X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=0816f0eb1716eb50668bdb033b59f1116103560c;hb=90431ef17b68f5df145128110f0856b1b0b175e2;hp=a4c7ee1d4b833b9aea45a32c0e271c861ec883f1;hpb=9a52bb6bc226793726ef4d814e09f08031e8d918;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index a4c7ee1..0816f0e 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -1836,7 +1836,7 @@ 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];
+	uint32_t		wa[3];
 
 	if (bar_fs) {
 		XFreeFontSet(display, bar_fs);
@@ -1885,10 +1885,12 @@ bar_setup(struct swm_region *r)
 	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;
+	wa[2] = XCB_EVENT_MASK_EXPOSURE;
 	xcb_create_window(conn, XCB_COPY_FROM_PARENT, 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,
-	    XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa);
+	    XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL
+	    | XCB_CW_EVENT_MASK, wa);
 
 	r->bar->buffer = xcb_generate_id(conn);
 	xcb_create_pixmap(conn, screen->root_depth, r->bar->buffer, r->bar->id,
@@ -6637,7 +6639,18 @@ focus_magic(struct ws_win *win)
 void
 expose(xcb_expose_event_t *e)
 {
+	int			i, num_screens;
+	struct swm_region	*r;
+
 	DNPRINTF(SWM_D_EVENT, "expose: window: 0x%x\n", e->window);
+
+	num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
+	for (i = 0; i < num_screens; i++)
+		TAILQ_FOREACH(r, &screens[i].rl, entry)
+			if (e->window == WINID(r->bar))
+				bar_update();
+
+	xcb_flush(conn);
 }
 
 void
@@ -7079,7 +7092,7 @@ clientmessage(xcb_client_message_event_t *e)
 	}
 
 	DNPRINTF(SWM_D_EVENT, "clientmessage: window: 0x%x, type: %u\n",
-	    e->window, e->response_type);
+	    e->window, e->type);
 
 	if (e->response_type == ewmh[_NET_ACTIVE_WINDOW].atom) {
 		DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_ACTIVE_WINDOW\n");
@@ -7605,14 +7618,16 @@ main(int argc, char *argv[])
 {
 	struct swm_region	*r, *rr;
 	struct ws_win		*winfocus = NULL;
-	struct timeval		tv;
 	union arg		a;
 	char			conf[PATH_MAX], *cfile = NULL;
 	struct stat		sb;
 	int			xfd, i, num_screens;
-	fd_set			rd;
 	struct sigaction	sact;
 	xcb_generic_event_t	*evt;
+#if 0
+	struct timeval          tv;
+	fd_set			rd;
+#endif
 
 	time_started = time(NULL);
 
@@ -7785,6 +7800,7 @@ noconfig:
 			continue;
 		}
 
+#if 0
 		FD_ZERO(&rd);
 		FD_SET(xfd, &rd);
 		tv.tv_sec = 1;
@@ -7792,6 +7808,7 @@ noconfig:
 		if (select(xfd + 1, &rd, NULL, NULL, &tv) == -1)
 			if (errno != EINTR)
 				DNPRINTF(SWM_D_MISC, "select failed");
+#endif
 		if (restart_wm == 1)
 			restart(NULL, NULL);
 		if (search_resp == 1)