summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2017-03-30 08:33:40 +0200
committerDave Davenport <qball@gmpclient.org>2017-03-30 08:33:40 +0200
commit4d19e35b0e14dda5a965ddd2f9663529b6b908e3 (patch)
tree1720788399b939c792523ff9ff1a2b26c6089dcb
parent898e4a2717a7c160b46b4665b4d192a024859213 (diff)
Remove more traces of old theme.
-rw-r--r--doc/rofi-manpage.markdown64
-rw-r--r--doc/rofi.1114
-rw-r--r--include/xrmoptions.h8
-rw-r--r--source/rofi.c6
-rw-r--r--source/xrmoptions.c20
5 files changed, 0 insertions, 212 deletions
diff --git a/doc/rofi-manpage.markdown b/doc/rofi-manpage.markdown
index 7c44a0ae..5ba54c15 100644
--- a/doc/rofi-manpage.markdown
+++ b/doc/rofi-manpage.markdown
@@ -219,70 +219,6 @@ Hide the indicator that shows what part of the string is matched.
Disables lazy grab, this forces the keyboard being grabbed before gui is shown.
-### Theming
-
-These options are **deprecated** and should not be used. Please use the new theme format to customize rofi.
-
-All colors are either hex #rrggbb, #aarrggbb or argb:aarrggbbvalues or X11 color names.
-
-`-bw`
-
-Set border width in pixels.
-
- rofi -bw 1
-
-Default: *1*
-
-`-font`
-
-Specify a font. Pango syntax is used.
-
- rofi -font "Dejavu Sans Mono 14"
-
-Default: *mono 12*
-
-`-eh` *element height*
-
-The height of a field in lines. e.g.
-
- echo -e "a\n3|b\n4|c\n5" | rofi -sep '|' -eh 2 -dmenu
-
-Default: *1*
-
-The following options are further explained in the theming section:
-
-`-color-window` *background* *border color* *separator color*
-
-Set window background, border and separator color.
-
-`-color-normal` *background, foreground, background alt, highlight background, highlight foreground*
-
-`-color-urgent` *background, foreground, background alt, highlight background, highlight foreground*
-
-`-color-active` *background, foreground, background alt, highlight background, highlight foreground*
-
-Specify the colors used in a row per state (normal, active, urgent).
-
-`-line-margin`
-
-Set the spacing between the rows.
-
-Default: *3*, Min: *3*, Max: *50*
-
-`-separator-style` *style*
-
-Set separator style. Possible options are "none", "solid" or "dash".
-
-Default: *dash*
-
-`-hide-scrollbar`
-
-Hide the scrollbar.
-
-`-scrollbar-width` *width*
-
-Set the scrollbar width.
-
### Matching
`-matching` *method*
diff --git a/doc/rofi.1 b/doc/rofi.1
index 8dc7f4e4..60e6aa9e 100644
--- a/doc/rofi.1
+++ b/doc/rofi.1
@@ -309,120 +309,6 @@ Hide the indicator that shows what part of the string is matched\.
.P
Disables lazy grab, this forces the keyboard being grabbed before gui is shown\.
.
-.SS "Theming"
-These options are \fBdeprecated\fR and should not be used\. Please use the new theme format to customize rofi\.
-.
-.P
-All colors are either hex #rrggbb, #aarrggbb or argb:aarrggbbvalues or X11 color names\.
-.
-.P
-\fB\-bw\fR
-.
-.P
-Set border width in pixels\.
-.
-.IP "" 4
-.
-.nf
-
-rofi \-bw 1
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Default: \fI1\fR
-.
-.P
-\fB\-font\fR
-.
-.P
-Specify a font\. Pango syntax is used\.
-.
-.IP "" 4
-.
-.nf
-
-rofi \-font "Dejavu Sans Mono 14"
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Default: \fImono 12\fR
-.
-.P
-\fB\-eh\fR \fIelement height\fR
-.
-.P
-The height of a field in lines\. e\.g\.
-.
-.IP "" 4
-.
-.nf
-
-echo \-e "a\en3|b\en4|c\en5" | rofi \-sep \'|\' \-eh 2 \-dmenu
-.
-.fi
-.
-.IP "" 0
-.
-.P
-Default: \fI1\fR
-.
-.P
-The following options are further explained in the theming section:
-.
-.P
-\fB\-color\-window\fR \fIbackground\fR \fIborder color\fR \fIseparator color\fR
-.
-.P
-Set window background, border and separator color\.
-.
-.P
-\fB\-color\-normal\fR \fIbackground, foreground, background alt, highlight background, highlight foreground\fR
-.
-.P
-\fB\-color\-urgent\fR \fIbackground, foreground, background alt, highlight background, highlight foreground\fR
-.
-.P
-\fB\-color\-active\fR \fIbackground, foreground, background alt, highlight background, highlight foreground\fR
-.
-.P
-Specify the colors used in a row per state (normal, active, urgent)\.
-.
-.P
-\fB\-line\-margin\fR
-.
-.P
-Set the spacing between the rows\.
-.
-.P
-Default: \fI3\fR, Min: \fI3\fR, Max: \fI50\fR
-.
-.P
-\fB\-separator\-style\fR \fIstyle\fR
-.
-.P
-Set separator style\. Possible options are "none", "solid" or "dash"\.
-.
-.P
-Default: \fIdash\fR
-.
-.P
-\fB\-hide\-scrollbar\fR
-.
-.P
-Hide the scrollbar\.
-.
-.P
-\fB\-scrollbar\-width\fR \fIwidth\fR
-.
-.P
-Set the scrollbar width\.
-.
.SS "Matching"
\fB\-matching\fR \fImethod\fR
.
diff --git a/include/xrmoptions.h b/include/xrmoptions.h
index 99bec516..da17acd8 100644
--- a/include/xrmoptions.h
+++ b/include/xrmoptions.h
@@ -93,14 +93,6 @@ void config_xresource_free ( void );
void config_parse_xresource_dump ( void );
/**
- * Dump the theme related settings in Xresources compatible way to
- * stdout.
- *
- * @ingroup CONFXResources
- */
-void config_parse_xresources_theme_dump ( void );
-
-/**
* @param type The type of the value
* @param key The key refering to this configuration option
* @param value The value to update based [out][in]
diff --git a/source/rofi.c b/source/rofi.c
index df8bae5f..aad30426 100644
--- a/source/rofi.c
+++ b/source/rofi.c
@@ -1110,12 +1110,6 @@ int main ( int argc, char *argv[] )
cleanup ();
return EXIT_SUCCESS;
}
- if ( find_arg ( "-dump-xresources-theme" ) >= 0 ) {
- config_parse_xresources_theme_dump ();
- cleanup ();
- return EXIT_SUCCESS;
- }
-
main_loop_source = g_water_xcb_source_new_for_connection ( NULL, xcb->connection, main_loop_x11_event_handler, NULL, NULL );
TICK_N ( "X11 Setup " );
diff --git a/source/xrmoptions.c b/source/xrmoptions.c
index 0512ec41..5713e22d 100644
--- a/source/xrmoptions.c
+++ b/source/xrmoptions.c
@@ -622,26 +622,6 @@ void print_help_msg ( const char *option, const char *type, const char*text, con
}
}
-void config_parse_xresources_theme_dump ( void )
-{
- printf ( "! ------------------------------------------------------------------------------\n" );
- printf ( "! ROFI Color theme\n" );
- printf ( "! User: %s\n", g_get_user_name () );
- printf ( "! ------------------------------------------------------------------------------\n" );
- const char * const namePrefix = "rofi";
- const char colorPrefix[] = "color-";
- const char separatorStyle[] = "separator-style";
- unsigned int entries = sizeof ( xrmOptions ) / sizeof ( *xrmOptions );
- for ( unsigned int i = 0; i < entries; ++i ) {
- if ( strncmp ( xrmOptions[i].name, colorPrefix, sizeof ( colorPrefix ) - 1 ) == 0 ) {
- xresource_dump_entry ( namePrefix, &xrmOptions[i] );
- }
- else if ( strcmp ( xrmOptions[i].name, separatorStyle ) == 0 ) {
- xresource_dump_entry ( namePrefix, &xrmOptions[i] );
- }
- }
-}
-
static char * config_parser_return_display_help_entry ( XrmOption *option, size_t l )
{
int ll = (int) l;