X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=d68be7d2dbe56be416af0fa9e004a3217e224e83;hb=f82d43238961d6605553683999d73f91f8516af3;hp=5c4fbe807e1ecf5d79c2520cdffe359269d651f2;hpb=4d964ea1ea42a47e09d1f63aa62943607f3bba36;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index 5c4fbe8..d68be7d 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -52,7 +52,7 @@ static const char *cvstag = "$scrotwm$"; -#define SWM_VERSION "0.9.22" +#define SWM_VERSION "0.9.24" #include #include @@ -154,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 @@ -201,6 +205,7 @@ 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; @@ -259,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); @@ -1492,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; @@ -1520,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; @@ -1534,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 @@ -2524,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) @@ -3330,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); @@ -3350,8 +3357,9 @@ setup_quirks(void) enum { SWM_S_BAR_DELAY, SWM_S_BAR_ENABLED, SWM_S_STACK_ENABLED, 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_BAR_FONT, - SWM_S_BAR_ACTION, SWM_S_SPAWN_TERM, SWM_S_SS_APP, SWM_S_DIALOG_RATIO + 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 @@ -3395,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) @@ -3485,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 }, }; @@ -4008,7 +4027,17 @@ enternotify(XEvent *e) ev->window, ev->mode, ev->detail, ev->root, ev->subwindow, ev->same_screen, ev->focus, ev->state); - goto focusme; + 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 @@ -4077,11 +4106,7 @@ enternotify(XEvent *e) } } #endif -focusme: - if (QLength(display)) { - DNPRINTF(SWM_D_EVENT, "ignore enternotify %d\n", - QLength(display)); - return; + break; } if ((win = find_window(ev->window)) == NULL) { @@ -4740,7 +4765,7 @@ main(int argc, char *argv[]) } done: bar_extra_stop(); - + XFreeGC(display, bar_gc); XCloseDisplay(display); return (0);