Mercurial > sdl-ios-xcode

comparison src/video/win32/SDL_win32video.h @ 4755:436183eb30c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with main repo (mainly for non-printable character fix)
author dewyatt
date Sun, 18 Jul 2010 13:48:23 -0400
parents dc7bdcf06367 9faebccfefb3
children 863ba7d1f029
comparison
equal deleted inserted replaced
4754:2072fed2f583 4755:436183eb30c8
43 /* WIN32_LEAN_AND_MEAN was defined, so we have to include this by hand */ 43 /* WIN32_LEAN_AND_MEAN was defined, so we have to include this by hand */
44 #include <objbase.h> 44 #include <objbase.h>
45 #include "ddraw.h" 45 #include "ddraw.h"
46 #endif 46 #endif
47 47
48 #include "SDL_win32clipboard.h"
48 #include "SDL_win32events.h" 49 #include "SDL_win32events.h"
49 #include "SDL_win32gamma.h" 50 #include "SDL_win32gamma.h"
50 #include "SDL_win32keyboard.h" 51 #include "SDL_win32keyboard.h"
51 #include "SDL_win32modes.h" 52 #include "SDL_win32modes.h"
52 #include "SDL_win32mouse.h" 53 #include "SDL_win32mouse.h"
58 #define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UCS-2", "UTF-8", (char *)S, SDL_strlen(S)+1) 59 #define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UCS-2", "UTF-8", (char *)S, SDL_strlen(S)+1)
59 #else 60 #else
60 #define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "ASCII", (char *)S, (SDL_strlen(S)+1)) 61 #define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "ASCII", (char *)S, (SDL_strlen(S)+1))
61 #define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)S, SDL_strlen(S)+1) 62 #define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)S, SDL_strlen(S)+1)
62 #endif 63 #endif
64 extern void WIN_SetError(const char *prefix);
63 65
64 /* Private display data */ 66 /* Private display data */
65 67
66 typedef struct SDL_VideoData 68 typedef struct SDL_VideoData
67 { 69 {
73 HANDLE ddrawDLL; 75 HANDLE ddrawDLL;
74 IDirectDraw *ddraw; 76 IDirectDraw *ddraw;
75 #endif 77 #endif
76 78
77 const SDL_scancode *key_layout; 79 const SDL_scancode *key_layout;
78 80 DWORD clipboard_count;
81
79 SDL_bool ime_com_initialized; 82 SDL_bool ime_com_initialized;
80 struct ITfThreadMgr *ime_thread_mgr; 83 struct ITfThreadMgr *ime_thread_mgr;
81 SDL_bool ime_initialized; 84 SDL_bool ime_initialized;
82 SDL_bool ime_enabled; 85 SDL_bool ime_enabled;
83 SDL_bool ime_available; 86 SDL_bool ime_available;