Mercurial > sdl-ios-xcode

comparison src/video/x11/SDL_x11events.c @ 1328:27ddb06a0bca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Sam Lantinga <slouken@libsdl.org>
date Sat, 04 Feb 2006 16:29:22 +0000
parents d12a63a8d95a
children 3692456e7b0f
comparison
equal deleted inserted replaced
1327:d12a63a8d95a 1328:27ddb06a0bca
330 #ifdef DEBUG_XEVENTS 330 #ifdef DEBUG_XEVENTS
331 printf("FocusIn!\n"); 331 printf("FocusIn!\n");
332 #endif 332 #endif
333 posted = SDL_PrivateAppActive(1, SDL_APPINPUTFOCUS); 333 posted = SDL_PrivateAppActive(1, SDL_APPINPUTFOCUS);
334 334
335 #ifdef X_HAVE_UTF8_STRING
335 if ( SDL_IC != NULL ) { 336 if ( SDL_IC != NULL ) {
336 pXSetICFocus(SDL_IC); 337 pXSetICFocus(SDL_IC);
337 } 338 }
338 339 #endif
339 /* Queue entry into fullscreen mode */ 340 /* Queue entry into fullscreen mode */
340 switch_waiting = 0x01 | SDL_FULLSCREEN; 341 switch_waiting = 0x01 | SDL_FULLSCREEN;
341 switch_time = SDL_GetTicks() + 1500; 342 switch_time = SDL_GetTicks() + 1500;
342 } 343 }
343 break; 344 break;
347 #ifdef DEBUG_XEVENTS 348 #ifdef DEBUG_XEVENTS
348 printf("FocusOut!\n"); 349 printf("FocusOut!\n");
349 #endif 350 #endif
350 posted = SDL_PrivateAppActive(0, SDL_APPINPUTFOCUS); 351 posted = SDL_PrivateAppActive(0, SDL_APPINPUTFOCUS);
351 352
353 #ifdef X_HAVE_UTF8_STRING
352 if ( SDL_IC != NULL ) { 354 if ( SDL_IC != NULL ) {
353 pXUnsetICFocus(SDL_IC); 355 pXUnsetICFocus(SDL_IC);
354 } 356 }
355 357 #endif
356 /* Queue leaving fullscreen mode */ 358 /* Queue leaving fullscreen mode */
357 switch_waiting = 0x01; 359 switch_waiting = 0x01;
358 switch_time = SDL_GetTicks() + 200; 360 switch_time = SDL_GetTicks() + 200;
359 } 361 }
360 break; 362 break;
712 ODD_keymap[XK_dead_ogonek&0xFF] = SDLK_COMPOSE; 714 ODD_keymap[XK_dead_ogonek&0xFF] = SDLK_COMPOSE;
713 ODD_keymap[XK_dead_iota&0xFF] = SDLK_COMPOSE; 715 ODD_keymap[XK_dead_iota&0xFF] = SDLK_COMPOSE;
714 ODD_keymap[XK_dead_voiced_sound&0xFF] = SDLK_COMPOSE; 716 ODD_keymap[XK_dead_voiced_sound&0xFF] = SDLK_COMPOSE;
715 ODD_keymap[XK_dead_semivoiced_sound&0xFF] = SDLK_COMPOSE; 717 ODD_keymap[XK_dead_semivoiced_sound&0xFF] = SDLK_COMPOSE;
716 ODD_keymap[XK_dead_belowdot&0xFF] = SDLK_COMPOSE; 718 ODD_keymap[XK_dead_belowdot&0xFF] = SDLK_COMPOSE;
719 #ifdef XK_dead_hook
717 ODD_keymap[XK_dead_hook&0xFF] = SDLK_COMPOSE; 720 ODD_keymap[XK_dead_hook&0xFF] = SDLK_COMPOSE;
721 #endif
722 #ifdef XK_dead_horn
718 ODD_keymap[XK_dead_horn&0xFF] = SDLK_COMPOSE; 723 ODD_keymap[XK_dead_horn&0xFF] = SDLK_COMPOSE;
724 #endif
719 725
720 #ifdef XK_dead_circumflex 726 #ifdef XK_dead_circumflex
721 /* These X keysyms have 0xFE as the high byte */ 727 /* These X keysyms have 0xFE as the high byte */
722 ODD_keymap[XK_dead_circumflex&0xFF] = SDLK_CARET; 728 ODD_keymap[XK_dead_circumflex&0xFF] = SDLK_CARET;
723 #endif 729 #endif