Changeset 9240 in orxonox.OLD for trunk/src/lib

Timestamp:

Jul 6, 2006, 12:25:44 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: better signal handler.
patched by chrigi

Location:

trunk/src/lib

Files:

• event/event_handler.cc (modified) (1 diff)
• gui/gl/glgui_handler.cc (modified) (1 diff)
• gui/gl/glgui_handler.h (modified) (1 diff)

trunk/src/lib/event/event_handler.cc

@@ -507 +507 @@
 int EventHandler::releaseMouse(void* p)
 {
+  SDL_ShowCursor(SDL_ENABLE);
   SDL_WM_GrabInput(SDL_GRAB_OFF);
-  SDL_ShowCursor(SDL_DISABLE);
   return 0;
 }

trunk/src/lib/gui/gl/glgui_handler.cc

@@ -268 +268 @@
 
 
-  Vector2D GLGuiHandler::cursorPositionOverFocusedWidget() const
-  {
-    return (this->_cursor != NULL) ? this->_cursor->getAbsCoor2D() : Vector2D(0,0);
+  const Vector2D& GLGuiHandler::cursorPositionOverFocusedWidget() const
+  {
+    return (this->_cursor != NULL) ? this->_cursor->getAbsCoor2D() : Vector2D::nullVector();
   }
 

trunk/src/lib/gui/gl/glgui_handler.h

@@ -30 +30 @@
     GLGuiCursor* cursor() const { return this->_cursor; }
 
-    Vector2D cursorPositionOverFocusedWidget() const;
+    const Vector2D& cursorPositionOverFocusedWidget() const;
     const Vector2D& cursorPositionAbs() const;
     Vector2D cursorPositionRel(const GLGuiWidget* const widget) const;