mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-01-03 11:08:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into xwm-selection

Browse source
This commit is contained in:
emersion 2017-12-14 11:20:38 +01:00
commit 6ef0219763
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
32 changed files with 268 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

7
xwayland/xwm.c
View file

@ -12,7 +12,7 @@
#include "wlr/types/wlr_surface.h"
#include "wlr/xwayland.h"
#include "wlr/xcursor.h"
#include "xwm.h"
#include "wlr/xwm.h"
#ifdef HAS_XCB_ICCCM
#include <xcb/xcb_icccm.h>
@ -946,6 +946,11 @@ static int x11_event_handler(int fd, uint32_t mask, void *data) {
while ((event = xcb_poll_for_event(xwm->xcb_conn))) {
count++;
if (xwm->xwayland->user_event_handler &&
xwm->xwayland->user_event_handler(xwm, event)) {
break;
}
if (xwm_handle_selection_event(xwm, event)) {
free(event);
continue;