From 06165f867a6431fc4dad55e5a1158ebc46416704 Mon Sep 17 00:00:00 2001
From: Dave Davenport <qball@gmpclient.org>
Date: Sun, 15 Jul 2018 11:04:47 +0200
Subject: [PATCH] [Lexer] Only allow configuration blocks before theme.

---
 lexer/theme-parser.y | 19 +++++++++++++++----
 themes/arthur.rasi   | 15 ---------------
 themes/dmenu.rasi    |  3 ---
 3 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/lexer/theme-parser.y b/lexer/theme-parser.y
index f5e11156..a2c53071 100644
--- a/lexer/theme-parser.y
+++ b/lexer/theme-parser.y
@@ -250,10 +250,24 @@ static ThemeColor hwb_to_rgb ( double h, double w, double b)
 %type <list>           t_property_element_list_optional
 %type <ival>           t_property_orientation
 %type <ival>           t_name_prefix_optional
-%start t_entry_list
+%start t_main
 
 %%
 
+/**
+ * First have the configuration blocks, then the theme.
+ */
+t_main
+: %empty {}
+| t_configuration_list t_entry_list {
+    // Dummy at this point.
+}
+;
+
+t_configuration_list:
+ %empty {}
+| t_configuration_list T_CONFIGURATION T_BOPEN t_config_property_list_optional T_BCLOSE {};
+
 t_entry_list:
   %empty {
         // There is always a base widget.
@@ -300,9 +314,6 @@ t_name_prefix_optional t_entry_name_path_selectors T_BOPEN t_property_list_optio
         g_hash_table_destroy ( $3 );
     }
 }
-| T_CONFIGURATION T_BOPEN t_config_property_list_optional T_BCLOSE {
-    // Dummy at this point.
-}
 ;
 
 t_config_property_list_optional
diff --git a/themes/arthur.rasi b/themes/arthur.rasi
index db57659f..11b1b689 100644
--- a/themes/arthur.rasi
+++ b/themes/arthur.rasi
@@ -4,21 +4,6 @@
  * Copyright: Dave Davenport
  */
 
-configuration {
-
-    // The display name of this browser
-    display-ssh:                   "  ";
-    // The display name of this browser
-    display-run:                    "";
-    // The display name of this browser
-    display-drun:                   "";
-    // The display name of this browser
-    display-window:                 "";
-    display-combi:                  "";
-    show-icons: true;
-}
-
-
 /**
  * User: Qball
  * Copyright: Dave Davenport
diff --git a/themes/dmenu.rasi b/themes/dmenu.rasi
index 40f3bdac..0b23ea26 100644
--- a/themes/dmenu.rasi
+++ b/themes/dmenu.rasi
@@ -10,9 +10,6 @@
     font:            "Times New Roman 12";
 }
 
-configuration {
-}
-
 #window {
     anchor:     north;
     location:   north;