2015-11-06 오전 11:24에 SungHyun Nam 이(가) 쓴 글:
> 2015-11-06 오전 6:48에 Bram Moolenaar 이(가) 쓴 글:
>>
>> Namsh wrote:
>>
>>> 2015-11-03 오후 4:41에 Tony Mechelynck 이(가) 쓴 글:
>>>> On Tue, Nov 3, 2015 at 8:22 AM, SungHyun Nam <[email protected]> wrote:
>>>>> Hello,
>>>>>
>>>>> I used hangulin feature nowadays, because it does not support
>>>>> utf-8 encoding, I always ran vim with 'set encoding=cp949'.
>>>>> But it gave me a pain whenever I open utf-8 encoded file.
>>>>>
>>>>> So that, today I made a patch. Any feedback is welcome!
>
> No interesting changes to the previous patch.
> I just removed unused variable in push_raw_key().
Previous patch was not changed.
I updated document and removed some obsoleted definitions in feature.h.
Summary for new changes:
- hangulin.txt: correcting my weak/ugly english is welcome! =^_^=
. updated for utf-8 and GTK2.
. removed emails for ChiDeok Hwang
Hwang, if you read this, please send your new email if you want.
- feature.h
. removed duplicated 'FEAT_XFONTSET' define
It is not only for hangulinput and re-defined few lines below.
. removed SLOW_XSERVER
I don't know about it and googling only finds it in vim.
Thanks,
namsh
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt
index 79ebff1..7296774 100644
--- a/runtime/doc/hangulin.txt
+++ b/runtime/doc/hangulin.txt
@@ -3,9 +3,6 @@
VIM REFERENCE MANUAL by Chi-Deok Hwang and Sung-Hyun Nam
-NOTE: The |+hangul_input| feature is scheduled to be removed. If you want to
-keep it, please send a message to the Vim user maillist.
-
Introduction *hangul*
------------
@@ -17,7 +14,8 @@ Compile
-------
Next is a basic option. You can add any other configure option. >
- ./configure --with-x --enable-multibyte --enable-fontset
--enable-hangulinput
+ ./configure --with-x --enable-multibyte --enable-hangulinput \
+ --disable-xim
And you should check feature.h. If |+hangul_input| feature is enabled
by configure, you can select more options such as keyboard type, 2 bulsik
@@ -26,18 +24,21 @@ or 3 bulsik. You can find keywords like next in there. >
#define HANGUL_DEFAULT_KEYBOARD 2
#define ESC_CHG_TO_ENG_MODE
/* #define X_LOCALE */
- /* #define SLOW_XSERVER */
Environment variables
---------------------
-You should set LANG variable to Korean locale such as ko or ko_KR.euc.
+You should set LANG variable to Korean locale such as ko, ko_KR.eucKR
+or ko_KR.UTF-8.
If you set LC_ALL variable, it should be set to Korean locale also.
VIM resource
------------
-You should add nexts to your global vimrc ($HOME/.vimrc). >
+You may want to set 'encoding' and 'fileencodings'.
+Next are examples:
- :set fileencoding=korea
+ :set encoding=euc-kr
+ :set encoding=utf-8
+ :set fileencodings=ucs-bom,utf-8,cp949,euc-kr,latin1
Keyboard
--------
@@ -52,8 +53,16 @@ If both are set, VIM_KEYBOARD has higher priority.
Hangul Fonts
------------
-You can set text font using $HOME/.Xdefaults or in your gvimrc file.
-But to use Hangul, you should set 'guifontset' in your vimrc.
+If you use GTK version of GVIM, you should set 'guifont' and 'guifontwide'.
+For example:
+ set guifont=Courier\ 12
+ set guifontwide=NanumGothicCoding\ 12
+
+If you use Motif or Athena version of GVIM, you should set 'guifontset' in
+your vimrc. You can set fontset in the .Xdefaults file.
+
+$HOME/.gvimrc: >
+ set guifontset=english_font,hangul_font
$HOME/.Xdefaults: >
Vim.font: english_font
@@ -66,40 +75,38 @@ $HOME/.Xdefaults: >
*international: True
Vim*fontList: english_font;hangul_font:
-$HOME/.gvimrc: >
- set guifontset=english_font,hangul_font
-
attention! the , (comma) or ; (semicolon)
And there should be no ':set guifont'. If it exists, then Gvim ignores
':set guifontset'. It means VIM runs without fontset supporting.
So, you can see only English. Hangul does not be correctly displayed.
-After 'fontset' feature is enabled, VIM does not allow using 'font'.
+After 'fontset' feature is enabled, VIM does not allow using english
+font only in 'font' setting for syntax.
For example, if you use >
:set guifontset=eng_font,your_font
in your .gvimrc, then you should do for syntax >
:hi Comment guifg=Cyan font=another_eng_font,another_your_font
If you just do >
:hi Comment font=another_eng_font
-then you can see a GOOD error message. Be careful!
+then you can see a error message. Be careful!
hangul_font width should be twice than english_font width.
Unsupported Feature
-------------------
-Johab font not yet supported. And I don't have any plan.
-If you really want to use johab font, you can use the
-hanguldraw.c in gau package.
+We don't support Johab font.
+We don't support Hanja input.
+And We don't have any plan to support them.
-Hanja input not yet supported. And I don't have any plan.
-If you really want to input hanja, just use VIM with hanterm.
+If you really need such features, you can use console version of VIM with a
+capable terminal emulator.
Bug or Comment
--------------
Send comments, patches and suggestions to:
- Chi-Deok Hwang <[email protected]>
SungHyun Nam <[email protected]>
+ Chi-Deok Hwang <...>
vim:tw=78:ts=8:ft=help:norl:
diff --git a/src/feature.h b/src/feature.h
index 01f611e..c499d9d 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -677,9 +677,6 @@
# define ESC_CHG_TO_ENG_MODE /* if defined, when ESC pressed,
* turn to english mode
*/
-# if !defined(FEAT_XFONTSET) && defined(HAVE_X11) && !defined(FEAT_GUI_GTK)
-# define FEAT_XFONTSET /* Hangul input requires
xfontset */
-# endif
# if defined(FEAT_XIM) && !defined(LINT)
Error: You should select only ONE of XIM and HANGUL INPUT
# endif
@@ -687,7 +684,6 @@
#if defined(FEAT_HANGULIN) || defined(FEAT_XIM)
/* # define X_LOCALE */ /* for OS with incomplete locale
support, like old linux versions. */
-/* # define SLOW_XSERVER */ /* for extremely slow X server */
#endif
/*
diff --git a/src/gui.c b/src/gui.c
index fc2981c..0736522 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -1223,8 +1223,19 @@ gui_update_cursor(force, clear_selection)
gui.highlight_mask = (cattr | attr);
#ifdef FEAT_HANGULIN
if (composing_hangul)
- (void)gui_outstr_nowrap(composing_hangul_buffer, 2,
- GUI_MON_IS_CURSOR | GUI_MON_NOCLEAR, cfg, cbg, 0);
+ {
+ char_u *comp_buf;
+ int comp_len;
+
+ comp_buf = hangul_composing_buffer_get(&comp_len);
+ if (comp_buf)
+ {
+ (void)gui_outstr_nowrap(comp_buf, comp_len,
+ GUI_MON_IS_CURSOR | GUI_MON_NOCLEAR,
+ cfg, cbg, 0);
+ vim_free(comp_buf);
+ }
+ }
else
#endif
(void)gui_screenchar(LineOffset[gui.row] + gui.col,
@@ -2572,9 +2583,19 @@ gui_undraw_cursor()
#ifdef FEAT_HANGULIN
if (composing_hangul
&& gui.col == gui.cursor_col && gui.row == gui.cursor_row)
- (void)gui_outstr_nowrap(composing_hangul_buffer, 2,
- GUI_MON_IS_CURSOR | GUI_MON_NOCLEAR,
- gui.norm_pixel, gui.back_pixel, 0);
+ {
+ char_u *comp_buf;
+ int comp_len;
+
+ comp_buf = hangul_composing_buffer_get(&comp_len);
+ if (comp_buf)
+ {
+ (void)gui_outstr_nowrap(comp_buf, comp_len,
+ GUI_MON_IS_CURSOR | GUI_MON_NOCLEAR,
+ gui.norm_pixel, gui.back_pixel, 0);
+ vim_free(comp_buf);
+ }
+ }
else
{
#endif
diff --git a/src/hangulin.c b/src/hangulin.c
index 24cf180..f02cad8 100644
--- a/src/hangulin.c
+++ b/src/hangulin.c
@@ -1619,3 +1619,49 @@ convert_3_to_ks(fv, mv, lv, des)
*des++ = johab_lcon_to_wan[lv];
return 8;
}
+
+ char_u *
+hangul_string_convert(buf, p_len)
+ char_u *buf;
+ int *p_len;
+{
+ char_u *tmpbuf = NULL;
+ vimconv_T vc;
+
+ if (enc_utf8)
+ {
+ vc.vc_type = CONV_NONE;
+ if (convert_setup(&vc, (char_u *)"euc-kr", p_enc) == OK)
+ {
+ tmpbuf = string_convert(&vc, buf, p_len);
+ convert_setup(&vc, NULL, NULL);
+ }
+ }
+
+ return tmpbuf;
+}
+
+ char_u *
+hangul_composing_buffer_get(p_len)
+ int *p_len;
+{
+ char_u *tmpbuf = NULL;
+
+ if (composing_hangul)
+ {
+ int len = 2;
+
+ tmpbuf = hangul_string_convert(composing_hangul_buffer, &len);
+ if (tmpbuf != NULL)
+ {
+ *p_len = len;
+ }
+ else
+ {
+ tmpbuf = vim_strnsave(composing_hangul_buffer, 2);
+ *p_len = 2;
+ }
+ }
+
+ return tmpbuf;
+}
diff --git a/src/proto/hangulin.pro b/src/proto/hangulin.pro
index adfde14..59e6986 100644
--- a/src/proto/hangulin.pro
+++ b/src/proto/hangulin.pro
@@ -6,4 +6,6 @@ void hangul_input_state_toggle __ARGS((void));
void hangul_keyboard_set __ARGS((void));
int hangul_input_process __ARGS((char_u *s, int len));
void hangul_input_clear __ARGS((void));
+char_u *hangul_string_convert __ARGS((char_u *buf, int *p_len));
+char_u *hangul_composing_buffer_get __ARGS((int *p_len));
/* vim: set ft=c : */
diff --git a/src/screen.c b/src/screen.c
index b1af862..de9e04d 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -10047,7 +10047,13 @@ showmode()
if (gui.in_use)
{
if (hangul_input_state_get())
- MSG_PUTS_ATTR(" \307\321\261\333", attr); /* HANGUL */
+ {
+ /* HANGUL */
+ if (enc_utf8)
+ MSG_PUTS_ATTR(" \355\225\234\352\270\200", attr);
+ else
+ MSG_PUTS_ATTR(" \307\321\261\333", attr);
+ }
}
#endif
#ifdef FEAT_INS_EXPAND
diff --git a/src/ui.c b/src/ui.c
index e0e54d9..5438a38 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1723,8 +1723,17 @@ push_raw_key(s, len)
char_u *s;
int len;
{
+ char_u *tmpbuf;
+
+ tmpbuf = hangul_string_convert(s, &len);
+ if (tmpbuf != NULL)
+ s = tmpbuf;
+
while (len--)
inbuf[inbufcount++] = *s++;
+
+ if (tmpbuf != NULL)
+ vim_free(tmpbuf);
}
#endif
