encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only reset the clip rect if it's currently the rect we previously clipped. 

This prevents us from clearing the clip rect globally when another application has set it.

There's also an experimental change to regularly update the clip rect for a window defensively, in case someone else has reset it. It works well, but I don't know if it's cheap enough to call as frequently as it would be called now, and might have other undesirable side effects.

Also fixed whitespace and SDL coding style
This commit is contained in:
Sam Lantinga 2018-08-26 10:34:23 -07:00
parent 09ab752aa3
commit 15b3794f11
4 changed files with 52 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/video/SDL_video.c
View File

@ -1543,8 +1543,9 @@ SDL_CreateWindow(const char *title, int x, int y, int w, int h, Uint32 flags)
// Clear minimized if not on windows, only windows handles it at create rather than FinishWindowCreation, // Clear minimized if not on windows, only windows handles it at create rather than FinishWindowCreation,
// but it's important or window focus will get broken on windows! // but it's important or window focus will get broken on windows!
#if !defined(__WIN32__) #if !defined(__WIN32__)
if ( window->flags & SDL_WINDOW_MINIMIZED ) if (window->flags & SDL_WINDOW_MINIMIZED) {
window->flags &= ~SDL_WINDOW_MINIMIZED; window->flags &= ~SDL_WINDOW_MINIMIZED;
}
#endif #endif
#if __WINRT__ && (NTDDI_VERSION < NTDDI_WIN10) #if __WINRT__ && (NTDDI_VERSION < NTDDI_WIN10)

29
src/video/windows/SDL_windowsevents.c
View File

@ -228,9 +228,7 @@ WIN_CheckWParamMouseButton(SDL_bool bwParamMousePressed, SDL_bool bSDLMousePress
/* Ignore the button click for activation */ /* Ignore the button click for activation */
if (!bwParamMousePressed) { if (!bwParamMousePressed) {
data->focus_click_pending &= ~SDL_BUTTON(button); data->focus_click_pending &= ~SDL_BUTTON(button);
if (!data->focus_click_pending) { WIN_UpdateClipCursor(data->window);
WIN_UpdateClipCursor(data->window);
}
} }
if (WIN_ShouldIgnoreFocusClick()) { if (WIN_ShouldIgnoreFocusClick()) {
return; return;
@ -401,6 +399,11 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
} }
#endif /* WMMSG_DEBUG */ #endif /* WMMSG_DEBUG */
/* Update the clipping rect in case someone else has stolen it */
/* FIXME: Is this function cheap enough to call this frequently?
WIN_UpdateClipCursor(data->window);
*/
if (IME_HandleMessage(hwnd, msg, wParam, &lParam, data->videodata)) if (IME_HandleMessage(hwnd, msg, wParam, &lParam, data->videodata))
return 0; return 0;
@ -465,6 +468,8 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
SDL_ToggleModState(KMOD_CAPS, (GetKeyState(VK_CAPITAL) & 0x0001) != 0); SDL_ToggleModState(KMOD_CAPS, (GetKeyState(VK_CAPITAL) & 0x0001) != 0);
SDL_ToggleModState(KMOD_NUM, (GetKeyState(VK_NUMLOCK) & 0x0001) != 0); SDL_ToggleModState(KMOD_NUM, (GetKeyState(VK_NUMLOCK) & 0x0001) != 0);
} else { } else {
RECT rect;
data->in_window_deactivation = SDL_TRUE; data->in_window_deactivation = SDL_TRUE;
if (SDL_GetKeyboardFocus() == data->window) { if (SDL_GetKeyboardFocus() == data->window) {
@ -472,7 +477,11 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
WIN_ResetDeadKeys(); WIN_ResetDeadKeys();
} }
ClipCursor(NULL); if (GetClipCursor(&rect) && SDL_memcmp(&rect, &data->cursor_clipped_rect, sizeof(rect) == 0)) {
SDL_Log("Windows deactivate, ClipCursor(NULL)\n");
ClipCursor(NULL);
SDL_zero(data->cursor_clipped_rect);
}
data->in_window_deactivation = SDL_FALSE; data->in_window_deactivation = SDL_FALSE;
} }
@ -653,7 +662,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
break; break;
case WM_UNICHAR: case WM_UNICHAR:
if ( wParam == UNICODE_NOCHAR ) { if (wParam == UNICODE_NOCHAR) {
returnCode = 1; returnCode = 1;
break; break;
} }
@ -661,8 +670,8 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_CHAR: case WM_CHAR:
{ {
char text[5]; char text[5];
if ( WIN_ConvertUTF32toUTF8( (UINT32)wParam, text ) ) { if (WIN_ConvertUTF32toUTF8((UINT32)wParam, text)) {
SDL_SendKeyboardText( text ); SDL_SendKeyboardText(text);
} }
} }
returnCode = 0; returnCode = 0;
@ -1099,9 +1108,9 @@ IsWin10FCUorNewer(void)
SDL_zero(info); SDL_zero(info);
info.dwOSVersionInfoSize = sizeof(info); info.dwOSVersionInfoSize = sizeof(info);
if (getVersionPtr(&info) == 0) { /* STATUS_SUCCESS == 0 */ if (getVersionPtr(&info) == 0) { /* STATUS_SUCCESS == 0 */
if ( (info.dwMajorVersion == 10 && info.dwMinorVersion == 0 && info.dwBuildNumber >= 16299) if ((info.dwMajorVersion == 10 && info.dwMinorVersion == 0 && info.dwBuildNumber >= 16299) ||
|| (info.dwMajorVersion == 10 && info.dwMinorVersion > 0) (info.dwMajorVersion == 10 && info.dwMinorVersion > 0) ||
|| (info.dwMajorVersion > 10) ) (info.dwMajorVersion > 10))
{ {
return SDL_TRUE; return SDL_TRUE;
} }

56
src/video/windows/SDL_windowswindow.c
View File

@ -98,9 +98,10 @@ GetWindowStyle(SDL_Window * window)
style |= STYLE_RESIZABLE; style |= STYLE_RESIZABLE;
} }
/* Need to set initialize minimize style, or when we call ShowWindow with WS_MINIMIZE it will activate a random window */ /* Need to set initialize minimize style, or when we call ShowWindow with WS_MINIMIZE it will activate a random window */
if ( window->flags & SDL_WINDOW_MINIMIZED ) if (window->flags & SDL_WINDOW_MINIMIZED) {
style |= WS_MINIMIZE; style |= WS_MINIMIZE;
}
} }
return style; return style;
} }
@ -334,8 +335,9 @@ WIN_CreateWindow(_THIS, SDL_Window * window)
/* Inform Windows of the frame change so we can respond to WM_NCCALCSIZE */ /* Inform Windows of the frame change so we can respond to WM_NCCALCSIZE */
SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE); SetWindowPos(hwnd, NULL, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOSIZE | SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE);
if ( window->flags & SDL_WINDOW_MINIMIZED ) if (window->flags & SDL_WINDOW_MINIMIZED) {
ShowWindow( hwnd, SW_SHOWMINNOACTIVE ); ShowWindow(hwnd, SW_SHOWMINNOACTIVE);
}
if (!(window->flags & SDL_WINDOW_OPENGL)) { if (!(window->flags & SDL_WINDOW_OPENGL)) {
return 0; return 0;
@ -409,13 +411,11 @@ WIN_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
SDL_sscanf(hint, "%p", (void**)&otherWindow); SDL_sscanf(hint, "%p", (void**)&otherWindow);
/* Do some error checking on the pointer */ /* Do some error checking on the pointer */
if (otherWindow != NULL && otherWindow->magic == &_this->window_magic) if (otherWindow != NULL && otherWindow->magic == &_this->window_magic) {
{
/* If the otherWindow has SDL_WINDOW_OPENGL set, set it for the new window as well */ /* If the otherWindow has SDL_WINDOW_OPENGL set, set it for the new window as well */
if (otherWindow->flags & SDL_WINDOW_OPENGL) if (otherWindow->flags & SDL_WINDOW_OPENGL) {
{
window->flags |= SDL_WINDOW_OPENGL; window->flags |= SDL_WINDOW_OPENGL;
if(!WIN_GL_SetPixelFormatFrom(_this, otherWindow, window)) { if (!WIN_GL_SetPixelFormatFrom(_this, otherWindow, window)) {
return -1; return -1;
} }
} }
@ -548,17 +548,17 @@ WIN_GetWindowBordersSize(_THIS, SDL_Window * window, int *top, int *left, int *b
void void
WIN_ShowWindow(_THIS, SDL_Window * window) WIN_ShowWindow(_THIS, SDL_Window * window)
{ {
DWORD style; DWORD style;
HWND hwnd; HWND hwnd;
int nCmdShow; int nCmdShow;
hwnd = ( (SDL_WindowData *)window->driverdata )->hwnd; hwnd = ((SDL_WindowData *)window->driverdata)->hwnd;
nCmdShow = SW_SHOW; nCmdShow = SW_SHOW;
style = GetWindowLong(hwnd, GWL_EXSTYLE); style = GetWindowLong(hwnd, GWL_EXSTYLE);
if ( style & WS_EX_NOACTIVATE ) if (style & WS_EX_NOACTIVATE) {
nCmdShow = SW_SHOWNOACTIVATE; nCmdShow = SW_SHOWNOACTIVATE;
}
ShowWindow(hwnd, nCmdShow ); ShowWindow(hwnd, nCmdShow);
} }
void void
@ -902,6 +902,7 @@ WIN_UpdateClipCursor(SDL_Window *window)
{ {
SDL_WindowData *data = (SDL_WindowData *) window->driverdata; SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
SDL_Mouse *mouse = SDL_GetMouse(); SDL_Mouse *mouse = SDL_GetMouse();
RECT rect;
if (data->focus_click_pending) { if (data->focus_click_pending) {
return; return;
@ -911,7 +912,6 @@ WIN_UpdateClipCursor(SDL_Window *window)
(window->flags & SDL_WINDOW_INPUT_FOCUS)) { (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
if (mouse->relative_mode && !mouse->relative_mode_warp) { if (mouse->relative_mode && !mouse->relative_mode_warp) {
LONG cx, cy; LONG cx, cy;
RECT rect;
GetWindowRect(data->hwnd, &rect); GetWindowRect(data->hwnd, &rect);
cx = (rect.left + rect.right) / 2; cx = (rect.left + rect.right) / 2;
@ -923,17 +923,21 @@ WIN_UpdateClipCursor(SDL_Window *window)
rect.top = cy - 1; rect.top = cy - 1;
rect.bottom = cy + 1; rect.bottom = cy + 1;
ClipCursor(&rect); if (ClipCursor(&rect)) {
data->cursor_clipped_rect = rect;
}
} else { } else {
RECT rect;
if (GetClientRect(data->hwnd, &rect) && !IsRectEmpty(&rect)) { if (GetClientRect(data->hwnd, &rect) && !IsRectEmpty(&rect)) {
ClientToScreen(data->hwnd, (LPPOINT) & rect); ClientToScreen(data->hwnd, (LPPOINT) & rect);
ClientToScreen(data->hwnd, (LPPOINT) & rect + 1); ClientToScreen(data->hwnd, (LPPOINT) & rect + 1);
ClipCursor(&rect); if (ClipCursor(&rect)) {
data->cursor_clipped_rect = rect;
}
} }
} }
} else { } else if (GetClipCursor(&rect) && SDL_memcmp(&rect, &data->cursor_clipped_rect, sizeof(rect)) == 0) {
ClipCursor(NULL); ClipCursor(NULL);
SDL_zero(data->cursor_clipped_rect);
} }
} }

1
src/video/windows/SDL_windowswindow.h
View File

@ -46,6 +46,7 @@ typedef struct
Uint8 focus_click_pending; Uint8 focus_click_pending;
SDL_bool windowed_mode_was_maximized; SDL_bool windowed_mode_was_maximized;
SDL_bool in_window_deactivation; SDL_bool in_window_deactivation;
RECT cursor_clipped_rect;
struct SDL_VideoData *videodata; struct SDL_VideoData *videodata;
#if SDL_VIDEO_OPENGL_EGL #if SDL_VIDEO_OPENGL_EGL
EGLSurface egl_surface; EGLSurface egl_surface;