From 1ea4db26e9ce71da6e81886df5de1c593f85d0f7 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 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 4a41710..c21461c 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.43 2013/05/22 13:02:14 okan Exp $ */
+/*	$OpenBSD: parse.y,v 1.44 2013/05/22 16:32:15 okan Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -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 v1.2.3-2-gb3c3