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

Merge pull request #714 from DaveDavenport/dumptheme

Browse source 
Changes the dump theme format to not have the prefix # and uses dots only to separate modifiers.
This commit is contained in:
Dave Davenport 2017-11-01 20:28:41 +01:00 committed by GitHub
commit c70d519226
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 58 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
doc/default_theme.rasi
View file

@ -1,3 +1,6 @@
/**
* rofi -dump-theme output.
**/
* { * {
selected-normal-foreground: @lightbg; selected-normal-foreground: @lightbg;
foreground: rgba ( 0, 43, 54, 100 % ); foreground: rgba ( 0, 43, 54, 100 % );
@ -28,24 +31,24 @@
active-background: @background; active-background: @background;
selected-active-background: @blue; selected-active-background: @blue;
} }
#window { window {
background-color: @background; background-color: @background;
border: 1; border: 1;
padding: 5; padding: 5;
} }
#mainbox { mainbox {
border: 0; border: 0;
padding: 0; padding: 0;
} }
#message { message {
border: 2px dash 0px 0px ; border: 2px dash 0px 0px ;
border-color: @separatorcolor; border-color: @separatorcolor;
padding: 1px ; padding: 1px ;
} }
#textbox { textbox {
text-color: @foreground; text-color: @foreground;
} }
#listview { listview {
fixed-height: 0; fixed-height: 0;
border: 2px dash 0px 0px ; border: 2px dash 0px 0px ;
border-color: @separatorcolor; border-color: @separatorcolor;
@ -53,79 +56,79 @@
scrollbar: true; scrollbar: true;
padding: 2px 0px 0px ; padding: 2px 0px 0px ;
} }
#element { element {
border: 0; border: 0;
padding: 1px ; padding: 1px ;
} }
#element.normal.normal { element normal.normal {
background-color: @normal-background; background-color: @normal-background;
text-color: @normal-foreground; text-color: @normal-foreground;
} }
#element.normal.urgent { element normal.urgent {
background-color: @urgent-background; background-color: @urgent-background;
text-color: @urgent-foreground; text-color: @urgent-foreground;
} }
#element.normal.active { element normal.active {
background-color: @active-background; background-color: @active-background;
text-color: @active-foreground; text-color: @active-foreground;
} }
#element.selected.normal { element selected.normal {
background-color: @selected-normal-background; background-color: @selected-normal-background;
text-color: @selected-normal-foreground; text-color: @selected-normal-foreground;
} }
#element.selected.urgent { element selected.urgent {
background-color: @selected-urgent-background; background-color: @selected-urgent-background;
text-color: @selected-urgent-foreground; text-color: @selected-urgent-foreground;
} }
#element.selected.active { element selected.active {
background-color: @selected-active-background; background-color: @selected-active-background;
text-color: @selected-active-foreground; text-color: @selected-active-foreground;
} }
#element.alternate.normal { element alternate.normal {
background-color: @alternate-normal-background; background-color: @alternate-normal-background;
text-color: @alternate-normal-foreground; text-color: @alternate-normal-foreground;
} }
#element.alternate.urgent { element alternate.urgent {
background-color: @alternate-urgent-background; background-color: @alternate-urgent-background;
text-color: @alternate-urgent-foreground; text-color: @alternate-urgent-foreground;
} }
#element.alternate.active { element alternate.active {
background-color: @alternate-active-background; background-color: @alternate-active-background;
text-color: @alternate-active-foreground; text-color: @alternate-active-foreground;
} }
#scrollbar { scrollbar {
width: 4px ; width: 4px ;
border: 0; border: 0;
handle-color: @normal-foreground; handle-color: @normal-foreground;
handle-width: 8px ; handle-width: 8px ;
padding: 0; padding: 0;
} }
#sidebar { sidebar {
border: 2px dash 0px 0px ; border: 2px dash 0px 0px ;
border-color: @separatorcolor; border-color: @separatorcolor;
} }
#button { button {
spacing: 0; spacing: 0;
text-color: @normal-foreground; text-color: @normal-foreground;
} }
#button.selected { button selected {
background-color: @selected-normal-background; background-color: @selected-normal-background;
text-color: @selected-normal-foreground; text-color: @selected-normal-foreground;
} }
#inputbar { inputbar {
spacing: 3px ; spacing: 3px ;
text-color: @normal-foreground; text-color: @normal-foreground;
padding: 1px ; padding: 1px ;
} }
#case-indicator { case-indicator {
spacing: 0; spacing: 0;
text-color: @normal-foreground; text-color: @normal-foreground;
} }
#entry { entry {
spacing: 0; spacing: 0;
text-color: @normal-foreground; text-color: @normal-foreground;
} }
#prompt { prompt {
spacing: 0; spacing: 0;
text-color: @normal-foreground; text-color: @normal-foreground;
} }

49
doc/old-theme-convert-output.rasi
View file

@ -1,3 +1,6 @@
/**
* rofi -dump-theme output.
**/
* { * {
selected-normal-foreground: rgba ( 2, 20, 63, 100 % ); selected-normal-foreground: rgba ( 2, 20, 63, 100 % );
foreground: rgba ( 219, 223, 188, 100 % ); foreground: rgba ( 219, 223, 188, 100 % );
@ -28,24 +31,24 @@
active-background: rgba ( 0, 0, 0, 0 % ); active-background: rgba ( 0, 0, 0, 0 % );
selected-active-background: rgba ( 138, 196, 255, 100 % ); selected-active-background: rgba ( 138, 196, 255, 100 % );
} }
#window { window {
background-color: @background; background-color: @background;
border: 1; border: 1;
padding: 5; padding: 5;
} }
#mainbox { mainbox {
border: 0; border: 0;
padding: 0; padding: 0;
} }
#message { message {
border: 2px 0px 0px ; border: 2px 0px 0px ;
border-color: @separatorcolor; border-color: @separatorcolor;
padding: 1px ; padding: 1px ;
} }
#textbox { textbox {
text-color: @foreground; text-color: @foreground;
} }
#listview { listview {
fixed-height: 0; fixed-height: 0;
border: 2px 0px 0px ; border: 2px 0px 0px ;
border-color: @separatorcolor; border-color: @separatorcolor;
@ -53,79 +56,79 @@
scrollbar: true; scrollbar: true;
padding: 2px 0px 0px ; padding: 2px 0px 0px ;
} }
#element { element {
border: 0; border: 0;
padding: 1px ; padding: 1px ;
} }
#element.normal.normal { element normal.normal {
background-color: @normal-background; background-color: @normal-background;
text-color: @normal-foreground; text-color: @normal-foreground;
} }
#element.normal.urgent { element normal.urgent {
background-color: @urgent-background; background-color: @urgent-background;
text-color: @urgent-foreground; text-color: @urgent-foreground;
} }
#element.normal.active { element normal.active {
background-color: @active-background; background-color: @active-background;
text-color: @active-foreground; text-color: @active-foreground;
} }
#element.selected.normal { element selected.normal {
background-color: @selected-normal-background; background-color: @selected-normal-background;
text-color: @selected-normal-foreground; text-color: @selected-normal-foreground;
} }
#element.selected.urgent { element selected.urgent {
background-color: @selected-urgent-background; background-color: @selected-urgent-background;
text-color: @selected-urgent-foreground; text-color: @selected-urgent-foreground;
} }
#element.selected.active { element selected.active {
background-color: @selected-active-background; background-color: @selected-active-background;
text-color: @selected-active-foreground; text-color: @selected-active-foreground;
} }
#element.alternate.normal { element alternate.normal {
background-color: @alternate-normal-background; background-color: @alternate-normal-background;
text-color: @alternate-normal-foreground; text-color: @alternate-normal-foreground;
} }
#element.alternate.urgent { element alternate.urgent {
background-color: @alternate-urgent-background; background-color: @alternate-urgent-background;
text-color: @alternate-urgent-foreground; text-color: @alternate-urgent-foreground;
} }
#element.alternate.active { element alternate.active {
background-color: @alternate-active-background; background-color: @alternate-active-background;
text-color: @alternate-active-foreground; text-color: @alternate-active-foreground;
} }
#scrollbar { scrollbar {
width: 4px ; width: 4px ;
border: 0; border: 0;
handle-color: @normal-foreground; handle-color: @normal-foreground;
handle-width: 8px ; handle-width: 8px ;
padding: 0; padding: 0;
} }
#sidebar { sidebar {
border: 2px 0px 0px ; border: 2px 0px 0px ;
border-color: @separatorcolor; border-color: @separatorcolor;
} }
#button { button {
spacing: 0; spacing: 0;
text-color: @normal-foreground; text-color: @normal-foreground;
} }
#button.selected { button selected {
background-color: @selected-normal-background; background-color: @selected-normal-background;
text-color: @selected-normal-foreground; text-color: @selected-normal-foreground;
} }
#inputbar { inputbar {
spacing: 3px ; spacing: 3px ;
text-color: @normal-foreground; text-color: @normal-foreground;
padding: 1px ; padding: 1px ;
} }
#case-indicator { case-indicator {
spacing: 0; spacing: 0;
text-color: @normal-foreground; text-color: @normal-foreground;
} }
#entry { entry {
spacing: 0; spacing: 0;
text-color: @normal-foreground; text-color: @normal-foreground;
} }
#prompt { prompt {
spacing: 0; spacing: 0;
text-color: @normal-foreground; text-color: @normal-foreground;
} }

8
source/theme.c
View file

@ -286,11 +286,10 @@ static void rofi_theme_print_index ( ThemeWidget *widget )
index = 4; index = 4;
for ( GList *iter = g_list_first ( list ); iter != NULL; iter = g_list_next ( iter ) ) { for ( GList *iter = g_list_first ( list ); iter != NULL; iter = g_list_next ( iter ) ) {
char *name = (char *) iter->data; char *name = (char *) iter->data;
if ( iter->prev == NULL ) {
putchar ( '#' );
}
fputs ( name, stdout ); fputs ( name, stdout );
if ( iter->next ) { if ( iter->prev == NULL && iter->next ) {
putchar ( ' ' );
} else if ( iter->next ) {
putchar ( '.' ); putchar ( '.' );
} }
} }
@ -321,6 +320,7 @@ static void rofi_theme_print_index ( ThemeWidget *widget )
void rofi_theme_print ( ThemeWidget *widget ) void rofi_theme_print ( ThemeWidget *widget )
{ {
if ( widget != NULL ) { if ( widget != NULL ) {
printf("/**\n * rofi -dump-theme output.\n * Rofi version: %s\n **/\n", PACKAGE_VERSION);
rofi_theme_print_index ( widget ); rofi_theme_print_index ( widget );
} }
} }

2
test/convert_old_theme_test.sh
View file

@ -3,7 +3,7 @@
TOP_DIR=$1 TOP_DIR=$1
xrdb -retain -load ${TOP_DIR}/doc/old-theme-convert-input.theme xrdb -retain -load ${TOP_DIR}/doc/old-theme-convert-input.theme
rofi -config ${TOP_DIR}/doc/old-theme-convert-input.theme -dump-theme > temp.txt rofi -config ${TOP_DIR}/doc/old-theme-convert-input.theme -dump-theme | grep -v "Rofi version" > temp.txt
if ! diff temp.txt ${TOP_DIR}/doc/old-theme-convert-output.rasi > /dev/null if ! diff temp.txt ${TOP_DIR}/doc/old-theme-convert-output.rasi > /dev/null
then then

2
test/default_theme_test.sh
View file

@ -2,7 +2,7 @@
TOP_DIR=$1 TOP_DIR=$1
rofi -no-config -dump-theme > temp.txt rofi -no-config -dump-theme | grep -v "Rofi version" > temp.txt
if ! diff temp.txt ${TOP_DIR}/doc/default_theme.rasi > /dev/null if ! diff temp.txt ${TOP_DIR}/doc/default_theme.rasi > /dev/null
then then