diff options
author | Tudor Brindus <me@tbrindus.ca> | 2021-01-24 21:09:53 -0500 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2021-01-25 21:02:55 +0100 |
commit | e75f483aeb2f48babc97d95b5dea2defa4df7224 (patch) | |
tree | f43421ff2af3ac86dd7619d08acd7c4b06b14184 /xwayland/selection/selection.c | |
parent | 1b8330d1f8b881a4ed49c3c2fca0cc2667932e2d (diff) |
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".
Diffstat (limited to 'xwayland/selection/selection.c')
-rw-r--r-- | xwayland/selection/selection.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xwayland/selection/selection.c b/xwayland/selection/selection.c index a8cb5df4..d27e0507 100644 --- a/xwayland/selection/selection.c +++ b/xwayland/selection/selection.c @@ -11,19 +11,19 @@ #include "xwayland/selection.h" #include "xwayland/xwm.h" -void xwm_selection_transfer_remove_source( +void xwm_selection_transfer_remove_event_source( struct wlr_xwm_selection_transfer *transfer) { - if (transfer->source != NULL) { - wl_event_source_remove(transfer->source); - transfer->source = NULL; + if (transfer->event_source != NULL) { + wl_event_source_remove(transfer->event_source); + transfer->event_source = NULL; } } -void xwm_selection_transfer_close_source_fd( +void xwm_selection_transfer_close_wl_client_fd( struct wlr_xwm_selection_transfer *transfer) { - if (transfer->source_fd >= 0) { - close(transfer->source_fd); - transfer->source_fd = -1; + if (transfer->wl_client_fd >= 0) { + close(transfer->wl_client_fd); + transfer->wl_client_fd = -1; } } |