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

decorations: refactor view_set_decorations

Browse source
This commit is contained in:
Tobias Bengfort 2024-04-18 09:46:36 +02:00 • committed by Johan Malm
parent bab1be834d
commit a0debda142
8 changed files with 88 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/ssd.h
View file

@ -48,6 +48,12 @@ enum ssd_part_type {
LAB_SSD_END_MARKER
};
enum ssd_mode {
LAB_SSD_MODE_NONE,
LAB_SSD_MODE_BORDER,
LAB_SSD_MODE_FULL
};
/* Forward declare arguments */
struct ssd;
struct ssd_button;
@ -72,7 +78,7 @@ void ssd_set_active(struct ssd *ssd, bool active);
void ssd_update_title(struct ssd *ssd);
void ssd_update_geometry(struct ssd *ssd);
void ssd_destroy(struct ssd *ssd);
void ssd_titlebar_hide(struct ssd *ssd);
void ssd_set_titlebar(struct ssd *ssd, bool enabled);
void ssd_enable_keybind_inhibit_indicator(struct ssd *ssd, bool enable);
void ssd_enable_shade(struct ssd *ssd, bool enable);

3
include/view.h
View file

@ -483,7 +483,8 @@ void view_toggle_visible_on_all_workspaces(struct view *view);
bool view_is_tiled(struct view *view);
bool view_is_floating(struct view *view);
void view_move_to_workspace(struct view *view, struct workspace *workspace);
void view_set_decorations(struct view *view, bool decorations);
enum ssd_mode view_get_ssd_mode(struct view *view);
void view_set_ssd_mode(struct view *view, enum ssd_mode mode);
void view_toggle_fullscreen(struct view *view);
void view_invalidate_last_layout_geometry(struct view *view);
void view_adjust_for_layout_change(struct view *view);

7
src/decorations/kde-deco.c
View file

@ -52,8 +52,11 @@ handle_mode(struct wl_listener *listener, void *data)
"requested: %u", client_mode);
}
view_set_decorations(kde_deco->view,
kde_deco->view->ssd_preference == LAB_SSD_PREF_SERVER);
if (kde_deco->view->ssd_preference == LAB_SSD_PREF_SERVER) {
view_set_ssd_mode(kde_deco->view, LAB_SSD_MODE_FULL);
} else {
view_set_ssd_mode(kde_deco->view, LAB_SSD_MODE_NONE);
}
}
static void

7
src/decorations/xdg-deco.c
View file

@ -48,8 +48,11 @@ xdg_deco_request_mode(struct wl_listener *listener, void *data)
wlr_xdg_toplevel_decoration_v1_set_mode(xdg_deco->wlr_xdg_decoration,
client_mode);
view_set_decorations(xdg_deco->view,
client_mode == WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE);
if (client_mode == WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE) {
view_set_ssd_mode(xdg_deco->view, LAB_SSD_MODE_FULL);
} else {
view_set_ssd_mode(xdg_deco->view, LAB_SSD_MODE_NONE);
}
}
static void

10
src/ssd/ssd.c
View file

@ -191,7 +191,7 @@ ssd_create(struct view *view, bool active)
ssd_titlebar_create(ssd);
if (view->ssd_titlebar_hidden) {
/* Ensure we keep the old state on Reconfigure or when exiting fullscreen */
ssd_titlebar_hide(ssd);
ssd_set_titlebar(ssd, false);
}
ssd->margin = ssd_thickness(view);
ssd_set_active(ssd, active);
@ -267,13 +267,13 @@ ssd_update_geometry(struct ssd *ssd)
}
void
ssd_titlebar_hide(struct ssd *ssd)
ssd_set_titlebar(struct ssd *ssd, bool enabled)
{
if (!ssd || !ssd->titlebar.tree->node.enabled) {
if (!ssd || ssd->titlebar.tree->node.enabled == enabled) {
return;
}
wlr_scene_node_set_enabled(&ssd->titlebar.tree->node, false);
ssd->titlebar.height = 0;
wlr_scene_node_set_enabled(&ssd->titlebar.tree->node, enabled);
ssd->titlebar.height = enabled ? ssd->view->server->theme->title_height : 0;
ssd_border_update(ssd);
ssd_extents_update(ssd);
ssd_shadow_update(ssd);

79
src/view.c
View file

@ -1223,25 +1223,14 @@ view_toggle_decorations(struct view *view)
{
assert(view);
/* Reject decoration toggles when shaded */
if (view->shaded) {
return;
enum ssd_mode mode = view_get_ssd_mode(view);
if (rc.ssd_keep_border && mode == LAB_SSD_MODE_FULL) {
view_set_ssd_mode(view, LAB_SSD_MODE_BORDER);
} else if (mode != LAB_SSD_MODE_NONE) {
view_set_ssd_mode(view, LAB_SSD_MODE_NONE);
} else {
view_set_ssd_mode(view, LAB_SSD_MODE_FULL);
}
if (rc.ssd_keep_border && view->ssd_enabled && view->ssd
&& !view->ssd_titlebar_hidden) {
/*
* ssd_titlebar_hidden has to be set before calling
* ssd_titlebar_hide() to make ssd_thickness() happy.
*/
view->ssd_titlebar_hidden = true;
ssd_titlebar_hide(view->ssd);
if (!view_is_floating(view)) {
view_apply_special_geometry(view);
}
return;
}
view_set_decorations(view, !view->ssd_enabled);
}
bool
@ -1323,26 +1312,46 @@ undecorate(struct view *view)
view->ssd = NULL;
}
void
view_set_decorations(struct view *view, bool decorations)
enum ssd_mode
view_get_ssd_mode(struct view *view)
{
assert(view);
if (view->ssd_enabled != decorations && !view->fullscreen) {
/*
* Set view->ssd_enabled first since it is referenced
* within the call tree of ssd_create()
*/
view->ssd_enabled = decorations;
if (decorations) {
decorate(view);
} else {
undecorate(view);
view->ssd_titlebar_hidden = false;
}
if (!view_is_floating(view)) {
view_apply_special_geometry(view);
}
if (!view->ssd_enabled) {
return LAB_SSD_MODE_NONE;
} else if (view->ssd_titlebar_hidden) {
return LAB_SSD_MODE_BORDER;
} else {
return LAB_SSD_MODE_FULL;
}
}
void
view_set_ssd_mode(struct view *view, enum ssd_mode mode)
{
assert(view);
if (view->shaded || view->fullscreen
|| mode == view_get_ssd_mode(view)) {
return;
}
/*
* Set these first since they are referenced
* within the call tree of ssd_create() and ssd_thickness()
*/
view->ssd_enabled = mode != LAB_SSD_MODE_NONE;
view->ssd_titlebar_hidden = mode != LAB_SSD_MODE_FULL;
if (view->ssd_enabled) {
decorate(view);
ssd_set_titlebar(view->ssd, !view->ssd_titlebar_hidden);
} else {
undecorate(view);
}
if (!view_is_floating(view)) {
view_apply_special_geometry(view);
}
}

6
src/xdg.c
View file

@ -599,7 +599,11 @@ xdg_toplevel_view_map(struct view *view)
init_foreign_toplevel(view);
view_set_decorations(view, has_ssd(view));
if (has_ssd(view)) {
view_set_ssd_mode(view, LAB_SSD_MODE_FULL);
} else {
view_set_ssd_mode(view, LAB_SSD_MODE_NONE);
}
/*
* Set initial "pending" dimensions (may be modified by

19
src/xwayland.c
View file

@ -435,8 +435,11 @@ handle_request_maximize(struct wl_listener *listener, void *data)
* Set decorations early to avoid changing geometry
* after maximize (reduces visual glitches).
*/
view_set_decorations(view,
want_deco(xwayland_surface_from_view(view)));
if (want_deco(xwayland_surface_from_view(view))) {
view_set_ssd_mode(view, LAB_SSD_MODE_FULL);
} else {
view_set_ssd_mode(view, LAB_SSD_MODE_NONE);
}
}
view_toggle_maximize(view, VIEW_AXIS_BOTH);
}
@ -508,7 +511,11 @@ handle_set_decorations(struct wl_listener *listener, void *data)
wl_container_of(listener, xwayland_view, set_decorations);
struct view *view = &xwayland_view->base;
view_set_decorations(view, want_deco(xwayland_view->xwayland_surface));
if (want_deco(xwayland_view->xwayland_surface)) {
view_set_ssd_mode(view, LAB_SSD_MODE_FULL);
} else {
view_set_ssd_mode(view, LAB_SSD_MODE_NONE);
}
}
static void
@ -659,7 +666,11 @@ xwayland_view_map(struct view *view)
*/
view_set_fullscreen(view, xwayland_surface->fullscreen);
if (!view->been_mapped) {
view_set_decorations(view, want_deco(xwayland_surface));
if (want_deco(xwayland_surface)) {
view_set_ssd_mode(view, LAB_SSD_MODE_FULL);
} else {
view_set_ssd_mode(view, LAB_SSD_MODE_NONE);
}
}
enum view_axis axis = VIEW_AXIS_NONE;
if (xwayland_surface->maximized_horz) {