Differential D26858 Diff 74241 src/server/tablet_interface.cpp

Changeset View

Standalone View

View Options

src/server/tablet_interface.cpp

  • This file was added.
1​/********************************************************************
2​Copyright 2019 Aleix Pol Gonzalez <aleixpol@kde.org>
3​
4​This library is free software; you can redistribute it and/or
5​modify it under the terms of the GNU Lesser General Public
6​License as published by the Free Software Foundation; either
7​version 2.1 of the License, or (at your option) version 3, or any
8​later version accepted by the membership of KDE e.V. (or its
9​successor approved by the membership of KDE e.V.), which shall
10​act as a proxy defined in Section 6 of version 3 of the license.
11​
12​This library is distributed in the hope that it will be useful,
13​but WITHOUT ANY WARRANTY; without even the implied warranty of
14​MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15​Lesser General Public License for more details.
16​
17​You should have received a copy of the GNU Lesser General Public
18​License along with this library. If not, see <http://www.gnu.org/licenses/>.
19​*********************************************************************/
20​#include "tablet_interface.h"
21​#include "resource_p.h"
22​#include "seat_interface.h"
23​#include "display.h"
24​#include "surface_interface.h"
25​
26​#include <QHash>
27​#include "qwayland-server-tablet-unstable-v2.h"
28​
29​using namespace KWayland;
30​using namespace Server;
31​
32​static int s_version = 1;
33​
34​class TabletInterface::Private : public QtWaylandServer::zwp_tablet_v2
35​{
36​public:
37​ Private(uint32_t vendorId, uint32_t productId, const QString name, const QStringList &paths)
38​ : zwp_tablet_v2()
39​ , m_vendorId(vendorId)
40​ , m_productId(productId)
41​ , m_name(name)
42​ , m_paths(paths)
43​ {}
44​
45​ wl_resource *resourceForSurface(SurfaceInterface *surface) const
46​ {
47​ ClientConnection *client = surface->client();
48​ QtWaylandServer::zwp_tablet_v2::Resource *r = resourceMap().value(*client);
49​ return r ? r->handle : nullptr;
50​ }
51​
52​ const uint32_t m_vendorId;
53​ const uint32_t m_productId;
54​ const QString m_name;
zzagUnsubmitted
Done

Align pointers to right.

zzag: Align pointers to right.
55​ const QStringList m_paths;
56​};
57​
58​TabletInterface::TabletInterface(uint32_t vendorId, uint32_t productId,
59​ const QString &name, const QStringList &paths,
davidedmundsonUnsubmitted
Not Done

This is still potentially crashy:
if all clients remove their tablet support we would have a dangling pointer in m_tablets.

Personally I would remove this delete q, and have the lifespan of TabletInterface managed up to TabletSeatInterface::removeTablet or TabletSeatInterface::~TabletSeatInterface()

even if it has no resources.

davidedmundson: This is still potentially crashy: if all clients remove their tablet support we would have a…
davidedmundsonUnsubmitted
Not Done

or if we do want to keep the TabletInterface around till clients gracefully remove their side
we should have some sort of if (resourcesMap.isEmpty() && isRemoved) {delete q}

davidedmundson: or if we do want to keep the TabletInterface around till clients gracefully remove their side…
60​ QObject *parent)
61​ : QObject(parent)
62​ , d(new Private(vendorId, productId, name, paths))
63​{
64​}
zzagUnsubmitted
Done

No auto.

zzag: No `auto`.
65​
66​TabletInterface::~TabletInterface() = default;
67​
68​bool TabletInterface::isSurfaceSupported(SurfaceInterface* surface) const
69​{
70​ return d->resourceForSurface(surface);
71​}
72​
73​class TabletToolInterface::Private : public QtWaylandServer::zwp_tablet_tool_v2
74​{
75​public:
76​ Private(Display *display, Type type, uint32_t hsh, uint32_t hsl, uint32_t hih,
77​ uint32_t hil, const QVector<Capability>& capabilities)
78​ : zwp_tablet_tool_v2()
79​ , m_display(display)
80​ , m_type(type)
81​ , m_hardwareSerialHigh(hsh)
82​ , m_hardwareSerialLow(hsl)
83​ , m_hardwareIdHigh(hih)
84​ , m_hardwareIdLow(hil)
85​ , m_capabilities(capabilities)
86​ {}
87​
88​ Display *const m_display;
89​
90​ wl_resource *targetResource() {
91​ ClientConnection *client = m_surface->client();
92​ const Resource *r = resourceMap().value(*client);
93​ return r ? r->handle : nullptr;
94​ }
95​
96​ quint64 hardwareSerial() const {
97​ return quint64(quint64(m_hardwareIdHigh) << 32) + m_hardwareIdLow;
98​ }
99​
100​ bool m_cleanup = false;
101​ QPointer<SurfaceInterface> m_surface;
102​ QPointer<TabletInterface> m_lastTablet;
103​ const uint32_t m_type;
104​ const uint32_t m_hardwareSerialHigh, m_hardwareSerialLow;
105​ const uint32_t m_hardwareIdHigh, m_hardwareIdLow;
106​ const QVector<Capability> m_capabilities;
107​};
108​
109​TabletToolInterface::TabletToolInterface(Display *display, Type type, uint32_t hsh,
110​ uint32_t hsl, uint32_t hih, uint32_t hil,
111​ const QVector<Capability>& capabilities,
112​ QObject *parent)
113​ : QObject(parent)
114​ , d(new Private(display, type, hsh, hsl, hih, hil, capabilities))
115​{}
116​
117​TabletToolInterface::~TabletToolInterface() = default;
118​
119​void TabletToolInterface::setCurrentSurface(SurfaceInterface *surface)
120​{
121​ if (d->m_surface == surface)
122​ return;
123​
124​ TabletInterface* const lastTablet = d->m_lastTablet;
125​ if (d->m_surface && d->resourceMap().contains(*d->m_surface->client())) {
126​ sendProximityOut();
127​ sendFrame(0);
128​ }
129​
130​ d->m_surface = surface;
131​
132​ if (lastTablet && lastTablet->d->resourceForSurface(surface)) {
133​ sendProximityIn(lastTablet);
134​ } else {
135​ d->m_lastTablet = lastTablet;
136​ }
137​}
138​
139​bool TabletToolInterface::isClientSupported() const
140​{
141​ return d->m_surface && d->targetResource();
142​}
143​
144​void TabletToolInterface::sendButton(uint32_t button, bool pressed)
145​{
146​ d->send_button(d->targetResource(), d->m_display->nextSerial(), button,
147​ pressed ? QtWaylandServer::zwp_tablet_tool_v2::button_state_pressed
148​ : QtWaylandServer::zwp_tablet_tool_v2::button_state_released);
149​}
150​
151​void TabletToolInterface::sendMotion(const QPointF& pos)
152​{
153​ d->send_motion(d->targetResource(), wl_fixed_from_double(pos.x()),
154​ wl_fixed_from_double(pos.y()));
155​}
156​
157​void TabletToolInterface::sendDistance(uint32_t distance)
158​{
159​ d->send_distance(d->targetResource(), distance);
160​}
161​
162​void TabletToolInterface::sendFrame(uint32_t time)
163​{
164​ d->send_frame(d->targetResource(), time);
165​
166​ if (d->m_cleanup) {
167​ d->m_surface = nullptr;
168​ d->m_lastTablet = nullptr;
169​ d->m_cleanup = false;
170​ }
171​}
172​
173​void TabletToolInterface::sendPressure(uint32_t pressure)
174​{
175​ d->send_pressure(d->targetResource(), pressure);
176​}
177​
178​void TabletToolInterface::sendRotation(qreal rotation)
179​{
180​ d->send_rotation(d->targetResource(), wl_fixed_from_double(rotation));
181​}
182​
183​void TabletToolInterface::sendSlider(int32_t position)
184​{
185​ d->send_slider(d->targetResource(), position);
186​}
187​
188​void TabletToolInterface::sendTilt(qreal degreesX, qreal degreesY)
189​{
190​ d->send_tilt(d->targetResource(), wl_fixed_from_double(degreesX),
191​ wl_fixed_from_double(degreesY));
192​}
193​
194​void TabletToolInterface::sendWheel(int32_t degrees, int32_t clicks)
195​{
196​ d->send_wheel(d->targetResource(), degrees, clicks);
197​}
198​
199​void TabletToolInterface::sendProximityIn(TabletInterface *tablet)
200​{
201​ wl_resource* tabletResource = tablet->d->resourceForSurface(d->m_surface);
202​ d->send_proximity_in(d->targetResource(), d->m_display->nextSerial(),
203​ tabletResource, d->m_surface->resource());
204​ d->m_lastTablet = tablet;
205​}
206​
207​void TabletToolInterface::sendProximityOut()
208​{
209​ d->send_proximity_out(d->targetResource());
210​ d->m_cleanup = true;
211​}
212​
213​void TabletToolInterface::sendDown()
214​{
215​ d->send_down(d->targetResource(), d->m_display->nextSerial());
216​}
217​
218​void TabletToolInterface::sendUp()
219​{
220​ d->send_up(d->targetResource());
221​}
222​
223​void TabletToolInterface::sendRemoved()
224​{
225​ for (QtWaylandServer::zwp_tablet_tool_v2::Resource *resource : d->resourceMap()) {
226​ d->send_removed(resource->handle);
227​ }
228​}
229​
230​class TabletSeatInterface::Private : public QtWaylandServer::zwp_tablet_seat_v2
231​{
232​public:
233​ Private(Display *display, TabletSeatInterface *q)
234​ : zwp_tablet_seat_v2()
235​ , q(q)
236​ , m_display(display)
237​ {
238​ }
zzagUnsubmitted
Done

Add braces.

zzag: Add braces.
239​
240​ void zwp_tablet_seat_v2_bind_resource(Resource *resource) override {
241​ for (auto iface : qAsConst(m_tablets)) {
242​ sendTabletAdded(resource, iface);
243​ }
244​
245​ for (auto *tool : qAsConst(m_tools)) {
246​ sendToolAdded(resource, tool);
247​ }
248​ }
249​
250​ void sendToolAdded(Resource *resource, TabletToolInterface *tool) {
251​ wl_resource *toolResource = tool->d->add(resource->client(), resource->version())->handle;
252​ send_tool_added(resource->handle, toolResource);
253​
254​ tool->d->send_type(toolResource, tool->d->m_type);
255​ tool->d->send_hardware_serial(toolResource, tool->d->m_hardwareSerialHigh,
256​ tool->d->m_hardwareSerialLow);
257​ tool->d->send_hardware_id_wacom(toolResource, tool->d->m_hardwareIdHigh,
258​ tool->d->m_hardwareIdLow);
259​ for (uint32_t cap : qAsConst(tool->d->m_capabilities)) {
260​ tool->d->send_capability(toolResource, cap);
261​ }
262​ tool->d->send_done(toolResource);
263​ }
264​ void sendTabletAdded(Resource *resource, TabletInterface *tablet) {
265​ wl_resource *tabletResource = tablet->d->add(resource->client(), resource->version())->handle;
266​ send_tablet_added(resource->handle, tabletResource);
267​
268​ tablet->d->send_name(tabletResource, tablet->d->m_name);
269​ if (tablet->d->m_vendorId && tablet->d->m_productId) {
270​ tablet->d->send_id(tabletResource, tablet->d->m_vendorId, tablet->d->m_productId);
271​ }
272​ for (const QString &path : qAsConst(tablet->d->m_paths)) {
273​ tablet->d->send_path(tabletResource, path);
274​ }
275​ tablet->d->send_done(tabletResource);
276​ }
277​
278​ TabletSeatInterface *const q;
279​ QVector<TabletToolInterface*> m_tools;
280​ QHash<QString, TabletInterface*> m_tablets;
281​ Display *const m_display;
282​};
283​
284​TabletSeatInterface::TabletSeatInterface(Display *display, QObject *parent)
285​ : QObject(parent)
286​ , d(new Private(display, this))
287​{
288​}
289​
290​TabletSeatInterface::~TabletSeatInterface() = default;
291​
292​TabletToolInterface *TabletSeatInterface::addTool(TabletToolInterface::Type type,
293​ quint64 hardwareSerial,
294​ quint64 hardwareId,
295​ const QVector<TabletToolInterface::Capability> &capabilities)
296​{
297​ constexpr auto MAX_UINT_32 = std::numeric_limits<quint32>::max();
298​ auto tool = new TabletToolInterface(d->m_display,
299​ type, hardwareSerial >> 32, hardwareSerial & MAX_UINT_32,
300​ hardwareId >> 32, hardwareId & MAX_UINT_32, capabilities, this);
301​ for (QtWaylandServer::zwp_tablet_seat_v2::Resource *resource : d->resourceMap()) {
302​ d->sendToolAdded(resource, tool);
303​ }
304​
305​ d->m_tools.append(tool);
306​ QObject::connect(tool, &QObject::destroyed, this,
307​ [this] (QObject *object) { d->m_tools.removeAll(static_cast<TabletToolInterface*>(object)); }
308​ );
309​ return tool;
310​}
311​
312​TabletInterface *TabletSeatInterface::addTablet(uint32_t vendorId, uint32_t productId,
313​ const QString &sysname,
314​ const QString &name,
315​ const QStringList &paths)
316​{
317​ auto iface = new TabletInterface(vendorId, productId, name, paths, this);
318​
319​ for (QtWaylandServer::zwp_tablet_seat_v2::Resource *r : d->resourceMap()) {
320​ d->sendTabletAdded(r, iface);
321​ }
322​
323​ d->m_tablets[sysname] = iface;
324​ QObject::connect(iface, &QObject::destroyed, this,
325​ [this, sysname] { d->m_tablets.remove(sysname); }
326​ );
327​ return iface;
328​}
329​
330​TabletToolInterface *TabletSeatInterface::toolByHardwareId(quint64 serialId) const
331​{
332​ for (TabletToolInterface *tool : d->m_tools) {
333​ if (tool->d->hardwareSerial() == serialId)
334​ return tool;
335​ }
336​ return nullptr;
337​}
338​
339​TabletInterface *TabletSeatInterface::tabletByName(const QString& name) const
340​{
341​ return d->m_tablets.value(name);
342​}
343​
344​class TabletManagerInterface::Private : public QtWaylandServer::zwp_tablet_manager_v2
345​{
346​public:
347​ Private(Display *display, TabletManagerInterface *q)
davidedmundsonUnsubmitted
Not Done

We're mixing up hardwareId and hardwareSerial

this method is called toolByHardwareId calls an internal method called hardwareSerial

Yet ultimately does check:
m_hardwareIdHigh

comparing it against a serial

davidedmundson: We're mixing up hardwareId and hardwareSerial this method is called toolByHardwareId calls an…
348​ : zwp_tablet_manager_v2(*display, s_version)
349​ , q(q)
350​ , m_display(display)
351​ {}
352​
353​ void zwp_tablet_manager_v2_get_tablet_seat(Resource *resource, uint32_t tablet_seat,
354​ struct ::wl_resource *seat_resource) override {
355​ SeatInterface* seat = SeatInterface::get(seat_resource);
356​ TabletSeatInterface *tsi = get(seat);
357​ tsi->d->add(resource->client(), tablet_seat, s_version);
358​ }
359​
360​ TabletSeatInterface *get(SeatInterface *seat)
361​ {
362​ TabletSeatInterface*& tabletSeat = m_seats[seat];
363​ if (!tabletSeat) {
364​ tabletSeat = new TabletSeatInterface(m_display, q);
365​ }
366​ return tabletSeat;
367​ }
zzagUnsubmitted
Done

Put a single space before *.

Display * const m_display;
zzag: Put a single space before `*`. ```lang=cpp Display * const m_display; ```
368​
369​ TabletManagerInterface *const q;
370​ Display *const m_display;
zzagUnsubmitted
Not Done

The opening brace must be on its own line.

zzag: The opening brace must be on its own line.
371​ QHash<SeatInterface*, TabletSeatInterface*> m_seats;
zzagUnsubmitted
Not Done
SeatInterface *seat = SeatInterface::get(seat_resource);
zzag: ```lang=cpp SeatInterface *seat = SeatInterface::get(seat_resource); ```
372​};
373​
374​TabletManagerInterface::TabletManagerInterface(Display *display, QObject *parent)
375​ : QObject(parent)
376​ , d(new Private(display, this))
377​{
378​}
379​
380​TabletSeatInterface *TabletManagerInterface::seat(SeatInterface *seat) const
381​{
382​ return d->get(seat);
383​}
384​
385​TabletManagerInterface::~TabletManagerInterface() = default;