#include <sys/wait.h>
#include <X11/cursorfont.h>
#include <X11/keysym.h>
+#include <X11/XF86keysym.h>
#include <X11/Xatom.h>
#include <X11/Xlib.h>
#include <X11/Xproto.h>
NetWMWindowTypeDialog, NetClientList, NetSupportingWMCheck, NetLast }; /* EWMH atoms */
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
- ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
+ ClkClientWin, ClkRootWin, ClkAnywhere, ClkLast }; /* clicks */
typedef union {
int i;
static void run(void);
static void scan(void);
static Bool sendevent(Client *c, Atom proto);
-static void send_keycode(KeyCode key, unsigned int state);
static void sendmon(Client *c, Monitor *m);
static void setclientstate(Client *c, long state);
static void setfocus(Client *c);
static void zoom(const Arg *arg);
/* variables */
-typedef struct {
- KeyCode keycode;
- unsigned int state;
-} BufferedKey;
-static BufferedKey key_buffer[200];
-static int key_buffer_len = 0;
static Bool key_buffering = False;
static const char broken[] = "broken";
static char stext[256];
Client *c;
Monitor *m;
XButtonPressedEvent *ev = &e->xbutton;
+ Bool called = False;
+
+ for(i = 0; i < LENGTH(buttons); i++) {
+ if(buttons[i].click == ClkAnywhere && buttons[i].button == ev->button
+ && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) {
+ buttons[i].func(&buttons[i].arg);
+ called = True;
+ }
+ }
+ if (called) {
+ return;
+ }
click = ClkRootWin;
/* focus monitor if necessary */
}
if(ev->window == selmon->barwin) {
return;
- }
- else if((c = wintoclient(ev->window))) {
+ } else if((c = wintoclient(ev->window))) {
focus(c);
click = ClkClientWin;
}
- for(i = 0; i < LENGTH(buttons); i++)
+ for(i = 0; i < LENGTH(buttons); i++) {
if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
- && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
- buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
+ && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) {
+ if (click == ClkTagBar && buttons[i].arg.i == 0) {
+ buttons[i].func(&arg);
+ } else {
+ buttons[i].func(&buttons[i].arg);
+ }
+ }
+ }
}
void
occ & 1 << i, urg & 1 << i);
x += w;
}
- w = blw = TEXTW(m->ltsymbol);
- drw_setscheme(drw, &scheme[SchemeNorm]);
- drw_text(drw, x, 0, w, bh, m->ltsymbol, 0);
- x += w;
xx = x;
if(m == selmon) { /* status is only drawn on selected monitor */
w = TEXTW(stext);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
if(focused) {
for(i = 0; i < LENGTH(buttons); i++)
- if(buttons[i].click == ClkClientWin)
+ if(buttons[i].click == ClkClientWin || buttons[i].click == ClkAnywhere)
for(j = 0; j < LENGTH(modifiers); j++)
XGrabButton(dpy, buttons[i].button,
buttons[i].mask | modifiers[j],
c->win, False, BUTTONMASK,
GrabModeAsync, GrabModeSync, None, None);
- }
- else
+ } else {
XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
+ }
}
}
grabkeys(void) {
updatenumlockmask();
//XUngrabKey(dpy, AnyKey, AnyModifier, root);
- XGrabKey(dpy, AnyKey, AnyModifier, root, True, GrabModeAsync, GrabModeAsync);
+ {
+ unsigned int i, j;
+ unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
+ KeyCode code;
+
+ XUngrabKey(dpy, AnyKey, AnyModifier, root);
+ for(i = 0; i < LENGTH(keys); i++)
+ if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
+ for(j = 0; j < LENGTH(modifiers); j++)
+ XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
+ True, GrabModeAsync,
+ keys[i].func == kbspawn ? GrabModeSync : GrabModeAsync);
+ }
}
void
#endif /* XINERAMA */
void
-send_keycode(KeyCode key, unsigned int state) {
- XKeyEvent event;
- if(!selmon->sel) {
- return;
- }
- event.display = dpy;
- event.root = root;
- event.window = selmon->sel->win;
- event.subwindow = None;
- event.same_screen = True;
- event.x = 1;
- event.y = 1;
- event.x_root = 1;
- event.y_root = 1;
- event.time = CurrentTime;
- event.state = state; // modifiers
- event.keycode = key;
- event.type = KeyPress;
- XSendEvent(event.display, event.window, True, KeyPressMask, (XEvent *)&event);
- event.type = KeyRelease;
- XSendEvent(event.display, event.window, True, KeyPressMask, (XEvent *)&event);
-}
-
-void
keypress(XEvent *e) {
unsigned int i;
KeySym keysym;
XKeyEvent *ev;
- Bool called = False;
ev = &e->xkey;
keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
- for(i = 0; i < LENGTH(keys); i++)
+ for(i = 0; i < LENGTH(keys); i++) {
if(keysym == keys[i].keysym
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
&& keys[i].func) {
keys[i].func(&(keys[i].arg));
- called = True;
- }
- if(!called) {
- if(key_buffering) {
- if(key_buffer_len == LENGTH(key_buffer)) {
- // buffer full, bail
- key_buffer_len = 0;
- key_buffering = False;
- } else {
- key_buffer[key_buffer_len].keycode = (KeyCode)ev->keycode;
- key_buffer[key_buffer_len].state = (KeyCode)ev->state;
- key_buffer_len += 1;
- }
- } else {
- send_keycode(ev->keycode, ev->state);
}
}
}
Client *c, *t = NULL;
Window trans = None;
XWindowChanges wc;
- int i;
if(!(c = calloc(1, sizeof(Client))))
die("fatal: could not malloc() %u bytes\n", sizeof(Client));
XMapWindow(dpy, c->win);
focus(c);
if(key_buffering) {
- if(key_buffer_len > 0) {
- for(i = 0; i < key_buffer_len; ++i) {
- send_keycode(key_buffer[i].keycode, key_buffer[i].state);
- }
- }
- key_buffer_len = 0;
key_buffering = False;
+ XAllowEvents(dpy, AsyncKeyboard, CurrentTime);
}
}
void
mappingnotify(XEvent *e) {
XMappingEvent *ev = &e->xmapping;
+ // fprintf(stderr, "MapNotify\n");
XRefreshKeyboardMapping(ev);
if(ev->request == MappingKeyboard)
static XWindowAttributes wa;
XMapRequestEvent *ev = &e->xmaprequest;
+ // fprintf(stderr, "MapRequest\n");
if(!XGetWindowAttributes(dpy, ev->window, &wa))
return;
if(wa.override_redirect) {
- key_buffer_len = 0;
- key_buffering = False;
return;
}
if(!wintoclient(ev->window))
XEvent ev;
/* main event loop */
XSync(dpy, False);
- while(running && !XNextEvent(dpy, &ev))
- if(handler[ev.type])
+ while(running && !XNextEvent(dpy, &ev)) {
+ if(handler[ev.type]) {
+ // fprintf(stderr, "handling event type %i\n", ev.type);
handler[ev.type](&ev); /* call handler */
+ } else {
+ // fprintf(stderr, "evt type %i\n", ev.type);
+ }
+ }
}
void
void
kbspawn(const Arg *arg) {
key_buffering = True;
- key_buffer_len = 0;
spawn(arg);
}
void
spawn(const Arg *arg) {
int tag = 0, i;
- if(arg->v == termcmd) {
+ if(arg->v == termcmd || arg->v == runcmd) {
for(i = 0; i < 32; ++i) {
if(selmon->tagset[selmon->seltags] & (1 << i)) {
tag = i;
}
}
WORKSPACE_NUMBER[17] = workspace_numbers_str[tag][0];
- WORKSPACE_NUMBER[18] = workspace_numbers_str[tag][1];
+ WORKSPACE_NUMBER[18] = workspace_numbers_str[tag][1]; // 2nd digit or null
}
if(arg->v == dmenucmd)
dmenumon[0] = '0' + selmon->num;
#define TAB_HEIGHT 19
#define TAB_PAD 7
+#define GUTTER_PX 8
void
jason_layout(Monitor *m) {
} else {
mw = m->ww;
}
- right_width = m->ww - mw;
+ right_width = m->ww - mw - GUTTER_PX;
tab_count = &(tab_counts[0]);
tab_top = m->wy - (m->wh - (2 * (TAB_HEIGHT + TAB_PAD))) + TAB_HEIGHT;
for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
resize(c, m->wx, m->wy, mw, m->wh, False, 0);
} else {
if (c == vis_slave) {
- resize(c, m->wx + mw, m->wy + TAB_HEIGHT + TAB_PAD, right_width, m->wh - 2 * (TAB_HEIGHT + TAB_PAD), False, base);
+ resize(c, m->wx + mw + GUTTER_PX, m->wy + TAB_HEIGHT + TAB_PAD, right_width, m->wh - 2 * (TAB_HEIGHT + TAB_PAD), False, base);
tab_count = &(tab_counts[1]);
tab_top = m->wy + m->wh - TAB_HEIGHT;
cur_tab = 0;
} else {
// this function does not get called when focus changes
// resize(c, m->wx + m->ww, m->wy, m->ww - mw, m->wh, False);
- resize(c, m->wx + mw + right_width * cur_tab / (*tab_count), tab_top, right_width, m->wh - 2 * (TAB_HEIGHT + TAB_PAD), False, base);
+ resize(c, m->wx + mw + GUTTER_PX + right_width * cur_tab / (*tab_count), tab_top, right_width, m->wh - 2 * (TAB_HEIGHT + TAB_PAD), False, base);
cur_tab += 1;
}
}
Got questions, comments, patches, etc.? Contact Jason Woofenden