mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-02 09:01:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Chase wlroots: Unified mapping

Browse source 
Need to handle new unified mapping, where mapping is attached to the
wlr_surface objects instead of their parents. Also, most of them require
a new associate event for xsurface objects, their surface member will be
NULL before this event is received.

Refactored by jlindgren:
- add struct mappable
- unify map/unmap logic
This commit is contained in:
Christopher Snowhill 2023-06-15 02:35:43 -07:00 • committed by Johan Malm
parent bf576e97de
commit d7dc6e01b4
10 changed files with 142 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/view.h
View file

@ -70,6 +70,13 @@ enum view_wants_focus {
struct view;
struct wlr_surface;
/* Common to struct view and struct xwayland_unmanaged */
struct mappable {
bool connected;
struct wl_listener map;
struct wl_listener unmap;
};
/* Basic size hints (subset of XSizeHints from X11) */
struct view_size_hints {
int min_width;
@ -194,8 +201,8 @@ struct view {
struct wl_listener destroy;
} toplevel;
struct wl_listener map;
struct wl_listener unmap;
struct mappable mappable;
struct wl_listener destroy;
struct wl_listener surface_destroy;
struct wl_listener commit;
@ -345,6 +352,10 @@ view_is_focusable(struct view *view) {
return view_is_focusable_from(view, NULL);
}
void mappable_connect(struct mappable *mappable, struct wlr_surface *surface,
wl_notify_func_t notify_map, wl_notify_func_t notify_unmap);
void mappable_disconnect(struct mappable *mappable);
void view_toggle_keybinds(struct view *view);
void view_set_activated(struct view *view, bool activated);
@ -427,6 +438,7 @@ void view_adjust_size(struct view *view, int *w, int *h);
void view_evacuate_region(struct view *view);
void view_on_output_destroy(struct view *view);
void view_connect_map(struct view *view, struct wlr_surface *surface);
void view_destroy(struct view *view);
enum view_axis view_axis_parse(const char *direction);

8
include/xwayland.h
View file

@ -13,12 +13,14 @@ struct xwayland_unmanaged {
struct wlr_scene_node *node;
struct wl_list link;
struct mappable mappable;
struct wl_listener associate;
struct wl_listener dissociate;
struct wl_listener request_activate;
struct wl_listener request_configure;
/* struct wl_listener request_fullscreen; */
struct wl_listener set_geometry;
struct wl_listener map;
struct wl_listener unmap;
struct wl_listener destroy;
struct wl_listener set_override_redirect;
};
@ -28,6 +30,8 @@ struct xwayland_view {
struct wlr_xwayland_surface *xwayland_surface;
/* Events unique to XWayland views */
struct wl_listener associate;
struct wl_listener dissociate;
struct wl_listener request_activate;
struct wl_listener request_configure;
struct wl_listener set_class;