diff options
author | Dave Davenport <qball@gmpclient.org> | 2016-12-19 08:10:33 +0100 |
---|---|---|
committer | Dave Davenport <qball@gmpclient.org> | 2016-12-19 08:10:33 +0100 |
commit | d8b877147c6340835eea70b62bffddc3a5b6f987 (patch) | |
tree | e3511fa525e507f3bb8e3588be61d7a42ff38cd9 | |
parent | a8a8906adc83cf6d0c32cb158fe4d6880717762a (diff) |
Fix cleanup lexer, add properties to theme documentation.
-rw-r--r-- | doc/themer.md | 53 | ||||
-rw-r--r-- | lexer/theme-lexer.l | 4 | ||||
-rw-r--r-- | source/rofi.c | 3 |
3 files changed, 47 insertions, 13 deletions
diff --git a/doc/themer.md b/doc/themer.md index 3ed2d0b7..5d7ac006 100644 --- a/doc/themer.md +++ b/doc/themer.md @@ -1,10 +1,10 @@ -# Basic Organization +# Basic Organization Each widget has: ## Class -Class: Type of widget. +Class: Type of widget. Example: textbox, scrollbar, separator @@ -56,13 +56,13 @@ List of names in **rofi**: State: State of widget -Optional flag(s) indicating state. +Optional flag(s) indicating state. These are appended after the name or class of the widget. -`@textbox selected.normal { }` +`@textbox selected.normal { }` -`#listview.element selected.urgent { }` +`#listview.element selected.urgent { }` Currently only the @entrybox has states: @@ -71,7 +71,7 @@ Currently only the @entrybox has states: Where `visible modifier` can be: * normal: No modification. * selected: The entry is selected/highlighted by user. - * alternate: The entry is at an alternating row. (uneven row) + * alternate: The entry is at an alternating row. (uneven row) Where `state` is: * normal: No modification. @@ -82,7 +82,7 @@ These can be mixed. Example: ``` -@textbox selected.active { +@textbox selected.active { background: #003642; foreground: #008ed4; } @@ -120,11 +120,46 @@ Value supports the following formats: * integer: `[0-9]+` * double: `[0-9]+\.[0-9]` * boolean: `true|false` - * color: + * color: * `#[0-9a-fA-F]{6}`: hexidecimal rgb color. * `#[0-9a-fA-F]{8}`: hexidecimal argb color. - * `argb:[0-0a-fA-F]{8}`: Old **rofi** argb color style. + * `argb:[0-0a-fA-F]{8}`: Old **rofi** argb color style. * `rgba\([0-9]{1,3},[0-9]{1,3}, [0-9]{1,3}, {double}\)`: css style rgba color. * `rgb\([0-9]{1,3},[0-9]{1,3}, [0-9]{1,3}\)`: css style rgb color. Each property is closed by a semi-colon `;`; + +The following properties are currently supports: + + * window: + * font: string + * background: color + * foreground: color + * border-width: integer + * padding: integer + * border-width: integer + * padding: integer + * border-width: integer + + * separator: + * line-style: string + * foreground: color + + * scrollbar + * foreground: color + + * box + * padding: integer + + * textbox: + * background: color + * foreground: color + + * listview: + * padding: integer + * lines: integer + * columns: integer + * fixed-height: boolean + * scrollbar: boolean + * scrollbar-width: integer + * cycle: boolean diff --git a/lexer/theme-lexer.l b/lexer/theme-lexer.l index beebf1f3..aa1841e1 100644 --- a/lexer/theme-lexer.l +++ b/lexer/theme-lexer.l @@ -35,7 +35,6 @@ YY_LLOC_START %} %{ if ( queue == NULL ){ -printf("queue create\n"); queue = g_queue_new ( ); } %} @@ -153,9 +152,8 @@ printf("queue create\n"); }; <INITIAL><<EOF>> { - yyterminate(); - printf("Queue free: %d\n", g_queue_get_length(queue));; g_queue_free ( queue ); + yyterminate(); } <*>. { fprintf(stderr, "Invalid character: '%c'\n", *yytext); diff --git a/source/rofi.c b/source/rofi.c index 4b530ea1..b50411fd 100644 --- a/source/rofi.c +++ b/source/rofi.c @@ -902,8 +902,9 @@ int main ( int argc, char *argv[] ) config_parse_cmd_options_dynamic ( ); if ( config.theme ) { + TICK_N ( "Parse theme" ); rofi_theme_parse_file ( config.theme ); -// rofi_theme_print ( rofi_theme ); + TICK_N ( "Parsed theme" ); } // Dump. |