diff options
| author | Frederic Culot <calcurse@culot.org> | 2009-01-24 14:44:09 +0000 |
|---|---|---|
| committer | Frederic Culot <calcurse@culot.org> | 2009-01-24 14:44:09 +0000 |
| commit | c8a1b720277bb31df1cbd7cae6a4615255d9d04f (patch) | |
| tree | f75f15def6c2fd0ddd5bf04768a0230ccb699a59 /src/custom.c | |
| parent | 9abf70b4a66171904cf8040c0808ee788ccd47f9 (diff) | |
| download | calcurse-c8a1b720277bb31df1cbd7cae6a4615255d9d04f.tar.gz calcurse-c8a1b720277bb31df1cbd7cae6a4615255d9d04f.zip | |
make it possible to use KEY_HOME and KEY_END to define new key bindings, and prevent user from assigning a non-recgnized key
Diffstat (limited to 'src/custom.c')
| -rwxr-xr-x | src/custom.c | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/src/custom.c b/src/custom.c index 0478247..b265881 100755 --- a/src/custom.c +++ b/src/custom.c @@ -1,4 +1,4 @@ -/* $calcurse: custom.c,v 1.36 2009/01/05 20:12:08 culot Exp $ */ +/* $calcurse: custom.c,v 1.37 2009/01/24 14:44:25 culot Exp $ */ /* * Calcurse - text-based organizer @@ -1173,7 +1173,7 @@ custom_keys_config (void) { scrollwin_t kwin; int selrow, selelm, firstrow, lastrow, nbrowelm, nbdisplayed; - int keyval, used; + int keyval, used, not_recognized; char *keystr; WINDOW *grabwin; const int LINESPERKEY = 2; @@ -1242,20 +1242,36 @@ custom_keys_config (void) #define WINCOL 50 do { + used = 0; grabwin = popup (WINROW, WINCOL, (row - WINROW) / 2, (col - WINCOL) / 2, _("Press the key you want to assign to:"), keys_get_label (selrow), 0); keyval = wgetch (grabwin); + + /* First check if this key would be recognized by calcurse. */ + if (keys_str2int (keys_int2str (keyval)) == -1) + { + not_recognized = 1; + WARN_MSG (_("This key is not yet recognized by calcurse, " + "please choose another one.")); + werase (kwin.pad.p); + nbrowelm = print_keys_bindings (kwin.pad.p, selrow, selelm, + LINESPERKEY); + wins_scrollwin_display (&kwin); + continue; + } + else + not_recognized = 0; + used = keys_assign_binding (keyval, selrow); if (used) { keys_e action; action = keys_get_action (keyval); - ERROR_MSG ( - _("This key is already in use for %s, " - "please choose another one."), + WARN_MSG (_("This key is already in use for %s, " + "please choose another one."), keys_get_label (action)); werase (kwin.pad.p); nbrowelm = print_keys_bindings (kwin.pad.p, selrow, selelm, @@ -1264,7 +1280,7 @@ custom_keys_config (void) } delwin (grabwin); } - while (used); + while (used || not_recognized); nbrowelm++; if (selelm < nbrowelm - 1) selelm++; @@ -1282,8 +1298,8 @@ custom_keys_config (void) case KEY_GENERIC_QUIT: if (keys_check_missing_bindings () != 0) { - ERROR_MSG (_("Some actions do not have any associated " - "key bindings!")); + WARN_MSG (_("Some actions do not have any associated " + "key bindings!")); } wins_scrollwin_delete (&kwin); return; |