Faris
/
dwm
mirror of git://git.suckless.org/dwm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new stuff

This commit is contained in:
arg@10ksloc.org 2006-08-02 13:05:04 +02:00
parent 0cf3ba0eab
commit a55f0e12fe
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
client.c
View File

@ -219,12 +219,13 @@ manage(Window w, XWindowAttributes *wa)
c->h = wa->height; c->h = wa->height;
c->th = bh; c->th = bh;
if(c->y < bh) c->border = 1;
setsize(c);
if(c->h != sh && c->y < bh)
c->y = c->ty = bh; c->y = c->ty = bh;
c->border = 1;
c->proto = getproto(c->win); c->proto = getproto(c->win);
setsize(c);
XSelectInput(dpy, c->win, XSelectInput(dpy, c->win,
StructureNotifyMask | PropertyChangeMask | EnterWindowMask); StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
XGetTransientForHint(dpy, c->win, &trans); XGetTransientForHint(dpy, c->win, &trans);
@ -237,8 +238,6 @@ manage(Window w, XWindowAttributes *wa)
DefaultVisual(dpy, screen), DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa); CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
settags(c);
if(clients) if(clients)
clients->prev = c; clients->prev = c;
c->next = clients; c->next = clients;
@ -251,11 +250,12 @@ manage(Window w, XWindowAttributes *wa)
XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK, XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None); GrabModeAsync, GrabModeSync, None, None);
settags(c);
if(!c->isfloat) if(!c->isfloat)
c->isfloat = trans || (c->maxw && c->minw && c->isfloat = trans
(c->maxw == c->minw) && (c->maxh == c->minh)); || (c->maxw && c->minw &&
c->maxw == c->minw && c->maxh == c->minh)
|| (c->w == sw && c->h == sh);
settitle(c); settitle(c);
arrange(NULL); arrange(NULL);
@ -272,6 +272,7 @@ resize(Client *c, Bool sizehints, Corner sticky)
int bottom = c->y + c->h; int bottom = c->y + c->h;
int right = c->x + c->w; int right = c->x + c->w;
XConfigureEvent e; XConfigureEvent e;
XWindowChanges wc;
if(sizehints) { if(sizehints) {
if(c->incw) if(c->incw)
@ -287,18 +288,23 @@ resize(Client *c, Bool sizehints, Corner sticky)
if(c->maxh && c->h > c->maxh) if(c->maxh && c->h > c->maxh)
c->h = c->maxh; c->h = c->maxh;
} }
if(c->x > sw) /* might happen on restart */ if(c->x > right) /* might happen on restart */
c->x = sw - c->w; c->x = right - c->w;
if(c->y > sh) if(c->y > bottom)
c->y = sh - c->h; c->y = bottom - c->h;
if(sticky == TopRight || sticky == BotRight) if(sticky == TopRight || sticky == BotRight)
c->x = right - c->w; c->x = right - c->w;
if(sticky == BotLeft || sticky == BotRight) if(sticky == BotLeft || sticky == BotRight)
c->y = bottom - c->h; c->y = bottom - c->h;
resizetitle(c); resizetitle(c);
XSetWindowBorderWidth(dpy, c->win, 1); wc.x = c->x;
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); wc.y = c->y;
wc.width = c->w;
wc.height = c->h;
wc.border_width = 1;
XConfigureWindow(dpy, c->win,
CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
e.type = ConfigureNotify; e.type = ConfigureNotify;
e.event = c->win; e.event = c->win;

7
event.c
View File

@ -175,11 +175,8 @@ configurerequest(XEvent *e)
wc.width = ev->width; wc.width = ev->width;
wc.height = ev->height; wc.height = ev->height;
wc.border_width = 1; wc.border_width = 1;
wc.sibling = None; XConfigureWindow(dpy, ev->window,
wc.stack_mode = Above; CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
ev->value_mask &= ~CWStackMode;
ev->value_mask |= CWBorderWidth;
XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
XSync(dpy, False); XSync(dpy, False);
} }