backend/drm/drm.c

@@ -750,6 +750,23 @@ static bool drm_connector_set_mode(struct wlr_drm_connector *conn,
 	return true;
 }
 
+static struct wlr_drm_mode *drm_mode_create(const drmModeModeInfo *modeinfo) {
+	struct wlr_drm_mode *mode = calloc(1, sizeof(*mode));
+	if (!mode) {
+		return NULL;
+	}
+
+	mode->drm_mode = *modeinfo;
+	mode->wlr_mode.width = mode->drm_mode.hdisplay;
+	mode->wlr_mode.height = mode->drm_mode.vdisplay;
+	mode->wlr_mode.refresh = calculate_refresh_rate(modeinfo);
+	if (modeinfo->type & DRM_MODE_TYPE_PREFERRED) {
+		mode->wlr_mode.preferred = true;
+	}
+
+	return mode;
+}
+
 struct wlr_output_mode *wlr_drm_connector_add_mode(struct wlr_output *output,
 		const drmModeModeInfo *modeinfo) {
 	struct wlr_drm_connector *conn = get_drm_connector_from_output(output);
@@ -766,21 +783,17 @@ struct wlr_output_mode *wlr_drm_connector_add_mode(struct wlr_output *output,
 		}
 	}
 
-	struct wlr_drm_mode *mode = calloc(1, sizeof(*mode));
+	struct wlr_drm_mode *mode = drm_mode_create(modeinfo);
 	if (!mode) {
 		return NULL;
 	}
-	memcpy(&mode->drm_mode, modeinfo, sizeof(*modeinfo));
 
-	mode->wlr_mode.width = mode->drm_mode.hdisplay;
-	mode->wlr_mode.height = mode->drm_mode.vdisplay;
-	mode->wlr_mode.refresh = calculate_refresh_rate(modeinfo);
+	wl_list_insert(&conn->output.modes, &mode->wlr_mode.link);
 
 	wlr_drm_conn_log(conn, WLR_INFO, "Registered custom mode "
 			"%"PRId32"x%"PRId32"@%"PRId32,
 			mode->wlr_mode.width, mode->wlr_mode.height,
 			mode->wlr_mode.refresh);
-	wl_list_insert(&conn->output.modes, &mode->wlr_mode.link);
 
 	return &mode->wlr_mode;
 }
@@ -1352,7 +1365,7 @@ void scan_drm_connectors(struct wlr_drm_backend *drm,
 					}
 				} else {
 					// Use the modern atomic drm interface.
-			 		size_t modeinfo_size = 0; 
+			 		size_t modeinfo_size = 0;
 					current_modeinfo = get_drm_prop_blob(drm->fd, wlr_conn->crtc->id,
 						wlr_conn->crtc->props.mode_id, &modeinfo_size);
 					assert(modeinfo_size == sizeof(drmModeModeInfo));
@@ -1362,23 +1375,14 @@ void scan_drm_connectors(struct wlr_drm_backend *drm,
 			wlr_log(WLR_INFO, "Detected modes:");
 
 			for (int i = 0; i < drm_conn->count_modes; ++i) {
-				struct wlr_drm_mode *mode = calloc(1, sizeof(*mode));
-				if (!mode) {
-					wlr_log_errno(WLR_ERROR, "Allocation failed");
-					continue;
-				}
-
 				if (drm_conn->modes[i].flags & DRM_MODE_FLAG_INTERLACE) {
-					free(mode);
 					continue;
 				}
 
-				mode->drm_mode = drm_conn->modes[i];
-				mode->wlr_mode.width = mode->drm_mode.hdisplay;
-				mode->wlr_mode.height = mode->drm_mode.vdisplay;
-				mode->wlr_mode.refresh = calculate_refresh_rate(&mode->drm_mode);
-				if (mode->drm_mode.type & DRM_MODE_TYPE_PREFERRED) {
-					mode->wlr_mode.preferred = true;
+				struct wlr_drm_mode *mode = drm_mode_create(&drm_conn->modes[i]);
+				if (!mode) {
+					wlr_log_errno(WLR_ERROR, "Allocation failed");
+					continue;
 				}
 
 				// If this is the current mode set on the conn's crtc,

include/types/wlr_output.h

@@ -8,6 +8,8 @@ void output_pending_resolution(struct wlr_output *output,
 	const struct wlr_output_state *state, int *width, int *height);
 void output_state_attach_buffer(struct wlr_output_state *state,
 	struct wlr_buffer *buffer);
+bool output_is_direct_scanout(struct wlr_output *output,
+	struct wlr_buffer *buffer);
 
 struct wlr_drm_format *output_pick_format(struct wlr_output *output,
 	const struct wlr_drm_format_set *display_formats, uint32_t format);

types/output/output.c

@@ -575,7 +575,7 @@ static bool output_basic_test(struct wlr_output *output,
 			return false;
 		}
 
-		if (output->back_buffer == NULL) {
+		if (output_is_direct_scanout(output, state->buffer)) {
 			if (output->attach_render_locks > 0) {
 				wlr_log(WLR_DEBUG, "Direct scan-out disabled by lock");
 				return false;

types/output/render.c

@@ -329,3 +329,18 @@ uint32_t wlr_output_preferred_read_format(struct wlr_output *output) {
 
 	return fmt;
 }
+
+bool output_is_direct_scanout(struct wlr_output *output,
+		struct wlr_buffer *buffer) {
+	if (output->swapchain == NULL) {
+		return true;
+	}
+
+	for (size_t i = 0; i < WLR_SWAPCHAIN_CAP; i++) {
+		if (output->swapchain->slots[i].buffer == buffer) {
+			return false;
+		}
+	}
+
+	return true;
+}

types/wlr_cursor.c

@@ -211,6 +211,10 @@ static struct wlr_cursor_device *get_cursor_device(struct wlr_cursor *cur,
 static void cursor_warp_unchecked(struct wlr_cursor *cur,
 		double lx, double ly) {
 	assert(cur->state->layout);
+	if (!isfinite(lx) || !isfinite(ly)) {
+		assert(false);
+		return;
+	}
 
 	struct wlr_cursor_output_cursor *output_cursor;
 	wl_list_for_each(output_cursor, &cur->state->output_cursors, link) {
@@ -296,13 +300,19 @@ void wlr_cursor_warp_closest(struct wlr_cursor *cur,
 	get_mapping(cur, dev, &mapping);
 	if (!wlr_box_empty(&mapping)) {
 		wlr_box_closest_point(&mapping, lx, ly, &lx, &ly);
-		if (isnan(lx) || isnan(ly)) {
-			lx = 0;
-			ly = 0;
-		}
-	} else {
+	} else if (!wl_list_empty(&cur->state->layout->outputs)) {
 		wlr_output_layout_closest_point(cur->state->layout, NULL, lx, ly,
 			&lx, &ly);
+	} else {
+		/*
+		 * There is no mapping box for the input device and the
+		 * output layout is empty.  This can happen for example
+		 * when external monitors are turned off/disconnected.
+		 * In this case, all (x,y) points are equally invalid,
+		 * so leave the cursor in its current location (better
+		 * from a user standpoint than warping it to (0,0)).
+		 */
+		return;
 	}
 
 	cursor_warp_unchecked(cur, lx, ly);
@@ -819,9 +829,9 @@ static void handle_layout_change(struct wl_listener *listener, void *data) {
 	struct wlr_output_layout *layout = data;
 
 	if (!wlr_output_layout_contains_point(layout, NULL, state->cursor->x,
-			state->cursor->y)) {
+			state->cursor->y) && !wl_list_empty(&layout->outputs)) {
 		// the output we were on has gone away so go to the closest boundary
-		// point
+		// point (unless the layout is empty; compare warp_closest())
 		double x, y;
 		wlr_output_layout_closest_point(layout, NULL, state->cursor->x,
 			state->cursor->y, &x, &y);

types/wlr_output_damage.c

@@ -5,6 +5,7 @@
 #include <wlr/types/wlr_output_damage.h>
 #include <wlr/types/wlr_output.h>
 #include <wlr/util/box.h>
+#include "types/wlr_output.h"
 
 static void output_handle_destroy(struct wl_listener *listener, void *data) {
 	struct wlr_output_damage *output_damage =
@@ -53,7 +54,8 @@ static void output_handle_precommit(struct wl_listener *listener, void *data) {
 	if (state->committed & WLR_OUTPUT_STATE_BUFFER) {
 		// TODO: find a better way to access this info without a precommit
 		// handler
-		output_damage->pending_attach_render = output->back_buffer != NULL;
+		output_damage->pending_attach_render =
+			output_is_direct_scanout(output, state->buffer);
 	}
 }