pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed compile errors

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402718
This commit is contained in:
Sam Lantinga 2008-02-07 16:00:29 +00:00
parent 49f4428692
commit 0f15089eef
4 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/video/x11/SDL_x11events.c
View file

@ -145,7 +145,7 @@ X11_DispatchEvent(_THIS)
#ifdef DEBUG_XEVENTS #ifdef DEBUG_XEVENTS
printf("MappingNotify!\n"); printf("MappingNotify!\n");
#endif #endif
X11_UpdateKeymap(this); X11_UpdateKeymap(_this);
} }
break; break;
@ -177,7 +177,7 @@ X11_DispatchEvent(_THIS)
case KeyPress:{ case KeyPress:{
KeyCode keycode = xevent.xkey.keycode; KeyCode keycode = xevent.xkey.keycode;
KeySym keysym = NoSymbol; KeySym keysym = NoSymbol;
char text[sizeof(SDL_TEXTINPUTEVENT_TEXT_SIZE)]; char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];
Uint32 ucs4 = 0; Uint32 ucs4 = 0;
#ifdef DEBUG_XEVENTS #ifdef DEBUG_XEVENTS
@ -199,7 +199,7 @@ X11_DispatchEvent(_THIS)
#endif #endif
/* Xutf8LookupString(), works for Latin-1 */ /* Xutf8LookupString(), works for Latin-1 */
SDL_zero(text); SDL_zero(text);
XLookupString(&xevent, text, sizeof(text), &keysym, NULL); XLookupString(&xevent.xkey, text, sizeof(text), &keysym, NULL);
if (*text) { if (*text) {
printf("Sending text event %s\n", text); printf("Sending text event %s\n", text);
SDL_SendKeyboardText(videodata->keyboard, text); SDL_SendKeyboardText(videodata->keyboard, text);

2
src/video/x11/SDL_x11keyboard.c
View file

@ -364,7 +364,7 @@ X11_InitKeyboard(_THIS)
SDL_zero(keyboard); SDL_zero(keyboard);
data->keyboard = SDL_AddKeyboard(&keyboard, -1); data->keyboard = SDL_AddKeyboard(&keyboard, -1);
X11_UpdateKeymap(this); X11_UpdateKeymap(_this);
SDL_SetScancodeName(SDL_SCANCODE_APPLICATION, "Menu"); SDL_SetScancodeName(SDL_SCANCODE_APPLICATION, "Menu");

20
test/common.c
View file

@ -804,19 +804,19 @@ PrintEvent(SDL_Event * event)
break; break;
case SDL_KEYDOWN: case SDL_KEYDOWN:
fprintf(stderr, fprintf(stderr,
"Keyboard %d: key pressed in window %d: physical 0x%08X = %s, layout 0x%08X = %s", "Keyboard %d: key pressed in window %d: scancode 0x%08X = %s, keycode 0x%08X = %s",
event->key.which, event->key.windowID, event->key.keysym.sym, event->key.which, event->key.windowID,
SDL_GetKeyName(event->key.keysym.sym), event->key.keysym.scancode,
SDL_GetLayoutKey(event->key.keysym.sym), SDL_GetScancodeName(event->key.keysym.scancode),
SDL_GetKeyName(SDL_GetLayoutKey(event->key.keysym.sym))); event->key.keysym.sym, SDL_GetKeyName(event->key.keysym.sym));
break; break;
case SDL_KEYUP: case SDL_KEYUP:
fprintf(stderr, fprintf(stderr,
"Keyboard %d: key released in window %d: physical 0x%08X = %s, layout 0x%08X = %s", "Keyboard %d: key released in window %d: scancode 0x%08X = %s, keycode 0x%08X = %s",
event->key.which, event->key.windowID, event->key.keysym.sym, event->key.which, event->key.windowID,
SDL_GetKeyName(event->key.keysym.sym), event->key.keysym.scancode,
SDL_GetLayoutKey(event->key.keysym.sym), SDL_GetScancodeName(event->key.keysym.scancode),
SDL_GetKeyName(SDL_GetLayoutKey(event->key.keysym.sym))); event->key.keysym.sym, SDL_GetKeyName(event->key.keysym.sym));
break; break;
case SDL_TEXTINPUT: case SDL_TEXTINPUT:
fprintf(stderr, "Keyboard %d: text input \"%s\" in window %d", fprintf(stderr, "Keyboard %d: text input \"%s\" in window %d",

9
test/testkeys.c
View file

@ -1,5 +1,5 @@
/* Print out all the keysyms we have, just to verify them */ /* Print out all the scancodes we have, just to verify them */
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
@ -11,14 +11,15 @@
int int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
SDLKey key; SDL_scancode scancode;
if (SDL_Init(SDL_INIT_VIDEO) < 0) { if (SDL_Init(SDL_INIT_VIDEO) < 0) {
fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError()); fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
exit(1); exit(1);
} }
for (key = SDLK_FIRST; key < SDLK_LAST; ++key) { for (scancode = 0; scancode < SDL_NUM_SCANCODES; ++scancode) {
printf("Key #%d, \"%s\"\n", key, SDL_GetKeyName(key)); printf("Scancode #%d, \"%s\"\n", scancode,
SDL_GetScancodeName(scancode));
} }
SDL_Quit(); SDL_Quit();
return (0); return (0);