diff options
author | oga <oga> | 2008-05-20 14:50:51 +0000 |
---|---|---|
committer | oga <oga> | 2008-05-20 14:50:51 +0000 |
commit | 1e46ba72f706d7ab2b0f7a6a14054b908348d10e (patch) | |
tree | 0efe57cdad018b6a29f0c0b65113ef08589f953d /calmwm.h | |
parent | 3bb0b451f78d13b4624e52b726f51e4847a84a2f (diff) | |
download | cwm-1e46ba72f706d7ab2b0f7a6a14054b908348d10e.tar.gz cwm-1e46ba72f706d7ab2b0f7a6a14054b908348d10e.tar.xz cwm-1e46ba72f706d7ab2b0f7a6a14054b908348d10e.zip |
Pull out the behaviour in grab_label and search_start into one utility
function menu_filter(). The plan is to eventually merge in grab_menu too. Shrinks the code a fair bit. Also, change XMaskEvent for XWindowEvent to prevent getting exposes for other windows. This is particuarly noticable on slow machines with a LOT of xterms (todd, you're an odd man). ok okan@, todd@.
Diffstat (limited to 'calmwm.h')
-rw-r--r-- | calmwm.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/calmwm.h b/calmwm.h index fa49d6c..e1a5b0e 100644 --- a/calmwm.h +++ b/calmwm.h @@ -60,7 +60,6 @@ struct screen_ctx { u_int which; Window rootwin; Window menuwin; - Window searchwin; Colormap colormap; XColor bgcolor, fgcolor, fccolor, redcolor, cyancolor, whitecolor, blackcolor; @@ -72,13 +71,13 @@ struct screen_ctx { int altpersist; - int maxinitialised; int xmax; int ymax; struct cycle_entry_q mruq; struct fonthash fonthash; + u_int fontheight; XftDraw *xftdraw; XftColor xftcolor; }; @@ -354,6 +353,10 @@ void client_gethints(struct client_ctx *); void client_freehints(struct client_ctx *); void client_do_shape(struct client_ctx *); +struct menu *menu_filter(struct menu_q *, char *, char *, int, + void (*)(struct menu_q *, struct menu_q *, char *), + void (*)(struct menu *, int)); + void xev_handle_maprequest(struct xevent *, XEvent *); void xev_handle_unmapnotify(struct xevent *, XEvent *); void xev_handle_destroynotify(struct xevent *, XEvent *); @@ -449,11 +452,6 @@ void kbfunc_ssh(struct client_ctx *, void *); void kbfunc_term(struct client_ctx *, void *); void kbfunc_lock(struct client_ctx *, void *); -void search_init(struct screen_ctx *); -struct menu *search_start(struct menu_q *, - void (*)(struct menu_q *, struct menu_q *, char *), - void (*)(struct menu *, int), - char *, int); void search_match_client(struct menu_q *, struct menu_q *, char *); void search_print_client(struct menu *, int); |