git.lucas.co / cce-compositor
Wayland compositor (wlroots)
git clone https://git.lucas.co/cce-compositor.git

commit32c7af5ca9005753667ea56887b2534c20a22309
parentc295370e83
authornovakne <[email protected]>
date2021-04-20 11:56
river: fix to work with latest zig-pixman

 deps/zig-pixman             | 2 +-
 river/PointerConstraint.zig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/deps/zig-pixman b/deps/zig-pixman
index 7847fd1..f8e682a 160000
--- a/deps/zig-pixman
+++ b/deps/zig-pixman
@@ -1 +1 @@
-Subproject commit 7847fd1bae7021cdb572e77eac93676c551fd1eb
+Subproject commit f8e682ac2f640368ebb414aa2e7db6a2be1b179e
diff --git a/river/PointerConstraint.zig b/river/PointerConstraint.zig
index cf666dd..fc5cf20 100644
--- a/river/PointerConstraint.zig
+++ b/river/PointerConstraint.zig
@@ -66,7 +66,7 @@ pub fn setAsActive(self: *Self) void {
 
     self.cursor.constraint = self.constraint;
 
-    if (self.constraint.current.region.notEmpty() != 0) {
+    if (self.constraint.current.region.notEmpty()) {
         _ = self.constraint.region.intersect(&self.constraint.surface.input_region, &self.constraint.current.region);
     } else {
         _ = self.constraint.region.copy(&self.constraint.surface.input_region);
@@ -84,7 +84,7 @@ fn constrainToRegion(self: *Self) void {
 
         var box: pixman.Box32 = undefined;
 
-        if (self.constraint.region.containsPoint(cx, cy, &box) == 0) {
+        if (!self.constraint.region.containsPoint(cx, cy, &box)) {
             var nRects: c_int = undefined;
             const rects = self.constraint.region.rectangles(&nRects);