mirror of
https://github.com/lbonn/rofi
synced 2024-11-15 00:27:36 +00:00
Remove deprecated theme system.
This commit is contained in:
Dave Davenport
parent
bfd338dfc8
commit
d99111c73b
8 changed files with 21 additions and 412 deletions
|
|
@ -11,22 +11,12 @@
|
|||
[ -lines *lines* ]
|
||||
[ -columns *columns* ]
|
||||
[ -font *pangofont* ]
|
||||
[ -fg *color* ]
|
||||
[ -fg-urgent *color* ]
|
||||
[ -fg-active *color* ]
|
||||
[ -bg-urgent *color* ]
|
||||
[ -bg-active *color* ]
|
||||
[ -bg *color* ]
|
||||
[ -bgalt *color* ]
|
||||
[ -hlfg *color* ]
|
||||
[ -hlbg *color* ]
|
||||
[ -terminal *terminal* ]
|
||||
[ -location *position* ]
|
||||
[ -fixed-num-lines ]
|
||||
[ -padding *padding* ]
|
||||
[ -opacity *opacity%* ]
|
||||
[ -display *display* ]
|
||||
[ -bc *color* ]
|
||||
[ -bw *width* ]
|
||||
[ -dmenu [ -p *prompt* ] [ -sep *separator* ] [ -l *selected line* ] [ -mesg ] [ -select ] [ -input *input* ] ]
|
||||
[ -filter *filter* ]
|
||||
|
|
@ -213,33 +203,6 @@ Select the scrolling method. 0: Per page, 1: continuous.
|
|||
### Theming
|
||||
|
||||
All colors are either hex #rrggbb values or X11 color names.
|
||||
`-bg`
|
||||
|
||||
`-bg-active`
|
||||
|
||||
`-bg-urgent`
|
||||
|
||||
Set background color in menu.
|
||||
|
||||
rofi -bg "#222222"
|
||||
|
||||
Default: *#f2f1f0*
|
||||
|
||||
`-bgalt`
|
||||
|
||||
Set background color for alternating rows in menu.
|
||||
|
||||
rofi -bgalt "#222222"
|
||||
|
||||
Default: *#f2f1f0*
|
||||
|
||||
`-bc`
|
||||
|
||||
Set border color for menu.
|
||||
|
||||
rofi -bc black
|
||||
|
||||
Default: *black*
|
||||
|
||||
`-bw`
|
||||
|
||||
|
|
@ -249,43 +212,6 @@ Set border width in pixels.
|
|||
|
||||
Default: *1*
|
||||
|
||||
`-fg`
|
||||
|
||||
`-fg-urgent`
|
||||
|
||||
`-fg-active`
|
||||
|
||||
Set foreground text color for the menu.
|
||||
|
||||
rofi -fg "#cccccc"
|
||||
|
||||
Default: *#222222*
|
||||
|
||||
|
||||
`-hlbg`
|
||||
|
||||
`-hlbg-active`
|
||||
|
||||
`-hlbg-urgent`
|
||||
|
||||
Set background color for the highlighted item in the menu.
|
||||
|
||||
rofi -hlbg "#005577"
|
||||
|
||||
Default: *#005577*
|
||||
|
||||
`-hlfg`
|
||||
|
||||
`-hlfg-active`
|
||||
|
||||
`-hlfg-urgent`
|
||||
|
||||
Set foreground text color for the highlighted item in the menu.
|
||||
|
||||
rofi -hlfg "#ffffff"
|
||||
|
||||
Default: *#FFFFFF*
|
||||
|
||||
`-font`
|
||||
|
||||
Specify a font. Pango syntax is used.
|
||||
|
|
|
|||
201
doc/rofi.1
201
doc/rofi.1
|
|
@ -1,19 +1,19 @@
|
|||
.\" generated with Ronn/v0.7.3
|
||||
.\" http://github.com/rtomayko/ronn/tree/0.7.3
|
||||
.
|
||||
.TH "ROFI\-MANPAGE" "" "February 2016" "" ""
|
||||
.TH "ROFI\-MANPAGE" "" "March 2016" "" ""
|
||||
.
|
||||
.SH "NAME"
|
||||
\fBrofi\fR \- A window switcher, run launcher, ssh dialog and dmenu replacement
|
||||
.
|
||||
.SH "SYNOPSIS"
|
||||
\fBrofi\fR [ \-width \fIpct_scr\fR ] [ \-lines \fIlines\fR ] [ \-columns \fIcolumns\fR ] [ \-font \fIpangofont\fR ] [ \-fg \fIcolor\fR ] [ \-fg\-urgent \fIcolor\fR ] [ \-fg\-active \fIcolor\fR ] [ \-bg\-urgent \fIcolor\fR ] [ \-bg\-active \fIcolor\fR ] [ \-bg \fIcolor\fR ] [ \-bgalt \fIcolor\fR ] [ \-hlfg \fIcolor\fR ] [ \-hlbg \fIcolor\fR ] [ \-key\-\fBmode\fR \fIcombo\fR ] [ \-terminal \fIterminal\fR ] [ \-location \fIposition\fR ] [ \-fixed\-num\-lines ] [ \-padding \fIpadding\fR ] [ \-opacity \fIopacity%\fR ] [ \-display \fIdisplay\fR ] [ \-bc \fIcolor\fR ] [ \-bw \fIwidth\fR ] [ \-dmenu [ \-p \fIprompt\fR ] [ \-sep \fIseparator\fR ] [ \-l \fIselected line\fR ] [ \-mesg ] [ \-select ] [ \-input \fIinput\fR ] ] [ \-filter \fIfilter\fR ] [ \-ssh\-client \fIclient\fR ] [ \-ssh\-command \fIcommand\fR ] [ \-disable\-history ] [ \-levenshtein\-sort ] [ \-case\-sensitive ] [ \-show \fImode\fR ] [ \-modi \fImode1,mode2\fR ] [ \-eh \fIelement height\fR ] [ \-lazy\-filter\-limit \fIlimit\fR ] [ \-e \fImessage\fR] [ \-a \fIrow\fR ] [ \-u \fIrow\fR ] [ \-pid \fIpath\fR ] [ \-now ] [ \-rnow ] [ \-snow ] [ \-version ] [ \-help ] [ \-dump\-xresources ] [ \-dump\-xresources\-theme ] [ \-auto\-select ] [ \-parse\-hosts ] [ \-no\-parse\-known\-hosts ] [ \-combi\-modi \fImode1,mode2\fR ] [ \-normal\-window ] [ \-fake\-transparency ] [ \-quiet ] [ \-glob ] [ \-regex ] [ \-tokenize ] [ \-threads \fInum\fR ] [ \-config \fIfilename\fR ]
|
||||
\fBrofi\fR [ \-width \fIpct_scr\fR ] [ \-lines \fIlines\fR ] [ \-columns \fIcolumns\fR ] [ \-font \fIpangofont\fR ] [ \-terminal \fIterminal\fR ] [ \-location \fIposition\fR ] [ \-fixed\-num\-lines ] [ \-padding \fIpadding\fR ] [ \-opacity \fIopacity%\fR ] [ \-display \fIdisplay\fR ] [ \-bw \fIwidth\fR ] [ \-dmenu [ \-p \fIprompt\fR ] [ \-sep \fIseparator\fR ] [ \-l \fIselected line\fR ] [ \-mesg ] [ \-select ] [ \-input \fIinput\fR ] ] [ \-filter \fIfilter\fR ] [ \-ssh\-client \fIclient\fR ] [ \-ssh\-command \fIcommand\fR ] [ \-disable\-history ] [ \-levenshtein\-sort ] [ \-case\-sensitive ] [ \-show \fImode\fR ] [ \-modi \fImode1,mode2\fR ] [ \-eh \fIelement height\fR ] [ \-lazy\-filter\-limit \fIlimit\fR ] [ \-e \fImessage\fR] [ \-a \fIrow\fR ] [ \-u \fIrow\fR ] [ \-pid \fIpath\fR ] [ \-now ] [ \-rnow ] [ \-snow ] [ \-version ] [ \-help ] [ \-dump\-xresources ] [ \-dump\-xresources\-theme ] [ \-auto\-select ] [ \-parse\-hosts ] [ \-no\-parse\-known\-hosts ] [ \-combi\-modi \fImode1,mode2\fR ] [ \-normal\-window ] [ \-fake\-transparency ] [ \-quiet ] [ \-glob ] [ \-regex ] [ \-tokenize ] [ \-threads \fInum\fR ] [ \-config \fIfilename\fR ]
|
||||
.
|
||||
.SH "DESCRIPTION"
|
||||
\fBrofi\fR is an X11 popup window switcher, run dialog, dmenu replacement and more\. It focuses on being fast to use and have minimal distraction\. It supports keyboard and mouse navigation, type to filter, tokenized search and more\.
|
||||
.
|
||||
.SH "USAGE"
|
||||
\fBrofi\fR can be used in three ways, single\-shot; executes once and directly exits when done, as a daemon listening to specific key\-combination or emulating dmenu\.
|
||||
\fBrofi\fR can be used in two ways, single\-shot (runs a mode then exits) or emulating dmenu\.
|
||||
.
|
||||
.SS "Single\-shot mode"
|
||||
To launch \fBrofi\fR directly in a certain mode, specify a mode with \fBrofi \-show <mode>\fR\. To show the run dialog:
|
||||
|
|
@ -28,22 +28,6 @@ rofi \-show run
|
|||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.SS "Daemon mode"
|
||||
To launch \fBrofi\fR in daemon mode don\'t specify any mode, instead keys can be bound to launch a certain mode\. To show run\-mode by pressing \fBF2\fR start \fBrofi\fR like this:
|
||||
.
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
rofi \-key\-run F2
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.P
|
||||
Keybindings can also be specified in the \fBXresources\fR file\.
|
||||
.
|
||||
.SS "Emulating dmenu"
|
||||
\fBrofi\fR can emulate \fBdmenu\fR (a dynamic menu for X) when launched with the \fB\-dmenu\fR flag\.
|
||||
.
|
||||
|
|
@ -171,24 +155,6 @@ Dump the current active configuration in Xresources format to the command\-line\
|
|||
Dump the current color schme in Xresources format to the command\-line\.
|
||||
.
|
||||
.P
|
||||
\fB\-key\-{mode}\fR \fBKEY\fR
|
||||
.
|
||||
.P
|
||||
Set the key combination to display a {mode} in daemon mode\.
|
||||
.
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
rofi \-key\-run F12
|
||||
rofi \-key\-ssh control+shift+s
|
||||
rofi \-key\-window SuperL+Tab
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.P
|
||||
\fB\-threads\fR \fInum\fR
|
||||
.
|
||||
.P
|
||||
|
|
@ -302,12 +268,6 @@ rofi \-modi "window,run,ssh,Workspaces:i3_switch_workspaces\.sh" \-show Workspac
|
|||
Start in case sensitive mode\.
|
||||
.
|
||||
.P
|
||||
\fB\-quiet\fR
|
||||
.
|
||||
.P
|
||||
Do not print any message when starting in daemon mode\.
|
||||
.
|
||||
.P
|
||||
\fB\-fuzzy\fR
|
||||
.
|
||||
.P
|
||||
|
|
@ -332,67 +292,7 @@ Load alternative configuration file\.
|
|||
Select the scrolling method\. 0: Per page, 1: continuous\.
|
||||
.
|
||||
.SS "Theming"
|
||||
All colors are either hex #rrggbb values or X11 color names\. \fB\-bg\fR
|
||||
.
|
||||
.P
|
||||
\fB\-bg\-active\fR
|
||||
.
|
||||
.P
|
||||
\fB\-bg\-urgent\fR
|
||||
.
|
||||
.P
|
||||
Set background color in menu\.
|
||||
.
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
rofi \-bg "#222222"
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.P
|
||||
Default: \fI#f2f1f0\fR
|
||||
.
|
||||
.P
|
||||
\fB\-bgalt\fR
|
||||
.
|
||||
.P
|
||||
Set background color for alternating rows in menu\.
|
||||
.
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
rofi \-bgalt "#222222"
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.P
|
||||
Default: \fI#f2f1f0\fR
|
||||
.
|
||||
.P
|
||||
\fB\-bc\fR
|
||||
.
|
||||
.P
|
||||
Set border color for menu\.
|
||||
.
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
rofi \-bc black
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.P
|
||||
Default: \fIblack\fR
|
||||
All colors are either hex #rrggbb values or X11 color names\.
|
||||
.
|
||||
.P
|
||||
\fB\-bw\fR
|
||||
|
|
@ -414,81 +314,6 @@ rofi \-bw 1
|
|||
Default: \fI1\fR
|
||||
.
|
||||
.P
|
||||
\fB\-fg\fR
|
||||
.
|
||||
.P
|
||||
\fB\-fg\-urgent\fR
|
||||
.
|
||||
.P
|
||||
\fB\-fg\-active\fR
|
||||
.
|
||||
.P
|
||||
Set foreground text color for the menu\.
|
||||
.
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
rofi \-fg "#cccccc"
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.P
|
||||
Default: \fI#222222\fR
|
||||
.
|
||||
.P
|
||||
\fB\-hlbg\fR
|
||||
.
|
||||
.P
|
||||
\fB\-hlbg\-active\fR
|
||||
.
|
||||
.P
|
||||
\fB\-hlbg\-urgent\fR
|
||||
.
|
||||
.P
|
||||
Set background color for the highlighted item in the menu\.
|
||||
.
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
rofi \-hlbg "#005577"
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.P
|
||||
Default: \fI#005577\fR
|
||||
.
|
||||
.P
|
||||
\fB\-hlfg\fR
|
||||
.
|
||||
.P
|
||||
\fB\-hlfg\-active\fR
|
||||
.
|
||||
.P
|
||||
\fB\-hlfg\-urgent\fR
|
||||
.
|
||||
.P
|
||||
Set foreground text color for the highlighted item in the menu\.
|
||||
.
|
||||
.IP "" 4
|
||||
.
|
||||
.nf
|
||||
|
||||
rofi \-hlfg "#ffffff"
|
||||
.
|
||||
.fi
|
||||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.P
|
||||
Default: \fI#FFFFFF\fR
|
||||
.
|
||||
.P
|
||||
\fB\-font\fR
|
||||
.
|
||||
.P
|
||||
|
|
@ -1133,24 +958,6 @@ ln \-s /usr/bin/rofi /usr/bin/dmenu
|
|||
.
|
||||
.IP "" 0
|
||||
.
|
||||
.SH "SIGNALS"
|
||||
\fBHUP\fR
|
||||
.
|
||||
.P
|
||||
If in daemon mode, reload the configuration from Xresources\. (commandline arguments still \-override Xresources)\. This will also reload configured key\-bindings\.
|
||||
.
|
||||
.P
|
||||
\fBINT\fR
|
||||
.
|
||||
.P
|
||||
If in daemon mode, quits \fBrofi\fR\.
|
||||
.
|
||||
.P
|
||||
\fBUSR1\fR
|
||||
.
|
||||
.P
|
||||
If in daemon mode, dumps the current configuration to stdout\. Similar to \fB\-xresources\-dump\fR
|
||||
.
|
||||
.SH "THEMING"
|
||||
With \fBrofi\fR 0\.15\.4 we have a new way of specifying colors, the old settings still apply (for now)\. To enable the new setup, set \fBrofi\.color\-enabled\fR to true\. The new setup allows you to specify colors per state, similar to \fBi3\fR Currently 3 states exists:
|
||||
.
|
||||
|
|
|
|||
|
|
@ -10,36 +10,6 @@ rofi.lines: 8
|
|||
rofi.columns: 1
|
||||
! Font to use
|
||||
rofi.font: Source Code Pro Medium 10
|
||||
! Foreground color
|
||||
rofi.fg: #839496
|
||||
! Background color
|
||||
rofi.bg: #002b36
|
||||
! Foreground color for active row
|
||||
rofi.fg-active: #268BD2
|
||||
! Foreground color for urgent row
|
||||
rofi.fg-urgent: #DC322F
|
||||
! Foreground color for highlighted active row
|
||||
rofi.hlfg-active: #FDF6E3
|
||||
! Foreground color for highlighted urgent row
|
||||
rofi.hlfg-urgent: #FDF6E3
|
||||
! Background color for active row
|
||||
rofi.bg-active: #FDF6E3
|
||||
! Background color for urgent row
|
||||
rofi.bg-urgent: #FDF6E3
|
||||
! Background color for highlighted active row
|
||||
rofi.hlbg-active: #268BD2
|
||||
! Background color for highlighted urgent row
|
||||
rofi.hlbg-urgent: #DC322F
|
||||
! Background color for alternating row
|
||||
rofi.bgalt: #002b36
|
||||
! Foreground color for highlighted row
|
||||
rofi.hlfg: #EEE8D5
|
||||
! Background color for highlighted row
|
||||
rofi.hlbg: #586E75
|
||||
! Border color
|
||||
rofi.bc: #002B36
|
||||
! Use extended color scheme
|
||||
rofi.color-enabled: true
|
||||
! Color scheme for normal row
|
||||
rofi.color-normal: argb:0000000, #a2b5df, argb:3affffff, #a2b5df, #02143f
|
||||
! Color scheme for urgent row
|
||||
|
|
|
|||
|
|
@ -55,31 +55,10 @@ typedef struct _Settings
|
|||
char * menu_font;
|
||||
|
||||
/** New row colors */
|
||||
unsigned int color_enabled;
|
||||
char * color_normal;
|
||||
char * color_active;
|
||||
char * color_urgent;
|
||||
char * color_window;
|
||||
/** Foreground color */
|
||||
char * menu_fg;
|
||||
char * menu_fg_urgent;
|
||||
char * menu_fg_active;
|
||||
/** Background color */
|
||||
char * menu_bg;
|
||||
char * menu_bg_urgent;
|
||||
char * menu_bg_active;
|
||||
/** Background color alt */
|
||||
char * menu_bg_alt;
|
||||
/** Highlight foreground color */
|
||||
char * menu_hlfg;
|
||||
char * menu_hlfg_urgent;
|
||||
char * menu_hlfg_active;
|
||||
/** Highlight background color */
|
||||
char * menu_hlbg;
|
||||
char * menu_hlbg_urgent;
|
||||
char * menu_hlbg_active;
|
||||
/** Border color */
|
||||
char * menu_bc;
|
||||
/** Terminal to use */
|
||||
char * terminal_emulator;
|
||||
/** SSH client to use */
|
||||
|
|
|
|||
|
|
@ -516,11 +516,6 @@ void remove_pid_file ( int fd )
|
|||
*/
|
||||
int config_sanity_check ( void )
|
||||
{
|
||||
// If alternative row is not set, copy the normal background color.
|
||||
// Do this at the beginning as we might use it in the error dialog.
|
||||
if ( config.menu_bg_alt == NULL ) {
|
||||
config.menu_bg_alt = config.menu_bg;
|
||||
}
|
||||
int found_error = FALSE;
|
||||
GString *msg = g_string_new (
|
||||
"<big><b>The configuration failed to validate:</b></big>\n" );
|
||||
|
|
|
|||
|
|
@ -647,30 +647,9 @@ static void textbox_parse_string ( const char *str, RowColor *color )
|
|||
}
|
||||
void textbox_setup ( void )
|
||||
{
|
||||
if ( config.color_enabled ) {
|
||||
textbox_parse_string ( config.color_normal, &( colors[NORMAL] ) );
|
||||
textbox_parse_string ( config.color_urgent, &( colors[URGENT] ) );
|
||||
textbox_parse_string ( config.color_active, &( colors[ACTIVE] ) );
|
||||
}
|
||||
else {
|
||||
colors[NORMAL].bg = color_get ( config.menu_bg );
|
||||
colors[NORMAL].fg = color_get ( config.menu_fg );
|
||||
colors[NORMAL].bgalt = color_get ( config.menu_bg_alt );
|
||||
colors[NORMAL].hlfg = color_get ( config.menu_hlfg );
|
||||
colors[NORMAL].hlbg = color_get ( config.menu_hlbg );
|
||||
|
||||
colors[URGENT].bg = color_get ( config.menu_bg_urgent );
|
||||
colors[URGENT].fg = color_get ( config.menu_fg_urgent );
|
||||
colors[URGENT].bgalt = color_get ( config.menu_bg_alt );
|
||||
colors[URGENT].hlfg = color_get ( config.menu_hlfg_urgent );
|
||||
colors[URGENT].hlbg = color_get ( config.menu_hlbg_urgent );
|
||||
|
||||
colors[ACTIVE].bg = color_get ( config.menu_bg_active );
|
||||
colors[ACTIVE].fg = color_get ( config.menu_fg_active );
|
||||
colors[ACTIVE].bgalt = color_get ( config.menu_bg_alt );
|
||||
colors[ACTIVE].hlfg = color_get ( config.menu_hlfg_active );
|
||||
colors[ACTIVE].hlbg = color_get ( config.menu_hlbg_active );
|
||||
}
|
||||
textbox_parse_string ( config.color_normal, &( colors[NORMAL] ) );
|
||||
textbox_parse_string ( config.color_urgent, &( colors[URGENT] ) );
|
||||
textbox_parse_string ( config.color_active, &( colors[ACTIVE] ) );
|
||||
}
|
||||
|
||||
void textbox_set_pango_context ( PangoContext *p )
|
||||
|
|
|
|||
|
|
@ -634,16 +634,11 @@ static struct
|
|||
void color_background ( cairo_t *d )
|
||||
{
|
||||
if ( !color_cache[BACKGROUND].set ) {
|
||||
if ( !config.color_enabled ) {
|
||||
color_cache[BACKGROUND].color = color_get ( config.menu_bg );
|
||||
}
|
||||
else {
|
||||
gchar **vals = g_strsplit ( config.color_window, ",", 3 );
|
||||
if ( vals != NULL && vals[0] != NULL ) {
|
||||
color_cache[BACKGROUND].color = color_get ( vals[0] );
|
||||
}
|
||||
g_strfreev ( vals );
|
||||
gchar **vals = g_strsplit ( config.color_window, ",", 3 );
|
||||
if ( vals != NULL && vals[0] != NULL ) {
|
||||
color_cache[BACKGROUND].color = color_get ( vals[0] );
|
||||
}
|
||||
g_strfreev ( vals );
|
||||
color_cache[BACKGROUND].set = TRUE;
|
||||
}
|
||||
|
||||
|
|
@ -653,16 +648,11 @@ void color_background ( cairo_t *d )
|
|||
void color_border ( cairo_t *d )
|
||||
{
|
||||
if ( !color_cache[BORDER].set ) {
|
||||
if ( !config.color_enabled ) {
|
||||
color_cache[BORDER].color = color_get ( config.menu_bc );
|
||||
}
|
||||
else {
|
||||
gchar **vals = g_strsplit ( config.color_window, ",", 3 );
|
||||
if ( vals != NULL && vals[0] != NULL && vals[1] != NULL ) {
|
||||
color_cache[BORDER].color = color_get ( vals[1] );
|
||||
}
|
||||
g_strfreev ( vals );
|
||||
gchar **vals = g_strsplit ( config.color_window, ",", 3 );
|
||||
if ( vals != NULL && vals[0] != NULL && vals[1] != NULL ) {
|
||||
color_cache[BORDER].color = color_get ( vals[1] );
|
||||
}
|
||||
g_strfreev ( vals );
|
||||
color_cache[BORDER].set = TRUE;
|
||||
}
|
||||
x11_helper_set_cairo_rgba ( d, color_cache[BORDER].color );
|
||||
|
|
@ -671,19 +661,14 @@ void color_border ( cairo_t *d )
|
|||
void color_separator ( cairo_t *d )
|
||||
{
|
||||
if ( !color_cache[SEPARATOR].set ) {
|
||||
if ( !config.color_enabled ) {
|
||||
color_cache[SEPARATOR].color = color_get ( config.menu_bc );
|
||||
gchar **vals = g_strsplit ( config.color_window, ",", 3 );
|
||||
if ( vals != NULL && vals[0] != NULL && vals[1] != NULL && vals[2] != NULL ) {
|
||||
color_cache[SEPARATOR].color = color_get ( vals[2] );
|
||||
}
|
||||
else {
|
||||
gchar **vals = g_strsplit ( config.color_window, ",", 3 );
|
||||
if ( vals != NULL && vals[0] != NULL && vals[1] != NULL && vals[2] != NULL ) {
|
||||
color_cache[SEPARATOR].color = color_get ( vals[2] );
|
||||
}
|
||||
else if ( vals != NULL && vals[0] != NULL && vals[1] != NULL ) {
|
||||
color_cache[SEPARATOR].color = color_get ( vals[1] );
|
||||
}
|
||||
g_strfreev ( vals );
|
||||
else if ( vals != NULL && vals[0] != NULL && vals[1] != NULL ) {
|
||||
color_cache[SEPARATOR].color = color_get ( vals[1] );
|
||||
}
|
||||
g_strfreev ( vals );
|
||||
color_cache[SEPARATOR].set = TRUE;
|
||||
}
|
||||
x11_helper_set_cairo_rgba ( d, color_cache[SEPARATOR].color );
|
||||
|
|
|
|||
|
|
@ -71,34 +71,6 @@ static XrmOption xrmOptions[] = {
|
|||
{ xrm_Number, "columns", { .num = &config.menu_columns }, NULL, "Number of columns" },
|
||||
|
||||
{ xrm_String, "font", { .str = &config.menu_font }, NULL, "Font to use" },
|
||||
/* Foreground color */
|
||||
{ xrm_String, "foreground", { .str = &config.menu_fg }, NULL, "" },
|
||||
{ xrm_String, "fg", { .str = &config.menu_fg }, NULL, "Foreground color" },
|
||||
{ xrm_String, "background", { .str = &config.menu_bg }, NULL, "" },
|
||||
{ xrm_String, "bg", { .str = &config.menu_bg }, NULL, "Background color" },
|
||||
|
||||
{ xrm_String, "fg-active", { .str = &config.menu_fg_active }, NULL, "Foreground color for active row" },
|
||||
{ xrm_String, "fg-urgent", { .str = &config.menu_fg_urgent }, NULL, "Foreground color for urgent row" },
|
||||
{ xrm_String, "hlfg-active", { .str = &config.menu_hlfg_active }, NULL, "Foreground color for highlighted active row" },
|
||||
{ xrm_String, "hlfg-urgent", { .str = &config.menu_hlfg_urgent }, NULL, "Foreground color for highlighted urgent row" },
|
||||
|
||||
{ xrm_String, "bg-active", { .str = &config.menu_bg_active }, NULL, "Background color for active row" },
|
||||
{ xrm_String, "bg-urgent", { .str = &config.menu_bg_urgent }, NULL, "Background color for urgent row" },
|
||||
{ xrm_String, "hlbg-active", { .str = &config.menu_hlbg_active }, NULL, "Background color for highlighted active row" },
|
||||
{ xrm_String, "hlbg-urgent", { .str = &config.menu_hlbg_urgent }, NULL, "Background color for highlighted urgent row" },
|
||||
|
||||
{ xrm_String, "background-alternate", { .str = &config.menu_bg_alt }, NULL, "" },
|
||||
{ xrm_String, "bgalt", { .str = &config.menu_bg_alt }, NULL, "Background color for alternating row" },
|
||||
|
||||
{ xrm_String, "highlightfg", { .str = &config.menu_hlfg }, NULL, "" },
|
||||
{ xrm_String, "hlfg", { .str = &config.menu_hlfg }, NULL, "Foreground color for highlighted row" },
|
||||
|
||||
{ xrm_String, "highlightbg", { .str = &config.menu_hlbg }, NULL, "" },
|
||||
{ xrm_String, "hlbg", { .str = &config.menu_hlbg }, NULL, "Background color for highlighted row" },
|
||||
|
||||
{ xrm_String, "bordercolor", { .str = &config.menu_bc }, NULL, "" },
|
||||
{ xrm_String, "bc", { .str = &config.menu_bc }, NULL, "Border color" },
|
||||
{ xrm_Boolean, "color-enabled", { .num = &config.color_enabled }, NULL, "Use extended color scheme" },
|
||||
{ xrm_String, "color-normal", { .str = &config.color_normal }, NULL, "Color scheme for normal row" },
|
||||
{ xrm_String, "color-urgent", { .str = &config.color_urgent }, NULL, "Color scheme for urgent row" },
|
||||
{ xrm_String, "color-active", { .str = &config.color_active }, NULL, "Color scheme for active row" },
|
||||
|
|
@ -547,10 +519,6 @@ void print_help_msg ( const char *option, const char *type, const char*text, con
|
|||
|
||||
void config_parse_xresources_theme_dump ( void )
|
||||
{
|
||||
if ( config.color_enabled != TRUE ) {
|
||||
printf ( "! Dumping theme only works for the extended color scheme.\n" );
|
||||
return;
|
||||
}
|
||||
printf ( "! ------------------------------------------------------------------------------\n" );
|
||||
printf ( "! ROFI Color theme\n" );
|
||||
printf ( "! User: %s\n", g_get_user_name () );
|
||||
|
|
|
|||
Loading…
Reference in a new issue