add a flag of EventFilter in Window::pollEvent() and Window::waitEvent()

Author: jube

TODO.md

@@ -15,7 +15,6 @@ This file is a list of ideas for gf. Some of them will eventually be in gf. Othe
 ## graphics
 
 - (font) use Signed Distance Field for big size fonts
-- (window/events) add a flag in `pollEvent`/`waitEvent` (`EventFlag::TouchAsMouse`, `EventFlag::NoWindowFilter`)
 - (curve/shape) add anti-aliasing to `Curve` and `Shape`
   - ideas: [vaserenderer](https://github.com/tyt2y3/vaserenderer),
   - ideas: [a forum thread](https://forum.libcinder.org/topic/smooth-thick-lines-using-geometry-shader#23286000001269127)

include/gf/Window.h

@@ -55,6 +55,16 @@ inline namespace v1 {
     Decorated = 0x0004, ///< Is the window decorated?
   };
 
+  /**
+   * @ingroup graphics_window_monitor
+   * @brief Filter for events
+   */
+  enum class EventFilter {
+    TouchAsMouse  = 0x0001, ///< Treat touch events as mouse events
+    AnyWindow     = 0x0002, ///< Grab events from any window, not just the created window
+  };
+
+
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 }
 
@@ -354,7 +364,7 @@ inline namespace v1 {
      * @return True if an event was returned, or false if the event queue was empty
      * @sa waitEvent()
      */
-    bool pollEvent(Event& event);
+    bool pollEvent(Event& event, Flags<EventFilter> filters = None);
 
     /**
      * @brief Wait for an event and return it
@@ -380,7 +390,7 @@ inline namespace v1 {
      * @return False if any error occurred
      * @sa pollEvent()
      */
-    bool waitEvent(Event& event);
+    bool waitEvent(Event& event, Flags<EventFilter> filters = None);
 
     /** @} */
 

library/graphics/Window.cc

@@ -411,7 +411,7 @@ inline namespace v1 {
       return modifiers;
     }
 
-    bool translateEvent(Vector2i size, const SDL_Event *in, Event& out) {
+    bool translateEvent(Vector2i size, const SDL_Event *in, Event& out, Flags<EventFilter> filters) {
       out.timestamp = in->common.timestamp;
 
       switch (in->type) {
@@ -513,7 +513,7 @@ inline namespace v1 {
           break;
 
         case SDL_MOUSEWHEEL:
-          if (in->wheel.which == SDL_TOUCH_MOUSEID) {
+          if (in->wheel.which == SDL_TOUCH_MOUSEID && !filters.test(EventFilter::TouchAsMouse)) {
             return false;
           }
 
@@ -530,7 +530,7 @@ inline namespace v1 {
         case SDL_MOUSEBUTTONDOWN:
           assert(in->button.state == SDL_PRESSED);
 
-          if (in->button.which == SDL_TOUCH_MOUSEID) {
+          if (in->button.which == SDL_TOUCH_MOUSEID && !filters.test(EventFilter::TouchAsMouse)) {
             return false;
           }
 
@@ -545,7 +545,7 @@ inline namespace v1 {
         case SDL_MOUSEBUTTONUP:
           assert(in->button.state == SDL_RELEASED);
 
-          if (in->button.which == SDL_TOUCH_MOUSEID) {
+          if (in->button.which == SDL_TOUCH_MOUSEID && !filters.test(EventFilter::TouchAsMouse)) {
             return false;
           }
 
@@ -558,7 +558,7 @@ inline namespace v1 {
           break;
 
         case SDL_MOUSEMOTION:
-          if (in->motion.which == SDL_TOUCH_MOUSEID) {
+          if (in->motion.which == SDL_TOUCH_MOUSEID && !filters.test(EventFilter::TouchAsMouse)) {
             return false;
           }
 
@@ -710,7 +710,7 @@ inline namespace v1 {
 
   } // anonymous namespace
 
-  bool Window::pollEvent(Event& event) {
+  bool Window::pollEvent(Event& event, Flags<EventFilter> filters) {
     assert(m_window);
 
     if (pickEventForWindow(m_windowId, event)) {
@@ -726,9 +726,9 @@ inline namespace v1 {
         if (status == 0) {
           return false;
         }
-      } while (!translateEvent(getSize(), &ev, event));
+      } while (!translateEvent(getSize(), &ev, event, filters));
 
-      if (isEventWindowDependent(event) && getWindowIdFromEvent(event) != m_windowId) {
+      if (isEventWindowDependent(event) && (filters.test(EventFilter::AnyWindow) || getWindowIdFromEvent(event) != m_windowId)) {
         g_pendingEvents.push_back(event);
       } else {
         break;
@@ -738,7 +738,7 @@ inline namespace v1 {
     return true;
   }
 
-  bool Window::waitEvent(Event& event) {
+  bool Window::waitEvent(Event& event, Flags<EventFilter> filters) {
     assert(m_window);
     SDL_Event ev;
 
@@ -753,9 +753,9 @@ inline namespace v1 {
         if (status == 0) {
           return false;
         }
-      } while (!translateEvent(getSize(), &ev, event));
+      } while (!translateEvent(getSize(), &ev, event, filters));
 
-      if (isEventWindowDependent(event) && getWindowIdFromEvent(event) != m_windowId) {
+      if (isEventWindowDependent(event) && (filters.test(EventFilter::AnyWindow) || getWindowIdFromEvent(event) != m_windowId)) {
         g_pendingEvents.push_back(event);
       } else {
         break;