From 546125869f2959480c9a0f6c448c2092d565ec15 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 21 Nov 2019 17:13:31 +0100 Subject: patch 8.1.2327: cannot build with Hangul input Problem: Cannot build with Hangul input. Solution: Remove Hangul input support. --- src/gui.c | 58 ++++++---------------------------------------------------- 1 file changed, 6 insertions(+), 52 deletions(-) (limited to 'src/gui.c') diff --git a/src/gui.c b/src/gui.c index 94a0503d05..275f3fe066 100644 --- a/src/gui.c +++ b/src/gui.c @@ -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; } } -- cgit v1.2.3