summaryrefslogtreecommitdiffstats
path: root/src/compositor
Commit message (Collapse)AuthorAgeFilesLines
* Cleaned out usages of removed or to be removed APIs.Samuel Rødal2012-12-064-59/+0
| | | | | Change-Id: Iabbada23d010ac0fdf99f88af3f109f94814b5ea Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Cleanup QtWayland moduleAndy Nichols2012-12-034-8/+8
| | | | | | | | | | | | | | | | | | | | | | | Now that both xkbcommon 0.2.0 and libWayland 1.0.0 have been released, we should no longer be building against sha1's and should be preparing for an eventual release so these build hints have been removed. A test has been added for libWayland 1.0.0 which is required to build QtWayland. README has been updated to reflect the current situation src/3rdparty has been removed as it has not been used in some time. patches folder and contents have been removed as they are no longer needed. extensions folder has been moved to the src folder Change-Id: Iab79b5c164758a4bd0253c90f60b2a2d044e2785 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Change setPos -> setPosition in WaylandSurfaceItem.David Yip2012-12-031-1/+1
| | | | | Change-Id: Ib6b5ed3062d8bc962d21398ccfb7f61c5d21a548 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Port to libxkbcommon 0.2.0.Giulio Camuffo2012-11-051-4/+4
| | | | | Change-Id: If2b76317c5c5addcbc45c0b3212cd2ce72ceab9c Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Update QtCompositor API to use wayland 1.0.0Andy Nichols2012-11-043-7/+25
| | | | | Change-Id: I6b598595cdb8ff91d5146e0ae2511752bcfa473f Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Prevent leaking texture ids.Samuel Rødal2012-10-242-4/+16
| | | | | | | | | We need to call glDeleteTextures() in the correct thread (and when the correct context is current). Luckily, QOpenGLSharedResourceGuard is designed to solve that problem. Change-Id: Ifc04fb9040ef82947189b098e1e1c4c8d787551f Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Changing from QQuickCanvas to QQuickWindowThomas Senyk2012-10-161-6/+6
| | | | | | | Following Change Id34e2954 Change-Id: Ic0d0e860c954570408c39a8f0d9502183c624dd4 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2569-390/+554
| | | | | | | | 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>
* Fixed modifiers not working for non-Qt wayland clients.Samuel Rødal2012-09-222-1/+52
| | | | | | | The compositor needs to keep track of the modifiers now. Change-Id: Idc865744e1fdc05ced276ad766b2ce095fb207f5 Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Made qtwayland compositor handle plain wayland clients.Samuel Rødal2012-09-223-0/+96
| | | | | | | | | | | | Wayland clients now expect to receive a compiled xkb keymap from the compositor. Update libxkbcommon_sha1.txt to newest and send a keymap to the clients (for now just evdev/pc105/us). Change-Id: I89e99f05d8a98a7de83b8985a370de4fa39074a6 Reviewed-by: Arvid Picciani <aep@exys.org> Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* Prevent crashing the compositor when the client wants to unset the cursor.Samuel Rødal2012-09-221-1/+3
| | | | | Change-Id: I40460110e24555aacaef928af32372c32a3291d1 Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
* use wl_list_for_each_safe instead of wl_list_for_eachElvis Lee2012-09-121-2/+2
| | | | | | | | frame_callback may has invalid value if it's freed heap area is overwritten after wl_resource_destroy Change-Id: I61d6484857624e9c379ec96e85903e86b55531e0 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-2/+0
| | | | | Change-Id: I229c0704fc3a5d230c921b8f9a08ad1b8ee124f6 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix mouse input in WaylandSurfaceItem.Pier Luigi Fiorini2012-08-271-4/+8
| | | | | | | | | Mouse input is fixed by passing global coordinates to the mouse events, now windows can be moved by a QML-based compositor. Also, all the mouse buttons are accepted. Change-Id: Ib4cdca047ffffcc2a89a23847c813d34387ca591 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* qtwayland: correct order of parameters in setMouseFocus()Elvis Lee2012-08-201-1/+1
| | | | | | | | Examined it's callers in qtwayland. And it's supposed that there is no extenal callers, not in qtwayland. Change-Id: Id9b42b03e0718f27dc7be3f987bb077092d3a06f Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Update Wayland SHAJorgen Lind2012-08-171-1/+1
| | | | | Change-Id: I3a0adb4b935282b9bb421a87dc8241d6ea8271f0 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Do not pass texture ownership to scenegraph in WaylandSurfaceItemLaszlo Agocs2012-08-171-1/+1
| | | | | | | | | | | | | | | | Doing so breaks many simple cases of GL rendering where there is one attach followed by multiple damages. Letting SG destroy the GL texture when deleting the old QSGTexture instance is wrong and results in showing nothing but the very first frame on the screen. Also, SurfaceBuffer does delete the GL texture upon destruction so the ownership should stay with it. This reverts c1ee015bab06e82bccbb723b522c185a8188cab5, not sure why the change was introduced in the first place. Change-Id: Ie91574daadeeb7214a55f8e32c10d0a316c0e2c8 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Wheel event support in WaylandSurfaceItemLaszlo Agocs2012-08-172-0/+9
| | | | | Change-Id: Ib3988b09ccb2eea998108cbb41d4edc25ce123bb Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Add sendConfigure() for WaylandSurfaceElvis Lee2012-08-172-0/+8
| | | | | | | | | If compositor calls directly setSize() for surface, it changes only the size of the surface's boundary. If it is needed to change the contents of the surface synchronously, send_configure() must be called. Change-Id: I9c607b57c6d31d4ada6621dc57063f36f24b9d95 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Make the gl integrations use the same build options as the config testsJorgen Lind2012-08-133-4/+18
| | | | | Change-Id: I3efbd0c87c19c8ff2c382c56d2ca34bbe2e7033d Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-111-1/+1
| | | | | Change-Id: Iba6a04a12450ef81635bc76e72d737c67cc5f096 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Need to NULL check for parent() in parentSurface()Elvis Lee2012-08-101-1/+1
| | | | | Change-Id: I7252a616e8243074cfba8a473869fb91f84a60a6 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Fix fall out from shell protocol changeLaszlo Agocs2012-07-252-4/+4
| | | | | | | | Compositors were crashing every time a new surface having the transient parent set was created. Change-Id: I3c5c0d8ca34c6739f7886281f17d1a8b0aa1c7cb Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Config tests for gl integrationJorgen Lind2012-07-171-27/+22
| | | | | Change-Id: Ie7d80e7591d11aa5df87ca5d5de4cd6c03928c83 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Use the new QPlatformNativeInterface native resource function getterJørgen Lind2012-07-051-4/+9
| | | | | Change-Id: I5b4e0a48247573e3fc03a87a53c02fa5b5a984d9 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Still support building with pri filesJorgen Lind2012-07-052-2/+2
| | | | | Change-Id: I1f537b8dc69359ab250b972b21673b2b4499843e Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-272-8/+2
| | | | | | | | | | | | | | | - 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>
* switch to new-style configure testsOswald Buddenhagen2012-06-271-1/+1
| | | | | Change-Id: I70f4f4e81a042a977748dbb42b069b3706829828 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-272-5/+5
| | | | | Change-Id: I4f5c243d01f1b00f7cced6487dd4a5fa4fb072e4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix broken handling of inactive transient surfacesLaszlo Agocs2012-06-189-6/+30
| | | | | | | | | Makes tooltips and tooltip-like components like Create's locator show up properly. These should never get keyboard focus even though they are regular surfaces like any other. Change-Id: I0ade61845d9785cad19040683362a5532a04e6f6 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix build when QtQuick is not availableLaszlo Agocs2012-06-182-8/+13
| | | | | Change-Id: I112e8fd8bf9181b4cb72bb9f99be958bd7499e3d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Introduce standard pkg-config usageDonald Carr2012-06-112-24/+4
| | | | | | | | 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>
* Reset keyboard focus when a surface is destroyedLaszlo Agocs2012-06-111-2/+6
| | | | | | | | Only pointer focus was reset, resulting in undefined behavior when acessing keyboardFocus() after all surfaces had gone away. Change-Id: I8c9f71e2eadbf69de1dc7856f4a05dd309ab95eb Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Implemented orientationUpdateMask support in WaylandSurface.Samuel Rødal2012-06-066-1/+60
| | | | | | | Used to find out whether the client wants orientation updates. Change-Id: Ibefc98df7b346cbfe13cb021c932dab3d6c5d758 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* A few fixes to prevent compositor crashesAndy Nichols2012-06-063-12/+19
| | | | | | | | | | | | | If a client application exits abruptly while in direct rendering mode, the surface buffer could reference a null buffer. We now check for this before attempting to use such a surface buffer. It is also possible for WaylandSurfaceNode::preprocess to be called after WaylandSurfaceItem has called surfaceDestroyed, so now we check for a valid surface in preprocess as well. Change-Id: Ibca71349b7a24687944f8b6cd505941b580e0c2a Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Bind texture in WaylandSurfaceItem::updateTextureAndy Nichols2012-06-041-0/+1
| | | | | | | | | | This avoids a race condition where we delete the resource behind the texture before we get a chance to upload it. Change-Id: I19d126ecf3fcb5141c6630cd8e783647ea6a779c Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Bump shaLaszlo Agocs2012-06-041-1/+1
| | | | | | | | | | | keyboard_modifiers is not yet sent from server side (in qt-compositor) on keyboard focus, this needs to be added later. Unfortunately the event is somewhat libxkbcommon-specific... Also move/removed some unused variables. Change-Id: Id971bdc3a0e217740593d23145fc4ebb27d99a06 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Use QPointer instead of QWeakPointer for tracking QObjects.Stephen Kelly2012-05-311-2/+2
| | | | | Change-Id: I842906ffcc37e6649d947cef3a0d9ea942b14d05 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* added two missing #include <unistd.h> (for int close(int);)Thomas Senyk2012-05-301-0/+1
| | | | | Change-Id: I9f32108a9a5d758c8dd23be5d72900e7ea7c271b Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Make sendOnScreenVisibility invokableGunnar Sletta2012-05-291-1/+1
| | | | | Change-Id: I78b3576c60b02fc62df1201bc797b08dcd536b50 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Reset the keyboard and pointer focus when attaching a null bufferLaszlo Agocs2012-05-231-0/+8
| | | | | | | | | | | | | | | Improve QMenu/QMenuBar usability with keyboard: We really do not want the keyboard focus to remain on hidden windows. For example when opening a menu and pressing escape the focus must not be left on the (existing, but hidden) menu widget's window. This isn't perfect (ideally the compositor implementations should be able to control this somehow by deciding to which window return the focus to when the focused window goes away) but is better than nothing and is identical to what Weston does. Change-Id: Iad963182b74903cc3843460641611467db3c02ef Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Added config.test for brcm_egl.Samuel Rødal2012-05-211-2/+2
| | | | | Change-Id: Ia103645ba0823dc94b42578de1f1e39e7dd84956 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Make axis events compatible with WestonLaszlo Agocs2012-05-201-1/+1
| | | | | | | | From now on mouse wheel events will work both with qt-compositor and Weston. Change-Id: I54876cd45f3530ea9b4b7962ca52c0974e1cb2d5 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Migrate from wl_input_device to wl_seatLaszlo Agocs2012-05-205-130/+313
| | | | | Change-Id: I0d218c32478c2acce4d7012bdb26b0cde50ee633 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Implemented graceful quitting of clients.Samuel Rødal2012-05-193-1/+18
| | | | | | | Send a quit message to let the client shut down cleanly. Change-Id: I5f99c9b92341fdb5f1b171f6fe36f26bf8a47026 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* BRCM EGL integration to handle eglCreateGlobalImageBRCM.Samuel Rødal2012-05-186-0/+443
| | | | | | | | | For hardware accelerated multiprocess compositing on the raspberry pi. Change-Id: Ieb46aa7306587f89fea87098227a520f18f959a7 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Add a custom WaylandSurfaceNode with its own materialsAndy Nichols2012-05-186-43/+284
| | | | | | | | | | | | With the previous WaylandSurfaceNode based on QSGSimpleTextureNode, QSGTexture's created from SHM buffers would always have and use their alpha channels, despite the useTextureAlpha flag being set to false. Now when the useTextureAlpha flag is set to false, we use a material that ignores the textures alpha channel. Change-Id: I9cc33939f37856495f8885357f49de5ffdd81d1f Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix case where we get a new damage event too soonAndy Nichols2012-05-181-2/+10
| | | | | | | | As in when we get a damage event between when updatePaintNode calls updateTexture, and WaylandSurfaceNode::preprocess is called. Change-Id: Ib953ea6ff6c5e1c0239b734940dcf6fc39d3bb27 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Give texture ownership to scenegraph in WaylandSurfaceItemAndy Nichols2012-05-181-5/+5
| | | | | Change-Id: Ia40d73e11d54b96e27e65224d8fab6d17c5997b9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Build without hw integration.Samuel Rødal2012-05-151-1/+8
| | | | | Change-Id: I011d0e9af8082570b29e9836df40d719bb5e96a6 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 08:01:55 +0000