Fix merge

Author: splhack

src/ex_getln.c

@@ -2506,6 +2506,34 @@ cmdline_at_end()
 }
 #endif
 
+#if defined(FEAT_GUI_MACVIM)
+/*
+ * Return the virtual column number at the current cursor position.
+ * This is used by the IM code to obtain the start of the preedit string.
+ */
+    colnr_T
+cmdline_getvcol_cursor()
+{
+    if (ccline.cmdbuff == NULL || ccline.cmdpos > ccline.cmdlen)
+	return MAXCOL;
+
+# ifdef FEAT_MBYTE
+    if (has_mbyte)
+    {
+	colnr_T	col;
+	int	i = 0;
+
+	for (col = 0; i < ccline.cmdpos; ++col)
+	    i += (*mb_ptr2len)(ccline.cmdbuff + i);
+
+	return col;
+    }
+    else
+# endif
+	return ccline.cmdpos;
+}
+#endif
+
 /*
  * Allocate a new command line buffer.
  * Assigns the new buffer to ccline.cmdbuff and ccline.cmdbufflen.

src/globals.h

@@ -876,6 +876,16 @@ EXTERN GtkIMContext	*xic INIT(= NULL);
 #  else
 EXTERN XIC		xic INIT(= NULL);
 #  endif
+# else
+/*
+ * Start and end column of the preedit area in virtual columns from the start
+ * of the text line.  When there is no preedit area they are set to MAXCOL.
+ * "preedit_end_col" is needed for coloring the preedited string.  Drawing the
+ * color between "preedit_start_col" and curpos did not work, because some XIM
+ * set the cursor position to the first char of the string.
+ */
+EXTERN colnr_T		preedit_start_col INIT(= MAXCOL);
+EXTERN colnr_T		preedit_end_col INIT(= MAXCOL);
 # endif
 # ifdef FEAT_GUI
 EXTERN guicolor_T	xim_fg_color INIT(= INVALCOLOR);

src/mbyte.c

@@ -4453,6 +4453,20 @@ iconv_end()
 # if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MACVIM) || defined(PROTO)
 static int xim_has_preediting INIT(= FALSE);  /* IM current status */
 
+#  ifdef FEAT_GUI_MACVIM
+/*
+ * Set preedit_start_col to the current cursor position.
+ */
+    static void
+init_preedit_start_col(void)
+{
+    if (State & CMDLINE)
+	preedit_start_col = cmdline_getvcol_cursor();
+    else if (curwin != NULL)
+	getvcol(curwin, &curwin->w_cursor, &preedit_start_col, NULL, NULL);
+}
+#  endif
+
 static int im_is_active	       = FALSE;	/* IM is enabled for current mode    */
 static int preedit_is_active   = FALSE;
 static int im_preedit_start    = 0;	/* start offset in characters        */
@@ -4756,6 +4770,14 @@ im_commit_cb(GtkIMContext *context UNUSED,
     if (add_to_input)
 	im_add_to_input((char_u *)str, slen);
 
+#  ifdef FEAT_GUI_MACVIM
+    /* Inserting chars while "im_is_active" is set does not cause a change of
+     * buffer.  When the chars are committed the buffer must be marked as
+     * changed. */
+    if (!commit_with_preedit)
+	preedit_start_col = MAXCOL;
+#  endif
+
     if (gtk_main_level() > 0)
 	gtk_main_quit();
 }
@@ -4799,6 +4821,9 @@ im_preedit_end_macvim()
     im_delete_preedit();
 
     /* Indicate that preediting has finished */
+# ifdef FEAT_GUI_MACVIM
+    preedit_start_col = MAXCOL;
+# endif
     xim_has_preediting = FALSE;
 
 #if 0
@@ -4882,6 +4907,8 @@ im_preedit_changed_macvim(char *preedit_string, int start_index, int cursor_inde
     gtk_im_context_get_preedit_string(context,
 				      &preedit_string, NULL,
 				      &cursor_index);
+# else
+    im_preedit_start = start_index;
 # endif
 
 #ifdef XIM_DEBUG
@@ -4890,8 +4917,38 @@ im_preedit_changed_macvim(char *preedit_string, int start_index, int cursor_inde
 
     g_return_if_fail(preedit_string != NULL); /* just in case */
 
+# ifdef FEAT_GUI_MACVIM
+    /* If preedit_start_col is MAXCOL set it to the current cursor position. */
+    if (preedit_start_col == MAXCOL && preedit_string[0] != '\0')
+    {
+	xim_has_preediting = TRUE;
+
+	/* Urgh, this breaks if the input buffer isn't empty now */
+	init_preedit_start_col();
+    }
+    else if (cursor_index == 0 && preedit_string[0] == '\0')
+    {
+	xim_has_preediting = FALSE;
+
+	/* If at the start position (after typing backspace)
+	 * preedit_start_col must be reset. */
+	preedit_start_col = MAXCOL;
+    }
+# endif
+
     im_delete_preedit();
 
+# ifdef FEAT_GUI_MACVIM
+    /*
+     * Compute the end of the preediting area: "preedit_end_col".
+     * According to the documentation of gtk_im_context_get_preedit_string(),
+     * the cursor_pos output argument returns the offset in bytes.  This is
+     * unfortunately not true -- real life shows the offset is in characters,
+     * and the GTK+ source code agrees with me.  Will file a bug later.
+     */
+    if (preedit_start_col != MAXCOL)
+	preedit_end_col = preedit_start_col;
+# endif
     str = (char_u *)preedit_string;
     for (p = str, i = 0; *p != NUL; p += utf_byte2len(*p), ++i)
     {
@@ -4916,6 +4973,10 @@ im_preedit_changed_macvim(char *preedit_string, int start_index, int cursor_inde
 	     * composing characters are not counted even if p_deco is set. */
 	    ++num_move_back;
 	}
+# ifdef FEAT_GUI_MACVIM
+	if (preedit_start_col != MAXCOL)
+	    preedit_end_col += utf_ptr2cells(p);
+# endif
     }
 
     if (p > str)
@@ -4991,6 +5052,9 @@ im_shutdown(void)
 # endif
     im_is_active = FALSE;
     im_commit_handler_id = 0;
+# ifdef FEAT_GUI_MACVIM
+    preedit_start_col = MAXCOL;
+# endif
     xim_has_preediting = FALSE;
 }
 
@@ -5149,6 +5213,9 @@ xim_reset(void)
     }
 # endif
 
+# ifdef FEAT_GUI_MACVIM
+    preedit_start_col = MAXCOL;
+# endif
     xim_has_preediting = FALSE;
 }
 

src/proto/ex_getln.pro

@@ -9,6 +9,7 @@ char_u *getexline __ARGS((int c, void *cookie, int indent));
 char_u *getexmodeline __ARGS((int promptc, void *cookie, int indent));
 int cmdline_overstrike __ARGS((void));
 int cmdline_at_end __ARGS((void));
+colnr_T cmdline_getvcol_cursor __ARGS((void));
 void free_cmdline_buf __ARGS((void));
 void putcmdline __ARGS((int c, int shift));
 void unputcmdline __ARGS((void));

src/proto/mbyte.pro

@@ -76,6 +76,7 @@ void im_set_active __ARGS((int active));
 void xim_set_focus __ARGS((int focus));
 void im_set_position __ARGS((int row, int col));
 void xim_set_preedit __ARGS((void));
+int im_get_feedback_attr __ARGS((int col));
 void xim_init __ARGS((void));
 void im_shutdown __ARGS((void));
 int im_xim_isvalid_imactivate __ARGS((void));

src/screen.c

@@ -2985,6 +2985,10 @@ win_line(wp, lnum, startrow, endrow, nochange)
 #endif
 #define WL_LINE		WL_SBR + 1	/* text in the line */
     int		draw_state = WL_START;	/* what to draw next */
+#if defined(FEAT_GUI_MACVIM)
+    int		feedback_col = 0;
+    int		feedback_old_attr = -1;
+#endif
 
 #ifdef FEAT_CONCEAL
     int		syntax_flags	= 0;
@@ -4858,6 +4862,39 @@ win_line(wp, lnum, startrow, endrow, nochange)
 		&& !attr_pri)
 	    char_attr = extra_attr;
 
+#if defined(FEAT_GUI_MACVIM)
+	if (
+		lnum == wp->w_cursor.lnum
+		&& (State & INSERT)
+		&& im_is_preediting()
+		&& draw_state == WL_LINE)
+	{
+	    colnr_T tcol;
+
+	    if (preedit_end_col == MAXCOL)
+		getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL);
+	    else
+		tcol = preedit_end_col;
+	    if ((long)preedit_start_col <= vcol && vcol < (long)tcol)
+	    {
+		if (feedback_old_attr < 0)
+		{
+		    feedback_col = 0;
+		    feedback_old_attr = char_attr;
+		}
+		char_attr = im_get_feedback_attr(feedback_col);
+		if (char_attr < 0)
+		    char_attr = feedback_old_attr;
+		feedback_col++;
+	    }
+	    else if (feedback_old_attr >= 0)
+	    {
+		char_attr = feedback_old_attr;
+		feedback_old_attr = -1;
+		feedback_col = 0;
+	    }
+	}
+#endif
 	/*
 	 * Handle the case where we are in column 0 but not on the first
 	 * character of the line and the user wants us to show us a