~gerboland/qtubuntu/enable-debug-mode

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/screen.h

Committer: Gerry Boland
Date: 2016-04-12 13:10:43 UTC
mfrom: (280.2.34 enable-debug-mode)
Revision ID: gerry.boland@canonical.com-20160412131043-t14zmcbheuxclmhr

Merge lp:~dandrader/qtubuntu/enable-debug-mode, he kindly fixed merging this with trunk

files added:
src/ubuntumirclient/cursor.cpp

src/ubuntumirclient/cursor.h

src/ubuntumirclient/offscreensurface.cpp

src/ubuntumirclient/offscreensurface.h

files modified:
README

debian/changelog

debian/control

src/ubuntumirclient/clipboard.cpp

src/ubuntumirclient/glcontext.cpp

src/ubuntumirclient/glcontext.h

src/ubuntumirclient/input.cpp

src/ubuntumirclient/input.h

src/ubuntumirclient/integration.cpp

src/ubuntumirclient/integration.h

src/ubuntumirclient/logging.h

src/ubuntumirclient/nativeinterface.cpp

src/ubuntumirclient/plugin.cpp

src/ubuntumirclient/screen.cpp

src/ubuntumirclient/screen.h

src/ubuntumirclient/ubuntumirclient.pro

src/ubuntumirclient/window.cpp

src/ubuntumirclient/window.h

Show diffs side-by-side

added added

removed removed

src/ubuntumirclient/screen.h

* This program is free software: you can redistribute it and/or modify it under

* the terms of the GNU Lesser General Public License version 3, as published by

#include <QSurfaceFormat>

#include <EGL/egl.h>

#include "cursor.h"

struct MirConnection;

class UbuntuScreen : public QObject, public QPlatformScreen

int depth() const override { return mDepth; }

QRect geometry() const override { return mGeometry; }

QRect availableGeometry() const override { return mGeometry; }

QSizeF physicalSize() const override { return mPhysicalSize; }

Qt::ScreenOrientation nativeOrientation() const override { return mNativeOrientation; }

Qt::ScreenOrientation orientation() const override { return mNativeOrientation; }

QPlatformCursor *cursor() const override { return const_cast<UbuntuCursor*>(&mCursor); }

// New methods.

QSurfaceFormat surfaceFormat() const { return mSurfaceFormat; }

uint32_t mirOutputId() const { return mOutputId; }

// QObject methods.

void customEvent(QEvent* event);

void customEvent(QEvent* event) override;

private:

QRect mGeometry;

QSizeF mPhysicalSize;

Qt::ScreenOrientation mNativeOrientation;

Qt::ScreenOrientation mCurrentOrientation;

QImage::Format mFormat;

EGLDisplay mEglDisplay;

EGLConfig mEglConfig;

EGLNativeDisplayType mEglNativeDisplay;

UbuntuCursor mCursor;

};

#endif // UBUNTU_SCREEN_H

Older »