1.1 --- a/src/video/win32/SDL_win32video.h	Tue Nov 23 17:43:10 2010 -0500
     1.2 +++ b/src/video/win32/SDL_win32video.h	Tue Nov 23 17:44:10 2010 -0500
     1.3 @@ -44,6 +44,9 @@
     1.4  
     1.5  #include <imm.h>
     1.6  
     1.7 +#define MAX_CANDLIST    10
     1.8 +#define MAX_CANDLENGTH  256
     1.9 +
    1.10  #if SDL_VIDEO_RENDER_D3D
    1.11  //#include <d3d9.h>
    1.12  #define D3D_DEBUG_INFO
    1.13 @@ -89,26 +92,26 @@
    1.14  
    1.15  /* Definition from Win98DDK version of IMM.H */
    1.16  typedef struct tagINPUTCONTEXT2 {
    1.17 -    HWND                hWnd;
    1.18 -    BOOL                fOpen;
    1.19 -    POINT               ptStatusWndPos;
    1.20 -    POINT               ptSoftKbdPos;
    1.21 -    DWORD               fdwConversion;
    1.22 -    DWORD               fdwSentence;
    1.23 -    union   {
    1.24 -        LOGFONTA        A;
    1.25 -        LOGFONTW        W;
    1.26 +    HWND hWnd;
    1.27 +    BOOL fOpen;
    1.28 +    POINT ptStatusWndPos;
    1.29 +    POINT ptSoftKbdPos;
    1.30 +    DWORD fdwConversion;
    1.31 +    DWORD fdwSentence;
    1.32 +    union {
    1.33 +        LOGFONTA A;
    1.34 +        LOGFONTW W;
    1.35      } lfFont;
    1.36 -    COMPOSITIONFORM     cfCompForm;
    1.37 -    CANDIDATEFORM       cfCandForm[4];
    1.38 -    HIMCC               hCompStr;
    1.39 -    HIMCC               hCandInfo;
    1.40 -    HIMCC               hGuideLine;
    1.41 -    HIMCC               hPrivate;
    1.42 -    DWORD               dwNumMsgBuf;
    1.43 -    HIMCC               hMsgBuf;
    1.44 -    DWORD               fdwInit;
    1.45 -    DWORD               dwReserve[3];
    1.46 +    COMPOSITIONFORM cfCompForm;
    1.47 +    CANDIDATEFORM cfCandForm[4];
    1.48 +    HIMCC hCompStr;
    1.49 +    HIMCC hCandInfo;
    1.50 +    HIMCC hGuideLine;
    1.51 +    HIMCC hPrivate;
    1.52 +    DWORD dwNumMsgBuf;
    1.53 +    HIMCC hMsgBuf;
    1.54 +    DWORD fdwInit;
    1.55 +    DWORD dwReserve[3];
    1.56  } INPUTCONTEXT2, *PINPUTCONTEXT2, NEAR *NPINPUTCONTEXT2, FAR *LPINPUTCONTEXT2;
    1.57  
    1.58  /* Private display data */
    1.59 @@ -147,6 +150,22 @@
    1.60      WCHAR ime_readingstring[16];
    1.61      int ime_cursor;
    1.62  
    1.63 +    SDL_bool ime_candlist;
    1.64 +    WCHAR ime_candidates[MAX_CANDLIST][MAX_CANDLENGTH];
    1.65 +    DWORD ime_candcount;
    1.66 +    DWORD ime_candref;
    1.67 +    DWORD ime_candsel;
    1.68 +    UINT ime_candpgsize;
    1.69 +    int ime_candlistindexbase;
    1.70 +    SDL_bool ime_candvertical;
    1.71 +
    1.72 +    SDL_Texture *ime_candtex;
    1.73 +    SDL_bool ime_dirty;
    1.74 +    SDL_Rect ime_rect;
    1.75 +    SDL_Rect ime_candlistrect;
    1.76 +    int ime_winwidth;
    1.77 +    int ime_winheight;
    1.78 +
    1.79      HKL ime_hkl;
    1.80      HMODULE ime_himm32;
    1.81      UINT (WINAPI *GetReadingString)(HIMC himc, UINT uReadingBufLen, LPWSTR lpwReadingBuf, PINT pnErrorIndex, BOOL *pfIsVertical, PUINT puMaxReadingLen);