Changeset 5968

Timestamp:

Oct 20, 2009, 6:46:50 PM (15 years ago)

Author:

rgrieder

Message:

Basic construct of an IOConsole for Unix, using Oli's console from GSDedicated.
MAY NOT COMPILE, PROBABLY DOESN'T RUN!
And surely does neither on Windows.

Location:

code/branches/console/src/libraries/core

Files:

• CMakeLists.txt (modified) (1 diff)
• IOConsole.h (added)
• input/InputBuffer.cc (modified) (2 diffs)
• input/InputBuffer.h (modified) (1 diff)
• input/InputHandler.h (modified) (1 diff)

code/branches/console/src/libraries/core/CMakeLists.txt

@@ -29 +29 @@
   GraphicsManager.cc
   GUIManager.cc
+  IOConsole.cc
   Language.cc
   LuaState.cc

code/branches/console/src/libraries/core/input/InputBuffer.cc

@@ -186 +186 @@
     void InputBuffer::processKey(const KeyEvent& evt)
     {
+        // Prevent disaster when switching applications
         if (evt.isModifierDown(KeyboardModifier::Alt) && evt.getKeyCode() == KeyCode::Tab)
             return;
@@ -222 +223 @@
 
     /**
-        @brief This update() function is called by the InputManager if the InputBuffer is active.
+        @brief This update() function is called by the InputState if the InputBuffer is active.
         @param dt Delta time
     */

code/branches/console/src/libraries/core/input/InputBuffer.h

@@ -162 +162 @@
                 { if (this->cursor_ > 0) { --this->cursor_; } }
 
+            void buttonPressed(const KeyEvent& evt);
+
         private:
             bool charIsAllowed(const char& input);
 
-            void buttonPressed(const KeyEvent& evt);
             void buttonHeld   (const KeyEvent& evt);
             void processKey   (const KeyEvent& evt);

code/branches/console/src/libraries/core/input/InputHandler.h

@@ -72 +72 @@
             , text_(evt.text)
             , modifiers_(0)
+        { }
+        KeyEvent(KeyCode::ByEnum key, unsigned int text, int modifiers)
+            : key_(key)
+            , text_(text)
+            , modifiers_(modifiers)
         { }
         bool operator==(const KeyEvent& rhs) const