From 44f2e8b952264311887c3b51dc6a987af226062a Mon Sep 17 00:00:00 2001 From: "Anselm R. Garbe" Date: Thu, 13 Jul 2006 10:34:55 +0200 Subject: added dev.c instead of kb.c --- Makefile | 2 +- README | 2 +- dev.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ kb.c | 60 ---------------------------- mouse.c | 81 -------------------------------------- wm.h | 4 +- 6 files changed, 137 insertions(+), 146 deletions(-) create mode 100644 dev.c delete mode 100644 kb.c delete mode 100644 mouse.c diff --git a/Makefile b/Makefile index 35963ce5..41bc8791 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ include config.mk -SRC = client.c draw.c event.c kb.c mouse.c util.c wm.c +SRC = client.c dev.c draw.c event.c util.c wm.c OBJ = ${SRC:.c=.o} MAN1 = dwm.1 BIN = dwm diff --git a/README b/README index 6260440a..e6b06b0e 100644 --- a/README +++ b/README @@ -37,4 +37,4 @@ This will start dwm on display :1 of the host foo.bar. Configuration ------------- The configuration of dwm is done by customizing the wm.h source file. To -customize the key bindings edit kb.c. +customize the key bindings edit dev.c. diff --git a/dev.c b/dev.c new file mode 100644 index 00000000..7e815ecb --- /dev/null +++ b/dev.c @@ -0,0 +1,134 @@ +/* + * (C)opyright MMVI Anselm R. Garbe + * See LICENSE file for license details. + */ + +#include "wm.h" + +#include +#include +#include +#include + +/********** CUSTOMIZE **********/ + +const char *term[] = { + "aterm", "-tr", "+sb", "-bg", "black", "-fg", "white", "-fn", + "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*",NULL +}; +const char *browse[] = { "firefox", NULL }; + +static Key key[] = { + { Mod1Mask, XK_Return, (void (*)(void *))spawn, term }, + { Mod1Mask, XK_w, (void (*)(void *))spawn, browse }, + { Mod1Mask, XK_k, sel, "prev" }, + { Mod1Mask, XK_j, sel, "next" }, + { Mod1Mask, XK_space, toggle, NULL }, + { Mod1Mask, XK_m, max, NULL }, + { Mod1Mask | ShiftMask, XK_c, ckill, NULL }, + { Mod1Mask | ShiftMask, XK_q, quit, NULL }, +}; + +/********** CUSTOMIZE **********/ + +void +update_keys(void) +{ + unsigned int i, len; + KeyCode code; + + len = sizeof(key) / sizeof(key[0]); + for(i = 0; i < len; i++) { + code = XKeysymToKeycode(dpy, key[i].keysym); + XUngrabKey(dpy, code, key[i].mod, root); + XGrabKey(dpy, code, key[i].mod, root, True, GrabModeAsync, GrabModeAsync); + } +} + +void +keypress(XEvent *e) +{ + XKeyEvent *ev = &e->xkey; + unsigned int i, len; + KeySym keysym; + + keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); + len = sizeof(key) / sizeof(key[0]); + for(i = 0; i < len; i++) + if((keysym == key[i].keysym) && (key[i].mod == ev->state)) { + if(key[i].func) + key[i].func(key[i].aux); + return; + } +} + +#define ButtonMask (ButtonPressMask | ButtonReleaseMask) +#define MouseMask (ButtonMask | PointerMotionMask) + +void +mresize(Client *c) +{ + XEvent ev; + int ocx, ocy; + + ocx = c->x; + ocy = c->y; + if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, + None, cursor[CurResize], CurrentTime) != GrabSuccess) + return; + XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h); + for(;;) { + XMaskEvent(dpy, MouseMask | ExposureMask, &ev); + switch(ev.type) { + default: break; + case Expose: + handler[Expose](&ev); + break; + case MotionNotify: + XFlush(dpy); + c->w = abs(ocx - ev.xmotion.x); + c->h = abs(ocy - ev.xmotion.y); + c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w; + c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h; + resize(c); + break; + case ButtonRelease: + XUngrabPointer(dpy, CurrentTime); + return; + } + } +} + +void +mmove(Client *c) +{ + XEvent ev; + int x1, y1, ocx, ocy, di; + unsigned int dui; + Window dummy; + + ocx = c->x; + ocy = c->y; + if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, + None, cursor[CurMove], CurrentTime) != GrabSuccess) + return; + XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); + for(;;) { + XMaskEvent(dpy, MouseMask | ExposureMask, &ev); + switch (ev.type) { + default: break; + case Expose: + handler[Expose](&ev); + break; + case MotionNotify: + XFlush(dpy); + c->x = ocx + (ev.xmotion.x - x1); + c->y = ocy + (ev.xmotion.y - y1); + resize(c); + break; + case ButtonRelease: + XUngrabPointer(dpy, CurrentTime); + return; + } + } +} diff --git a/kb.c b/kb.c deleted file mode 100644 index 5999c6e0..00000000 --- a/kb.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * (C)opyright MMVI Anselm R. Garbe - * See LICENSE file for license details. - */ - -#include "wm.h" - -#include - -/********** CUSTOMIZE **********/ - -const char *term[] = { - "aterm", "-tr", "+sb", "-bg", "black", "-fg", "white", "-fn", - "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*",NULL -}; -const char *browse[] = { "firefox", NULL }; - -static Key key[] = { - { Mod1Mask, XK_Return, (void (*)(void *))spawn, term }, - { Mod1Mask, XK_w, (void (*)(void *))spawn, browse }, - { Mod1Mask, XK_k, sel, "prev" }, - { Mod1Mask, XK_j, sel, "next" }, - { Mod1Mask, XK_space, toggle, NULL }, - { Mod1Mask, XK_m, max, NULL }, - { Mod1Mask | ShiftMask, XK_c, ckill, NULL }, - { Mod1Mask | ShiftMask, XK_q, quit, NULL }, -}; - -/********** CUSTOMIZE **********/ - -void -update_keys(void) -{ - unsigned int i, len; - KeyCode code; - - len = sizeof(key) / sizeof(key[0]); - for(i = 0; i < len; i++) { - code = XKeysymToKeycode(dpy, key[i].keysym); - XUngrabKey(dpy, code, key[i].mod, root); - XGrabKey(dpy, code, key[i].mod, root, True, GrabModeAsync, GrabModeAsync); - } -} - -void -keypress(XEvent *e) -{ - XKeyEvent *ev = &e->xkey; - unsigned int i, len; - KeySym keysym; - - keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); - len = sizeof(key) / sizeof(key[0]); - for(i = 0; i < len; i++) - if((keysym == key[i].keysym) && (key[i].mod == ev->state)) { - if(key[i].func) - key[i].func(key[i].aux); - return; - } -} diff --git a/mouse.c b/mouse.c deleted file mode 100644 index 041ab039..00000000 --- a/mouse.c +++ /dev/null @@ -1,81 +0,0 @@ -/* - * (C)opyright MMVI Anselm R. Garbe - * See LICENSE file for license details. - */ - -#include -#include -#include - -#include "wm.h" - -#define ButtonMask (ButtonPressMask | ButtonReleaseMask) -#define MouseMask (ButtonMask | PointerMotionMask) - -void -mresize(Client *c) -{ - XEvent ev; - int ocx, ocy; - - ocx = c->x; - ocy = c->y; - if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, - None, cursor[CurResize], CurrentTime) != GrabSuccess) - return; - XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h); - for(;;) { - XMaskEvent(dpy, MouseMask | ExposureMask, &ev); - switch(ev.type) { - default: break; - case Expose: - handler[Expose](&ev); - break; - case MotionNotify: - XFlush(dpy); - c->w = abs(ocx - ev.xmotion.x); - c->h = abs(ocy - ev.xmotion.y); - c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w; - c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h; - resize(c); - break; - case ButtonRelease: - XUngrabPointer(dpy, CurrentTime); - return; - } - } -} - -void -mmove(Client *c) -{ - XEvent ev; - int x1, y1, ocx, ocy, di; - unsigned int dui; - Window dummy; - - ocx = c->x; - ocy = c->y; - if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, - None, cursor[CurMove], CurrentTime) != GrabSuccess) - return; - XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); - for(;;) { - XMaskEvent(dpy, MouseMask | ExposureMask, &ev); - switch (ev.type) { - default: break; - case Expose: - handler[Expose](&ev); - break; - case MotionNotify: - XFlush(dpy); - c->x = ocx + (ev.xmotion.x - x1); - c->y = ocy + (ev.xmotion.y - y1); - resize(c); - break; - case ButtonRelease: - XUngrabPointer(dpy, CurrentTime); - return; - } - } -} diff --git a/wm.h b/wm.h index 9172deaf..7e484340 100644 --- a/wm.h +++ b/wm.h @@ -115,11 +115,9 @@ extern unsigned int texth(Fnt *font); /* event.c */ extern void discard_events(long even_mask); -/* kb.c */ +/* dev.c */ extern void update_keys(void); extern void keypress(XEvent *e); - -/* mouse.c */ extern void mresize(Client *c); extern void mmove(Client *c); -- cgit v1.2.3