Warning: this removes functionality (#2) In preparation for split xwm as a client; this will be re-implemented later.
Signed-off-by: Tiago Vignatti <[email protected]> --- src/xwayland/Makefile.am | 1 - src/xwayland/window-manager.c | 9 ++++----- src/xwayland/window-manager.h | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/xwayland/Makefile.am b/src/xwayland/Makefile.am index 6a7d424..396f058 100644 --- a/src/xwayland/Makefile.am +++ b/src/xwayland/Makefile.am @@ -21,7 +21,6 @@ xwayland_la_SOURCES = \ xwayland.h \ window-manager.h \ window-manager.c \ - selection.c \ launcher.c \ xserver-protocol.c \ xserver-server-protocol.h \ diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c index a2db694..89cc1f2 100644 --- a/src/xwayland/window-manager.c +++ b/src/xwayland/window-manager.c @@ -1188,12 +1188,13 @@ weston_wm_handle_event(int fd, uint32_t mask, void *data) int count = 0; while (event = xcb_poll_for_event(wm->conn), event != NULL) { +#if 0 if (weston_wm_handle_selection_event(wm, event)) { free(event); count++; continue; } - +#endif switch (event->response_type & ~0x80) { case XCB_BUTTON_PRESS: case XCB_BUTTON_RELEASE: @@ -1495,9 +1496,9 @@ weston_wm_create(struct weston_xserver *wxs) XCB_ATOM_ATOM, 32, /* format */ ARRAY_LENGTH(supported), supported); - +#if 0 weston_wm_selection_init(wm); - +#endif xcb_flush(wm->conn); wm->activate_listener.notify = weston_wm_window_activate; @@ -1523,8 +1524,6 @@ weston_wm_destroy(struct weston_wm *wm) weston_wm_destroy_cursors(wm); xcb_disconnect(wm->conn); wl_event_source_remove(wm->source); - wl_list_remove(&wm->selection_listener.link); - wl_list_remove(&wm->activate_listener.link); wl_list_remove(&wm->kill_listener.link); free(wm); diff --git a/src/xwayland/window-manager.h b/src/xwayland/window-manager.h index 703976e..b9c063e 100644 --- a/src/xwayland/window-manager.h +++ b/src/xwayland/window-manager.h @@ -54,7 +54,6 @@ struct weston_wm { xcb_timestamp_t selection_timestamp; int selection_property_set; int flush_property_on_delete; - struct wl_listener selection_listener; struct { xcb_atom_t wm_protocols; -- 1.7.9.5 _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
