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

Cleanup timespec types

Browse Source
This commit is contained in:
Isaac Freund
2020-04-20 00:23:25 +02:00
parent 1fe00bc38f
commit f0c4faf10b
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/render.zig
View File

@ -10,7 +10,7 @@ const ViewStack = @import("view_stack.zig").ViewStack;
pub fn renderOutput(output: *Output) void { pub fn renderOutput(output: *Output) void {
const renderer = output.root.server.wlr_renderer; const renderer = output.root.server.wlr_renderer;
var now: c.struct_timespec = undefined; var now: c.timespec = undefined;
_ = c.clock_gettime(c.CLOCK_MONOTONIC, &now); _ = c.clock_gettime(c.CLOCK_MONOTONIC, &now);
// wlr_output_attach_render makes the OpenGL context current. // wlr_output_attach_render makes the OpenGL context current.
@ -65,11 +65,11 @@ const LayerSurfaceRenderData = struct {
output: *c.wlr_output, output: *c.wlr_output,
renderer: *c.wlr_renderer, renderer: *c.wlr_renderer,
layer_surface: *LayerSurface, layer_surface: *LayerSurface,
when: *c.struct_timespec, when: *c.timespec,
}; };
/// Render all surfaces on the passed layer /// Render all surfaces on the passed layer
fn renderLayer(output: Output, layer: std.TailQueue(LayerSurface), now: *c.struct_timespec) void { fn renderLayer(output: Output, layer: std.TailQueue(LayerSurface), now: *c.timespec) void {
var it = layer.first; var it = layer.first;
while (it) |node| : (it = node.next) { while (it) |node| : (it = node.next) {
const layer_surface = &node.data; const layer_surface = &node.data;
@ -141,10 +141,10 @@ const ViewRenderData = struct {
output: *c.wlr_output, output: *c.wlr_output,
renderer: *c.wlr_renderer, renderer: *c.wlr_renderer,
view: *View, view: *View,
when: *c.struct_timespec, when: *c.timespec,
}; };
fn renderView(output: Output, view: *View, now: *c.struct_timespec) void { fn renderView(output: Output, view: *View, now: *c.timespec) void {
// If we have a stashed buffer, we are in the middle of a transaction // If we have a stashed buffer, we are in the middle of a transaction
// and need to render that buffer until the transaction is complete. // and need to render that buffer until the transaction is complete.
if (view.stashed_buffer) |buffer| { if (view.stashed_buffer) |buffer| {
@ -240,7 +240,7 @@ fn renderSurface(_surface: ?*c.wlr_surface, sx: c_int, sy: c_int, data: ?*c_void
c.wlr_surface_send_frame_done(surface, rdata.when); c.wlr_surface_send_frame_done(surface, rdata.when);
} }
fn renderBorders(output: Output, view: *View, now: *c.struct_timespec) void { fn renderBorders(output: Output, view: *View, now: *c.timespec) void {
var border: c.wlr_box = undefined; var border: c.wlr_box = undefined;
const color = if (view.wlr_xdg_surface.unnamed_164.toplevel.*.current.activated) const color = if (view.wlr_xdg_surface.unnamed_164.toplevel.*.current.activated)
[_]f32{ 0.57647059, 0.63137255, 0.63137255, 1.0 } // Solarized base1 [_]f32{ 0.57647059, 0.63137255, 0.63137255, 1.0 } // Solarized base1

2
src/view.zig
View File

@ -100,7 +100,7 @@ pub const View = struct {
} }
pub fn sendFrameDone(self: Self) void { pub fn sendFrameDone(self: Self) void {
var now: c.struct_timespec = undefined; var now: c.timespec = undefined;
_ = c.clock_gettime(c.CLOCK_MONOTONIC, &now); _ = c.clock_gettime(c.CLOCK_MONOTONIC, &now);
c.wlr_surface_send_frame_done(self.wlr_xdg_surface.surface, &now); c.wlr_surface_send_frame_done(self.wlr_xdg_surface.surface, &now);
} }