X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=67ad17a4f6f3a201fd3209f58f8950c797484661;hb=28609b91d0e28949174112d517ce6ce26f1cd656;hp=34ea9096b9f4e6a9a561edff94127b0982d43fd8;hpb=8230a09707adc3dd91b5929e975f4064aafae460;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index 34ea909..67ad17a 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -52,7 +52,7 @@ static const char *cvstag = "$scrotwm$"; -#define SWM_VERSION "0.9.12" +#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 @@ -148,6 +152,11 @@ u_int32_t swm_debug = 0 #define WIDTH(r) (r)->g.w #define HEIGHT(r) (r)->g.h #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" @@ -159,13 +168,14 @@ 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; int xrandr_support; int xrandr_eventbase; -int ignore_enter = 0; unsigned int numlockmask = 0; Display *display; @@ -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,63 +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_invalid -}; - /* layout handlers */ void stack(void); void vertical_config(struct workspace *, int); @@ -318,9 +279,12 @@ void horizontal_config(struct workspace *, int); void horizontal_stack(struct workspace *, struct swm_geometry *); void max_stack(struct workspace *, struct swm_geometry *); +struct ws_win *find_window(Window); + void grabbuttons(struct ws_win *, int); void new_region(struct swm_screen *, int, int, int, int); void unmanage_window(struct ws_win *); +long getstate(Window); struct layout { void (*l_stack)(struct workspace *, struct swm_geometry *); @@ -334,10 +298,13 @@ struct layout { { vertical_stack, vertical_config, 0, "[|]" }, { horizontal_stack, horizontal_config, 0, "[-]" }, { max_stack, NULL, - SWM_L_FOCUSPREV | SWM_L_MAPONFOCUS, "[ ]"}, - { NULL, NULL, 0}, + SWM_L_MAPONFOCUS | SWM_L_FOCUSPREV, "[ ]"}, + { 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) @@ -350,6 +317,7 @@ struct workspace { struct swm_region *r; /* may be NULL */ struct swm_region *old_r; /* may be NULL */ struct ws_win_list winlist; /* list of windows in ws */ + struct ws_win_list unmanagedlist; /* list of dead windows in ws */ /* stacker state */ struct { @@ -366,9 +334,9 @@ enum { SWM_S_COLOR_BAR, SWM_S_COLOR_BAR_BORDER, SWM_S_COLOR_BAR_FONT, SWM_S_COLOR_FOCUS, SWM_S_COLOR_UNFOCUS, SWM_S_COLOR_MAX }; /* physical screen mapping */ -#define SWM_WS_MAX (10) /* XXX Too small? */ +#define SWM_WS_MAX (10) struct swm_screen { - int idx; /* screen index */ + 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; @@ -389,30 +357,36 @@ union arg { #define SWM_ARG_ID_FOCUSNEXT (0) #define SWM_ARG_ID_FOCUSPREV (1) #define SWM_ARG_ID_FOCUSMAIN (2) -#define SWM_ARG_ID_SWAPNEXT (3) -#define SWM_ARG_ID_SWAPPREV (4) -#define SWM_ARG_ID_SWAPMAIN (5) -#define SWM_ARG_ID_MASTERSHRINK (6) -#define SWM_ARG_ID_MASTERGROW (7) -#define SWM_ARG_ID_MASTERADD (8) -#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) -#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) -#define SWM_ARG_ID_KILLWINDOW (0) -#define SWM_ARG_ID_DELETEWINDOW (1) +#define SWM_ARG_ID_FOCUSCUR (4) +#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) +#define SWM_ARG_ID_MASTERDEL (23) +#define SWM_ARG_ID_STACKRESET (30) +#define SWM_ARG_ID_STACKINIT (31) +#define SWM_ARG_ID_CYCLEWS_UP (40) +#define SWM_ARG_ID_CYCLEWS_DOWN (41) +#define SWM_ARG_ID_CYCLESC_UP (42) +#define SWM_ARG_ID_CYCLESC_DOWN (43) +#define SWM_ARG_ID_STACKINC (50) +#define SWM_ARG_ID_STACKDEC (51) +#define SWM_ARG_ID_SS_ALL (60) +#define SWM_ARG_ID_SS_WINDOW (61) +#define SWM_ARG_ID_DONTCENTER (70) +#define SWM_ARG_ID_CENTER (71) +#define SWM_ARG_ID_KILLWINDOW (80) +#define SWM_ARG_ID_DELETEWINDOW (81) char **argv; }; +void focus(struct swm_region *, union arg *); +void focus_magic(struct ws_win *, int); +#define SWM_F_GENERIC (0) +#define SWM_F_TRANSIENT (1) /* quirks */ struct quirk { char *class; @@ -545,8 +519,48 @@ dumpevent(XEvent *e) "remaining\n", e->xany.window, e->type, QLength(display)); } + +void +dumpwins(struct swm_region *r, union arg *args) +{ + struct ws_win *win; + unsigned int state; + XWindowAttributes wa; + + if (r->ws == NULL) { + fprintf(stderr, "invalid workspace\n"); + return; + } + + fprintf(stderr, "=== managed window list ws %02d ===\n", r->ws->idx); + + TAILQ_FOREACH(win, &r->ws->winlist, entry) { + state = getstate(win->id); + if (!XGetWindowAttributes(display, win->id, &wa)) + fprintf(stderr, "window: %lu failed " + "XGetWindowAttributes\n", win->id); + fprintf(stderr, "window: %lu map_state: %d state: %d\n", + win->id, wa.map_state, state); + } + + fprintf(stderr, "===== unmanaged window list =====\n"); + TAILQ_FOREACH(win, &r->ws->unmanagedlist, entry) { + state = getstate(win->id); + if (!XGetWindowAttributes(display, win->id, &wa)) + fprintf(stderr, "window: %lu failed " + "XGetWindowAttributes\n", win->id); + fprintf(stderr, "window: %lu map_state: %d state: %d\n", + win->id, wa.map_state, state); + } + + fprintf(stderr, "=================================\n"); +} #else #define dumpevent(e) +void +dumpwins(struct swm_region *r, union arg *args) +{ +} #endif /* SWM_DEBUG */ void expose(XEvent *); @@ -556,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 *); @@ -573,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, @@ -596,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; @@ -763,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 = ""; @@ -789,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); } @@ -925,18 +943,11 @@ void set_win_state(struct ws_win *win, long state) { long data[] = {state, None}; - XWindowAttributes wa; DNPRINTF(SWM_D_EVENT, "set_win_state: window: %lu\n", win->id); if (win == NULL) return; - /* make sure we drain everything */ - XSync(display, True); - - /* make sure we still exist too */ - if (XGetWindowAttributes(display, win->id, &wa) == BadWindow) - return; XChangeProperty(display, win->id, astate, astate, 32, PropModeReplace, (unsigned char *)data, 2); @@ -1066,24 +1077,19 @@ quit(struct swm_region *r, union arg *args) void unmap_window(struct ws_win *win) { - XWindowAttributes wa; - if (win == NULL) return; - /* make sure we still exist too */ - if (XGetWindowAttributes(display, win->id, &wa) == BadWindow) - return; - /* don't unmap again */ - if (wa.map_state == IsUnmapped && getstate(win->id) == IconicState) + if (getstate(win->id) == IconicState) return; - /* java shits itself when windows are set to iconic state */ - if (win->java == 0) - set_win_state(win, IconicState); + 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 @@ -1177,16 +1183,50 @@ root_to_region(Window root) } struct ws_win * -find_window(Window id) +find_unmanaged_window(Window id) { struct ws_win *win; int i, j; for (i = 0; i < ScreenCount(display); i++) for (j = 0; j < SWM_WS_MAX; j++) + TAILQ_FOREACH(win, &screens[i].ws[j].unmanagedlist, + entry) + if (id == win->id) + return (win); + return (NULL); +} + +struct ws_win * +find_window(Window id) +{ + struct ws_win *win; + 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); } @@ -1240,23 +1280,111 @@ spawnterm(struct swm_region *r, union arg *args) } void +kill_refs(struct ws_win *win) +{ + int i, x; + struct swm_region *r; + struct workspace *ws; + + if (win == NULL) + return; + + for (i = 0; i < ScreenCount(display); i++) + TAILQ_FOREACH(r, &screens[i].rl, entry) + for (x = 0; x < SWM_WS_MAX; x++) { + ws = &r->s->ws[x]; + if (win == ws->focus) + ws->focus = NULL; + if (win == ws->focus_prev) + ws->focus_prev = NULL; + } +} + +int +validate_win(struct ws_win *testwin) +{ + struct ws_win *win; + struct workspace *ws; + struct swm_region *r; + int i, x, foundit = 0; + + if (testwin == NULL) + return(0); + + for (i = 0, foundit = 0; i < ScreenCount(display); i++) + TAILQ_FOREACH(r, &screens[i].rl, entry) + for (x = 0; x < SWM_WS_MAX; x++) { + ws = &r->s->ws[x]; + TAILQ_FOREACH(win, &ws->winlist, entry) + if (win == testwin) + return (0); + } + return (1); +} + +int +validate_ws(struct workspace *testws) +{ + struct swm_region *r; + struct workspace *ws; + int foundit, i, x; + + /* validate all ws */ + for (i = 0, foundit = 0; i < ScreenCount(display); i++) + TAILQ_FOREACH(r, &screens[i].rl, entry) + for (x = 0; x < SWM_WS_MAX; x++) { + ws = &r->s->ws[x]; + if (ws == testws) + return (0); + } + return (1); +} + +void unfocus_win(struct ws_win *win) { + XEvent cne; + + DNPRINTF(SWM_D_FOCUS, "unfocus_win: id: %lu\n", WINID(win)); + if (win == NULL) return; if (win->ws == NULL) return; + + if (validate_ws(win->ws)) + abort(); + if (win->ws->r == NULL) return; + if (validate_win(win)) { + kill_refs(win); + return; + } + if (win->ws->focus == win) { win->ws->focus = NULL; win->ws->focus_prev = win; } + if (validate_win(win->ws->focus)) { + kill_refs(win->ws->focus); + win->ws->focus = NULL; + } + if (validate_win(win->ws->focus_prev)) { + kill_refs(win->ws->focus_prev); + 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 @@ -1265,7 +1393,7 @@ unfocus_all(void) struct ws_win *win; int i, j; - DNPRINTF(SWM_D_FOCUS, "unfocus_all:\n"); + DNPRINTF(SWM_D_FOCUS, "unfocus_all\n"); for (i = 0; i < ScreenCount(display); i++) for (j = 0; j < SWM_WS_MAX; j++) @@ -1276,6 +1404,12 @@ unfocus_all(void) void focus_win(struct ws_win *win) { + 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); if (win == NULL) @@ -1283,38 +1417,51 @@ focus_win(struct ws_win *win) if (win->ws == NULL) return; - /* use big hammer to make sure it works under all use cases */ - unfocus_all(); + if (validate_ws(win->ws)) + abort(); + if (validate_win(win)) { + kill_refs(win); + return; + } + + 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) { + /* 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); - grabbuttons(win, 1); if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS) XMapRaised(display, win->id); - if (win->java == 0) - XSetInputFocus(display, win->id, - RevertToPointerRoot, CurrentTime); } } 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, *winfocus = NULL, *parent = NULL; + struct ws_win *win; struct workspace *new_ws, *old_ws; + union arg a; - if (!(r && r->s)) { - fprintf(stderr, "r && r->s failed\n"); - abort(); - } - if (wsid < 0 || wsid > SWM_WS_MAX) { - fprintf(stderr, "illegal wsid\n"); - abort(); - } + if (!(r && r->s)) + return; this_r = r; old_ws = this_r->ws; @@ -1324,62 +1471,35 @@ switchws(struct swm_region *r, union arg *args) "%d -> %d\n", r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r), old_ws->idx, wsid); - if (new_ws == NULL || old_ws == NULL) { - fprintf(stderr, "new_ws = %p old_ws = %p\n", new_ws, old_ws); - abort(); - } - + if (new_ws == NULL || old_ws == NULL) + return; if (new_ws == old_ws) return; - /* get focus window */ - if (new_ws->focus) - winfocus = new_ws->focus; - else if (new_ws->focus_prev) - winfocus = new_ws->focus_prev; - else - winfocus = TAILQ_FIRST(&new_ws->winlist); - 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; - - /* - * Map new windows first if they were here before - * to minimize ugly blinking. - */ - if (new_ws->old_r == this_r) - TAILQ_FOREACH(win, &new_ws->winlist, entry) - if (!(win->ws->cur_layout->flags & - SWM_L_MAPONFOCUS)) - XMapRaised(display, win->id); - - 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; - ignore_enter = 1; stack(); - if (winfocus) { - /* make sure we see the parent window */ - if (winfocus->transient) { - parent = find_window(winfocus->transient); - if (parent) - focus_win(parent); - } - - focus_win(winfocus); - } - ignore_enter = 0; + 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 @@ -1421,11 +1541,26 @@ 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; - struct workspace *ws = NULL; - struct ws_win *winfocus = NULL; + union arg a; int i, x, y; /* do nothing if we don't have more than one screen */ @@ -1450,25 +1585,20 @@ cyclescr(struct swm_region *r, union arg *args) if (rr == NULL) return; - ws = rr->ws; - winfocus = ws->focus; - if (winfocus == NULL) - winfocus = ws->focus_prev; - if (winfocus) { - /* use window coordinates */ - x = winfocus->g.x + 1; - y = winfocus->g.y + 1; - } else { - /* use region coordinates */ - x = rr->g.x + 1; - y = rr->g.y + 1 + bar_enabled ? bar_height : 0; - } - - unfocus_all(); - XSetInputFocus(display, PointerRoot, RevertToPointerRoot, CurrentTime); + /* move mouse to region */ + x = rr->g.x + 1; + y = rr->g.y + 1 + bar_enabled ? bar_height : 0; XWarpPointer(display, None, rr->s[i].root, 0, 0, 0, 0, x, y); - focus_win(winfocus); + a.id = SWM_ARG_ID_FOCUSCUR; + focus(rr, &a); + + if (rr->ws->focus) { + /* move to focus window */ + x = rr->ws->focus->g.x + 1; + y = rr->ws->focus->g.y + 1; + XWarpPointer(display, None, rr->s[i].root, 0, 0, 0, 0, x, y); + } } void @@ -1525,34 +1655,113 @@ 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; } - ignore_enter = 1; stack(); } void +focus_prev(struct ws_win *win) +{ + struct ws_win *winfocus = NULL, *winlostfocus = NULL; + struct ws_win *cur_focus = NULL; + struct ws_win_list *wl = NULL; + struct workspace *ws = NULL; + + DNPRINTF(SWM_D_FOCUS, "focus_prev: id %lu\n", WINID(win)); + + if (!(win && win->ws)) + return; + + ws = win->ws; + wl = &ws->winlist; + cur_focus = ws->focus; + winlostfocus = cur_focus; + + /* pickle, just focus on whatever */ + if (cur_focus == NULL) { + /* use prev_focus if valid */ + if (ws->focus_prev && ws->focus_prev != cur_focus && + find_window(WINID(ws->focus_prev))) + winfocus = ws->focus_prev; + if (winfocus == NULL) + winfocus = TAILQ_FIRST(wl); + goto done; + } + + /* if transient focus on parent */ + if (cur_focus->transient) { + winfocus = find_window(cur_focus->transient); + goto done; + } + + /* if in max_stack try harder */ + if (ws->cur_layout->flags & SWM_L_FOCUSPREV) { + 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 done; + } + + if (cur_focus == win) + winfocus = TAILQ_PREV(win, ws_win_list, entry); + if (winfocus == NULL) + winfocus = TAILQ_LAST(wl, ws_win_list); + if (winfocus == NULL || winfocus == win) + winfocus = TAILQ_NEXT(cur_focus, entry); +done: + if (winfocus == winlostfocus || winfocus == NULL) + return; + + focus_magic(winfocus, SWM_F_GENERIC); +} + +void focus(struct swm_region *r, union arg *args) { - struct ws_win *winfocus, *winlostfocus; - struct ws_win_list *wl; - struct ws_win *cur_focus; + struct ws_win *winfocus = NULL, *winlostfocus = NULL; + struct ws_win *cur_focus = NULL; + struct ws_win_list *wl = NULL; + struct workspace *ws = NULL; + + if (!(r && r->ws)) + return; DNPRINTF(SWM_D_FOCUS, "focus: id %d\n", args->id); - cur_focus = r->ws->focus; - if (cur_focus == NULL) + /* treat FOCUS_CUR special */ + if (args->id == SWM_ARG_ID_FOCUSCUR) { + if (r->ws->focus) + winfocus = r->ws->focus; + else if (r->ws->focus_prev) + winfocus = r->ws->focus_prev; + else + winfocus = TAILQ_FIRST(&r->ws->winlist); + + focus_magic(winfocus, SWM_F_GENERIC); return; + } - wl = &cur_focus->ws->winlist; + if ((cur_focus = r->ws->focus) == NULL) + return; + ws = r->ws; + wl = &ws->winlist; winlostfocus = cur_focus; switch (args->id) { - case SWM_ARG_ID_FOCUSPREV: + case SWM_ARG_ID_FOCUSPREV: winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry); if (winfocus == NULL) winfocus = TAILQ_LAST(wl, ws_win_list); @@ -1568,8 +1777,6 @@ focus(struct swm_region *r, union arg *args) winfocus = TAILQ_FIRST(wl); if (winfocus == cur_focus) winfocus = cur_focus->ws->focus_prev; - if (winfocus == NULL) - return; break; default: @@ -1579,14 +1786,15 @@ focus(struct swm_region *r, union arg *args) if (winfocus == winlostfocus || winfocus == NULL) return; - focus_win(winfocus); + focus_magic(winfocus, SWM_F_GENERIC); } void cycle_layout(struct swm_region *r, union arg *args) { struct workspace *ws = r->ws; - struct ws_win *winfocus, *parent = NULL; + struct ws_win *winfocus; + union arg a; DNPRINTF(SWM_D_EVENT, "cycle_layout: workspace: %d\n", ws->idx); @@ -1596,17 +1804,10 @@ cycle_layout(struct swm_region *r, union arg *args) if (ws->cur_layout->l_stack == NULL) ws->cur_layout = &layouts[0]; - ignore_enter = 1; stack(); - /* make sure we see the parent window */ - if (winfocus) { - if (winfocus->transient) - parent = find_window(winfocus->transient); - if (parent) - focus_win(parent); - focus_win(winfocus); - } - ignore_enter = 0; + a.id = SWM_ARG_ID_FOCUSCUR; + focus(r, &a); + bar_update(); } void @@ -1639,10 +1840,6 @@ stack(void) { "(screen %d, region %d)\n", r->ws->idx, i, j++); /* start with screen geometry, adjust for bar */ - if (r == NULL) { - fprintf(stderr, "illegal r\n"); - abort(); - } g = r->g; g.w -= 2; g.h -= 2; @@ -1650,19 +1847,9 @@ stack(void) { g.y += bar_height; g.h -= bar_height; } - if (r->ws == NULL) { - fprintf(stderr, "illegal ws\n"); - abort(); - } - if (r->ws->cur_layout == NULL) { - fprintf(stderr, "illegal cur_layout\n"); - abort(); - } - if (r->ws->cur_layout->l_stack == NULL) { - fprintf(stderr, "illegal l_stack\n"); - abort(); - } 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) @@ -1670,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; @@ -1680,8 +1882,28 @@ stack_floater(struct ws_win *win, struct swm_region *r) bzero(&wc, sizeof wc); mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight; - if ((win->quirks & SWM_Q_FULLSCREEN) && (win->g.w == WIDTH(r)) && - (win->g.h == HEIGHT(r))) + + /* + * 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; else wc.border_width = 1; @@ -1689,24 +1911,45 @@ 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; } + + 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; + } + + /* 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); + + wc.x = win->g.x; + wc.y = win->g.y; 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; - } - /* adjust for region */ - wc.x += r->g.x; - wc.y += r->g.y; + /* + * Retain floater and transient geometry for correct positioning + * when ws changes region + */ + store_float_geom(win, r); - DNPRINTF(SWM_D_STACK, "stack_floater: win %lu x %d y %d w %d h %d\n", + 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); XConfigureWindow(display, win->id, mask, &wc); + configreq_win(win); } /* @@ -1747,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; @@ -1873,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 || @@ -1900,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++; @@ -2007,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); } @@ -2018,7 +2270,7 @@ max_stack(struct workspace *ws, struct swm_geometry *g) { XWindowChanges wc; struct swm_geometry gg = *g; - struct ws_win *win, *wintrans = NULL; + struct ws_win *win, *wintrans = NULL, *parent = NULL; unsigned int mask; int winno; @@ -2034,18 +2286,34 @@ max_stack(struct workspace *ws, struct swm_geometry *g) TAILQ_FOREACH(win, &ws->winlist, entry) { if (win->transient) { wintrans = win; + parent = find_window(win->transient); 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); @@ -2058,8 +2326,10 @@ max_stack(struct workspace *ws, struct swm_geometry *g) /* put the last transient on top */ if (wintrans) { + if (parent) + XMapRaised(display, parent->id); stack_floater(wintrans, ws->r); - focus_win(wintrans); /* override */ + focus_magic(wintrans, SWM_F_TRANSIENT); } } @@ -2067,10 +2337,11 @@ void send_to_ws(struct swm_region *r, union arg *args) { int wsid = args->id; - struct ws_win *win = win, *winfocus = NULL; + struct ws_win *win = win; struct workspace *ws, *nws; Atom ws_idx_atom = 0; unsigned char ws_idx_str[SWM_PROPLEN]; + union arg a; if (r && r->ws) win = r->ws->focus; @@ -2078,26 +2349,16 @@ send_to_ws(struct swm_region *r, union arg *args) return; if (win == NULL) return; + if (win->ws->idx == wsid) + return; DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id); ws = win->ws; nws = &win->s->ws[wsid]; - /* find a window to focus */ - winfocus = TAILQ_PREV(win, ws_win_list, entry); - if (TAILQ_FIRST(&ws->winlist) == win) - winfocus = TAILQ_NEXT(win, entry); - else { - winfocus = TAILQ_PREV(win, ws_win_list, entry); - if (winfocus == NULL) - winfocus = TAILQ_LAST(&ws->winlist, ws_win_list); - } - /* out of windows in ws so focus on nws instead if we multi screen */ - if (winfocus == NULL) - if (ScreenCount(display) > 1 || outputs > 1) - winfocus = win; - + a.id = SWM_ARG_ID_FOCUSPREV; + focus(r, &a); unmap_window(win); TAILQ_REMOVE(&ws->winlist, win, entry); TAILQ_INSERT_TAIL(&nws->winlist, win, entry); @@ -2112,13 +2373,7 @@ send_to_ws(struct swm_region *r, union arg *args) XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8, PropModeReplace, ws_idx_str, SWM_PROPLEN); } - - if (count_win(nws, 1) == 1) - nws->focus = win; - stack(); - if (winfocus) - focus_win(winfocus); } void @@ -2140,14 +2395,35 @@ void floating_toggle(struct swm_region *r, union arg *args) { struct ws_win *win = r->ws->focus; + union arg a; 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(); - focus_win(win); + a.id = SWM_ARG_ID_FOCUSCUR; + focus(win->ws->r, &a); } void @@ -2173,7 +2449,7 @@ resize_window(struct ws_win *win, int center) win->id, wc.x, wc.y, wc.width, wc.height); XConfigureWindow(display, win->id, mask, &wc); - config_win(win); + configreq_win(win); } void @@ -2181,17 +2457,43 @@ 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 %d\n", + + DNPRINTF(SWM_D_MOUSE, "resize: win %lu floating %d trans %lu\n", win->id, win->floating, win->transient); 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); @@ -2202,6 +2504,13 @@ resize(struct ws_win *win, union arg *args) handler[ev.type](&ev); break; case MotionNotify: + /* do not allow resize outside 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; + if (ev.xmotion.x <= 1) ev.xmotion.x = 1; if (ev.xmotion.y <= 1) @@ -2222,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); @@ -2247,7 +2558,7 @@ move_window(struct ws_win *win) win->id, wc.x, wc.y, wc.width, wc.height); XConfigureWindow(display, win->id, mask, &wc); - config_win(win); + configreq_win(win); } void @@ -2255,21 +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 %d\n", + 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); @@ -2280,6 +2600,13 @@ move(struct ws_win *win, union arg *args) handler[ev.type](&ev); break; case MotionNotify: + /* 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; win->g.y = ev.xmotion.y_root; @@ -2296,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) @@ -2352,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} }, @@ -2374,6 +2760,7 @@ struct keyfunc { { "spawn_lock", legacyfunc, {0} }, { "spawn_initscr", legacyfunc, {0} }, { "spawn_custom", dummykeyfunc, {0} }, + { "dumpwins", dumpwins, {0} }, { "invalid key func", NULL, {0} }, }; struct key { @@ -2873,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); @@ -2896,6 +3284,9 @@ setup_keys(void) setkeybinding(MODKEY|ShiftMask, XK_v, kf_version, NULL); setkeybinding(MODKEY|ShiftMask, XK_Delete, kf_spawn_custom, "lock"); setkeybinding(MODKEY|ShiftMask, XK_i, kf_spawn_custom, "initscr"); +#ifdef SWM_DEBUG + setkeybinding(MODKEY|ShiftMask, XK_d, kf_dumpwins, NULL); +#endif } void @@ -3107,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); @@ -3125,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) @@ -3146,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; @@ -3164,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) @@ -3239,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 }, @@ -3253,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 }, }; @@ -3353,12 +3768,22 @@ conf_load(char *filename) return (0); } +void +set_child_transient(struct ws_win *win) +{ + struct ws_win *parent; + + parent = find_window(win->transient); + if (parent) + parent->child_trans = win; +} + struct ws_win * manage_window(Window id) { Window trans = 0; struct workspace *ws; - struct ws_win *win, *ww, *parent; + struct ws_win *win, *ww; int format, i, ws_idx, n, border_me = 0; unsigned long nitems, bytes; Atom ws_idx_atom = 0, type; @@ -3370,7 +3795,18 @@ manage_window(Window id) XWindowChanges wc; if ((win = find_window(id)) != NULL) - return (win); /* already being managed */ + return (win); /* already being managed */ + + /* see if we are on the unmanaged list */ + if ((win = find_unmanaged_window(id)) != NULL) { + DNPRINTF(SWM_D_MISC, "manage previously unmanaged window " + "%lu\n", win->id); + TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry); + TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry); + if (win->transient) + set_child_transient(win); + return (win); + } if ((win = calloc(1, sizeof(struct ws_win))) == NULL) errx(1, "calloc: failed to allocate memory for new window"); @@ -3385,11 +3821,9 @@ manage_window(Window id) XGetTransientForHint(display, id, &trans); if (trans) { win->transient = trans; - parent = find_window(win->transient); - if (parent) - parent->child_trans = win; - DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n", - (unsigned)win->id, win->transient); + set_child_transient(win); + DNPRINTF(SWM_D_MISC, "manage_window: win %lu transient %lu\n", + win->id, win->transient); } /* get supported protocols */ if (XGetWMProtocols(display, id, &prot, &n)) { @@ -3443,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 && @@ -3459,16 +3895,20 @@ manage_window(Window id) win->ch.res_class, win->ch.res_name); /* java is retarded so treat it special */ - if (strstr(win->ch.res_name, "sun-awt")) + if (strstr(win->ch.res_name, "sun-awt")) { win->java = 1; + border_me = 1; + } for (i = 0; i < quirks_length; i++){ if (!strcmp(win->ch.res_class, quirks[i].class) && !strcmp(win->ch.res_name, quirks[i].name)) { DNPRINTF(SWM_D_CLASS, "found: %s name: %s\n", win->ch.res_class, win->ch.res_name); - if (quirks[i].quirk & SWM_Q_FLOAT) + if (quirks[i].quirk & SWM_Q_FLOAT) { win->floating = 1; + border_me = 1; + } win->quirks = quirks[i].quirk; } } @@ -3520,9 +3960,34 @@ manage_window(Window id) } void +free_window(struct ws_win *win) +{ + DNPRINTF(SWM_D_MISC, "free_window: %lu\n", win->id); + + if (win == NULL) + return; + + /* needed for restart wm */ + set_win_state(win, WithdrawnState); + + TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry); + + if (win->ch.res_class) + XFree(win->ch.res_class); + if (win->ch.res_name) + XFree(win->ch.res_name); + + kill_refs(win); + + /* paint memory */ + memset(win, 0xff, sizeof *win); /* XXX kill later */ + + free(win); +} + +void unmanage_window(struct ws_win *win) { - struct workspace *ws; struct ws_win *parent; if (win == NULL) @@ -3530,28 +3995,31 @@ unmanage_window(struct ws_win *win) DNPRINTF(SWM_D_MISC, "unmanage_window: %lu\n", win->id); - /* needed for restart wm */ - set_win_state(win, WithdrawnState); - if (win->transient) { parent = find_window(win->transient); if (parent) parent->child_trans = NULL; } - ws = win->ws; + /* work around for mplayer going full screen */ + if (!win->floating) + focus_prev(win); + TAILQ_REMOVE(&win->ws->winlist, win, entry); - if (win->ch.res_class) - XFree(win->ch.res_class); - if (win->ch.res_name) - XFree(win->ch.res_name); - free(win); + TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry); + + kill_refs(win); } void -focus_magic(struct ws_win *win) +focus_magic(struct ws_win *win, int do_trans) { - if (win->child_trans) { + DNPRINTF(SWM_D_FOCUS, "focus_magic: %lu %d\n", WINID(win), do_trans); + + if (win == NULL) + return; + + if (do_trans == SWM_F_TRANSIENT && win->child_trans) { /* win = parent & has a transient so focus on that */ if (win->java) { focus_win(win->child_trans); @@ -3570,15 +4038,6 @@ focus_magic(struct ws_win *win) } } -Bool -destroy_notify_cb(Display *d, XEvent *e, char *arg) -{ - struct ws_win *win = (struct ws_win *)arg; - if (win && win->id == e->xany.window && e->xany.type == DestroyNotify) - return (True); - return (False); -} - void expose(XEvent *e) { @@ -3616,10 +4075,9 @@ keypress(XEvent *e) void buttonpress(XEvent *e) { - XButtonPressedEvent *ev = &e->xbutton; - struct ws_win *win; int i, action; + XButtonPressedEvent *ev = &e->xbutton; DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window); @@ -3627,7 +4085,7 @@ buttonpress(XEvent *e) if ((win = find_window(ev->window)) == NULL) return; - focus_magic(win); + focus_magic(win, SWM_F_TRANSIENT); action = client_click; for (i = 0; i < LENGTH(buttons); i++) @@ -3646,7 +4104,8 @@ configurerequest(XEvent *e) XWindowChanges wc; if ((win = find_window(ev->window)) == NULL) - new = 1; + if ((win = find_unmanaged_window(ev->window)) == NULL) + new = 1; if (new) { DNPRINTF(SWM_D_EVENT, "configurerequest: new window: %lu\n", @@ -3672,27 +4131,8 @@ configurerequest(XEvent *e) win->g.w = ev->width; if (ev->value_mask & CWHeight) win->g.h = ev->height; - if (win->ws->r != NULL) { - /* this seems to be full screen */ - if (win->g.w >= WIDTH(win->ws->r)) { - win->g.x = 0; - win->g.w = WIDTH(win->ws->r); - ev->value_mask |= CWX | CWWidth; - } - if (win->g.h >= HEIGHT(win->ws->r)) { - /* kill border */ - win->g.y = 0; - win->g.h = HEIGHT(win->ws->r); - ev->value_mask |= CWY | CWHeight; - } - } - XMoveResizeWindow(display, win->id, - win->g.x, win->g.y, win->g.w, win->g.h); - if ((ev->value_mask & (CWX | CWY)) && - !(ev->value_mask & (CWWidth | CWHeight))) - config_win(win); - } else - config_win(win); + } + config_win(win); } } @@ -3705,12 +4145,10 @@ configurenotify(XEvent *e) DNPRINTF(SWM_D_EVENT, "configurenotify: window: %lu\n", e->xconfigure.window); - XMapWindow(display, e->xconfigure.window); win = find_window(e->xconfigure.window); if (win) { XGetWMNormalHints(display, win->id, &win->sh, &mask); adjust_font(win); - XMapWindow(display, win->id); if (font_adjusted) stack(); } @@ -3719,110 +4157,187 @@ configurenotify(XEvent *e) void destroynotify(XEvent *e) { - struct ws_win *win, *w, *winfocus = NULL; - struct workspace *ws; - struct ws_win_list *wl; + struct ws_win *win; XDestroyWindowEvent *ev = &e->xdestroywindow; - XEvent de; DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window); - if ((win = find_window(ev->window)) != NULL) { - /* find a window to focus */ - ws = win->ws; - wl = &ws->winlist; - - /* if we are transient give focus to parent */ - if (win->transient) - winfocus = find_window(win->transient); - else if (ws->focus == win) { - /* if in max_stack try harder */ - if (ws->cur_layout->flags & SWM_L_FOCUSPREV) { - if (win != ws->focus_prev) - winfocus = ws->focus_prev; - else if (win != ws->focus) - winfocus = ws->focus; - } - - /* fallback and normal handling */ - if (winfocus == NULL) { - if (TAILQ_FIRST(wl) == win) - winfocus = TAILQ_NEXT(win, entry); - else { - winfocus = TAILQ_PREV(ws->focus, - ws_win_list, entry); - if (winfocus == NULL) - winfocus = TAILQ_LAST(wl, - ws_win_list); - } - } - } - unmanage_window(win); - - /* - * Under stress conditions windows sometimes do not get removed - * from the managed list. Use a very large hammer to get rid - * of them. A smaller hammer would be nice. - */ - TAILQ_FOREACH(w, &ws->winlist, entry) { - if (win == w) - continue; /* can't happen but oh well */ - - if (getstate(w->id) != -1) - continue; + if ((win = find_window(ev->window)) == NULL) { + if ((win = find_unmanaged_window(ev->window)) == NULL) + return; + free_window(win); + return; + } - /* see if we have a destroy event */ - if (XCheckIfEvent(display, &de, destroy_notify_cb, - (char *)w) == False) - unmanage_window(w); /* no event, help it */ - else - XPutBackEvent(display, &de); /* oops */ - } + /* make sure we focus on something */ + win->floating = 0; - ignore_enter = 1; - stack(); - if (winfocus) - focus_win(winfocus); - ignore_enter = 0; - } + unmanage_window(win); + stack(); + free_window(win); } void enternotify(XEvent *e) { XCrossingEvent *ev = &e->xcrossing; + XEvent cne; struct ws_win *win; +#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 + * + * making this code an option would enable a follow mouse for focus + * feature + */ - DNPRINTF(SWM_D_EVENT, "enternotify: window: %lu\n", ev->window); - - if (ignore_enter) { - /* eat event(r) to prevent autofocus */ - ignore_enter = 0; + /* + * 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 + * 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 (QLength(display)) + if (ev->mode == NotifyNormal && ev->detail == NotifyVirtual && + ev->subwindow == 0) { + DNPRINTF(SWM_D_EVENT, "ignoring enternotify: NotifyVirtual\n"); return; + } - if ((win = find_window(ev->window)) == NULL) + /* this window already has focus */ + if (ev->mode == NotifyNormal && ev->detail == NotifyInferior) { + DNPRINTF(SWM_D_EVENT, "ignoring enternotify: win has focus\n"); return; + } - focus_magic(win); -} + /* 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; + } -void -focusin(XEvent *e) -{ - DNPRINTF(SWM_D_EVENT, "focusin: window: %lu\n", e->xfocus.window); + 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); } +/* 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 @@ -3833,7 +4348,7 @@ mapnotify(XEvent *e) DNPRINTF(SWM_D_EVENT, "mapnotify: window: %lu\n", ev->window); - win = find_window(ev->window); + win = manage_window(ev->window); if (win) set_win_state(win, NormalState); } @@ -3853,9 +4368,8 @@ maprequest(XEvent *e) { struct ws_win *win; struct swm_region *r; - - XMapRequestEvent *ev = &e->xmaprequest; XWindowAttributes wa; + XMapRequestEvent *ev = &e->xmaprequest; DNPRINTF(SWM_D_EVENT, "maprequest: window: %lu\n", e->xmaprequest.window); @@ -3869,14 +4383,12 @@ maprequest(XEvent *e) if (win == NULL) return; /* can't happen */ - ignore_enter = 1; stack(); - ignore_enter = 0; /* make new win focused */ r = root_to_region(win->wa.root); if (win->ws == r->ws) - focus_win(win); + focus_magic(win, SWM_F_GENERIC); } void @@ -3917,8 +4429,7 @@ propertynotify(XEvent *e) void unmapnotify(XEvent *e) { - struct ws_win *win, *winfocus = NULL; - struct workspace *ws; + struct ws_win *win; DNPRINTF(SWM_D_EVENT, "unmapnotify: window: %lu\n", e->xunmap.window); @@ -3927,51 +4438,9 @@ unmapnotify(XEvent *e) if (win == NULL) return; - /* igonore transients and floaters, like mplayer */ - if (win->transient || win->floating) - return; - - /* java can not deal with this heuristic */ - if (win->java) - return; - if (getstate(e->xunmap.window) == NormalState) { - /* - * this window does not have a destroy event but but it is no - * longer visible due to the app unmapping it so unmanage it - */ - ws = win->ws; - /* if we are max_stack try harder to focus on something */ - if (ws->cur_layout->flags & SWM_L_FOCUSPREV) { - if (win->transient) - winfocus = find_window(win->transient); - else if (win != ws->focus_prev) - winfocus = ws->focus_prev; - else if (win != ws->focus) - winfocus = ws->focus; - } - - /* normal and fallback if haven't found anything to focus on */ - if (winfocus == NULL) { - winfocus = TAILQ_PREV(win, ws_win_list, entry); - if (TAILQ_FIRST(&ws->winlist) == win) - winfocus = TAILQ_NEXT(win, entry); - else { - if (ws->focus) - winfocus = TAILQ_PREV(ws->focus, - ws_win_list, entry); - if (winfocus == NULL) - winfocus = TAILQ_LAST(&ws->winlist, - ws_win_list); - } - } - - /* trash window and refocus */ unmanage_window(win); - ignore_enter = 1; stack(); - focus_win(winfocus); - ignore_enter = 0; } } @@ -4041,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); @@ -4087,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); } @@ -4219,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++) { @@ -4228,6 +4705,7 @@ setup_screens(void) ws->r = NULL; ws->old_r = NULL; TAILQ_INIT(&ws->winlist); + TAILQ_INIT(&ws->unmanagedlist); for (k = 0; layouts[k].l_stack != NULL; k++) if (layouts[k].l_config != NULL) @@ -4254,7 +4732,7 @@ setup_screens(void) continue; state = getstate(wins[j]); - manage = state == NormalState || state == IconicState; + manage = state == IconicState; if (wa.map_state == IsViewable || manage) manage_window(wins[j]); } @@ -4265,7 +4743,7 @@ setup_screens(void) continue; state = getstate(wins[j]); - manage = state == NormalState || state == IconicState; + manage = state == IconicState; if (XGetTransientForHint(display, wins[j], &d1) && manage) manage_window(wins[j]); @@ -4291,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 @@ -4320,6 +4800,7 @@ main(int argc, char *argv[]) struct swm_region *r, *rr; struct ws_win *winfocus = NULL; struct timeval tv; + union arg a; char conf[PATH_MAX], *cfile = NULL; struct stat sb; XEvent e; @@ -4386,6 +4867,8 @@ main(int argc, char *argv[]) /* set some values to work around bad programs */ workaround(); + unfocus_all(); + grabkeys(); stack(); @@ -4419,14 +4902,20 @@ main(int argc, char *argv[]) /* if we are being restarted go focus on first window */ if (winfocus) { - rr = TAILQ_FIRST(&screens[0].rl); + rr = winfocus->ws->r; + if (rr == NULL) { + /* not a visible window */ + winfocus = NULL; + continue; + } /* move pointer to first screen if multi screen */ if (ScreenCount(display) > 1 || outputs > 1) XWarpPointer(display, None, rr->s[0].root, 0, 0, 0, 0, rr->g.x, rr->g.y + bar_enabled ? bar_height : 0); - focus_win(winfocus); + a.id = SWM_ARG_ID_FOCUSCUR; + focus(rr, &a); winfocus = NULL; continue; } @@ -4438,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) { @@ -4447,7 +4938,7 @@ main(int argc, char *argv[]) } done: bar_extra_stop(); - + XFreeGC(display, bar_gc); XCloseDisplay(display); return (0);