X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=67ad17a4f6f3a201fd3209f58f8950c797484661;hb=28609b91d0e28949174112d517ce6ce26f1cd656;hp=0137fe7de0eba0bfa24972f34abd7f4db701bed7;hpb=80e76b8191fc2de100f1c7741c5730bb7fe47379;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index 0137fe7..67ad17a 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -52,7 +52,7 @@ static const char *cvstag = "$scrotwm$"; -#define SWM_VERSION "0.9.18" +#define SWM_VERSION "0.9.25" #include #include @@ -84,6 +84,10 @@ static const char *cvstag = "$scrotwm$"; #include #include +#ifdef __OSX__ +#include +#endif + #if RANDR_MAJOR < 1 # error XRandR versions less than 1.0 are not supported #endif @@ -150,6 +154,10 @@ u_int32_t swm_debug = 0 #define SWM_MAX_FONT_STEPS (3) #define WINID(w) (w ? w->id : 0) +#define SWM_FOCUS_DEFAULT (0) +#define SWM_FOCUS_SYNERGY (1) +#define SWM_FOCUS_FOLLOW (2) + #ifndef SWM_LIB #define SWM_LIB "/usr/local/lib/libswmhack.so" #endif @@ -160,7 +168,9 @@ Atom aprot; Atom adelete; Atom takefocus; volatile sig_atomic_t running = 1; +volatile sig_atomic_t restart_wm = 0; int outputs = 0; +int last_focus_event = FocusOut; int (*xerrorxlib)(Display *, XErrorEvent *); int other_wm; int ss_enabled = 0; @@ -193,8 +203,11 @@ int bar_verbose = 1; int bar_height = 0; int stack_enabled = 1; int clock_enabled = 1; +char *clock_format = NULL; int title_name_enabled = 0; int title_class_enabled = 0; +int focus_mode = SWM_FOCUS_DEFAULT; +int disable_border = 0; pid_t bar_pid; GC bar_gc; XGCValues bar_gcv; @@ -225,6 +238,7 @@ struct swm_region { TAILQ_ENTRY(swm_region) entry; struct swm_geometry g; struct workspace *ws; /* current workspace on this region */ + struct workspace *ws_prior; /* prior workspace on this region */ struct swm_screen *s; /* screen idx */ Window bar_window; }; @@ -235,7 +249,11 @@ struct ws_win { Window id; Window transient; struct ws_win *child_trans; /* transient child window */ - struct swm_geometry g; + struct swm_geometry g; /* current geometry */ + struct swm_geometry g_float; /* geometry when floating */ + struct swm_geometry rg_float; /* region geom when floating */ + int g_floatvalid; /* flag: geometry in g_float is valid */ + int floatmaxed; /* flag: floater was maxed in max_stack */ int floating; int manual; int font_size_boundary[SWM_MAX_FONT_STEPS]; @@ -253,64 +271,6 @@ struct ws_win { }; TAILQ_HEAD(ws_win_list, ws_win); -/* user/key callable function IDs */ -enum keyfuncid { - kf_cycle_layout, - kf_stack_reset, - kf_master_shrink, - kf_master_grow, - kf_master_add, - kf_master_del, - kf_stack_inc, - kf_stack_dec, - kf_swap_main, - kf_focus_next, - kf_focus_prev, - kf_swap_next, - kf_swap_prev, - kf_spawn_term, - kf_spawn_menu, - kf_quit, - kf_restart, - kf_focus_main, - kf_ws_1, - kf_ws_2, - kf_ws_3, - kf_ws_4, - kf_ws_5, - kf_ws_6, - kf_ws_7, - kf_ws_8, - kf_ws_9, - kf_ws_10, - kf_ws_next, - kf_ws_prev, - kf_screen_next, - kf_screen_prev, - kf_mvws_1, - kf_mvws_2, - kf_mvws_3, - kf_mvws_4, - kf_mvws_5, - kf_mvws_6, - kf_mvws_7, - kf_mvws_8, - kf_mvws_9, - kf_mvws_10, - kf_bar_toggle, - kf_wind_kill, - kf_wind_del, - kf_screenshot_all, - kf_screenshot_wind, - kf_float_toggle, - kf_version, - kf_spawn_lock, - kf_spawn_initscr, - kf_spawn_custom, - kf_dumpwins, - kf_invalid -}; - /* layout handlers */ void stack(void); void vertical_config(struct workspace *, int); @@ -342,6 +302,9 @@ struct layout { { NULL, NULL, 0, NULL }, }; +/* position of max_stack mode in the layouts array */ +#define SWM_MAX_STACK 2 + #define SWM_H_SLICE (32) #define SWM_V_SLICE (32) @@ -398,6 +361,7 @@ union arg { #define SWM_ARG_ID_SWAPNEXT (10) #define SWM_ARG_ID_SWAPPREV (11) #define SWM_ARG_ID_SWAPMAIN (12) +#define SWM_ARG_ID_MOVELAST (13) #define SWM_ARG_ID_MASTERSHRINK (20) #define SWM_ARG_ID_MASTERGROW (21) #define SWM_ARG_ID_MASTERADD (22) @@ -606,8 +570,7 @@ void configurerequest(XEvent *); void configurenotify(XEvent *); void destroynotify(XEvent *); void enternotify(XEvent *); -void focusin(XEvent *); -void focusout(XEvent *); +void focusevent(XEvent *); void mapnotify(XEvent *); void mappingnotify(XEvent *); void maprequest(XEvent *); @@ -623,8 +586,8 @@ void (*handler[LASTEvent])(XEvent *) = { [ConfigureNotify] = configurenotify, [DestroyNotify] = destroynotify, [EnterNotify] = enternotify, - [FocusIn] = focusin, - [FocusOut] = focusout, + [FocusIn] = focusevent, + [FocusOut] = focusevent, [MapNotify] = mapnotify, [MappingNotify] = mappingnotify, [MapRequest] = maprequest, @@ -646,9 +609,11 @@ sighdlr(int sig) break; } break; + case SIGHUP: + restart_wm = 1; + break; case SIGINT: case SIGTERM: - case SIGHUP: case SIGQUIT: running = 0; break; @@ -813,6 +778,7 @@ bar_update(void) int i, x; size_t len; char s[SWM_BAR_MAX]; + char cn[SWM_BAR_MAX]; char loc[SWM_BAR_MAX]; char *b; char *stack = ""; @@ -839,20 +805,22 @@ bar_update(void) else { time(&tmt); localtime_r(&tmt, &tm); - strftime(s, sizeof s, "%a %b %d %R %Z %Y ", &tm); + strftime(s, sizeof s, clock_format, &tm); + strlcat(s, " ", sizeof s); } for (i = 0; i < ScreenCount(display); i++) { x = 1; TAILQ_FOREACH(r, &screens[i].rl, entry) { + strlcpy(cn, "", sizeof cn); if (r && r->ws) - bar_class_name(s, sizeof s, r->ws->focus); + bar_class_name(cn, sizeof cn, r->ws->focus); if (stack_enabled) stack = r->ws->cur_layout->name; - snprintf(loc, sizeof loc, "%d:%d %s %s %s %s", - x++, r->ws->idx + 1, stack, s, bar_ext, + snprintf(loc, sizeof loc, "%d:%d %s %s%s %s %s", + x++, r->ws->idx + 1, stack, s, cn, bar_ext, bar_vertext); bar_print(r, loc); } @@ -1119,6 +1087,9 @@ unmap_window(struct ws_win *win) set_win_state(win, IconicState); XUnmapWindow(display, win->id); + if (win->ws->r) + XSetWindowBorder(display, win->id, + win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); } void @@ -1230,13 +1201,32 @@ struct ws_win * find_window(Window id) { struct ws_win *win; - int i, j; + Window wrr, wpr, *wcr = NULL; + int i, j, nc; 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 (id == win->id) return (win); + + /* if we were looking for the parent return that window instead */ + if (XQueryTree(display, id, &wrr, &wpr, &wcr, &nc) == 0) + return (NULL); + if (wcr) + XFree(wcr); + + /* ignore not found and root */ + if (wpr == 0 || wrr == wpr) + return (NULL); + + /* look for parent */ + 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 (wpr == win->id) + return (win); + return (NULL); } @@ -1353,6 +1343,8 @@ validate_ws(struct workspace *testws) void unfocus_win(struct ws_win *win) { + XEvent cne; + DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", WINID(win)); if (win == NULL) @@ -1385,31 +1377,38 @@ unfocus_win(struct ws_win *win) win->ws->focus_prev = NULL; } + /* drain all previous unfocus events */ + while (XCheckTypedEvent(display, FocusOut, &cne) == True) + ; + grabbuttons(win, 0); XSetWindowBorder(display, win->id, win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); + } void -unfocus_all_except(struct ws_win *except) +unfocus_all(void) { struct ws_win *win; int i, j; - DNPRINTF(SWM_D_FOCUS, "unfocus_all_except: id: %lu\n", except->id); + 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 != except) - unfocus_win(win); + unfocus_win(win); } void focus_win(struct ws_win *win) { - int rtr; - Window wf; + XEvent cne; + Window cur_focus; + int rr; + struct ws_win *cfw = NULL; + DNPRINTF(SWM_D_FOCUS, "focus_win: id: %lu\n", win ? win->id : 0); @@ -1425,24 +1424,26 @@ focus_win(struct ws_win *win) return; } - /* use big hammer to make sure it works under all use cases */ - unfocus_all_except(win); - if (validate_win(win)) { kill_refs(win); return; } + XGetInputFocus(display, &cur_focus, &rr); + if ((cfw = find_window(cur_focus)) != NULL) + unfocus_win(cfw); + win->ws->focus = win; if (win->ws->r != NULL) { - XGetInputFocus(display, &wf, &rtr); - if (wf != win->id) { - grabbuttons(win, 1); - if (win->java == 0) - XSetInputFocus(display, win->id, - RevertToParent, CurrentTime); - } + /* drain all previous focus events */ + while (XCheckTypedEvent(display, FocusIn, &cne) == True) + ; + + if (win->java == 0) + XSetInputFocus(display, win->id, + RevertToParent, CurrentTime); + grabbuttons(win, 1); XSetWindowBorder(display, win->id, win->ws->r->s->c[SWM_S_COLOR_FOCUS].color); if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS) @@ -1453,7 +1454,7 @@ focus_win(struct ws_win *win) void switchws(struct swm_region *r, union arg *args) { - int wsid = args->id; + int wsid = args->id, unmap_old = 0; struct swm_region *this_r, *other_r; struct ws_win *win; struct workspace *new_ws, *old_ws; @@ -1477,17 +1478,16 @@ switchws(struct swm_region *r, union arg *args) other_r = new_ws->r; if (other_r == NULL) { - /* if the other workspace is hidden, switch windows */ - if (old_ws->r != NULL) - old_ws->old_r = old_ws->r; + /* the other workspace is hidden, hide this one */ old_ws->r = NULL; - - TAILQ_FOREACH(win, &old_ws->winlist, entry) - unmap_window(win); + unmap_old = 1; } else { + /* the other ws is visible in another region, exchange them */ + other_r->ws_prior = new_ws; other_r->ws = old_ws; old_ws->r = other_r; } + this_r->ws_prior = old_ws; this_r->ws = new_ws; new_ws->r = this_r; @@ -1495,6 +1495,11 @@ switchws(struct swm_region *r, union arg *args) a.id = SWM_ARG_ID_FOCUSCUR; focus(new_ws->r, &a); bar_update(); + + /* unmap old windows */ + if (unmap_old) + TAILQ_FOREACH(win, &old_ws->winlist, entry) + unmap_window(win); } void @@ -1536,6 +1541,22 @@ cyclews(struct swm_region *r, union arg *args) } void +priorws(struct swm_region *r, union arg *args) +{ + union arg a; + + DNPRINTF(SWM_D_WS, "priorws id %d " + "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); + + if (r->ws_prior == NULL) + return; + + a.id = r->ws_prior->idx; + switchws(r, &a); +} + +void cyclescr(struct swm_region *r, union arg *args) { struct swm_region *rr = NULL; @@ -1634,6 +1655,10 @@ swapwin(struct swm_region *r, union arg *args) TAILQ_REMOVE(wl, source, entry); TAILQ_INSERT_HEAD(wl, source, entry); break; + case SWM_ARG_ID_MOVELAST: + TAILQ_REMOVE(wl, source, entry); + TAILQ_INSERT_TAIL(wl, source, entry); + break; default: DNPRINTF(SWM_D_MOVE, "invalid id: %d\n", args->id); return; @@ -1679,11 +1704,14 @@ focus_prev(struct ws_win *win) /* if in max_stack try harder */ if (ws->cur_layout->flags & SWM_L_FOCUSPREV) { - /* window got unmapped go to parent which is now cur_focus */ - if (ws->focus_prev == win) - winfocus = cur_focus; + if (cur_focus != ws->focus_prev) + winfocus = ws->focus_prev; + else if (cur_focus != ws->focus) + winfocus = ws->focus; + else + winfocus = TAILQ_PREV(win, ws_win_list, entry); if (winfocus) - goto focusanyway; + goto done; } if (cur_focus == win) @@ -1695,7 +1723,7 @@ focus_prev(struct ws_win *win) done: if (winfocus == winlostfocus || winfocus == NULL) return; -focusanyway: + focus_magic(winfocus, SWM_F_GENERIC); } @@ -1720,7 +1748,7 @@ focus(struct swm_region *r, union arg *args) winfocus = r->ws->focus_prev; else winfocus = TAILQ_FIRST(&r->ws->winlist); - + focus_magic(winfocus, SWM_F_GENERIC); return; } @@ -1820,6 +1848,8 @@ stack(void) { g.h -= bar_height; } r->ws->cur_layout->l_stack(r->ws, &g); + /* save r so we can track region changes */ + r->ws->old_r = r; } } if (font_adjusted) @@ -1827,6 +1857,21 @@ stack(void) { } void +store_float_geom(struct ws_win *win, struct swm_region *r) +{ + /* retain window geom and region geom */ + win->g_float.x = win->g.x; + win->g_float.y = win->g.y; + win->g_float.w = win->g.w; + win->g_float.h = win->g.h; + win->rg_float.x = r->g.x; + win->rg_float.y = r->g.y; + win->rg_float.w = r->g.w; + win->rg_float.h = r->g.h; + win->g_floatvalid = 1; +} + +void stack_floater(struct ws_win *win, struct swm_region *r) { unsigned int mask; @@ -1837,6 +1882,26 @@ stack_floater(struct ws_win *win, struct swm_region *r) bzero(&wc, sizeof wc); mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight; + + /* + * to allow windows to change their size (e.g. mplayer fs) only retrieve + * geom on ws switches or return from max mode + */ + + if (win->floatmaxed || (r != r->ws->old_r && win->g_floatvalid) ) { + /* + * use stored g and rg to set relative position and size + * as in old region or before max stack mode + */ + win->g.x = win->g_float.x - win->rg_float.x + r->g.x; + win->g.y = win->g_float.y - win->rg_float.y + r->g.y; + win->g.w = win->g_float.w; + win->g.h = win->g_float.h; + win->g_floatvalid = 0; + } + + win->floatmaxed = 0; + if ((win->quirks & SWM_Q_FULLSCREEN) && (win->g.w >= WIDTH(r)) && (win->g.h >= HEIGHT(r))) wc.border_width = 0; @@ -1846,26 +1911,39 @@ stack_floater(struct ws_win *win, struct swm_region *r) 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; - 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; + + if (!win->manual) { + /* + * floaters and transients are auto-centred unless moved + * or resized + */ + win->g.x = r->g.x + (WIDTH(r) - win->g.w) / 2; + win->g.y = r->g.y + (HEIGHT(r) - win->g.h) / 2; } - /* adjust for region */ - if (wc.x < r->g.x) - wc.x += r->g.x; - if (wc.y < r->g.y) - wc.y += r->g.y; + /* win can be outside r if new r smaller than old r */ + /* Ensure top left corner inside r (move probs otherwise) */ + if (win->g.x < r->g.x ) + win->g.x = r->g.x; + if (win->g.x > r->g.x + r->g.w - 1) + win->g.x = (win->g.w > r->g.w) ? r->g.x : + (r->g.x + r->g.w - win->g.w - 2); + if (win->g.y < r->g.y ) + win->g.y = r->g.y; + if (win->g.y > r->g.y + r->g.h - 1) + win->g.y = (win->g.h > r->g.h) ? r->g.y : + (r->g.y + r->g.h - win->g.h - 2); - win->g.x = wc.x; - win->g.y = wc.y; - win->g.w = wc.width; - win->g.h = wc.height; + wc.x = win->g.x; + wc.y = win->g.y; + wc.width = win->g.w; + wc.height = win->g.h; + + /* + * Retain floater and transient geometry for correct positioning + * when ws changes region + */ + store_float_geom(win, r); DNPRINTF(SWM_D_MISC, "stack_floater: win %lu x %d y %d w %d h %d\n", win->id, wc.x, wc.y, wc.width, wc.height); @@ -1912,6 +1990,7 @@ void stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) { XWindowChanges wc; + XWindowAttributes wa; struct swm_geometry win_g, r_g = *g; struct ws_win *win; int i, j, s, stacks; @@ -2038,7 +2117,12 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) win_g.y += last_h + 2; bzero(&wc, sizeof wc); - wc.border_width = 1; + if (disable_border && bar_enabled == 0 && winno == 1){ + wc.border_width = 0; + win_g.w += 2; + win_g.h += 2; + } else + wc.border_width = 1; reconfigure = 0; if (rot) { if (win->g.x != win_g.y || win->g.y != win_g.x || @@ -2065,7 +2149,10 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) XConfigureWindow(display, win->id, mask, &wc); configreq_win(win); } - XMapRaised(display, win->id); + + if (XGetWindowAttributes(display, win->id, &wa)) + if (wa.map_state == IsUnmapped) + XMapRaised(display, win->id); last_h = win_g.h; i++; @@ -2172,7 +2259,7 @@ horizontal_config(struct workspace *ws, int id) void horizontal_stack(struct workspace *ws, struct swm_geometry *g) { - DNPRINTF(SWM_D_STACK, "vertical_stack: workspace: %d\n", ws->idx); + DNPRINTF(SWM_D_STACK, "horizontal_stack: workspace: %d\n", ws->idx); stack_master(ws, g, 1, 0); } @@ -2203,15 +2290,30 @@ max_stack(struct workspace *ws, struct swm_geometry *g) continue; } + if (win->floating && win->floatmaxed == 0 ) { + /* + * retain geometry for retrieval on exit from + * max_stack mode + */ + store_float_geom(win, ws->r); + win->floatmaxed = 1; + } + /* only reconfigure if necessary */ if (win->g.x != gg.x || win->g.y != gg.y || win->g.w != gg.w || win->g.h != gg.h) { bzero(&wc, sizeof wc); - wc.border_width = 1; win->g.x = wc.x = gg.x; win->g.y = wc.y = gg.y; - win->g.w = wc.width = gg.w; - win->g.h = wc.height = gg.h; + if (bar_enabled){ + wc.border_width = 1; + win->g.w = wc.width = gg.w; + win->g.h = wc.height = gg.h; + } else { + wc.border_width = 0; + win->g.w = wc.width = gg.w + 2; + win->g.h = wc.height = gg.h + 2; + } mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth; XConfigureWindow(display, win->id, mask, &wc); configreq_win(win); @@ -2298,8 +2400,27 @@ floating_toggle(struct swm_region *r, union arg *args) if (win == NULL) return; - win->floating = !win->floating; - win->manual = 0; + /* reject floating toggles in max stack mode */ + if (r->ws->cur_layout == &layouts[SWM_MAX_STACK]) + return; + + if (win->floating) { + if (!win->floatmaxed) { + /* retain position for refloat */ + store_float_geom(win, r); + } + win->floating = 0; + } else { + if (win->g_floatvalid) { + /* refloat at last floating relative position */ + win->g.x = win->g_float.x - win->rg_float.x + r->g.x; + win->g.y = win->g_float.y - win->rg_float.y + r->g.y; + win->g.w = win->g_float.w; + win->g.h = win->g_float.h; + } + win->floating = 1; + } + stack(); a.id = SWM_ARG_ID_FOCUSCUR; focus(win->ws->r, &a); @@ -2337,6 +2458,9 @@ resize(struct ws_win *win, union arg *args) XEvent ev; Time time = 0; struct swm_region *r = win->ws->r; + int relx, rely; + union arg a; + DNPRINTF(SWM_D_MOUSE, "resize: win %lu floating %d trans %lu\n", win->id, win->floating, win->transient); @@ -2344,10 +2468,32 @@ resize(struct ws_win *win, union arg *args) if (!(win->transient != 0 || win->floating != 0)) return; + /* reject resizes in max mode for floaters (transient ok) */ + if (win->floatmaxed) + return; + + win->manual = 1; + /* raise the window = move to last in window list */ + a.id = SWM_ARG_ID_MOVELAST; + swapwin(r, &a); + stack(); + 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); + + /* place pointer at bottom left corner or nearest point inside r */ + if ( win->g.x + win->g.w < r->g.x + r->g.w - 1) + relx = win->g.w; + else + relx = r->g.x + r->g.w - win->g.x - 2; + + if ( win->g.y + win->g.h < r->g.y + r->g.h - 1) + rely = win->g.h; + else + rely = r->g.y + r->g.h - win->g.y - 2; + + XWarpPointer(display, None, win->id, 0, 0, 0, 0, relx, rely); do { XMaskEvent(display, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev); @@ -2359,11 +2505,10 @@ resize(struct ws_win *win, union arg *args) break; case MotionNotify: /* do not allow resize outside of region */ - if (ev.xmotion.y_root < r->g.y || - ev.xmotion.y_root >= r->g.y + r->g.h - 1) - continue; - if (ev.xmotion.x_root < r->g.x || - ev.xmotion.x_root >= r->g.x + r->g.w - 1) + if ( ev.xmotion.x_root < r->g.x || + ev.xmotion.x_root > r->g.x + r->g.w - 1 || + ev.xmotion.y_root < r->g.y || + ev.xmotion.y_root > r->g.y + r->g.h - 1) continue; if (ev.xmotion.x <= 1) @@ -2386,6 +2531,8 @@ resize(struct ws_win *win, union arg *args) XSync(display, False); resize_window(win, args->id); } + store_float_geom(win,r); + XWarpPointer(display, None, win->id, 0, 0, 0, 0, win->g.w - 1, win->g.h - 1); XUngrabPointer(display, CurrentTime); @@ -2419,22 +2566,30 @@ move(struct ws_win *win, union arg *args) { XEvent ev; Time time = 0; - int restack = 0; struct swm_region *r = win->ws->r; + union arg a; DNPRINTF(SWM_D_MOUSE, "move: win %lu floating %d trans %lu\n", win->id, win->floating, win->transient); - if (win->floating == 0) { + /* in max_stack mode should only move transients */ + if (win->ws->cur_layout == &layouts[SWM_MAX_STACK] && !win->transient) + return; + + win->manual = 1; + if (win->floating == 0 && !win->transient) { win->floating = 1; - win->manual = 1; - restack = 1; } + /* raise the window = move to last in window list */ + a.id = SWM_ARG_ID_MOVELAST; + swapwin(r, &a); + stack(); + 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); + XWarpPointer(display, None, win->id, 0, 0, 0, 0, -1, -1); do { XMaskEvent(display, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev); @@ -2445,12 +2600,11 @@ move(struct ws_win *win, union arg *args) handler[ev.type](&ev); break; case MotionNotify: - /* don't allow to move window out of region */ - if (ev.xmotion.y_root < r->g.y || - ev.xmotion.y_root + win->g.h >= r->g.y + r->g.h - 1) - continue; - if (ev.xmotion.x_root < r->g.x || - ev.xmotion.x_root + win->g.w >= r->g.x + r->g.w - 1) + /* don't allow to move window origin out of region */ + if ( ev.xmotion.x_root < r->g.x || + ev.xmotion.x_root > r->g.x + r->g.w - 1 || + ev.xmotion.y_root < r->g.y || + ev.xmotion.y_root > r->g.y + r->g.h - 1) continue; win->g.x = ev.xmotion.x_root; @@ -2469,15 +2623,73 @@ move(struct ws_win *win, union arg *args) XSync(display, False); move_window(win); } + store_float_geom(win,r); XWarpPointer(display, None, win->id, 0, 0, 0, 0, 0, 0); XUngrabPointer(display, CurrentTime); - if (restack) - stack(); /* drain events */ while (XCheckMaskEvent(display, EnterWindowMask, &ev)); } +/* user/key callable function IDs */ +enum keyfuncid { + kf_cycle_layout, + kf_stack_reset, + kf_master_shrink, + kf_master_grow, + kf_master_add, + kf_master_del, + kf_stack_inc, + kf_stack_dec, + kf_swap_main, + kf_focus_next, + kf_focus_prev, + kf_swap_next, + kf_swap_prev, + kf_spawn_term, + kf_spawn_menu, + kf_quit, + kf_restart, + kf_focus_main, + kf_ws_1, + kf_ws_2, + kf_ws_3, + kf_ws_4, + kf_ws_5, + kf_ws_6, + kf_ws_7, + kf_ws_8, + kf_ws_9, + kf_ws_10, + kf_ws_next, + kf_ws_prev, + kf_ws_prior, + kf_screen_next, + kf_screen_prev, + kf_mvws_1, + kf_mvws_2, + kf_mvws_3, + kf_mvws_4, + kf_mvws_5, + kf_mvws_6, + kf_mvws_7, + kf_mvws_8, + kf_mvws_9, + kf_mvws_10, + kf_bar_toggle, + kf_wind_kill, + kf_wind_del, + kf_screenshot_all, + kf_screenshot_wind, + kf_float_toggle, + kf_version, + kf_spawn_lock, + kf_spawn_initscr, + kf_spawn_custom, + kf_dumpwins, + kf_invalid +}; + /* key definitions */ void dummykeyfunc(struct swm_region *r, union arg *args) @@ -2525,6 +2737,7 @@ struct keyfunc { { "ws_10", switchws, {.id = 9} }, { "ws_next", cyclews, {.id = SWM_ARG_ID_CYCLEWS_UP} }, { "ws_prev", cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN} }, + { "ws_prior", priorws, {0} }, { "screen_next", cyclescr, {.id = SWM_ARG_ID_CYCLESC_UP} }, { "screen_prev", cyclescr, {.id = SWM_ARG_ID_CYCLESC_DOWN} }, { "mvws_1", send_to_ws, {.id = 0} }, @@ -3047,6 +3260,7 @@ setup_keys(void) setkeybinding(MODKEY, XK_0, kf_ws_10, NULL); setkeybinding(MODKEY, XK_Right, kf_ws_next, NULL); setkeybinding(MODKEY, XK_Left, kf_ws_prev, NULL); + setkeybinding(MODKEY, XK_a, kf_ws_prior, NULL); setkeybinding(MODKEY|ShiftMask, XK_Right, kf_screen_next, NULL); setkeybinding(MODKEY|ShiftMask, XK_Left, kf_screen_prev, NULL); setkeybinding(MODKEY|ShiftMask, XK_1, kf_mvws_1, NULL); @@ -3284,8 +3498,7 @@ void setup_quirks(void) { setquirk("MPlayer", "xv", SWM_Q_FLOAT | SWM_Q_FULLSCREEN); - setquirk("OpenOffice.org 2.4", "VCLSalFrame", SWM_Q_FLOAT); - setquirk("OpenOffice.org 3.0", "VCLSalFrame", SWM_Q_FLOAT); + setquirk("OpenOffice.org 3.2", "VCLSalFrame", SWM_Q_FLOAT); setquirk("Firefox-bin", "firefox-bin", SWM_Q_TRANSSZ); setquirk("Firefox", "Dialog", SWM_Q_FLOAT); setquirk("Gimp", "gimp", SWM_Q_FLOAT | SWM_Q_ANYWHERE); @@ -3302,10 +3515,12 @@ setup_quirks(void) #define SWM_CONF_FILE "scrotwm.conf" enum { SWM_S_BAR_DELAY, SWM_S_BAR_ENABLED, SWM_S_STACK_ENABLED, - SWM_S_CLOCK_ENABLED, SWM_S_CYCLE_EMPTY, SWM_S_CYCLE_VISIBLE, - SWM_S_SS_ENABLED, SWM_S_TERM_WIDTH, SWM_S_TITLE_CLASS_ENABLED, - SWM_S_TITLE_NAME_ENABLED, SWM_S_BAR_FONT, SWM_S_BAR_ACTION, - SWM_S_SPAWN_TERM, SWM_S_SS_APP, SWM_S_DIALOG_RATIO }; + SWM_S_CLOCK_ENABLED, SWM_S_CLOCK_FORMAT, SWM_S_CYCLE_EMPTY, + SWM_S_CYCLE_VISIBLE, SWM_S_SS_ENABLED, SWM_S_TERM_WIDTH, + SWM_S_TITLE_CLASS_ENABLED, SWM_S_TITLE_NAME_ENABLED, + SWM_S_FOCUS_MODE, SWM_S_DISABLE_BORDER, SWM_S_BAR_FONT, + SWM_S_BAR_ACTION, SWM_S_SPAWN_TERM, SWM_S_SS_APP, SWM_S_DIALOG_RATIO + }; int setconfvalue(char *selector, char *value, int flags) @@ -3323,6 +3538,13 @@ setconfvalue(char *selector, char *value, int flags) case SWM_S_CLOCK_ENABLED: clock_enabled = atoi(value); break; + case SWM_S_CLOCK_FORMAT: +#ifndef SWM_DENY_CLOCK_FORMAT + free(clock_format); + if ((clock_format = strdup(value)) == NULL) + err(1, "setconfvalue: clock_format"); +#endif + break; case SWM_S_CYCLE_EMPTY: cycle_empty = atoi(value); break; @@ -3341,6 +3563,19 @@ setconfvalue(char *selector, char *value, int flags) case SWM_S_TITLE_NAME_ENABLED: title_name_enabled = atoi(value); break; + case SWM_S_FOCUS_MODE: + if (!strcmp(value, "default")) + focus_mode = SWM_FOCUS_DEFAULT; + else if (!strcmp(value, "follow_cursor")) + focus_mode = SWM_FOCUS_FOLLOW; + else if (!strcmp(value, "synergy")) + focus_mode = SWM_FOCUS_SYNERGY; + else + err(1, "focus_mode"); + break; + case SWM_S_DISABLE_BORDER: + disable_border = atoi(value); + break; case SWM_S_BAR_FONT: free(bar_fonts[0]); if ((bar_fonts[0] = strdup(value)) == NULL) @@ -3416,6 +3651,7 @@ struct config_option configopt[] = { { "bind", setconfbinding, 0 }, { "stack_enabled", setconfvalue, SWM_S_STACK_ENABLED }, { "clock_enabled", setconfvalue, SWM_S_CLOCK_ENABLED }, + { "clock_format", setconfvalue, SWM_S_CLOCK_FORMAT }, { "color_focus", setconfcolor, SWM_S_COLOR_FOCUS }, { "color_unfocus", setconfcolor, SWM_S_COLOR_UNFOCUS }, { "cycle_empty", setconfvalue, SWM_S_CYCLE_EMPTY }, @@ -3430,7 +3666,9 @@ struct config_option configopt[] = { { "screenshot_app", setconfvalue, SWM_S_SS_APP }, { "term_width", setconfvalue, SWM_S_TERM_WIDTH }, { "title_class_enabled", setconfvalue, SWM_S_TITLE_CLASS_ENABLED }, - { "title_name_enabled", setconfvalue, SWM_S_TITLE_NAME_ENABLED } + { "title_name_enabled", setconfvalue, SWM_S_TITLE_NAME_ENABLED }, + { "focus_mode", setconfvalue, SWM_S_FOCUS_MODE }, + { "disable_border", setconfvalue, SWM_S_DISABLE_BORDER }, }; @@ -3639,6 +3877,8 @@ manage_window(Window id) win->g.h = win->wa.height; win->g.x = win->wa.x; win->g.y = win->wa.y; + win->g_floatvalid = 0; + win->floatmaxed = 0; /* Set window properties so we can remember this after reincarnation */ if (ws_idx_atom && prop == NULL && @@ -3761,7 +4001,10 @@ unmanage_window(struct ws_win *win) parent->child_trans = NULL; } - focus_prev(win); + /* work around for mplayer going full screen */ + if (!win->floating) + focus_prev(win); + TAILQ_REMOVE(&win->ws->winlist, win, entry); TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry); @@ -3926,6 +4169,9 @@ destroynotify(XEvent *e) return; } + /* make sure we focus on something */ + win->floating = 0; + unmanage_window(win); stack(); free_window(win); @@ -3937,10 +4183,28 @@ enternotify(XEvent *e) XCrossingEvent *ev = &e->xcrossing; XEvent cne; struct ws_win *win; - - DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu mode %d detail %d\n", - ev->window, ev->mode, ev->detail); - +#if 0 + struct ws_win *w; + Window focus_return; + int revert_to_return; +#endif + DNPRINTF(SWM_D_FOCUS, "enternotify: window: %lu mode %d detail %d root " + "%lu subwindow %lu same_screen %d focus %d state %d\n", + ev->window, ev->mode, ev->detail, ev->root, ev->subwindow, + ev->same_screen, ev->focus, ev->state); + + switch (focus_mode) { + case SWM_FOCUS_DEFAULT: + if (QLength(display)) { + DNPRINTF(SWM_D_EVENT, "ignore enternotify %d\n", + QLength(display)); + return; + } + break; + case SWM_FOCUS_FOLLOW: + break; + case SWM_FOCUS_SYNERGY: +#if 0 /* * all these checks need to be in this order because the * XCheckTypedWindowEvent relies on weeding out the previous events @@ -3950,39 +4214,130 @@ enternotify(XEvent *e) */ /* + * state is set when we are switching workspaces and focus is set when + * the window or a subwindow already has focus (occurs during restart). + * + * Only honor the focus flag if last_focus_event is not FocusOut, + * this allows scrotwm to continue to control focus when another + * program is also playing with it. + */ + if (ev->state || (ev->focus && last_focus_event != FocusOut)) { + DNPRINTF(SWM_D_EVENT, "ignoring enternotify: focus\n"); + return; + } + + /* * happens when a window is created or destroyed and the border * crosses the mouse pointer and when switching ws + * + * we need the subwindow test to see if we came from root in order + * to give focus to floaters */ - if (ev->mode == NotifyNormal && ev->detail == NotifyVirtual) + if (ev->mode == NotifyNormal && ev->detail == NotifyVirtual && + ev->subwindow == 0) { + DNPRINTF(SWM_D_EVENT, "ignoring enternotify: NotifyVirtual\n"); return; + } /* this window already has focus */ - if (ev->mode == NotifyNormal && ev->detail == NotifyInferior) + if (ev->mode == NotifyNormal && ev->detail == NotifyInferior) { + DNPRINTF(SWM_D_EVENT, "ignoring enternotify: win has focus\n"); return; + } /* this window is being deleted or moved to another ws */ if (XCheckTypedWindowEvent(display, ev->window, ConfigureNotify, &cne) == True) { + DNPRINTF(SWM_D_EVENT, "ignoring enternotify: configurenotify\n"); XPutBackEvent(display, &cne); return; } - if ((win = find_window(ev->window)) == NULL) + if ((win = find_window(ev->window)) == NULL) { + DNPRINTF(SWM_D_EVENT, "ignoring enternotify: win == NULL\n"); + return; + } + + /* + * In fullstack kill all enters unless they come from a different ws + * (i.e. another region) or focus has been grabbed externally. + */ + if (win->ws->cur_layout->flags & SWM_L_FOCUSPREV && + last_focus_event != FocusOut) { + XGetInputFocus(display, &focus_return, &revert_to_return); + if ((w = find_window(focus_return)) == NULL || + w->ws == win->ws) { + DNPRINTF(SWM_D_EVENT, "ignoring event: fullstack\n"); + return; + } + } +#endif + break; + } + + if ((win = find_window(ev->window)) == NULL) { + DNPRINTF(SWM_D_EVENT, "ignoring enternotify: win == NULL\n"); return; + } + + /* + * if we have more enternotifies let them handle it in due time + */ + if (XCheckTypedEvent(display, EnterNotify, &cne) == True) { + DNPRINTF(SWM_D_EVENT, + "ignoring enternotify: got more enternotify\n"); + XPutBackEvent(display, &cne); + return; + } focus_magic(win, SWM_F_TRANSIENT); } -void -focusin(XEvent *e) -{ - DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", e->xfocus.window); -} +/* lets us use one switch statement for arbitrary mode/detail combinations */ +#define MERGE_MEMBERS(a,b) (((a & 0xffff) << 16) | (b & 0xffff)) void -focusout(XEvent *e) +focusevent(XEvent *e) { - DNPRINTF(SWM_D_EVENT, "focusout: window: %lu\n", e->xfocus.window); +#if 0 + struct ws_win *win; + u_int32_t mode_detail; + XFocusChangeEvent *ev = &e->xfocus; + + DNPRINTF(SWM_D_EVENT, "focusevent: %s window: %lu mode %d detail %d\n", + ev->type == FocusIn ? "entering" : "leaving", + ev->window, ev->mode, ev->detail); + + if (last_focus_event == ev->type) { + DNPRINTF(SWM_D_FOCUS, "ignoring focusevent: bad ordering\n"); + return; + } + + last_focus_event = ev->type; + mode_detail = MERGE_MEMBERS(ev->mode, ev->detail); + + switch (mode_detail) { + /* synergy client focus operations */ + case MERGE_MEMBERS(NotifyNormal, NotifyNonlinear): + case MERGE_MEMBERS(NotifyNormal, NotifyNonlinearVirtual): + + /* synergy server focus operations */ + case MERGE_MEMBERS(NotifyWhileGrabbed, NotifyNonlinear): + + /* Entering applications like rdesktop that mangle the pointer */ + case MERGE_MEMBERS(NotifyNormal, NotifyPointer): + + if ((win = find_window(e->xfocus.window)) != NULL && win->ws->r) + XSetWindowBorder(display, win->id, + win->ws->r->s->c[ev->type == FocusIn ? + SWM_S_COLOR_FOCUS : SWM_S_COLOR_UNFOCUS].color); + break; + default: + fprintf(stderr, "ignoring focusevent\n"); + DNPRINTF(SWM_D_FOCUS, "ignoring focusevent\n"); + break; + } +#endif } void @@ -4083,13 +4438,6 @@ unmapnotify(XEvent *e) if (win == NULL) return; - /* - * XXX this is a work around for going fullscreen on mplayer - * remove this and find a better heuristic - */ - if (win->floating) - return; - if (getstate(e->xunmap.window) == NormalState) { unmanage_window(win); stack(); @@ -4162,6 +4510,9 @@ new_region(struct swm_screen *s, int x, int y, int w, int h) (X(r) + WIDTH(r)) > x && Y(r) < (y + h) && (Y(r) + HEIGHT(r)) > y) { + if (r->ws->r != NULL) + r->ws->old_r = r->ws->r; + r->ws->r = NULL; XDestroyWindow(display, r->bar_window); TAILQ_REMOVE(&s->rl, r, entry); TAILQ_INSERT_TAIL(&s->orl, r, entry); @@ -4208,6 +4559,7 @@ new_region(struct swm_screen *s, int x, int y, int w, int h) HEIGHT(r) = h; r->s = s; r->ws = ws; + r->ws_prior = NULL; ws->r = r; TAILQ_INSERT_TAIL(&s->rl, r, entry); } @@ -4340,6 +4692,10 @@ setup_screens(void) setscreencolor("black", i + 1, SWM_S_COLOR_BAR); setscreencolor("rgb:a0/a0/a0", i + 1, SWM_S_COLOR_BAR_FONT); + /* set default cursor */ + XDefineCursor(display, screens[i].root, + XCreateFontCursor(display, XC_left_ptr)); + /* init all workspaces */ /* XXX these should be dynamically allocated too */ for (j = 0; j < SWM_WS_MAX; j++) { @@ -4413,6 +4769,8 @@ setup_globals(void) err(1, "setup_globals: strdup"); if ((spawn_term[0] = strdup("xterm")) == NULL) err(1, "setup_globals: strdup"); + if ((clock_format = strdup("%a %b %d %R %Z %Y")) == NULL) + errx(1, "strdup"); } void @@ -4509,6 +4867,8 @@ main(int argc, char *argv[]) /* set some values to work around bad programs */ workaround(); + unfocus_all(); + grabkeys(); stack(); @@ -4567,6 +4927,8 @@ main(int argc, char *argv[]) if (select(xfd + 1, &rd, NULL, NULL, &tv) == -1) if (errno != EINTR) DNPRINTF(SWM_D_MISC, "select failed"); + if (restart_wm == 1) + restart(NULL, NULL); if (running == 0) goto done; if (bar_alarm) { @@ -4576,7 +4938,7 @@ main(int argc, char *argv[]) } done: bar_extra_stop(); - + XFreeGC(display, bar_gc); XCloseDisplay(display); return (0);