mirror of
https://github.com/labwc/labwc.git
synced 2025-10-29 05:40:24 -04:00
02df0a15d7
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
39 lines
1.1 KiB
C
39 lines
1.1 KiB
C
/* 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 */
|