LordMZTE/dotfiles
1
0
Fork 0
mirror of https://mzte.de/git/LordMZTE/dotfiles.git synced 2024-05-18 15:04:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

wlbg: fix panning

Browse source
This commit is contained in:
LordMZTE 2023-10-28 18:42:00 +02:00
parent bd0ac1cfe8
commit c9a3fc041b
Signed by: LordMZTE
GPG key ID: B64802DC33A64FF6
2 changed files with 44 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
scripts/wlbg/src/Gfx.zig
View file

@ -157,6 +157,38 @@ pub fn deinit(self: *Gfx) void {
self.* = undefined;
}
pub fn preDraw(
self: *Gfx,
dt: i64,
pointer_state: *PointerState,
outputs: []const OutputWindow,
infos: []const OutputInfo,
) !void {
for (self.cursor_positions, self.should_redraw, infos, outputs) |*pos, *redraw, inf, outp| {
const target = if (pointer_state.surface == outp.surface)
.{ pointer_state.x, pointer_state.y }
else
.{ @divTrunc(inf.width, 2), @divTrunc(inf.height, 2) };
const new_x: c_int = @intFromFloat(std.math.lerp(
@as(f32, @floatFromInt(pos[0])),
@as(f32, @floatFromInt(target[0])),
std.math.clamp(@as(f32, @floatFromInt(dt)) / 250.0, 0.0, 1.0),
));
const new_y: c_int = @intFromFloat(std.math.lerp(
@as(f32, @floatFromInt(pos[1])),
@as(f32, @floatFromInt(target[1])),
std.math.clamp(@as(f32, @floatFromInt(dt)) / 250.0, 0.0, 1.0),
));
if (new_x != pos[0] or new_y != pos[1])
redraw.* = true;
pos[0] = new_x;
pos[1] = new_y;
}
}
pub fn draw(
self: *Gfx,
dt: i64,
@ -169,30 +201,6 @@ pub fn draw(
c.glBindFramebuffer(c.GL_FRAMEBUFFER, 0); // use default framebuffer
c.glUseProgram(self.main_shader_program);
for (self.cursor_positions, self.should_redraw, infos, outputs) |*pos, *redraw, inf, outp| {
const target = if (pointer_state.surface == outp.surface)
.{ pointer_state.x, pointer_state.y }
else
.{ @divTrunc(inf.width, 2), @divTrunc(inf.height, 2) };
const new_x: c_int = @intFromFloat(std.math.lerp(
@as(f32, @floatFromInt(pos[0])),
@as(f32, @floatFromInt(target[0])),
std.math.clamp(@as(f32, @floatFromInt(dt)) / 1000.0, 0.0, 1.0),
));
const new_y: c_int = @intFromFloat(std.math.lerp(
@as(f32, @floatFromInt(pos[1])),
@as(f32, @floatFromInt(target[1])),
std.math.clamp(@as(f32, @floatFromInt(dt)) / 1000.0, 0.0, 1.0),
));
if (new_x != pos[0] or new_y != pos[1])
redraw.* = true;
pos[0] = new_x;
pos[1] = new_y;
}
if (!self.should_redraw[output_idx])
return;
self.should_redraw[output_idx] = false;

13
scripts/wlbg/src/main.zig
View file

@ -18,7 +18,7 @@ pub const std_options = struct {
pub const log_level = .debug;
};
const fps = 15;
const fps = 30;
pub fn main() !void {
std.log.info("initializing event loop", .{});
@ -240,6 +240,17 @@ fn renderCb(
resetXevTimerCompletion(completion, now, 1000 / fps);
data.?.gfx.preDraw(
delta_time,
data.?.pointer_state,
data.?.outputs,
data.?.output_info,
) catch |e| {
std.log.err("running preDraw: {}", .{e});
loop.stop();
return .disarm;
};
for (data.?.outputs, 0..) |output, i| {
if (c.eglMakeCurrent(
data.?.egl_dpy,