diff --git a/include/common/borderset.h b/include/common/borderset.h index c9d7248f..d4016d8c 100644 --- a/include/common/borderset.h +++ b/include/common/borderset.h @@ -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); 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 clearBorderCache(struct borderset *borderset); +void clearborder_cache(struct borderset *borderset); #endif /* LABWC_BORDERSET_H */ diff --git a/include/ssd-internal.h b/include/ssd-internal.h index 776fba34..38280582 100644 --- a/include/ssd-internal.h +++ b/include/ssd-internal.h @@ -106,7 +106,7 @@ struct ssd { struct scaled_font_buffer *title; struct wl_list buttons_left; /* 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 */ } titlebar; @@ -116,7 +116,7 @@ struct ssd { struct ssd_border_subtree { struct wlr_scene_tree *tree; struct wlr_scene_rect *top, *bottom, *left, *right; - struct bufferset *texturedBorders; + struct bufferset *textured_borders; } subtrees[2]; /* indexed by enum ssd_active_state */ } border; diff --git a/include/view.h b/include/view.h index a2acaa95..6c6dc795 100644 --- a/include/view.h +++ b/include/view.h @@ -244,7 +244,7 @@ struct view { int width, height; struct wlr_scene_tree *tree; struct wlr_scene_rect *border; - struct bufferset *texturedBorders; + struct bufferset *textured_borders; struct wlr_scene_rect *background; struct scaled_font_buffer *text; } resize_indicator; diff --git a/src/common/borderset.c b/src/common/borderset.c index e06c39b3..1c6f8962 100644 --- a/src/common/borderset.c +++ b/src/common/borderset.c @@ -6,9 +6,9 @@ #include "common/macros.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; // 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. - if (!borderCache) { - borderCache = createBuffer(id, size, type, bevelSize); - return borderCache; + if (!border_cache) { + border_cache = create_buffer(id, size, type, bevelSize); + return border_cache; } else { - last->next = createBuffer(id, size, type, bevelSize); + last->next = create_buffer(id, size, type, bevelSize); return last->next; } 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); @@ -270,7 +270,7 @@ struct borderset *createBuffer(uint32_t id, int size, enum border_type type, int 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 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); } -void clearBorderCache(struct borderset *borderset) +void clearborder_cache(struct borderset *borderset) { if (!borderset) { return; } if (borderset->next) { - clearBorderCache(borderset->next); + clearborder_cache(borderset->next); } wlr_buffer_drop(&borderset->top->base); wlr_buffer_drop(&borderset->left->base); diff --git a/src/common/lab-scene-rect.c b/src/common/lab-scene-rect.c index 8ad48a28..ad5c4cf7 100644 --- a/src/common/lab-scene-rect.c +++ b/src/common/lab-scene-rect.c @@ -12,7 +12,7 @@ struct border_scene { struct wlr_scene_tree *tree; struct wlr_scene_rect *top, *bottom, *left, *right; - struct bufferset *texturedBorders; + struct bufferset *textured_borders; }; static void @@ -58,12 +58,12 @@ lab_scene_rect_create(struct wlr_scene_tree *parent, (uint32_t)(r*255) << 16 | (uint32_t)(g*255) << 8 | (uint32_t)(b*255); - struct borderset *renderedborders = getBorders(colour32, bw, + struct borderset *renderedborders = get_borders(colour32, bw, opts->border_type, opts->bevel_width); - border->texturedBorders = generateBufferset(border->tree, + border->textured_borders = generate_bufferset(border->tree, renderedborders, bw); } 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->left, border_width, height - border_width * 2); wlr_scene_rect_set_size(border->right, border_width, height - border_width * 2); - if (border->texturedBorders) { - renderBufferset(border->texturedBorders, width, height, 0); + if (border->textured_borders) { + renderBufferset(border->textured_borders, width, height, 0); } } diff --git a/src/main.c b/src/main.c index f25c48c2..0534b542 100644 --- a/src/main.c +++ b/src/main.c @@ -41,7 +41,7 @@ static const struct option long_options[] = { {0, 0, 0, 0} }; -struct borderset *borderCache; +struct borderset *border_cache; static const char labwc_usage[] = "Usage: labwc [options...]\n" diff --git a/src/menu/menu.c b/src/menu/menu.c index 188bba12..24958304 100644 --- a/src/menu/menu.c +++ b/src/menu/menu.c @@ -205,10 +205,10 @@ item_create_scene_for_state(struct menuitem *item, float *text_color, (uint32_t)(r*255) << 16 | (uint32_t)(g*255) << 8 | (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_bevel_width); - bufferset = generateBufferset(tree, renderedborders, bw); + bufferset = generate_bufferset(tree, renderedborders, bw); } else if (rc.theme->menu_items_border_type && !state) { float r = bg_color[0]; 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)(g*255) << 8 | (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_bevel_width); - bufferset = generateBufferset(tree, renderedborders, bw); + bufferset = generate_bufferset(tree, renderedborders, bw); } /* Create icon */ @@ -408,10 +408,10 @@ title_create_scene(struct menuitem *menuitem, int *item_y) (uint32_t)(r*255) << 16 | (uint32_t)(g*255) << 8 | (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_bevel_width); - bufferset = generateBufferset(menuitem->tree, renderedborders, bw); + bufferset = generate_bufferset(menuitem->tree, renderedborders, bw); } /* Background */ diff --git a/src/server.c b/src/server.c index 8af35e4a..a25ed300 100644 --- a/src/server.c +++ b/src/server.c @@ -90,8 +90,8 @@ reload_config_and_theme(void) scaled_buffer_invalidate_sharing(); rcxml_finish(); - clearBorderCache(borderCache); - borderCache = NULL; + clearborder_cache(border_cache); + border_cache = NULL; rcxml_read(rc.config_file); theme_finish(rc.theme); diff --git a/src/ssd/resize-indicator.c b/src/ssd/resize-indicator.c index 8f2105d8..8f17e3e8 100644 --- a/src/ssd/resize-indicator.c +++ b/src/ssd/resize-indicator.c @@ -50,9 +50,9 @@ resize_indicator_reconfigure_view(struct resize_indicator *indicator) (uint32_t)(r*255) << 16 | (uint32_t)(g*255) << 8 | (uint32_t)(b*255); - struct borderset *renderedborders = getBorders(colour32, bw, theme->osd_border_type, - theme->osd_border_bevel_width); - indicator->texturedBorders = generateBufferset(indicator->tree, + struct borderset *renderedborders = get_borders(colour32, bw, + theme->osd_border_type, theme->osd_border_bevel_width); + indicator->textured_borders = generate_bufferset(indicator->tree, renderedborders, bw); } } @@ -141,7 +141,7 @@ resize_indicator_set_size(struct resize_indicator *indicator, int width) indicator->height - 2 * rc.theme->osd_border_width); if (rc.theme->osd_border_type) { - renderBufferset(indicator->texturedBorders, indicator->width, + renderBufferset(indicator->textured_borders, indicator->width, indicator->height, 0); } } diff --git a/src/ssd/ssd-border.c b/src/ssd/ssd-border.c index 69d3e569..8885b0d1 100644 --- a/src/ssd/ssd-border.c +++ b/src/ssd/ssd-border.c @@ -55,10 +55,10 @@ ssd_border_create(struct ssd *ssd) (uint32_t)(r*255) << 16 | (uint32_t)(g*255) << 8 | (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].bevel_width); - subtree->texturedBorders = generateBufferset(subtree->tree, + subtree->textured_borders = generate_bufferset(subtree->tree, renderedborders, bw); } else { subtree->left = lab_wlr_scene_rect_create(parent, @@ -159,7 +159,7 @@ ssd_border_update(struct ssd *ssd) FOR_EACH_ACTIVE_STATE(active) { struct ssd_border_subtree *subtree = &ssd->border.subtrees[active]; 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), -ssd->titlebar.height-theme->border_width); } else { diff --git a/src/ssd/ssd-titlebar.c b/src/ssd/ssd-titlebar.c index 7575b841..9b2aa9dc 100644 --- a/src/ssd/ssd-titlebar.c +++ b/src/ssd/ssd-titlebar.c @@ -66,12 +66,12 @@ ssd_titlebar_create(struct ssd *ssd) (uint32_t)(r*255) << 16 | (uint32_t)(g*255) << 8 | (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_type, theme->window[active].title_bg.bevel_width); - subtree->texturedBorders = generateBufferset(subtree->tree, renderedborders, - theme->window[active].title_bg.border_width); + subtree->textured_borders = generate_bufferset(subtree->tree, + renderedborders, theme->window[active].title_bg.border_width); // If we have the beveled borders, we actually have to run // 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); } } diff --git a/src/theme.c b/src/theme.c index 59693f10..3fa9600a 100644 --- a/src/theme.c +++ b/src/theme.c @@ -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)(g*255) << 8 | (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_bevel_width); diff --git a/src/workspaces.c b/src/workspaces.c index 7c089c2b..892f95ff 100644 --- a/src/workspaces.c +++ b/src/workspaces.c @@ -114,7 +114,7 @@ _osd_update(void) (uint32_t)(r*255) << 16 | (uint32_t)(g*255) << 8 | (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); cairo_set_source_surface(cairo, renderedborders->top->surface, 0, 0);