Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Seat: keep parent Xwayland view of a focused OR surface activated

Browse Source 
Xwayland OR menus may disappear if their parent view is deactivated. The
heuristic and ICCCM input model implemented prior, used to determine whether an
OR surface may take focus, does not cover all menus, so retaining parent view
activation works as a catch-all solution for handling unwanted OR menu focus.
This commit is contained in:
Zakariyya Von Forslun
2023-01-11 06:47:05 +10:00
parent f20692e329
commit 63610d9440
2 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
river/Seat.zig
View File

@ -80,6 +80,9 @@ focused_output: *Output,
focused: FocusTarget = .none,
/// Currently activated Xwayland view (used to handle override redirect menus)
activated_xwayland_view: if (build_options.xwayland) ?*View else void = if (build_options.xwayland) null else {},
/// Stack of views in most recently focused order
/// If there is a currently focused view, it is on top.
focus_stack: ViewStack(*View) = .{},
@ -230,11 +233,36 @@ pub fn setFocusRaw(self: *Self, new_focus: FocusTarget) void {
.none => null,
};
if (build_options.xwayland) {
// Keep the parent top-level Xwayland view of any override redirect surface
// activated while that override redirect surface is focused. This ensures
// override redirect menus do not disappear as a result of deactivating
// their parent window.
if (new_focus == .xwayland_override_redirect and
self.focused == .view and
self.focused.view.impl == .xwayland_view and
self.focused.view.impl.xwayland_view.xwayland_surface.pid == new_focus.xwayland_override_redirect.xwayland_surface.pid)
{
self.activated_xwayland_view = self.focused.view;
} else if (self.activated_xwayland_view) |active_view| {
if (!(new_focus == .view and new_focus.view == active_view) and
!(new_focus == .xwayland_override_redirect and new_focus.xwayland_override_redirect.xwayland_surface.pid == active_view.impl.xwayland_view.xwayland_surface.pid))
{
if (active_view.pending.focus == 0) active_view.setActivated(false);
self.activated_xwayland_view = null;
}
}
}
// First clear the current focus
switch (self.focused) {
.view => |view| {
view.pending.focus -= 1;
if (view.pending.focus == 0) view.setActivated(false);
if (view.pending.focus == 0 and
(!build_options.xwayland or view != self.activated_xwayland_view))
{
view.setActivated(false);
}
},
.xwayland_override_redirect, .layer, .lock_surface, .none => {},
}
@ -244,7 +272,11 @@ pub fn setFocusRaw(self: *Self, new_focus: FocusTarget) void {
.view => |target_view| {
assert(server.lock_manager.state == .unlocked);
assert(self.focused_output == target_view.output);
if (target_view.pending.focus == 0) target_view.setActivated(true);
if (target_view.pending.focus == 0 and
(!build_options.xwayland or target_view != self.activated_xwayland_view))
{
target_view.setActivated(true);
}
target_view.pending.focus += 1;
target_view.pending.urgent = false;
},