mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

view: make request_activate listener xwayland only

Browse source
This commit is contained in:
Johan Malm 2023-02-24 21:27:11 +00:00 • committed by Consolatis
parent 665b6503e1
commit ecbe699f94
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/view.h
View file

@ -99,7 +99,6 @@ struct view {
struct wl_listener commit;
struct wl_listener request_move;
struct wl_listener request_resize;
struct wl_listener request_activate;
struct wl_listener request_minimize;
struct wl_listener request_maximize;
struct wl_listener request_fullscreen;

1
include/xwayland.h
View file

@ -28,6 +28,7 @@ struct xwayland_view {
struct wlr_xwayland_surface *xwayland_surface;
/* Events unique to XWayland views */
struct wl_listener request_activate;
struct wl_listener request_configure;
struct wl_listener set_app_id; /* TODO: s/set_app_id/class/ */
struct wl_listener set_decorations;

14
src/xwayland.c
View file

@ -227,12 +227,12 @@ handle_destroy(struct wl_listener *listener, void *data)
wl_list_remove(&view->unmap.link);
wl_list_remove(&view->request_move.link);
wl_list_remove(&view->request_resize.link);
wl_list_remove(&view->request_activate.link);
wl_list_remove(&view->request_minimize.link);
wl_list_remove(&view->request_maximize.link);
wl_list_remove(&view->request_fullscreen.link);
wl_list_remove(&view->set_title.link);
wl_list_remove(&xwayland_view->request_activate.link);
wl_list_remove(&xwayland_view->request_configure.link);
wl_list_remove(&xwayland_view->set_app_id.link);
wl_list_remove(&xwayland_view->set_decorations.link);
@ -279,8 +279,10 @@ handle_request_configure(struct wl_listener *listener, void *data)
static void
handle_request_activate(struct wl_listener *listener, void *data)
{
struct view *view = wl_container_of(listener, view, request_activate);
assert(view);
struct xwayland_view *xwayland_view =
wl_container_of(listener, xwayland_view, request_activate);
assert(xwayland_view);
struct view *view = &xwayland_view->base;
desktop_focus_and_activate_view(&view->server->seat, view);
desktop_move_to_front(view);
}
@ -640,8 +642,6 @@ handle_new_surface(struct wl_listener *listener, void *data)
wl_signal_add(&xsurface->events.unmap, &view->unmap);
view->destroy.notify = handle_destroy;
wl_signal_add(&xsurface->events.destroy, &view->destroy);
view->request_activate.notify = handle_request_activate;
wl_signal_add(&xsurface->events.request_activate, &view->request_activate);
view->request_minimize.notify = handle_request_minimize;
wl_signal_add(&xsurface->events.request_minimize, &view->request_minimize);
view->request_maximize.notify = handle_request_maximize;
@ -657,6 +657,10 @@ handle_new_surface(struct wl_listener *listener, void *data)
wl_signal_add(&xsurface->events.set_title, &view->set_title);
/* Events specific to XWayland views */
xwayland_view->request_activate.notify = handle_request_activate;
wl_signal_add(&xsurface->events.request_activate,
&xwayland_view->request_activate);
xwayland_view->request_configure.notify = handle_request_configure;
wl_signal_add(&xsurface->events.request_configure,
&xwayland_view->request_configure);