diff --git a/src/x11/x.c b/src/x11/x.c index fdfe33c..c10574e 100644 --- a/src/x11/x.c +++ b/src/x11/x.c @@ -44,6 +44,9 @@ bool dunst_grab_errored = false; static bool fullscreen_last = false; +static void x_shortcut_init(keyboard_shortcut *ks); +static int x_shortcut_grab(keyboard_shortcut *ks); +static void x_shortcut_ungrab(keyboard_shortcut *ks); /* FIXME refactor setup teardown handlers into one setup and one teardown */ static void x_shortcut_setup_error_handler(void); static int x_shortcut_tear_down_error_handler(void); @@ -676,7 +679,7 @@ static int x_shortcut_tear_down_error_handler(void) /* * Grab the given keyboard shortcut. */ -int x_shortcut_grab(keyboard_shortcut *ks) +static int x_shortcut_grab(keyboard_shortcut *ks) { if (!ks->is_valid) return 1; @@ -713,7 +716,7 @@ int x_shortcut_grab(keyboard_shortcut *ks) /* * Ungrab the given keyboard shortcut. */ -void x_shortcut_ungrab(keyboard_shortcut *ks) +static void x_shortcut_ungrab(keyboard_shortcut *ks) { Window root; root = RootWindow(xctx.dpy, DefaultScreen(xctx.dpy)); @@ -726,7 +729,7 @@ void x_shortcut_ungrab(keyboard_shortcut *ks) /* * Initialize the keyboard shortcut. */ -void x_shortcut_init(keyboard_shortcut *ks) +static void x_shortcut_init(keyboard_shortcut *ks) { if (ks == NULL || ks->str == NULL) return; diff --git a/src/x11/x.h b/src/x11/x.h index ef1c412..dc1f29a 100644 --- a/src/x11/x.h +++ b/src/x11/x.h @@ -66,12 +66,6 @@ void x_win_show(void); void x_win_destroy(window_x11 *win); void x_display_surface(cairo_surface_t *srf, window_x11 *win, const struct dimensions *dim); -/* shortcut */ -void x_shortcut_init(keyboard_shortcut *shortcut); -void x_shortcut_ungrab(keyboard_shortcut *ks); -int x_shortcut_grab(keyboard_shortcut *ks); -KeySym x_shortcut_string_to_mask(const char *str); - /* X misc */ bool x_is_idle(void); void x_setup(void); @@ -79,10 +73,5 @@ void x_free(void); struct geometry x_parse_geometry(const char *geom_str); -gboolean x_mainloop_fd_dispatch(GSource *source, GSourceFunc callback, - gpointer user_data); -gboolean x_mainloop_fd_check(GSource *source); -gboolean x_mainloop_fd_prepare(GSource *source, gint *timeout); - #endif /* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */