Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
applied Jukkas prev/next patch with XK_{h,l}
[dwm.git]
/
client.c
diff --git
a/client.c
b/client.c
index
889daa5
..
646bcc1
100644
(file)
--- a/
client.c
+++ b/
client.c
@@
-70,11
+70,13
@@
focusnext(Arg *arg)
if(!sel)
return;
if(!sel)
return;
- if(!(c = getnext(sel->next, tsel)))
- c = getnext(clients, tsel);
+ if(sel->ismax)
+ togglemax(NULL);
+
+ if(!(c = getnext(sel->next)))
+ c = getnext(clients);
if(c) {
higher(c);
if(c) {
higher(c);
- c->revert = sel;
focus(c);
}
}
focus(c);
}
}
@@
-87,7
+89,14
@@
focusprev(Arg *arg)
if(!sel)
return;
if(!sel)
return;
- if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
+ if(sel->ismax)
+ togglemax(NULL);
+
+ if(!(c = getprev(sel->prev))) {
+ for(c = clients; c && c->next; c = c->next);
+ c = getprev(c);
+ }
+ if(c) {
higher(c);
focus(c);
}
higher(c);
focus(c);
}
@@
-121,6
+130,8
@@
gravitate(Client *c, Bool invert)
int dx = 0, dy = 0;
switch(c->grav) {
int dx = 0, dy = 0;
switch(c->grav) {
+ default:
+ break;
case StaticGravity:
case NorthWestGravity:
case NorthGravity:
case StaticGravity:
case NorthWestGravity:
case NorthGravity:
@@
-137,11
+148,11
@@
gravitate(Client *c, Bool invert)
case SouthWestGravity:
dy = -(c->h);
break;
case SouthWestGravity:
dy = -(c->h);
break;
- default:
- break;
}
switch (c->grav) {
}
switch (c->grav) {
+ default:
+ break;
case StaticGravity:
case NorthWestGravity:
case WestGravity:
case StaticGravity:
case NorthWestGravity:
case WestGravity:
@@
-158,8
+169,6
@@
gravitate(Client *c, Bool invert)
case SouthEastGravity:
dx = -(c->w + c->border);
break;
case SouthEastGravity:
dx = -(c->w + c->border);
break;
- default:
- break;
}
if(invert) {
}
if(invert) {
@@
-198,7
+207,6
@@
lower(Client *c)
void
manage(Window w, XWindowAttributes *wa)
{
void
manage(Window w, XWindowAttributes *wa)
{
- int diff;
Client *c;
Window trans;
XSetWindowAttributes twa;
Client *c;
Window trans;
XSetWindowAttributes twa;
@@
-218,7
+226,7
@@
manage(Window w, XWindowAttributes *wa)
c->proto = getproto(c->win);
setsize(c);
XSelectInput(dpy, c->win,
c->proto = getproto(c->win);
setsize(c);
XSelectInput(dpy, c->win,
-
StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
+ StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
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;
@@
-231,16
+239,16
@@
manage(Window w, XWindowAttributes *wa)
settags(c);
settags(c);
+ if(clients)
+ clients->prev = c;
c->next = clients;
clients = c;
c->next = clients;
clients = c;
- XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
- GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask,
+ XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonMask,
GrabModeAsync, GrabModeSync, None, None);
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button2, MODKEY, c->win, False, Button
Press
Mask,
+ XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonMask,
GrabModeAsync, GrabModeSync, None, None);
GrabModeAsync, GrabModeSync, None, None);
- XGrabButton(dpy, Button3, MODKEY, c->win, False, Button
Press
Mask,
+ XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonMask,
GrabModeAsync, GrabModeSync, None, None);
if(!c->isfloat)
GrabModeAsync, GrabModeSync, None, None);
if(!c->isfloat)
@@
-252,68
+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
-maximize(Arg *arg)
-{
- if(!sel)
- return;
- sel->x = sx;
- sel->y = sy + bh;
- sel->w = sw - 2 * sel->border;
- sel->h = sh - 2 * sel->border - bh;
- higher(sel);
- resize(sel, False, TopLeft);
-}
-
-void
-pop(Client *c)
-{
- Client **l;
-
- for(l = &clients; *l && *l != c; l = &(*l)->next);
- *l = c->next;
-
- c->next = clients; /* pop */
- clients = c;
- arrange(NULL);
}
void
}
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)
@@
-404,6
+381,38
@@
settitle(Client *c)
resizetitle(c);
}
resizetitle(c);
}
+void
+togglemax(Arg *arg)
+{
+ int ox, oy, ow, oh;
+ XEvent ev;
+
+ if(!sel)
+ return;
+
+ if((sel->ismax = !sel->ismax)) {
+ ox = sel->x;
+ oy = sel->y;
+ ow = sel->w;
+ oh = sel->h;
+ sel->x = sx;
+ sel->y = sy + bh;
+ sel->w = sw - 2 * sel->border;
+ sel->h = sh - 2 * sel->border - bh;
+
+ higher(sel);
+ resize(sel, False, TopLeft);
+
+ sel->x = ox;
+ sel->y = oy;
+ sel->w = ow;
+ sel->h = oh;
+ }
+ else
+ resize(sel, False, TopLeft);
+ while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
void
unmanage(Client *c)
{
void
unmanage(Client *c)
{
@@
-416,13
+425,18
@@
unmanage(Client *c)
XDestroyWindow(dpy, c->title);
for(l = &clients; *l && *l != c; l = &(*l)->next);
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;
*l = c->next;
*l = c->next;
- for(l = &clients; *l; l = &(*l)->next)
- if((*l)->revert == c)
- (*l)->revert = NULL;
- if(sel == c)
- sel = sel->revert ? sel->revert : clients;
-
+ if(sel == c) {
+ sel = getnext(c->next);
+ if(!sel)
+ sel = getprev(c->prev);
+ if(!sel)
+ sel = clients;
+ }
free(c);
XSync(dpy, False);
free(c);
XSync(dpy, False);
@@
-436,16
+450,29
@@
unmanage(Client *c)
void
zoom(Arg *arg)
{
void
zoom(Arg *arg)
{
- Client *c;
+ Client *c
, **l
;
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 */
+ for(l = &clients; *l && *l != sel; l = &(*l)->next);
+ if(sel->prev)
+ sel->prev->next = sel->next;
+ if(sel->next)
+ sel->next->prev = sel->prev;
+ *l = sel->next;
+
+ sel->prev = NULL;
+ if(clients)
+ clients->prev = sel;
+ sel->next = clients;
+ clients = sel;
+ arrange(NULL);
focus(sel);
}
focus(sel);
}