Permalink
Browse files

patch 8.0.1570: can't use :popup for a menu in the terminal

Problem:    Can't use :popup for a menu in the terminal. (Wei Zhang)
Solution:   Make :popup work in the terminal.  Also fix that entries were
            included that don't work in the current state.
  • Loading branch information...
brammool committed Mar 5, 2018
1 parent 28ada69 commit 29a2c08d792e4458a0af8371f5341394829fce29
Showing with 53 additions and 12 deletions.
  1. +14 −3 src/ex_docmd.c
  2. +11 −7 src/menu.c
  3. +24 −2 src/popupmnu.c
  4. +1 −0 src/proto/menu.pro
  5. +1 −0 src/proto/popupmnu.pro
  6. +2 −0 src/version.c
@@ -204,7 +204,8 @@ static void ex_tearoff(exarg_T *eap);
#else
# define ex_tearoff ex_ni
#endif
#if (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK)) && defined(FEAT_MENU)
#if (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \
|| defined(FEAT_TERM_POPUP_MENU)) && defined(FEAT_MENU)
static void ex_popup(exarg_T *eap);
#else
# define ex_popup ex_ni
@@ -8741,11 +8742,21 @@ ex_tearoff(exarg_T *eap)
}
#endif
#if (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK)) && defined(FEAT_MENU)
#if (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \
|| defined(FEAT_TERM_POPUP_MENU)) && defined(FEAT_MENU)
static void
ex_popup(exarg_T *eap)
{
gui_make_popup(eap->arg, eap->forceit);
# if defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK)
if (gui.in_use)
gui_make_popup(eap->arg, eap->forceit);
# ifdef FEAT_TERM_POPUP_MENU
else
# endif
# endif
# ifdef FEAT_TERM_POPUP_MENU
pum_make_popup(eap->arg, eap->forceit);
# endif
}
#endif
@@ -1891,6 +1891,16 @@ get_menu_mode(void)
return MENU_INDEX_INVALID;
}
int
get_menu_mode_flag(void)
{
int mode = get_menu_mode();
if (mode == MENU_INDEX_INVALID)
return 0;
return 1 << mode;
}
/*
* Display the Special "PopUp" menu as a pop-up at the current mouse
* position. The "PopUpn" menu is for Normal mode, "PopUpi" for Insert mode,
@@ -2044,13 +2054,7 @@ gui_update_menus(int modes)
if (modes != 0x0)
mode = modes;
else
{
mode = get_menu_mode();
if (mode == MENU_INDEX_INVALID)
mode = 0;
else
mode = (1 << mode);
}
mode = get_menu_mode_flag();
if (force_menu_update || mode != prev_mode)
{
@@ -1132,12 +1132,16 @@ pum_show_popupmenu(vimmenu_T *menu)
#ifdef FEAT_BEVAL_TERM
int save_bevalterm = p_bevalterm;
#endif
int mode;
pum_undisplay();
pum_size = 0;
mode = get_menu_mode_flag();
for (mp = menu->children; mp != NULL; mp = mp->next)
++pum_size;
if (menu_is_separator(mp->dname)
|| (mp->modes & mp->enabled & mode))
++pum_size;
array = (pumitem_T *)alloc_clear((unsigned)sizeof(pumitem_T) * pum_size);
if (array == NULL)
@@ -1146,7 +1150,7 @@ pum_show_popupmenu(vimmenu_T *menu)
for (mp = menu->children; mp != NULL; mp = mp->next)
if (menu_is_separator(mp->dname))
array[idx++].pum_text = (char_u *)"";
else
else if (mp->modes & mp->enabled & mode)
array[idx++].pum_text = mp->dname;
pum_array = array;
@@ -1231,6 +1235,24 @@ pum_show_popupmenu(vimmenu_T *menu)
p_bevalterm = save_bevalterm;
mch_setmouse(TRUE);
# endif
}
void
pum_make_popup(char_u *path_name, int use_mouse_pos)
{
vimmenu_T *menu;
if (!use_mouse_pos)
{
/* Hack: set mouse position at the cursor so that the menu pops up
* around there. */
mouse_row = curwin->w_winrow + curwin->w_wrow;
mouse_col = curwin->w_wincol + curwin->w_wcol;
}
menu = gui_find_menu(path_name);
if (menu != NULL)
pum_show_popupmenu(menu);
}
# endif
@@ -12,6 +12,7 @@ int menu_is_popup(char_u *name);
int menu_is_child_of_popup(vimmenu_T *menu);
int menu_is_toolbar(char_u *name);
int menu_is_separator(char_u *name);
int get_menu_mode_flag(void);
void show_popupmenu(void);
int check_menu_pointer(vimmenu_T *root, vimmenu_T *menu_to_check);
void gui_create_initial_menus(vimmenu_T *menu);
@@ -10,4 +10,5 @@ void ui_remove_balloon(void);
void ui_post_balloon(char_u *mesg, list_T *list);
void ui_may_remove_balloon(void);
void pum_show_popupmenu(vimmenu_T *menu);
void pum_make_popup(char_u *path_name, int mouse_pos);
/* vim: set ft=c : */
@@ -766,6 +766,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1570,
/**/
1569,
/**/

0 comments on commit 29a2c08

Please sign in to comment.