Mercurial > sdl-ios-xcode
comparison src/video/win32/SDL_win32window.c @ 4650:7ad7a473b086
More fixes for windows. Disabled tablet code.
author | jimtla |
---|---|
date | Thu, 10 Jun 2010 00:15:17 -0400 |
parents | f7b03b6838cb |
children | 03dcb795c583 |
comparison
equal
deleted
inserted
replaced
4649:35a80b0791aa | 4650:7ad7a473b086 |
---|---|
254 SDL_Instance, NULL); | 254 SDL_Instance, NULL); |
255 if (!hwnd) { | 255 if (!hwnd) { |
256 WIN_SetError("Couldn't create window"); | 256 WIN_SetError("Couldn't create window"); |
257 return -1; | 257 return -1; |
258 } | 258 } |
259 | 259 /*Disable Tablet support, replace with multi-touch.*/ |
260 #if 0 | |
260 /* we're configuring the tablet data. See Wintab reference for more info */ | 261 /* we're configuring the tablet data. See Wintab reference for more info */ |
261 if (videodata->wintabDLL | 262 if (videodata->wintabDLL |
262 && videodata->WTInfoA(WTI_DEFSYSCTX, 0, &lc) != 0) { | 263 && videodata->WTInfoA(WTI_DEFSYSCTX, 0, &lc) != 0) { |
263 lc.lcPktData = PACKETDATA; | 264 lc.lcPktData = PACKETDATA; |
264 lc.lcPktMode = PACKETMODE; | 265 lc.lcPktMode = PACKETMODE; |
288 } | 289 } |
289 g_hCtx = tmp_hctx; | 290 g_hCtx = tmp_hctx; |
290 } | 291 } |
291 g_hCtx[window->id] = videodata->WTOpenA(hwnd, &lc, TRUE); | 292 g_hCtx[window->id] = videodata->WTOpenA(hwnd, &lc, TRUE); |
292 } | 293 } |
294 #else | |
295 //RegisterTouchWindow(hwnd, 0); | |
296 #endif | |
293 #ifndef _WIN32_WCE /* has no RawInput */ | 297 #ifndef _WIN32_WCE /* has no RawInput */ |
294 /* we're telling the window, we want it to report raw input events from mice */ | 298 /* we're telling the window, we want it to report raw input events from mice */ |
295 Rid.usUsagePage = 0x01; | 299 Rid.usUsagePage = 0x01; |
296 Rid.usUsage = 0x02; | 300 Rid.usUsage = 0x02; |
297 Rid.dwFlags = RIDEV_INPUTSINK; | 301 Rid.dwFlags = RIDEV_INPUTSINK; |