- Change gtktoxevent API to be GdkScreen and therefore multiscreen compliant

- Modify xfwm4 to be compatible with the gtktoxevent API change (make sure you update both libxfcegui4 *and* xfwm4 at the same time!)
- Code cleanup in xfwm4; move global variables in a dynamically allocated structure.


(Old svn revision: 11770)

1 files changed, 17 insertions, 18 deletions

diff --git a/src/spinning_cursor.c b/src/spinning_cursor.c
index 5227f1ba6..fbf88dfde 100644
--- a/src/spinning_cursor.c
+++ b/src/spinning_cursor.c
@@ -1,20 +1,20 @@
 /*
-	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
-	the Free Software Foundation; You may only use version 2 of the License,
-	you have no option to use any other version.
+        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
+        the Free Software Foundation; You may only use version 2 of the License,
+        you have no option to use any other version.
  
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+        GNU General Public License for more details.
  
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  
-	mozilla  - (c) 1998 mozilla.org
-	xfwm4    - (c) 2003 Olivier Fourdan
+        mozilla  - (c) 1998 mozilla.org
+        xfwm4    - (c) 2003 Olivier Fourdan
  
  */
 
@@ -23,7 +23,6 @@
 #endif
 
 #include <X11/Xlib.h>
-#include "main.h"
 
 static const unsigned char xlib_spinning_bits[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
@@ -74,11 +73,11 @@ cursorCreateSpinning (Display * dpy, Window window)
     bg.flags = 0xf;
 
     cursor =
-	XCreatePixmapFromBitmapData (dpy, window, (char *) xlib_spinning_bits,
-	32, 32, 0xffffffff, 0x0, 1);
+        XCreatePixmapFromBitmapData (dpy, window, (char *) xlib_spinning_bits,
+        32, 32, 0xffffffff, 0x0, 1);
     mask =
-	XCreatePixmapFromBitmapData (dpy, window,
-	(char *) xlib_spinning_mask_bits, 32, 32, 0xffffffff, 0x0, 1);
+        XCreatePixmapFromBitmapData (dpy, window,
+        (char *) xlib_spinning_mask_bits, 32, 32, 0xffffffff, 0x0, 1);
     xcursor = XCreatePixmapCursor (dpy, cursor, mask, &fg, &bg, 2, 2);
     XFreePixmap (dpy, mask);
     XFreePixmap (dpy, cursor);