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

tree-wide: use rc.theme instead of server.theme

Browse source 
Having two global pointers to the same struct is redundant.
This commit is contained in:
John Lindgren 2026-03-21 22:47:22 -04:00 • committed by Consolatis
parent 9550bccef2
commit d4ad27e636
18 changed files with 46 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/labwc.h
View file

@ -302,8 +302,6 @@ struct server {
/* Set when in cycle (alt-tab) mode */ /* Set when in cycle (alt-tab) mode */
struct cycle_state cycle; struct cycle_state cycle;
struct theme *theme;
struct menu *menu_current; struct menu *menu_current;
struct wl_list menus; struct wl_list menus;

3
include/theme.h
View file

@ -213,12 +213,9 @@ struct theme {
int mag_border_width; int mag_border_width;
}; };
struct server;
/** /**
* theme_init - read openbox theme and generate button textures * theme_init - read openbox theme and generate button textures
* @theme: theme data * @theme: theme data
* @server: server
* @theme_name: theme-name in <theme-dir>/<theme-name>/labwc/themerc * @theme_name: theme-name in <theme-dir>/<theme-name>/labwc/themerc
* Note <theme-dir> is obtained in theme-dir.c * Note <theme-dir> is obtained in theme-dir.c
*/ */

2
src/action.c
View file

@ -776,7 +776,7 @@ show_menu(struct view *view, struct cursor_context *ctx,
int lx, ly; int lx, ly;
wlr_scene_node_coords(ctx->node, &lx, &ly); wlr_scene_node_coords(ctx->node, &lx, &ly);
/* MAX() prevents negative x when the window is maximized */ /* MAX() prevents negative x when the window is maximized */
x = MAX(x, lx - server.theme->menu_border_width); x = MAX(x, lx - rc.theme->menu_border_width);
} }
} }

2
src/cycle/cycle.c
View file

@ -26,7 +26,7 @@ static void
update_preview_outlines(struct view *view) update_preview_outlines(struct view *view)
{ {
/* Create / Update preview outline tree */ /* Create / Update preview outline tree */
struct theme *theme = server.theme; struct theme *theme = rc.theme;
struct lab_scene_rect *rect = server.cycle.preview_outline; struct lab_scene_rect *rect = server.cycle.preview_outline;
if (!rect) { if (!rect) {
struct lab_scene_rect_options opts = { struct lab_scene_rect_options opts = {

4
src/cycle/osd-classic.c
View file

@ -32,7 +32,7 @@ create_fields_scene(struct view *view,
struct wlr_scene_tree *parent, const float *text_color, struct wlr_scene_tree *parent, const float *text_color,
const float *bg_color, int field_widths_sum, int x, int y) const float *bg_color, int field_widths_sum, int x, int y)
{ {
struct theme *theme = server.theme; struct theme *theme = rc.theme;
struct window_switcher_classic_theme *switcher_theme = struct window_switcher_classic_theme *switcher_theme =
&theme->osd_window_switcher_classic; &theme->osd_window_switcher_classic;
@ -80,7 +80,7 @@ static void
cycle_osd_classic_init(struct cycle_osd_output *osd_output) cycle_osd_classic_init(struct cycle_osd_output *osd_output)
{ {
struct output *output = osd_output->output; struct output *output = osd_output->output;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
struct window_switcher_classic_theme *switcher_theme = struct window_switcher_classic_theme *switcher_theme =
&theme->osd_window_switcher_classic; &theme->osd_window_switcher_classic;
int padding = theme->osd_border_width + switcher_theme->padding; int padding = theme->osd_border_width + switcher_theme->padding;

6
src/cycle/osd-thumbnail.c
View file

@ -119,7 +119,7 @@ static struct cycle_osd_thumbnail_item *
create_item_scene(struct wlr_scene_tree *parent, struct view *view, create_item_scene(struct wlr_scene_tree *parent, struct view *view,
struct cycle_osd_output *osd_output) struct cycle_osd_output *osd_output)
{ {
struct theme *theme = server.theme; struct theme *theme = rc.theme;
struct window_switcher_thumbnail_theme *switcher_theme = struct window_switcher_thumbnail_theme *switcher_theme =
&theme->osd_window_switcher_thumbnail; &theme->osd_window_switcher_thumbnail;
int padding = theme->border_width + switcher_theme->item_padding; int padding = theme->border_width + switcher_theme->item_padding;
@ -196,7 +196,7 @@ static void
get_items_geometry(struct output *output, int nr_thumbs, get_items_geometry(struct output *output, int nr_thumbs,
int *nr_cols, int *nr_rows, int *nr_visible_rows) int *nr_cols, int *nr_rows, int *nr_visible_rows)
{ {
struct theme *theme = server.theme; struct theme *theme = rc.theme;
struct window_switcher_thumbnail_theme *switcher_theme = struct window_switcher_thumbnail_theme *switcher_theme =
&theme->osd_window_switcher_thumbnail; &theme->osd_window_switcher_thumbnail;
int output_width, output_height; int output_width, output_height;
@ -232,7 +232,7 @@ static void
cycle_osd_thumbnail_init(struct cycle_osd_output *osd_output) cycle_osd_thumbnail_init(struct cycle_osd_output *osd_output)
{ {
struct output *output = osd_output->output; struct output *output = osd_output->output;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
struct window_switcher_thumbnail_theme *switcher_theme = struct window_switcher_thumbnail_theme *switcher_theme =
&theme->osd_window_switcher_thumbnail; &theme->osd_window_switcher_thumbnail;
int padding = theme->osd_border_width + switcher_theme->padding; int padding = theme->osd_border_width + switcher_theme->padding;

2
src/magnifier.c
View file

@ -41,7 +41,7 @@ box_logical_to_physical(struct wlr_box *box, struct wlr_output *output)
void void
magnifier_draw(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box *damage) magnifier_draw(struct output *output, struct wlr_buffer *output_buffer, struct wlr_box *damage)
{ {
struct theme *theme = server.theme; struct theme *theme = rc.theme;
bool fullscreen = (rc.mag_width == -1 || rc.mag_height == -1); bool fullscreen = (rc.mag_width == -1 || rc.mag_height == -1);
struct wlr_box output_box = { struct wlr_box output_box = {

1
src/main.c
View file

@ -260,7 +260,6 @@ main(int argc, char *argv[])
struct theme theme = { 0 }; struct theme theme = { 0 };
theme_init(&theme, rc.theme_name); theme_init(&theme, rc.theme_name);
rc.theme = &theme; rc.theme = &theme;
server.theme = &theme;
menu_init(); menu_init();

14
src/menu/menu.c
View file

@ -135,7 +135,7 @@ item_create(struct menu *menu, const char *text, const char *icon_name, bool sho
assert(menu); assert(menu);
assert(text); assert(text);
struct theme *theme = server.theme; struct theme *theme = rc.theme;
struct menuitem *menuitem = znew(*menuitem); struct menuitem *menuitem = znew(*menuitem);
menuitem->parent = menu; menuitem->parent = menu;
menuitem->selectable = true; menuitem->selectable = true;
@ -166,7 +166,7 @@ item_create_scene_for_state(struct menuitem *item, float *text_color,
float *bg_color) float *bg_color)
{ {
struct menu *menu = item->parent; struct menu *menu = item->parent;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
/* Tree to hold background and label buffers */ /* Tree to hold background and label buffers */
struct wlr_scene_tree *tree = lab_wlr_scene_tree_create(item->tree); struct wlr_scene_tree *tree = lab_wlr_scene_tree_create(item->tree);
@ -242,7 +242,7 @@ item_create_scene(struct menuitem *menuitem, int *item_y)
assert(menuitem); assert(menuitem);
assert(menuitem->type == LAB_MENU_ITEM); assert(menuitem->type == LAB_MENU_ITEM);
struct menu *menu = menuitem->parent; struct menu *menu = menuitem->parent;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
/* Menu item root node */ /* Menu item root node */
menuitem->tree = lab_wlr_scene_tree_create(menu->scene_tree); menuitem->tree = lab_wlr_scene_tree_create(menu->scene_tree);
@ -291,7 +291,7 @@ separator_create_scene(struct menuitem *menuitem, int *item_y)
assert(menuitem); assert(menuitem);
assert(menuitem->type == LAB_MENU_SEPARATOR_LINE); assert(menuitem->type == LAB_MENU_SEPARATOR_LINE);
struct menu *menu = menuitem->parent; struct menu *menu = menuitem->parent;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
/* Menu item root node */ /* Menu item root node */
menuitem->tree = lab_wlr_scene_tree_create(menu->scene_tree); menuitem->tree = lab_wlr_scene_tree_create(menu->scene_tree);
@ -337,7 +337,7 @@ title_create_scene(struct menuitem *menuitem, int *item_y)
assert(menuitem); assert(menuitem);
assert(menuitem->type == LAB_MENU_TITLE); assert(menuitem->type == LAB_MENU_TITLE);
struct menu *menu = menuitem->parent; struct menu *menu = menuitem->parent;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
float *bg_color = theme->menu_title_bg_color; float *bg_color = theme->menu_title_bg_color;
float *text_color = theme->menu_title_text_color; float *text_color = theme->menu_title_text_color;
@ -411,7 +411,7 @@ static void
menu_create_scene(struct menu *menu) menu_create_scene(struct menu *menu)
{ {
struct menuitem *item; struct menuitem *item;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
assert(!menu->scene_tree); assert(!menu->scene_tree);
@ -1351,7 +1351,7 @@ menu_process_item_selection(struct menuitem *item)
item->submenu->parent = item->parent; item->submenu->parent = item->parent;
/* And open the new submenu tree */ /* And open the new submenu tree */
struct wlr_box anchor_rect = struct wlr_box anchor_rect =
get_item_anchor_rect(server.theme, item); get_item_anchor_rect(rc.theme, item);
if (item->submenu->execute && !item->submenu->scene_tree) { if (item->submenu->execute && !item->submenu->scene_tree) {
open_pipemenu_async(item->submenu, anchor_rect); open_pipemenu_async(item->submenu, anchor_rect);
} else { } else {

8
src/resize-outlines.c
View file

@ -4,7 +4,7 @@
#include <wlr/types/wlr_scene.h> #include <wlr/types/wlr_scene.h>
#include "common/border.h" #include "common/border.h"
#include "common/lab-scene-rect.h" #include "common/lab-scene-rect.h"
#include "labwc.h" #include "config/rcxml.h"
#include "resize-indicator.h" #include "resize-indicator.h"
#include "ssd.h" #include "ssd.h"
#include "theme.h" #include "theme.h"
@ -25,9 +25,9 @@ resize_outlines_update(struct view *view, struct wlr_box new_geo)
if (!outlines->rect) { if (!outlines->rect) {
struct lab_scene_rect_options opts = { struct lab_scene_rect_options opts = {
.border_colors = (float *[3]) { .border_colors = (float *[3]) {
server.theme->osd_bg_color, rc.theme->osd_bg_color,
server.theme->osd_label_text_color, rc.theme->osd_label_text_color,
server.theme->osd_bg_color, rc.theme->osd_bg_color,
}, },
.nr_borders = 3, .nr_borders = 3,
.border_width = 1, .border_width = 1,

4
src/server.c
View file

@ -86,8 +86,8 @@ reload_config_and_theme(void)
scaled_buffer_invalidate_sharing(); scaled_buffer_invalidate_sharing();
rcxml_finish(); rcxml_finish();
rcxml_read(rc.config_file); rcxml_read(rc.config_file);
theme_finish(server.theme); theme_finish(rc.theme);
theme_init(server.theme, rc.theme_name); theme_init(rc.theme, rc.theme_name);
#if HAVE_LIBSFDO #if HAVE_LIBSFDO
desktop_entry_finish(); desktop_entry_finish();

6
src/ssd/ssd-border.c
View file

@ -4,7 +4,7 @@
#include <wlr/types/wlr_scene.h> #include <wlr/types/wlr_scene.h>
#include "common/macros.h" #include "common/macros.h"
#include "common/scene-helpers.h" #include "common/scene-helpers.h"
#include "labwc.h" #include "config/rcxml.h"
#include "ssd.h" #include "ssd.h"
#include "ssd-internal.h" #include "ssd-internal.h"
#include "theme.h" #include "theme.h"
@ -17,7 +17,7 @@ ssd_border_create(struct ssd *ssd)
assert(!ssd->border.tree); assert(!ssd->border.tree);
struct view *view = ssd->view; struct view *view = ssd->view;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
int width = view->current.width; int width = view->current.width;
int height = view_effective_height(view, /* use_pending */ false); int height = view_effective_height(view, /* use_pending */ false);
int full_width = width + 2 * theme->border_width; int full_width = width + 2 * theme->border_width;
@ -90,7 +90,7 @@ ssd_border_update(struct ssd *ssd)
ssd->margin = ssd_thickness(ssd->view); ssd->margin = ssd_thickness(ssd->view);
} }
struct theme *theme = server.theme; struct theme *theme = rc.theme;
int width = view->current.width; int width = view->current.width;
int height = view_effective_height(view, /* use_pending */ false); int height = view_effective_height(view, /* use_pending */ false);

4
src/ssd/ssd-extents.c
View file

@ -14,7 +14,7 @@ void
ssd_extents_create(struct ssd *ssd) ssd_extents_create(struct ssd *ssd)
{ {
struct view *view = ssd->view; struct view *view = ssd->view;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
int border_width = MAX(0, MAX(rc.resize_minimum_area, theme->border_width)); int border_width = MAX(0, MAX(rc.resize_minimum_area, theme->border_width));
@ -100,7 +100,7 @@ ssd_extents_update(struct ssd *ssd)
return; return;
} }
struct theme *theme = server.theme; struct theme *theme = rc.theme;
int width = view->current.width; int width = view->current.width;
int height = view_effective_height(view, /* use_pending */ false); int height = view_effective_height(view, /* use_pending */ false);

6
src/ssd/ssd-shadow.c
View file

@ -145,7 +145,7 @@ static void
set_shadow_geometry(struct ssd *ssd) set_shadow_geometry(struct ssd *ssd)
{ {
struct view *view = ssd->view; struct view *view = ssd->view;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
int titlebar_height = ssd->titlebar.height; int titlebar_height = ssd->titlebar.height;
int width = view->current.width; int width = view->current.width;
int height = view_effective_height(view, false) + titlebar_height; int height = view_effective_height(view, false) + titlebar_height;
@ -203,7 +203,7 @@ ssd_shadow_create(struct ssd *ssd)
ssd->shadow.tree = lab_wlr_scene_tree_create(ssd->tree); ssd->shadow.tree = lab_wlr_scene_tree_create(ssd->tree);
struct theme *theme = server.theme; struct theme *theme = rc.theme;
struct view *view = ssd->view; struct view *view = ssd->view;
enum ssd_active_state active; enum ssd_active_state active;
@ -256,7 +256,7 @@ ssd_shadow_update(struct ssd *ssd)
assert(ssd->shadow.tree); assert(ssd->shadow.tree);
struct view *view = ssd->view; struct view *view = ssd->view;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
bool maximized = view->maximized == VIEW_AXIS_BOTH; bool maximized = view->maximized == VIEW_AXIS_BOTH;
bool tiled_shadows = false; bool tiled_shadows = false;
if (rc.shadows_on_tiled) { if (rc.shadows_on_tiled) {

18
src/ssd/ssd-titlebar.c
View file

@ -27,7 +27,7 @@ void
ssd_titlebar_create(struct ssd *ssd) ssd_titlebar_create(struct ssd *ssd)
{ {
struct view *view = ssd->view; struct view *view = ssd->view;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
int width = view->current.width; int width = view->current.width;
int corner_width = ssd_get_corner_width(); int corner_width = ssd_get_corner_width();
@ -160,7 +160,7 @@ set_squared_corners(struct ssd *ssd, bool enable)
struct view *view = ssd->view; struct view *view = ssd->view;
int width = view->current.width; int width = view->current.width;
int corner_width = ssd_get_corner_width(); int corner_width = ssd_get_corner_width();
struct theme *theme = server.theme; struct theme *theme = rc.theme;
int x = enable ? 0 : corner_width; int x = enable ? 0 : corner_width;
@ -220,7 +220,7 @@ static void
update_visible_buttons(struct ssd *ssd) update_visible_buttons(struct ssd *ssd)
{ {
struct view *view = ssd->view; struct view *view = ssd->view;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
int width = MAX(view->current.width - 2 * theme->window_titlebar_padding_width, 0); int width = MAX(view->current.width - 2 * theme->window_titlebar_padding_width, 0);
int button_width = theme->window_button_width; int button_width = theme->window_button_width;
int button_spacing = theme->window_button_spacing; int button_spacing = theme->window_button_spacing;
@ -273,7 +273,7 @@ ssd_titlebar_update(struct ssd *ssd)
struct view *view = ssd->view; struct view *view = ssd->view;
int width = view->current.width; int width = view->current.width;
int corner_width = ssd_get_corner_width(); int corner_width = ssd_get_corner_width();
struct theme *theme = server.theme; struct theme *theme = rc.theme;
bool maximized = view->maximized == VIEW_AXIS_BOTH; bool maximized = view->maximized == VIEW_AXIS_BOTH;
bool squared = ssd_should_be_squared(ssd); bool squared = ssd_should_be_squared(ssd);
@ -365,7 +365,7 @@ static void
ssd_update_title_positions(struct ssd *ssd, int offset_left, int offset_right) ssd_update_title_positions(struct ssd *ssd, int offset_left, int offset_right)
{ {
struct view *view = ssd->view; struct view *view = ssd->view;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
int width = view->current.width; int width = view->current.width;
int title_bg_width = width - offset_left - offset_right; int title_bg_width = width - offset_left - offset_right;
@ -413,9 +413,9 @@ static void
get_title_offsets(struct ssd *ssd, int *offset_left, int *offset_right) get_title_offsets(struct ssd *ssd, int *offset_left, int *offset_right)
{ {
struct ssd_titlebar_subtree *subtree = &ssd->titlebar.subtrees[SSD_ACTIVE]; struct ssd_titlebar_subtree *subtree = &ssd->titlebar.subtrees[SSD_ACTIVE];
int button_width = server.theme->window_button_width; int button_width = rc.theme->window_button_width;
int button_spacing = server.theme->window_button_spacing; int button_spacing = rc.theme->window_button_spacing;
int padding_width = server.theme->window_titlebar_padding_width; int padding_width = rc.theme->window_titlebar_padding_width;
*offset_left = padding_width; *offset_left = padding_width;
*offset_right = padding_width; *offset_right = padding_width;
@ -443,7 +443,7 @@ ssd_update_title(struct ssd *ssd)
/* view->title is never NULL (instead it can be an empty string) */ /* view->title is never NULL (instead it can be an empty string) */
assert(view->title); assert(view->title);
struct theme *theme = server.theme; struct theme *theme = rc.theme;
struct ssd_state_title *state = &ssd->state.title; struct ssd_state_title *state = &ssd->state.title;
bool title_unchanged = state->text && !strcmp(view->title, state->text); bool title_unchanged = state->text && !strcmp(view->title, state->text);

8
src/ssd/ssd.c
View file

@ -39,7 +39,7 @@ ssd_thickness(struct view *view)
return (struct border){ 0 }; return (struct border){ 0 };
} }
struct theme *theme = server.theme; struct theme *theme = rc.theme;
if (view->maximized == VIEW_AXIS_BOTH) { if (view->maximized == VIEW_AXIS_BOTH) {
struct border thickness = { 0 }; struct border thickness = { 0 };
@ -101,7 +101,7 @@ ssd_get_resizing_type(const struct ssd *ssd, struct wlr_cursor *cursor)
if (view_titlebar_visible(view)) { if (view_titlebar_visible(view)) {
/* If the titlebar is visible, consider it part of the view */ /* If the titlebar is visible, consider it part of the view */
int titlebar_height = server.theme->titlebar_height; int titlebar_height = rc.theme->titlebar_height;
view_box.y -= titlebar_height; view_box.y -= titlebar_height;
view_box.height += titlebar_height; view_box.height += titlebar_height;
} }
@ -156,7 +156,7 @@ ssd_create(struct view *view, bool active)
LAB_NODE_SSD_ROOT, view, /*data*/ NULL); LAB_NODE_SSD_ROOT, view, /*data*/ NULL);
wlr_scene_node_lower_to_bottom(&ssd->tree->node); wlr_scene_node_lower_to_bottom(&ssd->tree->node);
ssd->titlebar.height = server.theme->titlebar_height; ssd->titlebar.height = rc.theme->titlebar_height;
ssd_shadow_create(ssd); ssd_shadow_create(ssd);
ssd_extents_create(ssd); ssd_extents_create(ssd);
/* /*
@ -257,7 +257,7 @@ ssd_set_titlebar(struct ssd *ssd, bool enabled)
return; return;
} }
wlr_scene_node_set_enabled(&ssd->titlebar.tree->node, enabled); wlr_scene_node_set_enabled(&ssd->titlebar.tree->node, enabled);
ssd->titlebar.height = enabled ? server.theme->titlebar_height : 0; ssd->titlebar.height = enabled ? rc.theme->titlebar_height : 0;
ssd_border_update(ssd); ssd_border_update(ssd);
ssd_extents_update(ssd); ssd_extents_update(ssd);
ssd_shadow_update(ssd); ssd_shadow_update(ssd);

2
src/view.c
View file

@ -994,7 +994,7 @@ view_compute_cascaded_position(struct view *view, struct wlr_box *geom)
/* TODO: move this logic to rcxml.c */ /* TODO: move this logic to rcxml.c */
int offset_x = rc.placement_cascade_offset_x; int offset_x = rc.placement_cascade_offset_x;
int offset_y = rc.placement_cascade_offset_y; int offset_y = rc.placement_cascade_offset_y;
struct theme *theme = server.theme; struct theme *theme = rc.theme;
int default_offset = theme->titlebar_height + theme->border_width + 5; int default_offset = theme->titlebar_height + theme->border_width + 5;
if (offset_x <= 0) { if (offset_x <= 0) {
offset_x = default_offset; offset_x = default_offset;

6
src/workspaces.c
View file

@ -64,7 +64,7 @@ parse_workspace_index(const char *name)
static void static void
_osd_update(void) _osd_update(void)
{ {
struct theme *theme = server.theme; struct theme *theme = rc.theme;
/* Settings */ /* Settings */
uint16_t margin = 10; uint16_t margin = 10;
@ -117,7 +117,7 @@ _osd_update(void)
x = (width - marker_width) / 2; x = (width - marker_width) / 2;
wl_list_for_each(workspace, &server.workspaces.all, link) { wl_list_for_each(workspace, &server.workspaces.all, link) {
bool active = workspace == server.workspaces.current; bool active = workspace == server.workspaces.current;
set_cairo_color(cairo, server.theme->osd_label_text_color); set_cairo_color(cairo, rc.theme->osd_label_text_color);
struct wlr_fbox fbox = { struct wlr_fbox fbox = {
.x = x, .x = x,
.y = margin, .y = margin,
@ -136,7 +136,7 @@ _osd_update(void)
} }
/* Text */ /* Text */
set_cairo_color(cairo, server.theme->osd_label_text_color); set_cairo_color(cairo, rc.theme->osd_label_text_color);
PangoLayout *layout = pango_cairo_create_layout(cairo); PangoLayout *layout = pango_cairo_create_layout(cairo);
pango_context_set_round_glyph_positions(pango_layout_get_context(layout), false); pango_context_set_round_glyph_positions(pango_layout_get_context(layout), false);
pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END); pango_layout_set_ellipsize(layout, PANGO_ELLIPSIZE_END);