view: sidestep transaction for float/fullscreen

Transactions are only useful when multiple views need to atomically
change size together. Float/fullscreen views are independant of the
layout and should bypass the transaction system.
This commit is contained in:
Isaac Freund 2020-07-31 12:16:11 +02:00
parent ecef8c2dc4
commit 7a244092e5
5 changed files with 37 additions and 21 deletions

View file

@ -296,17 +296,12 @@ fn layoutExternal(self: *Self, visible_count: u32, output_tags: u32) !void {
pub fn arrangeViews(self: *Self) void { pub fn arrangeViews(self: *Self) void {
const full_area = Box.fromWlrBox(c.wlr_output_layout_get_box(self.root.wlr_output_layout, self.wlr_output).*); const full_area = Box.fromWlrBox(c.wlr_output_layout_get_box(self.root.wlr_output_layout, self.wlr_output).*);
// Make fullscreen views take the full area, count up views that will be // Count up views that will be arranged by the layout
// arranged by the layout.
var layout_count: u32 = 0; var layout_count: u32 = 0;
var it = ViewStack(View).pendingIterator(self.views.first, self.pending.tags); var it = ViewStack(View).pendingIterator(self.views.first, self.pending.tags);
while (it.next()) |node| { while (it.next()) |node| {
const view = &node.view; const view = &node.view;
if (view.pending.fullscreen) { if (!view.pending.float) layout_count += 1;
view.pending.box = full_area;
} else if (!view.pending.float) {
layout_count += 1;
}
} }
// If the usable area has a zero dimension, trying to arrange the layout // If the usable area has a zero dimension, trying to arrange the layout

View file

@ -218,9 +218,6 @@ pub fn setFocused(self: *Self, focused: bool) void {
/// Set the pending state to fullscren and inform the client. Should be /// Set the pending state to fullscren and inform the client. Should be
/// followed by starting a transaction to apply the pending state. /// followed by starting a transaction to apply the pending state.
pub fn setFullscreen(self: *Self, fullscreen: bool) void { pub fn setFullscreen(self: *Self, fullscreen: bool) void {
// If transitionng from fullscreen -> float, return to the saved
// floating dimensions.
if (self.pending.fullscreen and self.pending.float) self.pending.box = self.float_box;
self.pending.fullscreen = fullscreen; self.pending.fullscreen = fullscreen;
switch (self.impl) { switch (self.impl) {
.xdg_toplevel => |xdg_toplevel| xdg_toplevel.setFullscreen(fullscreen), .xdg_toplevel => |xdg_toplevel| xdg_toplevel.setFullscreen(fullscreen),
@ -315,7 +312,7 @@ pub fn map(self: *Self) void {
self.output.sendViewTags(); self.output.sendViewTags();
root.arrange(); if (self.pending.float) self.configure() else root.arrange();
} }
/// Called by the impl when the surface will no longer be displayed /// Called by the impl when the surface will no longer be displayed
@ -339,7 +336,7 @@ pub fn unmap(self: *Self) void {
self.output.sendViewTags(); self.output.sendViewTags();
root.arrange(); if (!self.current.float and !self.current.fullscreen) root.arrange();
} }
/// Destory the view and free the ViewStack node holding it. /// Destory the view and free the ViewStack node holding it.

View file

@ -245,14 +245,14 @@ fn handleCommit(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
view.surface_box = new_box; view.surface_box = new_box;
if (s == self.wlr_xdg_surface.configure_serial) { if (s == self.wlr_xdg_surface.configure_serial) {
// If this commit is in response to our configure, either notify // If this commit is in response to our configure and the view is
// the transaction code or apply the pending state immediately, // part of the layout, notify the transaction code. If floating or
// depending on whether or not the view is floating. // fullscreen apply the pending state immediately.
view.pending_serial = null; view.pending_serial = null;
if (view.current.float and view.pending.float) if (!view.pending.float and !view.pending.fullscreen)
view.current = view.pending view.output.root.notifyConfigured()
else else
view.output.root.notifyConfigured(); view.current = view.pending;
} else { } else {
// If the client has not yet acked our configure, we need to send a // If the client has not yet acked our configure, we need to send a
// frame done event so that it commits another buffer. These // frame done event so that it commits another buffer. These

View file

@ -39,8 +39,14 @@ pub fn toggleFloat(
// Don't modify views which are the target of a cursor action // Don't modify views which are the target of a cursor action
if (seat.input_manager.isCursorActionTarget(view)) return; if (seat.input_manager.isCursorActionTarget(view)) return;
if (!view.pending.float) view.pending.box = view.float_box;
view.pending.float = !view.pending.float; view.pending.float = !view.pending.float;
// If switching from layout to float, restore the previous floating dimensions
if (view.pending.float) {
view.pending.box = view.float_box;
view.configure();
}
view.output.root.arrange(); view.output.root.arrange();
} }
} }

View file

@ -17,6 +17,9 @@
const std = @import("std"); const std = @import("std");
const c = @import("../c.zig");
const Box = @import("../Box.zig");
const Error = @import("../command.zig").Error; const Error = @import("../command.zig").Error;
const Seat = @import("../Seat.zig"); const Seat = @import("../Seat.zig");
@ -35,7 +38,22 @@ pub fn toggleFullscreen(
// Don't modify views which are the target of a cursor action // Don't modify views which are the target of a cursor action
if (seat.input_manager.isCursorActionTarget(view)) return; if (seat.input_manager.isCursorActionTarget(view)) return;
view.setFullscreen(!seat.focused.view.pending.fullscreen); view.setFullscreen(!view.pending.fullscreen);
view.output.root.arrange();
if (view.pending.fullscreen) {
const output = view.output;
view.pending.box = Box.fromWlrBox(
c.wlr_output_layout_get_box(output.root.wlr_output_layout, output.wlr_output).*,
);
view.configure();
} else if (view.pending.float) {
// If transitioning from fullscreen -> float, return to the saved
// floating dimensions.
view.pending.box = view.float_box;
view.configure();
} else {
// Transitioning to layout, arrange and start a transaction
view.output.root.arrange();
}
} }
} }