#endif
#endif
-#if defined(__OpenBSD__)
+#ifndef XCB_ICCCM_NUM_WM_HINTS_ELEMENTS
#define XCB_ICCCM_SIZE_HINT_P_MIN_SIZE XCB_SIZE_HINT_P_MIN_SIZE
#define XCB_ICCCM_SIZE_HINT_P_MAX_SIZE XCB_SIZE_HINT_P_MAX_SIZE
#define XCB_ICCCM_SIZE_HINT_P_RESIZE_INC XCB_SIZE_HINT_P_RESIZE_INC
#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) \
"-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;
+#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 = 0;
+char *bar_fonts;
+XftColor bar_font_color;
+struct passwd *pwd;
/* layout manager data */
struct swm_geometry {
} c[SWM_S_COLOR_MAX];
xcb_gcontext_t bar_gc;
+ GC bar_gc_legacy;
};
struct swm_screen *screens;
};
/* function prototypes */
+void buttonpress(xcb_button_press_event_t *);
+void check_conn(void);
+void clientmessage(xcb_client_message_event_t *);
int conf_load(char *, int);
+void configurenotify(xcb_configure_notify_event_t *);
+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_error(xcb_generic_error_t *);
void event_handle(xcb_generic_event_t *);
+char *expand_tilde(char *);
+void expose(xcb_expose_event_t *);
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 *);
+#ifdef SWM_DEBUG
+void focusin(xcb_focus_in_event_t *);
+#endif
xcb_atom_t get_atom_from_string(const char *);
+#ifdef SWM_DEBUG
+char *get_atom_name(xcb_atom_t);
+char *get_notify_detail_label(uint8_t);
+char *get_notify_mode_label(uint8_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 keypress(xcb_key_press_event_t *);
+#ifdef SWM_DEBUG
+void leavenotify(xcb_leave_notify_event_t *);
+#endif
void map_window_raised(xcb_window_t);
+void mapnotify(xcb_map_notify_event_t *);
+void mappingnotify(xcb_mapping_notify_event_t *);
+void maprequest(xcb_map_request_event_t *);
void new_region(struct swm_screen *, int, int, int, int);
int parse_rgb(const char *, uint16_t *, uint16_t *, uint16_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 store_float_geom(struct ws_win *, struct swm_region *);
void unmanage_window(struct ws_win *);
+void unmapnotify(xcb_unmap_notify_event_t *);
void update_window(struct ws_win *);
-#ifdef SWM_DEBUG
-char *get_atom_name(xcb_atom_t);
-#endif
+/*void visibilitynotify(xcb_visibility_notify_event_t *);*/
+
+char *
+expand_tilde(char *s)
+{
+ struct passwd *ppwd;
+ int i, max;
+ char *user;
+ const char *sc = s;
+ char *result;
+
+ if (s == NULL)
+ errx(1, "expand_tilde: NULL string.");
+
+ if (s[0] != '~') {
+ result = strdup(sc);
+ goto out;
+ }
+
+ ++s;
+
+ if ((max = sysconf(_SC_LOGIN_NAME_MAX)) == -1)
+ errx(1, "expand_tilde: sysconf");
+
+ if ((user = calloc(1, max + 1)) == NULL)
+ errx(1, "expand_tilde: calloc");
+
+ for (i = 0; s[i] != '/' && s[i] != '\0'; ++i)
+ user[i] = s[i];
+ user[i] = '\0';
+ s = &s[i];
+
+ ppwd = strlen(user) == 0 ? getpwuid(getuid()) : getpwnam(user);
+ if (ppwd == NULL)
+ result = strdup(sc);
+ else
+ if (asprintf(&result, "%s%s", ppwd->pw_dir, s) == -1)
+ result = NULL;
+out:
+ if (result == NULL)
+ errx(1, "expand_tilde: failed to allocate memory.");
+
+ return result;
+}
int
parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb)
xcb_screen_t *
get_screen(int screen)
{
- xcb_screen_iterator_t i;
+ const xcb_setup_t *r;
+ xcb_screen_iterator_t iter;
+
+ if ((r = xcb_get_setup(conn)) == NULL) {
+ DNPRINTF(SWM_D_MISC, "get_screen: xcb_get_setup\n");
+ check_conn();
+ }
- i = xcb_setup_roots_iterator(xcb_get_setup(conn));
- for (; i.rem; --screen, xcb_screen_next(&i))
+ iter = xcb_setup_roots_iterator(r);
+ for (; iter.rem; --screen, xcb_screen_next(&iter))
if (screen == 0)
- return (i.data);
+ return (iter.data);
return (NULL);
}
#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;
}
#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 */
-void event_error(xcb_generic_error_t *);
-void expose(xcb_expose_event_t *);
-void keypress(xcb_key_press_event_t *);
-void buttonpress(xcb_button_press_event_t *);
-void configurerequest(xcb_configure_request_event_t *);
-void configurenotify(xcb_configure_notify_event_t *);
-void destroynotify(xcb_destroy_notify_event_t *);
-void enternotify(xcb_enter_notify_event_t *);
-void mapnotify(xcb_map_notify_event_t *);
-void mappingnotify(xcb_mapping_notify_event_t *);
-void maprequest(xcb_map_request_event_t *);
-void propertynotify(xcb_property_notify_event_t *);
-void unmapnotify(xcb_unmap_notify_event_t *);
-/*void visibilitynotify(xcb_visibility_notify_event_t *);*/
-void clientmessage(xcb_client_message_event_t *);
-void screenchange(xcb_randr_screen_change_notify_event_t *);
-
void
sighdlr(int sig)
{
sidx, num_screens);
sidx--;
- screen = get_screen(sidx);
+ if ((screen = get_screen(sidx)) == NULL)
+ errx(1, "ERROR: can't get screen %d.", sidx);
+
if (w < 1 || h < 1)
errx(1, "region %ux%u+%u+%u too small", w, h, x, y);
}
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,
+ sizeof(rect), &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)
{
size_t len;
sizeof(rect), &rect);
/* draw back buffer */
+#if 0
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);
-
+#endif
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_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;
- int count;
- xcb_screen_t *screen = get_screen(r->s->idx);
- uint32_t wa[3];
- XRenderColor color;
+ char *default_string;
+ char **missing_charsets;
+ int num_missing_charsets = 0;
+ int i;
- if (r->bar != NULL)
- return;
+ if (bar_fs) {
+ XFreeFontSet(display, bar_fs);
+ bar_fs = NULL;
+ }
- if ((r->bar = calloc(1, sizeof(struct swm_bar))) == NULL)
- err(1, "bar_setup: calloc: failed to allocate memory.");
+ DNPRINTF(SWM_D_INIT, "fontset_init: loading bar_fonts: %s\n", bar_fonts);
+
+ 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) {
- while ((font = strsep(&bar_fonts, ",")) != NULL) {
+ if ((d = strdup(bar_fonts)) == NULL)
+ errx(1, "insufficient memory.");
+ 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(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);
xcb_create_pixmap(conn, screen->root_depth, r->bar->buffer, r->bar->id,
WIDTH(r->bar), HEIGHT(r->bar));
- xcb_randr_select_input(conn, r->bar->id,
- XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE);
+ if (xrandr_support)
+ xcb_randr_select_input(conn, r->bar->id,
+ XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE);
if (bar_enabled)
map_window_raised(r->bar->id);
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)) {
bar_extra = 1;
unmap_all();
- XftFontClose(display, bar_font);
- XftColorFree(display, DefaultVisual(display, r->s->idx),
- DefaultColormap(display, r->s->idx), &bar_font_color);
+ if (bar_font_legacy)
+ XFreeFontSet(display, bar_fs);
+ else {
+ 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);
{
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);
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 gcv, 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);
- draw = XftDrawCreate(display, w,
- DefaultVisual(display, r->s->idx),
- DefaultColormap(display, r->s->idx));
+ XSetForeground(display, l_draw,
+ r->s->c[SWM_S_COLOR_BAR].pixel);
- XftDrawStringUtf8(draw, &bar_font_color, bar_font, 2,
- (HEIGHT(r->bar) + bar_font->height) / 2 - bar_font->descent,
- (FcChar8 *)s, len);
+ DRAWSTRING(display, w, bar_fs, l_draw, 2,
+ (bar_fs_extents->max_logical_extent.height -
+ l_lbox.height) / 2 - l_lbox.y, s, len);
- XftDrawDestroy(draw);
+ XFreeGC(display, l_draw);
+ } else {
+#if 0
+ sw->gc = xcb_generate_id(conn);
+ gcv = 0;
+ xcb_create_gc(conn, sw->gc, w, XCB_GC_GRAPHICS_EXPOSURES,
+ &gcv);
+#endif
+
+ draw = XftDrawCreate(display, w,
+ DefaultVisual(display, r->s->idx),
+ DefaultColormap(display, r->s->idx));
+
+ XftDrawStringUtf8(draw, &bar_font_color, bar_font, 2,
+ (HEIGHT(r->bar) + bar_font->height) / 2 -
+ bar_font->descent, (FcChar8 *)s, len);
+
+ XftDrawDestroy(draw);
+/* xcb_free_gc(conn, sw->gc);*/
+ }
DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w);
unsigned int shape; /* cursor style */
xcb_cursor_t cursor;
xcb_font_t cursor_font;
- xcb_grab_pointer_cookie_t gpc;
xcb_query_pointer_reply_t *xpr;
xcb_generic_event_t *evt;
xcb_motion_notify_event_t *mne;
xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font,
shape, shape + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
- gpc = xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
+ xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE, cursor,
XCB_CURRENT_TIME),
struct swm_region *r = NULL;
xcb_font_t cursor_font;
xcb_cursor_t cursor;
- xcb_grab_pointer_cookie_t gpc;
xcb_query_pointer_reply_t *qpr;
xcb_generic_event_t *evt;
xcb_motion_notify_event_t *mne;
xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font,
XC_fleur, XC_fleur + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
- gpc = xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
+ xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
XCB_WINDOW_NONE, cursor, XCB_CURRENT_TIME);
int
setconfspawn(char *selector, char *value, int flags)
{
+ char *args;
+
/* suppress unused warning since var is needed */
(void)flags;
- DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, value);
+ args = expand_tilde(value);
- setspawn(selector, value);
+ DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args);
+
+ setspawn(selector, args);
+ free(args);
DNPRINTF(SWM_D_SPAWN, "setconfspawn: done\n");
return (0);
+ j];
keycode = xcb_key_symbols_get_keycode(syms,
XK_Num_Lock);
- if (kc == *keycode)
+ if (kc == *keycode)
numlockmask = (1 << i);
free(keycode);
}
{
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);
}
switch (flags) {
case SWM_S_BAR_ACTION:
free(bar_argv[0]);
- if ((bar_argv[0] = strdup(value)) == NULL)
+ if ((bar_argv[0] = expand_tilde(value)) == NULL)
err(1, "setconfvalue: bar_action");
break;
case SWM_S_BAR_AT_BOTTOM:
err(1, "setconfvalue: asprintf: failed to allocate "
"memory for bar_fonts.");
free(b);
+
+ if (isxlfd(value))
+ bar_font_legacy = 1;
break;
case SWM_S_BAR_FORMAT:
free(bar_format);
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;
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);
struct quirk *qp;
uint32_t event_mask, i;
xcb_icccm_get_wm_protocols_reply_t wpr;
- xcb_icccm_get_wm_class_reply_t tmpch;
if ((win = find_window(id)) != NULL)
return (win); /* already being managed */
if (xcb_icccm_get_wm_class_reply(conn,
xcb_icccm_get_wm_class(conn, win->id),
- &tmpch, NULL)) {
- win->ch.class_name = tmpch.class_name;
- win->ch.instance_name = tmpch.instance_name;
-
- xcb_icccm_get_wm_class_reply_wipe(&tmpch);
-
+ &win->ch, NULL)) {
DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, name: %s\n",
win->ch.class_name, win->ch.instance_name);
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);
if (win->wa)
free(win->wa);
-
+
+ xcb_icccm_get_wm_class_reply_wipe(&win->ch);
+
kill_refs(win);
/* paint memory */
xcb_flush(conn);
}
+#ifdef SWM_DEBUG
+void
+focusin(xcb_focus_in_event_t *e)
+{
+ DNPRINTF(SWM_D_EVENT, "focusin: window: 0x%x, mode: %s(%u), "
+ "detail: %s(%u)\n", e->event, get_notify_mode_label(e->mode),
+ e->mode, get_notify_detail_label(e->detail), e->detail);
+}
+#endif
+
void
keypress(xcb_key_press_event_t *e)
{
free_window(win);
}
+#ifdef SWM_DEBUG
+char *
+get_notify_detail_label(uint8_t detail)
+{
+ char *label;
+
+ switch (detail) {
+ case XCB_NOTIFY_DETAIL_ANCESTOR:
+ label = "Ancestor";
+ break;
+ case XCB_NOTIFY_DETAIL_VIRTUAL:
+ label = "Virtual";
+ break;
+ case XCB_NOTIFY_DETAIL_INFERIOR:
+ label = "Inferior";
+ break;
+ case XCB_NOTIFY_DETAIL_NONLINEAR:
+ label = "Nonlinear";
+ break;
+ case XCB_NOTIFY_DETAIL_NONLINEAR_VIRTUAL:
+ label = "NonlinearVirtual";
+ break;
+ case XCB_NOTIFY_DETAIL_POINTER:
+ label = "Pointer";
+ break;
+ case XCB_NOTIFY_DETAIL_POINTER_ROOT:
+ label = "PointerRoot";
+ break;
+ case XCB_NOTIFY_DETAIL_NONE:
+ label = "None";
+ break;
+ default:
+ label = "Unknown";
+ }
+
+ return label;
+}
+
+char *
+get_notify_mode_label(uint8_t mode)
+{
+ char *label;
+
+ switch (mode) {
+ case XCB_NOTIFY_MODE_NORMAL:
+ label = "Normal";
+ break;
+ case XCB_NOTIFY_MODE_GRAB:
+ label = "Grab";
+ break;
+ case XCB_NOTIFY_MODE_UNGRAB:
+ label = "Ungrab";
+ break;
+ case XCB_NOTIFY_MODE_WHILE_GRABBED:
+ label = "WhileGrabbed";
+ break;
+ default:
+ label = "Unknown";
+ }
+
+ return label;
+}
+#endif
+
void
enternotify(xcb_enter_notify_event_t *e)
{
struct ws_win *win;
- DNPRINTF(SWM_D_FOCUS, "enternotify: window: 0x%x, mode: %d, detail: "
- "%d, root: 0x%x, subwindow: 0x%x, same_screen_focus: %s, "
- "state: %d\n", e->event, e->mode, e->detail, e->root,
+ 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) {
xcb_flush(conn);
}
+#ifdef SWM_DEBUG
+void
+leavenotify(xcb_leave_notify_event_t *e)
+{
+ DNPRINTF(SWM_D_FOCUS, "leavenotify: 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);
+}
+#endif
+
/* lets us use one switch statement for arbitrary mode/detail combinations */
#define MERGE_MEMBERS(a,b) (((a & 0xffff) << 16) | (b & 0xffff))
xcb_flush(conn);
}
+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.";
+ break;
+ case XCB_CONN_CLOSED_EXT_NOTSUPPORTED:
+ s = "Extension not supported.";
+ break;
+ case XCB_CONN_CLOSED_MEM_INSUFFICIENT:
+ s = "Insufficient memory.";
+ break;
+ case XCB_CONN_CLOSED_REQ_LEN_EXCEED:
+ s = "Request length was exceeded.";
+ break;
+ case XCB_CONN_CLOSED_PARSE_ERR:
+ s = "Error parsing display string.";
+ break;
+ default:
+ s = "Unknown error.";
+ }
+ if (errcode)
+ errx(errcode, "X CONNECTION ERROR: %s", s);
+#else
+ if (errcode)
+ errx(errcode, "X CONNECTION ERROR");
+#endif
+}
+
int
enable_wm(void)
{
/* this causes an error if some other window manager is running */
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
for (i = 0; i < num_screens; i++) {
- sc = get_screen(i);
+ if ((sc = get_screen(i)) == NULL)
+ errx(1, "ERROR: can't get screen %d.", i);
DNPRINTF(SWM_D_INIT, "enable_wm: screen %d, root: 0x%x\n",
i, sc->root);
wac = xcb_change_window_attributes_checked(conn, sc->root,
xcb_randr_get_crtc_info_cookie_t cic;
xcb_randr_get_crtc_info_reply_t *cir = NULL;
xcb_randr_crtc_t *crtc;
- xcb_screen_t *screen = get_screen(i);
+ xcb_screen_t *screen;
+
+ if ((screen = get_screen(i)) == NULL)
+ errx(1, "ERROR: can't get screen %d.", i);
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
if (i >= num_screens)
struct workspace *ws;
uint32_t gcv[1], wa[1];
const xcb_query_extension_reply_t *qep;
+ xcb_screen_t *screen;
xcb_cursor_t cursor;
xcb_font_t cursor_font;
xcb_randr_query_version_cookie_t c;
/* initial Xrandr setup */
xrandr_support = 0;
- c = xcb_randr_query_version(conn, 1, 1);
- r = xcb_randr_query_version_reply(conn, c, NULL);
- if (r) {
- if (r->major_version >= 1)
- xrandr_support = 1;
- free(r);
- }
qep = xcb_get_extension_data(conn, &xcb_randr_id);
- xrandr_eventbase = qep->first_event;
+ if (qep->present) {
+ c = xcb_randr_query_version(conn, 1, 1);
+ r = xcb_randr_query_version_reply(conn, c, NULL);
+ if (r) {
+ if (r->major_version >= 1) {
+ xrandr_support = 1;
+ xrandr_eventbase = qep->first_event;
+ }
+ free(r);
+ }
+ }
cursor_font = xcb_generate_id(conn);
xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor");
screens[i].idx = i;
TAILQ_INIT(&screens[i].rl);
TAILQ_INIT(&screens[i].orl);
- screens[i].root = get_screen(i)->root;
+ if ((screen = get_screen(i)) == NULL)
+ errx(1, "ERROR: can't get screen %d.", i);
+ screens[i].root = screen->root;
/* set default colors */
setscreencolor("red", i + 1, SWM_S_COLOR_FOCUS);
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,
EVENT(XCB_DESTROY_NOTIFY, destroynotify);
EVENT(XCB_ENTER_NOTIFY, enternotify);
EVENT(XCB_EXPOSE, expose);
- /*EVENT(XCB_FOCUS_IN, );*/
+#ifdef SWM_DEBUG
+ EVENT(XCB_FOCUS_IN, focusin);
+#endif
/*EVENT(XCB_FOCUS_OUT, );*/
/*EVENT(XCB_GRAPHICS_EXPOSURE, );*/
/*EVENT(XCB_GRAVITY_NOTIFY, );*/
EVENT(XCB_KEY_PRESS, keypress);
/*EVENT(XCB_KEY_RELEASE, keypress);*/
/*EVENT(XCB_KEYMAP_NOTIFY, );*/
- /*EVENT(XCB_LEAVE_NOTIFY, );*/
+#ifdef SWM_DEBUG
+ EVENT(XCB_LEAVE_NOTIFY, leavenotify);
+#endif
EVENT(XCB_MAP_NOTIFY, mapnotify);
EVENT(XCB_MAP_REQUEST, maprequest);
EVENT(XCB_MAPPING_NOTIFY, mappingnotify);
sact.sa_flags = SA_NOCLDSTOP;
sigaction(SIGCHLD, &sact, NULL);
+ if (!X_HAVE_UTF8_STRING)
+ warnx("no UTF-8 support");
+
if (!(display = XOpenDisplay(0)))
errx(1, "can not open display");
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)
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);
+ if (bar_font_legacy) {
+ XFreeFontSet(display, bar_fs);
+ } else {
+ 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);