X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=a97a184ae883d5e27dd4c55bb684ffabea20fb71;hb=c83c5792fd6a3cf26da08b3a50e655f1134bfd0e;hp=9f3d6940c5b1ca4a8795b94b5d3f3ce1fefc5239;hpb=36d3347501c900d3974a48eebbb615b81168424b;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index 9f3d694..a97a184 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -61,6 +61,7 @@ #include #include #include +#include #include #include @@ -98,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 @@ -112,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 @@ -131,6 +134,9 @@ int ignore_enter = 0; unsigned int numlockmask = 0; Display *display; +int cycle_empty = 0; +int cycle_visible = 0; + /* dialog windows */ double dialog_ratio = .6; /* status bar */ @@ -178,7 +184,7 @@ struct ws_win { TAILQ_ENTRY(ws_win) entry; Window id; struct swm_geometry g; - int focus; + int got_focus; int floating; int transient; struct workspace *ws; /* always valid */ @@ -195,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); @@ -242,11 +250,9 @@ struct swm_screen { unsigned long bar_font_color; unsigned long color_focus; /* XXX should this be per ws? */ unsigned long color_unfocus; - char bar_text[SWM_BAR_MAX]; }; struct swm_screen *screens; int num_screens; -Window rootclick = 0; struct ws_win *cur_focus = NULL; @@ -265,6 +271,8 @@ union arg { #define SWM_ARG_ID_MASTERDEL (9) #define SWM_ARG_ID_STACKRESET (10) #define SWM_ARG_ID_STACKINIT (11) +#define SWM_ARG_ID_CYCLEWS_UP (12) +#define SWM_ARG_ID_CYCLEWS_DOWN (13) char **argv; }; @@ -293,6 +301,32 @@ name_to_color(char *colorname) return (result); } +int +varmatch(char *var, char *name, int *index) +{ + char *p, buf[5]; + int i; + + i = strncmp(var, name, 255); + if (index == NULL) + return (i); + + *index = -1; + if (i <= 0) + return (i); + p = var + strlen(name); + if (*p++ != '[') + return (i); + bzero(buf, sizeof buf); + i = 0; + while (isdigit(*p) && i < sizeof buf) + buf[i++] = *p++; + if (i == 0 || i >= sizeof buf || *p != ']') + return (1); + *index = strtonum(buf, 0, 99, NULL); + return (0); +} + /* conf file stuff */ #define SWM_CONF_WS "\n= \t" #define SWM_CONF_FILE "scrotwm.conf" @@ -302,7 +336,7 @@ conf_load(char *filename) FILE *config; char *line, *cp, *var, *val; size_t len, lineno = 0; - int i; + int i, sc; DNPRINTF(SWM_D_MISC, "conf_load: filename %s\n", filename); @@ -312,7 +346,7 @@ conf_load(char *filename) if ((config = fopen(filename, "r")) == NULL) return (1); - for (;;) { + for (sc = ScreenCount(display);;) { if ((line = fparseln(config, &len, &lineno, NULL, 0)) == NULL) if (feof(config)) break; @@ -334,18 +368,37 @@ conf_load(char *filename) case 'b': if (!strncmp(var, "bar_enabled", strlen("bar_enabled"))) bar_enabled = atoi(val); - else if (!strncmp(var, "bar_border", - strlen("bar_border"))) - for (i = 0; i < ScreenCount(display); i++) - screens[i].bar_border = name_to_color(val); - else if (!strncmp(var, "bar_color", - strlen("bar_color"))) - for (i = 0; i < ScreenCount(display); i++) - screens[i].bar_color = name_to_color(val); - else if (!strncmp(var, "bar_font_color", - strlen("bar_font_color"))) - for (i = 0; i < ScreenCount(display); i++) - screens[i].bar_font_color = name_to_color(val); + else if (!varmatch(var, "bar_border", &i)) + if (i > 0 && i <= sc) + screens[i - 1].bar_border = + name_to_color(val); + else if (i == -1) + for (i = 0; i < sc; i++) + screens[i].bar_border = + name_to_color(val); + else + goto badidx; + else if (!varmatch(var, "bar_color", &i)) + if (i > 0 && i <= sc) + screens[i - 1].bar_color = + name_to_color(val); + else if (i == -1) + for (i = 0; i < sc; i++) + screens[i].bar_color = + name_to_color(val); + else + goto badidx; + else if (!varmatch(var, "bar_font_color", &i)) + if (i > 0 && i <= sc) + screens[i - 1].bar_font_color = + name_to_color(val); + else if (i == -1) + for (i = 0; i < sc; i++) + screens[i].bar_font_color = + name_to_color(val); + else + goto badidx; + else if (!strncmp(var, "bar_font", strlen("bar_font"))) asprintf(&bar_fonts[0], "%s", val); else @@ -353,13 +406,30 @@ conf_load(char *filename) break; case 'c': - if (!strncmp(var, "color_focus", strlen("color_focus"))) - for (i = 0; i < ScreenCount(display); i++) - screens[i].color_focus = name_to_color(val); - else if (!strncmp(var, "color_unfocus", - strlen("color_unfocus"))) - for (i = 0; i < ScreenCount(display); i++) - screens[i].color_unfocus = name_to_color(val); + if (!varmatch(var, "color_focus", &i)) + if (i > 0 && i <= sc) + screens[i - 1].color_focus = + name_to_color(val); + else if (i == -1) + for (i = 0; i < sc; i++) + screens[i].color_focus = + name_to_color(val); + else + goto badidx; + else if (!varmatch(var, "color_unfocus", &i)) + if (i > 0 && i <= sc) + screens[i - 1].color_unfocus = + name_to_color(val); + else if (i == -1) + for (i = 0; i < sc; i++) + screens[i].color_unfocus = + name_to_color(val); + else + goto badidx; + else if (!strncmp(var, "cycle_empty", strlen("cycle_empty"))) + cycle_visible = atoi(val); + else if (!strncmp(var, "cycle_visible", strlen("cycle_visible"))) + cycle_visible = atoi(val); else goto bad; break; @@ -388,21 +458,17 @@ conf_load(char *filename) return (0); bad: errx(1, "invalid conf file entry: %s=%s", var, val); +badidx: + errx(1, "invalid screen index: %s out of bounds", var); } void -bar_print(struct swm_region *r, char *s, int erase) +bar_print(struct swm_region *r, char *s) { - if (erase) { - XSetForeground(display, bar_gc, r->s->bar_color); - XDrawString(display, r->bar_window, bar_gc, 4, bar_fs->ascent, - r->s->bar_text, strlen(r->s->bar_text)); - } - - strlcpy(r->s->bar_text, s, sizeof r->s->bar_text); + XClearWindow(display, r->bar_window); XSetForeground(display, bar_gc, r->s->bar_font_color); - XDrawString(display, r->bar_window, bar_gc, 4, bar_fs->ascent, - r->s->bar_text, strlen(r->s->bar_text)); + XDrawString(display, r->bar_window, bar_gc, 4, bar_fs->ascent, s, + strlen(s)); } void @@ -426,7 +492,7 @@ bar_update(void) TAILQ_FOREACH(r, &screens[i].rl, entry) { snprintf(e, sizeof e, "%s %d:%d", s, x++, r->ws->idx + 1); - bar_print(r, e, 1); + bar_print(r, e); } } XSync(display, False); @@ -443,28 +509,28 @@ void bar_toggle(struct swm_region *r, union arg *args) { struct swm_region *tmpr; - int i, j; + int i, j, sc = ScreenCount(display); DNPRINTF(SWM_D_MISC, "bar_toggle\n"); if (bar_enabled) { - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < sc; i++) TAILQ_FOREACH(tmpr, &screens[i].rl, entry) XUnmapWindow(display, tmpr->bar_window); } else { - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < sc; i++) TAILQ_FOREACH(tmpr, &screens[i].rl, entry) XMapRaised(display, tmpr->bar_window); } bar_enabled = !bar_enabled; XSync(display, False); - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < sc; i++) for (j = 0; j < SWM_WS_MAX; j++) screens[i].ws[j].restack = 1; stack(); /* must be after stack */ - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < sc; i++) TAILQ_FOREACH(tmpr, &screens[i].rl, entry) bar_update(); } @@ -499,6 +565,24 @@ bar_setup(struct swm_region *r) } void +bar_refresh(void) +{ + XSetWindowAttributes wa; + struct swm_region *r; + int i; + + bzero(&wa, sizeof wa); + for (i = 0; i < ScreenCount(display); i++) + TAILQ_FOREACH(r, &screens[i].rl, entry) { + wa.border_pixel = screens[i].bar_border; + wa.background_pixel = screens[i].bar_color; + XChangeWindowAttributes(display, r->bar_window, + CWBackPixel | CWBorderPixel, &wa); + } + bar_update(); +} + +void config_win(struct ws_win *win) { XConfigureEvent ce; @@ -573,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); } @@ -631,36 +712,45 @@ spawn(struct swm_region *r, union arg *args) } void -unfocus_win(struct ws_win *win) +unfocus_all(void) { - DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", win->id); - if (win->ws->r && win->focus) - XSetWindowBorder(display, win->id, - win->ws->r->s->color_unfocus); - win->focus = 0; - if (win->ws->focus == win) - win->ws->focus = NULL; - if (cur_focus == win) - cur_focus = NULL; -} + struct ws_win *win; + int i, j; + + DNPRINTF(SWM_D_FOCUS, "unfocus_all:\n"); + for (i = 0; i < ScreenCount(display); i++) + for (j = 0; j < SWM_WS_MAX; j++) + 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; + win->ws->focus = NULL; + cur_focus = NULL; + } +} void focus_win(struct ws_win *win) { - DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win->id); + DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win ? win->id : 0); - rootclick = 0; + if (win == NULL) + return; + unfocus_all(); win->ws->focus = win; if (win->ws->r != NULL) { - if (cur_focus && cur_focus != win) - unfocus_win(cur_focus); cur_focus = win; - if (!win->focus) + if (!win->got_focus) { XSetWindowBorder(display, win->id, win->ws->r->s->color_focus); - win->focus = 1; + grabbuttons(win, 1); + } + win->got_focus = 1; XSetInputFocus(display, win->id, RevertToPointerRoot, CurrentTime); } @@ -713,6 +803,45 @@ switchws(struct swm_region *r, union arg *args) } void +cyclews(struct swm_region *r, union arg *args) +{ + union arg a; + struct swm_screen *s = r->s; + + DNPRINTF(SWM_D_WS, "cyclews id %d " + "in screen %d region %dx%d+%d+%d ws %d\n", args->id, + r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r), r->ws->idx); + + a.id = r->ws->idx; + + do { + switch (args->id) { + case SWM_ARG_ID_CYCLEWS_UP: + if (a.id < SWM_WS_MAX - 1) + a.id++; + else + a.id = 0; + break; + case SWM_ARG_ID_CYCLEWS_DOWN: + if (a.id > 0) + a.id--; + else + a.id = SWM_WS_MAX - 1; + break; + default: + return; + }; + + if (cycle_empty == 0 && TAILQ_EMPTY(&s->ws[a.id].winlist)) + continue; + if (cycle_visible == 0 && s->ws[a.id].r != NULL) + continue; + + switchws(r, &a); + } while (a.id != r->ws->idx); +} + +void swapwin(struct swm_region *r, union arg *args) { struct ws_win *target; @@ -1209,6 +1338,8 @@ struct key { { MODKEY, XK_8, switchws, {.id = 7} }, { MODKEY, XK_9, switchws, {.id = 8} }, { MODKEY, XK_0, switchws, {.id = 9} }, + { MODKEY, XK_Right, cyclews, {.id = SWM_ARG_ID_CYCLEWS_UP} }, + { MODKEY, XK_Left, cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN} }, { MODKEY | ShiftMask, XK_1, send_to_ws, {.id = 0} }, { MODKEY | ShiftMask, XK_2, send_to_ws, {.id = 1} }, { MODKEY | ShiftMask, XK_3, send_to_ws, {.id = 2} }, @@ -1225,6 +1356,36 @@ struct key { }; 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 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, Button1, click, {.id=Button1} }, +}; + +void updatenumlockmask(void) { unsigned int i, j; @@ -1267,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) { @@ -1295,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 @@ -1463,11 +1639,12 @@ destroynotify(XEvent *e) { struct ws_win *win; XDestroyWindowEvent *ev = &e->xdestroywindow; + struct workspace *ws; DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window); if ((win = find_window(ev->window)) != NULL) { - struct workspace *ws = win->ws; + ws = win->ws; /* find a window to focus */ if (ws->focus == win) ws->focus = TAILQ_PREV(win, ws_win_list, entry); @@ -1475,12 +1652,8 @@ destroynotify(XEvent *e) ws->focus = TAILQ_FIRST(&ws->winlist); if (ws->focus == win) ws->focus = NULL; - if (cur_focus == win) { - if (ws->focus == NULL) - unfocus_win(win); /* XXX focus another ws? */ - else - focus_win(ws->focus); - } + if (cur_focus == win) + focus_win(ws->focus); TAILQ_REMOVE(&ws->winlist, win, entry); set_win_state(win, WithdrawnState); @@ -1494,47 +1667,23 @@ enternotify(XEvent *e) { XCrossingEvent *ev = &e->xcrossing; struct ws_win *win; - int i, j; DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu\n", ev->window); - if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && - ev->window != ev->root) - return; if (ignore_enter) { /* eat event(r) to prevent autofocus */ ignore_enter--; return; } - /* brute force for now */ - for (i = 0; i < ScreenCount(display); i++) { - for (j = 0; j < SWM_WS_MAX; j++) { - TAILQ_FOREACH(win, &screens[i].ws[j].winlist , entry) { - if (win->id == ev->window) - focus_win(win); - } - } - } + + if ((win = find_window(ev->window)) != NULL) + focus_win(win); } 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 @@ -1714,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, - ButtonPressMask | wa.your_event_mask); /* set default colors */ screens[i].color_focus = name_to_color("red"); @@ -1852,6 +1998,8 @@ main(int argc, char *argv[]) if (pwd == NULL) errx(1, "invalid user %d", getuid()); + setup_screens(); + snprintf(conf, sizeof conf, "%s/.%s", pwd->pw_dir, SWM_CONF_FILE); if (stat(conf, &sb) != -1) { if (S_ISREG(sb.st_mode)) @@ -1863,12 +2011,9 @@ main(int argc, char *argv[]) if (S_ISREG(sb.st_mode)) cfile = conf; } - - setup_screens(); - if (cfile) conf_load(cfile); - + bar_refresh(); /* ws[0].focus = TAILQ_FIRST(&ws[0].winlist); */