averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-07 15:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #603 from dougfales/fix-popup-menu-items

Browse Source 
In ex_macmenu, add the mac action to each of the PopUp mode menus
This commit is contained in:
Kazuki Sakamoto
2017-11-29 22:32:01 -08:00
committed by GitHub
parent 594349b5e7 5ebd0d1c70
commit d558443e8d
1 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/menu.c
+41 -9
View File
@@ -2782,6 +2782,27 @@ menu_for_path(char_u *menu_path)
return menu;
}
void
set_mac_menu_attrs(
vimmenu_T *menu,
char_u *action,
int set_alt,
int mac_alternate,
int set_key,
int mac_key,
int mac_mods)
{
if (action)
menu->mac_action = action;
if (set_key)
{
menu->mac_key = mac_key;
menu->mac_mods = mac_mods;
}
if (set_alt)
menu->mac_alternate = mac_alternate;
}
/*
* Handle the ":macmenu" command.
*/
@@ -2790,11 +2811,14 @@ ex_macmenu(eap)
exarg_T *eap;
{
vimmenu_T *menu = NULL;
vimmenu_T *popup_menu_for_mode = NULL;
char_u *arg;
char_u *menu_path;
char_u *p;
char_u *keys;
int i;
int len;
int modes;
char_u *linep;
char_u *key_start;
char_u *key = NULL;
@@ -2804,9 +2828,10 @@ ex_macmenu(eap)
int mac_key = 0;
int mac_mods = 0;
int mac_alternate = 0;
int noremap;
int unmenu;
char_u *last_dash;
int bit;
int set_action = FALSE;
int set_key = FALSE;
int set_alt = FALSE;
@@ -2904,7 +2929,6 @@ ex_macmenu(eap)
break;
}
set_action = TRUE;
}
else if (STRCMP(key, "ALT") == 0)
{
@@ -3020,15 +3044,23 @@ ex_macmenu(eap)
*/
if (!error)
{
if (set_action)
menu->mac_action = action;
if (set_key)
set_mac_menu_attrs(menu, action, set_alt, mac_alternate, set_key, mac_key, mac_mods);
modes = get_menu_cmd_modes(eap->cmd, eap->forceit, &noremap, &unmenu);
if (menu_is_popup(menu_path))
{
menu->mac_key = mac_key;
menu->mac_mods = mac_mods;
for (i = 0; i < MENU_INDEX_TIP; ++i)
if (modes & (1 << i))
{
p = popup_mode_name(menu_path, i);
if (p != NULL)
{
popup_menu_for_mode = menu_for_path(p);
set_mac_menu_attrs(popup_menu_for_mode, action, set_alt, mac_alternate, set_key, mac_key, mac_mods);
vim_free(p);
}
}
}
if (set_alt)
menu->mac_alternate = mac_alternate;
}
else
{