Merge branch 'master' into chaz

[chaz/openbox] / openbox / grab.h

diff --git a/openbox/grab.h b/openbox/grab.h
index 088d2d6c792f2691f9438ac6deb4472a5d128aca..c4fe17c2a5918c95fc50c3669e240275db0eb1ae 100644 (file)
--- a/openbox/grab.h
+++ b/openbox/grab.h
@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    grab.h for the Openbox window manager
-   Copyright (c) 2003        Ben Jansens
+   Copyright (c) 2003-2007   Dana Jansens
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@
 #define __grab_h
 
 #include "misc.h"
+#include "obt/keyboard.h"
 
 #include <glib.h>
 #include <X11/Xlib.h>
@@ -27,14 +28,22 @@
 void grab_startup(gboolean reconfig);
 void grab_shutdown(gboolean reconfig);
 
-gboolean grab_keyboard(gboolean grab);
-gboolean grab_pointer(gboolean grab, gboolean owner_events, ObCursor cur);
+ObtIC *grab_input_context(void);
+
+gboolean grab_keyboard_full(gboolean grab);
+/*! @param confine If true the pointer is confined to the screen */
+gboolean grab_pointer_full(gboolean grab, gboolean owner_events,
+                           gboolean confine, ObCursor cur);
 gint grab_server(gboolean grab);
 
-gboolean grab_on_keyboard();
-gboolean grab_on_pointer();
+#define grab_keyboard() grab_keyboard_full(TRUE)
+#define ungrab_keyboard() grab_keyboard_full(FALSE)
+#define grab_pointer(o,c,u) grab_pointer_full(TRUE, (o), (c), (u))
+#define ungrab_pointer() grab_pointer_full(FALSE, FALSE, FALSE, OB_CURSOR_NONE)
+
+gboolean grab_on_keyboard(void);
+gboolean grab_on_pointer(void);
 
-void grab_button(guint button, guint state, Window win, guint mask);
 void grab_button_full(guint button, guint state, Window win, guint mask,
                       gint pointer_mode, ObCursor cursor);
 void ungrab_button(guint button, guint state, Window win);
@@ -43,4 +52,7 @@ void grab_key(guint keycode, guint state, Window win, gint keyboard_mode);
 
 void ungrab_all_keys(Window win);
 
+void grab_key_passive_count(int change);
+void ungrab_passive_key(void);
+
 #endif