Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-22 00:35:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Date: Sat, 04 Feb 2006 19:47:23 +0900

Browse Source 
From: Hayashi Naoyuki
Subject: Re: [SDL] Character Composition problem on X

The compilation fails.
cc: Error: SDL_x11events.c, line 717: In this statement, "XK_dead_hook"
is not declared. (undeclared)
        ODD_keymap[XK_dead_hook&0xFF] = SDLK_COMPOSE;
-------------------^
cc: Error: SDL_x11events.c, line 718: In this statement, "XK_dead_horn"
is not declared. (undeclared)
        ODD_keymap[XK_dead_horn&0xFF] = SDLK_COMPOSE;

Neither XK_dead_hook nor XK_dead_horn are defined on Tru64.
This commit is contained in:
Sam Lantinga
2006-02-04 16:29:22 +00:00
parent 467be8347d
commit 76646e9ef3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/video/x11/SDL_x11events.c
View File

@@ -332,10 +332,11 @@ printf("FocusIn!\n");
#endif
posted = SDL_PrivateAppActive(1, SDL_APPINPUTFOCUS);
#ifdef X_HAVE_UTF8_STRING
if ( SDL_IC != NULL ) {
pXSetICFocus(SDL_IC);
}
#endif
/* Queue entry into fullscreen mode */
switch_waiting = 0x01 | SDL_FULLSCREEN;
switch_time = SDL_GetTicks() + 1500;
@@ -349,10 +350,11 @@ printf("FocusOut!\n");
#endif
posted = SDL_PrivateAppActive(0, SDL_APPINPUTFOCUS);
#ifdef X_HAVE_UTF8_STRING
if ( SDL_IC != NULL ) {
pXUnsetICFocus(SDL_IC);
}
#endif
/* Queue leaving fullscreen mode */
switch_waiting = 0x01;
switch_time = SDL_GetTicks() + 200;
@@ -714,8 +716,12 @@ void X11_InitKeymap(void)
ODD_keymap[XK_dead_voiced_sound&0xFF] = SDLK_COMPOSE;
ODD_keymap[XK_dead_semivoiced_sound&0xFF] = SDLK_COMPOSE;
ODD_keymap[XK_dead_belowdot&0xFF] = SDLK_COMPOSE;
#ifdef XK_dead_hook
ODD_keymap[XK_dead_hook&0xFF] = SDLK_COMPOSE;
#endif
#ifdef XK_dead_horn
ODD_keymap[XK_dead_horn&0xFF] = SDLK_COMPOSE;
#endif
#ifdef XK_dead_circumflex
/* These X keysyms have 0xFE as the high byte */