summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add warning to private headersPaul Olav Tvete2015-10-2321-0/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We mean it. Change-Id: I7381c7aad198dcca485d488571fd12296d07f980 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| * | | Rename QWaylandExtensionContainer to QWaylandObjectPaul Olav Tvete2015-10-2322-52/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the name, and make QWaylandExtension a subclass of QWaylandObject. This way, all extensions can have extensions of their own, without multiply inheriting. Change-Id: Ie06e764412d113f7a62399caa605a48b015c7d24 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | | Merge branch 'qt/5.6' into wip-compositor-apiPaul Olav Tvete2015-10-1373-198/+1047
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/wayland/pure-qml/main.cpp examples/wayland/pure-qml/qml/Chrome.qml examples/wayland/pure-qml/qml/main.qml src/client/qwaylanddnd_p.h src/compositor/compositor_api/qwaylandquicksurface.cpp src/compositor/compositor_api/qwaylandsurface_p.h src/compositor/compositor_api/qwaylandsurfaceitem.cpp src/compositor/extensions/qwlinputmethodcontext_p.h src/compositor/hardware_integration/qwlclientbufferintegration_p.h src/compositor/hardware_integration/qwlclientbufferintegrationfactory_p.h src/compositor/hardware_integration/qwlclientbufferintegrationplugin_p.h src/compositor/hardware_integration/qwlhwintegration_p.h src/compositor/hardware_integration/qwlserverbufferintegrationfactory_p.h src/compositor/hardware_integration/qwlserverbufferintegrationplugin_p.h src/compositor/wayland_wrapper/qwlcompositor_p.h src/compositor/wayland_wrapper/qwldatadevice_p.h src/compositor/wayland_wrapper/qwldatadevicemanager_p.h src/compositor/wayland_wrapper/qwldatasource_p.h src/compositor/wayland_wrapper/qwlextendedsurface_p.h src/compositor/wayland_wrapper/qwlinputdevice_p.h src/compositor/wayland_wrapper/qwlinputmethod_p.h src/compositor/wayland_wrapper/qwlinputpanel_p.h src/compositor/wayland_wrapper/qwlinputpanelsurface_p.h src/compositor/wayland_wrapper/qwlkeyboard.cpp src/compositor/wayland_wrapper/qwlkeyboard_p.h src/compositor/wayland_wrapper/qwloutput_p.h src/compositor/wayland_wrapper/qwlpointer_p.h src/compositor/wayland_wrapper/qwlregion_p.h src/compositor/wayland_wrapper/qwlshellsurface_p.h src/compositor/wayland_wrapper/qwlsubsurface_p.h src/compositor/wayland_wrapper/qwlsurface.cpp src/compositor/wayland_wrapper/qwlsurface_p.h src/compositor/wayland_wrapper/qwltextinput_p.h src/compositor/wayland_wrapper/qwltextinputmanager_p.h src/compositor/wayland_wrapper/qwltouch_p.h src/compositor/windowmanagerprotocol/waylandwindowmanagerintegration_p.h src/imports/compositor/WaylandCursorItem.qml Change-Id: I4e63ef295b297022d4970b3c68b3d565843086bd
| * | | | Fix missing #ifndef for housekeeping code.Erik Larsson2015-10-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad74c37917ef2cb61565c88dc3de12bd0fb7fbcb Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | A surface buffer has content iff it has a bufferPaul Olav Tvete2015-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I357097740a50b677b85e1708ec440da03573d2d2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | | | Avoid crash on window closePaul Olav Tvete2015-10-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic6aad5c0d51b2ae9ee078d3935db3daa642f9b32 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | | | Avoid double deletePaul Olav Tvete2015-10-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extension resources are destroyed by Wayland, and we delete the corresponding classes when that happens. This means that we must not delete the extensions when the container is deleted. Change-Id: I0842e40ab8e8861a623d0fcb47dfd3cf71417d4f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | | | Add raise() and lower() to QWaylandQuickItemPaul Olav Tvete2015-09-292-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idbd0ec7e8b77f6241aa6ac91639d76a0ffe2dae9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | | | Improve notification at surface destructionPaul Olav Tvete2015-09-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7e9cb1a0ed728f21af4f1e00ee66dfe86f0dd6a4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | | | Add missing Q_ENUMJørgen Lind2015-09-183-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib1af1399fb7a50ae3e97432fc7d34b1bc6956428 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Make sure QWaylandQuickItem paints the first frameJørgen Lind2015-09-182-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when a Surface containing a frame is being set on it Change-Id: Ie19f017f0f28e225ffc29edf9a88fa21e6988d02 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Hook up the QWaylandQuickItem::surfaceDestroyedJørgen Lind2015-09-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8551318190782a2426ff9d03fbe881a0cdc7016a Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Remove the parent pointer for the view in QWaylandQuickItemJørgen Lind2015-09-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its a scoped pointer and will be deleted by QWaylandQuickItem Change-Id: Ief881cc4dd83780da49c3d70d886389b7a10c33d Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Add sizeFollowsSurface property to QWaylandQuickItemJørgen Lind2015-09-183-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I416f5689679d08b9ba89dceceac5c2ed9128ed9a Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Add a setDefaultOutput function to QWaylandCompositorJørgen Lind2015-09-183-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have to remove the assert in QWaylandCompositorPrivate::addOutput since setDefault output can also add outputs now, and it might be called by both Change-Id: Ic2a321fde37917427dfb68b38dd3e6af2ed20368 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Add a DiscardFontBuffers property to QWaylandViewJørgen Lind2015-09-183-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an optimisation property which can be set on a view. If you have two views for a surface, then the frontBuffer will be released first when the last view has released the frontBuffer. With this option all views with this option set to true will discard the frontBuffer when the throtlingView discards its frontbuffer Change-Id: Id628ec60830549ea930c1fff950501de2b073e48 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Simplify the construction of pure-qmlJørgen Lind2015-09-182-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible that an WaylandOutput item is declared as a child of a WaylandCompositor item. This is mostly usefull for examples, since output handling will likely be event driven in a propper compositor Change-Id: I3238b079e41a49f69cbd9255818588674b364fb2 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Remove the QWaylandOutputSpaceJørgen Lind2015-09-1820-485/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need this abstraction anymore since we don't have global coordinates in the core api anymore Change-Id: I553a736a0e71026447d6a0af3f8a64607b8c8f06 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Remove nativeBuffer from QWaylandBufferRefJørgen Lind2015-09-182-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f95ee3a93e7884c730492d324b5430f7be0502d Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | New API for drag and dropPaul Olav Tvete2015-09-176-122/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let the compositor implementation keep all the GUI state. Change-Id: I73a865fa3407340276d6765e10378b8e23a76fe2 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Crash fixPaul Olav Tvete2015-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the internal API correctly. Change-Id: I56e1bbe27c126d70da6a04bad9de7c8a8ea1112b Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Return empty size when nil buffer is attachedPaul Olav Tvete2015-09-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74d46c9d2639315341a1e101e304cdffd748976c Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Implement resize/move for pure-qmlJørgen Lind2015-09-1610-16/+419
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7919f7715486fa2d8cfe35c08095f6c33757a515 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Create a utility function for QWaylandQuickItem::inputRegionContainsJørgen Lind2015-09-162-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7bfdd54015e768e0336bda6e74e1816188d30c94 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Make QWaylandQuickItem use pimplJørgen Lind2015-09-164-136/+250
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic2c0707d8576f72e1c6ae6e8c2e026882a5733b6 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Remove QWaylandCompositor::cleanupGraphicsResources()Jørgen Lind2015-09-154-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is not needed anymore since the QWaylandView holds a reference to the buffer and the QWaylandQuickItem owns the texture Change-Id: I0a4da028cf1cecf4b0710b96737dfc1035e5f1f9 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | QWaylandOutput should not resize the windowPaul Olav Tvete2015-09-151-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The communication should always go the other way: if sizeFollowsWindow then the output is automatically resized when the window resizes. Otherwise, QWaylandOutput::setGeometry() must be called manually. Change-Id: Ibbf3435aa68ddefd8dbb779e3e25232a3775973d Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Remove the touch grabberPaul Olav Tvete2015-09-153-75/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not tested. Change-Id: I247d57b06b87b38a649e10cf190db49e1d59566f Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Remove the keyboard grabberPaul Olav Tvete2015-09-153-54/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I63e5764e3b0000cf84c326aca3c33e333f860d08 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Remove the mouse grabberPaul Olav Tvete2015-09-157-200/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is no longer used for move/resize, and we are going to introduce a new concept for drag and drop (which stopped working several changes ago anyway). The old drag and drop code is left commented out to assist in the new implementation. Change-Id: I18cb41d04f09d6033d1c9e666a739793fcef494b Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Remove global coordinatesJørgen Lind2015-09-1416-587/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This involves removing: - pickView and mapView from QWaylandOutput - requestedPos[X,Y] from QWaylandView Change-Id: Ie53eef434ac6ae7d0d5474f649f78a59ae857167 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
| * | | | Fix missing sending of modifiersJørgen Lind2015-09-101-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The joy of shadowing :) Change-Id: Ie693c700f1527f81991a3d5ff79f7ea22555f467 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Add an option for a QQuickWaylandItem to take focus on ClickJørgen Lind2015-09-103-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it could maybe be called automaticKeyboardFocus, but then there are edgecases like focusOnFirst show which needs to be known Change-Id: Ied3e9e7a3f51cf3e5a58ace372680bd691bdb62a Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Fix sending exposeevents on all swapbuffersJørgen Lind2015-09-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Change-Id: I2d4a5f6dd357d84df43acc0082f9621fb6609768 I extracted a call to handleExposeEvent from a if statement. I failed to see that the else condition also had an if statement. Change-Id: Ie51c5f918a4e4ddaec9e75c9c3afffa962d2bd06 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Fix % warning when using generated filesJørgen Lind2015-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib7857743140d9f2dfa5bf1ff2187af8f3e2478da Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Rename QtCompositor to QtWaylandCompositorJørgen Lind2015-09-10115-291/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable building QtWaylandCompositor by default Change-Id: I7cf34052b304ca9fef55b7e30ef6a6367b5d75f1 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Move the createDefaultSurface function to QWaylandCompositorPrivateJørgen Lind2015-09-105-25/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its really not meant to be reimplemented by other classes than QWaylandCompositor or QWaylandQuickCompositor because of the createSurface signal. If someone really wants to use the virtual function then they can subclass the private Change-Id: Iad88fde3fc999ac18bdc57bd37864884865a962a Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Remove legacy namingJørgen Lind2015-09-103-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf7fad69085b4439b7d5cc3fd1a7aa24ed9e03c3 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Fix crash in pickView()Paul Olav Tvete2015-09-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...this is why we need autotests for all functions Change-Id: I73aa6ac1777684ceac51a59884b059871c18d260 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
| * | | | Make it possible to connect to a createSurface signalJørgen Lind2015-09-0410-30/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the QWaylandSurface factory function from QWaylandCompositor. Add a default constructor to QWaylandSurface and a initialize function. Add som housekeeping code in debug builds that ensures the user calls initialize. Add a fallback factory function on the compositor if the user is fine with getting the default implementation of QWaylandSurface or QWaylandQuickSurface Change-Id: Ib9289c323b6723f0d1119a484cf9e0c26c95b549
| * | | | Add an assert in QtWaylandScanner for duplicate bindsJørgen Lind2015-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Q_SIGNALS are a one -> many distribution we can end up signalling creation requests to many slots. Its then important that we verify that only one of these actually binds an object for the object id. Its a programming error to have this situation, hence its an assert, and not a runtime check that gives a warning. The bind will overwrite the object and the last bind will continue to work as normal in release mode. Change-Id: I1f469066cf5287789249763843e6cbaa545ee619
| * | | | Cleanup QWaylandQuickCompositorExtension fileJørgen Lind2015-09-042-8/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I3f0e5a41f0bb15311bd48775be10d81548caf1e3
| * | | | Set default size if a QWindow has no geometryJørgen Lind2015-09-041-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also extract two lines out of conditional branches Change-Id: I2d4a5f6dd357d84df43acc0082f9621fb6609768
| * | | | Make sure we don't send enter events continuslyJørgen Lind2015-09-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and when we want to send leave events, then make sure we have a client, since it might have died Change-Id: I86e85a9af050872b4329e685363ea60c33001e94
| * | | | Rename primary(Output|OutputSpace) to default(Output|OutputSpace)Jørgen Lind2015-09-047-25/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: I0bbe6dd6bd8e9f6972cc88b832029ac98aa2af49
| * | | | Make it possible to discard currentBuffer of a viewJørgen Lind2015-09-043-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be convenient if there is a view which copies the currentBuffer to a cache and then wants to release the ref to the buffer Change-Id: I0b7bbb4bc22c420fdf0d1af4bb1bbf0a4f888bc8
| * | | | QWaylandOutput::outputForClient to QWaylandOutput::resourceForClientJørgen Lind2015-09-042-5/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I052286240ce986c9f5a4e897639f1e93e64d96da
| * | | | Make it possible to construct QWaylandOutputJørgen Lind2015-09-0414-145/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires QWaylandOutput to be initialized. This will happend when the QWaylandCompositor of the QWaylandOutputSpace that is set on the QWaylandOutput is created. QWaylandCompositor will send or post a Polish event to the QWaylandOutput which again will call QWaylandOutput::initialize. This function will create the global that will be put on the wl_displays registry This makes it possible to Create WaylandOutputs in QML (see the pure-qml example) and also gives a better programming model in C++ Change-Id: Iaf907ae18a283678eda6d04390dc9790ae0bced8
| * | | | Rename automaticFrameCallbacks to automaticFrameCallbackJørgen Lind2015-09-042-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and: - add a signal for when it changes - change default to true Change-Id: Ifb7d29756f554dbd2a2594c935442ba9f4956c5c
| * | | | Add missing QT_X_NAMESPACEJørgen Lind2015-09-041-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I76d82f2e0d201a9b3079ae49e88b3383530b9756
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 09:07:18 +0000