use NULL as sentinel instead of 0

[xonotic/netradiant.git] / radiant / windowobservers.cpp

diff --git a/radiant/windowobservers.cpp b/radiant/windowobservers.cpp
index eafd725b60565fbea44689eebc6576007e669180..3bd2334daf1f0f2d8e55bd8078338e7b146b0a70 100644 (file)
--- a/radiant/windowobservers.cpp
+++ b/radiant/windowobservers.cpp
@@ -53,18 +53,18 @@ inline void WindowObservers_OnModifierUp( WindowObservers& observers, ModifierFl
 gboolean selection_modifier_key_press( ui::Widget widget, GdkEventKey* event, WindowObservers& observers ){
        switch ( event->keyval )
        {
-       case GDK_Alt_L:
-       case GDK_Alt_R:
+       case GDK_KEY_Alt_L:
+       case GDK_KEY_Alt_R:
                //globalOutputStream() << "Alt PRESSED\n";
                WindowObservers_OnModifierDown( observers, c_modifierAlt );
                break;
-       case GDK_Shift_L:
-       case GDK_Shift_R:
+       case GDK_KEY_Shift_L:
+       case GDK_KEY_Shift_R:
                //globalOutputStream() << "Shift PRESSED\n";
                WindowObservers_OnModifierDown( observers, c_modifierShift );
                break;
-       case GDK_Control_L:
-       case GDK_Control_R:
+       case GDK_KEY_Control_L:
+       case GDK_KEY_Control_R:
                //globalOutputStream() << "Control PRESSED\n";
                WindowObservers_OnModifierDown( observers, c_modifierControl );
                break;
@@ -75,18 +75,18 @@ gboolean selection_modifier_key_press( ui::Widget widget, GdkEventKey* event, Wi
 gboolean selection_modifier_key_release( ui::Widget widget, GdkEventKey* event, WindowObservers& observers ){
        switch ( event->keyval )
        {
-       case GDK_Alt_L:
-       case GDK_Alt_R:
+       case GDK_KEY_Alt_L:
+       case GDK_KEY_Alt_R:
                //globalOutputStream() << "Alt RELEASED\n";
                WindowObservers_OnModifierUp( observers, c_modifierAlt );
                break;
-       case GDK_Shift_L:
-       case GDK_Shift_R:
+       case GDK_KEY_Shift_L:
+       case GDK_KEY_Shift_R:
                //globalOutputStream() << "Shift RELEASED\n";
                WindowObservers_OnModifierUp( observers, c_modifierShift );
                break;
-       case GDK_Control_L:
-       case GDK_Control_R:
+       case GDK_KEY_Control_L:
+       case GDK_KEY_Control_R:
                //globalOutputStream() << "Control RELEASED\n";
                WindowObservers_OnModifierUp( observers, c_modifierControl );
                break;
@@ -149,3 +149,18 @@ void GlobalWindowObservers_connectWidget( ui::Widget widget ){
        widget.connect( "button_release_event", G_CALLBACK( modifiers_button_release ), &g_window_observers );
        widget.connect( "motion_notify_event", G_CALLBACK( modifiers_motion ), &g_window_observers );
 }
+
+ModifierFlags modifiers_for_state(unsigned int state)
+{
+       ModifierFlags modifiers = c_modifierNone;
+       if ( state & GDK_SHIFT_MASK ) {
+               modifiers |= c_modifierShift;
+       }
+       if ( state & GDK_CONTROL_MASK ) {
+               modifiers |= c_modifierControl;
+       }
+       if ( state & GDK_MOD1_MASK ) {
+               modifiers |= c_modifierAlt;
+       }
+       return modifiers;
+}