summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Remove the MDI compositor.Robin Burchell2012-01-133-237/+1
| | | | | | | | | | This was broken by the recent input rewrites, and isn't really the 'correct' future-proof path anyway. Wayland is more advocating client-side decorations rather than compositor-side decorations, and this won't work in that world. Change-Id: I187084d7eea785eda43e8658cfd2120205eea211 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Use QOpenGLFunctions instead of presuming GL methods exist.Robin Burchell2012-01-132-16/+23
| | | | | | | | | | | They may not always exist, especially on desktop GL, so this is incorrect and won't build in some cases. Credit to Samuel Rødal for setting me on the path :) Change-Id: I89296c5ed67f9388cceedb08cd68a7b5560be5e9 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Don't crash when sending touch events.Laszlo Agocs2012-01-111-7/+8
| | | | | | Change-Id: I62bf4913338e6daa3245400b0e2c7004907cb29a Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Move event handling into WaylandInput apiJørgen Lind2012-01-112-29/+29
| | | | | | | | | | | | | Qt only gives us 1 input device as of now, ie. the mouse/keyboard and touch events. However, at some point in the future, this will change, so that the events will have a device id. This will ie on x map to the same device, but on evdev this can be different devices. Also this is part of what is needed to implement grabbing Change-Id: Ice049502d6f0f53fd06142d4dedde05806d60120 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Fix so that not all mouse events end up being key events as wellJørgen Lind2012-01-101-0/+1
| | | | | | | | in the Window compositor Change-Id: I9d88e15ea7ac810a18f6a5b962109d27d2d883a7 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Handle changeCursor in QWindowCompositorJørgen Lind2012-01-102-0/+14
| | | | | | Change-Id: I8ef3b9b36aad00177170f98bcc5c832f884bab04 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Handle mouse focus in the QWindowCompositorJørgen Lind2012-01-101-0/+1
| | | | | | Change-Id: Ibb994eb8b9e2c69aecdee7daf704475d4d84b183 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add a function to the compositor api to send full touch eventsLaszlo Agocs2012-01-101-6/+3
| | | | | | | | | | | | | | | A simple sendTouchPointEvent(id, x, y, ...) type of function will not be sufficient in the future due to the amount of data in a touch event; therefore an additional sendFullTouchEvent is introduced. This function takes a QTouchEvent and posts a series of down, motion, up, frame events as needed. In the future it may be changed so that it maps to a protocol extension instead of the standard events. As an example qwindow-compositor is updated to use this new function. Change-Id: I39d3df1c6d4868364440f59789d01fc5b7b80dac Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Add an option to qwindow-compositor for disabling random positioningLaszlo Agocs2012-01-101-2/+6
| | | | | | | | | | When passing -stickytopleft all surfaces will be shown at position 0,0 instead of picking a random one. This is useful for apps with one single large window in combination with -nofullscreen. Change-Id: I0834c43981a2d2c7b9796e273ac0eb0cfd738132 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Use QOpenGLFunctions in qwindow-compositor.Laszlo Agocs2012-01-092-4/+4
| | | | | | | | To keep it building with desktop OpenGL. Change-Id: I82685926461fc3249ed7a53e741b653273fe6f5c Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove logging of key presses in qwindow-compositor.Laszlo Agocs2012-01-091-2/+2
| | | | | | Change-Id: I505b262687bb32853a69c4dccb79a05f68b1dced Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Have a crack at fixing setGeometry calls.Robin Burchell2012-01-061-4/+6
| | | | | | | | | Commit a5ce91c023aeb433f1b5b792291a88c9a5683955 removed setGeometry, so let's make an effort at still functioning. Change-Id: Iaae877a2312712ba63aa94a8ae3a3939554c5592 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Add isYInverted property with notificationPaul Olav Tvete2012-01-051-1/+9
| | | | | | Change-Id: I6a835a2be4513fa6c24f172503669bc3c95fad0b Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Remove QSize from surfaceMapped signal.Robin Burchell2012-01-051-3/+3
| | | | | | | | Commit 6307ca5e22d81da9a39289c2cca9165fea81b3a5 removed this from the signal, so we must follow suit. Change-Id: I4073cfb7e9f6c722c1ac097e3d939767868027cb Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Remove the geometry from the wayland surfaceJørgen Lind2012-01-042-46/+46
| | | | | | | | | and add pos and size properties instead. The pos is a PointF while the size is a integer based Size since pos can be transformed, while the size reffers to the pixel size. Change-Id: I5d84aa6661405cb0df356b787246d0d73ad0c503 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make it possible to drag windows aroundJørgen Lind2012-01-042-11/+42
| | | | | | | while holding the windows key down. Change-Id: I1b5cd7fb39b5ec0ead6a4c312b4bb653a0191a00 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Implement subsurfaces extensionJørgen Lind2012-01-0413-319/+525
| | | | | | | | | | | | 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>
* Add mouse move events to the window compositorJørgen Lind2012-01-041-0/+7
| | | | | Change-Id: Iacdfbd55feb5db4d38eac6e2729684052a46afa9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove the size from the mapped signalJørgen Lind2012-01-044-14/+14
| | | | | Change-Id: I4b49e115c569cab580665040cc9b173c697b1fcc Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Added surface_extension and output_extensionJørgen Lind2011-12-201-1/+1
| | | | | | | | | | This is an atempt on removing WindowManagerIntegration and create more specialised extensions. Hopefully it will reduce tha "map lookups" we have all because of the windowmanagerintegration is way to generic, and hopefully it will make it easier to ready and understand the code Change-Id: I126c430e87909e4520f6d241c0a6023214cb509a Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Restore retained selection support in qt-compositor.Laszlo Agocs2011-12-161-0/+2
| | | | | Change-Id: I20fdffacd4f62d2e7083c269c7f82c059f3e24fc Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Remove unused headerJørgen Lind2011-12-091-1/+0
| | | | | Change-Id: I54c0840a5b6f198ca9619d6888e506daa4b66df8 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Make qwindow-compositor work without opengl module dependency.Laszlo Agocs2011-12-072-6/+38
| | | | | Change-Id: Icb05b076b46dfbf36154343083bd332a4d9a7468 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* I removed the qwidget-compositor-mdi.proJørgen Lind2011-12-071-0/+27
| | | | | | | I cant revert the patch, so I just have to add it. Change-Id: I05531ca973ada7043f39c46faccc35ffd6800bf9 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Add comments to example pro file to explain how to include priJørgen Lind2011-12-073-0/+11
| | | | | Change-Id: Ic5cb0aff2bf70158905a8d6c4487670ce76c9355 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Make wayland actually a moduleJørgen Lind2011-12-079-57/+46
| | | | | | | | | 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>
* Make it possible to run qwindow-compositor in non-fullscreen.Laszlo Agocs2011-12-062-12/+6
| | | | | | | Also remove some leftovers from the pro file. Change-Id: Ic4f461054855d7e5b9ea907818f2c58565f6ea3b Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Updated to head of Wayland, but did not fix clipboard or dndJørgen Lind2011-11-301-0/+1
| | | | | Change-Id: I9f4d4101947b2cc64b52eed070d3a37c00ab07da Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* qwindow-compositor: Do a render on expose.Laszlo Agocs2011-11-251-0/+3
| | | | | Change-Id: Ic2941a389de6f8aeaf74a86ce09ecf4616b390cc Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Get rid of QOpenGLContext dependency in WaylandCompositor constructor.Samuel Rødal2011-11-014-7/+7
| | | | | | | | | | 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>
* Add basic key, mouse, touch event support to qwindow-compositor.Laszlo Agocs2011-10-242-4/+88
| | | | | | | | This brings the capabilities of this compact and lean compositor example up to the level of the old qwidget-based one. Change-Id: I58eae567e64e1f06432d23bd7d24579efb36eb84 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Do not leak textures in qwindow-compositor.Laszlo Agocs2011-10-241-1/+3
| | | | | | | | When drawing images coming via SHM the OpenGL texture was never deleted, causing a leak of a texture on every update. Change-Id: Ic40198a5a8369a273c046a186a82d69597ea5c0c Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix mirrored Y coordinates in qwindow-compositor.Laszlo Agocs2011-10-241-4/+4
| | | | | Change-Id: I432aa2fdf231301fda99b68e863ecc964c550781 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Avoid qwindow-compositor crash on startup due to missing background.Laszlo Agocs2011-10-243-6/+7
| | | | | | | | Include background.jpg as a resource. This way it will be found always. Change-Id: I859a01b97fc81b704f8c632aab546b4b9905c375 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Some small improvements to qwindow-compositor.Samuel Rødal2011-10-074-6/+17
| | | | | | | Change-Id: I497def3e500116d3cc2850e4cc4e3ea4055de6cb Reviewed-on: http://codereview.qt-project.org/6222 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com> Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Cleaned up project filesAndy Nichols2011-09-132-6/+6
| | | | | Removed references to Widgets module that is not needed anymore. Also make qml-compositor deployable with make install.
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 22:45:45 +0000