Commit 1239e62b authored by Pier Luigi Fiorini's avatar Pier Luigi Fiorini
Browse files

Send done and scale events only when clients support wl_output >= 2


Those events were added with wl_output version 2 and we can't send
them to clients supporting wl_output version 1.

Change-Id: I4a673b8cc0476675532d31b4391a537d8473987b
Reviewed-by: default avatarGiulio Camuffo <giulio.camuffo@jollamobile.com>
Showing with 14 additions and 8 deletions
......@@ -127,9 +127,10 @@ void Output::output_bind_resource(Resource *resource)
m_mode.size.width(), m_mode.size.height(),
m_mode.refreshRate);
send_scale(resource->handle, m_scaleFactor);
send_done(resource->handle);
if (resource->version() >= 2) {
send_scale(resource->handle, m_scaleFactor);
send_done(resource->handle);
}
}
void Output::setManufacturer(const QString &manufacturer)
......@@ -163,7 +164,8 @@ void Output::setMode(const QWaylandOutput::Mode &mode)
send_mode(resource->handle, mode_current,
m_mode.size.width(), m_mode.size.height(),
m_mode.refreshRate * 1000);
send_done(resource->handle);
if (resource->version() >= 2)
send_done(resource->handle);
}
}
......@@ -189,7 +191,8 @@ void Output::setGeometry(const QRect &geometry)
send_mode(resource->handle, mode_current,
m_mode.size.width(), m_mode.size.height(),
m_mode.refreshRate * 1000);
send_done(resource->handle);
if (resource->version() >= 2)
send_done(resource->handle);
}
}
......@@ -236,8 +239,10 @@ void Output::setScaleFactor(int scale)
m_scaleFactor = scale;
Q_FOREACH (Resource *resource, resourceMap().values()) {
send_scale(resource->handle, m_scaleFactor);
send_done(resource->handle);
if (resource->version() >= 2) {
send_scale(resource->handle, m_scaleFactor);
send_done(resource->handle);
}
}
}
......@@ -254,7 +259,8 @@ void Output::sendGeometryInfo()
m_physicalSize.width(), m_physicalSize.height(),
toWlSubpixel(m_subpixel), m_manufacturer, m_model,
toWlTransform(m_transform));
send_done(resource->handle);
if (resource->version() >= 2)
send_done(resource->handle);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment