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

xwayland: refactor selection code

Browse source
This commit is contained in:
emersion 2018-04-03 12:12:57 -04:00
parent 67dec2da2b
commit 591ea27cf9
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
9 changed files with 1626 additions and 1530 deletions
Download patch file Download diff file Expand all files Collapse all files

52
include/xwayland/xwm.h
View file

@ -5,13 +5,18 @@
#include <wlr/config.h>
#include <wlr/xwayland.h>
#include <xcb/render.h>
#ifdef WLR_HAS_XCB_ICCCM
#include <xcb/xcb_icccm.h>
#include <xcb/xcb_icccm.h>
#endif
#ifdef WLR_HAS_XCB_ERRORS
#include <xcb/xcb_errors.h>
#include <xcb/xcb_errors.h>
#endif
#include "xwayland/selection.h"
/* This is in xcb/xcb_event.h, but pulling xcb-util just for a constant
* others redefine anyway is meh
*/
#define XCB_EVENT_RESPONSE_TYPE_MASK (0x7f)
enum atom_name {
WL_SURFACE_ID,
@ -79,40 +84,6 @@ enum net_wm_state_action {
NET_WM_STATE_TOGGLE = 2,
};
#define XDND_VERSION 5
struct wlr_xwm_selection;
struct wlr_xwm_selection_transfer {
struct wlr_xwm_selection *selection;
bool incr;
bool flush_property_on_delete;
bool property_set;
struct wl_array source_data;
int source_fd;
struct wl_event_source *source;
// when sending to x11
xcb_selection_request_event_t request;
struct wl_list outgoing_link;
// when receiving from x11
int property_start;
xcb_get_property_reply_t *property_reply;
};
struct wlr_xwm_selection {
struct wlr_xwm *xwm;
xcb_atom_t atom;
xcb_window_t window;
xcb_window_t owner;
xcb_timestamp_t timestamp;
struct wlr_xwm_selection_transfer incoming;
struct wl_list outgoing;
};
struct wlr_xwm {
struct wlr_xwayland *xwayland;
struct wl_event_source *event_source;
@ -168,15 +139,12 @@ void xwm_set_cursor(struct wlr_xwm *xwm, const uint8_t *pixels, uint32_t stride,
int xwm_handle_selection_event(struct wlr_xwm *xwm, xcb_generic_event_t *event);
int xwm_handle_selection_client_message(struct wlr_xwm *xwm,
xcb_client_message_event_t *ev);
void xwm_selection_init(struct wlr_xwm *xwm);
void xwm_selection_finish(struct wlr_xwm *xwm);
xcb_client_message_event_t *ev);
void xwm_set_seat(struct wlr_xwm *xwm, struct wlr_seat *seat);
char *xwm_get_atom_name(struct wlr_xwm *xwm, xcb_atom_t atom);
bool xwm_atoms_contains(struct wlr_xwm *xwm, xcb_atom_t *atoms,
size_t num_atoms, enum atom_name needle);
size_t num_atoms, enum atom_name needle);
#endif