src/video/x11/SDL_x11events.c
changeset 10496 6660aa9120d6
parent 10494 c54de4000f9f
child 10499 363c1c7e7a41
     1.1 --- a/src/video/x11/SDL_x11events.c	Fri Oct 07 18:24:34 2016 -0700
     1.2 +++ b/src/video/x11/SDL_x11events.c	Fri Oct 07 18:57:40 2016 -0700
     1.3 @@ -380,8 +380,8 @@
     1.4          X11_XSetICFocus(data->ic);
     1.5      }
     1.6  #endif
     1.7 -#ifdef SDL_USE_IBUS
     1.8 -    SDL_IBus_SetFocus(SDL_TRUE);
     1.9 +#ifdef SDL_USE_IME
    1.10 +    SDL_IME_SetFocus(SDL_TRUE);
    1.11  #endif
    1.12  }
    1.13  
    1.14 @@ -403,8 +403,8 @@
    1.15          X11_XUnsetICFocus(data->ic);
    1.16      }
    1.17  #endif
    1.18 -#ifdef SDL_USE_IBUS
    1.19 -    SDL_IBus_SetFocus(SDL_FALSE);
    1.20 +#ifdef SDL_USE_IME
    1.21 +    SDL_IME_SetFocus(SDL_FALSE);
    1.22  #endif
    1.23  }
    1.24  
    1.25 @@ -786,9 +786,9 @@
    1.26              X11_XLookupString(&xevent.xkey, text, sizeof(text), &keysym, NULL);
    1.27  #endif
    1.28  
    1.29 -#ifdef SDL_USE_IBUS
    1.30 +#ifdef SDL_USE_IME
    1.31              if(SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE){
    1.32 -                handled_by_ime = SDL_IBus_ProcessKeyEvent(keysym, keycode);
    1.33 +                handled_by_ime = SDL_IME_ProcessKeyEvent(keysym, keycode);
    1.34              }
    1.35  #endif
    1.36              if (!handled_by_ime) {
    1.37 @@ -860,10 +860,10 @@
    1.38                  xevent.xconfigure.y != data->last_xconfigure.y) {
    1.39                  SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MOVED,
    1.40                                      xevent.xconfigure.x, xevent.xconfigure.y);
    1.41 -#ifdef SDL_USE_IBUS
    1.42 +#ifdef SDL_USE_IME
    1.43                  if(SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE){
    1.44 -                    /* Update IBus candidate list position */
    1.45 -                    SDL_IBus_UpdateTextRect(NULL);
    1.46 +                    /* Update IME candidate list position */
    1.47 +                    SDL_IME_UpdateTextRect(NULL);
    1.48                  }
    1.49  #endif
    1.50              }
    1.51 @@ -1408,9 +1408,9 @@
    1.52          X11_DispatchEvent(_this);
    1.53      }
    1.54  
    1.55 -#ifdef SDL_USE_IBUS
    1.56 +#ifdef SDL_USE_IME
    1.57      if(SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE){
    1.58 -        SDL_IBus_PumpEvents();
    1.59 +        SDL_IME_PumpEvents();
    1.60      }
    1.61  #endif
    1.62