diff options
| -rw-r--r-- | calmwm.h | 3 | ||||
| -rw-r--r-- | client.c | 9 |
2 files changed, 10 insertions, 2 deletions
@@ -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.361 2018/07/16 14:19:23 okan Exp $ + * $OpenBSD: calmwm.h,v 1.362 2018/11/08 15:49:42 okan Exp $ */ #ifndef _CALMWM_H_ @@ -130,6 +130,7 @@ struct client_ctx { Window win; Colormap colormap; int bwidth; /* border width */ + int obwidth; /* original border width */ struct geom geom, savegeom, fullgeom; struct { long flags; /* defined hints */ @@ -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: client.c,v 1.245 2018/02/06 15:05:20 okan Exp $ + * $OpenBSD: client.c,v 1.246 2018/11/08 15:49:42 okan Exp $ */ #include <sys/types.h> @@ -96,6 +96,7 @@ client_init(Window win, struct screen_ctx *sc, int active) cc->ptr.y = cc->geom.h / 2; cc->colormap = wattr.colormap; + cc->obwidth = wattr.border_width; if (wattr.map_state != IsViewable) { client_placecalc(cc); @@ -760,6 +761,12 @@ client_placecalc(struct client_ctx *cc) cc->geom.x = sc->view.h - cc->bwidth - 1; if (cc->geom.y + cc->geom.h + cc->bwidth <= 0) cc->geom.y = -(cc->geom.h + cc->bwidth - 1); + if (cc->flags & CLIENT_IGNORE) { + if (((cc->obwidth * 2) + cc->geom.x + cc->geom.w) == sc->view.w) + cc->geom.x += cc->obwidth * 2; + if (((cc->obwidth * 2) + cc->geom.y + cc->geom.h) == sc->view.h) + cc->geom.y += cc->obwidth * 2; + } } else { struct geom area; int xmouse, ymouse; |