From: TimePath Date: Sat, 22 Jul 2017 06:00:29 +0000 (+1000) Subject: Remove from gtkutil/cursor.h X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=2c97d2fff3cc15f282d32b13cf60475a3a514d30 Remove from gtkutil/cursor.h --- diff --git a/libs/gtkutil/cursor.cpp b/libs/gtkutil/cursor.cpp index f123854d..c524e5ea 100644 --- a/libs/gtkutil/cursor.cpp +++ b/libs/gtkutil/cursor.cpp @@ -25,6 +25,7 @@ #include #include +#include GdkCursor* create_blank_cursor(){ @@ -51,3 +52,75 @@ void Sys_SetCursorPos( ui::Window window, int x, int y ){ gdk_display_get_pointer( gdk_display_get_default(), &screen, 0, 0, 0 ); gdk_display_warp_pointer( gdk_display_get_default(), screen, x, y ); } + +gboolean DeferredMotion::gtk_motion(ui::Widget widget, GdkEventMotion *event, DeferredMotion *self) +{ + self->motion( event->x, event->y, event->state ); + return FALSE; +} + +gboolean FreezePointer::motion_delta(ui::Widget widget, GdkEventMotion *event, FreezePointer *self) +{ + int current_x, current_y; + Sys_GetCursorPos( ui::Window(GTK_WINDOW( widget )), ¤t_x, ¤t_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"; + if (ddx < -32 || ddx > 32 || ddy < -32 || ddy > 32) { + Sys_SetCursorPos( ui::Window(GTK_WINDOW( widget )), self->recorded_x, self->recorded_y ); + self->last_x = self->recorded_x; + self->last_y = self->recorded_y; + } + self->m_function( dx, dy, event->state, self->m_data ); + } + return FALSE; +} + +void FreezePointer::freeze_pointer(ui::Window window, FreezePointer::MotionDeltaFunction function, void *data) +{ + ASSERT_MESSAGE( m_function == 0, "can't freeze pointer" ); + + const GdkEventMask mask = static_cast( GDK_POINTER_MOTION_MASK + | GDK_POINTER_MOTION_HINT_MASK + | GDK_BUTTON_MOTION_MASK + | GDK_BUTTON1_MOTION_MASK + | GDK_BUTTON2_MOTION_MASK + | GDK_BUTTON3_MOTION_MASK + | GDK_BUTTON_PRESS_MASK + | GDK_BUTTON_RELEASE_MASK + | GDK_VISIBILITY_NOTIFY_MASK ); + + 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_cursor_unref( cursor ); + + Sys_GetCursorPos( window, &recorded_x, &recorded_y ); + + Sys_SetCursorPos( window, recorded_x, recorded_y ); + + last_x = recorded_x; + last_y = recorded_y; + + m_function = function; + m_data = data; + + handle_motion = g_signal_connect( G_OBJECT( window ), "motion_notify_event", G_CALLBACK( motion_delta ), this ); +} + +void FreezePointer::unfreeze_pointer(ui::Window window) +{ + g_signal_handler_disconnect( G_OBJECT( window ), handle_motion ); + + m_function = 0; + m_data = 0; + + Sys_SetCursorPos( window, recorded_x, recorded_y ); + + gdk_pointer_ungrab( GDK_CURRENT_TIME ); +} diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h index d5d5d339..2af212f4 100644 --- a/libs/gtkutil/cursor.h +++ b/libs/gtkutil/cursor.h @@ -23,12 +23,12 @@ #define INCLUDED_GTKUTIL_CURSOR_H #include -#include #include #include "debugging/debugging.h" typedef struct _GdkCursor GdkCursor; +typedef struct _GdkEventMotion GdkEventMotion; GdkCursor* create_blank_cursor(); void blank_cursor( ui::Widget widget ); @@ -64,10 +64,7 @@ void motion( gdouble x, gdouble y, guint state ){ m_handler = g_idle_add( (GSourceFunc)deferred, this ); } } -static gboolean gtk_motion( ui::Widget widget, GdkEventMotion *event, DeferredMotion* self ){ - self->motion( event->x, event->y, event->state ); - return FALSE; -} +static gboolean gtk_motion( ui::Widget widget, GdkEventMotion *event, DeferredMotion* self ); }; class DeferredMotionDelta @@ -118,68 +115,11 @@ void* m_data; public: FreezePointer() : handle_motion( 0 ), m_function( 0 ), m_data( 0 ){ } -static gboolean motion_delta( ui::Widget widget, GdkEventMotion *event, FreezePointer* self ){ - int current_x, current_y; - Sys_GetCursorPos( ui::Window(GTK_WINDOW( widget )), ¤t_x, ¤t_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"; - if (ddx < -32 || ddx > 32 || ddy < -32 || ddy > 32) { - Sys_SetCursorPos( ui::Window(GTK_WINDOW( widget )), self->recorded_x, self->recorded_y ); - self->last_x = self->recorded_x; - self->last_y = self->recorded_y; - } - self->m_function( dx, dy, event->state, self->m_data ); - } - return FALSE; -} - -void freeze_pointer( ui::Window window, MotionDeltaFunction function, void* data ){ - ASSERT_MESSAGE( m_function == 0, "can't freeze pointer" ); - - const GdkEventMask mask = static_cast( GDK_POINTER_MOTION_MASK - | GDK_POINTER_MOTION_HINT_MASK - | GDK_BUTTON_MOTION_MASK - | GDK_BUTTON1_MOTION_MASK - | GDK_BUTTON2_MOTION_MASK - | GDK_BUTTON3_MOTION_MASK - | GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_VISIBILITY_NOTIFY_MASK ); - - 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_cursor_unref( cursor ); - - Sys_GetCursorPos( window, &recorded_x, &recorded_y ); +static gboolean motion_delta( ui::Widget widget, GdkEventMotion *event, FreezePointer* self ); - Sys_SetCursorPos( window, recorded_x, recorded_y ); +void freeze_pointer( ui::Window window, MotionDeltaFunction function, void* data ); - last_x = recorded_x; - last_y = recorded_y; - - m_function = function; - m_data = data; - - handle_motion = g_signal_connect( G_OBJECT( window ), "motion_notify_event", G_CALLBACK( motion_delta ), this ); -} - -void unfreeze_pointer( ui::Window window ){ - g_signal_handler_disconnect( G_OBJECT( window ), handle_motion ); - - m_function = 0; - m_data = 0; - - Sys_SetCursorPos( window, recorded_x, recorded_y ); - - gdk_pointer_ungrab( GDK_CURRENT_TIME ); -} +void unfreeze_pointer( ui::Window window ); }; #endif