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] patch for SDL_WINDOW_SKIP_TASKBAR support, against 2.0.5 source, under /src/video/windows

windows_skip_taskbar.patch (text/plain), 4.48 KB, created by Ioannis Makris on 2017-08-12 23:34:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ioannis Makris

Created: 2017-08-12 23:34:17 UTC

Size: 4.48 KB

patch

obsolete

>diff -ruN windows/SDL_windowswindow.c windows_new/SDL_windowswindow.c
>--- windows/SDL_windowswindow.c	2017-08-13 00:04:45.441260800 +0200
>+++ windows_new/SDL_windowswindow.c	2017-08-13 01:23:23.324108300 +0200
>@@ -78,6 +78,21 @@
>     return style;
> }
> 
>+#define STYLE_SKIP_TASKBAR  (WS_EX_TOOLWINDOW)
>+
>+static DWORD
>+GetWindowExStyle(SDL_Window * window)
>+{
>+    DWORD ex_style = 0;
>+
>+    if (window->flags & SDL_WINDOW_SKIP_TASKBAR) {
>+        if (window->flags & SDL_WINDOW_BORDERLESS) {
>+            ex_style |= STYLE_SKIP_TASKBAR;
>+        }
>+    }
>+    return ex_style;
>+}
>+
> static void
> WIN_SetWindowPositionInternal(_THIS, SDL_Window * window, UINT flags)
> {
>@@ -114,7 +129,7 @@
> }
> 
> static int
>-SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
>+SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, HWND hipwnd, SDL_bool created)
> {
>     SDL_VideoData *videodata = (SDL_VideoData *) _this->driverdata;
>     SDL_WindowData *data;
>@@ -126,6 +141,7 @@
>     }
>     data->window = window;
>     data->hwnd = hwnd;
>+    data->hipwnd = hipwnd;
>     data->hdc = GetDC(hwnd);
>     data->created = created;
>     data->mouse_button_flags = 0;
>@@ -203,6 +219,7 @@
>     }
>     {
>         DWORD style = GetWindowLong(hwnd, GWL_STYLE);
>+        DWORD ex_style = GetWindowLong(hwnd, GWL_EXSTYLE);
>         if (style & WS_VISIBLE) {
>             window->flags |= SDL_WINDOW_SHOWN;
>         } else {
>@@ -234,6 +251,12 @@
>         {
>             window->flags &= ~SDL_WINDOW_MINIMIZED;
>         }
>+
>+        if (ex_style & WS_EX_TOOLWINDOW || hipwnd) {
>+            window->flags |= SDL_WINDOW_SKIP_TASKBAR;
>+        } else {
>+            window->flags &= ~SDL_WINDOW_SKIP_TASKBAR;
>+        }
>     }
>     if (GetFocus() == hwnd) {
>         window->flags |= SDL_WINDOW_INPUT_FOCUS;
>@@ -266,35 +289,51 @@
> WIN_CreateWindow(_THIS, SDL_Window * window)
> {
>     HWND hwnd;
>+    HWND hipwnd = NULL;
>     RECT rect;
>     DWORD style = STYLE_BASIC;
>+    DWORD ex_style = 0;
>     int x, y;
>     int w, h;
> 
>     style |= GetWindowStyle(window);
>+    ex_style = GetWindowExStyle(window);
> 
>     /* Figure out what the window area will be */
>     rect.left = window->x;
>     rect.top = window->y;
>     rect.right = window->x + window->w;
>     rect.bottom = window->y + window->h;
>-    AdjustWindowRectEx(&rect, style, FALSE, 0);
>+    AdjustWindowRectEx(&rect, style, FALSE, ex_style);
>     x = rect.left;
>     y = rect.top;
>     w = (rect.right - rect.left);
>     h = (rect.bottom - rect.top);
> 
>+    if ((window->flags & SDL_WINDOW_SKIP_TASKBAR) && !(window->flags & SDL_WINDOW_BORDERLESS)) {
>+        hipwnd =
>+            CreateWindowEx(WS_EX_TOOLWINDOW, SDL_Appname, TEXT(""), 0,
>+                           0, 0, 0, 0, NULL, NULL, SDL_Instance, NULL);
>+        if (!hipwnd) {
>+            return WIN_SetError("Couldn't create window");
>+        }
>+    }
>+
>     hwnd =
>-        CreateWindow(SDL_Appname, TEXT(""), style, x, y, w, h, NULL, NULL,
>-                     SDL_Instance, NULL);
>+        CreateWindowEx(ex_style, SDL_Appname, TEXT(""), style, x, y, w, h, hipwnd, NULL,
>+                       SDL_Instance, NULL);
>+
>     if (!hwnd) {
>         return WIN_SetError("Couldn't create window");
>     }
> 
>     WIN_PumpEvents(_this);
> 
>-    if (SetupWindowData(_this, window, hwnd, SDL_TRUE) < 0) {
>+    if (SetupWindowData(_this, window, hwnd, hipwnd, SDL_TRUE) < 0) {
>         DestroyWindow(hwnd);
>+        if (hipwnd) {
>+            DestroyWindow(hipwnd);
>+        }
>         return -1;
>     }
> 
>@@ -357,7 +396,7 @@
>         SDL_stack_free(title);
>     }
> 
>-    if (SetupWindowData(_this, window, hwnd, SDL_FALSE) < 0) {
>+    if (SetupWindowData(_this, window, hwnd, 0, SDL_FALSE) < 0) {
>         return -1;
>     }
> 
>@@ -675,6 +714,9 @@
>         RemoveProp(data->hwnd, TEXT("SDL_WindowData"));
>         if (data->created) {
>             DestroyWindow(data->hwnd);
>+            if (data->hipwnd) {                
>+                DestroyWindow(data->hipwnd);
>+            }
>         } else {
>             /* Restore any original event handler... */
>             if (data->wndproc != NULL) {
>diff -ruN windows/SDL_windowswindow.h windows_new/SDL_windowswindow.h
>--- windows/SDL_windowswindow.h	2017-08-13 00:04:45.457261700 +0200
>+++ windows_new/SDL_windowswindow.h	2017-08-13 00:03:18.409282900 +0200
>@@ -31,6 +31,7 @@
> {
>     SDL_Window *window;
>     HWND hwnd;
>+    HWND hipwnd;
>     HDC hdc;
>     HDC mdc;
>     HBITMAP hbm;

Actions: View | Diff

Attachments on bug 3738: 2829

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.