AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

wayland: Fix xdg-output v3 support

Browse Source 
The xdg_output.done event is deprecated in xdg-output v3, so clients
need to rely on the wl_output.done event instead.

However, applying the changes on the fist wl_output.event when using
xdg-output v3 may lead to an incomplete change, as following xdg-output
updates may follow.

Make sure we apply xdg-output events on wl_output.done events with
xdg-output v3.

https://gitlab.gnome.org/GNOME/gtk/issues/2128
This commit is contained in:
Olivier Fourdan 2019-09-03 15:59:18 +02:00
parent 848a19a013
commit 31393704de
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gdk/wayland/gdkdisplay-wayland.c
View File

@ -2215,12 +2215,19 @@ should_update_monitor (GdkWaylandMonitor *monitor)
monitor->version < OUTPUT_VERSION_WITH_DONE); monitor->version < OUTPUT_VERSION_WITH_DONE);
} }
static void static gboolean
apply_monitor_change (GdkWaylandMonitor *monitor) should_expect_xdg_output_done (GdkWaylandMonitor *monitor)
{ {
GdkDisplay *display = GDK_MONITOR (monitor)->display; GdkDisplay *display = GDK_MONITOR (monitor)->display;
GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display); GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
return (monitor_has_xdg_output (monitor) &&
display_wayland->xdg_output_manager_version < NO_XDG_OUTPUT_DONE_SINCE_VERSION);
}
static void
apply_monitor_change (GdkWaylandMonitor *monitor)
{
GDK_NOTE (MISC, GDK_NOTE (MISC,
g_message ("monitor %d changed position %d %d, size %d %d", g_message ("monitor %d changed position %d %d, size %d %d",
monitor->id, monitor->id,
@ -2231,11 +2238,7 @@ apply_monitor_change (GdkWaylandMonitor *monitor)
gdk_monitor_set_size (GDK_MONITOR (monitor), monitor->width, monitor->height); gdk_monitor_set_size (GDK_MONITOR (monitor), monitor->width, monitor->height);
gdk_monitor_set_connector (GDK_MONITOR (monitor), monitor->name); gdk_monitor_set_connector (GDK_MONITOR (monitor), monitor->name);
monitor->wl_output_done = FALSE; monitor->wl_output_done = FALSE;
/* xdg_output v3 marks xdg_output.done as deprecated, so if using monitor->xdg_output_done = FALSE;
* that version, no need to wait for xdg-output.done event.
*/
monitor->xdg_output_done =
(display_wayland->xdg_output_manager_version >= NO_XDG_OUTPUT_DONE_SINCE_VERSION);
update_scale (GDK_MONITOR (monitor)->display); update_scale (GDK_MONITOR (monitor)->display);
} }
@ -2280,7 +2283,7 @@ xdg_output_handle_done (void *data,
g_message ("handle done xdg-output %d", monitor->id)); g_message ("handle done xdg-output %d", monitor->id));
monitor->xdg_output_done = TRUE; monitor->xdg_output_done = TRUE;
if (monitor->wl_output_done) if (monitor->wl_output_done && should_expect_xdg_output_done (monitor))
apply_monitor_change (monitor); apply_monitor_change (monitor);
} }
@ -2377,7 +2380,7 @@ output_handle_done (void *data,
monitor->wl_output_done = TRUE; monitor->wl_output_done = TRUE;
if (!monitor_has_xdg_output (monitor) || monitor->xdg_output_done) if (!should_expect_xdg_output_done (monitor) || monitor->xdg_output_done)
apply_monitor_change (monitor); apply_monitor_change (monitor);
} }