Merge ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic

[Marco Trevisan (Treviño)]

Fix already in cosmic, no need to port there.

[Iain Lane (laney)]

thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 9c9690f..3f8c8d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mutter (3.28.3-2~ubuntu18.04.2) UNRELEASED; urgency=medium
+
+  * d/p/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch:
+    - Create back buffers in early intel GPU generations (LP: #1727356)
+  * d/p/clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch,
+    d/p/clutter-Do-not-latch-modifiers-on-modifier-keys.patch
+    - Fix typing capital letters when using OSD keyboard (LP: #1730211)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 30 Oct 2018 12:25:42 +0100
+
 mutter (3.28.3-2~ubuntu18.04.1) bionic; urgency=medium
 
   * No-change backport from unstable to bionic
diff --git a/debian/patches/clutter-Do-not-latch-modifiers-on-modifier-keys.patch b/debian/patches/clutter-Do-not-latch-modifiers-on-modifier-keys.patch
new file mode 100644
index 0000000..120171f
--- /dev/null
+++ b/debian/patches/clutter-Do-not-latch-modifiers-on-modifier-keys.patch
@@ -0,0 +1,43 @@
+From: Carlos Garnacho <[e-mail]>
+Date: Wed, 3 Oct 2018 22:43:21 +0200
+Subject: clutter: Do not latch modifiers on modifier keys
+
+If the user maps eg. Alt+F2 to a pad button, the MetaInputSettings will
+send the full Alt press, F2 press, F2 release, Alt release sequence.
+However the keycode corresponding to Alt is found in level 1, so the
+Shift modifier gets unintendedly latched in addition to the Alt key
+press/release pair.
+
+We could probably improve keycode lookup heuristics so level=0 (and
+no modifier latching) is preferred, but we can do without it altogether
+for modifier keys.
+
+Ubuntu-Bug: https://bugs.launchpad.net/oem-priority/+bug/1730211
+Applied-Upstream: yes, 3.30.1
+---
+ clutter/clutter/x11/clutter-virtual-input-device-x11.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/clutter/clutter/x11/clutter-virtual-input-device-x11.c b/clutter/clutter/x11/clutter-virtual-input-device-x11.c
+index b86ded0..e16ba3f 100644
+--- a/clutter/clutter/x11/clutter-virtual-input-device-x11.c
++++ b/clutter/clutter/x11/clutter-virtual-input-device-x11.c
+@@ -147,14 +147,16 @@ clutter_virtual_input_device_x11_notify_keyval (ClutterVirtualInputDevice *virtu
+       return;
+     }
+ 
+-  if (key_state == CLUTTER_KEY_STATE_PRESSED)
++  if (!_clutter_keymap_x11_get_is_modifier (keymap, keycode) &&
++      key_state == CLUTTER_KEY_STATE_PRESSED)
+     clutter_keymap_x11_latch_modifiers (keymap, level, TRUE);
+ 
+   XTestFakeKeyEvent (clutter_x11_get_default_display (),
+                      (KeyCode) keycode,
+                      key_state == CLUTTER_KEY_STATE_PRESSED, 0);
+ 
+-  if (key_state == CLUTTER_KEY_STATE_RELEASED)
++  if (!_clutter_keymap_x11_get_is_modifier (keymap, keycode) &&
++      key_state == CLUTTER_KEY_STATE_RELEASED)
+     clutter_keymap_x11_latch_modifiers (keymap, level, FALSE);
+ }
+ 
diff --git a/debian/patches/clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch b/debian/patches/clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch
new file mode 100644
index 0000000..ccb4263
--- /dev/null
+++ b/debian/patches/clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch
@@ -0,0 +1,316 @@
+From: Carlos Garnacho <[e-mail]>
+Date: Fri, 29 Jun 2018 14:31:23 +0200
+Subject: clutter/x11: Implement keycode lookup from keysyms on virtual key
+ devices
+
+Unfortunately XKeysymToKeycode() falls short in that it coalesces keysyms
+into keycodes pertaining to the first level (i.e. lowercase). Add a
+ClutterKeymapX11 method (much alike its GdkKeymap counterpart) to look up
+all matches for the given keysym.
+
+Two other helper methods have been added so the virtual device can fetch
+the current keyboard group, and latch modifiers for key emission. Combining
+all this, the virtual device is now able to handle keycodes in further
+levels.
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/135
+
+(cherry picked from commit 85284acb000ddc70afcf716b6c198b4b5bf5741e)
+
+Ubuntu-Bug: https://bugs.launchpad.net/oem-priority/+bug/1730211
+Applied-Upstream: yes, 3.28.4
+---
+ clutter/clutter/x11/clutter-keymap-x11.c           | 178 ++++++++++++++++++++-
+ clutter/clutter/x11/clutter-keymap-x11.h           |   8 +
+ .../clutter/x11/clutter-virtual-input-device-x11.c |  22 ++-
+ 3 files changed, 204 insertions(+), 4 deletions(-)
+
+diff --git a/clutter/clutter/x11/clutter-keymap-x11.c b/clutter/clutter/x11/clutter-keymap-x11.c
+index 914e314..c34e676 100644
+--- a/clutter/clutter/x11/clutter-keymap-x11.c
++++ b/clutter/clutter/x11/clutter-keymap-x11.c
+@@ -38,6 +38,14 @@
+ 
+ typedef struct _ClutterKeymapX11Class   ClutterKeymapX11Class;
+ typedef struct _DirectionCacheEntry     DirectionCacheEntry;
++typedef struct _ClutterKeymapKey        ClutterKeymapKey;
++
++struct _ClutterKeymapKey
++{
++  guint keycode;
++  guint group;
++  guint level;
++};
+ 
+ struct _DirectionCacheEntry
+ {
+@@ -59,6 +67,7 @@ struct _ClutterKeymapX11
+ 
+   ClutterModifierType num_lock_mask;
+   ClutterModifierType scroll_lock_mask;
++  ClutterModifierType level3_shift_mask;
+ 
+   PangoDirection current_direction;
+ 
+@@ -69,6 +78,7 @@ struct _ClutterKeymapX11
+   Atom current_group_atom;
+   guint current_cache_serial;
+   DirectionCacheEntry group_direction_cache[4];
++  int current_group;
+ #endif
+ 
+   guint caps_lock_state : 1;
+@@ -198,6 +208,9 @@ get_xkb (ClutterKeymapX11 *keymap_x11)
+   if (keymap_x11->scroll_lock_mask == 0)
+     keymap_x11->scroll_lock_mask = XkbKeysymToModifiers (backend_x11->xdpy,
+                                                          XK_Scroll_Lock);
++  if (keymap_x11->level3_shift_mask == 0)
++    keymap_x11->level3_shift_mask = XkbKeysymToModifiers (backend_x11->xdpy,
++                                                          XK_ISO_Level3_Shift);
+ 
+   return keymap_x11->xkb_desc;
+ }
+@@ -469,6 +482,7 @@ static void
+ clutter_keymap_x11_init (ClutterKeymapX11 *keymap)
+ {
+   keymap->current_direction = PANGO_DIRECTION_NEUTRAL;
++  keymap->current_group = -1;
+ }
+ 
+ static ClutterTranslateReturn
+@@ -498,7 +512,8 @@ clutter_keymap_x11_translate_event (ClutterEventTranslator *translator,
+         {
+         case XkbStateNotify:
+           CLUTTER_NOTE (EVENT, "Updating keyboard state");
+-          update_direction (keymap_x11, XkbStateGroup (&xkb_event->state));
++          keymap_x11->current_group = XkbStateGroup (&xkb_event->state);
++          update_direction (keymap_x11, keymap_x11->current_group);
+           update_locked_mods (keymap_x11, xkb_event->state.locked_mods);
+           retval = CLUTTER_TRANSLATE_REMOVE;
+           break;
+@@ -665,3 +680,164 @@ _clutter_keymap_x11_get_direction (ClutterKeymapX11 *keymap)
+ #endif
+     return PANGO_DIRECTION_NEUTRAL;
+ }
++
++static gboolean
++clutter_keymap_x11_get_entries_for_keyval (ClutterKeymapX11  *keymap_x11,
++                                           guint              keyval,
++                                           ClutterKeymapKey **keys,
++                                           gint              *n_keys)
++{
++#ifdef HAVE_XKB
++  if (CLUTTER_BACKEND_X11 (keymap_x11->backend)->use_xkb)
++    {
++      XkbDescRec *xkb = get_xkb (keymap_x11);
++      GArray *retval;
++      gint keycode;
++
++      keycode = keymap_x11->min_keycode;
++      retval = g_array_new (FALSE, FALSE, sizeof (ClutterKeymapKey));
++
++      while (keycode <= keymap_x11->max_keycode)
++        {
++          gint max_shift_levels = XkbKeyGroupsWidth (xkb, keycode);
++          gint group = 0;
++          gint level = 0;
++          gint total_syms = XkbKeyNumSyms (xkb, keycode);
++          gint i = 0;
++          KeySym *entry;
++
++          /* entry is an array with all syms for group 0, all
++           * syms for group 1, etc. and for each group the
++           * shift level syms are in order
++           */
++          entry = XkbKeySymsPtr (xkb, keycode);
++
++          while (i < total_syms)
++            {
++              g_assert (i == (group * max_shift_levels + level));
++
++              if (entry[i] == keyval)
++                {
++                  ClutterKeymapKey key;
++
++                  key.keycode = keycode;
++                  key.group = group;
++                  key.level = level;
++
++                  g_array_append_val (retval, key);
++
++                  g_assert (XkbKeySymEntry (xkb, keycode, level, group) ==
++                            keyval);
++                }
++
++              ++level;
++
++              if (level == max_shift_levels)
++                {
++                  level = 0;
++                  ++group;
++                }
++
++              ++i;
++            }
++
++          ++keycode;
++        }
++
++      if (retval->len > 0)
++        {
++          *keys = (ClutterKeymapKey*) retval->data;
++          *n_keys = retval->len;
++        }
++      else
++        {
++          *keys = NULL;
++          *n_keys = 0;
++        }
++
++      g_array_free (retval, retval->len > 0 ? FALSE : TRUE);
++
++      return *n_keys > 0;
++    }
++  else
++#endif
++    {
++      return FALSE;
++    }
++}
++
++void
++clutter_keymap_x11_latch_modifiers (ClutterKeymapX11 *keymap_x11,
++                                    uint32_t          level,
++                                    gboolean          enable)
++{
++#ifdef HAVE_XKB
++  ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (keymap_x11->backend);
++  uint32_t modifiers[] = {
++    0,
++    ShiftMask,
++    keymap_x11->level3_shift_mask,
++    keymap_x11->level3_shift_mask | ShiftMask,
++  };
++  uint32_t value = 0;
++
++  if (!backend_x11->use_xkb)
++    return;
++
++  level = CLAMP (level, 0, G_N_ELEMENTS (modifiers) - 1);
++
++  if (enable)
++    value = modifiers[level];
++  else
++    value = 0;
++
++  XkbLatchModifiers (clutter_x11_get_default_display (),
++                     XkbUseCoreKbd, modifiers[level],
++                     value);
++#endif
++}
++
++static uint32_t
++clutter_keymap_x11_get_current_group (ClutterKeymapX11 *keymap_x11)
++{
++  ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (keymap_x11->backend);
++  XkbStateRec state_rec;
++
++  if (keymap_x11->current_group >= 0)
++    return keymap_x11->current_group;
++
++  XkbGetState (backend_x11->xdpy, XkbUseCoreKbd, &state_rec);
++  return XkbStateGroup (&state_rec);
++}
++
++gboolean
++clutter_keymap_x11_keycode_for_keyval (ClutterKeymapX11 *keymap_x11,
++                                       guint             keyval,
++                                       guint            *keycode_out,
++                                       guint            *level_out)
++{
++  ClutterKeymapKey *keys;
++  gint i, n_keys, group;
++  gboolean found = FALSE;
++
++  g_return_val_if_fail (keycode_out != NULL, FALSE);
++  g_return_val_if_fail (level_out != NULL, FALSE);
++
++  group = clutter_keymap_x11_get_current_group (keymap_x11);
++
++  if (!clutter_keymap_x11_get_entries_for_keyval (keymap_x11, keyval, &keys, &n_keys))
++    return FALSE;
++
++  for (i = 0; i < n_keys && !found; i++)
++    {
++      if (keys[i].group == group)
++        {
++          *keycode_out = keys[i].keycode;
++          *level_out = keys[i].level;
++          found = TRUE;
++        }
++    }
++
++  g_free (keys);
++  return found;
++}
+diff --git a/clutter/clutter/x11/clutter-keymap-x11.h b/clutter/clutter/x11/clutter-keymap-x11.h
+index ad673a2..4b5b403 100644
+--- a/clutter/clutter/x11/clutter-keymap-x11.h
++++ b/clutter/clutter/x11/clutter-keymap-x11.h
+@@ -51,6 +51,14 @@ gboolean _clutter_keymap_x11_get_is_modifier     (ClutterKeymapX11    *keymap,
+ 
+ PangoDirection _clutter_keymap_x11_get_direction (ClutterKeymapX11    *keymap);
+ 
++gboolean clutter_keymap_x11_keycode_for_keyval (ClutterKeymapX11 *keymap_x11,
++                                                guint             keyval,
++                                                guint            *keycode_out,
++                                                guint            *level_out);
++void     clutter_keymap_x11_latch_modifiers (ClutterKeymapX11 *keymap_x11,
++                                             uint32_t          level,
++                                             gboolean          enable);
++
+ G_END_DECLS
+ 
+ #endif /* __CLUTTER_KEYMAP_X11_H__ */
+diff --git a/clutter/clutter/x11/clutter-virtual-input-device-x11.c b/clutter/clutter/x11/clutter-virtual-input-device-x11.c
+index 416c944..b86ded0 100644
+--- a/clutter/clutter/x11/clutter-virtual-input-device-x11.c
++++ b/clutter/clutter/x11/clutter-virtual-input-device-x11.c
+@@ -32,6 +32,8 @@
+ 
+ #include "clutter-virtual-input-device.h"
+ #include "x11/clutter-virtual-input-device-x11.h"
++#include "x11/clutter-backend-x11.h"
++#include "x11/clutter-keymap-x11.h"
+ 
+ struct _ClutterVirtualInputDeviceX11
+ {
+@@ -135,11 +137,25 @@ clutter_virtual_input_device_x11_notify_keyval (ClutterVirtualInputDevice *virtu
+ 						uint32_t                   keyval,
+ 						ClutterKeyState            key_state)
+ {
+-  KeyCode keycode;
++  ClutterBackendX11 *backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
++  ClutterKeymapX11 *keymap = backend_x11->keymap;
++  uint32_t keycode, level;
++
++  if (!clutter_keymap_x11_keycode_for_keyval (keymap, keyval, &keycode, &level))
++    {
++      g_warning ("No keycode found for keyval %x in current group", keyval);
++      return;
++    }
++
++  if (key_state == CLUTTER_KEY_STATE_PRESSED)
++    clutter_keymap_x11_latch_modifiers (keymap, level, TRUE);
+ 
+-  keycode = XKeysymToKeycode (clutter_x11_get_default_display (), keyval);
+   XTestFakeKeyEvent (clutter_x11_get_default_display (),
+-                     keycode, key_state == CLUTTER_KEY_STATE_PRESSED, 0);
++                     (KeyCode) keycode,
++                     key_state == CLUTTER_KEY_STATE_PRESSED, 0);
++
++  if (key_state == CLUTTER_KEY_STATE_RELEASED)
++    clutter_keymap_x11_latch_modifiers (keymap, level, FALSE);
+ }
+ 
+ static void
diff --git a/debian/patches/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch b/debian/patches/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch
new file mode 100644
index 0000000..a25fca3
--- /dev/null
+++ b/debian/patches/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch
@@ -0,0 +1,63 @@
+From: =?utf-8?q?Alex_Villac=C3=ADs_Lasso?= <[e-mail]>
+Date: Fri, 27 Jul 2018 16:08:52 +0000
+Subject: renderer/native: Fallback to non-planar API if
+ gbm_bo_get_handle_for_plane fails
+
+Commit c0d9b08ef9bf2be865aad9bf1bc74ba24c655d9f replaced the old GBM API calls
+with the multi-plane GBM API. However, the call to gbm_bo_get_handle_for_plane
+fails for some DRI drivers (in particular i915). Due to missing error checks,
+the subsequent call to drmModeAddFB[2] fails and the screen output locks up.
+
+This commit adds the missing error checks and falls back to the old GBM API
+(non-planar) if necessary.
+
+v5: test success of gbm_bo_get_handle_for_plane instead of errno
+
+This commit adopts solution proposed by Daniel van Vugt to check the return
+value of gbm_bo_get_handle_for_plane on plane 0 and fall back to old
+non-planar method if the call fails. This removes the errno check (for
+ENOSYS) that could abort if mesa ever sets a different value.
+
+Related to: https://gitlab.gnome.org/GNOME/mutter/issues/127
+
+(cherry picked from commit f7af32a3eaefabbea3ebbda3a93eff98dd105ab9)
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1727356
+Applied-Upstream: yes, 3.28.4
+---
+ src/backends/native/meta-renderer-native.c | 21 ++++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
+index fc6b223..59003b3 100644
+--- a/src/backends/native/meta-renderer-native.c
++++ b/src/backends/native/meta-renderer-native.c
+@@ -1607,12 +1607,23 @@ gbm_get_next_fb_id (MetaGpuKms         *gpu_kms,
+       return FALSE;
+     }
+ 
+-  for (i = 0; i < gbm_bo_get_plane_count (next_bo); i++)
++  if (gbm_bo_get_handle_for_plane (next_bo, 0).s32 == -1)
+     {
+-      strides[i] = gbm_bo_get_stride_for_plane (next_bo, i);
+-      handles[i] = gbm_bo_get_handle_for_plane (next_bo, i).u32;
+-      offsets[i] = gbm_bo_get_offset (next_bo, i);
+-      modifiers[i] = gbm_bo_get_modifier (next_bo);
++      /* Failed to fetch handle to plane, falling back to old method */
++      strides[0] = gbm_bo_get_stride (next_bo);
++      handles[0] = gbm_bo_get_handle (next_bo).u32;
++      offsets[0] = 0;
++      modifiers[0] = DRM_FORMAT_MOD_INVALID;
++    }
++  else
++    {
++      for (i = 0; i < gbm_bo_get_plane_count (next_bo); i++)
++        {
++          strides[i] = gbm_bo_get_stride_for_plane (next_bo, i);
++          handles[i] = gbm_bo_get_handle_for_plane (next_bo, i).u32;
++          offsets[i] = gbm_bo_get_offset (next_bo, i);
++          modifiers[i] = gbm_bo_get_modifier (next_bo);
++        }
+     }
+ 
+   kms_fd = meta_gpu_kms_get_fd (gpu_kms);
diff --git a/debian/patches/series b/debian/patches/series
index 860ee4c..5bd9ae6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,9 @@ theme-load-icons-as-Gtk-does-with-fallback-and-RTL-suppor.patch
 clutter-Smooth-out-master-clock-to-smooth-visuals.patch
 core-Return-1-if-meta_window_get_monitor-is-called-on-an-.patch
 bgo768531_workaround-startup-notifications.patch
+renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch
+clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch
+clutter-Do-not-latch-modifiers-on-modifier-keys.patch
 debian/synaptics-support.patch
 debian/skip-failing-tests.patch
 debian/skip-failing-tests-325.patch