Differential D15443 Diff 46752 src/server/seat_interface_p.h

Changeset View

Standalone View

View Options

src/server/seat_interface_p.h

Show All 40 Lines
41{ 41​{
42public: 42​public:
43 Private(SeatInterface *q, Display *d); 43​ Private(SeatInterface *q, Display *d);
44 void bind(wl_client *client, uint32_t version, uint32_t id) override; 44​ void bind(wl_client *client, uint32_t version, uint32_t id) override;
45 void sendCapabilities(wl_resource *r); 45​ void sendCapabilities(wl_resource *r);
46 void sendName(wl_resource *r); 46​ void sendName(wl_resource *r);
47 QVector<PointerInterface *> pointersForSurface(SurfaceInterface *surface) const; 47​ QVector<PointerInterface *> pointersForSurface(SurfaceInterface *surface) const;
48 QVector<KeyboardInterface *> keyboardsForSurface(SurfaceInterface *surface) const; 48​ QVector<KeyboardInterface *> keyboardsForSurface(SurfaceInterface *surface) const;
49 TouchInterface *touchForSurface(SurfaceInterface *surface) const; 49​ QVector<TouchInterface *> touchsForSurface(SurfaceInterface *surface) const;
50 DataDeviceInterface *dataDeviceForSurface(SurfaceInterface *surface) const; 50​ DataDeviceInterface *dataDeviceForSurface(SurfaceInterface *surface) const;
51 TextInputInterface *textInputForSurface(SurfaceInterface *surface) const; 51​ TextInputInterface *textInputForSurface(SurfaceInterface *surface) const;
52 void registerDataDevice(DataDeviceInterface *dataDevice); 52​ void registerDataDevice(DataDeviceInterface *dataDevice);
53 void registerTextInput(TextInputInterface *textInput); 53​ void registerTextInput(TextInputInterface *textInput);
54 void endDrag(quint32 serial); 54​ void endDrag(quint32 serial);
55 void cancelPreviousSelection(DataDeviceInterface *newlySelectedDataDevice); 55​ void cancelPreviousSelection(DataDeviceInterface *newlySelectedDataDevice);
56 56​
57 QString name; 57​ QString name;
▲ Show 20 Lines • Show All 77 Lines • ▼ Show 20 Line(s)133 struct Focus {
135 QMetaObject::Connection destroyConnection; 135​ QMetaObject::Connection destroyConnection;
136 quint32 serial = 0; 136​ quint32 serial = 0;
137 TextInputInterface *textInput = nullptr; 137​ TextInputInterface *textInput = nullptr;
138 }; 138​ };
139 Focus focus; 139​ Focus focus;
140 }; 140​ };
141 TextInput textInput; 141​ TextInput textInput;
142 142​
143​ // Touch related members
143 struct Touch { 144​ struct Touch {
144 struct Focus { 145​ struct Focus {
145 SurfaceInterface *surface = nullptr; 146​ SurfaceInterface *surface = nullptr;
146 TouchInterface *touch = nullptr; 147​ QVector<TouchInterface*> touchs;
davidedmundsonUnsubmitted
Not Done

touchs -> touches

davidedmundson: touchs -> touches
147 QMetaObject::Connection destroyConnection; 148​ QMetaObject::Connection destroyConnection;
148 QPointF offset = QPointF(); 149​ QPointF offset = QPointF();
149 }; 150​ };
150 Focus focus; 151​ Focus focus;
151 QVector<qint32> ids; 152​ QVector<qint32> ids;
152 }; 153​ };
153 Touch touchInterface; 154​ Touch globalTouch;
154 155​
155 struct Drag { 156​ struct Drag {
156 enum class Mode { 157​ enum class Mode {
157 None, 158​ None,
158 Pointer, 159​ Pointer,
159 Touch 160​ Touch
160 }; 161​ };
161 Mode mode = Mode::None; 162​ Mode mode = Mode::None;
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines