Nulo/river
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Float child and fixed-size toplevels by default

Browse source 
Closes https://github.com/ifreund/river/issues/14
This commit is contained in:
Isaac Freund 2020-04-27 16:25:49 +02:00
parent 451777b130
commit 460fb6da19
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/server.zig
View file

@ -145,11 +145,13 @@ pub const Server = struct {
const self = @fieldParentPtr(Self, "listen_new_xdg_surface", listener.?); const self = @fieldParentPtr(Self, "listen_new_xdg_surface", listener.?);
const wlr_xdg_surface = @ptrCast(*c.wlr_xdg_surface, @alignCast(@alignOf(*c.wlr_xdg_surface), data)); const wlr_xdg_surface = @ptrCast(*c.wlr_xdg_surface, @alignCast(@alignOf(*c.wlr_xdg_surface), data));
if (wlr_xdg_surface.role != .WLR_XDG_SURFACE_ROLE_TOPLEVEL) { if (wlr_xdg_surface.role == .WLR_XDG_SURFACE_ROLE_POPUP) {
// TODO: log Log.Debug.log("New xdg_popup", .{});
return; return;
} }
Log.Debug.log("New xdg_toplevel", .{});
self.input_manager.default_seat.focused_output.addView(wlr_xdg_surface); self.input_manager.default_seat.focused_output.addView(wlr_xdg_surface);
} }

26
src/xdg_toplevel.zig
View file

@ -69,6 +69,7 @@ pub fn forEachSurface(
) void { ) void {
c.wlr_xdg_surface_for_each_surface(self.wlr_xdg_surface, iterator, user_data); c.wlr_xdg_surface_for_each_surface(self.wlr_xdg_surface, iterator, user_data);
} }
/// Called when the xdg surface is destroyed /// Called when the xdg surface is destroyed
fn handleDestroy(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { fn handleDestroy(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const self = @fieldParentPtr(Self, "listen_destroy", listener.?); const self = @fieldParentPtr(Self, "listen_destroy", listener.?);
@ -109,17 +110,24 @@ fn handleMap(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
view.natural_height = @intCast(u32, self.wlr_xdg_surface.surface.*.current.height); view.natural_height = @intCast(u32, self.wlr_xdg_surface.surface.*.current.height);
} }
const app_id: ?[*:0]const u8 = self.wlr_xdg_surface.unnamed_166.toplevel.*.app_id; const wlr_xdg_toplevel: *c.wlr_xdg_toplevel = self.wlr_xdg_surface.unnamed_166.toplevel;
Log.Debug.log("View with app_id '{}' mapped", .{if (app_id) |id| id else "NULL"}); const state = &wlr_xdg_toplevel.current;
const app_id: [*:0]const u8 = if (wlr_xdg_toplevel.app_id) |id| id else "NULL";
// Make views with app_ids listed in the float filter float Log.Debug.log("View with app_id '{}' mapped", .{app_id});
if (app_id) |id| {
for (root.server.config.float_filter.items) |filter_app_id| { for (root.server.config.float_filter.items) |filter_app_id| {
if (std.mem.eql(u8, std.mem.span(id), std.mem.span(filter_app_id))) { // Make views with app_ids listed in the float filter float
view.setFloating(true); if (std.mem.eql(u8, std.mem.span(app_id), std.mem.span(filter_app_id))) {
break; view.setFloating(true);
} break;
} }
} else if ((wlr_xdg_toplevel.parent != null) or
(state.min_width != 0 and state.min_height != 0 and
(state.min_width == state.max_width or state.min_height == state.max_height)))
{
// If the toplevel has a parent or is of fixed size make it float
view.setFloating(true);
} }
// Focus the newly mapped view. Note: if a seat is focusing a different output // Focus the newly mapped view. Note: if a seat is focusing a different output