From 532f132194751bd2f530a13c243a30c76f66bfaa Mon Sep 17 00:00:00 2001 From: okan Date: Wed, 22 May 2013 16:32:15 +0000 Subject: 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. --- parse.y | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'parse.y') 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); } -- cgit 1.4.1