diff options
author | okan <okan> | 2013-05-22 16:32:15 +0000 |
---|---|---|
committer | okan <okan> | 2013-05-22 16:32:15 +0000 |
commit | 532f132194751bd2f530a13c243a30c76f66bfaa (patch) | |
tree | 5391a5e9a32ad16e575203ffde8479c2a2d58c14 /parse.y | |
parent | 866f5af9c746d84e68ab1a376c18f96581fb0765 (diff) | |
download | cwm-532f132194751bd2f530a13c243a30c76f66bfaa.tar.gz cwm-532f132194751bd2f530a13c243a30c76f66bfaa.tar.xz cwm-532f132194751bd2f530a13c243a30c76f66bfaa.zip |
move validation of pointer Button into conf_mousebind so we check
validity during the parse phase and not bother adding it to the queue, instead of each time a client needs to grab (when it's too late); furthermore, make this a config error, stop parsing and load the default config.
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/parse.y b/parse.y index 111be2e..0e67ba1 100644 --- a/parse.y +++ b/parse.y @@ -171,7 +171,12 @@ main : FONTNAME STRING { conf->gap.right = $5; } | MOUSEBIND STRING string { - conf_mousebind(conf, $2, $3); + if (!conf_mousebind(conf, $2, $3)) { + yyerror("invalid mousebind: %s %s", $2, $3); + free($2); + free($3); + YYERROR; + } free($2); free($3); } |