aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0447: GUI scrollbar test fails with Athena and Motif

Browse Source 
Problem:    GUI scrollbar test fails with Athena and Motif.
Solution:   When not using on-the-fly scrolling call normal_cmd().
This commit is contained in:
Bram Moolenaar 2018-10-02 16:23:58 +02:00
parent 4f88875725
commit 586c70cdfe
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/evalfunc.c
View File

@ -3588,7 +3588,7 @@ f_feedkeys(typval_T *argvars, typval_T *rettv UNUSED)
if (!dangerous) if (!dangerous)
++ex_normal_busy; ++ex_normal_busy;
exec_normal(TRUE, TRUE); exec_normal(TRUE, FALSE, TRUE);
if (!dangerous) if (!dangerous)
--ex_normal_busy; --ex_normal_busy;
@ -13233,6 +13233,10 @@ f_test_scrollbar(typval_T *argvars, typval_T *rettv UNUSED)
return; return;
} }
gui_drag_scrollbar(sb, value, dragging); 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 #endif

11
src/ex_docmd.c
View File

@ -10471,21 +10471,24 @@ exec_normal_cmd(char_u *cmd, int remap, int silent)
{ {
/* Stuff the argument into the typeahead buffer. */ /* Stuff the argument into the typeahead buffer. */
ins_typebuf(cmd, remap, 0, TRUE, silent); 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. * Execute normal_cmd() until there is no typeahead left.
* When "use_vpeekc" is TRUE use vpeekc() to check for available chars.
*/ */
void 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; oparg_T oa;
clear_oparg(&oa); clear_oparg(&oa);
finish_op = FALSE; finish_op = FALSE;
while ((!stuff_empty() || ((was_typed || !typebuf_typed()) while ((!stuff_empty()
&& typebuf.tb_len > 0)) && !got_int) || ((was_typed || !typebuf_typed()) && typebuf.tb_len > 0)
|| (use_vpeekc && vpeekc() != NUL))
&& !got_int)
{ {
update_topline_cursor(); update_topline_cursor();
#ifdef FEAT_TERMINAL #ifdef FEAT_TERMINAL

2
src/proto/ex_docmd.pro
View File

@ -59,7 +59,7 @@ int save_current_state(save_state_T *sst);
void restore_current_state(save_state_T *sst); void restore_current_state(save_state_T *sst);
void ex_normal(exarg_T *eap); void ex_normal(exarg_T *eap);
void exec_normal_cmd(char_u *cmd, int remap, int silent); 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); 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 *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); char_u *expand_sfile(char_u *arg);

2
src/version.c
View File

@ -792,6 +792,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
447,
/**/ /**/
446, 446,
/**/ /**/