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

transactions: revert c0d7e71

Browse Source
This commit is contained in:
Isaac Freund
2020-06-09 17:04:38 +02:00
parent 7c094420ed
commit 24b1a566de
6 changed files with 36 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
river/Root.zig
View File

@ -132,63 +132,27 @@ fn startTransaction(self: *Self) void {
var view_it = ViewStack(View).iterator(output.views.first, std.math.maxInt(u32));
while (view_it.next()) |view_node| {
const view = &view_node.view;
// Clear the serial in case this transaction is interrupting a prior one.
view.pending_serial = null;
switch (view.configureAction()) {
.override => {
view.configure();
// Some clients do not ack a configure if the requested
// size is the same as their current size. Configures of
// this nature may be sent if a pending configure is
// interrupted by a configure returning to the original
// size.
if (view.pending_box.?.width == view.current_box.width and
view.pending_box.?.height == view.current_box.height)
{
view.pending_serial = null;
} else {
std.debug.assert(view.pending_serial != null);
self.pending_configures += 1;
}
},
.new_configure => {
view.configure();
self.pending_configures += 1;
std.debug.assert(view.pending_serial != null);
},
.old_configure => {
self.pending_configures += 1;
if (view.next_box) |next_box| {
view.pending_box.?.x = next_box.x;
view.pending_box.?.y = next_box.y;
view.next_box = null;
}
},
.noop => {
if (view.next_box) |next_box| {
view.pending_box = view.next_box;
view.next_box = null;
}
std.debug.assert(view.pending_serial == null);
},
}
// If there is a saved buffer present, then this transaction is
// interrupting a previous transaction and we should keep the old
// buffer.
if (view.stashed_buffer == null) {
view.stashBuffer();
if (view.needsConfigure()) {
view.configure();
self.pending_configures += 1;
// We save the current buffer, so we can send an early
// frame done event to give the client a head start on
// redrawing.
view.sendFrameDone();
}
// If there is a saved buffer present, then this transaction is interrupting
// a previous transaction and we should keep the old buffer.
if (view.stashed_buffer == null) {
view.stashBuffer();
}
}
}
// If there are views that need configures, start a timer and wait for
// configure events before committing.
if (self.pending_configures > 0) {
Log.Debug.log(
"Started transaction with {} pending configures.",
@ -201,10 +165,6 @@ fn startTransaction(self: *Self) void {
self.commitTransaction();
}
} else {
// No views need configures, clear the current timer in case we are
// interrupting another transaction and commit.
if (c.wl_event_source_timer_update(self.transaction_timer, 0) < 0)
Log.Error.log("Error disarming timer", .{});
self.commitTransaction();
}
}
@ -223,7 +183,7 @@ pub fn notifyConfigured(self: *Self) void {
self.pending_configures -= 1;
if (self.pending_configures == 0) {
// Disarm the timer, as we didn't timeout
if (c.wl_event_source_timer_update(self.transaction_timer, 0) < 0)
if (c.wl_event_source_timer_update(self.transaction_timer, 0) == -1)
Log.Error.log("Error disarming timer", .{});
self.commitTransaction();
}
@ -263,7 +223,6 @@ fn commitTransaction(self: *Self) void {
const view = &view_node.view;
// Ensure that all pending state is cleared
view.pending_serial = null;
std.debug.assert(view.next_box == null);
if (view.pending_box) |state| {
view.current_box = state;
view.pending_box = null;