Mercurial > vim
changeset 14871:f20df682c8af v8.1.0447
patch 8.1.0447: GUI scrollbar test fails with Athena and Motif
commit https://github.com/vim/vim/commit/586c70cdfede55a166e3564f1cb68a299d81987d
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Oct 2 16:23:58 2018 +0200
patch 8.1.0447: GUI scrollbar test fails with Athena and Motif
Problem: GUI scrollbar test fails with Athena and Motif.
Solution: When not using on-the-fly scrolling call normal_cmd().
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 02 Oct 2018 16:30:05 +0200 |
| parents | b81f630a720a |
| children | ea0de198c5c4 |
| files | src/evalfunc.c src/ex_docmd.c src/proto/ex_docmd.pro src/version.c |
| diffstat | 4 files changed, 15 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -3588,7 +3588,7 @@ f_feedkeys(typval_T *argvars, typval_T * if (!dangerous) ++ex_normal_busy; - exec_normal(TRUE, TRUE); + exec_normal(TRUE, FALSE, TRUE); if (!dangerous) --ex_normal_busy; @@ -13233,6 +13233,10 @@ f_test_scrollbar(typval_T *argvars, typv return; } gui_drag_scrollbar(sb, value, dragging); +# ifndef USE_ON_FLY_SCROLL + // need to loop through normal_cmd() to handle the scroll events + exec_normal(FALSE, TRUE, FALSE); +# endif } #endif
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -10471,21 +10471,24 @@ exec_normal_cmd(char_u *cmd, int remap, { /* Stuff the argument into the typeahead buffer. */ ins_typebuf(cmd, remap, 0, TRUE, silent); - exec_normal(FALSE, FALSE); + exec_normal(FALSE, FALSE, FALSE); } /* * Execute normal_cmd() until there is no typeahead left. + * When "use_vpeekc" is TRUE use vpeekc() to check for available chars. */ void -exec_normal(int was_typed, int may_use_terminal_loop UNUSED) +exec_normal(int was_typed, int use_vpeekc, int may_use_terminal_loop UNUSED) { oparg_T oa; clear_oparg(&oa); finish_op = FALSE; - while ((!stuff_empty() || ((was_typed || !typebuf_typed()) - && typebuf.tb_len > 0)) && !got_int) + while ((!stuff_empty() + || ((was_typed || !typebuf_typed()) && typebuf.tb_len > 0) + || (use_vpeekc && vpeekc() != NUL)) + && !got_int) { update_topline_cursor(); #ifdef FEAT_TERMINAL
--- a/src/proto/ex_docmd.pro +++ b/src/proto/ex_docmd.pro @@ -59,7 +59,7 @@ int save_current_state(save_state_T *sst void restore_current_state(save_state_T *sst); void ex_normal(exarg_T *eap); void exec_normal_cmd(char_u *cmd, int remap, int silent); -void exec_normal(int was_typed, int may_use_terminal_loop); +void exec_normal(int was_typed, int use_vpeekc, int may_use_terminal_loop); int find_cmdline_var(char_u *src, int *usedlen); char_u *eval_vars(char_u *src, char_u *srcstart, int *usedlen, linenr_T *lnump, char_u **errormsg, int *escaped); char_u *expand_sfile(char_u *arg);