diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2019-07-26 17:13:39 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2019-07-26 17:13:39 +0000 |
| commit | c179fce6c7a3e8f23854d6c0f93211b8f8450a51 (patch) | |
| tree | 0c9fef9bab962156894c19ec8fd4a653937ee445 | |
| parent | 88ab3a69428f410a1e2a9fdd08b52990dfb015f7 (diff) | |
| parent | 795899f9d5583a163e6a61057d079ae6db393bb9 (diff) | |
| download | gtk+-c179fce6c7a3e8f23854d6c0f93211b8f8450a51.tar.gz | |
Merge branch 'xdg-output-v3-gtk4' into 'master'
wayland: Add xdg-output v3 support
See merge request GNOME/gtk!1022
| -rw-r--r-- | gdk/wayland/gdkdisplay-wayland.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index c02f7c66eb..931a9f5436 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -93,6 +93,7 @@ #define GTK_SHELL1_VERSION 2 #define OUTPUT_VERSION_WITH_DONE 2 +#define NO_XDG_OUTPUT_DONE_SINCE_VERSION 3 static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland); @@ -531,7 +532,7 @@ gdk_registry_handle_global (void *data, } else if (strcmp(interface, "zxdg_output_manager_v1") == 0) { - display_wayland->xdg_output_manager_version = MIN (version, 2); + display_wayland->xdg_output_manager_version = MIN (version, 3); display_wayland->xdg_output_manager = wl_registry_bind (display_wayland->wl_registry, id, &zxdg_output_manager_v1_interface, @@ -2217,6 +2218,9 @@ should_update_monitor (GdkWaylandMonitor *monitor) static void apply_monitor_change (GdkWaylandMonitor *monitor) { + GdkDisplay *display = GDK_MONITOR (monitor)->display; + GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display); + GDK_NOTE (MISC, g_message ("monitor %d changed position %d %d, size %d %d", monitor->id, @@ -2227,7 +2231,11 @@ apply_monitor_change (GdkWaylandMonitor *monitor) gdk_monitor_set_size (GDK_MONITOR (monitor), monitor->width, monitor->height); gdk_monitor_set_connector (GDK_MONITOR (monitor), monitor->name); monitor->wl_output_done = FALSE; - monitor->xdg_output_done = FALSE; + /* xdg_output v3 marks xdg_output.done as deprecated, so if using + * 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); } |