nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup x.h prototypes

Browse Source
This commit is contained in:
Nikos Tsipinakis 2018-05-06 21:43:34 +03:00
parent 90dd111970
commit adc075bf2c
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/x11/x.c
View File

@ -44,6 +44,9 @@ bool dunst_grab_errored = false;
static bool fullscreen_last = 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 */ /* FIXME refactor setup teardown handlers into one setup and one teardown */
static void x_shortcut_setup_error_handler(void); static void x_shortcut_setup_error_handler(void);
static int x_shortcut_tear_down_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. * Grab the given keyboard shortcut.
*/ */
int x_shortcut_grab(keyboard_shortcut *ks) static int x_shortcut_grab(keyboard_shortcut *ks)
{ {
if (!ks->is_valid) if (!ks->is_valid)
return 1; return 1;
@ -713,7 +716,7 @@ int x_shortcut_grab(keyboard_shortcut *ks)
/* /*
* Ungrab the given keyboard shortcut. * Ungrab the given keyboard shortcut.
*/ */
void x_shortcut_ungrab(keyboard_shortcut *ks) static void x_shortcut_ungrab(keyboard_shortcut *ks)
{ {
Window root; Window root;
root = RootWindow(xctx.dpy, DefaultScreen(xctx.dpy)); root = RootWindow(xctx.dpy, DefaultScreen(xctx.dpy));
@ -726,7 +729,7 @@ void x_shortcut_ungrab(keyboard_shortcut *ks)
/* /*
* Initialize the keyboard shortcut. * 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) if (ks == NULL || ks->str == NULL)
return; return;

11
src/x11/x.h
View File

@ -66,12 +66,6 @@ void x_win_show(void);
void x_win_destroy(window_x11 *win); void x_win_destroy(window_x11 *win);
void x_display_surface(cairo_surface_t *srf, window_x11 *win, const struct dimensions *dim); 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 */ /* X misc */
bool x_is_idle(void); bool x_is_idle(void);
void x_setup(void); void x_setup(void);
@ -79,10 +73,5 @@ void x_free(void);
struct geometry x_parse_geometry(const char *geom_str); 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 #endif
/* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */ /* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */