Commit 754aa2d321031afe1fd36f99f6ba45f53984d544
2021-08-02T11:55:02
Mostly revert cfcdfb7be9f5c97a51ddef9ad3677a604856266b. This was causing window changes to completely break, resulting in broken decorations and bizarre frame timing, I don't know what exactly it's doing but it's not good. Kept the libdecor_frame_is_floating logic, at least.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
index 1aace10..d4618f6 100644
--- a/src/video/wayland/SDL_waylandwindow.c
+++ b/src/video/wayland/SDL_waylandwindow.c
@@ -290,18 +290,12 @@ decoration_frame_configure(struct libdecor_frame *frame,
enum libdecor_window_state window_state;
struct libdecor_state *state;
- SDL_bool fullscreen = SDL_FALSE;
- SDL_bool maximized = SDL_FALSE;
-
/* window size */
if (!libdecor_configuration_get_content_size(configuration, frame, &width, &height)) {
- width = wind->floating_width;
- height = wind->floating_height;
+ width = window->w;
+ height = window->h;
}
- width = (width == 0) ? window->w : width;
- height = (height == 0) ? window->h : height;
-
Wayland_HandleResize(window, width, height, wind->scale_factor);
wind->shell_surface.libdecor.initial_configure_seen = SDL_TRUE;
@@ -310,51 +304,33 @@ decoration_frame_configure(struct libdecor_frame *frame,
window_state = LIBDECOR_WINDOW_STATE_NONE;
}
- /* translate libdecor to SDL states */
- switch (window_state) {
- case LIBDECOR_WINDOW_STATE_FULLSCREEN:
- fullscreen = SDL_TRUE;
- break;
- case LIBDECOR_WINDOW_STATE_MAXIMIZED:
- maximized = SDL_TRUE;
- break;
- }
-
- if (!fullscreen) {
+ /* Always send maximized/restored/focus events; if the event is redundant it will
+ * automatically be discarded (see src/events/SDL_windowevents.c).
+ *
+ * No, we do not get minimize events from libdecor.
+ */
+ if (window_state & LIBDECOR_WINDOW_STATE_FULLSCREEN) {
+ window->flags |= SDL_WINDOW_FULLSCREEN;
+ } else {
if (window->flags & SDL_WINDOW_FULLSCREEN) {
/* We might need to re-enter fullscreen after being restored from minimized */
SDL_WaylandOutputData *driverdata = (SDL_WaylandOutputData *) SDL_GetDisplayForWindow(window)->driverdata;
SetFullscreen(window, driverdata->output);
- fullscreen = SDL_TRUE;
- }
-
- if (width == 0 || height == 0) {
- width = wind->floating_width;
- height = wind->floating_height;
- }
-
- if ((window->flags & SDL_WINDOW_RESIZABLE)) {
- if (window->max_w > 0) {
- width = SDL_min(width, window->max_w);
- }
- width = SDL_max(width, window->min_w);
-
- if (window->max_h > 0) {
- height = SDL_min(height, window->max_h);
- }
- height = SDL_max(height, window->min_h);
} else {
- return;
+ SDL_SendWindowEvent(window,
+ (window_state & LIBDECOR_WINDOW_STATE_MAXIMIZED) ?
+ SDL_WINDOWEVENT_MAXIMIZED :
+ SDL_WINDOWEVENT_RESTORED,
+ 0, 0);
}
+ window->flags &= ~SDL_WINDOW_FULLSCREEN;
}
- if (!fullscreen) {
- SDL_SendWindowEvent(window,
- maximized ?
- SDL_WINDOWEVENT_MAXIMIZED :
- SDL_WINDOWEVENT_RESTORED,
- 0, 0);
- }
+ SDL_SendWindowEvent(window,
+ (window_state & LIBDECOR_WINDOW_STATE_ACTIVE) ?
+ SDL_WINDOWEVENT_FOCUS_GAINED :
+ SDL_WINDOWEVENT_FOCUS_LOST,
+ 0, 0);
/* commit frame state */
state = libdecor_state_new(width, height);