Fix MSYS2 issues

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

diff --git a/libs/gtkutil/cursor.cpp b/libs/gtkutil/cursor.cpp
index f0538a5089963bad6a1c7f5279b2bce7c73c4daa..69e95e88aa392c37d9734c0509ed30885cfef143 100644 (file)
--- a/libs/gtkutil/cursor.cpp
+++ b/libs/gtkutil/cursor.cpp
@@ -24,43 +24,103 @@
 #include "stream/textstream.h"
 
 #include <string.h>
 #include "stream/textstream.h"
 
 #include <string.h>

-#include <gdk/gdkcursor.h>
-#include <gdk/gdkpixmap.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>

 
 
 GdkCursor* create_blank_cursor(){
 
 
 GdkCursor* create_blank_cursor(){

-       GdkPixmap *pixmap;
-       GdkBitmap *mask;
-       char buffer [( 32 * 32 ) / 8];
-       memset( buffer, 0, ( 32 * 32 ) / 8 );
-       GdkColor white = {0, 0xffff, 0xffff, 0xffff};
-       GdkColor black = {0, 0x0000, 0x0000, 0x0000};
-       pixmap = gdk_bitmap_create_from_data( 0, buffer, 32, 32 );
-       mask   = gdk_bitmap_create_from_data( 0, buffer, 32, 32 );
-       GdkCursor *cursor = gdk_cursor_new_from_pixmap( pixmap, mask, &white, &black, 1, 1 );
-       gdk_drawable_unref( pixmap );
-       gdk_drawable_unref( mask );
-
-       return cursor;
+       return gdk_cursor_new(GDK_BLANK_CURSOR);

 }
 
 }
 

-void blank_cursor( GtkWidget* widget ){
+void blank_cursor( ui::Widget widget ){

        GdkCursor* cursor = create_blank_cursor();
        GdkCursor* cursor = create_blank_cursor();

-       gdk_window_set_cursor( widget->window, cursor );
+       gdk_window_set_cursor( gtk_widget_get_window(widget), cursor );

        gdk_cursor_unref( cursor );
 }
 
        gdk_cursor_unref( cursor );
 }
 

-void default_cursor( GtkWidget* widget ){
-       gdk_window_set_cursor( widget->window, 0 );
+void default_cursor( ui::Widget widget ){
+       gdk_window_set_cursor( gtk_widget_get_window(widget), 0 );

 }
 
 
 }
 
 

-void Sys_GetCursorPos( GtkWindow* window, int *x, int *y ){
+void Sys_GetCursorPos( ui::Window window, int *x, int *y ){

        gdk_display_get_pointer( gdk_display_get_default(), 0, x, y, 0 );
 }
 
        gdk_display_get_pointer( gdk_display_get_default(), 0, x, y, 0 );
 }
 

-void Sys_SetCursorPos( GtkWindow* window, int x, int y ){
+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 );
 }
        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 );
 }

+
+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 )), &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";
+               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<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_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 = window.connect( "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 );
+}