compositor-drm: Ignore disconnected connectors width

- Fixes segfault, if first enumerated connector is not connected.
- Corrects x-offset where e.g. the 2. of 3 connectors is not connected.
  (where width of 1. output would have taken twice as
   offset for output at 3. connector)
dev
Benjamin Franzke 13 years ago committed by Kristian Høgsberg
parent 3651bd54e1
commit 9eaee35613
  1. 6
      compositor/compositor-drm.c

@ -516,13 +516,15 @@ create_outputs(struct drm_compositor *ec, int option_connector)
if (connector->connection == DRM_MODE_CONNECTED && if (connector->connection == DRM_MODE_CONNECTED &&
(option_connector == 0 || (option_connector == 0 ||
connector->connector_id == option_connector)) connector->connector_id == option_connector)) {
if (create_output_for_connector(ec, resources, if (create_output_for_connector(ec, resources,
connector, x, y) < 0) connector, x, y) < 0)
return -1; return -1;
x += container_of(ec->base.output_list.prev, struct wlsc_output, x += container_of(ec->base.output_list.prev,
struct wlsc_output,
link)->current->width; link)->current->width;
}
drmModeFreeConnector(connector); drmModeFreeConnector(connector);
} }

Loading…
Cancel
Save