From c7ab378c61197bc8b17bf622b4a1bb063e51f6d6 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 16 Mar 2023 14:11:41 -0700
Subject: [PATCH] We don't need to track whether we were hidden by parent focus
change
---
src/video/x11/SDL_x11events.c | 6 ++----
src/video/x11/SDL_x11window.c | 4 ----
src/video/x11/SDL_x11window.h | 1 -
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c
index 6e2f08ec6099..b373be12f376 100644
--- a/src/video/x11/SDL_x11events.c
+++ b/src/video/x11/SDL_x11events.c
@@ -501,10 +501,8 @@ static void X11_DispatchMapNotify(SDL_WindowData *data)
static void X11_DispatchUnmapNotify(SDL_WindowData *data)
{
- if (!data->hidden_by_parent_focus) {
- SDL_SendWindowEvent(data->window, SDL_EVENT_WINDOW_HIDDEN, 0, 0);
- SDL_SendWindowEvent(data->window, SDL_EVENT_WINDOW_MINIMIZED, 0, 0);
- }
+ SDL_SendWindowEvent(data->window, SDL_EVENT_WINDOW_HIDDEN, 0, 0);
+ SDL_SendWindowEvent(data->window, SDL_EVENT_WINDOW_MINIMIZED, 0, 0);
}
static void InitiateWindowMove(_THIS, const SDL_WindowData *data, const SDL_Point *point)
diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
index d5750ce3e292..99f84e5a4959 100644
--- a/src/video/x11/SDL_x11window.c
+++ b/src/video/x11/SDL_x11window.c
@@ -1263,10 +1263,6 @@ void X11_ShowWindow(_THIS, SDL_Window *window)
Display *display = data->videodata->display;
XEvent event;
- if (window->driverdata->hidden_by_parent_focus) {
- return;
- }
-
if (window->parent) {
/* Update our position in case our parent moved while we were hidden */
X11_UpdateWindowPosition(window);
diff --git a/src/video/x11/SDL_x11window.h b/src/video/x11/SDL_x11window.h
index 416f7d6b16af..cc8620aa7364 100644
--- a/src/video/x11/SDL_x11window.h
+++ b/src/video/x11/SDL_x11window.h
@@ -60,7 +60,6 @@ struct SDL_WindowData
int border_top;
int border_bottom;
SDL_bool mouse_grabbed;
- SDL_bool hidden_by_parent_focus;
Uint64 last_focus_event_time;
PendingFocusEnum pending_focus;
Uint64 pending_focus_time;