Changeset 2009Tweet

Timestamp:

Oct 12, 2012, 1:04:13 AM (5 years ago)

Author:

sam

Message:

input: add the Keyboard abstraction object type.

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• core.h (modified) (1 diff)
• input/input.h (modified) (2 diffs)
• input/keyboard.cpp (added)
• input/keyboard.h (added)
• lolcore.vcxproj (modified) (2 diffs)
• lolcore.vcxproj.filters (modified) (2 diffs)
• platform/sdl/sdlinput.cpp (modified) (2 diffs)

trunk/src/Makefile.am

@@ -45 +45 @@
     \
     input/input.cpp input/input.h \
+    input/keyboard.cpp input/keyboard.h \
     input/stick.cpp input/stick.h \
     \

trunk/src/core.h

@@ -92 +92 @@
 #include "scene.h"
 #include "input/input.h"
+#include "input/keyboard.h"
 #include "input/stick.h"
 #include "profiler.h"

trunk/src/input/input.h

@@ -23 +23 @@
 
 #include "lol/math/vector.h"
+#include "input/keyboard.h"
 #include "input/stick.h"
 
@@ -433 +434 @@
 
     /* These methods are called by the underlying input listeners */
+    /* FIXME: this should disappear and be replaced by an input
+     * system that abstracts mice */
     static void SetMousePos(ivec2 coord);
     static void SetMouseButton(int index);
     static void UnsetMouseButton(int index);
 
+    /* Keyboard handling */
+    static Keyboard *CreateKeyboard();
+    static void DestroyKeyboard(Keyboard *keyboard);
+
+    static Keyboard *TrackKeyboard(int desired);
+    static void UntrackKeyboard(Keyboard *keyboard);
+
     /* Joystick handling */
     static Stick *CreateStick();

trunk/src/lolcore.vcxproj

@@ -267 +267 @@
     <ClCompile Include="image\image.cpp" />
     <ClCompile Include="input\input.cpp" />
+    <ClCompile Include="input\keyboard.cpp" />
     <ClCompile Include="input\stick.cpp" />
     <ClCompile Include="layer.cpp" />
@@ -576 +577 @@
     <ClInclude Include="image\image.h" />
     <ClInclude Include="input\input.h" />
+    <ClInclude Include="input\keyboard.h" />
     <ClInclude Include="input\stick.h" />
     <ClInclude Include="layer.h" />

trunk/src/lolcore.vcxproj.filters

@@ -137 +137 @@
       <Filter>src\input</Filter>
     </ClCompile>
+    <ClCompile Include="input\keyboard.cpp">
+      <Filter>src\input</Filter>
+    </ClCompile>
     <ClCompile Include="input\stick.cpp">
       <Filter>src\input</Filter>
@@ -704 +707 @@
     </ClInclude>
     <ClInclude Include="input\input.h">
+      <Filter>src\input</Filter>
+    </ClInclude>
+    <ClInclude Include="input\keyboard.h">
       <Filter>src\input</Filter>
     </ClInclude>

trunk/src/platform/sdl/sdlinput.cpp

@@ -56 +56 @@
 {
 #if defined USE_SDL
+    /* Enable Unicode translation of keyboard events */
+    SDL_EnableUNICODE(1);
+
     SDL_Init(SDL_INIT_TIMER | SDL_INIT_JOYSTICK);
 
@@ -162 +165 @@
 #if 0
         case SDL_KEYDOWN:
-            Input::KeyPressed(event.key.keysym.sym, seconds);
+            if (event.key.keysym.unicode)
+                fprintf(stderr, "%c (0x%04X)\n", event.key.keysym.unicode, event.key.keysym.unicode);
             break;
 #endif