Commit 86c3638a authored by Daniel Wyatt's avatar Daniel Wyatt

Add variables needed for win32 candidate list support.

parent f8961256
...@@ -44,6 +44,9 @@ ...@@ -44,6 +44,9 @@
#include <imm.h> #include <imm.h>
#define MAX_CANDLIST 10
#define MAX_CANDLENGTH 256
#if SDL_VIDEO_RENDER_D3D #if SDL_VIDEO_RENDER_D3D
//#include <d3d9.h> //#include <d3d9.h>
#define D3D_DEBUG_INFO #define D3D_DEBUG_INFO
...@@ -89,26 +92,26 @@ typedef struct ...@@ -89,26 +92,26 @@ typedef struct
/* Definition from Win98DDK version of IMM.H */ /* Definition from Win98DDK version of IMM.H */
typedef struct tagINPUTCONTEXT2 { typedef struct tagINPUTCONTEXT2 {
HWND hWnd; HWND hWnd;
BOOL fOpen; BOOL fOpen;
POINT ptStatusWndPos; POINT ptStatusWndPos;
POINT ptSoftKbdPos; POINT ptSoftKbdPos;
DWORD fdwConversion; DWORD fdwConversion;
DWORD fdwSentence; DWORD fdwSentence;
union { union {
LOGFONTA A; LOGFONTA A;
LOGFONTW W; LOGFONTW W;
} lfFont; } lfFont;
COMPOSITIONFORM cfCompForm; COMPOSITIONFORM cfCompForm;
CANDIDATEFORM cfCandForm[4]; CANDIDATEFORM cfCandForm[4];
HIMCC hCompStr; HIMCC hCompStr;
HIMCC hCandInfo; HIMCC hCandInfo;
HIMCC hGuideLine; HIMCC hGuideLine;
HIMCC hPrivate; HIMCC hPrivate;
DWORD dwNumMsgBuf; DWORD dwNumMsgBuf;
HIMCC hMsgBuf; HIMCC hMsgBuf;
DWORD fdwInit; DWORD fdwInit;
DWORD dwReserve[3]; DWORD dwReserve[3];
} INPUTCONTEXT2, *PINPUTCONTEXT2, NEAR *NPINPUTCONTEXT2, FAR *LPINPUTCONTEXT2; } INPUTCONTEXT2, *PINPUTCONTEXT2, NEAR *NPINPUTCONTEXT2, FAR *LPINPUTCONTEXT2;
/* Private display data */ /* Private display data */
...@@ -147,6 +150,22 @@ typedef struct SDL_VideoData ...@@ -147,6 +150,22 @@ typedef struct SDL_VideoData
WCHAR ime_readingstring[16]; WCHAR ime_readingstring[16];
int ime_cursor; int ime_cursor;
SDL_bool ime_candlist;
WCHAR ime_candidates[MAX_CANDLIST][MAX_CANDLENGTH];
DWORD ime_candcount;
DWORD ime_candref;
DWORD ime_candsel;
UINT ime_candpgsize;
int ime_candlistindexbase;
SDL_bool ime_candvertical;
SDL_Texture *ime_candtex;
SDL_bool ime_dirty;
SDL_Rect ime_rect;
SDL_Rect ime_candlistrect;
int ime_winwidth;
int ime_winheight;
HKL ime_hkl; HKL ime_hkl;
HMODULE ime_himm32; HMODULE ime_himm32;
UINT (WINAPI *GetReadingString)(HIMC himc, UINT uReadingBufLen, LPWSTR lpwReadingBuf, PINT pnErrorIndex, BOOL *pfIsVertical, PUINT puMaxReadingLen); UINT (WINAPI *GetReadingString)(HIMC himc, UINT uReadingBufLen, LPWSTR lpwReadingBuf, PINT pnErrorIndex, BOOL *pfIsVertical, PUINT puMaxReadingLen);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment