Mercurial > sdl-ios-xcode

comparison src/video/win32/SDL_win32video.h @ 4661:03dcb795c583

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged changes from the main SDL codebase
author Sam Lantinga <slouken@libsdl.org>
date Mon, 12 Jul 2010 21:09:23 -0700
parents 7ad7a473b086 9faebccfefb3
children c24ba2cc9583
comparison
equal deleted inserted replaced
4660:b15e7017409b 4661:03dcb795c583
50 /* WIN32_LEAN_AND_MEAN was defined, so we have to include this by hand */ 50 /* WIN32_LEAN_AND_MEAN was defined, so we have to include this by hand */
51 #include <objbase.h> 51 #include <objbase.h>
52 #include "ddraw.h" 52 #include "ddraw.h"
53 #endif 53 #endif
54 54
55 #include "wactab/wintab.h" 55 #include "SDL_win32clipboard.h"
56 #define PACKETDATA ( PK_X | PK_Y | PK_BUTTONS | PK_NORMAL_PRESSURE | PK_CURSOR)
57 #define PACKETMODE 0
58 #include "wactab/pktdef.h"
59
60 #include "SDL_win32events.h" 56 #include "SDL_win32events.h"
61 #include "SDL_win32gamma.h" 57 #include "SDL_win32gamma.h"
62 #include "SDL_win32keyboard.h" 58 #include "SDL_win32keyboard.h"
63 #include "SDL_win32modes.h" 59 #include "SDL_win32modes.h"
64 #include "SDL_win32mouse.h" 60 #include "SDL_win32mouse.h"
70 #define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UCS-2", "UTF-8", (char *)S, SDL_strlen(S)+1) 66 #define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UCS-2", "UTF-8", (char *)S, SDL_strlen(S)+1)
71 #else 67 #else
72 #define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "ASCII", (char *)S, (SDL_strlen(S)+1)) 68 #define WIN_StringToUTF8(S) SDL_iconv_string("UTF-8", "ASCII", (char *)S, (SDL_strlen(S)+1))
73 #define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)S, SDL_strlen(S)+1) 69 #define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)S, SDL_strlen(S)+1)
74 #endif 70 #endif
71 extern void WIN_SetError(const char *prefix);
75 72
76 /* Private display data */ 73 /* Private display data */
77 74
78 typedef struct SDL_VideoData 75 typedef struct SDL_VideoData
79 { 76 {
84 #if SDL_VIDEO_RENDER_DDRAW 81 #if SDL_VIDEO_RENDER_DDRAW
85 HANDLE ddrawDLL; 82 HANDLE ddrawDLL;
86 IDirectDraw *ddraw; 83 IDirectDraw *ddraw;
87 #endif 84 #endif
88 85
89 /* *INDENT-OFF* */ 86 DWORD clipboard_count;
90 /* Function pointers for the Wacom API */
91 HANDLE wintabDLL;
92 UINT (*WTInfoA) (UINT, UINT, LPVOID);
93 HCTX (*WTOpenA) (HWND, LPLOGCONTEXTA, BOOL);
94 int (*WTPacket) (HCTX, UINT, LPVOID);
95 BOOL (*WTClose) (HCTX);
96 /* *INDENT-ON* */
97 87
98 int keyboard;
99 const SDL_scancode *key_layout; 88 const SDL_scancode *key_layout;
100 } SDL_VideoData; 89 } SDL_VideoData;
101 90
102 #endif /* _SDL_win32video_h */ 91 #endif /* _SDL_win32video_h */
103 92