Changeset 6802 in orxonox.OLD for trunk

Timestamp:

Jan 28, 2006, 10:20:47 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: eventHandler releases mouse on alt-Tab, and recaptures it on mouse-click on the Window

Location:

trunk/src

Files:

• lib/event/event_handler.cc (modified) (2 diffs)
• subprojects/importer/Makefile.am (modified) (1 diff)

trunk/src/lib/event/event_handler.cc

@@ -52 +52 @@
   this->keyMapper = NULL;
   this->stateStack = NULL;
-
+  this->eventsGrabbed = false;
 }
 
@@ -361 +361 @@
 int EventHandler::eventFilter(const SDL_Event *event)
 {
-  if (event->type == SDL_KEYDOWN &&  event->key.keysym.sym == SDLK_TAB && SDL_GetKeyState(NULL)[SDLK_LALT])
-  {
-    printf("Not sending event to the WindowManager\n");
-
-    EventHandler::getInstance()->grabEvents(false);
-    return 0;
-  }
+  if (likely(EventHandler::getInstance()->eventsGrabbed))
+  {
+    if (event->type == SDL_KEYDOWN &&  event->key.keysym.sym == SDLK_TAB && SDL_GetKeyState(NULL)[SDLK_LALT])
+    {
+      PRINTF(3)("Not sending event to the WindowManager\n");
+      EventHandler::getInstance()->grabEvents(false);
+      return 0;
+    }
+  }
+  else
+  {
+    if (event->type == SDL_MOUSEBUTTONDOWN)
+    {
+      EventHandler::getInstance()->grabEvents( true);
+      return 0;
+    }
+  }
+
   return 1;
 }

trunk/src/subprojects/importer/Makefile.am

@@ -94 +94 @@
                 $(MAINSRCDIR)/lib/parser/ini_parser/ini_parser.cc \
                 $(MAINSRCDIR)/lib/coord/p_node.cc \
-                $(MAINSRCDIR)/lib/coord/null_parent.cc \
                 $(MAINSRCDIR)/util/loading/load_param.cc \
                 $(MAINSRCDIR)/util/loading/load_param_description.cc \