hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 18:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

input: try to refocus a focusable window when seat grabs are reset (#7669)

Browse source
This commit is contained in:
outfoxxed 2024-09-06 17:06:55 -07:00 committed by GitHub
parent b0fca6eaf0
commit 0500213086
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 50 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/desktop/Popup.cpp
View file

@ -202,6 +202,13 @@ void CPopup::reposition() {
m_pResource->applyPositioning(box, COORDS); m_pResource->applyPositioning(box, COORDS);
} }
SP<CWLSurface> CPopup::getT1Owner() {
if (m_pWindowOwner)
return m_pWindowOwner->m_pWLSurface;
else
return m_pLayerOwner->surface;
}
Vector2D CPopup::coordsRelativeToParent() { Vector2D CPopup::coordsRelativeToParent() {
Vector2D offset; Vector2D offset;

23
src/desktop/Popup.hpp
View file

@ -18,21 +18,22 @@ class CPopup {
~CPopup(); ~CPopup();
Vector2D coordsRelativeToParent(); SP<CWLSurface> getT1Owner();
Vector2D coordsGlobal(); Vector2D coordsRelativeToParent();
Vector2D coordsGlobal();
Vector2D size(); Vector2D size();
void onNewPopup(SP<CXDGPopupResource> popup); void onNewPopup(SP<CXDGPopupResource> popup);
void onDestroy(); void onDestroy();
void onMap(); void onMap();
void onUnmap(); void onUnmap();
void onCommit(bool ignoreSiblings = false); void onCommit(bool ignoreSiblings = false);
void onReposition(); void onReposition();
void recheckTree(); void recheckTree();
bool visible(); bool visible();
// will also loop over this node // will also loop over this node
void breadthfirst(std::function<void(CPopup*, void*)> fn, void* data); void breadthfirst(std::function<void(CPopup*, void*)> fn, void* data);

31
src/managers/SeatManager.cpp
View file

@ -6,6 +6,7 @@
#include "../protocols/core/Compositor.hpp" #include "../protocols/core/Compositor.hpp"
#include "../Compositor.hpp" #include "../Compositor.hpp"
#include "../devices/IKeyboard.hpp" #include "../devices/IKeyboard.hpp"
#include "wlr-layer-shell-unstable-v1.hpp"
#include <algorithm> #include <algorithm>
#include <ranges> #include <ranges>
@ -584,6 +585,36 @@ void CSeatManager::setGrab(SP<CSeatGrab> grab) {
auto oldGrab = seatGrab; auto oldGrab = seatGrab;
seatGrab.reset(); seatGrab.reset();
g_pInputManager->refocus(); g_pInputManager->refocus();
auto currentFocus = state.keyboardFocus.lock();
auto refocus = !currentFocus;
SP<CWLSurface> surf;
PHLLS layer;
if (!refocus) {
surf = CWLSurface::fromResource(currentFocus);
layer = surf->getLayer();
}
if (!refocus && !layer) {
auto popup = surf->getPopup();
if (popup) {
auto parent = popup->getT1Owner();
layer = parent->getLayer();
}
}
if (!refocus && layer)
refocus = layer->interactivity == ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_NONE;
if (refocus) {
auto candidate = g_pCompositor->m_pLastWindow.lock();
if (candidate)
g_pCompositor->focusWindow(candidate);
}
if (oldGrab->onEnd) if (oldGrab->onEnd)
oldGrab->onEnd(); oldGrab->onEnd();
} }