diff options
Diffstat (limited to 'source/xrmoptions.c')
| -rw-r--r-- | source/xrmoptions.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/source/xrmoptions.c b/source/xrmoptions.c index 04126acd..c103c6d6 100644 --- a/source/xrmoptions.c +++ b/source/xrmoptions.c @@ -29,15 +29,10 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <xcb/xcb.h> -#include <xcb/xkb.h> #include <xcb/xcb_xrm.h> #include <xkbcommon/xkbcommon.h> #include <xkbcommon/xkbcommon-compose.h> -#include <xkbcommon/xkbcommon-x11.h> #include <glib.h> -#include "xcb.h" -#include "xcb-internal.h" #include "x11-helper.h" #include "rofi.h" #include "xrmoptions.h" @@ -110,15 +105,8 @@ static XrmOption xrmOptions[] = { { xrm_Number, "bw", { .num = &config.menu_bw }, NULL, "Border width", CONFIG_DEFAULT }, - { xrm_Number, "location", { .num = &config.location }, NULL, - "Location on screen", CONFIG_DEFAULT }, - { xrm_Number, "padding", { .num = &config.padding }, NULL, "Padding", CONFIG_DEFAULT }, - { xrm_SNumber, "yoffset", { .snum = &config.y_offset }, NULL, - "Y-offset relative to location", CONFIG_DEFAULT }, - { xrm_SNumber, "xoffset", { .snum = &config.x_offset }, NULL, - "X-offset relative to location", CONFIG_DEFAULT }, { xrm_Boolean, "fixed-num-lines", { .num = &config.fixed_num_lines }, NULL, "Always show number of lines", CONFIG_DEFAULT }, @@ -163,11 +151,6 @@ static XrmOption xrmOptions[] = { "Set the matching algorithm. (normal, regex, glob, fuzzy)", CONFIG_DEFAULT }, { xrm_Boolean, "tokenize", { .num = &config.tokenize }, NULL, "Tokenize input string", CONFIG_DEFAULT }, - { xrm_String, "monitor", { .str = &config.monitor }, NULL, - "", CONFIG_DEFAULT }, - /* Alias for dmenu compatibility. */ - { xrm_String, "m", { .str = &config.monitor }, NULL, - "Monitor id to show on", CONFIG_DEFAULT }, { xrm_Number, "line-margin", { .num = &config.line_margin }, NULL, "Margin between rows", CONFIG_DEFAULT }, { xrm_Number, "line-padding", { .num = &config.line_padding }, NULL, @@ -180,18 +163,12 @@ static XrmOption xrmOptions[] = { "Hide scroll-bar", CONFIG_DEFAULT }, { xrm_Boolean, "fullscreen", { .num = &config.fullscreen }, NULL, "Fullscreen", CONFIG_DEFAULT }, - { xrm_Boolean, "fake-transparency", { .num = &config.fake_transparency }, NULL, - "Fake transparency", CONFIG_DEFAULT }, - { xrm_SNumber, "dpi", { .snum = &config.dpi }, NULL, - "DPI", CONFIG_DEFAULT }, { xrm_Number, "threads", { .num = &config.threads }, NULL, "Threads to use for string matching", CONFIG_DEFAULT }, { xrm_Number, "scrollbar-width", { .num = &config.scrollbar_width }, NULL, "Scrollbar width", CONFIG_DEFAULT }, { xrm_Number, "scroll-method", { .num = &config.scroll_method }, NULL, "Scrolling method. (0: Page, 1: Centered)", CONFIG_DEFAULT }, - { xrm_String, "fake-background", { .str = &config.fake_background }, NULL, - "Background to use for fake transparency. (background or screenshot)", CONFIG_DEFAULT }, { xrm_String, "window-format", { .str = &config.window_format }, NULL, "Window Format. w (desktop name), t (title), n (name), r (role), c (class)", CONFIG_DEFAULT }, { xrm_Boolean, "click-to-exit", { .snum = &config.click_to_exit }, NULL, @@ -277,34 +254,6 @@ static void __config_parse_xresource_options ( xcb_xrm_database_t *xDB, enum Con g_free ( name ); } } -static void __config_parse_xresource_options_dynamic ( xcb_xrm_database_t *xDB, enum ConfigSource source ) -{ - const char * namePrefix = "rofi"; - - for ( unsigned int i = 0; i < num_extra_options; ++i ) { - char *name; - - name = g_strdup_printf ( "%s.%s", namePrefix, extra_options[i].name ); - char *xrmValue = NULL; - if ( xcb_xrm_resource_get_string ( xDB, name, NULL, &xrmValue ) == 0 ) { - config_parser_set ( &( extra_options[i] ), xrmValue, source ); - } - if ( xrmValue ) { - free ( xrmValue ); - } - - g_free ( name ); - } -} -void config_parse_xresource_options ( xcb_stuff *xcb ) -{ - xcb_xrm_database_t *xDB = xcb_xrm_database_from_default ( xcb->connection ); - if ( xDB ) { - __config_parse_xresource_options ( xDB, CONFIG_XRESOURCES ); - __config_parse_xresource_options_dynamic ( xDB, CONFIG_XRESOURCES ); - xcb_xrm_database_free ( xDB ); - } -} void config_parse_xresource_options_file ( const char *filename ) { if ( !filename ) { @@ -316,7 +265,6 @@ void config_parse_xresource_options_file ( const char *filename ) return; } __config_parse_xresource_options ( xDB, CONFIG_FILE ); - __config_parse_xresource_options_dynamic ( xDB, CONFIG_FILE ); xcb_xrm_database_free ( xDB ); } |