summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qt/5.9' into 5.10v5.10.0-beta3Paul Olav Tvete2017-10-2525-188/+505
|\ | | | | | | Change-Id: I6c283081669594b3e8c6b30194bb96e389319cb2
| * Support threaded rendering for Nvidia EGLStreamsPaul Olav Tvete2017-10-251-44/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | Create and update the texture on the GUI thread. Make sure there is a valid context on the GUI thread: create one if necessary, and share it with the global share context. Note: this requires that threaded compositors set the Qt::AA_ShareOpenGLContexts application attribute. Task-number: QTBUG-63039 Change-Id: Ia19af0536f9df319cde84221ed53db1c2ef42293 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * Ensure QWaylandWindow::transientParent has a shell surfaceJohan Klokkhammer Helsing2017-10-251-11/+16
| | | | | | | | | | | | | | | | | | | | This may not be a perfect solution, but it's better than the current one, where the transient parent may not have a shell surface (because the window may be hidden or not yet initialized). Task-number: QTBUG-63840 Change-Id: Ia5f04376d4b6d12b41ceeab5ba13cdc1b63b4e3c Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Compositor: Add missing QWaylandOutput::windowChanged emitJohan Klokkhammer Helsing2017-10-241-0/+1
| | | | | | | | | | Change-Id: If02092ad3b9042e8f771f2bc55daed7a810191bd Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Add documentation for XdgShellV5 signalsJohan Klokkhammer Helsing2017-10-241-0/+92
| | | | | | | | | | Change-Id: I6bb9385c709537a3ad924ad936bb87747e2ced7a Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Ref count buffer usageDavid Edmundson2017-10-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QPlatformBackingStore can get flushed multiple times between paints. Flush sets the front buffer, but it does not create a new backbuffer. We can't do so without doing an expensive pre-emptive copy. This means we send the same front buffer multiple times. This is somewhat questionable with regards to the Wayland specification, but seems to work. If we do send a buffer multiple times we can't consider it free until the last attached buffer is released; otherwise we end up painting into a buffer whilst the server is still using it, leading to flickering. Change-Id: I8235eed6a85f0d52b37544e7bcb623b16a9dd832 Reviewed-by: Marco Martin <mart@kde.org> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * Add documentation for XdgSurfaceV5 signalsJohan Klokkhammer Helsing2017-10-201-1/+129
| | | | | | | | | | Change-Id: If1e3304cb9a8da2aeb20802759370bc2f0f476dd Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Fix crash when wl-shell setType is called with a hidden parentJohan Klokkhammer Helsing2017-10-201-2/+4
| | | | | | | | | | | | | | | | Fall back to creating a toplevel instead Change-Id: If7db27d08b79e4f9f8c82fa8f9bf73abdb2585d9 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Fix outdated FDL license headerKai Koehne2017-10-204-20/+20
| | | | | | | | | | Change-Id: Id4ba079514c7844821adac3c0c108af7deb57889 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix crash after destroying view with mouse focusJohan Klokkhammer Helsing2017-10-186-76/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't emit QWaylandSeat::mouseFocusChanged with a destroyed QWaylandView. QWaylandPointer has been refactored to make it easier to follow enter and leave logic. A missing emit for buttonPressedChanged has been fixed as well. This also adds a test for pointer events to verify that setting mouse focus works and that the crash has been fixed. Task-number: QTBUG-63208 Change-Id: Id0c174a7b609dfd0152f3ae446dd51fd8befd554 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Fix incorrect documentation for QWaylandWlShellSurface::surfaceRequestedJohan Klokkhammer Helsing2017-10-171-6/+25
| | | | | | | | | | | | | | And add documentation for QWaylandWlShellSurface::surfaceCreated Change-Id: Iea730b7aee8403f0accae686d9d0fbbf086c7d86 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Compositor documentation: Specify return types for objectsJohan Klokkhammer Helsing2017-10-1710-21/+22
| | | | | | | | | | | | Change-Id: I9ff21c7d8b085be8fbcb102b5284ec1ac5dfb40b Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Documentation: update examples for extensionsJohan Klokkhammer Helsing2017-10-162-3/+3
| | | | | | | | | | | | Change-Id: If8840594b4077a464e97b4cb6db2fe8b70edf70d Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| * QWaylandWindow: reset window should reset maskChristophe Chapuis2017-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | When QWaylandWindow::reset() is called, the window's mask is not changed. It means that when the window will be initialized again, it will not re-send the mask description to the server side through Wayland. Task-number: QTBUG-62638 Change-Id: I07d561f466836bbd90ae58521c0768ed85554256 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Christophe Chapuis <chris.chapuis@gmail.com>
* | Docs: Bump compositor module version to 1.1v5.10.0-beta2Johan Klokkhammer Helsing2017-10-131-2/+2
| | | | | | | | | | Change-Id: Icbb93367f2d9f08261b450c97f9e7fb1820b4ee3 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1Liang Qi2017-10-0412-52/+117
|\| | | | | | | Change-Id: I83392c13a9cea972fbb570a9510a19f401675283
| * Add missing QML documentation for IviSurfaceJohan Klokkhammer Helsing2017-10-031-3/+14
| | | | | | | | | | Change-Id: I4b84d7eac0016dccaa370419487940e32130617e Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Add missing documentation for IviApplicationJohan Klokkhammer Helsing2017-10-031-0/+43
| | | | | | | | | | Change-Id: I7f958175fdb5ae21babae259bf2e8d5e749cd396 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Remove duplicate QML documentation of Shell.focusPolicyJohan Klokkhammer Helsing2017-10-031-7/+1
| | | | | | | | | | Change-Id: I6c972b79555d41cba9e8c5954e595f76b580725b Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Add QML documentation for WaylandSeatJohan Klokkhammer Helsing2017-10-031-0/+11
| | | | | | | | | | Change-Id: I71f6714f2ac4d92baedd89246d57f20c159bda1b Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Update documentation for QWaylandQuickShellSurfaceItemJohan Klokkhammer Helsing2017-10-031-7/+7
| | | | | | | | | | | | Change-Id: I80b4f078d63ac32d9ce6d91fc46f0b9d9d7d7146 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Prevent '* * *' from appearing in WaylandView documentationJohan Klokkhammer Helsing2017-10-031-4/+5
| | | | | | | | | | | | | | The documentation was missing the proper indentation. Change-Id: I3ce2afd8b9ea8c045f54202f942a8f55f831c1b2 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Compositor: Add missing cursorSurfaceChanged signalJohan Klokkhammer Helsing2017-10-022-1/+6
| | | | | | | | | | Change-Id: I23a67b8189ab84e6a70c9e3de5da15cf2e9a9d77 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Documentation: Fix missing renames from Xdg* to Xdg*V5Johan Klokkhammer Helsing2017-10-024-29/+29
| | | | | | | | | | Change-Id: Ia60e20a15151a76c337872bf46b4d09da519387c Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| * The ping method belongs to XdgShellV5, not XdgSurfaceJohan Klokkhammer Helsing2017-09-271-1/+1
| | | | | | | | | | Change-Id: I9f2ed6411ab0e24a2a6e6f194abe3ffaaba96756 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | Add missing documentation for XdgShellV6Johan Klokkhammer Helsing2017-10-031-0/+39
| | | | | | | | | | Change-Id: Ifc7682614ee4e2691dface73ceace20fd4f6effa Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Documentation: Add QML return types for XdgShellV6* typesJohan Klokkhammer Helsing2017-10-021-6/+6
| | | | | | | | | | | | | | And also fix copy-paste error for parentXdgSurface Change-Id: Ife15e8fc7a59a0effa0c9f00689273db3699eca6 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | doc: Expand the overview docs of Qt Wayland CompositorEskil Abrahamsen Blomfeldt2017-09-261-4/+52
| | | | | | | | | | | | | | | | | | | | | | There is some confusion with regards to what types of features the Wayland Compositor provides and how it related to application managers. This tries to expand the entry point description in the docs to give a more detailed description. Change-Id: I96f58c04646c69575a1bd4e4b9178c5722d752d6 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-09-209-62/+171
|\| | | | | | | Change-Id: I76bfc271efcf75c75bf38f4bf58503e1d2a00839
| * Fix server buffer integration override logicPaul Olav Tvete2017-09-141-1/+1
| | | | | | | | | | | | | | | | Assign to the actual variable instead of a new one with the same name. Change-Id: I9e4c3525891ff53f0194198b9c11f223df4c14a9 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Set window screen from wl_surface.enter and leave eventsJohan Klokkhammer Helsing2017-09-114-5/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes the pointer mScreen, which would previously cause a crash if the screen was removed. Ensures that QWindow::screen() is correct, except in the cases where: - The compositor has not yet sent enter and leave events (in which case the primary output is returned). - The compositor is not sending enter and leave events (although this is mandatory, some compositors don't do this). - The application developer has tried to move the window with QWindow::setScreen(QScreen *). Since there is no way for a client to ask to be moved to a specific monitor in windowed mode, we return the requested screen until a new enter or leave event is received. This will also be useful when implementing/fixing features where the current screen matters. Examples are QT_AUTO_SCREEN_SCALE_FACTOR and the optional output parameter to wl_shell_surface.set_fullscreen. Task-number: QTBUG-62044 Change-Id: Iafde2e278fbc8876e8dafe5b2a4d2482fdc7961a Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Close popups in the correct orderPaul Olav Tvete2017-09-072-0/+20
| | | | | | | | | | | | | | | | | | According to the protocol, child popups have to be closed before parents, but QMenuBar/QMenu will sometimes close the parent first. Change-Id: Id027ac483b727a19388df619fe1503d794e12c12 Task-number: QTBUG-62048 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * Fix crash when window attach is called without waiting for frame callbacksJohan Klokkhammer Helsing2017-08-312-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QWaylandWindow::attach was called before getting the frame callback, it would overwrite mFrameCallback. Hence, all but the last frame callback would still be alive after the QWaylandWindow destructor. When the dangling callbacks got invoked the data pointer was statically casted to the deleted QWaylandWindow, resulting in undefined behavior. In this change we only delete frame callbacks from the render thread, avoiding a race condition we fixed earlier. And we always destroy the frame callback when adding a new one, ensuring that the destructor will clean up the only remaining callback. There's a test confirming that the crash has been fixed. This fixes the flakiness of many of the qtbase auto tests. Change-Id: Iecb08ab48216eac61b1ebc5c0e0664d4aac900c0 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Update documentation for ShellSurfaceItem::shellSurfaceJohan Klokkhammer Helsing2017-08-311-7/+6
| | | | | | | | | | | | | | | | The old link to XdgSurface was broken due to the rename to V5. Added the other ShellSurface implementations as well. Change-Id: I012501d93353b27bb7bb6e14e56d5baecbdae6c1 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Remove unimplemented method QWaylandTouch::focusDestroyedJohan Klokkhammer Helsing2017-08-241-3/+0
| | | | | | | | | | Change-Id: I59d43d87e672015560a932c4ab5f376ad657c431 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Send pointer events to all bound resourcesJohan Klokkhammer Helsing2017-08-242-36/+60
| | | | | | | | | | | | | | | | | | | | | | Previously we would send events to just one of the bound resources. An example of this, is the breeze Qt style, which would bind to the pointer resource a second time, which resulted in the original resource not receiving any events, which in turn resulted in an unresponsive client. Change-Id: Iac0ffe5d9ef0dfb95db89796515d7eb4a0b38227 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * Remove unimplemented method QWaylandPointerPrivate::focusDestroyedJohan Klokkhammer Helsing2017-08-241-2/+0
| | | | | | | | | | Change-Id: I83d5692b6361311ba0562b0c3e6e026f392f7ab5 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | QWaylandShmBuffer: use a memfd if we can for a simple memory bufferv5.10.0-alpha1Thiago Macieira2017-08-261-7/+28
| | | | | | | | | | | | | | | | which has a file descriptor we can also use to share with Change-Id: I8d96dea9955d4c749b99fffd14cd61628c616b30 Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-179-13/+33
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia0f9d099e92a40cae7ec506781f70c56415bcf89
| * Try -lEGL when checking for wayland-eglJohan Klokkhammer Helsing2017-08-152-2/+4
| | | | | | | | | | | | | | | | This will detect wayland-egl on an imx6 without pkg-config Change-Id: I9c0fe6eef375fd0431a218c3b0407505c29eead9 Reviewed-by: Karim Pinter <karim.pinter@qt.io> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Remove unimplemented overload for QWaylandSeat::sendFullKeyEventJohan Klokkhammer Helsing2017-08-151-1/+0
| | | | | | | | | | Change-Id: I2cc4e0877d5957c0939d62ec66ed2ce72f15e7e6 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
| * Add missing QML documentation for ShellSurfaceItem::moveItemJohan Klokkhammer Helsing2017-08-141-1/+11
| | | | | | | | | | | | | | And add a more helpful explanation of the property. Change-Id: Ia5cd31867f5b0be586129abef829e00ee384b346 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Fallback to focusWindow as transient parentMarco Martin2017-08-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The wayland protocol requires Popup windows to have a transient parent set, in order to correctly position the window on the screen. In Qt, some popup menus don't have it, so they will appear misplaced in the screen. This adds an heuristic which makes transientParent() return the current application focus window, which is an approximation which won't be always correct, but seems to fix most applications Task-number: QTBUG-60932 Change-Id: Icec1e306d3f64f4f00ad735a8c2eedb99e85eabb Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * Check surface exists when setting textinput focusDavid Edmundson2017-08-091-2/+4
| | | | | | | | | | | | | | | | | | | | QWaylandWindow resets the surface on various events. Handling focus comes in a posted event, so this can be after we've hidden a window and lost a surface. Task-number: QTBUG-61704 Change-Id: I535ff78c6bc2b86816696a08f8eebc47186d1225 Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * Documentation: ShellSurfaceItem inherits WaylandQuickItemJohan Klokkhammer Helsing2017-08-091-0/+1
| | | | | | | | | | Change-Id: Ia67fe4f677dd77a6c1b4d7c1762fdefa9a2aed60 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| * Reset mFrameCallback in destructionDavid Edmundson2017-07-191-1/+3
| | | | | | | | | | | | | | | | Otherwise we crash if we call reset twice. For example if we call setParent and setVisible together. Change-Id: I7f07825167bf8c3236a80e649a6d6805fd6c868b Reviewed-by: Johan Helsing <johan.helsing@qt.io>
| * Fix incorrect type for WaylandQuickItem::subsurfaceHandler in docsJohan Klokkhammer Helsing2017-07-131-1/+1
| | | | | | | | | | Change-Id: I8d08eddb0eb9cd005b29e13818ba27efa11c6872 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
| * Use a non grabbing zxdg_popup_v6 for tooltipsGiulio Camuffo2017-07-122-5/+7
| | | | | | | | | | | | Change-Id: I9de16c48a1dee7728fb02faa590c112bd656aa09 Reviewed-by: David Edmundson <davidedmundson@kde.org> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
* | Fix nullptr dereference when handling a popup with no positionerJohan Klokkhammer Helsing2017-08-161-1/+6
| | | | | | | | | | | | | | If positioner was null, we would try to print its data in the error message. Change-Id: Ic6d5d5cd8039dbfd97d4cbbcc34fb18207ae633e Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | shm-based server buffer for testing on desktopPaul Olav Tvete2017-08-1615-0/+736
| | | | | | | | | | Change-Id: I2ea03f3366524d3133a65870abad9d9389dfec9c Reviewed-by: Johan Helsing <johan.helsing@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 11:21:46 +0000