mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-05 04:06:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

foreign-toplevel: simplify and fully separate ext-foreign/wlr-foreign

Browse source 
Currently, the dependencies between foreign-toplevel[-internal],
ext-foreign, and wlr-foreign are cyclical and a bit complex.

I suggest we reorganize it into a simpler hierarchy:

  foreign-toplevel/
    -> foreign.c/h
      -> (depends on) ext-foreign.c/h
      -> (depends on) wlr-foreign.c/h

The refactored code is smaller and (IMO) easier to follow.

In detail:

- Add include/foreign-toplevel folder mirroring src/foreign-toplevel
- Split foreign-toplevel-internal.h to ext-foreign.h and wlr-foreign.h
- Eliminate ext-/wlr-foreign.c -> foreign.c reverse dependencies
  (including internal signals and foreign_request* functions)
- Make struct foreign_toplevel private to foreign.c

Lightly tested with qmpanel (which uses wlr-foreign-toplevel).

v2: reorder foreign-toplevel internal API funcs
This commit is contained in:
John Lindgren 2025-08-07 20:30:59 -04:00
parent 55b495f398
commit 02df0a15d7
11 changed files with 202 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

83
include/foreign-toplevel-internal.h
View file

@ -1,83 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef LABWC_FOREIGN_TOPLEVEL_INTERNAL_H
#define LABWC_FOREIGN_TOPLEVEL_INTERNAL_H
#include <stdbool.h>
#include <wayland-server-core.h>
#include "foreign-toplevel.h"
struct foreign_toplevel {
struct view *view;
/* *-toplevel implementations */
struct wlr_foreign_toplevel {
struct wlr_foreign_toplevel_handle_v1 *handle;
/* Client side events */
struct {
struct wl_listener request_maximize;
struct wl_listener request_minimize;
struct wl_listener request_fullscreen;
struct wl_listener request_activate;
struct wl_listener request_close;
struct wl_listener handle_destroy;
} on;
/* Compositor side state updates */
struct {
struct wl_listener new_app_id;
struct wl_listener new_title;
struct wl_listener new_outputs;
struct wl_listener maximized;
struct wl_listener minimized;
struct wl_listener fullscreened;
struct wl_listener activated;
} on_view;
/* Internal signals */
struct {
struct wl_listener toplevel_parent;
struct wl_listener toplevel_destroy;
} on_foreign_toplevel;
} wlr_toplevel;
struct ext_foreign_toplevel {
struct wlr_ext_foreign_toplevel_handle_v1 *handle;
/* Client side events */
struct {
struct wl_listener handle_destroy;
} on;
/* Compositor side state updates */
struct {
struct wl_listener new_app_id;
struct wl_listener new_title;
} on_view;
/* Internal signals */
struct {
struct wl_listener toplevel_destroy;
} on_foreign_toplevel;
} ext_toplevel;
/* TODO: add struct xdg_x11_mapped_toplevel at some point */
struct {
struct wl_signal toplevel_parent; /* struct view *parent */
struct wl_signal toplevel_destroy;
} events;
};
void ext_foreign_toplevel_init(struct foreign_toplevel *toplevel);
void wlr_foreign_toplevel_init(struct foreign_toplevel *toplevel);
void foreign_request_minimize(struct foreign_toplevel *toplevel, bool minimized);
void foreign_request_maximize(struct foreign_toplevel *toplevel, enum view_axis axis);
void foreign_request_fullscreen(struct foreign_toplevel *toplevel, bool fullscreen);
void foreign_request_activate(struct foreign_toplevel *toplevel);
void foreign_request_close(struct foreign_toplevel *toplevel);
#endif /* LABWC_FOREIGN_TOPLEVEL_INTERNAL_H */

27
include/foreign-toplevel/ext-foreign.h Normal file
View file

@ -0,0 +1,27 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef LABWC_EXT_FOREIGN_TOPLEVEL_H
#define LABWC_EXT_FOREIGN_TOPLEVEL_H
#include <wayland-server-core.h>
struct ext_foreign_toplevel {
struct view *view;
struct wlr_ext_foreign_toplevel_handle_v1 *handle;
/* Client side events */
struct {
struct wl_listener handle_destroy;
} on;
/* Compositor side state updates */
struct {
struct wl_listener new_app_id;
struct wl_listener new_title;
} on_view;
};
void ext_foreign_toplevel_init(struct ext_foreign_toplevel *ext_toplevel,
struct view *view);
void ext_foreign_toplevel_finish(struct ext_foreign_toplevel *ext_toplevel);
#endif /* LABWC_EXT_FOREIGN_TOPLEVEL_H */

0
include/foreign-toplevel.h → include/foreign-toplevel/foreign.h
View file

39
include/foreign-toplevel/wlr-foreign.h Normal file
View file

@ -0,0 +1,39 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef LABWC_WLR_FOREIGN_TOPLEVEL_H
#define LABWC_WLR_FOREIGN_TOPLEVEL_H
#include <wayland-server-core.h>
struct wlr_foreign_toplevel {
struct view *view;
struct wlr_foreign_toplevel_handle_v1 *handle;
/* Client side events */
struct {
struct wl_listener request_maximize;
struct wl_listener request_minimize;
struct wl_listener request_fullscreen;
struct wl_listener request_activate;
struct wl_listener request_close;
struct wl_listener handle_destroy;
} on;
/* Compositor side state updates */
struct {
struct wl_listener new_app_id;
struct wl_listener new_title;
struct wl_listener new_outputs;
struct wl_listener maximized;
struct wl_listener minimized;
struct wl_listener fullscreened;
struct wl_listener activated;
} on_view;
};
void wlr_foreign_toplevel_init(struct wlr_foreign_toplevel *wlr_toplevel,
struct view *view);
void wlr_foreign_toplevel_set_parent(struct wlr_foreign_toplevel *wlr_toplevel,
struct wlr_foreign_toplevel *parent);
void wlr_foreign_toplevel_finish(struct wlr_foreign_toplevel *wlr_toplevel);
#endif /* LABWC_WLR_FOREIGN_TOPLEVEL_H */

74
src/foreign-toplevel/ext-foreign.c
View file

@ -1,10 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
#include "foreign-toplevel/ext-foreign.h"
#include <assert.h> #include <assert.h>
#include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h> #include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h>
#include "common/macros.h" #include "common/macros.h"
#include "labwc.h" #include "labwc.h"
#include "view.h" #include "view.h"
#include "foreign-toplevel-internal.h"
/* ext signals */ /* ext signals */
static void static void
@ -20,9 +20,6 @@ handle_handle_destroy(struct wl_listener *listener, void *data)
wl_list_remove(&ext_toplevel->on_view.new_app_id.link); wl_list_remove(&ext_toplevel->on_view.new_app_id.link);
wl_list_remove(&ext_toplevel->on_view.new_title.link); wl_list_remove(&ext_toplevel->on_view.new_title.link);
/* Internal signals */
wl_list_remove(&ext_toplevel->on_foreign_toplevel.toplevel_destroy.link);
ext_toplevel->handle = NULL; ext_toplevel->handle = NULL;
} }
@ -30,60 +27,44 @@ handle_handle_destroy(struct wl_listener *listener, void *data)
static void static void
handle_new_app_id(struct wl_listener *listener, void *data) handle_new_app_id(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = struct ext_foreign_toplevel *ext_toplevel =
wl_container_of(listener, toplevel, ext_toplevel.on_view.new_app_id); wl_container_of(listener, ext_toplevel, on_view.new_app_id);
assert(toplevel->ext_toplevel.handle); assert(ext_toplevel->handle);
struct wlr_ext_foreign_toplevel_handle_v1_state state = { struct wlr_ext_foreign_toplevel_handle_v1_state state = {
.title = view_get_string_prop(toplevel->view, "title"), .title = view_get_string_prop(ext_toplevel->view, "title"),
.app_id = view_get_string_prop(toplevel->view, "app_id") .app_id = view_get_string_prop(ext_toplevel->view, "app_id")
}; };
wlr_ext_foreign_toplevel_handle_v1_update_state( wlr_ext_foreign_toplevel_handle_v1_update_state(ext_toplevel->handle,
toplevel->ext_toplevel.handle, &state); &state);
} }
static void static void
handle_new_title(struct wl_listener *listener, void *data) handle_new_title(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = struct ext_foreign_toplevel *ext_toplevel =
wl_container_of(listener, toplevel, ext_toplevel.on_view.new_title); wl_container_of(listener, ext_toplevel, on_view.new_title);
assert(toplevel->ext_toplevel.handle); assert(ext_toplevel->handle);
struct wlr_ext_foreign_toplevel_handle_v1_state state = { struct wlr_ext_foreign_toplevel_handle_v1_state state = {
.title = view_get_string_prop(toplevel->view, "title"), .title = view_get_string_prop(ext_toplevel->view, "title"),
.app_id = view_get_string_prop(toplevel->view, "app_id") .app_id = view_get_string_prop(ext_toplevel->view, "app_id")
}; };
wlr_ext_foreign_toplevel_handle_v1_update_state( wlr_ext_foreign_toplevel_handle_v1_update_state(ext_toplevel->handle,
toplevel->ext_toplevel.handle, &state); &state);
}
/* Internal signals */
static void
handle_toplevel_destroy(struct wl_listener *listener, void *data)
{
struct ext_foreign_toplevel *ext_toplevel =
wl_container_of(listener, ext_toplevel, on_foreign_toplevel.toplevel_destroy);
if (!ext_toplevel->handle) {
return;
}
/* invokes handle_handle_destroy() which does more cleanup */
wlr_ext_foreign_toplevel_handle_v1_destroy(ext_toplevel->handle);
} }
/* Internal API */ /* Internal API */
void void
ext_foreign_toplevel_init(struct foreign_toplevel *toplevel) ext_foreign_toplevel_init(struct ext_foreign_toplevel *ext_toplevel,
struct view *view)
{ {
struct ext_foreign_toplevel *ext_toplevel = &toplevel->ext_toplevel;
struct view *view = toplevel->view;
assert(view->server->foreign_toplevel_list); assert(view->server->foreign_toplevel_list);
ext_toplevel->view = view;
struct wlr_ext_foreign_toplevel_handle_v1_state state = { struct wlr_ext_foreign_toplevel_handle_v1_state state = {
.title = view_get_string_prop(toplevel->view, "title"), .title = view_get_string_prop(view, "title"),
.app_id = view_get_string_prop(toplevel->view, "app_id") .app_id = view_get_string_prop(view, "app_id")
}; };
ext_toplevel->handle = wlr_ext_foreign_toplevel_handle_v1_create( ext_toplevel->handle = wlr_ext_foreign_toplevel_handle_v1_create(
view->server->foreign_toplevel_list, &state); view->server->foreign_toplevel_list, &state);
@ -101,7 +82,16 @@ ext_foreign_toplevel_init(struct foreign_toplevel *toplevel)
/* Compositor side state changes */ /* Compositor side state changes */
CONNECT_SIGNAL(view, &ext_toplevel->on_view, new_app_id); CONNECT_SIGNAL(view, &ext_toplevel->on_view, new_app_id);
CONNECT_SIGNAL(view, &ext_toplevel->on_view, new_title); CONNECT_SIGNAL(view, &ext_toplevel->on_view, new_title);
}
/* Internal signals */
CONNECT_SIGNAL(toplevel, &ext_toplevel->on_foreign_toplevel, toplevel_destroy); void
ext_foreign_toplevel_finish(struct ext_foreign_toplevel *ext_toplevel)
{
if (!ext_toplevel->handle) {
return;
}
/* invokes handle_handle_destroy() which does more cleanup */
wlr_ext_foreign_toplevel_handle_v1_destroy(ext_toplevel->handle);
assert(!ext_toplevel->handle);
} }

60
src/foreign-toplevel/foreign.c
View file

@ -1,44 +1,19 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
#include "foreign-toplevel/foreign.h"
#include <assert.h> #include <assert.h>
#include <wayland-server-core.h>
#include "common/macros.h"
#include "common/mem.h" #include "common/mem.h"
#include "labwc.h" #include "foreign-toplevel/ext-foreign.h"
#include "foreign-toplevel/wlr-foreign.h"
#include "view.h" #include "view.h"
#include "foreign-toplevel-internal.h"
/* Internal API */ struct foreign_toplevel {
void /* *-toplevel implementations */
foreign_request_minimize(struct foreign_toplevel *toplevel, bool minimized) struct wlr_foreign_toplevel wlr_toplevel;
{ struct ext_foreign_toplevel ext_toplevel;
view_minimize(toplevel->view, minimized);
}
void /* TODO: add struct xdg_x11_mapped_toplevel at some point */
foreign_request_maximize(struct foreign_toplevel *toplevel, enum view_axis axis) };
{
view_maximize(toplevel->view, axis, /*store_natural_geometry*/ true);
}
void
foreign_request_fullscreen(struct foreign_toplevel *toplevel, bool fullscreen)
{
view_set_fullscreen(toplevel->view, fullscreen);
}
void
foreign_request_activate(struct foreign_toplevel *toplevel)
{
desktop_focus_view(toplevel->view, /*raise*/ true);
}
void
foreign_request_close(struct foreign_toplevel *toplevel)
{
view_close(toplevel->view);
}
/* Public API */
struct foreign_toplevel * struct foreign_toplevel *
foreign_toplevel_create(struct view *view) foreign_toplevel_create(struct view *view)
{ {
@ -46,13 +21,8 @@ foreign_toplevel_create(struct view *view)
assert(view->mapped); assert(view->mapped);
struct foreign_toplevel *toplevel = znew(*toplevel); struct foreign_toplevel *toplevel = znew(*toplevel);
toplevel->view = view; wlr_foreign_toplevel_init(&toplevel->wlr_toplevel, view);
ext_foreign_toplevel_init(&toplevel->ext_toplevel, view);
wl_signal_init(&toplevel->events.toplevel_parent);
wl_signal_init(&toplevel->events.toplevel_destroy);
wlr_foreign_toplevel_init(toplevel);
ext_foreign_toplevel_init(toplevel);
return toplevel; return toplevel;
} }
@ -61,15 +31,15 @@ void
foreign_toplevel_set_parent(struct foreign_toplevel *toplevel, struct foreign_toplevel *parent) foreign_toplevel_set_parent(struct foreign_toplevel *toplevel, struct foreign_toplevel *parent)
{ {
assert(toplevel); assert(toplevel);
wl_signal_emit_mutable(&toplevel->events.toplevel_parent, parent); wlr_foreign_toplevel_set_parent(&toplevel->wlr_toplevel,
parent ? &parent->wlr_toplevel : NULL);
} }
void void
foreign_toplevel_destroy(struct foreign_toplevel *toplevel) foreign_toplevel_destroy(struct foreign_toplevel *toplevel)
{ {
assert(toplevel); assert(toplevel);
wl_signal_emit_mutable(&toplevel->events.toplevel_destroy, NULL); wlr_foreign_toplevel_finish(&toplevel->wlr_toplevel);
assert(!toplevel->wlr_toplevel.handle); ext_foreign_toplevel_finish(&toplevel->ext_toplevel);
assert(!toplevel->ext_toplevel.handle);
free(toplevel); free(toplevel);
} }

181
src/foreign-toplevel/wlr-foreign.c
View file

@ -1,62 +1,63 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
#include "foreign-toplevel/wlr-foreign.h"
#include <assert.h> #include <assert.h>
#include <wlr/types/wlr_foreign_toplevel_management_v1.h> #include <wlr/types/wlr_foreign_toplevel_management_v1.h>
#include "common/macros.h" #include "common/macros.h"
#include "labwc.h" #include "labwc.h"
#include "output.h" #include "output.h"
#include "view.h" #include "view.h"
#include "foreign-toplevel-internal.h"
/* wlr signals */ /* wlr signals */
static void static void
handle_request_minimize(struct wl_listener *listener, void *data) handle_request_minimize(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = wl_container_of( struct wlr_foreign_toplevel *wlr_toplevel =
listener, toplevel, wlr_toplevel.on.request_minimize); wl_container_of(listener, wlr_toplevel, on.request_minimize);
struct wlr_foreign_toplevel_handle_v1_minimized_event *event = data; struct wlr_foreign_toplevel_handle_v1_minimized_event *event = data;
foreign_request_minimize(toplevel, event->minimized); view_minimize(wlr_toplevel->view, event->minimized);
} }
static void static void
handle_request_maximize(struct wl_listener *listener, void *data) handle_request_maximize(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = wl_container_of( struct wlr_foreign_toplevel *wlr_toplevel =
listener, toplevel, wlr_toplevel.on.request_maximize); wl_container_of(listener, wlr_toplevel, on.request_maximize);
struct wlr_foreign_toplevel_handle_v1_maximized_event *event = data; struct wlr_foreign_toplevel_handle_v1_maximized_event *event = data;
foreign_request_maximize(toplevel, view_maximize(wlr_toplevel->view,
event->maximized ? VIEW_AXIS_BOTH : VIEW_AXIS_NONE); event->maximized ? VIEW_AXIS_BOTH : VIEW_AXIS_NONE,
/*store_natural_geometry*/ true);
} }
static void static void
handle_request_fullscreen(struct wl_listener *listener, void *data) handle_request_fullscreen(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = wl_container_of( struct wlr_foreign_toplevel *wlr_toplevel =
listener, toplevel, wlr_toplevel.on.request_fullscreen); wl_container_of(listener, wlr_toplevel, on.request_fullscreen);
struct wlr_foreign_toplevel_handle_v1_fullscreen_event *event = data; struct wlr_foreign_toplevel_handle_v1_fullscreen_event *event = data;
/* TODO: This ignores event->output */ /* TODO: This ignores event->output */
foreign_request_fullscreen(toplevel, event->fullscreen); view_set_fullscreen(wlr_toplevel->view, event->fullscreen);
} }
static void static void
handle_request_activate(struct wl_listener *listener, void *data) handle_request_activate(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = wl_container_of( struct wlr_foreign_toplevel *wlr_toplevel =
listener, toplevel, wlr_toplevel.on.request_activate); wl_container_of(listener, wlr_toplevel, on.request_activate);
/* In a multi-seat world we would select seat based on event->seat here. */ /* In a multi-seat world we would select seat based on event->seat here. */
foreign_request_activate(toplevel); desktop_focus_view(wlr_toplevel->view, /*raise*/ true);
} }
static void static void
handle_request_close(struct wl_listener *listener, void *data) handle_request_close(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = wl_container_of( struct wlr_foreign_toplevel *wlr_toplevel =
listener, toplevel, wlr_toplevel.on.request_close); wl_container_of(listener, wlr_toplevel, on.request_close);
foreign_request_close(toplevel); view_close(wlr_toplevel->view);
} }
static void static void
@ -82,10 +83,6 @@ handle_handle_destroy(struct wl_listener *listener, void *data)
wl_list_remove(&wlr_toplevel->on_view.fullscreened.link); wl_list_remove(&wlr_toplevel->on_view.fullscreened.link);
wl_list_remove(&wlr_toplevel->on_view.activated.link); wl_list_remove(&wlr_toplevel->on_view.activated.link);
/* Internal signals */
wl_list_remove(&wlr_toplevel->on_foreign_toplevel.toplevel_parent.link);
wl_list_remove(&wlr_toplevel->on_foreign_toplevel.toplevel_destroy.link);
wlr_toplevel->handle = NULL; wlr_toplevel->handle = NULL;
} }
@ -93,41 +90,41 @@ handle_handle_destroy(struct wl_listener *listener, void *data)
static void static void
handle_new_app_id(struct wl_listener *listener, void *data) handle_new_app_id(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = struct wlr_foreign_toplevel *wlr_toplevel =
wl_container_of(listener, toplevel, wlr_toplevel.on_view.new_app_id); wl_container_of(listener, wlr_toplevel, on_view.new_app_id);
assert(toplevel->wlr_toplevel.handle); assert(wlr_toplevel->handle);
const char *app_id = view_get_string_prop(toplevel->view, "app_id"); const char *app_id = view_get_string_prop(wlr_toplevel->view, "app_id");
const char *wlr_app_id = toplevel->wlr_toplevel.handle->app_id; const char *wlr_app_id = wlr_toplevel->handle->app_id;
if (app_id && wlr_app_id && !strcmp(app_id, wlr_app_id)) { if (app_id && wlr_app_id && !strcmp(app_id, wlr_app_id)) {
/* Don't send app_id if they are the same */ /* Don't send app_id if they are the same */
return; return;
} }
wlr_foreign_toplevel_handle_v1_set_app_id(toplevel->wlr_toplevel.handle, app_id); wlr_foreign_toplevel_handle_v1_set_app_id(wlr_toplevel->handle, app_id);
} }
static void static void
handle_new_title(struct wl_listener *listener, void *data) handle_new_title(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = struct wlr_foreign_toplevel *wlr_toplevel =
wl_container_of(listener, toplevel, wlr_toplevel.on_view.new_title); wl_container_of(listener, wlr_toplevel, on_view.new_title);
assert(toplevel->wlr_toplevel.handle); assert(wlr_toplevel->handle);
const char *title = view_get_string_prop(toplevel->view, "title"); const char *title = view_get_string_prop(wlr_toplevel->view, "title");
const char *wlr_title = toplevel->wlr_toplevel.handle->title; const char *wlr_title = wlr_toplevel->handle->title;
if (title && wlr_title && !strcmp(title, wlr_title)) { if (title && wlr_title && !strcmp(title, wlr_title)) {
/* Don't send title if they are the same */ /* Don't send title if they are the same */
return; return;
} }
wlr_foreign_toplevel_handle_v1_set_title(toplevel->wlr_toplevel.handle, title); wlr_foreign_toplevel_handle_v1_set_title(wlr_toplevel->handle, title);
} }
static void static void
handle_new_outputs(struct wl_listener *listener, void *data) handle_new_outputs(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = struct wlr_foreign_toplevel *wlr_toplevel =
wl_container_of(listener, toplevel, wlr_toplevel.on_view.new_outputs); wl_container_of(listener, wlr_toplevel, on_view.new_outputs);
assert(toplevel->wlr_toplevel.handle); assert(wlr_toplevel->handle);
/* /*
* Loop over all outputs and notify foreign_toplevel clients about changes. * Loop over all outputs and notify foreign_toplevel clients about changes.
@ -137,13 +134,13 @@ handle_new_outputs(struct wl_listener *listener, void *data)
* wlr_foreign_toplevel handle the rest. * wlr_foreign_toplevel handle the rest.
*/ */
struct output *output; struct output *output;
wl_list_for_each(output, &toplevel->view->server->outputs, link) { wl_list_for_each(output, &wlr_toplevel->view->server->outputs, link) {
if (view_on_output(toplevel->view, output)) { if (view_on_output(wlr_toplevel->view, output)) {
wlr_foreign_toplevel_handle_v1_output_enter( wlr_foreign_toplevel_handle_v1_output_enter(
toplevel->wlr_toplevel.handle, output->wlr_output); wlr_toplevel->handle, output->wlr_output);
} else { } else {
wlr_foreign_toplevel_handle_v1_output_leave( wlr_foreign_toplevel_handle_v1_output_leave(
toplevel->wlr_toplevel.handle, output->wlr_output); wlr_toplevel->handle, output->wlr_output);
} }
} }
} }
@ -151,84 +148,55 @@ handle_new_outputs(struct wl_listener *listener, void *data)
static void static void
handle_maximized(struct wl_listener *listener, void *data) handle_maximized(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = struct wlr_foreign_toplevel *wlr_toplevel =
wl_container_of(listener, toplevel, wlr_toplevel.on_view.maximized); wl_container_of(listener, wlr_toplevel, on_view.maximized);
assert(toplevel->wlr_toplevel.handle); assert(wlr_toplevel->handle);
wlr_foreign_toplevel_handle_v1_set_maximized( wlr_foreign_toplevel_handle_v1_set_maximized(wlr_toplevel->handle,
toplevel->wlr_toplevel.handle, wlr_toplevel->view->maximized == VIEW_AXIS_BOTH);
toplevel->view->maximized == VIEW_AXIS_BOTH);
} }
static void static void
handle_minimized(struct wl_listener *listener, void *data) handle_minimized(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = struct wlr_foreign_toplevel *wlr_toplevel =
wl_container_of(listener, toplevel, wlr_toplevel.on_view.minimized); wl_container_of(listener, wlr_toplevel, on_view.minimized);
assert(toplevel->wlr_toplevel.handle); assert(wlr_toplevel->handle);
wlr_foreign_toplevel_handle_v1_set_minimized( wlr_foreign_toplevel_handle_v1_set_minimized(wlr_toplevel->handle,
toplevel->wlr_toplevel.handle, toplevel->view->minimized); wlr_toplevel->view->minimized);
} }
static void static void
handle_fullscreened(struct wl_listener *listener, void *data) handle_fullscreened(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = struct wlr_foreign_toplevel *wlr_toplevel =
wl_container_of(listener, toplevel, wlr_toplevel.on_view.fullscreened); wl_container_of(listener, wlr_toplevel, on_view.fullscreened);
assert(toplevel->wlr_toplevel.handle); assert(wlr_toplevel->handle);
wlr_foreign_toplevel_handle_v1_set_fullscreen( wlr_foreign_toplevel_handle_v1_set_fullscreen(wlr_toplevel->handle,
toplevel->wlr_toplevel.handle, toplevel->view->fullscreen); wlr_toplevel->view->fullscreen);
} }
static void static void
handle_activated(struct wl_listener *listener, void *data) handle_activated(struct wl_listener *listener, void *data)
{ {
struct foreign_toplevel *toplevel = struct wlr_foreign_toplevel *wlr_toplevel =
wl_container_of(listener, toplevel, wlr_toplevel.on_view.activated); wl_container_of(listener, wlr_toplevel, on_view.activated);
assert(toplevel->wlr_toplevel.handle); assert(wlr_toplevel->handle);
bool *activated = data; bool *activated = data;
wlr_foreign_toplevel_handle_v1_set_activated( wlr_foreign_toplevel_handle_v1_set_activated(wlr_toplevel->handle,
toplevel->wlr_toplevel.handle, *activated); *activated);
}
/* Internal signals */
static void
handle_toplevel_parent(struct wl_listener *listener, void *data)
{
struct wlr_foreign_toplevel *wlr_toplevel = wl_container_of(
listener, wlr_toplevel, on_foreign_toplevel.toplevel_parent);
struct foreign_toplevel *parent = data;
assert(wlr_toplevel->handle);
/* The wlroots wlr-foreign-toplevel impl ensures parent is reset to NULL on destroy */
wlr_foreign_toplevel_handle_v1_set_parent(wlr_toplevel->handle, parent
? parent->wlr_toplevel.handle
: NULL);
}
static void
handle_toplevel_destroy(struct wl_listener *listener, void *data)
{
struct wlr_foreign_toplevel *wlr_toplevel = wl_container_of(
listener, wlr_toplevel, on_foreign_toplevel.toplevel_destroy);
assert(wlr_toplevel->handle);
/* invokes handle_handle_destroy() which does more cleanup */
wlr_foreign_toplevel_handle_v1_destroy(wlr_toplevel->handle);
} }
/* Internal API */ /* Internal API */
void void
wlr_foreign_toplevel_init(struct foreign_toplevel *toplevel) wlr_foreign_toplevel_init(struct wlr_foreign_toplevel *wlr_toplevel,
struct view *view)
{ {
struct wlr_foreign_toplevel *wlr_toplevel = &toplevel->wlr_toplevel;
struct view *view = toplevel->view;
assert(view->server->foreign_toplevel_manager); assert(view->server->foreign_toplevel_manager);
wlr_toplevel->view = view;
wlr_toplevel->handle = wlr_foreign_toplevel_handle_v1_create( wlr_toplevel->handle = wlr_foreign_toplevel_handle_v1_create(
view->server->foreign_toplevel_manager); view->server->foreign_toplevel_manager);
@ -262,8 +230,29 @@ wlr_foreign_toplevel_init(struct foreign_toplevel *toplevel)
CONNECT_SIGNAL(view, &wlr_toplevel->on_view, minimized); CONNECT_SIGNAL(view, &wlr_toplevel->on_view, minimized);
CONNECT_SIGNAL(view, &wlr_toplevel->on_view, fullscreened); CONNECT_SIGNAL(view, &wlr_toplevel->on_view, fullscreened);
CONNECT_SIGNAL(view, &wlr_toplevel->on_view, activated); CONNECT_SIGNAL(view, &wlr_toplevel->on_view, activated);
}
/* Internal signals */
CONNECT_SIGNAL(toplevel, &wlr_toplevel->on_foreign_toplevel, toplevel_parent); void
CONNECT_SIGNAL(toplevel, &wlr_toplevel->on_foreign_toplevel, toplevel_destroy); wlr_foreign_toplevel_set_parent(struct wlr_foreign_toplevel *wlr_toplevel,
struct wlr_foreign_toplevel *parent)
{
if (!wlr_toplevel->handle) {
return;
}
/* The wlroots wlr-foreign-toplevel impl ensures parent is reset to NULL on destroy */
wlr_foreign_toplevel_handle_v1_set_parent(wlr_toplevel->handle,
parent ? parent->handle : NULL);
}
void
wlr_foreign_toplevel_finish(struct wlr_foreign_toplevel *wlr_toplevel)
{
if (!wlr_toplevel->handle) {
return;
}
/* invokes handle_handle_destroy() which does more cleanup */
wlr_foreign_toplevel_handle_v1_destroy(wlr_toplevel->handle);
assert(!wlr_toplevel->handle);
} }

3
src/view-impl-common.c
View file

@ -1,9 +1,8 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/* view-impl-common.c: common code for shell view->impl functions */ /* view-impl-common.c: common code for shell view->impl functions */
#include "view-impl-common.h" #include "view-impl-common.h"
#include <stdio.h>
#include <strings.h> #include <strings.h>
#include "foreign-toplevel.h" #include "foreign-toplevel/foreign.h"
#include "labwc.h" #include "labwc.h"
#include "view.h" #include "view.h"
#include "window-rules.h" #include "window-rules.h"

2
src/view.c
View file

@ -14,7 +14,7 @@
#include "common/match.h" #include "common/match.h"
#include "common/mem.h" #include "common/mem.h"
#include "common/scene-helpers.h" #include "common/scene-helpers.h"
#include "foreign-toplevel.h" #include "foreign-toplevel/foreign.h"
#include "input/keyboard.h" #include "input/keyboard.h"
#include "labwc.h" #include "labwc.h"
#include "menu/menu.h" #include "menu/menu.h"

2
src/xdg.c
View file

@ -10,7 +10,7 @@
#include "common/macros.h" #include "common/macros.h"
#include "common/mem.h" #include "common/mem.h"
#include "decorations.h" #include "decorations.h"
#include "foreign-toplevel.h" #include "foreign-toplevel/foreign.h"
#include "labwc.h" #include "labwc.h"
#include "menu/menu.h" #include "menu/menu.h"
#include "node.h" #include "node.h"

2
src/xwayland.c
View file

@ -13,7 +13,7 @@
#include "common/mem.h" #include "common/mem.h"
#include "config/rcxml.h" #include "config/rcxml.h"
#include "config/session.h" #include "config/session.h"
#include "foreign-toplevel.h" #include "foreign-toplevel/foreign.h"
#include "labwc.h" #include "labwc.h"
#include "node.h" #include "node.h"
#include "output.h" #include "output.h"