limit scope of screen_apply_gap()

This commit is contained in:
okan 2018-02-09 20:08:07 +00:00
parent 088c402dd1
commit f1e693de1a
2 changed files with 5 additions and 4 deletions

View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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_ #ifndef _CALMWM_H_
@ -476,7 +476,6 @@ void search_print_text(struct menu *, int);
void search_print_wm(struct menu *, int); void search_print_wm(struct menu *, int);
struct region_ctx *region_find(struct screen_ctx *, int, 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 screen_ctx *screen_find(Window);
struct geom screen_area(struct screen_ctx *, int, int, struct geom screen_area(struct screen_ctx *, int, int,
enum apply_gap); enum apply_gap);

View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * 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 <sys/types.h> #include <sys/types.h>
@ -31,6 +31,8 @@
#include "calmwm.h" #include "calmwm.h"
static struct geom screen_apply_gap(struct screen_ctx *, struct geom);
void void
screen_init(int which) screen_init(int which)
{ {
@ -220,7 +222,7 @@ screen_update_geometry(struct screen_ctx *sc)
xu_ewmh_net_workarea(sc); xu_ewmh_net_workarea(sc);
} }
struct geom static struct geom
screen_apply_gap(struct screen_ctx *sc, struct geom geom) screen_apply_gap(struct screen_ctx *sc, struct geom geom)
{ {
geom.x += sc->gap.left; geom.x += sc->gap.left;