From e75f483aeb2f48babc97d95b5dea2defa4df7224 Mon Sep 17 00:00:00 2001 From: Tudor Brindus Date: Sun, 24 Jan 2021 21:09:53 -0500 Subject: xwayland/selection: rename Wayland-facing data and helpers Previously, wlr_xwm_selection_transfer.source_fd meant: - the source of data in a Wayland -> X11 copy (good) - the destination of data in a X11 -> Wayland copy (confusing) This made reading through xwayland/selection/incoming.c difficult: in many places, "source" actually means "destination". --- include/xwayland/selection.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/xwayland') diff --git a/include/xwayland/selection.h b/include/xwayland/selection.h index 67a23e81..c0bae533 100644 --- a/include/xwayland/selection.h +++ b/include/xwayland/selection.h @@ -18,8 +18,8 @@ struct wlr_xwm_selection_transfer { bool flush_property_on_delete; bool property_set; struct wl_array source_data; - int source_fd; - struct wl_event_source *source; + int wl_client_fd; + struct wl_event_source *event_source; // when sending to x11 xcb_selection_request_event_t request; @@ -41,9 +41,9 @@ struct wlr_xwm_selection { struct wl_list outgoing; }; -void xwm_selection_transfer_remove_source( +void xwm_selection_transfer_remove_event_source( struct wlr_xwm_selection_transfer *transfer); -void xwm_selection_transfer_close_source_fd( +void xwm_selection_transfer_close_wl_client_fd( struct wlr_xwm_selection_transfer *transfer); void xwm_selection_transfer_destroy_property_reply( struct wlr_xwm_selection_transfer *transfer); -- cgit v1.2.3