X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=3719d0d965a27ca9364eafe7074e4997f94e43d2;hb=332906d454ef06919ddcdb82e8b67e11050897c4;hp=ea332558d2f6bb357413a0404e47c88424108f84;hpb=78cac56aec5d7d3d4743ffed76556525f53df6c8;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index ea33255..3719d0d 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -425,6 +425,7 @@ XftFont		*bar_font;
 int		 bar_font_legacy = 1;
 char		*bar_fonts;
 XftColor	 bar_font_color;
+XftColor	 search_font_color;
 struct passwd	*pwd;
 char		*startup_exception;
 unsigned int	 nr_exceptions = 0;
@@ -2715,6 +2716,12 @@ xft_init(struct swm_region *r)
 	    DefaultColormap(display, r->s->idx), &color, &bar_font_color))
 		warn("Xft error: unable to allocate color.");
 
+	PIXEL_TO_XRENDERCOLOR(r->s->c[SWM_S_COLOR_BAR].pixel, color);
+
+	if (!XftColorAllocValue(display, DefaultVisual(display, r->s->idx),
+	    DefaultColormap(display, r->s->idx), &color, &search_font_color))
+		warn("Xft error: unable to allocate color.");
+
 	bar_height = bar_font->height + 2 * bar_border_width;
 
 	if (bar_height < 1)
@@ -2762,6 +2769,13 @@ bar_setup(struct swm_region *r)
 	    XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL
 	    | XCB_CW_EVENT_MASK, wa);
 
+	/* Stack bar window above region window to start. */
+	wa[0] = r->id;
+	wa[1] = XCB_STACK_MODE_ABOVE;
+
+	xcb_configure_window(conn, r->bar->id, XCB_CONFIG_WINDOW_SIBLING |
+	    XCB_CONFIG_WINDOW_STACK_MODE, wa);
+
 	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));
@@ -4953,8 +4967,7 @@ max_stack(struct workspace *ws, struct swm_geometry *g)
 		}
 	}
 
-	if (TRANS(win)) {
-		parent = find_window(win->transient);
+	if (TRANS(win) && (parent = find_window(win->transient))) {
 		raise_window(parent);
 
 		TAILQ_FOREACH(w, &ws->stack, stack_entry)
@@ -5375,7 +5388,8 @@ search_win(struct swm_region *r, union arg *args)
 	struct ws_win		*win = NULL;
 	struct search_window	*sw = NULL;
 	xcb_window_t		w;
-	uint32_t		wa[2];
+	uint32_t		wa[3];
+	xcb_screen_t		*screen;
 	int			i, width, height;
 	char			s[8];
 	FILE			*lfile;
@@ -5396,6 +5410,9 @@ search_win(struct swm_region *r, union arg *args)
 	if ((lfile = fdopen(select_list_pipe[1], "w")) == NULL)
 		return;
 
+	if ((screen = get_screen(r->s->idx)) == NULL)
+		errx(1, "ERROR: can't get screen %d.", r->s->idx);
+
 	TAILQ_INIT(&search_wl);
 
 	i = 1;
@@ -5419,6 +5436,7 @@ search_win(struct swm_region *r, union arg *args)
 		w = xcb_generate_id(conn);
 		wa[0] = r->s->c[SWM_S_COLOR_FOCUS].pixel;
 		wa[1] = r->s->c[SWM_S_COLOR_UNFOCUS].pixel;
+		wa[2] = screen->default_colormap;
 
 		if (bar_font_legacy) {
 			XmbTextExtents(bar_fs, s, len, &l_ibox, &l_lbox);
@@ -5431,10 +5449,10 @@ search_win(struct swm_region *r, union arg *args)
 			height = bar_font->height + 4;
 		}
 
-		xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0,
+		xcb_create_window(conn, screen->root_depth, w, win->id, 0, 0,
 		    width, height, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT,
-		    XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL |
-		    XCB_CW_BORDER_PIXEL, wa);
+		    screen->root_visual, XCB_CW_BACK_PIXEL |
+		    XCB_CW_BORDER_PIXEL | XCB_CW_COLORMAP, wa);
 
 		xcb_map_window(conn, w);
 
@@ -5459,7 +5477,7 @@ search_win(struct swm_region *r, union arg *args)
 			    DefaultVisual(display, r->s->idx),
 			    DefaultColormap(display, r->s->idx));
 
-			XftDrawStringUtf8(draw, &bar_font_color, bar_font, 2,
+			XftDrawStringUtf8(draw, &search_font_color, bar_font, 2,
 			    (HEIGHT(r->bar) + bar_font->height) / 2 -
 			    bar_font->descent, (FcChar8 *)s, len);
 
@@ -9429,6 +9447,13 @@ enternotify(xcb_enter_notify_event_t *e)
 			return;
 		}
 	} else {
+		if (e->mode == XCB_NOTIFY_MODE_NORMAL &&
+		    e->detail == XCB_NOTIFY_DETAIL_INFERIOR) {
+			DNPRINTF(SWM_D_EVENT, "enternotify: entering from "
+			    "inferior; ignoring\n");
+			return;
+		}
+
 		focus_win(get_focus_magic(win));
 	}
 
@@ -10475,9 +10500,12 @@ shutdown_cleanup(void)
 
 		if (screens[i].bar_gc != XCB_NONE)
 			xcb_free_gc(conn, screens[i].bar_gc);
-		if (!bar_font_legacy)
+		if (!bar_font_legacy) {
 			XftColorFree(display, DefaultVisual(display, i),
 			    DefaultColormap(display, i), &bar_font_color);
+			XftColorFree(display, DefaultVisual(display, i),
+			    DefaultColormap(display, i), &search_font_color);
+		}
 	}
 
 	if (bar_font_legacy)