mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

gtk-primary-selection: use impl pattern for sources

Browse source
This commit is contained in:
emersion 2018-11-27 20:16:55 +01:00
parent cbe42d1006
commit bfa7f4ee0d
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
4 changed files with 100 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

28
xwayland/selection/incoming.c
View file

@ -137,7 +137,7 @@ static void xwm_selection_get_data(struct wlr_xwm_selection *selection) {
static void source_send(struct wlr_xwm_selection *selection,
struct wl_array *mime_types, struct wl_array *mime_types_atoms,
const char *requested_mime_type, int32_t fd) {
const char *requested_mime_type, int fd) {
struct wlr_xwm *xwm = selection->xwm;
struct wlr_xwm_selection_transfer *transfer = &selection->incoming;
@ -222,17 +222,17 @@ struct x11_primary_selection_source {
struct wl_array mime_types_atoms;
};
static void primary_selection_source_cancel(
struct wlr_gtk_primary_selection_source *wlr_source);
static const struct wlr_gtk_primary_selection_source_impl
primary_selection_source_impl;
bool primary_selection_source_is_xwayland(
struct wlr_gtk_primary_selection_source *wlr_source) {
return wlr_source->cancel == primary_selection_source_cancel;
return wlr_source->impl == &primary_selection_source_impl;
}
static void primary_selection_source_send(
struct wlr_gtk_primary_selection_source *wlr_source, const char *mime_type,
int32_t fd) {
struct wlr_gtk_primary_selection_source *wlr_source,
const char *mime_type, int fd) {
struct x11_primary_selection_source *source =
(struct x11_primary_selection_source *)wlr_source;
struct wlr_xwm_selection *selection = source->selection;
@ -241,15 +241,20 @@ static void primary_selection_source_send(
mime_type, fd);
}
static void primary_selection_source_cancel(
static void primary_selection_source_destroy(
struct wlr_gtk_primary_selection_source *wlr_source) {
struct x11_primary_selection_source *source =
(struct x11_primary_selection_source *)wlr_source;
wlr_gtk_primary_selection_source_finish(&source->base);
wl_array_release(&source->mime_types_atoms);
free(source);
}
static const struct wlr_gtk_primary_selection_source_impl
primary_selection_source_impl = {
.send = primary_selection_source_send,
.destroy = primary_selection_source_destroy,
};
static bool source_get_targets(struct wlr_xwm_selection *selection,
struct wl_array *mime_types, struct wl_array *mime_types_atoms) {
struct wlr_xwm *xwm = selection->xwm;
@ -356,9 +361,8 @@ static void xwm_selection_get_targets(struct wlr_xwm_selection *selection) {
if (source == NULL) {
return;
}
wlr_gtk_primary_selection_source_init(&source->base);
source->base.send = primary_selection_source_send;
source->base.cancel = primary_selection_source_cancel;
wlr_gtk_primary_selection_source_init(&source->base,
&primary_selection_source_impl);
source->selection = selection;
wl_array_init(&source->mime_types_atoms);
@ -369,7 +373,7 @@ static void xwm_selection_get_targets(struct wlr_xwm_selection *selection) {
wlr_gtk_primary_selection_device_manager_set_selection(
xwm->xwayland->gtk_primary_selection, xwm->seat, &source->base);
} else {
source->base.cancel(&source->base);
wlr_gtk_primary_selection_source_destroy(&source->base);
}
} else if (selection == &xwm->dnd_selection) {
// TODO