[plasma/kwin] src: Revert "Handle "Globally Active" input model more gracefully"
Vlad Zahorodnii <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit def002a9c5f736d08f1260a9e025b64bada15143 by Vlad Zahorodnii.
Committed on 17/08/2026 at 09:31.
Pushed by vladz into branch 'master'.
Revert "Handle "Globally Active" input model more gracefully"
This reverts commit d2bf6d6365928bac8e16f7d54e849b31228143f2.
M +1 -3 src/activation.cpp
M +0 -5 src/window.cpp
M +0 -1 src/window.h
M +0 -5 src/x11window.cpp
M +0 -1 src/x11window.h
https://invent.kde.org/plasma/kwin/-/commit/def002a9c5f736d08f1260a9e025b64bada15143
diff --git a/src/activation.cpp b/src/activation.cpp
index e78050c95d0..c587bb06e8c 100644
--- a/src/activation.cpp
+++ b/src/activation.cpp
@@ -396,9 +396,7 @@ bool Workspace::requestFocus(Window *window, bool force)
}
window->takeFocus();
- if (!window->takesAsyncFocus()) {
- setActiveWindow(window);
- }
+ setActiveWindow(window);
return true;
}
diff --git a/src/window.cpp b/src/window.cpp
index fdb7c62038b..a4460a9ecb0 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -667,11 +667,6 @@ void Window::takeFocus()
{
}
-bool Window::takesAsyncFocus() const
-{
- return false;
-}
-
bool Window::isSpecialWindow() const
{
// TODO
diff --git a/src/window.h b/src/window.h
index 796b5454ed3..bf2c61d7c7b 100644
--- a/src/window.h
+++ b/src/window.h
@@ -1115,7 +1115,6 @@ public:
bool wantsTabFocus() const;
virtual void takeFocus();
- virtual bool takesAsyncFocus() const;
virtual bool wantsInput() const = 0;
void checkWorkspacePosition(RectF oldGeometry = RectF(), LogicalOutput *oldOutput = nullptr);
#if KWIN_BUILD_X11
diff --git a/src/x11window.cpp b/src/x11window.cpp
index 3f477e2cb1f..ba55ac83dc6 100644
--- a/src/x11window.cpp
+++ b/src/x11window.cpp
@@ -1659,11 +1659,6 @@ void X11Window::takeFocus()
}
}
-bool X11Window::takesAsyncFocus() const
-{
- return !acceptsFocus() && info->supportsProtocol(NET::TakeFocusProtocol);
-}
-
/**
* Returns whether the window provides context help or not. If it does,
* you should show a help menu item or a help button like '?' and call
diff --git a/src/x11window.h b/src/x11window.h
index fc13023600d..67cf57bf81f 100644
--- a/src/x11window.h
+++ b/src/x11window.h
@@ -148,7 +148,6 @@ public:
bool isCloseable() const override; ///< May be closed by the user (May have a close button)
void takeFocus() override;
- bool takesAsyncFocus() const override;
void invalidateDecoration() override;