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 /include | |
parent | fb2c23a429d0206043069ca1f571b49d7cbc275f (diff) |
Pack magic externs into a xcb_stuff.
Diffstat (limited to 'include')
-rw-r--r-- | include/helper.h | 2 | ||||
-rw-r--r-- | include/i3-support.h | 2 | ||||
-rw-r--r-- | include/rofi.h | 1 | ||||
-rw-r--r-- | include/view.h | 2 | ||||
-rw-r--r-- | include/x11-helper.h | 25 | ||||
-rw-r--r-- | include/xkb.h | 3 | ||||
-rw-r--r-- | include/xrmoptions.h | 5 |
7 files changed, 19 insertions, 21 deletions
diff --git a/include/helper.h b/include/helper.h index d479ce92..eae59ce1 100644 --- a/include/helper.h +++ b/include/helper.h @@ -137,7 +137,7 @@ void remove_pid_file ( int fd ); * * This functions exits the program with 1 when it finds an invalid configuration. */ -int config_sanity_check ( xcb_connection_t *xcb_connection ); +int config_sanity_check ( void ); /** * @param arg string to parse. diff --git a/include/i3-support.h b/include/i3-support.h index 25e5ef48..cc14e4ea 100644 --- a/include/i3-support.h +++ b/include/i3-support.h @@ -28,7 +28,7 @@ void i3_support_focus_window ( xcb_window_t id ); * @returns TRUE when i3 is running, FALSE when not. */ -int i3_support_initialize ( xcb_connection_t *xcb_connection ); +int i3_support_initialize ( xcb_stuff *xcb ); /** * Cleanup. diff --git a/include/rofi.h b/include/rofi.h index 343e49ac..fc6c2a1c 100644 --- a/include/rofi.h +++ b/include/rofi.h @@ -14,6 +14,7 @@ * @defgroup Main Main * @{ */ + /** * Pointer to xdg cache directory. */ diff --git a/include/view.h b/include/view.h index 758894ef..a266d165 100644 --- a/include/view.h +++ b/include/view.h @@ -90,7 +90,7 @@ void rofi_view_update ( RofiViewState *state ); * * Enables fake transparancy on this view. */ -void rofi_view_setup_fake_transparency ( xcb_connection_t *xcb_connection, xcb_screen_t *xcb_screen, RofiViewState *state ); +void rofi_view_setup_fake_transparency ( RofiViewState *state ); /** * @param state The handle to the view diff --git a/include/x11-helper.h b/include/x11-helper.h index d6479bc6..e75e0643 100644 --- a/include/x11-helper.h +++ b/include/x11-helper.h @@ -21,9 +21,9 @@ * * @returns a newly allocated string with the result or NULL */ -char* window_get_text_prop ( xcb_connection_t *xcb_connection, xcb_window_t w, xcb_atom_t atom ); +char* window_get_text_prop ( xcb_window_t w, xcb_atom_t atom ); -void window_set_atom_prop ( xcb_connection_t *xcb_connection, xcb_window_t w, xcb_atom_t prop, xcb_atom_t *atoms, int count ); +void window_set_atom_prop ( xcb_window_t w, xcb_atom_t prop, xcb_atom_t *atoms, int count ); /** * xcb_window_t info. @@ -47,30 +47,27 @@ typedef struct int l, r, t, b; } workarea; -void monitor_active ( xcb_connection_t *xcb_connection, workarea *mon ); +void monitor_active ( workarea *mon ); // find the dimensions of the monitor displaying point x,y -void monitor_dimensions ( xcb_connection_t *xcb_connection, xcb_screen_t *screen, int x, int y, workarea *mon ); +void monitor_dimensions ( int x, int y, workarea *mon ); // Find the dimensions of the monitor specified by user. -int monitor_get_dimension ( xcb_connection_t *xcb_connection, xcb_screen_t *screen, int monitor, workarea *mon ); -int monitor_get_smallest_size ( xcb_connection_t *xcb_connection ); +int monitor_get_dimension ( int monitor, workarea *mon ); +int monitor_get_smallest_size ( void ); /** - * @param display The display. - * * Release keyboard. */ -void release_keyboard ( xcb_connection_t *xcb_connection ); +void release_keyboard ( void ); /** - * @param display The display. * @param w xcb_window_t we want to grab keyboard on. * * Grab keyboard and mouse. * * @return 1 when keyboard is grabbed, 0 not. */ -int take_keyboard ( xcb_connection_t *xcb_connection, xcb_window_t w ); +int take_keyboard ( xcb_window_t w ); /** * @param mask The mask to canonilize @@ -95,7 +92,7 @@ void x11_parse_key ( char *combo, unsigned int *mod, xkb_keysym_t *key ); * * Set the opacity of the window and sub-windows. */ -void x11_set_window_opacity ( xcb_connection_t *xcb_connection, xcb_window_t box, unsigned int opacity ); +void x11_set_window_opacity ( xcb_window_t box, unsigned int opacity ); /** * Setup several items required. @@ -103,7 +100,7 @@ void x11_set_window_opacity ( xcb_connection_t *xcb_connection, xcb_window_t box * * Numlock detection * * Cache */ -void x11_setup ( xcb_connection_t *xcb_connection, xkb_stuff *xkb ); +void x11_setup ( xkb_stuff *xkb ); extern xcb_depth_t *depth; extern xcb_visualtype_t *visual; @@ -114,7 +111,7 @@ extern xcb_visualtype_t *root_visual; * This function tries to create a 32bit TrueColor colormap. * If this fails, it falls back to the default for the connected display. */ -void x11_create_visual_and_colormap ( xcb_connection_t *xcb_connection, xcb_screen_t *xcb_screen ); +void x11_create_visual_and_colormap ( void ); typedef struct { diff --git a/include/xkb.h b/include/xkb.h index 8e648665..cd415c60 100644 --- a/include/xkb.h +++ b/include/xkb.h @@ -1,6 +1,5 @@ #ifndef ROFI_XKB_H #define ROFI_XKB_H -typedef struct xkb_stuff xkb_stuff; - +typedef struct xkb_stuff xkb_stuff; #endif diff --git a/include/xrmoptions.h b/include/xrmoptions.h index ea8ea758..e8967158 100644 --- a/include/xrmoptions.h +++ b/include/xrmoptions.h @@ -1,5 +1,6 @@ #ifndef ROFI_XRMOPTIONS_H #define ROFI_XRMOPTIONS_H +#include "xcb.h" // Big thanks to Sean Pringle for this code. /** @@ -52,7 +53,7 @@ typedef enum * * @ingroup CONFXServer */ -void config_parse_xresource_options ( xcb_connection_t *xcb_connection, xcb_screen_t *xcb_screen ); +void config_parse_xresource_options ( xcb_stuff *xcb ); /** * @ingroup CONFFile @@ -79,7 +80,7 @@ void config_parse_cmd_options_dynamic ( void ); * * @ingroup CONFXServer */ -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 ); /** * @ingroup CONFFile |