CR Eyescale#590

eq/agl/eventHandler.cpp

@@ -49,6 +49,7 @@ namespace
 {
 uint32_t _getButtonState( const EventRef eventRef )
 {
+    // GetCurrentEventButtonState returns the same bits as Eq buttons
     uint32 buttons = GetCurrentEventButtonState();
 
     if( buttons == PTR_BUTTON1 )
@@ -85,18 +86,18 @@ uint32_t _getButtonAction( const EventRef event )
     }
 }
 
-uint32_t _getKeyModifiers( const EventRef event )
+KeyModifier _getKeyModifiers( const EventRef event )
 {
     uint32_t keys = 0;
-    uint32_t result = 0;
-    GetEventParameter( eventRef, kEventParamKeyModifiers,
-                       typeUInt32, 0, sizeof( keys ), 0, &keys );
+    KeyModifier result = KeyModifier::none;
+    GetEventParameter( event, kEventParamKeyModifiers, typeUInt32, 0,
+                       sizeof( keys ), 0, &keys );
     if( keys & optionKey )
-        result |= KM_ALT;
+        result |= KeyModifier::alt;
     if( keys & controlKey )
-        result |= KM_CONTROL;
+        result |= KeyModifier::control;
     if( keys & shiftKey )
-        result |= KM_SHIFT;
+        result |= KeyModifier::shift;
     return result;
 }
 
@@ -377,7 +378,6 @@ bool EventHandler::_processMouseEvent( const EventRef eventRef )
     event.x = static_cast< int32_t >( pos.x );
     event.y = static_cast< int32_t >( pos.y ) - menuHeight;
     event.modifiers = _getKeyModifiers( eventRef );
-    // GetCurrentEventButtonState returns the same bits as Eq buttons
     event.buttons = _getButtonState( eventRef );
 
     switch( GetEventKind( eventRef ))
@@ -449,6 +449,7 @@ bool EventHandler::_processKeyEvent( const EventRef eventRef )
 {
     KeyEvent event( _getKey( eventRef ));
     event.modifiers = _getKeyModifiers( eventRef );
+
     switch( GetEventKind( eventRef ))
     {
     case kEventRawKeyDown:

eq/agl/eventHandler.h

@@ -1,5 +1,5 @@
 
-/* Copyright (c) 2007-2014, Stefan Eilemann <[email protected]>
+/* Copyright (c) 2007-2016, Stefan Eilemann <[email protected]>
  *
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 2.1 as published

eq/fabric/eventEnums.h

@@ -1,5 +1,5 @@
 
-/* Copyright (c) 2014, Daniel Nachbaur <[email protected]>
+/* Copyright (c) 2014-2016, Daniel Nachbaur <[email protected]>
  *
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 2.1 as published
@@ -18,7 +18,9 @@
 #ifndef EQFABRIC_EVENTENUMS_H
 #define EQFABRIC_EVENTENUMS_H
 
+#include <lunchbox/bitOperation.h>
 #include <lunchbox/types.h>
+#include <iostream>
 
 namespace eq
 {
@@ -99,15 +101,51 @@ enum PointerButton
  * Key modifiers
  * @version 2.0
  */
-enum KeyModifier
+enum class KeyModifier : unsigned
 {
-    KM_NONE    = LB_BIT_NONE,
-    KM_ALT     = LB_BIT1,
-    KM_CONTROL = LB_BIT2,
-    KM_SHIFT   = LB_BIT3,
+    none    = LB_BIT_NONE,
+    alt     = LB_BIT1,
+    control = LB_BIT2,
+    shift   = LB_BIT3,
 };
 
+inline KeyModifier operator & ( const KeyModifier l, const KeyModifier r )
+{
+    return static_cast< KeyModifier >( static_cast< unsigned >( l ) &
+                                       static_cast< unsigned >( r ));
 }
+
+inline KeyModifier operator | ( const KeyModifier l, const KeyModifier r )
+{
+    return static_cast< KeyModifier >( static_cast< unsigned >( l ) |
+                                       static_cast< unsigned >( r ));
+}
+
+inline KeyModifier& operator |= ( KeyModifier& l, const KeyModifier r )
+{
+    return l = l | r;
+}
+
+inline std::ostream& operator << ( std::ostream& os, const KeyModifier mod )
+{
+    if( (mod & KeyModifier::alt) == KeyModifier::alt )
+        os << " alt";
+    if( (mod & KeyModifier::control) == KeyModifier::control )
+        os << " ctrl";
+    if( (mod & KeyModifier::shift) == KeyModifier::shift )
+        os << " shift";
+    return os;
+}
+
+}
+}
+}
+
+namespace lunchbox
+{
+template<> inline void byteswap( eq::fabric::eventEnums::KeyModifier& value )
+{
+    byteswap( reinterpret_cast< unsigned& >( value ));
 }
 }
 

eq/fabric/keyEvent.h

@@ -30,20 +30,14 @@ struct KeyEvent : public Event
     KeyEvent( const uint32_t k = 0 ) : key( k ) {}
 
     uint32_t key; //!<  KeyCode for special keys, ascii code otherwise
-    uint32_t modifiers; ; //!< key modifier mask
+    KeyModifier modifiers; ; //!< key modifier mask
 };
 
 /** Print the key event to the given output stream. @version 1.0 */
 inline std::ostream& operator << ( std::ostream& os, const KeyEvent& event )
 {
-    os << static_cast< const Event& >( event ) << " key " << event.key;
-    if( event.modifiers & KM_ALT )
-        os << " alt";
-    if( event.modifiers & KM_CONTROL )
-        os << " ctrl";
-    if( event.modifiers & KM_SHIFT )
-        os << " shift";
-    return os;
+    return os << static_cast< const Event& >( event ) << " key " << event.key
+              << event.modifiers;
 }
 }
 }

eq/fabric/pointerEvent.h

@@ -37,7 +37,7 @@ struct PointerEvent : public Event
     int32_t dy;       //!< Y position change since last event
     uint32_t buttons; //!< current state of all buttons
     uint32_t button;  //!< fired button
-    uint32_t modifiers; //!< state of modifier keys
+    KeyModifier modifiers; //!< state of modifier keys
     float xAxis;      //!< x wheel rotation in clicks
     float yAxis;      //!< y wheel rotation in clicks
     RenderContext context; //!< The last rendering context at position
@@ -57,13 +57,7 @@ inline std::ostream& operator << ( std::ostream& os, const PointerEvent& event )
     if( event.buttons & PTR_BUTTON4 ) os << "4";
     if( event.buttons & PTR_BUTTON5 ) os << "5";
 
-    os << " modifiers";
-    if( event.buttons == KM_NONE ) os << " none";
-    if( event.buttons & KM_ALT ) os << " alt";
-    if( event.buttons & KM_CONTROL ) os << " ctrl";
-    if( event.buttons & KM_SHIFT ) os << " shift";
-
-    os << " fired ";
+    os << event.modifiers << " fired ";
     if( event.button == PTR_BUTTON_NONE ) os << "none";
     if( event.button & PTR_BUTTON1 ) os << "1";
     if( event.button & PTR_BUTTON2 ) os << "2";

eq/glx/eventHandler.cpp

@@ -164,15 +164,15 @@ uint32_t _getKey( const XEvent& event )
     }
 }
 
-uint32_t _getKeyModifiers( const unsigned int state )
+KeyModifier _getKeyModifiers( const unsigned int state )
 {
-    uint32_t result = 0;
+    KeyModifier result = KeyModifier::none;
     if( state & Mod1Mask )
-        result |= KM_ALT;
+        result |= KeyModifier::alt;
     if( state & ControlMask )
-        result |= KM_CONTROL;
+        result |= KeyModifier::control;
     if( state & ShiftMask )
-        result |= KM_SHIFT;
+        result |= KeyModifier::shift;
     return result;
 }
 

eq/qt/eventHandler.cpp

@@ -87,16 +87,16 @@ uint32_t _getKey( const QKeyEvent& keyEvent )
     }
 }
 
-uint32_t _getKeyModifiers( const QInputEvent& event )
+KeyModifier _getKeyModifiers( const QInputEvent& event )
 {
     Qt::KeyboardModifiers modifiers = event.modifiers();
-    uint32_t result = 0;
+    KeyModifier result = KeyModifier::none;
     if( modifiers & Qt::AltModifier )
-        result |= KM_ALT;
+        result |= KeyModifier::alt;
     if( modifiers & Qt::ControlModifier )
-        result |= KM_CONTROL;
+        result |= KeyModifier::control;
     if( modifiers & Qt::ShiftModifier )
-        result |= KM_SHIFT;
+        result |= KeyModifier::shift;
     return result;
 }
 

eq/wgl/eventHandler.cpp

@@ -170,15 +170,15 @@ uint32_t _getKey( LPARAM lParam, WPARAM wParam )
     return KC_VOID;
 }
 
-uint32_t _getKeyModifiers()
+KeyModifier _getKeyModifiers()
 {
-    uint32_t result = 0;
+    KeyModifier result = KeyModifier::none;
     if( GetKeyState( VK_MENU ) & 0x8000 )
-        result |= KM_ALT;
+        result |= KeyModifier::alt;
     if( GetKeyState( VK_CONTROL ) & 0x8000 )
-        result |= KM_CONTROL;
+        result |= KeyModifier::control;
     if( GetKeyState( VK_SHIFT ) & 0x8000 )
-        result |= KM_SHIFT;
+        result |= KeyModifier::shift;
     return result;
 }
 

eq/wgl/eventHandler.h

@@ -1,5 +1,5 @@
 
-/* Copyright (c) 2007-2013, Stefan Eilemann <[email protected]>
+/* Copyright (c) 2007-2016, Stefan Eilemann <[email protected]>
  *
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 2.1 as published

eq/wgl/types.h

@@ -1,5 +1,5 @@
 
-/* Copyright (c) 2011-2012, Stefan Eilemann <[email protected]>
+/* Copyright (c) 2011-2016, Stefan Eilemann <[email protected]>
  *
  * This library is free software; you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 2.1 as published

examples/eqPly/config.cpp

@@ -36,6 +36,8 @@
 #include <admin/addWindow.h>
 #include <admin/removeWindow.h>
 
+using eq::KeyModifier;
+
 namespace eqPly
 {
 
@@ -674,7 +676,9 @@ bool Config::handleEvent( const eq::EventType type,
             _spinX = 0;
             _spinY = 0;
 
-            if( _frameData.usePilotMode())
+            if( (event.modifiers & KeyModifier::shift) == KeyModifier::shift )
+                _frameData.moveCamera( 0.f, 0.f, -.005f * event.dy );
+            else if( _frameData.usePilotMode())
                 _frameData.spinCamera( -0.005f * event.dy, -0.005f * event.dx );
             else
                 _frameData.spinModel( -0.005f * event.dy, -0.005f * event.dx,