all repos — openbox @ fcdcd0fab4141d2d8bc1c156096ac5dbedbeaf61

openbox fork - make it a bit more like ryudo

match the func prototypes in the header
Dana Jansens danakj@orodu.net
commit

fcdcd0fab4141d2d8bc1c156096ac5dbedbeaf61

parent

78507f20c3f026c741cfb08870f461f1bbc0270c

1 files changed, 8 insertions(+), 3 deletions(-)

jump to
M openbox/grab.copenbox/grab.c

@@ -1,3 +1,4 @@

+#include "grab.h" #include "openbox.h" #include "event.h" #include "xerror.h"

@@ -76,7 +77,7 @@ }

return ret; } -int grab_server(gboolean grab) +gint grab_server(gboolean grab) { static guint sgrabs = 0; if (grab) {

@@ -93,10 +94,12 @@ }

return sgrabs; } -void grab_startup() +void grab_startup(gboolean reconfig) { guint i = 0; + if (reconfig) return; + mask_list[i++] = 0; mask_list[i++] = LockMask; mask_list[i++] = NumLockMask;

@@ -108,8 +111,10 @@ mask_list[i++] = ScrollLockMask | LockMask | NumLockMask;

g_assert(i == MASK_LIST_SIZE); } -void grab_shutdown() +void grab_shutdown(gboolean reconfig) { + if (reconfig) return; + while (grab_keyboard(FALSE)); while (grab_pointer(FALSE, OB_CURSOR_NONE)); while (grab_pointer_window(FALSE, OB_CURSOR_NONE, None));