X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=331dabccf945d404a294dc940efe4b16607e979c;hb=2505c8c112ee33308b6cbc22b5406c1fa23ddfe1;hp=ab82ff1bb75ebb8bc20827827d3fdba9062cadb7;hpb=f6733e1aa641ae84bb9b76267a7adde30a7f71bc;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index ab82ff1..331dabc 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -88,11 +88,9 @@ #include #include #include -#include -#include #include -#include -#include +#include +#include #include #include #include @@ -179,6 +177,7 @@ static const char *buildstr = SPECTRWM_VERSION; #define SWM_D_EVENTQ 0x1000 #define SWM_D_CONF 0x2000 #define SWM_D_BAR 0x4000 +#define SWM_D_INIT 0x8000 u_int32_t swm_debug = 0 | SWM_D_MISC @@ -196,6 +195,7 @@ u_int32_t swm_debug = 0 | SWM_D_EVENTQ | SWM_D_CONF | SWM_D_BAR + | SWM_D_INIT ; #else #define DPRINTF(x...) @@ -261,6 +261,8 @@ int ss_enabled = 0; int xrandr_support; int xrandr_eventbase; unsigned int numlockmask = 0; + +Display *display; xcb_connection_t *conn; xcb_key_symbols_t *syms; @@ -349,11 +351,9 @@ int border_width = 1; int verbose_layout = 0; time_t time_started; pid_t bar_pid; -#if 0 -XFontSet bar_fs; -XFontSetExtents *bar_fs_extents; -#endif +XftFont *bar_font; char *bar_fonts; +XftColor bar_font_color; struct passwd *pwd; /* layout manager data */ @@ -637,6 +637,7 @@ struct ewmh_hint { }; /* function prototypes */ +xcb_char2b_t *char2b(const char *); int conf_load(char *, int); void constrain_window(struct ws_win *, struct swm_region *, int); void do_sync(void); @@ -657,8 +658,30 @@ void spawn_select(struct swm_region *, union arg *, char *, int *); void store_float_geom(struct ws_win *, struct swm_region *); void unmanage_window(struct ws_win *); void update_window(struct ws_win *); +#ifdef SWM_DEBUG +char *get_atom_name(xcb_atom_t); +#endif /* function definitions */ +xcb_char2b_t * +char2b(const char *str) +{ + xcb_char2b_t *s; + size_t i, len; + + len = strlen(str); + s = malloc(len * sizeof(xcb_char2b_t)); + if (!s) + return (NULL); + + for (i = 0; i < len; i++) { + s[i].byte1 = '\0'; + s[i].byte2 = str[i]; + } + + return (s); +} + int parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb) { @@ -938,6 +961,9 @@ ewmh_update_win_state(struct ws_win *win, long state, long action) if (win == NULL) return; + DNPRINTF(SWM_D_PROP, "ewmh_update_win_state: window: 0x%x, state: %ld, " + "action: %ld\n", win->id, state, action); + if (state == ewmh[_NET_WM_STATE_FULLSCREEN].atom) mask = EWMH_F_FULLSCREEN; if (state == ewmh[_NET_WM_STATE_ABOVE].atom) @@ -1317,32 +1343,31 @@ socket_setnonblock(int fd) void bar_print(struct swm_region *r, const char *s) { - int x = 0; - size_t len; - xcb_rectangle_t rect; - uint32_t gcv[1]; - XRectangle ibox, lbox; + size_t len; + xcb_rectangle_t rect; + uint32_t gcv[1]; + int32_t x; + XGlyphInfo info; + XftDraw *draw; len = strlen(s); - /* FIXME fix bar font position calculations */ -#if 0 - XmbTextExtents(bar_fs, s, len, &ibox, &lbox); + + XftTextExtentsUtf8(display, bar_font, (FcChar8 *)s, len, &info); switch (bar_justify) { case SWM_BAR_JUSTIFY_LEFT: x = SWM_BAR_OFFSET; break; case SWM_BAR_JUSTIFY_CENTER: - x = (WIDTH(r) - lbox.width) / 2; + x = (WIDTH(r) - info.width) / 2; break; case SWM_BAR_JUSTIFY_RIGHT: - x = WIDTH(r) - lbox.width - SWM_BAR_OFFSET; + x = WIDTH(r) - info.width - SWM_BAR_OFFSET; break; } if (x < SWM_BAR_OFFSET) x = SWM_BAR_OFFSET; -#endif rect.x = 0; rect.y = 0; @@ -1360,14 +1385,15 @@ bar_print(struct swm_region *r, const char *s) xcb_change_gc(conn, r->s->bar_gc, XCB_GC_BACKGROUND, gcv); gcv[0] = r->s->c[SWM_S_COLOR_BAR_FONT].color; xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv); -#if 0 - xcb_image_text_8(conn, len, r->bar->buffer, r->s->bar_gc, x, - (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 - - lbox.y, s); -#else - /* workaround */ - xcb_image_text_8(conn, len, r->bar->buffer, r->s->bar_gc, 4, 14, s); -#endif + + draw = XftDrawCreate(display, r->bar->buffer, + DefaultVisual(display, r->s->idx), + DefaultColormap(display, r->s->idx)); + + XftDrawStringUtf8(draw, &bar_font_color, bar_font, x, + bar_font->height, (FcChar8 *)s, len); + + XftDrawDestroy(draw); /* blt */ xcb_copy_area(conn, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0, @@ -1544,7 +1570,7 @@ void bar_replace_pad(char *tmp, int *limit, size_t sz) { /* special case; no limit given, pad one space, instead */ - if (*limit == sz - 1) + if (*limit == (int)sz - 1) *limit = 1; snprintf(tmp, sz, "%*s", *limit, " "); } @@ -1567,7 +1593,7 @@ bar_replace_seq(char *fmt, char *fmtrep, struct swm_region *r, size_t *offrep, size = 0; if (sscanf(fmt, "%d%n", &limit, &size) != 1) limit = sizeof tmp - 1; - if (limit <= 0 || limit >= sizeof tmp) + if (limit <= 0 || limit >= (int)sizeof tmp) limit = sizeof tmp - 1; /* there is nothing to replace (ie EOL) */ @@ -1623,7 +1649,7 @@ bar_replace_seq(char *fmt, char *fmtrep, struct swm_region *r, size_t *offrep, len = strlen(tmp); ptr = tmp; - if (len < limit) + if ((int)len < limit) limit = len; while (limit-- > 0) { if (*offrep >= sz - 1) @@ -1829,57 +1855,54 @@ bar_refresh(void) void bar_setup(struct swm_region *r) { - char *default_string; - char **missing_charsets; - int num_missing_charsets = 0; - int i; + char *font; xcb_screen_t *screen = get_screen(r->s->idx); uint32_t wa[3]; - -#if 0 - if (bar_fs) { - XFreeFontSet(display, bar_fs); - bar_fs = NULL; + XRenderColor color; + + if (bar_font) { + XftColorFree(display, DefaultVisual(display, r->s->idx), + DefaultColormap(display, r->s->idx), &bar_font_color); + XftFontClose(display, bar_font); + bar_font = NULL; } -#endif if ((r->bar = calloc(1, sizeof(struct swm_bar))) == NULL) err(1, "bar_setup: calloc: failed to allocate memory."); -#if 0 - DNPRINTF(SWM_D_BAR, "bar_setup: 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); + while ((font = strsep(&bar_fonts, " ,")) != NULL) { + if (*font == '\0') + continue; - 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."); + DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", font); + bar_font = XftFontOpenName(display, r->s->idx, + font); + if (!bar_font) { + warnx("unable to load font %s", font); + continue; + } else { + DNPRINTF(SWM_D_INIT, "successfully opened font %s\n", + font); + break; + } } + if (bar_font == NULL) + errx(1, "unable to open a font"); - 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; + bar_height = bar_font->height + 4 * bar_border_width; if (bar_height < 1) bar_height = 1; -#else - /* workaround */ - bar_height = 24; -#endif + + color.alpha = 0xffff; + color.red = (r->s->c[SWM_S_COLOR_BAR_FONT].color >> 16) & 0xffff; + color.green = (r->s->c[SWM_S_COLOR_BAR_FONT].color >> 8) & 0xffff; + color.blue = r->s->c[SWM_S_COLOR_BAR_FONT].color & 0xffff; + if (!XftColorAllocValue(display, DefaultVisual(display, r->s->idx), + DefaultColormap(display, r->s->idx), &color, + &bar_font_color)) + warn("unable to allocate Xft color"); + X(r->bar) = X(r); Y(r->bar) = bar_at_bottom ? (Y(r) + HEIGHT(r) - bar_height) : Y(r); WIDTH(r->bar) = WIDTH(r) - 2 * bar_border_width; @@ -2105,14 +2128,16 @@ quit(struct swm_region *r, union arg *args) void unmap_window(struct ws_win *win) { + DNPRINTF(SWM_D_EVENT, "unmap_window: window: 0x%x\n", win->id); + if (win == NULL) return; /* don't unmap again */ - if (getstate(win->id) == XCB_ICCCM_WM_STATE_ICONIC) + if (getstate(win->id) == XCB_ICCCM_WM_STATE_WITHDRAWN) return; - set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC); + set_win_state(win, XCB_ICCCM_WM_STATE_WITHDRAWN); xcb_unmap_window(conn, win->id); xcb_change_window_attributes(conn, win->id, @@ -2182,6 +2207,9 @@ restart(struct swm_region *r, union arg *args) 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); @@ -2591,6 +2619,8 @@ switchws(struct swm_region *r, union arg *args) event_drain(XCB_ENTER_NOTIFY); else xcb_flush(conn); + + DNPRINTF(SWM_D_WS, "switchws: done\n"); } void @@ -3819,7 +3849,7 @@ search_win(struct swm_region *r, union arg *args) char s[8]; FILE *lfile; size_t len; - XRectangle ibox, lbox; + XGlyphInfo info; DNPRINTF(SWM_D_MISC, "search_win\n"); @@ -3851,26 +3881,15 @@ search_win(struct swm_region *r, union arg *args) snprintf(s, sizeof s, "%d", i); len = strlen(s); - /* FIXME fix calculations */ -#if 0 - XmbTextExtents(bar_fs, s, len, &ibox, &lbox); -#endif + XftTextExtentsUtf8(display, bar_font, (FcChar8 *)s, len, &info); w = xcb_generate_id(conn); wa[0] = r->s->c[SWM_S_COLOR_FOCUS].color; wa[1] = r->s->c[SWM_S_COLOR_UNFOCUS].color; -#if 0 xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0, - lbox.width + 4, bar_fs_extents->max_logical_extent.height, + 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); -#else - /* workaround */ - xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0, - 22, 20, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, - XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | - XCB_CW_BORDER_PIXEL, wa); -#endif sw->indicator = w; TAILQ_INSERT_TAIL(&search_wl, sw, entry); @@ -3883,14 +3902,7 @@ search_win(struct swm_region *r, union arg *args) XCB_GC_BACKGROUND | XCB_GC_GRAPHICS_EXPOSURES, gcv); map_window_raised(w); -#if 0 - xcb_image_text_8(conn, len, w, sw->gc, 2, - (bar_fs_extents->max_logical_extent.height - - lbox.height) / 2 - lbox.y, s); -#else - /* workaround */ - xcb_image_text_8(conn, len, w, sw->gc, 6, 14, s); -#endif + xcb_image_text_8(conn, len, w, sw->gc, 2, bar_font->height, s); DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w); @@ -3978,7 +3990,7 @@ search_resp_search_workspace(char *resp, unsigned long len) p = strchr(q, ':'); if (p != NULL) *p = '\0'; - ws_idx = strtonum(q, 1, workspace_limit, &errstr); + ws_idx = (int)strtonum(q, 1, workspace_limit, &errstr); if (errstr) { DNPRINTF(SWM_D_MISC, "workspace idx is %s: %s", errstr, q); @@ -4007,7 +4019,7 @@ search_resp_search_window(char *resp, unsigned long len) return; } - idx = strtonum(s, 1, INT_MAX, &errstr); + idx = (int)strtonum(s, 1, INT_MAX, &errstr); if (errstr) { DNPRINTF(SWM_D_MISC, "window idx is %s: %s", errstr, s); @@ -4992,7 +5004,7 @@ spawn_insert(char *name, char *args) DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s\n", name); if ((sp = calloc(1, sizeof *sp)) == NULL) - err(1, "spawn_insert: malloc"); + err(1, "spawn_insert: calloc"); if ((sp->name = strdup(name)) == NULL) err(1, "spawn_insert: strdup"); @@ -5759,7 +5771,6 @@ setconfvalue(char *selector, char *value, int flags) if (asprintf(&bar_fonts, "%s,%s", value, bar_fonts) == -1) err(1, "setconfvalue: asprintf: failed to allocate " "memory for bar_fonts."); - free(b); break; case SWM_S_BAR_FORMAT: @@ -6176,7 +6187,7 @@ conf_load(char *filename, int keymapping) for (i = 0; i < LENGTH(configopt); i++) { opt = &configopt[i]; if (!strncasecmp(cp, opt->optname, wordlen) && - strlen(opt->optname) == wordlen) { + (int)strlen(opt->optname) == wordlen) { optind = i; break; } @@ -6320,7 +6331,7 @@ tryharder: return (0); } - ret = strtonum(xcb_get_property_value(pr), 0, INT_MAX, &errstr); + ret = (pid_t)strtonum(xcb_get_property_value(pr), 0, INT_MAX, &errstr); free(pr); return (ret); @@ -6459,7 +6470,7 @@ manage_window(xcb_window_t id) p = NULL; } else if (prop && win->transient == 0) { DNPRINTF(SWM_D_PROP, "manage_window: get _SWM_WS: %s\n", prop); - ws_idx = strtonum(prop, 0, workspace_limit - 1, + ws_idx = (int)strtonum(prop, 0, workspace_limit - 1, &errstr); if (errstr) { DNPRINTF(SWM_D_EVENT, "manage_window: window: #%s: %s", @@ -6758,6 +6769,24 @@ buttonpress(xcb_button_press_event_t *e) xcb_flush(conn); } +#ifdef SWM_DEBUG +void +print_win_geom(xcb_window_t w) +{ + xcb_get_geometry_reply_t *wa; + + + wa = xcb_get_geometry_reply(conn, xcb_get_geometry(conn, w), NULL); + + DNPRINTF(SWM_D_MISC, "print_win_geom: window: 0x%x, root: 0x%x, " + "depth: %u, (x,y) w x h: (%d,%d) %d x %d, border: %d\n", + w, wa->root, wa->depth, wa->x, wa->y, wa->width, wa->height, + wa->border_width); + + free(wa); +} +#endif + void configurerequest(xcb_configure_request_event_t *e) { @@ -6769,42 +6798,52 @@ configurerequest(xcb_configure_request_event_t *e) 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); +#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); } - DNPRINTF(SWM_D_EVENT, "configurerequest: new window: 0x%x, " - "new: %s, (x,y) w x h: (%d,%d) %d x %d\n", e->window, - YESNO(new), wc[0], wc[1], wc[2], wc[3]); + if (mask != 0) + xcb_configure_window(conn, e->window, mask, wc); - 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); @@ -6968,17 +7007,17 @@ maprequest(xcb_map_request_event_t *e) focus_magic(win); } -void -propertynotify(xcb_property_notify_event_t *e) -{ - struct ws_win *win; #ifdef SWM_DEBUG +char * +get_atom_name(xcb_atom_t atom) +{ char *name; size_t len; xcb_get_atom_name_reply_t *r; + xcb_map_request_event_t mre; r = xcb_get_atom_name_reply(conn, - xcb_get_atom_name(conn, e->atom), + xcb_get_atom_name(conn, atom), NULL); if (r) { len = xcb_get_atom_name_name_length(r); @@ -6988,14 +7027,27 @@ propertynotify(xcb_property_notify_event_t *e) memcpy(name, xcb_get_atom_name_name(r), len); name[len] = '\0'; - DNPRINTF(SWM_D_EVENT, - "propertynotify: window: 0x%x, atom: %s\n", - e->window, name); - free(name); + return name; } } free(r); } + + return NULL; +} +#endif + +void +propertynotify(xcb_property_notify_event_t *e) +{ + struct ws_win *win; +#ifdef SWM_DEBUG + char *name; + + name = get_atom_name(e->atom); + DNPRINTF(SWM_D_EVENT, "propertynotify: window: 0x%x, atom: %s(%u)\n", + e->window, name, e->atom); + free(name); #endif win = find_window(e->window); @@ -7053,15 +7105,27 @@ void clientmessage(xcb_client_message_event_t *e) { struct ws_win *win; + xcb_map_request_event_t mre; +#ifdef SWM_DEBUG + char *name; + name = get_atom_name(e->type); + DNPRINTF(SWM_D_EVENT, "clientmessage: window: 0x%x, atom: %s(%u)\n", + e->window, name, e->type); + free(name); +#endif win = find_window(e->window); - if (win == NULL) + + if (win == NULL) { + if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) { + DNPRINTF(SWM_D_EVENT, "clientmessage: request focus on " + "unmanaged window.\n"); + mre.window = e->window; + maprequest(&mre); + } return; } - DNPRINTF(SWM_D_EVENT, "clientmessage: window: 0x%x, type: %u\n", - e->window, e->type); - if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) { DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_ACTIVE_WINDOW\n"); focus_win(win); @@ -7107,20 +7171,32 @@ clientmessage(xcb_client_message_event_t *e) xcb_flush(conn); } -void -active_wm(void) +int +enable_wm(void) { int num_screens, i; - const uint32_t val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT; + const uint32_t val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT; xcb_screen_t *sc; + xcb_void_cookie_t wac; + xcb_generic_error_t *error; /* 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); - xcb_change_window_attributes(conn, sc->root, + 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_CW_EVENT_MASK, &val); + if ((error = xcb_request_check(conn, wac))) { + DNPRINTF(SWM_D_INIT, "enable_wm: error_code: %u\n", + error->error_code); + free(error); + return 1; + } } + + return 0; } void @@ -7279,14 +7355,6 @@ screenchange(xcb_randr_screen_change_notify_event_t *e) DNPRINTF(SWM_D_EVENT, "screenchange: root: 0x%x\n", e->root); - if (e->rotation & (XCB_RANDR_ROTATION_ROTATE_90 - | XCB_RANDR_ROTATION_ROTATE_270)) - xcb_randr_set_screen_size(conn, e->root, e->height, - e->width, e->mheight, e->mwidth); - else - xcb_randr_set_screen_size(conn, e->root, e->width, - e->height, e->mwidth, e->mheight); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); /* silly event doesn't include the screen index */ for (i = 0; i < num_screens; i++) @@ -7298,6 +7366,9 @@ screenchange(xcb_randr_screen_change_notify_event_t *e) /* brute force for now, just re-enumerate the regions */ scan_xrandr(i); +#ifdef SWM_DEBUG + print_win_geom(e->root); +#endif /* add bars to all regions */ for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) @@ -7603,7 +7674,7 @@ main(int argc, char *argv[]) start_argv = argv; warnx("Welcome to spectrwm V%s Build: %s", SPECTRWM_VERSION, buildstr); - if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "")) + if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "")) warnx("no locale support"); /* handle some signals */ @@ -7620,10 +7691,15 @@ main(int argc, char *argv[]) sact.sa_flags = SA_NOCLDSTOP; sigaction(SIGCHLD, &sact, NULL); - conn = xcb_connect(NULL, NULL); + if (!(display = XOpenDisplay(0))) + errx(1, "can not open display"); + + conn = XGetXCBConnection(display); if (xcb_connection_has_error(conn)) errx(1, "can not get XCB connection"); + XSetEventQueueOwner(display, XCBOwnsEventQueue); + xcb_prefetch_extension_data(conn, &xcb_randr_id); xfd = xcb_get_file_descriptor(conn); @@ -7642,12 +7718,11 @@ main(int argc, char *argv[]) free(evt); } - active_wm(); - xcb_aux_sync(conn); - - if (xcb_poll_for_event(conn) != NULL) + if (enable_wm() != 0) errx(1, "another window manager is currently running"); + xcb_aux_sync(conn); + setup_globals(); setup_screens(); setup_keys(); @@ -7773,10 +7848,12 @@ done: for (i = 0; i < num_screens; ++i) if (screens[i].bar_gc != 0) xcb_free_gc(conn, screens[i].bar_gc); -#if 0 - XFreeFontSet(display, bar_fs); -#endif + + 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); return (0);