Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
fixed version in man page
[dwm.git]
/
client.c
diff --git
a/client.c
b/client.c
index
fa48644
..
c797972
100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-25,7
+25,11
@@
resizetitle(Client *c)
c->tw = c->w + 2;
c->tx = c->x + c->w - c->tw + 2;
c->ty = c->y;
c->tw = c->w + 2;
c->tx = c->x + c->w - c->tw + 2;
c->ty = c->y;
- XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+ if(c->tags[tsel])
+ XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+ else
+ XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
+
}
static int
}
static int
@@
-129,7
+133,7
@@
gravitate(Client *c, Bool invert)
case SouthEastGravity:
case SouthGravity:
case SouthWestGravity:
case SouthEastGravity:
case SouthGravity:
case SouthWestGravity:
- dy = -
c->h
;
+ dy = -
(c->h)
;
break;
default:
break;
break;
default:
break;
@@
-192,19
+196,22
@@
lower(Client *c)
void
manage(Window w, XWindowAttributes *wa)
{
void
manage(Window w, XWindowAttributes *wa)
{
+ int diff;
Client *c;
XSetWindowAttributes twa;
Window trans;
c = emallocz(sizeof(Client));
c->win = w;
Client *c;
XSetWindowAttributes twa;
Window trans;
c = emallocz(sizeof(Client));
c->win = w;
- c->tx = c->x = wa->x;
- c->ty = c->y = wa->y;
- if(c->y < bh)
- c->ty = c->y += bh;
- c->tw = c->w = wa->width;
+ c->x = c->tx = wa->x;
+ c->y = c->ty = wa->y;
+ c->w = c->tw = wa->width;
c->h = wa->height;
c->th = bh;
c->h = wa->height;
c->th = bh;
+
+ if(c->y < bh)
+ c->y = c->ty = bh;
+
c->border = 1;
c->proto = getproto(c->win);
setsize(c);
c->border = 1;
c->proto = getproto(c->win);
setsize(c);
@@
-220,7
+227,6
@@
manage(Window w, XWindowAttributes *wa)
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
DefaultVisual(dpy, screen),
CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
- settitle(c);
settags(c);
c->next = clients;
settags(c);
c->next = clients;
@@
-228,18
+234,21
@@
manage(Window w, XWindowAttributes *wa)
XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button1, M
od1Mask
, c->win, False, ButtonPressMask,
+ XGrabButton(dpy, Button1, M
ODKEY
, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, M
od1Mask
, c->win, False, ButtonPressMask,
+ XGrabButton(dpy, Button2, M
ODKEY
, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, M
od1Mask
, c->win, False, ButtonPressMask,
+ XGrabButton(dpy, Button3, M
ODKEY
, c->win, False, ButtonPressMask,
GrabModeAsync, GrabModeSync, None, None);
if(!c->isfloat)
GrabModeAsync, GrabModeSync, None, None);
if(!c->isfloat)
- c->isfloat = trans
- || ((c->maxw == c->minw) && (c->maxh == c->minh));
+ c->isfloat = trans || (c->maxw && c->minw &&
+ (c->maxw == c->minw) && (c->maxh == c->minh));
+
+ settitle(c);
arrange(NULL);
arrange(NULL);
+
/* mapping the window now prevents flicker */
if(c->tags[tsel]) {
XMapRaised(dpy, c->win);
/* mapping the window now prevents flicker */
if(c->tags[tsel]) {
XMapRaised(dpy, c->win);
@@
-247,10
+256,8
@@
manage(Window w, XWindowAttributes *wa)
focus(c);
}
else {
focus(c);
}
else {
- ban(c);
XMapRaised(dpy, c->win);
XMapRaised(dpy, c->title);
XMapRaised(dpy, c->win);
XMapRaised(dpy, c->title);
- XSync(dpy, False);
}
}
}
}
@@
-264,7
+271,7
@@
maximize(Arg *arg)
sel->w = sw - 2 * sel->border;
sel->h = sh - 2 * sel->border - bh;
higher(sel);
sel->w = sw - 2 * sel->border;
sel->h = sh - 2 * sel->border - bh;
higher(sel);
- resize(sel, False);
+ resize(sel, False
, TopLeft
);
}
void
}
void
@@
-280,9
+287,11
@@
pop(Client *c)
}
void
}
void
-resize(Client *c, Bool inc)
+resize(Client *c, Bool inc
, Corner sticky
)
{
XConfigureEvent e;
{
XConfigureEvent e;
+ int right = c->x + c->w;
+ int bottom = c->y + c->h;
if(inc) {
if(c->incw)
if(inc) {
if(c->incw)
@@
-293,7
+302,7
@@
resize(Client *c, Bool inc)
if(c->x > sw) /* might happen on restart */
c->x = sw - c->w;
if(c->y > sh)
if(c->x > sw) /* might happen on restart */
c->x = sw - c->w;
if(c->y > sh)
- c->
ty = c->
y = sh - c->h;
+ c->y = sh - c->h;
if(c->minw && c->w < c->minw)
c->w = c->minw;
if(c->minh && c->h < c->minh)
if(c->minw && c->w < c->minw)
c->w = c->minw;
if(c->minh && c->h < c->minh)
@@
-302,9
+311,15
@@
resize(Client *c, Bool inc)
c->w = c->maxw;
if(c->maxh && c->h > c->maxh)
c->h = c->maxh;
c->w = c->maxw;
if(c->maxh && c->h > c->maxh)
c->h = c->maxh;
+ if(sticky == TopRight || sticky == BotRight)
+ c->x = right - c->w;
+ if(sticky == BotLeft || sticky == BotRight)
+ c->y = bottom - c->h;
+
resizetitle(c);
XSetWindowBorderWidth(dpy, c->win, 1);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
resizetitle(c);
XSetWindowBorderWidth(dpy, c->win, 1);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+
e.type = ConfigureNotify;
e.event = c->win;
e.window = c->win;
e.type = ConfigureNotify;
e.event = c->win;
e.window = c->win;