X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=132743fa21014e43f26cda140826c1e5390477a2;hb=0f584636013cbb5fd6efef904857ac1695e72953;hp=3215774974c3ef966badeccc2c090661bd783056;hpb=608cf20ac790005b49f9f5bed3b944015308da3a;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 3215774..132743f 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -2539,7 +2539,8 @@ bar_setup(struct swm_region *r)
 	r->bar->id = xcb_generate_id(conn);
 	wa[0] = r->s->c[SWM_S_COLOR_BAR].pixel;
 	wa[1] = r->s->c[SWM_S_COLOR_BAR_BORDER_UNFOCUS].pixel;
-	wa[2] = XCB_EVENT_MASK_EXPOSURE;
+	wa[2] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_POINTER_MOTION |
+	    XCB_EVENT_MASK_POINTER_MOTION_HINT;
 
 	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),
@@ -7225,7 +7226,7 @@ int
 conf_load(const char *filename, int keymapping)
 {
 	FILE			*config;
-	char			*line = NULL, *cp, *optsub, *optval;
+	char			*line = NULL, *cp, *optsub, *optval = NULL;
 	size_t			linelen, lineno = 0;
 	int			wordlen, i, optidx;
 	struct config_option	*opt = NULL;
@@ -7245,8 +7246,8 @@ conf_load(const char *filename, int keymapping)
 		if (line)
 			free(line);
 
-		if ((line = fparseln(config, &linelen, &lineno, NULL, 0))
-		    == NULL) {
+		if ((line = fparseln(config, &linelen, &lineno, NULL,
+		    FPARSELN_UNESCCOMM | FPARSELN_UNESCCONT)) == NULL) {
 			if (ferror(config))
 				err(1, "%s", filename);
 			else
@@ -8208,7 +8209,7 @@ enternotify(xcb_enter_notify_event_t *e)
 			/* If no windows on pointer region, then focus root. */
 			r = root_to_region(e->root, SWM_CK_POINTER);
 			if (r == NULL) {
-				DNPRINTF(SWM_D_EVENT, "enterntoify: "
+				DNPRINTF(SWM_D_EVENT, "enternotify: "
 				    "NULL region; ignoring.\n");
 				return;
 			}
@@ -8223,7 +8224,7 @@ enternotify(xcb_enter_notify_event_t *e)
 		focus_win(get_focus_magic(win));
 	}
 
-	focus_flush();
+	xcb_flush(conn);
 }
 
 #ifdef SWM_DEBUG
@@ -8742,6 +8743,7 @@ scan_xrandr(int i)
 	int						ncrtc = 0;
 #endif /* SWM_XRR_HAS_CRTC */
 	struct swm_region				*r;
+	struct ws_win					*win;
 	int						num_screens;
 	xcb_randr_get_screen_resources_current_cookie_t	src;
 	xcb_randr_get_screen_resources_current_reply_t	*srr;
@@ -8766,9 +8768,6 @@ scan_xrandr(int i)
 		xcb_destroy_window(conn, r->id);
 		TAILQ_REMOVE(&screens[i].rl, r, entry);
 		TAILQ_INSERT_TAIL(&screens[i].orl, r, entry);
-
-		if (r->s->r_focus == r)
-			r->s->r_focus = NULL;
 	}
 	outputs = 0;
 
@@ -8818,6 +8817,16 @@ scan_xrandr(int i)
 		    screen->height_in_pixels);
 
 out:
+	/* Cleanup unused previously visible workspaces. */
+	TAILQ_FOREACH(r, &screens[i].orl, entry) {
+		TAILQ_FOREACH(win, &r->ws->winlist, entry)
+			unmap_window(win);
+
+		/* The screen shouldn't focus on an unused region. */
+		if (screens[i].r_focus == r)
+			screens[i].r_focus = NULL;
+	}
+
 	DNPRINTF(SWM_D_MISC, "scan_xrandr: done.\n");
 }
 
@@ -8847,14 +8856,19 @@ screenchange(xcb_randr_screen_change_notify_event_t *e)
 	for (i = 0; i < num_screens; i++) {
 		TAILQ_FOREACH(r, &screens[i].rl, entry)
 			bar_setup(r);
-
-		/* Focus on first region. */
-		r = TAILQ_FIRST(&screens[i].rl);
-		if (r)
-			focus_region(r);
 	}
 
 	stack();
+
+	/* Make sure a region has focus on each screen. */
+	for (i = 0; i < num_screens; i++) {
+		if (screens[i].r_focus == NULL) {
+			r = TAILQ_FIRST(&screens[i].rl);
+			if (r != NULL)
+				focus_region(r);
+		}
+	}
+
 	bar_draw();
 	focus_flush();
 }