fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix multiple popup windows

Browse Source 
The window was not deleted if an "already in use"-key was detected,
and a new one was created as the loop was reentered.

Create/delete of the popup are moved outside the loop.
A redrawwin() call is needed to have the window displayed again.

Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen
2017-10-27 08:17:57 +02:00
committed by Lukas Fleischer
parent e9bddf38e8
commit 012a0e6670
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/custom.c
View File

@@ -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;