diff --git a/compositor/compositor.c b/compositor/compositor.c index 3e72c27..a702fb2 100644 --- a/compositor/compositor.c +++ b/compositor/compositor.c @@ -154,6 +154,16 @@ wlsc_surface_create(struct wlsc_compositor *compositor, return surface; } +static uint32_t +get_time(void) +{ + struct timeval tv; + + gettimeofday(&tv, NULL); + + return tv.tv_sec * 1000 + tv.tv_usec / 1000; +} + static void destroy_surface(struct wl_resource *resource, struct wl_client *client) { @@ -166,7 +176,7 @@ destroy_surface(struct wl_resource *resource, struct wl_client *client) wl_list_remove(&surface->link); glDeleteTextures(1, &surface->texture); - time = wl_display_get_time(compositor->wl_display); + time = get_time(); wl_list_for_each_safe(l, next, &surface->surface.destroy_listener_list, link) l->func(l, &surface->surface, time); @@ -1149,7 +1159,7 @@ drag_cancel(struct wl_client *client, struct wl_drag *drag) if (drag->source == NULL || drag->source->client != client) return; - time = wl_display_get_time(wl_client_get_display(client)); + time = get_time(); wlsc_input_device_end_grab(device, time); } diff --git a/wayland/wayland-server.c b/wayland/wayland-server.c index 2ea9035..1fe3ffc 100644 --- a/wayland/wayland-server.c +++ b/wayland/wayland-server.c @@ -516,16 +516,6 @@ wl_display_destroy(struct wl_display *display) free(display); } -WL_EXPORT uint32_t -wl_display_get_time(struct wl_display *display) -{ - struct timeval tv; - - gettimeofday(&tv, NULL); - - return tv.tv_sec * 1000 + tv.tv_usec / 1000; -} - WL_EXPORT void wl_display_add_object(struct wl_display *display, struct wl_object *object) { diff --git a/wayland/wayland-server.h b/wayland/wayland-server.h index 6115f60..43efcfe 100644 --- a/wayland/wayland-server.h +++ b/wayland/wayland-server.h @@ -178,9 +178,6 @@ wl_display_set_compositor(struct wl_display *display, struct wl_compositor *compositor, const struct wl_compositor_interface *implementation); -uint32_t -wl_display_get_time(struct wl_display *display); - void wl_display_post_frame(struct wl_display *display, uint32_t msecs);