mirrors/wayland
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/wayland.git synced 2025-11-17 06:59:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Consolidate 'sync' and 'frame' events into just one 'key' event

Browse source
This commit is contained in:
Kristian Høgsberg 2010-11-29 17:04:21 -05:00
parent ac93a3d3d7
commit c1ad1f9c9b
3 changed files with 26 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

44
wayland/wayland-client.c
View file

@ -292,38 +292,31 @@ display_handle_range(void *data,
}
static void
display_handle_sync(void *data, struct wl_display *display, uint32_t key)
display_handle_key(void *data,
struct wl_display *display, uint32_t key, uint32_t time)
{
struct wl_sync_handler *handler;
struct wl_sync_handler *sync_handler;
struct wl_frame_handler *frame_handler;
handler = container_of(display->sync_list.next,
struct wl_sync_handler, link);
if (handler->key != key) {
fprintf(stderr, "unsolicited sync event, client gone?\n");
sync_handler = container_of(display->sync_list.next,
struct wl_sync_handler, link);
if (sync_handler->key == key) {
wl_list_remove(&sync_handler->link);
sync_handler->func(sync_handler->data);
free(sync_handler);
return;
}
wl_list_remove(&handler->link);
handler->func(handler->data);
free(handler);
}
static void
display_handle_frame(void *data,
struct wl_display *display, uint32_t key, uint32_t time)
{
struct wl_frame_handler *handler;
handler = container_of(display->frame_list. next,
struct wl_frame_handler, link);
if (handler->key != key) {
fprintf(stderr, "unsolicited frame event, client gone?\n");
frame_handler = container_of(display->frame_list. next,
struct wl_frame_handler, link);
if (frame_handler->key == key) {
wl_list_remove(&frame_handler->link);
frame_handler->func(frame_handler->data, time);
free(frame_handler);
return;
}
wl_list_remove(&handler->link);
handler->func(handler->data, time);
free(handler);
fprintf(stderr, "unsolicited sync event, client gone?\n");
}
static const struct wl_display_listener display_listener = {
@ -332,8 +325,7 @@ static const struct wl_display_listener display_listener = {
display_handle_no_memory,
display_handle_global,
display_handle_range,
display_handle_sync,
display_handle_frame
display_handle_key
};
WL_EXPORT struct wl_display *

4
wayland/wayland-server.c
View file

@ -305,7 +305,7 @@ static void
display_sync(struct wl_client *client,
struct wl_display *display, uint32_t key)
{
wl_client_post_event(client, &display->base, WL_DISPLAY_SYNC, key);
wl_client_post_event(client, &display->base, WL_DISPLAY_KEY, key, 0);
}
static void
@ -421,7 +421,7 @@ wl_display_post_frame(struct wl_display *display, uint32_t time)
wl_list_for_each_safe(listener, next, &display->frame_list, link) {
wl_client_post_event(listener->client, &display->base,
WL_DISPLAY_FRAME, listener->key, time);
WL_DISPLAY_KEY, listener->key, time);
wl_resource_destroy(&listener->resource, listener->client);
}
}