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

Allow undefined actions in keys configuration file

Browse Source 
In the keys file there are three possibilities for each action:

1. One or several keys are assigned to it
2. It is marked as UNDEFINED (new)
3. It is missing from the file

On load of the keys file, calcurse respectively

1. Assigns the key(s)
2. Assigns "UNDEFINED" (new)
3. Assigns a default key if possible

If default keys were assigned, the user is informed of the number of
actions affected, and the keys file is updated.

After load each action must either have keys assigned or be undefined.
If not, calcurse exits with a failure. If there are syntax/semantic
errors in the file, calcurse rejects the file and exits.

When an interactive user leaves the keys configuration menu, a warning
is issued if any action is UNDEFINED. The keys file is always updated.

Addresses GitHub issue #298.

Additionally: Description of concepts and data structures used for
keyboard keys and virtual keys (actions) as well as name changes and
comments to improve readability.

Signed-off-by: Lars Henriksen <LarsHenriksen@get2net.dk>
Signed-off-by: Lukas Fleischer <lfleischer@calcurse.org>
This commit is contained in:
Lars Henriksen
2020-12-27 23:30:48 +01:00
committed by Lukas Fleischer
parent 6e6663c5dd
commit 338c640a19
5 changed files with 331 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/custom.c
View File

@@ -975,10 +975,11 @@ print_keys_bindings(WINDOW * win, int selected_row, int selected_elm,
const int XPOS = 1;
const int EQUALPOS = 23;
const int KEYPOS = 25;
int noelm, action, y;
int noelm, action, y, pos;
const char *key = NULL;
noelm = y = 0;
for (action = 0; action < NBKEYS; action++) {
for (action = 0; action < NBVKEYS; action++) {
char *actionstr;
int nbkeys;
@@ -990,18 +991,15 @@ print_keys_bindings(WINDOW * win, int selected_row, int selected_elm,
mem_free(actionstr);
mvwaddstr(win, y, EQUALPOS, "=");
if (nbkeys == 0)
mvwaddstr(win, y, KEYPOS, _("undefined"));
mvwaddstr(win, y, KEYPOS, _("UNDEFINED"));
if (action == selected_row)
custom_remove_attr(win, ATTR_HIGHEST);
if (nbkeys > 0) {
if (action == selected_row) {
const char *key;
int pos;
/* Elements may have been added or deleted. */
wclrtoeol(win);
pos = KEYPOS;
while ((key =
keys_action_nkey(action,
noelm)) != NULL) {
while ((key = keys_action_nkey(action, noelm))) {
if (noelm == selected_elm)
print_key_incolor(win, key,
y, pos);
@@ -1012,8 +1010,9 @@ print_keys_bindings(WINDOW * win, int selected_row, int selected_elm,
pos += utf8_strwidth((char *)key) + 1;
}
} else {
mvwaddstr(win, y, KEYPOS,
keys_action_allkeys(action));
key = keys_action_allkeys(action);
mvwaddstr(win, y, KEYPOS, key);
mem_free((char *)key);
}
}
y += yoff;
@@ -1045,9 +1044,11 @@ void custom_keys_config(void)
const int LABELLINES = 3;
clear();
nbdisplayed = ((notify_bar() ? row - 3 : row - 2) - LABELLINES) / LINESPERKEY;
wins_scrollwin_init(&kwin, 0, 0, notify_bar() ? row - 3 : row - 2, col, _("keys configuration"));
wins_scrollwin_set_pad(&kwin, NBKEYS * LINESPERKEY);
nbdisplayed = ((notify_bar() ? row - 3 : row - 2) -
LABELLINES) / LINESPERKEY;
wins_scrollwin_init(&kwin, 0, 0, notify_bar() ? row - 3 : row - 2, col,
_("keys configuration"));
wins_scrollwin_set_pad(&kwin, NBVKEYS * LINESPERKEY);
wins_scrollwin_draw_deco(&kwin, 0);
custom_keys_config_bar();
selrow = selelm = 0;
@@ -1072,7 +1073,7 @@ void custom_keys_config(void)
}
break;
case KEY_MOVE_DOWN:
if (selrow < NBKEYS - 1) {
if (selrow < NBVKEYS - 1) {
selrow++;
selelm = 0;
if (selrow == lastrow) {
@@ -1103,7 +1104,7 @@ void custom_keys_config(void)
keys_get_label(selrow), 0);
for (;;) {
ch = keys_wgetch(grabwin);
enum key action = keys_get_action(ch);
enum vkey action = keys_get_action(ch);
/* Is the key already used by this action? */
if (action == selrow)
break;
@@ -1142,10 +1143,8 @@ void custom_keys_config(void)
selelm--;
break;
case KEY_GENERIC_QUIT:
if (keys_check_missing_bindings() != 0) {
WARN_MSG(_("Some actions do not have any associated "
"key bindings!"));
}
if (keys_check_undefined())
WARN_MSG(_("Some actions are left undefined!"));
wins_scrollwin_delete(&kwin);
return;
}