Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
spectrwm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Xlib exiting on error.
[spectrwm.git]
/
spectrwm.c
diff --git
a/spectrwm.c
b/spectrwm.c
index
750878a
..
cd6ca79
100644
(file)
--- a/
spectrwm.c
+++ b/
spectrwm.c
@@
-88,11
+88,9
@@
#include <unistd.h>
#include <util.h>
#include <X11/cursorfont.h>
#include <unistd.h>
#include <util.h>
#include <X11/cursorfont.h>
-#include <X11/keysym.h>
-#include <X11/Xlib.h>
#include <X11/extensions/Xrandr.h>
#include <X11/extensions/Xrandr.h>
-#include <X11/extensions/XTest.h>
-#include <xcb/xcb.h>
+#include <X11/Xft/Xft.h>
+#include <X11/Xlib-xcb.h>
#include <xcb/xcb_atom.h>
#include <xcb/xcb_aux.h>
#include <xcb/xcb_event.h>
#include <xcb/xcb_atom.h>
#include <xcb/xcb_aux.h>
#include <xcb/xcb_event.h>
@@
-258,11
+256,14
@@
volatile sig_atomic_t running = 1;
volatile sig_atomic_t restart_wm = 0;
int outputs = 0;
/*int last_focus_event = FocusOut;*/
volatile sig_atomic_t restart_wm = 0;
int outputs = 0;
/*int last_focus_event = FocusOut;*/
+int (*xerrorxlib)(Display *, XErrorEvent *);
int other_wm;
int ss_enabled = 0;
int xrandr_support;
int xrandr_eventbase;
unsigned int numlockmask = 0;
int other_wm;
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;
xcb_connection_t *conn;
xcb_key_symbols_t *syms;
@@
-351,10
+352,7
@@
int border_width = 1;
int verbose_layout = 0;
time_t time_started;
pid_t bar_pid;
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;
char *bar_fonts;
struct passwd *pwd;
@@
-639,6
+637,7
@@
struct ewmh_hint {
};
/* function prototypes */
};
/* 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);
int conf_load(char *, int);
void constrain_window(struct ws_win *, struct swm_region *, int);
void do_sync(void);
@@
-661,6
+660,25
@@
void unmanage_window(struct ws_win *);
void update_window(struct ws_win *);
/* function definitions */
void update_window(struct ws_win *);
/* 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)
{
int
parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb)
{
@@
-1319,32
+1337,30
@@
socket_setnonblock(int fd)
void
bar_print(struct swm_region *r, const char *s)
{
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);
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:
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:
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;
break;
}
if (x < SWM_BAR_OFFSET)
x = SWM_BAR_OFFSET;
-#endif
rect.x = 0;
rect.y = 0;
rect.x = 0;
rect.y = 0;
@@
-1362,14
+1378,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);
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,
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,
/* blt */
xcb_copy_area(conn, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0,
@@
-1831,57
+1842,40
@@
bar_refresh(void)
void
bar_setup(struct swm_region *r)
{
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];
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 ((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;
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;
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;
@@
-3821,7
+3815,7
@@
search_win(struct swm_region *r, union arg *args)
char s[8];
FILE *lfile;
size_t len;
char s[8];
FILE *lfile;
size_t len;
- XRectangle ibox, lbox;
+ XGlyphInfo info;
DNPRINTF(SWM_D_MISC, "search_win\n");
DNPRINTF(SWM_D_MISC, "search_win\n");
@@
-3853,26
+3847,15
@@
search_win(struct swm_region *r, union arg *args)
snprintf(s, sizeof s, "%d", i);
len = strlen(s);
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;
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,
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);
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);
sw->indicator = w;
TAILQ_INSERT_TAIL(&search_wl, sw, entry);
@@
-3885,14
+3868,7
@@
search_win(struct swm_region *r, union arg *args)
XCB_GC_BACKGROUND | XCB_GC_GRAPHICS_EXPOSURES, gcv);
map_window_raised(w);
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);
DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w);
@@
-5761,7
+5737,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.");
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:
free(b);
break;
case SWM_S_BAR_FORMAT:
@@
-7166,7
+7141,7
@@
int
enable_wm(void)
{
int num_screens, i;
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;
xcb_screen_t *sc;
xcb_void_cookie_t wac;
xcb_generic_error_t *error;
@@
-7346,7
+7321,6
@@
screenchange(xcb_randr_screen_change_notify_event_t *e)
DNPRINTF(SWM_D_EVENT, "screenchange: root: 0x%x\n", e->root);
DNPRINTF(SWM_D_EVENT, "screenchange: root: 0x%x\n", e->root);
-
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++)
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++)
@@
-7648,6
+7622,17
@@
event_handle(xcb_generic_event_t *evt)
screenchange((void *)evt);
}
screenchange((void *)evt);
}
+xerror(Display *d, XErrorEvent *ee)
+{
+#ifdef SWM_DEBUG
+ char error_text[1024];
+ XGetErrorText(display, ee->error_code, error_text, sizeof(error_text));
+ DNPRINTF(SWM_D_MISC, "xerror: error_code: %u, error_text: %s\n",
+ ee->error_code, error_text);
+#endif
+ return -1;
+}
+
int
main(int argc, char *argv[])
{
int
main(int argc, char *argv[])
{
@@
-7666,7
+7651,7
@@
main(int argc, char *argv[])
start_argv = argv;
warnx("Welcome to spectrwm V%s Build: %s", SPECTRWM_VERSION, buildstr);
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 */
warnx("no locale support");
/* handle some signals */
@@
-7683,7
+7668,13
@@
main(int argc, char *argv[])
sact.sa_flags = SA_NOCLDSTOP;
sigaction(SIGCHLD, &sact, NULL);
sact.sa_flags = SA_NOCLDSTOP;
sigaction(SIGCHLD, &sact, NULL);
- conn = xcb_connect(NULL, NULL);
+ if (!(display = XOpenDisplay(0)))
+ errx(1, "can not open display");
+
+ /* prevent xlib from exiting on an error */
+ xerrorxlib = XSetErrorHandler(xerror);
+
+ conn = XGetXCBConnection(display);
if (xcb_connection_has_error(conn))
errx(1, "can not get XCB connection");
if (xcb_connection_has_error(conn))
errx(1, "can not get XCB connection");
@@
-7836,7
+7827,7
@@
done:
if (screens[i].bar_gc != 0)
xcb_free_gc(conn, screens[i].bar_gc);
#if 0
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);
#endif
xcb_key_symbols_free(syms);
xcb_flush(conn);