aboutsummaryrefslogtreecommitdiffstats
path: root/calmwm.h
diff options
context:
space:
mode:
authorokan2013-05-23 16:52:39 +0000
committerokan2013-05-23 16:52:39 +0000
commit0e1a282d21c537a3a9f065464a15044befb6f4d1 (patch)
tree800f1952cd32945dea37108928df92ad489a7ab1 /calmwm.h
parent5a8fdbc2af0bc6cb55cda04a3dc9ef09bbb40090 (diff)
downloadcwm-0e1a282d21c537a3a9f065464a15044befb6f4d1.tar.gz
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.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/calmwm.h b/calmwm.h
index b139795..a2f1e97 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: calmwm.h,v 1.209 2013/05/22 16:32:15 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.210 2013/05/23 16:52:39 okan Exp $
*/
#ifndef _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);