static const char *buildstr = SPECTRWM_VERSION;
#endif
-#if RANDR_MAJOR < 1
-# error XRandR versions less than 1.0 are not supported
+#if !defined(__CYGWIN__) /* cygwin chokes on xrandr stuff */
+# if RANDR_MAJOR < 1
+# error XRandR versions less than 1.0 are not supported
#endif
-#if RANDR_MAJOR >= 1
-#if RANDR_MINOR >= 2
-#define SWM_XRR_HAS_CRTC
-#endif
-#endif
+# if RANDR_MAJOR >= 1
+# if RANDR_MINOR >= 2
+# define SWM_XRR_HAS_CRTC
+# endif
+# endif
+#endif /* __CYGWIN__ */
#ifndef XCB_ICCCM_NUM_WM_HINTS_ELEMENTS
#define XCB_ICCCM_SIZE_HINT_P_MIN_SIZE XCB_SIZE_HINT_P_MIN_SIZE
#define xcb_icccm_wm_hints_t xcb_wm_hints_t
#endif
-#define SWM_DEBUG
+/*#define SWM_DEBUG*/
#ifdef SWM_DEBUG
#define DPRINTF(x...) do { \
if (swm_debug) \
xrc.alpha = 0xffff;
#define LENGTH(x) (int)(sizeof (x) / sizeof (x)[0])
-#define MODKEY Mod1Mask
-#define CLEANMASK(mask) ((mask) & ~(numlockmask | LockMask))
-#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
-#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+#define MODKEY XCB_MOD_MASK_1
+#define CLEANMASK(mask) ((mask) & ~(numlockmask | XCB_MOD_MASK_LOCK))
+#define BUTTONMASK (XCB_EVENT_MASK_BUTTON_PRESS | \
+ XCB_EVENT_MASK_BUTTON_RELEASE)
+#define MOUSEMASK (BUTTONMASK|XCB_EVENT_MASK_POINTER_MOTION)
#define SWM_PROPLEN (16)
#define SWM_FUNCNAME_LEN (32)
#define SWM_KEYS_LEN (255)
#define YESNO(x) ((x) ? "yes" : "no")
#define SWM_FOCUS_DEFAULT (0)
-#define SWM_FOCUS_SYNERGY (1)
-#define SWM_FOCUS_FOLLOW (2)
+#define SWM_FOCUS_FOLLOW (1)
+#define SWM_FOCUS_MANUAL (2)
#define SWM_CONF_DEFAULT (0)
#define SWM_CONF_KEYMAPPING (1)
#define SWM_BAR_JUSTIFY_CENTER (1)
#define SWM_BAR_JUSTIFY_RIGHT (2)
#define SWM_BAR_OFFSET (4)
-#define SWM_BAR_FONTS "-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*," \
- "-*-profont-*-*-*-*-*-*-*-*-*-*-*-*," \
- "-*-times-medium-r-*-*-*-*-*-*-*-*-*-*," \
- "-misc-fixed-medium-r-*-*-*-*-*-*-*-*-*-*," \
- "-*-*-*-r-*--*-*-*-*-*-*-*-*"
-
-char *bar_argv[] = { NULL, NULL };
-int bar_pipe[2];
-unsigned char bar_ext[SWM_BAR_MAX];
-char bar_vertext[SWM_BAR_MAX];
-int bar_version = 0;
-sig_atomic_t bar_alarm = 0;
-int bar_delay = 30;
-int bar_enabled = 1;
-int bar_border_width = 1;
-int bar_at_bottom = 0;
-int bar_extra = 1;
-int bar_extra_running = 0;
-int bar_verbose = 1;
-int bar_height = 0;
-int bar_justify = SWM_BAR_JUSTIFY_LEFT;
-char *bar_format = NULL;
-int stack_enabled = 1;
-int clock_enabled = 1;
-int urgent_enabled = 0;
-char *clock_format = NULL;
-int title_name_enabled = 0;
-int title_class_enabled = 0;
-int window_name_enabled = 0;
-int focus_mode = SWM_FOCUS_DEFAULT;
-int focus_close = SWM_STACK_BELOW;
-int focus_close_wrap = 1;
-int focus_default = SWM_STACK_TOP;
-int spawn_position = SWM_STACK_TOP;
-int disable_border = 0;
-int border_width = 1;
-int verbose_layout = 0;
-time_t time_started;
-pid_t bar_pid;
-XftFont *bar_font;
-char *bar_fonts;
-XftColor bar_font_color;
-struct passwd *pwd;
+#define SWM_BAR_FONTS "-*-terminus-medium-*-*-*-12-*-*-*-*-*-*-*," \
+ "-*-profont-*-*-*-*-12-*-*-*-*-*-*-*," \
+ "-*-times-medium-r-*-*-12-*-*-*-*-*-*-*," \
+ "-misc-fixed-medium-r-*-*-12-*-*-*-*-*-*-*," \
+ "-*-*-*-r-*-*-*-*-*-*-*-*-*-*"
+
+#ifdef X_HAVE_UTF8_STRING
+#define DRAWSTRING(x...) Xutf8DrawString(x)
+#else
+#define DRAWSTRING(x...) XmbDrawString(x)
+#endif
+
+char *bar_argv[] = { NULL, NULL };
+int bar_pipe[2];
+unsigned char bar_ext[SWM_BAR_MAX];
+char bar_vertext[SWM_BAR_MAX];
+int bar_version = 0;
+sig_atomic_t bar_alarm = 0;
+int bar_delay = 30;
+int bar_enabled = 1;
+int bar_border_width = 1;
+int bar_at_bottom = 0;
+int bar_extra = 1;
+int bar_extra_running = 0;
+int bar_verbose = 1;
+int bar_height = 0;
+int bar_justify = SWM_BAR_JUSTIFY_LEFT;
+char *bar_format = NULL;
+int stack_enabled = 1;
+int clock_enabled = 1;
+int urgent_enabled = 0;
+char *clock_format = NULL;
+int title_name_enabled = 0;
+int title_class_enabled = 0;
+int window_name_enabled = 0;
+int focus_mode = SWM_FOCUS_DEFAULT;
+int focus_close = SWM_STACK_BELOW;
+int focus_close_wrap = 1;
+int focus_default = SWM_STACK_TOP;
+int spawn_position = SWM_STACK_TOP;
+int disable_border = 0;
+int border_width = 1;
+int verbose_layout = 0;
+time_t time_started;
+pid_t bar_pid;
+XFontSet bar_fs;
+XFontSetExtents *bar_fs_extents;
+XftFont *bar_font;
+int bar_font_legacy = 1;
+char *bar_fonts;
+XftColor bar_font_color;
+struct passwd *pwd;
/* layout manager data */
struct swm_geometry {
TAILQ_ENTRY(ws_win) entry;
xcb_window_t id;
xcb_window_t transient;
- struct ws_win *child_trans; /* transient child window */
+ struct ws_win *focus_child; /* focus on child transient */
struct swm_geometry g; /* current geometry */
struct swm_geometry g_float; /* region coordinates */
int g_floatvalid; /* g_float geometry validity */
} c[SWM_S_COLOR_MAX];
xcb_gcontext_t bar_gc;
+ GC bar_gc_legacy;
};
struct swm_screen *screens;
_NET_ACTIVE_WINDOW,
_NET_CLOSE_WINDOW,
_NET_MOVERESIZE_WINDOW,
+ _NET_WM_ACTION_ABOVE,
_NET_WM_ACTION_CLOSE,
_NET_WM_ACTION_FULLSCREEN,
_NET_WM_ACTION_MOVE,
_NET_WM_ACTION_RESIZE,
_NET_WM_ALLOWED_ACTIONS,
+ _NET_WM_NAME,
_NET_WM_STATE,
_NET_WM_STATE_ABOVE,
_NET_WM_STATE_FULLSCREEN,
{"_NET_ACTIVE_WINDOW", XCB_ATOM_NONE},
{"_NET_CLOSE_WINDOW", XCB_ATOM_NONE},
{"_NET_MOVERESIZE_WINDOW", XCB_ATOM_NONE},
+ {"_NET_WM_ACTION_ABOVE", XCB_ATOM_NONE},
{"_NET_WM_ACTION_CLOSE", XCB_ATOM_NONE},
{"_NET_WM_ACTION_FULLSCREEN", XCB_ATOM_NONE},
{"_NET_WM_ACTION_MOVE", XCB_ATOM_NONE},
{"_NET_WM_ACTION_RESIZE", XCB_ATOM_NONE},
{"_NET_WM_ALLOWED_ACTIONS", XCB_ATOM_NONE},
+ {"_NET_WM_NAME", XCB_ATOM_NONE},
{"_NET_WM_STATE", XCB_ATOM_NONE},
{"_NET_WM_STATE_ABOVE", XCB_ATOM_NONE},
{"_NET_WM_STATE_FULLSCREEN", XCB_ATOM_NONE},
void configurerequest(xcb_configure_request_event_t *);
void constrain_window(struct ws_win *, struct swm_region *, int);
void destroynotify(xcb_destroy_notify_event_t *);
-void do_sync(void);
void enternotify(xcb_enter_notify_event_t *);
+void event_drain(uint8_t);
void event_error(xcb_generic_error_t *);
void event_handle(xcb_generic_event_t *);
char *expand_tilde(char *);
struct ws_win *find_window(xcb_window_t);
int floating_toggle_win(struct ws_win *);
void focus(struct swm_region *, union arg *);
-void focus_magic(struct ws_win *);
+void focus_flush(void);
+struct ws_win *focus_magic(struct ws_win *);
+void focus_win(struct ws_win *);
#ifdef SWM_DEBUG
void focusin(xcb_focus_in_event_t *);
#endif
xcb_screen_t *get_screen(int);
char *get_win_name(xcb_window_t);
uint32_t getstate(xcb_window_t);
-void grabbuttons(struct ws_win *, int);
+void grabbuttons(struct ws_win *);
void keypress(xcb_key_press_event_t *);
#ifdef SWM_DEBUG
void leavenotify(xcb_leave_notify_event_t *);
#endif
+void load_float_geom(struct ws_win *, struct swm_region *);
void map_window_raised(xcb_window_t);
void mapnotify(xcb_map_notify_event_t *);
void mappingnotify(xcb_mapping_notify_event_t *);
void propertynotify(xcb_property_notify_event_t *);
void spawn_select(struct swm_region *, union arg *, char *, int *);
void screenchange(xcb_randr_screen_change_notify_event_t *);
+void shutdown_cleanup(void);
void store_float_geom(struct ws_win *, struct swm_region *);
void unmanage_window(struct ws_win *);
void unmapnotify(xcb_unmap_notify_event_t *);
char *
expand_tilde(char *s)
{
- struct passwd *pwd;
+ struct passwd *ppwd;
int i, max;
char *user;
const char *sc = s;
user[i] = '\0';
s = &s[i];
- pwd = strlen(user) == 0 ? getpwuid(getuid()) : getpwnam(user);
- if (pwd == NULL)
+ ppwd = strlen(user) == 0 ? getpwuid(getuid()) : getpwnam(user);
+ if (ppwd == NULL)
result = strdup(sc);
else
- if (asprintf(&result, "%s%s", pwd->pw_dir, s) == -1)
+ if (asprintf(&result, "%s%s", ppwd->pw_dir, s) == -1)
result = NULL;
out:
if (result == NULL)
}
void
-do_sync(void)
+focus_flush(void)
{
- xcb_get_input_focus_cookie_t c;
- xcb_get_input_focus_reply_t *r;
-
- /* mimic XSync() */
- c = xcb_get_input_focus(conn);
- xcb_flush(conn);
- r = xcb_get_input_focus_reply(conn, c, NULL);
- if (r)
- free(r);
+ if (focus_mode == SWM_FOCUS_DEFAULT)
+ event_drain(XCB_ENTER_NOTIFY);
+ else
+ xcb_flush(conn);
}
void
win->g = win->ws->r->g;
win->bordered = 0;
} else {
- if (win->g_floatvalid) {
- /* refloat at last floating relative position */
- win->g = win->g_float;
- X(win) += X(win->ws->r);
- Y(win) += Y(win->ws->r);
- }
+ load_float_geom(win, win->ws->r);
}
return (1);
if (win->floating) {
actions[n++] = ewmh[_NET_WM_ACTION_MOVE].atom;
actions[n++] = ewmh[_NET_WM_ACTION_RESIZE].atom;
+ actions[n++] = ewmh[_NET_WM_ACTION_ABOVE].atom;
}
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id,
#define _NET_WM_STATE_TOGGLE 2 /* toggle property */
void
-ewmh_update_win_state(struct ws_win *win, long state, long action)
+ewmh_update_win_state(struct ws_win *win, xcb_atom_t state, long action)
{
unsigned int mask = 0;
unsigned int changed = 0;
return;
DNPRINTF(SWM_D_PROP, "ewmh_update_win_state: window: 0x%x, state: %ld, "
- "action: %ld\n", win->id, state, action);
+ "action: %ld\n", win->id, (unsigned long)state, action);
if (state == ewmh[_NET_WM_STATE_FULLSCREEN].atom)
mask = EWMH_F_FULLSCREEN;
- if (state == ewmh[_NET_WM_STATE_ABOVE].atom)
+ else if (state == ewmh[_NET_WM_STATE_ABOVE].atom)
mask = EWMH_F_ABOVE;
- if (state == ewmh[_SWM_WM_STATE_MANUAL].atom)
+ else if (state == ewmh[_SWM_WM_STATE_MANUAL].atom)
mask = SWM_F_MANUAL;
- if (state == ewmh[_NET_WM_STATE_SKIP_PAGER].atom)
+ else if (state == ewmh[_NET_WM_STATE_SKIP_PAGER].atom)
mask = EWMH_F_SKIP_PAGER;
- if (state == ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom)
+ else if (state == ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom)
mask = EWMH_F_SKIP_TASKBAR;
-
orig_flags = win->ewmh_flags;
switch (action) {
changed = (win->ewmh_flags & mask) ^ (orig_flags & mask) ? 1 : 0;
- if (state == ewmh[_NET_WM_STATE_ABOVE].atom)
- if (changed)
- if (!floating_toggle_win(win))
+ if (state == ewmh[_NET_WM_STATE_ABOVE].atom) {
+ if (changed && !floating_toggle_win(win))
win->ewmh_flags = orig_flags; /* revert */
- if (state == ewmh[_SWM_WM_STATE_MANUAL].atom)
+ } else if (state == ewmh[_SWM_WM_STATE_MANUAL].atom) {
if (changed)
win->manual = (win->ewmh_flags & SWM_F_MANUAL) != 0;
- if (state == ewmh[_NET_WM_STATE_FULLSCREEN].atom)
- if (changed)
- if (!ewmh_set_win_fullscreen(win,
+ } else if (state == ewmh[_NET_WM_STATE_FULLSCREEN].atom) {
+ if (changed && !ewmh_set_win_fullscreen(win,
win->ewmh_flags & EWMH_F_FULLSCREEN))
win->ewmh_flags = orig_flags; /* revert */
+ }
xcb_delete_property(conn, win->id, ewmh[_NET_WM_STATE].atom);
xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id,
ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
&ewmh[_NET_WM_STATE_FULLSCREEN].atom);
- if (win->ewmh_flags & EWMH_F_SKIP_PAGER)
+ else if (win->ewmh_flags & EWMH_F_SKIP_PAGER)
xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id,
ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
&ewmh[_NET_WM_STATE_SKIP_PAGER].atom);
- if (win->ewmh_flags & EWMH_F_SKIP_TASKBAR)
+ else if (win->ewmh_flags & EWMH_F_SKIP_TASKBAR)
xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id,
ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
&ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom);
- if (win->ewmh_flags & EWMH_F_ABOVE)
+ else if (win->ewmh_flags & EWMH_F_ABOVE)
xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id,
ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
&ewmh[_NET_WM_STATE_ABOVE].atom);
- if (win->ewmh_flags & SWM_F_MANUAL)
+ else if (win->ewmh_flags & SWM_F_MANUAL)
xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id,
ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1,
&ewmh[_SWM_WM_STATE_MANUAL].atom);
}
#else
void
-dumpwins(struct swm_region *r, union arg *args)
+dumpwins(struct swm_region *r, union arg *s)
{
+ (void)r;
+ (void)s;
}
#endif /* SWM_DEBUG */
err(1, "fcntl F_SETFL");
}
+void
+bar_print_legacy(struct swm_region *r, const char *s)
+{
+ xcb_rectangle_t rect;
+ uint32_t gcv[1];
+ XGCValues gcvd;
+ int x = 0;
+ size_t len;
+ XRectangle ibox, lbox;
+ GC draw;
+
+ len = strlen(s);
+ XmbTextExtents(bar_fs, s, len, &ibox, &lbox);
+
+ switch (bar_justify) {
+ case SWM_BAR_JUSTIFY_LEFT:
+ x = SWM_BAR_OFFSET;
+ break;
+ case SWM_BAR_JUSTIFY_CENTER:
+ x = (WIDTH(r) - lbox.width) / 2;
+ break;
+ case SWM_BAR_JUSTIFY_RIGHT:
+ x = WIDTH(r) - lbox.width - SWM_BAR_OFFSET;
+ break;
+ }
+
+ if (x < SWM_BAR_OFFSET)
+ x = SWM_BAR_OFFSET;
+
+ rect.x = 0;
+ rect.y = 0;
+ rect.width = WIDTH(r->bar);
+ rect.height = HEIGHT(r->bar);
+
+ /* clear back buffer */
+ gcv[0] = r->s->c[SWM_S_COLOR_BAR].pixel;
+ xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv);
+ xcb_poly_fill_rectangle(conn, r->bar->buffer, r->s->bar_gc, 1, &rect);
+
+ /* draw back buffer */
+ gcvd.graphics_exposures = 0;
+ draw = XCreateGC(display, r->bar->buffer, GCGraphicsExposures, &gcvd);
+ XSetForeground(display, draw, r->s->c[SWM_S_COLOR_BAR_FONT].pixel);
+ DRAWSTRING(display, r->bar->buffer, bar_fs, draw,
+ x, (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 -
+ lbox.y, s, len);
+ XFreeGC(display, draw);
+
+ /* blt */
+ xcb_copy_area(conn, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0,
+ 0, 0, WIDTH(r->bar), HEIGHT(r->bar));
+}
+
void
bar_print(struct swm_region *r, const char *s)
{
/* clear back buffer */
gcv[0] = r->s->c[SWM_S_COLOR_BAR].pixel;
xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv);
- xcb_poly_fill_rectangle(conn, r->bar->buffer, r->s->bar_gc,
- sizeof(rect), &rect);
+ xcb_poly_fill_rectangle(conn, r->bar->buffer, r->s->bar_gc, 1, &rect);
/* draw back buffer */
- gcv[0] = r->s->c[SWM_S_COLOR_BAR].pixel;
- xcb_change_gc(conn, r->s->bar_gc, XCB_GC_BACKGROUND, gcv);
- gcv[0] = r->s->c[SWM_S_COLOR_BAR_FONT].pixel;
- xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv);
-
draw = XftDrawCreate(display, r->bar->buffer,
DefaultVisual(display, r->s->idx),
DefaultColormap(display, r->s->idx));
continue;
bar_fmt(fmtexp, fmtnew, r, sizeof fmtnew);
bar_replace(fmtnew, fmtrep, r, sizeof fmtrep);
- bar_print(r, fmtrep);
+ if (bar_font_legacy)
+ bar_print_legacy(r, fmtrep);
+ else
+ bar_print(r, fmtrep);
}
}
}
bar_enabled = !bar_enabled;
stack();
+
/* must be after stack */
bar_update();
- xcb_flush(conn);
+ focus_flush();
}
void
bar_update();
}
+int
+isxlfd(char *s)
+{
+ int count = 0;
+
+ while ((s = index(s, '-'))) {
+ ++count;
+ ++s;
+ }
+
+ return (count == 14);
+}
+
void
-bar_setup(struct swm_region *r)
+fontset_init()
{
- char *font, *fontpos, *dup, *search;
- int count;
- xcb_screen_t *screen;
- uint32_t wa[3];
- XRenderColor color;
+ char *default_string;
+ char **missing_charsets;
+ int num_missing_charsets = 0;
+ int i;
- if ((screen = get_screen(r->s->idx)) == NULL)
- errx(1, "ERROR: can't get screen %d.", r->s->idx);
+ if (bar_fs) {
+ XFreeFontSet(display, bar_fs);
+ bar_fs = NULL;
+ }
- if (r->bar != NULL)
- return;
+ DNPRINTF(SWM_D_INIT, "fontset_init: loading bar_fonts: %s\n", bar_fonts);
- if ((r->bar = calloc(1, sizeof(struct swm_bar))) == NULL)
- err(1, "bar_setup: calloc: failed to allocate memory.");
+ bar_fs = XCreateFontSet(display, bar_fonts, &missing_charsets,
+ &num_missing_charsets, &default_string);
+
+ if (num_missing_charsets > 0) {
+ warnx("Unable to load charset(s):");
+
+ for (i = 0; i < num_missing_charsets; ++i)
+ warnx("%s", missing_charsets[i]);
+
+ XFreeStringList(missing_charsets);
+
+ if (strcmp(default_string, ""))
+ warnx("Glyphs from those sets will be replaced "
+ "by '%s'.", default_string);
+ else
+ warnx("Glyphs from those sets won't be drawn.");
+ }
+
+ if (bar_fs == NULL)
+ errx(1, "Error creating font set structure.");
+
+ bar_fs_extents = XExtentsOfFontSet(bar_fs);
+
+ bar_height = bar_fs_extents->max_logical_extent.height +
+ 2 * bar_border_width;
+
+ if (bar_height < 1)
+ bar_height = 1;
+}
+
+void
+xft_init(struct swm_region *r)
+{
+ char *font, *d, *search;
+ XRenderColor color;
if (bar_font == NULL) {
- if ((dup = strdup(bar_fonts)) == NULL)
+ if ((d = strdup(bar_fonts)) == NULL)
errx(1, "insufficient memory.");
- search = dup;
+ search = d;
while ((font = strsep(&search, ",")) != NULL) {
if (*font == '\0')
continue;
- DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", font);
-
- count = 0;
- fontpos = font;
- while ((fontpos = index(fontpos, '-'))) {
- count++;
- fontpos++;
- }
+ DNPRINTF(SWM_D_INIT, "xft_init: try font %s\n", font);
- if (count == 14)
+ if (isxlfd(font)) {
bar_font = XftFontOpenXlfd(display, r->s->idx,
font);
- else
+ } else {
bar_font = XftFontOpenName(display, r->s->idx,
font);
+ }
+
if (!bar_font) {
warnx("unable to load font %s", font);
continue;
break;
}
}
- free(dup);
+ free(d);
}
if (bar_font == NULL)
errx(1, "unable to open a font");
+ PIXEL_TO_XRENDERCOLOR(r->s->c[SWM_S_COLOR_BAR_FONT].pixel, color);
+
+ if (!XftColorAllocValue(display, DefaultVisual(display, r->s->idx),
+ DefaultColormap(display, r->s->idx), &color, &bar_font_color))
+ warn("unable to allocate Xft color");
+
bar_height = bar_font->height + 2 * bar_border_width;
if (bar_height < 1)
bar_height = 1;
+}
- PIXEL_TO_XRENDERCOLOR(r->s->c[SWM_S_COLOR_BAR_FONT].pixel, color);
+void
+bar_setup(struct swm_region *r)
+{
+ xcb_screen_t *screen;
+ uint32_t wa[3];
- if (!XftColorAllocValue(display, DefaultVisual(display, r->s->idx),
- DefaultColormap(display, r->s->idx), &color, &bar_font_color))
- warn("unable to allocate Xft color");
+ DNPRINTF(SWM_D_BAR, "bar_setup: screen %d.\n",
+ r->s->idx);
+
+ if ((screen = get_screen(r->s->idx)) == NULL)
+ errx(1, "ERROR: can't get screen %d.", r->s->idx);
+
+ if (r->bar != NULL)
+ return;
+
+ if ((r->bar = calloc(1, sizeof(struct swm_bar))) == NULL)
+ err(1, "bar_setup: calloc: failed to allocate memory.");
+
+ if (bar_font_legacy)
+ fontset_init();
+ else
+ xft_init(r);
X(r->bar) = X(r);
Y(r->bar) = bar_at_bottom ? (Y(r) + HEIGHT(r) - bar_height) : Y(r);
ce.window = ev->window;
/* make response appear more WM_SIZE_HINTS-compliant */
- if (win->sh.flags)
+ if (win->sh.flags) {
DNPRINTF(SWM_D_MISC, "config_win: hints: window: 0x%x,"
" sh.flags: %u, min: %d x %d, max: %d x %d, inc: "
"%d x %d\n", win->id, win->sh.flags, SH_MIN_W(win),
SH_MIN_H(win), SH_MAX_W(win), SH_MAX_H(win),
SH_INC_W(win), SH_INC_H(win));
+ }
/* min size */
if (SH_MIN(win)) {
restart(struct swm_region *r, union arg *args)
{
/* suppress unused warning since var is needed */
+ (void)r;
(void)args;
DNPRINTF(SWM_D_MISC, "restart: %s\n", start_argv[0]);
- /* disable alarm because the following code may not be interrupted */
- alarm(0);
- if (signal(SIGALRM, SIG_IGN) == SIG_ERR)
- err(1, "can't disable alarm");
-
- bar_extra_stop();
- bar_extra = 1;
- unmap_all();
-
- XftFontClose(display, bar_font);
- XftColorFree(display, DefaultVisual(display, r->s->idx),
- DefaultColormap(display, r->s->idx), &bar_font_color);
- xcb_key_symbols_free(syms);
- xcb_flush(conn);
- xcb_disconnect(conn);
+ shutdown_cleanup();
execvp(start_argv[0], start_argv);
warn("execvp failed");
win->ws->focus_prev = NULL;
}
- grabbuttons(win, 0);
xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL,
&win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].pixel);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root,
{
struct ws_win *cfw = NULL;
xcb_get_input_focus_reply_t *r;
- xcb_window_t cur_focus = XCB_WINDOW_NONE;
DNPRINTF(SWM_D_FOCUS, "focus_win: window: 0x%x\n", WINID(win));
- if (win == NULL)
+ if (win == NULL) {
+ /* Clear the status-bar. */
+ bar_update();
return;
+ }
+
if (win->ws == NULL)
return;
if (validate_ws(win->ws))
- return; /* XXX this gets hit with thunderbird, needs fixing */
-
- if (validate_win(win)) {
- kill_refs(win);
return;
- }
if (validate_win(win)) {
kill_refs(win);
r = xcb_get_input_focus_reply(conn, xcb_get_input_focus(conn), NULL);
if (r) {
- cur_focus = r->focus;
+ cfw = find_window(r->focus);
free(r);
}
- if ((cfw = find_window(cur_focus)) != NULL)
- unfocus_win(cfw);
- else {
-#if 0
- /* use larger hammer since the window was killed somehow */
- TAILQ_FOREACH(cfw, &win->ws->winlist, entry)
- if (cfw->ws && cfw->ws->r && cfw->ws->r->s)
- xcb_change_window_attributes(conn, cfw->id,
- XCB_CW_BORDER_PIXEL,
- &cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].pixel);
-#endif
+
+ if (win->ws->focus != win) {
+ unfocus_win(win->ws->focus);
+ win->ws->focus = win;
+ }
+
+ /* Tell app it can set focus. */
+ if (win->take_focus) {
+ /* java is special; always tell parent */
+ if (win->transient && win->java)
+ client_msg(find_window(win->transient), a_takefocus);
+ else
+ client_msg(win, a_takefocus);
}
- win->ws->focus = win;
+ if (cfw != win) {
+ if (cfw)
+ unfocus_win(cfw);
+
+ if (win->ws->r != NULL) {
+ if (win->java == 0)
+ xcb_set_input_focus(conn,
+ XCB_INPUT_FOCUS_PARENT, win->id,
+ XCB_CURRENT_TIME);
- if (win->ws->r != NULL) {
- if (win->java == 0)
- xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT,
- win->id, XCB_CURRENT_TIME);
- grabbuttons(win, 1);
- xcb_change_window_attributes(conn, win->id,
- XCB_CW_BORDER_PIXEL,
- &win->ws->r->s->c[SWM_S_COLOR_FOCUS].pixel);
- if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS ||
- win->ws->always_raise)
- map_window_raised(win->id);
+ xcb_change_window_attributes(conn, win->id,
+ XCB_CW_BORDER_PIXEL,
+ &win->ws->r->s->c[SWM_S_COLOR_FOCUS].pixel);
+
+ if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS ||
+ win->ws->always_raise)
+ map_window_raised(win->id);
- xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root,
- ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1,
- &win->id);
+ xcb_change_property(conn, XCB_PROP_MODE_REPLACE,
+ win->s->root, ewmh[_NET_ACTIVE_WINDOW].atom,
+ XCB_ATOM_WINDOW, 32, 1, &win->id);
+ }
}
bar_update();
}
+/* If a child window should have focus instead, return it. */
+struct ws_win *
+focus_magic(struct ws_win *win)
+{
+ struct ws_win *parent = NULL;
+
+ DNPRINTF(SWM_D_FOCUS, "focus_magic: window: 0x%x\n", WINID(win));
+ if (win == NULL)
+ return win;
+
+ if (win->transient) {
+ parent = find_window(win->transient);
+
+ /* If parent prefers focus elsewhere, then do so. */
+ if (parent && parent->focus_child) {
+ if (validate_win(parent->focus_child) == 0)
+ win = parent->focus_child;
+ else
+ parent->focus_child = NULL;
+ }
+ }
+
+ /* If this window prefers focus elsewhere, then do so. */
+ if (win->focus_child) {
+ if (validate_win(win->focus_child) == 0)
+ win = win->focus_child;
+ else
+ win->focus_child = NULL;
+ }
+
+ return win;
+}
+
void
event_drain(uint8_t rt)
{
xcb_generic_event_t *evt;
- xcb_flush(conn);
+ /* ensure all pending requests have been processed before filtering. */
+ xcb_aux_sync(conn);
while ((evt = xcb_poll_for_event(conn))) {
if (XCB_EVENT_RESPONSE_TYPE(evt) != rt)
event_handle(evt);
TAILQ_FOREACH(win, &old_ws->winlist, entry)
unmap_window(win);
- if (focus_mode == SWM_FOCUS_DEFAULT)
- event_drain(XCB_ENTER_NOTIFY);
- else
- xcb_flush(conn);
+ focus_flush();
DNPRINTF(SWM_D_WS, "switchws: done\n");
}
{
union arg a;
+ (void)args;
+
DNPRINTF(SWM_D_WS, "priorws: id: %d, 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);
stack();
- xcb_flush(conn);
+ focus_flush();
}
void
}
kill_refs(win);
- focus_magic(winfocus);
+ focus_win(focus_magic(winfocus));
}
void
if (winfocus->iconic == 0)
break;
- focus_magic(winfocus);
+ focus_win(focus_magic(winfocus));
return;
}
return;
}
- focus_magic(winfocus);
+ focus_win(focus_magic(winfocus));
xcb_flush(conn);
}
stack();
bar_update();
- if (focus_mode == SWM_FOCUS_DEFAULT)
- event_drain(XCB_ENTER_NOTIFY);
-
a.id = SWM_ARG_ID_FOCUSCUR;
focus(r, &a);
+
+ focus_flush();
}
void
if (font_adjusted)
font_adjusted--;
- if (focus_mode == SWM_FOCUS_DEFAULT)
- event_drain(XCB_ENTER_NOTIFY);
-
DNPRINTF(SWM_D_STACK, "stack: end\n");
}
void
store_float_geom(struct ws_win *win, struct swm_region *r)
{
+ if (win == NULL || r == NULL)
+ return;
+
/* retain window geom and region geom */
win->g_float = win->g;
win->g_float.x -= X(r);
win->g_float.w, win->g_float.h);
}
+void
+load_float_geom(struct ws_win *win, struct swm_region *r)
+{
+ if (win == NULL || r == NULL)
+ return;
+
+ if (win->g_floatvalid) {
+ win->g = win->g_float;
+ X(win) += X(r);
+ Y(win) += Y(r);
+ DNPRINTF(SWM_D_MISC, "load_float_geom: window: 0x%x, g: (%d,%d)"
+ "%d x %d\n", win->id, X(win), Y(win), WIDTH(win),
+ HEIGHT(win));
+ } else {
+ DNPRINTF(SWM_D_MISC, "load_float_geom: window: 0x%x, g_float "
+ "is not set.\n", win->id);
+ }
+}
+
void
stack_floater(struct ws_win *win, struct swm_region *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->g_floatvalid && (win->floatmaxed || (r != r->ws->old_r &&
- !(win->ewmh_flags & EWMH_F_FULLSCREEN)))) {
- /* refloat at last floating relative position */
- win->g = win->g_float;
- X(win) += X(r);
- Y(win) += Y(r);
+ if (win->floatmaxed || (r != r->ws->old_r &&
+ !(win->ewmh_flags & EWMH_F_FULLSCREEN))) {
+ /* update geometry for the new region */
+ load_float_geom(win, r);
}
win->floatmaxed = 0;
if (!win->g_floatvalid)
store_float_geom(win, win->ws->r);
- win->g = win->ws->r->g;
+ win->g = r->g;
}
/*
HEIGHT(win) = (double)HEIGHT(r) * dialog_ratio;
}
- if (!win->manual) {
+ if (!win->manual && !(win->ewmh_flags & EWMH_F_FULLSCREEN) &&
+ !(win->quirks & SWM_Q_ANYWHERE)) {
/*
- * floaters and transients are auto-centred unless moved
- * or resized
+ * 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);
+
+ store_float_geom(win, r);
}
/* keep window within region bounds */
win->font_steps++;
font_adjusted++;
win->last_inc = win->sh.width_inc;
- fake_keypress(win, XK_KP_Subtract, ShiftMask);
+ fake_keypress(win, XK_KP_Subtract, XCB_MOD_MASK_SHIFT);
} else if (win->font_steps && win->last_inc != win->sh.width_inc &&
WIDTH(win) > win->font_size_boundary[win->font_steps - 1]) {
win->font_steps--;
font_adjusted++;
win->last_inc = win->sh.width_inc;
- fake_keypress(win, XK_KP_Add, ShiftMask);
+ fake_keypress(win, XK_KP_Add, XCB_MOD_MASK_SHIFT);
}
}
if (parent)
map_window_raised(parent->id);
stack_floater(wintrans, ws->r);
- focus_magic(wintrans);
+ focus_win(focus_magic(wintrans));
}
}
stack();
bar_update();
- xcb_flush(conn);
+ focus_flush();
}
void
if (r->ws->always_raise == 0)
stack();
- xcb_flush(conn);
+ focus_flush();
}
void
a.id = SWM_ARG_ID_FOCUSCUR;
focus(r, &a);
- xcb_flush(conn);
+ focus_flush();
}
char *
{
char *name = NULL;
xcb_get_property_cookie_t c;
- xcb_icccm_get_text_property_reply_t r;
+ xcb_get_property_reply_t *r;
- c = xcb_icccm_get_wm_name(conn, win);
- if (xcb_icccm_get_wm_name_reply(conn, c, &r, NULL)) {
- if (r.name_len > 0) {
- name = malloc(r.name_len + 1);
- if (name) {
- memcpy(name, r.name, r.name_len);
- name[r.name_len] = '\0';
- }
+ /* First try _NET_WM_NAME for UTF-8. */
+ c = xcb_get_property(conn, 0, win, a_netwmname,
+ XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX);
+ r = xcb_get_property_reply(conn, c, NULL);
+
+ 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) {
+ free(r);
+ return NULL;
}
- xcb_icccm_get_text_property_reply_wipe(&r);
}
- return (name);
+ if (r->length > 0)
+ name = strndup(xcb_get_property_value(r),
+ xcb_get_property_value_length(r));
+
+ free(r);
+ return name;
}
void
while ((sw = TAILQ_FIRST(&search_wl)) != NULL) {
xcb_destroy_window(conn, sw->indicator);
- xcb_free_gc(conn, sw->gc);
TAILQ_REMOVE(&search_wl, sw, entry);
free(sw);
}
struct ws_win *win = NULL;
struct search_window *sw = NULL;
xcb_window_t w;
- uint32_t gcv[3], wa[2];
- int i;
+ uint32_t wa[2];
+ int i, width, height;
char s[8];
FILE *lfile;
size_t len;
XftDraw *draw;
XGlyphInfo info;
+ GC l_draw;
+ XGCValues l_gcv;
+ XRectangle l_ibox, l_lbox;
DNPRINTF(SWM_D_MISC, "search_win\n");
snprintf(s, sizeof s, "%d", i);
len = strlen(s);
- XftTextExtentsUtf8(display, bar_font, (FcChar8 *)s, len, &info);
-
w = xcb_generate_id(conn);
wa[0] = r->s->c[SWM_S_COLOR_FOCUS].pixel;
wa[1] = r->s->c[SWM_S_COLOR_UNFOCUS].pixel;
+
+ if (bar_font_legacy) {
+ XmbTextExtents(bar_fs, s, len, &l_ibox, &l_lbox);
+ width = l_lbox.width + 4;
+ height = bar_fs_extents->max_logical_extent.height + 4;
+ } else {
+ XftTextExtentsUtf8(display, bar_font, (FcChar8 *)s, len,
+ &info);
+ width = info.width + 4;
+ height = bar_font->height + 4;
+ }
+
xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0,
- info.width + 4, bar_font->height + 4,
- 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT,
- XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
+ width, height, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT,
+ XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL |
+ XCB_CW_BORDER_PIXEL, wa);
+
+ map_window_raised(w);
sw->indicator = w;
TAILQ_INSERT_TAIL(&search_wl, sw, entry);
- sw->gc = xcb_generate_id(conn);
- gcv[0] = r->s->c[SWM_S_COLOR_BAR].pixel;
- gcv[1] = r->s->c[SWM_S_COLOR_FOCUS].pixel;
- gcv[2] = 0;
- xcb_create_gc(conn, sw->gc, w, XCB_GC_FOREGROUND |
- XCB_GC_BACKGROUND | XCB_GC_GRAPHICS_EXPOSURES, gcv);
- map_window_raised(w);
+ if (bar_font_legacy) {
+ l_gcv.graphics_exposures = 0;
+ l_draw = XCreateGC(display, w, 0, &l_gcv);
+
+ XSetForeground(display, l_draw,
+ r->s->c[SWM_S_COLOR_BAR].pixel);
- draw = XftDrawCreate(display, w,
- DefaultVisual(display, r->s->idx),
- DefaultColormap(display, r->s->idx));
+ DRAWSTRING(display, w, bar_fs, l_draw, 2,
+ (bar_fs_extents->max_logical_extent.height -
+ l_lbox.height) / 2 - l_lbox.y, s, len);
- XftDrawStringUtf8(draw, &bar_font_color, bar_font, 2,
- (HEIGHT(r->bar) + bar_font->height) / 2 - bar_font->descent,
- (FcChar8 *)s, len);
+ XFreeGC(display, l_draw);
+ } else {
+
+ draw = XftDrawCreate(display, w,
+ DefaultVisual(display, r->s->idx),
+ DefaultColormap(display, r->s->idx));
- XftDrawDestroy(draw);
+ XftDrawStringUtf8(draw, &bar_font_color, bar_font, 2,
+ (HEIGHT(r->bar) + bar_font->height) / 2 -
+ bar_font->descent, (FcChar8 *)s, len);
+
+ XftDrawDestroy(draw);
+ }
DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w);
}
win->floating = 0;
} else {
- if (win->g_floatvalid) {
- /* refloat at last floating relative position */
- X(win) = win->g_float.x + X(r);
- Y(win) = win->g_float.y + Y(r);
- WIDTH(win) = win->g_float.w;
- HEIGHT(win) = win->g_float.h;
- }
+ load_float_geom(win, r);
win->floating = 1;
}
if (win == NULL)
return;
+ if (win->ewmh_flags & EWMH_F_FULLSCREEN)
+ return;
+
ewmh_update_win_state(win, ewmh[_NET_WM_STATE_ABOVE].atom,
_NET_WM_STATE_TOGGLE);
focus(win->ws->r, &a);
}
- xcb_flush(conn);
- event_drain(XCB_ENTER_NOTIFY);
+ focus_flush();
}
void
stack();
+ focus_flush();
+
switch (args->id) {
case SWM_ARG_ID_WIDTHSHRINK:
WIDTH(win) -= SWM_RESIZE_STEPS;
/* not free, don't sync more than 120 times / second */
if ((mne->time - timestamp) > (1000 / 120) ) {
timestamp = mne->time;
- do_sync();
update_window(win);
+ xcb_flush(conn);
}
break;
default:
free(evt);
}
if (timestamp) {
- do_sync();
update_window(win);
+ xcb_flush(conn);
}
store_float_geom(win,r);
stack();
+ focus_flush();
+
move_step = 0;
switch (args->id) {
case SWM_ARG_ID_MOVELEFT:
/* not free, don't sync more than 120 times / second */
if ((mne->time - timestamp) > (1000 / 120) ) {
timestamp = mne->time;
- do_sync();
update_window(win);
+ xcb_flush(conn);
}
break;
default:
free(evt);
}
if (timestamp) {
- do_sync();
update_window(win);
+ xcb_flush(conn);
}
store_float_geom(win, r);
free(qpr);
void (*func)(struct ws_win *, union arg *);
union arg args;
} buttons[] = {
+#define MODKEY_SHIFT MODKEY | XCB_MOD_MASK_SHIFT
/* action key mouse button func args */
{ client_click, MODKEY, Button3, resize, {.id = SWM_ARG_ID_DONTCENTER} },
- { client_click, MODKEY | ShiftMask, Button3, resize, {.id = SWM_ARG_ID_CENTER} },
+ { client_click, MODKEY_SHIFT, Button3, resize, {.id = SWM_ARG_ID_CENTER} },
{ client_click, MODKEY, Button1, move, {0} },
+#undef MODKEY_SHIFT
};
void
mod_key = mod;
RB_FOREACH(kp, key_tree, &keys)
- if (kp->mod & ShiftMask)
- kp->mod = mod | ShiftMask;
+ if (kp->mod & XCB_MOD_MASK_SHIFT)
+ kp->mod = mod | XCB_MOD_MASK_SHIFT;
else
kp->mod = mod;
for (i = 0; i < LENGTH(buttons); i++)
- if (buttons[i].mask & ShiftMask)
- buttons[i].mask = mod | ShiftMask;
+ if (buttons[i].mask & XCB_MOD_MASK_SHIFT)
+ buttons[i].mask = mod | XCB_MOD_MASK_SHIFT;
else
buttons[i].mask = mod;
}
if (strncasecmp(name, "MOD", SWM_MODNAME_SIZE) == 0)
*mod |= currmod;
else if (!strncasecmp(name, "Mod1", SWM_MODNAME_SIZE))
- *mod |= Mod1Mask;
+ *mod |= XCB_MOD_MASK_1;
else if (!strncasecmp(name, "Mod2", SWM_MODNAME_SIZE))
- *mod += Mod2Mask;
+ *mod += XCB_MOD_MASK_2;
else if (!strncmp(name, "Mod3", SWM_MODNAME_SIZE))
- *mod |= Mod3Mask;
+ *mod |= XCB_MOD_MASK_3;
else if (!strncmp(name, "Mod4", SWM_MODNAME_SIZE))
- *mod |= Mod4Mask;
+ *mod |= XCB_MOD_MASK_4;
else if (strncasecmp(name, "SHIFT", SWM_MODNAME_SIZE) == 0)
- *mod |= ShiftMask;
+ *mod |= XCB_MOD_MASK_SHIFT;
else if (strncasecmp(name, "CONTROL", SWM_MODNAME_SIZE) == 0)
- *mod |= ControlMask;
+ *mod |= XCB_MOD_MASK_CONTROL;
else {
*ks = XStringToKeysym(name);
XConvertCase(*ks, ks, &uks);
void
setup_keys(void)
{
+#define MODKEY_SHIFT MODKEY | XCB_MOD_MASK_SHIFT
setkeybinding(MODKEY, XK_space, KF_CYCLE_LAYOUT,NULL);
- setkeybinding(MODKEY|ShiftMask, XK_backslash, KF_FLIP_LAYOUT, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_space, KF_STACK_RESET, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_backslash, KF_FLIP_LAYOUT, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_space, KF_STACK_RESET, NULL);
setkeybinding(MODKEY, XK_h, KF_MASTER_SHRINK, NULL);
setkeybinding(MODKEY, XK_l, KF_MASTER_GROW, NULL);
setkeybinding(MODKEY, XK_comma, KF_MASTER_ADD, NULL);
setkeybinding(MODKEY, XK_period, KF_MASTER_DEL, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_comma, KF_STACK_INC, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_period, KF_STACK_DEC, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_comma, KF_STACK_INC, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_period, KF_STACK_DEC, NULL);
setkeybinding(MODKEY, XK_Return, KF_SWAP_MAIN, NULL);
setkeybinding(MODKEY, XK_j, KF_FOCUS_NEXT, NULL);
setkeybinding(MODKEY, XK_k, KF_FOCUS_PREV, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_j, KF_SWAP_NEXT, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_k, KF_SWAP_PREV, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_Return, KF_SPAWN_CUSTOM,"term");
+ setkeybinding(MODKEY_SHIFT, XK_j, KF_SWAP_NEXT, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_k, KF_SWAP_PREV, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_Return, KF_SPAWN_CUSTOM,"term");
setkeybinding(MODKEY, XK_p, KF_SPAWN_CUSTOM,"menu");
- setkeybinding(MODKEY|ShiftMask, XK_q, KF_QUIT, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_q, KF_QUIT, NULL);
setkeybinding(MODKEY, XK_q, KF_RESTART, NULL);
setkeybinding(MODKEY, XK_m, KF_FOCUS_MAIN, NULL);
setkeybinding(MODKEY, XK_1, KF_WS_1, NULL);
setkeybinding(MODKEY, XK_Up, KF_WS_NEXT_ALL, NULL);
setkeybinding(MODKEY, XK_Down, KF_WS_PREV_ALL, 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);
- setkeybinding(MODKEY|ShiftMask, XK_2, KF_MVWS_2, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_3, KF_MVWS_3, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_4, KF_MVWS_4, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_5, KF_MVWS_5, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_6, KF_MVWS_6, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_7, KF_MVWS_7, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_8, KF_MVWS_8, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_9, KF_MVWS_9, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_0, KF_MVWS_10, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F1, KF_MVWS_11, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F2, KF_MVWS_12, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F3, KF_MVWS_13, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F4, KF_MVWS_14, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F5, KF_MVWS_15, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F6, KF_MVWS_16, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F7, KF_MVWS_17, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F8, KF_MVWS_18, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F9, KF_MVWS_19, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F10, KF_MVWS_20, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F11, KF_MVWS_21, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_F12, KF_MVWS_22, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_Right, KF_SCREEN_NEXT, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_Left, KF_SCREEN_PREV, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_1, KF_MVWS_1, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_2, KF_MVWS_2, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_3, KF_MVWS_3, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_4, KF_MVWS_4, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_5, KF_MVWS_5, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_6, KF_MVWS_6, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_7, KF_MVWS_7, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_8, KF_MVWS_8, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_9, KF_MVWS_9, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_0, KF_MVWS_10, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F1, KF_MVWS_11, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F2, KF_MVWS_12, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F3, KF_MVWS_13, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F4, KF_MVWS_14, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F5, KF_MVWS_15, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F6, KF_MVWS_16, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F7, KF_MVWS_17, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F8, KF_MVWS_18, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F9, KF_MVWS_19, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F10, KF_MVWS_20, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F11, KF_MVWS_21, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_F12, KF_MVWS_22, NULL);
setkeybinding(MODKEY, XK_b, KF_BAR_TOGGLE, NULL);
setkeybinding(MODKEY, XK_Tab, KF_FOCUS_NEXT, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_Tab, KF_FOCUS_PREV, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_x, KF_WIND_KILL, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_Tab, KF_FOCUS_PREV, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_x, KF_WIND_KILL, NULL);
setkeybinding(MODKEY, XK_x, KF_WIND_DEL, NULL);
setkeybinding(MODKEY, XK_s, KF_SPAWN_CUSTOM,"screenshot_all");
- setkeybinding(MODKEY|ShiftMask, XK_s, KF_SPAWN_CUSTOM,"screenshot_wind");
+ setkeybinding(MODKEY_SHIFT, XK_s, KF_SPAWN_CUSTOM,"screenshot_wind");
setkeybinding(MODKEY, XK_t, KF_FLOAT_TOGGLE,NULL);
- 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");
+ setkeybinding(MODKEY_SHIFT, XK_v, KF_VERSION, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_Delete, KF_SPAWN_CUSTOM,"lock");
+ setkeybinding(MODKEY_SHIFT, XK_i, KF_SPAWN_CUSTOM,"initscr");
setkeybinding(MODKEY, XK_w, KF_ICONIFY, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_w, KF_UNICONIFY, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_r, KF_RAISE_TOGGLE,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_w, KF_UNICONIFY, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_r, KF_RAISE_TOGGLE,NULL);
setkeybinding(MODKEY, XK_v, KF_BUTTON2, NULL);
setkeybinding(MODKEY, XK_equal, KF_WIDTH_GROW, NULL);
setkeybinding(MODKEY, XK_minus, KF_WIDTH_SHRINK,NULL);
- setkeybinding(MODKEY|ShiftMask, XK_equal, KF_HEIGHT_GROW,NULL);
- setkeybinding(MODKEY|ShiftMask, XK_minus, KF_HEIGHT_SHRINK,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_equal, KF_HEIGHT_GROW,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_minus, KF_HEIGHT_SHRINK,NULL);
setkeybinding(MODKEY, XK_bracketleft, KF_MOVE_LEFT,NULL);
setkeybinding(MODKEY, XK_bracketright,KF_MOVE_RIGHT,NULL);
- setkeybinding(MODKEY|ShiftMask, XK_bracketleft, KF_MOVE_UP, NULL);
- setkeybinding(MODKEY|ShiftMask, XK_bracketright,KF_MOVE_DOWN,NULL);
- setkeybinding(MODKEY|ShiftMask, XK_slash, KF_NAME_WORKSPACE,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_bracketleft, KF_MOVE_UP, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_bracketright,KF_MOVE_DOWN,NULL);
+ setkeybinding(MODKEY_SHIFT, XK_slash, KF_NAME_WORKSPACE,NULL);
setkeybinding(MODKEY, XK_slash, KF_SEARCH_WORKSPACE,NULL);
setkeybinding(MODKEY, XK_f, KF_SEARCH_WIN, NULL);
#ifdef SWM_DEBUG
- setkeybinding(MODKEY|ShiftMask, XK_d, KF_DUMPWINS, NULL);
+ setkeybinding(MODKEY_SHIFT, XK_d, KF_DUMPWINS, NULL);
#endif
+#undef MODKEY_SHIFT
}
void
xcb_get_modifier_mapping_reply_t *modmap_r;
xcb_keycode_t *modmap, kc, *keycode;
- DNPRINTF(SWM_D_MISC, "updatenumlockmask\n");
numlockmask = 0;
modmap_r = xcb_get_modifier_mapping_reply(conn,
}
free(modmap_r);
}
+ DNPRINTF(SWM_D_MISC, "updatenumlockmask: %d\n", numlockmask);
}
void
grabkeys(void)
{
- int num_screens, k;
- unsigned int j;
- xcb_keycode_t *code;
- unsigned int modifiers[] =
- { 0, LockMask, numlockmask, numlockmask | LockMask };
struct key *kp;
+ int num_screens, k, j;
+ unsigned int modifiers[3];
+ xcb_keycode_t *code;
DNPRINTF(SWM_D_MISC, "grabkeys\n");
updatenumlockmask();
+ modifiers[0] = 0;
+ modifiers[1] = numlockmask;
+ modifiers[2] = numlockmask | XCB_MOD_MASK_LOCK;
+
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
for (k = 0; k < num_screens; k++) {
if (TAILQ_EMPTY(&screens[k].rl))
xcb_grab_key(conn, 1,
screens[k].root,
kp->mod | modifiers[j],
- *code, XCB_GRAB_MODE_ASYNC,
+ *code, XCB_GRAB_MODE_SYNC,
XCB_GRAB_MODE_ASYNC);
free(code);
}
}
void
-grabbuttons(struct ws_win *win, int focused)
+grabbuttons(struct ws_win *win)
{
- unsigned int i, j;
- unsigned int modifiers[] =
- { 0, LockMask, numlockmask, numlockmask|LockMask };
+#if 0
+ int i;
+#endif
- updatenumlockmask();
+ DNPRINTF(SWM_D_MOUSE, "grabbuttons: win 0x%x\n", win->id);
+
+#if 0
xcb_ungrab_button(conn, XCB_BUTTON_INDEX_ANY, win->id,
XCB_BUTTON_MASK_ANY);
- if (focused) {
- for (i = 0; i < LENGTH(buttons); i++)
- if (buttons[i].action == client_click)
- for (j = 0; j < LENGTH(modifiers); j++)
- xcb_grab_button(conn, 0, win->id,
- BUTTONMASK,
- XCB_GRAB_MODE_ASYNC,
- XCB_GRAB_MODE_SYNC,
- XCB_WINDOW_NONE,
- XCB_CURSOR_NONE,
- buttons[i].button,
- buttons[i].mask);
- } else
- xcb_grab_button(conn, 0, win->id, BUTTONMASK,
- XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_SYNC, XCB_WINDOW_NONE,
- XCB_CURSOR_NONE, XCB_BUTTON_INDEX_ANY, XCB_BUTTON_MASK_ANY);
+
+ for (i = 0; i < LENGTH(buttons); i++)
+ if (buttons[i].action == client_click)
+ xcb_grab_button(conn, 0, win->id, BUTTONMASK,
+ XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC,
+ XCB_WINDOW_NONE, XCB_CURSOR_NONE,
+ buttons[i].button, buttons[i].mask);
+#endif
+ xcb_grab_button(conn, 0, win->id, BUTTONMASK, XCB_GRAB_MODE_SYNC,
+ XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE, XCB_CURSOR_NONE,
+ XCB_BUTTON_INDEX_ANY, XCB_BUTTON_MASK_ANY);
}
const char *quirkname[] = {
{
char *cp, *class, *name;
int retval;
- unsigned long quirks;
+ unsigned long qrks;
/* suppress unused warning since var is needed */
(void)flags;
*cp = '\0';
class = selector;
name = cp + 1;
- if ((retval = parsequirks(value, &quirks)) == 0)
- setquirk(class, name, quirks);
+ if ((retval = parsequirks(value, &qrks)) == 0)
+ setquirk(class, name, qrks);
return (retval);
}
err(1, "setconfvalue: asprintf: failed to allocate "
"memory for bar_fonts.");
free(b);
+
+ /* If already in xft mode, then we are done. */
+ if (!bar_font_legacy)
+ break;
+
+ /* If there are any non-XLFD entries, switch to Xft mode. */
+ while ((b = strsep(&value, ",")) != NULL) {
+ if (*b == '\0')
+ continue;
+ if (!isxlfd(b)) {
+ bar_font_legacy = 0;
+ break;
+ }
+ }
break;
case SWM_S_BAR_FORMAT:
free(bar_format);
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 if (!strcmp(value, "manual"))
+ focus_mode = SWM_FOCUS_MANUAL;
else
errx(1, "focus_mode");
break;
(void)flags;
if (!strncasecmp(value, "Mod1", strlen("Mod1")))
- update_modkey(Mod1Mask);
+ update_modkey(XCB_MOD_MASK_1);
else if (!strncasecmp(value, "Mod2", strlen("Mod2")))
- update_modkey(Mod2Mask);
+ update_modkey(XCB_MOD_MASK_2);
else if (!strncasecmp(value, "Mod3", strlen("Mod3")))
- update_modkey(Mod3Mask);
+ update_modkey(XCB_MOD_MASK_3);
else if (!strncasecmp(value, "Mod4", strlen("Mod4")))
- update_modkey(Mod4Mask);
+ update_modkey(XCB_MOD_MASK_4);
else
return (1);
return (0);
int
setlayout(char *selector, char *value, int flags)
{
- int ws_id, i, x, mg, ma, si, raise, f = 0;
+ int ws_id, i, x, mg, ma, si, ar, f = 0;
int st = SWM_V_STACK, num_screens;
char s[1024];
struct workspace *ws;
bzero(s, sizeof s);
if (sscanf(value, "ws[%d]:%d:%d:%d:%d:%1023c",
- &ws_id, &mg, &ma, &si, &raise, s) != 6)
+ &ws_id, &mg, &ma, &si, &ar, s) != 6)
errx(1, "invalid layout entry, should be 'ws[<idx>]:"
"<master_grow>:<master_add>:<stack_inc>:<always_raise>:"
"<type>'");
ws = (struct workspace *)&screens[i].ws;
ws[ws_id].cur_layout = &layouts[st];
- ws[ws_id].always_raise = raise;
+ ws[ws_id].always_raise = ar;
if (st == SWM_MAX_STACK)
continue;
}
}
+ focus_flush();
+
return (0);
}
FILE *config;
char *line, *cp, *optsub, *optval;
size_t linelen, lineno = 0;
- int wordlen, i, optind;
+ int wordlen, i, optidx;
struct config_option *opt;
DNPRINTF(SWM_D_CONF, "conf_load: begin\n");
filename, lineno);
goto out;
}
- optind = -1;
+ optidx = -1;
for (i = 0; i < LENGTH(configopt); i++) {
opt = &configopt[i];
if (!strncasecmp(cp, opt->optname, wordlen) &&
(int)strlen(opt->optname) == wordlen) {
- optind = i;
+ optidx = i;
break;
}
}
- if (optind == -1) {
+ if (optidx == -1) {
warnx("%s: line %zd: unknown option %.*s",
filename, lineno, wordlen, cp);
goto out;
/* get RHS value */
optval = strdup(cp);
/* call function to deal with it all */
- if (configopt[optind].func(optsub, optval,
- configopt[optind].funcflags) != 0)
+ if (configopt[optidx].func(optsub, optval,
+ configopt[optidx].funcflags) != 0)
errx(1, "%s: line %zd: invalid data for %s",
- filename, lineno, configopt[optind].optname);
+ filename, lineno, configopt[optidx].optname);
free(optval);
free(optsub);
free(line);
parent = find_window(win->transient);
if (parent)
- parent->child_trans = win;
+ parent->focus_child = win;
else {
DNPRINTF(SWM_D_MISC, "set_child_transient: parent doesn't exist"
" for 0x%x trans 0x%x\n", win->id, win->transient);
if (win->hints.window_group != wmh.window_group)
continue;
- w->child_trans = win;
+ w->focus_child = win;
win->transient = w->id;
*trans = w->id;
DNPRINTF(SWM_D_MISC, "set_child_transient: adjusting "
manage_window(xcb_window_t id)
{
xcb_window_t trans = XCB_WINDOW_NONE;
- struct workspace *ws;
struct ws_win *win, *ww;
int ws_idx, border_me = 0;
- char ws_idx_str[SWM_PROPLEN], *prop = NULL;
+ char ws_idx_str[SWM_PROPLEN];
struct swm_region *r;
struct pid_e *p;
struct quirk *qp;
uint32_t event_mask, i;
xcb_icccm_get_wm_protocols_reply_t wpr;
- if ((win = find_window(id)) != NULL)
- return (win); /* already being managed */
+ if ((win = find_window(id)) != NULL) {
+ DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x already "
+ "managed; skipping.)\n", id);
+ return (win); /* Already managed. */
+ }
- /* see if we are on the unmanaged list */
+ /* See if window is on the unmanaged list. */
if ((win = find_unmanaged_window(id)) != NULL) {
- DNPRINTF(SWM_D_MISC, "manage_window: previously unmanaged "
- "window: 0x%x\n", win->id);
+ DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x found on "
+ "unmanaged list.\n", id);
TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry);
+
if (win->transient)
set_child_transient(win, &trans);
- if (trans && (ww = find_window(trans)))
- TAILQ_INSERT_AFTER(&win->ws->winlist, ww, win, entry);
- else if ((ww = win->ws->focus) &&
- spawn_position == SWM_STACK_ABOVE)
- TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus,
- win, entry);
- else if (ww && spawn_position == SWM_STACK_BELOW)
- TAILQ_INSERT_BEFORE(win->ws->focus, win, entry);
- else switch (spawn_position) {
- default:
- case SWM_STACK_TOP:
- case SWM_STACK_ABOVE:
- TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry);
- break;
- case SWM_STACK_BOTTOM:
- case SWM_STACK_BELOW:
- TAILQ_INSERT_HEAD(&win->ws->winlist, win, entry);
- }
-
- ewmh_update_actions(win);
- return (win);
+ goto out;
+ } else {
+ DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x is new.\n", id);
}
+ /* Create and initialize ws_win object. */
if ((win = calloc(1, sizeof(struct ws_win))) == NULL)
err(1, "manage_window: calloc: failed to allocate memory for "
"new window");
win->id = id;
- win->bordered = 0;
-
- /* see if we need to override the workspace */
- p = find_pid(window_get_pid(id));
-
- /* Get all the window data in one shot */
- ws_idx = get_ws_idx(id);
+ /* Get window geometry. */
win->wa = xcb_get_geometry_reply(conn,
- xcb_get_geometry(conn, id),
+ xcb_get_geometry(conn, win->id),
NULL);
+
+ /* Figure out which region the window belongs to. */
+ r = root_to_region(win->wa->root);
+
+ /* Ignore window border if there is one. */
+ WIDTH(win) = win->wa->width;
+ HEIGHT(win) = win->wa->height;
+ X(win) = win->wa->x + win->wa->border_width;
+ Y(win) = win->wa->y + win->wa->border_width;
+ win->bordered = 0;
+ win->floatmaxed = 0;
+ win->ewmh_flags = 0;
+ win->s = r->s; /* this never changes */
+
+ store_float_geom(win, r);
+
+ /* Get WM_SIZE_HINTS. */
xcb_icccm_get_wm_normal_hints_reply(conn,
- xcb_icccm_get_wm_normal_hints(conn, id),
+ xcb_icccm_get_wm_normal_hints(conn, win->id),
&win->sh, NULL);
+
+ /* Get WM_HINTS. */
xcb_icccm_get_wm_hints_reply(conn,
- xcb_icccm_get_wm_hints(conn, id),
+ xcb_icccm_get_wm_hints(conn, win->id),
&win->hints, NULL);
+
+ /* Get WM_TRANSIENT_FOR; see if window is a transient. */
xcb_icccm_get_wm_transient_for_reply(conn,
- xcb_icccm_get_wm_transient_for(conn, id),
+ xcb_icccm_get_wm_transient_for(conn, win->id),
&trans, NULL);
if (trans) {
win->transient = trans;
- set_child_transient(win, &trans);
- DNPRINTF(SWM_D_MISC, "manage_window: window: 0x%x, "
- "transient: 0x%x\n", win->id, win->transient);
+ set_child_transient(win, &win->transient);
}
- /* get supported protocols */
+ /* Get supported protocols. */
if (xcb_icccm_get_wm_protocols_reply(conn,
- xcb_icccm_get_wm_protocols(conn, id, a_prot),
+ 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->iconic = get_iconic(win);
- /*
- * Figure out where to put the window. If it was previously assigned to
- * a workspace (either by spawn() or manually moving), and isn't
- * transient, * put it in the same workspace
- */
- r = root_to_region(win->wa->root);
- if (p) {
- ws = &r->s->ws[p->ws];
+ /* Figure out which workspace the window belongs to. */
+ if ((p = find_pid(window_get_pid(win->id))) != NULL) {
+ win->ws = &r->s->ws[p->ws];
TAILQ_REMOVE(&pidlist, p, entry);
free(p);
p = NULL;
- } else if (ws_idx != -1 && win->transient == 0) {
- ws = &r->s->ws[ws_idx];
+ } else if ((ws_idx = get_ws_idx(win->id)) != -1 &&
+ win->transient == 0) {
+ /* _SWM_WS is set; use that. */
+ win->ws = &r->s->ws[ws_idx];
+ } else if (trans && (ww = find_window(trans)) != NULL) {
+ /* Launch transients in the same ws as parent. */
+ win->ws = ww->ws;
+ border_me = 1;
} else {
- ws = r->ws;
- /* this should launch transients in the same ws as parent */
- if (id && trans)
- if ((ww = find_window(trans)) != NULL)
- if (ws->r) {
- ws = ww->ws;
- if (ww->ws->r)
- r = ww->ws->r;
- else
- warnx("manage_window: fix this "
- "bug mcbride");
- border_me = 1;
- }
+ win->ws = r->ws;
}
- /* set up the window layout */
- win->id = id;
- win->ws = ws;
- win->s = r->s; /* this never changes */
- if (trans && (ww = find_window(trans)))
- TAILQ_INSERT_AFTER(&ws->winlist, ww, win, entry);
- else if (win->ws->focus && spawn_position == SWM_STACK_ABOVE)
- TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus, win,
- entry);
- else if (win->ws->focus && spawn_position == SWM_STACK_BELOW)
- TAILQ_INSERT_BEFORE(win->ws->focus, win, entry);
- else switch (spawn_position) {
- default:
- case SWM_STACK_TOP:
- case SWM_STACK_ABOVE:
- TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry);
- break;
- case SWM_STACK_BOTTOM:
- case SWM_STACK_BELOW:
- TAILQ_INSERT_HEAD(&win->ws->winlist, win, entry);
- }
-
- /* ignore window border if there is one. */
- WIDTH(win) = win->wa->width;
- HEIGHT(win) = win->wa->height;
- X(win) = win->wa->x + win->wa->border_width;
- Y(win) = win->wa->y + win->wa->border_width;
- win->bordered = 0;
- win->g_floatvalid = 0;
- win->floatmaxed = 0;
- win->ewmh_flags = 0;
-
- DNPRINTF(SWM_D_MISC, "manage_window: window: 0x%x, (x,y) w x h: "
- "(%d,%d) %d x %d, ws: %d\n", win->id, X(win), Y(win), WIDTH(win),
- HEIGHT(win), ws->idx);
-
- constrain_window(win, r, 0);
-
- /* Set window properties so we can remember this after reincarnation */
- if (prop == NULL && snprintf(ws_idx_str, SWM_PROPLEN, "%d", ws->idx) <
+ /* Set the _SWM_WS atom so we can remember this after reincarnation. */
+ if (snprintf(ws_idx_str, SWM_PROPLEN, "%d", win->ws->idx) <
SWM_PROPLEN) {
DNPRINTF(SWM_D_PROP, "manage_window: set _SWM_WS: %s\n",
ws_idx_str);
a_swm_ws, XCB_ATOM_STRING, 8, strlen(ws_idx_str),
ws_idx_str);
}
- if (prop)
- free(prop);
+ /* Handle EWMH */
ewmh_autoquirk(win);
+ /* Determine initial quirks. */
if (xcb_icccm_get_wm_class_reply(conn,
xcb_icccm_get_wm_class(conn, win->id),
&win->ch, NULL)) {
/* 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;
border_me = 1;
}
TAILQ_FOREACH(qp, &quirks, entry) {
if (!strcmp(win->ch.class_name, qp->class) &&
!strcmp(win->ch.instance_name, qp->name)) {
- DNPRINTF(SWM_D_CLASS, "manage_window: found: "
- "class: %s, name: %s\n", win->ch.class_name,
- win->ch.instance_name);
+ DNPRINTF(SWM_D_CLASS, "manage_window: on quirks"
+ "list; mask: 0x%lx\n", qp->quirk);
if (qp->quirk & SWM_Q_FLOAT) {
win->floating = 1;
border_me = 1;
}
}
- /* alter window position if quirky */
+ /* Alter window position if quirky */
if (win->quirks & SWM_Q_ANYWHERE) {
- win->manual = 1; /* don't center the quirky windows */
- if (bar_enabled && Y(win) < bar_height)
- Y(win) = bar_height;
- if (WIDTH(win) + X(win) > WIDTH(r))
- X(win) = WIDTH(r) - WIDTH(win) - 2;
+ win->manual = 1;
border_me = 1;
}
/* Reset font sizes (the bruteforce way; no default keybinding). */
if (win->quirks & SWM_Q_XTERM_FONTADJ) {
for (i = 0; i < SWM_MAX_FONT_STEPS; i++)
- fake_keypress(win, XK_KP_Subtract, ShiftMask);
+ fake_keypress(win, XK_KP_Subtract, XCB_MOD_MASK_SHIFT);
for (i = 0; i < SWM_MAX_FONT_STEPS; i++)
- fake_keypress(win, XK_KP_Add, ShiftMask);
+ fake_keypress(win, XK_KP_Add, XCB_MOD_MASK_SHIFT);
}
- ewmh_get_win_state(win);
- ewmh_update_actions(win);
- ewmh_update_win_state(win, None, _NET_WM_STATE_REMOVE);
-
- /* border me */
if (border_me) {
win->bordered = 1;
X(win) -= border_width;
Y(win) -= border_width;
- update_window(win);
}
+ /* Make sure window is positioned inside its region, if its active. */
+ if (win->ws->r)
+ constrain_window(win, win->ws->r, 0);
+
+ if (win->ws->r || border_me)
+ update_window(win);
+
+ /* Select which X events to monitor. */
event_mask = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE |
XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY;
#ifdef SWM_DEBUG
event_mask |= XCB_EVENT_MASK_LEAVE_WINDOW;
#endif
- xcb_change_window_attributes(conn, id, XCB_CW_EVENT_MASK, &event_mask);
+ xcb_change_window_attributes(conn, win->id, XCB_CW_EVENT_MASK,
+ &event_mask);
- /* floaters need to be mapped if they are in the current workspace */
- if ((win->floating || win->transient) && (ws->idx == r->ws->idx))
- map_window_raised(win->id);
+out:
+ /* Figure out where to stack the window in the workspace. */
+ if (trans && (ww = find_window(trans)))
+ TAILQ_INSERT_AFTER(&win->ws->winlist, ww, win, entry);
+ else if (win->ws->focus && spawn_position == SWM_STACK_ABOVE)
+ TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus, win,
+ entry);
+ else if (win->ws->focus && spawn_position == SWM_STACK_BELOW)
+ TAILQ_INSERT_BEFORE(win->ws->focus, win, entry);
+ else switch (spawn_position) {
+ default:
+ case SWM_STACK_TOP:
+ case SWM_STACK_ABOVE:
+ TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry);
+ break;
+ case SWM_STACK_BOTTOM:
+ case SWM_STACK_BELOW:
+ TAILQ_INSERT_HEAD(&win->ws->winlist, win, entry);
+ }
+
+ /* Get initial _NET_WM_STATE */
+ ewmh_get_win_state(win);
+ /* Set initial _NET_WM_ALLOWED_ACTIONS */
+ ewmh_update_actions(win);
+
+ grabbuttons(win);
+
+ DNPRINTF(SWM_D_MISC, "manage_window: done. window: 0x%x, (x,y) w x h: "
+ "(%d,%d) %d x %d, ws: %d, iconic: %s, transient: 0x%x\n", win->id,
+ X(win), Y(win), WIDTH(win), HEIGHT(win), win->ws->idx,
+ YESNO(win->iconic), win->transient);
return (win);
}
if (win->transient) {
parent = find_window(win->transient);
if (parent)
- parent->child_trans = NULL;
+ parent->focus_child = NULL;
}
/* focus on root just in case */
TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry);
}
-void
-focus_magic(struct ws_win *win)
-{
- DNPRINTF(SWM_D_FOCUS, "focus_magic: window: 0x%x\n", WINID(win));
-
- if (win == NULL) {
- /* if there are no windows clear the status-bar */
- bar_update();
- return;
- }
-
- if (win->child_trans) {
- /* win = parent & has a transient so focus on that */
- if (win->java) {
- focus_win(win->child_trans);
- if (win->child_trans->take_focus)
- client_msg(win, a_takefocus);
- } else {
- /* make sure transient hasn't disappeared */
- if (validate_win(win->child_trans) == 0) {
- focus_win(win->child_trans);
- if (win->child_trans->take_focus)
- client_msg(win->child_trans,
- a_takefocus);
- } else {
- win->child_trans = NULL;
- focus_win(win);
- if (win->take_focus)
- client_msg(win, a_takefocus);
- }
- }
- } else {
- /* regular focus */
- focus_win(win);
- if (win->take_focus)
- client_msg(win, a_takefocus);
- }
-}
-
void
expose(xcb_expose_event_t *e)
{
{
struct ws_win *win;
int i;
- unsigned int action;
+ int handled = 0;
DNPRINTF(SWM_D_EVENT, "buttonpress: window 0x%x, detail: %u\n",
e->event, e->detail);
if ((win = find_window(e->event)) == NULL)
return;
- focus_magic(win);
- action = client_click;
+ focus_win(focus_magic(win));
for (i = 0; i < LENGTH(buttons); i++)
- if (action == buttons[i].action && buttons[i].func &&
+ if (client_click == buttons[i].action && buttons[i].func &&
buttons[i].button == e->detail &&
- CLEANMASK(buttons[i].mask) == CLEANMASK(e->state))
+ CLEANMASK(buttons[i].mask) == CLEANMASK(e->state)) {
buttons[i].func(win, &buttons[i].args);
+ handled = 1;
+ }
+
+ if (!handled) {
+ DNPRINTF(SWM_D_EVENT, "buttonpress: passing to window\n");
+ xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, e->time);
+ }
xcb_flush(conn);
}
}
#endif
+#ifdef SWM_DEBUG
+char *
+get_stack_mode_name(uint8_t mode)
+{
+ char *name;
+
+ switch(mode) {
+ case XCB_STACK_MODE_ABOVE:
+ name = "Above";
+ break;
+ case XCB_STACK_MODE_BELOW:
+ name = "Below";
+ break;
+ case XCB_STACK_MODE_TOP_IF:
+ name = "TopIf";
+ break;
+ case XCB_STACK_MODE_BOTTOM_IF:
+ name = "BottomIf";
+ break;
+ case XCB_STACK_MODE_OPPOSITE:
+ name = "Opposite";
+ break;
+ default:
+ name = "Unknown";
+ }
+
+ return name;
+}
+#endif
+
void
configurerequest(xcb_configure_request_event_t *e)
{
struct ws_win *win;
+ struct swm_region *r = NULL;
int new = 0, i = 0;
uint16_t mask = 0;
uint32_t wc[7] = {0};
if ((win = find_window(e->window)) == NULL)
if ((win = find_unmanaged_window(e->window)) == NULL)
new = 1;
+
#ifdef SWM_DEBUG
- print_win_geom(e->window);
+ if (swm_debug & SWM_D_EVENT) {
+ print_win_geom(e->window);
+
+ DNPRINTF(SWM_D_EVENT, "configurerequest: window: 0x%x, "
+ "parent: 0x%x, new: %s, value_mask: %u { ", e->window,
+ e->parent, YESNO(new), e->value_mask);
+ if (e->value_mask & XCB_CONFIG_WINDOW_X)
+ DPRINTF("X: %d ", e->x);
+ if (e->value_mask & XCB_CONFIG_WINDOW_Y)
+ DPRINTF("Y: %d ", e->y);
+ if (e->value_mask & XCB_CONFIG_WINDOW_WIDTH)
+ DPRINTF("W: %u ", e->width);
+ if (e->value_mask & XCB_CONFIG_WINDOW_HEIGHT)
+ DPRINTF("H: %u ", e->height);
+ if (e->value_mask & XCB_CONFIG_WINDOW_BORDER_WIDTH)
+ DPRINTF("Border: %u ", e->border_width);
+ if (e->value_mask & XCB_CONFIG_WINDOW_SIBLING)
+ DPRINTF("Sibling: 0x%x ", e->sibling);
+ if (e->value_mask & XCB_CONFIG_WINDOW_STACK_MODE)
+ DPRINTF("StackMode: %s(%u) ",
+ get_stack_mode_name(e->stack_mode), e->stack_mode);
+ DPRINTF("}\n");
+ }
#endif
+
if (new) {
- DNPRINTF(SWM_D_EVENT, "configurerequest: new window: 0x%x, "
- "value_mask: 0x%x", e->window, e->value_mask);
if (e->value_mask & XCB_CONFIG_WINDOW_X) {
mask |= XCB_CONFIG_WINDOW_X;
wc[i++] = e->x;
- DPRINTF(", X: %d", e->x);
}
if (e->value_mask & XCB_CONFIG_WINDOW_Y) {
mask |= XCB_CONFIG_WINDOW_Y;
wc[i++] = e->y;
- DPRINTF(", Y: %d", e->y);
}
if (e->value_mask & XCB_CONFIG_WINDOW_WIDTH) {
mask |= XCB_CONFIG_WINDOW_WIDTH;
wc[i++] = e->width;
- DPRINTF(", W: %u", e->width);
}
if (e->value_mask & XCB_CONFIG_WINDOW_HEIGHT) {
mask |= XCB_CONFIG_WINDOW_HEIGHT;
wc[i++] = e->height;
- DPRINTF(", H: %u", e->height);
}
if (e->value_mask & XCB_CONFIG_WINDOW_BORDER_WIDTH) {
mask |= XCB_CONFIG_WINDOW_BORDER_WIDTH;
wc[i++] = e->border_width;
- DPRINTF(", Border: %u", e->border_width);
}
if (e->value_mask & XCB_CONFIG_WINDOW_SIBLING) {
mask |= XCB_CONFIG_WINDOW_SIBLING;
wc[i++] = e->sibling;
- DPRINTF(", Sibling: 0x%x", e->sibling);
}
if (e->value_mask & XCB_CONFIG_WINDOW_STACK_MODE) {
mask |= XCB_CONFIG_WINDOW_STACK_MODE;
wc[i++] = e->stack_mode;
- DPRINTF(", StackMode: %u", e->stack_mode);
}
if (mask != 0)
xcb_configure_window(conn, e->window, mask, wc);
-
- DPRINTF(", Sent: %s\n", YESNO((mask != 0)));
} else if ((!win->manual || win->quirks & SWM_Q_ANYWHERE) &&
!(win->ewmh_flags & EWMH_F_FULLSCREEN)) {
- win->g_float.x = e->x - X(win->ws->r);
- win->g_float.y = e->y - Y(win->ws->r);
- win->g_float.w = e->width;
- win->g_float.h = e->height;
+ if (win->ws->r)
+ r = win->ws->r;
+ else if (win->ws->old_r)
+ r = win->ws->old_r;
+
+ /* windows are centered unless ANYWHERE quirk is set. */
+ if (win->quirks & SWM_Q_ANYWHERE) {
+ if (e->value_mask & XCB_CONFIG_WINDOW_X) {
+ win->g_float.x = e->x;
+ if (r)
+ win->g_float.x -= X(r);
+ }
+
+ if (e->value_mask & XCB_CONFIG_WINDOW_Y) {
+ win->g_float.y = e->y;
+ if (r)
+ win->g_float.y -= Y(r);
+ }
+ }
+
+ if (e->value_mask & XCB_CONFIG_WINDOW_WIDTH)
+ win->g_float.w = e->width;
+
+ if (e->value_mask & XCB_CONFIG_WINDOW_HEIGHT)
+ win->g_float.h = e->height;
+
win->g_floatvalid = 1;
- if (win->floating) {
- win->g = win->g_float;
- win->g.x += X(win->ws->r);
- win->g.y += Y(win->ws->r);
- update_window(win);
+ if (win->floating && r) {
+ WIDTH(win) = win->g_float.w;
+ HEIGHT(win) = win->g_float.h;
+
+ stack_floater(win, win->ws->r);
+
+ focus_flush();
} else {
config_win(win, e);
+ xcb_flush(conn);
}
} else {
config_win(win, e);
+ xcb_flush(conn);
}
-
- xcb_flush(conn);
}
void
xcb_icccm_get_wm_normal_hints(conn, win->id),
&win->sh, NULL);
adjust_font(win);
- if (font_adjusted)
+ if (font_adjusted) {
stack();
+ xcb_flush(conn);
+ }
}
}
win->floating = 0;
unmanage_window(win);
- stack();
free_window(win);
+
+ stack();
+
+ focus_flush();
}
#ifdef SWM_DEBUG
enternotify(xcb_enter_notify_event_t *e)
{
struct ws_win *win;
+
DNPRINTF(SWM_D_FOCUS, "enternotify: window: 0x%x, mode: %s(%d), "
"detail: %s(%d), root: 0x%x, subwindow: 0x%x, same_screen_focus: "
"%s, state: %d\n", e->event, get_notify_mode_label(e->mode),
e->mode, get_notify_detail_label(e->detail), e->detail, e->root,
e->child, YESNO(e->same_screen_focus), e->state);
- if (e->mode != XCB_NOTIFY_MODE_NORMAL) {
- DNPRINTF(SWM_D_EVENT, "skip enternotify: generated by "
- "cursor grab.\n");
+ if (focus_mode == SWM_FOCUS_MANUAL &&
+ e->mode == XCB_NOTIFY_MODE_NORMAL) {
+ DNPRINTF(SWM_D_EVENT, "enternotify: manual focus; ignoring.\n");
return;
}
- switch (focus_mode) {
- case SWM_FOCUS_DEFAULT:
- break;
- case SWM_FOCUS_FOLLOW:
- break;
- case SWM_FOCUS_SYNERGY:
- break;
- }
-
if ((win = find_window(e->event)) == NULL) {
- DNPRINTF(SWM_D_EVENT, "skip enternotify: window is NULL\n");
+ DNPRINTF(SWM_D_EVENT, "enternotify: window is NULL; ignoring\n");
return;
}
- focus_magic(win);
+ focus_win(focus_magic(win));
xcb_flush(conn);
}
DNPRINTF(SWM_D_EVENT, "mapnotify: window: 0x%x\n", e->window);
- win = manage_window(e->window);
- if (win)
- set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL);
+ if ((win = find_window(e->window)) == NULL)
+ win = manage_window(e->window);
- /*
- * focus_win can only set input focus on a mapped window.
- * make sure the window really has focus since it is just being mapped.
- */
+ set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL);
+
+ /* Focus on window if it is selected. */
if (win->ws->focus == win)
focus_win(win);
}
maprequest(xcb_map_request_event_t *e)
{
struct ws_win *win;
- struct swm_region *r;
xcb_get_window_attributes_reply_t *war;
- DNPRINTF(SWM_D_EVENT, "maprequest: window: 0x%x\n",
+ DNPRINTF(SWM_D_EVENT, "maprequest: win 0x%x\n",
e->window);
war = xcb_get_window_attributes_reply(conn,
xcb_get_window_attributes(conn, e->window),
NULL);
- if (!war)
- return;
+ if (war == NULL) {
+ DNPRINTF(SWM_D_EVENT, "maprequest: window lost.\n");
+ goto out;
+ }
+
if (war->override_redirect) {
- free(war);
- return;
+ DNPRINTF(SWM_D_EVENT, "maprequest: override_redirect; "
+ "skipping.\n");
+ goto out;
}
- free(war);
win = manage_window(e->window);
- if (win == NULL) {
- return; /* can't happen */
- }
- stack();
+ /* All windows need to be mapped if they are in the current workspace.*/
+ if (win->ws->r)
+ stack();
- /* make new win focused */
- r = root_to_region(win->wa->root);
- if (win->ws == r->ws)
- focus_magic(win);
+ /* The new window should get focus. */
+ win->ws->focus = focus_magic(win);
+
+ /* Ignore EnterNotify to handle the mapnotify without interference. */
+ if (focus_mode == SWM_FOCUS_DEFAULT)
+ event_drain(XCB_ENTER_NOTIFY);
+out:
+ free(war);
+ DNPRINTF(SWM_D_EVENT, "maprequest: done.\n");
}
#ifdef SWM_DEBUG
get_atom_name(xcb_atom_t atom)
{
char *name = NULL;
+#if 0
+ /*
+ * This should be disabled during most debugging since
+ * xcb_get_* causes an xcb_flush.
+ */
size_t len;
xcb_get_atom_name_reply_t *r;
}
free(r);
}
-
+#else
+ (void)atom;
+#endif
return (name);
}
#endif
e->window, name, e->atom);
free(name);
#endif
+ xcb_flush(conn);
win = find_window(e->window);
if (win == NULL)
xcb_flush(conn);
}
-#ifdef XCB_CONN_ERROR
void
check_conn(void)
{
int errcode = xcb_connection_has_error(conn);
+#ifdef XCB_CONN_ERROR
char *s;
-
switch (errcode) {
case XCB_CONN_ERROR:
s = "Socket error, pipe error or other stream error.";
default:
s = "Unknown error.";
}
-
if (errcode)
errx(errcode, "X CONNECTION ERROR: %s", s);
-}
#else
-void
-check_conn(void)
-{
- if (conn->has_error)
- errx(1, "X CONNECTION ERROR");
-}
+ if (errcode)
+ errx(errcode, "X CONNECTION ERROR");
#endif
+}
int
enable_wm(void)
int i, num_screens;
xcb_atom_t netwmcheck;
xcb_window_t root, win;
- uint32_t wa[2];
/* work around sun jdk bugs, code from wmname */
netwmcheck = get_atom_from_string("_NET_SUPPORTING_WM_CHECK");
root = screens[i].root;
win = xcb_generate_id(conn);
- wa[0] = screens[i].c[SWM_S_COLOR_UNFOCUS].pixel;
- wa[1] = screens[i].c[SWM_S_COLOR_UNFOCUS].pixel;
- xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, 0, 0, 0, 1,
- 1, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT,
- XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
+ xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, root,
+ 0, 0, 1, 1, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT,
+ XCB_COPY_FROM_PARENT, 0, NULL);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root,
netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win);
}
}
+void
+shutdown_cleanup(void)
+{
+ int i, num_screens;
+
+ /* disable alarm because the following code may not be interrupted */
+ alarm(0);
+ if (signal(SIGALRM, SIG_IGN) == SIG_ERR)
+ err(1, "can't disable alarm");
+
+ bar_extra_stop();
+ bar_extra = 1;
+ unmap_all();
+
+ teardown_ewmh();
+
+ num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+ for (i = 0; i < num_screens; ++i) {
+ if (screens[i].bar_gc != 0)
+ xcb_free_gc(conn, screens[i].bar_gc);
+ if (!bar_font_legacy)
+ XftColorFree(display, DefaultVisual(display, i),
+ DefaultColormap(display, i), &bar_font_color);
+ }
+
+ if (bar_font_legacy)
+ XFreeFontSet(display, bar_fs);
+ else {
+ XftFontClose(display, bar_font);
+ }
+
+ xcb_key_symbols_free(syms);
+ xcb_flush(conn);
+ xcb_disconnect(conn);
+}
+
void
event_error(xcb_generic_error_t *e)
{
+ (void)e;
+
DNPRINTF(SWM_D_EVENT, "event_error: %s(%u) from %s(%u), sequence: %u, "
"resource_id: %u, minor_code: %u\n",
xcb_event_get_error_label(e->error_code), e->error_code,
tv.tv_sec = 1;
tv.tv_usec = 0;
if (select(xfd + 1, &rd, NULL, NULL, &tv) == -1)
- if (errno != EINTR)
+ if (errno != EINTR) {
DNPRINTF(SWM_D_MISC, "select failed");
+ }
if (restart_wm == 1)
restart(NULL, NULL);
if (search_resp == 1)
}
}
done:
- teardown_ewmh();
- bar_extra_stop();
-
- for (i = 0; i < num_screens; ++i)
- if (screens[i].bar_gc != 0)
- xcb_free_gc(conn, screens[i].bar_gc);
-
- XftFontClose(display, bar_font);
- XftColorFree(display, DefaultVisual(display, 0),
- DefaultColormap(display, 0), &bar_font_color);
- xcb_key_symbols_free(syms);
- xcb_flush(conn);
- xcb_disconnect(conn);
+ shutdown_cleanup();
return (0);
}