# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1139070562 0
# Node ID 27ddb06a0bca7bc97c2b0be124f2a436b6a85e33
# Parent  d12a63a8d95a3cbbe2ca57dddfe783f6bc112938
Date: Sat, 04 Feb 2006 19:47:23 +0900
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.

diff -r d12a63a8d95a -r 27ddb06a0bca src/video/x11/SDL_x11events.c
--- a/src/video/x11/SDL_x11events.c	Sat Feb 04 08:35:11 2006 +0000
+++ b/src/video/x11/SDL_x11events.c	Sat Feb 04 16:29:22 2006 +0000
@@ -332,10 +332,11 @@
 #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 @@
 #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 @@
  	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 */