diff options
author | okan <okan> | 2019-03-04 19:28:17 +0000 |
---|---|---|
committer | okan <okan> | 2019-03-04 19:28:17 +0000 |
commit | 0bda8f76067b737f34c11ef094b349c0c12fe118 (patch) | |
tree | 81fd0a0d76d553fa1635dcdf16a3c30338c45475 /calmwm.h | |
parent | 9d5b0e5d22fca1b6fb37a8df906bdad0317238c9 (diff) | |
download | cwm-0bda8f76067b737f34c11ef094b349c0c12fe118.tar.gz cwm-0bda8f76067b737f34c11ef094b349c0c12fe118.tar.xz cwm-0bda8f76067b737f34c11ef094b349c0c12fe118.zip |
Separate out the menu window from the client resize/move geom window; in each
case, create and destroy on-demand. Isolate more menu specific code.
Diffstat (limited to 'calmwm.h')
-rw-r--r-- | calmwm.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/calmwm.h b/calmwm.h index 32b7341..939f946 100644 --- a/calmwm.h +++ b/calmwm.h @@ -47,9 +47,6 @@ #define BUTTONMASK (ButtonPressMask | ButtonReleaseMask) #define MOUSEMASK (BUTTONMASK | PointerMotionMask) -#define MENUMASK (MOUSEMASK | ButtonMotionMask | KeyPressMask | \ - ExposureMask) -#define MENUGRABMASK (MOUSEMASK | ButtonMotionMask | StructureNotifyMask) #define IGNOREMODMASK (LockMask | Mod2Mask | 0x2000) /* direction/amount */ @@ -229,7 +226,7 @@ struct screen_ctx { struct { Window win; XftDraw *xftdraw; - } menu; + } prop; XftColor xftcolor[CWM_COLOR_NITEMS]; XftFont *xftfont; }; @@ -484,6 +481,12 @@ void screen_init(int); void screen_update_geometry(struct screen_ctx *); void screen_updatestackingorder(struct screen_ctx *); void screen_assert_clients_within(struct screen_ctx *); +void screen_prop_win_create(struct screen_ctx *, Window); +void screen_prop_win_destroy(struct screen_ctx *); +void screen_prop_win_draw(struct screen_ctx *, + const char *, ...) + __attribute__((__format__ (printf, 2, 3))) + __attribute__((__nonnull__ (2))); void kbfunc_cwm_status(void *, struct cargs *); void kbfunc_ptrmove(void *, struct cargs *); @@ -522,10 +525,6 @@ void kbfunc_exec_cmd(void *, struct cargs *); void kbfunc_exec_lock(void *, struct cargs *); void kbfunc_exec_term(void *, struct cargs *); -void menu_windraw(struct screen_ctx *, Window, - const char *, ...) - __attribute__((__format__ (printf, 3, 4))) - __attribute__((__nonnull__ (3))); struct menu *menu_filter(struct screen_ctx *, struct menu_q *, const char *, const char *, int, void (*)(struct menu_q *, struct menu_q *, char *), |