r49133 - in /desktop/unstable/mutter/debian: changelog patches/series patches/wayland-add-extended-state-for-tiled.patch

[smcv at users.alioth.debian.org]

Author: smcv
Date: Thu Jun 23 08:35:58 2016
New Revision: 49133

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49133
Log:
Backport patch from upstream to introduce XDG_SURFACE_STATE_GNOME_TILED

Mark tiled windows with that state, allowing GDK versions with a
corresponding patch to report GDK_WINDOW_STATE_TILED correctly under
Wayland.

Added:
    desktop/unstable/mutter/debian/patches/wayland-add-extended-state-for-tiled.patch
Modified:
    desktop/unstable/mutter/debian/changelog
    desktop/unstable/mutter/debian/patches/series

Modified: desktop/unstable/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/changelog?rev=49133&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/changelog	[utf-8] (original)
+++ desktop/unstable/mutter/debian/changelog	[utf-8] Thu Jun 23 08:35:58 2016
@@ -4,6 +4,12 @@
   * Use https for copyright headers
   * Use https in d/watch and use new "special strings" to help standardize
     format
+
+  [ Simon McVittie ]
+  * Backport patch from upstream to introduce XDG_SURFACE_STATE_GNOME_TILED
+    and mark tiled windows with it, allowing GDK versions with a
+    corresponding patch to report GDK_WINDOW_STATE_TILED correctly under
+    Wayland
 
  -- Simon McVittie <smcv at debian.org>  Thu, 23 Jun 2016 08:57:31 +0100
 

Modified: desktop/unstable/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/series?rev=49133&op=diff
==============================================================================
--- desktop/unstable/mutter/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/mutter/debian/patches/series	[utf-8] Thu Jun 23 08:35:58 2016
@@ -1 +1,2 @@
 01_Wcast-align.patch
+wayland-add-extended-state-for-tiled.patch

Added: desktop/unstable/mutter/debian/patches/wayland-add-extended-state-for-tiled.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/mutter/debian/patches/wayland-add-extended-state-for-tiled.patch?rev=49133&op=file
==============================================================================
--- desktop/unstable/mutter/debian/patches/wayland-add-extended-state-for-tiled.patch	(added)
+++ desktop/unstable/mutter/debian/patches/wayland-add-extended-state-for-tiled.patch	[utf-8] Thu Jun 23 08:35:58 2016
@@ -0,0 +1,49 @@
+From: Olivier Fourdan <ofourdan at redhat.com>
+Date: Wed, 25 May 2016 15:04:27 +0200
+Subject: wayland: add extended state for tiled
+
+xdg-shell allows desktop environments to extend the list of states
+within a given range.
+
+Use this possibility to add a new state for tiled so that gtk+ can
+benefit from this.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=766860
+Origin: upstream, 3.21.3, commit:e7430a45356da043019659db9b4892a08f889c7e
+[smcv: backported to 3.20.x]
+---
+ src/wayland/meta-wayland-surface.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
+index 4699cfd..495723d 100644
+--- a/src/wayland/meta-wayland-surface.c
++++ b/src/wayland/meta-wayland-surface.c
+@@ -56,6 +56,13 @@
+ #include "meta-surface-actor-wayland.h"
+ #include "meta-xwayland-private.h"
+ 
++/*
++ * Define GNOME additional states to xdg-shell
++ * The current reserved range for GNOME is 0x1000 - 0x1FFF
++ */
++
++#define XDG_SURFACE_STATE_GNOME_TILED 0x1000
++
+ enum {
+   PENDING_STATE_SIGNAL_APPLIED,
+ 
+@@ -2502,6 +2509,13 @@ fill_states (struct wl_array *states, MetaWindow *window)
+       s = wl_array_add (states, sizeof *s);
+       *s = XDG_SURFACE_STATE_ACTIVATED;
+     }
++  /* GNOME extension to xdg-shell states */
++  if (window->tile_mode == META_TILE_LEFT ||
++      window->tile_mode == META_TILE_RIGHT)
++    {
++      s = wl_array_add (states, sizeof *s);
++      *s = XDG_SURFACE_STATE_GNOME_TILED;
++    }
+ }
+ 
+ void