radiant/cursor: get the display from the widget, attempt to support multiple displays...

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

diff --git a/libs/gtkutil/cursor.cpp b/libs/gtkutil/cursor.cpp
index 69e95e88aa392c37d9734c0509ed30885cfef143..42b1123ca05cd8f56fe4e30efdd93918e67495fc 100644 (file)
--- a/libs/gtkutil/cursor.cpp
+++ b/libs/gtkutil/cursor.cpp
@@ -27,30 +27,34 @@
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
-
 GdkCursor* create_blank_cursor(){
-       return gdk_cursor_new(GDK_BLANK_CURSOR);
+       return gdk_cursor_new( GDK_BLANK_CURSOR );
 }
 
-void blank_cursor( ui::Widget widget ){
-       GdkCursor* cursor = create_blank_cursor();
-       gdk_window_set_cursor( gtk_widget_get_window(widget), cursor );
+void set_cursor( ui::Widget widget, GdkCursorType cursor_type ){
+       GdkCursor* cursor = gdk_cursor_new( cursor_type );
+       gdk_window_set_cursor( gtk_widget_get_window( widget ), cursor );
        gdk_cursor_unref( cursor );
 }
 
-void default_cursor( ui::Widget widget ){
-       gdk_window_set_cursor( gtk_widget_get_window(widget), 0 );
+void blank_cursor( ui::Widget widget ){
+       set_cursor( widget, GDK_BLANK_CURSOR );
 }
 
+void default_cursor( ui::Widget widget ){
+       gdk_window_set_cursor( gtk_widget_get_window( widget ), NULL );
+}
 
-void Sys_GetCursorPos( ui::Window window, int *x, int *y ){
-       gdk_display_get_pointer( gdk_display_get_default(), 0, x, y, 0 );
+void Sys_GetCursorPos( ui::Widget widget, int *x, int *y ){
+       GdkDisplay *display = gtk_widget_get_display( GTK_WIDGET( widget ) );
+       // No need to store the screen, it will be recovered from widget again.
+       gdk_display_get_pointer( display, NULL, x, y, NULL );
 }
 
-void Sys_SetCursorPos( ui::Window window, int x, int 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 );
+void Sys_SetCursorPos( ui::Widget widget, int x, int y ){
+       GdkDisplay *display = gtk_widget_get_display( GTK_WIDGET( widget ) );
+       GdkScreen *screen = gtk_widget_get_screen( GTK_WIDGET( widget ) );
+       gdk_display_warp_pointer( display, screen, x, y );
 }
 
 gboolean DeferredMotion::gtk_motion(ui::Widget widget, GdkEventMotion *event, DeferredMotion *self)
@@ -62,17 +66,17 @@ gboolean DeferredMotion::gtk_motion(ui::Widget widget, GdkEventMotion *event, De
 gboolean FreezePointer::motion_delta(ui::Widget widget, GdkEventMotion *event, FreezePointer *self)
 {
        int current_x, current_y;
-       Sys_GetCursorPos( ui::Window(GTK_WINDOW( widget )), &current_x, &current_y );
+       Sys_GetCursorPos( widget, &current_x, &current_y );
        int dx = current_x - self->last_x;
        int dy = current_y - self->last_y;
-       int ddx = current_x - self->recorded_x;
-       int ddy = current_y - self->recorded_y;
        self->last_x = current_x;
        self->last_y = current_y;
        if ( dx != 0 || dy != 0 ) {
                //globalOutputStream() << "motion x: " << dx << ", y: " << dy << "\n";
+               int ddx = current_x - self->recorded_x;
+               int ddy = current_y - self->recorded_y;
                if (ddx < -32 || ddx > 32 || ddy < -32 || ddy > 32) {
-                       Sys_SetCursorPos( ui::Window(GTK_WINDOW( widget )), self->recorded_x, self->recorded_y );
+                       Sys_SetCursorPos( widget, self->recorded_x, self->recorded_y );
                        self->last_x = self->recorded_x;
                        self->last_y = self->recorded_y;
                }
@@ -81,7 +85,7 @@ gboolean FreezePointer::motion_delta(ui::Widget widget, GdkEventMotion *event, F
        return FALSE;
 }
 
-void FreezePointer::freeze_pointer(ui::Window window, FreezePointer::MotionDeltaFunction function, void *data)
+void FreezePointer::freeze_pointer(ui::Widget widget, FreezePointer::MotionDeltaFunction function, void *data)
 {
        ASSERT_MESSAGE( m_function == 0, "can't freeze pointer" );
 
@@ -97,12 +101,12 @@ void FreezePointer::freeze_pointer(ui::Window window, FreezePointer::MotionDelta
 
        GdkCursor* cursor = create_blank_cursor();
        //GdkGrabStatus status =
-       gdk_pointer_grab( gtk_widget_get_window(GTK_WIDGET(window)), TRUE, mask, 0, cursor, GDK_CURRENT_TIME );
+       gdk_pointer_grab( gtk_widget_get_window( widget ), TRUE, mask, 0, cursor, GDK_CURRENT_TIME );
        gdk_cursor_unref( cursor );
 
-       Sys_GetCursorPos( window, &recorded_x, &recorded_y );
+       Sys_GetCursorPos( widget, &recorded_x, &recorded_y );
 
-       Sys_SetCursorPos( window, recorded_x, recorded_y );
+       Sys_SetCursorPos( widget, recorded_x, recorded_y );
 
        last_x = recorded_x;
        last_y = recorded_y;
@@ -110,17 +114,17 @@ void FreezePointer::freeze_pointer(ui::Window window, FreezePointer::MotionDelta
        m_function = function;
        m_data = data;
 
-       handle_motion = window.connect( "motion_notify_event", G_CALLBACK( motion_delta ), this );
+       handle_motion = widget.connect( "motion_notify_event", G_CALLBACK( motion_delta ), this );
 }
 
-void FreezePointer::unfreeze_pointer(ui::Window window)
+void FreezePointer::unfreeze_pointer(ui::Widget widget)
 {
-       g_signal_handler_disconnect( G_OBJECT( window ), handle_motion );
+       g_signal_handler_disconnect( G_OBJECT( widget ), handle_motion );
 
        m_function = 0;
        m_data = 0;
 
-       Sys_SetCursorPos( window, recorded_x, recorded_y );
+       Sys_SetCursorPos( widget, recorded_x, recorded_y );
 
        gdk_pointer_ungrab( GDK_CURRENT_TIME );
 }