xwm: cleanup send focus window logic

xwayland/xwm.c

@@ -117,8 +117,12 @@ static void xwm_set_net_active_window(struct wlr_xwm *xwm,
 
 static void xwm_send_focus_window(struct wlr_xwm *xwm,
 		struct wlr_xwayland_surface *xsurface) {
-	if (xsurface) {
+	if (!xsurface) {
-		if (xsurface->override_redirect) {
+		xcb_set_input_focus_checked(xwm->xcb_conn,
+			XCB_INPUT_FOCUS_POINTER_ROOT,
+			XCB_NONE, XCB_CURRENT_TIME);
+		return;
+	} else if (xsurface->override_redirect) {
 		return;
 	}
 
@@ -140,11 +144,6 @@ static void xwm_send_focus_window(struct wlr_xwm *xwm,
 	values[0] = XCB_STACK_MODE_ABOVE;
 	xcb_configure_window(xwm->xcb_conn, xsurface->window_id,
 		XCB_CONFIG_WINDOW_STACK_MODE, values);
-	} else {
-		xcb_set_input_focus(xwm->xcb_conn,
-			XCB_INPUT_FOCUS_POINTER_ROOT,
-			XCB_NONE, XCB_CURRENT_TIME);
-	}
 }