pool/mutter
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 785405 from home:AZhou:branches:GNOME:Factory

Browse Source 
- Add mutter-wayland-fix-keyboard-move-resize-window.patch:
  move some common code out of X11 only code blocks to fix it
  (bsc#1159976, glgo#GNOME/mutter!997).

OBS-URL: https://build.opensuse.org/request/show/785405
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/mutter?expand=0&rev=342
This commit is contained in:
Yifan Jiang 2020-03-19 06:44:26 +00:00 committed by Git OBS Bridge
parent 85234f7ddb
commit 2825abc696
3 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mutter-wayland-fix-keyboard-move-resize-window.patch Normal file
View File

@ -0,0 +1,36 @@
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index b86272541..b995075fb 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -1820,12 +1820,12 @@ meta_window_grab_all_keys (MetaWindow *window,
meta_topic (META_DEBUG_KEYBINDINGS,
"Grabbing all keys on window %s\n", window->desc);
retval = grab_keyboard (grabwindow, timestamp, XIGrabModeAsync);
- if (retval)
- {
- window->keys_grabbed = FALSE;
- window->all_keys_grabbed = TRUE;
- window->grab_on_frame = window->frame != NULL;
- }
+ }
+ if (retval)
+ {
+ window->keys_grabbed = FALSE;
+ window->all_keys_grabbed = TRUE;
+ window->grab_on_frame = window->frame != NULL;
}
return retval;
@@ -1835,9 +1835,10 @@ void
meta_window_ungrab_all_keys (MetaWindow *window,
guint32 timestamp)
{
- if (!meta_is_wayland_compositor () && window->all_keys_grabbed)
+ if (window->all_keys_grabbed)
{
- ungrab_keyboard (timestamp);
+ if (!meta_is_wayland_compositor())
+ ungrab_keyboard (timestamp);
window->grab_on_frame = FALSE;
window->all_keys_grabbed = FALSE;

7
mutter.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 13 02:17:24 UTC 2020 - Alynx Zhou <alynx.zhou@suse.com>
- Add mutter-wayland-fix-keyboard-move-resize-window.patch:
move some common code out of X11 only code blocks to fix it
(bsc#1159976, glgo#GNOME/mutter!997).
-------------------------------------------------------------------
Mon Mar 02 10:50:18 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>

3
mutter.spec
View File

@ -39,6 +39,8 @@ Patch4: mutter-disable-cvt-s390x.patch
Patch5: mutter-fix-mesa20.patch
# PATCH-FIX-UPSTREAM 0001-Update-to-PipeWire-0.3-API.patch alarrosa@suse.de -- Port mutter to build with pipewire 0.3.0
Patch6: 0001-Update-to-PipeWire-0.3-API.patch
# PATCH-FIX-UPSTREAM mutter-wayland-fix-keyboard-move-resize-window.patch bsc#1159976, glgo#GNOME/mutter!997 alynx.zhou@suse.com -- Fix window keyboard move/resize mode in wayland
Patch7: mutter-wayland-fix-keyboard-move-resize-window.patch
## SLE-only patches start at 1000
# PATCH-FEATURE-SLE mutter-SLE-bell.patch FATE#316042 bnc#889218 idonmez@suse.com -- make audible bell work out of the box.
Patch1000: mutter-SLE-bell.patch
@ -161,6 +163,7 @@ applications that want to make use of the mutter library.
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
# SLE-only patches and translations.
translation-update-upstream po mutter