Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

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

diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h
index 20e38408a8526d39e451dd7729b59665351248a4..2d16142eb9f71134c1bb93ae384632024c837565 100644 (file)
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -29,118 +29,96 @@
 typedef struct _GdkCursor GdkCursor;
 typedef struct _GdkEventMotion GdkEventMotion;
 
-GdkCursor *create_blank_cursor();
-
-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);
-
-
-class DeferredMotion {
-    guint m_handler;
-
-    typedef void ( *MotionFunction )(gdouble x, gdouble y, guint state, void *data);
-
-    MotionFunction m_function;
-    void *m_data;
-    gdouble m_x;
-    gdouble m_y;
-    guint m_state;
-
-    static gboolean deferred(DeferredMotion *self)
-    {
-        self->m_handler = 0;
-        self->m_function(self->m_x, self->m_y, self->m_state, self->m_data);
-        return FALSE;
-    }
-
+GdkCursor* create_blank_cursor();
+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 );
+
+
+
+class DeferredMotion
+{
+guint m_handler;
+typedef void ( *MotionFunction )( gdouble x, gdouble y, guint state, void* data );
+MotionFunction m_function;
+void* m_data;
+gdouble m_x;
+gdouble m_y;
+guint m_state;
+
+static gboolean deferred( DeferredMotion* self ){
+       self->m_handler = 0;
+       self->m_function( self->m_x, self->m_y, self->m_state, self->m_data );
+       return FALSE;
+}
 public:
-    DeferredMotion(MotionFunction function, void *data) : m_handler(0), m_function(function), m_data(data)
-    {
-    }
-
-    void motion(gdouble x, gdouble y, guint state)
-    {
-        m_x = x;
-        m_y = y;
-        m_state = state;
-        if (m_handler == 0) {
-            m_handler = g_idle_add((GSourceFunc) deferred, this);
-        }
-    }
-
-    static gboolean gtk_motion(ui::Widget widget, GdkEventMotion *event, DeferredMotion *self);
+DeferredMotion( MotionFunction function, void* data ) : m_handler( 0 ), m_function( function ), m_data( data ){
+}
+void motion( gdouble x, gdouble y, guint state ){
+       m_x = x;
+       m_y = y;
+       m_state = state;
+       if ( m_handler == 0 ) {
+               m_handler = g_idle_add( (GSourceFunc)deferred, this );
+       }
+}
+static gboolean gtk_motion( ui::Widget widget, GdkEventMotion *event, DeferredMotion* self );
 };
 
-class DeferredMotionDelta {
-    int m_delta_x;
-    int m_delta_y;
-    guint m_motion_handler;
-
-    typedef void ( *MotionDeltaFunction )(int x, int y, void *data);
-
-    MotionDeltaFunction m_function;
-    void *m_data;
-
-    static gboolean deferred_motion(gpointer data)
-    {
-        reinterpret_cast<DeferredMotionDelta *>( data )->m_function(
-                reinterpret_cast<DeferredMotionDelta *>( data )->m_delta_x,
-                reinterpret_cast<DeferredMotionDelta *>( data )->m_delta_y,
-                reinterpret_cast<DeferredMotionDelta *>( data )->m_data
-        );
-        reinterpret_cast<DeferredMotionDelta *>( data )->m_motion_handler = 0;
-        reinterpret_cast<DeferredMotionDelta *>( data )->m_delta_x = 0;
-        reinterpret_cast<DeferredMotionDelta *>( data )->m_delta_y = 0;
-        return FALSE;
-    }
-
+class DeferredMotionDelta
+{
+int m_delta_x;
+int m_delta_y;
+guint m_motion_handler;
+typedef void ( *MotionDeltaFunction )( int x, int y, void* data );
+MotionDeltaFunction m_function;
+void* m_data;
+
+static gboolean deferred_motion( gpointer data ){
+       reinterpret_cast<DeferredMotionDelta*>( data )->m_function(
+               reinterpret_cast<DeferredMotionDelta*>( data )->m_delta_x,
+               reinterpret_cast<DeferredMotionDelta*>( data )->m_delta_y,
+               reinterpret_cast<DeferredMotionDelta*>( data )->m_data
+               );
+       reinterpret_cast<DeferredMotionDelta*>( data )->m_motion_handler = 0;
+       reinterpret_cast<DeferredMotionDelta*>( data )->m_delta_x = 0;
+       reinterpret_cast<DeferredMotionDelta*>( data )->m_delta_y = 0;
+       return FALSE;
+}
 public:
-    DeferredMotionDelta(MotionDeltaFunction function, void *data) : m_delta_x(0), m_delta_y(0), m_motion_handler(0),
-                                                                    m_function(function), m_data(data)
-    {
-    }
-
-    void flush()
-    {
-        if (m_motion_handler != 0) {
-            g_source_remove(m_motion_handler);
-            deferred_motion(this);
-        }
-    }
-
-    void motion_delta(int x, int y, unsigned int state)
-    {
-        m_delta_x += x;
-        m_delta_y += y;
-        if (m_motion_handler == 0) {
-            m_motion_handler = g_idle_add(deferred_motion, this);
-        }
-    }
+DeferredMotionDelta( MotionDeltaFunction function, void* data ) : m_delta_x( 0 ), m_delta_y( 0 ), m_motion_handler( 0 ), m_function( function ), m_data( data ){
+}
+void flush(){
+       if ( m_motion_handler != 0 ) {
+               g_source_remove( m_motion_handler );
+               deferred_motion( this );
+       }
+}
+void motion_delta( int x, int y, unsigned int state ){
+       m_delta_x += x;
+       m_delta_y += y;
+       if ( m_motion_handler == 0 ) {
+               m_motion_handler = g_idle_add( deferred_motion, this );
+       }
+}
 };
 
-class FreezePointer {
-    unsigned int handle_motion;
-    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;
+class FreezePointer
+{
+unsigned int handle_motion;
+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(ui::Window widget, GdkEventMotion *event, FreezePointer *self);
+FreezePointer() : handle_motion( 0 ), m_function( 0 ), m_data( 0 ){
+}
+static gboolean motion_delta( ui::Window widget, GdkEventMotion *event, FreezePointer* self );
 
-    void freeze_pointer(ui::Window window, MotionDeltaFunction function, void *data);
+void freeze_pointer( ui::Window window, MotionDeltaFunction function, void* data );
 
-    void unfreeze_pointer(ui::Window window);
+void unfreeze_pointer( ui::Window window );
 };
 
 #endif