Changeset 2735 in orxonox.OLD for orxonox/trunk/gui

Timestamp:

Nov 6, 2004, 3:18:40 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: added keys, and enabled key_press_event on them

Location:

orxonox/trunk/gui

Files:

• orxonox_gui_keys.cc (modified) (3 diffs)
• orxonox_gui_keys.h (modified) (2 diffs)

orxonox/trunk/gui/orxonox_gui_keys.cc

@@ -36 +36 @@
   keysBox = new Box ('v');
   player1 = new Player("player1");
-  player2 = new Player("player2");
-  
+  //  player2 = new Player("player2");
+
   keysBox->fill(player1->getOpenButton());
-  player1->getOpenButton()->connectSignal("key_press_event", this, key_cb);
 
   keysFrame->fill (keysBox);
@@ -59 +58 @@
 {
   openButton = new Button (player);
+  openButton->connectSignal("button_press_event", this, openWindowEvent);
+
+  keyWindow = new Window("keys of player");
+
+  keyBox = new Box('v');
+  Keys[UP] = new Button("up");
+  Keys[DOWN] = new Button("down");
+  Keys[LEFT] = new Button("left");
+  Keys[RIGHT] = new Button("right");
+  Keys[SHOOT] = new Button("shoot");
+
+  Keys[UP]->connectSignal("key_press_event", Keys[UP], key_cb);
+  Keys[DOWN]->connectSignal("key_press_event", Keys[DOWN], key_cb);
+  Keys[LEFT]->connectSignal("key_press_event", Keys[LEFT], key_cb);
+  Keys[RIGHT]->connectSignal("key_press_event", Keys[RIGHT], key_cb);
+  Keys[SHOOT]->connectSignal("key_press_event", Keys[SHOOT], key_cb);
+
+  keyBox->fill(Keys[UP]);
+  keyBox->fill(Keys[DOWN]);
+  keyBox->fill(Keys[LEFT]);
+  keyBox->fill(Keys[RIGHT]);
+  keyBox->fill(Keys[SHOOT]);
+
+  keyWindow->fill(keyBox);
+  windowIsOpen = false;
+
 }
 
@@ -73 +98 @@
 }
 
-gint WindowOpen (GtkWidget* widget, GdkEvent* event, void* player)
-{
-  
-}
-
-
-
-gint key_cb(GtkWidget* w, GdkEventKey* event, void* widget)
+/**
+   \brief function to display, hide the palyer window
+   Buggy, segmentation fault on WindowMaker
+*/
+void Player::openWindow ()
+{
+  if (!windowIsOpen)
+    keyWindow->showall();
+  else
+    keyWindow->hide();
+  windowIsOpen = !windowIsOpen;
+}
+
+gint Player::openWindowEvent (GtkWidget* widget, GdkEvent* event, void* player)
+{
+
+  static_cast<Player*>(player)->openWindow();
+}
+
+
+/**
+   \brief Function which gets keystrokes
+   \param w the widget that released the Function.
+   \param event The event that happened.
+   \param Widget the Widget which will be applied.
+   \returns Nothing
+*/
+gint key_cb(GtkWidget* w, GdkEventKey* event, void* Widget)
 {
   switch(event->keyval) {

orxonox/trunk/gui/orxonox_gui_keys.h

@@ -13 +13 @@
  * defines the Possible Player Keys
  */
-enum KEYS { UP, DOWN, LEFT, RIGTH, SHOOT };
+enum KEYS { UP, DOWN, LEFT, RIGHT, SHOOT };
 
-/**
-   \brief Class to hold infos about a Player
-*/
+//! Class to hold infos about a Player
 class Player
 {
  private:
-  char keys[10];
+  Window* keyWindow;
+  bool windowIsOpen;
   Button* openButton;
-  Window* window;
-  
+
+
+  Box* keyBox;
+  Button* Keys[10];
+
+
  public:
   Player(char* player);
 
   Button* getOpenButton();
+  
+  void openWindow ();
 
+  static gint openWindowEvent(GtkWidget* widget, GdkEvent* event, void* player);
   void setkey(KEYS key);
   
@@ -52 +58 @@
 
 
-gint key_cb(GtkWidget* w, GdkEventKey* event, gpointer data);
+
+gint key_cb(GtkWidget* w, GdkEventKey* event, void* Widget);
 
 #endif /* _ORXONOX_GUI_KEYS_H */