diff options
Diffstat (limited to 'clients/gears.c')
| -rw-r--r-- | clients/gears.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/clients/gears.c b/clients/gears.c index 93a86b4f..1fb77e0e 100644 --- a/clients/gears.c +++ b/clients/gears.c @@ -23,6 +23,7 @@ #include "config.h" #include <stdint.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -208,8 +209,13 @@ static void update_fps(struct gears *gears, uint32_t time) { long diff_ms; + static bool first_call = true; - gears->frames++; + if (first_call) { + gears->last_fps = time; + first_call = false; + } else + gears->frames++; diff_ms = time - gears->last_fps; @@ -398,7 +404,6 @@ gears_create(struct display *display) { const int width = 450, height = 500; struct gears *gears; - struct timeval tv; int i; gears = zalloc(sizeof *gears); @@ -437,8 +442,6 @@ gears_create(struct display *display) gears->view.rotx = 20.0; gears->view.roty = 30.0; - gettimeofday(&tv, NULL); - gears->last_fps = tv.tv_sec * 1000 + tv.tv_usec / 1000; printf("Warning: FPS count is limited by the wayland compositor or monitor refresh rate\n"); glEnable(GL_NORMALIZE); @@ -469,17 +472,29 @@ gears_create(struct display *display) return gears; } +static void +gears_destroy(struct gears *gears) +{ + widget_destroy(gears->widget); + window_destroy(gears->window); + free(gears); +} + int main(int argc, char *argv[]) { struct display *d; + struct gears *gears; d = display_create(&argc, argv); if (d == NULL) { fprintf(stderr, "failed to create display: %m\n"); return -1; } - gears_create(d); + gears = gears_create(d); display_run(d); + gears_destroy(gears); + display_destroy(d); + return 0; } |