summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/wayland/qwaylanddisplay.cpp
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-06-22 10:00:28 +0200
committerJørgen Lind <jorgen.lind@nokia.com>2011-06-23 13:59:44 +0200
commit365fa4e41a356fbeb27deb513773c08c0252ea5e (patch)
tree5bd945900faf8bc7f052d097f9d75b34e7dca40e /src/plugins/platforms/wayland/qwaylanddisplay.cpp
parent933485413b6322cf15f366098365f904c5ae9bfa (diff)
Update the wayland plugin
to sha1 bfea3d6befdb688d5354e6f15a9400ea637febf9
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylanddisplay.cpp')
-rw-r--r--src/plugins/platforms/wayland/qwaylanddisplay.cpp27
1 files changed, 23 insertions, 4 deletions
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
index d501659f5..9e8cfe3df 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@@ -234,17 +234,36 @@ int QWaylandDisplay::sourceUpdate(uint32_t mask, void *data)
}
void QWaylandDisplay::outputHandleGeometry(void *data,
- struct wl_output *output,
+ wl_output *output,
int32_t x, int32_t y,
- int32_t width, int32_t height)
+ int32_t physicalWidth,
+ int32_t physicalHeight,
+ int subpixel,
+ const char *make, const char *model)
{
QWaylandDisplay *waylandDisplay = static_cast<QWaylandDisplay *>(data);
- QRect outputRect = QRect(x, y, width, height);
+ QRect outputRect = QRect(x, y, physicalWidth, physicalHeight);
waylandDisplay->createNewScreen(output,outputRect);
}
+void QWaylandDisplay::mode(void *data,
+ struct wl_output *wl_output,
+ uint32_t flags,
+ int width,
+ int height,
+ int refresh)
+{
+ Q_UNUSED(data);
+ Q_UNUSED(wl_output);
+ Q_UNUSED(flags);
+ Q_UNUSED(width);
+ Q_UNUSED(height);
+ Q_UNUSED(refresh);
+}
+
const struct wl_output_listener QWaylandDisplay::outputListener = {
- QWaylandDisplay::outputHandleGeometry
+ QWaylandDisplay::outputHandleGeometry,
+ QWaylandDisplay::mode
};
const struct wl_compositor_listener QWaylandDisplay::compositorListener = {