From f1e693de1a376c0b48bc8879ad9c91e1f02c7c84 Mon Sep 17 00:00:00 2001 From: okan Date: Fri, 9 Feb 2018 20:08:07 +0000 Subject: [PATCH] limit scope of screen_apply_gap() --- app/cwm/calmwm.h | 3 +-- app/cwm/screen.c | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h index fb1fa3379..393768a9a 100644 --- a/app/cwm/calmwm.h +++ b/app/cwm/calmwm.h @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: calmwm.h,v 1.357 2018/02/09 19:54:54 okan Exp $ + * $OpenBSD: calmwm.h,v 1.358 2018/02/09 20:08:07 okan Exp $ */ #ifndef _CALMWM_H_ @@ -476,7 +476,6 @@ void search_print_text(struct menu *, int); void search_print_wm(struct menu *, int); struct region_ctx *region_find(struct screen_ctx *, int, int); -struct geom screen_apply_gap(struct screen_ctx *, struct geom); struct screen_ctx *screen_find(Window); struct geom screen_area(struct screen_ctx *, int, int, enum apply_gap); diff --git a/app/cwm/screen.c b/app/cwm/screen.c index ae3e417d8..2cd3db985 100644 --- a/app/cwm/screen.c +++ b/app/cwm/screen.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: screen.c,v 1.85 2018/01/23 16:18:59 okan Exp $ + * $OpenBSD: screen.c,v 1.86 2018/02/09 20:08:07 okan Exp $ */ #include @@ -31,6 +31,8 @@ #include "calmwm.h" +static struct geom screen_apply_gap(struct screen_ctx *, struct geom); + void screen_init(int which) { @@ -220,7 +222,7 @@ screen_update_geometry(struct screen_ctx *sc) xu_ewmh_net_workarea(sc); } -struct geom +static struct geom screen_apply_gap(struct screen_ctx *sc, struct geom geom) { geom.x += sc->gap.left;