[arch-commits] Commit in mutter/trunk (2 files)
Date: Wednesday, July 17, 2019 @ 21:47:03
Author: heftig
Revision: 358106
3.32.2+40+gccab0f470-2
Added:
mutter/trunk/0001-window-x11-Focus-a-window-in-the-active-workspace-as.patch
Modified:
mutter/trunk/PKGBUILD
-+
0001-window-x11-Focus-a-window-in-the-active-workspace-as.patch | 67
++
PKGBUILD| 11 +
2 files changed, 75 insertions(+), 3 deletions(-)
Added: 0001-window-x11-Focus-a-window-in-the-active-workspace-as.patch
===
--- 0001-window-x11-Focus-a-window-in-the-active-workspace-as.patch
(rev 0)
+++ 0001-window-x11-Focus-a-window-in-the-active-workspace-as.patch
2019-07-17 21:47:03 UTC (rev 358106)
@@ -0,0 +1,67 @@
+From 128aef6aca88ea945c3e161b82d3cffb37a8bce7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?=
+Date: Wed, 17 Jul 2019 01:13:48 +0200
+Subject: [PATCH] window-x11: Focus a window in the active workspace as
+ take-focus fallback
+
+Starting with commit 2db94e2e we try to focus a fallback default focus window
+if no take-focus window candidate gets the input focus when we request it and
+we limit the focus candidates to the current window's workspace.
+
+However, if the window is unmanaging, the workspace might be unset, and we
could
+end up in deferencing a NULL pointer causing a crash.
+
+So, in case the window's workspace is unset, just use the currently active
+workspace for the display.
+
+Closes #687
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/688
+
+(cherry picked from commit 8cbad75c411282855f506855fc7a2953b7bdae0d)
+---
+ src/x11/window-x11.c | 16 +++-
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
+index 0ca651ba2..79a9dbe38 100644
+--- a/src/x11/window-x11.c
b/src/x11/window-x11.c
+@@ -886,15 +886,21 @@ meta_window_x11_maybe_focus_delayed (MetaWindow *window,
+ }
+
+ static void
+-maybe_focus_default_window (MetaWorkspace *workspace,
+-MetaWindow*not_this_one,
+-guint32timestamp)
++maybe_focus_default_window (MetaDisplay *display,
++MetaWindow *not_this_one,
++guint32 timestamp)
+ {
+- MetaStack *stack = workspace->display->stack;
++ MetaWorkspace *workspace;
++ MetaStack *stack = display->stack;
+ g_autoptr (GList) focusable_windows = NULL;
+ g_autoptr (GQueue) focus_candidates = NULL;
+ GList *l;
+
++ if (not_this_one && not_this_one->workspace)
++workspace = not_this_one->workspace;
++ else
++workspace = display->workspace_manager->active_workspace;
++
+/* Go through all the focusable windows and try to focus them
+ * in order, waiting for a delay. The first one that replies to
+ * the request (in case of take focus windows) changing the display
+@@ -991,7 +997,7 @@ meta_window_x11_focus (MetaWindow *window,
+
+ meta_x11_display_focus_the_no_focus_window (x11_display,
+ timestamp);
+- maybe_focus_default_window (window->workspace, window,
++ maybe_focus_default_window (window->display, window,
+ timestamp);
+ }
+ }
+--
+2.22.0
+
Modified: PKGBUILD
===
--- PKGBUILD2019-07-17 20:20:20 UTC (rev 358105)
+++ PKGBUILD2019-07-17 21:47:03 UTC (rev 358106)
@@ -4,7 +4,7 @@
pkgname=mutter
pkgver=3.32.2+40+gccab0f470
-pkgrel=1
+pkgrel=2
pkgdesc="A window manager for GNOME"
url="https://gitlab.gnome.org/GNOME/mutter;
arch=(x86_64)
@@ -17,8 +17,10 @@
groups=(gnome)
install=mutter.install
_commit=ccab0f470dcc556073754c8adf9413819d22cc14 # gnome-3-32
-source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit;)
-sha256sums=('SKIP')
+source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit;
+0001-window-x11-Focus-a-window-in-the-active-workspace-as.patch)
+sha256sums=('SKIP'
+'a639f8fd35c82216b2b15ca49fe592a0618bfec681f88347ce75724a4402fcc7')
pkgver() {
cd $pkgname
@@ -33,6 +35,9 @@
# required to build gala
git cherry-pick -n bd7704f9e17e9554ad663386ef4fce1e16a56f08
+
+ # https://gitlab.gnome.org/GNOME/mutter/issues/687
+ patch -Np1 -i
../0001-window-x11-Focus-a-window-in-the-active-workspace-as.patch
}
build() {
[arch-commits] Commit in mutter/trunk (2 files)
Date: Tuesday, March 26, 2019 @ 22:03:26
Author: heftig
Revision: 349253
3.32.0+33+g58f7059ea-1
Added:
mutter/trunk/0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch
Modified:
mutter/trunk/PKGBUILD
-+
0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch | 42
++
PKGBUILD|9 +-
2 files changed, 49 insertions(+), 2 deletions(-)
Added: 0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch
===
--- 0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch
(rev 0)
+++ 0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch
2019-03-26 22:03:26 UTC (rev 349253)
@@ -0,0 +1,42 @@
+From da01a3eaffe01ae2c3ea826171057548c7973c39 Mon Sep 17 00:00:00 2001
+Message-Id:
+From: "Jan Alexander Steffens (heftig)"
+Date: Tue, 26 Mar 2019 22:24:44 +0100
+Subject: [PATCH] wayland/xdg-shell: Correct window menu position in logical
+ layout mode
+
+Fixes https://gitlab.gnome.org/GNOME/mutter/issues/527
+---
+ src/wayland/meta-wayland-legacy-xdg-shell.c | 2 +-
+ src/wayland/meta-wayland-xdg-shell.c| 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/wayland/meta-wayland-legacy-xdg-shell.c
b/src/wayland/meta-wayland-legacy-xdg-shell.c
+index 1523481d4..823064177 100644
+--- a/src/wayland/meta-wayland-legacy-xdg-shell.c
b/src/wayland/meta-wayland-legacy-xdg-shell.c
+@@ -258,7 +258,7 @@ zxdg_toplevel_v6_show_window_menu (struct wl_client
*client,
+ if (!meta_wayland_seat_get_grab_info (seat, surface, serial, FALSE, NULL,
NULL))
+ return;
+
+- monitor_scale = window->monitor->scale;
++ monitor_scale = meta_window_wayland_get_geometry_scale (window);
+ meta_window_show_menu (window, META_WINDOW_MENU_WM,
+ window->buffer_rect.x + (x * monitor_scale),
+ window->buffer_rect.y + (y * monitor_scale));
+diff --git a/src/wayland/meta-wayland-xdg-shell.c
b/src/wayland/meta-wayland-xdg-shell.c
+index d747f5c07..fa0207a03 100644
+--- a/src/wayland/meta-wayland-xdg-shell.c
b/src/wayland/meta-wayland-xdg-shell.c
+@@ -264,7 +264,7 @@ xdg_toplevel_show_window_menu (struct wl_client *client,
+ if (!meta_wayland_seat_get_grab_info (seat, surface, serial, FALSE, NULL,
NULL))
+ return;
+
+- monitor_scale = window->monitor->scale;
++ monitor_scale = meta_window_wayland_get_geometry_scale (window);
+ meta_window_show_menu (window, META_WINDOW_MENU_WM,
+ window->buffer_rect.x + (x * monitor_scale),
+ window->buffer_rect.y + (y * monitor_scale));
+--
+2.21.0
+
Modified: PKGBUILD
===
--- PKGBUILD2019-03-26 22:02:09 UTC (rev 349252)
+++ PKGBUILD2019-03-26 22:03:26 UTC (rev 349253)
@@ -3,7 +3,7 @@
# Contributor: Michael Kanis
pkgname=mutter
-pkgver=3.32.0+25+gf0b9654de
+pkgver=3.32.0+33+g58f7059ea
pkgrel=1
pkgdesc="A window manager for GNOME"
url="https://gitlab.gnome.org/GNOME/mutter;
@@ -15,10 +15,12 @@
makedepends=(gobject-introspection git egl-wayland meson xorg-server)
checkdepends=(xorg-server-xvfb)
groups=(gnome)
-_commit=f0b9654deb947e49e42b76d6daa42b86e5b0ec17 # master
+_commit=58f7059ea42c04fbb28c7210a287437f0f55b2d8 # master
source=("git+https://gitlab.gnome.org/GNOME/mutter.git#commit=$_commit;
+0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch
216.patch)
sha256sums=('SKIP'
+'8628fe45738d631d7776204be76cc091c5a1359d2874945c7913c7705330f816'
'ed4f3cf738a3cffdf8a6e1a352bf24d74078c3b26fb9262c5746e0d95b9df756')
pkgver() {
@@ -29,6 +31,9 @@
prepare() {
cd $pkgname
+ # https://gitlab.gnome.org/GNOME/mutter/issues/527
+ patch -Np1 -i
../0001-wayland-xdg-shell-Correct-window-menu-position-in-lo.patch
+
# https://gitlab.gnome.org/GNOME/mutter/merge_requests/216
git apply -3 ../216.patch
}
[arch-commits] Commit in mutter/trunk (2 files)
Date: Thursday, March 27, 2014 @ 00:04:52
Author: jgc
Revision: 208791
GNOME 3.12
Modified:
mutter/trunk/PKGBUILD
Deleted:
mutter/trunk/0001-monitor-expose-min-backlight-step.patch
--+
0001-monitor-expose-min-backlight-step.patch | 29 -
PKGBUILD | 15 ++--
2 files changed, 3 insertions(+), 41 deletions(-)
Deleted: 0001-monitor-expose-min-backlight-step.patch
===
--- 0001-monitor-expose-min-backlight-step.patch2014-03-26 22:45:05 UTC
(rev 208790)
+++ 0001-monitor-expose-min-backlight-step.patch2014-03-26 23:04:52 UTC
(rev 208791)
@@ -1,29 +0,0 @@
-From 6b150b3e9f1d16e6c374e178107ab490a18346dd Mon Sep 17 00:00:00 2001
-From: Asad Mehmood asad78...@googlemail.com
-Date: Thu, 17 Oct 2013 16:05:59 +0100
-Subject: [PATCH] monitor: expose min-backlight-step
-
-Expose min-backlight-step so that gnome-settings-daemon can
-support backlights with less than 10 steps without mutter
-normalizing the brightness back to its original value
- src/core/monitor.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/core/monitor.c b/src/core/monitor.c
-index 9ec0c2a..6d65f9e 100644
a/src/core/monitor.c
-+++ b/src/core/monitor.c
-@@ -806,6 +806,9 @@ meta_monitor_manager_handle_get_resources
(MetaDBusDisplayConfig *skeleton,
- g_variant_new_take_string (make_display_name
(manager, output)));
- g_variant_builder_add (properties, {sv}, backlight,
- g_variant_new_int32 (output-backlight));
-+ g_variant_builder_add (properties, {sv}, min-backlight-step,
-+ g_variant_new_int32 ((output-backlight_max -
output-backlight_min) ?
-+ 100 /
(output-backlight_max - output-backlight_min) : -1));
- g_variant_builder_add (properties, {sv}, primary,
- g_variant_new_boolean (output-is_primary));
- g_variant_builder_add (properties, {sv}, presentation,
---
-1.8.4.1
-
Modified: PKGBUILD
===
--- PKGBUILD2014-03-26 22:45:05 UTC (rev 208790)
+++ PKGBUILD2014-03-26 23:04:52 UTC (rev 208791)
@@ -4,7 +4,7 @@
# Contributor: Michael Kanis mkanis_at_gmx_dot_de
pkgname=mutter
-pkgver=3.10.4
+pkgver=3.12.0
pkgrel=1
pkgdesc=A window manager for GNOME
arch=(i686 x86_64)
@@ -15,18 +15,9 @@
groups=('gnome')
options=('!emptydirs')
install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
-0001-monitor-expose-min-backlight-step.patch)
-sha256sums=('9159c40ea9f5c5e3d1e67cc12ebcbd6328a7b732274195b4e5bdacb3cb1771e6'
-'f1ef173d96ac27abdcf765972d2ac434f63bf4629b8bd51c177e8963d07f5eb7')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('1dcc5c71a80b74c48e8a3f1ce90bd718ab53b267cd20fe28b1543c358bb42ac6')
-prepare() {
- cd $pkgname-$pkgver
-
- # FS#37224
- patch -Np1 -i ../0001-monitor-expose-min-backlight-step.patch
-}
-
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc \
[arch-commits] Commit in mutter/trunk (2 files)
Date: Saturday, November 16, 2013 @ 13:14:33
Author: heftig
Revision: 199784
FS#37224
Added:
mutter/trunk/0001-monitor-expose-min-backlight-step.patch
Modified:
mutter/trunk/PKGBUILD
--+
0001-monitor-expose-min-backlight-step.patch | 29 +
PKGBUILD | 15 ++--
2 files changed, 41 insertions(+), 3 deletions(-)
Added: 0001-monitor-expose-min-backlight-step.patch
===
--- 0001-monitor-expose-min-backlight-step.patch
(rev 0)
+++ 0001-monitor-expose-min-backlight-step.patch2013-11-16 12:14:33 UTC
(rev 199784)
@@ -0,0 +1,29 @@
+From 6b150b3e9f1d16e6c374e178107ab490a18346dd Mon Sep 17 00:00:00 2001
+From: Asad Mehmood asad78...@googlemail.com
+Date: Thu, 17 Oct 2013 16:05:59 +0100
+Subject: [PATCH] monitor: expose min-backlight-step
+
+Expose min-backlight-step so that gnome-settings-daemon can
+support backlights with less than 10 steps without mutter
+normalizing the brightness back to its original value
+---
+ src/core/monitor.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/core/monitor.c b/src/core/monitor.c
+index 9ec0c2a..6d65f9e 100644
+--- a/src/core/monitor.c
b/src/core/monitor.c
+@@ -806,6 +806,9 @@ meta_monitor_manager_handle_get_resources
(MetaDBusDisplayConfig *skeleton,
+ g_variant_new_take_string (make_display_name
(manager, output)));
+ g_variant_builder_add (properties, {sv}, backlight,
+ g_variant_new_int32 (output-backlight));
++ g_variant_builder_add (properties, {sv}, min-backlight-step,
++ g_variant_new_int32 ((output-backlight_max -
output-backlight_min) ?
++ 100 /
(output-backlight_max - output-backlight_min) : -1));
+ g_variant_builder_add (properties, {sv}, primary,
+ g_variant_new_boolean (output-is_primary));
+ g_variant_builder_add (properties, {sv}, presentation,
+--
+1.8.4.1
+
Modified: PKGBUILD
===
--- PKGBUILD2013-11-16 12:14:30 UTC (rev 199783)
+++ PKGBUILD2013-11-16 12:14:33 UTC (rev 199784)
@@ -5,7 +5,7 @@
pkgname=mutter
pkgver=3.10.2
-pkgrel=1
+pkgrel=2
pkgdesc=A window manager for GNOME
arch=(i686 x86_64)
license=('GPL')
@@ -15,9 +15,18 @@
groups=('gnome')
options=('!emptydirs')
install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('438163bc7fbab88366b589cab895a1df79eeac389e012c6e26ec559316651100')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+0001-monitor-expose-min-backlight-step.patch)
+sha256sums=('438163bc7fbab88366b589cab895a1df79eeac389e012c6e26ec559316651100'
+'f1ef173d96ac27abdcf765972d2ac434f63bf4629b8bd51c177e8963d07f5eb7')
+prepare() {
+ cd $pkgname-$pkgver
+
+ # FS#37224
+ patch -Np1 -i ../0001-monitor-expose-min-backlight-step.patch
+}
+
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc \
