mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: Ignore disconnected connectors width

Browse Source 
- 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)
This commit is contained in:
Benjamin Franzke
2011-08-02 13:03:54 +02:00
committed by Kristian Høgsberg
parent 3651bd54e1
commit 9eaee35613
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor-drm.c
+4 -2
View File
@@ -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);
} }