Merge commit '9d6e27e4e37e7406e8691594fb0b74aab89e954b' into garux-merge

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

diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h
index 0a6a495d61c5c4e19b330131f690428fe74deb78..3b873db4f92e88fffc0b1a8e087c51282148a1aa 100644 (file)
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -22,25 +22,20 @@
 #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 <gtk/gtkmain.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;
 
 #if 0
 GdkCursor* create_blank_cursor();
-void blank_cursor( GtkWidget* widget );
-void default_cursor( GtkWidget* widget );
+void blank_cursor( ui::Widget widget );
+void default_cursor( ui::Widget widget );
 #endif
-void Sys_GetCursorPos( GtkWindow* window, int *x, int *y );
-void Sys_SetCursorPos( GtkWindow* window, int x, int y );
+void Sys_GetCursorPos( ui::Window window, int *x, int *y );
+void Sys_SetCursorPos( ui::Window window, int x, int y );
 
 
 
@@ -70,10 +65,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
@@ -125,83 +117,11 @@ 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->last_x;
-       int dy = current_y - self->last_y;
-       int ddx = current_x - self->center_x;
-       int ddy = current_y - self->center_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( GTK_WINDOW( widget ), self->center_x, self->center_y );
-                       self->last_x = self->center_x;
-                       self->last_y = self->center_y;
-               }
-               self->m_function( dx, dy, event->state, self->m_data );
-       }
-       return FALSE;
-}
-
-void freeze_pointer( GtkWindow* window, GtkWidget* widget, 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 = gdk_cursor_new( GDK_BLANK_CURSOR );
-       //GdkCursor* cursor = create_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( window )->window, 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 );
-       weedjet = widget;
-
-       gdk_cursor_unref( cursor );
-
-       Sys_GetCursorPos( window, &recorded_x, &recorded_y );
+static gboolean motion_delta( ui::Window widget, GdkEventMotion *event, FreezePointer* self );
 
-       /*      using center for tracking for max safety        */
-       gdk_window_get_origin( widget->window, &center_x, &center_y );
-       center_y += widget->allocation.height / 2;
-       center_x += widget->allocation.width / 2;
+void freeze_pointer( ui::Window window, MotionDeltaFunction function, void* data );
 
-       Sys_SetCursorPos( window, center_x, center_y );
-
-       last_x = center_x;
-       last_y = center_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 );
-
-       m_function = 0;
-       m_data = 0;
-
-       Sys_SetCursorPos( window, recorded_x, recorded_y );
-
-//     gdk_window_set_cursor( GTK_WIDGET( window )->window, 0 );
-       gdk_pointer_ungrab( GDK_CURRENT_TIME );
-       gtk_grab_remove( weedjet );
-}
+void unfreeze_pointer( ui::Window window );
 };
 
 #endif