aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/wlr/types/meson.build1
-rw-r--r--include/wlr/types/wlr_gtk_primary_selection.h46
-rw-r--r--include/wlr/types/wlr_primary_selection.h54
-rw-r--r--include/wlr/types/wlr_seat.h15
-rw-r--r--include/wlr/xwayland.h4
-rw-r--r--include/xwayland/selection.h4
-rw-r--r--meson.build2
-rw-r--r--rootston/desktop.c5
-rw-r--r--types/meson.build3
-rw-r--r--types/seat/wlr_seat.c16
-rw-r--r--types/seat/wlr_seat_keyboard.c8
-rw-r--r--types/wlr_gtk_primary_selection.c409
-rw-r--r--types/wlr_primary_selection.c69
-rw-r--r--xwayland/selection/incoming.c44
-rw-r--r--xwayland/selection/outgoing.c10
-rw-r--r--xwayland/selection/selection.c14
16 files changed, 443 insertions, 261 deletions
diff --git a/include/wlr/types/meson.build b/include/wlr/types/meson.build
index df611970..491d4a50 100644
--- a/include/wlr/types/meson.build
+++ b/include/wlr/types/meson.build
@@ -23,6 +23,7 @@ install_headers(
'wlr_output.h',
'wlr_pointer.h',
'wlr_presentation_time.h',
+ 'wlr_primary_selection.h',
'wlr_region.h',
'wlr_screencopy_v1.h',
'wlr_screenshooter.h',
diff --git a/include/wlr/types/wlr_gtk_primary_selection.h b/include/wlr/types/wlr_gtk_primary_selection.h
index f3410f69..7cf34201 100644
--- a/include/wlr/types/wlr_gtk_primary_selection.h
+++ b/include/wlr/types/wlr_gtk_primary_selection.h
@@ -14,7 +14,8 @@
struct wlr_gtk_primary_selection_device_manager {
struct wl_global *global;
- struct wl_list resources;
+ struct wl_list resources; // wl_resource_get_link
+ struct wl_list devices; // wlr_gtk_primary_selection_device::link
struct wl_listener display_destroy;
@@ -25,30 +26,20 @@ struct wlr_gtk_primary_selection_device_manager {
void *data;
};
-struct wlr_gtk_primary_selection_source {
- // source metadata
- struct wl_array mime_types;
-
- // source implementation
- void (*send)(struct wlr_gtk_primary_selection_source *source,
- const char *mime_type, int32_t fd);
- void (*cancel)(struct wlr_gtk_primary_selection_source *source);
-
- // source status
- struct wlr_seat_client *seat_client;
-
- struct {
- struct wl_signal destroy;
- } events;
-
- void *data;
-};
+/**
+ * A device is a per-seat object used to set and get the current selection.
+ */
+struct wlr_gtk_primary_selection_device {
+ struct wlr_gtk_primary_selection_device_manager *manager;
+ struct wlr_seat *seat;
+ struct wl_list link; // wlr_gtk_primary_selection_device_manager::devices
+ struct wl_list resources; // wl_resource_get_link
-struct wlr_gtk_primary_selection_offer {
- struct wl_resource *resource;
- struct wlr_gtk_primary_selection_source *source;
+ struct wl_list offers; // wl_resource_get_link
- struct wl_listener source_destroy;
+ struct wl_listener seat_destroy;
+ struct wl_listener seat_focus_change;
+ struct wl_listener seat_primary_selection;
void *data;
};
@@ -58,13 +49,4 @@ struct wlr_gtk_primary_selection_device_manager *
void wlr_gtk_primary_selection_device_manager_destroy(
struct wlr_gtk_primary_selection_device_manager *manager);
-void wlr_seat_client_send_gtk_primary_selection(struct wlr_seat_client *seat_client);
-void wlr_seat_set_gtk_primary_selection(struct wlr_seat *seat,
- struct wlr_gtk_primary_selection_source *source, uint32_t serial);
-
-void wlr_gtk_primary_selection_source_init(
- struct wlr_gtk_primary_selection_source *source);
-void wlr_gtk_primary_selection_source_finish(
- struct wlr_gtk_primary_selection_source *source);
-
#endif
diff --git a/include/wlr/types/wlr_primary_selection.h b/include/wlr/types/wlr_primary_selection.h
new file mode 100644
index 00000000..9be61acc
--- /dev/null
+++ b/include/wlr/types/wlr_primary_selection.h
@@ -0,0 +1,54 @@
+/*
+ * This an unstable interface of wlroots. No guarantees are made regarding the
+ * future consistency of this API.
+ */
+#ifndef WLR_USE_UNSTABLE
+#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
+#endif
+
+#ifndef WLR_TYPES_WLR_PRIMARY_SELECTION_H
+#define WLR_TYPES_WLR_PRIMARY_SELECTION_H
+
+#include <wayland-server.h>
+#include <wlr/types/wlr_seat.h>
+
+struct wlr_primary_selection_source;
+
+/**
+ * A data source implementation. Only the `send` function is mandatory.
+ */
+struct wlr_primary_selection_source_impl {
+ void (*send)(struct wlr_primary_selection_source *source,
+ const char *mime_type, int fd);
+ void (*destroy)(struct wlr_primary_selection_source *source);
+};
+
+/**
+ * A source is the sending side of a selection.
+ */
+struct wlr_primary_selection_source {
+ const struct wlr_primary_selection_source_impl *impl;
+
+ // source metadata
+ struct wl_array mime_types;
+
+ struct {
+ struct wl_signal destroy;
+ } events;
+
+ void *data;
+};
+
+void wlr_primary_selection_source_init(
+ struct wlr_primary_selection_source *source,
+ const struct wlr_primary_selection_source_impl *impl);
+void wlr_primary_selection_source_destroy(
+ struct wlr_primary_selection_source *source);
+void wlr_primary_selection_source_send(
+ struct wlr_primary_selection_source *source, const char *mime_type,
+ int fd);
+
+void wlr_seat_set_primary_selection(struct wlr_seat *seat,
+ struct wlr_primary_selection_source *source);
+
+#endif
diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h
index 9670e6a5..942a3420 100644
--- a/include/wlr/types/wlr_seat.h
+++ b/include/wlr/types/wlr_seat.h
@@ -30,7 +30,6 @@ struct wlr_seat_client {
struct wl_list keyboards;
struct wl_list touches;
struct wl_list data_devices;
- struct wl_list primary_selection_devices;
struct {
struct wl_signal destroy;
@@ -168,6 +167,10 @@ struct wlr_seat_keyboard_state {
struct wlr_seat_keyboard_grab *grab;
struct wlr_seat_keyboard_grab *default_grab;
+
+ struct {
+ struct wl_signal focus_change; // wlr_seat_keyboard_focus_change_event
+ } events;
};
struct wlr_seat_touch_state {
@@ -181,6 +184,8 @@ struct wlr_seat_touch_state {
struct wlr_seat_touch_grab *default_grab;
};
+struct wlr_primary_selection_source;
+
struct wlr_seat {
struct wl_global *global;
struct wl_display *display;
@@ -194,8 +199,7 @@ struct wlr_seat {
struct wlr_data_source *selection_source;
uint32_t selection_serial;
- struct wlr_gtk_primary_selection_source *primary_selection_source;
- uint32_t primary_selection_serial;
+ struct wlr_primary_selection_source *primary_selection_source;
// `drag` goes away before `drag_source`, when the implicit grab ends
struct wlr_drag *drag;
@@ -248,6 +252,11 @@ struct wlr_seat_pointer_focus_change_event {
double sx, sy;
};
+struct wlr_seat_keyboard_focus_change_event {
+ struct wlr_seat *seat;
+ struct wlr_surface *old_surface, *new_surface;
+};
+
/**
* Allocates a new wlr_seat and adds a wl_seat global to the display.
*/
diff --git a/include/wlr/xwayland.h b/include/wlr/xwayland.h
index 8247aa15..40cc8848 100644
--- a/include/wlr/xwayland.h
+++ b/include/wlr/xwayland.h
@@ -18,6 +18,7 @@
struct wlr_xwm;
struct wlr_xwayland_cursor;
+struct wlr_gtk_primary_selection_device_manager;
struct wlr_xwayland {
pid_t pid;
@@ -42,13 +43,14 @@ struct wlr_xwayland {
struct wl_display *wl_display;
struct wlr_compositor *compositor;
struct wlr_seat *seat;
- struct wl_listener seat_destroy;
struct {
struct wl_signal ready;
struct wl_signal new_surface;
} events;
+ struct wl_listener seat_destroy;
+
/**
* Add a custom event handler to xwayland. Return 1 if the event was
* handled or 0 to use the default wlr-xwayland handler. wlr-xwayland will
diff --git a/include/xwayland/selection.h b/include/xwayland/selection.h
index 6529e9eb..85201461 100644
--- a/include/xwayland/selection.h
+++ b/include/xwayland/selection.h
@@ -7,6 +7,8 @@
#define XDND_VERSION 5
+struct wlr_primary_selection_source;
+
struct wlr_xwm_selection;
struct wlr_xwm_selection_transfer {
@@ -62,7 +64,7 @@ int xwm_handle_xfixes_selection_notify(struct wlr_xwm *xwm,
xcb_xfixes_selection_notify_event_t *event);
bool data_source_is_xwayland(struct wlr_data_source *wlr_source);
bool primary_selection_source_is_xwayland(
- struct wlr_gtk_primary_selection_source *wlr_source);
+ struct wlr_primary_selection_source *wlr_source);
void xwm_seat_handle_start_drag(struct wlr_xwm *xwm, struct wlr_drag *drag);
diff --git a/meson.build b/meson.build
index 3d96d052..df1dbb84 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
project(
'wlroots',
'c',
- version: '0.1.0',
+ version: '0.2.0',
license: 'MIT',
meson_version: '>=0.48.0',
default_options: [
diff --git a/rootston/desktop.c b/rootston/desktop.c
index 65a3509a..9b5291a3 100644
--- a/rootston/desktop.c
+++ b/rootston/desktop.c
@@ -955,11 +955,10 @@ struct roots_desktop *desktop_create(struct roots_server *server,
wlr_server_decoration_manager_set_default_mode(
desktop->server_decoration_manager,
WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT);
- desktop->primary_selection_device_manager =
- wlr_gtk_primary_selection_device_manager_create(server->wl_display);
desktop->idle = wlr_idle_create(server->wl_display);
desktop->idle_inhibit = wlr_idle_inhibit_v1_create(server->wl_display);
-
+ desktop->primary_selection_device_manager =
+ wlr_gtk_primary_selection_device_manager_create(server->wl_display);
desktop->input_inhibit =
wlr_input_inhibit_manager_create(server->wl_display);
desktop->input_inhibit_activate.notify = input_inhibit_activate;
diff --git a/types/meson.build b/types/meson.build
index f7653e55..03e5fcba 100644
--- a/types/meson.build
+++ b/types/meson.build
@@ -30,6 +30,7 @@ lib_wlr_types = static_library(
'wlr_export_dmabuf_v1.c',
'wlr_gamma_control_v1.c',
'wlr_gamma_control.c',
+ 'wlr_gtk_primary_selection.c',
'wlr_idle_inhibit_v1.c',
'wlr_idle.c',
'wlr_input_device.c',
@@ -46,7 +47,7 @@ lib_wlr_types = static_library(
'wlr_pointer_constraints_v1.c',
'wlr_pointer.c',
'wlr_presentation_time.c',
- 'wlr_gtk_primary_selection.c',
+ 'wlr_primary_selection.c',
'wlr_region.c',
'wlr_screencopy_v1.c',
'wlr_screenshooter.c',
diff --git a/types/seat/wlr_seat.c b/types/seat/wlr_seat.c
index 537a3bae..8b1d67fd 100644
--- a/types/seat/wlr_seat.c
+++ b/types/seat/wlr_seat.c
@@ -6,7 +6,7 @@
#include <wayland-server.h>
#include <wlr/types/wlr_data_device.h>
#include <wlr/types/wlr_input_device.h>
-#include <wlr/types/wlr_gtk_primary_selection.h>
+#include <wlr/types/wlr_primary_selection.h>
#include <wlr/types/wlr_seat.h>
#include <wlr/util/log.h>
#include "types/wlr_seat.h"
@@ -88,10 +88,6 @@ static void seat_client_handle_resource_destroy(
wl_resource_for_each_safe(resource, tmp, &client->data_devices) {
wl_resource_destroy(resource);
}
- wl_resource_for_each_safe(resource, tmp,
- &client->primary_selection_devices) {
- wl_resource_destroy(resource);
- }
wl_list_remove(&client->link);
free(client);
@@ -138,7 +134,6 @@ static void seat_handle_bind(struct wl_client *client, void *_wlr_seat,
wl_list_init(&seat_client->keyboards);
wl_list_init(&seat_client->touches);
wl_list_init(&seat_client->data_devices);
- wl_list_init(&seat_client->primary_selection_devices);
wl_signal_init(&seat_client->events.destroy);
wl_list_insert(&wlr_seat->clients, &seat_client->link);
@@ -167,11 +162,8 @@ void wlr_seat_destroy(struct wlr_seat *seat) {
wlr_data_source_cancel(seat->selection_source);
seat->selection_source = NULL;
}
- if (seat->primary_selection_source) {
- wl_list_remove(&seat->primary_selection_source_destroy.link);
- seat->primary_selection_source->cancel(seat->primary_selection_source);
- seat->primary_selection_source = NULL;
- }
+
+ wlr_seat_set_primary_selection(seat, NULL);
struct wlr_seat_client *client, *tmp;
wl_list_for_each_safe(client, tmp, &seat->clients, link) {
@@ -243,6 +235,8 @@ struct wlr_seat *wlr_seat_create(struct wl_display *display, const char *name) {
seat->keyboard_state.seat = seat;
wl_list_init(&seat->keyboard_state.surface_destroy.link);
+ wl_signal_init(&seat->keyboard_state.events.focus_change);
+
// touch state
struct wlr_seat_touch_grab *touch_grab =
calloc(1, sizeof(struct wlr_seat_touch_grab));
diff --git a/types/seat/wlr_seat_keyboard.c b/types/seat/wlr_seat_keyboard.c
index 1269c972..96176b6d 100644
--- a/types/seat/wlr_seat_keyboard.c
+++ b/types/seat/wlr_seat_keyboard.c
@@ -273,7 +273,6 @@ void wlr_seat_keyboard_enter(struct wlr_seat *seat,
wl_array_release(&keys);
wlr_seat_client_send_selection(client);
- wlr_seat_client_send_gtk_primary_selection(client);
}
// reinitialize the focus destroy events
@@ -294,6 +293,13 @@ void wlr_seat_keyboard_enter(struct wlr_seat *seat,
// as it targets seat->keyboard_state.focused_client
wlr_seat_keyboard_send_modifiers(seat, modifiers);
}
+
+ struct wlr_seat_keyboard_focus_change_event event = {
+ .seat = seat,
+ .old_surface = focused_surface,
+ .new_surface = surface,
+ };
+ wlr_signal_emit_safe(&seat->keyboard_state.events.focus_change, &event);
}
void wlr_seat_keyboard_notify_enter(struct wlr_seat *seat,
diff --git a/types/wlr_gtk_primary_selection.c b/types/wlr_gtk_primary_selection.c
index 5493a8c0..5f349154 100644
--- a/types/wlr_gtk_primary_selection.c
+++ b/types/wlr_gtk_primary_selection.c
@@ -4,6 +4,7 @@
#include <string.h>
#include <unistd.h>
#include <wlr/types/wlr_gtk_primary_selection.h>
+#include <wlr/types/wlr_primary_selection.h>
#include <wlr/types/wlr_seat.h>
#include <wlr/util/log.h>
#include "gtk-primary-selection-protocol.h"
@@ -13,7 +14,7 @@
static const struct gtk_primary_selection_offer_interface offer_impl;
-static struct wlr_gtk_primary_selection_offer *offer_from_resource(
+static struct wlr_gtk_primary_selection_device *device_from_offer_resource(
struct wl_resource *resource) {
assert(wl_resource_instance_of(resource,
&gtk_primary_selection_offer_interface, &offer_impl));
@@ -22,13 +23,15 @@ static struct wlr_gtk_primary_selection_offer *offer_from_resource(
static void offer_handle_receive(struct wl_client *client,
struct wl_resource *resource, const char *mime_type, int32_t fd) {
- struct wlr_gtk_primary_selection_offer *offer = offer_from_resource(resource);
- if (offer == NULL) {
+ struct wlr_gtk_primary_selection_device *device =
+ device_from_offer_resource(resource);
+ if (device == NULL || device->seat->primary_selection_source == NULL) {
close(fd);
return;
}
- offer->source->send(offer->source, mime_type, fd);
+ wlr_primary_selection_source_send(device->seat->primary_selection_source,
+ mime_type, fd);
}
static void offer_handle_destroy(struct wl_client *client,
@@ -41,85 +44,83 @@ static const struct gtk_primary_selection_offer_interface offer_impl = {
.destroy = offer_handle_destroy,
};
-static void offer_destroy(struct wlr_gtk_primary_selection_offer *offer) {
- if (offer == NULL) {
- return;
- }
- // Make resource inert
- wl_resource_set_user_data(offer->resource, NULL);
- wl_list_remove(&offer->source_destroy.link);
- free(offer);
-}
-
static void offer_handle_resource_destroy(struct wl_resource *resource) {
- struct wlr_gtk_primary_selection_offer *offer = offer_from_resource(resource);
- offer_destroy(offer);
-}
-
-static void offer_handle_source_destroy(struct wl_listener *listener,
- void *data) {
- struct wlr_gtk_primary_selection_offer *offer =
- wl_container_of(listener, offer, source_destroy);
- offer_destroy(offer);
+ wl_list_remove(wl_resource_get_link(resource));
}
+static struct wlr_gtk_primary_selection_device *device_from_resource(
+ struct wl_resource *resource);
-struct client_data_source {
- struct wlr_gtk_primary_selection_source source;
- struct wl_resource *resource;
-};
-
-static void client_source_send(struct wlr_gtk_primary_selection_source *wlr_source,
- const char *mime_type, int32_t fd) {
- struct client_data_source *source = (struct client_data_source *)wlr_source;
- gtk_primary_selection_source_send_send(source->resource, mime_type, fd);
- close(fd);
-}
-
-static void client_source_cancel(
- struct wlr_gtk_primary_selection_source *wlr_source) {
- struct client_data_source *source = (struct client_data_source *)wlr_source;
- gtk_primary_selection_source_send_cancelled(source->resource);
-}
-
-static void source_send_offer(struct wlr_gtk_primary_selection_source *source,
- struct wl_resource *device_resource) {
- struct wlr_gtk_primary_selection_offer *offer =
- calloc(1, sizeof(struct wlr_gtk_primary_selection_offer));
- if (offer == NULL) {
- wl_resource_post_no_memory(device_resource);
- return;
- }
+static void create_offer(struct wl_resource *device_resource,
+ struct wlr_primary_selection_source *source) {
+ struct wlr_gtk_primary_selection_device *device =
+ device_from_resource(device_resource);
+ assert(device != NULL);
struct wl_client *client = wl_resource_get_client(device_resource);
uint32_t version = wl_resource_get_version(device_resource);
- offer->resource = wl_resource_create(client,
+ struct wl_resource *resource = wl_resource_create(client,
&gtk_primary_selection_offer_interface, version, 0);
- if (offer->resource == NULL) {
- free(offer);
+ if (resource == NULL) {
wl_resource_post_no_memory(device_resource);
return;
}
- wl_resource_set_implementation(offer->resource, &offer_impl, offer,
+ wl_resource_set_implementation(resource, &offer_impl, device,
offer_handle_resource_destroy);
- offer->source_destroy.notify = offer_handle_source_destroy;
- wl_signal_add(&source->events.destroy, &offer->source_destroy);
+ wl_list_insert(&device->offers, wl_resource_get_link(resource));
- gtk_primary_selection_device_send_data_offer(device_resource,
- offer->resource);
+ gtk_primary_selection_device_send_data_offer(device_resource, resource);
char **p;
wl_array_for_each(p, &source->mime_types) {
- gtk_primary_selection_offer_send_offer(offer->resource, *p);
+ gtk_primary_selection_offer_send_offer(resource, *p);
}
- offer->source = source;
+ gtk_primary_selection_device_send_selection(device_resource, resource);
+}
+
+static void destroy_offer(struct wl_resource *resource) {
+ if (device_from_offer_resource(resource) == NULL) {
+ return;
+ }
- gtk_primary_selection_device_send_selection(device_resource,
- offer->resource);
+ // Make the offer inert
+ wl_resource_set_user_data(resource, NULL);
+
+ struct wl_list *link = wl_resource_get_link(resource);
+ wl_list_remove(link);
+ wl_list_init(link);
}
+
+struct client_data_source {
+ struct wlr_primary_selection_source source;
+ struct wl_resource *resource;
+};
+
+static void client_source_send(
+ struct wlr_primary_selection_source *wlr_source,
+ const char *mime_type, int fd) {
+ struct client_data_source *source = (struct client_data_source *)wlr_source;
+ gtk_primary_selection_source_send_send(source->resource, mime_type, fd);
+ close(fd);
+}
+
+static void client_source_destroy(
+ struct wlr_primary_selection_source *wlr_source) {
+ struct client_data_source *source = (struct client_data_source *)wlr_source;
+ gtk_primary_selection_source_send_cancelled(source->resource);
+ // Make the source resource inert
+ wl_resource_set_user_data(source->resource, NULL);
+ free(source);
+}
+
+static const struct wlr_primary_selection_source_impl client_source_impl = {
+ .send = client_source_send,
+ .destroy = client_source_destroy,
+};
+
static const struct gtk_primary_selection_source_interface source_impl;
static struct client_data_source *client_data_source_from_resource(
@@ -133,17 +134,24 @@ static void source_handle_offer(struct wl_client *client,
struct wl_resource *resource, const char *mime_type) {
struct client_data_source *source =
client_data_source_from_resource(resource);
+ if (source == NULL) {
+ return;
+ }
- char **p = wl_array_add(&source->source.mime_types, sizeof(*p));
- if (p) {
- *p = strdup(mime_type);
+ char *dup_mime_type = strdup(mime_type);
+ if (dup_mime_type == NULL) {
+ wl_resource_post_no_memory(resource);
+ return;
}
- if (p == NULL || *p == NULL) {
- if (p) {
- source->source.mime_types.size -= sizeof(*p);
- }
+
+ char **p = wl_array_add(&source->source.mime_types, sizeof(*p));
+ if (p == NULL) {
+ free(dup_mime_type);
wl_resource_post_no_memory(resource);
+ return;
}
+
+ *p = dup_mime_type;
}
static void source_handle_destroy(struct wl_client *client,
@@ -159,89 +167,16 @@ static const struct gtk_primary_selection_source_interface source_impl = {
static void source_resource_handle_destroy(struct wl_resource *resource) {
struct client_data_source *source =
client_data_source_from_resource(resource);
- wlr_gtk_primary_selection_source_finish(&source->source);
- free(source);
-}
-
-
-void wlr_seat_client_send_gtk_primary_selection(
- struct wlr_seat_client *seat_client) {
- if (wl_list_empty(&seat_client->primary_selection_devices)) {
- return;
- }
-
- struct wlr_gtk_primary_selection_source *source =
- seat_client->seat->primary_selection_source;
- struct wl_resource *resource;
- wl_resource_for_each(resource, &seat_client->primary_selection_devices) {
- if (source) {
- source_send_offer(source, resource);
- } else {
- gtk_primary_selection_device_send_selection(resource, NULL);
- }
- }
-}
-
-static void seat_client_primary_selection_source_destroy(
- struct wl_listener *listener, void *data) {
- struct wlr_seat *seat =
- wl_container_of(listener, seat, primary_selection_source_destroy);
- struct wlr_seat_client *seat_client = seat->keyboard_state.focused_client;
-
- if (seat_client && seat->keyboard_state.focused_surface) {
- struct wl_resource *resource;
- wl_resource_for_each(resource, &seat_client->primary_selection_devices) {
- gtk_primary_selection_device_send_selection(resource, NULL);
- }
- }
-
- seat->primary_selection_source = NULL;
-
- wlr_signal_emit_safe(&seat->events.primary_selection, seat);
-}
-
-void wlr_seat_set_gtk_primary_selection(struct wlr_seat *seat,
- struct wlr_gtk_primary_selection_source *source, uint32_t serial) {
- if (source) {
- assert(source->send);
- assert(source->cancel);
- }
-
- if (seat->primary_selection_source &&
- seat->primary_selection_serial - serial < UINT32_MAX / 2) {
+ if (source == NULL) {
return;
}
-
- // TODO: make all offers inert
- if (seat->primary_selection_source) {
- wl_list_remove(&seat->primary_selection_source_destroy.link);
- seat->primary_selection_source->cancel(seat->primary_selection_source);
- seat->primary_selection_source = NULL;
- }
-
- seat->primary_selection_source = source;
- seat->primary_selection_serial = serial;
-
- struct wlr_seat_client *focused_client =
- seat->keyboard_state.focused_client;
- if (focused_client) {
- wlr_seat_client_send_gtk_primary_selection(focused_client);
- }
-
- wlr_signal_emit_safe(&seat->events.primary_selection, seat);
-
- if (source) {
- seat->primary_selection_source_destroy.notify =
- seat_client_primary_selection_source_destroy;
- wl_signal_add(&source->events.destroy,
- &seat->primary_selection_source_destroy);
- }
+ wlr_primary_selection_source_destroy(&source->source);
}
static const struct gtk_primary_selection_device_interface device_impl;
-static struct wlr_seat_client *seat_client_from_device_resource(
+static struct wlr_gtk_primary_selection_device *device_from_resource(
struct wl_resource *resource) {
assert(wl_resource_instance_of(resource,
&gtk_primary_selection_device_interface, &device_impl));
@@ -251,17 +186,25 @@ static struct wlr_seat_client *seat_client_from_device_resource(
static void device_handle_set_selection(struct wl_client *client,
struct wl_resource *resource, struct wl_resource *source_resource,
uint32_t serial) {
- struct client_data_source *source = NULL;
+ struct wlr_gtk_primary_selection_device *device =
+ device_from_resource(resource);
+ if (device == NULL) {
+ return;
+ }
+
+ struct client_data_source *client_source = NULL;
if (source_resource != NULL) {
- source = client_data_source_from_resource(source_resource);
+ client_source = client_data_source_from_resource(source_resource);
}
- struct wlr_seat_client *seat_client =
- seat_client_from_device_resource(resource);
+ struct wlr_primary_selection_source *source = NULL;
+ if (client_source != NULL) {
+ source = &client_source->source;
+ }
- struct wlr_gtk_primary_selection_source *wlr_source =
- (struct wlr_gtk_primary_selection_source *)source;
- wlr_seat_set_gtk_primary_selection(seat_client->seat, wlr_source, serial);
+ // TODO: serial checking
+
+ wlr_seat_set_primary_selection(device->seat, source);
}
static void device_handle_destroy(struct wl_client *client,
@@ -274,30 +217,139 @@ static const struct gtk_primary_selection_device_interface device_impl = {
.destroy = device_handle_destroy,
};
-static void device_resource_handle_destroy(struct wl_resource *resource) {
+static void device_handle_resource_destroy(struct wl_resource *resource) {
wl_list_remove(wl_resource_get_link(resource));
}
-void wlr_gtk_primary_selection_source_init(
- struct wlr_gtk_primary_selection_source *source) {
- wl_array_init(&source->mime_types);
- wl_signal_init(&source->events.destroy);
+static void device_resource_send_selection(struct wl_resource *resource,
+ struct wlr_primary_selection_source *source) {
+ assert(device_from_resource(resource) != NULL);
+
+ if (source != NULL) {
+ create_offer(resource, source);
+ } else {
+ gtk_primary_selection_device_send_selection(resource, NULL);
+ }
}
-void wlr_gtk_primary_selection_source_finish(
- struct wlr_gtk_primary_selection_source *source) {
- if (source == NULL) {
+static void device_send_selection(
+ struct wlr_gtk_primary_selection_device *device) {
+ struct wlr_seat_client *seat_client =
+ device->seat->keyboard_state.focused_client;
+ if (seat_client == NULL) {
return;
}
- wlr_signal_emit_safe(&source->events.destroy, source);
+ struct wl_resource *resource;
+ wl_resource_for_each(resource, &device->resources) {
+ if (wl_resource_get_client(resource) == seat_client->client) {
+ device_resource_send_selection(resource,
+ device->seat->primary_selection_source);
+ }
+ }
+}
+
+static void device_destroy(struct wlr_gtk_primary_selection_device *device);
- char **p;
- wl_array_for_each(p, &source->mime_types) {
- free(*p);
+static void device_handle_seat_destroy(struct wl_listener *listener,
+ void *data) {
+ struct wlr_gtk_primary_selection_device *device =
+ wl_container_of(listener, device, seat_destroy);
+ device_destroy(device);
+}
+
+static void device_handle_seat_focus_change(struct wl_listener *listener,
+ void *data) {
+ struct wlr_gtk_primary_selection_device *device =
+ wl_container_of(listener, device, seat_focus_change);
+ // TODO: maybe make previous offers inert, or set a NULL selection for
+ // previous client?
+ device_send_selection(device);
+}
+
+static void device_handle_seat_primary_selection(struct wl_listener *listener,
+ void *data) {
+ struct wlr_gtk_primary_selection_device *device =
+ wl_container_of(listener, device, seat_primary_selection);
+
+ struct wl_resource *resource, *tmp;
+ wl_resource_for_each_safe(resource, tmp, &device->offers) {
+ destroy_offer(resource);
+ }
+
+ device_send_selection(device);
+}
+
+static struct wlr_gtk_primary_selection_device *get_or_create_device(
+ struct wlr_gtk_primary_selection_device_manager *manager,
+ struct wlr_seat *seat) {
+ struct wlr_gtk_primary_selection_device *device;
+ wl_list_for_each(device, &manager->devices, link) {
+ if (device->seat == seat) {
+ return device;
+ }
+ }
+
+ device = calloc(1, sizeof(struct wlr_gtk_primary_selection_device));
+ if (device == NULL) {
+ return NULL;
+ }
+ device->manager = manager;
+ device->seat = seat;
+
+ wl_list_init(&device->resources);
+ wl_list_insert(&manager->devices, &device->link);
+
+ wl_list_init(&device->offers);
+
+ device->seat_destroy.notify = device_handle_seat_destroy;
+ wl_signal_add(&seat->events.destroy, &device->seat_destroy);
+
+ device->seat_focus_change.notify = device_handle_seat_focus_change;
+ wl_signal_add(&seat->keyboard_state.events.focus_change,
+ &device->seat_focus_change);
+
+ device->seat_primary_selection.notify =
+ device_handle_seat_primary_selection;
+ wl_signal_add(&seat->events.primary_selection,
+ &device->seat_primary_selection);
+
+ return device;
+}
+
+static void device_destroy(struct wlr_gtk_primary_selection_device *device) {
+ if (device == NULL) {
+ return;
+ }
+ wl_list_remove(&device->link);
+ wl_list_remove(&device->seat_destroy.link);
+ wl_list_remove(&device->seat_focus_change.link);
+ wl_list_remove(&device->seat_primary_selection.link);
+ struct wl_resource *resource, *resource_tmp;
+ wl_resource_for_each_safe(resource, resource_tmp, &device->offers) {
+ destroy_offer(resource);
}
- wl_array_release(&source->mime_types);
+ wl_resource_for_each_safe(resource, resource_tmp, &device->resources) {
+ // Make the resource inert
+ wl_resource_set_user_data(resource, NULL);
+
+ struct wl_list *link = wl_resource_get_link(resource);
+ wl_list_remove(link);
+ wl_list_init(link);
+ }
+ free(device);
+}
+
+
+static const struct gtk_primary_selection_device_manager_interface
+ device_manager_impl;
+
+struct wlr_gtk_primary_selection_device_manager *manager_from_resource(
+ struct wl_resource *resource) {
+ assert(wl_resource_instance_of(resource,
+ &gtk_primary_selection_device_manager_interface, &device_manager_impl));
+ return wl_resource_get_user_data(resource);
}
static void device_manager_handle_create_source(struct wl_client *client,
@@ -308,9 +360,9 @@ static void device_manager_handle_create_source(struct wl_client *client,
wl_client_post_no_memory(client);
return;
}
- wlr_gtk_primary_selection_source_init(&source->source);
+ wlr_primary_selection_source_init(&source->source, &client_source_impl);
- int version = wl_resource_get_version(manager_resource);
+ uint32_t version = wl_resource_get_version(manager_resource);
source->resource = wl_resource_create(client,
&gtk_primary_selection_source_interface, version, id);
if (source->resource == NULL) {
@@ -320,9 +372,6 @@ static void device_manager_handle_create_source(struct wl_client *client,
}
wl_resource_set_implementation(source->resource, &source_impl, source,
source_resource_handle_destroy);
-
- source->source.send = client_source_send;
- source->source.cancel = client_source_cancel;
}
void device_manager_handle_get_device(struct wl_client *client,
@@ -330,6 +379,15 @@ void device_manager_handle_get_device(struct wl_client *client,
struct wl_resource *seat_resource) {
struct wlr_seat_client *seat_client =
wlr_seat_client_from_resource(seat_resource);
+ struct wlr_gtk_primary_selection_device_manager *manager =
+ manager_from_resource(manager_resource);
+
+ struct wlr_gtk_primary_selection_device *device =
+ get_or_create_device(manager, seat_client->seat);
+ if (device == NULL) {
+ wl_resource_post_no_memory(manager_resource);
+ return;
+ }
uint32_t version = wl_resource_get_version(manager_resource);
struct wl_resource *resource = wl_resource_create(client,
@@ -338,10 +396,14 @@ void device_manager_handle_get_device(struct wl_client *client,
wl_resource_post_no_memory(manager_resource);
return;
}
- wl_resource_set_implementation(resource, &device_impl, seat_client,
- &device_resource_handle_destroy);
- wl_list_insert(&seat_client->primary_selection_devices,
- wl_resource_get_link(resource));
+ wl_resource_set_implementation(resource, &device_impl, device,
+ device_handle_resource_destroy);
+ wl_list_insert(&device->resources, wl_resource_get_link(resource));
+
+ if (device->seat->keyboard_state.focused_client == seat_client) {
+ device_resource_send_selection(resource,
+ device->seat->primary_selection_source);
+ }
}
static void device_manager_handle_destroy(struct wl_client *client,
@@ -401,6 +463,7 @@ struct wlr_gtk_primary_selection_device_manager *
}
wl_list_init(&manager->resources);
+ wl_list_init(&manager->devices);
wl_signal_init(&manager->events.destroy);
manager->display_destroy.notify = handle_display_destroy;
diff --git a/types/wlr_primary_selection.c b/types/wlr_primary_selection.c
new file mode 100644
index 00000000..921f44ee
--- /dev/null
+++ b/types/wlr_primary_selection.c
@@ -0,0 +1,69 @@
+#include <assert.h>
+#include <stdlib.h>
+#include <wlr/types/wlr_primary_selection.h>
+#include "util/signal.h"
+
+void wlr_primary_selection_source_init(
+ struct wlr_primary_selection_source *source,
+ const struct wlr_primary_selection_source_impl *impl) {
+ assert(impl->send);
+ wl_array_init(&source->mime_types);
+ wl_signal_init(&source->events.destroy);
+ source->impl = impl;
+}
+
+void wlr_primary_selection_source_destroy(
+ struct wlr_primary_selection_source *source) {
+ if (source == NULL) {
+ return;
+ }
+
+ wlr_signal_emit_safe(&source->events.destroy, source);
+
+ char **p;
+ wl_array_for_each(p, &source->mime_types) {
+ free(*p);
+ }
+ wl_array_release(&source->mime_types);
+
+ if (source->impl->destroy) {
+ source->impl->destroy(source);
+ } else {
+ free(source);
+ }
+}
+
+void wlr_primary_selection_source_send(
+ struct wlr_primary_selection_source *source, const char *mime_type,
+ int32_t fd) {
+ source->impl->send(source, mime_type, fd);
+}
+
+
+static void seat_handle_primary_selection_source_destroy(
+ struct wl_listener *listener, void *data) {
+ struct wlr_seat *seat =
+ wl_container_of(listener, seat, primary_selection_source_destroy);
+ wl_list_remove(&seat->primary_selection_source_destroy.link);
+ seat->primary_selection_source = NULL;
+ wlr_signal_emit_safe(&seat->events.primary_selection, seat);
+}
+
+void wlr_seat_set_primary_selection(struct wlr_seat *seat,
+ struct wlr_primary_selection_source *source) {
+ if (seat->primary_selection_source != NULL) {
+ wl_list_remove(&seat->primary_selection_source_destroy.link);
+ wlr_primary_selection_source_destroy(seat->primary_selection_source);
+ seat->primary_selection_source = NULL;
+ }
+
+ seat->primary_selection_source = source;
+ if (source != NULL) {
+ seat->primary_selection_source_destroy.notify =
+ seat_handle_primary_selection_source_destroy;
+ wl_signal_add(&source->events.destroy,
+ &seat->primary_selection_source_destroy);
+ }
+
+ wlr_signal_emit_safe(&seat->events.primary_selection, seat);
+}
diff --git a/xwayland/selection/incoming.c b/xwayland/selection/incoming.c
index d4d7d553..3e97ca04 100644
--- a/xwayland/selection/incoming.c
+++ b/xwayland/selection/incoming.c
@@ -5,11 +5,11 @@
#include <string.h>
#include <unistd.h>
#include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_gtk_primary_selection.h>
+#include <wlr/types/wlr_primary_selection.h>
#include <wlr/util/log.h>
#include <xcb/xfixes.h>
-#include "xwayland/xwm.h"
#include "xwayland/selection.h"
+#include "xwayland/xwm.h"
/**
* Write the X11 selection to a Wayland client.
@@ -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;
@@ -217,22 +217,22 @@ static const struct wlr_data_source_impl data_source_impl = {
};
struct x11_primary_selection_source {
- struct wlr_gtk_primary_selection_source base;
+ struct wlr_primary_selection_source base;
struct wlr_xwm_selection *selection;
struct wl_array mime_types_atoms;
};
-static void primary_selection_source_cancel(
- struct wlr_gtk_primary_selection_source *wlr_source);
+static const struct wlr_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;
+ struct wlr_primary_selection_source *wlr_source) {
+ 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_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(
- struct wlr_gtk_primary_selection_source *wlr_source) {
+static void primary_selection_source_destroy(
+ struct wlr_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_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_primary_selection_source_init(&source->base,
+ &primary_selection_source_impl);
source->selection = selection;
wl_array_init(&source->mime_types_atoms);
@@ -366,10 +370,9 @@ static void xwm_selection_get_targets(struct wlr_xwm_selection *selection) {
bool ok = source_get_targets(selection, &source->base.mime_types,
&source->mime_types_atoms);
if (ok) {
- wlr_seat_set_gtk_primary_selection(xwm->seat, &source->base,
- wl_display_next_serial(xwm->xwayland->wl_display));
+ wlr_seat_set_primary_selection(xwm->seat, &source->base);
} else {
- source->base.cancel(&source->base);
+ wlr_primary_selection_source_destroy(&source->base);
}
} else if (selection == &xwm->dnd_selection) {
// TODO
@@ -424,8 +427,7 @@ int xwm_handle_xfixes_selection_notify(struct wlr_xwm *xwm,
wlr_seat_set_selection(xwm->seat, NULL,
wl_display_next_serial(xwm->xwayland->wl_display));
} else if (selection == &xwm->primary_selection) {
- wlr_seat_set_gtk_primary_selection(xwm->seat, NULL,
- wl_display_next_serial(xwm->xwayland->wl_display));
+ wlr_seat_set_primary_selection(xwm->seat, NULL);
} else if (selection == &xwm->dnd_selection) {
// TODO: DND
} else {
diff --git a/xwayland/selection/outgoing.c b/xwayland/selection/outgoing.c
index b658ab52..fd5021d5 100644
--- a/xwayland/selection/outgoing.c
+++ b/xwayland/selection/outgoing.c
@@ -4,11 +4,11 @@
#include <string.h>
#include <unistd.h>
#include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_gtk_primary_selection.h>
+#include <wlr/types/wlr_primary_selection.h>
#include <wlr/util/log.h>
#include <xcb/xfixes.h>
-#include "xwayland/xwm.h"
#include "xwayland/selection.h"
+#include "xwayland/xwm.h"
static void xwm_selection_send_notify(struct wlr_xwm *xwm,
xcb_selection_request_event_t *req, bool success) {
@@ -195,10 +195,10 @@ static void xwm_selection_source_send(struct wlr_xwm_selection *selection,
return;
}
} else if (selection == &selection->xwm->primary_selection) {
- struct wlr_gtk_primary_selection_source *source =
+ struct wlr_primary_selection_source *source =
selection->xwm->seat->primary_selection_source;
if (source != NULL) {
- source->send(source, mime_type, fd);
+ wlr_primary_selection_source_send(source, mime_type, fd);
return;
}
} else if (selection == &selection->xwm->dnd_selection) {
@@ -231,7 +231,7 @@ static struct wl_array *xwm_selection_source_get_mime_types(
return &source->mime_types;
}
} else if (selection == &selection->xwm->primary_selection) {
- struct wlr_gtk_primary_selection_source *source =
+ struct wlr_primary_selection_source *source =
selection->xwm->seat->primary_selection_source;
if (source != NULL) {
return &source->mime_types;
diff --git a/xwayland/selection/selection.c b/xwayland/selection/selection.c
index a29eeeae..4d7732cb 100644
--- a/xwayland/selection/selection.c
+++ b/xwayland/selection/selection.c
@@ -5,11 +5,11 @@
#include <string.h>
#include <unistd.h>
#include <wlr/types/wlr_data_device.h>
-#include <wlr/types/wlr_gtk_primary_selection.h>
+#include <wlr/types/wlr_primary_selection.h>
#include <wlr/util/log.h>
#include <xcb/xfixes.h>
-#include "xwayland/xwm.h"
#include "xwayland/selection.h"
+#include "xwayland/xwm.h"
void xwm_selection_transfer_remove_source(
struct wlr_xwm_selection_transfer *transfer) {
@@ -231,8 +231,7 @@ void xwm_selection_finish(struct wlr_xwm *xwm) {
if (xwm->seat->primary_selection_source &&
primary_selection_source_is_xwayland(
xwm->seat->primary_selection_source)) {
- wlr_seat_set_gtk_primary_selection(xwm->seat, NULL,
- wl_display_next_serial(xwm->xwayland->wl_display));
+ wlr_seat_set_primary_selection(xwm->seat, NULL);
}
wlr_xwayland_set_seat(xwm->xwayland, NULL);
}
@@ -274,11 +273,10 @@ static void seat_handle_primary_selection(struct wl_listener *listener,
struct wlr_seat *seat = data;
struct wlr_xwm *xwm =
wl_container_of(listener, xwm, seat_primary_selection);
- struct wlr_gtk_primary_selection_source *source = seat->primary_selection_source;
+ struct wlr_primary_selection_source *source =
+ seat->primary_selection_source;
- if (source != NULL &&
- primary_selection_source_is_xwayland(
- source)) {
+ if (source != NULL && primary_selection_source_is_xwayland(source)) {
return;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 05:38:41 +0000