# HG changeset patch # User vimboss # Date 1120861151 0 # Node ID 797041cd1c66358908fecbbc38193960f54b7cd8 # Parent d5dbe17efce2c84cf9c8c81a66f35bb4effe03d5 updated for version 7.0105 diff --git a/src/gui_w16.c b/src/gui_w16.c --- a/src/gui_w16.c +++ b/src/gui_w16.c @@ -802,7 +802,7 @@ gui_mch_show_popupmenu(vimmenu_T *menu) } void -gui_make_popup(char_u *path_name) +gui_make_popup(char_u *path_name, int mouse_pos) { vimmenu_T *menu = gui_find_menu(path_name); @@ -814,10 +814,18 @@ gui_make_popup(char_u *path_name) temp_p = GetDCOrg(s_hdc); p.x = LOWORD(temp_p); p.y = HIWORD(temp_p); - if (curwin!=NULL) + if (mouse_pos) { - p.x+= TEXT_X(W_WINCOL(curwin) + curwin->w_wcol +1); - p.y+= TEXT_Y(W_WINROW(curwin) + curwin->w_wrow +1); + int mx, my; + + gui_mch_getmouse(&mx, &my); + p.x += mx; + p.y += my; + } + else if (curwin != NULL) + { + p.x += TEXT_X(W_WINCOL(curwin) + curwin->w_wcol + 1); + p.y += TEXT_Y(W_WINROW(curwin) + curwin->w_wrow + 1); } msg_scroll = FALSE; gui_mch_show_popupmenu_at(menu, (int)p.x, (int)p.y); diff --git a/src/proto/gui_kde.pro b/src/proto/gui_kde.pro --- a/src/proto/gui_kde.pro +++ b/src/proto/gui_kde.pro @@ -15,5 +15,5 @@ void gui_mch_show_popupmenu __ARGS((vimm void gui_mch_find_dialog __ARGS((exarg_T *eap)); void gui_mch_replace_dialog __ARGS((exarg_T *eap)); void ex_helpfind __ARGS((exarg_T *eap)); -void gui_make_popup __ARGS((char_u *path_name)); +void gui_make_popup __ARGS((char_u *path_name, int mouse_pos)); /* vim: set ft=cpp : */