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

rivertile: Use saturating arithmetics to prevent over-/underflow when using user defined values

Browse Source
This commit is contained in:
Leon Henrik Plickat 2022-02-19 13:53:42 +01:00 committed by Isaac Freund
parent e67a9423a8
commit e857631936
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rivertile/main.zig
View File

@ -201,12 +201,12 @@ const Output = struct {
0; 0;
const usable_width = switch (output.main_location) { const usable_width = switch (output.main_location) {
.left, .right => ev.usable_width - 2 * outer_padding, .left, .right => ev.usable_width -| (2 *| outer_padding),
.top, .bottom => ev.usable_height - 2 * outer_padding, .top, .bottom => ev.usable_height -| (2 *| outer_padding),
}; };
const usable_height = switch (output.main_location) { const usable_height = switch (output.main_location) {
.left, .right => ev.usable_height - 2 * outer_padding, .left, .right => ev.usable_height -| (2 *| outer_padding),
.top, .bottom => ev.usable_width - 2 * outer_padding, .top, .bottom => ev.usable_width -| (2 *| outer_padding),
}; };
// to make things pixel-perfect, we make the first main and first secondary // to make things pixel-perfect, we make the first main and first secondary
@ -258,10 +258,10 @@ const Output = struct {
height = secondary_height + if (i == main_count) secondary_height_rem else 0; height = secondary_height + if (i == main_count) secondary_height_rem else 0;
} }
x += @intCast(i32, view_padding); x +|= @intCast(i32, view_padding);
y += @intCast(i32, view_padding); y +|= @intCast(i32, view_padding);
width -= 2 * view_padding; width -|= 2 *| view_padding;
height -= 2 * view_padding; height -|= 2 *| view_padding;
switch (output.main_location) { switch (output.main_location) {
.left => layout.pushViewDimensions( .left => layout.pushViewDimensions(
@ -272,22 +272,22 @@ const Output = struct {
ev.serial, ev.serial,
), ),
.right => layout.pushViewDimensions( .right => layout.pushViewDimensions(
@intCast(i32, usable_width - width) - x + @intCast(i32, outer_padding), @intCast(i32, usable_width - width) - x +| @intCast(i32, outer_padding),
y + @intCast(i32, outer_padding), y +| @intCast(i32, outer_padding),
width, width,
height, height,
ev.serial, ev.serial,
), ),
.top => layout.pushViewDimensions( .top => layout.pushViewDimensions(
y + @intCast(i32, outer_padding), y +| @intCast(i32, outer_padding),
x + @intCast(i32, outer_padding), x +| @intCast(i32, outer_padding),
height, height,
width, width,
ev.serial, ev.serial,
), ),
.bottom => layout.pushViewDimensions( .bottom => layout.pushViewDimensions(
y + @intCast(i32, outer_padding), y +| @intCast(i32, outer_padding),
@intCast(i32, usable_width - width) - x + @intCast(i32, outer_padding), @intCast(i32, usable_width - width) - x +| @intCast(i32, outer_padding),
height, height,
width, width,
ev.serial, ev.serial,