diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-11-21 17:13:31 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-11-21 17:13:31 +0100 |
commit | 546125869f2959480c9a0f6c448c2092d565ec15 (patch) | |
tree | 7ac0aff02cb54e73a4a1a0143d6c09ed2eff8bcd | |
parent | 10455d43fef041309ce0613fa792c635dd71e3a8 (diff) |
patch 8.1.2327: cannot build with Hangul inputv8.1.2327
Problem: Cannot build with Hangul input.
Solution: Remove Hangul input support.
-rw-r--r-- | Filelist | 2 | ||||
-rw-r--r-- | runtime/doc/hangulin.txt | 113 | ||||
-rw-r--r-- | src/Makefile | 19 | ||||
-rwxr-xr-x | src/auto/configure | 34 | ||||
-rw-r--r-- | src/config.h.in | 3 | ||||
-rw-r--r-- | src/config.mk.in | 3 | ||||
-rw-r--r-- | src/configure.ac | 25 | ||||
-rw-r--r-- | src/edit.c | 10 | ||||
-rw-r--r-- | src/evalfunc.c | 3 | ||||
-rw-r--r-- | src/feature.h | 19 | ||||
-rw-r--r-- | src/globals.h | 5 | ||||
-rw-r--r-- | src/gui.c | 58 | ||||
-rw-r--r-- | src/gui_gtk_x11.c | 12 | ||||
-rw-r--r-- | src/gui_x11.c | 11 | ||||
-rw-r--r-- | src/hangulin.c | 1643 | ||||
-rw-r--r-- | src/mbyte.c | 9 | ||||
-rw-r--r-- | src/proto.h | 3 | ||||
-rw-r--r-- | src/proto/hangulin.pro | 10 | ||||
-rw-r--r-- | src/screen.c | 13 | ||||
-rw-r--r-- | src/ui.c | 32 | ||||
-rw-r--r-- | src/version.c | 6 |
21 files changed, 27 insertions, 2006 deletions
@@ -401,7 +401,6 @@ SRC_UNIX = \ src/gui_xmebwp.h \ src/gui_x11.c \ src/gui_x11_pm.h \ - src/hangulin.c \ src/if_xcmdsrv.c \ src/link.sh \ src/installman.sh \ @@ -421,7 +420,6 @@ SRC_UNIX = \ src/proto/gui_motif.pro \ src/proto/gui_xmdlg.pro \ src/proto/gui_x11.pro \ - src/proto/hangulin.pro \ src/proto/if_xcmdsrv.pro \ src/proto/os_unix.pro \ src/proto/pty.pro \ diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt index 708cfe9ac4..4aea0fd591 100644 --- a/runtime/doc/hangulin.txt +++ b/runtime/doc/hangulin.txt @@ -1,112 +1,17 @@ -*hangulin.txt* For Vim version 8.1. Last change: 2015 Nov 24 +*hangulin.txt* For Vim version 8.1. Last change: 2019 Nov 21 VIM REFERENCE MANUAL by Chi-Deok Hwang and Sung-Hyun Nam + *hangul* +Vim had built-in support for hangul, the Korean language, for users without +XIM (X Input Method). Since it didn't work well and was not maintained it was +removed in Vim 8.1.2327. -Introduction *hangul* ------------- -It is to input hangul, the Korean language, with Vim GUI version. -If you have a XIM program, you can use another |+xim| feature. -Basically, it is for anybody who has no XIM program. +If you want this hangul input mehod you can go back to Vim 8.1.2326 or +earlier. If you think this code is still useful and want to maintain it, make +a patch to add it back. However, making it work with UTF-8 encoding would be +best. -Compile -------- -Next is a basic option. You can add any other configure option. > - - ./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 -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 */ - -Environment variables ---------------------- -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 may want to set 'encoding' and 'fileencodings'. -Next are examples: > - - :set encoding=euc-kr - :set encoding=utf-8 - :set fileencodings=ucs-bom,utf-8,cp949,euc-kr,latin1 - -Keyboard --------- -You can change keyboard type (2 bulsik or 3 bulsik) using VIM_KEYBOARD -or HANGUL_KEYBOARD_TYPE environment variables. For sh, just do (2 bulsik): > - - export VIM_KEYBOARD="2" -or > - export HANGUL_KEYBOARD_TYPE="2" - -If both are set, VIM_KEYBOARD has higher priority. - -Hangul Fonts ------------- -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 - - ! Nexts are for hangul menu with Athena - *international: True - Vim*fontSet: english_font,hangul_font - - ! Nexts are for hangul menu with Motif - *international: True - Vim*fontList: 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 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 error message. Be careful! - -hangul_font width should be twice than english_font width. - -Unsupported Feature -------------------- -We don't support Johab font. -We don't support Hanja input. -And We don't have any plan to support them. - -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: - - SungHyun Nam <goweol@gmail.com> - Chi-Deok Hwang <...> vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/src/Makefile b/src/Makefile index 90390e0335..e1968ba86f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -504,11 +504,8 @@ CClink = $(CC) # XIM - X Input Method. Special character input support for X11 (Chinese, # Japanese, special symbols, etc). Also needed for dead-key support. # When omitted it's automatically enabled for the X-windows GUI. -# HANGUL - Input Hangul (Korean) language using internal routines. -# Uncomment one of these when you want to input a multibyte language. #CONF_OPT_INPUT = --enable-xim #CONF_OPT_INPUT = --disable-xim -#CONF_OPT_INPUT = --enable-hangulinput # FONTSET - X fontset support for output of languages with many characters. # Uncomment this when you want to output a multibyte language. @@ -1488,7 +1485,7 @@ LINT_CFLAGS = -DLINT -I. $(PRE_DEFS) $(POST_DEFS) \ $(PYTHON3_CFLAGS) $(TCL_CFLAGS) $(VTERM_CFLAGS) \ -Dinline= -D__extension__= -Dalloca=alloca -LINT_EXTRA = -DHANGUL_INPUT -D"__attribute__(x)=" +LINT_EXTRA = -D"__attribute__(x)=" DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS) @@ -1676,7 +1673,6 @@ SRC = $(BASIC_SRC) \ $(GUI_SRC) \ $(TERM_SRC) \ $(XDIFF_SRC) \ - $(HANGULIN_SRC) \ $(LUA_SRC) \ $(MZSCHEME_SRC) \ $(PERL_SRC) \ @@ -1684,7 +1680,7 @@ SRC = $(BASIC_SRC) \ $(TCL_SRC) \ $(RUBY_SRC) -EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \ +EXTRA_SRC = if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \ if_python.c if_python3.c if_tcl.c if_ruby.c \ gui_beval.c netbeans.c channel.c \ $(GRESOURCE_SRC) @@ -1710,7 +1706,7 @@ ALL_SRC = $(BASIC_SRC) $(ALL_GUI_SRC) $(UNITTEST_SRC) \ # Which files to check with lint. Select one of these three lines. ALL_SRC # checks more, but may not work well for checking a GUI that wasn't configured. # The perl sources also don't work well with lint. -LINT_SRC = $(BASIC_SRC) $(GUI_SRC) $(HANGULIN_SRC) \ +LINT_SRC = $(BASIC_SRC) $(GUI_SRC) \ $(PYTHON_SRC) $(PYTHON3_SRC) $(TCL_SRC) \ $(NETBEANS_SRC) $(CHANNEL_SRC) $(TERM_SRC) #LINT_SRC = $(SRC) @@ -1756,7 +1752,6 @@ OBJ_COMMON = \ objects/hardcopy.o \ objects/hashtab.o \ objects/highlight.o \ - $(HANGULIN_OBJ) \ objects/if_cscope.o \ objects/if_xcmdsrv.o \ objects/indent.o \ @@ -1909,7 +1904,6 @@ PRO_AUTO = \ getchar.pro \ hardcopy.pro \ hashtab.pro \ - hangulin.pro \ highlight.pro \ if_cscope.pro \ if_lua.pro \ @@ -3220,9 +3214,6 @@ objects/gui_photon.o: gui_photon.c objects/gui_mac.o: gui_mac.c $(CCC) -o $@ gui_mac.c -objects/hangulin.o: hangulin.c - $(CCC) -o $@ hangulin.c - objects/highlight.o: highlight.c $(CCC) -o $@ highlight.c @@ -4066,10 +4057,6 @@ objects/message_test.o: message_test.c main.c vim.h protodef.h auto/config.h \ feature.h os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h \ option.h beval.h proto/gui_beval.pro structs.h regexp.h gui.h alloc.h \ ex_cmds.h spell.h proto.h globals.h message.c -objects/hangulin.o: hangulin.c vim.h protodef.h auto/config.h feature.h os_unix.h \ - auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ - proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ - proto.h globals.h objects/if_lua.o: if_lua.c vim.h protodef.h auto/config.h feature.h os_unix.h \ auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \ proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \ diff --git a/src/auto/configure b/src/auto/configure index 713bf9ea80..b7c1c11e80 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -629,8 +629,6 @@ MSGFMT INSTALL_TOOL_LANGS INSTALL_LANGS TAGPRG -HANGULIN_OBJ -HANGULIN_SRC GUI_X_LIBS GUITYPE GUI_LIB_LOC @@ -820,7 +818,6 @@ enable_multibyte enable_rightleft enable_arabic enable_farsi -enable_hangulinput enable_xim enable_fontset with_x @@ -1502,7 +1499,6 @@ Optional Features: --disable-rightleft Do not include Right-to-Left language support. --disable-arabic Do not include Arabic language support. --disable-farsi Deprecated. - --enable-hangulinput Include Hangul input support. --enable-xim Include XIM input support. --enable-fontset Include X fontset output support. --enable-gui=OPTS X11 GUI. default=auto OPTS=auto/no/gtk2/gnome2/gtk3/motif/athena/neXtaw/photon/carbon @@ -7992,18 +7988,6 @@ if test "${enable_farsi+set}" = set; then : fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-hangulinput argument" >&5 -$as_echo_n "checking --enable-hangulinput argument... " >&6; } -# Check whether --enable-hangulinput was given. -if test "${enable_hangulinput+set}" = set; then : - enableval=$enable_hangulinput; -else - enable_hangulinput="no" -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_hangulinput" >&5 -$as_echo "$enable_hangulinput" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-xim argument" >&5 $as_echo_n "checking --enable-xim argument... " >&6; } # Check whether --enable-xim was given. @@ -10496,8 +10480,7 @@ rm -f conftest* fi CPPFLAGS=$cppflags_save - if test "$enable_xim" = "auto" -a "$enable_hangulinput" != "yes" \ - -a "x$GUITYPE" != "xNONE" ; then + if test "$enable_xim" = "auto" -a "x$GUITYPE" != "xNONE" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: X GUI selected; xim has been enabled" >&5 $as_echo "X GUI selected; xim has been enabled" >&6; } enable_xim="yes" @@ -10674,21 +10657,6 @@ $as_echo "no - using X11" >&6; } $as_echo "no" >&6; };; esac -if test "$enable_hangulinput" = "yes"; then - if test "x$GUITYPE" = "xNONE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI selected; hangul input has been disabled" >&5 -$as_echo "no GUI selected; hangul input has been disabled" >&6; } - enable_hangulinput=no - else - $as_echo "#define FEAT_HANGULIN 1" >>confdefs.h - - HANGULIN_SRC=hangulin.c - - HANGULIN_OBJ=objects/hangulin.o - - fi -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether toupper is broken" >&5 $as_echo_n "checking whether toupper is broken... " >&6; } diff --git a/src/config.h.in b/src/config.h.in index e17f036c7c..deeceb7a94 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -408,9 +408,6 @@ /* Define if you want to include XIM support. */ #undef FEAT_XIM -/* Define if you want to include Hangul input support. */ -#undef FEAT_HANGULIN - /* Define if you use GTK and want GNOME support. */ #undef FEAT_GUI_GNOME diff --git a/src/config.mk.in b/src/config.mk.in index 6aa842935b..1b5175b9e7 100644 --- a/src/config.mk.in +++ b/src/config.mk.in @@ -78,9 +78,6 @@ TCL_PRO = @TCL_PRO@ TCL_CFLAGS = @TCL_CFLAGS@ TCL_LIBS = @TCL_LIBS@ -HANGULIN_SRC = @HANGULIN_SRC@ -HANGULIN_OBJ = @HANGULIN_OBJ@ - NETBEANS_SRC = @NETBEANS_SRC@ NETBEANS_OBJ = @NETBEANS_OBJ@ CHANNEL_SRC = @CHANNEL_SRC@ diff --git a/src/configure.ac b/src/configure.ac index 6a10638e01..fd93b78227 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -2161,12 +2161,6 @@ dnl Farsi language support has been removed, ignore --disable-farsi AC_ARG_ENABLE(farsi, [ --disable-farsi Deprecated.],,) -AC_MSG_CHECKING(--enable-hangulinput argument) -AC_ARG_ENABLE(hangulinput, - [ --enable-hangulinput Include Hangul input support.], , - [enable_hangulinput="no"]) -AC_MSG_RESULT($enable_hangulinput) - AC_MSG_CHECKING(--enable-xim argument) AC_ARG_ENABLE(xim, [ --enable-xim Include XIM input support.], @@ -3058,9 +3052,8 @@ if test -z "$SKIP_ATHENA" -o -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_ fi CPPFLAGS=$cppflags_save - dnl automatically enable XIM when hangul input isn't enabled - if test "$enable_xim" = "auto" -a "$enable_hangulinput" != "yes" \ - -a "x$GUITYPE" != "xNONE" ; then + dnl automatically enable XIM in the GUI + if test "$enable_xim" = "auto" -a "x$GUITYPE" != "xNONE" ; then AC_MSG_RESULT(X GUI selected; xim has been enabled) enable_xim="yes" fi @@ -3178,20 +3171,6 @@ case `uname` in *) CYGWIN=no; AC_MSG_RESULT(no);; esac -dnl Only really enable hangul input when GUI and XFONTSET are available -if test "$enable_hangulinput" = "yes"; then - if test "x$GUITYPE" = "xNONE"; then - AC_MSG_RESULT(no GUI selected; hangul input has been disabled) - enable_hangulinput=no - else - AC_DEFINE(FEAT_HANGULIN) - HANGULIN_SRC=hangulin.c - AC_SUBST(HANGULIN_SRC) - HANGULIN_OBJ=objects/hangulin.o - AC_SUBST(HANGULIN_OBJ) - fi -fi - dnl Checks for libraries and include files. AC_CACHE_CHECK([whether toupper is broken], [vim_cv_toupper_broken], diff --git a/src/edit.c b/src/edit.c index a9cd2a494e..1c168b6a8b 100644 --- a/src/edit.c +++ b/src/edit.c @@ -4118,16 +4118,6 @@ ins_esc( #ifdef FEAT_SPELL check_spell_redraw(); #endif -#if defined(FEAT_HANGULIN) -# if defined(ESC_CHG_TO_ENG_MODE) - hangul_input_state_set(0); -# endif - if (composing_hangul) - { - push_raw_key(composing_hangul_buffer, 2); - composing_hangul = 0; - } -#endif temp = curwin->w_cursor.col; if (disabled_redraw) diff --git a/src/evalfunc.c b/src/evalfunc.c index 63c4057ba7..b374d55d41 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -3401,9 +3401,6 @@ f_has(typval_T *argvars, typval_T *rettv) #ifdef FEAT_GUI_MSWIN "gui_win32", #endif -#ifdef FEAT_HANGULIN - "hangul_input", -#endif #if defined(HAVE_ICONV_H) && defined(USE_ICONV) "iconv", #endif diff --git a/src/feature.h b/src/feature.h index 4c0758d523..428a904591 100644 --- a/src/feature.h +++ b/src/feature.h @@ -528,9 +528,7 @@ /* * +xim X Input Method. For entering special languages like * chinese and Japanese. - * +hangul_input Internal Hangul input method. Must be included - * through configure: "--enable-hangulin" - * Both are for Unix and VMS only. + * this is for Unix and VMS only. */ #ifndef FEAT_XIM /* #define FEAT_XIM */ @@ -540,18 +538,9 @@ # define USE_XIM 1 /* needed for GTK include files */ #endif -#ifdef FEAT_HANGULIN -# define HANGUL_DEFAULT_KEYBOARD 2 /* 2 or 3 bulsik keyboard */ -# define ESC_CHG_TO_ENG_MODE /* if defined, when ESC pressed, - * turn to english mode - */ -# if defined(FEAT_XIM) && !defined(LINT) - Error: You should select only ONE of XIM and HANGUL INPUT -# endif -#endif -#if defined(FEAT_HANGULIN) || defined(FEAT_XIM) -/* # define X_LOCALE */ /* for OS with incomplete locale - support, like old linux versions. */ +#if defined(FEAT_XIM) +// # define X_LOCALE // for OS with incomplete locale + // support, like old linux versions. #endif /* diff --git a/src/globals.h b/src/globals.h index 224450384d..fd1e6933c5 100644 --- a/src/globals.h +++ b/src/globals.h @@ -965,11 +965,6 @@ EXTERN guicolor_T xim_bg_color INIT(= INVALCOLOR); # endif #endif -#ifdef FEAT_HANGULIN -EXTERN int composing_hangul INIT(= 0); -EXTERN char_u composing_hangul_buffer[5]; -#endif - /* * "State" is the main state of Vim. * There are other variables that modify the state: @@ -1169,13 +1169,13 @@ gui_update_cursor( if (id > 0) { cattr = syn_id2colors(id, &cfg, &cbg); -#if defined(HAVE_INPUT_METHOD) || defined(FEAT_HANGULIN) +#if defined(HAVE_INPUT_METHOD) { static int iid; guicolor_T fg, bg; if ( -# if defined(FEAT_GUI_GTK) && defined(FEAT_XIM) && !defined(FEAT_HANGULIN) +# if defined(FEAT_GUI_GTK) && defined(FEAT_XIM) preedit_get_status() # else im_get_status() @@ -1260,35 +1260,14 @@ gui_update_cursor( } old_hl_mask = gui.highlight_mask; - if (shape->shape == SHAPE_BLOCK -#ifdef FEAT_HANGULIN - || composing_hangul -#endif - ) + if (shape->shape == SHAPE_BLOCK) { /* * Draw the text character with the cursor colors. Use the * character attributes plus the cursor attributes. */ gui.highlight_mask = (cattr | attr); -#ifdef FEAT_HANGULIN - if (composing_hangul) - { - 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, + (void)gui_screenchar(LineOffset[gui.row] + gui.col, GUI_MON_IS_CURSOR | GUI_MON_NOCLEAR, cfg, cbg, 0); } else @@ -2641,38 +2620,13 @@ gui_undraw_cursor(void) { if (gui.cursor_is_valid) { -#ifdef FEAT_HANGULIN - if (composing_hangul - && gui.col == gui.cursor_col && gui.row == gui.cursor_row) - { - 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 if (gui_redraw_block(gui.cursor_row, gui.cursor_col, gui.cursor_row, gui.cursor_col, GUI_MON_NOCLEAR) && gui.cursor_col > 0) (void)gui_redraw_block(gui.cursor_row, gui.cursor_col - 1, gui.cursor_row, gui.cursor_col - 1, GUI_MON_NOCLEAR); -#ifdef FEAT_HANGULIN - if (composing_hangul) - (void)gui_redraw_block(gui.cursor_row, gui.cursor_col + 1, - gui.cursor_row, gui.cursor_col + 1, GUI_MON_NOCLEAR); - } -#endif - /* Cursor_is_valid is reset when the cursor is undrawn, also reset it - * here in case it wasn't needed to undraw it. */ + // Cursor_is_valid is reset when the cursor is undrawn, also reset it + // here in case it wasn't needed to undraw it. gui.cursor_is_valid = FALSE; } } diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index d57cefa099..9c41ffbc40 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -1159,14 +1159,6 @@ key_press_event(GtkWidget *widget UNUSED, return TRUE; #endif -#ifdef FEAT_HANGULIN - if (key_sym == GDK_space && (state & GDK_SHIFT_MASK)) - { - hangul_input_state_toggle(); - return TRUE; - } -#endif - #ifdef SunXK_F36 /* * These keys have bogus lookup strings, and trapping them here is @@ -4388,10 +4380,6 @@ gui_mch_open(void) g_signal_connect(G_OBJECT(gui.mainwin), "destroy", G_CALLBACK(mainwin_destroy_cb), NULL); -#ifdef FEAT_HANGULIN - hangul_keyboard_set(); -#endif - /* * Notify the fixed area about the need to resize the contents of the * gui.formwin, which we use for random positioning of the included diff --git a/src/gui_x11.c b/src/gui_x11.c index 3555ffae09..40f53d6f7c 100644 --- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -863,14 +863,6 @@ gui_x11_key_hit_cb( len = 0; #endif -#ifdef FEAT_HANGULIN - if ((key_sym == XK_space) && (ev_press->state & ShiftMask)) - { - hangul_input_state_toggle(); - goto theend; - } -#endif - if (key_sym == XK_space) string[0] = ' '; /* Otherwise Ctrl-Space doesn't work */ @@ -1638,9 +1630,6 @@ gui_mch_open(void) * changed them) */ highlight_gui_started(); /* re-init colors and fonts */ -#ifdef FEAT_HANGULIN - hangul_keyboard_set(); -#endif #ifdef FEAT_XIM xim_init(); #endif diff --git a/src/hangulin.c b/src/hangulin.c deleted file mode 100644 index 75e7f6a0ce..0000000000 --- a/src/hangulin.c +++ /dev/null @@ -1,1643 +0,0 @@ -/* vi:set ts=8 sts=4 sw=4 noet: - * - * VIM - Vi IMproved by Bram Moolenaar - * - * Do ":help uganda" in Vim to read copying and usage conditions. - * Do ":help credits" in Vim to see a list of people who contributed. - * See README.txt for an overview of the Vim source code. - */ - -#include "vim.h" - -#ifndef HANGUL_DEFAULT_KEYBOARD -# define HANGUL_DEFAULT_KEYBOARD 3 -#endif - -#define AUTOMATA_NEW 0 -#define AUTOMATA_CORRECT 1 -#define AUTOMATA_SPECIAL 2 -#define AUTOMATA_CORRECT_NEW 3 -#define AUTOMATA_ERROR 4 -#define AUTOMATA_NULL 5 - -#define F_F 0x1 /* 초성 (initial sound) */ -#define F_M 0x2 /* 중성 (medial vowel) */ -#define F_L 0x4 /* 종성 (final consonant) */ -#define F_A 0x8 /* ASCII */ -#define F_NULL 1 -#define M_NULL 2 -#define L_NULL 1 - -static int hangul_input_state = 0; -static int f=F_NULL, m=M_NULL, l=L_NULL; -static int sp=0; -static char_u stack[20] = {0}; -static int last_l = -1, last_ll = -1; -static int hangul_keyboard_type = HANGUL_DEFAULT_KEYBOARD; - -static void convert_ks_to_3(const char_u *src, int *fp, int *mp, int *lp); -static int convert_3_to_ks(int fv, int mv, int lv, char_u *des); - -#define push(x) {stack[ sp++ ] = *(x); stack[sp++] = *((x)+1);} -#define pop(x) {*((x) + 1) = stack[--sp]; *(x) = stack[--sp];} -#define query(x) {*((x) + 1) = stack[sp - 1]; *(x) = stack[sp - 2];} - -#define convert_3_to_code convert_3_to_ks - - -/**********************************************************************/ -/****** 3 벌식자판을 위한 루틴 (Routines for 3 bulsik keyboard) ******/ -/**********************************************************************/ - -/* 3 벌식에서 자판 변환 (3 bulsik keyboard conversion) */ - -static char_u value_table_for_3[] = -{ - 24 , '"' , '#' , '$' , '%' , '&' , /* ! " # $ % & */ - 18 , '(' , ')' , '*' , '+' , ',' , /* ' ( ) * + , */ - '-' , '.' , 13 , 17 , 29 , 22 , /* - . / 0 1 2 */ - 19 , 19 , 26 , 5 , 12 , 28 , /* 3 4 5 6 7 8 */ - 20 , ':' , 9 , '2' , '=' , '3' , /* 9 : ; < = > */ - '?' , '@' , 8 , '!' , 11 , 10 , /* ? @ A B C D */ - 26 , 3 , '/' , 39 , '8' , '4' , /* E F G H I J */ - '5' , '6' , '1' , '0' , '9' , '>' , /* K L M N O P */ - 28 , 6 , 7 , ';' , '7' , 16 , /* Q R S T U V */ - 27 , 20 , '<' , 25 , '[' , 92 , /* W X Y Z [ \ */ - ']' , '^' , '_' , '`' , 23 , 20 , /* ] ^ _ ` a b */ - 10 , 29 , 11 , 3 , 27 , 4 , /* c d e f g h */ - 8 , 13 , 2 , 14 , 20 , 11 , /* i j k l m n */ - 16 , 19 , 21 , 4 , 5 , 7 , /* o p q r s t */ - 5 , 13 , 9 , 2 , 7 , 17 , /* u v w x y z */ -}; - -static short_u kind_table_for_3[] = -{ - F_L, F_A, F_A, F_A, F_A, F_A, /* ! " # $ % & */ - F_F, F_A, F_A, F_A, F_A, F_A, /* ' ( ) * + , */ - F_A, F_A, F_M, F_F, F_L, F_L, /* - . / 0 1 2 */ - F_L, F_M, F_M, F_M, F_M, F_M, /* 3 4 5 6 7 8 */ - F_M, F_A, F_F, F_A, F_A, F_A, /* 9 : ; < = > */ - F_A, F_A, F_L, F_A, F_L, F_L, /* ? @ A B C D */ - F_L, F_L, F_A, F_A, F_A, F_A, /* E F G H I J */ - F_A, F_A, F_A, F_A, F_A, F_A, /* K L M N O P */ - F_L, F_M, F_L, F_A, F_A, F_L, /* Q R S T U V */ - F_L, F_L, F_A, F_L, F_A, F_A, /* W X Y Z [ \ */ - F_A, F_A, F_A, F_A, F_L, F_M, /* ] ^ _ ` a b */ - F_M, F_M, F_M, F_M, F_M, F_F, /* c d e f g h */ - F_F, F_F, F_F, F_F, F_F, F_F, /* i j k l m n */ - F_F, F_F, F_L, F_M, F_L, F_M, /* o p q r s t */ - F_F, F_M, F_L, F_L, F_F, F_L, /* u v w x y z */ -}; - -/* 3 벌식에서 (현재초성, 입력영문) -> 복합초성 처리 - * 3 bulsik: (current initial sound, input english) -> compound initial sound. - */ - - static int -comfcon3(int v, int c) -{ - if (v == 2 && c == 2) - return 3; - if (v == 5 && c == 5) - return 6; - if (v == 9 && c == 9) - return 10; - if (v == 11 && c == 11) - return 12; - if (v == 14 && c == 14) - return 15; - return 0; -} - -/* 3 벌식에서 (현재모음, 입력 영문) -> 복합 모음 처리 - * 3 bulsik: (current vowel, input english) -> compound vowel. - */ - - static int -comvow3(int v, int c) -{ - switch (v) - { - case 13: /* ㅗ */ - switch (c) { - case 3: /* ㅗㅏ */ - return 14; - case 4: /* ㅗㅐ */ - return 15; - case 29: /* ㅗㅣ */ - return 18; - } - break; - - case 20: /* ㅜ */ - switch (c) { - case 7: /* ㅜㅓ */ - return 21; - case 10: /* ㅜㅔ */ - return 22; - case 29: /* ㅜㅣ */ - return 23; - } - break; - - /* 3 벌식 자판은 ㅡㅣ 가 있으므로 ... */ - } - return 0; -} - -/* 3 벌식에서 (현재 받침, 영문자 입력) -> 받침 - * 3 bulsik: (current prop(?), input english) -> prop(?). - * I want to say, the 'prop' is similar to 'final consonant', but not vowel. - * (I cannot find the real english from my dictionary. Sorry!) - * VIM: V = initial sound, I = medial vowel, M = final consonant. - */ - - static int -comcon3(int k, int c) -{ - switch (k) - { - case 2: /* ㄱ */ - switch (c) { - case 2: - return 3; /* ㄱㄱ */ - case 21: - return 4; /* ㄱㅅ */ - } - break; - - case 5: /* ㄴ */ - switch (c) { - case 24: /* ㄴㅈ */ - return 6; - case 29: - return 7; /* ㄴㅎ */ - } - break; - - case 9: /* ㄹ */ - switch (c) { - case 2: /* ㄹㄱ */ - return 10; - case 17: /* ㄹㅁ */ - return 11; - case 19: /* ㄹㅂ */ - return 12; - case 21: /* ㄹㅅ */ - return 13; - case 27: /* ㄹㅌ */ - return 14; - case 28: /* ㄹㅍ */ - return 15; - case 29: /* ㄹㅎ */ - return 16; - } - break; - - case 19: - switch (c) { - case 21: /* ㅂㅅ */ - return 20; - } - break; - } - return 0; -} - -/**********************************************************************/ -/****** 2 벌식자판을 위한 루틴 (Routines for 2 bulsik keyboard) ******/ -/**********************************************************************/ - - static int -kind_table_for_2(int c) -{ - static char_u table[] = - { - /* a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s */ - 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, - /* t, u, v, w, x, y, z */ - 0, 1, 0, 0, 0, 1, 0 - }; - - if (c <= 'Z') - c -= 'A'; - else - c -= 'a'; - - return table[c]; -} - -/* 2 벌식에서 영문자 -> 조합형 초성 변환 - * (2 bulsik: conversion english char. to initial sound of compound type) - * 결과: 초성이 아니면 0 (If it is not initial sound, return 0). - */ - static int -fcon(int c) -{ - static char_u table[] = - { - /*E */ 6 , /*F */ 0 , /*G */ 0 , /*H */ 0 , /*I */ 0 , /*J */ 0 , /*K */ 0 , - /*L */ 0 , /*M */ 0 , /*N */ 0 , /*O */ 0 , /*P */ 0 , /*Q */ 10, /*R */ 3 , - /*S */ 0 , /*T */ 12, /*U */ 0 , /*V */ 0 , /*W */ 15, /*X */ 0 , /*Y */ 0 , - /*Z */ 0 , /*[ */ 0 , /*\ */ 0 , /*] */ 0 , /*^ */ 0 , /*_ */ 0 , /*` */ 0 , - /*a */ 8 , /*b */ 0 , /*c */ 16, /*d */ 13, /*e */ 5 , /*f */ 7 , /*g */ 20, - /*h */ 0 , /*i */ 0 , /*j */ 0 , /*k */ 0 , /*l */ 0 , /*m */ 0 , /*n */ 0 , - /*o */ 0 , /*p */ 0 , /*q */ 9 , /*r */ 2 , /*s */ 4 , /*t */ 11, /*u */ 0 , - /*v */ 19, /*w */ 14, /*x */ 18, /*y */ 0 , /*z */ 17 - }; - - if (c < 'E' || c > 'z') - return 0; - return table[c - 'E']; -} - -/* 2 벌식에서 영문자 -> 중성 변환 - * (2 bulsik: conversion english char. to medial vowel) - * 결과: 중성이 아니면 0 (If it is not medial vowel, return 0). - */ - static int -vow(int c) -{ - static char_u table[] = - { - /*O */ 6 , /*P */ 12, /*Q */ 0 , /*R */ 0 , /*S */ 0 , /*T */ 0 , /*U */ 0 , - /*V */ 0 , /*W */ 0 , /*X */ 0 , /*Y */ 0 , /*Z */ 0 , /*[ */ 0 , /*\ */ 0 , - /*] */ 0 , /*^ */ 0 , /*_ */ 0 , /*` */ 0 , /*a */ 0 , /*b */ 26, /*c */ 0 , - /*d */ 0 , /*e */ 0 , /*f */ 0 , /*g */ 0 , /*h */ 13, /*i */ 5 , /*j */ 7 , - /*k */ 3 , /*l */ 29, /*m */ 27, /*n */ 20, /*o */ 4 , /*p */ 10, /*q */ 0 , - /*r */ 0 , /*s */ 0 , /*t */ 0 , /*u */ 11, /*v */ 0 , /*w */ 0 , /*x */ 0 , - /*y */ 19}; - - if (c < 'O' || c > 'y') - return 0; - return table[c - 'O']; -} - -/* 2벌식에서 영문자 -> 받침 변환 - * (2 bulsik: conversion english char. to prop) - * 결과: 받침이 아니면 0 (If not prop, return 0) - */ - static int -lcon(int c) -{ - static char_u table[] = - { - /*R */ 3 , /*S */ 0 , /*T */ 22, /*U */ 0 , /*V */ 0 , /*W */ 0 , /*X */ 0 , - |