Merge branch 'mschwan/gdef-inline-fix' into 'master'

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

diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h
index b3cfe080f8676c10ea8010ce60fb27fa01fa992f..2d16142eb9f71134c1bb93ae384632024c837565 100644 (file)
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -22,22 +22,18 @@
 #if !defined( INCLUDED_GTKUTIL_CURSOR_H )
 #define INCLUDED_GTKUTIL_CURSOR_H
 
-#include <glib.h>
-#include <gdk/gdkevents.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <uilib/uilib.h>
 
 #include "debugging/debugging.h"
 
 typedef struct _GdkCursor GdkCursor;
-typedef struct _GtkWidget GtkWidget;
-typedef struct _GtkWindow GtkWindow;
+typedef struct _GdkEventMotion GdkEventMotion;
 
 GdkCursor* create_blank_cursor();
-void blank_cursor( GtkWidget* widget );
-void default_cursor( GtkWidget* widget );
-void Sys_GetCursorPos( GtkWindow* window, int *x, int *y );
-void Sys_SetCursorPos( GtkWindow* window, int x, int y );
+void blank_cursor( ui::Widget widget );
+void default_cursor( ui::Widget widget );
+void Sys_GetCursorPos( ui::Window window, int *x, int *y );
+void Sys_SetCursorPos( ui::Window window, int x, int y );
 
 
 
@@ -67,10 +63,7 @@ void motion( gdouble x, gdouble y, guint state ){
                m_handler = g_idle_add( (GSourceFunc)deferred, this );
        }
 }
-static gboolean gtk_motion( GtkWidget *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
@@ -114,64 +107,18 @@ void motion_delta( int x, int y, unsigned int state ){
 class FreezePointer
 {
 unsigned int handle_motion;
-int recorded_x, recorded_y;
+int recorded_x, recorded_y, last_x, last_y;
 typedef void ( *MotionDeltaFunction )( int x, int y, unsigned int state, void* data );
 MotionDeltaFunction m_function;
 void* m_data;
 public:
 FreezePointer() : handle_motion( 0 ), m_function( 0 ), m_data( 0 ){
 }
-static gboolean motion_delta( GtkWidget *widget, GdkEventMotion *event, FreezePointer* self ){
-       int current_x, current_y;
-       Sys_GetCursorPos( GTK_WINDOW( widget ), &current_x, &current_y );
-       int dx = current_x - self->recorded_x;
-       int dy = current_y - self->recorded_y;
-       if ( dx != 0 || dy != 0 ) {
-               //globalOutputStream() << "motion x: " << dx << ", y: " << dy << "\n";
-               Sys_SetCursorPos( GTK_WINDOW( widget ), self->recorded_x, self->recorded_y );
-               self->m_function( dx, dy, event->state, self->m_data );
-       }
-       return FALSE;
-}
-
-void freeze_pointer( GtkWindow* window, MotionDeltaFunction function, void* data ){
-       ASSERT_MESSAGE( m_function == 0, "can't freeze pointer" );
-
-       const GdkEventMask mask = static_cast<GdkEventMask>( 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( window )->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 );
-
-       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( GtkWindow* window ){
-       g_signal_handler_disconnect( G_OBJECT( window ), handle_motion );
+static gboolean motion_delta( ui::Window widget, GdkEventMotion *event, FreezePointer* self );
 
-       m_function = 0;
-       m_data = 0;
+void freeze_pointer( ui::Window window, MotionDeltaFunction function, void* data );
 
-       Sys_SetCursorPos( window, recorded_x, recorded_y );
-
-       gdk_pointer_ungrab( GDK_CURRENT_TIME );
-}
+void unfreeze_pointer( ui::Window window );
 };
 
 #endif