Mercurial > vim
changeset 1434:40aa7ae37901 v7.1.149
updated for version 7.1-149
| author | vimboss |
|---|---|
| date | Tue, 06 Nov 2007 21:27:31 +0000 |
| parents | 9b7d8fd5dc68 |
| children | 2cdccc96d730 |
| files | src/edit.c src/gui.c src/version.c |
| diffstat | 3 files changed, 50 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/edit.c +++ b/src/edit.c @@ -3385,8 +3385,8 @@ ins_compl_prep(c) if (c != Ctrl_R && vim_is_ctrl_x_key(c)) edit_submode_extra = NULL; - /* Ignore end of Select mode mapping */ - if (c == K_SELECT) + /* Ignore end of Select mode mapping and mouse scroll buttons. */ + if (c == K_SELECT || c == K_MOUSEDOWN || c == K_MOUSEUP) return retval; /* Set "compl_get_longest" when finding the first matches. */ @@ -8652,15 +8652,16 @@ ins_mousescroll(up) int up; { pos_T tpos; -# if defined(FEAT_GUI) && defined(FEAT_WINDOWS) - win_T *old_curwin; +# if defined(FEAT_WINDOWS) + win_T *old_curwin = curwin; +# endif +# ifdef FEAT_INS_EXPAND + int did_scroll = FALSE; # endif tpos = curwin->w_cursor; # if defined(FEAT_GUI) && defined(FEAT_WINDOWS) - old_curwin = curwin; - /* Currently the mouse coordinates are only known in the GUI. */ if (gui.in_use && mouse_row >= 0 && mouse_col >= 0) { @@ -8677,10 +8678,23 @@ ins_mousescroll(up) # endif undisplay_dollar(); - if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL)) - scroll_redraw(up, (long)(curwin->w_botline - curwin->w_topline)); - else - scroll_redraw(up, 3L); +# ifdef FEAT_INS_EXPAND + /* Don't scroll the window in which completion is being done. */ + if (!pum_visible() +# if defined(FEAT_WINDOWS) + || curwin != old_curwin +# endif + ) +# endif + { + if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL)) + scroll_redraw(up, (long)(curwin->w_botline - curwin->w_topline)); + else + scroll_redraw(up, 3L); +# ifdef FEAT_INS_EXPAND + did_scroll = TRUE; +# endif + } # if defined(FEAT_GUI) && defined(FEAT_WINDOWS) curwin->w_redr_status = TRUE; @@ -8689,6 +8703,17 @@ ins_mousescroll(up) curbuf = curwin->w_buffer; # endif +# ifdef FEAT_INS_EXPAND + /* The popup menu may overlay the window, need to redraw it. + * TODO: Would be more efficient to only redraw the windows that are + * overlapped by the popup menu. */ + if (pum_visible() && did_scroll) + { + redraw_all_later(NOT_VALID); + ins_compl_show_pum(); + } +# endif + if (!equalpos(curwin->w_cursor, tpos)) { start_arrow(&tpos);
--- a/src/gui.c +++ b/src/gui.c @@ -4214,7 +4214,19 @@ gui_do_scroll() #endif ) { - redraw_win_later(wp, VALID); + int type = VALID; + +#ifdef FEAT_INS_EXPAND + if (pum_visible()) + { + type = NOT_VALID; + wp->w_lines_valid = 0; + } +#endif + /* Don't set must_redraw here, it may cause the popup menu to + * disappear when losing focus after a scrollbar drag. */ + if (wp->w_redr_type < type) + wp->w_redr_type = type; updateWindow(wp); /* update window, status line, and cmdline */ }