diff options
| author | Dave Davenport <qball@gmpclient.org> | 2021-05-04 19:50:23 +0200 |
|---|---|---|
| committer | Dave Davenport <qball@gmpclient.org> | 2021-05-04 19:50:23 +0200 |
| commit | 2516173a3d336fe70d01d93c7bcd1a5315bca535 (patch) | |
| tree | 6cded24a3d9d02c58520e8f04201ca7f96224c90 | |
| parent | 373e09e7d3ad03dac3037c3fc167533b36707bc4 (diff) | |
Remove parsing of xresource config settings via Xserver.
This option is deprecated.
| -rw-r--r-- | include/xrmoptions.h | 10 | ||||
| -rw-r--r-- | source/rofi.c | 2 | ||||
| -rw-r--r-- | source/xrmoptions.c | 18 |
3 files changed, 4 insertions, 26 deletions
diff --git a/include/xrmoptions.h b/include/xrmoptions.h index 573ad810..7e7735f8 100644 --- a/include/xrmoptions.h +++ b/include/xrmoptions.h @@ -81,16 +81,6 @@ typedef enum } XrmOptionType; /** - * @param xcb Handler object holding connection used to fetch the settings from. - * - * Parse the rofi related X resource options of the - * connected X server. - * - * @ingroup CONFXServer - */ -void config_parse_xresource_options ( xcb_stuff *xcb ); - -/** * @param filename The xresources file to parse * * Parses filename and updates the config diff --git a/source/rofi.c b/source/rofi.c index 6d066f54..06ac90ec 100644 --- a/source/rofi.c +++ b/source/rofi.c @@ -947,8 +947,6 @@ int main ( int argc, char *argv[] ) } g_free ( etc ); } - // Load in config from X resources. - config_parse_xresource_options ( xcb ); if ( config_path_new && g_file_test ( config_path_new, G_FILE_TEST_IS_REGULAR ) ) { if ( rofi_theme_parse_file ( config_path_new ) ) { diff --git a/source/xrmoptions.c b/source/xrmoptions.c index 727476fd..549ec240 100644 --- a/source/xrmoptions.c +++ b/source/xrmoptions.c @@ -45,7 +45,6 @@ /** Different sources of configuration. */ const char * const ConfigSourceStr[] = { "Default", - "XResources", "File", "Rasi File", "Commandline", @@ -54,10 +53,9 @@ const char * const ConfigSourceStr[] = { enum ConfigSource { CONFIG_DEFAULT = 0, - CONFIG_XRESOURCES = 1, - CONFIG_FILE = 2, - CONFIG_FILE_THEME = 3, - CONFIG_CMDLINE = 4 + CONFIG_FILE = 1, + CONFIG_FILE_THEME = 2, + CONFIG_CMDLINE = 3 }; typedef struct @@ -335,15 +333,7 @@ static void __config_parse_xresource_options_dynamic ( xcb_xrm_database_t *xDB, 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 ) { |