X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=44d4bdbff95d8221a65e930492dada721b492bbe;hb=2be758c051ea436220695b1e2fd2d5daa99f97eb;hp=7291eb186078a53df7a0cdb4cd70123acefbeffc;hpb=b78adefb6507ceb8d3918f99f806292615124395;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 7291eb1..44d4bdb 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -258,7 +258,7 @@ struct search_window {
 	TAILQ_ENTRY(search_window)	entry;
 	int				idx;
 	struct ws_win			*win;
-	GC				gc;
+	xcb_gcontext_t			gc;
 	xcb_window_t			indicator;
 };
 TAILQ_HEAD(search_winlist, search_window);
@@ -292,12 +292,6 @@ double			dialog_ratio = 0.6;
 				"-misc-fixed-medium-r-*-*-*-*-*-*-*-*-*-*,"  \
 				"-*-*-*-r-*--*-*-*-*-*-*-*-*"
 
-#ifdef X_HAVE_UTF8_STRING
-#define DRAWSTRING(x...)	Xutf8DrawString(x)
-#else
-#define DRAWSTRING(x...)	XmbDrawString(x)
-#endif
-
 char			*bar_argv[] = { NULL, NULL };
 int			bar_pipe[2];
 unsigned char		bar_ext[SWM_BAR_MAX];
@@ -505,7 +499,7 @@ struct swm_screen {
 		char		*name;
 	} c[SWM_S_COLOR_MAX];
 
-	GC			bar_gc;
+	xcb_gcontext_t		bar_gc;
 };
 struct swm_screen	*screens;
 
@@ -1426,6 +1420,8 @@ 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;
 
 	len = strlen(s);
@@ -1446,21 +1442,27 @@ bar_print(struct swm_region *r, const char *s)
 	if (x < SWM_BAR_OFFSET)
 		x = SWM_BAR_OFFSET;
 
+	rect.x = 0;
+	rect.y = 0;
+	rect.width = WIDTH(r->bar);
+	rect.height = HEIGHT(r->bar);
+
 	/* clear back buffer */
-	XSetForeground(display, r->s->bar_gc, r->s->c[SWM_S_COLOR_BAR].color);
-	XFillRectangle(display, r->bar->buffer, r->s->bar_gc, 0, 0,
-	    WIDTH(r->bar), HEIGHT(r->bar));
+	gcv[0] = r->s->c[SWM_S_COLOR_BAR].color;
+	xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv);
+	xcb_poly_fill_rectangle(conn, r->bar->buffer, r->s->bar_gc,
+		sizeof(rect), &rect);
 
 	/* draw back buffer */
-	XSetForeground(display, r->s->bar_gc,
-	    r->s->c[SWM_S_COLOR_BAR_FONT].color);
-	DRAWSTRING(display, r->bar->buffer, bar_fs, r->s->bar_gc,
-		x, (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 -
-		lbox.y, s, len);
+	gcv[0] = r->s->c[SWM_S_COLOR_BAR_FONT].color;
+	xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv);
+	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);
 
 	/* blt */
-	XCopyArea(display, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0,
-	    WIDTH(r->bar), HEIGHT(r->bar), 0, 0);
+	xcb_copy_area(conn, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0,
+		0, 0, WIDTH(r->bar), HEIGHT(r->bar));
 }
 
 void
@@ -1921,7 +1923,8 @@ bar_setup(struct swm_region *r)
 	int			num_missing_charsets = 0;
 	int			i;
 	xcb_screen_t		*screen = get_screen(r->s->idx);
-
+	uint32_t		wa[2];
+	
 	if (bar_fs) {
 		XFreeFontSet(display, bar_fs);
 		bar_fs = NULL;
@@ -1966,13 +1969,18 @@ bar_setup(struct swm_region *r)
 	WIDTH(r->bar) = WIDTH(r) - 2 * bar_border_width;
 	HEIGHT(r->bar) = bar_height - 2 * bar_border_width;
 
-	r->bar->id = XCreateSimpleWindow(display,
-	    r->s->root, X(r->bar), Y(r->bar), WIDTH(r->bar), HEIGHT(r->bar),
-	    bar_border_width, r->s->c[SWM_S_COLOR_BAR_BORDER].color,
-	    r->s->c[SWM_S_COLOR_BAR].color);
+	r->bar->id = xcb_generate_id(conn);
+	wa[0] = r->s->c[SWM_S_COLOR_BAR].color;
+	wa[1] = r->s->c[SWM_S_COLOR_BAR_BORDER].color;
+	xcb_create_window(conn, screen->root_depth, r->bar->id, r->s->root,
+		X(r->bar), Y(r->bar), WIDTH(r->bar), HEIGHT(r->bar),
+		bar_border_width, XCB_WINDOW_CLASS_INPUT_OUTPUT,
+		screen->root_visual, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL,
+		wa);
 
-	r->bar->buffer = XCreatePixmap(display, r->bar->id, WIDTH(r->bar),
-	    HEIGHT(r->bar), screen->root_depth);
+	r->bar->buffer = xcb_generate_id(conn);
+	xcb_create_pixmap(conn, screen->root_depth, r->bar->buffer, r->bar->id,
+		WIDTH(r->bar), HEIGHT(r->bar)); 
 
 	xcb_randr_select_input(conn, r->bar->id,
 		XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE);
@@ -3738,7 +3746,7 @@ get_win_name(xcb_window_t win)
 
 	c = xcb_icccm_get_wm_name(conn, win);
 	if (xcb_icccm_get_wm_name_reply(conn, c, &r, NULL)) {
-		name = malloc(1, r.name_len + 1);
+		name = malloc(r.name_len + 1);
 		if (!name) {
 			xcb_get_text_property_reply_wipe(&r);
 			return (NULL);
@@ -3860,7 +3868,7 @@ search_win_cleanup(void)
 
 	while ((sw = TAILQ_FIRST(&search_wl)) != NULL) {
 		xcb_destroy_window(conn, sw->indicator);
-		XFreeGC(display, sw->gc);
+		xcb_free_gc(conn, sw->gc);
 		TAILQ_REMOVE(&search_wl, sw, entry);
 		free(sw);
 	}
@@ -3872,13 +3880,13 @@ search_win(struct swm_region *r, union arg *args)
 	struct ws_win		*win = NULL;
 	struct search_window	*sw = NULL;
 	xcb_window_t		w;
-	XGCValues               gcv;
+	uint32_t		gcv[1], wa[2];
 	int			i;
 	char			s[8];
 	FILE			*lfile;
 	size_t			len;
 	XRectangle		ibox, lbox;
-
+	xcb_screen_t		*screen; 
 	DNPRINTF(SWM_D_MISC, "search_win\n");
 
 	search_r = r;
@@ -3905,28 +3913,33 @@ search_win(struct swm_region *r, union arg *args)
 		}
 		sw->idx = i;
 		sw->win = win;
+		screen = get_screen(sw->idx);
 
 		snprintf(s, sizeof s, "%d", i);
 		len = strlen(s);
 
 		XmbTextExtents(bar_fs, s, len, &ibox, &lbox);
 
-		w = XCreateSimpleWindow(display,
-		    win->id, 0, 0,lbox.width + 4,
-		    bar_fs_extents->max_logical_extent.height, 1,
-		    r->s->c[SWM_S_COLOR_UNFOCUS].color,
-		    r->s->c[SWM_S_COLOR_FOCUS].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;
+		xcb_create_window(conn, screen->root_depth, w, win->id,
+			0, 0, lbox.width + 4,
+			bar_fs_extents->max_logical_extent.height, 1,
+			XCB_WINDOW_CLASS_INPUT_OUTPUT, screen->root_visual,
+			XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);	
+		
 		sw->indicator = w;
 		TAILQ_INSERT_TAIL(&search_wl, sw, entry);
 
-		sw->gc = XCreateGC(display, w, 0, &gcv);
+		sw->gc = xcb_generate_id(conn);
+		gcv[0] = r->s->c[SWM_S_COLOR_BAR].color;		
+		xcb_create_gc(conn, sw->gc, w, XCB_GC_FOREGROUND, gcv); 
 		map_window_raised(w);
-		XSetForeground(display, sw->gc, r->s->c[SWM_S_COLOR_BAR].color);
 
-		DRAWSTRING(display, w, bar_fs, sw->gc, 2,
+		xcb_image_text_8(conn, len, w, sw->gc, 2,
 		    (bar_fs_extents->max_logical_extent.height -
-		    lbox.height) / 2 - lbox.y, s, len);
+		    lbox.height) / 2 - lbox.y, s);
 
 		fprintf(lfile, "%d\n", i);
 		i++;
@@ -7328,32 +7341,35 @@ scan_xrandr(int i)
 			screens[i].root);
 		srr = xcb_randr_get_screen_resources_current_reply(conn, src,
 			NULL);
-		if (srr == NULL)
+		if (srr == NULL) {
 			new_region(&screens[i], 0, 0,
 			    screen->width_in_pixels,
 			    screen->height_in_pixels);
-		else
+			return;
+		} else
 			ncrtc = srr->num_crtcs;
 		for (c = 0; c < ncrtc; c++) {
 			crtc = xcb_randr_get_screen_resources_current_crtcs(srr);
 			cic = xcb_randr_get_crtc_info(conn, crtc[c],
 				XCB_CURRENT_TIME);
 			cir = xcb_randr_get_crtc_info_reply(conn, cic, NULL);
-			if (cir && cir->num_outputs == 0)
+			if (cir == NULL)
+				continue;
+			if (cir->num_outputs == 0) {
+				free(cir);
 				continue;
+			}
 
-			if (cir == NULL || cir->mode == 0)
+			if (cir->mode == 0)
 				new_region(&screens[i], 0, 0,
 				    screen->width_in_pixels,
 				    screen->height_in_pixels);
 			else
 				new_region(&screens[i],
 				    cir->x, cir->y, cir->width, cir->height);
-		}
-		if (srr)
-			free(srr);
-		if (cir)
 			free(cir);
+		}
+		free(srr);
 	} else
 #endif /* SWM_XRR_HAS_CRTC */
 	{
@@ -7469,7 +7485,7 @@ setup_screens(void)
 {
 	int			i, j, k, num_screens;
 	struct workspace	*ws;
-	XGCValues		gcv;
+	uint32_t		gcv[1];
 	const xcb_query_extension_reply_t *qep;
 	xcb_randr_query_version_cookie_t	c;
 	xcb_randr_query_version_reply_t		*r;
@@ -7508,9 +7524,10 @@ setup_screens(void)
 		setscreencolor("rgb:a0/a0/a0", i + 1, SWM_S_COLOR_BAR_FONT);
 
 		/* create graphics context on screen */
-		gcv.graphics_exposures = 0;
-		screens[i].bar_gc = XCreateGC(display, screens[i].root,
-			GCGraphicsExposures, &gcv);
+		screens[i].bar_gc = xcb_generate_id(conn);
+		gcv[0] = 0;
+		xcb_create_gc(conn, screens[i].bar_gc, screens[i].root,
+			XCB_GC_GRAPHICS_EXPOSURES, gcv);
 
 		/* set default cursor */
 		XDefineCursor(display, screens[i].root,
@@ -7560,6 +7577,8 @@ workaround(void)
 	int			i, num_screens;
 	xcb_atom_t		netwmcheck, netwmname, utf8_string;
 	xcb_window_t		root, win;
+	xcb_screen_t		*screen;
+	uint32_t		wa[2];
 
 	/* work around sun jdk bugs, code from wmname */
 	netwmcheck = get_atom_from_string("_NET_SUPPORTING_WM_CHECK");
@@ -7569,9 +7588,15 @@ workaround(void)
 	num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
 	for (i = 0; i < num_screens; i++) {
 		root = screens[i].root;
-		win = XCreateSimpleWindow(display,root, 0, 0, 1, 1, 0,
-		    screens[i].c[SWM_S_COLOR_UNFOCUS].color,
-		    screens[i].c[SWM_S_COLOR_UNFOCUS].color);
+		screen = get_screen(i);
+
+		win = xcb_generate_id(conn);
+		wa[0] = screens[i].c[SWM_S_COLOR_UNFOCUS].color;
+		wa[1] = screens[i].c[SWM_S_COLOR_UNFOCUS].color;
+		xcb_create_window(conn, screen->root_depth, win, 0,
+			0, 0, 1, 1, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT,
+			screen->root_visual,
+			XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
 
 		xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root,
 			netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win);
@@ -7787,8 +7812,8 @@ done:
 	bar_extra_stop();
 
 	for (i = 0; i < num_screens; ++i)
-		if (screens[i].bar_gc != NULL)
-			XFreeGC(display, screens[i].bar_gc);
+		if (screens[i].bar_gc != 0)
+			xcb_free_gc(conn, screens[i].bar_gc);
 	XFreeFontSet(display, bar_fs);
 	xcb_disconnect(conn);
 	XCloseDisplay(display);