Samuel Rødal [Fri, 5 Aug 2011 10:16:54 +0000 (12:16 +0200)]
Merge remote branch 'origin/master' into refactor
Samuel Rødal [Fri, 5 Aug 2011 10:12:29 +0000 (12:12 +0200)]
Updated according to ShaderEffectItem -> ShaderEffect API changes.
Laszlo Agocs [Thu, 4 Aug 2011 12:01:37 +0000 (15:01 +0300)]
Avoid killing clients with sigpipe when transfering clipboard data.
When transfering selection data from sender to receiver, normally they
both block on the write and read. However blocking on the read when
retaining the data is sub-optimal for the compositor. Therefore it
uses non-blocking I/O (*) but this seems to introduce a chance of
having the clients terminating with SIGPIPE signal due to trying to
write when the compositor has already closed the handle and started to
retain another selection from another client. (all this caused by a
rapid succession of QClipboard::setMimeData calls)
The patch ensures that the read end of the pipe is not closed until
all data has been read, even if a newer selection gets activated
meanwhile, in which case the data (that became obsolete) is simply
ignored.
(*) The patch also enables real non-blocking I/O which was missing
for some reason, until now the compositor blocked when the first
reaady to read signal came.
Lasse Holmstedt [Fri, 29 Jul 2011 21:12:28 +0000 (23:12 +0200)]
Add root-level .pro files
So that you can build from the root. By default, examples are not
built.
Laszlo Agocs [Wed, 27 Jul 2011 09:34:09 +0000 (12:34 +0300)]
Merge branch 'master' into refactor
Conflicts:
examples/qml-compositor/qml-compositor.pro
Laszlo Agocs [Tue, 26 Jul 2011 08:55:50 +0000 (11:55 +0300)]
Fix qwidget example build with regular Qt5.
Laszlo Agocs [Tue, 26 Jul 2011 08:55:02 +0000 (11:55 +0300)]
Get rid of unnecessary focus checks for touch event sending.
Laszlo Agocs [Fri, 22 Jul 2011 12:11:44 +0000 (15:11 +0300)]
Add drag'n'drop and basic cursor support.
Oswald Buddenhagen [Thu, 21 Jul 2011 09:27:33 +0000 (11:27 +0200)]
and now: the (hopefully) correct fix
in fact, that private header comes from qtdeclarative
Oswald Buddenhagen [Thu, 21 Jul 2011 09:08:32 +0000 (11:08 +0200)]
fix build
the usage of declarative makes our code use opengl-private even without
opengl itself being used.
Oswald Buddenhagen [Wed, 20 Jul 2011 09:07:55 +0000 (11:07 +0200)]
recognize QT_WAYLAND_GL_CONFIG also as a qmake variable
unlike an environment variable set only for the time being, this
actually survives automated rebuilds of makefiles
Oswald Buddenhagen [Tue, 19 Jul 2011 12:39:19 +0000 (14:39 +0200)]
clean up the QT+= stuff in the project files
so that we don't have to inject privates from the outside.
after recent cleanups, only qtcore and qtopengl privates are necessary,
and that only in the compositor api.
Laszlo Agocs [Tue, 19 Jul 2011 12:34:21 +0000 (15:34 +0300)]
Merge branch 'master' into refactor
Conflicts:
examples/qwidget-compositor-mdi/main.cpp
src/qt-compositor/hardware_integration/mesa_egl/mesaeglintegration.cpp
src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
src/qt-compositor/qt-compositor.pri
src/qt-compositor/wayland_wrapper/wlsurface.h
Laszlo Agocs [Tue, 19 Jul 2011 11:56:22 +0000 (14:56 +0300)]
Make it compile with xcomposite_glx.
Laszlo Agocs [Tue, 19 Jul 2011 09:19:25 +0000 (12:19 +0300)]
Add missing touchEventsEnabled property to WaylandSurfaceItem.
Laszlo Agocs [Tue, 19 Jul 2011 09:06:21 +0000 (12:06 +0300)]
Fix compilation of qml example and enable touch handling.
Laszlo Agocs [Tue, 19 Jul 2011 08:45:07 +0000 (11:45 +0300)]
Add touch event support to WaylandSurfaceItem.
Martin Zielinski [Mon, 11 Jul 2011 08:05:21 +0000 (10:05 +0200)]
Reduced usage of private headers
Integration of v8 lead to a lot of v8 headers being included from
private QtDeclarative headers. As v8 headers are not installed, this
broke the compositor build. This change reduces the usage of private
headers to the minimum.
Martin Zielinski [Mon, 4 Jul 2011 07:54:42 +0000 (09:54 +0200)]
Correct authentication behavior
The authentication of clients via windowmanager-token is now
more robust. This is needed to get the app-booster usecase working
correctly.
Lasse Holmstedt [Tue, 5 Jul 2011 09:35:43 +0000 (11:35 +0200)]
Remove debug output
Lasse Holmstedt [Wed, 29 Jun 2011 09:50:38 +0000 (11:50 +0200)]
Propagate screen orientation changes through wayland
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Laszlo Agocs [Thu, 30 Jun 2011 11:48:48 +0000 (14:48 +0300)]
Add touch support to qwidget example compositor.
Laszlo Agocs [Thu, 30 Jun 2011 10:40:41 +0000 (13:40 +0300)]
Update wayland sha.
Laszlo Agocs [Thu, 30 Jun 2011 08:08:32 +0000 (11:08 +0300)]
Add touch event support.
Morten Sorvig [Wed, 29 Jun 2011 11:28:28 +0000 (13:28 +0200)]
Configure for mac.
Don't use pkgconfig. Use the raster compositor.
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
Paul Olav Tvete [Mon, 27 Jun 2011 12:20:28 +0000 (14:20 +0200)]
Fix MDI compositor after surfaceMapped API change.
Martin Zielinski [Mon, 27 Jun 2011 06:56:41 +0000 (08:56 +0200)]
Added transport of on-screen visibility to qt-compositor via wayland
qt-compositor now has the ability to inform a client of not being visible on-screen.
This is mainly used to stop rendering and processing on the client-app side if the
window is occluded by another fullscreen window.
Lasse Holmstedt [Thu, 23 Jun 2011 17:05:52 +0000 (19:05 +0200)]
Add authentication token to public api
Reviewed-by: Samuel Rødal
Samuel Rødal [Thu, 23 Jun 2011 14:39:59 +0000 (16:39 +0200)]
Make Wayland EGL integration check if the extension is available.
Prevents failing when using a software implementation of Mesa.
Laszlo Agocs [Thu, 23 Jun 2011 15:57:14 +0000 (17:57 +0200)]
Added yet another missing remove_global call.
Laszlo Agocs [Thu, 23 Jun 2011 15:18:14 +0000 (17:18 +0200)]
Avoid post_global() whenever possible.
Calling post_global() multiple times is a bad idea
after selection offers are handled as real globals.
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
Laszlo Agocs [Fri, 17 Jun 2011 07:41:55 +0000 (09:41 +0200)]
Handle selection offers as real globals.
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