vim: src/popupwin.c comparison

comparison src/popupwin.c @ 17429:6e756ad5ef1a v8.1.1713

patch 8.1.1713: highlighting cursor line only works with popup_menu() commit https://github.com/vim/vim/commit/df9c6cad8cc318e26e99c3b055f0788e7d6582de Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 18 13:46:42 2019 +0200 patch 8.1.1713: highlighting cursor line only works with popup_menu() Problem: Highlighting cursor line only works with popup_menu(). Solution: Add the "cursorline" property. (Naruhiko Nishino, closes https://github.com/vim/vim/issues/4671)

author	Bram Moolenaar <Bram@vim.org>
date	Thu, 18 Jul 2019 14:00:08 +0200
parents	73e81cd9e6cb
children	ce35cdbe9f74

comparison

equal deleted inserted replaced

-:30036b80e5ca
+:6e756ad5ef1a
 	{
 	    str = tv_get_string(&di->di_tv);
 	    if (*str != NUL)
 		*pval = vim_strsave(str);
 	}
+}
+}
+/*
+* Highlight the line with the cursor.
+* Also scrolls the text to put the cursor line in view.
+*/
+static void
+popup_highlight_curline(win_T *wp)
+{
+int	    id;
+char    buf[100];
+match_delete(wp, 1, FALSE);
+if ((wp->w_popup_flags & POPF_CURSORLINE) != 0)
+{
+	// Scroll to show the line with the cursor.  This assumes lines don't
+	// wrap.
+	while (wp->w_topline + wp->w_height - 1 < wp->w_cursor.lnum)
+	    wp->w_topline++;
+	while (wp->w_cursor.lnum < wp->w_topline)
+	    wp->w_topline--;
+	id = syn_name2id((char_u *)"PopupSelected");
+	vim_snprintf(buf, sizeof(buf), "\\%%%dl.*", (int)wp->w_cursor.lnum);
+	match_add(wp, (char_u *)(id == 0 ? "PmenuSel" : "PopupSelected"),
+					     (char_u *)buf, 10, 1, NULL, NULL);
 }
 }
 /*
 * Shared between popup_create() and f_popup_setoptions().
 {
 	set_mousemoved_values(wp);
 	handle_moved_argument(wp, di, TRUE);
 }
+di = dict_find(dict, (char_u *)"cursorline", -1);
+if (di != NULL)
+{
+	if (di->di_tv.v_type == VAR_NUMBER)
+	{
+	    if (di->di_tv.vval.v_number != 0)
+		wp->w_popup_flags |= POPF_CURSORLINE;
+	    else
+		wp->w_popup_flags &= ~POPF_CURSORLINE;
+	}
+	else
+	    semsg(_(e_invargval), "cursorline");
+}
 di = dict_find(dict, (char_u *)"filter", -1);
 if (di != NULL)
 {
 	callback_T	callback = get_callback(&di->di_tv);
 }
 }
 /*
 * Go through the options in "dict" and apply them to popup window "wp".
+* Only used when creating a new popup window.
 */
 static void
 apply_options(win_T *wp, dict_T *dict)
 {
 int		nr;
 	wp->w_popup_flags |= POPF_HIDDEN;
 	--wp->w_buffer->b_nwindows;
 }
 popup_mask_refresh = TRUE;
+popup_highlight_curline(wp);
 }
 /*
 * Add lines to the popup from a list of strings.
 */
 	callback = get_callback(&tv);
 	if (callback.cb_name != NULL)
 	    set_callback(&wp->w_filter_cb, &callback);
 	wp->w_p_wrap = 0;
+	wp->w_popup_flags |= POPF_CURSORLINE;
 }
 for (i = 0; i < 4; ++i)
 	VIM_CLEAR(wp->w_border_highlight[i]);
 for (i = 0; i < 8; ++i)
 			  || wp == mouse_find_win(&row, &col, FIND_POPUP)))
 	// do not consume the key, allow for dragging the popup
 	rettv->vval.v_number = 0;
 }
-static void
-popup_highlight_curline(win_T *wp)
-{
-int	    id;
-char    buf[100];
-match_delete(wp, 1, FALSE);
-// Scroll to show the line with the cursor.  This assumes lines don't wrap.
-while (wp->w_topline + wp->w_height - 1 < wp->w_cursor.lnum)
-	wp->w_topline++;
-while (wp->w_cursor.lnum < wp->w_topline)
-	wp->w_topline--;
-id = syn_name2id((char_u *)"PopupSelected");
-vim_snprintf(buf, sizeof(buf), "\\%%%dl.*", (int)wp->w_cursor.lnum);
-match_add(wp, (char_u *)(id == 0 ? "PmenuSel" : "PopupSelected"),
-					     (char_u *)buf, 10, 1, NULL, NULL);
-}
 /*
 * popup_filter_menu({text}, {options})
 */
 void
 f_popup_filter_menu(typval_T *argvars, typval_T *rettv)
 * popup_menu({text}, {options})
 */
 void
 f_popup_menu(typval_T *argvars, typval_T *rettv)
 {
-win_T *wp = popup_create(argvars, rettv, TYPE_MENU);
+popup_create(argvars, rettv, TYPE_MENU);
-if (wp != NULL)
-	popup_highlight_curline(wp);
 }
 /*
 * popup_notification({text}, {options})
 */
 apply_general_options(wp, dict);
 if (old_firstline != wp->w_firstline)
 	redraw_win_later(wp, NOT_VALID);
 popup_mask_refresh = TRUE;
+popup_highlight_curline(wp);
 popup_adjust_position(wp);
 }
 /*
 * popup_getpos({id})
 	dict_add_number(dict, "zindex", wp->w_zindex);
 	dict_add_number(dict, "fixed", wp->w_popup_fixed);
 	dict_add_string(dict, "title", wp->w_popup_title);
 	dict_add_number(dict, "wrap", wp->w_p_wrap);
 	dict_add_number(dict, "drag", wp->w_popup_drag);
+	dict_add_number(dict, "cursorline", (wp->w_popup_flags & POPF_CURSORLINE) != 0);
 	dict_add_string(dict, "highlight", wp->w_p_wcr);
 	if (wp->w_scrollbar_highlight != NULL)
 	    dict_add_string(dict, "scrollbarhighlight",
 						    wp->w_scrollbar_highlight);
 	if (wp->w_thumb_highlight != NULL)
 int		res;
 typval_T	rettv;
 int		dummy;
 typval_T	argv[3];
 char_u	buf[NUMBUFLEN];
+linenr_T	old_lnum = wp->w_cursor.lnum;
 // Emergency exit: CTRL-C closes the popup.
 if (c == Ctrl_C)
 {
 	rettv.v_type = VAR_NUMBER;
 argv[2].v_type = VAR_UNKNOWN;
 // NOTE: The callback might close the popup, thus make "wp" invalid.
 call_callback(&wp->w_filter_cb, -1,
 			    &rettv, 2, argv, NULL, 0L, 0L, &dummy, TRUE, NULL);
+if (old_lnum != wp->w_cursor.lnum)
+	popup_highlight_curline(wp);
 res = tv_get_number(&rettv);
 vim_free(argv[1].vval.v_string);
 clear_tv(&rettv);
 return res;
 }

Mercurial > vim

comparison src/popupwin.c @ 17429:6e756ad5ef1a v8.1.1713