From 3a11b5d9a98dfceceea3ff9ca264ca32f798b828 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Wed, 27 Mar 2019 15:33:55 +0000 Subject: [PATCH] Format region.h Signed-off-by: Yuxuan Shui --- src/region.h | 55 ++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/src/region.h b/src/region.h index 3e424d2f..cb972d7d 100644 --- a/src/region.h +++ b/src/region.h @@ -1,13 +1,13 @@ // SPDX-License-Identifier: MPL-2.0 // Copyright (c) 2018 Yuxuan Shui #pragma once -#include -#include #include #include +#include +#include -#include "utils.h" #include "log.h" +#include "utils.h" typedef struct pixman_region32 pixman_region32_t; typedef struct pixman_box32 pixman_box32_t; @@ -16,38 +16,33 @@ typedef pixman_box32_t rect_t; RC_TYPE(region_t, rc_region, pixman_region32_init, pixman_region32_fini, static inline) -/// copy a region_t -static inline void -copy_region(region_t *dst, const region_t *p) { - pixman_region32_copy(dst, (region_t *)p); -} - -static inline void -dump_region(const region_t *x) { - int nrects; - const rect_t *rects = pixman_region32_rectangles((region_t *)x, &nrects); - log_trace("nrects: %d", nrects); - for (int i = 0; i < nrects; i++) - log_trace("(%d, %d) - (%d, %d)", rects[i].x1, rects[i].y1, rects[i].x2, rects[i].y2); +static inline void dump_region(const region_t *x) { + if (log_get_level_tls() < LOG_LEVEL_TRACE) { + return; + } + int nrects; + const rect_t *rects = pixman_region32_rectangles((region_t *)x, &nrects); + log_trace("nrects: %d", nrects); + for (int i = 0; i < nrects; i++) + log_trace("(%d, %d) - (%d, %d)", rects[i].x1, rects[i].y1, rects[i].x2, + rects[i].y2); } /// Convert one xcb rectangle to our rectangle type -static inline rect_t -from_x_rect(const xcb_rectangle_t *rect) { - return (rect_t) { - .x1 = rect->x, - .y1 = rect->y, - .x2 = rect->x + rect->width, - .y2 = rect->y + rect->height, - }; +static inline rect_t from_x_rect(const xcb_rectangle_t *rect) { + return (rect_t){ + .x1 = rect->x, + .y1 = rect->y, + .x2 = rect->x + rect->width, + .y2 = rect->y + rect->height, + }; } /// Convert an array of xcb rectangles to our rectangle type /// Returning an array that needs to be freed -static inline rect_t * -from_x_rects(int nrects, const xcb_rectangle_t *rects) { - rect_t *ret = ccalloc(nrects, rect_t); - for (int i = 0; i < nrects; i++) - ret[i] = from_x_rect(rects+i); - return ret; +static inline rect_t *from_x_rects(int nrects, const xcb_rectangle_t *rects) { + rect_t *ret = ccalloc(nrects, rect_t); + for (int i = 0; i < nrects; i++) + ret[i] = from_x_rect(rects + i); + return ret; }