Changeset 7863 in orxonox.OLD for trunk/src

Timestamp:

May 25, 2006, 6:02:27 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: also catching mouse-events

Location:

trunk/src/lib/gui/qt_gui

Files:

• gui_control.cc (modified) (5 diffs)
• gui_control.h (modified) (1 diff)

trunk/src/lib/gui/qt_gui/gui_control.cc

@@ -30 +30 @@
 #include <QtCore/QEvent>
 #include <QtGui/QKeyEvent>
+#include <QtGui/QMouseEvent>
 
 #include "sdlincl.h"
@@ -93 +94 @@
     Saveable::load();
     this->setText(QString().fromStdString(this->value().getString()));
-    printf("%s\n", this->value().getString().c_str());
   }
 
@@ -105 +105 @@
   bool GuiControlInput::event ( QEvent * e )
   {
-    if (!this->bListening || e->type() != QEvent::KeyPress)
-      return QPushButton::event(e);
-
-
-    this->releaseKeyboard();
-    this->bListening = true;
-    if (e->type() == QEvent::KeyPress)
+    if (this->bListening && (e->type() == QEvent::KeyPress || e->type() == QEvent::MouseButtonPress))
     {
-      QKeyEvent* event = dynamic_cast<QKeyEvent*>(e);
-
-      int ev = QtKToSDLK(event->key());
-      if (ev != -1)
+      this->bListening = false;
+      this->releaseKeyboard();
+      this->releaseMouse();
+      /// KEY IS PRESSED:
+      if (e->type() == QEvent::KeyPress)
       {
-        this->setText(QString().fromStdString(SDLKToKeyname(ev)));
+        QKeyEvent* event = dynamic_cast<QKeyEvent*>(e);
+
+        int ev = QtKToSDLK(event->key());
+        if (ev != -1)
+        {
+          this->setText(QString().fromStdString(SDLKToKeyname(ev)));
+        }
+        return true;
       }
+      /// MOUSE BUTTON PRESSED:
+      if (e->type() == QEvent::MouseButtonPress)
+      {
+        QMouseEvent* event = dynamic_cast<QMouseEvent*>(e);
+        if (event->button() != Qt::NoButton)
+        {
+          this->setText(QString().fromStdString(QtKToString(event->button())));
+        }
+
+      }
+
     }
-    return true;
+
+    return QPushButton::event(e);
   }
 
@@ -128 +142 @@
     this->bListening = true;
     this->grabKeyboard();
+    this->grabMouse();
   }
 
@@ -271 +286 @@
     }
   }
+
+  std::string GuiControlInput::QtKToString(int button)
+  {
+    if( button == Qt::LeftButton) return "BUTTON_LEFT";
+    if( button == Qt::MidButton) return "BUTTON_MIDDLE";
+    if( button == Qt::RightButton) return "BUTTON_RIGHT";
+    //if( button == Qt::) return "BUTTON_WHEELUP";
+    //if( button == EV_MOUSE_BUTTON_WHEELDOWN) return "BUTTON_WHEELDOWN";
+    return "UNKNOWN";
+  }
+
 }

trunk/src/lib/gui/qt_gui/gui_control.h

@@ -38 +38 @@
 
     static int QtKToSDLK(int key);
+    static std::string QtKToString(int button);
 
     public slots: