Florian Müllner
parent
508c582bfa
commit
3beab53de1
1
.gitignore
vendored
1
.gitignore
vendored
@ -220,3 +220,4 @@ mutter-2.31.5.tar.bz2
|
||||
/mutter-46.rc.tar.xz
|
||||
/mutter-46.0.tar.xz
|
||||
/mutter-46.1.tar.xz
|
||||
/mutter-46.3.tar.xz
|
||||
|
||||
@ -1,7 +1,74 @@
|
||||
From 21680b2f4edb064ff524cb91e9e20ace91deda6d Mon Sep 17 00:00:00 2001
|
||||
From caca4ecbc4657998b4f9f3192afbd234f336402c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
||||
Date: Sun, 26 May 2024 00:43:37 +0200
|
||||
Subject: [PATCH 1/3] Revert "x11/window: Compare input shape to client rect
|
||||
when undecorating"
|
||||
|
||||
This reverts commit d8af06fe4993227c5059971effbe28527cd75412.
|
||||
---
|
||||
src/x11/window-x11.c | 16 +++++++++-------
|
||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
|
||||
index df5f955877..925c7549b7 100644
|
||||
--- a/src/x11/window-x11.c
|
||||
+++ b/src/x11/window-x11.c
|
||||
@@ -2400,7 +2400,6 @@ meta_window_x11_update_input_region (MetaWindow *window)
|
||||
g_autoptr (MtkRegion) region = NULL;
|
||||
MetaWindowX11 *window_x11 = META_WINDOW_X11 (window);
|
||||
MetaWindowX11Private *priv = meta_window_x11_get_instance_private (window_x11);
|
||||
- MtkRectangle bounding_rect = { 0 };
|
||||
Window xwindow;
|
||||
|
||||
if (window->decorated)
|
||||
@@ -2412,14 +2411,10 @@ meta_window_x11_update_input_region (MetaWindow *window)
|
||||
return;
|
||||
}
|
||||
xwindow = window->frame->xwindow;
|
||||
- bounding_rect.width = window->buffer_rect.width;
|
||||
- bounding_rect.height = window->buffer_rect.height;
|
||||
}
|
||||
else
|
||||
{
|
||||
xwindow = priv->xwindow;
|
||||
- bounding_rect.width = priv->client_rect.width;
|
||||
- bounding_rect.height = priv->client_rect.height;
|
||||
}
|
||||
|
||||
if (META_X11_DISPLAY_HAS_SHAPE (x11_display))
|
||||
@@ -2463,8 +2458,8 @@ meta_window_x11_update_input_region (MetaWindow *window)
|
||||
else if (n_rects == 1 &&
|
||||
(rects[0].x == 0 &&
|
||||
rects[0].y == 0 &&
|
||||
- rects[0].width == bounding_rect.width &&
|
||||
- rects[0].height == bounding_rect.height))
|
||||
+ rects[0].width == window->buffer_rect.width &&
|
||||
+ rects[0].height == window->buffer_rect.height))
|
||||
{
|
||||
/* This is the bounding region case. Keep the
|
||||
* region as NULL. */
|
||||
@@ -2481,6 +2476,13 @@ meta_window_x11_update_input_region (MetaWindow *window)
|
||||
|
||||
if (region != NULL)
|
||||
{
|
||||
+ MtkRectangle bounding_rect;
|
||||
+
|
||||
+ bounding_rect.x = 0;
|
||||
+ bounding_rect.y = 0;
|
||||
+ bounding_rect.width = window->buffer_rect.width;
|
||||
+ bounding_rect.height = window->buffer_rect.height;
|
||||
+
|
||||
/* The shape we get back from the client may have coordinates
|
||||
* outside of the frame. The X SHAPE Extension requires that
|
||||
* the overall shape the client provides never exceeds the
|
||||
--
|
||||
2.45.2
|
||||
|
||||
|
||||
From 2b7161220cb95a1d531ef0cf8a8af911039cf194 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
||||
Date: Sun, 21 Apr 2024 16:54:52 +0200
|
||||
Subject: [PATCH 1/2] Revert "x11/window: Update comment and variable name to
|
||||
Subject: [PATCH 2/3] Revert "x11/window: Update comment and variable name to
|
||||
reflect current behavior"
|
||||
|
||||
This reverts commit e4763d00e8512aeb408ae118597d753f12217487.
|
||||
@ -10,7 +77,7 @@ This reverts commit e4763d00e8512aeb408ae118597d753f12217487.
|
||||
1 file changed, 8 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
|
||||
index 6d2016e3ec..f6f7d87dfe 100644
|
||||
index 925c7549b7..7f2c0a3fd2 100644
|
||||
--- a/src/x11/window-x11.c
|
||||
+++ b/src/x11/window-x11.c
|
||||
@@ -2476,20 +2476,21 @@ meta_window_x11_update_input_region (MetaWindow *window)
|
||||
@ -43,13 +110,13 @@ index 6d2016e3ec..f6f7d87dfe 100644
|
||||
|
||||
meta_window_set_input_region (window, region);
|
||||
--
|
||||
2.44.0
|
||||
2.45.2
|
||||
|
||||
|
||||
From f1996e67ad8a5a0009e90c38767c8906e015ba70 Mon Sep 17 00:00:00 2001
|
||||
From 256a879b7e230e8e9826be6e0df69feb31cbdd52 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Williamson <awilliam@redhat.com>
|
||||
Date: Thu, 5 Oct 2023 13:09:46 -0700
|
||||
Subject: [PATCH 2/2] Revert "x11: Use input region from frame window for
|
||||
Subject: [PATCH 3/3] Revert "x11: Use input region from frame window for
|
||||
decorated windows"
|
||||
|
||||
This reverts commit d991961ae2a5c8cf2e58ff1072239f4902b0f767. It
|
||||
@ -63,28 +130,28 @@ Closes: https://gitlab.gnome.org/GNOME/mutter/-/issues/3068
|
||||
2 files changed, 10 insertions(+), 26 deletions(-)
|
||||
|
||||
diff --git a/src/core/frame.c b/src/core/frame.c
|
||||
index c74a2e04ec..5feb854805 100644
|
||||
index 7a09f89f14..df489e441c 100644
|
||||
--- a/src/core/frame.c
|
||||
+++ b/src/core/frame.c
|
||||
@@ -35,7 +35,6 @@
|
||||
#include "x11/window-props.h"
|
||||
@@ -36,7 +36,6 @@
|
||||
|
||||
#include <X11/Xatom.h>
|
||||
#include <X11/Xlib.h>
|
||||
-#include <X11/extensions/shape.h>
|
||||
|
||||
#define EVENT_MASK (SubstructureRedirectMask | \
|
||||
StructureNotifyMask | SubstructureNotifyMask | \
|
||||
@@ -109,9 +108,6 @@ meta_window_x11_set_frame_xwindow (MetaWindow *window,
|
||||
@@ -118,9 +117,6 @@ meta_window_x11_set_frame_xwindow (MetaWindow *window,
|
||||
XChangeWindowAttributes (x11_display->xdisplay,
|
||||
frame->xwindow, CWEventMask, &attrs);
|
||||
|
||||
- if (META_X11_DISPLAY_HAS_SHAPE (x11_display))
|
||||
- XShapeSelectInput (x11_display->xdisplay, frame->xwindow, ShapeNotifyMask);
|
||||
-
|
||||
meta_x11_display_register_x_window (x11_display, &frame->xwindow, window);
|
||||
|
||||
if (window->mapped)
|
||||
@@ -220,9 +216,6 @@ meta_window_destroy_frame (MetaWindow *window)
|
||||
if (mtk_x11_error_trap_pop_with_return (x11_display->xdisplay))
|
||||
{
|
||||
meta_topic (META_DEBUG_WINDOW_STATE,
|
||||
@@ -254,9 +250,6 @@ meta_window_destroy_frame (MetaWindow *window)
|
||||
window->reparents_pending += 1;
|
||||
}
|
||||
|
||||
@ -95,7 +162,7 @@ index c74a2e04ec..5feb854805 100644
|
||||
meta_window_x11_get_xwindow (window),
|
||||
x11_display->atom__MUTTER_NEEDS_FRAME);
|
||||
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
|
||||
index f6f7d87dfe..1bc5c57a1a 100644
|
||||
index 7f2c0a3fd2..ace1f8f5bc 100644
|
||||
--- a/src/x11/window-x11.c
|
||||
+++ b/src/x11/window-x11.c
|
||||
@@ -2082,10 +2082,6 @@ meta_window_x11_constructed (GObject *object)
|
||||
@ -159,5 +226,5 @@ index f6f7d87dfe..1bc5c57a1a 100644
|
||||
/* The shape we get back from the client may have coordinates
|
||||
* outside of the frame. The X SHAPE Extension requires that
|
||||
--
|
||||
2.44.0
|
||||
2.45.2
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||
|
||||
Name: mutter
|
||||
Version: 46.1
|
||||
Version: 46.3
|
||||
Release: %autorelease
|
||||
Summary: Window and compositing manager based on Clutter
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (mutter-46.1.tar.xz) = bb360db020c31e71ae9e247d871130dd737b180a0a48eebcafee6a3b4b5e704fe9828e12caec13e81a03d6b61bfac389c5865e747786cf154ff363ab108a003f
|
||||
SHA512 (mutter-46.3.tar.xz) = 82e2e8455556e1a6e9dfd8b7d36f8d500fac69094907012754ee8d653f448397fe4a277e5a9b327051a319697205b56d0f7a9ea789d210e58ec685b589d2f150
|
||||
|
||||
Loading…
Reference in New Issue
Block a user