X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=b4c192b0bfdde8151271fdf9b50d136fe8aa3661;hb=d3d4aa29871111737a4f6985da695c8688a05270;hp=e2784a2d3d578a46e235b07121fad6df33a3ebf3;hpb=e2f3c002248193d800941500c66e7b4c69b26a10;p=chaz%2Fopenbox

diff --git a/openbox/grab.c b/openbox/grab.c
index e2784a2d..b4c192b0 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    grab.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -31,7 +32,7 @@
 #define MASK_LIST_SIZE 8
 
 /*! A list of all possible combinations of keyboard lock masks */
-static unsigned int mask_list[MASK_LIST_SIZE];
+static guint mask_list[MASK_LIST_SIZE];
 static guint kgrabs = 0;
 static guint pgrabs = 0;
 
@@ -75,7 +76,7 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
         if (pgrabs++ == 0) {
             ret = XGrabPointer(ob_display, screen_support_win,
                                False, GRAB_PTR_MASK, GrabModeAsync,
-                               GrabModeAsync, FALSE,
+                               GrabModeAsync, None,
                                ob_cursor(cur), event_lasttime) == Success;
             if (!ret)
                 --pgrabs;
@@ -97,7 +98,7 @@ gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
     if (grab) {
         if (pgrabs++ == 0) {
             ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
-                               GrabModeAsync, GrabModeAsync, TRUE,
+                               GrabModeAsync, GrabModeAsync, None,
                                ob_cursor(cur),
                                event_lasttime) == Success;
             if (!ret)
@@ -158,7 +159,7 @@ void grab_shutdown(gboolean reconfig)
 }
 
 void grab_button_full(guint button, guint state, Window win, guint mask,
-                      int pointer_mode, ObCursor cur)
+                      gint pointer_mode, ObCursor cur)
 {
     guint i;
 
@@ -185,7 +186,7 @@ void ungrab_button(guint button, guint state, Window win)
         XUngrabButton(ob_display, button, state | mask_list[i], win);
 }
 
-void grab_key(guint keycode, guint state, Window win, int keyboard_mode)
+void grab_key(guint keycode, guint state, Window win, gint keyboard_mode)
 {
     guint i;