diff options
author | Dave Davenport <qball@gmpclient.org> | 2016-03-01 18:11:55 +0100 |
---|---|---|
committer | Dave Davenport <qball@gmpclient.org> | 2016-03-01 18:11:55 +0100 |
commit | 7d046a1f5bcc3a55f250aed0cbfaf8a54a8d6875 (patch) | |
tree | de42f664183bf2bb6c474c13bb4404ad6a181a09 /source/xrmoptions.c | |
parent | fb2c23a429d0206043069ca1f571b49d7cbc275f (diff) |
Pack magic externs into a xcb_stuff.
Diffstat (limited to 'source/xrmoptions.c')
-rw-r--r-- | source/xrmoptions.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/xrmoptions.c b/source/xrmoptions.c index 6960c738..9d304a7e 100644 --- a/source/xrmoptions.c +++ b/source/xrmoptions.c @@ -36,6 +36,7 @@ #include <xkbcommon/xkbcommon-compose.h> #include <xkbcommon/xkbcommon-x11.h> #include <X11/Xresource.h> +#include "xcb.h" #include "x11-helper.h" #include "rofi.h" #include "xrmoptions.h" @@ -223,9 +224,9 @@ static void __config_parse_xresource_options ( XrmDatabase xDB ) g_free ( name ); } } -void config_parse_xresource_options ( xcb_connection_t *xcb_connection, xcb_screen_t *xcb_screen ) +void config_parse_xresource_options ( xcb_stuff *xcb ) { - char *name = window_get_text_prop ( xcb_connection, xcb_screen->root, XCB_ATOM_RESOURCE_MANAGER ); + char *name = window_get_text_prop ( xcb_stuff_get_root_window ( xcb ), XCB_ATOM_RESOURCE_MANAGER ); if ( name ) { // Map Xresource entries to rofi config options. XrmDatabase xDB = XrmGetStringDatabase ( name ); @@ -329,9 +330,9 @@ static void __config_parse_xresource_options_dynamic ( XrmDatabase xDB ) } } -void config_parse_xresource_options_dynamic ( xcb_connection_t *xcb_connection, xcb_screen_t *xcb_screen ) +void config_parse_xresource_options_dynamic ( xcb_stuff *xcb ) { - char *name = window_get_text_prop ( xcb_connection, xcb_screen->root, XCB_ATOM_RESOURCE_MANAGER ); + char *name = window_get_text_prop ( xcb_stuff_get_root_window ( xcb ), XCB_ATOM_RESOURCE_MANAGER ); XrmDatabase xDB = XrmGetStringDatabase ( name ); __config_parse_xresource_options_dynamic ( xDB ); XrmDestroyDatabase ( xDB ); |