Merge pull request Eyescale#589 from eile/master

Denoise Event handling
tribal-tec · Oct 17, 2016 · 29e4dc0 · 29e4dc0
2 parents b0fd859 + 338e6bb
commit 29e4dc0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/eq/CMakeLists.txt b/eq/CMakeLists.txt
@@ -56,9 +56,6 @@ set(EQUALIZER_PUBLIC_HEADERS
   os.h
   pipe.h
   pixelData.h
-  qt/types.h
-  qt/window.h
-  qt/shareContextWindow.h
   resultImageListener.h
   segment.h
   server.h
@@ -225,6 +222,11 @@ if(WIN32)
 endif()
 
 if(EQ_QT_USED)
+  list(APPEND EQUALIZER_PUBLIC_HEADERS
+    qt/types.h
+    qt/window.h
+    qt/shareContextWindow.h
+    )
   list(APPEND EQUALIZER_HEADERS
     qt/windowFactory.h
     qt/windowSystem.h

diff --git a/eq/config.cpp b/eq/config.cpp
@@ -566,6 +566,7 @@ EventOCommand Config::sendEvent( const uint32_t type )
 {
     LBASSERT( getAppNodeID() != 0 );
     LBASSERT( _impl->appNode );
+    LBASSERT( type != EVENT_UNKNOWN );
 
     EventOCommand cmd( send( _impl->appNode, fabric::CMD_CONFIG_EVENT ));
     cmd << type;

diff --git a/eq/fabric/eventType.h b/eq/fabric/eventType.h
@@ -37,7 +37,7 @@ enum EventType // Also update string table in event.cpp
     EVENT_VIEW_RESIZE,          //!< A view has been resized
 
     // PointerEvent
-    EVENT_CHANNEL_POINTER_MOTION, //!< A pointer is moved over a Channel
+    EVENT_CHANNEL_POINTER_MOTION = 10, //!< A pointer is moved over a Channel
     EVENT_CHANNEL_POINTER_BUTTON_PRESS, //!< Mouse button pressed in a Channel
     EVENT_CHANNEL_POINTER_BUTTON_RELEASE, //!< Mouse button release in a Channel
     EVENT_CHANNEL_POINTER_WHEEL, //!< Mouse wheel scroll over a Channel
@@ -47,14 +47,14 @@ enum EventType // Also update string table in event.cpp
     EVENT_WINDOW_POINTER_BUTTON_RELEASE, //!< Mouse button release in a Window
 
     // KeyEvent
-    EVENT_KEY_PRESS, //!< Key pressed
+    EVENT_KEY_PRESS = 20, //!< Key pressed
     EVENT_KEY_RELEASE, //!< Key released
 
-    EVENT_MAGELLAN_AXIS,        //!< AxisEvent: SpaceMouse touched
+    EVENT_MAGELLAN_AXIS = 30,        //!< AxisEvent: SpaceMouse touched
     EVENT_MAGELLAN_BUTTON,      //!< ButtonEvent: SpaceMouse button pressed
 
     // Stateless Events
-    EVENT_WINDOW_CLOSE,         //!< A window has been closed
+    EVENT_WINDOW_CLOSE = 40,         //!< A window has been closed
     EVENT_WINDOW_HIDE,          //!< A window is hidden
     EVENT_WINDOW_EXPOSE,    //!< A window is dirty
     EVENT_EXIT, //!< Exit request from application or due to runtime error
@@ -77,7 +77,7 @@ enum EventType // Also update string table in event.cpp
      * Config error event. Contains the originator id, the error code and
      * 0-n Strings with additional information.
      */
-    EVENT_CONFIG_ERROR,
+    EVENT_CONFIG_ERROR = 50,
     EVENT_NODE_ERROR, //!< Node error event. @sa CONFIG_ERROR
     EVENT_PIPE_ERROR, //!< Pipe error event. @sa CONFIG_ERROR
     EVENT_WINDOW_ERROR, //!< Window error event. @sa CONFIG_ERROR

diff --git a/eq/glx/window.h b/eq/glx/window.h
@@ -1,7 +1,7 @@
 
-/* Copyright (c) 2005-2014, Stefan Eilemann <eile@equalizergraphics.com>
- *                    2014, Daniel Nachbaur <danielnachbaur@gmail.com>
- *                    2009, Maxim Makhinya
+/* Copyright (c) 2005-2016, Stefan Eilemann <eile@equalizergraphics.com>
+ *                          Daniel Nachbaur <danielnachbaur@gmail.com>
+ *                          Maxim Makhinya
  *
  * 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
@@ -71,8 +71,7 @@ class WindowIF : public GLWindow
         { return GLWindow::processEvent( type, event ); }
 
     /** Process a stateless event. @return true if the event was handled. */
-    virtual bool processEvent( EventType type, const XEvent& )
-        { return GLWindow::processEvent( type ); }
+    virtual bool processEvent( EventType, const XEvent& ) { return false; }
 
 };