NEWS

+46.4
+====
+* Fix nested popovers on wayland [Carlos; !3874]
+* Misc. bug fixes and cleanups [Robert, Jonas; !3906, !3329]
+
+Contributors:
+  Jonas Ådahl, Carlos Garnacho, Robert Mader
+
+Translators:
+  Jürgen Benvenuti [de], Chao-Hsiung Liao [zh_TW]
+
 46.3.1
 ======
 * Fix visibility of Xwayland windows [Michel; !3862]

clutter/clutter/clutter-stage-private.h

@@ -136,7 +136,7 @@ void clutter_stage_add_to_redraw_clip (ClutterStage       *self,
                                        ClutterPaintVolume *clip);
 
 CLUTTER_EXPORT
-ClutterGrab * clutter_stage_grab_input_only (ClutterStage        *self,
+ClutterGrab * clutter_stage_grab_input_only_inactive (ClutterStage        *self,
                                                       ClutterEventHandler  handler,
                                                       gpointer             user_data,
                                                       GDestroyNotify       user_data_destroy);
@@ -151,4 +151,11 @@ ClutterActor * clutter_stage_update_device_for_event (ClutterStage *stage,
 void clutter_stage_update_devices_in_view (ClutterStage     *stage,
                                            ClutterStageView *view);
 
+CLUTTER_EXPORT
+ClutterGrab * clutter_stage_grab_inactive (ClutterStage *stage,
+                                           ClutterActor *actor);
+
+CLUTTER_EXPORT
+void clutter_grab_activate (ClutterGrab *grab);
+
 G_END_DECLS

clutter/clutter/clutter-stage.c

@@ -3830,18 +3830,31 @@ clutter_stage_grab_full (ClutterStage *stage,
                          ClutterActor *actor,
                          gboolean      owns_actor)
 {
-  ClutterStagePrivate *priv;
-  ClutterGrab *grab;
-  gboolean was_grabbed;
-
   g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL);
   g_return_val_if_fail (CLUTTER_IS_ACTOR (actor), NULL);
   g_return_val_if_fail (stage ==
                         (ClutterStage *) _clutter_actor_get_stage_internal (actor),
                         NULL);
 
+  return clutter_grab_new (stage, actor, owns_actor);
+}
+
+void
+clutter_grab_activate (ClutterGrab *grab)
+{
+  ClutterStage *stage;
+  ClutterStagePrivate *priv;
+  gboolean was_grabbed;
+
+  g_return_if_fail (CLUTTER_IS_GRAB (grab));
+
+  stage = grab->stage;
   priv = clutter_stage_get_instance_private (stage);
 
+  /* This grab is already active */
+  if (grab->prev || grab->next || priv->topmost_grab == grab)
+    return;
+
   if (!priv->topmost_grab)
     {
       ClutterContext *context;
@@ -3854,8 +3867,6 @@ clutter_stage_grab_full (ClutterStage *stage,
         clutter_seat_grab (seat, clutter_get_current_event_time ());
     }
 
-  grab = clutter_grab_new (stage, actor, owns_actor);
-
   grab->prev = NULL;
   grab->next = priv->topmost_grab;
 
@@ -3876,10 +3887,10 @@ clutter_stage_grab_full (ClutterStage *stage,
 
       CLUTTER_NOTE (GRABS,
                     "[grab=%p] Attached seat grab (n_grabs: %u) on actor: %s",
-                    grab, n_grabs, _clutter_actor_get_debug_name (actor));
+                    grab, n_grabs, _clutter_actor_get_debug_name (grab->actor));
     }
 
-  clutter_actor_attach_grab (actor, grab);
+  clutter_actor_attach_grab (grab->actor, grab);
   clutter_stage_notify_grab (stage, grab, grab->next);
 
   if (was_grabbed != !!priv->topmost_grab)
@@ -3887,8 +3898,6 @@ clutter_stage_grab_full (ClutterStage *stage,
 
   if (grab->next)
     clutter_grab_notify (grab->next);
-
-  return grab;
 }
 
 /**
@@ -3905,12 +3914,24 @@ clutter_stage_grab_full (ClutterStage *stage,
 ClutterGrab *
 clutter_stage_grab (ClutterStage *stage,
                     ClutterActor *actor)
+{
+  ClutterGrab *grab;
+
+  grab = clutter_stage_grab_full (stage, actor, FALSE);
+  clutter_grab_activate (grab);
+
+  return grab;
+}
+
+ClutterGrab *
+clutter_stage_grab_inactive (ClutterStage *stage,
+                             ClutterActor *actor)
 {
   return clutter_stage_grab_full (stage, actor, FALSE);
 }
 
 ClutterGrab *
-clutter_stage_grab_input_only (ClutterStage        *stage,
+clutter_stage_grab_input_only_inactive (ClutterStage         *stage,
                                         ClutterEventHandler   handler,
                                         gpointer              user_data,
                                         GDestroyNotify        user_data_destroy)

debian/changelog

+mutter (46.4-1ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian. Remaining changes:
+    - Add x11-Add-support-for-fractional-scaling-using-Randr.patch
+    - Add window-Add-ability-to-override-the-edge-constraints.patch
+      + Make possible for extensions (such as Tiling Assistant) to override
+        window constraints
+    - Add backends-Handle-null-views-instead-of-creating-dummy-view.patch
+      to prevent "clutter_frame_clock_notify_presented: code should not be
+      reached" log spam in some Nvidia Wayland sessions (LP: #1967707)
+  * Remove debian/salsa-ci.yml since it isn't working
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Sun, 04 Aug 2024 12:40:18 -0400
+
+mutter (46.4-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/libmutter-14-0.symbols: Update
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Sun, 04 Aug 2024 12:37:19 -0400
+
+mutter (46.3.1-7) unstable; urgency=medium
+
+  [ Daniel van Vugt ]
+  * Delete patches that aren't needed for LP#2073009
+
+  [ Jeremy Bícha ]
+  * Stop ignoring build test failures on Debian ports.
+    The test failures make it appear that GNOME Shell/Mutter is broken there.
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Thu, 01 Aug 2024 14:08:54 -0400
+
+mutter (46.3.1-6) unstable; urgency=medium
+
+  * Run dh_auto_test everywhere even if results are skipped on some
+    architectures
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Sat, 27 Jul 2024 11:45:53 -0400
+
 mutter (46.3.1-4ubuntu1) oracular; urgency=medium
 
   * Merge with Debian (LP: #2063147, LP: #2066080). Remaining changes:

debian/libmutter-14-0.symbols

@@ -1542,6 +1542,7 @@ libmutter-clutter-14.so.0 libmutter-14-0 #MINVER#
  clutter_get_default_text_direction@Base 43.0
  clutter_get_font_map@Base 43.0
  clutter_get_text_direction@Base 44~beta
+ clutter_grab_activate@Base 46.4
  clutter_grab_dismiss@Base 43.0
  clutter_grab_get_seat_state@Base 43.0
  clutter_grab_get_type@Base 43.0
@@ -1877,7 +1878,8 @@ libmutter-clutter-14.so.0 libmutter-14-0 #MINVER#
  clutter_stage_get_type@Base 43.0
  clutter_stage_get_view_at@Base 43.0
  clutter_stage_grab@Base 43.0
- clutter_stage_grab_input_only@Base 45~beta.1
+ clutter_stage_grab_inactive@Base 46.4
+ clutter_stage_grab_input_only_inactive@Base 46.4
  clutter_stage_handle_event@Base 45~beta.1
  clutter_stage_is_redraw_queued_on_view@Base 43.0
  clutter_stage_manager_get_default@Base 43.0

debian/patches/cogl-tests-Avoid-floats-when-converting-between-int-forma.patch

-From: Daniel van Vugt <daniel.van.vugt@canonical.com>
-Date: Thu, 25 Jul 2024 19:08:11 +0800
-Subject: cogl/tests: Avoid floats when converting between int formats
-
-All we need is an intermediate int format with twice as many bits and
-to put division at the end to avoid any loss of precision.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3903>
-(cherry picked from commit 3eb32cf75051f79060e576ab413ec35e9d05f633)
----
- src/tests/cogl/conform/test-offscreen-texture-formats.c | 10 ++--------
- 1 file changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/src/tests/cogl/conform/test-offscreen-texture-formats.c b/src/tests/cogl/conform/test-offscreen-texture-formats.c
-index 01e3796..b75e76d 100644
---- a/src/tests/cogl/conform/test-offscreen-texture-formats.c
-+++ b/src/tests/cogl/conform/test-offscreen-texture-formats.c
-@@ -35,19 +35,13 @@ get_bits (uint32_t in,
- static int
- rgb16_to_rgb8 (int rgb16)
- {
--  float r;
--
--  r = rgb16 / (float) ((1 << 16) - 1);
--  return (int) (r * (float) ((1 << 8) - 1));
-+  return (int) ((int32_t) rgb16 * 0xff / 0xffff);
- }
- 
- static int
- rgb8_to_rgb16 (int rgb8)
- {
--  float r;
--
--  r = rgb8 / (float) ((1 << 8) - 1);
--  return (int) (r * (float) ((1 << 16) - 1));
-+  return (int) ((int32_t) rgb8 * 0xffff / 0xff);
- }
- 
- static void

debian/patches/cogl-tests-Avoid-rounding-truncation-ambiguity-in-8-16bpc.patch

-From: Daniel van Vugt <daniel.van.vugt@canonical.com>
-Date: Thu, 25 Jul 2024 18:36:37 +0800
-Subject: cogl/tests: Avoid rounding/truncation ambiguity in 8/16bpc
- conversion
-
-The OpenGL specs say rounding is preferred, but not required. Let's
-avoid that uncertainty by choosing a test value that rounds and truncates
-to the same integer either way. Only green needs fixing since our red,
-blue and alpha values already follow this rule.
-
-Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3903>
-(cherry picked from commit 7df6b5c4ed7086add18efe474dd6d59eac23b3d5)
----
- src/tests/cogl/conform/test-offscreen-texture-formats.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/tests/cogl/conform/test-offscreen-texture-formats.c b/src/tests/cogl/conform/test-offscreen-texture-formats.c
-index 170f447..01e3796 100644
---- a/src/tests/cogl/conform/test-offscreen-texture-formats.c
-+++ b/src/tests/cogl/conform/test-offscreen-texture-formats.c
-@@ -58,7 +58,7 @@ test_offscreen_texture_formats_store_rgba16161616 (void)
-   GError *error = NULL;
-   uint8_t readback[8 * 4];
-   const uint16_t rgba16_red = 515;
--  const uint16_t rgba16_green = 61133;
-+  const uint16_t rgba16_green = 60987;
-   const uint16_t rgba16_blue = 2;
-   const uint16_t rgba16_alpha = 1111;
-   int i;
-@@ -125,8 +125,7 @@ test_offscreen_texture_formats_store_rgba16161616 (void)
-       uint8_t *pixel_data = (uint8_t *) &readback[i * 4];
- 
-       g_assert_cmpint (pixel_data[0], ==, rgb16_to_rgb8 (rgba16_red));
--      /* this one is off by one, no idea why */
--      /* g_assert_cmpint (pixel_data[1], ==, rgb16_to_rgb8 (rgba16_green)); */
-+      g_assert_cmpint (pixel_data[1], ==, rgb16_to_rgb8 (rgba16_green));
-       g_assert_cmpint (pixel_data[2], ==, rgb16_to_rgb8 (rgba16_blue));
-       g_assert_cmpint (pixel_data[3], ==, rgb16_to_rgb8 (rgba16_alpha));
-     }

debian/patches/debian/meson-Do-not-mark-CI-test-tools-as-required.patch

@@ -8,7 +8,7 @@ This way we can mark them as nocheck without build issues.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index e29c500..c72be33 100644
+index 3bd61f5..bd07a9b 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -422,7 +422,7 @@ if have_tests

debian/patches/series

@@ -7,9 +7,7 @@ workarounds/tests-Skip-thread-priority-test.patch
 workarounds/Mark-several-additional-tests-as-flaky.patch
 workarounds/kms-crtc-Increase-default-deadline-evasion-to-1000-micros.patch
 workarounds/place-Always-center-initial-setup.patch
-cogl-tests-Avoid-converting-16bpc-float-16bpc.patch
-cogl-tests-Avoid-rounding-truncation-ambiguity-in-8-16bpc.patch
-cogl-tests-Avoid-floats-when-converting-between-int-forma.patch
+workarounds/cogl-tests-Avoid-converting-16bpc-float-16bpc.patch
 ubuntu/x11-Add-support-for-fractional-scaling-using-Randr.patch
 ubuntu/window-Add-ability-to-override-the-edge-constraints.patch
 ubuntu/backends-Handle-null-views-instead-of-creating-dummy-view.patch

debian/patches/ubuntu/x11-Add-support-for-fractional-scaling-using-Randr.patch

@@ -2759,7 +2759,7 @@ index 215203f..d957ff8 100644
    output_info_init_modes (output_info, gpu, xrandr_output);
    output_info_init_crtcs (output_info, gpu, xrandr_output);
 diff --git a/src/compositor/meta-compositor-x11.c b/src/compositor/meta-compositor-x11.c
-index 87ccff5..72ac1db 100644
+index 52d2842..9d910e6 100644
 --- a/src/compositor/meta-compositor-x11.c
 +++ b/src/compositor/meta-compositor-x11.c
 @@ -30,6 +30,7 @@
@@ -2779,7 +2779,7 @@ index 87ccff5..72ac1db 100644
  };
  
  G_DEFINE_TYPE (MetaCompositorX11, meta_compositor_x11, META_TYPE_COMPOSITOR)
-@@ -266,20 +269,91 @@ shape_cow_for_window (MetaCompositorX11 *compositor_x11,
+@@ -268,20 +271,91 @@ shape_cow_for_window (MetaCompositorX11 *compositor_x11,
      }
  }
  
@@ -2872,7 +2872,7 @@ index 87ccff5..72ac1db 100644
        window_actor = meta_window_actor_from_window (prev_unredirected_window);
        window_actor_x11 = META_WINDOW_ACTOR_X11 (window_actor);
        meta_window_actor_x11_set_unredirected (window_actor_x11, FALSE);
-@@ -293,6 +367,17 @@ set_unredirected_window (MetaCompositorX11 *compositor_x11,
+@@ -295,6 +369,17 @@ set_unredirected_window (MetaCompositorX11 *compositor_x11,
        MetaWindowActor *window_actor;
        MetaWindowActorX11 *window_actor_x11;
  
@@ -2890,7 +2890,7 @@ index 87ccff5..72ac1db 100644
        window_actor = meta_window_actor_from_window (window);
        window_actor_x11 = META_WINDOW_ACTOR_X11 (window_actor);
        meta_window_actor_x11_set_unredirected (window_actor_x11, TRUE);
-@@ -304,21 +389,11 @@ maybe_unredirect_top_window (MetaCompositorX11 *compositor_x11)
+@@ -306,21 +391,11 @@ maybe_unredirect_top_window (MetaCompositorX11 *compositor_x11)
  {
    MetaCompositor *compositor = META_COMPOSITOR (compositor_x11);
    MetaWindow *window_to_unredirect = NULL;

debian/patches/workarounds/Mark-several-additional-tests-as-flaky.patch

@@ -72,7 +72,7 @@ index 7d259f6..e732c1d 100644
    now_us = g_get_monotonic_time ();
  
 diff --git a/src/tests/clutter/conform/grab.c b/src/tests/clutter/conform/grab.c
-index c62eea6..4ba11f4 100644
+index 26125a2..af6b79d 100644
 --- a/src/tests/clutter/conform/grab.c
 +++ b/src/tests/clutter/conform/grab.c
 @@ -620,6 +620,12 @@ grab_input_only (void)

debian/patches/workarounds/tests-Skip-thread-priority-test.patch

@@ -17,7 +17,7 @@ https://wiki.debian.org/ArchitectureSpecificsMemo
  1 file changed, 6 insertions(+)
 
 diff --git a/src/tests/native-thread.c b/src/tests/native-thread.c
-index abe944b..d798bf9 100644
+index abe944b..178379f 100644
 --- a/src/tests/native-thread.c
 +++ b/src/tests/native-thread.c
 @@ -1156,6 +1156,12 @@ assert_realtime (MetaThreadImpl  *thread_impl,

debian/rules

@@ -52,15 +52,24 @@ TEST_COMMAND_BASE=env \
 TEST_COMMAND=$(TEST_COMMAND_BASE) --no-suite flaky
 TEST_COMMAND_FLAKY=env DEB_ALLOW_FLAKY_TESTS=1 $(TEST_COMMAND_BASE) --suite flaky
 
-# Don't run the tests on mips etc. since they either time out or fail too
-# much, blocking migration to testing.
+# Ignore test failures on official architectures
+# because it is believed that significant debian-installer/tasksel issues
+# occur if task-gnome-desktop is not installable.
+#
+# We suspect that GNOME Shell might not work on mips64el and s390x.
+# See gnome-settings-daemon where a simple mutter session fails there.
+#
+# But GNOME Shell is apparently usable on Ubuntu's riscv64:
+# https://discourse.ubuntu.com/t/33807
+#
 # Please keep this list in sync with debian/tests/installed-tests
 override_dh_auto_test:
-ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
-ifeq (,$(filter mips mips64el mipsel riscv64 s390x alpha hppa powerpc sparc64 x32,$(DEB_HOST_ARCH)))
+ifeq (,$(filter mips64el riscv64 s390x,$(DEB_HOST_ARCH)))
 	$(TEST_COMMAND)
 	-$(TEST_COMMAND_FLAKY) --logbase flaky-tests
-endif
+else
+	-$(TEST_COMMAND)
+	-$(TEST_COMMAND_FLAKY) --logbase flaky-tests
 endif
 
 # debhelper >= 13.4 makes all of /usr/libexec executable, which is not

debian/salsa-ci.yml

----
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml

debian/tests/installed-tests

@@ -25,7 +25,7 @@ if [ "$e" -ne 0 ]; then
     arch="$(dpkg --print-architecture)"
     case "$arch" in
         # Please keep this list in sync with debian/rules
-        (armhf|mips|mips64el|mipsel|ppc64el|riscv64|s390x|alpha|hppa|powerpc|sparc64|x32)
+        (mips64el|riscv64|s390x)
             echo "# Ignoring test failure on $arch"
             exit 77
             ;;

meson.build

 project('mutter', 'c',
-  version: '46.3.1',
+  version: '46.4',
   meson_version: '>= 0.60.0',
   license: 'GPLv2+'
 )

po/de.po

@@ -5,28 +5,28 @@
 # Christian Neumair <chris@gnome-de.org>, 2002-2004.
 # Hendrik Richter <hendrikr@gnome.org>, 2005-2008.
 # Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013, 2016-2018.
-# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2011-2012.
+# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009-2024.
 # Wolfgang Stöggl <c72578@yahoo.de> 2011, 2017.
 # Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012.
 # Tim Sabsch <tim@sabsch.com>, 2018-2023.
 # Philipp Kiemle <philipp.kiemle@gmail.com>, 2021, 2023.
-# Jürgen Benvenuti <gastornis@posteo.org>, 2022, 2023.
+# Jürgen Benvenuti <gastornis@posteo.org>, 2022-2024.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2023-09-04 18:11+0000\n"
-"PO-Revision-Date: 2023-09-09 00:15+0200\n"
-"Last-Translator: Philipp Kiemle <philipp.kiemle@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues/\n"
+"POT-Creation-Date: 2024-05-03 15:32+0000\n"
+"PO-Revision-Date: 2024-05-10 19:43+0200\n"
+"Last-Translator: Jürgen Benvenuti <gastornis@posteo.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.3.1\n"
+"X-Generator: Poedit 3.4.2\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -260,11 +260,11 @@ msgstr "Fenster vertikal maximieren"
 msgid "Maximize window horizontally"
 msgstr "Fenster horizontal maximieren"
 
-#: data/50-mutter-windows.xml:41 data/org.gnome.mutter.gschema.xml.in:164
+#: data/50-mutter-windows.xml:41 data/org.gnome.mutter.gschema.xml.in:167
 msgid "View split on left"
 msgstr "Ansicht links teilen"
 
-#: data/50-mutter-windows.xml:45 data/org.gnome.mutter.gschema.xml.in:169
+#: data/50-mutter-windows.xml:45 data/org.gnome.mutter.gschema.xml.in:172
 msgid "View split on right"
 msgstr "Ansicht rechts teilen"
 
@@ -409,10 +409,11 @@ msgid ""
 "space, while scaling monitor framebuffers instead of window content, to "
 "manage HiDPI monitors. Does not require a restart. • “kms-modifiers” — makes "
 "mutter always allocate scanout buffers with explicit modifiers, if supported "
-"by the driver. Requires a restart. • “rt-scheduler” — makes mutter request a "
-"low priority real-time scheduling. Requires a restart. • “autoclose-"
-"xwayland” — automatically terminates Xwayland if all relevant X11 clients "
-"are gone. Requires a restart."
+"by the driver. Requires a restart. • “autoclose-xwayland” — automatically "
+"terminates Xwayland if all relevant X11 clients are gone. Requires a "
+"restart. • “variable-refresh-rate” — makes mutter dynamically adjust the "
+"refresh rate of the monitor when applicable if supported by the monitor, GPU "
+"and DRM driver. Configurable in Settings. Requires a restart."
 msgstr ""
 "Um experimentelle Funktionen zu aktivieren, fügen Sie das entsprechende "
 "Schlüsselwort zur Liste hinzu. Möglicherweise muss der Compositor neu "
@@ -426,26 +427,26 @@ msgstr ""
 "Fensterinhalte skaliert werden, um HiDPI-Bildschirme besser versorgen zu "
 "können. Erfordert keinen Neustart. • »kms-modifiers« — weist Mutter an, "
 "immer Scanout-Puffer mit expliziten Modifikatoren zuzuweisen, sofern dies "
-"von den Treibern unterstützt wird. Erfordert einen Neustart. • »rt-"
-"scheduler« — weist Mutter an, ein Echtzeit-Scheduling mit niedriger "
-"Priorität anzufordern. Dafür muss der Anwendung oder dem Benutzer "
-"»CAP_SYS_NICE« zur Verfügung stehen. Erfordert einen Neustart. • »autoclose-"
+"von den Treibern unterstützt wird. Erfordert einen Neustart. • »autoclose-"
 "xwayland« — beendet Xwayland automatisch, wenn alle relevanten X11-Clients "
-"beendet wurden. Erfordert einen Neustart."
+"beendet wurden. Erfordert einen Neustart. • »variable-refresh-rate« — weist "
+"Mutter an, die Bildschirm-Wiederholrate dynamisch anzupassen, sofern "
+"zutreffend und von Bildschirm, GPU und DRM-Treiber unterstützt. Einstellbar "
+"in den Einstellungen. Erfordert einen Neustart."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:144
 msgid "Modifier to use to locate the pointer"
 msgstr "Zusatztaste zum Finden des Zeigers"
 
-#: data/org.gnome.mutter.gschema.xml.in:142
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "This key will initiate the “locate pointer” action."
 msgstr "Diese Taste wird die Aktion »Zeiger finden« auslösen."
 
-#: data/org.gnome.mutter.gschema.xml.in:149
+#: data/org.gnome.mutter.gschema.xml.in:152
 msgid "Timeout for check-alive ping"
 msgstr "Reaktionsschwellwert bei Kontaktkontrolle"
 
-#: data/org.gnome.mutter.gschema.xml.in:150
+#: data/org.gnome.mutter.gschema.xml.in:153
 msgid ""
 "Number of milliseconds a client has to respond to a ping request in order to "
 "not be detected as frozen. Using 0 will disable the alive check completely."
@@ -454,16 +455,16 @@ msgstr ""
 "Kontaktkontrolle antworten muss, um nicht als abgestürzt zu gelten. »0« "
 "bedeutet, dass die Kontaktkontrolle ausgeschaltet wird."
 
-#: data/org.gnome.mutter.gschema.xml.in:174
+#: data/org.gnome.mutter.gschema.xml.in:177
 msgid "Switch monitor configurations"
 msgstr "Bildschirmkonfigurationen wechseln"
 
 # Ich denke nicht, dass »rotate« hier die Bildschirmdrehung meint, sondern eher eine Liste aus Konfigurationen rotiert (d.h. umgewälzt) wird.
-#: data/org.gnome.mutter.gschema.xml.in:179
+#: data/org.gnome.mutter.gschema.xml.in:182
 msgid "Rotates the built-in monitor configuration"
 msgstr "Wechselt die Konfiguration des eingebauten Bildschirms"
 
-#: data/org.gnome.mutter.gschema.xml.in:184
+#: data/org.gnome.mutter.gschema.xml.in:187
 msgid "Cancel any active input capture session"
 msgstr "Alle aktiven Eingabeerfassungssitzungen abbrechen"
 
@@ -659,79 +660,83 @@ msgstr "%s %s"
 msgid "Bell event"
 msgstr "Klangereignis"
 
-#: src/core/display.c:723
+#: src/core/display.c:734
 msgid "Privacy Screen Enabled"
 msgstr "Sichtschutz aktiviert"
 
-#: src/core/display.c:724
+#: src/core/display.c:735
 msgid "Privacy Screen Disabled"
 msgstr "Sichtschutz deaktiviert"
 
-#: src/core/meta-context-main.c:579
+#: src/core/meta-context-main.c:601
 msgid "Replace the running window manager"
 msgstr "Den aktuellen Fensterverwalter ersetzen"
 
-#: src/core/meta-context-main.c:585
+#: src/core/meta-context-main.c:607
 msgid "X Display to use"
 msgstr "Zu verwendende X-Anzeige"
 
-#: src/core/meta-context-main.c:591
+#: src/core/meta-context-main.c:613
 msgid "Disable connection to session manager"
 msgstr "Verbindung zur Sitzungsverwaltung deaktivieren"
 
-#: src/core/meta-context-main.c:597
+#: src/core/meta-context-main.c:619
 msgid "Specify session management ID"
 msgstr "Kennung der Sitzungsverwaltung angeben"
 
-#: src/core/meta-context-main.c:603
+#: src/core/meta-context-main.c:625
 msgid "Initialize session from savefile"
 msgstr "Sitzung anhand gespeicherter Datei starten"
 
-#: src/core/meta-context-main.c:609
+#: src/core/meta-context-main.c:631
 msgid "Make X calls synchronous"
 msgstr "X-Aufrufe abgleichen"
 
-#: src/core/meta-context-main.c:617
+#: src/core/meta-context-main.c:639
 msgid "Run as a wayland compositor"
 msgstr "Als Wayland-Compositor ausführen"
 
-#: src/core/meta-context-main.c:623
+#: src/core/meta-context-main.c:645
 msgid "Run as a nested compositor"
 msgstr "Als eingebetteten Compositor ausführen"
 
-#: src/core/meta-context-main.c:629
+#: src/core/meta-context-main.c:651
 msgid "Run wayland compositor without starting Xwayland"
 msgstr "Wayland-Compositor ausführen, ohne Xwayland zu starten"
 
-#: src/core/meta-context-main.c:635
+#: src/core/meta-context-main.c:657
 msgid "Specify Wayland display name to use"
 msgstr "Name der Wayland-Anzeige festlegen"
 
-#: src/core/meta-context-main.c:643
+#: src/core/meta-context-main.c:665
 msgid "Run as a full display server, rather than nested"
 msgstr "Als vollwertigen Display-Server verwenden (nicht eingebettet)"
 
-#: src/core/meta-context-main.c:648
+#: src/core/meta-context-main.c:670
 msgid "Run as a headless display server"
 msgstr "Als Display-Server ohne grafische Oberfläche verwenden"
 
 # Für WxH@R siehe https://gitlab.gnome.org/GNOME/mutter/-/blob/master/src/core/main.c#L498
-#: src/core/meta-context-main.c:653
+#: src/core/meta-context-main.c:675
 msgid "Add persistent virtual monitor (WxH or WxH@R)"
 msgstr "Einen persistenten virtuellen Monitor hinzufügen (BxH oder BxH@W)"
 
-#: src/core/meta-context-main.c:665
+#: src/core/meta-context-main.c:687
 msgid "Run with X11 backend"
 msgstr "Mit X11-Backend ausführen"
 
-#: src/core/meta-context-main.c:671
+#: src/core/meta-context-main.c:693
 msgid "Profile performance using trace instrumentation"
 msgstr "Die Leistungsfähigkeit mithilfe von Stapeleinsatz profilieren"
 
+#: src/core/meta-context-main.c:699
+msgid "Enable debug control D-Bus interface"
+msgstr "D-Bus-Schnittstelle zur Steuerung der Fehlerdiagnose einschalten"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/core/meta-pad-action-mapper.c:805
+#: src/core/meta-pad-action-mapper.c:826
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Moduswechsel (Gruppe %d)"
@@ -739,11 +744,11 @@ msgstr "Moduswechsel (Gruppe %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/core/meta-pad-action-mapper.c:827
+#: src/core/meta-pad-action-mapper.c:848
 msgid "Switch monitor"
 msgstr "Bildschirm wechseln"
 
-#: src/core/meta-pad-action-mapper.c:829
+#: src/core/meta-pad-action-mapper.c:850
 msgid "Show on-screen help"
 msgstr "Bildschirmhilfe anzeigen"
 
@@ -761,7 +766,7 @@ msgstr "Version ausgeben"
 msgid "Mutter plugin to use"
 msgstr "Zu benutzendes Mutter-Plugin"
 
-#: src/core/prefs.c:1843
+#: src/core/prefs.c:1842
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeitsfläche %d"
@@ -770,7 +775,7 @@ msgstr "Arbeitsfläche %d"
 msgid "Mutter was compiled without support for verbose mode"
 msgstr "Mutter wurde ohne Unterstützung für den ausführlichen Modus kompiliert"
 
-#: src/core/workspace.c:512
+#: src/core/workspace.c:510
 msgid "Workspace switched"
 msgstr "Arbeitsfläche gewechselt"
 
@@ -779,7 +784,7 @@ msgstr "Arbeitsfläche gewechselt"
 msgid "Mode Switch: Mode %d"
 msgstr "Moduswechsel: Modus %d"
 
-#: src/x11/meta-x11-display.c:717
+#: src/x11/meta-x11-display.c:723
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -788,19 +793,19 @@ msgstr ""
 "Bildschirm »%s« hat bereits einen Fensterverwalter. Versuchen Sie die Option "
 "»--replace«, um den aktuellen Fensterverwalter zu ersetzen."
 
-#: src/x11/meta-x11-display.c:1082
+#: src/x11/meta-x11-display.c:1088
 #, c-format
 msgid "Failed to open X Window System display “%s”"
 msgstr "X-Window-Systemanzeige »%s« konnte nicht geöffnet werden"
 
-#: src/x11/meta-x11-display.c:1228
+#: src/x11/meta-x11-display.c:1268
 #, c-format
 msgid "Screen %d on display “%s” is invalid"
 msgstr "Bildschirm %d auf Anzeige »%s« ist ungültig"
 
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: src/x11/meta-x11-display.c:2549
+#: src/x11/meta-x11-display.c:2547
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -813,7 +818,7 @@ msgstr ""
 msgid "Format %s not supported"
 msgstr "Format %s wird nicht unterstützt"
 
-#: src/x11/window-props.c:548
+#: src/x11/window-props.c:528
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (auf %s)"

src/compositor/meta-compositor-x11.c

@@ -188,6 +188,8 @@ meta_compositor_x11_manage (MetaCompositor  *compositor,
 
   compositor_x11->have_x11_sync_object = meta_sync_ring_init (xdisplay);
 
+  meta_x11_display_redirect_windows (x11_display, display);
+
   return TRUE;
 }