src/video/x11/SDL_x11events.c
changeset 1328 27ddb06a0bca
parent 1327 d12a63a8d95a
child 1336 3692456e7b0f
     1.1 --- a/src/video/x11/SDL_x11events.c	Sat Feb 04 08:35:11 2006 +0000
     1.2 +++ b/src/video/x11/SDL_x11events.c	Sat Feb 04 16:29:22 2006 +0000
     1.3 @@ -332,10 +332,11 @@
     1.4  #endif
     1.5  		posted = SDL_PrivateAppActive(1, SDL_APPINPUTFOCUS);
     1.6  
     1.7 +#ifdef X_HAVE_UTF8_STRING
     1.8  		if ( SDL_IC != NULL ) {
     1.9  			pXSetICFocus(SDL_IC);
    1.10  		}
    1.11 -
    1.12 +#endif
    1.13  		/* Queue entry into fullscreen mode */
    1.14  		switch_waiting = 0x01 | SDL_FULLSCREEN;
    1.15  		switch_time = SDL_GetTicks() + 1500;
    1.16 @@ -349,10 +350,11 @@
    1.17  #endif
    1.18  		posted = SDL_PrivateAppActive(0, SDL_APPINPUTFOCUS);
    1.19  
    1.20 +#ifdef X_HAVE_UTF8_STRING
    1.21  		if ( SDL_IC != NULL ) {
    1.22  			pXUnsetICFocus(SDL_IC);
    1.23  		}
    1.24 -
    1.25 +#endif
    1.26  		/* Queue leaving fullscreen mode */
    1.27  		switch_waiting = 0x01;
    1.28  		switch_time = SDL_GetTicks() + 200;
    1.29 @@ -714,8 +716,12 @@
    1.30   	ODD_keymap[XK_dead_voiced_sound&0xFF] = SDLK_COMPOSE;
    1.31   	ODD_keymap[XK_dead_semivoiced_sound&0xFF] = SDLK_COMPOSE;
    1.32   	ODD_keymap[XK_dead_belowdot&0xFF] = SDLK_COMPOSE;
    1.33 +#ifdef XK_dead_hook
    1.34   	ODD_keymap[XK_dead_hook&0xFF] = SDLK_COMPOSE;
    1.35 +#endif
    1.36 +#ifdef XK_dead_horn
    1.37   	ODD_keymap[XK_dead_horn&0xFF] = SDLK_COMPOSE;
    1.38 +#endif
    1.39  
    1.40  #ifdef XK_dead_circumflex
    1.41  	/* These X keysyms have 0xFE as the high byte */