diff options
| -rw-r--r-- | client.c | 15 |
1 files changed, 5 insertions, 10 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: client.c,v 1.244 2017/12/29 18:50:43 okan Exp $ + * $OpenBSD: client.c,v 1.245 2018/02/06 15:05:20 okan Exp $ */ #include <sys/types.h> @@ -752,17 +752,12 @@ client_placecalc(struct client_ctx *cc) int xslack, yslack; if (cc->hint.flags & (USPosition | PPosition)) { - int wmax, hmax; - - wmax = DisplayWidth(X_Dpy, sc->which); - hmax = DisplayHeight(X_Dpy, sc->which); - - if (cc->geom.x >= wmax) - cc->geom.x = wmax - cc->bwidth - 1; + if (cc->geom.x >= sc->view.w) + cc->geom.x = sc->view.w - cc->bwidth - 1; if (cc->geom.x + cc->geom.w + cc->bwidth <= 0) cc->geom.x = -(cc->geom.w + cc->bwidth - 1); - if (cc->geom.y >= hmax) - cc->geom.x = hmax - cc->bwidth - 1; + if (cc->geom.y >= sc->view.h) + 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); } else { |