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

Timestamp:

Nov 6, 2004, 4:03:22 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk/gui: key now able to be set.

Location:

orxonox/trunk/gui

Files:

• orxonox_gui.cc (modified) (1 diff)
• orxonox_gui.h (modified) (1 diff)
• orxonox_gui_keys.cc (modified) (2 diffs)
• orxonox_gui_keys.h (modified) (2 diffs)

orxonox/trunk/gui/orxonox_gui.cc

@@ -871 +871 @@
    \param text The text to be inserted into the Label.
 */
-void Label::setText (char * text)
+void Label::setText (char* text)
 {
   label = text;

orxonox/trunk/gui/orxonox_gui.h

@@ -268 +268 @@
   void init(void);
   
-  void setText (char * text);
+  void setText (char* text);
   char* getText ();
 };

orxonox/trunk/gui/orxonox_gui_keys.cc

@@ -125 +125 @@
    \returns Nothing
 */
-gint key_cb(GtkWidget* w, GdkEventKey* event, void* Widget)
-{
+gint Player::key_cb(GtkWidget* w, GdkEventKey* event, void* widget)
+{
+  Label* label = static_cast<Label*>(widget);
+
   switch(event->keyval) {
-
   case GDK_Up:
     printf("Up arrow key!\n");
-    static_cast<Label*>(Widget)->setText("up");
+    label->setText("up");
     break;
   case GDK_Down:
     printf("Down arrow key!\n");
+    label->setText("down");
+    break;
+  case GDK_Left:
+    printf("Left arrow key!\n");
+    label->setText("left");
     break;
   case GDK_Right:
     printf("Right arrow key!\n");
-    break;
-  case GDK_Left:
-    printf("Left arrow key!\n");
+    label->setText("right");
     break;
 
   case GDK_space:
     printf("Space Pressed.\n");
+    label->setText("space");
     break;
 
   case 65293:
     printf("Enter Pressed\n");
+    label->setText("enter");
     break;
 
@@ -154 +160 @@
   case GDK_Shift_L:
     printf("Left Shift!\n");
+    label->setText("l_shift");
     break;
   case GDK_Shift_R:
     printf("Right Shift!\n");
+    label->setText("r_shift");
     break;
   case GDK_Control_L:
     printf("Left Control!\n");
+    label->setText("l_ctrl");
     break;
   case GDK_Control_R:
     printf("Right Control!\n");
+    label->setText("r_ctrl");
     break;
   case GDK_Alt_L:
     printf("Left Alt!\n");
+    label->setText("l_alt");
     break;
   case GDK_Alt_R:
     printf("Rigth Alt!\n");
+    label->setText("r_alt");
     break;
     // FXX KEYS //
   case GDK_F1:
     printf("F1!\n");
+    label->setText("f1");
     break;
   case GDK_F2:
     printf("F2!\n");
+    label->setText("f2");
     break;
   case GDK_F3:
     printf("F3!\n");
+    label->setText("f3");
     break;
   case GDK_F4:
     printf("F4!\n");
+    label->setText("f4");
     break;
   case GDK_F5:
     printf("F5!\n");
+    label->setText("f5");
     break;
   case GDK_F6:
     printf("F6!\n");
+    label->setText("f6");
     break;
   case GDK_F7:
     printf("F7!\n");
+    label->setText("f7");
     break;
   case GDK_F8:
     printf("F8!\n");
+    label->setText("f8");
     break;
   case GDK_F9:
     printf("F9\n");
+    label->setText("f9");
     break;
   case GDK_F10:
     printf("F10!\n");
+    label->setText("f10");
     break;
   case GDK_F11:
     printf("F11!\n");
+    label->setText("f11");
     break;
   case GDK_F12:
     printf("F12!\n");
+    label->setText("f12");
     break;
 
 
   default:
-    printf ("other key %c \n", event->keyval,event->keyval);
+    char* tmp;
+    sprintf(tmp, "%c", event->keyval);
+    printf ("other key %s \n", tmp);
+    label->setText(tmp);
     break;
   }

orxonox/trunk/gui/orxonox_gui_keys.h

@@ -41 +41 @@
 
   static gint openWindowEvent(GtkWidget* widget, GdkEvent* event, void* player);
+  static gint key_cb(GtkWidget* w, GdkEventKey* event, void* widget);
   void setkey(KEYS key);
   
@@ -64 +65 @@
 
 
-gint key_cb(GtkWidget* w, GdkEventKey* event, void* Widget);
 
 #endif /* _ORXONOX_GUI_KEYS_H */