Hello community, here is the log from the commit of package gtk3 for openSUSE:Factory checked in at 2018-07-31 15:55:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk3 (Old) and /work/SRC/openSUSE:Factory/.gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtk3" Tue Jul 31 15:55:28 2018 rev:132 rq:625067 version:3.22.30 Changes: -------- --- /work/SRC/openSUSE:Factory/gtk3/gtk3.changes 2018-06-22 13:15:53.113920870 +0200 +++ /work/SRC/openSUSE:Factory/.gtk3.new/gtk3.changes 2018-07-31 15:55:33.271155858 +0200 @@ -1,0 +2,8 @@ +Tue Jul 24 08:56:43 UTC 2018 - [email protected] + +- Add gtk3-fix-wayland-csd-announce.patch: This fixes libreoffice + under kwin, which would remove it's own headers as per the + manager's request but not inform kwin leaving it in the even + more broken state of having none. (boo#1099991) + +------------------------------------------------------------------- New: ---- gtk3-fix-wayland-csd-announce.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk3.spec ++++++ --- /var/tmp/diff_new_pack.qoNITp/_old 2018-07-31 15:55:34.051157176 +0200 +++ /var/tmp/diff_new_pack.qoNITp/_new 2018-07-31 15:55:34.055157183 +0200 @@ -39,6 +39,8 @@ Patch1: gtk3-revert-forced-xftdpi.patch # PATCH-FIX-UPSTREAM gtk3-filechooserbutton-Fix-reserved-pointers.patch [email protected] -- Stop gcc from complaining about unnecessary parenthesis resulting build failures in gnucash. Patch2: gtk3-filechooserbutton-Fix-reserved-pointers.patch +# PATCH-FIX-UPSTREAM gtk3-fix-wayland-csd-announce.patch boo#1099991 [email protected] -- Fix gdk_wayland_window_announce_csd +Patch3: gtk3-fix-wayland-csd-announce.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -353,6 +355,7 @@ %endif %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %configure \ ++++++ gtk3-fix-wayland-csd-announce.patch ++++++ >From 3d1514c0e8d163102f060ab178914b33dd8c2d9f Mon Sep 17 00:00:00 2001 From: David Edmundson <[email protected]> Date: Mon, 25 Jun 2018 17:06:33 +0100 Subject: [PATCH] Fix gdk_wayland_window_announce_csd According to the spec compositors were to assume surfaces are CSD until told otherwise. This means we need to send org_kde_kwin_server_decoration_request_mode in both cases. The wl_surface is recreated on map/unmap events. If we recreate the wl_surface we have to recreate the org_kde_kwin_server_decoration object with the new surface. This fixes libreoffice under kwin, which would remove it's own headers as per the manager's request but not inform kwin leaving it in the even more broken state of having none. --- gdk/wayland/gdkwaylandwindow.h | 3 ++ gdk/wayland/gdkwindow-wayland.c | 76 +++++++++++++++++++++++++++++++++++++---- gtk/gtkwindow.c | 9 +++-- 3 files changed, 79 insertions(+), 9 deletions(-) diff --git a/gdk/wayland/gdkwaylandwindow.h b/gdk/wayland/gdkwaylandwindow.h index 93b7802b6e..59fbd5727d 100644 --- a/gdk/wayland/gdkwaylandwindow.h +++ b/gdk/wayland/gdkwaylandwindow.h @@ -80,6 +80,9 @@ gboolean gdk_wayland_window_set_transient_for_exported (GdkWindo GDK_AVAILABLE_IN_3_22 void gdk_wayland_window_announce_csd (GdkWindow *window); +GDK_AVAILABLE_IN_3_22 +void gdk_wayland_window_announce_ssd (GdkWindow *window); + G_END_DECLS #endif /* __GDK_WAYLAND_WINDOW_H__ */ diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c index 5a2fdf0223..3da3ac5b68 100644 --- a/gdk/wayland/gdkwindow-wayland.c +++ b/gdk/wayland/gdkwindow-wayland.c @@ -145,6 +145,7 @@ struct _GdkWindowImplWayland unsigned int pending_buffer_attached : 1; unsigned int pending_commit : 1; unsigned int awaiting_frame : 1; + unsigned int using_csd : 1; GdkWindowTypeHint hint; GdkWindow *transient_for; GdkWindow *popup_parent; @@ -258,6 +259,7 @@ static void calculate_moved_to_rect_result (GdkWindow *window, static gboolean gdk_wayland_window_is_exported (GdkWindow *window); static void gdk_wayland_window_unexport (GdkWindow *window); +static void gdk_wayland_window_announce_decoration_mode (GdkWindow *window); GType _gdk_window_impl_wayland_get_type (void); @@ -388,6 +390,8 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS impl->scale = gdk_screen_get_monitor_scale_factor (screen, 0); G_GNUC_END_IGNORE_DEPRECATIONS + impl->using_csd = TRUE; + /* logical 1x1 fake buffer */ impl->staging_cairo_surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, impl->scale, @@ -691,6 +695,7 @@ _gdk_wayland_display_create_window_impl (GdkDisplay *display, window->impl = GDK_WINDOW_IMPL (impl); impl->wrapper = GDK_WINDOW (window); impl->shortcuts_inhibitors = g_hash_table_new (NULL, NULL); + impl->using_csd = TRUE; if (window->width > 65535) { @@ -2064,19 +2069,68 @@ window_anchor_to_gravity_legacy (GdkGravity rect_anchor) } } -void -gdk_wayland_window_announce_csd (GdkWindow *window) +static void +kwin_server_decoration_mode_set (void *data, struct org_kde_kwin_server_decoration *org_kde_kwin_server_decoration, uint32_t mode) +{ + GdkWindow *window = GDK_WINDOW (data); + GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); + + if ((mode == ORG_KDE_KWIN_SERVER_DECORATION_MODE_SERVER && impl->using_csd) || + (mode == ORG_KDE_KWIN_SERVER_DECORATION_MODE_CLIENT && !impl->using_csd)) + gdk_wayland_window_announce_decoration_mode (window); +} + +static const struct org_kde_kwin_server_decoration_listener kwin_server_decoration_listener = { + kwin_server_decoration_mode_set +}; + +static void +gdk_wayland_window_announce_decoration_mode (GdkWindow *window) { GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (gdk_window_get_display (window)); GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); + if (!display_wayland->server_decoration_manager) return; - impl->display_server.server_decoration = - org_kde_kwin_server_decoration_manager_create (display_wayland->server_decoration_manager, - impl->display_server.wl_surface); + if (!impl->display_server.server_decoration) + { + impl->display_server.server_decoration = + org_kde_kwin_server_decoration_manager_create (display_wayland->server_decoration_manager, + impl->display_server.wl_surface); + org_kde_kwin_server_decoration_add_listener (impl->display_server.server_decoration, + &kwin_server_decoration_listener, + window); + } + if (impl->display_server.server_decoration) - org_kde_kwin_server_decoration_request_mode (impl->display_server.server_decoration, - ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_MODE_CLIENT); + { + if (impl->using_csd) + org_kde_kwin_server_decoration_request_mode (impl->display_server.server_decoration, + ORG_KDE_KWIN_SERVER_DECORATION_MODE_CLIENT); + else + org_kde_kwin_server_decoration_request_mode (impl->display_server.server_decoration, + ORG_KDE_KWIN_SERVER_DECORATION_MODE_SERVER); + } +} + +void +gdk_wayland_window_announce_csd (GdkWindow *window) +{ + GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); + + impl->using_csd = TRUE; + if (impl->mapped) + gdk_wayland_window_announce_decoration_mode (window); +} + +void +gdk_wayland_window_announce_ssd (GdkWindow *window) +{ + GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl); + + impl->using_csd = FALSE; + if (impl->mapped) + gdk_wayland_window_announce_decoration_mode (window); } static GdkWindow * @@ -2906,11 +2960,13 @@ gdk_wayland_window_map (GdkWindow *window) else { gdk_wayland_window_create_xdg_toplevel (window); + gdk_wayland_window_announce_decoration_mode (window); } } else { gdk_wayland_window_create_xdg_toplevel (window); + gdk_wayland_window_announce_decoration_mode (window); } impl->mapped = TRUE; @@ -3074,6 +3130,12 @@ gdk_wayland_window_hide_surface (GdkWindow *window) impl->application.was_set = FALSE; } + if (impl->display_server.server_decoration) + { + org_kde_kwin_server_decoration_release (impl->display_server.server_decoration); + impl->display_server.server_decoration = NULL; + } + wl_surface_destroy (impl->display_server.wl_surface); impl->display_server.wl_surface = NULL; diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c index b5f4b5af3d..9a4c8989a5 100644 --- a/gtk/gtkwindow.c +++ b/gtk/gtkwindow.c @@ -7489,8 +7489,13 @@ gtk_window_realize (GtkWidget *widget) gdk_window_set_decorations (gdk_window, 0); #ifdef GDK_WINDOWING_WAYLAND - if (priv->client_decorated && GDK_IS_WAYLAND_WINDOW (gdk_window)) - gdk_wayland_window_announce_csd (gdk_window); + if (GDK_IS_WAYLAND_WINDOW (gdk_window)) + { + if (priv->client_decorated) + gdk_wayland_window_announce_csd (gdk_window); + else + gdk_wayland_window_announce_ssd (gdk_window); + } #endif if (!priv->deletable) -- 2.13.7
