Changeset 5093 in orxonox.OLD for trunk

Timestamp:

Aug 21, 2005, 11:17:50 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: inputLine is working.

Location:

trunk/src

Files:

• lib/event/event.h (modified) (1 diff)
• lib/event/event_handler.cc (modified) (1 diff)
• lib/event/event_handler.h (modified) (1 diff)
• util/loading/game_loader.cc (modified) (1 diff)
• util/shell.cc (modified) (9 diffs)

trunk/src/lib/event/event.h

@@ -2 +2 @@
  * @file event.h
  * an abstract event
+ *
+ * @todo remove HUGE class-overhead. This could also be a struct
 */
 

trunk/src/lib/event/event_handler.cc

@@ -89 +89 @@
   this->keyMapper->loadKeyBindings(iniParser);
 }
-
-
-/**
- *  set the state of the event handler
- * @param state: to which the event handler shall change
-*/
-void EventHandler::setState(elState state)
-{
-  this->state = state;
-}
-
 
 /**

trunk/src/lib/event/event_handler.h

@@ -26 +26 @@
   void init(IniParser* iniParser);
 
-  void setState(elState state);
+  /** @param state: to which the event handler shall change */
+  inline void setState(elState state) { this->state = state; };
+  /** @returns the current state */
+  inline elState getState() const { return this->state; };
 
   void subscribe(EventListener* el, elState state, int eventType);

trunk/src/util/loading/game_loader.cc

@@ -78 +78 @@
 
   this->eventHandler = EventHandler::getInstance();
-  this->eventHandler->subscribe(this, ES_ALL, KeyMapper::PEV_PAUSE);
+  this->eventHandler->subscribe(this, ES_GAME, KeyMapper::PEV_PAUSE);
   this->eventHandler->subscribe(this, ES_ALL, KeyMapper::PEV_QUIT);
-  this->eventHandler->subscribe(this, ES_ALL, KeyMapper::PEV_NEXT_WORLD);
-  this->eventHandler->subscribe(this, ES_ALL, KeyMapper::PEV_PREVIOUS_WORLD);
+  this->eventHandler->subscribe(this, ES_GAME, KeyMapper::PEV_NEXT_WORLD);
+  this->eventHandler->subscribe(this, ES_GAME, KeyMapper::PEV_PREVIOUS_WORLD);
 }
 

trunk/src/util/shell.cc

@@ -20 +20 @@
 #include "text_engine.h"
 #include "list.h"
-
+#include "graphics_engine.h"
+#include "event_handler.h"
+
+#include "debug.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -43 +46 @@
   this->setBufferSize(100);
   this->setBufferDisplaySize(10);
-  this->setAbsCoor2D(2, 400);
+  this->setAbsCoor2D(2, GraphicsEngine::getInstance()->getResolutionY());
   this->setAbsDir2D(0);
 
   this->inputLineText = TextEngine::getInstance()->createText("fonts/earth.ttf", 10, TEXT_DYNAMIC, 255, 0, 0);
   this->inputLineText->setText(NULL);
+  this->inputLine = new char[1];
+  this->inputLine[0] = '\0';
+
+  EventHandler::getInstance()->subscribe(this, ES_GAME, SDLK_BACKQUOTE);
+
+  EventHandler* evh = EventHandler::getInstance();
+  for (int i = 1; i < EV_NUMBER; i++)
+    EventHandler::getInstance()->subscribe(this, ES_SHELL, i);
 }
 
@@ -61 +72 @@
     delete this->bufferText[i];
   delete this->bufferText;
+
   delete this->inputLineText;
-
+  delete this->inputLine;
 
   Shell::singletonRef = NULL;
@@ -243 +255 @@
   delete this->inputLine;
   this->inputLine = addCharLine;
+  this->inputLineText->setText(inputLine);
 }
 
@@ -256 +269 @@
   delete this->inputLine;
   this->inputLine = addCharLine;
+  this->inputLineText->setText(inputLine);
 }
 
@@ -264 +278 @@
 void Shell::removeCharacters(unsigned int characterCount)
 {
+  if (strlen(this->inputLine) == 0)
+    return;
+
   if (characterCount > strlen(this->inputLine))
     characterCount = strlen(this->inputLine);
@@ -270 +287 @@
 
   strncpy(removeCharLine, this->inputLine, strlen(inputLine)-characterCount);
+  removeCharLine[strlen(inputLine)-characterCount] = '\0';
   delete this->inputLine;
   this->inputLine = removeCharLine;
-}
-
+  this->inputLineText->setText(inputLine);
+}
+
+#include "key_names.h"
 /**
  * listens for some event
@@ -280 +300 @@
 void Shell::process(const Event &event)
 {
-//  if (event.type)
-
+  if (event.bPressed)
+  {
+    PRINTF(4)("Shell received command %s\n", SDLKToKeyname(event.type));
+    if (event.type == SDLK_BACKQUOTE)
+    {
+      if (EventHandler::getInstance()->getState() == ES_GAME)
+        EventHandler::getInstance()->setState(ES_SHELL);
+      else
+        EventHandler::getInstance()->setState(ES_GAME);
+    }
+
+    else if (event.type == SDLK_TAB)
+      this->autoComplete();
+    else if (event.type == SDLK_BACKSPACE)
+      this->removeCharacters(1);
+    else if (event.type < 127)
+      this->addCharacter(event.type);
+  }
 }
 
@@ -306 +342 @@
 bool Shell::autoComplete()
 {
-
+  PRINTF(3)("AutoCompletion not implemented yet\n");
 }