X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=835c1d413664ae1378ed0fb981e3acbc256e4dfa;hb=bbb499e87a8c905214478e1badd67465701fc5cb;hp=520f15624a421e8191c0075c9698cade8a4fec98;hpb=a2a8bae91b7dcc662140ef915f8da5d104feb91c;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index 520f156..835c1d4 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -50,7 +50,7 @@ static const char *cvstag = "$scrotwm$"; -#define SWM_VERSION "0.6" +#define SWM_VERSION "0.8" #include #include @@ -126,11 +126,13 @@ u_int32_t swm_debug = 0 #define MODKEY Mod1Mask #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) +#define MOUSEMASK (BUTTONMASK|PointerMotionMask) #define SWM_PROPLEN (16) -#define X(r) (r)->g.x +#define X(r) (r)->g.x #define Y(r) (r)->g.y -#define WIDTH(r) (r)->g.w +#define WIDTH(r) (r)->g.w #define HEIGHT(r) (r)->g.h +#define SWM_MAX_FONT_STEPS (3) #ifndef SWM_LIB #define SWM_LIB "/usr/X11R6/lib/swmhack.so" @@ -142,6 +144,7 @@ int (*xerrorxlib)(Display *, XErrorEvent *); int other_wm; int running = 1; int ss_enabled = 0; +int xrandr_support; int xrandr_eventbase; int ignore_enter = 0; unsigned int numlockmask = 0; @@ -149,6 +152,8 @@ Display *display; int cycle_empty = 0; int cycle_visible = 0; +int term_width = 0; +int font_adjusted = 0; /* dialog windows */ double dialog_ratio = .6; @@ -157,6 +162,8 @@ double dialog_ratio = .6; char *bar_argv[] = { NULL, NULL }; int bar_pipe[2]; char bar_ext[SWM_BAR_MAX]; +char bar_vertext[SWM_BAR_MAX]; +int bar_version = 0; sig_atomic_t bar_alarm = 0; int bar_delay = 30; int bar_enabled = 1; @@ -178,6 +185,8 @@ char *bar_fonts[] = { /* terminal + args */ char *spawn_term[] = { "xterm", NULL }; char *spawn_screenshot[] = { "screenshot.sh", NULL, NULL }; +char *spawn_lock[] = { "xlock", NULL }; +char *spawn_initscr[] = { "initscreen.sh", NULL }; char *spawn_menu[] = { "dmenu_run", "-fn", NULL, "-nb", NULL, "-nf", NULL, "-sb", NULL, "-sf", NULL, NULL }; @@ -202,9 +211,9 @@ struct workspace; struct swm_region { TAILQ_ENTRY(swm_region) entry; struct swm_geometry g; - Window bar_window; struct workspace *ws; /* current workspace on this region */ struct swm_screen *s; /* screen idx */ + Window bar_window; }; TAILQ_HEAD(swm_region_list, swm_region); @@ -215,6 +224,11 @@ struct ws_win { int got_focus; int floating; int transient; + int manual; + int font_size_boundary[SWM_MAX_FONT_STEPS]; + int font_steps; + int last_inc; + unsigned long quirks; struct workspace *ws; /* always valid */ struct swm_screen *s; /* always valid, never changes */ XWindowAttributes wa; @@ -253,6 +267,7 @@ struct workspace { int restack; /* restack on switch */ struct layout *cur_layout; /* current layout handlers */ struct ws_win *focus; /* may be NULL */ + struct ws_win *focus_prev; /* may be NULL */ struct swm_region *r; /* may be NULL */ struct ws_win_list winlist; /* list of windows in ws */ @@ -260,8 +275,10 @@ struct workspace { struct { int horizontal_msize; int horizontal_mwin; + int horizontal_stacks; int vertical_msize; int vertical_mwin; + int vertical_stacks; } l_state; }; @@ -273,8 +290,8 @@ enum { SWM_S_COLOR_BAR, SWM_S_COLOR_BAR_BORDER, SWM_S_COLOR_BAR_FONT, struct swm_screen { int idx; /* screen index */ struct swm_region_list rl; /* list of regions on this screen */ + struct swm_region_list orl; /* list of old regions */ Window root; - int xrandr_support; struct workspace ws[SWM_WS_MAX]; /* colors */ @@ -307,20 +324,63 @@ union arg { #define SWM_ARG_ID_CYCLEWS_DOWN (13) #define SWM_ARG_ID_CYCLESC_UP (14) #define SWM_ARG_ID_CYCLESC_DOWN (15) +#define SWM_ARG_ID_STACKINC (16) +#define SWM_ARG_ID_STACKDEC (17) #define SWM_ARG_ID_SS_ALL (0) #define SWM_ARG_ID_SS_WINDOW (1) +#define SWM_ARG_ID_DONTCENTER (0) +#define SWM_ARG_ID_CENTER (1) char **argv; }; +/* quirks */ struct quirk { char *class; char *name; unsigned long quirk; -#define SWM_Q_FLOAT (1<<0) +#define SWM_Q_FLOAT (1<<0) /* float this window */ +#define SWM_Q_TRANSSZ (1<<1) /* transiend window size too small */ +#define SWM_Q_ANYWHERE (1<<2) /* don't position this window */ +#define SWM_Q_XTERM_FONTADJ (1<<3) /* adjust xterm fonts when resizing */ } quirks[] = { { "MPlayer", "xv", SWM_Q_FLOAT }, { "OpenOffice.org 2.4", "VCLSalFrame", SWM_Q_FLOAT }, - { NULL, NULL, 0}, + { "OpenOffice.org 3.0", "VCLSalFrame", SWM_Q_FLOAT }, + { "Firefox-bin", "firefox-bin", SWM_Q_TRANSSZ}, + { "Gimp", "gimp", SWM_Q_FLOAT | SWM_Q_ANYWHERE}, + { "XTerm", "xterm", SWM_Q_XTERM_FONTADJ}, + { NULL, NULL, 0}, +}; + +/* events */ +void expose(XEvent *); +void keypress(XEvent *); +void buttonpress(XEvent *); +void configurerequest(XEvent *); +void configurenotify(XEvent *); +void destroynotify(XEvent *); +void enternotify(XEvent *); +void focusin(XEvent *); +void mappingnotify(XEvent *); +void maprequest(XEvent *); +void propertynotify(XEvent *); +void unmapnotify(XEvent *); +void visibilitynotify(XEvent *); + +void (*handler[LASTEvent])(XEvent *) = { + [Expose] = expose, + [KeyPress] = keypress, + [ButtonPress] = buttonpress, + [ConfigureRequest] = configurerequest, + [ConfigureNotify] = configurenotify, + [DestroyNotify] = destroynotify, + [EnterNotify] = enternotify, + [FocusIn] = focusin, + [MappingNotify] = mappingnotify, + [MapRequest] = maprequest, + [PropertyNotify] = propertynotify, + [UnmapNotify] = unmapnotify, + [VisibilityNotify] = visibilitynotify, }; unsigned long @@ -365,6 +425,35 @@ setscreencolor(char *val, int i, int c) i, ScreenCount(display)); } +void new_region(struct swm_screen *, int, int, int, int); + +void +custom_region(char *val) +{ + unsigned int sidx, x, y, w, h; + + if (sscanf(val, "screen[%u]:%ux%u+%u+%u", &sidx, &w, &h, &x, &y) != 5) + errx(1, "invalid custom region, " + "should be 'screen[]:x++\n"); + if (sidx < 1 || sidx > ScreenCount(display)) + errx(1, "invalid screen index: %d out of bounds (maximum %d)\n", + sidx, ScreenCount(display)); + sidx--; + + if (w < 1 || h < 1) + errx(1, "region %ux%u+%u+%u too small\n", w, h, x, y); + + if (x < 0 || x > DisplayWidth(display, sidx) || + y < 0 || y > DisplayHeight(display, sidx) || + w + x > DisplayWidth(display, sidx) || + h + y > DisplayHeight(display, sidx)) + errx(1, "region %ux%u+%u+%u not within screen boundaries " + "(%ux%u)\n", w, h, x, y, + DisplayWidth(display, sidx), DisplayHeight(display, sidx)); + + new_region(&screens[sidx], x, y, w, h); +} + int varmatch(char *var, char *name, int *index) { @@ -471,16 +560,33 @@ conf_load(char *filename) goto bad; break; + case 'r': + if (!strncmp(var, "region", strlen("region"))) + custom_region(val); + else + goto bad; + break; + case 's': if (!strncmp(var, "spawn_term", strlen("spawn_term"))) asprintf(&spawn_term[0], "%s", val); - if (!strncmp(var, "screenshot_enabled", + else if (!strncmp(var, "screenshot_enabled", strlen("screenshot_enabled"))) ss_enabled = atoi(val); - if (!strncmp(var, "screenshot_app", + else if (!strncmp(var, "screenshot_app", strlen("screenshot_app"))) asprintf(&spawn_screenshot[0], "%s", val); + else + goto bad; break; + + case 't': + if (!strncmp(var, "term_width", strlen("term_width"))) + term_width = atoi(val); + else + goto bad; + break; + default: goto bad; } @@ -566,8 +672,8 @@ bar_update(void) for (i = 0; i < ScreenCount(display); i++) { x = 1; TAILQ_FOREACH(r, &screens[i].rl, entry) { - snprintf(loc, sizeof loc, "%s %d:%d %s", - s, x++, r->ws->idx + 1, bar_ext); + snprintf(loc, sizeof loc, "%s %d:%d %s %s", + s, x++, r->ws->idx + 1, bar_ext, bar_vertext); bar_print(r, loc); } } @@ -693,6 +799,17 @@ bar_setup(struct swm_region *r) } void +version(struct swm_region *r, union arg *args) +{ + bar_version = !bar_version; + if (bar_version) + strlcpy(bar_vertext, cvstag, sizeof bar_vertext); + else + strlcpy(bar_vertext, "", sizeof bar_vertext); + bar_update(); +} + +void config_win(struct ws_win *win) { XConfigureEvent ce; @@ -751,6 +868,34 @@ unmap_all(void) } void +fake_keypress(struct ws_win *win, int keysym, int modifiers) +{ + XKeyEvent event; + + event.display = display; /* Ignored, but what the hell */ + event.window = win->id; + event.root = win->s->root; + event.subwindow = None; + event.time = CurrentTime; + event.x = win->g.x; + event.y = win->g.y; + event.x_root = 1; + event.y_root = 1; + event.same_screen = True; + event.keycode = XKeysymToKeycode(display, keysym); + event.state = modifiers; + + 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 restart(struct swm_region *r, union arg *args) { DNPRINTF(SWM_D_MISC, "restart: %s\n", start_argv[0]); @@ -773,7 +918,7 @@ restart(struct swm_region *r, union arg *args) struct swm_region * root_to_region(Window root) { - struct swm_region *r; + struct swm_region *r = NULL; Window rr, cr; int i, x, y, wx, wy; unsigned int mask; @@ -783,20 +928,17 @@ root_to_region(Window root) break; 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) { + &rr, &cr, &x, &y, &wx, &wy, &mask) != False) { + /* 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); } + + if (r == NULL) + r = TAILQ_FIRST(&screens[i].rl); + return (r); } @@ -855,6 +997,16 @@ spawn(struct swm_region *r, union arg *args) } void +spawnterm(struct swm_region *r, union arg *args) +{ + DNPRINTF(SWM_D_MISC, "spawnterm\n"); + + if (term_width) + setenv("_SWM_XTERM_FONTADJ", "", 1); + spawn(r, args); +} + +void spawnmenu(struct swm_region *r, union arg *args) { DNPRINTF(SWM_D_MISC, "spawnmenu\n"); @@ -898,6 +1050,9 @@ focus_win(struct ws_win *win) if (win == NULL) return; + if (win->ws->focus != win && win->ws->focus != NULL) + win->ws->focus_prev = win->ws->focus; + unfocus_all(); win->ws->focus = win; if (win->ws->r != NULL) { @@ -925,7 +1080,7 @@ switchws(struct swm_region *r, union arg *args) old_ws = this_r->ws; new_ws = &this_r->s->ws[wsid]; - DNPRINTF(SWM_D_WS, "switchws screen %d region %dx%d+%d+%d: " + DNPRINTF(SWM_D_WS, "switchws screen[%d]:%dx%d+%d+%d: " "%d -> %d\n", r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r), old_ws->idx, wsid); @@ -936,13 +1091,14 @@ switchws(struct swm_region *r, union arg *args) if (!other_r) { /* if the other workspace is hidden, switch windows */ /* map new window first to prevent ugly blinking */ + old_ws->r = NULL; + old_ws->restack = 1; + TAILQ_FOREACH(win, &new_ws->winlist, entry) XMapRaised(display, win->id); TAILQ_FOREACH(win, &old_ws->winlist, entry) XUnmapWindow(display, win->id); - old_ws->r = NULL; - old_ws->restack = 1; } else { other_r->ws = old_ws; old_ws->r = other_r; @@ -965,7 +1121,7 @@ cyclews(struct swm_region *r, union arg *args) 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, + "in screen[%d]:%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; @@ -1026,7 +1182,7 @@ cyclescr(struct swm_region *r, union arg *args) void swapwin(struct swm_region *r, union arg *args) { - struct ws_win *target; + struct ws_win *target, *source; struct ws_win_list *wl; @@ -1036,40 +1192,48 @@ swapwin(struct swm_region *r, union arg *args) if (cur_focus == NULL) return; - wl = &cur_focus->ws->winlist; + source = cur_focus; + wl = &source->ws->winlist; switch (args->id) { case SWM_ARG_ID_SWAPPREV: - target = TAILQ_PREV(cur_focus, ws_win_list, entry); + target = TAILQ_PREV(source, ws_win_list, entry); TAILQ_REMOVE(wl, cur_focus, entry); if (target == NULL) - TAILQ_INSERT_TAIL(wl, cur_focus, entry); + TAILQ_INSERT_TAIL(wl, source, entry); else - TAILQ_INSERT_BEFORE(target, cur_focus, entry); + TAILQ_INSERT_BEFORE(target, source, entry); break; case SWM_ARG_ID_SWAPNEXT: - target = TAILQ_NEXT(cur_focus, entry); - TAILQ_REMOVE(wl, cur_focus, entry); + target = TAILQ_NEXT(source, entry); + TAILQ_REMOVE(wl, source, entry); if (target == NULL) - TAILQ_INSERT_HEAD(wl, cur_focus, entry); + TAILQ_INSERT_HEAD(wl, source, entry); else - TAILQ_INSERT_AFTER(wl, target, cur_focus, entry); + TAILQ_INSERT_AFTER(wl, target, source, entry); break; case SWM_ARG_ID_SWAPMAIN: target = TAILQ_FIRST(wl); - if (target == cur_focus) - return; + if (target == source) { + if (source->ws->focus_prev != NULL && + source->ws->focus_prev != target) + + source = source->ws->focus_prev; + else + return; + } + source->ws->focus_prev = target; TAILQ_REMOVE(wl, target, entry); - TAILQ_INSERT_BEFORE(cur_focus, target, entry); - TAILQ_REMOVE(wl, cur_focus, entry); - TAILQ_INSERT_HEAD(wl, cur_focus, entry); + TAILQ_INSERT_BEFORE(source, target, entry); + TAILQ_REMOVE(wl, source, entry); + TAILQ_INSERT_HEAD(wl, source, entry); break; default: DNPRINTF(SWM_D_MOVE, "invalid id: %d\n", args->id); return; } - ignore_enter = 2; + ignore_enter = 1; stack(); } @@ -1172,6 +1336,8 @@ stack(void) { r->ws->cur_layout->l_stack(r->ws, &g); } } + if (font_adjusted) + font_adjusted--; XSync(display, False); } @@ -1184,14 +1350,19 @@ stack_floater(struct ws_win *win, struct swm_region *r) bzero(&wc, sizeof wc); mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight; wc.border_width = 1; - if (win->transient) { + if (win->transient && (win->quirks & SWM_Q_TRANSSZ)) { win->g.w = (double)WIDTH(r) * dialog_ratio; win->g.h = (double)HEIGHT(r) * dialog_ratio; } wc.width = win->g.w; wc.height = win->g.h; - wc.x = (WIDTH(r) - win->g.w) / 2; - wc.y = (HEIGHT(r) - win->g.h) / 2; + if (win->manual) { + wc.x = win->g.x; + wc.y = win->g.y; + } else { + wc.x = (WIDTH(r) - win->g.w) / 2; + wc.y = (HEIGHT(r) - win->g.h) / 2; + } DNPRINTF(SWM_D_STACK, "stack_floater: win %lu x %d y %d w %d h %d\n", win->id, wc.x, wc.y, wc.width, wc.height); @@ -1199,6 +1370,35 @@ stack_floater(struct ws_win *win, struct swm_region *r) XConfigureWindow(display, win->id, mask, &wc); } +/* + * Send keystrokes to terminal to decrease/increase the font size as the + * window size changes. + */ +void +adjust_font(struct ws_win *win) +{ + if (!(win->quirks & SWM_Q_XTERM_FONTADJ) || + win->floating || win->transient) + return; + + if (win->sh.width_inc && win->last_inc != win->sh.width_inc && + win->g.w / win->sh.width_inc < term_width && + win->font_steps < SWM_MAX_FONT_STEPS) { + win->font_size_boundary[win->font_steps] = + (win->sh.width_inc * term_width) + win->sh.base_width; + win->font_steps++; + font_adjusted++; + win->last_inc = win->sh.width_inc; + fake_keypress(win, XK_KP_Subtract, ShiftMask); + } else if (win->font_steps && win->last_inc != win->sh.width_inc && + win->g.w > win->font_size_boundary[win->font_steps - 1]) { + win->font_steps--; + font_adjusted++; + win->last_inc = win->sh.width_inc; + fake_keypress(win, XK_KP_Add, ShiftMask); + } +} + #define SWAPXY(g) do { \ int tmp; \ tmp = (g)->y; (g)->y = (g)->x; (g)->x = tmp; \ @@ -1210,7 +1410,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) XWindowChanges wc; struct swm_geometry win_g, r_g = *g; struct ws_win *win, *winfocus; - int i, j, w_inc, h_inc, w_base, h_base; + int i, j, s, w_inc, h_inc, w_base, h_base, stacks; int hrh, extra, h_slice, last_h = 0; int split, colno, winno, mwin, msize, mscale; int remain, missing, v_slice;; @@ -1232,22 +1432,29 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) w_base = win->sh.base_width; mwin = ws->l_state.horizontal_mwin; mscale = ws->l_state.horizontal_msize; + stacks = ws->l_state.horizontal_stacks; SWAPXY(&r_g); } else { w_inc = win->sh.height_inc; w_base = win->sh.base_height; mwin = ws->l_state.vertical_mwin; mscale = ws->l_state.vertical_msize; + stacks = ws->l_state.vertical_stacks; } win_g = r_g; + if (stacks > winno - mwin) + stacks = winno - mwin; + if (stacks < 1) + stacks = 1; + h_slice = r_g.h / SWM_H_SLICE; if (mwin && winno > mwin) { v_slice = r_g.w / SWM_V_SLICE; split = mwin; colno = split; - msize = v_slice * mscale; + win_g.w = v_slice * mscale; if (w_inc > 1 && w_inc < v_slice) { /* adjust for window's requested size increment */ @@ -1263,28 +1470,40 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) } } - win_g.w = msize; + msize = win_g.w; if (flip) win_g.x += r_g.w - msize; } else { - colno = winno; - split = 0; + msize = -2; + colno = split = winno / stacks; + win_g.w = ((r_g.w - (stacks * 2) + 2) / stacks); } hrh = r_g.h / colno; extra = r_g.h - (colno * hrh); win_g.h = hrh - 2; - i = j = 0; + /* stack all the tiled windows */ + i = j = 0, s = stacks; TAILQ_FOREACH(win, &ws->winlist, entry) { + if (win->transient != 0 || win->floating != 0) + continue; + if (split && i == split) { - colno = winno - split; + colno = (winno - mwin) / stacks; + if (s <= (winno - mwin) % stacks) + colno++; + split = split + colno; hrh = (r_g.h / colno); extra = r_g.h - (colno * hrh); if (flip) win_g.x = r_g.x; else - win_g.x += msize + 2; - win_g.w = r_g.w - (msize + 2); + win_g.x += win_g.w + 2; + win_g.w = (r_g.w - msize - (stacks * 2)) / stacks; + if (s == 1) + win_g.w += (r_g.w - msize - (stacks * 2)) % + stacks; + s--; j = 0; } win_g.h = hrh - 2; @@ -1292,7 +1511,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) h_inc = win->sh.width_inc; h_base = win->sh.base_width; } else { - h_inc = win->sh.height_inc; + h_inc = win->sh.height_inc; h_base = win->sh.base_height; } if (j == colno - 1) { @@ -1316,35 +1535,38 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) else win_g.y += last_h + 2; - if (win->transient != 0 || win->floating != 0) - stack_floater(win, ws->r); - else { - bzero(&wc, sizeof wc); - wc.border_width = 1; - if (rot) { - win->g.x = wc.x = win_g.y; - win->g.y = wc.y = win_g.x; - win->g.w = wc.width = win_g.h; - win->g.h = wc.height = win_g.w; - } else { - win->g.x = wc.x = win_g.x; - win->g.y = wc.y = win_g.y; - win->g.w = wc.width = win_g.w; - win->g.h = wc.height = win_g.h; - } - mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth; - XConfigureWindow(display, win->id, mask, &wc); - /* - fprintf(stderr, "vertical_stack: win %d x %d y %d w %d h %d bw %d\n", win->id, win->g.x, win->g.y, win->g.w , win->g.h, wc.border_width); - */ + bzero(&wc, sizeof wc); + wc.border_width = 1; + if (rot) { + win->g.x = wc.x = win_g.y; + win->g.y = wc.y = win_g.x; + win->g.w = wc.width = win_g.h; + win->g.h = wc.height = win_g.w; + } else { + win->g.x = wc.x = win_g.x; + win->g.y = wc.y = win_g.y; + win->g.w = wc.width = win_g.w; + win->g.h = wc.height = win_g.h; } - + adjust_font(win); + mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth; + XConfigureWindow(display, win->id, mask, &wc); XMapRaised(display, win->id); + last_h = win_g.h; i++; j++; } + /* now, stack all the floaters and transients */ + TAILQ_FOREACH(win, &ws->winlist, entry) { + if (win->transient == 0 && win->floating == 0) + continue; + + stack_floater(win, ws->r); + XMapRaised(display, win->id); + } + if (winfocus) focus_win(winfocus); /* has to be done outside of the loop */ } @@ -1359,6 +1581,7 @@ vertical_config(struct workspace *ws, int id) case SWM_ARG_ID_STACKINIT: ws->l_state.vertical_msize = SWM_V_SLICE / 2; ws->l_state.vertical_mwin = 1; + ws->l_state.vertical_stacks = 1; break; case SWM_ARG_ID_MASTERSHRINK: if (ws->l_state.vertical_msize > 1) @@ -1375,6 +1598,13 @@ vertical_config(struct workspace *ws, int id) if (ws->l_state.vertical_mwin > 0) ws->l_state.vertical_mwin--; break; + case SWM_ARG_ID_STACKINC: + ws->l_state.vertical_stacks++; + break; + case SWM_ARG_ID_STACKDEC: + if (ws->l_state.vertical_stacks > 1) + ws->l_state.vertical_stacks--; + break; default: return; } @@ -1398,6 +1628,7 @@ horizontal_config(struct workspace *ws, int id) case SWM_ARG_ID_STACKINIT: ws->l_state.horizontal_mwin = 1; ws->l_state.horizontal_msize = SWM_H_SLICE / 2; + ws->l_state.horizontal_stacks = 1; break; case SWM_ARG_ID_MASTERSHRINK: if (ws->l_state.horizontal_msize > 1) @@ -1414,6 +1645,13 @@ horizontal_config(struct workspace *ws, int id) if (ws->l_state.horizontal_mwin > 0) ws->l_state.horizontal_mwin--; break; + case SWM_ARG_ID_STACKINC: + ws->l_state.horizontal_stacks++; + break; + case SWM_ARG_ID_STACKDEC: + if (ws->l_state.horizontal_stacks > 1) + ws->l_state.horizontal_stacks--; + break; default: return; } @@ -1482,6 +1720,9 @@ send_to_ws(struct swm_region *r, union arg *args) Atom ws_idx_atom = 0; unsigned char ws_idx_str[SWM_PROPLEN]; + if (win == NULL) + return; + DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id); ws = win->ws; @@ -1551,6 +1792,20 @@ screenshot(struct swm_region *r, union arg *args) spawn(r, &a); } +void +floating_toggle(struct swm_region *r, union arg *args) +{ + struct ws_win *win = cur_focus; + + if (win == NULL) + return; + + win->floating = !win->floating; + win->manual = 0; + stack(); + focus_win(win); +} + /* key definitions */ struct key { unsigned int mod; @@ -1565,12 +1820,14 @@ struct key { { MODKEY, XK_l, stack_config, {.id = SWM_ARG_ID_MASTERGROW} }, { MODKEY, XK_comma, stack_config, {.id = SWM_ARG_ID_MASTERADD} }, { MODKEY, XK_period, stack_config, {.id = SWM_ARG_ID_MASTERDEL} }, + { MODKEY | ShiftMask, XK_comma, stack_config, {.id = SWM_ARG_ID_STACKINC} }, + { MODKEY | ShiftMask, XK_period, stack_config, {.id = SWM_ARG_ID_STACKDEC} }, { MODKEY, XK_Return, swapwin, {.id = SWM_ARG_ID_SWAPMAIN} }, { MODKEY, XK_j, focus, {.id = SWM_ARG_ID_FOCUSNEXT} }, { MODKEY, XK_k, focus, {.id = SWM_ARG_ID_FOCUSPREV} }, { MODKEY | ShiftMask, XK_j, swapwin, {.id = SWM_ARG_ID_SWAPNEXT} }, { MODKEY | ShiftMask, XK_k, swapwin, {.id = SWM_ARG_ID_SWAPPREV} }, - { MODKEY | ShiftMask, XK_Return, spawn, {.argv = spawn_term} }, + { MODKEY | ShiftMask, XK_Return, spawnterm, {.argv = spawn_term} }, { MODKEY, XK_p, spawnmenu, {.argv = spawn_menu} }, { MODKEY | ShiftMask, XK_q, quit, {0} }, { MODKEY, XK_q, restart, {0} }, @@ -1605,23 +1862,165 @@ struct key { { MODKEY | ShiftMask, XK_x, wkill, {0} }, { MODKEY, XK_s, screenshot, {.id = SWM_ARG_ID_SS_ALL} }, { MODKEY | ShiftMask, XK_s, screenshot, {.id = SWM_ARG_ID_SS_WINDOW} }, + { MODKEY, XK_t, floating_toggle,{0} }, + { MODKEY | ShiftMask, XK_v, version, {0} }, + { MODKEY | ShiftMask, XK_Delete, spawn, {.argv = spawn_lock} }, + { MODKEY | ShiftMask, XK_i, spawn, {.argv = spawn_initscr} }, }; void -click(struct swm_region *r, union arg *args) +resize_window(struct ws_win *win, int center) { - DNPRINTF(SWM_D_MOUSE, "click: button: %d\n", args->id); + unsigned int mask; + XWindowChanges wc; + struct swm_region *r; - switch (args->id) { - case Button1: - break; - case Button2: - break; - case Button3: - break; - default: + r = root_to_region(win->wa.root); + bzero(&wc, sizeof wc); + mask = CWBorderWidth | CWWidth | CWHeight; + wc.border_width = 1; + wc.width = win->g.w; + wc.height = win->g.h; + if (center == SWM_ARG_ID_CENTER) { + wc.x = (WIDTH(r) - win->g.w) / 2; + wc.y = (HEIGHT(r) - win->g.h) / 2; + mask |= CWX | CWY; + } + + DNPRINTF(SWM_D_STACK, "resize_window: win %lu x %d y %d w %d h %d\n", + win->id, wc.x, wc.y, wc.width, wc.height); + + XConfigureWindow(display, win->id, mask, &wc); + config_win(win); +} + +void +resize(struct ws_win *win, union arg *args) +{ + XEvent ev; + Time time = 0; + + DNPRINTF(SWM_D_MOUSE, "resize: win %lu floating %d trans %d\n", + win->id, win->floating, win->transient); + + if (!(win->transient != 0 || win->floating != 0)) return; + + if (XGrabPointer(display, win->id, False, MOUSEMASK, GrabModeAsync, + GrabModeAsync, None, None /* cursor */, CurrentTime) != GrabSuccess) + return; + XWarpPointer(display, None, win->id, 0, 0, 0, 0, win->g.w, win->g.h); + do { + XMaskEvent(display, MOUSEMASK | ExposureMask | + SubstructureRedirectMask, &ev); + switch(ev.type) { + case ConfigureRequest: + case Expose: + case MapRequest: + handler[ev.type](&ev); + break; + case MotionNotify: + if (ev.xmotion.x < 0) + ev.xmotion.x = 0; + if (ev.xmotion.y < 0) + ev.xmotion.y = 0; + win->g.w = ev.xmotion.x; + win->g.h = ev.xmotion.y; + + /* not free, don't sync more than 60 times / second */ + if ((ev.xmotion.time - time) > (1000 / 60) ) { + time = ev.xmotion.time; + XSync(display, False); + resize_window(win, args->id); + } + break; + } + } while (ev.type != ButtonRelease); + if (time) { + XSync(display, False); + resize_window(win, args->id); } + XWarpPointer(display, None, win->id, 0, 0, 0, 0, win->g.w - 1, + win->g.h - 1); + XUngrabPointer(display, CurrentTime); + + /* drain events */ + while (XCheckMaskEvent(display, EnterWindowMask, &ev)); +} + +void +move_window(struct ws_win *win) +{ + unsigned int mask; + XWindowChanges wc; + struct swm_region *r; + + r = root_to_region(win->wa.root); + bzero(&wc, sizeof wc); + mask = CWX | CWY; + wc.x = win->g.x; + wc.y = win->g.y; + + DNPRINTF(SWM_D_STACK, "move_window: win %lu x %d y %d w %d h %d\n", + win->id, wc.x, wc.y, wc.width, wc.height); + + XConfigureWindow(display, win->id, mask, &wc); + config_win(win); +} + +void +move(struct ws_win *win, union arg *args) +{ + XEvent ev; + Time time = 0; + int restack = 0; + + DNPRINTF(SWM_D_MOUSE, "move: win %lu floating %d trans %d\n", + win->id, win->floating, win->transient); + + if (win->floating == 0) { + win->floating = 1; + win->manual = 1; + restack = 1; + } + + if (XGrabPointer(display, win->id, False, MOUSEMASK, GrabModeAsync, + GrabModeAsync, None, None /* cursor */, CurrentTime) != GrabSuccess) + return; + XWarpPointer(display, None, win->id, 0, 0, 0, 0, 0, 0); + do { + XMaskEvent(display, MOUSEMASK | ExposureMask | + SubstructureRedirectMask, &ev); + switch(ev.type) { + case ConfigureRequest: + case Expose: + case MapRequest: + handler[ev.type](&ev); + break; + case MotionNotify: + win->g.x = ev.xmotion.x_root; + win->g.y = ev.xmotion.y_root; + + /* not free, don't sync more than 60 times / second */ + if ((ev.xmotion.time - time) > (1000 / 60) ) { + time = ev.xmotion.time; + XSync(display, False); + move_window(win); + } + break; + } + } while (ev.type != ButtonRelease); + if (time) { + XSync(display, False); + move_window(win); + } + XWarpPointer(display, None, win->id, 0, 0, 0, 0, 0, 0); + XUngrabPointer(display, CurrentTime); + if (restack) + stack(); + + /* drain events */ + while (XCheckMaskEvent(display, EnterWindowMask, &ev)); } /* mouse */ @@ -1630,11 +2029,13 @@ struct button { unsigned int action; unsigned int mask; unsigned int button; - void (*func)(struct swm_region *r, union arg *); + void (*func)(struct ws_win *, union arg *); union arg args; } buttons[] = { /* action key mouse button func args */ - { client_click, MODKEY, Button1, click, {.id=Button1} }, + { client_click, MODKEY, Button3, resize, {.id = SWM_ARG_ID_DONTCENTER} }, + { client_click, MODKEY | ShiftMask, Button3, resize, {.id = SWM_ARG_ID_CENTER} }, + { client_click, MODKEY, Button1, move, {0} }, }; void @@ -1750,8 +2151,7 @@ buttonpress(XEvent *e) 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); + buttons[i].func(win, &buttons[i].args); } void @@ -1778,6 +2178,7 @@ manage_window(Window id) struct swm_region *r; long mask; const char *errstr; + XWindowChanges wc; if ((win = find_window(id)) != NULL) return (win); /* already being managed */ @@ -1785,42 +2186,49 @@ manage_window(Window id) if ((win = calloc(1, sizeof(struct ws_win))) == NULL) errx(1, "calloc: failed to allocate memory for new window"); + /* Get all the window data in one shot */ ws_idx_atom = XInternAtom(display, "_SWM_WS", False); if (ws_idx_atom) XGetWindowProperty(display, id, ws_idx_atom, 0, SWM_PROPLEN, False, XA_STRING, &type, &format, &nitems, &bytes, &prop); - XGetWindowAttributes(display, id, &win->wa); + XGetTransientForHint(display, id, &trans); + XGetWMNormalHints(display, id, &win->sh, &mask); /* XXX function? */ + if (trans) { + win->transient = trans; + DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n", + (unsigned)win->id, win->transient); + } + + /* + * Figure out where to put the window. If it was previously assigned to + * a workspace (either by spawn() or manually moving), and isn't + * transient, * put it in the same workspace + */ r = root_to_region(win->wa.root); - /* If the window was managed before, put it in the same workspace */ - if (prop) { + if (prop && win->transient == 0) { DNPRINTF(SWM_D_PROP, "got property _SWM_WS=%s\n", prop); ws_idx = strtonum(prop, 0, 9, &errstr); - if (errstr) + if (errstr) { DNPRINTF(SWM_D_EVENT, "window idx is %s: %s", errstr, prop); + } ws = &r->s->ws[ws_idx]; } else ws = r->ws; + /* set up the window layout */ win->id = id; win->ws = ws; win->s = r->s; /* this never changes */ TAILQ_INSERT_TAIL(&ws->winlist, win, entry); - XGetTransientForHint(display, win->id, &trans); - if (trans) { - win->transient = trans; - DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n", - (unsigned)win->id, win->transient); - } win->g.w = win->wa.width; win->g.h = win->wa.height; win->g.x = win->wa.x; win->g.y = win->wa.y; - XGetWMNormalHints(display, win->id, &win->sh, &mask); /* XXX function? */ - + /* Set window properties so we can remember this after reincarnation */ if (ws_idx_atom && prop == NULL && snprintf(ws_idx_str, SWM_PROPLEN, "%d", ws->idx) < SWM_PROPLEN) { DNPRINTF(SWM_D_PROP, "setting property _SWM_WS to %s\n", @@ -1830,10 +2238,6 @@ manage_window(Window id) } XFree(prop); - /* - fprintf(stderr, "manage window: %d x %d y %d w %d h %d\n", win->id, win->g.x, win->g.y, win->g.w, win->g.h); - */ - if (XGetClassHint(display, win->id, &win->ch)) { DNPRINTF(SWM_D_CLASS, "class: %s name: %s\n", win->ch.res_class, win->ch.res_name); @@ -1845,15 +2249,38 @@ manage_window(Window id) win->ch.res_class, win->ch.res_name); if (quirks[i].quirk & SWM_Q_FLOAT) win->floating = 1; + win->quirks = quirks[i].quirk; } } } + /* alter window position if quirky */ + if (win->quirks & SWM_Q_ANYWHERE) { + win->manual = 1; /* don't center the quirky windows */ + bzero(&wc, sizeof wc); + mask = 0; + if (win->g.y < bar_height) { + win->g.y = wc.y = bar_height; + mask |= CWY; + } + if (win->g.w + win->g.x > WIDTH(r)) { + win->g.x = wc.x = WIDTH(win->ws->r) - win->g.w - 2; + mask |= CWX; + } + wc.border_width = 1; + mask |= CWBorderWidth; + XConfigureWindow(display, win->id, mask, &wc); + } + XSelectInput(display, id, EnterWindowMask | FocusChangeMask | PropertyChangeMask | StructureNotifyMask); set_win_state(win, NormalState); + /* floaters need to be mapped if they are in the current workspace */ + if (win->floating && (ws->idx == r->ws->idx)) + XMapRaised(display, win->id); + /* make new win focused */ focus_win(win); @@ -1861,6 +2288,43 @@ manage_window(Window id) } void +unmanage_window(struct ws_win *win) +{ + struct workspace *ws; + + if (win == NULL) + return; + + DNPRINTF(SWM_D_MISC, "unmanage_window: %lu\n", win->id); + + /* don't unmanage if we are switching workspaces */ + ws = win->ws; + if (ws->restack) + return; + + /* find a window to focus */ + if (ws->focus == win) + ws->focus = TAILQ_PREV(win, ws_win_list, entry); + if (ws->focus == NULL) + ws->focus = TAILQ_FIRST(&ws->winlist); + if (ws->focus == NULL || ws->focus == win) { + ws->focus = NULL; + unfocus_all(); + } else + focus_win(ws->focus); + if (ws->focus_prev == win) + ws->focus_prev = NULL; + + TAILQ_REMOVE(&win->ws->winlist, win, entry); + set_win_state(win, WithdrawnState); + if (win->ch.res_class) + XFree(win->ch.res_class); + if (win->ch.res_name) + XFree(win->ch.res_name); + free(win); +} + +void configurerequest(XEvent *e) { XConfigureRequestEvent *ev = &e->xconfigurerequest; @@ -1874,10 +2338,6 @@ configurerequest(XEvent *e) if (new) { DNPRINTF(SWM_D_EVENT, "configurerequest: new window: %lu\n", ev->window); - /* - fprintf(stderr, "configurerequest: new window: %lu x %d y %d w %d h %d bw %d s %d sm %d\n", - ev->window, ev->x, ev->y, ev->width, ev->height, ev->border_width, ev->above, ev->detail); - */ bzero(&wc, sizeof wc); wc.x = ev->x; wc.y = ev->y; @@ -1888,10 +2348,6 @@ configurerequest(XEvent *e) wc.stack_mode = ev->detail; XConfigureWindow(display, ev->window, ev->value_mask, &wc); } else { - /* - fprintf(stderr, "configurerequest: change window: %lu\n", - ev->window); - */ DNPRINTF(SWM_D_EVENT, "configurerequest: change window: %lu\n", ev->window); if (win->floating) { @@ -1917,8 +2373,8 @@ configurerequest(XEvent *e) ev->value_mask |= CWY | CWHeight; } } - if ((ev->value_mask & (CWX|CWY)) && - !(ev->value_mask & (CWWidth|CWHeight))) + if ((ev->value_mask & (CWX | CWY)) && + !(ev->value_mask & (CWWidth | CWHeight))) config_win(win); XMoveResizeWindow(display, win->id, win->g.x, win->g.y, win->g.w, win->g.h); @@ -1930,8 +2386,19 @@ configurerequest(XEvent *e) void configurenotify(XEvent *e) { + struct ws_win *win; + long mask; + DNPRINTF(SWM_D_EVENT, "configurenotify: window: %lu\n", e->xconfigure.window); + + win = find_window(e->xconfigure.window); + XMapWindow(display, win->id); + XGetWMNormalHints(display, win->id, &win->sh, &mask); + adjust_font(win); + XMapWindow(display, win->id); + if (font_adjusted) + stack(); } void @@ -1939,29 +2406,11 @@ 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) { - ws = win->ws; - /* find a window to focus */ - if (ws->focus == win) - ws->focus = TAILQ_PREV(win, ws_win_list, entry); - if (ws->focus == NULL) - ws->focus = TAILQ_FIRST(&ws->winlist); - if (ws->focus == NULL || ws->focus == win) { - ws->focus = NULL; - unfocus_all(); - } else - focus_win(ws->focus); - TAILQ_REMOVE(&ws->winlist, win, entry); - set_win_state(win, WithdrawnState); - if (win->ch.res_class) - XFree(win->ch.res_class); - if (win->ch.res_name) - XFree(win->ch.res_name); - free(win); + unmanage_window(win); stack(); } } @@ -2016,6 +2465,7 @@ maprequest(XEvent *e) if (wa.override_redirect) return; manage_window(e->xmaprequest.window); + stack(); } @@ -2057,7 +2507,14 @@ propertynotify(XEvent *e) void unmapnotify(XEvent *e) { + XDestroyWindowEvent *ev = &e->xdestroywindow; + struct ws_win *win; + DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window); + + if ((win = find_window(ev->window)) != NULL) + if (win->transient) + unmanage_window(win); } void @@ -2075,22 +2532,6 @@ visibilitynotify(XEvent *e) bar_update(); } -void (*handler[LASTEvent])(XEvent *) = { - [Expose] = expose, - [KeyPress] = keypress, - [ButtonPress] = buttonpress, - [ConfigureRequest] = configurerequest, - [ConfigureNotify] = configurenotify, - [DestroyNotify] = destroynotify, - [EnterNotify] = enternotify, - [FocusIn] = focusin, - [MappingNotify] = mappingnotify, - [MapRequest] = maprequest, - [PropertyNotify] = propertynotify, - [UnmapNotify] = unmapnotify, - [VisibilityNotify] = visibilitynotify, -}; - int xerror_start(Display *d, XErrorEvent *ee) { @@ -2144,16 +2585,63 @@ getstate(Window w) } void -new_region(struct swm_screen *s, struct workspace *ws, - int x, int y, int w, int h) +new_region(struct swm_screen *s, int x, int y, int w, int h) { - struct swm_region *r; + struct swm_region *r, *n; + struct workspace *ws = NULL; + int i; + + DNPRINTF(SWM_D_MISC, "new region: screen[%d]:%dx%d+%d+%d\n", + s->idx, w, h, x, y); + + /* remove any conflicting regions */ + n = TAILQ_FIRST(&s->rl); + while (n) { + r = n; + n = TAILQ_NEXT(r, entry); + if (X(r) < (x + w) && + (X(r) + WIDTH(r)) > x && + Y(r) < (y + h) && + (Y(r) + HEIGHT(r)) > y) { + XDestroyWindow(display, r->bar_window); + TAILQ_REMOVE(&s->rl, r, entry); + TAILQ_INSERT_TAIL(&s->orl, r, entry); + } + } + + /* search old regions for one to reuse */ + + /* size + location match */ + TAILQ_FOREACH(r, &s->orl, entry) + if (X(r) == x && Y(r) == y && + HEIGHT(r) == h && WIDTH(r) == w) + break; - DNPRINTF(SWM_D_MISC, "new region on screen %d: %dx%d (%d, %d)\n", - s->idx, x, y, w, h); + /* size match */ + TAILQ_FOREACH(r, &s->orl, entry) + if (HEIGHT(r) == h && WIDTH(r) == w) + break; + + if (r != NULL) { + TAILQ_REMOVE(&s->orl, r, entry); + /* try to use old region's workspace */ + if (r->ws->r == NULL) + ws = r->ws; + } else + if ((r = calloc(1, sizeof(struct swm_region))) == NULL) + errx(1, "calloc: failed to allocate memory for screen"); + + /* if we don't have a workspace already, find one */ + if (ws == NULL) { + for (i = 0; i < SWM_WS_MAX; i++) + if (s->ws[i].r == NULL) { + ws = &s->ws[i]; + break; + } + } - if ((r = calloc(1, sizeof(struct swm_region))) == NULL) - errx(1, "calloc: failed to allocate memory for screen"); + if (ws == NULL) + errx(1, "no free workspaces\n"); X(r) = x; Y(r) = y; @@ -2167,20 +2655,100 @@ new_region(struct swm_screen *s, struct workspace *ws, } void -setup_screens(void) +scan_xrandr(int i) { #ifdef SWM_XRR_HAS_CRTC XRRCrtcInfo *ci; XRRScreenResources *sr; int c; + int ncrtc = 0; #endif /* SWM_XRR_HAS_CRTC */ + struct swm_region *r; + + + if (i >= ScreenCount(display)) + errx(1, "invalid screen"); + + /* remove any old regions */ + while ((r = TAILQ_FIRST(&screens[i].rl)) != NULL) { + r->ws->r = NULL; + XDestroyWindow(display, r->bar_window); + TAILQ_REMOVE(&screens[i].rl, r, entry); + TAILQ_INSERT_TAIL(&screens[i].orl, r, entry); + } + + /* map virtual screens onto physical screens */ +#ifdef SWM_XRR_HAS_CRTC + if (xrandr_support) { + sr = XRRGetScreenResources(display, screens[i].root); + if (sr == NULL) + new_region(&screens[i], 0, 0, + DisplayWidth(display, i), + DisplayHeight(display, i)); + else + ncrtc = sr->ncrtc; + + for (c = 0, ci = NULL; c < ncrtc; c++) { + ci = XRRGetCrtcInfo(display, sr, sr->crtcs[c]); + if (ci->noutput == 0) + continue; + + if (ci != NULL && ci->mode == None) + new_region(&screens[i], 0, 0, + DisplayWidth(display, i), + DisplayHeight(display, i)); + else + new_region(&screens[i], + ci->x, ci->y, ci->width, ci->height); + } + if (ci) + XRRFreeCrtcInfo(ci); + XRRFreeScreenResources(sr); + } else +#endif /* SWM_XRR_HAS_CRTC */ + { + new_region(&screens[i], 0, 0, DisplayWidth(display, i), + DisplayHeight(display, i)); + } +} + +void +screenchange(XEvent *e) { + XRRScreenChangeNotifyEvent *xe = (XRRScreenChangeNotifyEvent *)e; + struct swm_region *r; + struct ws_win *win; + int i; + + DNPRINTF(SWM_D_EVENT, "screenchange: %lu\n", xe->root); + + if (!XRRUpdateConfiguration(e)) + return; + + /* silly event doesn't include the screen index */ + for (i = 0; i < ScreenCount(display); i++) + if (screens[i].root == xe->root) + break; + if (i >= ScreenCount(display)) + errx(1, "screenchange: screen not found\n"); + + /* brute force for now, just re-enumerate the regions */ + scan_xrandr(i); + + /* hide any windows that went away */ + TAILQ_FOREACH(r, &screens[i].rl, entry) + TAILQ_FOREACH(win, &r->ws->winlist, entry) + XUnmapWindow(display, win->id); + stack(); +} + +void +setup_screens(void) +{ Window d1, d2, *wins = NULL; XWindowAttributes wa; - struct swm_region *r; unsigned int no; - int errorbase, major, minor; - int ncrtc = 0, w = 0; int i, j, k; + int errorbase, major, minor; struct workspace *ws; int ws_idx_atom; @@ -2190,13 +2758,20 @@ setup_screens(void) errx(1, "calloc: screens"); ws_idx_atom = XInternAtom(display, "_SWM_WS", False); - + + /* initial Xrandr setup */ + xrandr_support = XRRQueryExtension(display, + &xrandr_eventbase, &errorbase); + if (xrandr_support) + if (XRRQueryVersion(display, &major, &minor) && major < 1) + xrandr_support = 0; /* map physical screens */ for (i = 0; i < ScreenCount(display); i++) { DNPRINTF(SWM_D_WS, "setup_screens: init screen %d\n", i); screens[i].idx = i; TAILQ_INIT(&screens[i].rl); + TAILQ_INIT(&screens[i].orl); screens[i].root = RootWindow(display, i); /* set default colors */ @@ -2207,6 +2782,7 @@ setup_screens(void) setscreencolor("rgb:a0/a0/a0", i + 1, SWM_S_COLOR_BAR_FONT); /* init all workspaces */ + /* XXX these should be dynamically allocated too */ for (j = 0; j < SWM_WS_MAX; j++) { ws = &screens[i].ws[j]; ws->idx = j; @@ -2221,83 +2797,38 @@ setup_screens(void) SWM_ARG_ID_STACKINIT); ws->cur_layout = &layouts[0]; } - - /* map virtual screens onto physical screens */ - screens[i].xrandr_support = XRRQueryExtension(display, - &xrandr_eventbase, &errorbase); - if (screens[i].xrandr_support) - if (XRRQueryVersion(display, &major, &minor) && - major < 1) - screens[i].xrandr_support = 0; - -#if 0 /* not ready for dynamic screen changes */ - if (screens[i].xrandr_support) - XRRSelectInput(display, - screens[r->s].root, - RRScreenChangeNotifyMask); -#endif - /* grab existing windows (before we build the bars)*/ if (!XQueryTree(display, screens[i].root, &d1, &d2, &wins, &no)) continue; -#ifdef SWM_XRR_HAS_CRTC - sr = XRRGetScreenResources(display, screens[i].root); - if (sr == NULL) - new_region(&screens[i], &screens[i].ws[w], - 0, 0, DisplayWidth(display, i), - DisplayHeight(display, i)); - else - ncrtc = sr->ncrtc; - - for (c = 0, ci = NULL; c < ncrtc; c++) { - ci = XRRGetCrtcInfo(display, sr, sr->crtcs[c]); - if (ci->noutput == 0) - continue; + scan_xrandr(i); - if (ci != NULL && ci->mode == None) - new_region(&screens[i], &screens[i].ws[w], 0, 0, - DisplayWidth(display, i), - DisplayHeight(display, i)); - else - new_region(&screens[i], &screens[i].ws[w], - ci->x, ci->y, ci->width, ci->height); - w++; - } - if (ci) - XRRFreeCrtcInfo(ci); - XRRFreeScreenResources(sr); -#else - new_region(&screens[i], &screens[i].ws[w], 0, 0, - DisplayWidth(display, i), - DisplayHeight(display, i)); -#endif /* SWM_XRR_HAS_CRTC */ + if (xrandr_support) + XRRSelectInput(display, screens[i].root, + RRScreenChangeNotifyMask); /* attach windows to a region */ /* normal windows */ - if ((r = TAILQ_FIRST(&screens[i].rl)) == NULL) - errx(1, "no regions on screen %d", i); - - for (i = 0; i < no; i++) { - XGetWindowAttributes(display, wins[i], &wa); - if (!XGetWindowAttributes(display, wins[i], &wa) || + for (j = 0; j < no; j++) { + XGetWindowAttributes(display, wins[j], &wa); + if (!XGetWindowAttributes(display, wins[j], &wa) || wa.override_redirect || - XGetTransientForHint(display, wins[i], &d1)) + XGetTransientForHint(display, wins[j], &d1)) continue; if (wa.map_state == IsViewable || - getstate(wins[i]) == NormalState) - manage_window(wins[i]); + getstate(wins[j]) == NormalState) + manage_window(wins[j]); } /* transient windows */ - for (i = 0; i < no; i++) { - if (!XGetWindowAttributes(display, wins[i], &wa)) + for (j = 0; j < no; j++) { + if (!XGetWindowAttributes(display, wins[j], &wa)) continue; - if (XGetTransientForHint(display, wins[i], &d1) && - (wa.map_state == IsViewable || getstate(wins[i]) == + if (XGetTransientForHint(display, wins[j], &d1) && + (wa.map_state == IsViewable || getstate(wins[j]) == NormalState)) - manage_window(wins[i]); + manage_window(wins[j]); } if (wins) { XFree(wins); @@ -2368,10 +2899,27 @@ main(int argc, char *argv[]) bar_alarm = 0; bar_update(); } - while(XPending(display)) { + while (XPending(display)) { XNextEvent(display, &e); - if (handler[e.type]) - handler[e.type](&e); + if (e.type < LASTEvent) { + if (handler[e.type]) + handler[e.type](&e); + else + DNPRINTF(SWM_D_EVENT, + "win: %lu unknown event: %d\n", + e.xany.window, e.type); + } else { + switch (e.type - xrandr_eventbase) { + case RRScreenChangeNotify: + screenchange(&e); + break; + default: + DNPRINTF(SWM_D_EVENT, + "win: %lu unknown xrandr event: " + "%d\n", e.xany.window, e.type); + break; + } + } } }