Merge commit 'e155ebe99481333af4a7660d174db490e2a75fb5' into master-merge

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

diff --git a/libs/gtkutil/cursor.cpp b/libs/gtkutil/cursor.cpp
index 46f227fce03c65ea49abf02e843481852a3acd52..445fb18361e34bcc230a886a89dd84acaf24b505 100644 (file)
--- a/libs/gtkutil/cursor.cpp
+++ b/libs/gtkutil/cursor.cpp
@@ -95,6 +95,13 @@ gboolean FreezePointer::motion_delta(ui::Widget widget, GdkEventMotion *event, F
        Sys_GetCursorPos( widget, &current_x, &current_y );
        int dx = current_x - self->last_x;
        int dy = current_y - self->last_y;
+#if 0 // NetRadiantCustom
+       int ddx = current_x - self->center_x;
+       int ddy = current_y - self->center_y;
+#else
+       int ddx = current_x - self->recorded_x;
+       int ddy = current_y - self->recorded_y;
+#endif
        self->last_x = current_x;
        self->last_y = current_y;
        if ( dx != 0 || dy != 0 ) {
@@ -106,7 +113,6 @@ gboolean FreezePointer::motion_delta(ui::Widget widget, GdkEventMotion *event, F
 
                gdk_window_get_origin( gtk_widget_get_window( widget ), &window_x, &window_y);
 
-
                translated_x = current_x - ( window_x );
                translated_y = current_y - ( window_y );
 
@@ -160,12 +166,16 @@ gboolean FreezePointer::motion_delta(ui::Widget widget, GdkEventMotion *event, F
                        self->last_y = reposition_y;
                }
 #else
-               int ddx = current_x - self->recorded_x;
-               int ddy = current_y - self->recorded_y;
                if (ddx < -32 || ddx > 32 || ddy < -32 || ddy > 32) {
+#if 0 // NetRadiantCustom
+                       Sys_SetCursorPos( widget, self->center_x, self->center_y );
+                       self->last_x = self->center_x;
+                       self->last_y = self->center_y;
+#else
                        Sys_SetCursorPos( widget, self->recorded_x, self->recorded_y );
                        self->last_x = self->recorded_x;
                        self->last_y = self->recorded_y;
+#endif
                }
 #endif
                self->m_function( dx, dy, event->state, self->m_data );
@@ -173,7 +183,8 @@ gboolean FreezePointer::motion_delta(ui::Widget widget, GdkEventMotion *event, F
        return FALSE;
 }
 
-// Note: NetRadiantCustom pass both parent and widget.
+/* NetRadiantCustom did this instead:
+void FreezePointer::freeze_pointer(ui::Window window, ui::Widget widget, FreezePointer::MotionDeltaFunction function, void *data) */
 void FreezePointer::freeze_pointer(ui::Widget widget, FreezePointer::MotionDeltaFunction function, void *data)
 {
        /* FIXME: This bug can happen if the pointer goes outside of the
@@ -213,18 +224,42 @@ void FreezePointer::freeze_pointer(ui::Widget widget, FreezePointer::MotionDelta
        third-party updates that may fix the mouse pointer
        visibility issue. */
 #else
-       GdkCursor* cursor = create_blank_cursor();
+#if 0 // NetRadiantCustom
+       //GdkCursor* cursor = create_blank_cursor();
+       GdkCursor* cursor = gdk_cursor_new( GDK_BLANK_CURSOR );
        //GdkGrabStatus status =
+       /*      fixes cursor runaways during srsly quick drags in camera
+       drags with pressed buttons have no problem at all w/o this      */
+       gdk_pointer_grab( gtk_widget_get_window( widget ), TRUE, mask, 0, cursor, GDK_CURRENT_TIME );
+       //gdk_window_set_cursor ( GTK_WIDGET( window )->window, cursor );
+       /*      is needed to fix activating neighbour widgets, that happens, if using upper one */
+       gtk_grab_add( widget );
+       m_weedjet = widget;
+#else
+       GdkCursor* cursor = create_blank_cursor();
+       //GdkGrabStatus status =
        gdk_pointer_grab( gtk_widget_get_window( widget ), TRUE, mask, 0, cursor, GDK_CURRENT_TIME );
        gdk_cursor_unref( cursor );
+#endif
 #endif
 
        Sys_GetCursorPos( widget, &recorded_x, &recorded_y );
 
-       Sys_SetCursorPos( widget, recorded_x, recorded_y );
+#if 0 // NetRadiantCustom
+       /*      using center for tracking for max safety        */
+       gdk_window_get_origin( GTK_WIDGET( widget )->window, &center_x, &center_y );
+       auto allocation = widget.dimensions();
+       center_y += allocation.height / 2;
+       center_x += allocation.width / 2;
+
+       Sys_SetCursorPos( widget, center_x, center_y );
 
+       last_x = center_x;
+       last_y = center_y;
+#else
        last_x = recorded_x;
        last_y = recorded_y;
+#endif
 
        m_function = function;
        m_data = data;
@@ -232,7 +267,8 @@ void FreezePointer::freeze_pointer(ui::Widget widget, FreezePointer::MotionDelta
        handle_motion = widget.connect( "motion_notify_event", G_CALLBACK( motion_delta ), this );
 }
 
-void FreezePointer::unfreeze_pointer(ui::Widget widget)
+// Only NetRadiantCustom uses centerize code.
+void FreezePointer::unfreeze_pointer(ui::Widget widget, bool centerize)
 {
        g_signal_handler_disconnect( G_OBJECT( widget ), handle_motion );
 
@@ -243,9 +279,26 @@ void FreezePointer::unfreeze_pointer(ui::Widget widget)
        /* The pointer was visible during all the move operation,
        so, keep the current position. */
 #else
-       // Note: NetRadiantCustom still uses window instead of widget.
+       // NetRadiantCustom still uses window instead of widget.
+#if 0 // NetRadiantCustom
+       if ( centerize ){
+               Sys_SetCursorPos( window, center_x, center_y );
+       }
+       else{
+               Sys_SetCursorPos( window, recorded_x, recorded_y );
+       }
+#else
        Sys_SetCursorPos( widget, recorded_x, recorded_y );
 #endif
+#endif
 
+//     gdk_window_set_cursor( GTK_WIDGET( window )->window, 0 );
        gdk_pointer_ungrab( GDK_CURRENT_TIME );
+
+#if 0 // NetRadiantCustom
+       if ( m_weedjet )
+       {
+               gtk_grab_remove( m_weedjet );
+       }
+#endif
 }