mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input: Remove wl_seat destroy signal

Browse Source 
We already have one on weston_seat.
This commit is contained in:
Kristian Høgsberg 2013-05-06 22:27:40 -04:00
parent 4a2a274350
commit 4912454ba4
5 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/clipboard.c
View File

@ -270,7 +270,7 @@ clipboard_create(struct weston_seat *seat)
wl_signal_add(&seat->seat.selection_signal, wl_signal_add(&seat->seat.selection_signal,
&clipboard->selection_listener); &clipboard->selection_listener);
wl_signal_add(&seat->seat.destroy_signal, wl_signal_add(&seat->destroy_signal,
&clipboard->destroy_listener); &clipboard->destroy_listener);
return clipboard; return clipboard;

1
src/compositor.h
View File

@ -330,7 +330,6 @@ struct weston_touch {
struct wl_seat { struct wl_seat {
struct wl_list base_resource_list; struct wl_list base_resource_list;
struct wl_signal destroy_signal;
struct weston_pointer *pointer; struct weston_pointer *pointer;
struct weston_keyboard *keyboard; struct weston_keyboard *keyboard;

4
src/input.c
View File

@ -1529,8 +1529,6 @@ weston_seat_init(struct weston_seat *seat, struct weston_compositor *ec)
{ {
memset(seat, 0, sizeof *seat); memset(seat, 0, sizeof *seat);
wl_signal_init(&seat->seat.destroy_signal);
seat->seat.selection_data_source = NULL; seat->seat.selection_data_source = NULL;
wl_list_init(&seat->seat.base_resource_list); wl_list_init(&seat->seat.base_resource_list);
wl_signal_init(&seat->seat.selection_signal); wl_signal_init(&seat->seat.selection_signal);
@ -1581,8 +1579,6 @@ weston_seat_release(struct weston_seat *seat)
xkb_state_unref(seat->xkb_state.state); xkb_state_unref(seat->xkb_state.state);
xkb_info_destroy(&seat->xkb_info); xkb_info_destroy(&seat->xkb_info);
wl_signal_emit(&seat->seat.destroy_signal, seat);
if (seat->seat.pointer) if (seat->seat.pointer)
weston_pointer_release(seat->seat.pointer); weston_pointer_release(seat->seat.pointer);
if (seat->seat.keyboard) if (seat->seat.keyboard)

2
src/shell.c
View File

@ -471,7 +471,7 @@ focus_state_create(struct weston_seat *seat, struct workspace *ws)
state->seat_destroy_listener.notify = focus_state_seat_destroy; state->seat_destroy_listener.notify = focus_state_seat_destroy;
state->surface_destroy_listener.notify = focus_state_surface_destroy; state->surface_destroy_listener.notify = focus_state_surface_destroy;
wl_signal_add(&seat->seat.destroy_signal, wl_signal_add(&seat->destroy_signal,
&state->seat_destroy_listener); &state->seat_destroy_listener);
wl_list_init(&state->surface_destroy_listener.link); wl_list_init(&state->surface_destroy_listener.link);

2
src/text-backend.c
View File

@ -874,7 +874,7 @@ handle_seat_created(struct wl_listener *listener,
input_method, bind_input_method); input_method, bind_input_method);
input_method->destroy_listener.notify = input_method_notifier_destroy; input_method->destroy_listener.notify = input_method_notifier_destroy;
wl_signal_add(&seat->seat.destroy_signal, &input_method->destroy_listener); wl_signal_add(&seat->destroy_signal, &input_method->destroy_listener);
seat->input_method = input_method; seat->input_method = input_method;