From 44a3863a1770379eb5e53c442d6205c55b049546 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 14 Jun 2013 10:08:00 -0500 Subject: [PATCH] input: Use wl_resource_get accessor functions for resources Signed-off-by: Jason Ekstrand --- src/input.c | 74 ++++++++++++++++++++++++++---------------------------- src/shell.c | 6 ++--- src/text-backend.c | 4 +-- 3 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/input.c b/src/input.c index 9b6d475..e670eb6 100644 --- a/src/input.c +++ b/src/input.c @@ -39,7 +39,7 @@ empty_region(pixman_region32_t *region) static void unbind_resource(struct wl_resource *resource) { - wl_list_remove(&resource->link); + wl_list_remove(wl_resource_get_link(resource)); free(resource); } @@ -143,7 +143,7 @@ default_grab_button(struct weston_pointer_grab *grab, resource = pointer->focus_resource; if (resource) { - display = wl_client_get_display(resource->client); + display = wl_client_get_display(wl_resource_get_client(resource)); serial = wl_display_next_serial(display); wl_pointer_send_button(resource, serial, time, button, state_w); } @@ -175,7 +175,7 @@ default_grab_touch_down(struct weston_touch_grab *grab, uint32_t time, uint32_t serial; if (touch->focus_resource && touch->focus) { - display = wl_client_get_display(touch->focus_resource->client); + display = wl_client_get_display(wl_resource_get_client(touch->focus_resource)); serial = wl_display_next_serial(display); wl_touch_send_down(touch->focus_resource, serial, time, touch->focus->resource, @@ -192,7 +192,7 @@ default_grab_touch_up(struct weston_touch_grab *grab, uint32_t serial; if (touch->focus_resource) { - display = wl_client_get_display(touch->focus_resource->client); + display = wl_client_get_display(wl_resource_get_client(touch->focus_resource)); serial = wl_display_next_serial(display); wl_touch_send_up(touch->focus_resource, serial, time, touch_id); } @@ -227,7 +227,7 @@ default_grab_key(struct weston_keyboard_grab *grab, resource = keyboard->focus_resource; if (resource) { - display = wl_client_get_display(resource->client); + display = wl_client_get_display(wl_resource_get_client(resource)); serial = wl_display_next_serial(display); wl_keyboard_send_key(resource, serial, time, key, state); } @@ -236,17 +236,13 @@ default_grab_key(struct weston_keyboard_grab *grab, static struct wl_resource * find_resource_for_surface(struct wl_list *list, struct weston_surface *surface) { - struct wl_resource *r; - if (!surface) return NULL; - wl_list_for_each(r, list, link) { - if (r->client == wl_resource_get_client(surface->resource)) - return r; - } - - return NULL; + if (!surface->resource) + return NULL; + + return wl_resource_find_for_client(list, wl_resource_get_client(surface->resource)); } static void @@ -408,7 +404,7 @@ weston_touch_destroy(struct weston_touch *touch) static void seat_send_updated_caps(struct weston_seat *seat) { - struct wl_resource *r; + struct wl_list *link; enum wl_seat_capability caps = 0; if (seat->pointer) @@ -418,8 +414,10 @@ seat_send_updated_caps(struct weston_seat *seat) if (seat->touch) caps |= WL_SEAT_CAPABILITY_TOUCH; - wl_list_for_each(r, &seat->base_resource_list, link) - wl_seat_send_capabilities(r, caps); + for (link = seat->base_resource_list.next; + link != &seat->base_resource_list; link = link->next) { + wl_seat_send_capabilities(wl_resource_from_link(link), caps); + } } WL_EXPORT void @@ -434,7 +432,7 @@ weston_pointer_set_focus(struct weston_pointer *pointer, resource = pointer->focus_resource; if (resource && pointer->focus != surface) { - display = wl_client_get_display(resource->client); + display = wl_client_get_display(wl_resource_get_client(resource)); serial = wl_display_next_serial(display); wl_pointer_send_leave(resource, serial, pointer->focus->resource); @@ -446,7 +444,7 @@ weston_pointer_set_focus(struct weston_pointer *pointer, if (resource && (pointer->focus != surface || pointer->focus_resource != resource)) { - display = wl_client_get_display(resource->client); + display = wl_client_get_display(wl_resource_get_client(resource)); serial = wl_display_next_serial(display); if (kbd) { kr = find_resource_for_surface(&kbd->resource_list, @@ -462,8 +460,8 @@ weston_pointer_set_focus(struct weston_pointer *pointer, } wl_pointer_send_enter(resource, serial, surface->resource, sx, sy); - wl_signal_add(&resource->destroy_signal, - &pointer->focus_listener); + wl_resource_add_destroy_listener(resource, + &pointer->focus_listener); pointer->focus_serial = serial; } @@ -482,7 +480,7 @@ weston_keyboard_set_focus(struct weston_keyboard *keyboard, if (keyboard->focus_resource && keyboard->focus != surface) { resource = keyboard->focus_resource; - display = wl_client_get_display(resource->client); + display = wl_client_get_display(wl_resource_get_client(resource)); serial = wl_display_next_serial(display); wl_keyboard_send_leave(resource, serial, keyboard->focus->resource); @@ -494,7 +492,7 @@ weston_keyboard_set_focus(struct weston_keyboard *keyboard, if (resource && (keyboard->focus != surface || keyboard->focus_resource != resource)) { - display = wl_client_get_display(resource->client); + display = wl_client_get_display(wl_resource_get_client(resource)); serial = wl_display_next_serial(display); wl_keyboard_send_modifiers(resource, serial, keyboard->modifiers.mods_depressed, @@ -503,8 +501,8 @@ weston_keyboard_set_focus(struct weston_keyboard *keyboard, keyboard->modifiers.group); wl_keyboard_send_enter(resource, serial, surface->resource, &keyboard->keys); - wl_signal_add(&resource->destroy_signal, - &keyboard->focus_listener); + wl_resource_add_destroy_listener(resource, + &keyboard->focus_listener); keyboard->focus_serial = serial; } @@ -998,8 +996,8 @@ touch_set_focus(struct weston_seat *seat, struct weston_surface *surface) seat->touch->focus = surface; seat->touch->focus_resource = resource; - wl_signal_add(&resource->destroy_signal, - &seat->touch->focus_listener); + wl_resource_add_destroy_listener(resource, + &seat->touch->focus_listener); } } @@ -1104,7 +1102,7 @@ pointer_set_cursor(struct wl_client *client, struct wl_resource *resource, uint32_t serial, struct wl_resource *surface_resource, int32_t x, int32_t y) { - struct weston_pointer *pointer = resource->data; + struct weston_pointer *pointer = wl_resource_get_user_data(resource); struct weston_surface *surface = NULL; if (surface_resource) @@ -1155,7 +1153,7 @@ static void seat_get_pointer(struct wl_client *client, struct wl_resource *resource, uint32_t id) { - struct weston_seat *seat = resource->data; + struct weston_seat *seat = wl_resource_get_user_data(resource); struct wl_resource *cr; if (!seat->pointer) @@ -1163,8 +1161,8 @@ seat_get_pointer(struct wl_client *client, struct wl_resource *resource, cr = wl_client_add_object(client, &wl_pointer_interface, &pointer_interface, id, seat->pointer); - wl_list_insert(&seat->pointer->resource_list, &cr->link); - cr->destroy = unbind_resource; + wl_list_insert(&seat->pointer->resource_list, wl_resource_get_link(cr)); + wl_resource_set_destructor(cr, unbind_resource); if (seat->pointer->focus && wl_resource_get_client(seat->pointer->focus->resource) == client) { @@ -1188,7 +1186,7 @@ static void seat_get_keyboard(struct wl_client *client, struct wl_resource *resource, uint32_t id) { - struct weston_seat *seat = resource->data; + struct weston_seat *seat = wl_resource_get_user_data(resource); struct wl_resource *cr; if (!seat->keyboard) @@ -1196,8 +1194,8 @@ seat_get_keyboard(struct wl_client *client, struct wl_resource *resource, cr = wl_client_add_object(client, &wl_keyboard_interface, NULL, id, seat); - wl_list_insert(&seat->keyboard->resource_list, &cr->link); - cr->destroy = unbind_resource; + wl_list_insert(&seat->keyboard->resource_list, wl_resource_get_link(cr)); + wl_resource_set_destructor(cr, unbind_resource); wl_keyboard_send_keymap(cr, WL_KEYBOARD_KEYMAP_FORMAT_XKB_V1, seat->xkb_info.keymap_fd, @@ -1215,15 +1213,15 @@ static void seat_get_touch(struct wl_client *client, struct wl_resource *resource, uint32_t id) { - struct weston_seat *seat = resource->data; + struct weston_seat *seat = wl_resource_get_user_data(resource); struct wl_resource *cr; if (!seat->touch) return; cr = wl_client_add_object(client, &wl_touch_interface, NULL, id, seat); - wl_list_insert(&seat->touch->resource_list, &cr->link); - cr->destroy = unbind_resource; + wl_list_insert(&seat->touch->resource_list, wl_resource_get_link(cr)); + wl_resource_set_destructor(cr, unbind_resource); } static const struct wl_seat_interface seat_interface = { @@ -1241,8 +1239,8 @@ bind_seat(struct wl_client *client, void *data, uint32_t version, uint32_t id) resource = wl_client_add_object(client, &wl_seat_interface, &seat_interface, id, data); - wl_list_insert(&seat->base_resource_list, &resource->link); - resource->destroy = unbind_resource; + wl_list_insert(&seat->base_resource_list, wl_resource_get_link(resource)); + wl_resource_set_destructor(resource, unbind_resource); if (seat->pointer) caps |= WL_SEAT_CAPABILITY_POINTER; diff --git a/src/shell.c b/src/shell.c index 36b23d4..7660f15 100644 --- a/src/shell.c +++ b/src/shell.c @@ -1110,7 +1110,7 @@ static void shell_surface_move(struct wl_client *client, struct wl_resource *resource, struct wl_resource *seat_resource, uint32_t serial) { - struct weston_seat *seat = seat_resource->data; + struct weston_seat *seat = wl_resource_get_user_data(seat_resource); struct shell_surface *shsurf = wl_resource_get_user_data(resource); struct weston_surface *surface; @@ -1270,7 +1270,7 @@ shell_surface_resize(struct wl_client *client, struct wl_resource *resource, struct wl_resource *seat_resource, uint32_t serial, uint32_t edges) { - struct weston_seat *seat = seat_resource->data; + struct weston_seat *seat = wl_resource_get_user_data(seat_resource); struct shell_surface *shsurf = wl_resource_get_user_data(resource); struct weston_surface *surface; @@ -2171,7 +2171,7 @@ shell_surface_set_popup(struct wl_client *client, shsurf->type = SHELL_SURFACE_POPUP; shsurf->parent = wl_resource_get_user_data(parent_resource); - shsurf->popup.shseat = get_shell_seat(seat_resource->data); + shsurf->popup.shseat = get_shell_seat(wl_resource_get_user_data(seat_resource)); shsurf->popup.serial = serial; shsurf->popup.x = x; shsurf->popup.y = y; diff --git a/src/text-backend.c b/src/text-backend.c index 55d4485..cc7d65d 100644 --- a/src/text-backend.c +++ b/src/text-backend.c @@ -170,7 +170,7 @@ text_input_activate(struct wl_client *client, struct wl_resource *surface) { struct text_input *text_input = wl_resource_get_user_data(resource); - struct weston_seat *weston_seat = seat->data; + struct weston_seat *weston_seat = wl_resource_get_user_data(seat); struct input_method *input_method = weston_seat->input_method; struct text_input *old = weston_seat->input_method->model; struct weston_compositor *ec = text_input->ec; @@ -205,7 +205,7 @@ text_input_deactivate(struct wl_client *client, struct wl_resource *seat) { struct text_input *text_input = wl_resource_get_user_data(resource); - struct weston_seat *weston_seat = seat->data; + struct weston_seat *weston_seat = wl_resource_get_user_data(seat); deactivate_text_input(text_input, weston_seat->input_method); -- 2.7.4