blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "xwm: only take clipboard if window is focused" 

This reverts commit e3542d879d.
This commit is contained in:
Tony Crisci 2017-12-08 09:23:26 -05:00
parent 35188834db
commit 52cda5653b
3 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xwayland/selection.c
View File

@ -466,6 +466,7 @@ static int xwm_handle_xfixes_selection_notify(struct wlr_xwm *xwm,
return 1;
}
int xwm_handle_selection_event(struct wlr_xwm *xwm,
xcb_generic_event_t *event) {
if (!xwm->seat) {
@ -541,25 +542,13 @@ static void handle_seat_set_selection(struct wl_listener *listener,
return;
}
if (source->send == data_source_send) {
if (source->send == data_source_send)
return;
}
xwm_set_selection_owner(xwm);
}
void xwm_set_selection_owner(struct wlr_xwm *xwm) {
if (xwm->focus_surface && xwm->seat->selection_source) {
xcb_set_selection_owner(xwm->xcb_conn,
xwm->selection_window,
xwm->atoms[CLIPBOARD],
XCB_TIME_CURRENT_TIME);
} else {
xcb_set_selection_owner(xwm->xcb_conn,
XCB_ATOM_NONE,
xwm->atoms[CLIPBOARD],
xwm->selection_timestamp);
}
xcb_set_selection_owner(xwm->xcb_conn,
xwm->selection_window,
xwm->atoms[CLIPBOARD],
XCB_TIME_CURRENT_TIME);
}
void xwm_set_seat(struct wlr_xwm *xwm, struct wlr_seat *seat) {

1
xwayland/xwm.c
View File

@ -175,7 +175,6 @@ void xwm_surface_activate(struct wlr_xwm *xwm,
xwm_send_focus_window(xwm, xsurface);
xwm->focus_surface = xsurface;
xwm_set_selection_owner(xwm);
xcb_flush(xwm->xcb_conn);
}

2
xwayland/xwm.h
View File

@ -98,8 +98,6 @@ 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);
void xwm_set_selection_owner(struct wlr_xwm *xwm);
void xwm_selection_init(struct wlr_xwm *xwm);
void xwm_set_seat(struct wlr_xwm *xwm, struct wlr_seat *seat);