pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed carriage returns

Browse source
This commit is contained in:
Sam Lantinga 2010-12-29 15:23:54 -08:00
parent bd88a60533
commit cd31bd4a56
1 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/video/win32/SDL_win32events.c
View file

@ -56,9 +56,9 @@
#ifndef WM_INPUT #ifndef WM_INPUT
#define WM_INPUT 0x00ff #define WM_INPUT 0x00ff
#endif #endif
#ifndef WM_TOUCH #ifndef WM_TOUCH
#define WM_TOUCH 0x0240 #define WM_TOUCH 0x0240
#endif #endif
static WPARAM static WPARAM
@ -520,11 +520,11 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
break; break;
case WM_TOUCH: case WM_TOUCH:
{ {
UINT i, num_inputs = LOWORD(wParam); UINT i, num_inputs = LOWORD(wParam);
PTOUCHINPUT inputs = SDL_stack_alloc(TOUCHINPUT, num_inputs); PTOUCHINPUT inputs = SDL_stack_alloc(TOUCHINPUT, num_inputs);
if (data->videodata->GetTouchInputInfo((HTOUCHINPUT)lParam, num_inputs, inputs, sizeof(TOUCHINPUT))) { if (data->videodata->GetTouchInputInfo((HTOUCHINPUT)lParam, num_inputs, inputs, sizeof(TOUCHINPUT))) {
RECT rect; RECT rect;
float x, y; float x, y;
if (!GetClientRect(hwnd, &rect) || if (!GetClientRect(hwnd, &rect) ||
@ -532,14 +532,14 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
break; break;
} }
ClientToScreen(hwnd, (LPPOINT) & rect); ClientToScreen(hwnd, (LPPOINT) & rect);
ClientToScreen(hwnd, (LPPOINT) & rect + 1); ClientToScreen(hwnd, (LPPOINT) & rect + 1);
rect.top *= 100; rect.top *= 100;
rect.left *= 100; rect.left *= 100;
rect.bottom *= 100; rect.bottom *= 100;
rect.right *= 100; rect.right *= 100;
for (i = 0; i < num_inputs; ++i) { for (i = 0; i < num_inputs; ++i) {
PTOUCHINPUT input = &inputs[i]; PTOUCHINPUT input = &inputs[i];
SDL_TouchID touchId = (SDL_TouchID)input->hSource; SDL_TouchID touchId = (SDL_TouchID)input->hSource;
if (!SDL_GetTouch(touchId)) { if (!SDL_GetTouch(touchId)) {
@ -559,26 +559,26 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
if (SDL_AddTouch(&touch, "") < 0) { if (SDL_AddTouch(&touch, "") < 0) {
continue; continue;
} }
} }
// Get the normalized coordinates for the window // Get the normalized coordinates for the window
x = (float)(input->x - rect.left)/(rect.right - rect.left); x = (float)(input->x - rect.left)/(rect.right - rect.left);
y = (float)(input->y - rect.top)/(rect.bottom - rect.top); y = (float)(input->y - rect.top)/(rect.bottom - rect.top);
if (input->dwFlags & TOUCHEVENTF_DOWN) { if (input->dwFlags & TOUCHEVENTF_DOWN) {
SDL_SendFingerDown(touchId, input->dwID, SDL_TRUE, x, y, 1); SDL_SendFingerDown(touchId, input->dwID, SDL_TRUE, x, y, 1);
} }
if (input->dwFlags & TOUCHEVENTF_MOVE) { if (input->dwFlags & TOUCHEVENTF_MOVE) {
SDL_SendTouchMotion(touchId, input->dwID, SDL_FALSE, x, y, 1); SDL_SendTouchMotion(touchId, input->dwID, SDL_FALSE, x, y, 1);
} }
if (input->dwFlags & TOUCHEVENTF_UP) { if (input->dwFlags & TOUCHEVENTF_UP) {
SDL_SendFingerDown(touchId, input->dwID, SDL_FALSE, x, y, 1); SDL_SendFingerDown(touchId, input->dwID, SDL_FALSE, x, y, 1);
} }
} }
} }
SDL_stack_free(inputs); SDL_stack_free(inputs);
data->videodata->CloseTouchInputHandle((HTOUCHINPUT)lParam); data->videodata->CloseTouchInputHandle((HTOUCHINPUT)lParam);
return 0; return 0;
} }
break; break;