pinosaur
/
dwm.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implemented focus on enterwindow on titlebars
[dwm.git]
/
client.c
diff --git
a/client.c
b/client.c
index
34c69aa
..
6f6ed99
100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-73,8
+73,8
@@
focusnext(Arg *arg)
if(sel->ismax)
togglemax(NULL);
if(sel->ismax)
togglemax(NULL);
- if(!(c = getnext(sel->next
, tsel
)))
- c = getnext(clients
, tsel
);
+ if(!(c = getnext(sel->next)))
+ c = getnext(clients);
if(c) {
higher(c);
focus(c);
if(c) {
higher(c);
focus(c);
@@
-191,7
+191,7
@@
killclient(Arg *arg)
{
if(!sel)
return;
{
if(!sel)
return;
- if(sel->proto &
WM_PROTOCOL_
DELWIN)
+ if(sel->proto &
PROTO
DELWIN)
sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
else
XKillClient(dpy, sel->win);
sendevent(sel->win, wmatom[WMProtocols], wmatom[WMDelete]);
else
XKillClient(dpy, sel->win);
@@
-230,7
+230,7
@@
manage(Window w, XWindowAttributes *wa)
XGetTransientForHint(dpy, c->win, &trans);
twa.override_redirect = 1;
twa.background_pixmap = ParentRelative;
XGetTransientForHint(dpy, c->win, &trans);
twa.override_redirect = 1;
twa.background_pixmap = ParentRelative;
- twa.event_mask = ExposureMask;
+ twa.event_mask = ExposureMask
| EnterWindowMask
;
c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
0, DefaultDepth(dpy, screen), CopyFromParent,
c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
0, DefaultDepth(dpy, screen), CopyFromParent,
@@
-244,11
+244,11
@@
manage(Window w, XWindowAttributes *wa)
c->next = clients;
clients = c;
c->next = clients;
clients = c;
- XGrabButton(dpy, Button1, MODKEY, c->win, False, B
uttonPressMask
,
+ XGrabButton(dpy, Button1, MODKEY, c->win, False, B
UTTONMASK
,
GrabModeAsync, GrabModeSync, None, None);
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY, c->win, False, B
uttonPressMask
,
+ XGrabButton(dpy, Button2, MODKEY, c->win, False, B
UTTONMASK
,
GrabModeAsync, GrabModeSync, None, None);
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY, c->win, False, B
uttonPressMask
,
+ XGrabButton(dpy, Button3, MODKEY, c->win, False, B
UTTONMASK
,
GrabModeAsync, GrabModeSync, None, None);
if(!c->isfloat)
GrabModeAsync, GrabModeSync, None, None);
if(!c->isfloat)
@@
-260,62
+260,37
@@
manage(Window w, XWindowAttributes *wa)
arrange(NULL);
/* mapping the window now prevents flicker */
arrange(NULL);
/* mapping the window now prevents flicker */
- if(c->tags[tsel]) {
-
XMapRaised(dpy, c->win
);
- XMapRaised(dpy, c->title);
+ XMapRaised(dpy, c->win);
+
XMapRaised(dpy, c->title
);
+ if(c->tags[tsel])
focus(c);
focus(c);
- }
- else {
- XMapRaised(dpy, c->win);
- XMapRaised(dpy, c->title);
-
- }
}
void
}
void
-pop(Client *c)
-{
- Client **l;
-
- for(l = &clients; *l && *l != c; l = &(*l)->next);
- if(c->prev)
- c->prev->next = c->next;
- if(c->next)
- c->next->prev = c->prev;
- *l = c->next;
-
- if(clients)
- clients->prev = c;
- c->next = clients;
- clients = c;
- arrange(NULL);
-}
-
-void
-resize(Client *c, Bool inc, Corner sticky)
+resize(Client *c, Bool sizehints, Corner sticky)
{
int bottom = c->y + c->h;
int right = c->x + c->w;
XConfigureEvent e;
{
int bottom = c->y + c->h;
int right = c->x + c->w;
XConfigureEvent e;
- if(
inc
) {
+ if(
sizehints
) {
if(c->incw)
c->w -= (c->w - c->basew) % c->incw;
if(c->inch)
c->h -= (c->h - c->baseh) % c->inch;
if(c->incw)
c->w -= (c->w - c->basew) % c->incw;
if(c->inch)
c->h -= (c->h - c->baseh) % c->inch;
+ if(c->minw && c->w < c->minw)
+ c->w = c->minw;
+ if(c->minh && c->h < c->minh)
+ c->h = c->minh;
+ if(c->maxw && c->w > c->maxw)
+ c->w = c->maxw;
+ if(c->maxh && c->h > c->maxh)
+ c->h = c->maxh;
}
if(c->x > sw) /* might happen on restart */
c->x = sw - c->w;
if(c->y > sh)
c->y = sh - c->h;
}
if(c->x > sw) /* might happen on restart */
c->x = sw - c->w;
if(c->y > sh)
c->y = sh - c->h;
- if(c->minw && c->w < c->minw)
- c->w = c->minw;
- if(c->minh && c->h < c->minh)
- c->h = c->minh;
- if(c->maxw && c->w > c->maxw)
- 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)
if(sticky == TopRight || sticky == BotRight)
c->x = right - c->w;
if(sticky == BotLeft || sticky == BotRight)
@@
-441,22
+416,20
@@
togglemax(Arg *arg)
void
unmanage(Client *c)
{
void
unmanage(Client *c)
{
- Client **l;
-
XGrabServer(dpy);
XSetErrorHandler(xerrordummy);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
XDestroyWindow(dpy, c->title);
XGrabServer(dpy);
XSetErrorHandler(xerrordummy);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
XDestroyWindow(dpy, c->title);
- for(l = &clients; *l && *l != c; l = &(*l)->next);
if(c->prev)
c->prev->next = c->next;
if(c->next)
c->next->prev = c->prev;
if(c->prev)
c->prev->next = c->next;
if(c->next)
c->next->prev = c->prev;
- *l = c->next;
+ if(c == clients)
+ clients = c->next;
if(sel == c) {
if(sel == c) {
- sel = getnext(c->next
, tsel
);
+ sel = getnext(c->next);
if(!sel)
sel = getprev(c->prev);
if(!sel)
if(!sel)
sel = getprev(c->prev);
if(!sel)
@@
-480,11
+453,21
@@
zoom(Arg *arg)
if(!sel)
return;
if(!sel)
return;
- if(sel == getnext(clients
, tsel
) && sel->next) {
- if((c = getnext(sel->next
, tsel
)))
+ if(sel == getnext(clients) && sel->next) {
+ if((c = getnext(sel->next)))
sel = c;
}
sel = c;
}
- pop(sel);
+ /* pop */
+ if(sel->prev)
+ sel->prev->next = sel->next;
+ if(sel->next)
+ sel->next->prev = sel->prev;
+ sel->prev = NULL;
+ if(clients)
+ clients->prev = sel;
+ sel->next = clients;
+ clients = sel;
+ arrange(NULL);
focus(sel);
}
focus(sel);
}