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

TextInput: remove pending_focused_surface

Browse Source 
This state doesn't need to exist, just get the focus from the Seat.
This commit is contained in:
Isaac Freund
2023-12-31 13:32:59 -06:00
parent 55ed16efd1
commit 49defcfb7a
4 changed files with 16 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
river/Seat.zig
View File

@ -53,6 +53,16 @@ pub const FocusTarget = union(enum) {
layer: *LayerSurface,
lock_surface: *LockSurface,
none: void,
pub fn surface(target: FocusTarget) ?*wlr.Surface {
return switch (target) {
.view => |view| view.rootSurface(),
.xwayland_override_redirect => |xwayland_or| xwayland_or.xwayland_surface.surface,
.layer => |layer| layer.wlr_layer_surface.surface,
.lock_surface => |lock_surface| lock_surface.wlr_lock_surface.surface,
.none => null,
};
}
};
wlr_seat: *wlr.Seat,
@ -216,14 +226,7 @@ pub fn setFocusRaw(self: *Self, new_focus: FocusTarget) void {
// If the target is already focused, do nothing
if (std.meta.eql(new_focus, self.focused)) return;
// Obtain the target surface
const target_surface = switch (new_focus) {
.view => |target_view| target_view.rootSurface(),
.xwayland_override_redirect => |target_or| target_or.xwayland_surface.surface,
.layer => |target_layer| target_layer.wlr_layer_surface.surface,
.lock_surface => |lock_surface| lock_surface.wlr_lock_surface.surface,
.none => null,
};
const target_surface = new_focus.surface();
// First clear the current focus
switch (self.focused) {