mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-30 06:59:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

treewide: remove empty statements in switch cases

Browse source 
For longer cases, factor out the logic to new functions.
For very short cases, just move the declaration before the switch.

v2: in one case, replace the switch with if/else.
This commit is contained in:
John Lindgren 2025-05-22 10:53:58 -04:00 • committed by Johan Malm
parent fbb92e2e30
commit a3d6226728
5 changed files with 59 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/edges.c
View file

@ -242,6 +242,40 @@ validate_output_edges(struct border *valid_edges,
view, target, output, validator, WLR_EDGE_BOTTOM);
}
static uint32_t
compute_edges_visible(const struct wlr_box *view_size,
const pixman_box32_t *view_rect,
const pixman_region32_t *available)
{
pixman_region32_t intersection;
pixman_region32_init(&intersection);
pixman_region32_intersect_rect(&intersection, available,
view_size->x, view_size->y,
view_size->width, view_size->height);
int nrects;
const pixman_box32_t *rects =
pixman_region32_rectangles(&intersection, &nrects);
uint32_t edges_visible = 0;
for (int i = 0; i < nrects; i++) {
if (rects[i].x1 == view_rect->x1) {
edges_visible |= WLR_EDGE_LEFT;
}
if (rects[i].y1 == view_rect->y1) {
edges_visible |= WLR_EDGE_TOP;
}
if (rects[i].x2 == view_rect->x2) {
edges_visible |= WLR_EDGE_RIGHT;
}
if (rects[i].y2 == view_rect->y2) {
edges_visible |= WLR_EDGE_BOTTOM;
}
}
pixman_region32_fini(&intersection);
return edges_visible;
}
/* Test if parts of the current view is covered by the remaining space in the region */
static void
subtract_view_from_space(struct view *view, pixman_region32_t *available)
@ -266,33 +300,8 @@ subtract_view_from_space(struct view *view, pixman_region32_t *available)
view->edges_visible = 0;
return;
case PIXMAN_REGION_PART:
; /* works around "a label can only be part of a statement" */
pixman_region32_t intersection;
pixman_region32_init(&intersection);
pixman_region32_intersect_rect(&intersection, available,
view_size.x, view_size.y,
view_size.width, view_size.height);
int nrects;
const pixman_box32_t *rects =
pixman_region32_rectangles(&intersection, &nrects);
view->edges_visible = 0;
for (int i = 0; i < nrects; i++) {
if (rects[i].x1 == view_rect.x1) {
view->edges_visible |= WLR_EDGE_LEFT;
}
if (rects[i].y1 == view_rect.y1) {
view->edges_visible |= WLR_EDGE_TOP;
}
if (rects[i].x2 == view_rect.x2) {
view->edges_visible |= WLR_EDGE_RIGHT;
}
if (rects[i].y2 == view_rect.y2) {
view->edges_visible |= WLR_EDGE_BOTTOM;
}
}
pixman_region32_fini(&intersection);
view->edges_visible = compute_edges_visible(
&view_size, &view_rect, available);
break;
}