X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=a97a184ae883d5e27dd4c55bb684ffabea20fb71;hb=6f857fcdf73613bdba4f15509addc13d2c5c98e1;hp=b5e2ffb2ec79aa9747f4dace990741853690a74e;hpb=166a233babe7d2adf2d07a8fc2602d9f7ae424c6;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index b5e2ffb..a97a184 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -99,6 +99,7 @@ #define SWM_D_FOCUS 0x0008 #define SWM_D_MOVE 0x0010 #define SWM_D_STACK 0x0020 +#define SWM_D_MOUSE 0x0040 u_int32_t swm_debug = 0 | SWM_D_MISC @@ -113,9 +114,10 @@ u_int32_t swm_debug = 0 #define DNPRINTF(n,x...) #endif -#define LENGTH(x) (sizeof x / sizeof x[0]) +#define LENGTH(x) (sizeof x / sizeof x[0]) #define MODKEY Mod1Mask -#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) +#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) +#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) #define X(r) (r)->g.x #define Y(r) (r)->g.y @@ -199,6 +201,8 @@ void horizontal_config(struct workspace *, int); void horizontal_stack(struct workspace *, struct swm_geometry *); void max_stack(struct workspace *, struct swm_geometry *); +void grabbuttons(struct ws_win *, int); + struct layout { void (*l_stack)(struct workspace *, struct swm_geometry *); void (*l_config)(struct workspace *, int); @@ -249,7 +253,6 @@ struct swm_screen { }; struct swm_screen *screens; int num_screens; -Window rootclick = 0; struct ws_win *cur_focus = NULL; @@ -654,23 +657,20 @@ root_to_region(Window root) if (screens[i].root == root) break; - if (rootclick != root && /* if root was just clicked in, use cursor */ - cur_focus && cur_focus->ws->r && cur_focus->s == &screens[i]) - r = cur_focus->ws->r; - else { - if (XQueryPointer(display, screens[i].root, - &rr, &cr, &x, &y, &wx, &wy, &mask) == False) { - r = TAILQ_FIRST(&screens[i].rl); - } else { - TAILQ_FOREACH(r, &screens[i].rl, entry) { - if (x > X(r) && x < X(r) + WIDTH(r) && - y > Y(r) && y < Y(r) + HEIGHT(r)) - break; - } - - if (r == NULL) - r = TAILQ_FIRST(&screens[i].rl); + if (XQueryPointer(display, screens[i].root, + &rr, &cr, &x, &y, &wx, &wy, &mask) == False) { + /* if we can't query the pointer, grab the first region */ + r = TAILQ_FIRST(&screens[i].rl); + } else { + /* otherwise, choose a region based on pointer location */ + TAILQ_FOREACH(r, &screens[i].rl, entry) { + if (x > X(r) && x < X(r) + WIDTH(r) && + y > Y(r) && y < Y(r) + HEIGHT(r)) + break; } + + if (r == NULL) + r = TAILQ_FIRST(&screens[i].rl); } return (r); } @@ -724,6 +724,7 @@ unfocus_all(void) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) { if (win->ws->r == NULL) continue; + grabbuttons(win, 0); XSetWindowBorder(display, win->id, win->ws->r->s->color_unfocus); win->got_focus = 0; @@ -740,14 +741,15 @@ focus_win(struct ws_win *win) if (win == NULL) return; - rootclick = 0; unfocus_all(); win->ws->focus = win; if (win->ws->r != NULL) { cur_focus = win; - if (!win->got_focus) + if (!win->got_focus) { XSetWindowBorder(display, win->id, win->ws->r->s->color_focus); + grabbuttons(win, 1); + } win->got_focus = 1; XSetInputFocus(display, win->id, RevertToPointerRoot, CurrentTime); @@ -1353,20 +1355,35 @@ struct key { { MODKEY | ShiftMask, XK_Tab, focus, {.id = SWM_ARG_ID_FOCUSPREV} }, }; -#if 0 +void +click(struct swm_region *r, union arg *args) +{ + DNPRINTF(SWM_D_MOUSE, "click: button: %d\n", args->id); + + switch (args->id) { + case Button1: + break; + case Button2: + break; + case Button3: + break; + default: + return; + } +} + /* mouse */ enum { client_click, root_click }; struct button { - unsigned int click; + unsigned int action; unsigned int mask; unsigned int button; void (*func)(struct swm_region *r, union arg *); union arg args; } buttons[] = { /* action key mouse button func args */ - { client_click, MODKEY, Button2, NULL, {0} }, + { client_click, MODKEY, Button1, click, {.id=Button1} }, }; -#endif void updatenumlockmask(void) @@ -1411,6 +1428,30 @@ grabkeys(void) } } } + +void +grabbuttons(struct ws_win *win, int focused) +{ + unsigned int i, j; + unsigned int modifiers[] = + { 0, LockMask, numlockmask, numlockmask|LockMask }; + + updatenumlockmask(); + XUngrabButton(display, AnyButton, AnyModifier, win->id); + if(focused) { + for (i = 0; i < LENGTH(buttons); i++) + if (buttons[i].action == client_click) + for (j = 0; j < LENGTH(modifiers); j++) + XGrabButton(display, buttons[i].button, + buttons[i].mask | modifiers[j], + win->id, False, BUTTONMASK, + GrabModeAsync, GrabModeSync, None, + None); + } else + XGrabButton(display, AnyButton, AnyModifier, win->id, False, + BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); +} + void expose(XEvent *e) { @@ -1439,35 +1480,26 @@ void buttonpress(XEvent *e) { XButtonPressedEvent *ev = &e->xbutton; -#ifdef SWM_CLICKTOFOCUS + struct ws_win *win; - struct workspace *ws; - struct swm_region *r; -#endif + int i, action; DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window); - if (ev->window == ev->root) { - rootclick = ev->root; - return; - } - if (ev->window == cur_focus->id) + action = root_click; + if ((win = find_window(ev->window)) == NULL) return; -#ifdef SWM_CLICKTOFOCUS - r = root_to_region(ev->root); - ws = r->ws; - TAILQ_FOREACH(win, &ws->winlist, entry) - if (win->id == ev->window) { - /* focus in the clicked window */ - XSetWindowBorder(display, ev->window, 0xff0000); - XSetWindowBorder(display, ws->focus->id, 0x888888); - XSetInputFocus(display, ev->window, RevertToPointerRoot, - CurrentTime); - ws->focus = win; - XSync(display, False); - break; + else { + focus_win(win); + action = client_click; } -#endif + + for (i = 0; i < LENGTH(buttons); i++) + if (action == buttons[i].action && buttons[i].func && + buttons[i].button == ev->button && + CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) + buttons[i].func(root_to_region(ev->root), + &buttons[i].args); } void @@ -1652,20 +1684,6 @@ void focusin(XEvent *e) { DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", e->xfocus.window); - - /* XXX this probably needs better handling now. - if (ev->window == ev->root) - return; - */ - /* - * kill grab for now so that we can cut and paste , this screws up - * click to focus - */ - /* - DNPRINTF(SWM_D_EVENT, "focusin: window: %lu grabbing\n", ev->window); - XGrabButton(display, Button1, AnyModifier, ev->window, False, - ButtonPress, GrabModeAsync, GrabModeSync, None, None); - */ } void @@ -1845,9 +1863,6 @@ setup_screens(void) screens[i].idx = i; TAILQ_INIT(&screens[i].rl); screens[i].root = RootWindow(display, i); - XGetWindowAttributes(display, screens[i].root, &wa); - XSelectInput(display, screens[i].root, - EnterWindowMask | ButtonPressMask | wa.your_event_mask); /* set default colors */ screens[i].color_focus = name_to_color("red");