Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
implemented the maximization as I described on the mailinglist, this feels better...
[dwm.git]
/
event.c
diff --git
a/event.c
b/event.c
index
9974192
..
d5f4aa8
100644
(file)
--- a/
event.c
+++ b/
event.c
@@
-21,8
+21,7
@@
KEYS
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
static void
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
static void
-movemouse(Client *c)
-{
+movemouse(Client *c) {
int x1, y1, ocx, ocy, di;
unsigned int dui;
Window dummy;
int x1, y1, ocx, ocy, di;
unsigned int dui;
Window dummy;
@@
-37,7
+36,8
@@
movemouse(Client *c)
for(;;) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
switch (ev.type) {
for(;;) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
switch (ev.type) {
- default: break;
+ default:
+ break;
case Expose:
handler[Expose](&ev);
break;
case Expose:
handler[Expose](&ev);
break;
@@
-55,8
+55,7
@@
movemouse(Client *c)
}
static void
}
static void
-resizemouse(Client *c)
-{
+resizemouse(Client *c) {
int ocx, ocy;
int nw, nh;
Corner sticky;
int ocx, ocy;
int nw, nh;
Corner sticky;
@@
-71,7
+70,8
@@
resizemouse(Client *c)
for(;;) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
switch(ev.type) {
for(;;) {
XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
switch(ev.type) {
- default: break;
+ default:
+ break;
case Expose:
handler[Expose](&ev);
break;
case Expose:
handler[Expose](&ev);
break;
@@
-97,8
+97,7
@@
resizemouse(Client *c)
}
static void
}
static void
-buttonpress(XEvent *e)
-{
+buttonpress(XEvent *e) {
int x;
Arg a;
Client *c;
int x;
Arg a;
Client *c;
@@
-131,7
+130,7
@@
buttonpress(XEvent *e)
}
else if((c = getclient(ev->window))) {
focus(c);
}
else if((c = getclient(ev->window))) {
focus(c);
- if(
maximized ||
CLEANMASK(ev->state) != MODKEY)
+ if(CLEANMASK(ev->state) != MODKEY)
return;
if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
restack(c);
return;
if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
restack(c);
@@
-147,8
+146,7
@@
buttonpress(XEvent *e)
}
static void
}
static void
-synconfig(Client *c, int x, int y, int w, int h, unsigned int border)
-{
+synconfig(Client *c, int x, int y, int w, int h, unsigned int border) {
XEvent synev;
synev.type = ConfigureNotify;
XEvent synev;
synev.type = ConfigureNotify;
@@
-165,15
+163,14
@@
synconfig(Client *c, int x, int y, int w, int h, unsigned int border)
}
static void
}
static void
-configurerequest(XEvent *e)
-{
+configurerequest(XEvent *e) {
unsigned long newmask;
Client *c;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
if((c = getclient(ev->window))) {
unsigned long newmask;
Client *c;
XConfigureRequestEvent *ev = &e->xconfigurerequest;
XWindowChanges wc;
if((c = getclient(ev->window))) {
- if((c == sel) && !c->isfloat && (arrange != dofloat)
&& maximized
) {
+ if((c == sel) && !c->isfloat && (arrange != dofloat)) {
synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
XSync(dpy, False);
return;
synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
XSync(dpy, False);
return;
@@
-219,8
+216,7
@@
configurerequest(XEvent *e)
}
static void
}
static void
-destroynotify(XEvent *e)
-{
+destroynotify(XEvent *e) {
Client *c;
XDestroyWindowEvent *ev = &e->xdestroywindow;
Client *c;
XDestroyWindowEvent *ev = &e->xdestroywindow;
@@
-229,15
+225,14
@@
destroynotify(XEvent *e)
}
static void
}
static void
-enternotify(XEvent *e)
-{
+enternotify(XEvent *e) {
Client *c;
XCrossingEvent *ev = &e->xcrossing;
if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
return;
Client *c;
XCrossingEvent *ev = &e->xcrossing;
if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
return;
- if((
c = getclient(ev->window)) || (c = getctitle(ev->window)
))
+ if((
(c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c
))
focus(c);
else if(ev->window == root) {
issel = True;
focus(c);
else if(ev->window == root) {
issel = True;
@@
-247,8
+242,7
@@
enternotify(XEvent *e)
}
static void
}
static void
-expose(XEvent *e)
-{
+expose(XEvent *e) {
Client *c;
XExposeEvent *ev = &e->xexpose;
Client *c;
XExposeEvent *ev = &e->xexpose;
@@
-261,8
+255,7
@@
expose(XEvent *e)
}
static void
}
static void
-keypress(XEvent *e)
-{
+keypress(XEvent *e) {
static unsigned int len = sizeof(key) / sizeof(key[0]);
unsigned int i;
KeySym keysym;
static unsigned int len = sizeof(key) / sizeof(key[0]);
unsigned int i;
KeySym keysym;
@@
-270,8
+263,8
@@
keypress(XEvent *e)
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
for(i = 0; i < len; i++) {
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
for(i = 0; i < len; i++) {
- if(keysym == key[i].keysym
&&
-
CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+ if(keysym == key[i].keysym
+
&&
CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
{
if(key[i].func)
key[i].func(&key[i].arg);
{
if(key[i].func)
key[i].func(&key[i].arg);
@@
-281,8
+274,7
@@
keypress(XEvent *e)
}
static void
}
static void
-leavenotify(XEvent *e)
-{
+leavenotify(XEvent *e) {
XCrossingEvent *ev = &e->xcrossing;
if((ev->window == root) && !ev->same_screen) {
XCrossingEvent *ev = &e->xcrossing;
if((ev->window == root) && !ev->same_screen) {
@@
-292,8
+284,7
@@
leavenotify(XEvent *e)
}
static void
}
static void
-mappingnotify(XEvent *e)
-{
+mappingnotify(XEvent *e) {
XMappingEvent *ev = &e->xmapping;
XRefreshKeyboardMapping(ev);
XMappingEvent *ev = &e->xmapping;
XRefreshKeyboardMapping(ev);
@@
-302,8
+293,7
@@
mappingnotify(XEvent *e)
}
static void
}
static void
-maprequest(XEvent *e)
-{
+maprequest(XEvent *e) {
static XWindowAttributes wa;
XMapRequestEvent *ev = &e->xmaprequest;
static XWindowAttributes wa;
XMapRequestEvent *ev = &e->xmaprequest;
@@
-321,8
+311,7
@@
maprequest(XEvent *e)
}
static void
}
static void
-propertynotify(XEvent *e)
-{
+propertynotify(XEvent *e) {
Client *c;
Window trans;
XPropertyEvent *ev = &e->xproperty;
Client *c;
Window trans;
XPropertyEvent *ev = &e->xproperty;
@@
-343,19
+332,18
@@
propertynotify(XEvent *e)
arrange(NULL);
break;
case XA_WM_NORMAL_HINTS:
arrange(NULL);
break;
case XA_WM_NORMAL_HINTS:
-
set
size(c);
+
update
size(c);
break;
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
break;
}
if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-
set
title(c);
+
update
title(c);
drawtitle(c);
}
}
}
static void
drawtitle(c);
}
}
}
static void
-unmapnotify(XEvent *e)
-{
+unmapnotify(XEvent *e) {
Client *c;
XUnmapEvent *ev = &e->xunmap;
Client *c;
XUnmapEvent *ev = &e->xunmap;
@@
-380,8
+368,7
@@
void (*handler[LASTEvent]) (XEvent *) = {
};
void
};
void
-grabkeys()
-{
+grabkeys() {
static unsigned int len = sizeof(key) / sizeof(key[0]);
unsigned int i;
KeyCode code;
static unsigned int len = sizeof(key) / sizeof(key[0]);
unsigned int i;
KeyCode code;
@@
-401,8
+388,7
@@
grabkeys()
}
void
}
void
-procevent()
-{
+procevent() {
XEvent ev;
while(XPending(dpy)) {
XEvent ev;
while(XPending(dpy)) {
@@
-411,4
+397,3
@@
procevent()
(handler[ev.type])(&ev); /* call handler */
}
}
(handler[ev.type])(&ev); /* call handler */
}
}
-