X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=62612f7cd3da57f1d3fded9afadc40166637ee0a;hb=c90ce2ecdbab9a7843d5be75828ac6239424831b;hp=50739c1f31a176f9a2c7fab730b8f9529ac1269e;hpb=9d10f0db5fd74344651bede474a4d21f9a2ef6fd;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index 50739c1..62612f7 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -88,11 +88,9 @@ #include #include #include -#include -#include #include -#include -#include +#include +#include #include #include #include @@ -263,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; @@ -351,10 +351,7 @@ 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; struct passwd *pwd; @@ -639,6 +636,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); @@ -659,8 +657,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) { @@ -940,6 +960,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: %d, " + "action: %d\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) @@ -1319,32 +1342,30 @@ socket_setnonblock(int fd) void bar_print(struct swm_region *r, const char *s) { - size_t len; - xcb_rectangle_t rect; - uint32_t gcv[1]; + size_t len; + xcb_rectangle_t rect; + uint32_t gcv[1]; + int32_t x; + XGlyphInfo info; len = strlen(s); - /* FIXME fix bar font position calculations */ -#if 0 - int x = 0; - XRectangle ibox, lbox; - 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; @@ -1362,14 +1383,9 @@ 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 + bar_font->height, s); /* blt */ xcb_copy_area(conn, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0, @@ -1831,57 +1847,40 @@ 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; + if (bar_font) { + 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, DefaultScreen(display), + 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_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 + 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; @@ -2107,14 +2106,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, @@ -2593,6 +2594,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 @@ -3821,7 +3824,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"); @@ -3853,26 +3856,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); @@ -3885,14 +3877,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); @@ -5761,7 +5746,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: @@ -7166,7 +7150,7 @@ 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; @@ -7665,7 +7649,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 */ @@ -7682,10 +7666,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); @@ -7835,7 +7824,7 @@ done: if (screens[i].bar_gc != 0) xcb_free_gc(conn, screens[i].bar_gc); #if 0 - XFreeFontSet(display, bar_fs); + XFreeFontSet(display, bar_font); #endif xcb_key_symbols_free(syms); xcb_flush(conn);