Kde/kwin: update patch
This commit is contained in:
parent
9aabffc52a
commit
75e75a571e
1 changed files with 45 additions and 29 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From ffa4f312c750ae0e7e36a656612148b1fa9c020c Mon Sep 17 00:00:00 2001
|
||||
From 3ea8c3758e75f06c71b0b279c4e51f22ec554954 Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Fri, 4 Oct 2024 22:49:16 +0300
|
||||
Subject: [PATCH 1/9] Resize X11 window immediately if it doesn't support
|
||||
|
|
@ -181,10 +181,10 @@ index b71a9d3640..780ccfbc7e 100644
|
|||
}
|
||||
|
||||
--
|
||||
2.46.1
|
||||
2.47.0
|
||||
|
||||
|
||||
From bc87fc3d80ad525786a9b15df5c2488a6110b53d Mon Sep 17 00:00:00 2001
|
||||
From 1be3dfa4b40732997ecb1bd1959ba775331d603a Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Fri, 4 Oct 2024 22:55:44 +0300
|
||||
Subject: [PATCH 2/9] Rename X11Window::handleSync,handleSyncTimeout
|
||||
|
|
@ -255,10 +255,10 @@ index 4f3b43c8b0..b54db23345 100644
|
|||
bool allowWindowActivation(xcb_timestamp_t time = -1U, bool focus_in = false);
|
||||
|
||||
--
|
||||
2.46.1
|
||||
2.47.0
|
||||
|
||||
|
||||
From b8016cbe28d847d052f1b0ee6c66bdaabbb88368 Mon Sep 17 00:00:00 2001
|
||||
From ea53098c38b64cb5870ef4f3b47fb53f509e03a4 Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Fri, 4 Oct 2024 22:59:34 +0300
|
||||
Subject: [PATCH 3/9] Rename X11Window::SyncRequest::isPending
|
||||
|
|
@ -340,10 +340,10 @@ index b54db23345..10fa57eaf2 100644
|
|||
};
|
||||
const SyncRequest &syncRequest() const
|
||||
--
|
||||
2.46.1
|
||||
2.47.0
|
||||
|
||||
|
||||
From 61e7061998ce3244325af62aac198ecf058a1aeb Mon Sep 17 00:00:00 2001
|
||||
From 49319a3f3e2a1d468e12bdf3dfd7eeb2e3db0899 Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Fri, 4 Oct 2024 23:12:44 +0300
|
||||
Subject: [PATCH 4/9] Make XSync timeout more permissive
|
||||
|
|
@ -599,10 +599,10 @@ index 10fa57eaf2..6b430b861a 100644
|
|||
void establishCommandAllGrab(uint8_t button);
|
||||
|
||||
--
|
||||
2.46.1
|
||||
2.47.0
|
||||
|
||||
|
||||
From dd10d1b329b06ab3377f669a610fec9726f28a70 Mon Sep 17 00:00:00 2001
|
||||
From 79e1853e9ecd20c1d9549399b46d434475b753bd Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Fri, 4 Oct 2024 23:20:03 +0300
|
||||
Subject: [PATCH 5/9] Disable Xwayland surface commits for all sync requests
|
||||
|
|
@ -658,10 +658,10 @@ index 1d25ab82b1..5688ea6da8 100644
|
|||
configure(nativeFrameGeometry, nativeWrapperGeometry, nativeClientGeometry);
|
||||
}
|
||||
--
|
||||
2.46.1
|
||||
2.47.0
|
||||
|
||||
|
||||
From 60ef3223e42a06110693fef3ec493662c799af38 Mon Sep 17 00:00:00 2001
|
||||
From 038a798c8be170eb5b7132b823d77474d118ca42 Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Fri, 4 Oct 2024 23:40:41 +0300
|
||||
Subject: [PATCH 6/9] Make Xwayland resizing less glitchy
|
||||
|
|
@ -824,10 +824,10 @@ index 6b430b861a..73d4c23a4c 100644
|
|||
void setAllowCommits(bool allow);
|
||||
|
||||
--
|
||||
2.46.1
|
||||
2.47.0
|
||||
|
||||
|
||||
From 59f45806953e05bbf289480b9e5882e4d87ee434 Mon Sep 17 00:00:00 2001
|
||||
From 10c5298221f5dc3cc90255846580b608f6f3c18c Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Thu, 3 Oct 2024 00:43:57 +0300
|
||||
Subject: [PATCH 7/9] scene: Use standard wl_surface item for Xwayland surfaces
|
||||
|
|
@ -837,13 +837,13 @@ opaque region getting out of sync.
|
|||
|
||||
Xwayland MR: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1698
|
||||
---
|
||||
src/scene/surfaceitem_wayland.cpp | 21 ---------------------
|
||||
src/scene/surfaceitem_wayland.h | 19 -------------------
|
||||
src/scene/surfaceitem_wayland.cpp | 36 -------------------------------
|
||||
src/scene/surfaceitem_wayland.h | 20 -----------------
|
||||
src/scene/windowitem.cpp | 2 +-
|
||||
3 files changed, 1 insertion(+), 41 deletions(-)
|
||||
3 files changed, 1 insertion(+), 57 deletions(-)
|
||||
|
||||
diff --git a/src/scene/surfaceitem_wayland.cpp b/src/scene/surfaceitem_wayland.cpp
|
||||
index a4d012f774..04961952b9 100644
|
||||
index 4a307565c0..04961952b9 100644
|
||||
--- a/src/scene/surfaceitem_wayland.cpp
|
||||
+++ b/src/scene/surfaceitem_wayland.cpp
|
||||
@@ -12,11 +12,6 @@
|
||||
|
|
@ -858,7 +858,7 @@ index a4d012f774..04961952b9 100644
|
|||
|
||||
namespace KWin
|
||||
{
|
||||
@@ -247,22 +242,6 @@ bool SurfacePixmapWayland::isValid() const
|
||||
@@ -247,37 +242,6 @@ bool SurfacePixmapWayland::isValid() const
|
||||
return m_bufferRef;
|
||||
}
|
||||
|
||||
|
|
@ -867,22 +867,37 @@ index a4d012f774..04961952b9 100644
|
|||
- : SurfaceItemWayland(window->surface(), parent)
|
||||
- , m_window(window)
|
||||
-{
|
||||
- connect(window, &X11Window::shapeChanged, this, &SurfaceItemXwayland::discardQuads);
|
||||
-}
|
||||
-
|
||||
-QList<QRectF> SurfaceItemXwayland::shape() const
|
||||
-{
|
||||
- QList<QRectF> shape = m_window->shapeRegion();
|
||||
- for (QRectF &shapePart : shape) {
|
||||
- shapePart = shapePart.intersected(rect());
|
||||
- }
|
||||
- return shape;
|
||||
-}
|
||||
-
|
||||
-QRegion SurfaceItemXwayland::opaque() const
|
||||
-{
|
||||
- if (!m_window->hasAlpha()) {
|
||||
- return rect().toRect();
|
||||
- } else {
|
||||
- return m_window->opaqueRegion() & rect().toRect();
|
||||
- QRegion shapeRegion;
|
||||
- for (const QRectF &shapePart : shape()) {
|
||||
- shapeRegion += shapePart.toRect();
|
||||
- }
|
||||
- if (!m_window->hasAlpha()) {
|
||||
- return shapeRegion;
|
||||
- } else {
|
||||
- return m_window->opaqueRegion() & shapeRegion;
|
||||
- }
|
||||
- return QRegion();
|
||||
-}
|
||||
-#endif
|
||||
} // namespace KWin
|
||||
|
||||
#include "moc_surfaceitem_wayland.cpp"
|
||||
diff --git a/src/scene/surfaceitem_wayland.h b/src/scene/surfaceitem_wayland.h
|
||||
index 991cd168c3..fbc7498446 100644
|
||||
index f769284172..fbc7498446 100644
|
||||
--- a/src/scene/surfaceitem_wayland.h
|
||||
+++ b/src/scene/surfaceitem_wayland.h
|
||||
@@ -16,7 +16,6 @@ namespace KWin
|
||||
|
|
@ -893,7 +908,7 @@ index 991cd168c3..fbc7498446 100644
|
|||
|
||||
/**
|
||||
* The SurfaceItemWayland class represents a Wayland surface in the scene.
|
||||
@@ -83,22 +82,4 @@ private:
|
||||
@@ -83,23 +82,4 @@ private:
|
||||
SurfaceItemWayland *m_item;
|
||||
};
|
||||
|
||||
|
|
@ -909,6 +924,7 @@ index 991cd168c3..fbc7498446 100644
|
|||
- explicit SurfaceItemXwayland(X11Window *window, Item *parent = nullptr);
|
||||
-
|
||||
- QRegion opaque() const override;
|
||||
- QList<QRectF> shape() const override;
|
||||
-
|
||||
-private:
|
||||
- X11Window *m_window;
|
||||
|
|
@ -930,10 +946,10 @@ index 4283051e7e..913d2708f5 100644
|
|||
break;
|
||||
case Application::OperationModeWaylandOnly:
|
||||
--
|
||||
2.46.1
|
||||
2.47.0
|
||||
|
||||
|
||||
From 84f35749d9084692e0ea8ae4ea187178005457cc Mon Sep 17 00:00:00 2001
|
||||
From 91ca5127fbf590a383fe311b76da8dce553e2a8a Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Mon, 14 Oct 2024 00:34:28 +0300
|
||||
Subject: [PATCH 8/9] Send the initial sync request before mapping the frame
|
||||
|
|
@ -995,10 +1011,10 @@ index b22de557d8..be35fe07fd 100644
|
|||
bool allow;
|
||||
if (session) {
|
||||
--
|
||||
2.46.1
|
||||
2.47.0
|
||||
|
||||
|
||||
From 3ecac02f2f7573d7b2714c1fb23bebaec8afa0e0 Mon Sep 17 00:00:00 2001
|
||||
From cffaa20e83b7d9de69dcc835f6ab5d2609a49be5 Mon Sep 17 00:00:00 2001
|
||||
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
|
||||
Date: Thu, 17 Oct 2024 19:21:32 +0300
|
||||
Subject: [PATCH 9/9] Block interactive resizing if there is a pending XSync
|
||||
|
|
@ -1025,5 +1041,5 @@ index be35fe07fd..3e989f29bd 100644
|
|||
|
||||
void X11Window::doInteractiveResizeSync(const QRectF &rect)
|
||||
--
|
||||
2.46.1
|
||||
2.47.0
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue