jazzman/xoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reduce client mem usage

Browse Source
This commit is contained in:
seanpringle
2012-09-08 17:15:45 +10:00
parent 6c409f13a4
commit 7c0d9812a8
2 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
xoat.c
View File

@@ -176,13 +176,10 @@ client* window_build_client(Window win)
XWMHints *hints = XGetWMHints(display, c->window); XWMHints *hints = XGetWMHints(display, c->window);
if (hints) if (hints)
{ {
memmove(&c->hints, hints, sizeof(XWMHints)); c->input = hints->flags & InputHint && hints->input ? 1:0;
c->urgent = c->urgent || hints->flags & XUrgencyHint ? 1:0;
XFree(hints); XFree(hints);
} }
long sr; XGetWMNormalHints(display, c->window, &c->size, &sr);
c->input = c->hints.flags & InputHint && c->hints.input ? 1:0;
c->urgent = c->urgent || c->hints.flags & XUrgencyHint ? 1: 0;
XClassHint chint; XClassHint chint;
if (XGetClassHint(display, c->window, &chint)) if (XGetClassHint(display, c->window, &chint))
{ {
@@ -304,37 +301,39 @@ void client_position_xywh(client *c, int x, int y, int w, int h)
return; return;
} }
w -= BORDER*2; h -= BORDER*2; w -= BORDER*2; h -= BORDER*2;
int sw = w, sh = h; int sw = w, sh = h; long sr; XSizeHints size;
int basew = c->size.flags & PBaseSize ? c->size.base_width : 0; if (XGetWMNormalHints(display, c->window, &size, &sr))
int baseh = c->size.flags & PBaseSize ? c->size.base_height: 0; {
int basew = size.flags & PBaseSize ? size.base_width : 0;
int baseh = size.flags & PBaseSize ? size.base_height: 0;
if (c->size.flags & PMinSize) if (size.flags & PMinSize)
{ {
w = MAX(w, c->size.min_width); w = MAX(w, size.min_width);
h = MAX(h, c->size.min_height); h = MAX(h, size.min_height);
} }
if (c->size.flags & PMaxSize) if (size.flags & PMaxSize)
{ {
w = MIN(w, c->size.max_width); w = MIN(w, size.max_width);
h = MIN(h, c->size.max_height); h = MIN(h, size.max_height);
} }
if (c->size.flags & PResizeInc) if (size.flags & PResizeInc)
{ {
w -= basew; h -= baseh; w -= basew; h -= baseh;
w -= w % c->size.width_inc; w -= w % size.width_inc;
h -= h % c->size.height_inc; h -= h % size.height_inc;
w += basew; h += baseh; w += basew; h += baseh;
} }
if (c->size.flags & PAspect) if (size.flags & PAspect)
{ {
double ratio = (double) w / h; double ratio = (double) w / h;
double minr = (double) c->size.min_aspect.x / c->size.min_aspect.y; double minr = (double) size.min_aspect.x / size.min_aspect.y;
double maxr = (double) c->size.max_aspect.x / c->size.max_aspect.y; double maxr = (double) size.max_aspect.x / size.max_aspect.y;
if (ratio < minr) h = (int)(w / minr); if (ratio < minr) h = (int)(w / minr);
else if (ratio > maxr) w = (int)(h * maxr); else if (ratio > maxr) w = (int)(h * maxr);
} }
}
// center if smaller than supplied size // center if smaller than supplied size
if (w < sw) x += (sw-w)/2; if (w < sw) x += (sw-w)/2;
if (h < sh) y += (sh-h)/2; if (h < sh) y += (sh-h)/2;

2
xoat.h
View File

@@ -93,8 +93,6 @@ int nmonitors = 1;
typedef struct { typedef struct {
Window window; Window window;
XWindowAttributes attr; XWindowAttributes attr;
XWMHints hints;
XSizeHints size;
Window transient_for; Window transient_for;
Atom type, states[MAX_NET_WM_STATES+1]; Atom type, states[MAX_NET_WM_STATES+1];
short monitor, spot, visible, manage, input, urgent; short monitor, spot, visible, manage, input, urgent;