Add @theme import command, that resets the current theme.

2 files changed, 8 insertions, 2 deletions

diff --git a/lexer/theme-lexer.l b/lexer/theme-lexer.l
index 391ed3b8..a576e266 100644
--- a/lexer/theme-lexer.l
+++ b/lexer/theme-lexer.l
@@ -229,6 +229,7 @@ C_COMMENT_OPEN "/*"
 
 
 INCLUDE    "@import"
+THEME "@theme"
 
 CONFIGURATION (?i:configuration)
 
@@ -302,6 +303,11 @@ if ( queue == NULL ){
     g_queue_push_head ( queue, GINT_TO_POINTER (YY_START) );
     BEGIN(INCLUDE);
 }
+<INITIAL>{THEME} {
+    rofi_theme_reset();
+    g_queue_push_head ( queue, GINT_TO_POINTER (YY_START) );
+    BEGIN(INCLUDE);
+}
     /** Skip all whitespace */
 <INCLUDE>{WHITESPACE} {}
 
diff --git a/lexer/theme-parser.y b/lexer/theme-parser.y
index de22b98b..b97bae22 100644
--- a/lexer/theme-parser.y
+++ b/lexer/theme-parser.y
@@ -256,8 +256,8 @@ t_entry_list:
   %empty {
         // There is always a base widget.
         if (rofi_theme == NULL ){
-            $$ =  rofi_theme = g_slice_new0 ( ThemeWidget  );
-            rofi_theme->name = g_strdup ( "Root" );
+            rofi_theme_reset();
+            $$ =  rofi_theme;
         }
   }
 |  t_entry_list