nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Validate that a binding mode is not defined more than once. (#2633) 

While defining the same mode usually wouldn't hurt and, in fact, the old behavior
allows to split the definition of a binding mode into several blocks, this
can lead to user errors where they accidentally define a mode twice and don't understand
why the mode behaves a certain way (this has been observed in real life :-)).

There's no good usecase for splitting a single binding mode into multiple blocks, thus
the new behavior is better.

fixes #2615
This commit is contained in:
Ingo Bürk 2017-01-13 18:33:29 +01:00 committed by Michael Stapelberg
parent 14eea7fce5
commit 33d6a4e829
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bindings.c
View File

@ -32,9 +32,10 @@ static struct Mode *mode_from_name(const char *name, bool pango_markup) {
/* Try to find the mode in the list of modes and return it */ /* Try to find the mode in the list of modes and return it */
SLIST_FOREACH(mode, &modes, modes) { SLIST_FOREACH(mode, &modes, modes) {
if (strcmp(mode->name, name) == 0) if (strcmp(mode->name, name) == 0) {
return mode; return mode;
} }
}
/* If the mode was not found, create a new one */ /* If the mode was not found, create a new one */
mode = scalloc(1, sizeof(struct Mode)); mode = scalloc(1, sizeof(struct Mode));

9
src/config_directives.c
View File

@ -126,6 +126,15 @@ CFGFUN(enter_mode, const char *pango_markup, const char *modename) {
ELOG("You cannot use the name %s for your mode\n", DEFAULT_BINDING_MODE); ELOG("You cannot use the name %s for your mode\n", DEFAULT_BINDING_MODE);
exit(1); exit(1);
} }
struct Mode *mode;
SLIST_FOREACH(mode, &modes, modes) {
if (strcmp(mode->name, modename) == 0) {
ELOG("The binding mode with name \"%s\" is defined at least twice.\n", modename);
exit(1);
}
}
DLOG("\t now in mode %s\n", modename); DLOG("\t now in mode %s\n", modename);
FREE(current_mode); FREE(current_mode);
current_mode = sstrdup(modename); current_mode = sstrdup(modename);