mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

cvsimport

Browse Source
This commit is contained in:
okan 2013-11-02 19:13:56 +00:00
commit 2037332bb7
2 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calmwm.h
View File

@ -149,11 +149,11 @@ struct client_ctx {
TAILQ_ENTRY(client_ctx) mru_entry; TAILQ_ENTRY(client_ctx) mru_entry;
struct screen_ctx *sc; struct screen_ctx *sc;
Window win; Window win;
XSizeHints *size;
Colormap colormap; Colormap colormap;
u_int bwidth; /* border width */ u_int bwidth; /* border width */
struct geom geom, savegeom; struct geom geom, savegeom;
struct { struct {
long flags; /* defined hints */
int basew; /* desired width */ int basew; /* desired width */
int baseh; /* desired height */ int baseh; /* desired height */
int minw; /* minimum width */ int minw; /* minimum width */

73
client.c
View File

@ -73,7 +73,6 @@ client_init(Window win, struct screen_ctx *sc, int mapped)
cc->state = mapped ? NormalState : IconicState; cc->state = mapped ? NormalState : IconicState;
cc->sc = sc; cc->sc = sc;
cc->win = win; cc->win = win;
cc->size = XAllocSizeHints();
client_getsizehints(cc); client_getsizehints(cc);
@ -175,7 +174,6 @@ client_delete(struct client_ctx *cc, int destroy)
if (cc == client_current()) if (cc == client_current())
client_none(sc); client_none(sc);
XFree(cc->size);
if (cc->app_name != NULL) if (cc->app_name != NULL)
XFree(cc->app_name); XFree(cc->app_name);
if (cc->app_class != NULL) if (cc->app_class != NULL)
@ -685,7 +683,7 @@ client_placecalc(struct client_ctx *cc)
struct screen_ctx *sc = cc->sc; struct screen_ctx *sc = cc->sc;
int xslack, yslack; int xslack, yslack;
if (cc->size->flags & (USPosition|PPosition)) { if (cc->hint.flags & (USPosition|PPosition)) {
/* /*
* Ignore XINERAMA screens, just make sure it's somewhere * Ignore XINERAMA screens, just make sure it's somewhere
* in the virtual desktop. else it stops people putting xterms * in the virtual desktop. else it stops people putting xterms
@ -695,10 +693,8 @@ client_placecalc(struct client_ctx *cc)
*/ */
xslack = sc->view.w - cc->geom.w - cc->bwidth * 2; xslack = sc->view.w - cc->geom.w - cc->bwidth * 2;
yslack = sc->view.h - cc->geom.h - cc->bwidth * 2; yslack = sc->view.h - cc->geom.h - cc->bwidth * 2;
if (cc->size->x > 0) cc->geom.x = MIN(cc->geom.x, xslack);
cc->geom.x = MIN(cc->size->x, xslack); cc->geom.y = MIN(cc->geom.y, yslack);
if (cc->size->y > 0)
cc->geom.y = MIN(cc->size->y, yslack);
} else { } else {
struct geom xine; struct geom xine;
int xmouse, ymouse; int xmouse, ymouse;
@ -750,43 +746,52 @@ void
client_getsizehints(struct client_ctx *cc) client_getsizehints(struct client_ctx *cc)
{ {
long tmp; long tmp;
XSizeHints *size;
if (!XGetWMNormalHints(X_Dpy, cc->win, cc->size, &tmp)) if ((size = XAllocSizeHints()) == NULL)
cc->size->flags = PSize; warnx("XAllocSizeHints failure");
if (cc->size->flags & PBaseSize) { if (!XGetWMNormalHints(X_Dpy, cc->win, size, &tmp))
cc->hint.basew = cc->size->base_width; size->flags = 0;
cc->hint.baseh = cc->size->base_height;
} else if (cc->size->flags & PMinSize) { cc->hint.flags = size->flags;
cc->hint.basew = cc->size->min_width;
cc->hint.baseh = cc->size->min_height; if (size->flags & PBaseSize) {
cc->hint.basew = size->base_width;
cc->hint.baseh = size->base_height;
} else if (size->flags & PMinSize) {
cc->hint.basew = size->min_width;
cc->hint.baseh = size->min_height;
} }
if (cc->size->flags & PMinSize) { if (size->flags & PMinSize) {
cc->hint.minw = cc->size->min_width; cc->hint.minw = size->min_width;
cc->hint.minh = cc->size->min_height; cc->hint.minh = size->min_height;
} else if (cc->size->flags & PBaseSize) { } else if (size->flags & PBaseSize) {
cc->hint.minw = cc->size->base_width; cc->hint.minw = size->base_width;
cc->hint.minh = cc->size->base_height; cc->hint.minh = size->base_height;
} }
if (cc->size->flags & PMaxSize) { if (size->flags & PMaxSize) {
cc->hint.maxw = cc->size->max_width; cc->hint.maxw = size->max_width;
cc->hint.maxh = cc->size->max_height; cc->hint.maxh = size->max_height;
} }
if (cc->size->flags & PResizeInc) { if (size->flags & PResizeInc) {
cc->hint.incw = cc->size->width_inc; cc->hint.incw = size->width_inc;
cc->hint.inch = cc->size->height_inc; cc->hint.inch = size->height_inc;
} }
cc->hint.incw = MAX(1, cc->hint.incw); cc->hint.incw = MAX(1, cc->hint.incw);
cc->hint.inch = MAX(1, cc->hint.inch); cc->hint.inch = MAX(1, cc->hint.inch);
if (cc->size->flags & PAspect) { if (size->flags & PAspect) {
if (cc->size->min_aspect.x > 0) if (size->min_aspect.x > 0)
cc->hint.mina = (float)cc->size->min_aspect.y / cc->hint.mina = (float)size->min_aspect.y /
cc->size->min_aspect.x; size->min_aspect.x;
if (cc->size->max_aspect.y > 0) if (size->max_aspect.y > 0)
cc->hint.maxa = (float)cc->size->max_aspect.x / cc->hint.maxa = (float)size->max_aspect.x /
cc->size->max_aspect.y; size->max_aspect.y;
} }
if (size)
XFree(size);
} }
void void