about summary refs log tree commit diff
path: root/calmwm.h
diff options
context:
space:
mode:
authorokan <okan>2013-05-23 16:52:39 +0000
committerokan <okan>2013-05-23 16:52:39 +0000
commitbe1a7a3f5c7c0777ba86d40c49425e97fbae62a1 (patch)
tree6caf5a6701ccfa50641a56cd616770e993ffa822 /calmwm.h
parent7cc1c7344fe74b91e528ea6792318d7af0d833ef (diff)
downloadcwm-be1a7a3f5c7c0777ba86d40c49425e97fbae62a1.tar.gz
cwm-be1a7a3f5c7c0777ba86d40c49425e97fbae62a1.tar.xz
cwm-be1a7a3f5c7c0777ba86d40c49425e97fbae62a1.zip
alter conf_grab(_kbd) to first ungrab AnyKey/AnyModifier, then proceed
to grab keys in keybindingq.  we don't need to ungrab/grab on every
addition to the queue, just once with a complete keybindingq; simplify
grabbing keys per screen (during init) and during a MappingNotify.

while here, change conf_grab_{kbd,mouse} to require only a Window.
Diffstat (limited to 'calmwm.h')
-rw-r--r--calmwm.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/calmwm.h b/calmwm.h
index 16901b3..25eae87 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -435,13 +435,12 @@ void			 conf_bindname(struct conf *, char *, char *);
 void			 conf_clear(struct conf *);
 void			 conf_client(struct client_ctx *);
 void			 conf_cmd_add(struct conf *, char *, char *);
-void			 conf_grab(struct conf *, struct keybinding *);
-void			 conf_grab_mouse(struct client_ctx *);
+void			 conf_grab_kbd(Window);
+void			 conf_grab_mouse(Window);
 void			 conf_init(struct conf *);
 void			 conf_ignore(struct conf *, char *);
 int			 conf_mousebind(struct conf *, char *, char *);
 void			 conf_screen(struct screen_ctx *);
-void			 conf_ungrab(struct conf *, struct keybinding *);
 
 void			 xev_loop(void);
 
@@ -453,7 +452,6 @@ int			 xu_getprop(Window, Atom, Atom, long, u_char **);
 int			 xu_get_wm_state(Window, int *);
 int			 xu_getstrprop(Window, Atom, char **);
 void			 xu_key_grab(Window, u_int, KeySym);
-void			 xu_key_ungrab(Window, u_int, KeySym);
 void			 xu_ptr_getpos(Window, int *, int *);
 int			 xu_ptr_grab(Window, u_int, Cursor);
 int			 xu_ptr_regrab(u_int, Cursor);