X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=d68be7d2dbe56be416af0fa9e004a3217e224e83;hb=f82d43238961d6605553683999d73f91f8516af3;hp=a2099dfffeac0aa9a36557b2a10a9ba826f15207;hpb=1332091a8e59e013803bb3021f0d4e2700a8e222;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index a2099df..d68be7d 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -52,7 +52,7 @@ static const char *cvstag = "$scrotwm$"; -#define SWM_VERSION "0.9.19" +#define SWM_VERSION "0.9.24" #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 @@ -194,8 +202,10 @@ 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; pid_t bar_pid; GC bar_gc; XGCValues bar_gcv; @@ -254,64 +264,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); @@ -839,7 +791,8 @@ 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++) { @@ -851,7 +804,7 @@ bar_update(void) if (stack_enabled) stack = r->ws->cur_layout->name; - snprintf(loc, sizeof loc, "%d:%d %s %s %s %s", + snprintf(loc, sizeof loc, "%d:%d %s %s %s %s", x++, r->ws->idx + 1, stack, s, bar_ext, bar_vertext); bar_print(r, loc); @@ -1119,6 +1072,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 +1186,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 +1328,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 +1362,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 +1409,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 +1439,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; @@ -1481,9 +1467,7 @@ switchws(struct swm_region *r, union arg *args) if (old_ws->r != NULL) old_ws->old_r = old_ws->r; old_ws->r = NULL; - - TAILQ_FOREACH(win, &old_ws->winlist, entry) - unmap_window(win); + unmap_old = 1; } else { other_r->ws = old_ws; old_ws->r = other_r; @@ -1495,6 +1479,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 @@ -1915,6 +1904,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; @@ -2068,7 +2058,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++; @@ -2481,6 +2474,64 @@ move(struct ws_win *win, union arg *args) 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_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) @@ -3287,8 +3338,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); @@ -3305,10 +3355,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_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) @@ -3326,6 +3378,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; @@ -3344,6 +3403,16 @@ 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_BAR_FONT: free(bar_fonts[0]); if ((bar_fonts[0] = strdup(value)) == NULL) @@ -3419,6 +3488,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 }, @@ -3433,7 +3503,8 @@ 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 }, }; @@ -3764,7 +3835,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); @@ -3929,6 +4003,9 @@ destroynotify(XEvent *e) return; } + /* make sure we focus on something */ + win->floating = 0; + unmanage_window(win); stack(); free_window(win); @@ -3939,16 +4016,29 @@ enternotify(XEvent *e) { XCrossingEvent *ev = &e->xcrossing; XEvent cne; - struct ws_win *win, *w; + 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 @@ -4015,6 +4105,24 @@ enternotify(XEvent *e) 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); } @@ -4025,6 +4133,10 @@ enternotify(XEvent *e) void focusevent(XEvent *e) { + 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 0 struct ws_win *win; u_int32_t mode_detail; XFocusChangeEvent *ev = &e->xfocus; @@ -4058,9 +4170,11 @@ focusevent(XEvent *e) 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 @@ -4161,13 +4275,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(); @@ -4491,6 +4598,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 @@ -4587,6 +4696,8 @@ main(int argc, char *argv[]) /* set some values to work around bad programs */ workaround(); + unfocus_all(); + grabkeys(); stack(); @@ -4654,7 +4765,7 @@ main(int argc, char *argv[]) } done: bar_extra_stop(); - + XFreeGC(display, bar_gc); XCloseDisplay(display); return (0);