X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=acf078a5a38dae26fed9035f825272bf26abe3b0;hb=28dbf3c66e2feccc078f440bc945c17a8800e39d;hp=be56d1b33b41a03819d596508f8e703d1c27b921;hpb=314eb462495f1c4b8a58d6f75dc6c2727c995926;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index be56d1b..acf078a 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -81,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -372,10 +373,11 @@ int bar_justify = SWM_BAR_JUSTIFY_LEFT; char *bar_format = NULL; int stack_enabled = 1; int clock_enabled = 1; +int iconic_enabled = 0; int urgent_enabled = 0; char *clock_format = NULL; -int title_name_enabled = 0; -int title_class_enabled = 0; +int window_class_enabled = 0; +int window_instance_enabled = 0; int window_name_enabled = 0; int focus_mode = SWM_FOCUS_DEFAULT; int focus_close = SWM_STACK_BELOW; @@ -436,11 +438,11 @@ struct ws_win { struct swm_geometry g; /* current geometry */ struct swm_geometry g_float; /* region coordinates */ int g_floatvalid; /* g_float geometry validity */ - int floatmaxed; /* whether maxed by max_stack */ int floating; int manual; int32_t mapped; int32_t iconic; + int32_t maximized; int bordered; unsigned int ewmh_flags; int font_size_boundary[SWM_MAX_FONT_STEPS]; @@ -515,6 +517,7 @@ struct workspace { 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 */ + int32_t state; char stacker[10]; /* display stacker and layout */ /* stacker state */ @@ -531,6 +534,12 @@ struct workspace { }; enum { + SWM_WS_STATE_HIDDEN, + SWM_WS_STATE_MAPPING, + SWM_WS_STATE_MAPPED, +}; + +enum { SWM_S_COLOR_BAR, SWM_S_COLOR_BAR_BORDER, SWM_S_COLOR_BAR_BORDER_UNFOCUS, @@ -613,8 +622,12 @@ union arg { /* quirks */ struct quirk { TAILQ_ENTRY(quirk) entry; - char *class; - char *name; + char *class; /* WM_CLASS:class */ + char *instance; /* WM_CLASS:instance */ + char *name; /* WM_NAME */ + regex_t regex_class; + regex_t regex_instance; + regex_t regex_name; unsigned long quirk; #define SWM_Q_FLOAT (1<<0) /* float this window */ #define SWM_Q_TRANSSZ (1<<1) /* transiend window size too small */ @@ -746,6 +759,7 @@ enum keyfuncid { KF_FOCUS_NEXT, KF_FOCUS_PREV, KF_FOCUS_URGENT, + KF_MAXIMIZE_TOGGLE, KF_HEIGHT_GROW, KF_HEIGHT_SHRINK, KF_ICONIFY, @@ -864,8 +878,7 @@ RB_HEAD(key_tree, key); /* function prototypes */ void adjust_font(struct ws_win *); -void bar_class_name(char *, size_t, struct swm_region *); -void bar_class_title_name(char *, size_t, struct swm_region *); +char *argsep(char **); void bar_cleanup(struct swm_region *); void bar_extra_setup(void); void bar_extra_stop(void); @@ -879,15 +892,19 @@ void bar_replace(char *, char *, struct swm_region *, size_t); void bar_replace_pad(char *, int *, size_t); char *bar_replace_seq(char *, char *, struct swm_region *, size_t *, size_t); void bar_setup(struct swm_region *); -void bar_title_name(char *, size_t, struct swm_region *); void bar_toggle(struct swm_region *, union arg *); void bar_urgent(char *, size_t); +void bar_window_class(char *, size_t, struct swm_region *); +void bar_window_class_instance(char *, size_t, struct swm_region *); void bar_window_float(char *, size_t, struct swm_region *); +void bar_window_instance(char *, size_t, struct swm_region *); void bar_window_name(char *, size_t, struct swm_region *); +void bar_window_state(char *, size_t, struct swm_region *); void bar_workspace_name(char *, size_t, struct swm_region *); void buttonpress(xcb_button_press_event_t *); void check_conn(void); void clear_keys(void); +int clear_maximized(struct workspace *); void clientmessage(xcb_client_message_event_t *); void client_msg(struct ws_win *, xcb_atom_t, xcb_timestamp_t); int conf_load(const char *, int); @@ -898,7 +915,7 @@ void constrain_window(struct ws_win *, struct swm_geometry *, int *); int count_win(struct workspace *, int); void cursors_cleanup(void); void cursors_load(void); -void custom_region(char *); +void custom_region(const char *); void cyclerg(struct swm_region *, union arg *); void cyclews(struct swm_region *, union arg *); void cycle_layout(struct swm_region *, union arg *); @@ -954,6 +971,7 @@ char *get_stack_mode_name(uint8_t); #endif int32_t get_swm_iconic(struct ws_win *); char *get_win_name(xcb_window_t); +void get_wm_protocols(struct ws_win *); int get_ws_idx(xcb_window_t); uint32_t getstate(xcb_window_t); void grabbuttons(struct ws_win *); @@ -975,18 +993,19 @@ void leavenotify(xcb_leave_notify_event_t *); #endif void load_float_geom(struct ws_win *); struct ws_win *manage_window(xcb_window_t, uint16_t); -void map_window(struct ws_win *, xcb_window_t); +void map_window(struct ws_win *); void mapnotify(xcb_map_notify_event_t *); void mappingnotify(xcb_mapping_notify_event_t *); void maprequest(xcb_map_request_event_t *); +void maximize_toggle(struct swm_region *, union arg *); void motionnotify(xcb_motion_notify_event_t *); void move(struct ws_win *, union arg *); void move_step(struct swm_region *, union arg *); uint32_t name_to_pixel(int, const char *); void name_workspace(struct swm_region *, union arg *); void new_region(struct swm_screen *, int, int, int, int); -int parsekeys(char *, unsigned int, unsigned int *, KeySym *); -int parsequirks(char *, unsigned long *); +int parsekeys(const char *, unsigned int, unsigned int *, KeySym *); +int parsequirks(const char *, unsigned long *); int parse_rgb(const char *, uint16_t *, uint16_t *, uint16_t *); void pressbutton(struct swm_region *, union arg *); void priorws(struct swm_region *, union arg *); @@ -994,9 +1013,10 @@ void priorws(struct swm_region *, union arg *); void print_win_geom(xcb_window_t); #endif void propertynotify(xcb_property_notify_event_t *); -void quirk_insert(const char *, const char *, unsigned long); +void quirk_free(struct quirk *); +void quirk_insert(const char *, const char *, const char *,unsigned long); void quirk_remove(struct quirk *); -void quirk_replace(struct quirk *, const char *, const char *, +void quirk_replace(struct quirk *, const char *, const char *, const char *, unsigned long); void quit(struct swm_region *, union arg *); void raise_toggle(struct swm_region *, union arg *); @@ -1020,19 +1040,19 @@ void search_workspace(struct swm_region *, union arg *); void send_to_rg(struct swm_region *, union arg *); void send_to_ws(struct swm_region *, union arg *); void set_region(struct swm_region *); -int setautorun(char *, char *, int); -int setconfbinding(char *, char *, int); -int setconfcolor(char *, char *, int); -int setconfmodkey(char *, char *, int); -int setconfquirk(char *, char *, int); -int setconfregion(char *, char *, int); -int setconfspawn(char *, char *, int); -int setconfvalue(char *, char *, int); +int setautorun(const char *, const char *, int); +int setconfbinding(const char *, const char *, int); +int setconfcolor(const char *, const char *, int); +int setconfmodkey(const char *, const char *, int); +int setconfquirk(const char *, const char *, int); +int setconfregion(const char *, const char *, int); +int setconfspawn(const char *, const char *, int); +int setconfvalue(const char *, const char *, int); void setkeybinding(unsigned int, KeySym, enum keyfuncid, const char *); -int setkeymapping(char *, char *, int); -int setlayout(char *, char *, int); -void setquirk(const char *, const char *, unsigned long); -void setscreencolor(char *, int, int); +int setkeymapping(const char *, const char *, int); +int setlayout(const char *, const char *, int); +void setquirk(const char *, const char *, const char *,unsigned long); +void setscreencolor(const char *, int, int); void setspawn(const char *, const char *, int); void setup_ewmh(void); void setup_globals(void); @@ -1056,13 +1076,15 @@ void spawn_remove(struct spawn_prog *); void spawn_replace(struct spawn_prog *, const char *, const char *, int); void spawn_select(struct swm_region *, union arg *, const char *, int *); void stack_config(struct swm_region *, union arg *); -void stack_floater(struct ws_win *, struct swm_region *); +void stack_floater(struct ws_win *); void stack_master(struct workspace *, struct swm_geometry *, int, int); +void reorder_window(struct ws_win *, uint32_t); void store_float_geom(struct ws_win *); char *strdupsafe(const char *); void swapwin(struct swm_region *, union arg *); void switchws(struct swm_region *, union arg *); void teardown_ewmh(void); +void unescape_selector(char *); void unfocus_win(struct ws_win *); void uniconify(struct swm_region *, union arg *); void unmanage_window(struct ws_win *); @@ -1075,7 +1097,6 @@ void update_window(struct ws_win *); void validate_spawns(void); int validate_win(struct ws_win *); int validate_ws(struct workspace *); -/*void visibilitynotify(xcb_visibility_notify_event_t *);*/ void version(struct swm_region *, union arg *); void win_to_ws(struct ws_win *, int, int); pid_t window_get_pid(xcb_window_t); @@ -1271,6 +1292,24 @@ get_atom_from_string(const char *str) } void +get_wm_protocols(struct ws_win *win) { + int i; + xcb_icccm_get_wm_protocols_reply_t wpr; + + if (xcb_icccm_get_wm_protocols_reply(conn, + xcb_icccm_get_wm_protocols(conn, win->id, a_prot), + &wpr, NULL)) { + for (i = 0; i < (int)wpr.atoms_len; i++) { + if (wpr.atoms[i] == a_takefocus) + win->take_focus = 1; + if (wpr.atoms[i] == a_delete) + win->can_delete = 1; + } + xcb_icccm_get_wm_protocols_reply_wipe(&wpr); + } +} + +void set_swm_iconic(struct ws_win *win, int newv) { int32_t v = newv; @@ -1460,12 +1499,19 @@ ewmh_update_win_state(struct ws_win *win, xcb_atom_t state, long action) unsigned int mask = 0; unsigned int changed = 0; unsigned int orig_flags; +#ifdef SWM_DEBUG + char *name; +#endif if (win == NULL) return; - DNPRINTF(SWM_D_PROP, "ewmh_update_win_state: window: 0x%x, state: %ld, " - "action: %ld\n", win->id, (unsigned long)state, action); +#ifdef SWM_DEBUG + name = get_atom_name(state); + DNPRINTF(SWM_D_PROP, "ewmh_update_win_state: window: 0x%x, state: %s, " + "action: %ld\n", win->id, name, action); + free(name); +#endif if (state == ewmh[_NET_WM_STATE_FULLSCREEN].atom) mask = EWMH_F_FULLSCREEN; @@ -1736,7 +1782,7 @@ name_to_pixel(int sidx, const char *colorname) } void -setscreencolor(char *val, int i, int c) +setscreencolor(const char *val, int i, int c) { int num_screens; @@ -1785,7 +1831,7 @@ plain_stacker(struct workspace *ws) } void -custom_region(char *val) +custom_region(const char *val) { unsigned int x, y, w, h; int sidx, num_screens; @@ -1955,7 +2001,7 @@ bar_extra_stop(void) } void -bar_class_name(char *s, size_t sz, struct swm_region *r) +bar_window_class(char *s, size_t sz, struct swm_region *r) { if (r == NULL || r->ws == NULL || r->ws->focus == NULL) return; @@ -1964,7 +2010,7 @@ bar_class_name(char *s, size_t sz, struct swm_region *r) } void -bar_title_name(char *s, size_t sz, struct swm_region *r) +bar_window_instance(char *s, size_t sz, struct swm_region *r) { if (r == NULL || r->ws == NULL || r->ws->focus == NULL) return; @@ -1973,22 +2019,24 @@ bar_title_name(char *s, size_t sz, struct swm_region *r) } void -bar_class_title_name(char *s, size_t sz, struct swm_region *r) +bar_window_class_instance(char *s, size_t sz, struct swm_region *r) { if (r == NULL || r->ws == NULL || r->ws->focus == NULL) return; - bar_class_name(s, sz, r); + bar_window_class(s, sz, r); strlcat(s, ":", sz); - bar_title_name(s, sz, r); + bar_window_instance(s, sz, r); } void -bar_window_float(char *s, size_t sz, struct swm_region *r) +bar_window_state(char *s, size_t sz, struct swm_region *r) { if (r == NULL || r ->ws == NULL || r->ws->focus == NULL) return; - if (r->ws->focus->floating) + if (r->ws->focus->maximized) + strlcat(s, "(m)", sz); + else if (r->ws->focus->floating) strlcat(s, "(f)", sz); } @@ -1999,9 +2047,8 @@ bar_window_name(char *s, size_t sz, struct swm_region *r) if (r == NULL || r->ws == NULL || r->ws->focus == NULL) return; - if ((title = get_win_name(r->ws->focus->id)) == NULL) - return; + title = get_win_name(r->ws->focus->id); strlcat(s, title, sz); free(title); } @@ -2053,6 +2100,8 @@ bar_workspace_name(char *s, size_t sz, struct swm_region *r) void bar_fmt(const char *fmtexp, char *fmtnew, struct swm_region *r, size_t sz) { + struct ws_win *w; + /* if format provided, just copy the buffers */ if (bar_format != NULL) { strlcpy(fmtnew, fmtexp, sz); @@ -2070,6 +2119,15 @@ bar_fmt(const char *fmtexp, char *fmtnew, struct swm_region *r, size_t sz) /* only show the workspace name if there's actually one */ if (r != NULL && r->ws != NULL && r->ws->name != NULL) strlcat(fmtnew, "<+D>", sz); + + /* If enabled, only show the iconic count if there are iconic wins. */ + if (iconic_enabled && r != NULL && r->ws != NULL) + TAILQ_FOREACH(w, &r->ws->winlist, entry) + if (w->iconic) { + strlcat(fmtnew, "{+M}", sz); + break; + } + strlcat(fmtnew, "+3<", sz); if (clock_enabled) { @@ -2081,21 +2139,21 @@ bar_fmt(const char *fmtexp, char *fmtnew, struct swm_region *r, size_t sz) if (urgent_enabled) strlcat(fmtnew, "* +U*+4<", sz); - if (title_class_enabled) { + if (window_class_enabled) { strlcat(fmtnew, "+C", sz); - if (!title_name_enabled) + if (!window_instance_enabled) strlcat(fmtnew, "+4<", sz); } /* checks needed by the colon and floating strlcat(3) calls below */ if (r != NULL && r->ws != NULL && r->ws->focus != NULL) { - if (title_name_enabled) { - if (title_class_enabled) + if (window_instance_enabled) { + if (window_class_enabled) strlcat(fmtnew, ":", sz); strlcat(fmtnew, "+T+4<", sz); } if (window_name_enabled) { - if (r->ws->focus->floating) + if (r->ws->focus->floating || r->ws->focus->maximized) strlcat(fmtnew, "+F ", sz); strlcat(fmtnew, "+64W ", sz); } @@ -2119,9 +2177,10 @@ char * bar_replace_seq(char *fmt, char *fmtrep, struct swm_region *r, size_t *offrep, size_t sz) { + struct ws_win *w; char *ptr; char tmp[SWM_BAR_MAX]; - int limit, size; + int limit, size, count; size_t len; /* reset strlcat(3) buffer */ @@ -2148,28 +2207,36 @@ bar_replace_seq(char *fmt, char *fmtrep, struct swm_region *r, size_t *offrep, snprintf(tmp, sizeof tmp, "%s", bar_ext); break; case 'C': - bar_class_name(tmp, sizeof tmp, r); + bar_window_class(tmp, sizeof tmp, r); break; case 'D': bar_workspace_name(tmp, sizeof tmp, r); break; case 'F': - bar_window_float(tmp, sizeof tmp, r); + bar_window_state(tmp, sizeof tmp, r); break; case 'I': snprintf(tmp, sizeof tmp, "%d", r->ws->idx + 1); break; + case 'M': + count = 0; + TAILQ_FOREACH(w, &r->ws->winlist, entry) + if (w->iconic) + ++count; + + snprintf(tmp, sizeof tmp, "%d", count); + break; case 'N': snprintf(tmp, sizeof tmp, "%d", r->s->idx + 1); break; case 'P': - bar_class_title_name(tmp, sizeof tmp, r); + bar_window_class_instance(tmp, sizeof tmp, r); break; case 'S': snprintf(tmp, sizeof tmp, "%s", r->ws->stacker); break; case 'T': - bar_title_name(tmp, sizeof tmp, r); + bar_window_instance(tmp, sizeof tmp, r); break; case 'U': bar_urgent(tmp, sizeof tmp); @@ -2813,27 +2880,109 @@ quit(struct swm_region *r, union arg *args) } void -map_window(struct ws_win *win, xcb_window_t sibling) +reorder_window(struct ws_win *win, uint32_t mode) { - uint16_t mode = XCB_CONFIG_WINDOW_STACK_MODE; + struct ws_win *w = win; + struct swm_region *r; + struct workspace *ws; uint32_t val[2]; - int i = 0; - /* If sibling is specified, stack right above it. */ - if (sibling != XCB_WINDOW_NONE) { - mode |= XCB_CONFIG_WINDOW_SIBLING; - val[i++] = sibling; + if (win == NULL || (r = win->ws->r) == NULL) + return; + ws = win->ws; + + DNPRINTF(SWM_D_EVENT, "reorder_window: win 0x%x, mode: %d\n", + win->id, mode); + + switch (mode) { + case SWM_STACK_TOP: + /* Position above top-most sibling. */ + TAILQ_FOREACH_REVERSE(w, &ws->winlist, ws_win_list, entry) { + if (w == win || w->iconic) + continue; + if ((win->ewmh_flags & EWMH_F_FULLSCREEN) != + (w->ewmh_flags & EWMH_F_FULLSCREEN)) + continue; + if (!win->maximized && w->maximized) + continue; + if (win->maximized) { + if (w->floating) + break; + continue; + } + if (win->floating == w->floating) + break; + } + break; + case SWM_STACK_ABOVE: + /* Stack above win directly prior. */ + while ((w = TAILQ_PREV(w, ws_win_list, entry)) != NULL) { + if (w == win || w->iconic) + continue; + if ((win->ewmh_flags & EWMH_F_FULLSCREEN) != + (w->ewmh_flags & EWMH_F_FULLSCREEN)) + continue; + if (win->maximized != w->maximized) + continue; + if (win->floating == w->floating) + break; + } + break; + case SWM_STACK_BELOW: + /* Stack above win directly prior. */ + while ((w = TAILQ_NEXT(w, entry)) != NULL) { + if (w == win || w->iconic) + continue; + if ((win->ewmh_flags & EWMH_F_FULLSCREEN) != + (w->ewmh_flags & EWMH_F_FULLSCREEN)) + continue; + if (win->maximized != w->maximized) + continue; + if (win->floating == w->floating) + break; + } + break; + case SWM_STACK_BOTTOM: + /* Position above top-most sibling. */ + TAILQ_FOREACH(w, &ws->winlist, entry) { + if (w == win || w->iconic) + continue; + if ((win->ewmh_flags & EWMH_F_FULLSCREEN) != + (w->ewmh_flags & EWMH_F_FULLSCREEN)) + continue; + if (win->maximized != w->maximized) + continue; + if (win->floating == w->floating) + break; + } + break; + } + + if (w == NULL) { + if (win->floating || (win->ewmh_flags & EWMH_F_FULLSCREEN) + || win->maximized) + val[0] = r->bar->id; + else + val[0] = r->id; + } else { + val[0] = w->id; } + DNPRINTF(SWM_D_EVENT, "reorder_window: sibling: 0x%x\n", val[0]); - val[i] = XCB_STACK_MODE_ABOVE; + val[1] = XCB_STACK_MODE_ABOVE; + + xcb_configure_window(conn, win->id, XCB_CONFIG_WINDOW_STACK_MODE | + XCB_CONFIG_WINDOW_SIBLING, val); +} +void +map_window(struct ws_win *win) +{ if (win == NULL) return; - DNPRINTF(SWM_D_EVENT, "map_window: win 0x%x, mapped: %s, " - "sibling: 0x%x\n", win->id, YESNO(win->mapped), sibling); - - xcb_configure_window(conn, win->id, mode, val); + DNPRINTF(SWM_D_EVENT, "map_window: win 0x%x, mapped: %s\n", + win->id, YESNO(win->mapped)); if (win->mapped) return; @@ -3180,42 +3329,6 @@ validate_ws(struct workspace *testws) return (1); } -xcb_window_t -get_sibling(struct ws_win *win, int mode) -{ - struct ws_win *w = win; - - switch (mode) { - case SWM_STACK_TOP: - TAILQ_FOREACH_REVERSE(w, &w->ws->winlist, ws_win_list, entry) - if (w != win && !w->floating && !w->iconic) - break; - break; - case SWM_STACK_ABOVE: - do { - w = TAILQ_NEXT(w, entry); - } while (w != NULL && (w == win || w->floating || w->iconic)); - break; - case SWM_STACK_BELOW: - do { - w = TAILQ_PREV(w, ws_win_list, entry); - } while (w != NULL && (w == win || w->floating || w->iconic)); - break; - case SWM_STACK_BOTTOM: - TAILQ_FOREACH(w, &w->ws->winlist, entry) - if (w != win && !w->floating && !w->iconic) - break; - break; - default: - w = NULL; - } - - if (w == NULL) - return (win->ws->r->id); - else - return (w->id); -} - void unfocus_win(struct ws_win *win) { @@ -3247,8 +3360,8 @@ unfocus_win(struct ws_win *win) } if (win->ws->focus == win) { - if (tile_gap < 0 && !win->floating) - map_window(win, get_sibling(win, SWM_STACK_BELOW)); + if (tile_gap < 0 && !win->floating && !win->maximized) + reorder_window(win, SWM_STACK_ABOVE); win->ws->focus = NULL; win->ws->focus_prev = win; } @@ -3332,6 +3445,9 @@ focus_win(struct ws_win *win) win->hints.input)) xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, win->id, last_event_time); + else + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, + ws->r->id, XCB_CURRENT_TIME); /* Tell app it can adjust focus to a specific window. */ if (win->take_focus) { @@ -3350,30 +3466,35 @@ focus_win(struct ws_win *win) ws->always_raise) { /* If a parent exists, map it first. */ if (parent) { - map_window(parent, XCB_WINDOW_NONE); + reorder_window(parent, SWM_STACK_TOP); + map_window(parent); /* Map siblings next. */ TAILQ_FOREACH(w, &ws->winlist, entry) if (w != win && !w->iconic && - w->transient == parent->id) - map_window(w, XCB_WINDOW_NONE); + w->transient == parent->id) { + reorder_window(w, SWM_STACK_ABOVE); + map_window(w); + } } /* Map focused window. */ - map_window(win, XCB_WINDOW_NONE); + reorder_window(win, SWM_STACK_TOP); + map_window(win); /* Finally, map children of focus window. */ TAILQ_FOREACH(w, &ws->winlist, entry) - if (w->transient == win->id && !w->iconic) - map_window(w, XCB_WINDOW_NONE); + if (w->transient == win->id && !w->iconic) { + reorder_window(w, SWM_STACK_ABOVE); + map_window(w); + } } else if (tile_gap < 0 && !win->floating) { /* * Windows overlap in the layout. * Raise focused win above all tiled wins. */ - if (tile_gap < 0 && !win->floating) - map_window(win, - get_sibling(win, SWM_STACK_TOP)); + reorder_window(win, SWM_STACK_TOP); + map_window(win); } set_region(ws->r); @@ -3551,12 +3672,15 @@ switchws(struct swm_region *r, union arg *args) new_ws->focus_prev = NULL; } + new_ws->state = SWM_WS_STATE_MAPPING; stack(); /* unmap old windows */ - if (unmap_old) + if (unmap_old) { TAILQ_FOREACH(win, &old_ws->winlist, entry) unmap_window(win); + old_ws->state = SWM_WS_STATE_HIDDEN; + } /* if workspaces were swapped, then don't wait to set focus */ if (old_ws->r && focus_mode != SWM_FOCUS_FOLLOW) { @@ -3574,6 +3698,7 @@ switchws(struct swm_region *r, union arg *args) } focus_flush(); + new_ws->state = SWM_WS_STATE_MAPPED; DNPRINTF(SWM_D_WS, "switchws: done.\n"); } @@ -3739,6 +3864,8 @@ swapwin(struct swm_region *r, union arg *args) if (cur_focus == NULL) return; + clear_maximized(r->ws); + source = cur_focus; wl = &source->ws->winlist; @@ -3814,14 +3941,14 @@ get_focus_prev(struct ws_win *win) wl = &ws->winlist; cur_focus = ws->focus; - DNPRINTF(SWM_D_FOCUS, "get_focus_prev: window: 0x%x, cur_focus: 0x%x\n", - WINID(win), WINID(cur_focus)); + DNPRINTF(SWM_D_FOCUS, "get_focus_prev: window: 0x%x, cur_focus: 0x%x, " + "focus_prev: 0x%x\n", WINID(win), WINID(cur_focus), + WINID(ws->focus_prev)); /* 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))) + if (ws->focus_prev && find_window(ws->focus_prev->id)) winfocus = ws->focus_prev; goto done; } @@ -4041,6 +4168,9 @@ focus(struct swm_region *r, union arg *args) goto out; } + if (clear_maximized(ws) > 0) + stack(); + focus_win(get_focus_magic(winfocus)); focus_flush(); @@ -4062,6 +4192,8 @@ cycle_layout(struct swm_region *r, union arg *args) if (ws->cur_layout->l_stack == NULL) ws->cur_layout = &layouts[0]; + clear_maximized(ws); + stack(); bar_draw(); @@ -4078,6 +4210,9 @@ stack_config(struct swm_region *r, union arg *args) DNPRINTF(SWM_D_STACK, "stack_config: id: %d workspace: %d\n", args->id, ws->idx); + if (clear_maximized(ws) > 0) + stack(); + if (ws->cur_layout->l_config != NULL) ws->cur_layout->l_config(ws, args->id); @@ -4105,9 +4240,6 @@ stack(void) { j = 0; #endif TAILQ_FOREACH(r, &screens[i].rl, entry) { - DNPRINTF(SWM_D_STACK, "stack: workspace: %d " - "(screen: %d, region: %d)\n", r->ws->idx, i, j++); - /* Adjust stack area for region bar and padding. */ g = r->g; g.x += region_padding; @@ -4119,6 +4251,11 @@ stack(void) { g.y += bar_height; g.h -= bar_height; } + + DNPRINTF(SWM_D_STACK, "stack: workspace: %d (screen: " + "%d, region: %d), (x,y) WxH: (%d,%d) %d x %d\n", + r->ws->idx, i, j++, g.x, g.y, g.w, g.h); + r->ws->cur_layout->l_stack(r->ws, &g); r->ws->cur_layout->l_string(r->ws); /* save r so we can track region changes */ @@ -4168,68 +4305,80 @@ load_float_geom(struct ws_win *win) } void -stack_floater(struct ws_win *win, struct swm_region *r) +stack_floater(struct ws_win *win) { + struct workspace *ws; + struct swm_region *r; + if (win == NULL) return; - DNPRINTF(SWM_D_MISC, "stack_floater: window: 0x%x\n", win->id); + ws = win->ws; - /* - * 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->ewmh_flags & EWMH_F_FULLSCREEN))) { - /* update geometry for the new region */ - load_float_geom(win); - } + if ((r = ws->r) == NULL) + return; - win->floatmaxed = 0; + DNPRINTF(SWM_D_MISC, "stack_floater: window: 0x%x\n", win->id); - /* - * if set to fullscreen mode, configure window to maximum size. - */ if (win->ewmh_flags & EWMH_F_FULLSCREEN) { + /* _NET_WM_FULLSCREEN: fullscreen without border. */ if (!win->g_floatvalid) store_float_geom(win); win->g = r->g; - } + win->bordered = 0; + } else if (win->maximized) { + /* Maximize: like a single stacked window. */ + if (!win->g_floatvalid) + store_float_geom(win); - /* - * remove border on fullscreen floater when in fullscreen mode or when - * the quirk is present. - */ - if ((win->ewmh_flags & EWMH_F_FULLSCREEN) || - ((win->quirks & SWM_Q_FULLSCREEN) && - (WIDTH(win) >= WIDTH(r)) && (HEIGHT(win) >= HEIGHT(r)))) { - if (win->bordered) { + win->g = r->g; + + if (bar_enabled && ws->bar_enabled) { + win->bordered = 1; + if (!bar_at_bottom) + Y(win) += bar_height; + HEIGHT(win) -= bar_height; + } else if (disable_border) { win->bordered = 0; - X(win) += border_width; - Y(win) += border_width; + } else { + win->bordered = 1; } - } else if (!win->bordered) { - win->bordered = 1; - X(win) -= border_width; - Y(win) -= border_width; - } - - if (win->transient && (win->quirks & SWM_Q_TRANSSZ)) { - WIDTH(win) = (double)WIDTH(r) * dialog_ratio; - HEIGHT(win) = (double)HEIGHT(r) * dialog_ratio; - } - if (!win->manual && !(win->ewmh_flags & EWMH_F_FULLSCREEN) && - !(win->quirks & SWM_Q_ANYWHERE)) { - /* - * floaters and transients are auto-centred unless moved, - * resized or ANYWHERE quirk is set. - */ - X(win) = X(r) + (WIDTH(r) - WIDTH(win)) / 2 - BORDER(win); - Y(win) = Y(r) + (HEIGHT(r) - HEIGHT(win)) / 2 - BORDER(win); + if (win->bordered) { + HEIGHT(win) -= 2 * border_width; + WIDTH(win) -= 2 * border_width; + } + } else { + /* Normal floating window. */ + /* Update geometry if new region. */ + if (r != ws->old_r) + load_float_geom(win); + + if ((win->quirks & SWM_Q_FULLSCREEN) && + WIDTH(win) >= WIDTH(r) && HEIGHT(win) >= HEIGHT(r)) { + /* Remove border for FULLSCREEN quirk. */ + win->bordered = 0; + } else if (!win->manual) { + if (win->transient && (win->quirks & SWM_Q_TRANSSZ)) { + /* Adjust size on TRANSSZ quirk. */ + WIDTH(win) = (double)WIDTH(r) * dialog_ratio; + HEIGHT(win) = (double)HEIGHT(r) * dialog_ratio; + } - store_float_geom(win); + if (!(win->quirks & SWM_Q_ANYWHERE)) { + /* + * Floaters and transients are auto-centred + * unless manually moved, resized or ANYWHERE + * quirk is set. + */ + X(win) = X(r) + (WIDTH(r) - WIDTH(win)) / 2 - + BORDER(win); + Y(win) = Y(r) + (HEIGHT(r) - HEIGHT(win)) / 2 - + BORDER(win); + store_float_geom(win); + } + } } /* Ensure at least 1 pixel of the window is in the region. */ @@ -4276,7 +4425,7 @@ void stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) { struct swm_geometry win_g, r_g = *g; - struct ws_win *win, *fs_win = NULL; + struct ws_win *win, *fs_win = NULL, *max_win = NULL; int i, j, s, stacks; int w_inc = 1, h_inc, w_base = 1, h_base; int hrh, extra = 0, h_slice, last_h = 0; @@ -4291,6 +4440,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) if (winno == 0 && count_win(ws, 1) == 0) return; + /* Find first tiled window. */ TAILQ_FOREACH(win, &ws->winlist, entry) if (!win->transient && !win->floating && !win->iconic) break; @@ -4357,6 +4507,11 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) continue; } + if (win->maximized) { + max_win = win; + continue; + } + if (split && i == split) { colno = (winno - mwin) / stacks; if (s <= (winno - mwin) % stacks) @@ -4453,7 +4608,8 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) update_window(win); } - map_window(win, get_sibling(win, SWM_STACK_BELOW)); + reorder_window(win, SWM_STACK_ABOVE); + map_window(win); last_h = win_g.h; i++; @@ -4461,30 +4617,45 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) } /* Map/raise focused tiled window to top if windows could overlap. */ - if (tile_gap < 0 && ws->focus != NULL && !ws->focus->floating) - map_window(ws->focus, get_sibling(ws->focus, SWM_STACK_TOP)); + if (tile_gap < 0 && ws->focus != NULL && !ws->focus->floating && + !ws->focus->maximized) { + reorder_window(ws->focus, SWM_STACK_TOP); + map_window(ws->focus); + } notiles: /* now, stack all the floaters and transients */ TAILQ_FOREACH(win, &ws->winlist, entry) { - if (!win->transient && !win->floating) - continue; - if (win->iconic) + if ((!win->transient && !win->floating) || win->iconic) continue; + if (win->ewmh_flags & EWMH_F_FULLSCREEN) { fs_win = win; continue; } - stack_floater(win, ws->r); - map_window(win, XCB_WINDOW_NONE); + if (win->maximized) { + max_win = win; + continue; + } + + stack_floater(win); + reorder_window(win, SWM_STACK_ABOVE); + map_window(win); } - /* Make sure fs_win is stacked last so it's on top. */ + /* Make sure fs_win is stacked on top. */ if (fs_win) { - stack_floater(fs_win, ws->r); - map_window(fs_win, XCB_WINDOW_NONE); + stack_floater(fs_win); + reorder_window(fs_win, SWM_STACK_TOP); + map_window(fs_win); + } else if (max_win) { + stack_floater(max_win); + reorder_window(max_win, SWM_STACK_TOP); + map_window(max_win); } + + DNPRINTF(SWM_D_STACK, "stack_master: max_win: 0x%x\n", WINID(max_win)); } void @@ -4625,16 +4796,18 @@ max_stack(struct workspace *ws, struct swm_geometry *g) if (w->transient || w->iconic) continue; - if (!w->mapped && w != win) - map_window(w, XCB_WINDOW_NONE); + if (!w->mapped && w != win) { + reorder_window(w, SWM_STACK_TOP); + map_window(w); + } - if (w->floating && !w->floatmaxed) { + if (w->floating && !w->maximized) { /* * retain geometry for retrieval on exit from * max_stack mode */ store_float_geom(w); - w->floatmaxed = 1; + w->maximized = 1; } /* only reconfigure if necessary */ @@ -4655,25 +4828,29 @@ max_stack(struct workspace *ws, struct swm_geometry *g) /* If a parent exists, map/raise it first. */ if (parent) { - map_window(parent, XCB_WINDOW_NONE); + reorder_window(parent, SWM_STACK_TOP); + map_window(parent); /* Map siblings next. */ TAILQ_FOREACH(w, &ws->winlist, entry) if (w != win && !w->iconic && w->transient == parent->id) { - stack_floater(w, ws->r); - map_window(w, XCB_WINDOW_NONE); + stack_floater(w); + reorder_window(w, SWM_STACK_ABOVE); + map_window(w); } } /* Map/raise focused window. */ - map_window(win, XCB_WINDOW_NONE); + reorder_window(win, SWM_STACK_TOP); + map_window(win); /* Finally, map/raise children of focus window. */ TAILQ_FOREACH(w, &ws->winlist, entry) if (w->transient == win->id && !w->iconic) { - stack_floater(w, ws->r); - map_window(w, XCB_WINDOW_NONE); + stack_floater(w); + reorder_window(w, SWM_STACK_ABOVE); + map_window(w); } } @@ -4733,8 +4910,16 @@ send_to_ws(struct swm_region *r, union arg *args) DNPRINTF(SWM_D_MOVE, "send_to_ws: win 0x%x, ws %d\n", win->id, wsid); + if (wsid >= workspace_limit) + return; + + if (win->ws->idx == wsid) + return; + win_to_ws(win, wsid, 1); + win->maximized = 0; + /* Restack and set new focus. */ stack(); @@ -4859,6 +5044,9 @@ raise_toggle(struct swm_region *r, union arg *args) if (r == NULL || r->ws == NULL) return; + if (r->ws->focus && r->ws->focus->maximized) + return; + r->ws->always_raise = !r->ws->always_raise; /* bring floaters back to top */ @@ -4893,27 +5081,25 @@ get_win_name(xcb_window_t win) c = xcb_get_property(conn, 0, win, ewmh[_NET_WM_NAME].atom, XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX); r = xcb_get_property_reply(conn, c, NULL); - if (r) { - if (r->type == XCB_NONE) { - free(r); - /* Use WM_NAME instead; no UTF-8. */ - c = xcb_get_property(conn, 0, win, XCB_ATOM_WM_NAME, - XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX); - r = xcb_get_property_reply(conn, c, NULL); - if (r == NULL) - return (NULL); - if (r->type == XCB_NONE) { - free(r); - return (NULL); - } - } - if (r->length > 0) - name = strndup(xcb_get_property_value(r), - xcb_get_property_value_length(r)); - + if (r && r->type == XCB_NONE) { free(r); + /* Use WM_NAME instead; no UTF-8. */ + c = xcb_get_property(conn, 0, win, XCB_ATOM_WM_NAME, + XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX); + r = xcb_get_property_reply(conn, c, NULL); } + if (r && r->type != XCB_NONE && r->length > 0) + name = strndup(xcb_get_property_value(r), + xcb_get_property_value_length(r)); + else + name = strdup(""); + + if (name == NULL) + err(1, "get_win_name: failed to allocate memory."); + + free(r); + return (name); } @@ -4956,8 +5142,6 @@ uniconify(struct swm_region *r, union arg *args) continue; name = get_win_name(win->id); - if (name == NULL) - continue; fprintf(lfile, "%s.%u\n", name, win->id); free(name); } @@ -5151,8 +5335,6 @@ search_resp_uniconify(const char *resp, size_t len) if (!win->iconic) continue; name = get_win_name(win->id); - if (name == NULL) - continue; if (asprintf(&s, "%s.%u", name, win->id) == -1) { free(name); continue; @@ -5320,7 +5502,8 @@ done: void wkill(struct swm_region *r, union arg *args) { - DNPRINTF(SWM_D_MISC, "wkill: id: %d\n", args->id); + DNPRINTF(SWM_D_MISC, "wkill: win %#x, id: %d\n", WINID(r->ws->focus), + args->id); if (r->ws->focus == NULL) return; @@ -5335,29 +5518,83 @@ wkill(struct swm_region *r, union arg *args) } int -floating_toggle_win(struct ws_win *win) +clear_maximized(struct workspace *ws) +{ + struct ws_win *w; + int count = 0; + + /* Clear any maximized win(s) on ws. */ + TAILQ_FOREACH(w, &ws->winlist, entry) + if (w->maximized) { + w->maximized = 0; + if (w->floating) + load_float_geom(w); + ++count; + } + + return count; +} + +void +maximize_toggle(struct swm_region *r, union arg *args) { + struct ws_win *win = r->ws->focus; + + /* suppress unused warning since var is needed */ + (void)args; + if (win == NULL) - return (0); + return; - if (win->ws->r == NULL) + DNPRINTF(SWM_D_MISC, "maximize_toggle: win %#x\n", win->id); + + if (win->ewmh_flags & EWMH_F_FULLSCREEN) + return; + + if (win->ws->cur_layout == &layouts[SWM_MAX_STACK]) + return; + + if (win->floating) { + if (win->maximized) + load_float_geom(win); + else + store_float_geom(win); + } + + win->maximized = !win->maximized; + + stack(); + + if (win == win->ws->focus) + focus_win(win); + + focus_flush(); + DNPRINTF(SWM_D_MISC, "maximize_toggle: done\n"); +} + +int +floating_toggle_win(struct ws_win *win) +{ + if (win == NULL) return (0); /* reject floating toggles in max stack mode */ if (win->ws->cur_layout == &layouts[SWM_MAX_STACK]) return (0); + if (win->ws->r == NULL) + return (0); + if (win->floating) { - if (!win->floatmaxed) { - /* retain position for refloat */ + if (!win->maximized) store_float_geom(win); - } - win->floating = 0; } else { load_float_geom(win); - win->floating = 1; } + win->floating = !win->floating; + win->maximized = 0; + ewmh_update_actions(win); return (1); @@ -5527,13 +5764,17 @@ resize(struct ws_win *win, union arg *args) if (!win->transient && !win->floating) return; - /* reject resizes in max mode for floaters (transient ok) */ - if (win->floatmaxed) + /* In max_stack mode, should only resize transients. */ + if (win->ws->cur_layout == &layouts[SWM_MAX_STACK] && !win->transient) return; - win->manual = 1; - ewmh_update_win_state(win, ewmh[_SWM_WM_STATE_MANUAL].atom, - _NET_WM_STATE_ADD); + win->maximized = 0; + + if (!win->manual) { + win->manual = 1; + ewmh_update_win_state(win, ewmh[_SWM_WM_STATE_MANUAL].atom, + _NET_WM_STATE_ADD); + } stack(); @@ -5749,6 +5990,8 @@ move(struct ws_win *win, union arg *args) if (win->ws->cur_layout == &layouts[SWM_MAX_STACK] && !win->transient) return; + win->maximized = 0; + if (!win->manual) { win->manual = 1; ewmh_update_win_state(win, ewmh[_SWM_WM_STATE_MANUAL].atom, @@ -5899,6 +6142,7 @@ struct keyfunc { { "focus_next", focus, {.id = SWM_ARG_ID_FOCUSNEXT} }, { "focus_prev", focus, {.id = SWM_ARG_ID_FOCUSPREV} }, { "focus_urgent", focus, {.id = SWM_ARG_ID_FOCUSURGENT} }, + { "maximize_toggle", maximize_toggle,{0} }, { "height_grow", resize_step, {.id = SWM_ARG_ID_HEIGHTGROW} }, { "height_shrink", resize_step, {.id = SWM_ARG_ID_HEIGHTSHRINK} }, { "iconify", iconify, {0} }, @@ -6212,24 +6456,73 @@ spawn_select(struct swm_region *r, union arg *args, const char *spawn_name, free(real_args); } +/* Argument tokenizer. */ +char * +argsep(char **sp) { + int single_quoted = 0, double_quoted = 0; + char *arg, *cp, *next; + + if (*sp == NULL) + return NULL; + + /* Eat and move characters until end of argument is found. */ + for (arg = next = cp = *sp; *cp != '\0'; ++cp) { + if (!double_quoted && *cp == '\'') { + /* Eat single-quote. */ + single_quoted = !single_quoted; + } else if (!single_quoted && *cp == '"') { + /* Eat double-quote. */ + double_quoted = !double_quoted; + } else if (!single_quoted && *cp == '\\' && *(cp + 1) == '"') { + /* Eat backslash; copy escaped character to arg. */ + *next++ = *(++cp); + } else if (!single_quoted && !double_quoted && *cp == '\\' && + (*(cp + 1) == '\'' || *(cp + 1) == ' ')) { + /* Eat backslash; move escaped character. */ + *next++ = *(++cp); + } else if (!single_quoted && !double_quoted && + (*cp == ' ' || *cp == '\t')) { + /* Terminate argument. */ + *next++ = '\0'; + /* Point sp to beginning of next argument. */ + *sp = ++cp; + break; + } else { + /* Move regular character. */ + *next++ = *cp; + } + } + + /* Terminate argument if end of string. */ + if (*cp == '\0') { + *next = '\0'; + *sp = NULL; + } + + return arg; +} + void spawn_insert(const char *name, const char *args, int flags) { - char *arg, *cp, *ptr; struct spawn_prog *sp; + char *arg, *dup, *ptr; + + DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s[%s]\n", name, args); - DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s\n", name); + if (args == NULL || *args == '\0') + return; if ((sp = calloc(1, sizeof *sp)) == NULL) err(1, "spawn_insert: calloc"); if ((sp->name = strdup(name)) == NULL) err(1, "spawn_insert: strdup"); - /* convert the arguments to an argument list */ - if ((ptr = cp = strdup(args)) == NULL) + /* Convert the arguments to an argument list. */ + if ((ptr = dup = strdup(args)) == NULL) err(1, "spawn_insert: strdup"); - while ((arg = strsep(&ptr, " \t")) != NULL) { - /* empty field; skip it */ + while ((arg = argsep(&ptr)) != NULL) { + /* Null argument; skip it. */ if (*arg == '\0') continue; @@ -6240,10 +6533,11 @@ spawn_insert(const char *name, const char *args, int flags) if ((sp->argv[sp->argc - 1] = strdup(arg)) == NULL) err(1, "spawn_insert: strdup"); } - free(cp); + free(dup); sp->flags = flags; + DNPRINTF(SWM_D_SPAWN, "arg %d: [%s]\n", sp->argc, sp->argv[sp->argc-1]); TAILQ_INSERT_TAIL(&spawns, sp, entry); DNPRINTF(SWM_D_SPAWN, "spawn_insert: leave\n"); } @@ -6300,10 +6594,13 @@ setspawn(const char *name, const char *args, int flags) } int -setconfspawn(char *selector, char *value, int flags) +setconfspawn(const char *selector, const char *value, int flags) { char *args; + if (selector == NULL || strlen(selector) == 0) + return (1); + args = expand_tilde(value); DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args); @@ -6392,10 +6689,11 @@ setup_spawn(void) #define SWM_MODNAME_SIZE 32 #define SWM_KEY_WS "\n+ \t" int -parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) +parsekeys(const char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) { - char *cp, *name; + char *str, *cp, *name; KeySym uks; + DNPRINTF(SWM_D_KEY, "parsekeys: enter [%s]\n", keystr); if (mod == NULL || ks == NULL) { DNPRINTF(SWM_D_KEY, "parsekeys: no mod or key vars\n"); @@ -6405,7 +6703,10 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) DNPRINTF(SWM_D_KEY, "parsekeys: no keystr\n"); return (1); } - cp = keystr; + + if ((cp = str = strdup(keystr)) == NULL) + err(1, "parsekeys: strdup"); + *ks = XCB_NO_SYMBOL; *mod = 0; while ((name = strsep(&cp, SWM_KEY_WS)) != NULL) { @@ -6433,10 +6734,13 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) DNPRINTF(SWM_D_KEY, "parsekeys: invalid key %s\n", name); + free(str); return (1); } } } + + free(str); DNPRINTF(SWM_D_KEY, "parsekeys: leave ok\n"); return (0); } @@ -6535,7 +6839,7 @@ setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid, } int -setconfbinding(char *selector, char *value, int flags) +setconfbinding(const char *selector, const char *value, int flags) { enum keyfuncid kfid; unsigned int mod; @@ -6545,8 +6849,9 @@ setconfbinding(char *selector, char *value, int flags) /* suppress unused warning since var is needed */ (void)flags; - DNPRINTF(SWM_D_KEY, "setconfbinding: enter\n"); - if (selector == NULL) { + DNPRINTF(SWM_D_KEY, "setconfbinding: enter selector: [%s], " + "value: [%s]\n", selector, value); + if (selector == NULL || strlen(selector) == 0) { DNPRINTF(SWM_D_KEY, "setconfbinding: unbind %s\n", value); if (parsekeys(value, mod_key, &mod, &ks) == 0) { kfid = KF_INVALID; @@ -6599,6 +6904,7 @@ setup_keys(void) setkeybinding(MODKEY, XK_k, KF_FOCUS_PREV, NULL); setkeybinding(MODKEY_SHIFT, XK_Tab, KF_FOCUS_PREV, NULL); setkeybinding(MODKEY, XK_u, KF_FOCUS_URGENT,NULL); + setkeybinding(MODKEY, XK_e, KF_MAXIMIZE_TOGGLE,NULL); setkeybinding(MODKEY_SHIFT, XK_equal, KF_HEIGHT_GROW,NULL); setkeybinding(MODKEY_SHIFT, XK_minus, KF_HEIGHT_SHRINK,NULL); setkeybinding(MODKEY, XK_w, KF_ICONIFY, NULL); @@ -6723,7 +7029,7 @@ clear_keys(void) } int -setkeymapping(char *selector, char *value, int flags) +setkeymapping(const char *selector, const char *value, int flags) { char *keymapping_file; @@ -6768,9 +7074,11 @@ updatenumlockmask(void) + j]; keycode = xcb_key_symbols_get_keycode(syms, XK_Num_Lock); - if (kc == *keycode) - numlockmask = (1 << i); - free(keycode); + if (keycode) { + if (kc == *keycode) + numlockmask = (1 << i); + free(keycode); + } } } free(modmap_r); @@ -6864,15 +7172,18 @@ const char *quirkname[] = { /* SWM_Q_WS: retain '|' for back compat for now (2009-08-11) */ #define SWM_Q_WS "\n|+ \t" int -parsequirks(char *qstr, unsigned long *quirk) +parsequirks(const char *qstr, unsigned long *quirk) { - char *cp, *name; + char *str, *cp, *name; int i; - if (quirk == NULL) + if (quirk == NULL || qstr == NULL) return (1); - cp = qstr; + if ((str = strdup(qstr)) == NULL) + err(1, "parsequirks: strdup"); + + cp = str; *quirk = 0; while ((name = strsep(&cp, SWM_Q_WS)) != NULL) { if (cp) @@ -6884,6 +7195,7 @@ parsequirks(char *qstr, unsigned long *quirk) "parsequirks: %s\n", name); if (i == 0) { *quirk = 0; + free(str); return (0); } *quirk |= 1 << (i-1); @@ -6893,30 +7205,73 @@ parsequirks(char *qstr, unsigned long *quirk) if (i >= LENGTH(quirkname)) { DNPRINTF(SWM_D_QUIRK, "parsequirks: invalid quirk [%s]\n", name); + free(str); return (1); } } + + free(str); return (0); } void -quirk_insert(const char *class, const char *name, unsigned long quirk) +quirk_insert(const char *class, const char *instance, const char *name, + unsigned long quirk) { struct quirk *qp; + int failed = 0; + char *str; - DNPRINTF(SWM_D_QUIRK, "quirk_insert: %s:%s [%lu]\n", class, name, - quirk); + DNPRINTF(SWM_D_QUIRK, "quirk_insert: class: %s, instance: %s, name: %s," + " value: %lu\n", class, instance, name, quirk); if ((qp = malloc(sizeof *qp)) == NULL) err(1, "quirk_insert: malloc"); + if ((qp->class = strdup(class)) == NULL) err(1, "quirk_insert: strdup"); + if ((qp->instance = strdup(instance)) == NULL) + err(1, "quirk_insert: strdup"); if ((qp->name = strdup(name)) == NULL) err(1, "quirk_insert: strdup"); - qp->quirk = quirk; - TAILQ_INSERT_TAIL(&quirks, qp, entry); - + if (asprintf(&str, "^%s$", class) == -1) + err(1, "quirk_insert: asprintf"); + if (regcomp(&qp->regex_class, str, REG_EXTENDED | REG_NOSUB)) { + add_startup_exception("regex failed to compile quirk 'class' " + "field: %s", class); + failed = 1; + } + DNPRINTF(SWM_D_QUIRK, "quirk_insert: compiled: %s\n", str); + free(str); + + if (asprintf(&str, "^%s$", instance) == -1) + err(1, "quirk_insert: asprintf"); + if (regcomp(&qp->regex_instance, str, REG_EXTENDED | REG_NOSUB)) { + add_startup_exception("regex failed to compile quirk 'instance'" + " field: %s", instance); + failed = 1; + } + DNPRINTF(SWM_D_QUIRK, "quirk_insert: compiled: %s\n", str); + free(str); + + if (asprintf(&str, "^%s$", name) == -1) + err(1, "quirk_insert: asprintf"); + if (regcomp(&qp->regex_name, str, REG_EXTENDED | REG_NOSUB)) { + add_startup_exception("regex failed to compile quirk 'name' " + "field: %s", name); + failed = 1; + } + DNPRINTF(SWM_D_QUIRK, "quirk_insert: compiled: %s\n", str); + free(str); + + if (failed) { + DNPRINTF(SWM_D_QUIRK, "quirk_insert: regex error; skipping.\n"); + quirk_free(qp); + } else { + qp->quirk = quirk; + TAILQ_INSERT_TAIL(&quirks, qp, entry); + } DNPRINTF(SWM_D_QUIRK, "quirk_insert: leave\n"); } @@ -6927,42 +7282,54 @@ quirk_remove(struct quirk *qp) qp->name, qp->quirk); TAILQ_REMOVE(&quirks, qp, entry); + quirk_free(qp); + + DNPRINTF(SWM_D_QUIRK, "quirk_remove: leave\n"); +} + +void +quirk_free(struct quirk *qp) +{ + regfree(&qp->regex_class); + regfree(&qp->regex_instance); + regfree(&qp->regex_name); free(qp->class); + free(qp->instance); free(qp->name); free(qp); - - DNPRINTF(SWM_D_QUIRK, "quirk_remove: leave\n"); } void -quirk_replace(struct quirk *qp, const char *class, const char *name, - unsigned long quirk) +quirk_replace(struct quirk *qp, const char *class, const char *instance, + const char *name, unsigned long quirk) { - DNPRINTF(SWM_D_QUIRK, "quirk_replace: %s:%s [%lu]\n", qp->class, - qp->name, qp->quirk); + DNPRINTF(SWM_D_QUIRK, "quirk_replace: %s:%s:%s [%lu]\n", qp->class, + qp->instance, qp->name, qp->quirk); quirk_remove(qp); - quirk_insert(class, name, quirk); + quirk_insert(class, instance, name, quirk); DNPRINTF(SWM_D_QUIRK, "quirk_replace: leave\n"); } void -setquirk(const char *class, const char *name, unsigned long quirk) +setquirk(const char *class, const char *instance, const char *name, + unsigned long quirk) { struct quirk *qp; - DNPRINTF(SWM_D_QUIRK, "setquirk: enter %s:%s [%lu]\n", class, name, - quirk); + DNPRINTF(SWM_D_QUIRK, "setquirk: enter %s:%s:%s [%lu]\n", class, + instance, name, quirk); /* Remove/replace existing quirk. */ TAILQ_FOREACH(qp, &quirks, entry) { if (strcmp(qp->class, class) == 0 && + strcmp(qp->instance, instance) == 0 && strcmp(qp->name, name) == 0) { if (quirk == 0) quirk_remove(qp); else - quirk_replace(qp, class, name, quirk); + quirk_replace(qp, class, instance, name, quirk); DNPRINTF(SWM_D_QUIRK, "setquirk: leave\n"); return; } @@ -6970,49 +7337,99 @@ setquirk(const char *class, const char *name, unsigned long quirk) /* Only insert if quirk is not NONE. */ if (quirk) - quirk_insert(class, name, quirk); + quirk_insert(class, instance, name, quirk); DNPRINTF(SWM_D_QUIRK, "setquirk: leave\n"); } +/* Eat '\' in str used to escape square brackets and colon. */ +void +unescape_selector(char *str) +{ + char *cp; + + for (cp = str; *str != '\0'; ++str, ++cp) { + if (*str == '\\' && (*(str + 1) == ':' || *(str + 1) == ']' || + *(str + 1) == '[')) + ++str; + + *cp = *str; + } + *cp = '\0'; +} + int -setconfquirk(char *selector, char *value, int flags) +setconfquirk(const char *selector, const char *value, int flags) { - char *cp, *class, *name; - int retval; + char *str, *cp, *class; + char *instance = NULL, *name = NULL; + int retval, count = 0; unsigned long qrks; /* suppress unused warning since var is needed */ (void)flags; - if (selector == NULL) + if (selector == NULL || strlen(selector) == 0) return (0); - if ((cp = strchr(selector, ':')) == NULL) - return (0); - *cp = '\0'; - class = selector; - name = cp + 1; + + if ((str = strdup(selector)) == NULL) + err(1, "setconfquirk: strdup"); + + /* Find non-escaped colon. */ + class = cp = str; + if (*cp == ':') { + *cp = '\0'; + ++count; + } + + for (++cp; *cp != '\0'; ++cp) { + if (*cp == ':' && *(cp - 1) != '\\') { + *cp = '\0'; + ++count; + } + } + + unescape_selector(class); + if (count) { + instance = class + strlen(class) + 1; + unescape_selector(instance); + } else { + instance = ".*"; + } + + if (count > 1) { + name = instance + strlen(instance) + 1; + unescape_selector(name); + } else { + name = ".*"; + } + + DNPRINTF(SWM_D_CONF, "setconfquirk: class: %s, instance: %s, " + "name: %s\n", class, instance, name); + if ((retval = parsequirks(value, &qrks)) == 0) - setquirk(class, name, qrks); + setquirk(class, instance, name, qrks); + + free(str); return (retval); } void setup_quirks(void) { - setquirk("MPlayer", "xv", SWM_Q_FLOAT | SWM_Q_FULLSCREEN | SWM_Q_FOCUSPREV); - 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); - setquirk("XTerm", "xterm", SWM_Q_XTERM_FONTADJ); - setquirk("xine", "Xine Window", SWM_Q_FLOAT | SWM_Q_ANYWHERE); - setquirk("Xitk", "Xitk Combo", SWM_Q_FLOAT | SWM_Q_ANYWHERE); - setquirk("xine", "xine Panel", SWM_Q_FLOAT | SWM_Q_ANYWHERE); - setquirk("Xitk", "Xine Window", SWM_Q_FLOAT | SWM_Q_ANYWHERE); - setquirk("xine", "xine Video Fullscreen Window", SWM_Q_FULLSCREEN | SWM_Q_FLOAT); - setquirk("pcb", "pcb", SWM_Q_FLOAT); - setquirk("SDL_App", "SDL_App", SWM_Q_FLOAT | SWM_Q_FULLSCREEN); + setquirk("MPlayer", "xv", ".*", SWM_Q_FLOAT | SWM_Q_FULLSCREEN | SWM_Q_FOCUSPREV); + 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); + setquirk("XTerm", "xterm", ".*", SWM_Q_XTERM_FONTADJ); + setquirk("xine", "Xine Window", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE); + setquirk("Xitk", "Xitk Combo", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE); + setquirk("xine", "xine Panel", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE); + setquirk("Xitk", "Xine Window", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE); + setquirk("xine", "xine Video Fullscreen Window", ".*", SWM_Q_FULLSCREEN | SWM_Q_FLOAT); + setquirk("pcb", "pcb", ".*", SWM_Q_FLOAT); + setquirk("SDL_App", "SDL_App", ".*", SWM_Q_FLOAT | SWM_Q_FULLSCREEN); } /* conf file stuff */ @@ -7041,6 +7458,7 @@ enum { SWM_S_FOCUS_CLOSE_WRAP, SWM_S_FOCUS_DEFAULT, SWM_S_FOCUS_MODE, + SWM_S_ICONIC_ENABLED, SWM_S_REGION_PADDING, SWM_S_SPAWN_ORDER, SWM_S_SPAWN_TERM, @@ -7049,23 +7467,20 @@ enum { SWM_S_STACK_ENABLED, SWM_S_TERM_WIDTH, SWM_S_TILE_GAP, - SWM_S_TITLE_CLASS_ENABLED, - SWM_S_TITLE_NAME_ENABLED, SWM_S_URGENT_ENABLED, SWM_S_VERBOSE_LAYOUT, + SWM_S_WINDOW_CLASS_ENABLED, + SWM_S_WINDOW_INSTANCE_ENABLED, SWM_S_WINDOW_NAME_ENABLED, SWM_S_WORKSPACE_LIMIT }; int -setconfvalue(char *selector, char *value, int flags) +setconfvalue(const char *selector, const char *value, int flags) { struct workspace *ws; int i, ws_id, num_screens; - char *b; - - /* suppress unused warning since var is needed */ - (void)selector; + char *b, *str; switch (flags) { case SWM_S_BAR_ACTION: @@ -7110,8 +7525,11 @@ setconfvalue(char *selector, char *value, int flags) if (!bar_font_legacy) break; + if ((str = strdup(value)) == NULL) + err(1, "setconfvalue: strdup"); + /* If there are any non-XLFD entries, switch to Xft mode. */ - while ((b = strsep(&value, ",")) != NULL) { + while ((b = strsep(&str, ",")) != NULL) { if (*b == '\0') continue; if (!isxlfd(b)) { @@ -7119,6 +7537,8 @@ setconfvalue(char *selector, char *value, int flags) break; } } + + free(str); break; case SWM_S_BAR_FORMAT: free(bar_format); @@ -7203,6 +7623,9 @@ setconfvalue(char *selector, char *value, int flags) else errx(1, "focus_mode"); break; + case SWM_S_ICONIC_ENABLED: + iconic_enabled = atoi(value); + break; case SWM_S_REGION_PADDING: region_padding = atoi(value); if (region_padding < 0) @@ -7241,12 +7664,6 @@ setconfvalue(char *selector, char *value, int flags) case SWM_S_TILE_GAP: tile_gap = atoi(value); break; - case SWM_S_TITLE_CLASS_ENABLED: - title_class_enabled = atoi(value); - break; - case SWM_S_TITLE_NAME_ENABLED: - title_name_enabled = atoi(value); - break; case SWM_S_URGENT_ENABLED: urgent_enabled = atoi(value); break; @@ -7259,6 +7676,12 @@ setconfvalue(char *selector, char *value, int flags) layouts[i].l_string = plain_stacker; } break; + case SWM_S_WINDOW_CLASS_ENABLED: + window_class_enabled = atoi(value); + break; + case SWM_S_WINDOW_INSTANCE_ENABLED: + window_instance_enabled = atoi(value); + break; case SWM_S_WINDOW_NAME_ENABLED: window_name_enabled = atoi(value); break; @@ -7276,7 +7699,7 @@ setconfvalue(char *selector, char *value, int flags) } int -setconfmodkey(char *selector, char *value, int flags) +setconfmodkey(const char *selector, const char *value, int flags) { /* suppress unused warnings since vars are needed */ (void)selector; @@ -7296,14 +7719,16 @@ setconfmodkey(char *selector, char *value, int flags) } int -setconfcolor(char *selector, char *value, int flags) +setconfcolor(const char *selector, const char *value, int flags) { - setscreencolor(value, ((selector == NULL)?-1:atoi(selector)), flags); + setscreencolor(value, + (selector == NULL || strlen(selector) == 0) ? -1 : atoi(selector), + flags); return (0); } int -setconfregion(char *selector, char *value, int flags) +setconfregion(const char *selector, const char *value, int flags) { /* suppress unused warnings since vars are needed */ (void)selector; @@ -7314,7 +7739,7 @@ setconfregion(char *selector, char *value, int flags) } int -setautorun(char *selector, char *value, int flags) +setautorun(const char *selector, const char *value, int flags) { int ws_id; char s[1024]; @@ -7386,7 +7811,7 @@ setautorun(char *selector, char *value, int flags) } int -setlayout(char *selector, char *value, int flags) +setlayout(const char *selector, const char *value, int flags) { int ws_id, i, x, mg, ma, si, ar, f = 0; int st = SWM_V_STACK, num_screens; @@ -7473,7 +7898,7 @@ setlayout(char *selector, char *value, int flags) /* config options */ struct config_option { char *optname; - int (*func)(char*, char*, int); + int (*func)(const char*, const char*, int); int funcflags; }; struct config_option configopt[] = { @@ -7506,6 +7931,7 @@ struct config_option configopt[] = { { "focus_close_wrap", setconfvalue, SWM_S_FOCUS_CLOSE_WRAP }, { "focus_default", setconfvalue, SWM_S_FOCUS_DEFAULT }, { "focus_mode", setconfvalue, SWM_S_FOCUS_MODE }, + { "iconic_enabled", setconfvalue, SWM_S_ICONIC_ENABLED }, { "keyboard_mapping", setkeymapping, 0 }, { "layout", setlayout, 0 }, { "modkey", setconfmodkey, 0 }, @@ -7520,10 +7946,12 @@ struct config_option configopt[] = { { "stack_enabled", setconfvalue, SWM_S_STACK_ENABLED }, { "term_width", setconfvalue, SWM_S_TERM_WIDTH }, { "tile_gap", setconfvalue, SWM_S_TILE_GAP }, - { "title_class_enabled", setconfvalue, SWM_S_TITLE_CLASS_ENABLED }, - { "title_name_enabled", setconfvalue, SWM_S_TITLE_NAME_ENABLED }, + { "title_class_enabled", setconfvalue, SWM_S_WINDOW_CLASS_ENABLED }, /* For backwards compat. */ + { "title_name_enabled", setconfvalue, SWM_S_WINDOW_INSTANCE_ENABLED }, /* For backwards compat. */ { "urgent_enabled", setconfvalue, SWM_S_URGENT_ENABLED }, { "verbose_layout", setconfvalue, SWM_S_VERBOSE_LAYOUT }, + { "window_class_enabled", setconfvalue, SWM_S_WINDOW_CLASS_ENABLED }, + { "window_instance_enabled", setconfvalue, SWM_S_WINDOW_INSTANCE_ENABLED }, { "window_name_enabled", setconfvalue, SWM_S_WINDOW_NAME_ENABLED }, { "workspace_limit", setconfvalue, SWM_S_WORKSPACE_LIMIT }, }; @@ -7557,9 +7985,9 @@ int conf_load(const char *filename, int keymapping) { FILE *config; - char *line = NULL, *cp, *optsub, *optval = NULL; + char *line = NULL, *cp, *ce, *optsub, *optval = NULL; size_t linelen, lineno = 0; - int wordlen, i, optidx; + int wordlen, i, optidx, count; struct config_option *opt = NULL; DNPRINTF(SWM_D_CONF, "conf_load: begin\n"); @@ -7622,55 +8050,47 @@ conf_load(const char *filename, int keymapping) cp += wordlen; cp += strspn(cp, " \t\n"); /* eat whitespace */ - /* from here on out we call goto invalid to continue */ - /* get [selector] if any */ optsub = NULL; + count = 0; if (*cp == '[') { - cp++; - wordlen = strcspn(cp, "]"); - if (*cp != ']') { - if (wordlen == 0) { - add_startup_exception("%s: line %zd: " - "syntax error", filename, lineno); - goto invalid; + ++count; + /* Get length of selector. */ + for (ce = ++cp; *ce != '\0'; ++ce) { + /* Find matching (not escaped) bracket. */ + if (*ce == ']' && *(ce - 1) != '\\') { + --count; + break; } + } - if (asprintf(&optsub, "%.*s", wordlen, cp) == - -1) { - add_startup_exception("%s: line %zd: " - "unable to allocatememory for " - "selector", filename, lineno); - goto invalid; - } + if (count > 0) { + add_startup_exception("%s: line %zd: syntax " + "error: unterminated selector", filename, + lineno); + continue; } - cp += wordlen; - cp += strspn(cp, "] \t\n"); /* eat trailing */ + + /* ce points at ']'; terminate optsub. */ + *ce = '\0'; + optsub = cp; + cp = ce + 1; } cp += strspn(cp, "= \t\n"); /* eat trailing */ /* get RHS value */ - optval = strdup(cp); + optval = cp; if (strlen(optval) == 0) { add_startup_exception("%s: line %zd: must supply value " "to %s", filename, lineno, configopt[optidx].optname); - goto invalid; + continue; } /* call function to deal with it all */ if (configopt[optidx].func(optsub, optval, configopt[optidx].funcflags) != 0) { add_startup_exception("%s: line %zd: invalid data for " "%s", filename, lineno, configopt[optidx].optname); - goto invalid; - } -invalid: - if (optval) { - free(optval); - optval = NULL; - } - if (optsub) { - free(optsub); - optsub = NULL; + continue; } } @@ -7816,12 +8236,12 @@ manage_window(xcb_window_t id, uint16_t mapped) struct ws_win *win, *ww; int ws_idx; char ws_idx_str[SWM_PROPLEN]; + char *class, *instance, *name; struct swm_region *r; struct pid_e *p; struct quirk *qp; uint32_t i, wa[2]; xcb_get_geometry_reply_t *gr; - xcb_icccm_get_wm_protocols_reply_t wpr; if ((win = find_window(id)) != NULL) { DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x already " @@ -7867,12 +8287,23 @@ manage_window(xcb_window_t id, uint16_t mapped) Y(win) = gr->y + gr->border_width - border_width; win->bordered = 1; win->mapped = mapped; - win->floatmaxed = 0; + win->maximized = 0; win->ewmh_flags = 0; win->s = r->s; /* this never changes */ free(gr); + /* Select which X events to monitor and set border pixel color. */ + wa[0] = win->s->c[SWM_S_COLOR_UNFOCUS].pixel; + wa[1] = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_PROPERTY_CHANGE | + XCB_EVENT_MASK_STRUCTURE_NOTIFY; +#ifdef SWM_DEBUG + wa[1] |= XCB_EVENT_MASK_LEAVE_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE; +#endif + + xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL | + XCB_CW_EVENT_MASK, wa); + /* Get WM_SIZE_HINTS. */ xcb_icccm_get_wm_normal_hints_reply(conn, xcb_icccm_get_wm_normal_hints(conn, win->id), @@ -7892,18 +8323,8 @@ manage_window(xcb_window_t id, uint16_t mapped) set_child_transient(win, &win->transient); } - /* Get supported protocols. */ - if (xcb_icccm_get_wm_protocols_reply(conn, - xcb_icccm_get_wm_protocols(conn, win->id, a_prot), - &wpr, NULL)) { - for (i = 0; i < wpr.atoms_len; i++) { - if (wpr.atoms[i] == a_takefocus) - win->take_focus = 1; - if (wpr.atoms[i] == a_delete) - win->can_delete = 1; - } - xcb_icccm_get_wm_protocols_reply_wipe(&wpr); - } + /* Get WM_PROTOCOLS. */ + get_wm_protocols(win); win->iconic = get_swm_iconic(win); @@ -7941,31 +8362,38 @@ manage_window(xcb_window_t id, uint16_t mapped) ewmh_autoquirk(win); /* Determine initial quirks. */ - if (xcb_icccm_get_wm_class_reply(conn, + xcb_icccm_get_wm_class_reply(conn, xcb_icccm_get_wm_class(conn, win->id), - &win->ch, NULL)) { - DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, name: %s\n", - win->ch.class_name, win->ch.instance_name); - - /* java is retarded so treat it special */ - if (strstr(win->ch.instance_name, "sun-awt")) { - DNPRINTF(SWM_D_CLASS, "manage_window: java window " - "detected.\n"); - win->java = 1; - } - - TAILQ_FOREACH(qp, &quirks, entry) { - if (strcmp(win->ch.class_name, qp->class) == 0 && - strcmp(win->ch.instance_name, qp->name) == 0) { - DNPRINTF(SWM_D_CLASS, "manage_window: on quirks" - "list; mask: 0x%lx\n", qp->quirk); - if (qp->quirk & SWM_Q_FLOAT) - win->floating = 1; - win->quirks = qp->quirk; - } + &win->ch, NULL); + + class = win->ch.class_name ? win->ch.class_name : ""; + instance = win->ch.instance_name ? win->ch.instance_name : ""; + name = get_win_name(win->id); + + DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, instance: %s, " + "name: %s\n", class, instance, name); + + /* java is retarded so treat it special */ + if (win->ch.instance_name && strstr(win->ch.instance_name, "sun-awt")) { + DNPRINTF(SWM_D_CLASS, "manage_window: java window detected.\n"); + win->java = 1; + } + + TAILQ_FOREACH(qp, &quirks, entry) { + if (regexec(&qp->regex_class, class, 0, NULL, 0) == 0 && + regexec(&qp->regex_instance, instance, 0, NULL, 0) == 0 && + regexec(&qp->regex_name, name, 0, NULL, 0) == 0) { + DNPRINTF(SWM_D_CLASS, "manage_window: matched " + "quirk: %s:%s:%s mask: %#lx\n", qp->class, + qp->instance, qp->name, qp->quirk); + if (qp->quirk & SWM_Q_FLOAT) + win->floating = 1; + win->quirks = qp->quirk; } } + free(name); + /* Alter window position if quirky */ if (win->quirks & SWM_Q_ANYWHERE) win->manual = 1; @@ -7985,17 +8413,6 @@ manage_window(xcb_window_t id, uint16_t mapped) update_window(win); } - /* Select which X events to monitor and set border pixel color. */ - wa[0] = win->s->c[SWM_S_COLOR_UNFOCUS].pixel; - wa[1] = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_PROPERTY_CHANGE | - XCB_EVENT_MASK_STRUCTURE_NOTIFY; -#ifdef SWM_DEBUG - wa[1] |= XCB_EVENT_MASK_LEAVE_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE; -#endif - - xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL | - XCB_CW_EVENT_MASK, wa); - out: /* Figure out where to stack the window in the workspace. */ if (trans && (ww = find_window(trans))) @@ -8345,7 +8762,7 @@ configurerequest(xcb_configure_request_event_t *e) xcb_flush(conn); } } else if ((!win->manual || win->quirks & SWM_Q_ANYWHERE) && - !(win->ewmh_flags & EWMH_F_FULLSCREEN)) { + !(win->ewmh_flags & EWMH_F_FULLSCREEN) && !win->maximized) { if (win->ws->r) r = win->ws->r; else if (win->ws->old_r) @@ -8375,12 +8792,13 @@ configurerequest(xcb_configure_request_event_t *e) win->g_floatvalid = 1; if (win->floating && r && (win->transient || - win->ws->cur_layout != &layouts[SWM_MAX_STACK])) { + win->ws->cur_layout != &layouts[SWM_MAX_STACK]) + && !win->maximized) { WIDTH(win) = win->g_float.w; HEIGHT(win) = win->g_float.h; if (r) { - stack_floater(win, r); + stack_floater(win); focus_flush(); } } else { @@ -8585,20 +9003,33 @@ leavenotify(xcb_leave_notify_event_t *e) void mapnotify(xcb_map_notify_event_t *e) { - struct ws_win *win; + struct ws_win *win, *parent = NULL; + struct workspace *ws; DNPRINTF(SWM_D_EVENT, "mapnotify: window: 0x%x\n", e->window); if ((win = manage_window(e->window, 1)) == NULL) return; + ws = win->ws; + + /* Need to know if win was mapped due to ws switch. */ + if (ws->state == SWM_WS_STATE_MAPPED) { + if (ws->focus_pending && ws->focus_pending->transient) + parent = find_window(win->transient); + + /* If window's parent is maximized, don't clear it. */ + if ((parent == NULL) || !parent->maximized) + if (clear_maximized(ws) > 0) + stack(); + } win->mapped = 1; set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL); if (focus_mode != SWM_FOCUS_FOLLOW && WS_FOCUSED(win->ws)) { - if (win->ws->focus_pending == win) { + if (ws->focus_pending == win) { focus_win(win); - win->ws->focus_pending = NULL; + ws->focus_pending = NULL; focus_flush(); } } @@ -8609,10 +9040,22 @@ mapnotify(xcb_map_notify_event_t *e) void mappingnotify(xcb_mapping_notify_event_t *e) { + struct ws_win *w; + int i, j, num_screens; + xcb_refresh_keyboard_mapping(syms, e); - if (e->request == XCB_MAPPING_KEYBOARD) + if (e->request == XCB_MAPPING_KEYBOARD) { grabkeys(); + + /* Regrab buttons on all managed windows. */ + num_screens = get_screen_count(); + for (i = 0; i < num_screens; i++) + for (j = 0; j < workspace_limit; j++) + TAILQ_FOREACH(w, &screens[i].ws[j].winlist, + entry) + grabbuttons(w); + } } void @@ -8645,7 +9088,10 @@ maprequest(xcb_map_request_event_t *e) /* The new window should get focus; prepare. */ if (focus_mode != SWM_FOCUS_FOLLOW && - !(win->quirks & SWM_Q_NOFOCUSONMAP)) { + !(win->quirks & SWM_Q_NOFOCUSONMAP) && + (!(win->hints.flags & XCB_ICCCM_WM_HINT_INPUT) || + (win->hints.flags & XCB_ICCCM_WM_HINT_INPUT && + win->hints.input))) { if (win->quirks & SWM_Q_FOCUSONMAP_SINGLE) { /* See if other wins of same type are already mapped. */ TAILQ_FOREACH(w, &win->ws->winlist, entry) { @@ -8717,7 +9163,7 @@ char * get_atom_name(xcb_atom_t atom) { char *name = NULL; -#if 0 +#ifdef SWM_DEBUG_ATOM_NAMES /* * This should be disabled during most debugging since * xcb_get_* causes an xcb_flush. @@ -8795,6 +9241,10 @@ propertynotify(xcb_property_notify_event_t *e) focus_flush(); } } else if (e->state == XCB_PROPERTY_DELETE) { + /* Reload floating geometry in case region changed. */ + if (win->floating) + load_float_geom(win); + /* The window is no longer iconic, restack ws. */ if (focus_mode != SWM_FOCUS_FOLLOW) ws->focus_pending = get_focus_magic(win); @@ -8818,6 +9268,8 @@ propertynotify(xcb_property_notify_event_t *e) } else if (e->atom == XCB_ATOM_WM_CLASS || e->atom == XCB_ATOM_WM_NAME) { bar_draw(); + } else if (e->atom == a_prot) { + get_wm_protocols(win); } xcb_flush(conn); @@ -8882,15 +9334,6 @@ unmapnotify(xcb_unmap_notify_event_t *e) focus_flush(); } -#if 0 -void -visibilitynotify(xcb_visibility_notify_event_t *e) -{ - DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: 0x%x\n", - e->window); -} -#endif - void clientmessage(xcb_client_message_event_t *e) { @@ -9096,6 +9539,9 @@ new_region(struct swm_screen *s, int x, int y, int w, int h) if (ws == NULL) errx(1, "new_region: no free workspaces"); + if (ws->state == SWM_WS_STATE_HIDDEN) + ws->state = SWM_WS_STATE_MAPPING; + X(r) = x; Y(r) = y; WIDTH(r) = w; @@ -9205,6 +9651,7 @@ out: TAILQ_FOREACH(r, &screens[i].orl, entry) { TAILQ_FOREACH(win, &r->ws->winlist, entry) unmap_window(win); + r->ws->state = SWM_WS_STATE_HIDDEN; /* The screen shouldn't focus on an unused region. */ if (screens[i].r_focus == r) @@ -9255,6 +9702,11 @@ screenchange(xcb_randr_screen_change_notify_event_t *e) bar_draw(); focus_flush(); + + /* Update workspace state on all regions. */ + for (i = 0; i < num_screens; i++) + TAILQ_FOREACH(r, &screens[i].rl, entry) + r->ws->state = SWM_WS_STATE_MAPPED; } void @@ -9437,6 +9889,7 @@ setup_screens(void) ws->focus_pending = NULL; ws->r = NULL; ws->old_r = NULL; + ws->state = SWM_WS_STATE_HIDDEN; TAILQ_INIT(&ws->winlist); TAILQ_INIT(&ws->unmanagedlist); @@ -9603,7 +10056,7 @@ event_handle(xcb_generic_event_t *evt) /*EVENT(XCB_SELECTION_NOTIFY, );*/ /*EVENT(XCB_SELECTION_REQUEST, );*/ EVENT(XCB_UNMAP_NOTIFY, unmapnotify); - /*EVENT(XCB_VISIBILITY_NOTIFY, visibilitynotify);*/ + /*EVENT(XCB_VISIBILITY_NOTIFY, );*/ #undef EVENT } if (type - xrandr_eventbase == XCB_RANDR_SCREEN_CHANGE_NOTIFY)