Morten Sorvig [Wed, 29 Jun 2011 10:51:01 +0000 (12:51 +0200)]
Fix signal-slot connection.
surfaceMapped(QRect) -> surfaceMapped(QSize)
Morten Sorvig [Fri, 27 May 2011 06:12:13 +0000 (08:12 +0200)]
Compile on non-linux
Samuel Rødal [Thu, 23 Jun 2011 13:43:55 +0000 (15:43 +0200)]
Get Qt compositor working with wayland EGL on refactor branch.
Jørgen Lind [Thu, 23 Jun 2011 12:22:53 +0000 (14:22 +0200)]
Merge branch 'master' into refactor
Jørgen Lind [Thu, 23 Jun 2011 09:04:48 +0000 (11:04 +0200)]
Fix broken rpath
Jørgen Lind [Thu, 23 Jun 2011 08:40:45 +0000 (10:40 +0200)]
Update wayland_sha
also, make the surfaceMapped signal give a size and not rect
and use the new visual api
Samuel Rødal [Wed, 22 Jun 2011 14:44:58 +0000 (16:44 +0200)]
Merge remote branch 'origin/master' into refactor
Samuel Rødal [Wed, 22 Jun 2011 14:43:56 +0000 (16:43 +0200)]
Fix compilation with nogl config, and silence compiler warning.
Samuel Rødal [Wed, 22 Jun 2011 14:41:36 +0000 (16:41 +0200)]
We don't strictly need to be informed on each damage / destroy callback.
Martin Zielinski [Wed, 22 Jun 2011 10:12:38 +0000 (12:12 +0200)]
Prepare client-visibility transport
Added clientRenderingEnabled property to WaylandSurfaceItem. This will be used
to inform the client application whether it should render or not.
Martin Zielinski [Tue, 21 Jun 2011 14:17:08 +0000 (16:17 +0200)]
changed to dynamic lib
Martin Zielinski [Tue, 21 Jun 2011 11:29:49 +0000 (13:29 +0200)]
Call update only if the item has the ItemHasContent Flag set
Laszlo Agocs [Fri, 17 Jun 2011 12:01:55 +0000 (14:01 +0200)]
Make qml-compositor compile.
Laszlo Agocs [Thu, 16 Jun 2011 16:15:43 +0000 (18:15 +0200)]
Merge branch 'master' into refactor
Laszlo Agocs [Thu, 16 Jun 2011 16:10:57 +0000 (18:10 +0200)]
Use QGuiGLContext properly and avoid crash.
Laszlo Agocs [Thu, 16 Jun 2011 16:07:49 +0000 (18:07 +0200)]
Make the qwidget example compositor compile with qtbase refactor.
Laszlo Agocs [Thu, 16 Jun 2011 16:05:41 +0000 (18:05 +0200)]
Added a few notes to the mdi example compositor regarding GL.
Martin Zielinski [Wed, 8 Jun 2011 14:02:45 +0000 (16:02 +0200)]
enable alpha-channel for wayland-windows
Laszlo Agocs [Fri, 10 Jun 2011 12:39:59 +0000 (14:39 +0200)]
Make it compile after QWindowContext refactor.
Also, avoid some mess caused by X headers by including guiapp
header earlier.
Paul Olav Tvete [Fri, 10 Jun 2011 10:42:36 +0000 (12:42 +0200)]
Handle surfaces with alpha channel in xcomposite_egl
Samuel Rødal [Fri, 3 Jun 2011 13:09:32 +0000 (15:09 +0200)]
Default to non-inverted Y in xcomposite EGL integration.
Martin Zielinski [Tue, 31 May 2011 07:28:40 +0000 (09:28 +0200)]
pro-file for staticlib build of qt-compositor
Samuel Rødal [Thu, 26 May 2011 11:56:24 +0000 (13:56 +0200)]
Made qwidget-compositor-mdi work with refactored Qt 5.
Lasse Holmstedt [Wed, 25 May 2011 10:55:26 +0000 (12:55 +0200)]
Add authentication token support for wayland windos
For compositors that support it, the wayland clients can associate themselves
with an auth token which is transmitted by the windowmanager protocol
extension.
Reviewed-by: Samuel Rødal
Samuel Rødal [Wed, 25 May 2011 10:41:29 +0000 (12:41 +0200)]
Added default background.jpg for qml compositor.
Used the one from demos/embeddeddialogs in Qt.
Samuel Rødal [Fri, 20 May 2011 08:42:21 +0000 (10:42 +0200)]
Added some options to customize the wayland server socket.
Samuel Rødal [Fri, 20 May 2011 07:59:52 +0000 (09:59 +0200)]
Add a .qrc file in qml-compositor so it can be run from anywhere.
Samuel Rødal [Thu, 19 May 2011 17:04:17 +0000 (19:04 +0200)]
Prevent qmake warnings when not building against Qt 5.
Samuel Rødal [Fri, 20 May 2011 07:33:06 +0000 (09:33 +0200)]
Don't create a hardware integration if the compositor is raster based.
Corentin Chary [Fri, 20 May 2011 07:46:04 +0000 (09:46 +0200)]
examples: new qwidget-compositor-mdi
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Merge-request: 3
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Corentin Chary [Fri, 20 May 2011 07:46:04 +0000 (09:46 +0200)]
qt-compositor/wayland_wrapper: wayland do not set buffer->compositor anymore
This is only a temporary workaround since wl_buffer::compositor field
will be removed soon.
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Merge-request: 3
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Corentin Chary [Fri, 20 May 2011 07:46:04 +0000 (09:46 +0200)]
qt-compositor: frameFinished() is a per-surface thing
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Merge-request: 3
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Samuel Rødal [Thu, 19 May 2011 17:04:17 +0000 (19:04 +0200)]
Prevent qmake warnings when not building against Qt 5.
Lasse Holmstedt [Thu, 19 May 2011 10:21:53 +0000 (12:21 +0200)]
Window manager extension for wayland
maps clients to process id's so that each surface will have
a PID associated to it.
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Corentin Chary [Thu, 19 May 2011 08:14:25 +0000 (10:14 +0200)]
qt-compositor: fix build with QT_WAYLAND_GL_CONFIG=nogl
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Merge-request: 2
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Corentin Chary [Thu, 19 May 2011 08:14:25 +0000 (10:14 +0200)]
examples/qwidget-compositor: don't use GL if disabled
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Merge-request: 2
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Laszlo Agocs [Mon, 16 May 2011 08:03:21 +0000 (10:03 +0200)]
Add an optional retained selection mode to the compositor.
Enabling this feature will cause the server to retrieve all data
for all mime types as soon as a selection is activated. This data
is then used as a backup, to keep the selection and the offer
working even after the app holding the current selection exits.
Reviewed-by: Samuel Rødal
Jørgen Lind [Thu, 12 May 2011 13:27:14 +0000 (15:27 +0200)]
Bug, we didn't support multiple attaches
Samuel Rødal [Thu, 12 May 2011 08:49:10 +0000 (10:49 +0200)]
Fixed missing texture updates.
Make sure we get a new texture id, so that
QSGSimpleTextureNode::setTexture() doesn't return early.
Paul Olav Tvete [Wed, 11 May 2011 12:14:44 +0000 (14:14 +0200)]
Remove Wayland copy, now that we have wayland_sha1.txt
Laszlo Agocs [Wed, 11 May 2011 12:00:38 +0000 (14:00 +0200)]
Updated known-good wayland sha.
Laszlo Agocs [Wed, 11 May 2011 11:57:33 +0000 (13:57 +0200)]
Fix build break caused by wayland master changes.
Jørgen Lind [Tue, 10 May 2011 13:51:03 +0000 (15:51 +0200)]
Fix support for making compositors in different directory
Laszlo Agocs [Fri, 6 May 2011 16:37:10 +0000 (18:37 +0200)]
Added clipboard support.
Samuel Rødal [Mon, 9 May 2011 07:25:23 +0000 (09:25 +0200)]
Changed the API for hiding a surface from setHidden to setPaintEnabled.
This makes it more explicit that setHidden() isn't just the inverse of
setVisible(), but also still handles mouse events.
Samuel Rødal [Fri, 6 May 2011 12:57:40 +0000 (14:57 +0200)]
Add new hidden property in WaylandSurfaceItem to control visibility.
This lets us control visibility while still having the mouse events
working. We usually want to hide the surface item if it has a shader
effect item modifying its appearance (since otherwise both the source
and the shader effect items are shown, blended on top of each other).
Jørgen Lind [Sun, 8 May 2011 15:43:23 +0000 (17:43 +0200)]
Add default value to inverted y on glx
This because glx can just ignore the query, and just pass the value
back.
Jørgen Lind [Fri, 6 May 2011 11:50:14 +0000 (13:50 +0200)]
We still support not having custome shaders
Jørgen Lind [Fri, 6 May 2011 11:26:51 +0000 (13:26 +0200)]
Implement invertedY in the glx backend
Also change flipped to be true as default for texture buffers
Jørgen Lind [Fri, 6 May 2011 10:19:18 +0000 (12:19 +0200)]
Make the shadereffect respect the flip property
Jørgen Lind [Fri, 6 May 2011 08:30:15 +0000 (10:30 +0200)]
Add invertedY flag for surface
Jørgen Lind [Thu, 5 May 2011 09:16:14 +0000 (11:16 +0200)]
Make qmal compositor resize
Jørgen Lind [Thu, 5 May 2011 09:15:35 +0000 (11:15 +0200)]
Compilefix
Jørgen Lind [Tue, 3 May 2011 15:45:22 +0000 (17:45 +0200)]
QT_COMPOSITOR_WAYLAND_GL defines in wlsurface
Jørgen Lind [Tue, 3 May 2011 11:04:17 +0000 (13:04 +0200)]
Added textfile showing what sha1 in wayland we have tested against
Jørgen Lind [Tue, 3 May 2011 10:59:50 +0000 (12:59 +0200)]
Remove warnings
Jørgen Lind [Tue, 3 May 2011 10:44:43 +0000 (12:44 +0200)]
Jørgen Lind [Tue, 3 May 2011 06:59:38 +0000 (08:59 +0200)]
Updated the xcomposite extension
Jørgen Lind [Fri, 29 Apr 2011 05:52:30 +0000 (07:52 +0200)]
Follow Wayland API Changes
Paul Olav Tvete [Thu, 28 Apr 2011 13:11:29 +0000 (15:11 +0200)]
Support for direct rendering (non-composited mode)
Experimental.
Gunnar Sletta [Tue, 26 Apr 2011 09:54:05 +0000 (11:54 +0200)]
The texture node already flips, so we need to flip again
Samuel Rødal [Tue, 19 Apr 2011 13:59:39 +0000 (15:59 +0200)]
Prevent flipped rendering in QML compositor.
Jørgen Lind [Tue, 19 Apr 2011 07:03:33 +0000 (09:03 +0200)]
Dont use accept4 && SOCK_CLOEXEC
Paul Olav Tvete [Mon, 18 Apr 2011 11:23:41 +0000 (13:23 +0200)]
Avoid crash when texture changes.
Now that we delete and re-create the texture in surfaceDamaged(), we have
to tell the node about the texture each time, and not only at creation.
Gunnar Sletta [Fri, 15 Apr 2011 14:16:59 +0000 (16:16 +0200)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt-compositor/mainline
Gunnar Sletta [Fri, 15 Apr 2011 14:15:56 +0000 (16:15 +0200)]
Make compositor work with scenegraph items again
Jørgen Lind [Fri, 15 Apr 2011 11:38:03 +0000 (13:38 +0200)]
Fix missing X11 dependency
Gunnar Sletta [Fri, 15 Apr 2011 05:12:56 +0000 (07:12 +0200)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt-compositor/mainline
Gunnar Sletta [Thu, 14 Apr 2011 13:00:48 +0000 (15:00 +0200)]
Update to the new texture API in scenegraph
Gunnar Sletta [Thu, 14 Apr 2011 12:49:06 +0000 (14:49 +0200)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt-compositor/mainline
Gunnar Sletta [Thu, 14 Apr 2011 12:33:45 +0000 (14:33 +0200)]
Set the correct filtering when the texture is used as a shader source
Gunnar Sletta [Thu, 14 Apr 2011 12:18:35 +0000 (14:18 +0200)]
No more source rect in the texture item
Gunnar Sletta [Thu, 14 Apr 2011 12:18:20 +0000 (14:18 +0200)]
work
Gunnar Sletta [Thu, 14 Apr 2011 11:24:27 +0000 (13:24 +0200)]
Use pixel coordinates
Jørgen Lind [Thu, 14 Apr 2011 08:04:50 +0000 (10:04 +0200)]
Updating src/3rdparty/wayland to head of Wayland master
In git://anongit.freedesktop.org/wayland/wayland its sha
f04e05ad76cd6af890b7b741a9e0f5181bd0ac10
Jørgen Lind [Thu, 14 Apr 2011 06:57:36 +0000 (08:57 +0200)]
Make Qt-Compositor conform to Wayland api changes
Frame callback needs a surface
Gunnar Sletta [Wed, 13 Apr 2011 21:11:04 +0000 (23:11 +0200)]
Compile after scene graph changes
Jørgen Lind [Mon, 11 Apr 2011 14:21:45 +0000 (16:21 +0200)]
Adjust the README
Jørgen Lind [Mon, 11 Apr 2011 13:41:57 +0000 (15:41 +0200)]
Update readme with mac specifics
Jørgen Lind [Mon, 11 Apr 2011 13:37:36 +0000 (15:37 +0200)]
Make it possible to build Qt-Compositor without gl support
even when Qt is built with QtOpenGL
Jørgen Lind [Mon, 11 Apr 2011 12:50:47 +0000 (14:50 +0200)]
Add a custom rule for hardware_integration
This enables the compositor pro file to include another pri file which
implements the hardware integration
Jørgen Lind [Mon, 11 Apr 2011 12:00:15 +0000 (14:00 +0200)]
Make Qt-Compositor build the xcomposite backend as default
when Qt is built with opengl. Other plugins can be set by defining the
environment variable: QT_WAYLAND_GL_CONFIG
Samuel Rødal [Fri, 8 Apr 2011 11:05:03 +0000 (13:05 +0200)]
Prevent accessing destroyed WaylandSurface in WaylandSurfaceItem.
Jørgen Lind [Thu, 7 Apr 2011 16:05:02 +0000 (18:05 +0200)]
Add the egl xcomposite extension
Harald Fernengel [Wed, 6 Apr 2011 12:13:11 +0000 (14:13 +0200)]
add missing \n in debug output
Jørgen Lind [Wed, 6 Apr 2011 10:55:29 +0000 (12:55 +0200)]
Remove glesv2 pkg-config config. We should pick this up
with QtOpenGL
Jørgen Lind [Wed, 6 Apr 2011 10:54:52 +0000 (12:54 +0200)]
Harald Fernengel [Wed, 6 Apr 2011 10:53:58 +0000 (12:53 +0200)]
Set the rpath
Wayland is currently instaled in non-standard dirs, so set the rpath if
the system supports rpath.
Reviewed-By: Jørgen Lind
Jørgen Lind [Wed, 6 Apr 2011 08:10:12 +0000 (10:10 +0200)]
Add XComposite extension to wayland
Samuel Rødal [Tue, 5 Apr 2011 13:57:44 +0000 (15:57 +0200)]
Update according to latest changes to QSGTextureProvider.
Samuel Rødal [Tue, 5 Apr 2011 13:48:15 +0000 (15:48 +0200)]
Do a delayed map in Wayland::Surface if needed.
Samuel Rødal [Tue, 5 Apr 2011 08:12:00 +0000 (10:12 +0200)]
Don't emit mapped until the surface is actually mapped.
Buffers might be attached without the surface ever being mapped.
Paul Olav Tvete [Fri, 1 Apr 2011 15:10:46 +0000 (17:10 +0200)]
Make it possible to create WaylandSurfaceItem from QML
Rev-by: Samuel
Samuel Rødal [Fri, 1 Apr 2011 12:07:54 +0000 (14:07 +0200)]
Properly handle surface resizes in QML compositor.
Samuel Rødal [Fri, 1 Apr 2011 11:41:33 +0000 (13:41 +0200)]
Some tweaks to WaylandSurfaceItem API.
Send mouse events regardless of focus.
Samuel Rødal [Fri, 1 Apr 2011 11:39:01 +0000 (13:39 +0200)]
Remove debugging from compositor_api.pri
Samuel Rødal [Fri, 1 Apr 2011 11:28:39 +0000 (13:28 +0200)]
Move WaylandSurfaceItem into common API.
Samuel Rødal [Fri, 1 Apr 2011 08:26:26 +0000 (10:26 +0200)]
Use QSGPlainTexture::setImage() instead of generating our own texture.
Takes care of swizzling based on whether we're on GL ES or not.
Samuel Rødal [Thu, 31 Mar 2011 15:01:20 +0000 (17:01 +0200)]
Update compositor to reflect latest changes in qtquick2.
Jørgen Lind [Thu, 24 Mar 2011 14:34:21 +0000 (15:34 +0100)]
qwidget-compositor:Make raster default