Changeset 2009
- Timestamp:
- Oct 12, 2012, 1:04:13 AM (10 years ago)
- Location:
- trunk/src
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/Makefile.am
r1987 r2009 45 45 \ 46 46 input/input.cpp input/input.h \ 47 input/keyboard.cpp input/keyboard.h \ 47 48 input/stick.cpp input/stick.h \ 48 49 \ -
trunk/src/core.h
r1987 r2009 92 92 #include "scene.h" 93 93 #include "input/input.h" 94 #include "input/keyboard.h" 94 95 #include "input/stick.h" 95 96 #include "profiler.h" -
trunk/src/input/input.h
r1897 r2009 23 23 24 24 #include "lol/math/vector.h" 25 #include "input/keyboard.h" 25 26 #include "input/stick.h" 26 27 … … 433 434 434 435 /* These methods are called by the underlying input listeners */ 436 /* FIXME: this should disappear and be replaced by an input 437 * system that abstracts mice */ 435 438 static void SetMousePos(ivec2 coord); 436 439 static void SetMouseButton(int index); 437 440 static void UnsetMouseButton(int index); 438 441 442 /* Keyboard handling */ 443 static Keyboard *CreateKeyboard(); 444 static void DestroyKeyboard(Keyboard *keyboard); 445 446 static Keyboard *TrackKeyboard(int desired); 447 static void UntrackKeyboard(Keyboard *keyboard); 448 439 449 /* Joystick handling */ 440 450 static Stick *CreateStick(); -
trunk/src/lolcore.vcxproj
r1987 r2009 267 267 <ClCompile Include="image\image.cpp" /> 268 268 <ClCompile Include="input\input.cpp" /> 269 <ClCompile Include="input\keyboard.cpp" /> 269 270 <ClCompile Include="input\stick.cpp" /> 270 271 <ClCompile Include="layer.cpp" /> … … 576 577 <ClInclude Include="image\image.h" /> 577 578 <ClInclude Include="input\input.h" /> 579 <ClInclude Include="input\keyboard.h" /> 578 580 <ClInclude Include="input\stick.h" /> 579 581 <ClInclude Include="layer.h" /> -
trunk/src/lolcore.vcxproj.filters
r1987 r2009 137 137 <Filter>src\input</Filter> 138 138 </ClCompile> 139 <ClCompile Include="input\keyboard.cpp"> 140 <Filter>src\input</Filter> 141 </ClCompile> 139 142 <ClCompile Include="input\stick.cpp"> 140 143 <Filter>src\input</Filter> … … 704 707 </ClInclude> 705 708 <ClInclude Include="input\input.h"> 709 <Filter>src\input</Filter> 710 </ClInclude> 711 <ClInclude Include="input\keyboard.h"> 706 712 <Filter>src\input</Filter> 707 713 </ClInclude> -
trunk/src/platform/sdl/sdlinput.cpp
r1808 r2009 56 56 { 57 57 #if defined USE_SDL 58 /* Enable Unicode translation of keyboard events */ 59 SDL_EnableUNICODE(1); 60 58 61 SDL_Init(SDL_INIT_TIMER | SDL_INIT_JOYSTICK); 59 62 … … 162 165 #if 0 163 166 case SDL_KEYDOWN: 164 Input::KeyPressed(event.key.keysym.sym, seconds); 167 if (event.key.keysym.unicode) 168 fprintf(stderr, "%c (0x%04X)\n", event.key.keysym.unicode, event.key.keysym.unicode); 165 169 break; 166 170 #endif
Note: See TracChangeset
for help on using the changeset viewer.