mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-07 08:21:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename camelcase names

Browse source
This commit is contained in:
Jack Zeal 2026-04-05 17:57:15 -07:00
parent 987b2c2a89
commit 8997f35607
13 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/common/borderset.h
View file

@ -43,19 +43,19 @@ struct bufferset {
}; };
extern struct borderset *borderCache; extern struct borderset *border_cache;
struct borderset *getBorders(uint32_t id, int size, enum border_type, int bevelSize); struct borderset *get_borders(uint32_t id, int size, enum border_type, int bevelSize);
struct borderset *createBuffer(uint32_t id, int size, enum border_type, int bevelSize); struct borderset *create_buffer(uint32_t id, int size, enum border_type, int bevelSize);
struct bufferset *generateBufferset(struct wlr_scene_tree *tree, struct bufferset *generate_bufferset(struct wlr_scene_tree *tree,
struct borderset *borderset, int bw); struct borderset *borderset, int bw);
void renderBufferset(struct bufferset *bufferset, int width, int height, int y); void renderBufferset(struct bufferset *bufferset, int width, int height, int y);
void renderBuffersetXY(struct bufferset *bufferset, int width, int height, int x, int y); void renderBuffersetXY(struct bufferset *bufferset, int width, int height, int x, int y);
void clearBorderCache(struct borderset *borderset); void clearborder_cache(struct borderset *borderset);
#endif /* LABWC_BORDERSET_H */ #endif /* LABWC_BORDERSET_H */

4
include/ssd-internal.h
View file

@ -106,7 +106,7 @@ struct ssd {
struct scaled_font_buffer *title; struct scaled_font_buffer *title;
struct wl_list buttons_left; /* ssd_button.link */ struct wl_list buttons_left; /* ssd_button.link */
struct wl_list buttons_right; /* ssd_button.link */ struct wl_list buttons_right; /* ssd_button.link */
struct bufferset *texturedBorders; struct bufferset *textured_borders;
} subtrees[2]; /* indexed by enum ssd_active_state */ } subtrees[2]; /* indexed by enum ssd_active_state */
} titlebar; } titlebar;
@ -116,7 +116,7 @@ struct ssd {
struct ssd_border_subtree { struct ssd_border_subtree {
struct wlr_scene_tree *tree; struct wlr_scene_tree *tree;
struct wlr_scene_rect *top, *bottom, *left, *right; struct wlr_scene_rect *top, *bottom, *left, *right;
struct bufferset *texturedBorders; struct bufferset *textured_borders;
} subtrees[2]; /* indexed by enum ssd_active_state */ } subtrees[2]; /* indexed by enum ssd_active_state */
} border; } border;

2
include/view.h
View file

@ -244,7 +244,7 @@ struct view {
int width, height; int width, height;
struct wlr_scene_tree *tree; struct wlr_scene_tree *tree;
struct wlr_scene_rect *border; struct wlr_scene_rect *border;
struct bufferset *texturedBorders; struct bufferset *textured_borders;
struct wlr_scene_rect *background; struct wlr_scene_rect *background;
struct scaled_font_buffer *text; struct scaled_font_buffer *text;
} resize_indicator; } resize_indicator;

20
src/common/borderset.c
View file

@ -6,9 +6,9 @@
#include "common/macros.h" #include "common/macros.h"
#include "buffer.h" #include "buffer.h"
struct borderset *getBorders(uint32_t id, int size, enum border_type type, int bevelSize) struct borderset *get_borders(uint32_t id, int size, enum border_type type, int bevelSize)
{ {
struct borderset *current = borderCache; struct borderset *current = border_cache;
struct borderset *last; struct borderset *last;
// Preventing building nonsense borders: // Preventing building nonsense borders:
@ -40,17 +40,17 @@ struct borderset *getBorders(uint32_t id, int size, enum border_type type, int b
} }
// Fall through, we need to create a buffer. // Fall through, we need to create a buffer.
if (!borderCache) { if (!border_cache) {
borderCache = createBuffer(id, size, type, bevelSize); border_cache = create_buffer(id, size, type, bevelSize);
return borderCache; return border_cache;
} else { } else {
last->next = createBuffer(id, size, type, bevelSize); last->next = create_buffer(id, size, type, bevelSize);
return last->next; return last->next;
} }
return NULL; return NULL;
} }
struct borderset *createBuffer(uint32_t id, int size, enum border_type type, int bevelSize) struct borderset *create_buffer(uint32_t id, int size, enum border_type type, int bevelSize)
{ {
struct borderset *new_borderset = znew(*new_borderset); struct borderset *new_borderset = znew(*new_borderset);
@ -270,7 +270,7 @@ struct borderset *createBuffer(uint32_t id, int size, enum border_type type, int
return new_borderset; return new_borderset;
} }
struct bufferset *generateBufferset(struct wlr_scene_tree *tree, struct bufferset *generate_bufferset(struct wlr_scene_tree *tree,
struct borderset *borderset, int bw) struct borderset *borderset, int bw)
{ {
struct bufferset *bufferset = znew(struct bufferset); struct bufferset *bufferset = znew(struct bufferset);
@ -346,13 +346,13 @@ void renderBuffersetXY(struct bufferset *bufferset, int width, int height, int x
x, height-bufferset->border_width+y); x, height-bufferset->border_width+y);
} }
void clearBorderCache(struct borderset *borderset) void clearborder_cache(struct borderset *borderset)
{ {
if (!borderset) { if (!borderset) {
return; return;
} }
if (borderset->next) { if (borderset->next) {
clearBorderCache(borderset->next); clearborder_cache(borderset->next);
} }
wlr_buffer_drop(&borderset->top->base); wlr_buffer_drop(&borderset->top->base);
wlr_buffer_drop(&borderset->left->base); wlr_buffer_drop(&borderset->left->base);

12
src/common/lab-scene-rect.c
View file

@ -12,7 +12,7 @@
struct border_scene { struct border_scene {
struct wlr_scene_tree *tree; struct wlr_scene_tree *tree;
struct wlr_scene_rect *top, *bottom, *left, *right; struct wlr_scene_rect *top, *bottom, *left, *right;
struct bufferset *texturedBorders; struct bufferset *textured_borders;
}; };
static void static void
@ -58,12 +58,12 @@ lab_scene_rect_create(struct wlr_scene_tree *parent,
(uint32_t)(r*255) << 16 | (uint32_t)(r*255) << 16 |
(uint32_t)(g*255) << 8 | (uint32_t)(g*255) << 8 |
(uint32_t)(b*255); (uint32_t)(b*255);
struct borderset *renderedborders = getBorders(colour32, bw, struct borderset *renderedborders = get_borders(colour32, bw,
opts->border_type, opts->bevel_width); opts->border_type, opts->bevel_width);
border->texturedBorders = generateBufferset(border->tree, border->textured_borders = generate_bufferset(border->tree,
renderedborders, bw); renderedborders, bw);
} else { } else {
border->texturedBorders = NULL; border->textured_borders = NULL;
} }
} }
@ -105,8 +105,8 @@ resize_border(struct border_scene *border, int border_width, int width, int heig
wlr_scene_rect_set_size(border->bottom, width, border_width); wlr_scene_rect_set_size(border->bottom, width, border_width);
wlr_scene_rect_set_size(border->left, border_width, height - border_width * 2); wlr_scene_rect_set_size(border->left, border_width, height - border_width * 2);
wlr_scene_rect_set_size(border->right, border_width, height - border_width * 2); wlr_scene_rect_set_size(border->right, border_width, height - border_width * 2);
if (border->texturedBorders) { if (border->textured_borders) {
renderBufferset(border->texturedBorders, width, height, 0); renderBufferset(border->textured_borders, width, height, 0);
} }
} }

2
src/main.c
View file

@ -41,7 +41,7 @@ static const struct option long_options[] = {
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
struct borderset *borderCache; struct borderset *border_cache;
static const char labwc_usage[] = static const char labwc_usage[] =
"Usage: labwc [options...]\n" "Usage: labwc [options...]\n"

12
src/menu/menu.c
View file

@ -205,10 +205,10 @@ item_create_scene_for_state(struct menuitem *item, float *text_color,
(uint32_t)(r*255) << 16 | (uint32_t)(r*255) << 16 |
(uint32_t)(g*255) << 8 | (uint32_t)(g*255) << 8 |
(uint32_t)(b*255); (uint32_t)(b*255);
struct borderset *renderedborders = getBorders(colour32, bw, struct borderset *renderedborders = get_borders(colour32, bw,
rc.theme->menu_items_active_border_type, rc.theme->menu_items_active_border_type,
rc.theme->menu_items_active_bevel_width); rc.theme->menu_items_active_bevel_width);
bufferset = generateBufferset(tree, renderedborders, bw); bufferset = generate_bufferset(tree, renderedborders, bw);
} else if (rc.theme->menu_items_border_type && !state) { } else if (rc.theme->menu_items_border_type && !state) {
float r = bg_color[0]; float r = bg_color[0];
float g = bg_color[1]; float g = bg_color[1];
@ -219,10 +219,10 @@ item_create_scene_for_state(struct menuitem *item, float *text_color,
(uint32_t)(r*255) << 16 | (uint32_t)(r*255) << 16 |
(uint32_t)(g*255) << 8 | (uint32_t)(g*255) << 8 |
(uint32_t)(b*255); (uint32_t)(b*255);
struct borderset *renderedborders = getBorders(colour32, bw, struct borderset *renderedborders = get_borders(colour32, bw,
rc.theme->menu_items_border_type, rc.theme->menu_items_border_type,
rc.theme->menu_items_bevel_width); rc.theme->menu_items_bevel_width);
bufferset = generateBufferset(tree, renderedborders, bw); bufferset = generate_bufferset(tree, renderedborders, bw);
} }
/* Create icon */ /* Create icon */
@ -408,10 +408,10 @@ title_create_scene(struct menuitem *menuitem, int *item_y)
(uint32_t)(r*255) << 16 | (uint32_t)(r*255) << 16 |
(uint32_t)(g*255) << 8 | (uint32_t)(g*255) << 8 |
(uint32_t)(b*255); (uint32_t)(b*255);
struct borderset *renderedborders = getBorders(colour32, bw, struct borderset *renderedborders = get_borders(colour32, bw,
rc.theme->menu_title_border_type, rc.theme->menu_title_border_type,
rc.theme->menu_title_bevel_width); rc.theme->menu_title_bevel_width);
bufferset = generateBufferset(menuitem->tree, renderedborders, bw); bufferset = generate_bufferset(menuitem->tree, renderedborders, bw);
} }
/* Background */ /* Background */

4
src/server.c
View file

@ -90,8 +90,8 @@ reload_config_and_theme(void)
scaled_buffer_invalidate_sharing(); scaled_buffer_invalidate_sharing();
rcxml_finish(); rcxml_finish();
clearBorderCache(borderCache); clearborder_cache(border_cache);
borderCache = NULL; border_cache = NULL;
rcxml_read(rc.config_file); rcxml_read(rc.config_file);
theme_finish(rc.theme); theme_finish(rc.theme);

8
src/ssd/resize-indicator.c
View file

@ -50,9 +50,9 @@ resize_indicator_reconfigure_view(struct resize_indicator *indicator)
(uint32_t)(r*255) << 16 | (uint32_t)(r*255) << 16 |
(uint32_t)(g*255) << 8 | (uint32_t)(g*255) << 8 |
(uint32_t)(b*255); (uint32_t)(b*255);
struct borderset *renderedborders = getBorders(colour32, bw, theme->osd_border_type, struct borderset *renderedborders = get_borders(colour32, bw,
theme->osd_border_bevel_width); theme->osd_border_type, theme->osd_border_bevel_width);
indicator->texturedBorders = generateBufferset(indicator->tree, indicator->textured_borders = generate_bufferset(indicator->tree,
renderedborders, bw); renderedborders, bw);
} }
} }
@ -141,7 +141,7 @@ resize_indicator_set_size(struct resize_indicator *indicator, int width)
indicator->height - 2 * rc.theme->osd_border_width); indicator->height - 2 * rc.theme->osd_border_width);
if (rc.theme->osd_border_type) { if (rc.theme->osd_border_type) {
renderBufferset(indicator->texturedBorders, indicator->width, renderBufferset(indicator->textured_borders, indicator->width,
indicator->height, 0); indicator->height, 0);
} }
} }

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

@ -55,10 +55,10 @@ ssd_border_create(struct ssd *ssd)
(uint32_t)(r*255) << 16 | (uint32_t)(r*255) << 16 |
(uint32_t)(g*255) << 8 | (uint32_t)(g*255) << 8 |
(uint32_t)(b*255); (uint32_t)(b*255);
struct borderset *renderedborders = getBorders(colour32, bw, struct borderset *renderedborders = get_borders(colour32, bw,
theme->window[active].border_type, theme->window[active].border_type,
theme->window[active].bevel_width); theme->window[active].bevel_width);
subtree->texturedBorders = generateBufferset(subtree->tree, subtree->textured_borders = generate_bufferset(subtree->tree,
renderedborders, bw); renderedborders, bw);
} else { } else {
subtree->left = lab_wlr_scene_rect_create(parent, subtree->left = lab_wlr_scene_rect_create(parent,
@ -159,7 +159,7 @@ ssd_border_update(struct ssd *ssd)
FOR_EACH_ACTIVE_STATE(active) { FOR_EACH_ACTIVE_STATE(active) {
struct ssd_border_subtree *subtree = &ssd->border.subtrees[active]; struct ssd_border_subtree *subtree = &ssd->border.subtrees[active];
if (theme->window[active].border_type) { if (theme->window[active].border_type) {
renderBufferset(subtree->texturedBorders, full_width, renderBufferset(subtree->textured_borders, full_width,
side_height+(ssd->titlebar.height + 2*theme->border_width), side_height+(ssd->titlebar.height + 2*theme->border_width),
-ssd->titlebar.height-theme->border_width); -ssd->titlebar.height-theme->border_width);
} else { } else {

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

@ -66,12 +66,12 @@ ssd_titlebar_create(struct ssd *ssd)
(uint32_t)(r*255) << 16 | (uint32_t)(r*255) << 16 |
(uint32_t)(g*255) << 8 | (uint32_t)(g*255) << 8 |
(uint32_t)(b*255); (uint32_t)(b*255);
struct borderset *renderedborders = getBorders(colour32, struct borderset *renderedborders = get_borders(colour32,
theme->window[active].title_bg.border_width, theme->window[active].title_bg.border_width,
theme->window[active].title_bg.border_type, theme->window[active].title_bg.border_type,
theme->window[active].title_bg.bevel_width); theme->window[active].title_bg.bevel_width);
subtree->texturedBorders = generateBufferset(subtree->tree, renderedborders, subtree->textured_borders = generate_bufferset(subtree->tree,
theme->window[active].title_bg.border_width); renderedborders, theme->window[active].title_bg.border_width);
// If we have the beveled borders, we actually have to run // If we have the beveled borders, we actually have to run
// ssd_titlebar_update() to make sure we render the updated borders. // ssd_titlebar_update() to make sure we render the updated borders.
@ -400,7 +400,7 @@ ssd_titlebar_update(struct ssd *ssd)
); );
} }
renderBuffersetXY(subtree->texturedBorders, titlebar_width, renderBuffersetXY(subtree->textured_borders, titlebar_width,
theme->titlebar_height, titlebar_x, 0); theme->titlebar_height, titlebar_x, 0);
} }
} }

2
src/theme.c
View file

@ -112,7 +112,7 @@ static void draw_beveled_border_on_button(cairo_t *cairo, int w, int h, int acti
(uint32_t)(r*255) << 16 | (uint32_t)(r*255) << 16 |
(uint32_t)(g*255) << 8 | (uint32_t)(g*255) << 8 |
(uint32_t)(b*255); (uint32_t)(b*255);
struct borderset *renderedborders = getBorders(colour32, bw, struct borderset *renderedborders = get_borders(colour32, bw,
rc.theme->window[active].button_border_type, rc.theme->window[active].button_border_type,
rc.theme->window[active].button_bevel_width); rc.theme->window[active].button_bevel_width);

2
src/workspaces.c
View file

@ -114,7 +114,7 @@ _osd_update(void)
(uint32_t)(r*255) << 16 | (uint32_t)(r*255) << 16 |
(uint32_t)(g*255) << 8 | (uint32_t)(g*255) << 8 |
(uint32_t)(b*255); (uint32_t)(b*255);
struct borderset *renderedborders = getBorders(colour32, bw, struct borderset *renderedborders = get_borders(colour32, bw,
theme->osd_border_type, theme->osd_border_bevel_width); theme->osd_border_type, theme->osd_border_bevel_width);
cairo_set_source_surface(cairo, renderedborders->top->surface, 0, 0); cairo_set_source_surface(cairo, renderedborders->top->surface, 0, 0);