profile/ivi/qtwayland.git
12 years agoRemove the dri2_xcb hardware integration
Jørgen Lind [Mon, 12 Dec 2011 14:07:01 +0000 (15:07 +0100)]
Remove the dri2_xcb hardware integration

EGL has bind_display instead

Change-Id: I643f06e7412bae9513d8b30eef655cd0a60cb57d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMake xcomposite-egl work without widgets
Jørgen Lind [Mon, 12 Dec 2011 14:08:20 +0000 (15:08 +0100)]
Make xcomposite-egl work without widgets

Change-Id: Ie9bfd6ca1a36650864ca8af70c25beb1baa5ac43
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoRemove usage of deprecated class QSGEngine
Andy Nichols [Mon, 12 Dec 2011 13:25:00 +0000 (14:25 +0100)]
Remove usage of deprecated class QSGEngine

Replaced by direct calls in QQuickCanvas to createTextureFromId
and createTextureFromImage.

Change-Id: I8aad61f9c48ccd5c6ca703b32df9c2c5fb199f1c
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoImplement shell_surface
Jørgen Lind [Mon, 12 Dec 2011 09:22:54 +0000 (10:22 +0100)]
Implement shell_surface

shell_surface is the compositors view of surfaces while wl_surface is
the clients view of the surface

Change-Id: Ic84eda94ac03960ab566cfc569a103c2b6ad1d44
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoDestroy callback objects in the sync callback on client-side.
Laszlo Agocs [Sun, 11 Dec 2011 18:31:58 +0000 (20:31 +0200)]
Destroy callback objects in the sync callback on client-side.

Previously these were leaked, resulting in obscure "server sent live
delete_id" messages sometimes (esp. with selection offers).

Change-Id: Ida07b5c206ed8a8e4f68f9a8b651a176c45101ff
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoAvoid showing incorrect warning when changing the data source.
Laszlo Agocs [Sun, 11 Dec 2011 17:22:58 +0000 (19:22 +0200)]
Avoid showing incorrect warning when changing the data source.

Also fix a typo.

Change-Id: Ic4a059edc3b3bcbbf5acd318e3ba05fad45190eb
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoRegister a touch device in the Wayland plug-in.
Laszlo Agocs [Thu, 8 Dec 2011 12:42:54 +0000 (14:42 +0200)]
Register a touch device in the Wayland plug-in.

This makes the plug-in compatible with the recent QTouchEvent changes
in qtbase.

Change-Id: I30891ef945dbb2f5863b0a1a097056c5586ac160
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoMade a global directory, and moved the export header there...
Jørgen Lind [Wed, 7 Dec 2011 20:30:35 +0000 (21:30 +0100)]
Made a global directory, and moved the export header there...

I'm not sure if the header file name is what we want, but will do for
now.

Change-Id: Ief7f006b0f59b53295e6a11c222d8c459a80683d
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
12 years agoRemove unused header
Jørgen Lind [Wed, 7 Dec 2011 20:28:29 +0000 (21:28 +0100)]
Remove unused header

Change-Id: I54c0840a5b6f198ca9619d6888e506daa4b66df8
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
12 years agoRemove dependency on libQtWidgets and libQtOpenGL
Gunnar Sletta [Tue, 6 Dec 2011 11:48:00 +0000 (12:48 +0100)]
Remove dependency on libQtWidgets and libQtOpenGL

Change-Id: I15ec75922d476080283e1c9759ed49e63a871b1f
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
12 years agoMake qwindow-compositor work without opengl module dependency.
Laszlo Agocs [Wed, 7 Dec 2011 09:31:32 +0000 (11:31 +0200)]
Make qwindow-compositor work without opengl module dependency.

Change-Id: Icb05b076b46dfbf36154343083bd332a4d9a7468
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoI removed the qwidget-compositor-mdi.pro
Jørgen Lind [Wed, 7 Dec 2011 09:22:12 +0000 (10:22 +0100)]
I removed the qwidget-compositor-mdi.pro

I cant revert the patch, so I just have to add it.

Change-Id: I05531ca973ada7043f39c46faccc35ffd6800bf9
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoAdd comments to example pro file to explain how to include pri
Jørgen Lind [Wed, 7 Dec 2011 09:01:39 +0000 (10:01 +0100)]
Add comments to example pro file to explain how to include pri

Change-Id: Ic5cb0aff2bf70158905a8d6c4487670ce76c9355
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoResolve the gl and egl extensions before we use them
Jørgen Lind [Wed, 30 Nov 2011 10:10:59 +0000 (11:10 +0100)]
Resolve the gl and egl extensions before we use them

Change-Id: Iafe68f71807cc8aa8964444adccb25128c597514
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoMake wayland actually a module
Jørgen Lind [Mon, 5 Dec 2011 16:09:02 +0000 (17:09 +0100)]
Make wayland actually a module

Also fix so that QtCompositor can be built as shared object.

+ fix so that the default QT_WAYLAND_GL_CONFIG is wayland_egl

Change-Id: I02b72e99286584426bd37ab2d00bbc84af11efdc
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoAdd a exportglobal file since we cant use qglobal.h anymore
Jørgen Lind [Tue, 6 Dec 2011 18:06:36 +0000 (19:06 +0100)]
Add a exportglobal file since we cant use qglobal.h anymore

Change-Id: I993132278bb26467a13199afbb9b4aecfe0da7fa
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoDirect rendering changes
Paul Olav Tvete [Mon, 5 Dec 2011 16:31:30 +0000 (17:31 +0100)]
Direct rendering changes

Change-Id: Ie3bebae680e370d5351279a988945c6a5d65ed75
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoRemove the input device resource from wayland's list upon destruction.
Laszlo Agocs [Tue, 6 Dec 2011 10:43:32 +0000 (12:43 +0200)]
Remove the input device resource from wayland's list upon destruction.

Otherwise exiting and starting new apps would sooner or later end
in a compositor crash due to dangling pointers in
input_device->resource_list.

Change-Id: I85ec0f2ffcdc014bf8d714b95772a4d7250d0be5
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoAvoid qt-compositor crash with data devices.
Laszlo Agocs [Tue, 6 Dec 2011 10:31:40 +0000 (12:31 +0200)]
Avoid qt-compositor crash with data devices.

The datadevice list must be cleared on a resource_destroy, otherwise
a subsequent datadevice request will end up finding and accessing
already freed pointers.

Change-Id: Iae7b87d0910d2e3278f8c79fbb7b5aacfbe6ade7
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFix data source resource destruction in qt-compositor.
Laszlo Agocs [Tue, 6 Dec 2011 10:21:05 +0000 (12:21 +0200)]
Fix data source resource destruction in qt-compositor.

Change-Id: Ieb7551c6d85979b5e6bb07927abeaabcf2466c20
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFix wm object resource destruction in qt-compositor.
Laszlo Agocs [Tue, 6 Dec 2011 10:15:52 +0000 (12:15 +0200)]
Fix wm object resource destruction in qt-compositor.

There was no destroy_resource callback which is very bad because
this meant the list containg the resource was not maintained properly.

Also remove a meaningless loop.

Change-Id: Ib82a6b76581061149130bb3322813f9a1716561f
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFix non-responsiveness issue with threaded GL
Paul Olav Tvete [Wed, 30 Nov 2011 12:38:25 +0000 (13:38 +0100)]
Fix non-responsiveness issue with threaded GL

Use our experimental patch for Wayland to make sure
that we always deliver requests made by other threads.
Previously, if wl_surface_damage() was called from a
thread other than the main thread, it would be blocked
until the main thread returned from select() for some
other reason.

Change-Id: I65fd6481c51b93f924c1706aa70cb328fd24c6e0
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoOur patches to Wayland
Paul Olav Tvete [Thu, 1 Dec 2011 08:24:55 +0000 (09:24 +0100)]
Our patches to Wayland

Change-Id: I342ccda193cbfb809e9011aeb4a87a4ed94d7d52
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoMake it possible to run qwindow-compositor in non-fullscreen.
Laszlo Agocs [Tue, 6 Dec 2011 10:12:09 +0000 (12:12 +0200)]
Make it possible to run qwindow-compositor in non-fullscreen.

Also remove some leftovers from the pro file.

Change-Id: Ic4f461054855d7e5b9ea907818f2c58565f6ea3b
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
12 years agoDirect rendering fixes
Paul Olav Tvete [Wed, 30 Nov 2011 14:59:54 +0000 (15:59 +0100)]
Direct rendering fixes

Make sure that we release the right buffer at the right time.

Change-Id: I181f92ad3eb27fda43a616dcf26aa611e144a2f1
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFix xcomposite-glx backend, avoid crashes in frame callback and touch
Laszlo Agocs [Wed, 30 Nov 2011 15:39:38 +0000 (17:39 +0200)]
Fix xcomposite-glx backend, avoid crashes in frame callback and touch

Change-Id: Id66dcc76d73eef7242b69cbbc488485db4daa648
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoRemove file that I never committed
Jørgen Lind [Wed, 30 Nov 2011 14:20:46 +0000 (15:20 +0100)]
Remove file that I never committed

Change-Id: Ia35fc2ebca8b5f00a7f108755e3c74d3cca917a4
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoUse correct include syntax for waylandobject.h
Andy Nichols [Wed, 30 Nov 2011 12:17:08 +0000 (13:17 +0100)]
Use correct include syntax for waylandobject.h

Change-Id: I10c5cd74e923f66cdfffda4ec996382484815d20
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoDisable not-yet-supported drag and drop code
Andy Nichols [Tue, 29 Nov 2011 15:06:52 +0000 (16:06 +0100)]
Disable not-yet-supported drag and drop code

Change-Id: Ica70987fe75f751aee6163322903b6545e9d8e8b
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoupdate window mamager protocol
Jørgen Lind [Tue, 29 Nov 2011 09:17:11 +0000 (10:17 +0100)]
update window mamager protocol

Change-Id: I29e70f26dbdf71e54c69b2e49342fa51928945d9
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoAdded data objects
Jørgen Lind [Mon, 31 Oct 2011 07:42:58 +0000 (08:42 +0100)]
Added data objects

ie. new clipboard and dnd protocol

Change-Id: I0ebdc6dc2972b6cb1dc882cd6b6f4ddde2621186
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoUpdated to head of Wayland, but did not fix clipboard or dnd
Jørgen Lind [Mon, 31 Oct 2011 07:41:18 +0000 (08:41 +0100)]
Updated to head of Wayland, but did not fix clipboard or dnd

Change-Id: I9f4d4101947b2cc64b52eed070d3a37c00ab07da
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoupdate sha
Jørgen Lind [Mon, 28 Nov 2011 09:06:55 +0000 (10:06 +0100)]
update sha

Change-Id: If17fdd64fa49fdc8f717cd638d7c09d951d93c4e
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoFix Wayland touch position mapping on client side.
Laszlo Agocs [Sun, 27 Nov 2011 16:34:23 +0000 (18:34 +0200)]
Fix Wayland touch position mapping on client side.

The previous solution was more or less working but was inaccurate and
an overkill. What we need here is a simple call to mapToGlobal().

Change-Id: Ice90aee608c2a3b0091911d5527157f1c70e9235
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoqwindow-compositor: Do a render on expose.
Laszlo Agocs [Fri, 25 Nov 2011 14:48:12 +0000 (16:48 +0200)]
qwindow-compositor: Do a render on expose.

Change-Id: Ic2941a389de6f8aeaf74a86ce09ecf4616b390cc
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoClear property cache when window is destroyed
Lasse Holmstedt [Mon, 21 Nov 2011 12:06:18 +0000 (13:06 +0100)]
Clear property cache when window is destroyed

Change-Id: Icf2d949ebb517d010c34dbb9e040fb833eff1fc3
Reviewed-by: Martin Zielinski <martin.zielinski@nokia.com>
12 years agoFlush window property changes also with EGL surfaces
Lasse Holmstedt [Mon, 21 Nov 2011 12:06:04 +0000 (13:06 +0100)]
Flush window property changes also with EGL surfaces

Change-Id: I57924c75ab22f259de70e97731439a74bc3ec9e7
Reviewed-by: Martin Zielinski <martin.zielinski@nokia.com>
12 years agoGet rid of QOpenGLContext dependency in WaylandCompositor constructor.
Samuel Rødal [Tue, 1 Nov 2011 07:56:47 +0000 (08:56 +0100)]
Get rid of QOpenGLContext dependency in WaylandCompositor constructor.

Now WaylandSurface::texture() takes a QOpenGLContext * instead. This
prevents a crash in qml-compositor against wayland_egl, since the
context was 0 (it's created behind the scenes by scene graph at a
later point).

Change-Id: Ia02f596922ad0edea602dfe12b411ec827d47669
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoAdd missing QWindow include
Kent Hansen [Mon, 31 Oct 2011 11:57:26 +0000 (12:57 +0100)]
Add missing QWindow include

Fix compile error ("waylandeglintegration.cpp:84:27: error: "
"invalid use of incomplete type 'struct QWindow'")

Change-Id: Ic87ee8a6fe67329d0e1e9a4a96fda05952093f8f
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoEnable selections to be offered directly from the compositor.
Laszlo Agocs [Fri, 28 Oct 2011 08:38:29 +0000 (11:38 +0300)]
Enable selections to be offered directly from the compositor.

The new function QWaylandCompositor::overrideSelection() allows
implementing clipboard functionality between the compositor and the
clients. This becomes important when the compositor process has UI
running in it because that implies offering and receiving selection
data not just between the clients but also between the compositor
(acting as a client in this respect) and clients.

Change-Id: I15575101bbef3edd71e23b7fe1f898e5803b37c6
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFixed Wayland-Client QPA plugin to work correctly for wayland_egl
Martin Zielinski [Wed, 26 Oct 2011 11:55:17 +0000 (13:55 +0200)]
Fixed Wayland-Client QPA plugin to work correctly for wayland_egl

Change-Id: I2b65b13b43e14aa173a083309cf30fb28f692a28
Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com>
12 years agoRename QSG* to QQuick* in qtwayland module
Andy Nichols [Wed, 26 Oct 2011 10:48:01 +0000 (12:48 +0200)]
Rename QSG* to QQuick* in qtwayland module

Change-Id: I6029550cb9a892795d0db9aafea59801a1de3c68
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoInclude QWindow header in qt-compositor.
Laszlo Agocs [Tue, 25 Oct 2011 11:29:28 +0000 (14:29 +0300)]
Include QWindow header in qt-compositor.

With recent Qt the compiler complains about undefined QWindow class,
so include the corresponding header.

Change-Id: Ie176431e67554110a2fab519c3cc56416200f0a9
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd basic key, mouse, touch event support to qwindow-compositor.
Laszlo Agocs [Mon, 24 Oct 2011 08:38:59 +0000 (11:38 +0300)]
Add basic key, mouse, touch event support to qwindow-compositor.

This brings the capabilities of this compact and lean compositor
example up to the level of the old qwidget-based one.

Change-Id: I58eae567e64e1f06432d23bd7d24579efb36eb84
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoDo not leak textures in qwindow-compositor.
Laszlo Agocs [Mon, 24 Oct 2011 08:28:36 +0000 (11:28 +0300)]
Do not leak textures in qwindow-compositor.

When drawing images coming via SHM the OpenGL texture was never
deleted, causing a leak of a texture on every update.

Change-Id: Ic40198a5a8369a273c046a186a82d69597ea5c0c
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix mirrored Y coordinates in qwindow-compositor.
Laszlo Agocs [Mon, 24 Oct 2011 07:48:20 +0000 (10:48 +0300)]
Fix mirrored Y coordinates in qwindow-compositor.

Change-Id: I432aa2fdf231301fda99b68e863ecc964c550781
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAvoid qwindow-compositor crash on startup due to missing background.
Laszlo Agocs [Mon, 24 Oct 2011 06:20:41 +0000 (09:20 +0300)]
Avoid qwindow-compositor crash on startup due to missing background.

Include background.jpg as a resource. This way it will be found
always.

Change-Id: I859a01b97fc81b704f8c632aab546b4b9905c375
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMake it compile with pkg-config.
Laszlo Agocs [Mon, 24 Oct 2011 05:40:12 +0000 (08:40 +0300)]
Make it compile with pkg-config.

The handcrafted handling of use_pkgconfig does not really work
so leave it to qmake and use PKGCONFIG instead.

Change-Id: I893c9c859c9b38e0affcb02981c001622698c1ff
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoGenerate touch events with a slightly larger area.
Laszlo Agocs [Thu, 20 Oct 2011 14:27:33 +0000 (17:27 +0300)]
Generate touch events with a slightly larger area.

The original size of (1, 1) is not really suitable for applications
like the fingerpaint example app. As there is no area coming
through the protocol we just use a rectangle of size (8, 8) for now.

Change-Id: If3d0c603e8f43310ee37038197afb16a270ebc84
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoAdd a very basic fallback for client-side key handling without xkb.
Laszlo Agocs [Wed, 12 Oct 2011 09:03:44 +0000 (12:03 +0300)]
Add a very basic fallback for client-side key handling without xkb.

Change-Id: I06096005ec1f50b2c0478becc623677e95a40e11
Reviewed-on: http://codereview.qt-project.org/6507
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemove FUD comments from setTouchEventsEnabled.
Laszlo Agocs [Wed, 12 Oct 2011 09:02:04 +0000 (12:02 +0300)]
Remove FUD comments from setTouchEventsEnabled.

Change-Id: Ieaee0ecb87197b03ba116700686fe3f8ad4f546c
Reviewed-on: http://codereview.qt-project.org/6506
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoUpdate to new QScreen orientation API.
Samuel Rødal [Thu, 6 Oct 2011 10:01:33 +0000 (12:01 +0200)]
Update to new QScreen orientation API.

Change-Id: I375e7fdf0db1f1817c3e1bfea0b652cfc72ac854
Reviewed-on: http://codereview.qt-project.org/6307
Sanity-Review: Paul Olav Tvete <paul.tvete@nokia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoFixed compile error (the old Status #define).
Samuel Rødal [Thu, 6 Oct 2011 08:24:05 +0000 (10:24 +0200)]
Fixed compile error (the old Status #define).

Change-Id: I650085e7e95c8b561e2e114937576e032cffb383
Reviewed-on: http://codereview.qt-project.org/6221
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

12 years agoSome small improvements to qwindow-compositor.
Samuel Rødal [Thu, 6 Oct 2011 09:45:49 +0000 (11:45 +0200)]
Some small improvements to qwindow-compositor.

Change-Id: I497def3e500116d3cc2850e4cc4e3ea4055de6cb
Reviewed-on: http://codereview.qt-project.org/6222
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

12 years agoBe nice to implementations in wayland_egl backend.
Samuel Rødal [Thu, 6 Oct 2011 09:46:23 +0000 (11:46 +0200)]
Be nice to implementations in wayland_egl backend.

Set the texture filtering modes so the implementation doesn't have to.

Change-Id: I5515d61b7a04a9b242039012fc66d26dce7737ec
Reviewed-on: http://codereview.qt-project.org/6223
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>

12 years agoRename qt-compositor.pro -> qtwayland.pro
Rohan McGovern [Wed, 28 Sep 2011 23:42:22 +0000 (09:42 +1000)]
Rename qt-compositor.pro -> qtwayland.pro

Follow the typical qmake naming scheme of <directoryname>.pro.

Change-Id: I4dce85d1f64a9385079a675dfc1e8e1f31483a15
Reviewed-on: http://codereview.qt-project.org/5760
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoUse the new page flipping API
Paul Olav Tvete [Thu, 22 Sep 2011 13:48:47 +0000 (15:48 +0200)]
Use the new page flipping API

Change-Id: I99bdbcef9395747ccd550e693bc6b84eccc54a40
Reviewed-on: http://codereview.qt-project.org/5392
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoSet the correct buffer pointer (protected member variables are evil).
Samuel Rødal [Tue, 13 Sep 2011 20:59:54 +0000 (22:59 +0200)]
Set the correct buffer pointer (protected member variables are evil).

Change-Id: I6cdd64fbee5a9b46b44d8fadfc0f443dd1f4b140
Reviewed-on: http://codereview.qt-project.org/4862
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-on: http://codereview.qt-project.org/5380
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoFixed XComposite hardware integration in wayland plugin.
Samuel Rødal [Wed, 14 Sep 2011 12:10:05 +0000 (14:10 +0200)]
Fixed XComposite hardware integration in wayland plugin.

We should set both the pixmap and window bits for XComposite to work on
a stricter EGL / GLX implementation.

Change-Id: Ie1be44ebcc68fed87f48c74dffd887ffae1189d5
Reviewed-on: http://codereview.qt-project.org/4893
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Reviewed-on: http://codereview.qt-project.org/5381

12 years agoAdd missing license headers.
Jason McDonald [Thu, 8 Sep 2011 01:44:29 +0000 (11:44 +1000)]
Add missing license headers.

Change-Id: I3ea0028dbf712b569ca00646098a729d3ac40717
Reviewed-on: http://codereview.qt-project.org/4379
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lasse Holmstedt
Reviewed-on: http://codereview.qt-project.org/5069
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoUse QPlaftormInputContextFactory to load input context in Wayland plugin
Joona Petrell [Tue, 13 Sep 2011 08:32:41 +0000 (11:32 +0300)]
Use QPlaftormInputContextFactory to load input context in Wayland plugin

Change-Id: Icd1d934463b550f0fcdf7d58df7c4fd1acb77ad8
Reviewed-on: http://codereview.qt-project.org/4740
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-on: http://codereview.qt-project.org/5068
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoFixed qml-compositor failing on XComposite EGL / GLX.
Samuel Rødal [Wed, 14 Sep 2011 15:56:50 +0000 (17:56 +0200)]
Fixed qml-compositor failing on XComposite EGL / GLX.

We also need to make sure that the QWindow has actually been created at
this point, before creating a child window to be used as the fake root
for composited windows.

12 years agoDon't call glDeleteTextures() when texture_id is 0.
Samuel Rødal [Wed, 14 Sep 2011 13:55:05 +0000 (15:55 +0200)]
Don't call glDeleteTextures() when texture_id is 0.

12 years agoFixed XComposite hardware integration.
Samuel Rødal [Wed, 14 Sep 2011 11:48:33 +0000 (13:48 +0200)]
Fixed XComposite hardware integration.

The root window needs to actually be mapped in order for
XCompositeNameWindowPixmap to work.

Also make sure to set both the window and pixmap bits in case we're on a
stricter EGL / GLX implementation.

12 years agoDisabled DESTDIR for the wayland platform
Andy Nichols [Tue, 13 Sep 2011 14:45:49 +0000 (16:45 +0200)]
Disabled DESTDIR for the wayland platform

This enables make install to work correctly.  This should be fixed when
this is moved into the QtWayland module.

12 years agoBuild fix
Lasse Holmstedt [Tue, 13 Sep 2011 11:59:59 +0000 (13:59 +0200)]
Build fix

12 years agoCleaned up project files
Andy Nichols [Tue, 13 Sep 2011 11:37:18 +0000 (13:37 +0200)]
Cleaned up project files

Removed references to Widgets module that is not needed anymore.  Also
make qml-compositor deployable with make install.

12 years agoMerge branch 'refactor'
Paul Olav Tvete [Tue, 13 Sep 2011 11:03:01 +0000 (13:03 +0200)]
Merge branch 'refactor'

12 years agoMerge branch 'refactor'
Gunnar Sletta [Tue, 13 Sep 2011 08:46:23 +0000 (10:46 +0200)]
Merge branch 'refactor'

Conflicts:
src/qt-compositor/compositor_api/waylandcompositor.cpp
src/qt-compositor/wayland_wrapper/wloutput.cpp

12 years agoImport the wayland platform plugin from qtbase, including the qt/4.8 history
Paul Olav Tvete [Mon, 12 Sep 2011 15:30:24 +0000 (17:30 +0200)]
Import the wayland platform plugin from qtbase, including the qt/4.8 history

12 years agoMerge remote branch 'gerrit/master' into HEAD
Samuel Rødal [Tue, 6 Sep 2011 08:49:40 +0000 (10:49 +0200)]
Merge remote branch 'gerrit/master' into HEAD

Conflicts:
src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
src/plugins/platforms/wayland/qwaylandnativeinterface.h

Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b

12 years agoGet rid of the textureChanged signal.
Paul Olav Tvete [Fri, 9 Sep 2011 12:01:39 +0000 (14:01 +0200)]
Get rid of the textureChanged signal.

We trigger update directly from damage now, so we don't need this signal anymore.

12 years agoMake sure we always release buffers
Paul Olav Tvete [Fri, 9 Sep 2011 07:46:28 +0000 (09:46 +0200)]
Make sure we always release buffers

If for some reason the compositor is not able to handle a buffer
before the next one arrives, the buffer would be locked forever.
This change detects that case, and adds an "emergency release", and
displays a warning.

12 years agoMake sure we update the item when the buffer is damaged.
Paul Olav Tvete [Thu, 8 Sep 2011 15:57:59 +0000 (17:57 +0200)]
Make sure we update the item when the buffer is damaged.

Done with Samuel.

12 years agoCompile fixes
Paul Olav Tvete [Thu, 8 Sep 2011 15:56:32 +0000 (17:56 +0200)]
Compile fixes

12 years agoChange the install path for qwindow-compositor example
Andy Nichols [Wed, 7 Sep 2011 14:09:08 +0000 (16:09 +0200)]
Change the install path for qwindow-compositor example

12 years agoAllow changing of the output geometry
Lasse Holmstedt [Tue, 6 Sep 2011 14:49:03 +0000 (16:49 +0200)]
Allow changing of the output geometry

If you are building a compositor that does not provide the same
composition area as the desktop resolution, you can now change the
geometry to match the area that your compositor is going to render.

You must set the geometry to desired value before clients connect.

Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemove isVisibleOnScreen from ManagedWaylandClient
Lasse Holmstedt [Wed, 31 Aug 2011 14:08:05 +0000 (16:08 +0200)]
Remove isVisibleOnScreen from ManagedWaylandClient

the values are already stored in WaylandSurfaceItem.

12 years agoSupport for generic window properties
Lasse Holmstedt [Wed, 31 Aug 2011 08:00:10 +0000 (10:00 +0200)]
Support for generic window properties

Wayland surfaces can now contain window-specific properties,
which are read/writable from both server and client side.

Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoGeneric property support for platform windows
Lasse Holmstedt [Wed, 31 Aug 2011 07:55:11 +0000 (09:55 +0200)]
Generic property support for platform windows

QPlatformNativeInterface can now contain generic window
properties in a QVariantMap, to facilitate communication
with the compositor and clients for certain platforms.
When window properties change, a signal is emitted from the
respective QPlatformNativeInterface instance. The properties
are intended to be read/writable from both client and server.

Change-Id: I7b42f7910d03c0d309add6c7dbb1c9b66ad22a3f
Reviewed-on: http://codereview.qt.nokia.com/3956
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoPropogate that the size has changed
Jørgen Lind [Fri, 2 Sep 2011 14:39:06 +0000 (16:39 +0200)]
Propogate that the size has changed

Change-Id: I73dde157e38933d39992cb4393297c0849ee1ae2
Reviewed-on: http://codereview.qt.nokia.com/4149
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agomissing include
Gunnar Sletta [Fri, 2 Sep 2011 07:08:18 +0000 (09:08 +0200)]
missing include

12 years agoAdapt to new API
Gunnar Sletta [Fri, 2 Sep 2011 06:57:40 +0000 (08:57 +0200)]
Adapt to new API

12 years agoMerge branch 'refactor' of scm.dev.nokia.troll.no:qt-compositor/mainline into refactor
Andy Nichols [Wed, 31 Aug 2011 14:25:36 +0000 (16:25 +0200)]
Merge branch 'refactor' of scm.dev.nokia.troll.no:qt-compositor/mainline into refactor

12 years agoEnables semi-transparent clients in QWindow Compositor
Andy Nichols [Wed, 31 Aug 2011 14:23:10 +0000 (16:23 +0200)]
Enables semi-transparent clients in QWindow Compositor

12 years agoCocoa: Fix qmlscene flicker on startup.
Morten Sorvig [Tue, 23 Aug 2011 10:51:11 +0000 (12:51 +0200)]
Cocoa: Fix qmlscene flicker on startup.

The SG render thread was racing window creation in
the GUI thread, which would cause flicker if the
window won the race and was shown before the SG
thread had a frame ready.

Send a synchronous expose event before showing the
window - this will wait for the SG render thread.

In addition, don't defer NSwindow creation. The GL
context setup is done before the window is shown
and needs a fully created window.

New API: QWindowSystemInterface::handleSynchronousExposeEvent
Retire: QWindowSystemInterface::handleExposeEvent

Change-Id: I0bb46089d16ec4882aaac8db67b57d15e0f51531
Reviewed-on: http://codereview.qt.nokia.com/3399
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
12 years agoActually rename the cleasses and remove the don't recreate eglimage
Jørgen Lind [Wed, 31 Aug 2011 13:51:35 +0000 (15:51 +0200)]
Actually rename the cleasses and remove the don't recreate eglimage

hack that the last commit contained

12 years agoRenaming mesa_egl to wayland_egl
Jørgen Lind [Wed, 31 Aug 2011 13:47:20 +0000 (15:47 +0200)]
Renaming mesa_egl to wayland_egl

and a compile fix for qwidget compositor

12 years agoMerge branch 'refactor' of scm.dev.nokia.troll.no:qt-compositor/mainline into refactor
Andy Nichols [Wed, 31 Aug 2011 11:35:03 +0000 (13:35 +0200)]
Merge branch 'refactor' of scm.dev.nokia.troll.no:qt-compositor/mainline into refactor

12 years agoInitial commit of QWindow based compositor
Andy Nichols [Wed, 31 Aug 2011 11:34:46 +0000 (13:34 +0200)]
Initial commit of QWindow based compositor

12 years agoUpdate to compile with changes to Refactor branch.
Andy Nichols [Wed, 31 Aug 2011 11:33:45 +0000 (13:33 +0200)]
Update to compile with changes to Refactor branch.

12 years agoAdded buffer release
Jørgen Lind [Fri, 19 Aug 2011 15:08:27 +0000 (17:08 +0200)]
Added buffer release

Also Removed the touch stuff from the widget compositor
Also fixed a multiple inheritance problem in widget compositor
Also Removed some stupid pkg-config variable for includes hack

12 years agoFixed build and crash issues.
Samuel Rødal [Mon, 29 Aug 2011 12:18:03 +0000 (14:18 +0200)]
Fixed build and crash issues.

12 years agoCopy core GL functionality to QtGui with QGL -> QOpenGL naming.
Samuel Rødal [Mon, 22 Aug 2011 08:49:28 +0000 (10:49 +0200)]
Copy core GL functionality to QtGui with QGL -> QOpenGL naming.

Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855
Reviewed-on: http://codereview.qt.nokia.com/3710
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoIntroduce new platform capability ThreadedOpenGL.
Samuel Rødal [Thu, 25 Aug 2011 18:19:44 +0000 (20:19 +0200)]
Introduce new platform capability ThreadedOpenGL.

Lets the platform plugin advertise whether it's safe to use OpenGL from
a different thread. With XCB we only advertise this if we have a
reasonably new XCB libary, as older versions suffer from the
xcb_wait_for_reply() blocking bug, which cause GL rendering in a
separate to stall when using Mesa drivers.

Change-Id: I4829df7e583a1c8aed218ae13a159d21266cc594
Reviewed-on: http://codereview.qt.nokia.com/3613
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMerge branch 'master' into refactor
Gunnar Sletta [Thu, 25 Aug 2011 08:11:49 +0000 (10:11 +0200)]
Merge branch 'master' into refactor

Conflicts:
src/gui/kernel/qapplication_qpa.cpp
src/gui/kernel/qcursor_qpa.cpp
src/gui/kernel/qwindowsysteminterface_qpa.cpp
src/gui/kernel/qwindowsysteminterface_qpa.h
src/gui/kernel/qwindowsysteminterface_qpa_p.h
src/gui/text/qtextcontrol.cpp
src/plugins/platforms/wayland/wayland.pro
src/widgets/accessible/qaccessible2.h
src/widgets/widgets/qwidgetlinecontrol_p.h

Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74

12 years agoIf the EGL_PLATFORM is not set, then set it
Jørgen Lind [Wed, 24 Aug 2011 08:38:31 +0000 (10:38 +0200)]
If the EGL_PLATFORM is not set, then set it

Change-Id: I6c1b0ba757c64fc42faacd69d4e5d1df28faf7d1
Reviewed-on: http://codereview.qt.nokia.com/3472
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoAvoid crash in texture provider.
Laszlo Agocs [Tue, 23 Aug 2011 13:14:19 +0000 (16:14 +0300)]
Avoid crash in texture provider.

12 years agoupdated to latest API
Gunnar Sletta [Mon, 22 Aug 2011 14:07:56 +0000 (16:07 +0200)]
updated to latest API

12 years agomake compositor build with refactor - frameSwapped slot added
Matthew Cattell [Thu, 18 Aug 2011 12:49:01 +0000 (14:49 +0200)]
make compositor build with refactor - frameSwapped slot added