PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2025-01-27 15:25:24 -05:00
Code Releases Activity

[Lexer] Allow for optional imports.

Browse source 
Adds the `?import` syntax.

fixes: #2078
This commit is contained in:
Qball 2025-01-20 14:34:53 +01:00
parent 56fbb62bd3
commit 5b95abce92
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/rofi-theme.5.markdown
View file

@ -1658,6 +1658,14 @@ If a filename is provided, it will try to resolve it in the following order:
A name is resolved (if it has no valid extension) as a filename by appending the `.rasi` and the `.rasinc` extension.
It will first look for files with `.rasi`, then for files with `.rasinc`.
If you want to do an optional import, e.g. no error when the file does not exists, you can do:
```css
?import "myfile"
```
This still throws an error on syntax error, but won't abort parsing if file does not exists.
## Examples
Several examples are installed together with **rofi**. These can be found in

24
lexer/theme-lexer.l
View file

@ -51,6 +51,8 @@
int last_state = 0;
extern int rofi_is_in_dmenu_mode;
gboolean import_optional = FALSE;
const char *rasi_theme_file_extensions[] = {".rasi", ".rasinc", NULL};
/**
* Type of Object to parse.
@ -289,6 +291,7 @@ C_COMMENT_OPEN "/*"
INCLUDE "@import"
OPT_INCLUDE "?import"
THEME "@theme"
DEFAULT (?i:\"default\"?)
@ -378,6 +381,12 @@ if ( queue == NULL ) {
*/
<INITIAL>{INCLUDE} {
g_queue_push_head ( queue, GINT_TO_POINTER (YY_START) );
import_optional = FALSE;
BEGIN(INCLUDE);
}
<INITIAL>{OPT_INCLUDE} {
g_queue_push_head ( queue, GINT_TO_POINTER (YY_START) );
import_optional = TRUE;
BEGIN(INCLUDE);
}
<INITIAL>{THEME} {
@ -437,10 +446,15 @@ if ( queue == NULL ) {
yylloc->first_column = yylloc->last_column = 1;
yylloc->filename = current->filename;
} else {
char *str = g_markup_printf_escaped ( "Failed to open theme: <i>%s</i>\nError: <b>%s</b>",
filename, strerror ( errno ) );
rofi_add_warning_message ( g_string_new ( str ) );
g_free ( str );
if ( !import_optional ) {
char *str = g_markup_printf_escaped ( "Failed to open theme: <i>%s</i>\nError: <b>%s</b>",
filename, strerror ( errno ) );
rofi_add_warning_message ( g_string_new ( str ) );
g_free ( str );
} else {
g_warning("Trying to parse optional theme: '%s', Error: %s",
filename, strerror(errno));
}
g_free(filename);
}
// Pop out of include. */
@ -844,7 +858,7 @@ if ( queue == NULL ) {
/**
* Media defaults.
*/
<MEDIA,MEDIA_CONTENT,MEDIA_ENV_VAR,MEDIA_ENV_VAR_DEFAULT,MEDIA_ENV_VAR_CONTENT>{WHITESPACE}+ ; // ignore all whitespace
<MEDIA,MEDIA_CONTENT,MEDIA_ENV_VAR,MEDIA_ENV_VAR_DEFAULT,MEDIA_ENV_VAR_CONTENT>{WHITESPACE}+ ; // ignore all whitespace
<MEDIA,MEDIA_CONTENT,MEDIA_ENV_VAR,MEDIA_ENV_VAR_DEFAULT,MEDIA_ENV_VAR_CONTENT>. {
yytext[yyleng-1] = '\0';