diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/rootston/seat.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_data_control_v1.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_data_device.h | 6 | ||||
| -rw-r--r-- | include/wlr/types/wlr_gtk_primary_selection.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_primary_selection.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_seat.h | 26 | ||||
| -rw-r--r-- | include/xwayland/xwm.h | 4 |
7 files changed, 34 insertions, 10 deletions
diff --git a/include/rootston/seat.h b/include/rootston/seat.h index 105ba3aa..4667cd38 100644 --- a/include/rootston/seat.h +++ b/include/rootston/seat.h @@ -38,6 +38,8 @@ struct roots_seat { struct wl_list tablets; struct wl_list tablet_pads; + struct wl_listener request_set_selection; + struct wl_listener request_set_primary_selection; struct wl_listener new_drag_icon; struct wl_listener destroy; }; diff --git a/include/wlr/types/wlr_data_control_v1.h b/include/wlr/types/wlr_data_control_v1.h index 50c96736..7d336344 100644 --- a/include/wlr/types/wlr_data_control_v1.h +++ b/include/wlr/types/wlr_data_control_v1.h @@ -34,7 +34,7 @@ struct wlr_data_control_device_v1 { struct wl_resource *selection_offer_resource; // current selection offer struct wl_listener seat_destroy; - struct wl_listener seat_selection; + struct wl_listener seat_set_selection; }; struct wlr_data_control_manager_v1 *wlr_data_control_manager_v1_create( diff --git a/include/wlr/types/wlr_data_device.h b/include/wlr/types/wlr_data_device.h index 209d917d..4ab181db 100644 --- a/include/wlr/types/wlr_data_device.h +++ b/include/wlr/types/wlr_data_device.h @@ -166,6 +166,12 @@ void wlr_data_device_manager_destroy(struct wlr_data_device_manager *manager); void wlr_seat_client_send_selection(struct wlr_seat_client *seat_client); /** + * Requests a selection to be set for the seat. + */ +void wlr_seat_request_set_selection(struct wlr_seat *seat, + struct wlr_data_source *source, uint32_t serial); + +/** * Sets the current selection for the seat. NULL can be provided to clear it. * This removes the previous one if there was any. In case the selection doesn't * come from a client, wl_display_next_serial() can be used to generate a diff --git a/include/wlr/types/wlr_gtk_primary_selection.h b/include/wlr/types/wlr_gtk_primary_selection.h index 7cf34201..4d7f84af 100644 --- a/include/wlr/types/wlr_gtk_primary_selection.h +++ b/include/wlr/types/wlr_gtk_primary_selection.h @@ -39,7 +39,7 @@ struct wlr_gtk_primary_selection_device { struct wl_listener seat_destroy; struct wl_listener seat_focus_change; - struct wl_listener seat_primary_selection; + struct wl_listener seat_set_primary_selection; void *data; }; diff --git a/include/wlr/types/wlr_primary_selection.h b/include/wlr/types/wlr_primary_selection.h index a2b23574..b1d45b61 100644 --- a/include/wlr/types/wlr_primary_selection.h +++ b/include/wlr/types/wlr_primary_selection.h @@ -48,6 +48,8 @@ void wlr_primary_selection_source_send( struct wlr_primary_selection_source *source, const char *mime_type, int fd); +void wlr_seat_request_set_primary_selection(struct wlr_seat *seat, + struct wlr_primary_selection_source *source, uint32_t serial); /** * Sets the current primary selection for the seat. NULL can be provided to * clear it. This removes the previous one if there was any. In case the diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index 1ad5542e..6bc4af1a 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -23,6 +23,7 @@ struct wlr_seat_client { struct wl_client *client; struct wlr_seat *seat; + struct wl_list link; // lists of wl_resource struct wl_list resources; @@ -34,8 +35,6 @@ struct wlr_seat_client { struct { struct wl_signal destroy; } events; - - struct wl_list link; }; struct wlr_touch_point { @@ -226,13 +225,18 @@ struct wlr_seat { struct wl_signal touch_grab_begin; struct wl_signal touch_grab_end; + // wlr_seat_pointer_request_set_cursor_event struct wl_signal request_set_cursor; - struct wl_signal selection; - struct wl_signal primary_selection; + // wlr_seat_request_set_selection_event + struct wl_signal request_set_selection; + struct wl_signal set_selection; + // wlr_seat_request_set_primary_selection_event + struct wl_signal request_set_primary_selection; + struct wl_signal set_primary_selection; - struct wl_signal start_drag; - struct wl_signal new_drag_icon; + struct wl_signal start_drag; // wlr_drag + struct wl_signal new_drag_icon; // wlr_drag_icon struct wl_signal destroy; } events; @@ -247,6 +251,16 @@ struct wlr_seat_pointer_request_set_cursor_event { int32_t hotspot_x, hotspot_y; }; +struct wlr_seat_request_set_selection_event { + struct wlr_data_source *source; + uint32_t serial; +}; + +struct wlr_seat_request_set_primary_selection_event { + struct wlr_primary_selection_source *source; + uint32_t serial; +}; + struct wlr_seat_pointer_focus_change_event { struct wlr_seat *seat; struct wlr_surface *old_surface, *new_surface; diff --git a/include/xwayland/xwm.h b/include/xwayland/xwm.h index c1be572b..a3bdc48c 100644 --- a/include/xwayland/xwm.h +++ b/include/xwayland/xwm.h @@ -128,8 +128,8 @@ struct wlr_xwm { struct wl_listener compositor_new_surface; struct wl_listener compositor_destroy; - struct wl_listener seat_selection; - struct wl_listener seat_primary_selection; + struct wl_listener seat_set_selection; + struct wl_listener seat_set_primary_selection; struct wl_listener seat_start_drag; struct wl_listener seat_drag_focus; struct wl_listener seat_drag_motion; |