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

Better handle transactions with xwayland views

Browse Source
This commit is contained in:
Isaac Freund 2020-05-08 17:06:15 +02:00
parent 0902e048be
commit 14ffe91a52
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/XwaylandView.zig
View File

@ -66,6 +66,12 @@ pub fn configure(self: Self, pending_box: Box) void {
@intCast(u16, pending_box.width), @intCast(u16, pending_box.width),
@intCast(u16, pending_box.height), @intCast(u16, pending_box.height),
); );
// Xwayland surfaces don't use serials, so we will just assume they have
// configured the next time they commit. Set pending serial to a dummy
// value to indicate that a transaction has started. Note: we can't just
// call notifyConfigured() here as the transaction has not yet been fully
// initiated.
self.view.pending_serial = 0x66666666;
} }
/// Inform the xwayland surface that it has gained focus /// Inform the xwayland surface that it has gained focus
@ -145,7 +151,13 @@ fn handleUnmap(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
} }
/// Called when the surface is comitted /// Called when the surface is comitted
/// TODO: check for unexpected change in size and react as needed
fn handleCommit(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void { fn handleCommit(listener: ?*c.wl_listener, data: ?*c_void) callconv(.C) void {
const self = @fieldParentPtr(Self, "listen_commit", listener.?); const self = @fieldParentPtr(Self, "listen_commit", listener.?);
// TODO: check for unexpected change in size and react as needed const view = self.view;
// See comment in XwaylandView.configure()
if (view.pending_serial != null) {
view.output.root.notifyConfigured();
view.pending_serial = null;
}
} }