summaryrefslogtreecommitdiffstats
path: root/examples/qml-compositor/main.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Allow to customize enabled compositor extensionsJan Arne Petersen2013-09-091-2/+1
| | | | | | | | Add an ExtensionFlag enum to QWaylandCompositor and allow to specify extensions to enable via the constructor. Change-Id: If1a691232134034ba4055a9ed280bc211dcaebe8 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Qt-ify the QtCompositor moduleAndy Nichols2013-02-081-17/+17
| | | | | | | | | | | | | | | | | | | | Currently the QtCompositor library and API do not follow the Qt API naming conventions. This commit intends to fix these inconsistencies. filenames start with q headers containing private API's end in _p public API classes begin with Q use the qt namespace macros where necessary Wayland namespace is now QtWayland wayland_wrapper classes are now private API's It's important to make these changes not just for stylistic reasons, but also because when qmake builds the module in checks for these conventions to determine how to deploy the include files. Change-Id: I8bfadeceda92a0f52cb73c704551da75540e7587 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix the pointer cursor handling (QtCompositor side)Andy Nichols2013-01-181-3/+9
| | | | | | | | | | | | | | | | | | | We now use the wayland-cursor library for handling pointer cursors. This required some API changes in QtCompositor, as cursors are now represented by wl_surfaces instead of just wl_buffer data. This means that when a new cursor is set by a client, you will receive a surface which you can generate cursors from. This Surface will be painted to when the cursor is changed. This also means that not all WaylandSurfaces are window surfaces, so it's important that you check that a WaylandSurface has a shell surface before treating it like a window surface. An API has been added for checking if there is a shellSurface available in a WaylandSurface. The qwindow compositor example demonstrates the correct usage of these new API's. Change-Id: Ife6b417f1048fd926a3499a139de07bceaebc727 Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Cleaned out usages of removed or to be removed APIs.Samuel Rødal2012-12-061-1/+1
| | | | | Change-Id: Iabbada23d010ac0fdf99f88af3f109f94814b5ea Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-251-6/+6
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie65cbe0c622780d2f0672bce19d267d1167620ff Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Compile fixesJorgen Lind2012-08-131-1/+1
| | | | | Change-Id: Ie532b5cd87dbcb9546b23c2ce7d013137933fbb8 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Fixed qml-compositor warning and sizing when running as windowed.Samuel Rødal2012-05-251-0/+1
| | | | | Change-Id: Ic5b58cb1761e74408bd44a048e487617d59ee72d Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Added maximize and window closing behavior to qml-compositor.Samuel Rødal2012-05-211-2/+31
| | | | | Change-Id: I13ebfa400d8ce669bf45ee533a2aa9a7190421d5 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixed qml-compositor and made it properly installable without a qrc.Samuel Rødal2012-05-161-1/+1
| | | | | Change-Id: I40936865453392dc90b03f67220f70480c0eae56 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Make qml compositor resize to windowJørgen Lind2012-04-161-1/+2
| | | | | Change-Id: I014250f968003fa8f9e14e962edcca581ed2e5d8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Build with latest qtdeclarative.Samuel Rødal2012-03-051-1/+1
| | | | | | | Used the rename-qtdeclarative-symbols.sh script from qtdeclarative/bin. Change-Id: I000b8afc3418fe862c51ce868996a4fd3de495be Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Added convenience properties in WaylandSurface for window orientation.Samuel Rødal2012-02-141-0/+5
| | | | | | | | | The new windowRotation property is especially useful for the compositor to know how much the surface needs to be rotated in order to be displayed correctly. Change-Id: I81ee17880ceafd465c39b4439dee978f2cb80924 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-301-1/+1
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I08d8673382f0230d5c5a22a25efaf5c45cef539a Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-231-1/+1
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: Ib67c393df41c539deae0ef71e0acc13029ceb46d Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update license headers.Jason McDonald2012-01-161-17/+17
| | | | | | | | | | All code in this module outside of src/plugins/platforms/wayland should carry a copy of the BSD license header. The master copy of this header lives at qtbase/header.BSD. Change-Id: Icd56f24f4a3d309db4c1c3aaef25618680c07f6e Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Implement subsurfaces extensionJørgen Lind2012-01-041-23/+20
| | | | | | | | | | | | This allows you to have subwindows in the compositor. We tried to experiment with composing subsurfaces client side, but the architecture did not feel very lean. This however, requires the compositor to compose each surface before drawing the surface. The example compositors render the subsurfaces into the wl_surfaces texture. This might not be a good idea. Change-Id: I6e186b62d7b490de7f4e6c6f22fcf6c1e0a70df3 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove the size from the mapped signalJørgen Lind2012-01-041-2/+2
| | | | | Change-Id: I4b49e115c569cab580665040cc9b173c697b1fcc Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove unused headerJørgen Lind2011-12-091-1/+0
| | | | | Change-Id: I54c0840a5b6f198ca9619d6888e506daa4b66df8 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Make wayland actually a moduleJørgen Lind2011-12-071-2/+2
| | | | | | | | | Also fix so that QtCompositor can be built as shared object. + fix so that the default QT_WAYLAND_GL_CONFIG is wayland_egl Change-Id: I02b72e99286584426bd37ab2d00bbc84af11efdc Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Get rid of QOpenGLContext dependency in WaylandCompositor constructor.Samuel Rødal2011-11-011-1/+1
| | | | | | | | | | Now WaylandSurface::texture() takes a QOpenGLContext * instead. This prevents a crash in qml-compositor against wayland_egl, since the context was 0 (it's created behind the scenes by scene graph at a later point). Change-Id: Ia02f596922ad0edea602dfe12b411ec827d47669 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Rename QSG* to QQuick* in qtwayland moduleAndy Nichols2011-10-261-7/+7
| | | | | Change-Id: I6029550cb9a892795d0db9aafea59801a1de3c68 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Compile fixesPaul Olav Tvete2011-09-081-1/+1
|
* Fixed build and crash issues.Samuel Rødal2011-08-291-10/+4
|
* make compositor build with refactor - frameSwapped slot addedMatthew Cattell2011-08-181-4/+10
|
* Merge branch 'master' into refactorLaszlo Agocs2011-07-191-1/+2
|\ | | | | | | | | | | | | | | | | Conflicts: examples/qwidget-compositor-mdi/main.cpp src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.cpp src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp src/qt-compositor/qt-compositor.pri src/qt-compositor/wayland_wrapper/wlsurface.h
| * Fix compilation of qml example and enable touch handling.Laszlo Agocs2011-07-191-1/+2
| |
* | Get Qt compositor working with wayland EGL on refactor branch.Samuel Rødal2011-06-231-5/+1
| |
* | Merge branch 'master' into refactorJørgen Lind2011-06-231-5/+5
|\|
| * Update wayland_shaJørgen Lind2011-06-231-5/+5
| | | | | | | | | | also, make the surfaceMapped signal give a size and not rect and use the new visual api
* | Make qml-compositor compile.Laszlo Agocs2011-06-171-2/+2
|/
* Add a .qrc file in qml-compositor so it can be run from anywhere.Samuel Rødal2011-05-201-1/+1
|
* Make qmal compositor resizeJørgen Lind2011-05-051-0/+1
|
* Properly handle surface resizes in QML compositor.Samuel Rødal2011-04-011-1/+8
|
* Move WaylandSurfaceItem into common API.Samuel Rødal2011-04-011-192/+5
|
* Use QSGPlainTexture::setImage() instead of generating our own texture.Samuel Rødal2011-04-011-18/+2
| | | | Takes care of swizzling based on whether we're on GL ES or not.
* Update compositor to reflect latest changes in qtquick2.Samuel Rødal2011-03-311-15/+14
|
* Made compositor keep track of key / pointer focus surfaces.Samuel Rødal2011-03-211-2/+1
| | | | | Puts less burden on the implementation to make sure the input focus is cleared when a surface is destroyed.
* Added animation to QML compositor when window is destroyed.Samuel Rødal2011-03-181-1/+5
|
* Get rid of QML errors when destroying a window.Samuel Rødal2011-03-181-1/+1
|
* Added window title and made contrast-lowering effect a bit more subtle.Samuel Rødal2011-03-171-0/+1
|
* Better layouting system in QML compositor.Samuel Rødal2011-03-151-13/+31
|
* Added keyboard input to QML compositor.Samuel Rødal2011-03-151-2/+17
|
* Added proper removing of windows in QML compositor.Samuel Rødal2011-03-151-0/+13
|
* Added initial scene-graph qml based compositor.Samuel Rødal2011-03-151-0/+284
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 02:11:01 +0000