diff options
Diffstat (limited to '')
| -rw-r--r-- | calmwm.h | 6 | ||||
| -rw-r--r-- | client.c | 5 | ||||
| -rw-r--r-- | mousefunc.c | 6 |
3 files changed, 11 insertions, 6 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.290 2015/06/05 15:01:51 okan Exp $ + * $OpenBSD: calmwm.h,v 1.291 2015/06/08 15:11:29 okan Exp $ */ #ifndef _CALMWM_H_ @@ -169,6 +169,10 @@ struct client_ctx { int x; /* x position */ int y; /* y position */ } ptr; + struct { + int h; /* hieght */ + int w; /* width */ + } dim; #define CLIENT_HIDDEN 0x0001 #define CLIENT_IGNORE 0x0002 #define CLIENT_VMAXIMIZED 0x0004 @@ -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.192 2015/05/20 23:54:39 okan Exp $ + * $OpenBSD: client.c,v 1.193 2015/06/08 15:11:29 okan Exp $ */ #include <sys/types.h> @@ -874,6 +874,9 @@ client_applysizehints(struct client_ctx *cc) cc->geom.w = MAX(cc->geom.w, 1); cc->geom.h = MAX(cc->geom.h, 1); + + cc->dim.w = (cc->geom.w - cc->hint.basew) / cc->hint.incw; + cc->dim.h = (cc->geom.h - cc->hint.baseh) / cc->hint.inch; } static void diff --git a/mousefunc.c b/mousefunc.c index 84a2fb4..814c6f4 100644 --- a/mousefunc.c +++ b/mousefunc.c @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: mousefunc.c,v 1.89 2015/06/07 19:10:00 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.90 2015/06/08 15:11:29 okan Exp $ */ #include <sys/types.h> @@ -53,9 +53,7 @@ mousefunc_sweep_draw(struct client_ctx *cc) struct screen_ctx *sc = cc->sc; char s[14]; /* fits " nnnn x nnnn \0" */ - (void)snprintf(s, sizeof(s), " %4d x %-4d ", - (cc->geom.w - cc->hint.basew) / cc->hint.incw, - (cc->geom.h - cc->hint.baseh) / cc->hint.inch); + (void)snprintf(s, sizeof(s), " %4d x %-4d ", cc->dim.w, cc->dim.h); XReparentWindow(X_Dpy, sc->menuwin, cc->win, 0, 0); XMoveResizeWindow(X_Dpy, sc->menuwin, 0, 0, |