X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=e5a8a02d8a885e8bb4f49f393336059d7b771711;hb=3b291e14599f33b779c499c57745238ad46ea90c;hp=4ec19672f53e49f8c5349fc0dc892f4c076bbbf3;hpb=1931c8e6d7edc3ce4a7e48cab22ca7cb33396de6;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 4ec1967..e5a8a02 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -659,7 +659,7 @@ void	 focus_magic(struct ws_win *);
 xcb_atom_t get_atom_from_string(const char *);
 xcb_screen_t	*get_screen(int);
 char	*get_win_name(xcb_window_t);
-uint16_t getstate(xcb_window_t);
+uint32_t getstate(xcb_window_t);
 void	 grabbuttons(struct ws_win *, int);
 void	 map_window_raised(xcb_window_t);
 void	 new_region(struct swm_screen *, int, int, int, int);
@@ -841,7 +841,7 @@ teardown_ewmh(void)
 		pc = xcb_get_property(conn, 0, screens[i].root, sup_check,
 		    XCB_ATOM_WINDOW, 0, 1);
 		pr = xcb_get_property_reply(conn, pc, NULL);
-		if (pr) {
+		if (pr && pr->format == sup_check) {
 			id = *((xcb_window_t *)xcb_get_property_value(pr));
 
 			xcb_destroy_window(conn, id);
@@ -1068,7 +1068,7 @@ void
 dumpwins(struct swm_region *r, union arg *args)
 {
 	struct ws_win				*win;
-	uint16_t				state;
+	uint32_t				state;
 	xcb_get_window_attributes_cookie_t	c;
 	xcb_get_window_attributes_reply_t	*wa;
 
@@ -1394,7 +1394,8 @@ bar_print(struct swm_region *r, const char *s)
 	    DefaultVisual(display, r->s->idx),
 	    DefaultColormap(display, r->s->idx));
 
-	XftDrawStringUtf8(draw, &bar_font_color, bar_font, x, bar_font->height,
+	XftDrawStringUtf8(draw, &bar_font_color, bar_font, x,
+	    (HEIGHT(r->bar) + bar_font->height) / 2 - bar_font->descent,
 	    (FcChar8 *)s, len);
 
 	XftDrawDestroy(draw);
@@ -1866,7 +1867,8 @@ bar_refresh(void)
 void
 bar_setup(struct swm_region *r)
 {
-	char			*font;
+	char			*font, *fontpos;
+	int			count;
 	xcb_screen_t		*screen = get_screen(r->s->idx);
 	uint32_t		wa[3];
 	XRenderColor		color;
@@ -1883,7 +1885,20 @@ bar_setup(struct swm_region *r)
 				continue;
 
 			DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", font);
-			bar_font = XftFontOpenName(display, r->s->idx, font);
+
+			count = 0;
+			fontpos = font;
+			while ((fontpos = index(fontpos, '-'))) {
+				count++;
+				fontpos++;
+			}
+
+			if (count == 14)
+				bar_font = XftFontOpenXlfd(display, r->s->idx,
+						font);
+			else
+				bar_font = XftFontOpenName(display, r->s->idx,
+						font);
 			if (!bar_font) {
 				warnx("unable to load font %s", font);
 				continue;
@@ -1898,7 +1913,7 @@ bar_setup(struct swm_region *r)
 	if (bar_font == NULL)
 		errx(1, "unable to open a font");
 
-	bar_height = bar_font->height + 4 * bar_border_width;
+	bar_height = bar_font->height + 2 * bar_border_width;
 
 	if (bar_height < 1)
 		bar_height = 1;
@@ -1969,10 +1984,10 @@ set_win_state(struct ws_win *win, uint16_t state)
 	    a_state, 32, 2, data);
 }
 
-uint16_t
+uint32_t
 getstate(xcb_window_t w)
 {
-	uint16_t			result = 0;
+	uint32_t			result = 0;
 	xcb_get_property_cookie_t	c;
 	xcb_get_property_reply_t	*r;
 
@@ -1980,7 +1995,8 @@ getstate(xcb_window_t w)
 	r = xcb_get_property_reply(conn, c, NULL);
 
 	if (r) {
-		result = *((uint16_t *)xcb_get_property_value(r));
+		if (r->type == a_state && r->format == 32 && r->length == 2)
+			result = *((uint32_t *)xcb_get_property_value(r));
 		free(r);
 	}
 
@@ -3875,6 +3891,7 @@ search_win(struct swm_region *r, union arg *args)
 	char			s[8];
 	FILE			*lfile;
 	size_t			len;
+	XftDraw			*draw;
 	XGlyphInfo		info;
 
 	DNPRINTF(SWM_D_MISC, "search_win\n");
@@ -3928,7 +3945,15 @@ search_win(struct swm_region *r, union arg *args)
 		    XCB_GC_BACKGROUND | XCB_GC_GRAPHICS_EXPOSURES, gcv);
 		map_window_raised(w);
 
-		xcb_image_text_8(conn, len, w, sw->gc, 2, bar_font->height, s);
+		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);
 
 		DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w);
 
@@ -6381,7 +6406,8 @@ window_get_pid(xcb_window_t win)
 		goto tryharder;
 	}
 
-	ret = *((pid_t *)xcb_get_property_value(pr));
+	if (pr->type == apid && pr->format == 32)
+		ret = *((pid_t *)xcb_get_property_value(pr));
 	free(pr);
 
 	return (ret);
@@ -6393,7 +6419,7 @@ tryharder:
 	pr = xcb_get_property_reply(conn, pc, NULL);
 	if (!pr)
 		return (0);
-	if (pr->type != XCB_ATOM_STRING) {
+	if (pr->type != apid) {
 		free(pr);
 		return (0);
 	}
@@ -6417,7 +6443,7 @@ get_ws_idx(xcb_window_t id)
 		xcb_get_property(conn, 0, id, a_swm_ws,
 		    XCB_ATOM_STRING, 0, SWM_PROPLEN),
 		NULL);
-	if (gpr) {
+	if (gpr && gpr->type) {
 		proplen = xcb_get_property_value_length(gpr);
 		if (proplen > 0) {
 			prop = malloc(proplen + 1);