[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.15,1.16
Max Horn
fingolfin at users.sourceforge.net
Fri Nov 22 10:47:03 CET 2002
Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv4010/backends/sdl
Modified Files:
sdl-common.cpp
Log Message:
improved keyboard input behaviour in SDL backend: make use of the unicode feature in SDL. This way, Shift-1 on my german keyboard generates ! not 1 (on an US keyboard it'll be a different symbol). Should fix bug #600258 and #551447
Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sdl-common.cpp 13 Nov 2002 14:38:48 -0000 1.15
+++ sdl-common.cpp 22 Nov 2002 18:46:18 -0000 1.16
@@ -47,6 +47,9 @@
}
SDL_ShowCursor(SDL_DISABLE);
+
+ // Enable unicode support if possible
+ SDL_EnableUNICODE(1);
#ifndef MACOSX // Don't set icon on OS X, as we use a nicer external icon there
// Setup the icon
@@ -423,14 +426,19 @@
return SDL_CreateThread(proc, param);
}
-int mapKey(int key, byte mod)
+static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode)
{
if (key >= SDLK_F1 && key <= SDLK_F9) {
return key - SDLK_F1 + 315;
+ } else if (key >= SDLK_UP && key <= SDLK_PAGEDOWN) {
+ return key;
+ } else if (unicode) {
+ return unicode;
} else if (key >= 'a' && key <= 'z' && mod & KMOD_SHIFT) {
- key &= ~0x20;
- } else if (key >= SDLK_NUMLOCK && key <= SDLK_EURO)
+ return key & ~0x20;
+ } else if (key >= SDLK_NUMLOCK && key <= SDLK_EURO) {
return 0;
+ }
return key;
}
@@ -486,24 +494,24 @@
break;
}
// map menu key (f11) to f5 (scumm menu)
- if (ev.key.keysym.sym == 292) {
+ if (ev.key.keysym.sym == SDLK_F11) {
event->event_code = EVENT_KEYDOWN;
- event->kbd.keycode = 286;
- event->kbd.ascii = mapKey(286, ev.key.keysym.mod);
+ event->kbd.keycode = SDLK_F5;
+ event->kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
}
// map center (space) to tab (default action )
// I wanted to map the calendar button but the calendar comes up
//
- else if (ev.key.keysym.sym==32) {
+ else if (ev.key.keysym.sym == SDLK_SPACE) {
event->event_code = EVENT_KEYDOWN;
- event->kbd.keycode = 9;
- event->kbd.ascii = mapKey(9, ev.key.keysym.mod);
+ event->kbd.keycode = SDLK_TAB;
+ event->kbd.ascii = mapKey(SDLK_TAB, ev.key.keysym.mod, 0);
}
// since we stole space (pause) above we'll rebind it to the tab key on the keyboard
- else if (ev.key.keysym.sym==9) {
+ else if (ev.key.keysym.sym == SDLK_TAB) {
event->event_code = EVENT_KEYDOWN;
- event->kbd.keycode = 32;
- event->kbd.ascii = mapKey(32, ev.key.keysym.mod);
+ event->kbd.keycode = SDLK_SPACE;
+ event->kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
}
else {
// let the events fall through if we didn't change them, this may not be the best way to
@@ -511,12 +519,12 @@
// and yes i have an huge terminal size so i dont wrap soon enough.
event->event_code = EVENT_KEYDOWN;
event->kbd.keycode = ev.key.keysym.sym;
- event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod);
+ event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
}
#else
event->event_code = EVENT_KEYDOWN;
event->kbd.keycode = ev.key.keysym.sym;
- event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod);
+ event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
#endif
switch(ev.key.keysym.sym) {
@@ -546,7 +554,7 @@
case SDL_KEYUP: {
event->event_code = EVENT_KEYUP;
event->kbd.keycode = ev.key.keysym.sym;
- event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod);
+ event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
switch(ev.key.keysym.sym){
case SDLK_LEFT:
More information about the Scummvm-git-logs
mailing list