sdl-ios-xcode: src/video/win32/SDL_win32events.c comparison

comparison src/video/win32/SDL_win32events.c @ 3566:07c8339c95c6

Fixed bug #905 Give the foreign window message proc more control over Windows events. This may need to be adjusted when we add the capability for the app to specify whether it wants SDL to handle input for the window or not.

author	Sam Lantinga <slouken@libsdl.org>
date	Tue, 15 Dec 2009 09:20:10 +0000
parents	f43c8f688f77
children	64ce267332c6

comparison

equal deleted inserted replaced

-:f43c8f688f77
+:07c8339c95c6
 WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 SDL_WindowData *data;
 RAWINPUT *raw;
 PACKET packet;
+LRESULT returnCode = -1;
 /* Send a SDL_SYSWMEVENT if the application wants them */
 if (SDL_ProcessEvents[SDL_SYSWMEVENT] == SDL_ENABLE) {
 SDL_SysWMmsg wmmsg;
 SDL_SendWindowEvent(data->windowID,
 SDL_WINDOWEVENT_MINIMIZED, 0, 0);
 }
 }
 }
-return (0);
+returnCode = 0;
+break;
 /* WinCE has no RawInput, so we use the classic mouse events.
 In classic Win32 this is done by WM_INPUT
 */
 #ifdef _WIN32_WCE
 break;
 }
 }
 if (index < 0) {
 /* New mouse?  Should we dynamically update mouse list? */
-return (0);
+returnCode = 0;
+break;
 }
 GetCursorPos(&point);
 ScreenToClient(hwnd, &point);
 SDL_SendMouseWheel(index, 0,
 (short) raw->data.mouse.usButtonData);
 }
 SDL_stack_free(lpb);
 }
-return (0);
+returnCode = 0;
+break;
 #endif /* _WIN32_WCE */
 case WM_MOUSELEAVE:
 {
 int i;
 if (mouse->focus == data->windowID) {
 SDL_SetMouseFocus(i, 0);
 }
 }
 }
-return (0);
+returnCode = 0;
+break;
 case WM_SYSKEYDOWN:
 case WM_KEYDOWN:
 {
 int index;
 /* Ignore repeated keys */
 if (lParam & REPEATED_KEYMASK) {
-return (0);
+returnCode = 0;
+break;
 }
 index = data->videodata->keyboard;
 wParam = RemapVKEY(wParam, lParam);
 switch (wParam) {
 } else if (state[SDL_SCANCODE_RSHIFT] == SDL_RELEASED
 && (GetKeyState(VK_RSHIFT) & 0x8000)) {
 wParam = VK_RSHIFT;
 } else {
 /* Probably a key repeat */
-return (0);
+wParam = 256;
 }
 }
 break;
 case VK_MENU:
 if (lParam & EXTENDED_KEYMASK)
 if (wParam < 256) {
 SDL_SendKeyboardKey(index, SDL_PRESSED,
 data->videodata->key_layout[wParam]);
 }
 }
-return (0);
+returnCode = 0;
+break;
 case WM_SYSKEYUP:
 case WM_KEYUP:
 {
 int index;
 } else if (state[SDL_SCANCODE_RSHIFT] == SDL_PRESSED
 && !(GetKeyState(VK_RSHIFT) & 0x8000)) {
 wParam = VK_RSHIFT;
 } else {
 /* Probably a key repeat */
-return (0);
+wParam = 256;
 }
 }
 break;
 case VK_MENU:
 if (lParam & EXTENDED_KEYMASK)
 if (wParam < 256) {
 SDL_SendKeyboardKey(index, SDL_RELEASED,
 data->videodata->key_layout[wParam]);
 }
 }
-return (0);
+returnCode = 0;
+break;
 case WM_CHAR:
 {
 char text[4];
 text[2] = 0x80 | (char) (wParam & 0x3F);
 text[3] = '\0';
 }
 SDL_SendKeyboardText(data->videodata->keyboard, text);
 }
-return (0);
+returnCode = 0;
+break;
 case WM_INPUTLANGCHANGE:
 {
 WIN_UpdateKeymap(data->videodata->keyboard);
 }
-return (1);
+returnCode = 1;
+break;
 case WM_GETMINMAXINFO:
 {
 MINMAXINFO *info;
 RECT size;
 int style;
 BOOL menu;
 /* If we allow resizing, let the resize happen naturally */
 if (SDL_GetWindowFlags(data->windowID) & SDL_WINDOW_RESIZABLE) {
-return (0);
+returnCode = 0;
+break;
 }
 /* Get the current position of our window */
 GetWindowRect(hwnd, &size);
 x = size.left;
 info->ptMinTrackSize.x = w;
 info->ptMinTrackSize.y = h;
 info->ptMaxTrackSize.x = w;
 info->ptMaxTrackSize.y = h;
 }
-return (0);
+returnCode = 0;
+break;
 case WM_WINDOWPOSCHANGED:
 {
 RECT rect;
 int x, y;
 static HCURSOR cursor;
 if (!cursor) {
 cursor = LoadCursor(NULL, IDC_ARROW);
 }
 SetCursor(cursor);
-return (TRUE);
+returnCode = TRUE;
 }
 }
 break;
 /* We are about to get palette focus! */
 case WM_QUERYNEWPALETTE:
 {
 /*
 WIN_RealizePalette(current_video);
-return (TRUE);
+returnCode = TRUE;
 */
 }
 break;
 /* Another application changed the palette */
 ValidateRect(hwnd, &rect);
 SDL_SendWindowEvent(data->windowID, SDL_WINDOWEVENT_EXPOSED,
 0, 0);
 }
 }
-return (0);
+returnCode = 0;
+break;
-/* If this isn't our window, we don't need to repaint the frame.
-This fixes a reentrancy issue that can cause stack overflows with foreign windows.
-3/21/09 Mason Wheeler */
-case WM_NCPAINT:
-{
-if (SDL_GetWindowFlags(data->windowID) & SDL_WINDOW_FOREIGN) {
-return (0);
-}
-break;
-}
 /* We'll do our own drawing, prevent flicker */
 case WM_ERASEBKGND:
 {
 }
 case WM_CLOSE:
 {
 SDL_SendWindowEvent(data->windowID, SDL_WINDOWEVENT_CLOSE, 0, 0);
 }
-return (0);
+returnCode = 0;
-}
+break;
-return CallWindowProc(data->wndproc, hwnd, msg, wParam, lParam);
+}
+/* If there's a window proc, assume it's going to handle messages */
+if (data->wndproc) {
+return CallWindowProc(data->wndproc, hwnd, msg, wParam, lParam);
+} else if (returnCode >= 0) {
+return returnCode;
+} else {
+return CallWindowProc(DefWindowProc, hwnd, msg, wParam, lParam);
+}
 }
 void
 WIN_PumpEvents(_THIS)
 {

Mercurial > sdl-ios-xcode

comparison src/video/win32/SDL_win32events.c @ 3566:07c8339c95c6