mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-02 16:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove undefined function gui_show_popupmenu + call.

Browse Source
This commit is contained in:
Thomas Wienecke
2014-04-10 19:12:28 +02:00
parent 225fbc2dd8
commit f2501fa655
2 changed files with 0 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/menu.h
View File

@@ -58,7 +58,6 @@ int menu_is_menubar(char_u *name);
int menu_is_popup(char_u *name); int menu_is_popup(char_u *name);
int menu_is_toolbar(char_u *name); int menu_is_toolbar(char_u *name);
int menu_is_separator(char_u *name); int menu_is_separator(char_u *name);
void gui_show_popupmenu(void);
void ex_emenu(exarg_T *eap); void ex_emenu(exarg_T *eap);
vimmenu_T *gui_find_menu(char_u *path_name); vimmenu_T *gui_find_menu(char_u *path_name);
void ex_menutranslate(exarg_T *eap); void ex_menutranslate(exarg_T *eap);

55
src/normal.c
View File

@@ -2208,62 +2208,7 @@ do_mouse (
if (!is_click) if (!is_click)
return FALSE; return FALSE;
#endif #endif
#if defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_GTK) \
|| defined(FEAT_GUI_ATHENA) || defined(FEAT_GUI_MSWIN) \
|| defined(FEAT_GUI_MAC) || defined(FEAT_GUI_PHOTON)
if (gui.in_use) {
jump_flags = 0;
if (STRCMP(p_mousem, "popup_setpos") == 0) {
/* First set the cursor position before showing the popup
* menu. */
if (VIsual_active) {
pos_T m_pos;
/*
* set MOUSE_MAY_STOP_VIS if we are outside the
* selection or the current window (might have false
* negative here)
*/
if (mouse_row < W_WINROW(curwin)
|| mouse_row
> (W_WINROW(curwin) + curwin->w_height))
jump_flags = MOUSE_MAY_STOP_VIS;
else if (get_fpos_of_mouse(&m_pos) != IN_BUFFER)
jump_flags = MOUSE_MAY_STOP_VIS;
else {
if ((lt(curwin->w_cursor, VIsual)
&& (lt(m_pos, curwin->w_cursor)
|| lt(VIsual, m_pos)))
|| (lt(VIsual, curwin->w_cursor)
&& (lt(m_pos, VIsual)
|| lt(curwin->w_cursor, m_pos)))) {
jump_flags = MOUSE_MAY_STOP_VIS;
} else if (VIsual_mode == Ctrl_V) {
getvcols(curwin, &curwin->w_cursor, &VIsual,
&leftcol, &rightcol);
getvcol(curwin, &m_pos, NULL, &m_pos.col, NULL);
if (m_pos.col < leftcol || m_pos.col > rightcol)
jump_flags = MOUSE_MAY_STOP_VIS;
}
}
} else
jump_flags = MOUSE_MAY_STOP_VIS;
}
if (jump_flags) {
jump_flags = jump_to_mouse(jump_flags, NULL, which_button);
update_curbuf(
VIsual_active ? INVERTED :
VALID);
setcursor();
out_flush(); /* Update before showing popup menu */
}
gui_show_popupmenu();
return (jump_flags & CURSOR_MOVED) != 0;
} else
return FALSE;
#else
return FALSE; return FALSE;
#endif
} }
if (which_button == MOUSE_LEFT if (which_button == MOUSE_LEFT
&& (mod_mask & (MOD_MASK_SHIFT|MOD_MASK_ALT))) { && (mod_mask & (MOD_MASK_SHIFT|MOD_MASK_ALT))) {