profile/ivi/qtwayland.git
12 years agoQWindow::visible() -> QWindow::isVisible() compile fix
Samuel Rødal [Sun, 6 May 2012 19:37:06 +0000 (21:37 +0200)]
QWindow::visible() -> QWindow::isVisible() compile fix

Change-Id: I3157b7444f260e5413683496238467fca8e7a015
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoChange uses of {to,from}Ascii to {to,from}Latin1
Thiago Macieira [Thu, 3 May 2012 15:12:58 +0000 (17:12 +0200)]
Change uses of {to,from}Ascii to {to,from}Latin1

This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I70205b0d86451d31e81a4be4a521e454e1eff83f
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoMake SurfaceBuffer::handle return something sensible
Jørgen Lind [Tue, 24 Apr 2012 12:25:36 +0000 (14:25 +0200)]
Make SurfaceBuffer::handle return something sensible

take 2

Change-Id: I4acd03e8e1cb5d77c877ce49d5b9256c94aeb310
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoAllow selection to be set when having no surfaces at all
Laszlo Agocs [Thu, 3 May 2012 09:32:31 +0000 (12:32 +0300)]
Allow selection to be set when having no surfaces at all

Having no surface will mean no keyboard focus, yet apps are free to
use QClipboard at any time.

Change-Id: I7383bf82480b8036940e1f01fa1b429f8a500ab9
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoClean up initialization in touch extension
Laszlo Agocs [Mon, 30 Apr 2012 09:37:10 +0000 (12:37 +0300)]
Clean up initialization in touch extension

Change-Id: I6e51bf6a243c1e64823a467d8acef0670ca98511
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFixed crashes and missing textures in WaylandSurfaceItem.
Samuel Rødal [Mon, 30 Apr 2012 12:45:19 +0000 (14:45 +0200)]
Fixed crashes and missing textures in WaylandSurfaceItem.

There might not always be a node created, so move the ownership of the
QSGTexture to the texture provider, which we now unconditionally create.

Change-Id: Ie9d6e846961ee468323f8acf731704b4ef313396
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoFix potential race condition
Paul Olav Tvete [Thu, 26 Apr 2012 11:31:22 +0000 (13:31 +0200)]
Fix potential race condition

The node lives in the render thread, while the item lives in the
GUI thread. They are only synchronized during updatePaintNode().
This patch fixes two race conditons: 1. the texture might be deleted
while the render thread is using it; 2. the item might be deleted before
WaylandSurfaceNode::preprocess() accesses it.

Change-Id: I19bcba3af8bca68c8b9bf42ae8c15537ce7cebcf
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoPass device capabilities to client in the touch extension
Laszlo Agocs [Thu, 26 Apr 2012 08:11:50 +0000 (11:11 +0300)]
Pass device capabilities to client in the touch extension

Assuming that all capabilities are available is not a good idea.

Change-Id: I06c0f6c14583e7a25d4a07058976ea347e2dc8fa
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoGive "something" for the handle of a shm sufracebuffer
Jørgen Lind [Tue, 24 Apr 2012 11:37:52 +0000 (13:37 +0200)]
Give "something" for the handle of a shm sufracebuffer

Change-Id: I91647bd515a1497ae999b3f493d60b3250727b67
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoFix warnings in compositor and 1 wl_resource_send event
Jørgen Lind [Mon, 23 Apr 2012 10:21:29 +0000 (12:21 +0200)]
Fix warnings in compositor and 1 wl_resource_send event

Change-Id: I3eb46559c6b19abcc625cd09c8d2921956fc8ec9
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoFix compositor crash when closing windows with subsurfaces
Jørgen Lind [Thu, 19 Apr 2012 20:51:28 +0000 (22:51 +0200)]
Fix compositor crash when closing windows with subsurfaces

Change-Id: I91b93cbd1ffcce6f60e44600a02f14f59813fccc
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoDon't crash if no extended window extension is present
Thiago Macieira [Wed, 18 Apr 2012 13:17:59 +0000 (15:17 +0200)]
Don't crash if no extended window extension is present

The extension is not standardised in Wayland, so it's very likely it
is not present (for example, when running applications under Weston).

Change-Id: I998af153e9abad6b165fb9d21a0014f64993d71a
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoDo not delete extended output instances twice
Laszlo Agocs [Sun, 22 Apr 2012 08:31:47 +0000 (11:31 +0300)]
Do not delete extended output instances twice

No need to destroy in Output dtor, delete is already called in
ExtendedOutput::destroy_resource. This prevents crashing when exiting
the compositor.

Change-Id: I2558ee012be56da055dbefbb474c0124681321ba
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoSend expose from qwindow-compositor
Laszlo Agocs [Fri, 20 Apr 2012 10:53:47 +0000 (13:53 +0300)]
Send expose from qwindow-compositor

Otherwise apps that (correctly) only start rendering on QEvent::Expose
will not render at all due to not receiving the event.

Turns out calling sendOnScreenVisibilityChange() is not that simple:
It does nothing until the extendedsurface instance is created and that
happens only after a roundtrip to the client. Therefore the compositor
listens to a new signal in WaylandSurface that indicates when the
extendedsurface-related functions become functional.

Change-Id: I9fdac4a98e2ad5d8c913c2a7aeef5b313f27c50a
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoDo not render in qwindow-compositor before expose
Laszlo Agocs [Fri, 20 Apr 2012 10:14:11 +0000 (13:14 +0300)]
Do not render in qwindow-compositor before expose

Change-Id: I0016a9969004252be3a5978e0ab4155b4d883682
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoSync up with the latest wayland developments.
Hannu Lyytinen [Wed, 18 Apr 2012 20:14:47 +0000 (23:14 +0300)]
Sync up with the latest wayland developments.

This commit makes the qtwayland module compatible with
wayland sha1 677c5180e67be18b7a0867fafb7f205b57a6e9ff.

Change-Id: I5af0510034b7e4a038313b80f1f6e0b18fa48eb3
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix compilation against latest qtbase.
Samuel Rødal [Thu, 19 Apr 2012 07:02:42 +0000 (09:02 +0200)]
Fix compilation against latest qtbase.

Change-Id: Ifebba587327a984e688825fda2ca2414ce19ba21
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoDo not send expose event for already exposed windows
Gunnar Sletta [Mon, 16 Apr 2012 15:08:13 +0000 (17:08 +0200)]
Do not send expose event for already exposed windows

Change-Id: Ic725856f88db475d808f0bfa661cf3f7a4dccc10
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoImplement nativeBufferLocking
Jørgen Lind [Mon, 16 Apr 2012 17:30:04 +0000 (19:30 +0200)]
Implement nativeBufferLocking

This is needed to be able to post directly to the framebuffer.

Change-Id: I6d19a6c8d9736a513a22dfa71358e6c4c7968e15
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoDecorations: Make it possible to move windows with transient parent
Laszlo Agocs [Fri, 13 Apr 2012 10:58:05 +0000 (13:58 +0300)]
Decorations: Make it possible to move windows with transient parent

This was not working previously due to not updating the offset.

Change-Id: I0a8db17a1eabeb6139129386675b271f9e1b8f22
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoDo not assert when closing dialogs
Laszlo Agocs [Fri, 13 Apr 2012 09:22:14 +0000 (12:22 +0300)]
Do not assert when closing dialogs

The leave event may arrive after the window is gone, resulting in a
null surface. The callback should do nothing in this case.

Change-Id: I36ec4cb1615f518de57b7de98206cdb8986405e4
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoDo not crash when closing pop-ups in widget apps.
Laszlo Agocs [Fri, 13 Apr 2012 08:57:22 +0000 (11:57 +0300)]
Do not crash when closing pop-ups in widget apps.

The shm frame callback has to be destroyed otherwise the callback will
occur after the dtor. Also, start using the previously unused 'window'
variable in the callback.

Change-Id: Iace09ae981344dcbe4112f49fcd19491963e4668
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoImplement nativeResourceForIntegration() to get the display.
Samuel Rødal [Fri, 13 Apr 2012 07:42:55 +0000 (09:42 +0200)]
Implement nativeResourceForIntegration() to get the display.

Make it possible to get the display without a surface handle.

Change-Id: I9d0a2bcb4515b927f440902ad14e59f3506b84de
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoAdd missing return statement
Jørgen Lind [Mon, 16 Apr 2012 17:28:06 +0000 (19:28 +0200)]
Add missing return statement

Change-Id: Ib95dc8ae0d9bbc2e9e06db95dd63ec8ad2d173e0
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoMake qml compositor resize to window
Jørgen Lind [Mon, 16 Apr 2012 06:04:29 +0000 (08:04 +0200)]
Make qml compositor resize to window

Change-Id: I014250f968003fa8f9e14e962edcca581ed2e5d8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoUpdated SHA-1 in wayland_sha1.txt to one against which qtwayland builds.
Samuel Rødal [Wed, 11 Apr 2012 15:15:55 +0000 (17:15 +0200)]
Updated SHA-1 in wayland_sha1.txt to one against which qtwayland builds.

Prevents following error:
wayland-util.h:152: error: ‘size_t’ does not name a type

Some <string.h> includes are also not necessary any more.

Change-Id: I0846948ba32d32521b0749b616eea3cad0ed3383
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFixed xcomposite_share compile errors.
Samuel Rødal [Wed, 11 Apr 2012 15:31:40 +0000 (17:31 +0200)]
Fixed xcomposite_share compile errors.

Change-Id: I1fac804abcb09bd760246c95a961a2d5b91de03a
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoClient side decoration
Jørgen Lind [Mon, 13 Feb 2012 09:23:41 +0000 (10:23 +0100)]
Client side decoration

Something is alot better than nothing :)
This gives window decorations for QWidgets and other applications that
use QBackingStore

Change-Id: Ic748ee1df88236b20416029e20e26532f7fb4476
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd public api to retrieve struct wl_display *
Jørgen Lind [Tue, 10 Apr 2012 13:28:54 +0000 (15:28 +0200)]
Add public api to retrieve struct wl_display *

Change-Id: I3e1b77419152cf1fbec64e517cf817f0d4a39b66
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMake windowcompositor actually eat events in the event filter
Jørgen Lind [Mon, 9 Apr 2012 21:44:28 +0000 (23:44 +0200)]
Make windowcompositor actually eat events in the event filter

Change-Id: I946aa90eb52751471470185a39f044ac23d53100
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix QWindow Compositors input handling
Jørgen Lind [Sat, 4 Feb 2012 11:02:42 +0000 (12:02 +0100)]
Fix QWindow Compositors input handling

Change-Id: I500c0a8e824abcf9a1e7662e1bd030ecc1b85170
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoImplement so that Compositors can use the wl_pointer_grab interface
Jørgen Lind [Sat, 4 Feb 2012 11:01:03 +0000 (12:01 +0100)]
Implement so that Compositors can use the wl_pointer_grab interface

Change-Id: Idaed835ef25a820cba388831c9ecdcf0f5de20f2
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoDon't use poor mans inheritance for waylandobject
Jørgen Lind [Mon, 9 Apr 2012 21:38:44 +0000 (23:38 +0200)]
Don't use poor mans inheritance for waylandobject

We'r programming in C++ afterall :)
This will let us use virtual functions in subclasses and multiple
inheritance.

Change-Id: I69647fa3197cbb33fb70e771470d7af07f8011f5
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoUpdate wayland_sha1 and implement buffer_pool interface
Jørgen Lind [Fri, 6 Apr 2012 11:35:43 +0000 (13:35 +0200)]
Update wayland_sha1 and implement buffer_pool interface

Change-Id: I0628a7655a6deb061a5d0b6c6304c89d8655cf11
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoEmit clipboard changed signal
Laszlo Agocs [Tue, 3 Apr 2012 09:06:26 +0000 (12:06 +0300)]
Emit clipboard changed signal

The signal was never emitted. The setNewClipboardMimeData() function
was not in use at all. The function is now removed and the signals are
emitted properly in all cases.

Change-Id: Iec42acab8e7d90084c836fa27a79982482ad8078
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFixed mockshell error in client auto test
Andy Nichols [Fri, 30 Mar 2012 13:17:25 +0000 (15:17 +0200)]
Fixed mockshell error in client auto test

Change-Id: Ibcb6bd807d281fbc14c35c98f4dabd4d7f82077b
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoImplemented QDesktopServices in wayland plugin.
Samuel Rødal [Thu, 29 Mar 2012 07:26:05 +0000 (09:26 +0200)]
Implemented QDesktopServices in wayland plugin.

Change-Id: Idc9158b4e8158fa9e95dbb11701fc9032bb64b68
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoIntroduced WaylandClient API to keep track of clients.
Samuel Rødal [Thu, 29 Mar 2012 11:56:38 +0000 (13:56 +0200)]
Introduced WaylandClient API to keep track of clients.

Makes it easier to keep track of which surfaces belong to a given
client, and the client associated with a given surface. WaylandClient is
an opaque type, representing an underlying wl_client *.

Change-Id: If21a2e02eb13a860e6ac641875bdcca67a53fdf5
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoFixed leaking of ExtendedOutput objects in the compositor.
Samuel Rødal [Thu, 29 Mar 2012 09:04:27 +0000 (11:04 +0200)]
Fixed leaking of ExtendedOutput objects in the compositor.

Need to properly free them when the corresponding resource is destroyed.

Change-Id: I1680a7a8b598986aace942ce647cc0f80d4c022f
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoPrevented crash and missing animation for shm clients.
Samuel Rødal [Tue, 27 Mar 2012 11:16:36 +0000 (13:16 +0200)]
Prevented crash and missing animation for shm clients.

Do the delayed attach _before_ we call handleExposeEvent(), which
might in turn lead to a damage being called before any buffer is
attached.

Change-Id: I55ef4f0de1b3ec201e727cebc52cfd891963b2b4
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoProperly report content orientation changes in the compositor.
Samuel Rødal [Wed, 28 Mar 2012 15:15:23 +0000 (17:15 +0200)]
Properly report content orientation changes in the compositor.

Change-Id: I9a65299c140c645edc05bdddb92e792e3d57275a
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoDon't initialize QRegion with an int.
Samuel Rødal [Wed, 28 Mar 2012 12:24:30 +0000 (14:24 +0200)]
Don't initialize QRegion with an int.

Using an int probably makes it use the QPolygon constructor with the int
treated as a size, which is not what we want.

Change-Id: Id382d5ebf15c8260b55d51c5b566e5e3ed054585
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoChange the touch extension to be always available.
Laszlo Agocs [Wed, 28 Mar 2012 10:58:04 +0000 (13:58 +0300)]
Change the touch extension to be always available.

Not opt-in anymore. Clients that connect to the extension will get the
extended touch events, others will get the regular events.

Change-Id: I91daec1949814fff5cfa0ebcc82c0977eee963b7
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemember to free the qtkey extension class.
Samuel Rødal [Wed, 28 Mar 2012 10:42:23 +0000 (12:42 +0200)]
Remember to free the qtkey extension class.

Change-Id: Ib327069521687bdf193f702b7dc89cff0ebbf416
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoEnable the qtkey extension regardless.
Samuel Rødal [Wed, 28 Mar 2012 10:18:14 +0000 (12:18 +0200)]
Enable the qtkey extension regardless.

Now the clients get qtkey events if they register themselves against
that interface, otherwise they get regular key events. This handles both
qt clients and pure wayland clients being connected at the same time,
sending qtkey events to the former and regular key events to the latter.

Change-Id: Iebd9d78b57758b45098b99a94414ee428e41636b
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoAdded qtkey extension to send raw QKeyEvents over the protocol.
Samuel Rødal [Tue, 27 Mar 2012 13:50:03 +0000 (15:50 +0200)]
Added qtkey extension to send raw QKeyEvents over the protocol.

For Qt based compositors we already have the full QKeyEvent, so we might
as well send it over the wayland protocol. This pretty much mirrors the
touch extension we already have.

Change-Id: I922f0cab6fe137272744762d6c57a31056b45672
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoFixed platform plugin for "nogl" building
Pierre Vorhagen [Mon, 26 Mar 2012 09:46:55 +0000 (11:46 +0200)]
Fixed platform plugin for "nogl" building

Change-Id: Ib65990c6895ab32fda62703e6aec9afb39f6256c
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoUpdate sync.profile
Alan Alpert [Wed, 21 Mar 2012 23:37:20 +0000 (09:37 +1000)]
Update sync.profile

Also needs declarative (which needs jsbackend)

Change-Id: Id2d2bea954ffb5c816aebc7a5d0513aecbbd971e
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoUse new xkbcommon includepath
Pierre Vorhagen [Wed, 21 Mar 2012 10:02:09 +0000 (11:02 +0100)]
Use new xkbcommon includepath

Change-Id: I294e5e8511ae8319f11d516d452f9b8a0d149b75
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoSend expose events and resize events according to spec
Gunnar Sletta [Fri, 16 Mar 2012 08:45:32 +0000 (09:45 +0100)]
Send expose events and resize events according to spec

Change-Id: Ia2452cd00e11c42d8ee7e8a1f8c39d82de3f4f37
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMake the native interface get the waylandintegration handle
Jørgen Lind [Wed, 14 Mar 2012 12:32:45 +0000 (13:32 +0100)]
Make the native interface get the waylandintegration handle

Then we don't need to go through the screen and the default screen if we
don't have a handle.

Change-Id: I2a2bb4d87a41c1acdf9af2f3abf3647b0f405a3a
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAvoid race condition
Paul Olav Tvete [Tue, 13 Mar 2012 11:33:34 +0000 (12:33 +0100)]
Avoid race condition

m_damaged may be set from a different thread while updateTexture() is
being executed. This change does not eliminate the race completely, but
will fail by creating the same texture twice instead of keeping an old,
invalid one.

Change-Id: Ic34d6df1699bd3d94fde3590343e4a524c9de6a2
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoreact to and send expose events
Gunnar Sletta [Wed, 22 Feb 2012 15:33:19 +0000 (16:33 +0100)]
react to and send expose events

Change-Id: I55d52717e62feb4010895d55fe5b82e0eb7acc1b
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoUpdated to use the Thread affinity patch that we tried to upstream
Jørgen Lind [Mon, 12 Mar 2012 13:58:51 +0000 (14:58 +0100)]
Updated to use the Thread affinity patch that we tried to upstream

Change-Id: I2de76d112d534588c3758213d8f5d6dd6e8c82df
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd explicit type casts to compile on desktop
Eskil Abrahamsen Blomfeldt [Tue, 31 Jan 2012 13:42:20 +0000 (14:42 +0100)]
Add explicit type casts to compile on desktop

If the wl_display type is forward declared and the native types
are typedef'd to something other than void*, there would be a
compile error.

Change-Id: I5fb813d3e2c5b718ba2c97651e5bdbeb661becbb
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoWe have buffer Queueing
Jørgen Lind [Mon, 12 Mar 2012 13:29:46 +0000 (14:29 +0100)]
We have buffer Queueing

Change-Id: I95cc6e5368bcefa8791a141a6f6f4166bc380e64
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoMake the module not depend on QtBase configure
Jørgen Lind [Sun, 11 Mar 2012 12:05:08 +0000 (13:05 +0100)]
Make the module not depend on QtBase configure

This is convenient if we want to reconfigure without reconfiguring
QtBase.

Change-Id: I719ba0d89905287a557e962ed6d804514e44b7f5
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoAdded missing header for client autotest.
Samuel Rødal [Mon, 12 Mar 2012 07:58:10 +0000 (08:58 +0100)]
Added missing header for client autotest.

Change-Id: Iabfaf1b570be7a2082f15fc25d5e715a9613b4d7
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoImplement cursor API in platform screen.
Friedemann Kleint [Tue, 6 Mar 2012 12:52:05 +0000 (13:52 +0100)]
Implement cursor API in platform screen.

Change-Id: I345852d407ab1dceb84ba99227dfd2989a54c6ad
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoAdded testing of QBackingStore backend in wayland plugin.
Samuel Rødal [Wed, 7 Mar 2012 12:52:50 +0000 (13:52 +0100)]
Added testing of QBackingStore backend in wayland plugin.

Change-Id: I4db26cbee88f329a926914ff878e6efa9b0c8395
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoAdded testing of key events to client auto test.
Samuel Rødal [Wed, 7 Mar 2012 09:40:31 +0000 (10:40 +0100)]
Added testing of key events to client auto test.

This requires passing on the native key code as well when calling into
QWindowSystemInterface from QWaylandInputDevice.

Change-Id: Iea1f98dcc9e050bb42cc48927da17aa54085a5e8
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoGet rid of dummy source update functions and debug output.
Samuel Rødal [Wed, 7 Mar 2012 09:12:26 +0000 (10:12 +0100)]
Get rid of dummy source update functions and debug output.

The source update callbacks are unnecessary since change
d224714afd087cc73d8 in wayland.

Change-Id: Iac2266621b8739464077d9aa8f9292e06e9b4b35
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoAdded auto-test for wayland plugin.
Samuel Rødal [Tue, 6 Mar 2012 09:29:45 +0000 (10:29 +0100)]
Added auto-test for wayland plugin.

Similar to the compositor auto-test, except this time we mock the
compositor, and test the client code, by forcing the wayland plugin to
be used.

Change-Id: I363019ff7e136db6822993f1881fec48a02a7db4
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFixed build of compositor auto test.
Samuel Rødal [Tue, 6 Mar 2012 16:38:42 +0000 (17:38 +0100)]
Fixed build of compositor auto test.

Change-Id: I1b61f48c964ac4d3eb07be99f4ab7602d7181524
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoRemove friend declarations in WaylandSurface
Jørgen Lind [Mon, 5 Mar 2012 16:10:14 +0000 (17:10 +0100)]
Remove friend declarations in WaylandSurface

Change-Id: I748f6814e7e4172279ff55f2049d69561305f2ab
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix potential crash when buffers are destroyed
Paul Olav Tvete [Tue, 6 Mar 2012 10:35:34 +0000 (11:35 +0100)]
Fix potential crash when buffers are destroyed

Also remove non-optimization.

Change-Id: Ic5903efffc064eb1ef0d46ef72231e726270af47
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoAdded auto-test for WaylandCompositor.
Samuel Rødal [Mon, 27 Feb 2012 15:23:39 +0000 (16:23 +0100)]
Added auto-test for WaylandCompositor.

Change-Id: I2fda66c30736218ee847d9f6827709507c84c301
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoFixed WaylandSurfaceItem for when paint enabled is false.
Samuel Rødal [Mon, 5 Mar 2012 12:34:50 +0000 (13:34 +0100)]
Fixed WaylandSurfaceItem for when paint enabled is false.

This broke in change c5163c53337b72e0c28ae. Even when paint enabled is
false meaning we don't create a paint node, we want to update the
QSGTexture and the texture provider, so that the WaylandSurfaceItem can
function as a shader effect source.

Change-Id: I8d40c774f8a28240902d2d9919aee8645db9dbe7
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
12 years agoBuild with latest qtdeclarative.
Samuel Rødal [Mon, 5 Mar 2012 11:54:54 +0000 (12:54 +0100)]
Build with latest qtdeclarative.

Used the rename-qtdeclarative-symbols.sh script from qtdeclarative/bin.

Change-Id: I000b8afc3418fe862c51ce868996a4fd3de495be
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoUpdate wayland_sha1
Jørgen Lind [Mon, 5 Mar 2012 08:58:32 +0000 (09:58 +0100)]
Update wayland_sha1

Change-Id: I34e186595e3111b687f95b6d9ddb8d497fc6d2d0
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoUse the new cool event wrapper functions generated by wayland-scanner
Jørgen Lind [Mon, 5 Mar 2012 08:58:32 +0000 (09:58 +0100)]
Use the new cool event wrapper functions generated by wayland-scanner

This gives us some more static typechecking which is cool..

This fixes actually a couple of minor bugs we had, one where we didn't
send a value for the refreshrate of a screen, and a couple in selection.

Change-Id: I2b4193b488784885d7cce27f7f5b2d2df45c6c83
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFixing includes to make it compile again
Jørgen Lind [Mon, 5 Mar 2012 08:33:33 +0000 (09:33 +0100)]
Fixing includes to make it compile again

Change-Id: Id62bf1cb47cd375263a6aaa2e21174d476ab4627
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoUpgrade to newer wayland SHA-1.
Samuel Rødal [Wed, 29 Feb 2012 15:36:05 +0000 (16:36 +0100)]
Upgrade to newer wayland SHA-1.

Change-Id: If0c1d86a3011e266cafabeb875bc5616191a8cf4
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFixed warnings in qwidget-compositor.
Samuel Rødal [Mon, 5 Mar 2012 07:09:17 +0000 (08:09 +0100)]
Fixed warnings in qwidget-compositor.

Change-Id: I22f12e2d78f2951e1c1c5a3b2c05794f0c26abb6
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFix so that includes like <QtCompositor/WaylandXXX> work
Jørgen Lind [Thu, 1 Mar 2012 09:56:14 +0000 (10:56 +0100)]
Fix so that includes like <QtCompositor/WaylandXXX> work

Change-Id: I96e78f55aa60f89c12ec0b970aae22abed225142
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agomodify '16 mouse buttons' code within qwaylandinputdevice.cpp
Rick Stockton [Sat, 3 Mar 2012 09:12:32 +0000 (01:12 -0800)]
modify '16 mouse buttons' code within qwaylandinputdevice.cpp

improve readability, match the style used in other plugins.

Task-number: QTBUG-22759

Change-Id: Icf5d6a405c3582364157fc9767c2aca3bc6839f1
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd '16 mouse buttons' feature to InputDevice::toWaylandButton
Rick Stockton [Sat, 3 Mar 2012 08:48:47 +0000 (00:48 -0800)]
Add '16 mouse buttons' feature to InputDevice::toWaylandButton

Task-number: QTBUG-22759

Change-Id: Id886a61a98e07bfeb4a18ef57905d6b7293ca0c8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoDo not crash the compositor when hiding a widget.
Laszlo Agocs [Fri, 2 Mar 2012 12:58:14 +0000 (14:58 +0200)]
Do not crash the compositor when hiding a widget.

Change-Id: I104307b3fc8e037e3871a6cae5c1ed3587ce0998
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoImprove wayland_cast and introduce resolve to simplify code.
Samuel Rødal [Thu, 1 Mar 2012 17:16:23 +0000 (18:16 +0100)]
Improve wayland_cast and introduce resolve to simplify code.

Resolves the wl_resource by accessing the data member.

Change-Id: I10912acea0a3ca6abbc067d07d43a46ec65a77aa
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoGet rid of warnings in compositor source.
Samuel Rødal [Thu, 1 Mar 2012 12:11:01 +0000 (13:11 +0100)]
Get rid of warnings in compositor source.

Change-Id: I8977e370e1036bf1722b5e88fc6cc3ade9a2d9a9
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoGot rid of warnings in wayland plugin source.
Samuel Rødal [Thu, 1 Mar 2012 12:56:07 +0000 (13:56 +0100)]
Got rid of warnings in wayland plugin source.

Change-Id: Id3b39213da79daff2ea952eb0ba90272f98a7da7
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoAvoid flicker when switching back to composited mode
Paul Olav Tvete [Fri, 2 Mar 2012 09:12:29 +0000 (10:12 +0100)]
Avoid flicker when switching back to composited mode

The surface item needs to create a new texture when the compositor
switches from direct render to composited mode.

Change-Id: Ic2d65929617f1941ea290645ac28b8e986c414bc
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMake direct rendering work after QPlatformScreenBuffer refactoring
Paul Olav Tvete [Thu, 1 Mar 2012 16:28:18 +0000 (17:28 +0100)]
Make direct rendering work after QPlatformScreenBuffer refactoring

Change-Id: Iebd082678264178987e2550370663ed2b44a8916
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
12 years agoMake SurfaceBuffer a QPlatformScreenBuffer
Jørgen Lind [Wed, 29 Feb 2012 15:15:49 +0000 (16:15 +0100)]
Make SurfaceBuffer a QPlatformScreenBuffer

And refactor to make it fit

Done with: Paul

Change-Id: I2bd28abb4ac256a336cd6c2c90e67104d8c27cc5
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
12 years agoAdd accessibility to wayland.
Frederik Gladhorn [Thu, 23 Feb 2012 14:28:55 +0000 (15:28 +0100)]
Add accessibility to wayland.

The QPlatformAccessibility class simply loads the needed platform plugins on demand.

Change-Id: I9c384b6bb9244379bc14902489170f8877c49a2f
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoCompile fix for the new DND interfaces
Jørgen Lind [Thu, 1 Mar 2012 08:34:24 +0000 (09:34 +0100)]
Compile fix for the new DND interfaces

This doesn't mean the DND works for the wayland plugin yet

Change-Id: I6a4ae57e4b19dcedaf10119e033d5cbead8cb19d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoUpdate SHA-1 to match 0.85.0 release.
Samuel Rødal [Wed, 29 Feb 2012 07:55:16 +0000 (08:55 +0100)]
Update SHA-1 to match 0.85.0 release.

Change-Id: I3b90ed63d4e4e5f2f5d1b7936f8622aa477a0ac8
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoAdded warning for when xkb_compile_keymap_from_rules fails.
Samuel Rødal [Wed, 29 Feb 2012 12:17:47 +0000 (13:17 +0100)]
Added warning for when xkb_compile_keymap_from_rules fails.

Change-Id: I9b0bde8cc8d2575963db2e3165919b2d78213424
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoLoad the module so we get the correct QT_CONFIG
Jørgen Lind [Mon, 27 Feb 2012 15:10:23 +0000 (16:10 +0100)]
Load the module so we get the correct QT_CONFIG

We need this to autodetect if we'r going to build WaylandSurfaceItem

Change-Id: Icdd5379d8334422ff4f780bf5192e9c01101e9db
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoconform to new plugin api
Jørgen Lind [Sun, 26 Feb 2012 11:23:12 +0000 (12:23 +0100)]
conform to new plugin api

Change-Id: I42c05384767989aa95b49abfadd875d0f8b157d4
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRefactor wlsurface,
Jørgen Lind [Tue, 14 Feb 2012 20:03:47 +0000 (21:03 +0100)]
Refactor wlsurface,

Now we treat all buffers the same (shm or not).
We advance the queue when we send the frame signal

Change-Id: Id62b1037e03fbeae82048f5ab9078fa81ed8e45d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemoved obsolete src/plugins/platforms/wayland/wayland_sha1.txt
Samuel Rødal [Tue, 28 Feb 2012 15:10:06 +0000 (16:10 +0100)]
Removed obsolete src/plugins/platforms/wayland/wayland_sha1.txt

The wayland_sha1.txt in the root folder is the correct one.

Change-Id: Ic843dc3110e6d71fbb031691312848369e448e06
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoGet rid of some code in wayland plugin.
Samuel Rødal [Mon, 27 Feb 2012 14:43:35 +0000 (15:43 +0100)]
Get rid of some code in wayland plugin.

We can use the convenience API that has been added to wayland instead.

Change-Id: I9516256a14f62593b3c78064a0f6288bb496c583
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoSupport ShowIsFullScreen in plugin and compositor.
Samuel Rødal [Wed, 22 Feb 2012 09:52:54 +0000 (10:52 +0100)]
Support ShowIsFullScreen in plugin and compositor.

Added way of controlling client side style hint ShowIsFullScreen from
compositor, and added support in plugin for the WindowFullScreen state.

Change-Id: I60efa5692b26e9a4079c3c2fb66eb72b67badd02
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoclean up qmake-generated projects
Oswald Buddenhagen [Tue, 21 Feb 2012 16:52:56 +0000 (17:52 +0100)]
clean up qmake-generated projects

remove assignmets which are defaults or bogus

Change-Id: I6e4fcef11e905ffbbb7a32210608faac7aa111e5
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoMake glx backend compiling again after qtbase broke the includes
Laszlo Agocs [Tue, 21 Feb 2012 11:52:24 +0000 (13:52 +0200)]
Make glx backend compiling again after qtbase broke the includes

Change-Id: I2bbbdad7fdd0c726316a4192240a00326fd4d72e
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoDon't send Deactivate events when creating WaylandSurfaceItem
Lasse Holmstedt [Mon, 20 Feb 2012 09:51:53 +0000 (10:51 +0100)]
Don't send Deactivate events when creating WaylandSurfaceItem

The default state is Deactivate, so getting extra ones at startup
is not needed.

Change-Id: I9c6b4b5dab58651f1933900421a3d6d68e00522f
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoFix issues with sendOnScreenVisibilityChange
Lasse Holmstedt [Mon, 20 Feb 2012 09:35:54 +0000 (10:35 +0100)]
Fix issues with sendOnScreenVisibilityChange

Initialize variables and send the event in the beginning so that
we can be sure both client and server are in sync.

Change-Id: Ibabd2fa3cfc2c7defd4804f3fcbdd184eba46652
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoCall the correct frameFinished method in Surface::sendFrameCallback
Andy Nichols [Fri, 17 Feb 2012 09:28:43 +0000 (10:28 +0100)]
Call the correct frameFinished method in Surface::sendFrameCallback

After the recent refactoring, the frameFinished method was still called
where we should now be calling frameFinishedInternal

Change-Id: I6ac5c0467dda6bb7e62976e8da28dc9d19a986c8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix wayland plugin and qwindow-compositor compilation
Laszlo Agocs [Fri, 17 Feb 2012 23:01:32 +0000 (01:01 +0200)]
Fix wayland plugin and qwindow-compositor compilation

Apparently some qtbase change triggers the need to include a bunch of
headers which were not properly included before. The extra mouse
button support in the platform plugin simply did not compile.

Change-Id: I7d518021fa81f2d5232277f0bce26e48effbeae3
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>