PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-11 13:50:48 -05:00
Code Releases Activity

[DSL] Move theme reset into the grammer parser and out of lexer.

Browse source
This commit is contained in:
Dave Davenport 2021-06-09 02:03:29 +02:00 committed by Dave Davenport
parent 2acd2d4eb9
commit cc69972b2b
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lexer/theme-lexer.l
View file

@ -339,9 +339,10 @@ if ( queue == NULL ){
BEGIN(INCLUDE); BEGIN(INCLUDE);
} }
<INITIAL>{THEME} { <INITIAL>{THEME} {
rofi_theme_reset(); //rofi_theme_reset();
g_queue_push_head ( queue, GINT_TO_POINTER (YY_START) ); g_queue_push_head ( queue, GINT_TO_POINTER (YY_START) );
BEGIN(INCLUDE); BEGIN(INCLUDE);
return T_RESET_THEME;
} }
/** Skip all whitespace */ /** Skip all whitespace */
<INCLUDE>{WHITESPACE} {} <INCLUDE>{WHITESPACE} {}

7
lexer/theme-parser.y
View file

@ -237,6 +237,7 @@ static ThemeColor hwb_to_rgb ( double h, double w, double b)
%token T_WHITESPACE "White space" %token T_WHITESPACE "White space"
%token T_PDEFAULTS "Default settings section ( '* { ... }')" %token T_PDEFAULTS "Default settings section ( '* { ... }')"
%token T_CONFIGURATION "Configuration block" %token T_CONFIGURATION "Configuration block"
%token T_RESET_THEME "Reset Theme"
%token T_COLOR_TRANSPARENT "Transparent" %token T_COLOR_TRANSPARENT "Transparent"
@ -322,6 +323,12 @@ t_entry_list:
%empty { %empty {
$$ = g_slice_new0 ( ThemeWidget ); $$ = g_slice_new0 ( ThemeWidget );
} }
| t_entry_list T_RESET_THEME {
rofi_theme_reset();
rofi_theme_free($1);
$$ = g_slice_new0 ( ThemeWidget );
}
| t_entry_list t_name_prefix_optional t_entry_name_path_selectors T_BOPEN t_property_list_optional T_BCLOSE | t_entry_list t_name_prefix_optional t_entry_name_path_selectors T_BOPEN t_property_list_optional T_BCLOSE
{ {
for ( GList *liter = g_list_first ( $3); liter; liter = g_list_next ( liter ) ) { for ( GList *liter = g_list_first ( $3); liter; liter = g_list_next ( liter ) ) {