summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove conversion warning in examplesJørgen Lind2013-08-022-6/+6
| | | | | | | Change-Id: I69944a417d40ad39d261b58a35eee4f84156995f Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Compile in C++11 mode: fix narrowing conversion in arraysThiago Macieira2013-07-022-8/+8
| | | | | Change-Id: I245abe09f60cb24e435af53ad7b2d2142f91b55c Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Add close event to the surface extensionJørgen Lind2013-06-061-1/+1
| | | | | Change-Id: Iacbd83d5551b3a5c2152ff80bb0085ce3f853306 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Make it possible to hide windowsJørgen Lind2013-06-061-0/+2
| | | | | Change-Id: Iad80149278edd670fd55a3a6c1b4975ac81d7f59 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Make QWindowCompositor render when surfaces move aroundJørgen Lind2013-05-182-0/+7
| | | | | Change-Id: I1f363238232c145941940fe203b110f8855d8c26 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Qt-ify the QtCompositor moduleAndy Nichols2013-02-084-90/+90
| | | | | | | | | | | | | | | | | | | | 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>
* Don't build QtCompositor unless explicitly enabledAndy Nichols2013-02-051-6/+11
| | | | | | | | | | | | | The QtCompositor API is to be considered experimental in Qt 5.1 and thus it should be disabled from being built by default. If the qmake variable CONFIG contains "wayland-compositor" then the QtCompositor API will be built. Change-Id: If10f5a688749f31338a80be45bbec22a0f2d12da Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix the pointer cursor handling (QtCompositor side)Andy Nichols2013-01-184-28/+53
| | | | | | | | | | | | | | | | | | | 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>
* make use of qtHaveModule()Oswald Buddenhagen2013-01-081-2/+2
| | | | | | Change-Id: I7cd0b3e1ac9f326b249bc8ed2ca5abf522cc619a Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
* Cleaned out usages of removed or to be removed APIs.Samuel Rødal2012-12-062-2/+1
| | | | | Change-Id: Iabbada23d010ac0fdf99f88af3f109f94814b5ea Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2516-96/+96
| | | | | | | | 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>
* Fix build errors due to api changes in QtBaseJorgen Lind2012-09-101-1/+1
| | | | | Change-Id: Ie171d9342d877792c2f0b19694ff020965d91985 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Compile fixesJorgen Lind2012-08-131-1/+1
| | | | | Change-Id: Ie532b5cd87dbcb9546b23c2ce7d013137933fbb8 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* qwindow-compositor: Fix background image drawingLaszlo Agocs2012-08-131-2/+5
| | | | | | | | | | Make it work correctly with -nofullscreen and prevent it from being shown upside-down (hard to notice with the default background image but becomes obvious when replacing background.jpg with something else) Change-Id: I372ba16818dd452c965febd551da0e35d114b920 Reviewed-by: Elvis Lee <kwangwoong.lee@lge.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Set default background image for QWidgetCompositorElvis Lee2012-08-033-1/+8
| | | | | | | This is helpful for seeing cursor. Change-Id: I1356be8ffb725af303ef4a13503843bbeae0e071 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Correct background's coordinatesElvis Lee2012-07-312-9/+25
| | | | | | | | | Background has been rendered from (0, 0), so it didn't reprensent boundary of qwindowcompositor correctly when using -nofullscreen. And make background'size equal to window size on constructing. Change-Id: I2bcdc350c1e8ebccdb19c69211afecf5d59000ea Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Handle events coming from show() properly in qwindow-compositorLaszlo Agocs2012-07-251-2/+2
| | | | | | | | | | | By not having the event handler set up properly before calling show() we lose the expose events for platforms that send a sync expose from setVisible (the default QPlatformWindow implementation). On platforms like xcb this was not visible because the expose came later, but with kms the initial expose was lost completely. Change-Id: I16848be35f4d07df8053c66f7d39633a23e45df3 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-271-7/+0
| | | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments - qmake -project boilerplate - dead code Change-Id: Ia515c3cc40170e3b99b0bfd04c10637d49f9b99f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Properly reset keyboard focus in qwindow-compositor when hidingLaszlo Agocs2012-06-192-2/+21
| | | | | | | | | Surfaces with null buffer attached should be handled similarly to destroyed surfaces. qtwayland makes sure the focus surface is reset, if needed, but it's up to qwindow-compositor to pick a new one. Change-Id: I68ec7fe3fe3e2795ae52ef60d9343cb527205c68 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix output geometry in qwindow-compositorLaszlo Agocs2012-06-181-0/+4
| | | | | Change-Id: I99989faca2c5e13df85accdcdacd5cc616b43ba1 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Introduce standard pkg-config usageDonald Carr2012-06-113-9/+0
| | | | | | | | Use our own qualified pkg-config mkspec feature rather than directly executing the system binary Change-Id: I4b162cd8d2d9a8bd5d0b3adb9ca935df9ff96a69 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Don't build qwidget compositor when qt is configured with -no-widgetsAndy Nichols2012-06-061-1/+5
| | | | | Change-Id: Ie7952d83527015996fe678ccd68d2984b0119858 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Avoid burning cpu in qwindow-compositor with glx and nvidiaLaszlo Agocs2012-06-051-2/+1
| | | | | Change-Id: I2da069c7fd12b26b2811b59ec66418865bcbe962 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixed qml-compositor warning and sizing when running as windowed.Samuel Rødal2012-05-252-1/+2
| | | | | 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-217-21/+180
| | | | | Change-Id: I13ebfa400d8ce669bf45ee533a2aa9a7190421d5 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* qwindow-compositor: Avoid stuck alt when running non-fullscreenLaszlo Agocs2012-05-212-0/+17
| | | | | Change-Id: I9d2129e2e746704f1fc0e8f6243fe3b8b7224456 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixed inverted textures in qml-compositor.Samuel Rødal2012-05-171-2/+2
| | | | | | | | qml-compositor now shows applications the same way as qwindow-compositor. Change-Id: If5e53863969830cbd22916e50447b4f05d0a245a Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Properly bind to the yInverted property in qml-compositor.Samuel Rødal2012-05-171-9/+2
| | | | | Change-Id: I1260ce2e0f711dc1140b7030e4941159d9eae03c Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Fixed qml-compositor and made it properly installable without a qrc.Samuel Rødal2012-05-168-19/+9
| | | | | Change-Id: I40936865453392dc90b03f67220f70480c0eae56 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Add wheel event supportLaszlo Agocs2012-05-101-0/+5
| | | | | Change-Id: Id827485138758ccb4c0db420559b2b9af5c45bbc Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Start using the new wl_fixed_t type properlyLaszlo Agocs2012-05-092-15/+15
| | | | | | | | | | | | | | The mouse and touch coordinates cannot just be treated as integers anymore, they need to be converted from/to double using the helper functions. Some necessary QPoint -> QPointF changes have also been made. For the Qt-specific touch extension we will not switch to wl_fixed_t though. This is because the precision is unfortunately quite small (factor of 256 vs. 10000). Change-Id: I23deaaffe478a39495b12d336985bc62e38a6af4 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove notes about enabling the touch extension in qwindow-compositorLaszlo Agocs2012-05-091-9/+0
| | | | | | | It is all automatic nowadays. Change-Id: I7b8f0c1716a910624ac31bd31832fb50418f48fb Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Send expose from qwindow-compositorLaszlo Agocs2012-04-242-0/+10
| | | | | | | | | | | | | | Otherwise apps that (correctly) only start rendering on QEvent::Expose will not render at all due to not receiving the event. Turns out calling sendOnScreenVisibilityChange() is not that simple: It does nothing until the extendedsurface instance is created and that happens only after a roundtrip to the client. Therefore the compositor listens to a new signal in WaylandSurface that indicates when the extendedsurface-related functions become functional. Change-Id: I9fdac4a98e2ad5d8c913c2a7aeef5b313f27c50a Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Do not render in qwindow-compositor before exposeLaszlo Agocs2012-04-241-2/+0
| | | | | Change-Id: I0016a9969004252be3a5978e0ab4155b4d883682 Reviewed-by: Jørgen Lind <jorgen.lind@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>
* Make windowcompositor actually eat events in the event filterJørgen Lind2012-04-111-3/+2
| | | | | Change-Id: I946aa90eb52751471470185a39f044ac23d53100 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix QWindow Compositors input handlingJørgen Lind2012-04-111-15/+17
| | | | | Change-Id: I500c0a8e824abcf9a1e7662e1bd030ecc1b85170 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Build with latest qtdeclarative.Samuel Rødal2012-03-052-2/+2
| | | | | | | Used the rename-qtdeclarative-symbols.sh script from qtdeclarative/bin. Change-Id: I000b8afc3418fe862c51ce868996a4fd3de495be Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Fixed warnings in qwidget-compositor.Samuel Rødal2012-03-051-4/+4
| | | | | Change-Id: I22f12e2d78f2951e1c1c5a3b2c05794f0c26abb6 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* clean up qmake-generated projectsOswald Buddenhagen2012-02-213-36/+1
| | | | | | | remove assignmets which are defaults or bogus Change-Id: I6e4fcef11e905ffbbb7a32210608faac7aa111e5 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Fix wayland plugin and qwindow-compositor compilationLaszlo Agocs2012-02-202-0/+5
| | | | | | | | | Apparently some qtbase change triggers the need to include a bunch of headers which were not properly included before. The extra mouse button support in the platform plugin simply did not compile. Change-Id: I7d518021fa81f2d5232277f0bce26e48effbeae3 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix qwindow-compositor memory leaksLaszlo Agocs2012-02-155-4/+17
| | | | | Change-Id: I85aa62c9deae308612ed2b13468e7f1e48f82acf Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Added convenience properties in WaylandSurface for window orientation.Samuel Rødal2012-02-142-1/+9
| | | | | | | | | 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>
* Add mouse event synthesizing to the touch extension protocol.Laszlo Agocs2012-02-073-1/+15
| | | | | | | | | The compositor can now be configured to tell the clients to generate mouse events when receiving touch events. In touchscreen-only systems this can be used to reduce the number of Wayland events. Change-Id: I231a15cd4ed463ee81c510c082a270efa255a1f3 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix compilation for qwidget and qwindow compositor examplesLaszlo Agocs2012-01-302-0/+5
| | | | | | Change-Id: If720f7f4797e319ab03d02b6ecb9c88cb71356c2 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-3016-16/+16
| | | | | | | | | | | 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-2316-16/+16
| | | | | | | | 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>
* Fix duplicated QOpenGLFunctions usageLaszlo Agocs2012-01-202-4/+1
| | | | | | Change-Id: I3c90b705c0ef07e824768975fe1889e394acd82b Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Update license headers.Jason McDonald2012-01-1616-136/+457
| | | | | | | | | | 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>
* Introduce a touch protocol extension.Laszlo Agocs2012-01-132-0/+8
| | | | | | | | | | | | | | | | | | | Using this opt-in protocol extension all data from QTouchEvent will properly be delivered to the clients. By default compositors will still use the standard and limited protocol for touch events to remain compatible with non-Qt clients. However by calling enableTouchExtension() in the compositor, touch events will be sent through the new protocol and thus Qt clients will receive proper QTouchEvents. Non-Qt clients will get no touch data in this mode. The contents of the rawScreenPositions() list are not yet delivered as the size implications remain to be checked. Change-Id: I981b9c4d44ea808a95b770bf948320abd47fc036 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>