diff options
| -rw-r--r-- | src/calcurse.h | 1 | ||||
| -rw-r--r-- | src/custom.c | 18 | ||||
| -rw-r--r-- | src/wins.c | 11 |
3 files changed, 19 insertions, 11 deletions
diff --git a/src/calcurse.h b/src/calcurse.h index 2124bb2..85e36b2 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -1216,6 +1216,7 @@ void wins_calendar_cleanup(void *); int wins_refresh(void); int wins_wrefresh(WINDOW *); int wins_doupdate(void); +int wins_redrawwin(WINDOW *); int wins_layout(void); void wins_set_layout(int); unsigned wins_sbar_width(void); diff --git a/src/custom.c b/src/custom.c index 3da9da4..52bdd5b 100644 --- a/src/custom.c +++ b/src/custom.c @@ -988,21 +988,16 @@ void custom_keys_config(void) case KEY_ADD_ITEM: #define WINROW 10 #define WINCOL 50 + grabwin = popup(WINROW, WINCOL, + (row - WINROW) / 2, (col - WINCOL) / 2, + _("Press the key you want to assign to:"), + keys_get_label(selrow), 0); for (;;) { - grabwin = - popup(WINROW, WINCOL, - (row - WINROW) / 2, - (col - WINCOL) / 2, - _("Press the key you want to assign to:"), - keys_get_label(selrow), 0); - ch = keys_wgetch(grabwin); enum key action = keys_get_action(ch); /* Is the key already used by this action? */ - if (action == selrow) { - delwin(grabwin); + if (action == selrow) break; - } /* Is the key used by another action? */ if (keys_assign_binding(ch, selrow)) { char *keystr = keys_int2str(ch); @@ -1018,13 +1013,14 @@ void custom_keys_config(void) selelm, LINESPERKEY); wins_scrollwin_display(&kwin); + wins_redrawwin(grabwin); continue; } nbrowelm++; selelm = nbrowelm - 1; - delwin(grabwin); break; } + delwin(grabwin); #undef WINROW #undef WINCOL break; @@ -163,6 +163,17 @@ int wins_doupdate(void) return rc; } +int wins_redrawwin(WINDOW *win) +{ + int rc; + + SCREEN_ACQUIRE; + rc = redrawwin(win); + SCREEN_RELEASE; + + return rc; +} + /* Get the current layout. */ int wins_layout(void) { |