vimdll: Support 'iminsert' on console

k-takata · Nov 29, 2019 · be97416 · be97416
1 parent 99fce97
commit be97416
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/src/gui_w32.c b/src/gui_w32.c
@@ -5746,6 +5746,14 @@ im_set_active(int active)
     HIMC	hImc;
     static HIMC	hImcOld = (HIMC)0;
 
+# ifdef VIMDLL
+    if (!gui.in_use)
+    {
+	mbyte_im_set_active(active);
+	return;
+    }
+# endif
+
     if (pImmGetContext)	    /* if NULL imm32.dll wasn't loaded (yet) */
     {
 	if (p_imdisable)
@@ -5815,6 +5823,11 @@ im_get_status(void)
     int		status = 0;
     HIMC	hImc;
 
+# ifdef VIMDLL
+    if (!gui.in_use)
+	return mbyte_im_get_status();
+# endif
+
     if (pImmGetContext && (hImc = pImmGetContext(s_hwnd)) != (HIMC)0)
     {
 	status = pImmGetOpenStatus(hImc) ? 1 : 0;

diff --git a/src/mbyte.c b/src/mbyte.c
@@ -4789,7 +4789,8 @@ iconv_end(void)
 # define USE_IMSTATUSFUNC (*p_imsf != NUL)
 #endif
 
-#if defined(FEAT_EVAL) && (defined(FEAT_XIM) || defined(IME_WITHOUT_XIM))
+#if defined(FEAT_EVAL) && \
+    (defined(FEAT_XIM) || defined(IME_WITHOUT_XIM) || defined(VIMDLL))
     static void
 call_imactivatefunc(int active)
 {
@@ -6454,11 +6455,15 @@ xim_get_status_area_height(void)
 
 #else /* !defined(FEAT_XIM) */
 
-# ifdef IME_WITHOUT_XIM
+# if defined(IME_WITHOUT_XIM) || defined(VIMDLL)
 static int im_was_set_active = FALSE;
 
     int
+#  ifdef VIMDLL
+mbyte_im_get_status(void)
+#  else
 im_get_status(void)
+#  endif
 {
 #  if defined(FEAT_EVAL)
     if (USE_IMSTATUSFUNC)
@@ -6468,7 +6473,11 @@ im_get_status(void)
 }
 
     void
+#  ifdef VIMDLL
+mbyte_im_set_active(int active_arg)
+#  else
 im_set_active(int active_arg)
+#  endif
 {
 #  if defined(FEAT_EVAL)
     int	    active = !p_imdisable && active_arg;
@@ -6481,7 +6490,7 @@ im_set_active(int active_arg)
 #  endif
 }
 
-#  ifdef FEAT_GUI
+#  if defined(FEAT_GUI) && !defined(VIMDLL)
     void
 im_set_position(int row UNUSED, int col UNUSED)
 {

diff --git a/src/proto.h b/src/proto.h
@@ -177,6 +177,10 @@ void qsort(void *base, size_t elm_count, size_t elm_size, int (*cmp)(const void
 # include "mouse.pro"
 # include "move.pro"
 # include "mbyte.pro"
+# ifdef VIMDLL
+int mbyte_im_get_status(void);
+void mbyte_im_set_active(int active_arg);
+# endif
 # include "normal.pro"
 # include "ops.pro"
 # include "option.pro"