0a3dad4 · unity8 · git.iko.soy

git.iko.soy/unity8

Merge trunk

commit0a3dad456b2abae9dd88df20fb389db925efa45b authorMichał Sawicz <michal.sawicz@canonical.com> dateFri 15 Jul 2016, 11:51 (10 years ago) parent568dd1e 65b1efb

780 files changed+37268−22903

compare with xenial

unifiedsplit

CMakeLists.txt+14−2

@@ -57,12 +57,24 @@ find_package(Qt5DBus 5.4 REQUIRED)

5757find_package(Qt5Concurrent 5.4 REQUIRED)

5858find_package(Qt5Sql 5.4 REQUIRED)

5959

60−pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=16)

60+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=18)

6161pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)

6262pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)

6363pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)

6464pkg_check_modules(QMENUMODEL REQUIRED qmenumodel)

6565

66+pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

67+

68+### Check UbuntuGestures private headers. No pkg-config (.pc) file is provided for them

69+find_path(UBUNTUGESTUREPRIV

70+ NAMES UbuntuGestures/private/damper_p.h UbuntuGestures/private/ucswipearea_p.h UbuntuGestures/private/ucswipearea_p_p.h

71+ PATHS ${UBUNTUGESTURES_INCLUDEDIR}/UbuntuGestures/${UBUNTUGESTURES_VERSION}

72+ NO_DEFAULT_PATH)

73+if (${UBUNTUGESTUREPRIV} STREQUAL UBUNTUGESTUREPRIV-NOTFOUND)

74+ message(FATAL_ERROR "UbuntuGestures private headers not found.")

75+endif()

76+# end of UbuntuGesture private headers check

77+

6678# Standard install paths

6779include(GNUInstallDirs)

6880

@@ -116,6 +128,7 @@ set(SHELL_APP unity8)

116128set(DASH_APP unity8-dash)

117129set(SCOPE_TOOL unity-scope-tool)

118130set(INDICATORS_CLIENT_APP indicators-client)

131+set(GREETER_APP unity8-greeter)

119132set(MOCK_INDICATOR_SERVICE_APP unity-mock-indicator-service)

120133

121134include_directories(

@@ -144,7 +157,6 @@ endif()

144157

145158# add subdirectories to build

146159add_subdirectory(include)

147−add_subdirectory(libs)

148160add_subdirectory(src)

149161add_subdirectory(tools)

150162add_subdirectory(qml)

build.sh+3−3

@@ -46,12 +46,12 @@ install_dependencies() {

4646 qmenumodel-qml \

4747 qml-module-qtquick-layouts \

4848 qml-module-qtquick-xmllistmodel \

49+ qml-module-ubuntu-components \

50+ qml-module-ubuntu-thumbnailer0.1 \

51+ qml-module-ubuntu-web \

4952 qtdeclarative5-gsettings1.0 \

50− qtdeclarative5-ubuntu-ui-toolkit-plugin \

5153 qtdeclarative5-ubuntu-settings-components \

5254 qtdeclarative5-ubuntu-telephony0.1 \

53− qtdeclarative5-ubuntu-thumbnailer0.1 \

54− qtdeclarative5-ubuntu-web-plugin \

5555 qtdeclarative5-unity-notifications-plugin \

5656 qml-module-ubuntu-connectivity \

5757 ubuntu-mobile-icons \

data/51-unity8-greeter.confnew file+2

@@ -0,0 +1,2 @@

1+[Seat:*]

2+greeter-session=unity8-greeter

data/CMakeLists.txt+11

@@ -2,6 +2,7 @@

22configure_file(${SHELL_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${SHELL_APP}.desktop @ONLY)

33configure_file(${DASH_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DASH_APP}.desktop @ONLY)

44configure_file(${INDICATORS_CLIENT_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${INDICATORS_CLIENT_APP}.desktop @ONLY)

5+configure_file(${GREETER_APP}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop @ONLY)

67# install desktop files

78install(FILES

@@ -11,6 +12,16 @@ install(FILES

1112 DESTINATION ${CMAKE_INSTALL_DATADIR}/applications

1213 )

1314

15+install(FILES

16+ ${CMAKE_CURRENT_BINARY_DIR}/${GREETER_APP}.desktop

17+ DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/greeters

18+ )

19+

20+install(FILES

21+ 51-unity8-greeter.conf

22+ DESTINATION ${CMAKE_INSTALL_DATADIR}/lightdm/lightdm.conf.d

23+ )

24+

1425# install dash icon

1526install(FILES

1627 ${CMAKE_CURRENT_SOURCE_DIR}/${DASH_APP}.png

data/unity8-dash.png

Binary file not shown.

data/unity8-greeter-init.confnew file+12

@@ -0,0 +1,12 @@

1+description "Unity 8 Greeter initialization"

2+author "Michael Terry <mterry@ubuntu.com>"

4+start on unity8-greeter-started

5+task

6+emits indicator-services-start

8+script

9+ start --no-wait ofono-setup || true

10+ initctl emit --no-wait indicator-services-start || true

11+ start --no-wait maliit-server || true

12+end script

data/unity8-greeter-wrappernew file+98

@@ -0,0 +1,98 @@

1+#!/bin/sh

2+# -*- Mode: sh; indent-tabs-mode: nil; tab-width: 4 -*-

3+#

5+# Author: Michael Terry <michael.terry@canonical.com>

6+#

7+# This program is free software: you can redistribute it and/or modify it under

8+# the terms of the GNU General Public License as published by the Free Software

9+# Foundation, version 3 of the License.

10+#

11+# See http://www.gnu.org/copyleft/gpl.html the full text of the license.

12+

13+# This wrapper merely ensures that init and friends live only as long as this

14+# script does. Otherwise, it's very easy for some processes to not notice that

15+# the session died. We could try to do this in-process, but we want to do this

16+# cleanup even if the greeter aborts.

17+

18+trap cleanup TERM EXIT

19+

20+cleanup()

21+{

22+ trap - TERM EXIT

23+ # Kill upstart and indicators

24+ if [ -n "$INIT_PID" ]; then

25+ kill "$INIT_PID"

26+ fi

27+ if [ -n "$CMD_PID" ]; then

28+ kill "$CMD_PID"

29+ fi

30+ exit 0

31+}

32+

33+set_greeter_var()

34+{

35+ export "$1=$2"

36+ gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "{'$1': '$2'}"

37+ if [ -n "$INIT_PID" ]; then

38+ initctl set-env --global "$1=$2"

39+ fi

40+}

41+

42+SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket

43+rm -f $SUB_SOCKET # clear socket in case we were hard shut down

44+

45+# If touch session script (which sets up grid units and mir variables) is available, use it

46+TOUCH_WRAPPER=

47+if [ -x /usr/bin/ubuntu-touch-session ]; then

48+ TOUCH_WRAPPER=/usr/bin/ubuntu-touch-session

49+fi

50+

51+# Pretend that we're in an ubuntu-touch session, so that indicator-network

52+# will start.

53+export DESKTOP_SESSION=ubuntu-touch

54+

55+# We disable ofono using pulse. It causes problems with racing with the user's

56+# pulse. We need to come up with a better long-term fix for this, because we

57+# eventually need the greeter to play ringtones for users that aren't logged in.

58+set_greeter_var PA_DISABLED 1

59+

60+# Normal unity8 sessions are entirely driven by Upstart. But greeters

61+# are special. They need access to the file descriptors that lightdm

62+# creates for them and don't want to start all the services that a normal

63+# session would. So it's inconvenient to live within an upstart session.

64+# But... we still want to use Upstart for some services. So launch here.

65+MIR_SOCKET=$SUB_SOCKET $TOUCH_WRAPPER /sbin/upstart --user --no-startup-event &

66+INIT_PID=$!

67+while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done

68+export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)

69+

70+# Start any pre-greeter tasks if needed (like wizard)

71+/sbin/initctl emit unity8-greeter-starting

72+

73+# Define language here for phone if available. When phone user switches their

74+# language, they expect that to affect the greeter too. But the user doesn't

75+# have permission to switch system language, only their own. So we notice if

76+# the phablet user exists and use their language if so. TODO: talk to design

77+# about whether we should switch language on fly as users are selected (this

78+# is very hard to do technically).

79+#

80+# Do this after unity8-greeter-starting, in case a customization upstart job

81+# changes language.

82+if [ "$(id -u phablet 2>/dev/null)" = "32011" ]; then

83+ USER_LANG=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User Language | cut -d\' -f2)

84+ if [ -n "$USER_LANG" ]; then

85+ set_greeter_var LANGUAGE "$USER_LANG"

86+ fi

87+ USER_LOCALE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User32011 --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User FormatsLocale | cut -d\' -f2)

88+ if [ -n "$USER_LOCALE" ]; then

89+ set_greeter_var LANG "$USER_LOCALE"

90+ set_greeter_var LC_ALL "$USER_LOCALE"

91+ fi

92+fi

93+

94+# And finally actually start the greeter

95+exec env QT_QPA_PLATFORM=ubuntumirclient MIR_SERVER_FILE=$SUB_SOCKET $TOUCH_WRAPPER $@ &

96+CMD_PID=$!

97+wait $CMD_PID

98+CMD_PID=

data/unity8-greeter.desktop.innew file+7

@@ -0,0 +1,7 @@

1+[Desktop Entry]

2+Type=Application

3+Name=Unity 8 Greeter

4+Comment=The converged Unity shell's Greeter

5+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8-greeter-wrapper @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity8 --mode=greeter

6+X-LightDM-Session-Type=mir

7+X-Ubuntu-Touch=true

data/unity8-greeter.pklanew file+44

@@ -0,0 +1,44 @@

1+# DO NOT EDIT THIS FILE, it will be overwritten on update

2+# Place your local configurations under /etc/polkit-1/localauthority/

4+[Disable Controlling of Network Devices]

5+Identity=unix-user:lightdm

6+Action=org.freedesktop.NetworkManager.enable-disable-network;org.freedesktop.NetworkManager.enable-disable-wifi;org.freedesktop.NetworkManager.enable-disable-wwan;org.freedesktop.NetworkManager.enable-disable-wimax;

7+ResultActive=no

8+ResultInactive=no

9+ResultsAny=no

10+

11+[Disable Sleep and Wake]

12+Identity=unix-user:lightdm

13+Action=org.freedesktop.NetworkManager.sleep-wake

14+ResultActive=no

15+ResultInactive=no

16+ResultsAny=no

17+

18+[Disable WiFi Sharing]

19+Identity=unix-user:lightdm

20+Action=org.freedesktop.NetworkManager.wifi.share.protected;org.freedesktop.NetworkManager.wifi.share.open

21+ResultActive=no

22+ResultInactive=no

23+ResultsAny=no

24+

25+[Disable Settings Modifications]

26+Identity=unix-user:lightdm

27+Action=org.freedesktop.NetworkManager.settings.modify.own;org.freedesktop.NetworkManager.settings.modify.system;org.freedesktop.NetworkManager.settings.modify.hostname

28+ResultActive=no

29+ResultInactive=no

30+ResultsAny=no

31+

32+[Disable User Connections]

33+Identity=unix-user:lightdm

34+Action=org.freedesktop.NetworkManager.use-user-connections

35+ResultActive=no

36+ResultInactive=no

37+ResultsAny=no

38+

39+[Enable Controlling of Network Connections]

40+Identity=unix-user:lightdm

41+Action=org.freedesktop.NetworkManager.network-control

42+ResultActive=yes

43+ResultInactive=no

44+ResultsAny=no

data/unity8.conf+25−2

@@ -3,7 +3,7 @@ author "Ricardo Mendoza <ricmm@ubuntu.com>"

44emits indicator-services-start

6−start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir)) and started dbus

6+start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir) or (xsession SESSION=unity8)) and started dbus

77stop on desktop-end

99kill timeout 120

@@ -50,11 +50,34 @@ pre-start script

5050 # the lag seen in the indicator panel pull-down (LP: #1488327) and also

5151 # reduces lag seen in apps:

5252 initctl set-env --global QML_NO_TOUCH_COMPRESSION=1

53+

54+ if [ "$XDG_SESSION_DESKTOP" = "ubuntu-touch" ]; then

55+ # On Ubuntu Touch, we currently use a trick where we auto-login the

56+ # user without a LightDM greeter at all. In this case, we want to

57+ # start with the lockscreen visible. Once we switch to using a

58+ # proper greeter for the first login, we can remove this code path.

59+ initctl set-env MODE=full-greeter

60+ else

61+ initctl set-env MODE=full-shell

62+ fi

5363end script

5464

55−exec ${BINARY:-unity8} $ARGS

65+exec ${BINARY:-unity8} --mode=$MODE $ARGS

5666

5767post-start script

68+ # If no MIR_SOCKET was defined on launch, we try to set one here

69+ if [ -z "$(initctl get-env --global UNITY_MIR_SOCKET)" ]; then

70+ if [ -S "$XDG_RUNTIME_DIR/mir_socket" ]; then

71+ mir_socket=$XDG_RUNTIME_DIR/mir_socket

72+ elif [ -S "/tmp/mir_socket" ]; then

73+ mir_socket=/tmp/mir_socket

74+ fi

75+

76+ if [ -n "$mir_socket" ]; then

77+ initctl set-env --global MIR_SOCKET="$mir_socket"

78+ fi

79+ fi

80+

5881 initctl emit --no-wait indicator-services-start

5982end script

6083

debian/changelog+273

@@ -1,3 +1,276 @@

1+unity8 (8.12+16.10.20160711-0ubuntu1) yakkety; urgency=medium

3+ [ Josh Arenson ]

4+ * Add a SessionsModel to lightdm to support the greeter's session

5+ chooser

6+ * Add unity8-greeter package which contains a basic, but usable

7+ LightDM greeter. (LP: #1324602)

9+ [ Michael Terry ]

10+ * Make sure indicators and launcher hide when power button is pressed

11+ on greeter. (LP: #1595569)

12+ * Fix tablet greeter focus to be always-on, no longer hiding the OSK

13+ or forcing a mouse click to type a password. (LP: #1435923)

14+

15+ -- Michael Terry <michael.terry@canonical.com> Mon, 11 Jul 2016 17:24:20 +0000

16+

17+unity8 (8.12+16.10.20160707-0ubuntu1) yakkety; urgency=medium

18+

19+ [ Michael Zanetti ]

20+ * emit the correct role changed signal on count visible changed (LP:

21+ #1599925)

22+

23+ -- Michał Sawicz <michal.sawicz@canonical.com> Thu, 07 Jul 2016 16:49:32 +0000

24+

25+unity8 (8.12+16.10.20160705-0ubuntu1) yakkety; urgency=medium

26+

27+ [ Michael Zanetti ]

28+ * don't displace windows if the OSK is on another screen (LP:

29+ #1598917)

30+

31+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 05 Jul 2016 10:00:57 +0000

32+

33+unity8 (8.12+16.10.20160627.5-0ubuntu1) yakkety; urgency=medium

34+

35+ [ Albert Astals Cid ]

36+ * Stop watching the old header item height once it's not our header

37+ anymore

38+ * LVWPH: cull the header item when not on view to save some painting

39+ * Adapt test to new mock behaviour

40+ * Don't let the mouse go outside the parentItem (LP: #1525350)

41+ * Use non deprecated package names

42+ * Mark system includes as such

43+ * Fix initialization order warning

44+ * Do not rely on deleteLater not crashing on null pointers

45+ * Add more headers of classes we use for automoc to be run

46+ * CardTool: Fix the fallback value to be a size and not an integer

47+ * CardTool: Include Ubuntu Components since we're using units.gu

48+ * Rework tst_PreviewRatingDisplayCreationRanges

49+

50+ [ Daniel d'Andrada ]

51+ * Cursor: Let AnimatedSprite run only on animated cursors and while

52+ the display is on (LP: #1588873, #1594358)

53+ * Fix missing screenshot when orientation changes while shell rotation

54+ ongoing (LP: #1587796)

55+

56+ [ Josh Arenson ]

57+ * Make PreviewRatingSingleDisplay visible again after editing a

58+ review. (LP: #1587097)

59+ * Correct errors in all png images to prevent libpng warnings.

60+

61+ [ Lukáš Tinkl ]

62+ * Fix some smaller issues with OOBE wizard password pages (LP:

63+ #1590467)

64+ * Prevent mouse wheel events from going through shell elements (LP:

65+ #1536268)

66+ * Do not let mouse and wheel events pass thru the titlebar (LP:

67+ #1588424)

68+ * Hide the maximize window button based on size restrictions (LP:

69+ #1541982)

70+

71+ [ Marco Trevisan (Treviño) ]

72+ * Unity8.conf: ensure MIR_SOCKET is set for future customers (such as

73+ the dash)

74+ * ClientIndicator: be more informative about loading failures for

75+ dynamically created objects

76+

77+ [ Michael Terry ]

78+ * Stop unity8 from getting in a "switch-to-greeter" loop when locking

79+ on a desktop. (LP: #1593718)

80+

81+ [ Michael Zanetti ]

82+ * set minimum window sizes on dash

83+ * displace application windows when the OSK would cover them

84+

85+ [ Nick Dedekind ]

86+ * Force dash to always stay in the main stage. (lp:#1592404) (LP:

87+ #1592404)

88+ * Save the last surface stage on stage drop. (LP: #1579003)

89+ * Default portrait only apps to the side stage. (LP: #1573153)

90+

91+ [ Albert Astals Cid, Andrea Cimitan, Michał Sawicz, Nick Dedekind ]

92+ * Added live video playback in dash previews

93+

94+ -- Michael Zanetti <michael.zanetti@canonical.com> Mon, 27 Jun 2016 18:48:59 +0000

95+

96+unity8 (8.12+16.10.20160620.3-0ubuntu1) yakkety; urgency=medium

97+

98+ [ Michael Terry, Michał Sawicz ]

99+ * Support unlocking via fingerprint, if one is registered.

100+

101+ -- Michael Terry <michael.terry@canonical.com> Mon, 20 Jun 2016 20:25:25 +0000

102+

103+unity8 (8.12+16.10.20160617-0ubuntu1) yakkety; urgency=medium

104+

105+ [ Michael Terry ]

106+ * Do not create Label/Icon if we don't need it

107+ * Fix Z-ordering of prompt surfaces (LP: #1586219)

108+ * Drop bottom edge tutorials completely and small fixes for other

109+ edges. (LP: #1565103)

110+ * Redo visuals for greeter prompt box. (LP: #1435923)

111+ * Make tutorial qmltests more robust. (LP: #1590810)

112+ * Stop showing an extra lockscreen in desktop unity8 sessions. (LP:

113+ #1582987)

114+

115+ [ Albert Astals Cid ]

116+ * Improve dash plugin mock

117+ * Stabilize PreviewExpandableTest::test_all_widgets_height

118+ * Workaround QTBUG-53460

119+ * Split artShape code for cardTool card and regular card

120+ * Simplify the code since fixedArtSize code is mandatory for regular

121+ cards

122+ * Desktop stage: Support rotatesWindowContents (LP: #1547481)

123+ * Turn if if else into if elseif else

124+ * Fix leaks in QInputDeviceManagerPrivate::addDevice

125+ * Do not call |= on uninitialized sigterm.sa_flags

126+ * initialize udevMonitor

127+ * Make notifier and notifierFd function local variables

128+ * Fix crash if a component that is not an Item is given to

129+ sectionDelegate

130+ * Tests: Do not use dynamic_cast if we're not going to test it anyway

131+ * Minor coverity fixes

132+ * Fix warning about anchors.fill in ProportionalShape (LP: #1590963)

133+ * Make wait in cleanup() wait for snapTo animation to have finished

134+

135+ [ Alexandros Frantzis ]

136+ * Improve the way notifications interact with power management (LP:

137+ #1570922)

138+

139+ [ Andrea Cimitan ]

140+ * Correctly refresh cardcreator cache on artshapestyle changes (LP:

141+ #1588335)

142+ * Same tweaks we have for click scope now for libertine

143+ * add a timer to pull to refresh to work on small windows (LP:

144+ #1589060)

145+

146+ [ Daniel d'Andrada ]

147+ * Clean up debug leftovers

148+ * Ensure mouse and window movement are pixel-aligned (LP: #1510382)

149+ * Fix SpreadDelegate rotation animations

150+ * No point in version-controlling files that are automatically

151+ generated

152+ * Center cursor on screen when it's first shown

153+ * Custom cursor name just have to start with "custom"

154+ * Work around AnimatedSprite infinite loop bug (LP: #1588929)

155+

156+ [ Josh Arenson ]

157+ * Disable showDash when it is already shown. (LP: #1506708)

158+ * Add a timestamp to the dash log (LP: #1580074)

159+ * Add timestamp to unity8 log (LP: #1498169)

160+

161+ [ Lukáš Tinkl ]

162+ * Implement keyboard shortcuts info panel

163+ * Implement window controls overlay activatable with 3 fingers tap

164+ (LP: #1489020)

165+ * Select correct Chinese input method for OSK in the wizard (LP:

166+ #1588633)

167+

168+ [ Michael Zanetti ]

169+ * Add support for the launcher surface pips displaying the correct

170+ number of surfaces

171+ * Add support for the persistent alert state. (LP: #1575147, #1584348,

172+ #1586621)

173+ * send a Alt-release event on alt+tab instead of delaying it

174+ completely and invoking it later (LP: #1565236)

175+

176+ [ Stephen M. Webb ]

177+ * added a new upstart $SESSION for unity8-desktop-session (LP:

178+ #1376715)

179+

180+ -- Michael Terry <michael.terry@canonical.com> Fri, 17 Jun 2016 01:22:57 +0000

181+

182+unity8 (8.12+16.10.20160601.1-0ubuntu1) yakkety; urgency=medium

183+

184+ [ Pawel Stolowski ]

185+ * Added apparmor profile for unity8-dash.

186+

187+ -- Michał Sawicz <michal.sawicz@canonical.com> Wed, 01 Jun 2016 20:59:03 +0000

188+

189+unity8 (8.12+16.10.20160527-0ubuntu1) yakkety; urgency=medium

190+

191+ [ Albert Astals Cid ]

192+ * Activate on click for SimpleMessages (LP: #1421696)

193+ * Add override

194+ * Change the art back to the cardData value if it changes from broken

195+ to valid image (LP: #1533577)

196+ * Concierge mode generated code optimization

197+ * Don't use context properties but properties of the delegates

198+ * Listen to contentItem::widthChanged instead of

199+ Flickable::contentWidthChanged (LP: #1565763)

200+ * Make some AP code faster

201+ * Make tests a bit more stable

202+ * Make unity8 and unity8-dash handle termination signals

203+ * Remove workaround not needed anymore (LP: #1475643)

204+ * Resolve cardArtStyle on compile time

205+ * Set the theme earlier (LP: #1574048)

206+

207+ [ Albert Astals Cid, Daniel d'Andrada ]

208+ * Remove DirectionalDragArea and libs/UbuntuGestures and port to SDK

209+ equivalents

210+

211+ [ Andrea Cimitan ]

212+ * Hide the preview review input field when a rating is required (LP:

213+ #1541971)

214+

215+ [ CI Train Bot ]

216+ * Resync trunk.

217+

218+ [ Daniel d'Andrada ]

219+ * Fix DragHandle so it works in all directions

220+ * Support animated cursors

221+ * WindowInputMonitor - also map Qt::Key_HomePage to our home key

222+ * plugins/Cursor: properly register to the screen's QPlatformCursor

223+ when screen changes (LP: #1579742)

224+

225+ [ Josh Arenson ]

226+ * Close the PageHeaderExtraPanel when a filter option is selected (LP:

227+ #1569498)

228+ * Wrap primaryFilter in a flickable to make it behave nicely. (LP:

229+ #1569492)

230+

231+ [ Lukáš Tinkl ]

232+ * First snap decision should always be expanded, unless user decides

233+ otherwise (LP: #1580090, #1575045)

234+ * Fullscreen notification bug fixes (LP: #1583944, #1581498, #1422711)

235+ * Implement maximizing windows horizontally/vertically

236+ * Lock the session when putting the laptop into sleep (LP: #1581063)

237+

238+ [ Lukáš Tinkl, Michael Terry ]

239+ * With a maximized window, "dragging" the panel down should restore it

240+

241+ [ Michael Terry ]

242+ * Change some dash button colors from orange to green. (LP: #1581047)

243+ * Use PageHeader instead Ambiance's PageHeadStyle

244+ * Use new setTimeZone method to set user-friendly timezone name in the

245+ wizard. (LP: #1566295)

246+

247+ [ Michael Zanetti ]

248+ * Remove the background dimming when the launcher is revealed by a

249+ drag (LP: #1575137)

250+ * reenable or drop disabled tests

251+

252+ -- Michael Terry <michael.terry@canonical.com> Fri, 27 May 2016 13:54:44 +0000

253+

254+unity8 (8.12+16.10.20160520.1-0ubuntu1) yakkety; urgency=medium

255+

256+ [ Lukáš Tinkl ]

257+ * Don't dim screen when the indicators are open (LP: #1564342)

258+ * Fix upcoming alarms ETA labels (LP: #1576741)

259+ * Stabilize flaky wizard tests (LP: #1582994)

260+

261+ [ Michael Zanetti ]

262+ * fix the SIM PIN darkening after it got removed accidentally (LP:

263+ #1577147)

264+

265+ [ Michał Sawicz, Nick Dedekind ]

266+ * Fixed saving current stage and loss of surface focus when switching

267+ stages

268+

269+ [ Nick Dedekind ]

270+ * Fixed incorrect osk surface item resizing the surface.

271+

272+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 20 May 2016 08:44:19 +0000

273+

1274unity8 (8.12+16.04.20160518.1-0ubuntu1) xenial; urgency=medium

2275

3276 [ CI Train Bot ]

debian/control+26−9

@@ -5,6 +5,7 @@ Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>

55Build-Depends: cmake,

66 dbus-test-runner,

77 debhelper (>= 9),

8+ dh-apparmor,

89 doxyqml,

910# To allow cross-compiling to work, we also must append :native

1011# to g++ so we don't try to run arm g++

@@ -22,6 +23,7 @@ Build-Depends: cmake,

2223 libglib2.0-dev,

2324 libgsettings-qt-dev,

2425 libhardware-dev,

26+ liblightdm-qt5-3-dev,

2527 libpam0g-dev,

2628 libpay2-dev,

2729 libpulse-dev,

@@ -29,8 +31,10 @@ Build-Depends: cmake,

2931 libqt5svg5-dev,

3032 libqt5xmlpatterns5-dev,

3133 libsystemsettings-dev,

34+ libubuntugestures5-dev,

35+ libubuntugestures5-private-dev,

3236 libudev-dev,

33− libunity-api-dev (>= 7.112),

37+ libunity-api-dev (>= 7.115),

3438 libusermetricsoutput1-dev,

3539# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop

3640 libx11-dev[!arm64 !armhf],

@@ -41,11 +45,13 @@ Build-Depends: cmake,

4145 python3-all:any,

4246 python3-setuptools,

4347 qml-module-qt-labs-folderlistmodel,

48+ qml-module-qtmultimedia (>= 5.4.1-1ubuntu19~overlay2),

4449 qml-module-qtquick-layouts,

4550 qml-module-qtquick-xmllistmodel,

4651 qml-module-qtquick2,

4752 qml-module-qtsysteminfo,

4853 qml-module-qttest,

54+ qml-module-ubuntu-components (>= 1.3.1845) | qml-module-ubuntu-components-gles (>= 1.3.1845),

4955 qt5-default,

5056 qtbase5-dev (>= 5.4),

5157 qtbase5-dev-tools,

@@ -53,10 +59,8 @@ Build-Depends: cmake,

5359 qtdeclarative5-dev (>= 5.4),

5460 qtdeclarative5-dev-tools,

5561 qtdeclarative5-private-dev (>= 5.4),

56− qtdeclarative5-qtmultimedia-plugin (>= 5.4.1-1ubuntu19~overlay2),

5762 qtdeclarative5-ubuntu-content1,

5863 qtdeclarative5-ubuntu-settings-components (>= 0.7),

59− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),

6064 ttf-ubuntu-font-family,

6165Standards-Version: 3.9.4

6266Homepage: http://launchpad.net/unity

@@ -71,13 +75,24 @@ X-Ubuntu-Use-Langpack: yes

7175Package: indicators-client

7276Architecture: any

7377Depends: qmenumodel-qml (>= 0.2.9),

74− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),

78+ qml-module-ubuntu-components (>= 1.3.1845) | qml-module-ubuntu-components-gles (>= 1.3.1845),

7579 unity8 (= ${binary:Version}),

7680 ${misc:Depends},

7781 ${shlibs:Depends},

7882Description: Indicators client test application

7983 This package contains the client application for indicators used by autopilot

8084

85+Package: unity8-greeter

86+Architecture: any

87+Depends: unity8 (= ${binary:Version}),

88+ unity-system-compositor,

89+ ${misc:Depends},

90+ ${shlibs:Depends}

91+Recommends: lightdm

92+Provides: lightdm-greeter

93+Description: The Unity8 Greeter

94+ The Unity 8 greeter is the primary login greeter for Ubuntu devices.

95+

8196Package: unity-scope-tool

8297Architecture: any

8398Depends: unity8-common (= ${source:Version}),

@@ -99,13 +114,15 @@ Depends: dmz-cursor-theme,

99114 libcap2-bin,

100115 libglib2.0-bin,

101116 qmenumodel-qml (>= 0.2.9),

117+ qml-module-biometryd,

102118 qml-module-qt-labs-folderlistmodel,

103119 qml-module-qtquick-xmllistmodel,

104120 qml-module-qtsysteminfo,

121+ qml-module-ubuntu-web,

105122 qtdeclarative5-qtmir-plugin (>= 0.4.8),

106123 qtdeclarative5-ubuntu-telephony0.1,

107124 qtdeclarative5-ubuntu-web-plugin,

108− ubuntu-system-settings,

125+ ubuntu-system-settings (>= 0.4),

109126 unity-launcher-impl-7,

110127 unity8-common (= ${source:Version}),

111128 unity8-private (= ${binary:Version}),

@@ -127,12 +144,12 @@ Description: Unity 8 shell

127144Package: unity8-common

128145Architecture: all

129146Depends: qml-module-qtquick-layouts,

147+ qml-module-ubuntu-components (>= 1.3.1845) | qml-module-ubuntu-components-gles (>= 1.3.1845),

148+ qml-module-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

130149 qtdeclarative5-ubuntu-settings-components (>= 0.7),

131− qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

132− qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1845) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1845),

133150 qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,

134151 ubuntu-thumbnailer-impl-0,

135− unity-application-impl-16,

152+ unity-application-impl-17,

136153 unity-notifications-impl-3,

137154 unity-plugin-scopes | unity-scopes-impl,

138155 unity-scopes-impl-12,

@@ -188,7 +205,7 @@ Package: unity8-private

188205Architecture: any

189206Multi-Arch: same

190207Pre-Depends: ${misc:Pre-Depends},

191−Depends: accountsservice-ubuntu-schemas (>= 0.0.5),

208+Depends: accountsservice-ubuntu-schemas (>= 0.0.7),

192209 gsettings-ubuntu-schemas (>= 0.0.2+14.10.20140815),

193210 libhardware2,

194211 pay-service,

debian/rules+5−1

@@ -29,10 +29,14 @@ override_dh_install:

2929 cd $(CURDIR)

3030 dh_install -X'*.pyc' --fail-missing

3131

32+override_dh_installdeb:

33+ dh_apparmor --profile-name=usr.bin.unity8-dash -punity8-dash

34+ dh_installdeb

35+

3236# use private lib directories

3337override_dh_makeshlibs:

3438 dh_makeshlibs -Nunity8-private -Nunity8-fake-env

3539

36−# libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist

40+# libMockLightDM-qml.so links against liblightdm-qt5-3.so which doesn't exist

3741override_dh_shlibdeps:

3842 dh_shlibdeps -XlibMockLightDM-qml.so

debian/unity8-greeter.installnew file+5

@@ -0,0 +1,5 @@

1+data/unity8-greeter-wrapper usr/bin/

2+data/unity8-greeter-init.conf usr/share/upstart/sessions/

3+data/unity8-greeter.pkla /var/lib/polkit-1/localauthority/10-vendor.d/

4+usr/share/lightdm/greeters/unity8-greeter.desktop

5+usr/share/lightdm/lightdm.conf.d/51-unity8-greeter.conf

debian/unity8-private.install+1−2

@@ -1,11 +1,10 @@

11usr/lib/*/libunity8-private.*

2−usr/lib/*/unity8/libUbuntuGestures*

32usr/lib/*/unity8/qml/AccountsService

43usr/lib/*/unity8/qml/Cursor

54usr/lib/*/unity8/qml/Dash

65usr/lib/*/unity8/qml/GlobalShortcut

76usr/lib/*/unity8/qml/Greeter

8−usr/lib/*/unity8/qml/IntegratedLightDM

7+usr/lib/*/unity8/qml/LightDM

98usr/lib/*/unity8/qml/Lights

109usr/lib/*/unity8/qml/Powerd

1110usr/lib/*/unity8/qml/ScreenshotDirectory

debian/unity8.install+1

@@ -1,3 +1,4 @@

1+debian/usr.bin.unity8-dash etc/apparmor.d

12var/lib/unity8/version

23data/unity8-dash.conf usr/share/upstart/sessions/

34data/unity8-filewatcher.conf usr/share/upstart/sessions/

debian/usr.bin.unity8-dashnew file+21

@@ -0,0 +1,21 @@

1+# vim:syntax=apparmor

3+#include <tunables/global>

5+# v2 compatible wildly permissive profile

6+profile unity8-dash /usr/bin/unity8-dash (attach_disconnected) {

7+ capability,

8+ network,

9+ / rwkl,

10+ /** rwlkm,

11+ /** pix,

12+

13+ mount,

14+ remount,

15+ umount,

16+ pivot_root,

17+ dbus,

18+ signal,

19+ ptrace,

20+ unix,

21+}

libs/CMakeLists.txtdeleted−1

@@ -1 +0,0 @@

1−add_subdirectory(UbuntuGestures)

libs/UbuntuGestures/CMakeLists.txtdeleted−41

@@ -1,41 +0,0 @@

1−# in order to include Qt's private headers

2−remove_definitions(-DQT_NO_KEYWORDS)

3−

4−set(UbuntuGestures_SOURCES

5− CandidateInactivityTimer.cpp

6− DebugHelpers.cpp

7− Timer.cpp

8− TimeSource.cpp

9− TouchOwnershipEvent.cpp

10− TouchRegistry.cpp

11− UnownedTouchEvent.cpp

12−)

13−

14−add_definitions(-DUBUNTUGESTURES_LIBRARY)

15−

16−add_library(UbuntuGestures SHARED ${UbuntuGestures_SOURCES})

17−

18−qt5_use_modules(UbuntuGestures Core Quick)

19−

20−# So that Foo.cpp can #include "Foo.moc"

21−include_directories(${CMAKE_CURRENT_BINARY_DIR})

22−

23−install(TARGETS UbuntuGestures

24− DESTINATION ${SHELL_PRIVATE_LIBDIR})

25−

26−

27−# There's no cmake var for v8 include path :-/ so create one

28−LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)

29−if(${Qt5Core_VERSION_STRING} VERSION_LESS "5.1.0")

30− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/../QtV8/${Qt5Core_VERSION_STRING}/QtV8)

31−else()

32− SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)

33−endif()

34−

35−# DANGER! DANGER! Using Qt's private API!

36−include_directories(

37− ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

38− ${Qt5Quick_INCLUDE_DIRS}

39− ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

40− ${Qt5V8_PRIVATE_INCLUDE_DIR}

41−)

libs/UbuntuGestures/CandidateInactivityTimer.cppdeleted−46

@@ -1,46 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "CandidateInactivityTimer.h"

18−

19−namespace UbuntuGestures {

20−

21−CandidateInactivityTimer::CandidateInactivityTimer(int touchId, QQuickItem *candidate,

22− AbstractTimer *timer, QObject *parent)

23− : QObject(parent)

24− , m_timer(timer)

25− , m_touchId(touchId)

26− , m_candidate(candidate)

27−{

28− connect(m_timer, &AbstractTimer::timeout,

29− this, &CandidateInactivityTimer::onTimeout);

30− m_timer->setInterval(durationMs);

31− m_timer->setSingleShot(true);

32− m_timer->start();

33−}

34−

35−CandidateInactivityTimer::~CandidateInactivityTimer()

36−{

37− delete m_timer;

38−}

39−

40−void CandidateInactivityTimer::onTimeout()

41−{

42− qWarning("[TouchRegistry] Candidate for touch %d defaulted!", m_touchId);

43− Q_EMIT candidateDefaulted(m_touchId, m_candidate);

44−}

45−

46−} // namespace UbuntuGestures

libs/UbuntuGestures/CandidateInactivityTimer.hdeleted−51

@@ -1,51 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H

18−#define UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H

19−

20−#include <QObject>

21−

22−class QQuickItem;

23−

24−#include "Timer.h"

25−

26−namespace UbuntuGestures {

27−

28−class UBUNTUGESTURES_EXPORT CandidateInactivityTimer : public QObject {

29− Q_OBJECT

30−public:

31− CandidateInactivityTimer(int touchId, QQuickItem *candidate,

32− AbstractTimer *timer,

33− QObject *parent = nullptr);

34−

35− virtual ~CandidateInactivityTimer();

36−

37− const int durationMs = 1000;

38−

39−Q_SIGNALS:

40− void candidateDefaulted(int touchId, QQuickItem *candidate);

41−private Q_SLOTS:

42− void onTimeout();

43−private:

44− AbstractTimer *m_timer;

45− int m_touchId;

46− QQuickItem *m_candidate;

47−};

48−

49−} // namespace UbuntuGestures

50−

51−#endif // UBUNTUGESTURES_CANDIDATE_INACTIVITY_TIMER_H

libs/UbuntuGestures/DebugHelpers.cppdeleted−95

@@ -1,95 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "DebugHelpers.h"

18−#include <QTouchEvent>

19−#include <QMouseEvent>

20−

21−QString touchPointStateToString(Qt::TouchPointState state)

22−{

23− switch (state) {

24− case Qt::TouchPointPressed:

25− return QStringLiteral("pressed");

26− case Qt::TouchPointMoved:

27− return QStringLiteral("moved");

28− case Qt::TouchPointStationary:

29− return QStringLiteral("stationary");

30− case Qt::TouchPointReleased:

31− return QStringLiteral("released");

32− default:

33− return QStringLiteral("INVALID_STATE");

34− }

35−}

36−

37−QString touchEventToString(const QTouchEvent *ev)

38−{

39− QString message;

40−

41− switch (ev->type()) {

42− case QEvent::TouchBegin:

43− message.append("TouchBegin ");

44− break;

45− case QEvent::TouchUpdate:

46− message.append("TouchUpdate ");

47− break;

48− case QEvent::TouchEnd:

49− message.append("TouchEnd ");

50− break;

51− case QEvent::TouchCancel:

52− message.append("TouchCancel ");

53− break;

54− default:

55− message.append("INVALID_TOUCH_EVENT_TYPE ");

56− }

57−

58− foreach(const QTouchEvent::TouchPoint& touchPoint, ev->touchPoints()) {

59− message.append(

60− QStringLiteral("(id:%1, state:%2, scenePos:(%3,%4)) ")

61− .arg(touchPoint.id())

62− .arg(touchPointStateToString(touchPoint.state()))

63− .arg(touchPoint.scenePos().x())

64− .arg(touchPoint.scenePos().y())

65− );

66− }

67−

68− return message;

69−}

70−

71−QString mouseEventToString(const QMouseEvent *ev)

72−{

73− QString message;

74−

75− switch (ev->type()) {

76− case QEvent::MouseButtonPress:

77− message.append("MouseButtonPress ");

78− break;

79− case QEvent::MouseButtonRelease:

80− message.append("MouseButtonRelease ");

81− break;

82− case QEvent::MouseButtonDblClick:

83− message.append("MouseButtonDblClick ");

84− break;

85− case QEvent::MouseMove:

86− message.append("MouseMove ");

87− break;

88− default:

89− message.append("INVALID_MOUSE_EVENT_TYPE ");

90− }

91−

92− message.append(QStringLiteral("pos(%1, %2)").arg(ev->x()).arg(ev->y()));

93−

94− return message;

95−}

libs/UbuntuGestures/DebugHelpers.hdeleted−31

@@ -1,31 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef UBUNTUGESTURES_DEBUG_HELPER_H

18−#define UBUNTUGESTURES_DEBUG_HELPER_H

19−

20−#include <QString>

21−

22−#include "UbuntuGesturesGlobal.h"

23−

24−class QMouseEvent;

25−class QTouchEvent;

26−

27−UBUNTUGESTURES_EXPORT QString touchPointStateToString(Qt::TouchPointState state);

28−UBUNTUGESTURES_EXPORT QString touchEventToString(const QTouchEvent *ev);

29−UBUNTUGESTURES_EXPORT QString mouseEventToString(const QMouseEvent *ev);

30−

31−#endif // UBUNTUGESTURES_DEBUG_HELPER_H

libs/UbuntuGestures/Pool.hdeleted−124

@@ -1,124 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef UBUNTUGESTURES_POOL_H

18−#define UBUNTUGESTURES_POOL_H

19−

20−#include <QVector>

21−

22−#include "UbuntuGesturesGlobal.h"

23−

24−/*

25− An object pool.

26− Avoids unnecessary creations/initializations and deletions/destructions of items. Useful

27− in a scenario where items are created and destroyed very frequently but the total number

28− of items at any given time remains small. They're stored in a unordered fashion.

29−

30− To be used in Pool, ItemType needs to have the following methods:

31−

32− - ItemType();

33−

34− A constructor that takes no parameters. An object contructed with it must return false if

35− isValid() is called.

36−

37− - bool isValid() const;

38−

39− Returns wheter the object holds a valid , "filled" state or is empty.

40− Used by Pool to check if the slot occupied by this object is actually available.

41−

42− - void reset();

43−

44− Resets the object to its initial, empty, state. After calling this method, isValid() must

45− return false.

46− */

47−template <class ItemType> class Pool

48−{

49−public:

50− Pool() : m_lastUsedIndex(-1) {

51− }

52−

53− class Iterator {

54− public:

55− Iterator() : index(-1), item(nullptr) {}

56− Iterator(int index, ItemType *item)

57− : index(index), item(item) {}

58−

59− ItemType *operator->() const { return item; }

60− ItemType &operator*() const { return *item; }

61− ItemType &value() const { return *item; }

62−

63− operator bool() const { return item != nullptr; }

64−

65− int index;

66− ItemType *item;

67− };

68−

69− ItemType &getEmptySlot() {

70− Q_ASSERT(m_lastUsedIndex < m_slots.size());

71−

72− // Look for an in-between vacancy first

73− for (int i = 0; i < m_lastUsedIndex; ++i) {

74− ItemType &item = m_slots[i];

75− if (!item.isValid()) {

76− return item;

77− }

78− }

79−

80− ++m_lastUsedIndex;

81− if (m_lastUsedIndex >= m_slots.size()) {

82− m_slots.resize(m_lastUsedIndex + 1);

83− }

84−

85− return m_slots[m_lastUsedIndex];

86− }

87−

88− void freeSlot(Iterator &iterator) {

89− m_slots[iterator.index].reset();

90− if (iterator.index == m_lastUsedIndex) {

91− do {

92− --m_lastUsedIndex;

93− } while (m_lastUsedIndex >= 0 && !m_slots.at(m_lastUsedIndex).isValid());

94− }

95− }

96−

97− // Iterates through all valid items (i.e. the occupied slots)

98− // calling the given function, with the option of ending the loop early.

99− //

100− // bool Func(Iterator& item)

101− //

102− // Returning true means it wants to continue the "for" loop, false

103− // terminates the loop.

104− template<typename Func> void forEach(Func func) {

105− Iterator it;

106− for (it.index = 0; it.index <= m_lastUsedIndex; ++it.index) {

107− it.item = &m_slots[it.index];

108− if (!it.item->isValid())

109− continue;

110−

111− if (!func(it))

112− break;

113− }

114− }

115−

116− bool isEmpty() const { return m_lastUsedIndex == -1; }

117−

118−

119−private:

120− QVector<ItemType> m_slots;

121− int m_lastUsedIndex;

122−};

123−

124−#endif // UBUNTUGESTURES_POOL_H

libs/UbuntuGestures/TimeSource.cppdeleted−49

@@ -1,49 +0,0 @@

1−/*

3− *

4− * This program is free software: you can redistribute it and/or modify it

5− * under the terms of the GNU Lesser General Public License, as

6− * published by the Free Software Foundation; either version 2.1 or 3.0

7− * of the License.

8− *

9− * This program is distributed in the hope that it will be useful, but

10− * WITHOUT ANY WARRANTY; without even the implied warranties of

11− * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR

12− * PURPOSE. See the applicable version of the GNU Lesser General Public

13− * License for more details.

14− *

15− * You should have received a copy of both the GNU Lesser General Public

16− * License along with this program. If not, see <http://www.gnu.org/licenses/>

17− *

18− * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>

19− */

20−

21−#include "TimeSource.h"

22−

23−#include <QElapsedTimer>

24−

25−namespace UbuntuGestures {

26−class RealTimeSourcePrivate {

27−public:

28− QElapsedTimer timer;

29−};

30−}

31−

32−using namespace UbuntuGestures;

33−

34−RealTimeSource::RealTimeSource()

35− : UbuntuGestures::TimeSource()

36− , d(new RealTimeSourcePrivate)

37−{

38− d->timer.start();

39−}

40−

41−RealTimeSource::~RealTimeSource()

42−{

43− delete d;

44−}

45−

46−qint64 RealTimeSource::msecsSinceReference()

47−{

48− return d->timer.elapsed();

49−}

libs/UbuntuGestures/TimeSource.hdeleted−64

@@ -1,64 +0,0 @@

1−/*

3− *

4− * This program is free software: you can redistribute it and/or modify it

5− * under the terms of the GNU Lesser General Public License, as

6− * published by the Free Software Foundation; either version 2.1 or 3.0

7− * of the License.

8− *

9− * This program is distributed in the hope that it will be useful, but

10− * WITHOUT ANY WARRANTY; without even the implied warranties of

11− * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR

12− * PURPOSE. See the applicable version of the GNU Lesser General Public

13− * License for more details.

14− *

15− * You should have received a copy of both the GNU Lesser General Public

16− * License along with this program. If not, see <http://www.gnu.org/licenses/>

17− *

18− * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com>

19− */

20−

21−#ifndef UBUNTUGESTURES_TIMESOURCE_H

22−#define UBUNTUGESTURES_TIMESOURCE_H

23−

24−#include "UbuntuGesturesGlobal.h"

25−#include <QSharedPointer>

26−

27−namespace UbuntuGestures {

28−/*

29− Interface for a time source.

30− */

31−class UBUNTUGESTURES_EXPORT TimeSource {

32−public:

33− virtual ~TimeSource() {}

34− /* Returns the current time in milliseconds since some reference time in the past. */

35− virtual qint64 msecsSinceReference() = 0;

36−};

37−typedef QSharedPointer<TimeSource> SharedTimeSource;

38−

39−/*

40− Implementation of a time source

41− */

42−class RealTimeSourcePrivate;

43−class UBUNTUGESTURES_EXPORT RealTimeSource : public TimeSource {

44−public:

45− RealTimeSource();

46− virtual ~RealTimeSource();

47− qint64 msecsSinceReference() override;

48−private:

49− RealTimeSourcePrivate *d;

50−};

51−

52−/*

53− A fake time source, useful for tests

54− */

55−class FakeTimeSource : public TimeSource {

56−public:

57− FakeTimeSource() { m_msecsSinceReference = 0; }

58− qint64 msecsSinceReference() override { return m_msecsSinceReference; }

59− qint64 m_msecsSinceReference;

60−};

61−

62−} // namespace UbuntuGestures

63−

64−#endif // UBUNTUGESTURES_TIMESOURCE_H

libs/UbuntuGestures/Timer.cppdeleted−152

@@ -1,152 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "Timer.h"

18−

19−namespace UbuntuGestures {

20−

21−Timer::Timer(QObject *parent) : AbstractTimer(parent)

22−{

23− m_timer.setSingleShot(false);

24− connect(&m_timer, &QTimer::timeout, this, &AbstractTimer::timeout);

25−}

26−

27−int Timer::interval() const

28−{

29− return m_timer.interval();

30−}

31−

32−void Timer::setInterval(int msecs)

33−{

34− m_timer.setInterval(msecs);

35−}

36−

37−void Timer::start()

38−{

39− m_timer.start();

40− AbstractTimer::start();

41−}

42−

43−void Timer::stop()

44−{

45− m_timer.stop();

46− AbstractTimer::stop();

47−}

48−

49−bool Timer::isSingleShot() const

50−{

51− return m_timer.isSingleShot();

52−}

53−

54−void Timer::setSingleShot(bool value)

55−{

56− m_timer.setSingleShot(value);

57−}

58−

59−/////////////////////////////////// FakeTimer //////////////////////////////////

60−

61−FakeTimer::FakeTimer(const SharedTimeSource &timeSource, QObject *parent)

62− : UbuntuGestures::AbstractTimer(parent)

63− , m_interval(0)

64− , m_singleShot(false)

65− , m_timeSource(timeSource)

66−{

67−}

68−

69−void FakeTimer::update()

70−{

71− if (!isRunning()) {

72− return;

73− }

74−

75− if (m_nextTimeoutTime <= m_timeSource->msecsSinceReference()) {

76− if (isSingleShot()) {

77− stop();

78− } else {

79− m_nextTimeoutTime += interval();

80− }

81− Q_EMIT timeout();

82− }

83−}

84−

85−void FakeTimer::start()

86−{

87− AbstractTimer::start();

88− m_nextTimeoutTime = m_timeSource->msecsSinceReference() + (qint64)interval();

89−}

90−

91−int FakeTimer::interval() const

92−{

93− return m_interval;

94−}

95−

96−void FakeTimer::setInterval(int msecs)

97−{

98− m_interval = msecs;

99−}

100−

101−bool FakeTimer::isSingleShot() const

102−{

103− return m_singleShot;

104−}

105−

106−void FakeTimer::setSingleShot(bool value)

107−{

108− m_singleShot = value;

109−}

110−

111−/////////////////////////////////// FakeTimerFactory //////////////////////////////////

112−

113−FakeTimerFactory::FakeTimerFactory()

114−{

115− m_timeSource.reset(new FakeTimeSource);

116−}

117−

118−void FakeTimerFactory::updateTime(qint64 targetTime)

119−{

120− qint64 minTimeoutTime = targetTime;

121−

122− for (int i = 0; i < timers.count(); ++i) {

123− FakeTimer *timer = timers[i].data();

124− if (timer && timer->isRunning() && timer->nextTimeoutTime() < minTimeoutTime) {

125− minTimeoutTime = timer->nextTimeoutTime();

126− }

127− }

128−

129− m_timeSource->m_msecsSinceReference = minTimeoutTime;

130−

131− for (int i = 0; i < timers.count(); ++i) {

132− FakeTimer *timer = timers[i].data();

133− if (timer) {

134− timer->update();

135− }

136− }

137−

138− if (m_timeSource->msecsSinceReference() < targetTime) {

139− updateTime(targetTime);

140− }

141−}

142−

143−AbstractTimer *FakeTimerFactory::createTimer(QObject *parent)

144−{

145− FakeTimer *fakeTimer = new FakeTimer(m_timeSource, parent);

146−

147− timers.append(fakeTimer);

148−

149− return fakeTimer;

150−}

151−

152−} // namespace UbuntuGestures

libs/UbuntuGestures/Timer.hdeleted−122

@@ -1,122 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef UBUNTUGESTURES_TIMER_H

18−#define UBUNTUGESTURES_TIMER_H

19−

20−#include "UbuntuGesturesGlobal.h"

21−#include "TimeSource.h"

22−

23−#include <QObject>

24−#include <QPointer>

25−#include <QTimer>

26−

27−namespace UbuntuGestures {

28−

29−/* Defines an interface for a Timer. Useful for tests. */

30−class UBUNTUGESTURES_EXPORT AbstractTimer : public QObject

31−{

32− Q_OBJECT

33−public:

34− AbstractTimer(QObject *parent) : QObject(parent), m_isRunning(false) {}

35− virtual int interval() const = 0;

36− virtual void setInterval(int msecs) = 0;

37− virtual void start() { m_isRunning = true; }

38− virtual void start(int msecs)

39− {

40− setInterval(msecs);

41− start();

42− }

43− virtual void stop() { m_isRunning = false; }

44− bool isRunning() const { return m_isRunning; }

45− virtual bool isSingleShot() const = 0;

46− virtual void setSingleShot(bool value) = 0;

47−Q_SIGNALS:

48− void timeout();

49−private:

50− bool m_isRunning;

51−};

52−

53−/* Essentially a QTimer wrapper */

54−class UBUNTUGESTURES_EXPORT Timer : public AbstractTimer

55−{

56− Q_OBJECT

57−public:

58− Timer(QObject *parent = nullptr);

59−

60− int interval() const override;

61− void setInterval(int msecs) override;

62− void start() override;

63− void stop() override;

64− bool isSingleShot() const override;

65− void setSingleShot(bool value) override;

66−private:

67− QTimer m_timer;

68−};

69−

70−/* For tests */

71−class UBUNTUGESTURES_EXPORT FakeTimer : public AbstractTimer

72−{

73− Q_OBJECT

74−public:

75− FakeTimer(const SharedTimeSource &timeSource, QObject *parent = nullptr);

76−

77− void update();

78− qint64 nextTimeoutTime() const { return m_nextTimeoutTime; }

79−

80− int interval() const override;

81− void setInterval(int msecs) override;

82− void start() override;

83− bool isSingleShot() const override;

84− void setSingleShot(bool value) override;

85−private:

86− int m_interval;

87− bool m_singleShot;

88− SharedTimeSource m_timeSource;

89− qint64 m_nextTimeoutTime;

90−};

91−

92−class UBUNTUGESTURES_EXPORT AbstractTimerFactory

93−{

94−public:

95− virtual ~AbstractTimerFactory() {}

96− virtual AbstractTimer *createTimer(QObject *parent = nullptr) = 0;

97−};

98−

99−class UBUNTUGESTURES_EXPORT TimerFactory : public AbstractTimerFactory

100−{

101−public:

102− AbstractTimer *createTimer(QObject *parent = nullptr) override { return new Timer(parent); }

103−};

104−

105−class UBUNTUGESTURES_EXPORT FakeTimerFactory : public AbstractTimerFactory

106−{

107−public:

108− FakeTimerFactory();

109− virtual ~FakeTimerFactory() {}

110−

111− void updateTime(qint64 msecsSinceReference);

112− QSharedPointer<TimeSource> timeSource() { return m_timeSource; }

113−

114− AbstractTimer *createTimer(QObject *parent = nullptr) override;

115− QList<QPointer<FakeTimer>> timers;

116−private:

117− QSharedPointer<FakeTimeSource> m_timeSource;

118−};

119−

120−} // namespace UbuntuGestures

121−

122−#endif // UBUNTUGESTURES_TIMER_H

libs/UbuntuGestures/TouchOwnershipEvent.hdeleted−50

@@ -1,50 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef UBUNTU_TOUCHOWNERSHIPEVENT_H

18−#define UBUNTU_TOUCHOWNERSHIPEVENT_H

19−

20−#include <QEvent>

21−#include "UbuntuGesturesGlobal.h"

22−

23−/*

24− When an item get an ownership event for a touch it can grab/steal that touch

25− with a clean conscience.

26− */

27−class UBUNTUGESTURES_EXPORT TouchOwnershipEvent : public QEvent

28−{

29−public:

30− TouchOwnershipEvent(int touchId, bool gained);

31−

32− static Type touchOwnershipEventType();

33−

34− /*

35− Whether ownership was gained (true) or lost (false)

36− */

37− bool gained() const { return m_gained; }

38−

39− /*

40− Id of the touch whose ownership was granted.

41− */

42− int touchId() const { return m_touchId; }

43−

44−private:

45− static Type m_touchOwnershipType;

46− int m_touchId;

47− bool m_gained;

48−};

49−

50−#endif // UBUNTU_TOUCHOWNERSHIPEVENT_H

libs/UbuntuGestures/TouchRegistry.cppdeleted−553

@@ -1,553 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "TouchRegistry.h"

18−

19−#include <QCoreApplication>

20−#include <QDebug>

21−

22−#pragma GCC diagnostic push

23−#pragma GCC diagnostic ignored "-pedantic"

24−#include <private/qquickitem_p.h>

25−#pragma GCC diagnostic pop

26−

27−#include "CandidateInactivityTimer.h"

28−#include "Timer.h"

29−#include "TouchOwnershipEvent.h"

30−#include "UnownedTouchEvent.h"

31−

32−#define TOUCHREGISTRY_DEBUG 0

33−

34−#if TOUCHREGISTRY_DEBUG

35− #include "DebugHelpers.h"

36− #define UG_DEBUG qDebug() << "[TouchRegistry]"

37−#endif // TOUCHREGISTRY_DEBUG

38−

39−using namespace UbuntuGestures;

40−

41−TouchRegistry *TouchRegistry::m_instance = nullptr;

42−

43−TouchRegistry::TouchRegistry(QObject *parent)

44− : QObject(parent)

45− , m_inDispatchLoop(false)

46− , m_timerFactory(new TimerFactory)

47−{

48−}

49−

50−TouchRegistry::~TouchRegistry()

51−{

52− Q_ASSERT(m_instance != nullptr);

53− m_instance = nullptr;

54− delete m_timerFactory;

55−}

56−

57−TouchRegistry *TouchRegistry::instance()

58−{

59− if (m_instance == nullptr) {

60− m_instance = new TouchRegistry;

61− }

62− return m_instance;

63−}

64−

65−void TouchRegistry::setTimerFactory(AbstractTimerFactory *timerFactory)

66−{

67− delete m_timerFactory;

68− m_timerFactory = timerFactory;

69−}

70−

71−void TouchRegistry::update(const QTouchEvent *event)

72−{

73− #if TOUCHREGISTRY_DEBUG

74− UG_DEBUG << "got" << qPrintable(touchEventToString(event));

75− #endif

76−

77− const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();

78− for (int i = 0; i < touchPoints.count(); ++i) {

79− const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);

80− if (touchPoint.state() == Qt::TouchPointPressed) {

81− TouchInfo &touchInfo = m_touchInfoPool.getEmptySlot();

82− touchInfo.init(touchPoint.id());

83− } else if (touchPoint.state() == Qt::TouchPointReleased) {

84− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchPoint.id());

85−

86− touchInfo->physicallyEnded = true;

87− }

88− }

89−

90− deliverTouchUpdatesToUndecidedCandidatesAndWatchers(event);

91−

92− freeEndedTouchInfos();

93−}

94−

95−void TouchRegistry::deliverTouchUpdatesToUndecidedCandidatesAndWatchers(const QTouchEvent *event)

96−{

97− // TODO: Look into how we could optimize this whole thing.

98− // Although it's not really a problem as we should have at most two candidates

99− // for each point and there should not be many active points at any given moment.

100− // But having three nested for-loops does scare.

101−

102− const QList<QTouchEvent::TouchPoint> &updatedTouchPoints = event->touchPoints();

103−

104− // Maps an item to the touches in this event he should be informed about.

105− // E.g.: a QTouchEvent might have three touches but a given item might be interested in only

106− // one of them. So he will get a UnownedTouchEvent from this QTouchEvent containing only that

107− // touch point.

108− QHash<QQuickItem*, QList<int>> touchIdsForItems;

109−

110− // Build touchIdsForItems

111− m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &touchInfo) {

112− if (touchInfo->isOwned() && touchInfo->watchers.isEmpty())

113− return true;

114−

115− for (int j = 0; j < updatedTouchPoints.count(); ++j) {

116− if (updatedTouchPoints[j].id() == touchInfo->id) {

117− if (!touchInfo->isOwned()) {

118− for (int i = 0; i < touchInfo->candidates.count(); ++i) {

119− CandidateInfo &candidate = touchInfo->candidates[i];

120− Q_ASSERT(!candidate.item.isNull());

121− if (candidate.state != CandidateInfo::InterimOwner) {

122− touchIdsForItems[candidate.item.data()].append(touchInfo->id);

123− }

124− }

125− }

126−

127− const QList<QPointer<QQuickItem>> &watchers = touchInfo->watchers;

128− for (int i = 0; i < watchers.count(); ++i) {

129− if (!watchers[i].isNull()) {

130− touchIdsForItems[watchers[i].data()].append(touchInfo->id);

131− }

132− }

133−

134− return true;

135− }

136− }

137−

138− return true;

139− });

140−

141− // TODO: Consider what happens if an item calls any of TouchRegistry's public methods

142− // from the event handler callback.

143− m_inDispatchLoop = true;

144− auto it = touchIdsForItems.constBegin();

145− while (it != touchIdsForItems.constEnd()) {

146− QQuickItem *item = it.key();

147− const QList<int> &touchIds = it.value();

148− dispatchPointsToItem(event, touchIds, item);

149− ++it;

150− };

151− m_inDispatchLoop = false;

152−}

153−

154−void TouchRegistry::freeEndedTouchInfos()

155−{

156− m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &touchInfo) {

157− if (touchInfo->ended()) {

158− m_touchInfoPool.freeSlot(touchInfo);

159− }

160− return true;

161− });

162−}

163−

164−/*

165− Extracts the touches with the given touchIds from event and send them in a

166− UnownedTouchEvent to the given item

167− */

168−void TouchRegistry::dispatchPointsToItem(const QTouchEvent *event, const QList<int> &touchIds,

169− QQuickItem *item)

170−{

171− Qt::TouchPointStates touchPointStates = 0;

172− QList<QTouchEvent::TouchPoint> touchPoints;

173−

174− const QList<QTouchEvent::TouchPoint> &allTouchPoints = event->touchPoints();

175−

176− QTransform windowToCandidateTransform = QQuickItemPrivate::get(item)->windowToItemTransform();

177− QMatrix4x4 windowToCandidateMatrix(windowToCandidateTransform);

178−

179− for (int i = 0; i < allTouchPoints.count(); ++i) {

180− const QTouchEvent::TouchPoint &originalTouchPoint = allTouchPoints[i];

181− if (touchIds.contains(originalTouchPoint.id())) {

182− QTouchEvent::TouchPoint touchPoint = originalTouchPoint;

183−

184− translateTouchPointFromScreenToWindowCoords(touchPoint);

185−

186− // Set the point's local coordinates to that of the item

187− touchPoint.setRect(windowToCandidateTransform.mapRect(touchPoint.sceneRect()));

188− touchPoint.setStartPos(windowToCandidateTransform.map(touchPoint.startScenePos()));

189− touchPoint.setLastPos(windowToCandidateTransform.map(touchPoint.lastScenePos()));

190− touchPoint.setVelocity(windowToCandidateMatrix.mapVector(touchPoint.velocity()).toVector2D());

191−

192− touchPoints.append(touchPoint);

193− touchPointStates |= touchPoint.state();

194− }

195− }

196−

197− QTouchEvent *eventForItem = new QTouchEvent(event->type(),

198− event->device(),

199− event->modifiers(),

200− touchPointStates,

201− touchPoints);

202− eventForItem->setWindow(event->window());

203− eventForItem->setTimestamp(event->timestamp());

204− eventForItem->setTarget(event->target());

205−

206− UnownedTouchEvent unownedTouchEvent(eventForItem);

207−

208− #if TOUCHREGISTRY_DEBUG

209− UG_DEBUG << "Sending unowned" << qPrintable(touchEventToString(eventForItem))

210− << "to" << item;

211− #endif

212−

213− QCoreApplication::sendEvent(item, &unownedTouchEvent);

214−}

215−

216−void TouchRegistry::translateTouchPointFromScreenToWindowCoords(QTouchEvent::TouchPoint &touchPoint)

217−{

218− touchPoint.setScreenRect(touchPoint.sceneRect());

219− touchPoint.setStartScreenPos(touchPoint.startScenePos());

220− touchPoint.setLastScreenPos(touchPoint.lastScenePos());

221−

222− touchPoint.setSceneRect(touchPoint.rect());

223− touchPoint.setStartScenePos(touchPoint.startPos());

224− touchPoint.setLastScenePos(touchPoint.lastPos());

225−}

226−

227−bool TouchRegistry::eventFilter(QObject *watched, QEvent *event)

228−{

229− Q_UNUSED(watched);

230−

231− switch (event->type()) {

232− case QEvent::TouchBegin:

233− case QEvent::TouchUpdate:

234− case QEvent::TouchEnd:

235− case QEvent::TouchCancel:

236− update(static_cast<QTouchEvent*>(event));

237− break;

238− default:

239− // do nothing

240− break;

241− }

242−

243− // Do not filter out the event. i.e., let it be handled further as

244− // we're just monitoring events

245− return false;

246−}

247−

248−void TouchRegistry::addCandidateOwnerForTouch(int id, QQuickItem *candidate)

249−{

250− #if TOUCHREGISTRY_DEBUG

251− UG_DEBUG << "addCandidateOwnerForTouch id" << id << "candidate" << candidate;

252− #endif

253−

254− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);

255− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }

256−

257− if (touchInfo->isOwned()) {

258− qWarning("TouchRegistry: trying to add candidate owner for a touch that's already owned");

259− return;

260− }

261−

262− // TODO: Check if candidate already exists

263−

264− CandidateInfo candidateInfo;

265− candidateInfo.state = CandidateInfo::Undecided;

266− candidateInfo.item = candidate;

267− candidateInfo.inactivityTimer = new CandidateInactivityTimer(id, candidate,

268− m_timerFactory->createTimer(),

269− this);

270− connect(candidateInfo.inactivityTimer, &CandidateInactivityTimer::candidateDefaulted,

271− this, &TouchRegistry::rejectCandidateOwnerForTouch);

272−

273− touchInfo->candidates.append(candidateInfo);

274−

275− connect(candidate, &QObject::destroyed, this, [=](){ pruneNullCandidatesForTouch(id); });

276−}

277−

278−void TouchRegistry::addTouchWatcher(int touchId, QQuickItem *watcher)

279−{

280− #if TOUCHREGISTRY_DEBUG

281− UG_DEBUG << "addTouchWatcher id" << touchId << "watcher" << watcher;

282− #endif

283−

284− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchId);

285− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }

286−

287− // TODO: Check if watcher already exists

288−

289− touchInfo->watchers.append(watcher);

290−}

291−

292−void TouchRegistry::removeCandidateOwnerForTouch(int id, QQuickItem *candidate)

293−{

294− #if TOUCHREGISTRY_DEBUG

295− UG_DEBUG << "removeCandidateOwnerForTouch id" << id << "candidate" << candidate;

296− #endif

297−

298− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);

299− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }

300−

301−

302− // TODO: check if the candidate is in fact the owner of the touch

303−

304− bool removed = false;

305− for (int i = 0; i < touchInfo->candidates.count() && !removed; ++i) {

306− if (touchInfo->candidates[i].item == candidate) {

307− removeCandidateOwnerForTouchByIndex(touchInfo, i);

308− removed = true;

309− }

310− }

311−}

312−

313−void TouchRegistry::pruneNullCandidatesForTouch(int touchId)

314−{

315− #if TOUCHREGISTRY_DEBUG

316− UG_DEBUG << "pruneNullCandidatesForTouch touchId" << touchId;

317− #endif

318−

319− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(touchId);

320− if (!touchInfo) {

321− // doesn't matter as touch is already gone.

322− return;

323− }

324−

325− int i = 0;

326− while (i < touchInfo->candidates.count()) {

327− if (touchInfo->candidates[i].item.isNull()) {

328− removeCandidateOwnerForTouchByIndex(touchInfo, i);

329− } else {

330− ++i;

331− }

332− }

333−}

334−

335−void TouchRegistry::removeCandidateOwnerForTouchByIndex(Pool<TouchRegistry::TouchInfo>::Iterator &touchInfo,

336− int candidateIndex)

337−{

338− // TODO: check if the candidate is in fact the owner of the touch

339−

340− Q_ASSERT(candidateIndex < touchInfo->candidates.count());

341−

342− if (candidateIndex == 0 && touchInfo->candidates[candidateIndex].state != CandidateInfo::Undecided) {

343− qCritical("TouchRegistry: touch owner is being removed.");

344− }

345− removeCandidateHelper(touchInfo, candidateIndex);

346−

347− if (candidateIndex == 0) {

348− // the top candidate has been removed. if the new top candidate

349− // wants the touch let him know he's now the owner.

350− if (touchInfo->isOwned()) {

351− touchInfo->notifyCandidatesOfOwnershipResolution();

352− }

353− }

354−

355− if (!m_inDispatchLoop && touchInfo->ended()) {

356− m_touchInfoPool.freeSlot(touchInfo);

357− }

358−}

359−

360−void TouchRegistry::requestTouchOwnership(int id, QQuickItem *candidate)

361−{

362− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);

363− if (!touchInfo) { qFatal("TouchRegistry: Failed to find TouchInfo"); }

364−

365− Q_ASSERT(!touchInfo->isOwned());

366−

367− int candidateIndex = -1;

368− for (int i = 0; i < touchInfo->candidates.count(); ++i) {

369− CandidateInfo &candidateInfo = touchInfo->candidates[i];

370− if (candidateInfo.item == candidate) {

371− candidateInfo.state = CandidateInfo::Requested;

372− delete candidateInfo.inactivityTimer;

373− candidateInfo.inactivityTimer = nullptr;

374− candidateIndex = i;

375− break;

376− }

377− }

378− #if TOUCHREGISTRY_DEBUG

379− UG_DEBUG << "requestTouchOwnership id " << id << "candidate" << candidate << "index: " << candidateIndex;

380− #endif

381−

382− // add it as a candidate if not present yet

383− if (candidateIndex < 0) {

384− CandidateInfo candidateInfo;

385− candidateInfo.state = CandidateInfo::InterimOwner;

386− candidateInfo.item = candidate;

387− candidateInfo.inactivityTimer = nullptr;

388− touchInfo->candidates.append(candidateInfo);

389− // it's the last one

390− candidateIndex = touchInfo->candidates.count() - 1;

391− connect(candidate, &QObject::destroyed, this, [=](){ pruneNullCandidatesForTouch(id); });

392− }

393−

394− // If it's the top candidate it means it's now the owner. Let

395− // it know about it.

396− if (candidateIndex == 0) {

397− touchInfo->notifyCandidatesOfOwnershipResolution();

398− }

399−}

400−

401−Pool<TouchRegistry::TouchInfo>::Iterator TouchRegistry::findTouchInfo(int id)

402−{

403− Pool<TouchInfo>::Iterator touchInfo;

404−

405− m_touchInfoPool.forEach([&](Pool<TouchInfo>::Iterator &someTouchInfo) -> bool {

406− if (someTouchInfo->id == id) {

407− touchInfo = someTouchInfo;

408− return false;

409− } else {

410− return true;

411− }

412− });

413−

414− return touchInfo;

415−}

416−

417−

418−void TouchRegistry::rejectCandidateOwnerForTouch(int id, QQuickItem *candidate)

419−{

420− // NB: It's technically possible that candidate is a dangling pointer at this point.

421− // Although that would most likely be due to a bug in our code.

422− // In any case, only dereference it after it's confirmed that it indeed exists.

423−

424− #if TOUCHREGISTRY_DEBUG

425− UG_DEBUG << "rejectCandidateOwnerForTouch id" << id << "candidate" << (void*)candidate;

426− #endif

427−

428− Pool<TouchInfo>::Iterator touchInfo = findTouchInfo(id);

429− if (!touchInfo) {

430− #if TOUCHREGISTRY_DEBUG

431− UG_DEBUG << "Failed to find TouchInfo for id" << id;

432− #endif

433− return;

434− }

435−

436− int rejectedCandidateIndex = -1;

437−

438− // Check if the given candidate is valid and still undecided

439− for (int i = 0; i < touchInfo->candidates.count() && rejectedCandidateIndex == -1; ++i) {

440− CandidateInfo &candidateInfo = touchInfo->candidates[i];

441− if (candidateInfo.item == candidate) {

442− Q_ASSERT(i > 0 || candidateInfo.state == CandidateInfo::Undecided);

443− if (i == 0 && candidateInfo.state != CandidateInfo::Undecided) {

444− qCritical() << "TouchRegistry: Can't reject item (" << (void*)candidate

445− << ") as it already owns touch" << id;

446− return;

447− } else {

448− // we found the guy and it's all fine.

449− rejectedCandidateIndex = i;

450− }

451− }

452− }

453−

454− // If we reached this point it's because the given candidate exists and is indeed undecided.

455−

456− Q_ASSERT(rejectedCandidateIndex >= 0 && rejectedCandidateIndex < touchInfo->candidates.size());

457−

458− {

459− TouchOwnershipEvent lostOwnershipEvent(id, false /*gained*/);

460− QCoreApplication::sendEvent(candidate, &lostOwnershipEvent);

461− }

462−

463− removeCandidateHelper(touchInfo, rejectedCandidateIndex);

464−

465− if (rejectedCandidateIndex == 0) {

466− // the top candidate has been removed. if the new top candidate

467− // wants the touch let him know he's now the owner.

468− if (touchInfo->isOwned()) {

469− touchInfo->notifyCandidatesOfOwnershipResolution();

470− }

471− }

472−}

473−

474−void TouchRegistry::removeCandidateHelper(Pool<TouchInfo>::Iterator &touchInfo, int candidateIndex)

475−{

476− {

477− CandidateInfo &candidateInfo = touchInfo->candidates[candidateIndex];

478−

479− delete candidateInfo.inactivityTimer;

480− candidateInfo.inactivityTimer = nullptr;

481−

482− if (candidateInfo.item) {

483− disconnect(candidateInfo.item.data(), nullptr, this, nullptr);

484− }

485− }

486− touchInfo->candidates.removeAt(candidateIndex);

487−}

488−

489−////////////////////////////////////// TouchRegistry::TouchInfo ////////////////////////////////////

490−

491−TouchRegistry::TouchInfo::TouchInfo(int id)

492−{

493− init(id);

494−}

495−

496−void TouchRegistry::TouchInfo::reset()

497−{

498− id = -1;

499−

500− for (int i = 0; i < candidates.count(); ++i) {

501− CandidateInfo &candidate = candidates[i];

502− delete candidate.inactivityTimer;

503− candidate.inactivityTimer.clear(); // shoundn't be needed but anyway...

504− }

505−}

506−

507−void TouchRegistry::TouchInfo::init(int id)

508−{

509− this->id = id;

510− physicallyEnded = false;

511− candidates.clear();

512− watchers.clear();

513−}

514−

515−bool TouchRegistry::TouchInfo::isOwned() const

516−{

517− return !candidates.isEmpty() && candidates.first().state != CandidateInfo::Undecided;

518−}

519−

520−bool TouchRegistry::TouchInfo::ended() const

521−{

522− Q_ASSERT(isValid());

523− return physicallyEnded && (isOwned() || candidates.isEmpty());

524−}

525−

526−void TouchRegistry::TouchInfo::notifyCandidatesOfOwnershipResolution()

527−{

528− Q_ASSERT(isOwned());

529−

530− #if TOUCHREGISTRY_DEBUG

531− UG_DEBUG << "sending TouchOwnershipEvent(id =" << id

532− << " gained) to candidate" << candidates[0].item;

533− #endif

534−

535− // need to take a copy of the item list in case

536− // we call back in to remove candidate during the lost ownership event.

537− QList<QPointer<QQuickItem>> items;

538− Q_FOREACH(const CandidateInfo& info, candidates) {

539− items << info.item;

540− }

541−

542− TouchOwnershipEvent gainedOwnershipEvent(id, true /*gained*/);

543− QCoreApplication::sendEvent(items[0], &gainedOwnershipEvent);

544−

545− TouchOwnershipEvent lostOwnershipEvent(id, false /*gained*/);

546− for (int i = 1; i < items.count(); ++i) {

547− #if TOUCHREGISTRY_DEBUG

548− UG_DEBUG << "sending TouchOwnershipEvent(id =" << id << " lost) to candidate"

549− << items[i];

550− #endif

551− QCoreApplication::sendEvent(items[i], &lostOwnershipEvent);

552− }

553−}

libs/UbuntuGestures/TouchRegistry.hdeleted−201

@@ -1,201 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef UNITY_TOUCHREGISTRY_H

18−#define UNITY_TOUCHREGISTRY_H

19−

20−#include <QQuickItem>

21−#include <QObject>

22−#include <QPointer>

23−#include <QTouchEvent>

24−#include <QVector>

25−

26−#include "UbuntuGesturesGlobal.h"

27−#include "CandidateInactivityTimer.h"

28−#include "Timer.h"

29−#include "Pool.h"

30−

31−namespace UbuntuGestures {

32− class AbstractTimerFactory;

33−}

34−

35−/*

36− Where the ownership of touches is registered.

37−

38− Singleton used for adding a touch point ownership model analogous to the one

39− described in the XInput 2.2 protocol[1] on top of the existing input dispatch logic in QQuickWindow.

40−

41− It provides a much more flexible and powerful way of dealing with pointer ownership than the existing

42− mechanisms in Qt. Namely QQuickItem::grabTouchPoints, QuickItem::keepTouchGrab,

43− QQuickItem::setFiltersChildMouseEvents, QQuickItem::ungrabTouchPoints and QQuickItem::touchUngrabEvent.

44−

45− Usage:

46−

47− 1- An item receives a a new touch point. If he's not sure whether he wants it yet, he calls:

48− TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, this);

49− touchEvent->ignore();

50− Ignoring the event is crucial so that it can be seen by other interested parties, which will

51− behave similarly.

52−

53− 2- That item will then start receiving UnownedTouchEvents for that touch from step 1. Once he's

54− made a decision he calls either:

55− TouchRegistry::instance()->requestTouchOwnership(touchId, this);

56− If he wants the touch point or:

57− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, this);

58− if he does not want it.

59−

60− Candidates are put in a priority queue. The first one to call addCandidateOwnerForTouch() will

61− take precedence over the others for receiving ownership over the touch point (from now on called

62− simply top-candidate).

63−

64− If the top-candidate calls requestTouchOwnership() he will immediately receive a

65− TouchOwnershipEvent(gained=true) for that touch point. He can then safely call

66− QQuickItem::grabTouchPoints to actually get the owned touch points. The other candidates

67− will receive TouchOwnershipEvent(gained=false) and will no longer receive UnownedTouchEvents

68− for that touch point. They will have to undo whatever action they were performing with that

69− touch point.

70−

71− But if the top-candidate calls removeCandidateOwnerForTouch() instead, he's popped from the

72− candidacy queue and ownership is given to the new top-most candidate if he has already

73− made his decision, that is.

74−

75− The TouchRegistry cannot enforce the results of this pointer ownership negotiation (i.e.,

76− who gets to grab the touch points) as that would clash with QQuickWindow's input event

77− dispatching logic. The candidates have to respect the decision and grab the touch points

78− themselves.

79−

80− If an item wants ownership over touches as soon as he receives the TouchBegin for them, his step 1

81− would be instead:

82− TouchRegistry::instance()->requestTouchOwnership(touchId, this);

83− touchEvent->accept();

84− He won't get any UnownedTouchEvent for that touch as he is already the interim owner (ie, QQuickWindow

85− will keep sending touch updates to him already). Eventually he will be notified once ownership has

86− been granted to him (from TouchRegistry perspective), from which point onwards he could safely assume

87− other TouchRegistry users wouldn't snatch this touch away from him.

88−

89− Items oblivious to TouchRegistry will lose their touch points without warning, just like in plain Qt.

90−

91− [1] - http://www.x.org/releases/X11R7.7/doc/inputproto/XI2proto.txt (see multitouch-ownership)

92− */

93−class UBUNTUGESTURES_EXPORT TouchRegistry : public QObject

94−{

95− Q_OBJECT

96−public:

97− virtual ~TouchRegistry();

98−

99− // Returns a pointer to the application's TouchRegistry instance.

100− static TouchRegistry *instance();

101−

102− void update(const QTouchEvent *event);

103−

104− // Calls update() if the given event is a QTouchEvent

105− bool eventFilter(QObject *watched, QEvent *event) override;

106−

107− // An item that might later request ownership over the given touch point.

108− // He will be kept informed about that touch point through UnownedTouchEvents

109− // All candidates must eventually decide whether they want to own the touch point

110− // or not. That decision is informed through requestTouchOwnership() or

111− // removeCandidateOwnerForTouch()

112− void addCandidateOwnerForTouch(int id, QQuickItem *candidate);

113−

114− // The same as rejecting ownership of a touch

115− void removeCandidateOwnerForTouch(int id, QQuickItem *candidate);

116−

117− // The candidate object wants to be the owner of the touch with the given id.

118− // If he's currently the oldest/top-most candidate, he will get an ownership

119− // event immediately. If not, he will get ownership if (or once) he becomes the

120− // top-most candidate.

121− void requestTouchOwnership(int id, QQuickItem *candidate);

122−

123− // An item that has no interest (effective or potential) in owning a touch point

124− // but would nonetheless like to be kept up-to-date on its state.

125− void addTouchWatcher(int touchId, QQuickItem *watcherItem);

126−

127− // Useful for tests, where you should use fake timers

128− void setTimerFactory(UbuntuGestures::AbstractTimerFactory *timerFactory);

129−

130−private Q_SLOTS:

131− void rejectCandidateOwnerForTouch(int id, QQuickItem *candidate);

132−

133−private:

134− // Only instance() can cronstruct one

135− TouchRegistry(QObject *parent = nullptr);

136−

137− class CandidateInfo {

138− public:

139− enum {

140− // A candidate owner that doesn't yet know for sure whether he wants the touch point

141− // (gesture recognition is stilll going on)

142− Undecided = 0,

143− // A candidate owner that wants the touch but hasn't been granted it yet,

144− // most likely because there's an undecided candidate with higher priority

145− Requested = 1,

146− // An item that is the interim owner of the touch, receiving QTouchEvents of it

147− // from QQuickWindow. Ie, it's the actual touch owner from Qt's point of view.

148− // It wants to keep its touch ownership but hasn't been granted it by TouchRegistry

149− // yet because of undecided candidates higher up.

150− InterimOwner = 2

151− } state;

152− QPointer<QQuickItem> item;

153− QPointer<UbuntuGestures::CandidateInactivityTimer> inactivityTimer;

154− };

155−

156− class TouchInfo {

157− public:

158− TouchInfo() : id(-1) {}

159− TouchInfo(int id);

160− bool isValid() const { return id >= 0; }

161− void reset();

162− void init(int id);

163− int id;

164− bool physicallyEnded;

165− bool isOwned() const;

166− bool ended() const;

167− void notifyCandidatesOfOwnershipResolution();

168−

169− // TODO optimize storage (s/QList/Pool)

170− QList<CandidateInfo> candidates;

171− QList<QPointer<QQuickItem>> watchers;

172− };

173−

174− void pruneNullCandidatesForTouch(int touchId);

175− void removeCandidateOwnerForTouchByIndex(Pool<TouchInfo>::Iterator &touchInfo, int candidateIndex);

176− void removeCandidateHelper(Pool<TouchInfo>::Iterator &touchInfo, int candidateIndex);

177−

178− Pool<TouchInfo>::Iterator findTouchInfo(int id);

179−

180− void deliverTouchUpdatesToUndecidedCandidatesAndWatchers(const QTouchEvent *event);

181−

182− static void translateTouchPointFromScreenToWindowCoords(QTouchEvent::TouchPoint &touchPoint);

183−

184− static void dispatchPointsToItem(const QTouchEvent *event, const QList<int> &touchIds,

185− QQuickItem *item);

186− void freeEndedTouchInfos();

187−

188− Pool<TouchInfo> m_touchInfoPool;

189−

190− // the singleton instance

191− static TouchRegistry *m_instance;

192−

193− bool m_inDispatchLoop;

194−

195− UbuntuGestures::AbstractTimerFactory *m_timerFactory;

196−

197− friend class tst_TouchRegistry;

198− friend class tst_DirectionalDragArea;

199−};

200−

201−#endif // UNITY_TOUCHREGISTRY_H

libs/UbuntuGestures/UnownedTouchEvent.hdeleted−45

@@ -1,45 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef UBUNTU_UNOWNEDTOUCHEVENT_H

18−#define UBUNTU_UNOWNEDTOUCHEVENT_H

19−

20−#include <QTouchEvent>

21−#include <QScopedPointer>

22−#include "UbuntuGesturesGlobal.h"

23−

24−/*

25− A touch event with touch points that do not belong the item receiving it.

26−

27− See TouchRegistry::addCandidateOwnerForTouch and TouchRegistry::addTouchWatcher

28− */

29−class UBUNTUGESTURES_EXPORT UnownedTouchEvent : public QEvent

30−{

31−public:

32− UnownedTouchEvent(QTouchEvent *touchEvent);

33− static Type unownedTouchEventType();

34−

35− // TODO: It might be cleaner to store the information directly in UnownedTouchEvent

36− // instead of carrying around a synthesized QTouchEvent. But the latter option

37− // is very convenient.

38− QTouchEvent *touchEvent();

39−

40−private:

41− static Type m_unownedTouchEventType;

42− QScopedPointer<QTouchEvent> m_touchEvent;

43−};

44−

45−#endif // UBUNTU_UNOWNEDTOUCHEVENT_H

plugins/AccountsService/AccountsService.cpp+21−1

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -36,8 +36,10 @@

3636#define PROP_DEMO_EDGES QStringLiteral("demo-edges")

3737#define PROP_DEMO_EDGES_COMPLETED QStringLiteral("DemoEdgesCompleted")

3838#define PROP_EMAIL QStringLiteral("Email")

39+#define PROP_ENABLE_FINGERPRINT_IDENTIFICATION QStringLiteral("EnableFingerprintIdentification")

3940#define PROP_ENABLE_INDICATORS_WHILE_LOCKED QStringLiteral("EnableIndicatorsWhileLocked")

4041#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED QStringLiteral("EnableLauncherWhileLocked")

42+#define PROP_FAILED_FINGERPRINT_LOGINS QStringLiteral("FailedFingerprintLogins")

4143#define PROP_FAILED_LOGINS QStringLiteral("FailedLogins")

4244#define PROP_INPUT_SOURCES QStringLiteral("InputSources")

4345#define PROP_LICENSE_ACCEPTED QStringLiteral("LicenseAccepted")

@@ -93,12 +95,14 @@ AccountsService::AccountsService(QObject* parent, const QString &user)

9395 registerProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QStringLiteral("keymapsChanged"));

9496 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));

9597 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));

98+ registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION, QStringLiteral("enableFingerprintIdentificationChanged"));

9699 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));

97100 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_INDICATORS_WHILE_LOCKED, QStringLiteral("enableIndicatorsWhileLockedChanged"));

98101 registerProperty(IFACE_UBUNTU_SECURITY, PROP_PASSWORD_DISPLAY_HINT, QStringLiteral("passwordDisplayHintChanged"));

99102 registerProperty(IFACE_UBUNTU_SECURITY_OLD, PROP_STATS_WELCOME_SCREEN, QStringLiteral("statsWelcomeScreenChanged"));

100103 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES, QStringLiteral("demoEdgesChanged"));

101104 registerProperty(IFACE_UNITY, PROP_DEMO_EDGES_COMPLETED, QStringLiteral("demoEdgesCompletedChanged"));

105+ registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, QStringLiteral("failedFingerprintLoginsChanged"));

102106 registerProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS, QStringLiteral("failedLoginsChanged"));

103107

104108 registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,

@@ -176,6 +180,12 @@ void AccountsService::markDemoEdgeCompleted(const QString &edge)

176180 }

177181}

178182

183+bool AccountsService::enableFingerprintIdentification() const

184+{

185+ auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_FINGERPRINT_IDENTIFICATION);

186+ return value.toBool();

187+}

188+

179189bool AccountsService::enableLauncherWhileLocked() const

180190{

181191 auto value = getProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED);

@@ -274,6 +284,16 @@ QStringList AccountsService::keymaps() const

274284 return {QStringLiteral("us")};

275285}

276286

287+uint AccountsService::failedFingerprintLogins() const

288+{

289+ return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS).toUInt();

290+}

291+

292+void AccountsService::setFailedFingerprintLogins(uint failedFingerprintLogins)

293+{

294+ setProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_FINGERPRINT_LOGINS, failedFingerprintLogins);

295+}

296+

277297uint AccountsService::failedLogins() const

278298{

279299 return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();

plugins/AccountsService/AccountsService.h+13−1

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -41,6 +41,9 @@ class AccountsService: public QObject

4141 Q_PROPERTY (QStringList demoEdgesCompleted

4242 READ demoEdgesCompleted

4343 NOTIFY demoEdgesCompletedChanged)

44+ Q_PROPERTY (bool enableFingerprintIdentification

45+ READ enableFingerprintIdentification

46+ NOTIFY enableFingerprintIdentificationChanged)

4447 Q_PROPERTY (bool enableLauncherWhileLocked

4548 READ enableLauncherWhileLocked

4649 NOTIFY enableLauncherWhileLockedChanged)

@@ -60,6 +63,10 @@ class AccountsService: public QObject

6063 READ failedLogins

6164 WRITE setFailedLogins

6265 NOTIFY failedLoginsChanged)

66+ Q_PROPERTY (uint failedFingerprintLogins

67+ READ failedFingerprintLogins

68+ WRITE setFailedFingerprintLogins

69+ NOTIFY failedFingerprintLoginsChanged)

6370 Q_PROPERTY(bool hereEnabled

6471 READ hereEnabled

6572 WRITE setHereEnabled

@@ -91,6 +98,7 @@ public:

9198 void setDemoEdges(bool demoEdges);

9299 QStringList demoEdgesCompleted() const;

93100 Q_INVOKABLE void markDemoEdgeCompleted(const QString &edge);

101+ bool enableFingerprintIdentification() const;

94102 bool enableLauncherWhileLocked() const;

95103 bool enableIndicatorsWhileLocked() const;

96104 QString backgroundFile() const;

@@ -98,6 +106,8 @@ public:

98106 PasswordDisplayHint passwordDisplayHint() const;

99107 uint failedLogins() const;

100108 void setFailedLogins(uint failedLogins);

109+ uint failedFingerprintLogins() const;

110+ void setFailedFingerprintLogins(uint failedFingerprintLogins);

101111 bool hereEnabled() const;

102112 void setHereEnabled(bool enabled);

103113 QString hereLicensePath() const;

@@ -112,12 +122,14 @@ Q_SIGNALS:

112122 void userChanged();

113123 void demoEdgesChanged();

114124 void demoEdgesCompletedChanged();

125+ void enableFingerprintIdentificationChanged();

115126 void enableLauncherWhileLockedChanged();

116127 void enableIndicatorsWhileLockedChanged();

117128 void backgroundFileChanged();

118129 void statsWelcomeScreenChanged();

119130 void passwordDisplayHintChanged();

120131 void failedLoginsChanged();

132+ void failedFingerprintLoginsChanged();

121133 void hereEnabledChanged();

122134 void hereLicensePathChanged();

123135 void realNameChanged();

plugins/AccountsService/AccountsService.qmltypesdeleted−41

@@ -1,41 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable AccountsService 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "AccountsService"

12− prototype: "QObject"

13− exports: ["AccountsService/AccountsService 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Enum {

18− name: "PasswordDisplayHint"

19− values: {

20− "Keyboard": 0,

21− "Numeric": 1

22− }

23− }

24− Property { name: "user"; type: "string" }

25− Property { name: "demoEdges"; type: "bool" }

26− Property { name: "demoEdgesCompleted"; type: "QStringList"; isReadonly: true }

27− Property { name: "enableLauncherWhileLocked"; type: "bool"; isReadonly: true }

28− Property { name: "enableIndicatorsWhileLocked"; type: "bool"; isReadonly: true }

29− Property { name: "backgroundFile"; type: "string"; isReadonly: true }

30− Property { name: "statsWelcomeScreen"; type: "bool"; isReadonly: true }

31− Property { name: "passwordDisplayHint"; type: "PasswordDisplayHint"; isReadonly: true }

32− Property { name: "failedLogins"; type: "uint" }

33− Property { name: "hereEnabled"; type: "bool" }

34− Property { name: "hereLicensePath"; type: "string"; isReadonly: true }

35− Property { name: "hereLicensePathValid"; type: "bool"; isReadonly: true }

36− Method {

37− name: "markDemoEdgeCompleted"

38− Parameter { name: "edge"; type: "string" }

39− }

40− }

41−}

plugins/AccountsService/com.canonical.unity.AccountsService.xml+4

@@ -47,5 +47,9 @@

4747 <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>

4848 </property>

4949

50+ <property name="FailedFingerprintLogins" type="u" access="readwrite">

51+ <annotation name="org.freedesktop.Accounts.DefaultValue" value="0"/>

52+ </property>

53+

5054 </interface>

5155</node>

plugins/CMakeLists.txt+1−1

@@ -15,7 +15,7 @@ add_subdirectory(AccountsService)

1515add_subdirectory(Cursor)

1616add_subdirectory(GlobalShortcut)

1717add_subdirectory(Greeter)

18−add_subdirectory(IntegratedLightDM)

18+add_subdirectory(LightDM)

1919add_subdirectory(Lights)

2020add_subdirectory(Dash)

2121add_subdirectory(Powerd)

plugins/Cursor/CMakeLists.txt+6−1

@@ -3,13 +3,18 @@ add_subdirectory(3rd_party)

33include_directories(

44 ${CMAKE_CURRENT_SOURCE_DIR}

55 ${CMAKE_CURRENT_SOURCE_DIR}/3rd_party/xcursor

6+)

8+include_directories(

9+ SYSTEM

610 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

711)

812

913set(QMLPLUGIN_SRC

1014 plugin.cpp

11− MousePointer.cpp

15+ CursorImageInfo.cpp

1216 CursorImageProvider.cpp

17+ MousePointer.cpp

1318 # We need to run moc on this header

1419 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h

1520 )

plugins/Cursor/Cursor.qml+37−6

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -15,14 +15,45 @@

1515 */

1616

1717import QtQuick 2.4

18−import Cursor 1.0 // For MousePointer

18+import Cursor 1.1

19+import Powerd 0.1

1920

2021MousePointer {

2122 id: mousePointer

2223

23− Image {

24− x: -mousePointer.hotspotX

25− y: -mousePointer.hotspotY

26− source: "image://cursor/" + mousePointer.themeName + "/" + mousePointer.cursorName

24+ CursorImageInfo {

25+ id: imageInfo

26+ themeName: mousePointer.themeName

27+ cursorName: mousePointer.cursorName

28+ }

29+

30+ Loader {

31+ active: mousePointer.visible && imageInfo.frameCount > 1

32+ sourceComponent: AnimatedSprite {

33+ x: -imageInfo.hotspot.x

34+ y: -imageInfo.hotspot.y

35+ source: "image://cursor/" + mousePointer.themeName + "/" + mousePointer.cursorName

36+

37+ interpolate: false

38+

39+ width: imageInfo.frameWidth

40+ height: imageInfo.frameHeight

41+

42+ frameCount: imageInfo.frameCount

43+ frameDuration: imageInfo.frameDuration

44+ frameWidth: imageInfo.frameWidth

45+ frameHeight: imageInfo.frameHeight

46+

47+ running: Powerd.status === Powerd.On

48+ }

49+ }

50+

51+ Loader {

52+ active: mousePointer.visible && imageInfo.frameCount === 1

53+ sourceComponent: Image {

54+ x: -imageInfo.hotspot.x

55+ y: -imageInfo.hotspot.y

56+ source: "image://cursor/" + mousePointer.themeName + "/" + mousePointer.cursorName

57+ }

2758 }

2859}

plugins/Cursor/Cursor.qmltypesdeleted−78

@@ -1,78 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Cursor 1.0 plugins'

8−

9−Module {

10− Component {

11− name: "MirMousePointerInterface"

12− defaultProperty: "data"

13− prototype: "QQuickItem"

14− Property { name: "cursorName"; type: "string"; isReadonly: true }

15− Property { name: "themeName"; type: "string"; isReadonly: true }

16− Property { name: "hotspotX"; type: "double"; isReadonly: true }

17− Property { name: "hotspotY"; type: "double"; isReadonly: true }

18− Signal {

19− name: "cursorNameChanged"

20− Parameter { name: "name"; type: "string" }

21− }

22− Signal {

23− name: "themeNameChanged"

24− Parameter { name: "name"; type: "string" }

25− }

26− Signal {

27− name: "hotspotXChanged"

28− Parameter { name: "value"; type: "double" }

29− }

30− Signal {

31− name: "hotspotYChanged"

32− Parameter { name: "value"; type: "double" }

33− }

34− Method {

35− name: "handleMouseEvent"

36− Parameter { name: "timestamp"; type: "ulong" }

37− Parameter { name: "movement"; type: "QPointF" }

38− Parameter { name: "buttons"; type: "Qt::MouseButtons" }

39− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }

40− }

41− Method {

42− name: "handleWheelEvent"

43− Parameter { name: "timestamp"; type: "ulong" }

44− Parameter { name: "angleDelta"; type: "QPoint" }

45− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }

46− }

47− }

48− Component {

49− name: "MousePointer"

50− defaultProperty: "data"

51− prototype: "MirMousePointerInterface"

52− exports: ["Cursor/MousePointer 1.0"]

53− exportMetaObjectRevisions: [0]

54− Signal {

55− name: "pushedLeftBoundary"

56− Parameter { name: "amount"; type: "double" }

57− Parameter { name: "buttons"; type: "Qt::MouseButtons" }

58− }

59− Signal {

60− name: "pushedRightBoundary"

61− Parameter { name: "amount"; type: "double" }

62− Parameter { name: "buttons"; type: "Qt::MouseButtons" }

63− }

64− Method {

65− name: "handleMouseEvent"

66− Parameter { name: "timestamp"; type: "ulong" }

67− Parameter { name: "movement"; type: "QPointF" }

68− Parameter { name: "buttons"; type: "Qt::MouseButtons" }

69− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }

70− }

71− Method {

72− name: "handleWheelEvent"

73− Parameter { name: "timestamp"; type: "ulong" }

74− Parameter { name: "angleDelta"; type: "QPoint" }

75− Parameter { name: "modifiers"; type: "Qt::KeyboardModifiers" }

76− }

77− }

78−}

plugins/Cursor/CursorImageInfo.cppnew file+96

@@ -0,0 +1,96 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "CursorImageInfo.h"

18+

19+CursorImageInfo::CursorImageInfo(QObject *parent)

20+ : QObject(parent)

21+{

22+}

23+

24+void CursorImageInfo::setCursorName(const QString &cursorName)

25+{

26+ if (cursorName != m_cursorName) {

27+ m_cursorName = cursorName;

28+ update();

29+ Q_EMIT cursorNameChanged();

30+ }

31+}

32+

33+void CursorImageInfo::setThemeName(const QString &themeName)

34+{

35+ if (m_themeName != themeName) {

36+ m_themeName = themeName;

37+ update();

38+ Q_EMIT themeNameChanged();

39+ }

40+}

41+

42+void CursorImageInfo::update()

43+{

44+ m_cursorImage = CursorImageProvider::instance()->fetchCursor(m_themeName, m_cursorName);

45+

46+ Q_EMIT hotspotChanged();

47+ Q_EMIT frameWidthChanged();

48+ Q_EMIT frameHeightChanged();

49+ Q_EMIT frameCountChanged();

50+ Q_EMIT frameDurationChanged();

51+}

52+

53+QPoint CursorImageInfo::hotspot() const

54+{

55+ if (m_cursorImage) {

56+ return m_cursorImage->hotspot;

57+ } else {

58+ return QPoint();

59+ }

60+}

61+

62+qreal CursorImageInfo::frameWidth() const

63+{

64+ if (m_cursorImage) {

65+ return m_cursorImage->frameWidth;

66+ } else {

67+ return 0;

68+ }

69+}

70+

71+qreal CursorImageInfo::frameHeight() const

72+{

73+ if (m_cursorImage) {

74+ return m_cursorImage->frameHeight;

75+ } else {

76+ return 0;

77+ }

78+}

79+

80+int CursorImageInfo::frameCount() const

81+{

82+ if (m_cursorImage) {

83+ return m_cursorImage->frameCount;

84+ } else {

85+ return 0;

86+ }

87+}

88+

89+int CursorImageInfo::frameDuration() const

90+{

91+ if (m_cursorImage) {

92+ return m_cursorImage->frameDuration;

93+ } else {

94+ return 0;

95+ }

96+}

plugins/Cursor/CursorImageInfo.hnew file+72

@@ -0,0 +1,72 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef CURSOR_IMAGE_INFO_H

18+#define CURSOR_IMAGE_INFO_H

19+

20+#include "CursorImageProvider.h"

21+

22+#include <QObject>

23+#include <QString>

24+

25+class CursorImageInfo : public QObject

26+{

27+ Q_OBJECT

28+

29+ Q_PROPERTY(QString themeName READ themeName WRITE setThemeName NOTIFY themeNameChanged)

30+ Q_PROPERTY(QString cursorName READ cursorName WRITE setCursorName NOTIFY cursorNameChanged)

31+

32+ Q_PROPERTY(QPoint hotspot READ hotspot NOTIFY hotspotChanged)

33+ Q_PROPERTY(qreal frameWidth READ frameWidth NOTIFY frameWidthChanged)

34+ Q_PROPERTY(qreal frameHeight READ frameHeight NOTIFY frameHeightChanged)

35+ Q_PROPERTY(int frameCount READ frameCount NOTIFY frameCountChanged)

36+ Q_PROPERTY(int frameDuration READ frameDuration NOTIFY frameDurationChanged)

37+

38+public:

39+ CursorImageInfo(QObject *parent = nullptr);

40+

41+ QString themeName() const { return m_themeName; }

42+ void setThemeName(const QString &);

43+

44+ QString cursorName() const { return m_cursorName; }

45+ void setCursorName(const QString &);

46+

47+ QPoint hotspot() const;

48+ qreal frameWidth() const;

49+ qreal frameHeight() const;

50+ int frameCount() const;

51+ int frameDuration() const;

52+

53+Q_SIGNALS:

54+ void themeNameChanged();

55+ void cursorNameChanged();

56+ void hotspotChanged();

57+ void frameWidthChanged();

58+ void frameHeightChanged();

59+ void frameCountChanged();

60+ void frameDurationChanged();

61+

62+private Q_SLOTS:

63+ void update();

64+

65+private:

66+ QString m_themeName;

67+ QString m_cursorName;

68+

69+ CursorImage *m_cursorImage{nullptr};

70+};

71+

72+#endif // CURSOR_IMAGE_INFO_H

plugins/Cursor/CursorImageProvider.cpp+51−22

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software: you can redistribute it and/or modify it under

55 * the terms of the GNU Lesser General Public License version 3, as published by

@@ -46,6 +46,9 @@ BuiltInCursorImage::BuiltInCursorImage()

4646 qimage.fill(Qt::transparent);

4747 QPainter imagePainter(&qimage);

4848

49+ frameWidth = qimage.width();

50+ frameHeight = qimage.height();

51+

4952 QSvgRenderer *svgRenderer = new QSvgRenderer(QByteArray(svgString));

5053 svgRenderer->render(&imagePainter);

5154 delete svgRenderer;

@@ -59,6 +62,8 @@ BlankCursorImage::BlankCursorImage()

5962{

6063 qimage = QImage(1, 1, QImage::Format_ARGB32);

6164 qimage.fill(Qt::transparent);

65+ frameWidth = qimage.width();

66+ frameHeight = qimage.height();

6267}

6368

6469/////

@@ -69,40 +74,74 @@ CustomCursorImage::CustomCursorImage(const QCursor &cursor)

6974{

7075 qimage = cursor.pixmap().toImage();

7176 hotspot = cursor.hotSpot();

77+ frameWidth = qimage.width();

78+ frameHeight = qimage.height();

7279}

7380

7481/////

7582// XCursorImage

7683

7784XCursorImage::XCursorImage(const QString &theme, const QString &file)

78− : xcursorImages(nullptr)

7985{

8086 // TODO: Consider grid unit value

8187 // Hardcoding to a medium size for now

8288 int preferredCursorHeightPx = 32;

8389

84− xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(file), QFile::encodeName(theme),

90+ XcursorImages *xcursorImages = XcursorLibraryLoadImages(QFile::encodeName(file), QFile::encodeName(theme),

8591 preferredCursorHeightPx);

86− if (!xcursorImages) {

92+ if (!xcursorImages || xcursorImages->nimage == 0) {

8793 return;

8894 }

8995

90− // Just take the first one. It will have multiple images in case of an animated cursor.

91− // TODO: Support animated cursors

92− if ( xcursorImages->nimage > 0) {

93− XcursorImage *xcursorImage = xcursorImages->images[0];

96+ frameCount = xcursorImages->nimage;

9497

95− qimage = QImage((uchar*)xcursorImage->pixels,

96− xcursorImage->width, xcursorImage->height, QImage::Format_ARGB32);

98+ for (int i = 0; i < xcursorImages->nimage; ++i) {

99+ XcursorImage *xcursorImage = xcursorImages->images[0];

100+ if (frameWidth < (int)xcursorImage->width) {

101+ frameWidth = xcursorImage->width;

102+ }

103+ if (frameHeight < (int)xcursorImage->height) {

104+ frameHeight = xcursorImage->height;

105+ }

106+ if (i == 0) {

107+ frameDuration = (int)xcursorImage->delay;

108+ } else {

109+ if (frameDuration != (int)xcursorImage->delay) {

110+ qWarning().nospace() << "CursorImageProvider: XCursorImage("<<theme<<","<<file<<") has"

111+ " varying delays in its animation. Animation won't look right.";

112+ }

113+ }

114+ }

97115

116+ {

117+ // Assume that the hotspot position does not animate

118+ XcursorImage *xcursorImage = xcursorImages->images[0];

98119 hotspot.setX(xcursorImage->xhot);

99120 hotspot.setY(xcursorImage->yhot);

100121 }

122+

123+ // Build the sprite as a single row of frames

124+ qimage = QImage(frameWidth*frameCount, frameHeight, QImage::Format_ARGB32);

125+ qimage.fill(Qt::transparent);

126+

127+ {

128+ QPainter painter(&qimage);

129+

130+ for (int i = 0; i < xcursorImages->nimage; ++i) {

131+ XcursorImage *xcursorImage = xcursorImages->images[i];

132+

133+ auto frameImage = QImage((uchar*)xcursorImage->pixels,

134+ xcursorImage->width, xcursorImage->height, QImage::Format_ARGB32);

135+

136+ painter.drawImage(QPoint(i*frameWidth, 0), frameImage);

137+ }

138+ }

139+

140+ XcursorImagesDestroy(xcursorImages);

101141}

102142

103143XCursorImage::~XCursorImage()

104144{

105− XcursorImagesDestroy(xcursorImages);

106145}

107146

108147/////

@@ -205,16 +244,6 @@ QImage CursorImageProvider::requestImage(const QString &cursorThemeAndName, QSiz

205244 return cursorImage->qimage;

206245}

207246

208−QPoint CursorImageProvider::hotspot(const QString &themeName, const QString &cursorName)

209−{

210− CursorImage *cursorImage = fetchCursor(themeName, cursorName);

211− if (cursorImage) {

212− return cursorImage->hotspot;

213− } else {

214− return QPoint(0,0);

215− }

216−}

217−

218247CursorImage *CursorImageProvider::fetchCursor(const QString &cursorThemeAndName)

219248{

220249 QString themeName;

@@ -271,7 +300,7 @@ CursorImage *CursorImageProvider::fetchCursorHelper(const QString &themeName, co

271300{

272301 if (cursorName == QLatin1String("blank")) {

273302 return &m_blankCursorImage;

274− } else if (cursorName == QLatin1String("custom")) {

303+ } else if (cursorName.startsWith(QLatin1String("custom"))) {

275304 return m_customCursorImage.data();

276305 } else {

277306 QMap<QString, CursorImage*> &themeCursors = m_cursors[themeName];

plugins/Cursor/CursorImageProvider.h+12−4

@@ -31,15 +31,23 @@ public:

3131 virtual ~CursorImage() {}

3232

3333 QImage qimage;

34+

35+ // TODO: consider if there's a need to animate the hotspot

36+ // ie, if there's a need to make it an array of points, one for each frame.

37+ // Maybe no single xcursor (or at least the ones we know of or use)

38+ // vary its hotspot position through its animation.

3439 QPoint hotspot;

40+

41+ int frameWidth{0};

42+ int frameHeight{0};

43+ int frameCount{1};

44+ int frameDuration{40};

3545};

3646

3747class XCursorImage : public CursorImage {

3848public:

3949 XCursorImage(const QString &theme, const QString &file);

4050 virtual ~XCursorImage();

41−

42− XcursorImages *xcursorImages;

4351};

4452

4553class BuiltInCursorImage : public CursorImage {

@@ -68,16 +76,16 @@ public:

6876

6977 QImage requestImage(const QString &cursorName, QSize *size, const QSize &requestedSize) override;

7078

71− QPoint hotspot(const QString &themeName, const QString &cursorName);

79+ CursorImage *fetchCursor(const QString &themeName, const QString &cursorName);

7280

7381 void setCustomCursor(const QCursor &customCursor);

7482

7583private:

7684 CursorImage *fetchCursor(const QString &cursorThemeAndName);

77− CursorImage *fetchCursor(const QString &themeName, const QString &cursorName);

7885 CursorImage *fetchCursorHelper(const QString &themeName, const QString &cursorName);

7986

8087 // themeName -> (cursorName -> cursorImage)

88+ // TODO: discard old, unused, cursors

8189 QMap<QString, QMap<QString, CursorImage*> > m_cursors;

8290

8391 QScopedPointer<CursorImage> m_builtInCursorImage;

plugins/Cursor/MousePointer.cpp+42−32

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software: you can redistribute it and/or modify it under

55 * the terms of the GNU Lesser General Public License version 3, as published by

@@ -29,10 +29,7 @@ MousePointer::MousePointer(QQuickItem *parent)

2929 : MirMousePointerInterface(parent)

3030 , m_cursorName(QStringLiteral("left_ptr"))

3131 , m_themeName(QStringLiteral("default"))

32− , m_hotspotX(0)

33− , m_hotspotY(0)

3432{

35− updateHotspot();

3633}

3734

3835void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,

@@ -46,21 +43,26 @@ void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::Mouse

4643 Q_EMIT mouseMoved();

4744 }

4845

49− qreal newX = x() + movement.x();

46+ m_accumulatedMovement += movement;

47+ // don't apply the fractional part

48+ QPointF appliedMovement(int(m_accumulatedMovement.x()), int(m_accumulatedMovement.y()));

49+ m_accumulatedMovement -= appliedMovement;

50+

51+ qreal newX = x() + appliedMovement.x();

5052 if (newX < 0) {

5153 Q_EMIT pushedLeftBoundary(qAbs(newX), buttons);

5254 newX = 0;

53− } else if (newX > parentItem()->width()) {

54− Q_EMIT pushedRightBoundary(newX - parentItem()->width(), buttons);

55− newX = parentItem()->width();

55+ } else if (newX >= parentItem()->width()) {

56+ Q_EMIT pushedRightBoundary(newX - (parentItem()->width() - 1), buttons);

57+ newX = parentItem()->width() - 1;

5658 }

5759 setX(newX);

5860

59− qreal newY = y() + movement.y();

61+ qreal newY = y() + appliedMovement.y();

6062 if (newY < 0) {

6163 newY = 0;

62− } else if (newY > parentItem()->height()) {

63− newY = parentItem()->height();

64+ } else if (newY >= parentItem()->height()) {

65+ newY = parentItem()->height() - 1;

6466 }

6567 setY(newY);

6668

@@ -89,8 +91,32 @@ void MousePointer::itemChange(ItemChange change, const ItemChangeData &value)

8991

9092void MousePointer::registerWindow(QWindow *window)

9193{

92− if (m_registeredWindow && window != m_registeredWindow) {

93− auto previousCursor = dynamic_cast<MirPlatformCursor*>(m_registeredWindow->screen()->handle()->cursor());

94+ if (window == m_registeredWindow) {

95+ return;

96+ }

97+

98+ if (m_registeredWindow) {

99+ m_registeredWindow->disconnect(this);

100+ }

101+

102+ m_registeredWindow = window;

103+

104+ if (m_registeredWindow) {

105+ connect(window, &QWindow::screenChanged, this, &MousePointer::registerScreen);

106+ registerScreen(window->screen());

107+ } else {

108+ registerScreen(nullptr);

109+ }

110+}

111+

112+void MousePointer::registerScreen(QScreen *screen)

113+{

114+ if (m_registeredScreen == screen) {

115+ return;

116+ }

117+

118+ if (m_registeredScreen) {

119+ auto previousCursor = dynamic_cast<MirPlatformCursor*>(m_registeredScreen->handle()->cursor());

94120 if (previousCursor) {

95121 previousCursor->setMousePointer(nullptr);

96122 } else {

@@ -98,10 +124,10 @@ void MousePointer::registerWindow(QWindow *window)

98124 }

99125 }

100126

101− m_registeredWindow = window;

127+ m_registeredScreen = screen;

102128

103− if (m_registeredWindow) {

104− auto cursor = dynamic_cast<MirPlatformCursor*>(window->screen()->handle()->cursor());

129+ if (m_registeredScreen) {

130+ auto cursor = dynamic_cast<MirPlatformCursor*>(m_registeredScreen->handle()->cursor());

105131 if (cursor) {

106132 cursor->setMousePointer(this);

107133 } else {

@@ -115,22 +141,6 @@ void MousePointer::setCursorName(const QString &cursorName)

115141 if (cursorName != m_cursorName) {

116142 m_cursorName = cursorName;

117143 Q_EMIT cursorNameChanged(m_cursorName);

118− updateHotspot();

119− }

120−}

121−

122−void MousePointer::updateHotspot()

123−{

124− QPoint newHotspot = CursorImageProvider::instance()->hotspot(m_themeName, m_cursorName);

125−

126− if (m_hotspotX != newHotspot.x()) {

127− m_hotspotX = newHotspot.x();

128− Q_EMIT hotspotXChanged(m_hotspotX);

129− }

130−

131− if (m_hotspotY != newHotspot.y()) {

132− m_hotspotY = newHotspot.y();

133− Q_EMIT hotspotYChanged(m_hotspotY);

134144 }

135145}

136146

plugins/Cursor/MousePointer.h+9−7

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software: you can redistribute it and/or modify it under

55 * the terms of the GNU Lesser General Public License version 3, as published by

@@ -20,6 +20,7 @@

2020// Qt

2121#include <QPointer>

2222#include <QWindow>

23+#include <QScreen>

2324

2425// Unity API

2526#include <unity/shell/application/MirMousePointerInterface.h>

@@ -35,9 +36,6 @@ public:

3536 void setThemeName(const QString &themeName) override;

3637 QString themeName() const override { return m_themeName; }

3738

38− qreal hotspotX() const override { return m_hotspotX; }

39− qreal hotspotY() const override { return m_hotspotY; }

40−

4139 void setCustomCursor(const QCursor &) override;

4240

4341public Q_SLOTS:

@@ -53,15 +51,19 @@ Q_SIGNALS:

5351protected:

5452 void itemChange(ItemChange change, const ItemChangeData &value) override;

5553

54+private Q_SLOTS:

55+ void registerScreen(QScreen *screen);

56+

5657private:

5758 void registerWindow(QWindow *window);

58− void updateHotspot();

5959

6060 QPointer<QWindow> m_registeredWindow;

61+ QPointer<QScreen> m_registeredScreen;

6162 QString m_cursorName;

6263 QString m_themeName;

63− int m_hotspotX;

64− int m_hotspotY;

64+

65+ // Accumulated, unapplied, mouse movement.

66+ QPointF m_accumulatedMovement;

6567};

6668

6769#endif // MOUSEPOINTER_H

plugins/Cursor/plugin.cpp+4−2

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -22,13 +22,15 @@

2222#include "plugin.h"

2323

2424// local

25+#include "CursorImageInfo.h"

2526#include "CursorImageProvider.h"

2627#include "MousePointer.h"

2728

2829void CursorPlugin::registerTypes(const char *uri)

2930{

3031 Q_ASSERT(uri == QLatin1String("Cursor"));

31− qmlRegisterType<MousePointer>(uri, 1, 0, "MousePointer");

32+ qmlRegisterType<CursorImageInfo>(uri, 1, 1, "CursorImageInfo");

33+ qmlRegisterType<MousePointer>(uri, 1, 1, "MousePointer");

3234}

3335

3436void CursorPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

plugins/Cursor/qmldir+1−1

@@ -1,3 +1,3 @@

11module Cursor

22plugin Cursor-qml

3−Cursor 1.0 Cursor.qml

3+Cursor 1.1 Cursor.qml

plugins/Dash/AudioProgressBar.qml+1−1

@@ -49,6 +49,6 @@ Item {

4949 rightMargin: maxWidth - (maxWidth * root.progress)

5050 }

5151 height: units.dp(2)

52− backgroundColor: UbuntuColors.orange

52+ backgroundColor: theme.palette.normal.activity

5353 }

5454}

plugins/Dash/CMakeLists.txt+4

@@ -10,6 +10,10 @@ endif()

1010include_directories(

1111 ${CMAKE_CURRENT_SOURCE_DIR}

1212 ${CMAKE_CURRENT_BINARY_DIR}

13+)

14+

15+include_directories(

16+ SYSTEM

1317 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

1418 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

1519 ${Qt5V8_PRIVATE_INCLUDE_DIR}

plugins/Dash/CardCreator.js+127−76

@@ -59,75 +59,100 @@ var kBackgroundLoaderCode = 'Loader {\n\

5959 } \n\

6060 }\n';

6161

62+// %1 is the aspect of the UbuntuShape

63+var kArtUbuntuShapeCode = 'UbuntuShape { \n\

64+ anchors.fill: parent; \n\

65+ source: artImage; \n\

66+ sourceFillMode: UbuntuShape.PreserveAspectCrop; \n\

67+ radius: "medium"; \n\

68+ aspect: %1; \n\

69+ }';

70+

71+var kArtProportionalShapeCode = 'ProportionalShape { \n\

72+ anchors.left: parent.left; \n\

73+ anchors.right: parent.right; \n\

74+ source: artImage; \n\

75+ aspect: UbuntuShape.DropShadow; \n\

76+ }';

77+

6278// %1 is used as anchors of artShapeHolder

6379// %2 is used as image width

6480// %3 is used as image height

65−// %4 is whether the image or the Loader with the UbuntuShape/ProportionalShape should be visible

66−// %5 is used as aspect ratio fallback

67−// %6 is whether the loader should be asynchronous or not

81+// %4 is whether the image should be visible

82+// %5 is whether the loader should be asynchronous or not

83+// %6 is the shape code we want to use

6884// %7 is injected as code to artImage

6985// %8 is used as image fallback

7086var kArtShapeHolderCode = 'Item { \n\

7187 id: artShapeHolder; \n\

72− height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; \n\

73− width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width; \n\

88+ height: root.fixedArtShapeSize.height; \n\

89+ width: root.fixedArtShapeSize.width; \n\

7490 anchors { %1 } \n\

7591 Loader { \n\

7692 id: artShapeLoader; \n\

7793 objectName: "artShapeLoader"; \n\

7894 readonly property string cardArt: cardData && cardData["art"] || %8; \n\

95+ onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\

7996 active: cardArt != ""; \n\

80− asynchronous: %6; \n\

97+ asynchronous: %5; \n\

8198 visible: status == Loader.Ready; \n\

8299 sourceComponent: Item { \n\

83100 id: artShape; \n\

84101 objectName: "artShape"; \n\

85102 visible: image.status == Image.Ready; \n\

86103 readonly property alias image: artImage; \n\

87− Loader { \n\

88− anchors.fill: parent; \n\

104+ %6 \n\

105+ width: root.fixedArtShapeSize.width; \n\

106+ height: root.fixedArtShapeSize.height; \n\

107+ CroppedImageMinimumSourceSize { \n\

108+ id: artImage; \n\

109+ objectName: "artImage"; \n\

110+ source: artShapeLoader.cardArt; \n\

111+ asynchronous: %5; \n\

89112 visible: %4; \n\

90− sourceComponent: root.artShapeStyle === "icon" ? artShapeIconComponent : artShapeShapeComponent; \n\

91− Component { \n\

92− id: artShapeShapeComponent; \n\

93− UbuntuShape { \n\

94− source: artImage; \n\

95− sourceFillMode: UbuntuShape.PreserveAspectCrop; \n\

96− radius: "medium"; \n\

97− aspect: { \n\

98− switch (root.artShapeStyle) { \n\

99− case "inset": return UbuntuShape.Inset; \n\

100− case "shadow": return UbuntuShape.DropShadow; \n\

101− default: \n\

102− case "flat": return UbuntuShape.Flat; \n\

103− } \n\

104− } \n\

105− } \n\

106− } \n\

107− Component { \n\

108− id: artShapeIconComponent; \n\

109− ProportionalShape { source: artImage; aspect: UbuntuShape.DropShadow; } \n\

110− } \n\

111− } \n\

112− readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1; \n\

113− readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : %5; \n\

114− Component.onCompleted: { updateWidthHeightBindings(); } \n\

115− Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); } \n\

116− function updateWidthHeightBindings() { \n\

117− if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) { \n\

118− width = root.fixedArtShapeSize.width; \n\

119− height = root.fixedArtShapeSize.height; \n\

120− } else { \n\

121− width = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.width }); \n\

122− height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); \n\

123− } \n\

113+ width: %2; \n\

114+ height: %3; \n\

115+ %7 \n\

124116 } \n\

117+ } \n\

118+ } \n\

119+ }\n';

120+

121+// %1 is used as anchors of artShapeHolder

122+// %2 is used as image width

123+// %3 is used as image height

124+// %4 is whether the image should be visible

125+// %5 is whether the loader should be asynchronous or not

126+// %6 is the shape code we want to use

127+// %7 is injected as code to artImage

128+// %8 is used as image fallback

129+var kArtShapeHolderCodeCardToolCard = 'Item { \n\

130+ id: artShapeHolder; \n\

131+ height: artShapeLoader.height; \n\

132+ width: artShapeLoader.width; \n\

133+ anchors { %1 } \n\

134+ Loader { \n\

135+ id: artShapeLoader; \n\

136+ objectName: "artShapeLoader"; \n\

137+ readonly property string cardArt: cardData && cardData["art"] || %8; \n\

138+ onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\

139+ active: cardArt != ""; \n\

140+ asynchronous: %5; \n\

141+ visible: status == Loader.Ready; \n\

142+ sourceComponent: Item { \n\

143+ id: artShape; \n\

144+ objectName: "artShape"; \n\

145+ visible: image.status == Image.Ready; \n\

146+ readonly property alias image: artImage; \n\

147+ %6 \n\

148+ width: image.status !== Image.Ready ? 0 : image.width; \n\

149+ height: image.status !== Image.Ready ? 0 : image.height; \n\

125150 CroppedImageMinimumSourceSize { \n\

126151 id: artImage; \n\

127152 objectName: "artImage"; \n\

128153 source: artShapeLoader.cardArt; \n\

129− asynchronous: %6; \n\

130− visible: !%4; \n\

154+ asynchronous: %5; \n\

155+ visible: %4; \n\

131156 width: %2; \n\

132157 height: %3; \n\

133158 %7 \n\

@@ -318,7 +343,7 @@ var kTouchdownCode = 'UbuntuShape { \n\

318343 id: touchdown; \n\

319344 objectName: "touchdown"; \n\

320345 anchors { %1 } \n\

321− visible: root.artShapeStyle != "shadow" && root.artShapeStyle != "icon" && root.pressed; \n\

346+ visible: root.pressed; \n\

322347 radius: "medium"; \n\

323348 borderSource: "radius_pressed.sci" \n\

324349 }\n';

@@ -412,7 +437,7 @@ function sanitizeColor(colorString) {

412437 return colorString;

413438}

414439

415−function cardString(template, components, isCardTool) {

440+function cardString(template, components, isCardTool, artShapeStyle) {

416441 var code;

417442

418443 var templateInteractive = (template == null ? true : (template["non-interactive"] !== undefined ? !template["non-interactive"] : true)) ? "true" : "false";

@@ -420,19 +445,19 @@ function cardString(template, components, isCardTool) {

420445 code = 'AbstractButton { \n\

421446 id: root; \n\

422447 property var cardData; \n\

423− property string artShapeStyle: "inset"; \n\

424448 property string backgroundShapeStyle: "inset"; \n\

425449 property real fontScale: 1.0; \n\

426450 property var scopeStyle: null; \n\

427− %2\

428− property size fixedArtShapeSize: Qt.size(-1, -1); \n\

429451 readonly property string title: cardData && cardData["title"] || ""; \n\

430452 property bool showHeader: true; \n\

431453 implicitWidth: childrenRect.width; \n\

432454 enabled: %1; \n\

433455 \n'.arg(templateInteractive);

434456

435− code = code.arg(isCardTool ? "" : "property int fixedHeaderHeight: -1; \n");

457+ if (!isCardTool) {

458+ code += "property int fixedHeaderHeight: -1; \n\

459+ property size fixedArtShapeSize: Qt.size(-1, -1); \n";

460+ }

436461

437462 var hasArt = components["art"] && components["art"]["field"] || false;

438463 var hasSummary = components["summary"] || false;

@@ -491,47 +516,71 @@ function cardString(template, components, isCardTool) {

491516 if (hasArt) {

492517 code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';

493518

519+ var artShapeAspect;

520+ if (isCardTool) {

521+ var artShapeAspect = components["art"] && components["art"]["aspect-ratio"] || 1;

522+ if (isNaN(artShapeAspect)) {

523+ artShapeAspect = 1;

524+ }

525+ } else {

526+ artShapeAspect = "(root.fixedArtShapeSize.width / root.fixedArtShapeSize.height)";

527+ }

528+

494529 var widthCode, heightCode;

495530 var artAnchors;

496531 if (isHorizontal) {

497532 artAnchors = 'left: parent.left';

498533 if (hasMascot || hasTitle) {

499− widthCode = 'height * artShape.aspect'

534+ widthCode = 'height * ' + artShapeAspect;

500535 heightCode = 'headerHeight + 2 * units.gu(1)';

501536 } else {

502537 // This side of the else is a bit silly, who wants an horizontal layout without mascot and title?

503538 // So we define a "random" height of the image height + 2 gu for the margins

504− widthCode = 'height * artShape.aspect'

539+ widthCode = 'height * ' + artShapeAspect

505540 heightCode = 'units.gu(7.625)';

506541 }

507542 } else {

508543 artAnchors = 'horizontalCenter: parent.horizontalCenter;';

509544 widthCode = 'root.width'

510− heightCode = 'width / artShape.aspect';

545+ heightCode = 'width / ' + artShapeAspect;

511546 }

512547

513− var aspectRatio = components["art"] && components["art"]["aspect-ratio"] || 1;

514− if (isNaN(aspectRatio)) {

515− aspectRatio = 1;

516− }

517548 var fallback = !isCardTool && components["art"] && components["art"]["fallback"] || "";

518549 fallback = encodeURI(fallback);

519550 var fallbackStatusCode = "";

520551 var fallbackURICode = '""';

521552 if (fallback !== "") {

522− // fallbackStatusCode has %6 in it because we want to substitute it for fallbackURICode

553+ // fallbackStatusCode has %8 in it because we want to substitute it for fallbackURICode

523554 // which in kArtShapeHolderCode is %8

524555 fallbackStatusCode += 'onStatusChanged: if (status === Image.Error) source = %8;';

525556 fallbackURICode = 'decodeURI("%1")'.arg(fallback);

526557 }

527− code += kArtShapeHolderCode.arg(artAnchors)

528− .arg(widthCode)

529− .arg(heightCode)

530− .arg(isConciergeMode ? "false" : "true")

531− .arg(aspectRatio)

532− .arg(asynchronous)

533− .arg(fallbackStatusCode)

534− .arg(fallbackURICode);

558+ var artShapeHolderShapeCode;

559+ if (!isConciergeMode) {

560+ if (artShapeStyle === "icon") {

561+ artShapeHolderShapeCode = kArtProportionalShapeCode;

562+ } else {

563+ var artShapeHolderShapeAspect;

564+ switch (artShapeStyle) {

565+ case "inset": artShapeHolderShapeAspect = "UbuntuShape.Inset"; break;

566+ case "shadow": artShapeHolderShapeAspect = "UbuntuShape.DropShadow"; break;

567+ default:

568+ case "flat": artShapeHolderShapeAspect = "UbuntuShape.Flat"; break;

569+ }

570+ artShapeHolderShapeCode = kArtUbuntuShapeCode.arg(artShapeHolderShapeAspect);

571+ }

572+ } else {

573+ artShapeHolderShapeCode = "";

574+ }

575+ var artShapeHolderCode = isCardTool ? kArtShapeHolderCodeCardToolCard : kArtShapeHolderCode;

576+ code += artShapeHolderCode.arg(artAnchors)

577+ .arg(widthCode)

578+ .arg(heightCode)

579+ .arg(isConciergeMode ? "true" : "false")

580+ .arg(asynchronous)

581+ .arg(artShapeHolderShapeCode)

582+ .arg(fallbackStatusCode)

583+ .arg(fallbackURICode);

535584 } else {

536585 code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'

537586 }

@@ -882,15 +931,17 @@ function cardString(template, components, isCardTool) {

882931 code += kSocialActionsRowCode.arg(socialAnchors).arg(socialColor);

883932 }

884933

885− var touchdownAnchors;

886− if (hasBackground) {

887− touchdownAnchors = 'fill: backgroundLoader';

888− } else if (touchdownOnArtShape) {

889− touchdownAnchors = 'fill: artShapeHolder';

890− } else {

891− touchdownAnchors = 'fill: root'

934+ if (artShapeStyle != "shadow" && artShapeStyle != "icon") {

935+ var touchdownAnchors;

936+ if (hasBackground) {

937+ touchdownAnchors = 'fill: backgroundLoader';

938+ } else if (touchdownOnArtShape) {

939+ touchdownAnchors = 'fill: artShapeHolder';

940+ } else {

941+ touchdownAnchors = 'fill: root'

942+ }

943+ code += kTouchdownCode.arg(touchdownAnchors);

892944 }

893− code += kTouchdownCode.arg(touchdownAnchors);

894945

895946 var implicitHeight = 'implicitHeight: ';

896947 if (hasSocialActions) {

@@ -925,13 +976,13 @@ function cardString(template, components, isCardTool) {

925976 return code;

926977}

927978

928−function createCardComponent(parent, template, components, isCardTool, identifier) {

979+function createCardComponent(parent, template, components, isCardTool, artShapeStyle, identifier) {

929980 var imports = 'import QtQuick 2.4; \n\

930981 import Ubuntu.Components 1.3; \n\

931982 import Ubuntu.Settings.Components 0.1; \n\

932983 import Dash 0.1;\n\

933984 import Utils 0.1;\n';

934− var card = cardString(template, components, isCardTool);

985+ var card = cardString(template, components, isCardTool, artShapeStyle);

935986 var code = imports + 'Component {\n' + card + '}\n';

936987

937988 try {

plugins/Dash/CardCreatorCache.qml+3−3

@@ -23,16 +23,16 @@ QtObject {

2323

2424 property var cache: new Object();

2525

26− function getCardComponent(template, components, isCardTool) {

26+ function getCardComponent(template, components, isCardTool, artShapeStyle) {

2727 if (template === undefined || components === undefined)

2828 return undefined;

2929

3030 var tString = JSON.stringify(template);

3131 var cString = JSON.stringify(components);

32− var allString = tString + cString + isCardTool;

32+ var allString = tString + cString + isCardTool + artShapeStyle;

3333 var component = cache[allString];

3434 if (component === undefined) {

35− component = CardCreator.createCardComponent(root, template, components, isCardTool, allString);

35+ component = CardCreator.createCardComponent(root, template, components, isCardTool, artShapeStyle, allString);

3636 cache[allString] = component;

3737 }

3838 return component;

plugins/Dash/Dash.qmltypesdeleted−100

@@ -1,100 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Dash 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "AbstractDashView"

12− defaultProperty: "data"

13− prototype: "QQuickItem"

14− Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }

15− Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }

16− Property { name: "columnSpacing"; type: "double" }

17− Property { name: "rowSpacing"; type: "double" }

18− Property { name: "cacheBuffer"; type: "int" }

19− Property { name: "displayMarginBeginning"; type: "double" }

20− Property { name: "displayMarginEnd"; type: "double" }

21− }

22− Component {

23− name: "HorizontalJournal"

24− defaultProperty: "data"

25− prototype: "AbstractDashView"

26− exports: ["Dash/HorizontalJournal 0.1"]

27− exportMetaObjectRevisions: [0]

28− Property { name: "rowHeight"; type: "double" }

29− }

30− Component {

31− name: "ListViewWithPageHeader"

32− defaultProperty: "flickableData"

33− prototype: "QQuickFlickable"

34− exports: ["Dash/ListViewWithPageHeader 0.1"]

35− exportMetaObjectRevisions: [0]

36− Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }

37− Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }

38− Property { name: "pageHeader"; type: "QQuickItem"; isPointer: true }

39− Property { name: "sectionDelegate"; type: "QQmlComponent"; isPointer: true }

40− Property { name: "sectionProperty"; type: "string" }

41− Property { name: "forceNoClip"; type: "bool" }

42− Property { name: "stickyHeaderHeight"; type: "int"; isReadonly: true }

43− Property { name: "headerItemShownHeight"; type: "double"; isReadonly: true }

44− Property { name: "cacheBuffer"; type: "int" }

45− Signal { name: "headerChanged" }

46− Method { name: "positionAtBeginning" }

47− Method { name: "showHeader" }

48− Method { name: "firstCreatedIndex"; type: "int" }

49− Method { name: "createdItemCount"; type: "int" }

50− Method {

51− name: "item"

52− type: "QQuickItem*"

53− Parameter { name: "modelIndex"; type: "int" }

54− }

55− Method {

56− name: "maximizeVisibleArea"

57− type: "bool"

58− Parameter { name: "modelIndex"; type: "int" }

59− }

60− Method {

61− name: "maximizeVisibleArea"

62− type: "bool"

63− Parameter { name: "modelIndex"; type: "int" }

64− Parameter { name: "itemHeight"; type: "int" }

65− }

66− }

67− Component {

68− name: "OrganicGrid"

69− defaultProperty: "data"

70− prototype: "AbstractDashView"

71− exports: ["Dash/OrganicGrid 0.1"]

72− exportMetaObjectRevisions: [0]

73− Property { name: "smallDelegateSize"; type: "QSizeF" }

74− Property { name: "bigDelegateSize"; type: "QSizeF" }

75− }

76− Component {

77− name: "VerticalJournal"

78− defaultProperty: "data"

79− prototype: "AbstractDashView"

80− exports: ["Dash/VerticalJournal 0.1"]

81− exportMetaObjectRevisions: [0]

82− Property { name: "columnWidth"; type: "double" }

83− }

84− Component {

85− prototype: "QObject"

86− name: "CardCreatorCache"

87− exports: ["CardCreatorCache -1.-1"]

88− exportMetaObjectRevisions: [-1]

89− isComposite: true

90− isCreatable: false

91− isSingleton: true

92− Property { name: "cache"; type: "QVariant" }

93− Method {

94− name: "getCardComponent"

95− type: "QVariant"

96− Parameter { name: "template"; type: "QVariant" }

97− Parameter { name: "components"; type: "QVariant" }

98− }

99− }

100−}

plugins/Dash/ScopeStyle.qml+1−1

@@ -70,7 +70,7 @@ QtObject {

7070 readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"

7171

7272 /// Color of the primary preview button

73− readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : UbuntuColors.orange

73+ readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : theme.palette.normal.positive

7474

7575 //! @cond

7676 property var d: QtObject {

plugins/Dash/abstractdashview.h+1−3

@@ -21,11 +21,9 @@

2121

2222class QAbstractItemModel;

2323class QQmlComponent;

24−#pragma GCC diagnostic push

25−#pragma GCC diagnostic ignored "-pedantic"

24+

2625#include <private/qqmldelegatemodel_p.h>

2726#include <qqmlinfo.h>

28−#pragma GCC diagnostic pop

2927

3028class AbstractDashView : public QQuickItem

3129{

plugins/Dash/graphics/music_progress_bg.png

Binary file not shown.

plugins/Dash/horizontaljournal.cpp+1−4

@@ -26,12 +26,9 @@

2626#include "horizontaljournal.h"

2727

2828#include <qqmlengine.h>

29−#pragma GCC diagnostic push

30−#pragma GCC diagnostic ignored "-pedantic"

31−#include <private/qqmldelegatemodel_p.h>

3229#include <qqmlinfo.h>

30+#include <private/qqmldelegatemodel_p.h>

3331#include <private/qquickitem_p.h>

34−#pragma GCC diagnostic pop

3532

3633HorizontalJournal::HorizontalJournal()

3734 : m_firstVisibleIndex(-1)

plugins/Dash/listviewwithpageheader.cpp+28−25

@@ -95,13 +95,11 @@

9595#include <QDebug>

9696#include <qqmlinfo.h>

9797#include <qqmlengine.h>

98−#pragma GCC diagnostic push

99−#pragma GCC diagnostic ignored "-pedantic"

98+#include <private/qqmlcontext_p.h>

10099#include <private/qqmldelegatemodel_p.h>

101100#include <private/qqmlglobal_p.h>

102101#include <private/qquickitem_p.h>

103102#include <private/qquickanimation_p.h>

104−#pragma GCC diagnostic pop

105103// #include <private/qquickrectangle_p.h>

106104

107105qreal ListViewWithPageHeader::ListItem::height() const

@@ -168,7 +166,7 @@ ListViewWithPageHeader::ListViewWithPageHeader()

168166 m_contentYAnimation->setDuration(200);

169167 m_contentYAnimation->setTargetObject(this);

170168

171− connect(this, &ListViewWithPageHeader::contentWidthChanged, this, &ListViewWithPageHeader::onContentWidthChanged);

169+ connect(contentItem(), &QQuickItem::widthChanged, this, &ListViewWithPageHeader::onContentWidthChanged);

172170 connect(this, &ListViewWithPageHeader::contentHeightChanged, this, &ListViewWithPageHeader::onContentHeightChanged);

173171 connect(this, &ListViewWithPageHeader::heightChanged, this, &ListViewWithPageHeader::onHeightChanged);

174172 connect(m_contentYAnimation, &QQuickNumberAnimation::runningChanged, this, &ListViewWithPageHeader::contentYAnimationRunningChanged);

@@ -255,6 +253,7 @@ void ListViewWithPageHeader::setHeader(QQuickItem *headerItem)

255253 oldHeaderHeight = m_headerItem->height();

256254 oldHeaderY = m_headerItem->y();

257255 m_headerItem->setParentItem(nullptr);

256+ QQuickItemPrivate::get(m_headerItem)->removeItemChangeListener(this, QQuickItemPrivate::ImplicitHeight);

258257 }

259258 m_headerItem = headerItem;

260259 if (m_headerItem) {

@@ -286,9 +285,11 @@ void ListViewWithPageHeader::setSectionDelegate(QQmlComponent *delegate)

286285 m_sectionDelegate = delegate;

287286

288287 m_topSectionItem = getSectionItem(QString(), false /*watchGeometry*/);

289− m_topSectionItem->setZ(3);

290− QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

291− connect(m_topSectionItem, &QQuickItem::heightChanged, this, &ListViewWithPageHeader::stickyHeaderHeightChanged);

288+ if (m_topSectionItem) {

289+ m_topSectionItem->setZ(3);

290+ QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

291+ connect(m_topSectionItem, &QQuickItem::heightChanged, this, &ListViewWithPageHeader::stickyHeaderHeightChanged);

292+ }

292293

293294 // TODO create sections for existing items

294295

@@ -699,7 +700,9 @@ void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)

699700 if (flags & QQmlDelegateModel::Destroyed) {

700701 item->setParentItem(nullptr);

701702 }

702− listItem->sectionItem()->deleteLater();

703+ if (listItem->sectionItem()) {

704+ listItem->sectionItem()->deleteLater();

705+ }

703706 delete listItem;

704707}

705708

@@ -757,8 +760,6 @@ QQuickItem *ListViewWithPageHeader::getSectionItem(const QString &sectionText, b

757760

758761 QQmlContext *creationContext = m_sectionDelegate->creationContext();

759762 QQmlContext *context = new QQmlContext(creationContext ? creationContext : qmlContext(this));

760− context->setContextProperty(QStringLiteral("section"), sectionText);

761− context->setContextProperty(QStringLiteral("delegateIndex"), -1);

762763 QObject *nobj = m_sectionDelegate->beginCreate(context);

763764 if (nobj) {

764765 QQml_setParent_noEvent(context, nobj);

@@ -766,6 +767,8 @@ QQuickItem *ListViewWithPageHeader::getSectionItem(const QString &sectionText, b

766767 if (!sectionItem) {

767768 delete nobj;

768769 } else {

770+ sectionItem->setProperty("text", sectionText);

771+ sectionItem->setProperty("delegateIndex", -1);

769772 sectionItem->setZ(2);

770773 QQml_setParent_noEvent(sectionItem, m_clipItem);

771774 sectionItem->setParentItem(m_clipItem);

@@ -775,7 +778,7 @@ QQuickItem *ListViewWithPageHeader::getSectionItem(const QString &sectionText, b

775778 }

776779 m_sectionDelegate->completeCreate();

777780

778− if (watchGeometry) {

781+ if (watchGeometry && sectionItem) {

779782 QQuickItemPrivate::get(sectionItem)->addItemChangeListener(this, QQuickItemPrivate::Geometry);

780783 }

781784

@@ -801,8 +804,7 @@ void ListViewWithPageHeader::updateSectionItem(int modelIndex)

801804 if (!item->sectionItem()) {

802805 item->setSectionItem(getSectionItem(sectionText));

803806 } else {

804− QQmlContext *context = QQmlEngine::contextForObject(item->sectionItem())->parentContext();

805− context->setContextProperty(QStringLiteral("section"), sectionText);

807+ item->sectionItem()->setProperty("text", sectionText);

806808 }

807809 } else {

808810 if (item->sectionItem()) {

@@ -923,8 +925,7 @@ ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIn

923925 polish();

924926 }

925927 if (listItem->sectionItem()) {

926− QQmlContext *context = QQmlEngine::contextForObject(listItem->sectionItem())->parentContext();

927− context->setContextProperty(QStringLiteral("delegateIndex"), modelIndex);

928+ listItem->sectionItem()->setProperty("delegateIndex", modelIndex);

928929 }

929930 adjustMinYExtent();

930931 m_contentHeightDirty = true;

@@ -948,9 +949,10 @@ void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)

948949 return;

949950

950951 item->setParentItem(m_clipItem);

952+ // FIXME Why do we need the refreshExpressions call?

951953 QQmlContext *context = QQmlEngine::contextForObject(item)->parentContext();

952− context->setContextProperty(QStringLiteral("ListViewWithPageHeader"), this);

953− context->setContextProperty(QStringLiteral("heightToClip"), QVariant::fromValue<int>(0));

954+ QQmlContextPrivate::get(context)->data->refreshExpressions();

955+ item->setProperty("heightToClip", QVariant::fromValue<int>(0));

954956 if (modelIndex == m_asyncRequestedIndex) {

955957 createItem(modelIndex, false);

956958 refill();

@@ -1116,8 +1118,7 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool

11161118 for (int i = 0; i < m_visibleItems.count(); ++i) {

11171119 ListItem *item = m_visibleItems[i];

11181120 if (item->sectionItem()) {

1119− QQmlContext *context = QQmlEngine::contextForObject(item->sectionItem())->parentContext();

1120− context->setContextProperty(QStringLiteral("delegateIndex"), m_firstVisibleIndex + i);

1121+ item->sectionItem()->setProperty("delegateIndex", m_firstVisibleIndex + i);

11211122 }

11221123 }

11231124

@@ -1287,8 +1288,7 @@ void ListViewWithPageHeader::layout()

12871288 } else {

12881289 // Update the top sticky section header

12891290 const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);

1290− QQmlContext *context = QQmlEngine::contextForObject(m_topSectionItem)->parentContext();

1291− context->setContextProperty(QStringLiteral("section"), section);

1291+ m_topSectionItem->setProperty("text", section);

12921292

12931293 QQuickItemPrivate::get(m_topSectionItem)->setCulled(false);

12941294 m_topSectionItem->setY(topSectionStickPos);

@@ -1300,19 +1300,18 @@ void ListViewWithPageHeader::layout()

13001300 break;

13011301 delegateIndex--;

13021302 }

1303− context->setContextProperty(QStringLiteral("delegateIndex"), delegateIndex);

1303+ m_topSectionItem->setProperty("delegateIndex", delegateIndex);

13041304 if (item->sectionItem()) {

13051305 QQuickItemPrivate::get(item->sectionItem())->setCulled(true);

13061306 }

13071307 }

13081308 }

13091309 }

1310− QQmlContext *context = QQmlEngine::contextForObject(item->m_item)->parentContext();

13111310 const qreal clipFrom = visibleFrom + (!item->sectionItem() && m_topSectionItem && !QQuickItemPrivate::get(m_topSectionItem)->culled ? m_topSectionItem->height() : 0);

13121311 if (!cull && pos < clipFrom) {

1313− context->setContextProperty(QStringLiteral("heightToClip"), clipFrom - pos);

1312+ item->m_item->setProperty("heightToClip", clipFrom - pos);

13141313 } else {

1315− context->setContextProperty(QStringLiteral("heightToClip"), QVariant::fromValue<int>(0));

1314+ item->m_item->setProperty("heightToClip", QVariant::fromValue<int>(0));

13161315 }

13171316// qDebug() << "ListViewWithPageHeader::layout" << item->m_item;

13181317 pos += item->height();

@@ -1335,6 +1334,10 @@ void ListViewWithPageHeader::layout()

13351334 }

13361335 }

13371336 }

1337+ if (m_headerItem) {

1338+ const bool cullHeader = m_headerItem->y() + m_headerItem->height() < contentY();

1339+ QQuickItemPrivate::get(m_headerItem)->setCulled(cullHeader);

1340+ }

13381341 m_inLayout = false;

13391342}

13401343

plugins/Dash/organicgrid.cpp−3

@@ -16,10 +16,7 @@

1616

1717#include "organicgrid.h"

1818

19−#pragma GCC diagnostic push

20−#pragma GCC diagnostic ignored "-pedantic"

2119#include <private/qquickitem_p.h>

22−#pragma GCC diagnostic pop

2320

2421OrganicGrid::OrganicGrid()

2522 : m_firstVisibleIndex(-1)

plugins/Dash/verticaljournal.cpp−3

@@ -27,10 +27,7 @@

2727 */

2828#include "verticaljournal.h"

2929

30−#pragma GCC diagnostic push

31−#pragma GCC diagnostic ignored "-pedantic"

3230#include <private/qquickitem_p.h>

33−#pragma GCC diagnostic pop

3431

3532VerticalJournal::VerticalJournal()

3633 : m_columnWidth(0)

plugins/GlobalShortcut/GlobalShortcut.qmltypesdeleted−31

@@ -1,31 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable GlobalShortcut 1.0 plugins'

8−

9−Module {

10− Component {

11− name: "GlobalShortcut"

12− defaultProperty: "data"

13− prototype: "QQuickItem"

14− exports: ["GlobalShortcut/GlobalShortcut 1.0"]

15− exportMetaObjectRevisions: [0]

16− Property { name: "shortcut"; type: "QVariant" }

17− Property { name: "active"; type: "bool" }

18− Signal {

19− name: "shortcutChanged"

20− Parameter { name: "shortcut"; type: "QVariant" }

21− }

22− Signal {

23− name: "triggered"

24− Parameter { name: "shortcut"; type: "string" }

25− }

26− Signal {

27− name: "activeChanged"

28− Parameter { name: "active"; type: "bool" }

29− }

30− }

31−}

plugins/Greeter/Unity/Launcher/CMakeLists.txt+1−1

@@ -1,4 +1,4 @@

1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)

1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)

22pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

44add_definitions(-DSM_BUSNAME=systemBus)

plugins/Greeter/Unity/Launcher/Launcher.qmltypesdeleted−182

@@ -1,182 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins/Greeter'

8−

9−Module {

10− Component {

11− name: "LauncherItem"

12− prototype: "unity::shell::launcher::LauncherItemInterface"

13− exports: ["Unity.Launcher/LauncherItem 0.1"]

14− isCreatable: false

15− exportMetaObjectRevisions: [0]

16− }

17− Component {

18− name: "LauncherModel"

19− prototype: "unity::shell::launcher::LauncherModelInterface"

20− exports: ["Unity.Launcher/LauncherModel 0.1"]

21− isCreatable: false

22− isSingleton: true

23− exportMetaObjectRevisions: [0]

24− Method {

25− name: "requestRemove"

26− Parameter { name: "appId"; type: "string" }

27− }

28− Method { name: "refresh" }

29− Method {

30− name: "get"

31− type: "unity::shell::launcher::LauncherItemInterface*"

32− Parameter { name: "index"; type: "int" }

33− }

34− Method {

35− name: "move"

36− Parameter { name: "oldIndex"; type: "int" }

37− Parameter { name: "newIndex"; type: "int" }

38− }

39− Method {

40− name: "pin"

41− Parameter { name: "appId"; type: "string" }

42− Parameter { name: "index"; type: "int" }

43− }

44− Method {

45− name: "pin"

46− Parameter { name: "appId"; type: "string" }

47− }

48− Method {

49− name: "quickListActionInvoked"

50− Parameter { name: "appId"; type: "string" }

51− Parameter { name: "actionIndex"; type: "int" }

52− }

53− Method {

54− name: "setUser"

55− Parameter { name: "username"; type: "string" }

56− }

57− Method {

58− name: "getUrlForAppId"

59− type: "string"

60− Parameter { name: "appId"; type: "string" }

61− }

62− }

63− Component {

64− name: "QuickListModel"

65− prototype: "unity::shell::launcher::QuickListModelInterface"

66− exports: ["Unity.Launcher/QuickListModel 0.1"]

67− isCreatable: false

68− exportMetaObjectRevisions: [0]

69− }

70− Component {

71− name: "unity::shell::launcher::LauncherItemInterface"

72− prototype: "QObject"

73− exports: ["Unity.Launcher/LauncherItemInterface 0.1"]

74− isCreatable: false

75− exportMetaObjectRevisions: [0]

76− Property { name: "appId"; type: "string"; isReadonly: true }

77− Property { name: "name"; type: "string"; isReadonly: true }

78− Property { name: "icon"; type: "string"; isReadonly: true }

79− Property { name: "pinned"; type: "bool"; isReadonly: true }

80− Property { name: "running"; type: "bool"; isReadonly: true }

81− Property { name: "recent"; type: "bool"; isReadonly: true }

82− Property { name: "progress"; type: "int"; isReadonly: true }

83− Property { name: "count"; type: "int"; isReadonly: true }

84− Property { name: "countVisible"; type: "bool"; isReadonly: true }

85− Property { name: "focused"; type: "bool"; isReadonly: true }

86− Property {

87− name: "quickList"

88− type: "unity::shell::launcher::QuickListModelInterface"

89− isReadonly: true

90− isPointer: true

91− }

92− Signal {

93− name: "nameChanged"

94− Parameter { name: "name"; type: "string" }

95− }

96− Signal {

97− name: "iconChanged"

98− Parameter { name: "icon"; type: "string" }

99− }

100− Signal {

101− name: "pinnedChanged"

102− Parameter { name: "pinned"; type: "bool" }

103− }

104− Signal {

105− name: "runningChanged"

106− Parameter { name: "running"; type: "bool" }

107− }

108− Signal {

109− name: "recentChanged"

110− Parameter { name: "running"; type: "bool" }

111− }

112− Signal {

113− name: "progressChanged"

114− Parameter { name: "progress"; type: "int" }

115− }

116− Signal {

117− name: "countChanged"

118− Parameter { name: "count"; type: "int" }

119− }

120− Signal {

121− name: "countVisibleChanged"

122− Parameter { name: "countVisible"; type: "bool" }

123− }

124− Signal {

125− name: "focusedChanged"

126− Parameter { name: "focused"; type: "bool" }

127− }

128− }

129− Component {

130− name: "unity::shell::launcher::LauncherModelInterface"

131− prototype: "QAbstractListModel"

132− exports: ["Unity.Launcher/LauncherModelInterface 0.1"]

133− isCreatable: false

134− exportMetaObjectRevisions: [0]

135− Property {

136− name: "applicationManager"

137− type: "unity::shell::application::ApplicationManagerInterface"

138− isPointer: true

139− }

140− Property { name: "onlyPinned"; type: "bool" }

141− Signal { name: "hint" }

142− Method {

143− name: "move"

144− Parameter { name: "oldIndex"; type: "int" }

145− Parameter { name: "newIndex"; type: "int" }

146− }

147− Method {

148− name: "get"

149− type: "unity::shell::launcher::LauncherItemInterface*"

150− Parameter { name: "index"; type: "int" }

151− }

152− Method {

153− name: "pin"

154− Parameter { name: "appId"; type: "string" }

155− Parameter { name: "index"; type: "int" }

156− }

157− Method {

158− name: "pin"

159− Parameter { name: "appId"; type: "string" }

160− }

161− Method {

162− name: "requestRemove"

163− Parameter { name: "appId"; type: "string" }

164− }

165− Method {

166− name: "quickListActionInvoked"

167− Parameter { name: "appId"; type: "string" }

168− Parameter { name: "actionIndex"; type: "int" }

169− }

170− Method {

171− name: "setUser"

172− Parameter { name: "username"; type: "string" }

173− }

174− }

175− Component {

176− name: "unity::shell::launcher::QuickListModelInterface"

177− prototype: "QAbstractListModel"

178− exports: ["Unity.Launcher/QuickListInterface 0.1"]

179− isCreatable: false

180− exportMetaObjectRevisions: [0]

181− }

182−}

plugins/Greeter/Unity/Launcher/launcheritem.cpp+14

@@ -32,6 +32,7 @@ LauncherItem::LauncherItem(const QString &appId, const QString &name, const QStr

3232 m_countVisible(false),

3333 m_focused(false),

3434 m_alerting(false),

35+ m_surfaceCount(0),

3536 m_quickList(new QuickListModel(this))

3637{

3738 QuickListEntry nameAction;

@@ -179,6 +180,19 @@ void LauncherItem::setAlerting(bool alerting)

179180 }

180181}

181182

183+int LauncherItem::surfaceCount() const

184+{

185+ return m_surfaceCount;

186+}

187+

188+void LauncherItem::setSurfaceCount(int surfaceCount)

189+{

190+ if (m_surfaceCount != surfaceCount) {

191+ m_surfaceCount = surfaceCount;

192+ Q_EMIT surfaceCountChanged(surfaceCount);

193+ }

194+}

195+

182196unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const

183197{

184198 return m_quickList;

plugins/Greeter/Unity/Launcher/launcheritem.h+3−1

@@ -42,6 +42,7 @@ public:

4242 bool countVisible() const override;

4343 bool focused() const override;

4444 bool alerting() const override;

45+ int surfaceCount() const override;

4546

4647 unity::shell::launcher::QuickListModelInterface *quickList() const override;

4748

@@ -56,7 +57,7 @@ private:

5657 void setCountVisible(bool countVisible);

5758 void setFocused(bool focused);

5859 void setAlerting(bool alerting);

59−

60+ void setSurfaceCount(int surfaceCount);

6061

6162private:

6263 QString m_appId;

@@ -70,6 +71,7 @@ private:

7071 bool m_countVisible;

7172 bool m_focused;

7273 bool m_alerting;

74+ int m_surfaceCount;

7375 QuickListModel *m_quickList;

7476

7577 friend class LauncherModel;

plugins/Greeter/Unity/Launcher/launchermodelas.cpp+2−7

@@ -69,18 +69,13 @@ QVariant LauncherModel::data(const QModelIndex &index, int role) const

6969 return item->focused();

7070 case RoleRunning:

7171 return item->running();

72+ case RoleSurfaceCount:

73+ return item->surfaceCount();

7274 }

7375

7476 return QVariant();

7577}

7678

77−void LauncherModel::setAlerting(const QString &appId, bool alerting)

78−{

79− Q_UNUSED(appId)

80− Q_UNUSED(alerting)

81− qWarning() << "This is a read only implementation. Cannot set alert-state of items.";

82−}

83−

8479unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const

8580{

8681 if (index < 0 || index >= m_list.count()) {

plugins/Greeter/Unity/Launcher/launchermodelas.h−1

@@ -41,7 +41,6 @@ public:

4141

4242 QVariant data(const QModelIndex &index, int role) const override;

4343

44− Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;

4544 Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;

4645 Q_INVOKABLE void move(int oldIndex, int newIndex) override;

4746 Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

plugins/IntegratedLightDM/CMakeLists.txtdeleted−40

@@ -1,40 +0,0 @@

1−pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

2−# TODO: Once we split out a separate greeter process, uncomment these lines

3−#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)

4−

5−add_subdirectory(liblightdm)

6−

7−include_directories(

8− ${CMAKE_CURRENT_SOURCE_DIR}

9− ${CMAKE_CURRENT_BINARY_DIR}

10− ${CMAKE_SOURCE_DIR}/plugins/Utils

11− ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM

12− #${LIBLIGHTDM_INCLUDE_DIRS}

13− ${libunity8-private_SOURCE_DIR}

14− ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

15−)

16−

17−set(QMLPLUGIN_SRC

18− ../Utils/unitysortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins

19− DBusGreeter.cpp

20− DBusGreeterList.cpp

21− Greeter.cpp

22− plugin.cpp

23− UsersModel.cpp

24− )

25−

26−add_library(IntegratedLightDM-qml MODULE

27− ${QMLPLUGIN_SRC}

28− )

29−

30−target_link_libraries(IntegratedLightDM-qml

31− integratedLightDM

32− unity8-private

33−# TODO: Once we split out a separate greeter process, uncomment these lines

34−# ${LIBLIGHTDM_LDFLAGS}

35− ${LIBUSERMETRICSOUTPUT_LDFLAGS}

36− )

37−

38−qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)

39−

40−add_unity8_plugin(IntegratedLightDM 0.1 IntegratedLightDM TARGETS IntegratedLightDM-qml)

plugins/LightDM/CMakeLists.txtnew file+26

@@ -0,0 +1,26 @@

1+pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

3+find_package(Qt5Core REQUIRED)

4+find_package(Qt5Quick REQUIRED)

6+include_directories(

7+ ${CMAKE_CURRENT_SOURCE_DIR}

8+ ${CMAKE_CURRENT_BINARY_DIR}

9+ ${CMAKE_SOURCE_DIR}/plugins/Utils

10+ ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/IntegratedLightDM

11+ ${libunity8-private_SOURCE_DIR}

12+ ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}

13+)

14+

15+set(QMLPLUGIN_SRC

16+ ../Utils/unitysortfilterproxymodelqml.cpp

17+ DBusGreeter.cpp

18+ DBusGreeterList.cpp

19+ Greeter.cpp

20+ plugin.cpp

21+ SessionsModel.cpp

22+ UsersModel.cpp

23+ )

24+

25+add_subdirectory(FullLightDM)

26+add_subdirectory(IntegratedLightDM)

plugins/IntegratedLightDM/DBusGreeter.cpp → plugins/LightDM/DBusGreeter.cpprenamed+5−4

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -24,7 +24,8 @@ DBusGreeter::DBusGreeter(Greeter *greeter, const QString &path)

2424 : UnityDBusObject(path, QStringLiteral("com.canonical.UnityGreeter"), true, greeter),

2525 m_greeter(greeter)

2626{

27− connect(m_greeter, &Greeter::isActiveChanged, this, &DBusGreeter::isActiveChangedHandler);

27+ connect(m_greeter, &Greeter::isActiveChanged,

28+ this, &DBusGreeter::isActiveChangedHandler);

2829}

2930

3031bool DBusGreeter::isActive() const

@@ -34,12 +35,12 @@ bool DBusGreeter::isActive() const

3435

3536void DBusGreeter::ShowGreeter()

3637{

37− return Q_EMIT m_greeter->showGreeter();

38+ Q_EMIT m_greeter->showGreeter();

3839}

3940

4041void DBusGreeter::HideGreeter()

4142{

42− return Q_EMIT m_greeter->hideGreeter();

43+ Q_EMIT m_greeter->hideGreeter();

4344}

4445

4546void DBusGreeter::isActiveChangedHandler()

plugins/IntegratedLightDM/DBusGreeter.h → plugins/LightDM/DBusGreeter.hrenamed

The content is the same.

plugins/IntegratedLightDM/DBusGreeterList.cpp → plugins/LightDM/DBusGreeterList.cpprenamed

The content is the same.

plugins/IntegratedLightDM/DBusGreeterList.h → plugins/LightDM/DBusGreeterList.hrenamed

The content is the same.

plugins/LightDM/FullLightDM/CMakeLists.txtnew file+28

@@ -0,0 +1,28 @@

1+pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-3)

3+set(PLUGIN_CLASSNAME "FullLightDM")

5+add_definitions(-DFULL_LIGHTDM)

7+include_directories(

8+ ../

9+ ${LIBLIGHTDM_INCLUDE_DIRS}

10+ ${CMAKE_CURRENT_BINARY_DIR}

11+ )

12+

13+foreach(source_file ${QMLPLUGIN_SRC})

14+ list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})

15+endforeach()

16+

17+add_library(FullLightDM-qml MODULE

18+ ${RELATIVE_QMLPLUGIN_SRC}

19+ )

20+

21+target_link_libraries(FullLightDM-qml

22+ unity8-private

23+ ${LIBLIGHTDM_LDFLAGS}

24+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}

25+ )

26+

27+qt5_use_modules(FullLightDM-qml DBus Gui Qml)

28+add_unity8_plugin(FullLightDM 0.1 LightDM/FullLightDM TARGETS FullLightDM-qml)

plugins/LightDM/FullLightDM/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module LightDM.FullLightDM

2+plugin FullLightDM-qml

3+typeinfo FullLightDM.qmltypes

plugins/IntegratedLightDM/Greeter.cpp → plugins/LightDM/Greeter.cpprenamed+13−2

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -13,7 +13,6 @@

1313 * You should have received a copy of the GNU General Public License

1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.

1515 *

16− * Author: Michael Terry <michael.terry@canonical.com>

1716 */

1817

1918#include "Greeter.h"

@@ -72,12 +71,24 @@ QString Greeter::authenticationUser() const

7271 return d->m_greeter->authenticationUser();

7372}

7473

74+QString Greeter::defaultSessionHint() const

75+{

76+ Q_D(const Greeter);

77+ return d->m_greeter->defaultSessionHint();

78+}

79+

7580bool Greeter::promptless() const

7681{

7782 Q_D(const Greeter);

7883 return d->promptless;

7984}

8085

86+QString Greeter::selectUser() const

87+{

88+ Q_D(const Greeter);

89+ return d->m_greeter->selectUserHint();

90+}

91+

8192void Greeter::authenticate(const QString &username)

8293{

8394 Q_D(Greeter);

plugins/IntegratedLightDM/Greeter.h → plugins/LightDM/Greeter.hrenamed+5−2

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -13,7 +13,6 @@

1313 * You should have received a copy of the GNU General Public License

1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.

1515 *

16− * Authors: Michael Terry <michael.terry@canonical.com>

1716 */

1817

1918/* This class is a really tiny filter around QLightDM::Greeter. There are some

@@ -37,7 +36,9 @@ class Greeter : public QObject

3736 Q_PROPERTY(bool active READ isActive WRITE setIsActive NOTIFY isActiveChanged)

3837 Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)

3938 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)

39+ Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)

4040 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)

41+ Q_PROPERTY(QString selectUser READ selectUser CONSTANT)

4142

4243public:

4344 explicit Greeter(QObject* parent=0);

@@ -45,7 +46,9 @@ public:

4546 bool isActive() const;

4647 bool isAuthenticated() const;

4748 QString authenticationUser() const;

49+ QString defaultSessionHint() const;

4850 bool promptless() const;

51+ QString selectUser() const;

4952

5053public Q_SLOTS:

5154 void authenticate(const QString &username=QString());

plugins/IntegratedLightDM/GreeterPrivate.h → plugins/LightDM/GreeterPrivate.hrenamed

The content is the same.

plugins/IntegratedLightDM/IntegratedLightDM.qmltypes → plugins/LightDM/IntegratedLightDM.qmltypesrenamed

The content is the same.

plugins/LightDM/IntegratedLightDM/CMakeLists.txtnew file+33

@@ -0,0 +1,33 @@

1+set(PLUGIN_CLASSNAME "IntegratedLightDM")

3+add_definitions(-DINTEGRATED_LIGHTDM)

5+foreach(include_directory ${QMLPLUGIN_INCLUDES})

6+ list(APPEND RELATIVE_QMLPLUGIN_INCLUDES ../${include_directory})

7+endforeach()

9+include_directories(

10+ . #QLightDM

11+ ${QMLPLUGIN_INCLUDES}

12+ ${libunity8-private_SOURCE_DIR}

13+ ${CMAKE_CURRENT_BINARY_DIR}

14+)

15+

16+foreach(source_file ${QMLPLUGIN_SRC})

17+ list(APPEND RELATIVE_QMLPLUGIN_SRC ../${source_file})

18+endforeach()

19+

20+add_library(IntegratedLightDM-qml MODULE

21+ ${RELATIVE_QMLPLUGIN_SRC}

22+ )

23+

24+target_link_libraries(IntegratedLightDM-qml

25+ integratedLightDM

26+ unity8-private

27+ ${LIBUSERMETRICSOUTPUT_LDFLAGS}

28+ )

29+

30+qt5_use_modules(IntegratedLightDM-qml DBus Gui Qml)

31+add_unity8_plugin(IntegratedLightDM 0.1 LightDM/IntegratedLightDM TARGETS IntegratedLightDM-qml)

32+

33+add_subdirectory(liblightdm)

plugins/LightDM/IntegratedLightDM/QLightDM/Greeternew file+17

@@ -0,0 +1,17 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "../liblightdm/Greeter.h"

plugins/LightDM/IntegratedLightDM/QLightDM/SessionsModelnew file+17

@@ -0,0 +1,17 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "../liblightdm/SessionsModel.h"

plugins/LightDM/IntegratedLightDM/QLightDM/UsersModelnew file+17

@@ -0,0 +1,17 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "../liblightdm/UsersModel.h"

plugins/IntegratedLightDM/liblightdm/CMakeLists.txt → plugins/LightDM/IntegratedLightDM/liblightdm/CMakeLists.txtrenamed+4−2

@@ -2,8 +2,10 @@ pkg_check_modules(LIBUSERMETRICSOUTPUT REQUIRED libusermetricsoutput-1)

33set(LibLightDM_SOURCES

44 Greeter.cpp

5+ SessionsModel.cpp

56 UsersModel.cpp

67 GreeterPrivate.cpp

8+ SessionsModelPrivate.cpp

79 UsersModelPrivate.cpp

810 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

911 ${CMAKE_SOURCE_DIR}/plugins/Utils/qvariantlistmodel.cpp

@@ -46,8 +48,8 @@ set_target_properties(integratedLightDMSession PROPERTIES

4648 COMPILE_FLAGS "-DSM_BUSNAME=sessionBus -fPIC")

4749set_target_properties(MockLightDM-demo-shared PROPERTIES

4850 COMPILE_FLAGS "-DSM_BUSNAME=systemBus"

49− OUTPUT_NAME lightdm-qt5-2)

51+ OUTPUT_NAME lightdm-qt5-3)

5052

5153install(TARGETS MockLightDM-demo-shared

52− DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/demo

54+ DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/IntegratedLightDM/demo

5355 )

plugins/IntegratedLightDM/liblightdm/Greeter.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpprenamed

The content is the same.

plugins/IntegratedLightDM/liblightdm/Greeter.h → plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.hrenamed

The content is the same.

plugins/IntegratedLightDM/liblightdm/GreeterPrivate.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.cpprenamed+1−2

@@ -50,8 +50,7 @@ public:

5050 {

5151 qRegisterMetaType<QLightDM::GreeterImpl::ResponseFuture>("QLightDM::GreeterImpl::ResponseFuture");

5252

53− connect(&futureWatcher, &QFutureWatcher<int>::finished,

54− this, &GreeterImpl::finishPam);

53+ connect(&futureWatcher, &QFutureWatcher<int>::finished, this, &GreeterImpl::finishPam);

5554 connect(this, SIGNAL(showMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)),

5655 this, SLOT(handleMessage(pam_handle *, QString, QLightDM::Greeter::MessageType)));

5756 // This next connect is how we pass ResponseFutures between threads

plugins/IntegratedLightDM/liblightdm/GreeterPrivate.h → plugins/LightDM/IntegratedLightDM/liblightdm/GreeterPrivate.hrenamed

The content is the same.

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.cppnew file+88

@@ -0,0 +1,88 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ */

17+

18+

19+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

20+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

21+ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm

22+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

23+

24+// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.

25+// To use the same method of setting role name that it does, we

26+// set our compatibility to Qt4 here too.

27+#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)

28+

29+#include "SessionsModel.h"

30+#include "SessionsModelPrivate.h"

31+#include <QtCore/QDir>

32+#include <QtCore/QString>

33+

34+namespace QLightDM

35+{

36+

37+SessionsModel::SessionsModel(QObject* parent) :

38+ QAbstractListModel(parent),

39+ d_ptr(new SessionsModelPrivate(this))

40+{

41+ Q_D(SessionsModel);

42+ m_roleNames = QAbstractListModel::roleNames();

43+ m_roleNames[KeyRole] = "key";

44+ m_roleNames[TypeRole] = "type";

45+}

46+

47+SessionsModel::~SessionsModel()

48+{

49+ delete d_ptr;

50+}

51+

52+QVariant SessionsModel::data(const QModelIndex& index, int role) const

53+{

54+ Q_D(const SessionsModel);

55+

56+ if(!index.isValid()) {

57+ return QVariant();

58+ }

59+

60+ int row = index.row();

61+

62+ switch (role) {

63+ case QLightDM::SessionsModel::KeyRole:

64+ return d->sessionItems[row].key;

65+ case Qt::DisplayRole:

66+ return d->sessionItems[row].name;

67+ default:

68+ return QVariant();

69+ }

70+}

71+

72+QHash<int, QByteArray> SessionsModel::roleNames() const

73+{

74+ return m_roleNames;

75+}

76+

77+int SessionsModel::rowCount(const QModelIndex& parent) const

78+{

79+ Q_D(const SessionsModel);

80+

81+ if (parent.isValid()) {

82+ return 0;

83+ } else { // parent is root

84+ return d->sessionItems.size();

85+ }

86+}

87+

88+} // namespace QLightDM

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModel.hnew file+72

@@ -0,0 +1,72 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ */

17+

18+#ifndef UNITY_INTEGRATED_SESSIONSMODEL_H

19+#define UNITY_INTEGRATED_SESSIONSMODEL_H

20+

21+#include <QtCore/QAbstractListModel>

22+#include <QtCore/QString>

23+

24+/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

25+ * CHANGES MADE HERE MUST BE REFLECTED ON THE MOCK LIB

26+ * COUNTERPART IN tests/mocks/LightDM/IntegratedLightDM/liblightdm

27+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */

28+

29+// This is taken from liblightdm and modified to confirm to our syle conventions

30+namespace QLightDM

31+{

32+class SessionsModelPrivate;

33+

34+class Q_DECL_EXPORT SessionsModel : public QAbstractListModel

35+ {

36+ Q_OBJECT

37+

38+ Q_ENUMS(SessionModelRoles SessionType)

39+

40+ public:

41+

42+ enum SessionModelRoles {

43+ //name is exposed as Qt::DisplayRole

44+ //comment is exposed as Qt::TooltipRole

45+ KeyRole = Qt::UserRole,

46+ IdRole = KeyRole, /** Deprecated */

47+ TypeRole

48+ };

49+

50+ enum SessionType {

51+ LocalSessions,

52+ RemoteSessions

53+ };

54+

55+ explicit SessionsModel(QObject* parent=0); /** Deprecated. Loads local sessions*/

56+ explicit SessionsModel(SessionsModel::SessionType, QObject* parent=0);

57+ virtual ~SessionsModel();

58+

59+ QHash<int, QByteArray> roleNames() const override;

60+ int rowCount(const QModelIndex& parent) const override;

61+ QVariant data(const QModelIndex& index, int role) const override;

62+

63+ protected:

64+ SessionsModelPrivate* const d_ptr;

65+

66+ private:

67+ QHash<int, QByteArray> m_roleNames;

68+ Q_DECLARE_PRIVATE(SessionsModel)

69+ };

70+}

71+

72+#endif // UNITY_INTEGRATED_SESSIONSMODEL_H

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cppnew file+36

@@ -0,0 +1,36 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ */

17+

18+#include "SessionsModelPrivate.h"

19+

20+#include <QDir>

21+#include <QSettings>

22+#include <QStringList>

23+

24+namespace QLightDM

25+{

26+

27+SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)

28+ : q_ptr(parent)

29+{

30+ // Since this model is never visible, as there is only 1 session,

31+ // just use the session name as the key

32+ QString sessionName = qgetenv("XDG_SESSION_DESKTOP");

33+ sessionItems.append({sessionName, "", sessionName, ""});

34+}

35+

36+} // namespace QLightDM

plugins/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.hnew file+54

@@ -0,0 +1,54 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ */

17+

18+#ifndef UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H

19+#define UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H

20+

21+#include <QtCore/QList>

22+#include <QtCore/QString>

23+

24+namespace QLightDM

25+{

26+class SessionsModel;

27+

28+class SessionItem

29+{

30+public:

31+ QString key;

32+ QString type; // unused

33+ QString name;

34+ QString comment; // unused

35+};

36+

37+class SessionsModelPrivate

38+{

39+public:

40+ explicit SessionsModelPrivate(SessionsModel* parent=0);

41+ virtual ~SessionsModelPrivate() = default;

42+

43+ QList<SessionItem> sessionItems;

44+

45+protected:

46+ SessionsModel* const q_ptr;

47+

48+private:

49+ Q_DECLARE_PUBLIC(SessionsModel)

50+};

51+

52+} // namespace QLightDM

53+

54+#endif // UNITY_INTEGRATED_SESSIONSMODEL_PRIVATE_H

plugins/IntegratedLightDM/liblightdm/UsersModel.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.cpprenamed+4−1

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -52,6 +52,7 @@ UsersModel::UsersModel(QObject *parent) :

5252 roles[SessionRole] = "session";

5353 roles[HasMessagesRole] = "hasMessages";

5454 roles[ImagePathRole] = "imagePath";

55+ roles[UidRole] = "uid";

5556 setRoleNames(roles);

5657

5758 connect(d_ptr, &UsersModelPrivate::dataChanged, this, [this](int i) {

@@ -101,6 +102,8 @@ QVariant UsersModel::data(const QModelIndex &index, int role) const

101102 return d->entries[row].has_messages;

102103 case UsersModel::ImagePathRole:

103104 return "";

105+ case UsersModel::UidRole:

106+ return d->entries[row].uid;

104107 default:

105108 return QVariant();

106109 }

plugins/IntegratedLightDM/liblightdm/UsersModel.h → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModel.hrenamed+2−1

@@ -50,7 +50,8 @@ public:

5050 SessionRole,

5151 HasMessagesRole,

5252 ImagePathRole,

53− BackgroundPathRole

53+ BackgroundPathRole,

54+ UidRole

5455 };

5556

5657 int rowCount(const QModelIndex &parent) const override;

plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpprenamed+5−3

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -26,6 +26,7 @@

2626#include <QDir>

2727#include <QSettings>

2828#include <QStringList>

29+#include <unistd.h>

2930

3031namespace QLightDM

3132{

@@ -37,6 +38,7 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

3738{

3839 QFileInfo demoFile(QDir::homePath() + "/.unity8-greeter-demo");

3940 QString currentUser = g_get_user_name();

41+ uid_t currentUid = getuid();

4042

4143 if (demoFile.exists()) {

4244 QSettings settings(demoFile.filePath(), QSettings::NativeFormat);

@@ -46,10 +48,10 @@ UsersModelPrivate::UsersModelPrivate(UsersModel* parent)

4648 Q_FOREACH(const QString &user, users)

4749 {

4850 QString name = settings.value(user + "/name", user).toString();

49− entries.append({user, name, 0, 0, false, false, 0, 0});

51+ entries.append({user, name, 0, 0, false, false, 0, 0, currentUid++});

5052 }

5153 } else {

52− entries.append({currentUser, 0, 0, 0, false, false, 0, 0});

54+ entries.append({currentUser, 0, 0, 0, false, false, 0, 0, currentUid});

5355

5456 connect(m_service, &AccountsServiceDBusAdaptor::maybeChanged,

5557 this, [this](const QString &user) {

plugins/IntegratedLightDM/liblightdm/UsersModelPrivate.h → plugins/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.hrenamed+2−1

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -40,6 +40,7 @@ public:

4040 bool has_messages;

4141 QString session;

4242 QString infographic;

43+ uid_t uid;

4344};

4445

4546class UsersModelPrivate : public QObject

plugins/LightDM/IntegratedLightDM/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module LightDM.IntegratedLightDM

2+plugin IntegratedLightDM-qml

3+typeinfo IntegratedLightDM.qmltypes

plugins/LightDM/SessionsModel.cppnew file+122

@@ -0,0 +1,122 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ */

17+

18+#include "SessionsModel.h"

19+#include <QtCore/QFile>

20+#include <QtCore/QSortFilterProxyModel>

21+

22+QHash<int, QByteArray> SessionsModel::roleNames() const

23+{

24+ return m_roleNames;

25+}

26+

27+int SessionsModel::rowCount(const QModelIndex& parent) const

28+{

29+ return m_model->rowCount(parent);

30+}

31+

32+QList<QUrl> SessionsModel::iconSearchDirectories() const

33+{

34+ return m_iconSearchDirectories;

35+}

36+

37+void SessionsModel::setIconSearchDirectories(const QList<QUrl> searchDirectories)

38+{

39+ // QML gives us a url with file:// prepended which breaks QFile::exists()

40+ // so convert the url to a local file

41+ QList<QUrl> localList = {};

42+ Q_FOREACH(const QUrl& searchDirectory, searchDirectories)

43+ {

44+ localList.append(searchDirectory.toLocalFile());

45+ }

46+ m_iconSearchDirectories = localList;

47+ Q_EMIT iconSearchDirectoriesChanged();

48+}

49+

50+QUrl SessionsModel::iconUrl(const QString sessionName) const

51+{

52+ Q_FOREACH(const QUrl& searchDirectory, m_iconSearchDirectories)

53+ {

54+ // This is an established icon naming convention

55+ QString customIconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +

56+ "/custom_" + sessionName + "_badge.png";

57+ QString iconUrl = searchDirectory.toString(QUrl::StripTrailingSlash) +

58+ "/" + sessionName + "_badge.png";

59+

60+ QFile customIconFile(customIconUrl);

61+ QFile iconFile(iconUrl);

62+ if (customIconFile.exists()) {

63+ return QUrl(customIconUrl);

64+ } else if (iconFile.exists()) {

65+ return QUrl(iconUrl);

66+ } else{

67+ // Search the legacy way

68+ QString path = searchDirectory.toString(QUrl::StripTrailingSlash) + "/";

69+ if (sessionName == "ubuntu" || sessionName == "ubuntu-2d") {

70+ path += "ubuntu_badge.png";

71+ } else if(

72+ sessionName == "gnome-classic" ||

73+ sessionName == "gnome-flashback-compiz" ||

74+ sessionName == "gnome-flashback-metacity" ||

75+ sessionName == "gnome-shell" ||

76+ sessionName == "gnome-wayland" ||

77+ sessionName == "gnome"

78+ ){

79+ path += "gnome_badge.png";

80+ } else if (sessionName == "plasma") {

81+ path += "kde_badge.png";

82+ } else if (sessionName == "xterm") {

83+ path += "recovery_console_badge.png";

84+ } else if (sessionName == "remote-login") {

85+ path += "remote_login_help.png";

86+ }

87+

88+ if (QFile(path).exists()) {

89+ return path;

90+ }

91+ }

92+ }

93+

94+ // FIXME make this smarter

95+ return QUrl("./graphics/session_icons/unknown_badge.png");

96+}

97+

98+QVariant SessionsModel::data(const QModelIndex& index, int role) const

99+{

100+ switch (role) {

101+ case SessionsModel::IconRole:

102+ return iconUrl(m_model->data(index, Qt::DisplayRole).toString());

103+ default:

104+ return m_model->data(index, role);

105+ }

106+}

107+

108+SessionsModel::SessionsModel(QObject* parent)

109+ : UnitySortFilterProxyModelQML(parent)

110+{

111+ // Add a custom IconRole that isn't in either of the lightdm implementations

112+ m_model = new QLightDM::SessionsModel(this);

113+ m_roleNames = m_model->roleNames();

114+ m_roleNames[IconRole] = "icon_url";

115+

116+ setModel(m_model);

117+ setSourceModel(m_model);

118+ setSortCaseSensitivity(Qt::CaseInsensitive);

119+ setSortLocaleAware(true);

120+ setSortRole(Qt::DisplayRole);

121+ sort(0);

122+}

plugins/LightDM/SessionsModel.hnew file+68

@@ -0,0 +1,68 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ */

17+

18+#ifndef UNITY_SESSIONSMODEL_H

19+#define UNITY_SESSIONSMODEL_H

20+

21+#include <unitysortfilterproxymodelqml.h>

22+#include <QLightDM/SessionsModel>

23+#include <QtCore/QHash>

24+#include <QtCore/QObject>

25+#include <QtCore/QUrl>

26+

27+class SessionsModel : public UnitySortFilterProxyModelQML

28+{

29+ Q_OBJECT

30+

31+ Q_ENUMS(SessionModelRoles)

32+

33+ Q_PROPERTY(QList<QUrl> iconSearchDirectories READ iconSearchDirectories

34+ WRITE setIconSearchDirectories NOTIFY iconSearchDirectoriesChanged)

35+Q_SIGNALS:

36+ void iconSearchDirectoriesChanged();

37+

38+public:

39+ enum SessionModelRoles {

40+ /* This is tricky / ugly. Since we are ultimately chaining 3 enums together,

41+ * the _first_ value of this enum MUST be the _last_ value of

42+ * QLightDM::SessionsModel::SessionModelRoles and consquently, this must

43+ * also match the last value in the corresponding enum of the integrated lib

44+ */

45+ TypeRole = QLightDM::SessionsModel::SessionModelRoles::TypeRole,

46+ IconRole

47+ };

48+

49+ explicit SessionsModel(QObject* parent=nullptr);

50+

51+ QHash<int, QByteArray> roleNames() const override;

52+ int rowCount(const QModelIndex& parent) const override;

53+ QVariant data(const QModelIndex& index, int role) const override;

54+ QList<QUrl> iconSearchDirectories() const;

55+ Q_INVOKABLE QUrl iconUrl(const QString sessionName) const;

56+

57+ void setIconSearchDirectories(const QList<QUrl> searchDirectories);

58+private:

59+ QLightDM::SessionsModel* m_model;

60+ QHash<int, QByteArray> m_roleNames;

61+ QList<QUrl> m_iconSearchDirectories{

62+ QUrl("/usr/share/unity8/Greeter/graphics/session_icons"),

63+ QUrl("/usr/local/share/unity-greeter"),

64+ QUrl("/usr/share/unity-greeter/")};

65+

66+};

67+

68+#endif // UNITY_SESSIONSMODEL_H

plugins/IntegratedLightDM/UsersModel.cpp → plugins/LightDM/UsersModel.cpprenamed

The content is the same.

plugins/IntegratedLightDM/UsersModel.h → plugins/LightDM/UsersModel.hrenamed

The content is the same.

plugins/IntegratedLightDM/plugin.cpp → plugins/LightDM/plugin.cpprenamed+26−4

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -19,9 +19,11 @@

1919#include "DBusGreeter.h"

2020#include "DBusGreeterList.h"

2121#include "Greeter.h"

22+#include "SessionsModel.h"

2223#include "UsersModel.h"

2324#include <libusermetricsoutput/ColorTheme.h>

2425#include <libusermetricsoutput/UserMetrics.h>

26+#include <QLightDM/SessionsModel>

2527#include <QLightDM/UsersModel>

2628

2729#include <QAbstractItemModel>

@@ -40,6 +42,13 @@ static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

4042 return greeter;

4143}

4244

45+static QObject *sessions_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

46+{

47+ Q_UNUSED(engine)

48+ Q_UNUSED(scriptEngine)

49+ return new SessionsModel();

50+}

51+

4352static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

4453{

4554 Q_UNUSED(engine)

@@ -54,16 +63,29 @@ static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine

5463 return UserMetricsOutput::UserMetrics::getInstance();

5564}

5665

57−void IntegratedLightDMPlugin::registerTypes(const char *uri)

66+void PLUGIN_CLASSNAME::registerTypes(const char *uri)

5867{

5968 qmlRegisterType<QAbstractItemModel>();

6069 qmlRegisterType<UserMetricsOutput::ColorTheme>();

6170

62− Q_ASSERT(uri == QLatin1String("IntegratedLightDM"));

71+#if defined INTEGRATED_LIGHTDM

72+ Q_ASSERT(uri == QLatin1String("LightDM.IntegratedLightDM"));

73+ qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);

74+#elif defined FULL_LIGHTDM

75+ Q_ASSERT(uri == QLatin1String("LightDM.FullLightDM"));

76+ qmlRegisterSingletonType<QLightDM::Greeter>(uri, 0, 1, "Greeter", greeter_provider);

77+#else

78+ #error No library defined in LightDM plugin

79+#endif

80+

6381 qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");

6482 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");

65− qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);

83+

84+ qmlRegisterSingletonType<SessionsModel>(uri, 0, 1, "Sessions", sessions_provider);

85+ qmlRegisterUncreatableType<SessionsModel>(uri, 0, 1, "SessionRoles", QStringLiteral("Type is not instantiable"));

86+

6687 qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);

6788 qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", QStringLiteral("Type is not instantiable"));

89+

6890 qmlRegisterSingletonType<UserMetricsOutput::UserMetrics>(uri, 0, 1, "Infographic", infographic_provider);

6991}

plugins/IntegratedLightDM/plugin.h → plugins/LightDM/plugin.hrenamed+5−5

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -15,13 +15,13 @@

1515 *

1616 */

1717

18−#ifndef INTEGRATED_LIGHTDM_PLUGIN_H

19−#define INTEGRATED_LIGHTDM_PLUGIN_H

18+#ifndef LIGHTDM_PLUGIN_H

19+#define LIGHTDM_PLUGIN_H

2020

2121#include <QtQml/QQmlEngine>

2222#include <QtQml/QQmlExtensionPlugin>

2323

24−class IntegratedLightDMPlugin : public QQmlExtensionPlugin

24+class PLUGIN_CLASSNAME : public QQmlExtensionPlugin

2525{

2626 Q_OBJECT

2727 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

@@ -30,4 +30,4 @@ public:

3030 void registerTypes(const char *uri) override;

3131};

3232

33−#endif /* INTEGRATED_LIGHTDM_PLUGIN_H */

33+#endif /* LIGHTDM_PLUGIN_H */

plugins/IntegratedLightDM/qmldir → plugins/LightDM/qmldirrenamed

The content is the same.

plugins/Lights/CMakeLists.txt+1

@@ -2,6 +2,7 @@ pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)

22pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)

44include_directories(

5+ SYSTEM

56 ${ANDROID_HEADERS_INCLUDE_DIRS}

67)

plugins/Lights/Lights.qmltypesdeleted−45

@@ -1,45 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Lights 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "Lights"

12− prototype: "QObject"

13− exports: ["Lights/Lights 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Enum {

18− name: "State"

19− values: {

20− "Off": 0,

21− "On": 1

22− }

23− }

24− Property { name: "state"; type: "State" }

25− Property { name: "color"; type: "QColor" }

26− Property { name: "onMillisec"; type: "int" }

27− Property { name: "offMillisec"; type: "int" }

28− Signal {

29− name: "stateChanged"

30− Parameter { name: "newState"; type: "State" }

31− }

32− Signal {

33− name: "colorChanged"

34− Parameter { name: "color"; type: "QColor" }

35− }

36− Signal {

37− name: "onMillisecChanged"

38− Parameter { name: "onMs"; type: "int" }

39− }

40− Signal {

41− name: "offMillisecChanged"

42− Parameter { name: "offMs"; type: "int" }

43− }

44− }

45−}

plugins/Lights/android-hardware.h−4

@@ -15,9 +15,5 @@

1515 *

1616 */

1717

18−// The purpose of this header wrapper is just to avoid having warnings being reported on

19−// code from external header files, as we can't do anything about them.

20−#pragma GCC system_header

21−

2218#include <hardware/hardware.h>

2319#include <hardware/lights.h>

plugins/Powerd/Powerd.qmltypesdeleted−39

@@ -1,39 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Powerd 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "Powerd"

12− prototype: "QObject"

13− exports: ["Powerd/Powerd 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Enum {

18− name: "DisplayStateChangeReason"

19− values: {

20− "Unknown": 0,

21− "Inactivity": 1,

22− "PowerKey": 2,

23− "Proximity": 3

24− }

25− }

26− Enum {

27− name: "Status"

28− values: {

29− "Off": 0,

30− "On": 1

31− }

32− }

33− Property { name: "status"; type: "Status"; isReadonly: true }

34− Signal {

35− name: "statusChanged"

36− Parameter { name: "reason"; type: "DisplayStateChangeReason" }

37− }

38− }

39−}

plugins/SessionBroadcast/SessionBroadcast.qmltypesdeleted−19

@@ -1,19 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable SessionBroadcast 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "SessionBroadcast"

12− prototype: "QObject"

13− exports: ["SessionBroadcast/SessionBroadcast 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Signal { name: "showHome" }

18− }

19−}

plugins/UInput/UInput.qmltypesdeleted−44

@@ -1,44 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable UInput 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "UInput"

12− prototype: "QObject"

13− exports: ["UInput/UInput 0.1"]

14− exportMetaObjectRevisions: [0]

15− Enum {

16− name: "Button"

17− values: {

18− "ButtonLeft": 0,

19− "ButtonRight": 1,

20− "ButtonMiddle": 2

21− }

22− }

23− Method { name: "createMouse" }

24− Method { name: "removeMouse" }

25− Method {

26− name: "moveMouse"

27− Parameter { name: "dx"; type: "int" }

28− Parameter { name: "dy"; type: "int" }

29− }

30− Method {

31− name: "pressMouse"

32− Parameter { name: "button"; type: "Button" }

33− }

34− Method {

35− name: "releaseMouse"

36− Parameter { name: "button"; type: "Button" }

37− }

38− Method {

39− name: "scrollMouse"

40− Parameter { name: "dh"; type: "int" }

41− Parameter { name: "dv"; type: "int" }

42− }

43− }

44−}

plugins/Ubuntu/DownloadDaemonListener/CMakeLists.txt−1

@@ -1,7 +1,6 @@

11include_directories(

22 ${CMAKE_CURRENT_SOURCE_DIR}

33 ${CMAKE_CURRENT_BINARY_DIR}

4− ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

54)

76set(DOWNLOADDAEMONLISTENER_SOURCES

plugins/Ubuntu/DownloadDaemonListener/DownloadDaemonListener.qmltypesdeleted−60

@@ -1,60 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Ubuntu.DownloadDaemonListener 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "DownloadTracker"

12− prototype: "QObject"

13− exports: ["Ubuntu.DownloadDaemonListener/DownloadTracker 0.1"]

14− exportMetaObjectRevisions: [0]

15− Property { name: "service"; type: "string" }

16− Property { name: "dbusPath"; type: "string" }

17− Property { name: "serviceReady"; type: "bool"; isReadonly: true }

18− Signal {

19− name: "serviceChanged"

20− Parameter { name: "service"; type: "string" }

21− }

22− Signal {

23− name: "dbusPathChanged"

24− Parameter { name: "dbusPath"; type: "string" }

25− }

26− Signal {

27− name: "serviceReadyChanged"

28− Parameter { name: "serviceReady"; type: "bool" }

29− }

30− Signal {

31− name: "canceled"

32− Parameter { name: "success"; type: "bool" }

33− }

34− Signal {

35− name: "error"

36− Parameter { name: "error"; type: "string" }

37− }

38− Signal {

39− name: "finished"

40− Parameter { name: "path"; type: "string" }

41− }

42− Signal {

43− name: "paused"

44− Parameter { name: "success"; type: "bool" }

45− }

46− Signal {

47− name: "progress"

48− Parameter { name: "received"; type: "qulonglong" }

49− Parameter { name: "total"; type: "qulonglong" }

50− }

51− Signal {

52− name: "resumed"

53− Parameter { name: "success"; type: "bool" }

54− }

55− Signal {

56− name: "started"

57− Parameter { name: "success"; type: "bool" }

58− }

59− }

60−}

plugins/Ubuntu/Gestures/AxisVelocityCalculator.h+1−1

@@ -24,7 +24,7 @@

2424#include "UbuntuGesturesQmlGlobal.h"

2525#include <stdint.h>

2626#include <QtCore/QObject>

27−#include "TimeSource.h"

27+#include <TimeSource>

2828

2929/*

3030 Estimates the current velocity of a finger based on recent movement along an axis

plugins/Ubuntu/Gestures/CMakeLists.txt+9−5

@@ -4,27 +4,30 @@ remove_definitions(-DQT_NO_KEYWORDS)

44set(UbuntuGesturesQml_SOURCES

55 plugin.cpp

66 AxisVelocityCalculator.cpp

7− Damper.cpp

87 Direction.cpp

9− DirectionalDragArea.cpp

10− FloatingFlickable.cpp

8+ MouseEventGenerator.cpp

119 PressedOutsideNotifier.cpp

1210 TouchDispatcher.cpp

1311 TouchGate.cpp

1412 TouchGestureArea.cpp

1513)

1614

15+pkg_check_modules(UBUNTUGESTURES REQUIRED UbuntuGestures)

16+

1717add_definitions(-DUBUNTUGESTURESQML_LIBRARY)

1818

1919add_library(UbuntuGesturesQml MODULE ${UbuntuGesturesQml_SOURCES})

20−target_link_libraries(UbuntuGesturesQml UbuntuGestures)

20+target_link_libraries(UbuntuGesturesQml ${UBUNTUGESTURES_LIBRARIES})

2121

2222qt5_use_modules(UbuntuGesturesQml Core Quick)

2323

2424# So that Foo.cpp can #include "Foo.moc"

2525include_directories(${CMAKE_CURRENT_BINARY_DIR})

2626

27−include_directories(${CMAKE_SOURCE_DIR}/libs/UbuntuGestures)

27+include_directories(

28+ SYSTEM

29+ ${UBUNTUGESTURES_INCLUDE_DIRS}

30+)

2831

2932# There's no cmake var for v8 include path :-/ so create one

3033LIST(GET Qt5Core_INCLUDE_DIRS 0 QtCoreDir0)

@@ -32,6 +35,7 @@ SET(Qt5V8_PRIVATE_INCLUDE_DIR ${QtCoreDir0}/QtV8/${Qt5Core_VERSION_STRING}/QtV8)

3235

3336# DANGER! DANGER! Using Qt's private API!

3437include_directories(

38+ SYSTEM

3539 ${Qt5Qml_PRIVATE_INCLUDE_DIRS}

3640 ${Qt5Quick_INCLUDE_DIRS}

3741 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}

plugins/Ubuntu/Gestures/Damper.hdeleted−89

@@ -1,89 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef UBUNTU_GESTURES_DAMPER_H

18−#define UBUNTU_GESTURES_DAMPER_H

19−

20−#include <QtCore/QPointF>

21−

22−/*

23− Decreases the oscillations of a value along an axis.

24− */

25−template <class Type> class Damper {

26−public:

27− Damper() : m_value(0), m_maxDelta(0) { }

28−

29− // Maximum delta between the raw value and its dampened counterpart.

30− void setMaxDelta(Type maxDelta) {

31− if (maxDelta < 0) qFatal("Damper::maxDelta must be a positive number.");

32− m_maxDelta = maxDelta;

33− }

34− Type maxDelta() const { return m_maxDelta; }

35−

36− void reset(Type value) {

37− m_value = value;

38− }

39−

40− Type update(Type value) {

41− Type delta = value - m_value;

42− if (delta > 0 && delta > m_maxDelta) {

43− m_value += delta - m_maxDelta;

44− } else if (delta < 0 && delta < -m_maxDelta) {

45− m_value += delta + m_maxDelta;

46− }

47−

48− return m_value;

49− }

50−

51− Type value() const { return m_value; }

52−

53−private:

54− Type m_value;

55− Type m_maxDelta;

56−};

57−

58−/*

59− A point that has its movement dampened.

60− */

61−class DampedPointF {

62−public:

63− void setMaxDelta(qreal maxDelta) {

64− m_x.setMaxDelta(maxDelta);

65− m_y.setMaxDelta(maxDelta);

66− }

67−

68− qreal maxDelta() const { return m_x.maxDelta(); }

69−

70− void reset(const QPointF point) {

71− m_x.reset(point.x());

72− m_y.reset(point.y());

73− }

74−

75− void update(const QPointF point) {

76− m_x.update(point.x());

77− m_y.update(point.y());

78− }

79−

80− qreal x() const { return m_x.value(); }

81− qreal y() const { return m_y.value(); }

82−private:

83− Damper<qreal> m_x;

84− Damper<qreal> m_y;

85−};

86−

87−QDebug operator<<(QDebug dbg, const DampedPointF &p);

88−

89−#endif // UBUNTU_GESTURES_DAMPER_H

plugins/Ubuntu/Gestures/Direction.h+1

@@ -29,6 +29,7 @@ class UBUNTUGESTURESQML_EXPORT Direction : public QObject {

2929 Q_ENUMS(Type)

3030

3131public:

32+ // Make sure it is kept synchronized with SDK UCSwipeArea::Direction

3233 enum Type {

3334 Rightwards, // Along the positive direction of the X axis

3435 Leftwards, // Along the negative direction of the X axis

plugins/Ubuntu/Gestures/DirectionalDragArea.cppdeleted−932

@@ -1,932 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#define ACTIVETOUCHESINFO_DEBUG 0

18−#define DIRECTIONALDRAGAREA_DEBUG 0

19−

20−#include "DirectionalDragArea.h"

21−

22−#include <QQuickWindow>

23−#include <QtCore/qmath.h>

24−#include <QScreen>

25−#include <QDebug>

26−

27−#pragma GCC diagnostic push

28−#pragma GCC diagnostic ignored "-pedantic"

29−#include <private/qquickwindow_p.h>

30−#pragma GCC diagnostic pop

31−

32−// local

33−#include "TouchOwnershipEvent.h"

34−#include "TouchRegistry.h"

35−#include "UnownedTouchEvent.h"

36−

37−#include "DirectionalDragArea_p.h"

38−

39−using namespace UbuntuGestures;

40−

41−#if DIRECTIONALDRAGAREA_DEBUG

42−#define ddaDebug(params) qDebug().nospace() << "[DDA(" << qPrintable(objectName()) << ")] " << params

43−#include "DebugHelpers.h"

44−

45−namespace {

46−const char *statusToString(DirectionalDragAreaPrivate::Status status)

47−{

48− if (status == DirectionalDragAreaPrivate::WaitingForTouch) {

49− return "WaitingForTouch";

50− } else if (status == DirectionalDragAreaPrivate::Undecided) {

51− return "Undecided";

52− } else {

53− return "Recognized";

54− }

55−}

56−

57−} // namespace {

58−#else // DIRECTIONALDRAGAREA_DEBUG

59−#define ddaDebug(params) ((void)0)

60−#endif // DIRECTIONALDRAGAREA_DEBUG

61−

62−DirectionalDragArea::DirectionalDragArea(QQuickItem *parent)

63− : QQuickItem(parent)

64− , d(new DirectionalDragAreaPrivate(this))

65−{

66− d->setRecognitionTimer(new Timer(this));

67− d->recognitionTimer->setInterval(d->maxTime);

68− d->recognitionTimer->setSingleShot(true);

69−

70− connect(this, &QQuickItem::enabledChanged, d, &DirectionalDragAreaPrivate::giveUpIfDisabledOrInvisible);

71− connect(this, &QQuickItem::visibleChanged, d, &DirectionalDragAreaPrivate::giveUpIfDisabledOrInvisible);

72−}

73−

74−Direction::Type DirectionalDragArea::direction() const

75−{

76− return d->direction;

77−}

78−

79−void DirectionalDragArea::setDirection(Direction::Type direction)

80−{

81− if (direction != d->direction) {

82− d->direction = direction;

83− Q_EMIT directionChanged(d->direction);

84− }

85−}

86−

87−void DirectionalDragAreaPrivate::setDistanceThreshold(qreal value)

88−{

89− if (distanceThreshold != value) {

90− distanceThreshold = value;

91− distanceThresholdSquared = distanceThreshold * distanceThreshold;

92− }

93−}

94−

95−void DirectionalDragAreaPrivate::setMaxTime(int value)

96−{

97− if (maxTime != value) {

98− maxTime = value;

99− recognitionTimer->setInterval(maxTime);

100− }

101−}

102−

103−void DirectionalDragAreaPrivate::setRecognitionTimer(UbuntuGestures::AbstractTimer *timer)

104−{

105− int interval = 0;

106− bool timerWasRunning = false;

107− bool wasSingleShot = false;

108−

109− // can be null when called from the constructor

110− if (recognitionTimer) {

111− interval = recognitionTimer->interval();

112− timerWasRunning = recognitionTimer->isRunning();

113− if (recognitionTimer->parent() == this) {

114− delete recognitionTimer;

115− }

116− }

117−

118− recognitionTimer = timer;

119− timer->setInterval(interval);

120− timer->setSingleShot(wasSingleShot);

121− connect(timer, &UbuntuGestures::AbstractTimer::timeout,

122− this, &DirectionalDragAreaPrivate::rejectGesture);

123− if (timerWasRunning) {

124− recognitionTimer->start();

125− }

126−}

127−

128−void DirectionalDragAreaPrivate::setTimeSource(const SharedTimeSource &timeSource)

129−{

130− this->timeSource = timeSource;

131− activeTouches.m_timeSource = timeSource;

132−}

133−

134−qreal DirectionalDragArea::distance() const

135−{

136− if (Direction::isHorizontal(d->direction)) {

137− return d->publicPos.x() - d->startPos.x();

138− } else {

139− return d->publicPos.y() - d->startPos.y();

140− }

141−}

142−

143−void DirectionalDragAreaPrivate::updateSceneDistance()

144−{

145− QPointF totalMovement = publicScenePos - startScenePos;

146− sceneDistance = projectOntoDirectionVector(totalMovement);

147−}

148−

149−qreal DirectionalDragArea::sceneDistance() const

150−{

151− return d->sceneDistance;

152−}

153−

154−qreal DirectionalDragArea::touchX() const

155−{

156− return d->publicPos.x();

157−}

158−

159−qreal DirectionalDragArea::touchY() const

160−{

161− return d->publicPos.y();

162−}

163−

164−qreal DirectionalDragArea::touchSceneX() const

165−{

166− return d->publicScenePos.x();

167−}

168−

169−qreal DirectionalDragArea::touchSceneY() const

170−{

171− return d->publicScenePos.y();

172−}

173−

174−bool DirectionalDragArea::dragging() const

175−{

176− return d->status == DirectionalDragAreaPrivate::Recognized;

177−}

178−

179−bool DirectionalDragArea::pressed() const

180−{

181− return d->status != DirectionalDragAreaPrivate::WaitingForTouch;

182−}

183−

184−bool DirectionalDragArea::immediateRecognition() const

185−{

186− return d->immediateRecognition;

187−}

188−

189−void DirectionalDragArea::setImmediateRecognition(bool enabled)

190−{

191− if (d->immediateRecognition != enabled) {

192− d->immediateRecognition = enabled;

193− Q_EMIT immediateRecognitionChanged(enabled);

194− }

195−}

196−

197−bool DirectionalDragArea::monitorOnly() const

198−{

199− return d->monitorOnly;

200−}

201−

202−void DirectionalDragArea::setMonitorOnly(bool monitorOnly)

203−{

204− if (d->monitorOnly != monitorOnly) {

205− d->monitorOnly = monitorOnly;

206−

207− if (monitorOnly && d->status == DirectionalDragAreaPrivate::Undecided) {

208− TouchRegistry::instance()->removeCandidateOwnerForTouch(d->touchId, this);

209− // We still wanna know when it ends for keeping the composition time window up-to-date

210− TouchRegistry::instance()->addTouchWatcher(d->touchId, this);

211− }

212−

213− Q_EMIT monitorOnlyChanged(monitorOnly);

214− }

215−}

216−

217−void DirectionalDragArea::removeTimeConstraints()

218−{

219− d->setMaxTime(60 * 60 * 1000);

220− d->compositionTime = 0;

221− ddaDebug("removed time constraints");

222−}

223−

224−bool DirectionalDragArea::event(QEvent *event)

225−{

226− if (event->type() == TouchOwnershipEvent::touchOwnershipEventType()) {

227− d->touchOwnershipEvent(static_cast<TouchOwnershipEvent *>(event));

228− return true;

229− } else if (event->type() == UnownedTouchEvent::unownedTouchEventType()) {

230− d->unownedTouchEvent(static_cast<UnownedTouchEvent *>(event));

231− return true;

232− } else {

233− return QQuickItem::event(event);

234− }

235−}

236−

237−void DirectionalDragAreaPrivate::touchOwnershipEvent(TouchOwnershipEvent *event)

238−{

239− if (event->gained()) {

240− QVector<int> ids;

241− ids.append(event->touchId());

242− ddaDebug("grabbing touch");

243− q->grabTouchPoints(ids);

244−

245− // Work around for Qt bug. If we grab a touch that is being used for mouse pointer

246− // emulation it will cause the emulation logic to go nuts.

247− // Thus we have to also grab the mouse in this case.

248− //

249− // The fix for this bug has landed in Qt 5.4 (https://codereview.qt-project.org/96887)

250− // TODO: Remove this workaround once we start using Qt 5.4

251− if (q->window()) {

252− QQuickWindowPrivate *windowPrivate = QQuickWindowPrivate::get(q->window());

253− if (windowPrivate->touchMouseId == event->touchId() && q->window()->mouseGrabberItem()) {

254− ddaDebug("removing mouse grabber");

255− q->window()->mouseGrabberItem()->ungrabMouse();

256− }

257− }

258− } else {

259− // We still wanna know when it ends for keeping the composition time window up-to-date

260− TouchRegistry::instance()->addTouchWatcher(touchId, q);

261−

262− setStatus(WaitingForTouch);

263− }

264−}

265−

266−void DirectionalDragAreaPrivate::unownedTouchEvent(UnownedTouchEvent *unownedTouchEvent)

267−{

268− QTouchEvent *event = unownedTouchEvent->touchEvent();

269−

270− Q_ASSERT(!event->touchPointStates().testFlag(Qt::TouchPointPressed));

271−

272− ddaDebug("Unowned " << timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));

273−

274− switch (status) {

275− case WaitingForTouch:

276− // do nothing

277− break;

278− case Undecided:

279− Q_ASSERT(q->isEnabled() && q->isVisible());

280− unownedTouchEvent_undecided(unownedTouchEvent);

281− break;

282− default: // Recognized:

283− if (monitorOnly) {

284− // Treat unowned event as if we owned it, but we are really just watching it

285− touchEvent_recognized(event);

286− }

287− break;

288− }

289−

290− activeTouches.update(event);

291−}

292−

293−void DirectionalDragAreaPrivate::unownedTouchEvent_undecided(UnownedTouchEvent *unownedTouchEvent)

294−{

295− const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(unownedTouchEvent->touchEvent());

296− if (!touchPoint) {

297− qCritical() << "DirectionalDragArea[status=Undecided]: touch " << touchId

298− << "missing from UnownedTouchEvent without first reaching state Qt::TouchPointReleased. "

299− "Considering it as released.";

300−

301− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);

302− setStatus(WaitingForTouch);

303− return;

304− }

305−

306− const QPointF &touchScenePos = touchPoint->scenePos();

307−

308− if (touchPoint->state() == Qt::TouchPointReleased) {

309− // touch has ended before recognition concluded

310− ddaDebug("Touch has ended before recognition concluded");

311− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);

312− setStatus(WaitingForTouch);

313− return;

314− }

315−

316− previousDampedScenePos.setX(dampedScenePos.x());

317− previousDampedScenePos.setY(dampedScenePos.y());

318− dampedScenePos.update(touchScenePos);

319−

320− if (!movingInRightDirection()) {

321− ddaDebug("Rejecting gesture because touch point is moving in the wrong direction.");

322− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);

323− // We still wanna know when it ends for keeping the composition time window up-to-date

324− TouchRegistry::instance()->addTouchWatcher(touchId, q);

325− setStatus(WaitingForTouch);

326− return;

327− }

328−

329− if (isWithinTouchCompositionWindow()) {

330− // There's still time for some new touch to appear and ruin our party as it would be combined

331− // with our touchId one and therefore deny the possibility of a single-finger gesture.

332− ddaDebug("Sill within composition window. Let's wait more.");

333− return;

334− }

335−

336− if (movedFarEnoughAlongGestureAxis()) {

337− if (!monitorOnly) {

338− TouchRegistry::instance()->requestTouchOwnership(touchId, q);

339− }

340− setStatus(Recognized);

341− setPublicPos(touchPoint->pos());

342− setPublicScenePos(touchScenePos);

343− } else if (isPastMaxDistance()) {

344− ddaDebug("Rejecting gesture because it went farther than maxDistance without getting recognized.");

345− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);

346− // We still wanna know when it ends for keeping the composition time window up-to-date

347− TouchRegistry::instance()->addTouchWatcher(touchId, q);

348− setStatus(WaitingForTouch);

349− } else {

350− ddaDebug("Didn't move far enough yet. Let's wait more.");

351− }

352−}

353−

354−void DirectionalDragArea::touchEvent(QTouchEvent *event)

355−{

356− // TODO: Consider when more than one touch starts in the same event (although it's not possible

357− // with Mir's android-input). Have to track them all. Consider it a plus/bonus.

358−

359− ddaDebug(d->timeSource->msecsSinceReference() << " " << qPrintable(touchEventToString(event)));

360−

361− if (!isEnabled() || !isVisible()) {

362− QQuickItem::touchEvent(event);

363− return;

364− }

365−

366− switch (d->status) {

367− case DirectionalDragAreaPrivate::WaitingForTouch:

368− d->touchEvent_absent(event);

369− break;

370− case DirectionalDragAreaPrivate::Undecided:

371− d->touchEvent_undecided(event);

372− break;

373− default: // Recognized:

374− d->touchEvent_recognized(event);

375− break;

376− }

377−

378− d->activeTouches.update(event);

379−}

380−

381−void DirectionalDragAreaPrivate::touchEvent_absent(QTouchEvent *event)

382−{

383− // TODO: accept/reject is for the whole event, not per touch id. See how that affects us.

384−

385− if (!event->touchPointStates().testFlag(Qt::TouchPointPressed)) {

386− // Nothing to see here. No touch starting in this event.

387− return;

388− }

389−

390− // to be proven wrong, if that's the case

391− bool allGood = true;

392−

393− if (isWithinTouchCompositionWindow()) {

394− // too close to the last touch start. So we consider them as starting roughly at the same time.

395− // Can't be a single-touch gesture.

396− ddaDebug("A new touch point came in but we're still within time composition window. Ignoring it.");

397− allGood = false;

398− }

399−

400− const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();

401−

402− const QTouchEvent::TouchPoint *newTouchPoint = nullptr;

403− for (int i = 0; i < touchPoints.count() && allGood; ++i) {

404− const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);

405− if (touchPoint.state() == Qt::TouchPointPressed) {

406− if (newTouchPoint) {

407− // more than one touch starting in this QTouchEvent. Can't be a single-touch gesture

408− allGood = false;

409− } else {

410− // that's our candidate

411− newTouchPoint = &touchPoint;

412− }

413− }

414− }

415−

416− if (allGood) {

417− allGood = sanityCheckRecognitionProperties();

418− if (!allGood) {

419− qWarning("DirectionalDragArea: recognition properties are wrongly set. Gesture recognition"

420− " is impossible");

421− }

422− }

423−

424− if (allGood) {

425− Q_ASSERT(newTouchPoint);

426−

427− startPos = newTouchPoint->pos();

428− startScenePos = newTouchPoint->scenePos();

429− touchId = newTouchPoint->id();

430− dampedScenePos.reset(startScenePos);

431− setPublicPos(startPos);

432−

433− setPublicScenePos(startScenePos);

434− updateSceneDirectionVector();

435−

436− if (recognitionIsDisabled()) {

437− // Behave like a dumb TouchArea

438− ddaDebug("Gesture recognition is disabled. Requesting touch ownership immediately.");

439− setStatus(Recognized);

440− if (monitorOnly) {

441− watchPressedTouchPoints(touchPoints);

442− event->ignore();

443− } else {

444− TouchRegistry::instance()->requestTouchOwnership(touchId, q);

445− event->accept();

446− }

447− } else {

448− // just monitor the touch points for now.

449− if (monitorOnly) {

450− watchPressedTouchPoints(touchPoints);

451− } else {

452− TouchRegistry::instance()->addCandidateOwnerForTouch(touchId, q);

453− }

454−

455− setStatus(Undecided);

456− // Let the item below have it. We will monitor it and grab it later if a gesture

457− // gets recognized.

458− event->ignore();

459− }

460− } else {

461− watchPressedTouchPoints(touchPoints);

462− event->ignore();

463− }

464−}

465−

466−void DirectionalDragAreaPrivate::touchEvent_undecided(QTouchEvent *event)

467−{

468− Q_ASSERT(fetchTargetTouchPoint(event) == nullptr);

469−

470− // We're not interested in new touch points. We already have our candidate (touchId).

471− // But we do want to know when those new touches end for keeping the composition time

472− // window up-to-date

473− event->ignore();

474− watchPressedTouchPoints(event->touchPoints());

475−

476− if (event->touchPointStates().testFlag(Qt::TouchPointPressed) && isWithinTouchCompositionWindow()) {

477− // multi-finger drags are not accepted

478− ddaDebug("Multi-finger drags are not accepted");

479−

480− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);

481− // We still wanna know when it ends for keeping the composition time window up-to-date

482− TouchRegistry::instance()->addTouchWatcher(touchId, q);

483−

484− setStatus(WaitingForTouch);

485− }

486−}

487−

488−void DirectionalDragAreaPrivate::touchEvent_recognized(QTouchEvent *event)

489−{

490− const QTouchEvent::TouchPoint *touchPoint = fetchTargetTouchPoint(event);

491−

492− if (!touchPoint) {

493− qCritical() << "DirectionalDragArea[status=Recognized]: touch " << touchId

494− << "missing from QTouchEvent without first reaching state Qt::TouchPointReleased. "

495− "Considering it as released.";

496− setStatus(WaitingForTouch);

497− } else {

498− setPublicPos(touchPoint->pos());

499− setPublicScenePos(touchPoint->scenePos());

500−

501− if (touchPoint->state() == Qt::TouchPointReleased) {

502− setStatus(WaitingForTouch);

503− }

504− }

505−}

506−

507−void DirectionalDragAreaPrivate::watchPressedTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints)

508−{

509− for (int i = 0; i < touchPoints.count(); ++i) {

510− const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);

511− if (touchPoint.state() == Qt::TouchPointPressed) {

512− TouchRegistry::instance()->addTouchWatcher(touchPoint.id(), q);

513− }

514− }

515−}

516−

517−bool DirectionalDragAreaPrivate::recognitionIsDisabled() const

518−{

519− return immediateRecognition || (distanceThreshold <= 0 && compositionTime <= 0);

520−}

521−

522−bool DirectionalDragAreaPrivate::sanityCheckRecognitionProperties()

523−{

524− return recognitionIsDisabled()

525− || (distanceThreshold < maxDistance && compositionTime < maxTime);

526−}

527−

528−const QTouchEvent::TouchPoint *DirectionalDragAreaPrivate::fetchTargetTouchPoint(QTouchEvent *event)

529−{

530− const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();

531− const QTouchEvent::TouchPoint *touchPoint = 0;

532− for (int i = 0; i < touchPoints.size(); ++i) {

533− if (touchPoints.at(i).id() == touchId) {

534− touchPoint = &touchPoints.at(i);

535− break;

536− }

537− }

538− return touchPoint;

539−}

540−

541−bool DirectionalDragAreaPrivate::movingInRightDirection() const

542−{

543− if (direction == Direction::Horizontal || direction == Direction::Vertical) {

544− return true;

545− } else {

546− QPointF movementVector(dampedScenePos.x() - previousDampedScenePos.x(),

547− dampedScenePos.y() - previousDampedScenePos.y());

548−

549− qreal scalarProjection = projectOntoDirectionVector(movementVector);

550−

551− return scalarProjection >= 0.;

552− }

553−}

554−

555−bool DirectionalDragAreaPrivate::movedFarEnoughAlongGestureAxis() const

556−{

557− if (distanceThreshold <= 0.) {

558− // distance threshold check is disabled

559− return true;

560− } else {

561− QPointF totalMovement(dampedScenePos.x() - startScenePos.x(),

562− dampedScenePos.y() - startScenePos.y());

563−

564− qreal scalarProjection = projectOntoDirectionVector(totalMovement);

565−

566− ddaDebug(" movedFarEnoughAlongGestureAxis: scalarProjection=" << scalarProjection

567− << ", distanceThreshold=" << distanceThreshold);

568−

569− if (direction == Direction::Horizontal || direction == Direction::Vertical) {

570− return qAbs(scalarProjection) > distanceThreshold;

571− } else {

572− return scalarProjection > distanceThreshold;

573− }

574− }

575−}

576−

577−bool DirectionalDragAreaPrivate::isPastMaxDistance() const

578−{

579− QPointF totalMovement(dampedScenePos.x() - startScenePos.x(),

580− dampedScenePos.y() - startScenePos.y());

581−

582− qreal squaredDistance = totalMovement.x()*totalMovement.x() + totalMovement.y()*totalMovement.y();

583− return squaredDistance > maxDistance*maxDistance;

584−}

585−

586−void DirectionalDragAreaPrivate::giveUpIfDisabledOrInvisible()

587−{

588− if (!q->isEnabled() || !q->isVisible()) {

589− if (status == Undecided) {

590− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);

591− // We still wanna know when it ends for keeping the composition time window up-to-date

592− TouchRegistry::instance()->addTouchWatcher(touchId, q);

593− }

594−

595− if (status != WaitingForTouch) {

596− ddaDebug("Resetting status because got disabled or made invisible");

597− setStatus(WaitingForTouch);

598− }

599− }

600−}

601−

602−void DirectionalDragAreaPrivate::rejectGesture()

603−{

604− if (status == Undecided) {

605− ddaDebug("Rejecting gesture because it's taking too long to drag beyond the threshold.");

606−

607− TouchRegistry::instance()->removeCandidateOwnerForTouch(touchId, q);

608− // We still wanna know when it ends for keeping the composition time window up-to-date

609− TouchRegistry::instance()->addTouchWatcher(touchId, q);

610−

611− setStatus(WaitingForTouch);

612− }

613−}

614−

615−void DirectionalDragAreaPrivate::setStatus(Status newStatus)

616−{

617− if (newStatus == status)

618− return;

619−

620− Status oldStatus = status;

621−

622− if (oldStatus == Undecided) {

623− recognitionTimer->stop();

624− }

625−

626− status = newStatus;

627− Q_EMIT statusChanged(status);

628−

629− ddaDebug(statusToString(oldStatus) << " -> " << statusToString(newStatus));

630−

631− switch (newStatus) {

632− case WaitingForTouch:

633− if (oldStatus == Recognized) {

634− Q_EMIT q->draggingChanged(false);

635− }

636− Q_EMIT q->pressedChanged(false);

637− break;

638− case Undecided:

639− recognitionTimer->start();

640− Q_EMIT q->pressedChanged(true);

641− break;

642− case Recognized:

643− if (oldStatus == WaitingForTouch) { // for immediate recognition

644− Q_EMIT q->pressedChanged(true);

645− }

646− Q_EMIT q->draggingChanged(true);

647− break;

648− default:

649− // no-op

650− break;

651− }

652−}

653−

654−void DirectionalDragAreaPrivate::setPublicPos(const QPointF point)

655−{

656− bool xChanged = publicPos.x() != point.x();

657− bool yChanged = publicPos.y() != point.y();

658−

659− // Public position should not get updated while the gesture is still being recognized

660− // (ie, Undecided status).

661− Q_ASSERT(status == WaitingForTouch || status == Recognized);

662−

663− if (status == Recognized && !recognitionIsDisabled()) {

664− // When the gesture finally gets recognized, the finger will likely be

665− // reasonably far from the edge. If we made the contentX immediately

666− // follow the finger position it would be visually unpleasant as it

667− // would appear right next to the user's finger out of nowhere (ie,

668− // it would jump). Instead, we make contentX go towards the user's

669− // finger in several steps. ie., in an animated way.

670− QPointF delta = point - publicPos;

671− // the trick is not to go all the way (1.0) as it would cause a sudden jump

672− publicPos.rx() += 0.4 * delta.x();

673− publicPos.ry() += 0.4 * delta.y();

674− } else {

675− // no smoothing when initializing or if gesture recognition was immediate as there will

676− // be no jump.

677− publicPos = point;

678− }

679−

680− if (xChanged) {

681− Q_EMIT q->touchXChanged(publicPos.x());

682− if (Direction::isHorizontal(direction))

683− Q_EMIT q->distanceChanged(q->distance());

684− }

685−

686− if (yChanged) {

687− Q_EMIT q->touchYChanged(publicPos.y());

688− if (Direction::isVertical(direction))

689− Q_EMIT q->distanceChanged(q->distance());

690− }

691−}

692−

693−void DirectionalDragAreaPrivate::setPublicScenePos(const QPointF point)

694−{

695− bool xChanged = publicScenePos.x() != point.x();

696− bool yChanged = publicScenePos.y() != point.y();

697−

698− if (!xChanged && !yChanged)

699− return;

700−

701− // Public position should not get updated while the gesture is still being recognized

702− // (ie, Undecided status).

703− Q_ASSERT(status == WaitingForTouch || status == Recognized);

704−

705− qreal oldSceneDistance = sceneDistance;

706−

707− if (status == Recognized && !recognitionIsDisabled()) {

708− // When the gesture finally gets recognized, the finger will likely be

709− // reasonably far from the edge. If we made the contentX immediately

710− // follow the finger position it would be visually unpleasant as it

711− // would appear right next to the user's finger out of nowhere (ie,

712− // it would jump). Instead, we make contentX go towards the user's

713− // finger in several steps. ie., in an animated way.

714− QPointF delta = point - publicScenePos;

715− // the trick is not to go all the way (1.0) as it would cause a sudden jump

716− publicScenePos.rx() += 0.4 * delta.x();

717− publicScenePos.ry() += 0.4 * delta.y();

718− } else {

719− // no smoothing when initializing or if gesture recognition was immediate as there will

720− // be no jump.

721− publicScenePos = point;

722− }

723−

724− updateSceneDistance();

725−

726− if (oldSceneDistance != sceneDistance) {

727− Q_EMIT q->sceneDistanceChanged(sceneDistance);

728− }

729−

730− if (xChanged) {

731− Q_EMIT q->touchSceneXChanged(publicScenePos.x());

732− }

733−

734− if (yChanged) {

735− Q_EMIT q->touchSceneYChanged(publicScenePos.y());

736− }

737−}

738−

739−bool DirectionalDragAreaPrivate::isWithinTouchCompositionWindow()

740−{

741− return

742− compositionTime > 0 &&

743− !activeTouches.isEmpty() &&

744− timeSource->msecsSinceReference() <=

745− activeTouches.mostRecentStartTime() + (qint64)compositionTime;

746−}

747−

748−void DirectionalDragArea::itemChange(ItemChange change, const ItemChangeData &value)

749−{

750− if (change == QQuickItem::ItemSceneChange) {

751− if (value.window != nullptr) {

752− value.window->installEventFilter(TouchRegistry::instance());

753−

754− // TODO: Handle window->screen() changes (ie window changing screens)

755−

756− qreal pixelsPerInch = value.window->screen()->physicalDotsPerInch();

757− if (pixelsPerInch < 0) {

758− // It can return garbage when run in a XVFB server (Virtual Framebuffer 'fake' X server)

759− pixelsPerInch = 72;

760− }

761−

762− d->setPixelsPerMm(pixelsPerInch / 25.4);

763− }

764− }

765−}

766−

767−void DirectionalDragAreaPrivate::setPixelsPerMm(qreal pixelsPerMm)

768−{

769− dampedScenePos.setMaxDelta(1. * pixelsPerMm);

770− setDistanceThreshold(4. * pixelsPerMm);

771− maxDistance = 10. * pixelsPerMm;

772−}

773−

774−//************************** ActiveTouchesInfo **************************

775−

776−ActiveTouchesInfo::ActiveTouchesInfo(const SharedTimeSource &timeSource)

777− : m_timeSource(timeSource)

778−{

779−}

780−

781−void ActiveTouchesInfo::update(QTouchEvent *event)

782−{

783− if (!(event->touchPointStates() & (Qt::TouchPointPressed | Qt::TouchPointReleased))) {

784− // nothing to update

785− #if ACTIVETOUCHESINFO_DEBUG

786− qDebug("[DDA::ActiveTouchesInfo] Nothing to Update");

787− #endif

788− return;

789− }

790−

791− const QList<QTouchEvent::TouchPoint> &touchPoints = event->touchPoints();

792− for (int i = 0; i < touchPoints.count(); ++i) {

793− const QTouchEvent::TouchPoint &touchPoint = touchPoints.at(i);

794− if (touchPoint.state() == Qt::TouchPointPressed) {

795− addTouchPoint(touchPoint.id());

796− } else if (touchPoint.state() == Qt::TouchPointReleased) {

797− removeTouchPoint(touchPoint.id());

798− }

799− }

800−}

801−

802−#if ACTIVETOUCHESINFO_DEBUG

803−QString ActiveTouchesInfo::toString()

804−{

805− QString string = "(";

806−

807− {

808− QTextStream stream(&string);

809− m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {

810− stream << "(id=" << touchInfo->id << ",startTime=" << touchInfo->startTime << ")";

811− return true;

812− });

813− }

814−

815− string.append(")");

816−

817− return string;

818−}

819−#endif // ACTIVETOUCHESINFO_DEBUG

820−

821−void ActiveTouchesInfo::addTouchPoint(int touchId)

822−{

823− ActiveTouchInfo &activeTouchInfo = m_touchInfoPool.getEmptySlot();

824− activeTouchInfo.id = touchId;

825− activeTouchInfo.startTime = m_timeSource->msecsSinceReference();

826−

827− #if ACTIVETOUCHESINFO_DEBUG

828− qDebug() << "[DDA::ActiveTouchesInfo]" << qPrintable(toString());

829− #endif

830−}

831−

832−qint64 ActiveTouchesInfo::touchStartTime(int touchId)

833−{

834− qint64 result = -1;

835−

836− m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {

837− if (touchId == touchInfo->id) {

838− result = touchInfo->startTime;

839− return false;

840− } else {

841− return true;

842− }

843− });

844−

845− Q_ASSERT(result != -1);

846− return result;

847−}

848−

849−void ActiveTouchesInfo::removeTouchPoint(int touchId)

850−{

851− m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &touchInfo) {

852− if (touchId == touchInfo->id) {

853− m_touchInfoPool.freeSlot(touchInfo);

854− return false;

855− } else {

856− return true;

857− }

858− });

859−

860− #if ACTIVETOUCHESINFO_DEBUG

861− qDebug() << "[DDA::ActiveTouchesInfo]" << qPrintable(toString());

862− #endif

863−}

864−

865−qint64 ActiveTouchesInfo::mostRecentStartTime()

866−{

867− Q_ASSERT(!m_touchInfoPool.isEmpty());

868−

869− qint64 highestStartTime = -1;

870−

871− m_touchInfoPool.forEach([&](Pool<ActiveTouchInfo>::Iterator &activeTouchInfo) {

872− if (activeTouchInfo->startTime > highestStartTime) {

873− highestStartTime = activeTouchInfo->startTime;

874− }

875− return true;

876− });

877−

878− return highestStartTime;

879−}

880−

881−void DirectionalDragAreaPrivate::updateSceneDirectionVector()

882−{

883− QPointF localOrigin(0., 0.);

884− QPointF localDirection;

885− switch (direction) {

886− case Direction::Upwards:

887− localDirection.rx() = 0.;

888− localDirection.ry() = -1.;

889− break;

890− case Direction::Downwards:

891− case Direction::Vertical:

892− localDirection.rx() = 0.;

893− localDirection.ry() = 1;

894− break;

895− case Direction::Leftwards:

896− localDirection.rx() = -1.;

897− localDirection.ry() = 0.;

898− break;

899− default: // Direction::Rightwards || Direction.Horizontal

900− localDirection.rx() = 1.;

901− localDirection.ry() = 0.;

902− break;

903− }

904− QPointF sceneOrigin = q->mapToScene(localOrigin);

905− QPointF sceneDirection = q->mapToScene(localDirection);

906− sceneDirectionVector = sceneDirection - sceneOrigin;

907−}

908−

909−qreal DirectionalDragAreaPrivate::projectOntoDirectionVector(const QPointF sceneVector) const

910−{

911− // same as dot product as sceneDirectionVector is a unit vector

912− return sceneVector.x() * sceneDirectionVector.x() +

913− sceneVector.y() * sceneDirectionVector.y();

914−}

915−

916−DirectionalDragAreaPrivate::DirectionalDragAreaPrivate(DirectionalDragArea *q)

917− : q(q)

918− , status(WaitingForTouch)

919− , sceneDistance(0)

920− , touchId(-1)

921− , direction(Direction::Rightwards)

922− , distanceThreshold(0)

923− , distanceThresholdSquared(0.)

924− , maxTime(400)

925− , compositionTime(60)

926− , immediateRecognition(false)

927− , recognitionTimer(nullptr)

928− , timeSource(new RealTimeSource)

929− , activeTouches(timeSource)

930− , monitorOnly(false)

931−{

932−}

plugins/Ubuntu/Gestures/DirectionalDragArea.hdeleted−143

@@ -1,143 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef DIRECTIONAL_DRAG_AREA_H

18−#define DIRECTIONAL_DRAG_AREA_H

19−

20−#include <QtQuick/QQuickItem>

21−#include "UbuntuGesturesQmlGlobal.h"

22−#include "Damper.h"

23−#include "Direction.h"

24−

25−// lib UbuntuGestures

26−#include <Pool.h>

27−#include <Timer.h>

28−

29−class TouchOwnershipEvent;

30−class UnownedTouchEvent;

31−class DirectionalDragAreaPrivate;

32−

33−/*

34− An area that detects axis-aligned single-finger drag gestures

35−

36− If a drag deviates too much from the components' direction recognition will

37− fail. It will also fail if the drag or flick is too short. E.g. a noisy or

38− fidgety click

39−

40− See doc/DirectionalDragArea.svg

41− */

42−class UBUNTUGESTURESQML_EXPORT DirectionalDragArea : public QQuickItem {

43− Q_OBJECT

44−

45− // The direction in which the gesture should move in order to be recognized.

46− Q_PROPERTY(Direction::Type direction READ direction WRITE setDirection NOTIFY directionChanged)

47−

48− // The distance travelled by the finger along the axis specified by

49− // DirectionalDragArea's direction.

50− Q_PROPERTY(qreal distance READ distance NOTIFY distanceChanged)

51−

52− // The distance travelled by the finger along the axis specified by

53− // DirectionalDragArea's direction in scene coordinates

54− Q_PROPERTY(qreal sceneDistance READ sceneDistance NOTIFY sceneDistanceChanged)

55−

56− // Position of the touch point performing the drag relative to this item.

57− Q_PROPERTY(qreal touchX READ touchX NOTIFY touchXChanged)

58− Q_PROPERTY(qreal touchY READ touchY NOTIFY touchYChanged)

59−

60− // Position of the touch point performing the drag, in scene's coordinate system

61− Q_PROPERTY(qreal touchSceneX READ touchSceneX NOTIFY touchSceneXChanged)

62− Q_PROPERTY(qreal touchSceneY READ touchSceneY NOTIFY touchSceneYChanged)

63−

64− // Whether a drag gesture is taking place

65− Q_PROPERTY(bool dragging READ dragging NOTIFY draggingChanged)

66−

67− // Whether the drag area is pressed.

68− Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)

69−

70− // Whether a gesture should be Recognized as soon a touch lands on the area.

71− // With this property enabled it will work pretty much like a MultiPointTouchArea,

72− // just with a different API.

73− //

74− // It's false by default. In most cases you will not want that enabled.

75− Q_PROPERTY(bool immediateRecognition

76− READ immediateRecognition

77− WRITE setImmediateRecognition

78− NOTIFY immediateRecognitionChanged)

79−

80− // Whether we are merely monitoring touch events (in which case, we don't

81− // claim ownership of the touch).

82− Q_PROPERTY(bool monitorOnly READ monitorOnly WRITE setMonitorOnly NOTIFY monitorOnlyChanged)

83−

84− Q_ENUMS(Direction)

85−public:

86− DirectionalDragArea(QQuickItem *parent = 0);

87−

88− Direction::Type direction() const;

89− void setDirection(Direction::Type);

90−

91− qreal distance() const;

92− qreal sceneDistance() const;

93−

94− qreal touchX() const;

95− qreal touchY() const;

96−

97− qreal touchSceneX() const;

98− qreal touchSceneY() const;

99−

100− bool dragging() const;

101−

102− bool pressed() const;

103−

104− bool immediateRecognition() const;

105− void setImmediateRecognition(bool enabled);

106−

107− bool monitorOnly() const;

108− void setMonitorOnly(bool monitorOnly);

109−

110− bool event(QEvent *e) override;

111−

112− /*

113− In qmltests, sequences of touch events are sent all at once, unlike in "real life".

114− Also qmltests might run really slowly, e.g. when run from inside virtual machines.

115− Thus to remove a variable that qmltests cannot really control, namely time, this

116− function removes all constraints that are sensible to elapsed time.

117−

118− This effectively makes the DirectionalDragArea easier to fool.

119− */

120− Q_INVOKABLE void removeTimeConstraints();

121−

122−Q_SIGNALS:

123− void directionChanged(Direction::Type direction);

124− void draggingChanged(bool value);

125− void pressedChanged(bool value);

126− void distanceChanged(qreal value);

127− void sceneDistanceChanged(qreal value);

128− void touchXChanged(qreal value);

129− void touchYChanged(qreal value);

130− void touchSceneXChanged(qreal value);

131− void touchSceneYChanged(qreal value);

132− void immediateRecognitionChanged(bool value);

133− void monitorOnlyChanged(bool value);

134−

135−protected:

136− void touchEvent(QTouchEvent *event) override;

137− void itemChange(ItemChange change, const ItemChangeData &value) override;

138−

139−public: // so tests can access it

140− DirectionalDragAreaPrivate *d;

141−};

142−

143−#endif // DIRECTIONAL_DRAG_AREA_H

plugins/Ubuntu/Gestures/DirectionalDragArea_p.hdeleted−169

@@ -1,169 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef DIRECTIONAL_DRAG_AREA_PRIV_H

18−#define DIRECTIONAL_DRAG_AREA_PRIV_H

19−

20−// Information about an active touch point

21−struct UBUNTUGESTURESQML_EXPORT ActiveTouchInfo {

22− ActiveTouchInfo() : id(-1), startTime(-1) {}

23− bool isValid() const { return id != -1; }

24− void reset() { id = -1; }

25− int id;

26− qint64 startTime;

27−};

28−class UBUNTUGESTURESQML_EXPORT ActiveTouchesInfo {

29−public:

30− ActiveTouchesInfo(const UbuntuGestures::SharedTimeSource &timeSource);

31− void update(QTouchEvent *event);

32− qint64 touchStartTime(int id);

33− bool isEmpty() const { return m_touchInfoPool.isEmpty(); }

34− qint64 mostRecentStartTime();

35− UbuntuGestures::SharedTimeSource m_timeSource;

36−private:

37− void addTouchPoint(int touchId);

38− void removeTouchPoint(int touchId);

39− #if ACTIVETOUCHESINFO_DEBUG

40− QString toString();

41− #endif

42−

43− Pool<ActiveTouchInfo> m_touchInfoPool;

44−};

45−

46−class UBUNTUGESTURESQML_EXPORT DirectionalDragAreaPrivate : public QObject {

47− Q_OBJECT

48−

49− Q_ENUMS(Status)

50−public:

51− DirectionalDragAreaPrivate(DirectionalDragArea *q);

52−

53−public Q_SLOTS:

54− void giveUpIfDisabledOrInvisible();

55− void rejectGesture();

56−

57−public:

58− // Describes the state of the directional drag gesture.

59− enum Status {

60− // Waiting for a new touch point to land on this area. No gesture is being processed

61− // or tracked.

62− WaitingForTouch,

63−

64− // A touch point has landed on this area but it's not know yet whether it is

65− // performing a drag in the correct direction.

66− // If it's decided that the touch point is not performing a directional drag gesture,

67− // it will be rejected/ignored and status will return to WaitingForTouch.

68− Undecided, //Recognizing,

69−

70− // There's a touch point in this area and it performed a drag in the correct

71− // direction.

72− //

73− // Once recognized, the gesture state will move back to WaitingForTouch only once

74− // that touch point ends. The gesture will remain in the Recognized state even if

75− // the touch point starts moving in other directions or halts.

76− Recognized,

77− };

78−

79− void touchEvent_absent(QTouchEvent *event);

80− void touchEvent_undecided(QTouchEvent *event);

81− void touchEvent_recognized(QTouchEvent *event);

82− bool movingInRightDirection() const;

83− bool movedFarEnoughAlongGestureAxis() const;

84− bool isPastMaxDistance() const;

85− const QTouchEvent::TouchPoint *fetchTargetTouchPoint(QTouchEvent *event);

86− void setStatus(Status newStatus);

87− void setPublicPos(const QPointF point);

88− void setPublicScenePos(const QPointF point);

89− bool isWithinTouchCompositionWindow();

90− void updateSceneDirectionVector();

91− // returns the scalar projection between the given vector (in scene coordinates)

92− // and m_sceneDirectionVector

93− qreal projectOntoDirectionVector(const QPointF sceneVector) const;

94− void touchOwnershipEvent(TouchOwnershipEvent *event);

95− void unownedTouchEvent(UnownedTouchEvent *event);

96− void unownedTouchEvent_undecided(UnownedTouchEvent *unownedTouchEvent);

97− void watchPressedTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints);

98− bool recognitionIsDisabled() const;

99− bool sanityCheckRecognitionProperties();

100− void updateSceneDistance();

101− void setMaxTime(int value);

102− void setDistanceThreshold(qreal value);

103− void setPixelsPerMm(qreal pixelsPerMm);

104− QString objectName() const { return q->objectName(); }

105−

106− // Replaces the existing Timer with the given one.

107− //

108− // Useful for providing a fake timer when testing.

109− void setRecognitionTimer(UbuntuGestures::AbstractTimer *timer);

110−

111− // Useful for testing, where a fake time source can be supplied

112− void setTimeSource(const UbuntuGestures::SharedTimeSource &timeSource);

113−

114− DirectionalDragArea *q;

115−

116− // The current status of the directional drag gesture area.

117− Status status;

118−

119− QPointF startPos;

120− QPointF startScenePos;

121− qreal sceneDistance;

122− int touchId;

123−

124− // The touch position exposed in the public API.

125− // It only starts to move once the gesture gets recognized.

126− QPointF publicPos;

127− QPointF publicScenePos;

128−

129− // A movement damper is used in some of the gesture recognition calculations

130− // to get rid of noise or small oscillations in the touch position.

131− DampedPointF dampedScenePos;

132− QPointF previousDampedScenePos;

133−

134− // Unit vector in scene coordinates describing the direction of the gesture recognition

135− QPointF sceneDirectionVector;

136−

137− Direction::Type direction;

138−

139− // How far a touch point has to move from its initial position along the gesture axis in order

140− // for it to be recognized as a directional drag.

141− qreal distanceThreshold;

142− qreal distanceThresholdSquared; // it's pow(distanceThreshold, 2)

143−

144− // Maximum time (in milliseconds) the gesture can take to go beyond the distance threshold

145− int maxTime;

146−

147− // Maximum distance the gesture can go without crossing the axis-aligned distance threshold

148− qreal maxDistance;

149−

150− // Maximum time (in milliseconds) after the start of a given touch point where

151− // subsequent touch starts are grouped with the first one into an N-touches gesture

152− // (e.g. a two-fingers tap or drag).

153− int compositionTime;

154−

155− bool immediateRecognition;

156−

157− UbuntuGestures::AbstractTimer *recognitionTimer;

158−

159− UbuntuGestures::SharedTimeSource timeSource;

160−

161− ActiveTouchesInfo activeTouches;

162−

163− bool monitorOnly;

164−

165−Q_SIGNALS:

166− void statusChanged(Status value);

167−};

168−

169−#endif // DIRECTIONAL_DRAG_AREA_PRIV_H

plugins/Ubuntu/Gestures/FloatingFlickable.cppdeleted−150

@@ -1,150 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "FloatingFlickable.h"

18−

19−#include <private/qquickflickable_p.h>

20−#include "DirectionalDragArea.h"

21−

22−#include <QDebug>

23−

24−FloatingFlickable::FloatingFlickable(QQuickItem *parent)

25− : QQuickItem(parent)

26− , m_mousePressed(false)

27−{

28− m_dragArea = new DirectionalDragArea(this);

29− m_dragArea->setWidth(width());

30− m_dragArea->setHeight(height());

31− m_dragArea->setDirection(Direction::Horizontal);

32− connect(m_dragArea, &DirectionalDragArea::touchXChanged,

33− this, &FloatingFlickable::onDragAreaTouchPosChanged);

34− connect(m_dragArea, &DirectionalDragArea::touchYChanged,

35− this, &FloatingFlickable::onDragAreaTouchPosChanged);

36− connect(m_dragArea, &DirectionalDragArea::draggingChanged,

37− this, &FloatingFlickable::onDragAreaDraggingChanged);

38− connect(m_dragArea, &DirectionalDragArea::directionChanged, this, &FloatingFlickable::directionChanged);

39−

40− m_flickable = new QQuickFlickable(this);

41− m_flickable->setEnabled(false);

42− m_flickable->setWidth(width());

43− m_flickable->setHeight(height());

44− connect(m_flickable, &QQuickFlickable::contentWidthChanged, this, &FloatingFlickable::contentWidthChanged);

45− connect(m_flickable, &QQuickFlickable::contentHeightChanged, this, &FloatingFlickable::contentHeightChanged);

46− connect(m_flickable, &QQuickFlickable::contentXChanged, this, &FloatingFlickable::contentXChanged);

47− connect(m_flickable, &QQuickFlickable::contentYChanged, this, &FloatingFlickable::contentYChanged);

48−

49− connect(this, &QQuickItem::widthChanged, this, &FloatingFlickable::updateChildrenWidth);

50− connect(this, &QQuickItem::heightChanged, this, &FloatingFlickable::updateChildrenHeight);

51−}

52−

53−qreal FloatingFlickable::contentWidth() const

54−{

55− return m_flickable->contentWidth();

56−}

57−

58−void FloatingFlickable::setContentWidth(qreal contentWidth)

59−{

60− m_flickable->setContentWidth(contentWidth);

61−}

62−

63−qreal FloatingFlickable::contentHeight() const

64−{

65− return m_flickable->contentHeight();

66−}

67−

68−void FloatingFlickable::setContentHeight(qreal contentHeight)

69−{

70− m_flickable->setContentHeight(contentHeight);

71−}

72−

73−qreal FloatingFlickable::contentX() const

74−{

75− return m_flickable->contentX();

76−}

77−

78−void FloatingFlickable::setContentX(qreal contentX)

79−{

80− m_flickable->setContentX(contentX);

81−}

82−

83−qreal FloatingFlickable::contentY() const

84−{

85− return m_flickable->contentY();

86−}

87−

88−void FloatingFlickable::setContentY(qreal contentY)

89−{

90− m_flickable->setContentY(contentY);

91−}

92−

93−Direction::Type FloatingFlickable::direction() const

94−{

95− return m_dragArea->direction();

96−}

97−

98−void FloatingFlickable::setDirection(Direction::Type direction)

99−{

100− m_dragArea->setDirection(direction);

101− if (Direction::isHorizontal(direction)) {

102− m_flickable->setFlickableDirection(QQuickFlickable::HorizontalFlick);

103− } else {

104− m_flickable->setFlickableDirection(QQuickFlickable::VerticalFlick);

105− }

106−}

107−

108−void FloatingFlickable::updateChildrenWidth()

109−{

110− m_dragArea->setWidth(width());

111− m_flickable->setWidth(width());

112−}

113−

114−void FloatingFlickable::updateChildrenHeight()

115−{

116− m_dragArea->setHeight(height());

117− m_flickable->setHeight(height());

118−}

119−

120−void FloatingFlickable::onDragAreaTouchPosChanged(qreal)

121−{

122− if (m_mousePressed) {

123− QMouseEvent mouseEvent(QEvent::MouseMove,

124− QPointF(m_dragArea->touchX(),m_dragArea->touchY()),

125− Qt::NoButton, Qt::LeftButton, Qt::NoModifier);

126−

127− QCoreApplication::sendEvent(m_flickable, &mouseEvent);

128−

129− }

130−}

131−

132−void FloatingFlickable::onDragAreaDraggingChanged(bool dragging)

133−{

134− if (dragging && !m_mousePressed) {

135− QMouseEvent mouseEvent(QEvent::MouseButtonPress,

136− QPointF(m_dragArea->touchX(),m_dragArea->touchY()),

137− Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);

138−

139− QCoreApplication::sendEvent(m_flickable, &mouseEvent);

140− m_mousePressed = true;

141−

142− } else if (!dragging && m_mousePressed) {

143− QMouseEvent mouseEvent(QEvent::MouseButtonRelease,

144− QPointF(m_dragArea->touchX(),m_dragArea->touchY()),

145− Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);

146−

147− QCoreApplication::sendEvent(m_flickable, &mouseEvent);

148− m_mousePressed = false;

149− }

150−}

plugins/Ubuntu/Gestures/FloatingFlickable.hdeleted−86

@@ -1,86 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef FLOATING_FLICKABLE_H

18−#define FLOATING_FLICKABLE_H

19−

20−#include <QQuickItem>

21−#include "UbuntuGesturesQmlGlobal.h"

22−#include "Direction.h"

23−

24−class DirectionalDragArea;

25−class QQuickFlickable;

26−

27−/*

28− A Flickable that can be put in front of the item to be flicked and

29− still have the item-to-be-flicked receive input events that are not flicks.

30−

31− Ie, it's a Flickable that, input-wise, is transparent to non-flick gestures.

32−

33− With a regular Flickable you would have to make the item-to-be-flicked a child

34− of Flicakble to achieve the same result. FloatingFlickable has no such requirement

35− or limitation.

36− */

37−class UBUNTUGESTURESQML_EXPORT FloatingFlickable : public QQuickItem {

38− Q_OBJECT

39−

40− Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged)

41− Q_PROPERTY(qreal contentHeight READ contentHeight WRITE setContentHeight NOTIFY contentHeightChanged)

42− Q_PROPERTY(qreal contentX READ contentX WRITE setContentX NOTIFY contentXChanged)

43− Q_PROPERTY(qreal contentY READ contentY WRITE setContentY NOTIFY contentYChanged)

44−

45− Q_PROPERTY(Direction::Type direction READ direction WRITE setDirection NOTIFY directionChanged)

46−

47−Q_SIGNALS:

48− void contentWidthChanged();

49− void contentHeightChanged();

50− void contentXChanged();

51− void contentYChanged();

52− void directionChanged();

53−

54−public:

55− FloatingFlickable(QQuickItem *parent = nullptr);

56−

57− qreal contentWidth() const;

58− void setContentWidth(qreal contentWidth);

59−

60− qreal contentHeight() const;

61− void setContentHeight(qreal contentHeight);

62−

63− qreal contentX() const;

64− void setContentX(qreal contentX);

65−

66− qreal contentY() const;

67− void setContentY(qreal contentY);

68−

69− Direction::Type direction() const;

70− void setDirection(Direction::Type);

71−

72−private Q_SLOTS:

73− void updateChildrenWidth();

74− void updateChildrenHeight();

75− void onDragAreaTouchPosChanged(qreal);

76− void onDragAreaDraggingChanged(bool value);

77−

78−private:

79− DirectionalDragArea *m_dragArea;

80− QQuickFlickable *m_flickable;

81− bool m_mousePressed;

82−

83− friend class tst_FloatingFlickable;

84−};

85−

86−#endif // FLOATING_FLICKABLE_H

plugins/Ubuntu/Gestures/Gestures.qmltypesdeleted−209

@@ -1,209 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Ubuntu.Gestures 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "AxisVelocityCalculator"

12− prototype: "QObject"

13− exports: ["Ubuntu.Gestures/AxisVelocityCalculator 0.1"]

14− exportMetaObjectRevisions: [0]

15− Property { name: "trackedPosition"; type: "double" }

16− Signal {

17− name: "trackedPositionChanged"

18− Parameter { name: "value"; type: "double" }

19− }

20− Method { name: "calculate"; type: "double" }

21− Method { name: "reset" }

22− }

23− Component {

24− name: "Direction"

25− prototype: "QObject"

26− exports: ["Ubuntu.Gestures/Direction 0.1"]

27− isCreatable: false

28− isSingleton: true

29− exportMetaObjectRevisions: [0]

30− Enum {

31− name: "Type"

32− values: {

33− "Rightwards": 0,

34− "Leftwards": 1,

35− "Downwards": 2,

36− "Upwards": 3,

37− "Horizontal": 4,

38− "Vertical": 5

39− }

40− }

41− Method {

42− name: "isHorizontal"

43− type: "bool"

44− Parameter { name: "type"; type: "Direction::Type" }

45− }

46− Method {

47− name: "isVertical"

48− type: "bool"

49− Parameter { name: "type"; type: "Direction::Type" }

50− }

51− Method {

52− name: "isPositive"

53− type: "bool"

54− Parameter { name: "type"; type: "Direction::Type" }

55− }

56− }

57− Component {

58− name: "DirectionalDragArea"

59− defaultProperty: "data"

60− prototype: "QQuickItem"

61− exports: ["Ubuntu.Gestures/DirectionalDragArea 0.1"]

62− exportMetaObjectRevisions: [0]

63− Property { name: "direction"; type: "Direction::Type" }

64− Property { name: "distance"; type: "double"; isReadonly: true }

65− Property { name: "sceneDistance"; type: "double"; isReadonly: true }

66− Property { name: "touchX"; type: "double"; isReadonly: true }

67− Property { name: "touchY"; type: "double"; isReadonly: true }

68− Property { name: "touchSceneX"; type: "double"; isReadonly: true }

69− Property { name: "touchSceneY"; type: "double"; isReadonly: true }

70− Property { name: "dragging"; type: "bool"; isReadonly: true }

71− Property { name: "pressed"; type: "bool"; isReadonly: true }

72− Property { name: "immediateRecognition"; type: "bool" }

73− Signal {

74− name: "directionChanged"

75− Parameter { name: "direction"; type: "Direction::Type" }

76− }

77− Signal {

78− name: "draggingChanged"

79− Parameter { name: "value"; type: "bool" }

80− }

81− Signal {

82− name: "pressedChanged"

83− Parameter { name: "value"; type: "bool" }

84− }

85− Signal {

86− name: "distanceChanged"

87− Parameter { name: "value"; type: "double" }

88− }

89− Signal {

90− name: "sceneDistanceChanged"

91− Parameter { name: "value"; type: "double" }

92− }

93− Signal {

94− name: "touchXChanged"

95− Parameter { name: "value"; type: "double" }

96− }

97− Signal {

98− name: "touchYChanged"

99− Parameter { name: "value"; type: "double" }

100− }

101− Signal {

102− name: "touchSceneXChanged"

103− Parameter { name: "value"; type: "double" }

104− }

105− Signal {

106− name: "touchSceneYChanged"

107− Parameter { name: "value"; type: "double" }

108− }

109− Signal {

110− name: "immediateRecognitionChanged"

111− Parameter { name: "value"; type: "bool" }

112− }

113− Method { name: "removeTimeConstraints" }

114− }

115− Component {

116− name: "FloatingFlickable"

117− defaultProperty: "data"

118− prototype: "QQuickItem"

119− exports: ["Ubuntu.Gestures/FloatingFlickable 0.1"]

120− exportMetaObjectRevisions: [0]

121− Property { name: "contentWidth"; type: "double" }

122− Property { name: "contentHeight"; type: "double" }

123− Property { name: "contentX"; type: "double" }

124− Property { name: "contentY"; type: "double" }

125− Property { name: "direction"; type: "Direction::Type" }

126− }

127− Component {

128− name: "GestureTouchPoint"

129− prototype: "QObject"

130− exports: ["Ubuntu.Gestures/GestureTouchPoint 0.1"]

131− isCreatable: false

132− exportMetaObjectRevisions: [0]

133− Property { name: "pointId"; type: "int"; isReadonly: true }

134− Property { name: "pressed"; type: "bool"; isReadonly: true }

135− Property { name: "x"; type: "double"; isReadonly: true }

136− Property { name: "y"; type: "double"; isReadonly: true }

137− Property { name: "dragging"; type: "bool"; isReadonly: true }

138− }

139− Component {

140− name: "PressedOutsideNotifier"

141− defaultProperty: "data"

142− prototype: "QQuickItem"

143− exports: ["Ubuntu.Gestures/PressedOutsideNotifier 0.1"]

144− exportMetaObjectRevisions: [0]

145− Signal { name: "pressedOutside" }

146− }

147− Component {

148− name: "TouchGate"

149− defaultProperty: "data"

150− prototype: "QQuickItem"

151− exports: ["Ubuntu.Gestures/TouchGate 0.1"]

152− exportMetaObjectRevisions: [0]

153− Property { name: "targetItem"; type: "QQuickItem"; isPointer: true }

154− Signal {

155− name: "targetItemChanged"

156− Parameter { name: "item"; type: "QQuickItem"; isPointer: true }

157− }

158− }

159− Component {

160− name: "TouchGestureArea"

161− defaultProperty: "data"

162− prototype: "QQuickItem"

163− exports: ["Ubuntu.Gestures/TouchGestureArea 0.1"]

164− exportMetaObjectRevisions: [0]

165− Enum {

166− name: "Status"

167− values: {

168− "WaitingForTouch": 0,

169− "Undecided": 1,

170− "Recognized": 2,

171− "Rejected": 3

172− }

173− }

174− Property { name: "touchPoints"; type: "GestureTouchPoint"; isList: true; isReadonly: true }

175− Property { name: "dragging"; type: "bool"; isReadonly: true }

176− Property { name: "minimumTouchPoints"; type: "int" }

177− Property { name: "maximumTouchPoints"; type: "int" }

178− Signal {

179− name: "statusChanged"

180− Parameter { name: "status"; type: "Status" }

181− }

182− Signal { name: "touchPointsUpdated" }

183− Signal {

184− name: "draggingChanged"

185− Parameter { name: "dragging"; type: "bool" }

186− }

187− Signal {

188− name: "minimumTouchPointsChanged"

189− Parameter { name: "value"; type: "bool" }

190− }

191− Signal {

192− name: "maximumTouchPointsChanged"

193− Parameter { name: "value"; type: "bool" }

194− }

195− Signal {

196− name: "pressed"

197− Parameter { name: "points"; type: "QList<QObject*>" }

198− }

199− Signal {

200− name: "released"

201− Parameter { name: "points"; type: "QList<QObject*>" }

202− }

203− Signal {

204− name: "updated"

205− Parameter { name: "points"; type: "QList<QObject*>" }

206− }

207− Signal { name: "clicked" }

208− }

209−}

plugins/Ubuntu/Gestures/MouseEventGenerator.cppnew file+64

@@ -0,0 +1,64 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "MouseEventGenerator.h"

18+

19+#include <QCoreApplication>

20+#include <QMouseEvent>

21+#include <QQuickItem>

22+

23+MouseEventGenerator::MouseEventGenerator(QObject *parent)

24+ : QObject(parent)

25+{

26+}

27+

28+void MouseEventGenerator::move(const QPointF position)

29+{

30+ if (!m_mousePressed || !m_targetItem) {

31+ return;

32+ }

33+

34+ QMouseEvent mouseEvent(QEvent::MouseMove,

35+ QPointF(position.x(), position.y()), Qt::NoButton, Qt::LeftButton, Qt::NoModifier);

36+

37+ QCoreApplication::sendEvent(m_targetItem, &mouseEvent);

38+}

39+

40+void MouseEventGenerator::press(const QPointF position)

41+{

42+ if (m_mousePressed || !m_targetItem) {

43+ return;

44+ }

45+

46+ QMouseEvent mouseEvent(QEvent::MouseButtonPress,

47+ QPointF(position.x(), position.y()), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);

48+

49+ QCoreApplication::sendEvent(m_targetItem, &mouseEvent);

50+ m_mousePressed = true;

51+}

52+

53+void MouseEventGenerator::release(const QPointF position)

54+{

55+ if (!m_mousePressed || !m_targetItem) {

56+ return;

57+ }

58+

59+ QMouseEvent mouseEvent(QEvent::MouseButtonRelease,

60+ QPointF(position.x(), position.y()), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);

61+

62+ QCoreApplication::sendEvent(m_targetItem, &mouseEvent);

63+ m_mousePressed = false;

64+}

plugins/Ubuntu/Gestures/MouseEventGenerator.hnew file+48

@@ -0,0 +1,48 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef MOUSEEVENTGENERATOR_H

18+#define MOUSEEVENTGENERATOR_H

19+

20+#include <QObject>

21+#include <QPointF>

22+

23+#include "UbuntuGesturesQmlGlobal.h"

24+

25+class QQuickItem;

26+

27+class UBUNTUGESTURESQML_EXPORT MouseEventGenerator : public QObject {

28+ Q_OBJECT

29+ Q_PROPERTY(QQuickItem* targetItem MEMBER m_targetItem NOTIFY targetItemChanged)

30+

31+public:

32+ MouseEventGenerator(QObject *parent = nullptr);

33+

34+ Q_INVOKABLE void move(const QPointF position);

35+ Q_INVOKABLE void press(const QPointF position);

36+ Q_INVOKABLE void release(const QPointF position);

37+

38+Q_SIGNALS:

39+ void targetItemChanged(QQuickItem *);

40+

41+private:

42+ bool m_mousePressed {false};

43+ QQuickItem *m_targetItem {nullptr};

44+

45+ friend class tst_FloatingFlickable;

46+};

47+

48+#endif // MOUSEEVENTGENERATOR_H

plugins/Ubuntu/Gestures/PressedOutsideNotifier.h+1−1

@@ -23,7 +23,7 @@

2323#include <QPointer>

2424#include <QTimer>

2525

26−#include "UbuntuGesturesGlobal.h"

26+#include <ubuntugesturesglobal.h>

2727

2828/*

2929 Notifies when a point, mouse or touch, is pressed outside its area.

plugins/Ubuntu/Gestures/TouchDispatcher.cpp+1−5

@@ -19,11 +19,7 @@

1919#include <QGuiApplication>

2020#include <QScopedPointer>

2121#include <QStyleHints>

22−

23−#pragma GCC diagnostic push

24−#pragma GCC diagnostic ignored "-pedantic"

2522#include <private/qquickitem_p.h>

26−#pragma GCC diagnostic pop

2723

2824#define TOUCHDISPATCHER_DEBUG 0

2925

@@ -225,7 +221,7 @@ void TouchDispatcher::dispatchAsMouse(

225221 QEvent::Type eventType;

226222 if (touchMouse->state() == Qt::TouchPointPressed) {

227223 eventType = QEvent::MouseButtonPress;

228− } if (touchMouse->state() == Qt::TouchPointReleased) {

224+ } else if (touchMouse->state() == Qt::TouchPointReleased) {

229225 eventType = QEvent::MouseButtonRelease;

230226 m_touchMouseId = -1;

231227 } else {

plugins/Ubuntu/Gestures/TouchGate.cpp+2−2

@@ -20,8 +20,8 @@

2020#include <QDebug>

2121#include <QQuickWindow>

2222

23−#include <TouchOwnershipEvent.h>

24−#include <TouchRegistry.h>

23+#include <TouchOwnershipEvent>

24+#include <TouchRegistry>

2525

2626#if TOUCHGATE_DEBUG

2727#define ugDebug(params) qDebug().nospace() << "[TouchGate(" << (void*)this << ")] " << params

plugins/Ubuntu/Gestures/TouchGestureArea.cpp+16−15

@@ -16,10 +16,11 @@

1616

1717#include "TouchGestureArea.h"

1818

19−// local

20−#include "TouchOwnershipEvent.h"

21−#include "TouchRegistry.h"

22−#include "UnownedTouchEvent.h"

19+#include <UbuntuGestures/TouchOwnershipEvent>

20+#include <UbuntuGestures/TouchRegistry>

21+#include <UbuntuGestures/UnownedTouchEvent>

22+// #include "TouchRegistry.h"

23+// #include "UnownedTouchEvent.h"

2324

2425#include <QGuiApplication>

2526#include <QStyleHints>

@@ -374,7 +375,7 @@ void TouchGestureArea::unownedTouchEvent_waitingForMoreTouches(QTouchEvent *even

374375 }

375376 }

376377

377− if (m_candidateTouches.count() == 0) {

378+ if (m_candidateTouches.isEmpty()) {

378379 setInternalStatus(InternalStatus::WaitingForTouch);

379380 }

380381}

@@ -438,7 +439,7 @@ void TouchGestureArea::unownedTouchEvent_rejected(QTouchEvent *event)

438439 }

439440 }

440441

441− if (m_watchedTouches.count() == 0) {

442+ if (m_watchedTouches.isEmpty()) {

442443 setInternalStatus(InternalStatus::WaitingForTouch);

443444 }

444445}

@@ -526,7 +527,7 @@ void TouchGestureArea::updateTouchPoints(QTouchEvent *touchEvent)

526527 if (updateable) {

527528 if (!dragging() && m_status == InternalStatus::Recognized) {

528529 bool allWantDrag = !m_liveTouchPoints.isEmpty();

529− Q_FOREACH(auto point, m_liveTouchPoints) {

530+ Q_FOREACH(const auto &point, m_liveTouchPoints) {

530531 allWantDrag &= point->dragging();

531532 }

532533 // only dragging if all points are dragging.

@@ -588,13 +589,15 @@ void TouchGestureArea::setInternalStatus(uint newStatus)

588589 resyncCachedTouchPoints();

589590 break;

590591 case InternalStatus::WaitingForMoreTouches:

591− m_recognitionTimer->start(m_recognitionPeriod);

592+ m_recognitionTimer->setInterval(m_recognitionPeriod);

593+ m_recognitionTimer->start();

592594 break;

593595 case InternalStatus::Recognized:

594596 resyncCachedTouchPoints();

595597 break;

596598 case InternalStatus::WaitingForRejection:

597− m_recognitionTimer->start(m_releaseRejectPeriod);

599+ m_recognitionTimer->setInterval(m_releaseRejectPeriod);

600+ m_recognitionTimer->start();

598601 break;

599602 case InternalStatus::Rejected:

600603 resyncCachedTouchPoints();

@@ -643,11 +646,9 @@ bool TouchGestureArea::dragging() const

643646QQmlListProperty<GestureTouchPoint> TouchGestureArea::touchPoints()

644647{

645648 return QQmlListProperty<GestureTouchPoint>(this,

646− 0,

647− nullptr,

648− TouchGestureArea::touchPoint_count,

649− TouchGestureArea::touchPoint_at,

650− 0);

649+ nullptr,

650+ TouchGestureArea::touchPoint_count,

651+ TouchGestureArea::touchPoint_at);

651652}

652653

653654int TouchGestureArea::minimumTouchPoints() const

@@ -718,7 +719,7 @@ void TouchGestureArea::rejectGesture()

718719 }

719720 m_candidateTouches.clear();

720721

721− if (m_watchedTouches.count() == 0) {

722+ if (m_watchedTouches.isEmpty()) {

722723 setInternalStatus(InternalStatus::WaitingForTouch);

723724 } else {

724725 setInternalStatus(InternalStatus::Rejected);

plugins/Ubuntu/Gestures/TouchGestureArea.h+9−10

@@ -21,8 +21,7 @@

2121

2222#include <QQuickItem>

2323

24−// lib UbuntuGestures

25−#include <Timer.h>

24+#include <UbuntuGestures/Timer>

2625

2726class TouchOwnershipEvent;

2827class UnownedTouchEvent;

@@ -106,8 +105,8 @@ private:

106105/*

107106 An area that detects multi-finger gestures.

108107

109− We can use this to detect gestures contstrained by a minimim and/or maximum number of touch points.

110− This components uses the touch registry to apply for ownership of touch points.

108+ We can use this to detect gestures constrained by a minimum and/or maximum number of touch points.

109+ This component uses the touch registry to apply for ownership of touch points.

111110 This way we can use the component in conjuntion with the directional drag area to compete for ownwership

112111 or gestures; unlike the MultiPointTouchArea.

113112 */

@@ -137,7 +136,7 @@ public:

137136 Recognized,

138137 Rejected

139138 };

140− TouchGestureArea(QQuickItem* parent = NULL);

139+ TouchGestureArea(QQuickItem* parent = nullptr);

141140 ~TouchGestureArea();

142141

143142 bool event(QEvent *e) override;

@@ -165,10 +164,10 @@ Q_SIGNALS:

165164

166165 void touchPointsUpdated();

167166 void draggingChanged(bool dragging);

168− void minimumTouchPointsChanged(bool value);

169− void maximumTouchPointsChanged(bool value);

170− void recognitionPeriodChanged(bool value);

171− void releaseRejectPeriodChanged(bool value);

167+ void minimumTouchPointsChanged(int value);

168+ void maximumTouchPointsChanged(int value);

169+ void recognitionPeriodChanged(int value);

170+ void releaseRejectPeriodChanged(int value);

172171

173172 void pressed(const QList<QObject*>& points);

174173 void released(const QList<QObject*>& points);

@@ -176,7 +175,7 @@ Q_SIGNALS:

176175 void clicked();

177176

178177protected:

179− void itemChange(ItemChange change, const ItemChangeData &value);

178+ void itemChange(ItemChange change, const ItemChangeData &value) override;

180179

181180private Q_SLOTS:

182181 void rejectGesture();

plugins/Ubuntu/Gestures/plugin.cpp+3−5

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -17,8 +17,7 @@

1717#include "plugin.h"

1818#include "AxisVelocityCalculator.h"

1919#include "Direction.h"

20−#include "DirectionalDragArea.h"

21−#include "FloatingFlickable.h"

20+#include "MouseEventGenerator.h"

2221#include "PressedOutsideNotifier.h"

2322#include "TouchGate.h"

2423#include "TouchGestureArea.h"

@@ -34,9 +33,8 @@ static QObject* directionSingleton(QQmlEngine* engine, QJSEngine* scriptEngine)

3433void UbuntuGesturesQmlPlugin::registerTypes(const char *uri)

3534{

3635 qmlRegisterSingletonType<Direction>(uri, 0, 1, "Direction", directionSingleton);

37− qmlRegisterType<DirectionalDragArea>(uri, 0, 1, "DirectionalDragArea");

3836 qmlRegisterType<AxisVelocityCalculator>(uri, 0, 1, "AxisVelocityCalculator");

39− qmlRegisterType<FloatingFlickable>(uri, 0, 1, "FloatingFlickable");

37+ qmlRegisterType<MouseEventGenerator>(uri, 0, 1, "MouseEventGenerator");

4038 qmlRegisterType<PressedOutsideNotifier>(uri, 0, 1, "PressedOutsideNotifier");

4139 qmlRegisterType<TouchGate>(uri, 0, 1, "TouchGate");

4240 qmlRegisterType<TouchGestureArea>(uri, 0, 1, "TouchGestureArea");

plugins/Ubuntu/Payments/Payments.qmltypesdeleted−43

@@ -1,43 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Ubuntu.Payments 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "Payments"

12− prototype: "QObject"

13− exports: ["Ubuntu.Payments/Payments 0.1"]

14− exportMetaObjectRevisions: [0]

15− Property { name: "currency"; type: "string" }

16− Property { name: "price"; type: "double" }

17− Property { name: "storeItemId"; type: "string" }

18− Property { name: "formattedPrice"; type: "string"; isReadonly: true }

19− Signal {

20− name: "currencyChanged"

21− Parameter { name: "currency"; type: "string" }

22− }

23− Signal {

24− name: "priceChanged"

25− Parameter { name: "price"; type: "double" }

26− }

27− Signal {

28− name: "storeItemIdChanged"

29− Parameter { name: "store_item_id"; type: "string" }

30− }

31− Signal {

32− name: "formattedPriceChanged"

33− Parameter { name: "formatted_price"; type: "string" }

34− }

35− Signal {

36− name: "purchaseError"

37− Parameter { name: "error"; type: "string" }

38− }

39− Signal { name: "purchaseCompleted" }

40− Signal { name: "purchaseCancelled" }

41− Method { name: "start" }

42− }

43−}

plugins/Ubuntu/SystemImage/SystemImage.qmltypesdeleted−19

@@ -1,19 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Ubuntu.SystemImage 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "SystemImage"

12− prototype: "QObject"

13− exports: ["Ubuntu.SystemImage/SystemImage 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Method { name: "factoryReset" }

18− }

19−}

plugins/Unity/Connectivity/Connectivity.qmltypesdeleted−19

@@ -1,19 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Unity.Connectivity 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "Connectivity"

12− prototype: "QObject"

13− exports: ["Unity.Connectivity/Connectivity 0.1"]

14− isCreatable: false

15− isSingleton: true

16− exportMetaObjectRevisions: [0]

17− Method { name: "unlockAllModems" }

18− }

19−}

plugins/Unity/DashCommunicator/DashCommunicator.qmltypesdeleted−47

@@ -1,47 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Unity.DashCommunicator 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "DashCommunicator"

12− prototype: "QThread"

13− exports: ["Unity.DashCommunicator/DashCommunicator 0.1"]

14− exportMetaObjectRevisions: [0]

15− Method {

16− name: "setCurrentScope"

17− Parameter { name: "index"; type: "int" }

18− Parameter { name: "animate"; type: "bool" }

19− Parameter { name: "isSwipe"; type: "bool" }

20− }

21− }

22− Component {

23− name: "DashCommunicatorService"

24− prototype: "QObject"

25− exports: ["Unity.DashCommunicator/DashCommunicatorService 0.1"]

26− exportMetaObjectRevisions: [0]

27− Signal {

28− name: "setCurrentScopeRequested"

29− Parameter { name: "index"; type: "int" }

30− Parameter { name: "animate"; type: "bool" }

31− Parameter { name: "isSwipe"; type: "bool" }

32− }

33− }

34− Component {

35− name: "QThread"

36− prototype: "QObject"

37− Signal { name: "started" }

38− Signal { name: "finished" }

39− Method {

40− name: "start"

41− Parameter { type: "Priority" }

42− }

43− Method { name: "start" }

44− Method { name: "terminate" }

45− Method { name: "quit" }

46− }

47−}

plugins/Unity/Indicators/CMakeLists.txt+4

@@ -6,6 +6,10 @@ find_package(Qt5Quick REQUIRED)

66include_directories(

77 ${CMAKE_CURRENT_SOURCE_DIR}

88 ${CMAKE_CURRENT_BINARY_DIR}

9+)

10+

11+include_directories(

12+ SYSTEM

913 ${GLIB_INCLUDE_DIRS}

1014 ${GIO_INCLUDE_DIRS}

1115 ${QMENUMODEL_INCLUDE_DIRS}

plugins/Unity/Indicators/Indicators.qmltypesdeleted−264

@@ -1,264 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Unity.Indicators 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "ActionRootState"

12− prototype: "RootStateObject"

13− exports: ["Unity.Indicators/ActionRootState 0.1"]

14− exportMetaObjectRevisions: [0]

15− Property { name: "actionGroup"; type: "QDBusActionGroup"; isPointer: true }

16− Property { name: "actionName"; type: "string" }

17− }

18− Component {

19− name: "ActionState"

20− prototype: "QObject"

21− exports: ["Unity.Indicators/ActionState 0.1"]

22− isCreatable: false

23− exportMetaObjectRevisions: [0]

24− Enum {

25− name: "ActionStates"

26− values: {

27− "Label": 0,

28− "IconSource": 1,

29− "AccessableName": 2,

30− "Visible": 3

31− }

32− }

33− }

34− Component {

35− name: "FlatMenuProxyModelRole"

36− prototype: "QObject"

37− exports: ["Unity.Indicators/FlatMenuProxyModelRole 0.1"]

38− isCreatable: false

39− exportMetaObjectRevisions: [0]

40− Enum {

41− name: "Roles"

42− values: {

43− "Action": 1,

44− "Label": 2,

45− "Extra": 3,

46− "Depth": 4,

47− "hasSection": 5,

48− "hasSubMenu": 6

49− }

50− }

51− }

52− Component {

53− name: "IndicatorsManager"

54− prototype: "QObject"

55− exports: ["Unity.Indicators/IndicatorsManager 0.1"]

56− exportMetaObjectRevisions: [0]

57− Property { name: "loaded"; type: "bool"; isReadonly: true }

58− Property { name: "profile"; type: "string" }

59− Signal {

60− name: "loadedChanged"

61− Parameter { type: "bool" }

62− }

63− Signal {

64− name: "profileChanged"

65− Parameter { type: "string" }

66− }

67− Signal {

68− name: "indicatorLoaded"

69− Parameter { name: "indicator_name"; type: "string" }

70− }

71− Signal {

72− name: "indicatorAboutToBeUnloaded"

73− Parameter { name: "indicator_name"; type: "string" }

74− }

75− Method { name: "load" }

76− Method { name: "unload" }

77− }

78− Component {

79− name: "IndicatorsModel"

80− prototype: "QAbstractListModel"

81− exports: ["Unity.Indicators/IndicatorsModel 0.1"]

82− exportMetaObjectRevisions: [0]

83− Property { name: "count"; type: "int"; isReadonly: true }

84− Property { name: "profile"; type: "string" }

85− Signal {

86− name: "indicatorDataChanged"

87− Parameter { name: "data"; type: "QVariant" }

88− }

89− Method { name: "load" }

90− Method { name: "unload" }

91− Method {

92− name: "data"

93− type: "QVariant"

94− Parameter { name: "row"; type: "int" }

95− Parameter { name: "role"; type: "int" }

96− }

97− }

98− Component {

99− name: "IndicatorsModelRole"

100− prototype: "QObject"

101− exports: ["Unity.Indicators/IndicatorsModelRole 0.1"]

102− isCreatable: false

103− exportMetaObjectRevisions: [0]

104− Enum {

105− name: "Roles"

106− values: {

107− "Identifier": 0,

108− "Position": 1,

109− "IndicatorProperties": 2

110− }

111− }

112− }

113− Component {

114− name: "MenuContentActivator"

115− prototype: "QObject"

116− exports: ["Unity.Indicators/MenuContentActivator 0.1"]

117− exportMetaObjectRevisions: [0]

118− Property { name: "baseIndex"; type: "int" }

119− Property { name: "running"; type: "bool" }

120− Property { name: "count"; type: "int" }

121− Property { name: "content"; type: "MenuContentState"; isList: true; isReadonly: true }

122− Signal {

123− name: "baseIndexChanged"

124− Parameter { name: "baseIndex"; type: "int" }

125− }

126− Signal {

127− name: "deltaChanged"

128− Parameter { name: "delta"; type: "int" }

129− }

130− Signal {

131− name: "runningChanged"

132− Parameter { name: "running"; type: "bool" }

133− }

134− Signal {

135− name: "countChanged"

136− Parameter { name: "count"; type: "int" }

137− }

138− Method { name: "restart" }

139− Method { name: "stop" }

140− Method { name: "clear" }

141− Method {

142− name: "isMenuContentActive"

143− type: "bool"

144− Parameter { name: "index"; type: "int" }

145− }

146− }

147− Component {

148− name: "MenuContentState"

149− prototype: "QObject"

150− exports: ["Unity.Indicators/MenuContentState 0.1"]

151− isCreatable: false

152− exportMetaObjectRevisions: [0]

153− Property { name: "active"; type: "bool"; isReadonly: true }

154− }

155− Component {

156− name: "ModelActionRootState"

157− prototype: "RootStateObject"

158− exports: ["Unity.Indicators/ModelActionRootState 0.1"]

159− exportMetaObjectRevisions: [0]

160− Property { name: "menu"; type: "UnityMenuModel"; isPointer: true }

161− Signal { name: "indexChanged" }

162− }

163− Component {

164− name: "ModelPrinter"

165− prototype: "QObject"

166− exports: ["Unity.Indicators/ModelPrinter 0.1"]

167− exportMetaObjectRevisions: [0]

168− Property { name: "model"; type: "UnityMenuModel"; isPointer: true }

169− Property { name: "text"; type: "string"; isReadonly: true }

170− Method { name: "text"; type: "string" }

171− }

172− Component {

173− name: "NetworkActionState"

174− prototype: "QObject"

175− exports: ["Unity.Indicators/NetworkActionState 0.1"]

176− isCreatable: false

177− exportMetaObjectRevisions: [0]

178− Enum {

179− name: "NetworkActionStates"

180− values: {

181− "Connection": 1,

182− "SignalStrength": 2

183− }

184− }

185− }

186− Component {

187− name: "NetworkConnection"

188− prototype: "QObject"

189− exports: ["Unity.Indicators/NetworkConnection 0.1"]

190− isCreatable: false

191− exportMetaObjectRevisions: [0]

192− Enum {

193− name: "NetworkConnectionStates"

194− values: {

195− "Initial": 0,

196− "Activating": 1,

197− "Activated": 2,

198− "Deactivating": 3

199− }

200− }

201− }

202− Component {

203− name: "RootStateObject"

204− prototype: "QObject"

205− Property { name: "valid"; type: "bool"; isReadonly: true }

206− Property { name: "title"; type: "string"; isReadonly: true }

207− Property { name: "leftLabel"; type: "string"; isReadonly: true }

208− Property { name: "rightLabel"; type: "string"; isReadonly: true }

209− Property { name: "icons"; type: "QStringList"; isReadonly: true }

210− Property { name: "accessibleName"; type: "string"; isReadonly: true }

211− Property { name: "indicatorVisible"; type: "bool"; isReadonly: true }

212− Signal { name: "updated" }

213− }

214− Component {

215− name: "SharedUnityMenuModel"

216− prototype: "QObject"

217− exports: ["Unity.Indicators/SharedUnityMenuModel 0.1"]

218− exportMetaObjectRevisions: [0]

219− Property { name: "busName"; type: "QByteArray" }

220− Property { name: "menuObjectPath"; type: "QByteArray" }

221− Property { name: "actions"; type: "QVariantMap" }

222− Property { name: "model"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }

223− }

224− Component {

225− name: "UnityMenuModelCache"

226− prototype: "QObject"

227− exports: ["Unity.Indicators/UnityMenuModelCache 0.1"]

228− isCreatable: false

229− isSingleton: true

230− exportMetaObjectRevisions: [0]

231− Method {

232− name: "contains"

233− type: "bool"

234− Parameter { name: "path"; type: "QByteArray" }

235− }

236− }

237− Component {

238− name: "UnityMenuModelStack"

239− prototype: "QObject"

240− exports: ["Unity.Indicators/UnityMenuModelStack 0.1"]

241− exportMetaObjectRevisions: [0]

242− Property { name: "head"; type: "UnityMenuModel"; isPointer: true }

243− Property { name: "tail"; type: "UnityMenuModel"; isReadonly: true; isPointer: true }

244− Property { name: "count"; type: "int"; isReadonly: true }

245− Signal {

246− name: "headChanged"

247− Parameter { name: "head"; type: "UnityMenuModel"; isPointer: true }

248− }

249− Signal {

250− name: "tailChanged"

251− Parameter { name: "tail"; type: "UnityMenuModel"; isPointer: true }

252− }

253− Signal {

254− name: "countChanged"

255− Parameter { name: "count"; type: "int" }

256− }

257− Method {

258− name: "push"

259− Parameter { name: "model"; type: "UnityMenuModel"; isPointer: true }

260− Parameter { name: "menuIndex"; type: "int" }

261− }

262− Method { name: "pop"; type: "UnityMenuModel*" }

263− }

264−}

plugins/Unity/Indicators/indicatorsmanager.cpp+1−1

@@ -291,7 +291,7 @@ Indicator::Ptr IndicatorsManager::indicator(const QString& indicator_name)

291291 // The rest of the indicators respect their default profile (which is "phone", even on desktop PCs)

292292 if ((new_indicator->identifier() == QStringLiteral("indicator-session"))

293293 || (new_indicator->identifier() == QStringLiteral("indicator-power") && m_platform.isPC())) {

294− new_indicator->setProfile(QStringLiteral("desktop"));

294+ new_indicator->setProfile(m_profile.replace(QStringLiteral("phone"), QStringLiteral("desktop")));

295295 } else {

296296 new_indicator->setProfile(m_profile);

297297 }

plugins/Unity/InputInfo/InputInfo.qmltypesdeleted−71

@@ -1,71 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Unity.InputInfo 0.1 plugins'

8−

9−Module {

10− Component {

11− name: "QDeclarativeInputDeviceModel"

12− prototype: "QAbstractListModel"

13− exports: ["Unity.InputInfo/InputDeviceModel 0.1"]

14− exportMetaObjectRevisions: [0]

15− Property { name: "deviceFilter"; type: "QInputDevice::InputType" }

16− Property { name: "count"; type: "int"; isReadonly: true }

17− Signal {

18− name: "deviceAdded"

19− Parameter { name: "devicePath"; type: "string" }

20− }

21− Signal {

22− name: "deviceRemoved"

23− Parameter { name: "devicePath"; type: "string" }

24− }

25− Signal {

26− name: "deviceFilterChanged"

27− Parameter { name: "filter"; type: "QInputDevice::InputType" }

28− }

29− Method { name: "updateDeviceList" }

30− Method {

31− name: "indexOf"

32− type: "int"

33− Parameter { name: "devicePath"; type: "string" }

34− }

35− Method {

36− name: "get"

37− type: "QInputDevice*"

38− Parameter { name: "index"; type: "int" }

39− }

40− }

41− Component {

42− name: "QInputDevice"

43− prototype: "QObject"

44− exports: ["Unity.InputInfo/InputInfo 0.1"]

45− exportMetaObjectRevisions: [0]

46− Enum {

47− name: "InputType"

48− values: {

49− "Unknown": 0,

50− "Button": 1,

51− "Mouse": 2,

52− "TouchPad": 4,

53− "TouchScreen": 8,

54− "Keyboard": 16,

55− "Switch": 32

56− }

57− }

58− Enum {

59− name: "InputTypeFlags"

60− values: {

61− "Unknown": 0,

62− "Button": 1,

63− "Mouse": 2,

64− "TouchPad": 4,

65− "TouchScreen": 8,

66− "Keyboard": 16,

67− "Switch": 32

68− }

69− }

70− }

71−}

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux.cpp+7−2

@@ -44,6 +44,7 @@

4444#include <libudev.h>

4545#include <libevdev/libevdev.h>

4646#include <fcntl.h>

47+#include <unistd.h>

4748#include <QDebug>

4849#include <QSocketNotifier>

4950#include <QTimer>

@@ -52,6 +53,7 @@

5253QInputDeviceManagerPrivate::QInputDeviceManagerPrivate(QObject *parent) :

5354 QObject(parent),

5455 currentFilter(QInputDevice::Unknown),

56+ udevMonitor(0),

5557 udevice(0)

5658{

5759 QTimer::singleShot(250,this,SLOT(init()));

@@ -83,9 +85,9 @@ void QInputDeviceManagerPrivate::init()

8385 udev_enumerate_add_match_subsystem(enumerate, subsystem.toLatin1());

8486

8587 udev_monitor_enable_receiving(udevMonitor);

86− notifierFd = udev_monitor_get_fd(udevMonitor);

88+ int notifierFd = udev_monitor_get_fd(udevMonitor);

8789

88− notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);

90+ QSocketNotifier *notifier = new QSocketNotifier(notifierFd, QSocketNotifier::Read, this);

8991 connect(notifier, SIGNAL(activated(int)), this, SLOT(onUDevChanges()));

9092

9193 udev_enumerate_scan_devices(enumerate);

@@ -168,6 +170,7 @@ QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)

168170 rc = libevdev_new_from_fd(fd, &dev);

169171 if (rc < 0) {

170172 qWarning() << "Failed to init libevdev ("<< strerror(-rc) << ")";

173+ close(fd);

171174 return Q_NULLPTR;

172175 }

173176

@@ -195,6 +198,8 @@ QInputDevice *QInputDeviceManagerPrivate::addDevice(struct udev_device *udev)

195198 }

196199 }

197200

201+ libevdev_free(dev);

202+ close(fd);

198203 return inputDevice;

199204}

200205

plugins/Unity/InputInfo/linux/qinputdeviceinfo_linux_p.h−2

@@ -83,8 +83,6 @@ private:

8383

8484 QInputDevice *addDevice(const QString &path);

8585 void removeDevice(const QString &path);

86− QSocketNotifier *notifier;

87− int notifierFd;

8886 struct udev_monitor *udevMonitor;

8987 QInputDevice::InputTypeFlags getInputTypeFlags(struct udev_device *);

9088 struct udev *udevice;

plugins/Unity/InputInfo/plugin.h+1−1

@@ -24,7 +24,7 @@ class InputInfoPlugin : public QQmlExtensionPlugin

2424 Q_OBJECT

2525 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

2626public:

27− void registerTypes(const char *uri);

27+ void registerTypes(const char *uri) override;

2828};

2929

3030#endif // INPUTINFO_PLUGIN_H

plugins/Unity/InputInfo/qdeclarativeinputdevicemodel_p.h+3−3

@@ -69,8 +69,8 @@ public:

6969 explicit QDeclarativeInputDeviceModel(QObject *parent = 0);

7070 virtual ~QDeclarativeInputDeviceModel();

7171

72− QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;

73− int rowCount(const QModelIndex &parent = QModelIndex()) const;

72+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

73+ int rowCount(const QModelIndex &parent = QModelIndex()) const override;

7474

7575 void setDeviceFilter(QInputDevice::InputType filter);

7676 QInputDevice::InputType deviceFilter();

@@ -78,7 +78,7 @@ public:

7878 Q_INVOKABLE int indexOf(const QString &devicePath) const;

7979

8080 Q_INVOKABLE QInputDevice *get(int index) const;

81− QHash<int, QByteArray> roleNames() const;

81+ QHash<int, QByteArray> roleNames() const override;

8282

8383Q_SIGNALS:

8484 void deviceAdded(const QString &devicePath);

plugins/Unity/Launcher/CMakeLists.txt+3−1

@@ -1,4 +1,4 @@

1−pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)

1+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)

22pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)

44add_definitions(-DSM_BUSNAME=systemBus)

@@ -23,6 +23,8 @@ set(QMLLAUNCHERPLUGIN_SRC

2323 asadapter.cpp

2424 ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp

2525 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h

26+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

27+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h

2628 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h

2729 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h

2830 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h

plugins/Unity/Launcher/Launcher.qmltypesdeleted−182

@@ -1,182 +0,0 @@

1−import QtQuick.tooling 1.1

2−

3−// This file describes the plugin-supplied types contained in the library.

4−// It is used for QML tooling purposes only.

5−//

6−// This file was auto-generated by:

7−// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins'