We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Move ALT-F4 code to WM_KEYDOWN

diff.txt (text/plain), 1.74 KB, created by Matt Eckert on 2014-11-11 11:54:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Eckert

Created: 2014-11-11 11:54:24 UTC

Size: 1.74 KB

patch

obsolete

>diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
>index 28801d2..f5cf430 100644
>--- a/src/video/windows/SDL_windowsevents.c
>+++ b/src/video/windows/SDL_windowsevents.c
>@@ -548,6 +548,16 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
>     case WM_SYSKEYDOWN:
>         {
>             SDL_Scancode code = WindowsScanCodeToSDLScanCode(lParam, wParam);
>+            const Uint8 *keyboardState = SDL_GetKeyboardState(NULL);
>+
>+            /* Detect relevant keyboard shortcuts */
>+            if (keyboardState[SDL_SCANCODE_LALT] == SDL_PRESSED || keyboardState[SDL_SCANCODE_RALT] == SDL_PRESSED) {
>+                /* ALT+F4: Close window */
>+                if (code == SDL_SCANCODE_F4) {
>+                    SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_CLOSE, 0, 0);
>+                }
>+            }
>+
>             if (code != SDL_SCANCODE_UNKNOWN) {
>                 SDL_SendKeyboardKey(SDL_PRESSED, code);
>             }
>@@ -575,14 +585,6 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
>             SDL_Scancode code = WindowsScanCodeToSDLScanCode(lParam, wParam);
>             const Uint8 *keyboardState = SDL_GetKeyboardState(NULL);
> 
>-            /* Detect relevant keyboard shortcuts */
>-            if (keyboardState[SDL_SCANCODE_LALT] == SDL_PRESSED || keyboardState[SDL_SCANCODE_RALT] == SDL_PRESSED) {
>-                /* ALT+F4: Close window */
>-                if (code == SDL_SCANCODE_F4) {
>-                    SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_CLOSE, 0, 0);
>-                }
>-            }
>-
>             if (code != SDL_SCANCODE_UNKNOWN) {
>                 if (code == SDL_SCANCODE_PRINTSCREEN &&
>                     keyboardState[code] == SDL_RELEASED) {

Actions: View | Diff

Attachments on bug 2780: 1930

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.