summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Change uses of {to,from}Ascii to {to,from}Latin10.85Thiago Macieira2012-05-041-2/+2
| | | | | | | | | | 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: I66018663366a886a1d34c8c9389536081a09f2b7 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* qMemCopy is deprecated, use memcpyThiago Macieira2012-05-041-1/+1
| | | | | Change-Id: I4ed8d04694497b184f35768eb02d73f53f95251a Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Add a missing #include <QtCore/QStringList>Thiago Macieira2012-05-041-0/+1
| | | | | Change-Id: I5a23050cb82f2027fe1ba5f37de174d1b0669e98 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Fix build: update to QPA APIThiago Macieira2012-04-241-1/+1
| | | | | | | wltouch.cpp:146:63: error: conversion from ‘QVector<QPointF>’ to non-scalar type ‘QList<QPointF>’ requested Change-Id: Ibcf6c547fa1eeee2ccd568f60c10146ab104ce81 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Don't crash if no extended window extension is presentThiago Macieira2012-04-241-1/+3
| | | | | | | | | 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: I24682fc53ca39ba8930c2a4451e91bd9d1f665b3 Reviewed-By: Rob Bradford <robert.bradford@intel.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* No tests in 0.85qt-v5.0.0-alpha1Jørgen Lind2012-03-191-2/+1
| | | | | Change-Id: Ia8d30448347a74153dc25bdca28835aebcf56021 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Implement cursor API in platform screen.Friedemann Kleint2012-03-193-2/+8
| | | | | | Change-Id: I345852d407ab1dceb84ba99227dfd2989a54c6ad Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Updated to use the Thread affinity patch that we tried to upstreamJørgen Lind2012-03-124-203/+254
| | | | | Change-Id: I11138634f4c3d5e673d764cdcb36e7b503aafca0 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Make the module not depend on QtBase configureJørgen Lind2012-03-126-41/+149
| | | | | | | | This is convenient if we want to reconfigure without reconfiguring QtBase. Change-Id: I47dabeb4a66161fd0f7cafd57d00a6ee0097d8d3 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
* Fix potential crash when buffers are destroyedPaul Olav Tvete2012-03-061-8/+4
| | | | | | | Also remove non-optimization. Change-Id: I989d752b6ce406b8e60704cfbdecdfdfd72cbf9d Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fixed warnings in qwidget-compositor.Samuel Rødal2012-03-051-4/+4
| | | | | Change-Id: I22f12e2d78f2951e1c1c5a3b2c05794f0c26abb6 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix so that includes like <QtCompositor/WaylandXXX> workJørgen Lind2012-03-051-1/+1
| | | | | Change-Id: I96e78f55aa60f89c12ec0b970aae22abed225142 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* modify '16 mouse buttons' code within qwaylandinputdevice.cppRick Stockton2012-03-051-50/+19
| | | | | | | | | 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>
* Add '16 mouse buttons' feature to InputDevice::toWaylandButtonRick Stockton2012-03-031-8/+20
| | | | | | | Task-number: QTBUG-22759 Change-Id: Id886a61a98e07bfeb4a18ef57905d6b7293ca0c8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Do not crash the compositor when hiding a widget.Laszlo Agocs2012-03-021-1/+1
| | | | | Change-Id: I104307b3fc8e037e3871a6cae5c1ed3587ce0998 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Improve wayland_cast and introduce resolve to simplify code.Samuel Rødal2012-03-0210-35/+46
| | | | | | | Resolves the wl_resource by accessing the data member. Change-Id: I10912acea0a3ca6abbc067d07d43a46ec65a77aa Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Get rid of warnings in compositor source.Samuel Rødal2012-03-029-5/+39
| | | | | Change-Id: I8977e370e1036bf1722b5e88fc6cc3ade9a2d9a9 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Got rid of warnings in wayland plugin source.Samuel Rødal2012-03-026-2/+26
| | | | | Change-Id: Id3b39213da79daff2ea952eb0ba90272f98a7da7 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Avoid flicker when switching back to composited modePaul Olav Tvete2012-03-023-10/+42
| | | | | | | | 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>
* Make direct rendering work after QPlatformScreenBuffer refactoringPaul Olav Tvete2012-03-014-15/+15
| | | | | Change-Id: Iebd082678264178987e2550370663ed2b44a8916 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Make SurfaceBuffer a QPlatformScreenBufferJørgen Lind2012-03-019-62/+143
| | | | | | | | | And refactor to make it fit Done with: Paul Change-Id: I2bd28abb4ac256a336cd6c2c90e67104d8c27cc5 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Add accessibility to wayland.Frederik Gladhorn2012-03-012-0/+10
| | | | | | | The QPlatformAccessibility class simply loads the needed platform plugins on demand. Change-Id: I9c384b6bb9244379bc14902489170f8877c49a2f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Compile fix for the new DND interfacesJørgen Lind2012-03-012-3/+4
| | | | | | | This doesn't mean the DND works for the wayland plugin yet Change-Id: I6a4ae57e4b19dcedaf10119e033d5cbead8cb19d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Update SHA-1 to match 0.85.0 release.Samuel Rødal2012-03-011-1/+1
| | | | | Change-Id: I3b90ed63d4e4e5f2f5d1b7936f8622aa477a0ac8 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Added warning for when xkb_compile_keymap_from_rules fails.Samuel Rødal2012-03-011-0/+3
| | | | | Change-Id: I9b0bde8cc8d2575963db2e3165919b2d78213424 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Load the module so we get the correct QT_CONFIGJørgen Lind2012-02-291-0/+2
| | | | | | | We need this to autodetect if we'r going to build WaylandSurfaceItem Change-Id: Icdd5379d8334422ff4f780bf5192e9c01101e9db Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* conform to new plugin apiJørgen Lind2012-02-293-2/+9
| | | | | Change-Id: I42c05384767989aa95b49abfadd875d0f8b157d4 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Refactor wlsurface,Jørgen Lind2012-02-294-172/+187
| | | | | | | | 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>
* Removed obsolete src/plugins/platforms/wayland/wayland_sha1.txtSamuel Rødal2012-02-281-3/+0
| | | | | | | The wayland_sha1.txt in the root folder is the correct one. Change-Id: Ic843dc3110e6d71fbb031691312848369e448e06 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Get rid of some code in wayland plugin.Samuel Rødal2012-02-272-39/+8
| | | | | | | 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>
* Support ShowIsFullScreen in plugin and compositor.Samuel Rødal2012-02-2314-6/+93
| | | | | | | | 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>
* clean up qmake-generated projectsOswald Buddenhagen2012-02-213-36/+1
| | | | | | | remove assignmets which are defaults or bogus Change-Id: I6e4fcef11e905ffbbb7a32210608faac7aa111e5 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Make glx backend compiling again after qtbase broke the includesLaszlo Agocs2012-02-211-0/+1
| | | | | Change-Id: I2bbbdad7fdd0c726316a4192240a00326fd4d72e Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Don't send Deactivate events when creating WaylandSurfaceItemLasse Holmstedt2012-02-201-1/+3
| | | | | | | | 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>
* Fix issues with sendOnScreenVisibilityChangeLasse Holmstedt2012-02-204-3/+8
| | | | | | | | 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>
* Call the correct frameFinished method in Surface::sendFrameCallbackAndy Nichols2012-02-201-1/+1
| | | | | | | | 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>
* Fix wayland plugin and qwindow-compositor compilationLaszlo Agocs2012-02-203-1/+6
| | | | | | | | | 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>
* Send mouse release generated from TouchCancel to the proper windowLaszlo Agocs2012-02-201-1/+1
| | | | | Change-Id: I3d0ab79eb261de4d22c6aadf0672f5c84ff3533e Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Compositor memory leak fixesLaszlo Agocs2012-02-1514-14/+81
| | | | | Change-Id: Ia0510e00ffc925cde98ec5345a8129d1979c478c Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix qwindow-compositor memory leaksLaszlo Agocs2012-02-155-4/+17
| | | | | Change-Id: I85aa62c9deae308612ed2b13468e7f1e48f82acf Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* qtwayland: Add support for 16 mouse buttonsRick Stockton2012-02-151-2/+41
| | | | | | | | | | | | | | | | | Update expands the mouse button assignment code block, which formerly handled only values 272, 273, and 274. New version handles all mouse mouse buttons shown in kernel's input.h header (decimal values 272 through 285). Value 286 appears to be the first button in the range for joystick devices, so I did not include any other kernel-enumerated values. (Other values might be possible- but I don't know of a mouse which is currently being sold with more than 15 non-wheel buttons. The mouse with 15 buttons is the Razer Naga, and I don't own it.) Task-number: QTBUG-22759 Change-Id: I77f16eb89e24d7d6410199badff28c0d48f7df93 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Expose in a virtual function that surfaces are being destroyedJørgen Lind2012-02-154-1/+8
| | | | | Change-Id: I979e7d9ca7152d4db6c3e7adae8353935a05d6c5 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
* Pass the correct window on to QWindowSystemInterface.Samuel Rødal2012-02-141-2/+2
| | | | | | | | | | | | | | Sometimes, the window's coordinate system is not bounded by the coordinates of the QScreen (such as if the window uses a landscape window orientation on a portrait screen). QGuiApplication::topLevelAt() will fail to find this window, but since we have the window already at the wayland plugin level we just use that. We already did this for mouse events, so it's natural to do it here as well. Change-Id: Id086dd940aa1cf4eb4480117d243ab8a76da6cca Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Added convenience properties in WaylandSurface for window orientation.Samuel Rødal2012-02-1412-3/+67
| | | | | | | | | The new windowRotation property is especially useful for the compositor to know how much the surface needs to be rotated in order to be displayed correctly. Change-Id: I81ee17880ceafd465c39b4439dee978f2cb80924 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Prevent occasional crash in qwaylandinputdevice.cppSamuel Rødal2012-02-131-1/+1
| | | | | Change-Id: I86559add9925dad6aef530433dd92066f1708757 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Removing Wayland::SurfacePrivateJørgen Lind2012-02-1315-555/+601
| | | | | | | | | | | | | | | And moving Wayland::SurfaceBuffer into its own file. Also remove the extra functions in Wayland::Surface which just relayed down to extended surface. The pattern is that WaylandSurface is the entry point so we check there is the Wayland::Surface has the extension we'r looking for, then calling it directly from WaylandSurface. Last, the data of an extension is suppose to be members of the extension, so I moved the properties to be members of ExtendedSurface Change-Id: I5877671a17ee873b7644094f695fcd3e4677964a Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix surface wrapper build when QT_COMPOSITOR_WAYLAND_GL is not setLaszlo Agocs2012-02-131-2/+2
| | | | | Change-Id: Ic03d08ec936059344a1e092329a9def0b4ceb9ee Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Fix build of compositors by always including QOpenGLContext.Pier Luigi Fiorini2012-02-121-1/+1
| | | | | | | | | QOpenGLContext is always required even when QT_COMPOSITOR_WAYLAND_GL is not defined. Moving the include outside the ifdef makes compositors build without problems. Change-Id: I4b8903b06a5f58ad8fd2953dbde1476877683cb4 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Surface::isInverted Dont use xor and move the ret variableJørgen Lind2012-02-121-3/+2
| | | | | | | outside the ifdef Change-Id: I6f9048cd7d5992ef46dcc0e9d05e86f2f7ca4033 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
* Added window flags to the surface-extension protocolGunnar Sletta2012-02-1012-2/+93
| | | | | Change-Id: I1b53c5f0b0f908490dcd0ab30e46ab681f885954 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>