Radiant:

[xonotic/netradiant.git] / libs / gtkutil / cursor.cpp

diff --git a/libs/gtkutil/cursor.cpp b/libs/gtkutil/cursor.cpp
index 6005bf1f8dae372696c8ecc6b6c76d58bb8ddaf0..ae19afe03d6866b58d093b48bb5af1bbb56507d8 100644 (file)
--- a/libs/gtkutil/cursor.cpp
+++ b/libs/gtkutil/cursor.cpp
@@ -27,7 +27,7 @@
 #include <gdk/gdkcursor.h>
 #include <gdk/gdkpixmap.h>
 
-
+#if 0
 GdkCursor* create_blank_cursor(){
        GdkPixmap *pixmap;
        GdkBitmap *mask;
@@ -53,38 +53,15 @@ void blank_cursor( GtkWidget* widget ){
 void default_cursor( GtkWidget* widget ){
        gdk_window_set_cursor( widget->window, 0 );
 }
+#endif
 
 
-#if defined( WIN32 )
-
-#include <gdk/gdkwin32.h>
-
-void Sys_GetCursorPos( GtkWindow* window, int *x, int *y ){
-       POINT pos;
-       GetCursorPos( &pos );
-       ScreenToClient( (HWND)GDK_WINDOW_HWND( GTK_WIDGET( window )->window ), &pos );
-       *x = pos.x;
-       *y = pos.y;
-}
-
-void Sys_SetCursorPos( GtkWindow* window, int x, int y ){
-       POINT pos;
-       pos.x = x;
-       pos.y = y;
-       ClientToScreen( (HWND)GDK_WINDOW_HWND( GTK_WIDGET( window )->window ), &pos );
-       SetCursorPos( pos.x, pos.y );
-}
-
-#else
-
-#include <gdk/gdkx.h>
-
 void Sys_GetCursorPos( GtkWindow* window, int *x, int *y ){
        gdk_display_get_pointer( gdk_display_get_default(), 0, x, y, 0 );
 }
 
 void Sys_SetCursorPos( GtkWindow* window, int x, int y ){
-       XWarpPointer( GDK_DISPLAY(), None, GDK_ROOT_WINDOW(), 0, 0, 0, 0, x, y );
+       GdkScreen *screen;
+       gdk_display_get_pointer( gdk_display_get_default(), &screen, 0, 0, 0 );
+       gdk_display_warp_pointer( gdk_display_get_default(), screen, x, y );
 }
-
-#endif