From: Dana Jansens <danakj@orodu.net>
Date: Wed, 3 Sep 2003 20:34:43 +0000 (+0000)
Subject: use the NONE cursor when not specifying one
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=ed9dc5dc788e3d0e79fa5010265ba9ce57ea6859;p=chaz%2Fopenbox

use the NONE cursor when not specifying one
---

diff --git a/openbox/grab.c b/openbox/grab.c
index 599fb681..5df654c6 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -111,8 +111,8 @@ void grab_startup()
 void grab_shutdown()
 {
     while (grab_keyboard(FALSE));
-    while (grab_pointer(FALSE, None));
-    while (grab_pointer_window(FALSE, None, None));
+    while (grab_pointer(FALSE, OB_CURSOR_NONE));
+    while (grab_pointer_window(FALSE, OB_CURSOR_NONE, None));
     while (grab_server(FALSE));
 }
 
@@ -133,7 +133,7 @@ void grab_button_full(guint button, guint state, Window win, guint mask,
 
 void grab_button(guint button, guint state, Window win, guint mask)
 {
-    grab_button_full(button, state, win, mask, GrabModeAsync, None);
+    grab_button_full(button, state, win, mask, GrabModeAsync, OB_CURSOR_NONE);
 }
 
 void ungrab_button(guint button, guint state, Window win)
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 030f38bd..6671107c 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -564,7 +564,7 @@ void menu_frame_show(ObMenuFrame *self, ObMenuFrame *parent)
 
     if (menu_frame_visible == NULL) {
         /* no menus shown yet */
-        grab_pointer(TRUE, None);
+        grab_pointer(TRUE, OB_CURSOR_NONE);
         grab_keyboard(TRUE);
     }
 
@@ -605,7 +605,7 @@ void menu_frame_hide(ObMenuFrame *self)
 
     if (menu_frame_visible == NULL) {
         /* last menu shown */
-        grab_pointer(FALSE, None);
+        grab_pointer(FALSE, OB_CURSOR_NONE);
         grab_keyboard(FALSE);
     }