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

XwaylandOverrideRedirect: eliminate "self" naming convention

Browse Source
This commit is contained in:
Isaac Freund
2024-03-14 12:29:49 +01:00
parent 28f30b2571
commit 693a2b0dda
7 changed files with 82 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
river/Cursor.zig
View File

@ -402,7 +402,7 @@ fn updateKeyboardFocus(cursor: Cursor, result: Root.AtResult) void {
assert(server.lock_manager.state != .unlocked);
cursor.seat.setFocusRaw(.{ .lock_surface = lock_surface });
},
.xwayland_override_redirect => |override_redirect| {
.override_redirect => |override_redirect| {
assert(server.lock_manager.state != .locked);
override_redirect.focusIfDesired();
},
@ -1009,7 +1009,7 @@ fn updateFocusFollowsCursorTarget(cursor: *Cursor) void {
.layer_surface, .lock_surface => {
cursor.focus_follows_cursor_target = null;
},
.xwayland_override_redirect => {
.override_redirect => {
assert(build_options.xwayland);
assert(server.xwayland != null);
cursor.focus_follows_cursor_target = null;
@ -1139,11 +1139,11 @@ fn warp(cursor: *Cursor) void {
.width = view.current.box.width,
.height = view.current.box.height,
},
.xwayland_override_redirect => |or_window| wlr.Box{
.x = or_window.xwayland_surface.x,
.y = or_window.xwayland_surface.y,
.width = or_window.xwayland_surface.width,
.height = or_window.xwayland_surface.height,
.override_redirect => |override_redirect| wlr.Box{
.x = override_redirect.xwayland_surface.x,
.y = override_redirect.xwayland_surface.y,
.width = override_redirect.xwayland_surface.width,
.height = override_redirect.xwayland_surface.height,
},
},
};