Xinqi Bao's Git
projects
/
dwm.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
inline
| side by side
yet another fix of copyright compactisition
[dwm.git]
/
event.c
diff --git
a/event.c
b/event.c
index
153b49a
..
c41c975
100644
(file)
--- a/
event.c
+++ b/
event.c
@@
-1,7
+1,8
@@
-/*
(C)opyright MMVI-MMVII
Anselm R. Garbe <garbeam at gmail dot com>
- *
See LICENSE file for license details.
- */
+/*
© 2006-2007
Anselm R. Garbe <garbeam at gmail dot com>
+ *
© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ *
See LICENSE file for license details. *
/
#include "dwm.h"
#include "dwm.h"
+#include <stdio.h>
#include <stdlib.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
#include <stdlib.h>
#include <X11/keysym.h>
#include <X11/Xatom.h>
@@
-11,8
+12,8
@@
typedef struct {
unsigned long mod;
KeySym keysym;
typedef struct {
unsigned long mod;
KeySym keysym;
- void (*func)(
Arg
*arg);
-
Arg
arg;
+ void (*func)(
const char
*arg);
+
const char *
arg;
} Key;
KEYS
} Key;
KEYS
@@
-20,6
+21,14
@@
KEYS
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
#define MOUSEMASK (BUTTONMASK | PointerMotionMask)
#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
#define MOUSEMASK (BUTTONMASK | PointerMotionMask)
+static Client *
+getclient(Window w) {
+ Client *c;
+
+ for(c = clients; c && c->win != w; c = c->next);
+ return c;
+}
+
static void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
static void
movemouse(Client *c) {
int x1, y1, ocx, ocy, di, nx, ny;
@@
-104,43
+113,37
@@
resizemouse(Client *c) {
static void
buttonpress(XEvent *e) {
static void
buttonpress(XEvent *e) {
-
int x
;
-
Arg a
;
+
static char buf[32]
;
+
unsigned int i, x
;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
Client *c;
XButtonPressedEvent *ev = &e->xbutton;
+ buf[0] = 0;
if(barwin == ev->window) {
x = 0;
if(barwin == ev->window) {
x = 0;
- for(
a.i = 0; a.i < ntags; a.
i++) {
- x += textw(tags[
a.
i]);
+ for(
i = 0; i < ntags;
i++) {
+ x += textw(tags[i]);
if(ev->x < x) {
if(ev->x < x) {
+ snprintf(buf, sizeof buf, "%d", i);
if(ev->button == Button1) {
if(ev->state & MODKEY)
if(ev->button == Button1) {
if(ev->state & MODKEY)
- tag(
&a
);
+ tag(
buf
);
else
else
- view(
&a
);
+ view(
buf
);
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
}
else if(ev->button == Button3) {
if(ev->state & MODKEY)
- toggletag(
&a
);
+ toggletag(
buf
);
else
else
- toggleview(
&a
);
+ toggleview(
buf
);
}
return;
}
}
}
return;
}
}
- if(ev->x < x + b
m
w)
+ if(ev->x < x + b
l
w)
switch(ev->button) {
case Button1:
switch(ev->button) {
case Button1:
- togglemode(NULL);
- break;
- case Button4:
- a.i = 1;
- incnmaster(&a);
- break;
- case Button5:
- a.i = -1;
- incnmaster(&a);
+ setlayout(NULL);
break;
}
}
break;
}
}
@@
-148,14
+151,14
@@
buttonpress(XEvent *e) {
focus(c);
if(CLEANMASK(ev->state) != MODKEY)
return;
focus(c);
if(CLEANMASK(ev->state) != MODKEY)
return;
- if(ev->button == Button1 && (
arrange == dofloat || c->isfloat
)) {
+ if(ev->button == Button1 && (
lt->arrange == floating || c->isfloating
)) {
restack();
movemouse(c);
}
else if(ev->button == Button2)
zoom(NULL);
else if(ev->button == Button3
restack();
movemouse(c);
}
else if(ev->button == Button2)
zoom(NULL);
else if(ev->button == Button3
- && (
arrange == dofloat || c->isfloat
) && !c->isfixed)
+ && (
lt->arrange == floating || c->isfloating
) && !c->isfixed)
{
restack();
resizemouse(c);
{
restack();
resizemouse(c);
@@
-171,9
+174,7
@@
configurerequest(XEvent *e) {
if((c = getclient(ev->window))) {
c->ismax = False;
if((c = getclient(ev->window))) {
c->ismax = False;
- if(ev->value_mask & CWBorderWidth)
- c->border = ev->border_width;
- if(c->isfixed || c->isfloat || (arrange == dofloat)) {
+ if(c->isfixed || c->isfloating || (lt->arrange == floating)) {
if(ev->value_mask & CWX)
c->x = ev->x;
if(ev->value_mask & CWY)
if(ev->value_mask & CWX)
c->x = ev->x;
if(ev->value_mask & CWY)
@@
-184,19
+185,16
@@
configurerequest(XEvent *e) {
c->h = ev->height;
if((ev->value_mask & (CWX | CWY))
&& !(ev->value_mask & (CWWidth | CWHeight)))
c->h = ev->height;
if((ev->value_mask & (CWX | CWY))
&& !(ev->value_mask & (CWWidth | CWHeight)))
- {
configure(c);
configure(c);
- if(isvisible(c))
- XMoveWindow(dpy, c->win, c->x, c->y);
- }
- else {
+ if(isvisible(c))
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
- if(!isvisible(c))
- ban(c);
- }
}
}
- else
+ else {
+ if(ev->value_mask & CWBorderWidth)
+ c->border = ev->border_width;
configure(c);
configure(c);
+ c->border = BORDERPX;
+ }
}
else {
wc.x = ev->x;
}
else {
wc.x = ev->x;
@@
-259,7
+257,7
@@
keypress(XEvent *e) {
&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
{
if(key[i].func)
&& CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
{
if(key[i].func)
- key[i].func(
&
key[i].arg);
+ key[i].func(key[i].arg);
}
}
}
}
@@
-308,8
+306,8
@@
propertynotify(XEvent *e) {
default: break;
case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans);
default: break;
case XA_WM_TRANSIENT_FOR:
XGetTransientForHint(dpy, c->win, &trans);
- if(!c->isfloat
&& (c->isfloat = (trans != 0
)))
- arrange();
+ if(!c->isfloat
ing && (c->isfloating = (getclient(trans) != NULL
)))
+
lt->
arrange();
break;
case XA_WM_NORMAL_HINTS:
updatesizehints(c);
break;
case XA_WM_NORMAL_HINTS:
updatesizehints(c);
@@
-367,14
+365,3
@@
grabkeys(void) {
GrabModeAsync, GrabModeAsync);
}
}
GrabModeAsync, GrabModeAsync);
}
}
-
-void
-procevent(void) {
- XEvent ev;
-
- while(XPending(dpy)) {
- XNextEvent(dpy, &ev);
- if(handler[ev.type])
- (handler[ev.type])(&ev); /* call handler */
- }
-}