#include <util.h>
#include <X11/cursorfont.h>
#include <X11/extensions/Xrandr.h>
+#include <X11/Xft/Xft.h>
#include <X11/Xlib-xcb.h>
#include <xcb/xcb_atom.h>
#include <xcb/xcb_aux.h>
int verbose_layout = 0;
time_t time_started;
pid_t bar_pid;
-xcb_font_t bar_fs;
-int32_t bar_fs_height;
+XftFont *bar_font;
char *bar_fonts;
+XftColor bar_font_color;
struct passwd *pwd;
/* layout manager data */
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 *
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];
num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
for (i = 0; i < num_screens; i++) {
/* Support check window will be created by workaround(). */
-
+
/* Report supported atoms */
xcb_delete_property(conn, screens[i].root, sup_list);
for (j = 0; j < LENGTH(ewmh); j++)
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)
size_t len;
xcb_rectangle_t rect;
uint32_t gcv[1];
- xcb_char2b_t *c2b;
- xcb_query_text_extents_reply_t *ter;
- int32_t x, width;
+ int32_t x;
+ XGlyphInfo info;
+ XftDraw *draw;
len = strlen(s);
- c2b = char2b(s);
- if (!c2b)
- return;
- ter = xcb_query_text_extents_reply(conn,
- xcb_query_text_extents(conn, bar_fs, len, c2b),
- NULL);
- if (!ter) {
- free(c2b);
- return;
- }
- width = ter->overall_width;
-
- free(ter);
- free(c2b);
-
+
+ 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) - width) / 2;
+ x = (WIDTH(r) - info.width) / 2;
break;
case SWM_BAR_JUSTIFY_RIGHT:
- x = WIDTH(r) - width - SWM_BAR_OFFSET;
+ x = WIDTH(r) - info.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);
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);
- gcv[0] = bar_fs;
- xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FONT, gcv);
-
- xcb_image_text_8(conn, len, r->bar->buffer, r->s->bar_gc, x,
- bar_fs_height, s);
+
+ 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,
void
bar_setup(struct swm_region *r)
{
- char *bar_font;
+ char *font;
xcb_screen_t *screen = get_screen(r->s->idx);
uint32_t wa[3];
- xcb_generic_error_t *error;
- xcb_void_cookie_t voc;
- xcb_query_font_reply_t *bar_fs_info;
-
- if (bar_fs) {
- xcb_close_font(conn, bar_fs);
- bar_fs = 0;
+ 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;
}
if ((r->bar = calloc(1, sizeof(struct swm_bar))) == NULL)
err(1, "bar_setup: calloc: failed to allocate memory.");
- bar_fs = xcb_generate_id(conn);
- while ((bar_font = strsep(&bar_fonts, " ,")) != NULL) {
- if (*bar_font == '\0')
+ while ((font = strsep(&bar_fonts, " ,")) != NULL) {
+ if (*font == '\0')
continue;
- DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", bar_font);
- voc = xcb_open_font_checked(conn, bar_fs, strlen(bar_font),
- bar_font);
-
- if ((error = xcb_request_check(conn, voc))) {
- DNPRINTF(SWM_D_INIT,
- "bar_setup: unable to open font: %s\n",
- bar_font);
- free(error);
- warnx("unable to load font %s", bar_font);
+ 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,
- "bar_setup: successfully opened font: %s\n",
- bar_font);
+ DNPRINTF(SWM_D_INIT, "successfully opened font %s\n",
+ font);
break;
}
}
+ if (bar_font == NULL)
+ errx(1, "unable to open a font");
- bar_fs_info = xcb_query_font_reply(conn,
- xcb_query_font(conn, bar_fs),
- NULL);
- if (!bar_fs_info)
- errx(1, "unable to get font information for font %s\n",
- bar_font);
- bar_fs_height = bar_fs_info->font_ascent + bar_fs_info->font_descent;
- free(bar_fs_info);
-
- bar_height = bar_fs_height + 4 * bar_border_width;
+ bar_height = bar_font->height + 4 * bar_border_width;
if (bar_height < 1)
bar_height = 1;
+ 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;
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,
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);
event_drain(XCB_ENTER_NOTIFY);
else
xcb_flush(conn);
+
+ DNPRINTF(SWM_D_WS, "switchws: done\n");
}
void
struct ws_win *win = NULL;
struct search_window *sw = NULL;
xcb_window_t w;
- uint32_t gcv[4], wa[2];
- int i, width;
+ uint32_t gcv[3], wa[2];
+ int i;
char s[8];
FILE *lfile;
size_t len;
- xcb_char2b_t *c2b;
- xcb_query_text_extents_reply_t *ter;
+ XGlyphInfo info;
DNPRINTF(SWM_D_MISC, "search_win\n");
snprintf(s, sizeof s, "%d", i);
len = strlen(s);
- c2b = char2b(s);
- if (!c2b) {
- warn("search_win: char2b malloc");
- free(sw);
- fclose(lfile);
- search_win_cleanup();
- return;
- }
- ter = xcb_query_text_extents_reply(conn,
- xcb_query_text_extents(conn, bar_fs,
- len, c2b),
- NULL);
- if (!ter) {
- warn("search_win: query text failed");
- free(c2b);
- free(sw);
- fclose(lfile);
- search_win_cleanup();
- return;
- }
- width = ter->overall_width;
- free(ter);
- free(c2b);
+ 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;
xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0,
- width + 4, bar_fs_height + 4,
+ 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);
sw->gc = xcb_generate_id(conn);
gcv[0] = r->s->c[SWM_S_COLOR_BAR].color;
gcv[1] = r->s->c[SWM_S_COLOR_FOCUS].color;
- gcv[2] = bar_fs;
- gcv[3] = 0;
+ gcv[2] = 0;
xcb_create_gc(conn, sw->gc, w, XCB_GC_FOREGROUND |
- XCB_GC_BACKGROUND | XCB_GC_FONT | XCB_GC_GRAPHICS_EXPOSURES,
- gcv);
+ XCB_GC_BACKGROUND | XCB_GC_GRAPHICS_EXPOSURES, gcv);
map_window_raised(w);
- xcb_image_text_8(conn, len, w, sw->gc, 2, bar_fs_height, s);
+ 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);
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;
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 */
if (!(display = XOpenDisplay(0)))
errx(1, "can not open display");
- conn = XGetXCBConnection(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);
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);
Got questions, comments, patches, etc.? Contact Jason Woofenden