Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
spectrwm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2f9e07e
)
Fix 'bind[] = ...' not unbinding as expected.
author
Reginald Kennedy
<rk@rejii.com>
Sat, 16 Nov 2013 15:21:15 +0000
(23:21 +0800)
committer
Reginald Kennedy
<rk@rejii.com>
Sat, 16 Nov 2013 15:50:55 +0000
(23:50 +0800)
Fixes #23
spectrwm.c
patch
|
blob
|
history
diff --git
a/spectrwm.c
b/spectrwm.c
index
34a49be
..
251b746
100644
(file)
--- a/
spectrwm.c
+++ b/
spectrwm.c
@@
-6398,6
+6398,9
@@
setconfspawn(const char *selector, const char *value, int flags)
{
char *args;
{
char *args;
+ if (selector == NULL || strlen(selector) == 0)
+ return (1);
+
args = expand_tilde(value);
DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args);
args = expand_tilde(value);
DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args);
@@
-6646,8
+6649,9
@@
setconfbinding(const char *selector, const char *value, int flags)
/* suppress unused warning since var is needed */
(void)flags;
/* suppress unused warning since var is needed */
(void)flags;
- DNPRINTF(SWM_D_KEY, "setconfbinding: enter\n");
- if (selector == NULL) {
+ DNPRINTF(SWM_D_KEY, "setconfbinding: enter selector: [%s], "
+ "value: [%s]\n", selector, value);
+ if (selector == NULL || strlen(selector) == 0) {
DNPRINTF(SWM_D_KEY, "setconfbinding: unbind %s\n", value);
if (parsekeys(value, mod_key, &mod, &ks) == 0) {
kfid = KF_INVALID;
DNPRINTF(SWM_D_KEY, "setconfbinding: unbind %s\n", value);
if (parsekeys(value, mod_key, &mod, &ks) == 0) {
kfid = KF_INVALID;
@@
-7164,7
+7168,7
@@
setconfquirk(const char *selector, const char *value, int flags)
/* suppress unused warning since var is needed */
(void)flags;
/* suppress unused warning since var is needed */
(void)flags;
- if (selector == NULL)
+ if (selector == NULL || strlen(selector) == 0)
return (0);
if ((str = strdup(selector)) == NULL)
return (0);
if ((str = strdup(selector)) == NULL)
@@
-7277,9
+7281,6
@@
setconfvalue(const char *selector, const char *value, int flags)
int i, ws_id, num_screens;
char *b, *str;
int i, ws_id, num_screens;
char *b, *str;
- /* suppress unused warning since var is needed */
- (void)selector;
-
switch (flags) {
case SWM_S_BAR_ACTION:
free(bar_argv[0]);
switch (flags) {
case SWM_S_BAR_ACTION:
free(bar_argv[0]);
@@
-7519,7
+7520,9
@@
setconfmodkey(const char *selector, const char *value, int flags)
int
setconfcolor(const char *selector, const char *value, int flags)
{
int
setconfcolor(const char *selector, const char *value, int flags)
{
- setscreencolor(value, ((selector == NULL)?-1:atoi(selector)), flags);
+ setscreencolor(value,
+ (selector == NULL || strlen(selector) == 0) ? -1 : atoi(selector),
+ flags);
return (0);
}
return (0);
}