Differential D20186 Diff 57933 kcms/touchpad/src/backends/x11/libinputtouchpad.h

Changeset View

Standalone View

View Options

kcms/touchpad/src/backends/x11/libinputtouchpad.h

1/* 1​/*
2 * Copyright (C) 2015 Weng Xuetian <wengxt@gmail.com> 2​ * Copyright (C) 2019 Atul Bisht <atulbisht26@gmail.com>
3 * 3​ *
4 * This program is free software; you can redistribute it and/or modify 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 5​ * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation; either version 2 of the License, or 6​ * the Free Software Foundation; either version 2 of the License, or
7 * (at your option) any later version. 7​ * (at your option) any later version.
8 * 8​ *
9 * This program is distributed in the hope that it will be useful, 9​ * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10​ * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11​ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12​ * GNU General Public License for more details.
13 * 13​ *
14 * You should have received a copy of the GNU General Public License 14​ * You should have received a copy of the GNU General Public License
15 * along with this program; if not, write to the Free Software 15​ * along with this program; if not, write to the Free Software
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 16​ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 */ 17​ */
18 18​
19#ifndef LIBINPUTTOUCHPAD_H 19​#ifndef LIBINPUTTOUCHPAD_H
20#define LIBINPUTTOUCHPAD_H 20​#define LIBINPUTTOUCHPAD_H
21 21​
22​#include <QObject>
23​
22#include "xlibtouchpad.h" 24​#include "xlibtouchpad.h"
25​#include "backends/libinputcommon.h"
23 26​
24class LibinputTouchpad : public XlibTouchpad 27​class LibinputTouchpad : public LibinputCommon, public XlibTouchpad
25{ 28​{
29​ Q_OBJECT
30​
26public: 31​public:
27 LibinputTouchpad(Display *display, int deviceId); 32​ LibinputTouchpad(Display *display, int deviceId);
33​ ~LibinputTouchpad() override {}
34​
35​ bool getConfig() override;
36​ bool applyConfig() override;
37​ bool getDefaultConfig() override;
38​ bool isChangedConfig() override;
39​
40​private:
41​
42​ template<typename T>
43​ bool valueLoader(Prop<T> &prop);
44​
45​ template<typename T>
46​ QString valueWriter(const Prop<T> &prop);
47​
48​ //
49​ // general
50​ QString name() const override {
51​ return m_name;
52​ }
53​ bool supportsDisableEvents() const override {
54​ return m_supportsDisableEvents.avail && m_supportsDisableEvents.val;
romanggUnsubmitted
Not Done

Equivalent and more concise is:
return m_supportsDisableEvents.avail && m_supportsDisableEvents.val ;
For other getters below as well.

Long term try to not access the member variables from child class though. You could just have these functions in the parent class and just always check if avail is true before accessing the value. This will change the behavior on Wayland backend as well, but it should be fine (let's do this after release though to not risk regressions).

romangg: Equivalent and more concise is: `return m_supportsDisableEvents.avail &&…
55​ }
56​ bool isEnabled() const override {
57​ return !m_enabled.val;
romanggUnsubmitted
Not Done

Why is there the negation? Put the Enabled-related function in the parent class.

romangg: Why is there the negation? Put the Enabled-related function in the parent class.
atulbiAuthorUnsubmitted
Not Done

X provides property for the disabled, while Wayland provides property for enabled.

atulbi: X provides property for the disabled, while Wayland provides property for enabled.
58​ }
59​ void setEnabled(bool set) override {
60​ m_enabled.set(!set);
61​ }
62​ //
63​ // Tapping
64​ void setLmrTapButtonMap(bool set) override {
65​ m_lrmTapButtonMap.set(!set);
romanggUnsubmitted
Not Done

I get why you query the avail field of this and other properties in the X case and not the special property as on Wayland, but maybe there is a way to find a common approach for both?

Anyways stuff for after the release. It's fine this way at the moment.

romangg: I get why you query the avail field of this and other properties in the X case and not the…
66​ m_lmrTapButtonMap.set(set);
67​ }
68​ //
69​ // advanced
70​ bool supportsLeftHanded() const override {
71​ return m_leftHanded.avail;
72​ }
73​ bool supportsDisableEventsOnExternalMouse() const override {
74​ return m_supportsDisableEventsOnExternalMouse.avail && m_supportsDisableEventsOnExternalMouse.val;
75​ }
76​ bool supportsDisableWhileTyping() const override {
77​ return m_disableWhileTyping.avail;
78​ }
79​ bool supportsMiddleEmulation() const override {
80​ return m_middleEmulation.avail;
81​ }
82​ //
83​ // acceleration speed and profile
84​ bool supportsPointerAcceleration() const override {
85​ return m_pointerAcceleration.avail;
86​ }
87​ bool supportsPointerAccelerationProfileFlat() const override {
88​ return m_supportsPointerAccelerationProfileFlat.avail && m_supportsPointerAccelerationProfileFlat.val;
89​ }
90​ bool supportsPointerAccelerationProfileAdaptive() const override {
91​ return m_supportsPointerAccelerationProfileAdaptive.avail && m_supportsPointerAccelerationProfileAdaptive.val;
92​ }
93​ //
94​ // scrolling
95​ bool supportsNaturalScroll() const override {
96​ return m_naturalScroll.avail;
97​ }
98​ bool supportsHorizontalScrolling() const override {
99​ return true;
100​ }
101​ bool supportsScrollTwoFinger() const override {
102​ return m_supportsScrollTwoFinger.avail && m_supportsScrollTwoFinger.val;
103​ }
104​ bool supportsScrollEdge() const override {
105​ return m_supportsScrollEdge.avail && m_supportsScrollEdge.val;
106​ }
107​ bool supportsScrollOnButtonDown() const override {
108​ return m_supportsScrollOnButtonDown.avail && m_supportsScrollOnButtonDown.val;
109​ }
110​ //
111​ // click method
112​ bool supportsClickMethodAreas() const override {
113​ return m_supportsClickMethodAreas.avail && m_supportsClickMethodAreas.val;
114​ }
115​ bool supportsClickMethodClickfinger() const override {
116​ return m_supportsClickMethodClickfinger.avail && m_supportsClickMethodClickfinger.val;
117​ }
118​
119​ // Tapping
120​ Prop<bool> m_lrmTapButtonMapEnabledByDefault = Prop<bool>("lrmTapButtonMapEnabledByDefault");
121​ Prop<bool> m_lrmTapButtonMap = Prop<bool>("lrmTapButtonMap");
122​ //
123​ // advanced
124​ Prop<bool> m_disableEventsOnExternalMouse = Prop<bool>("disableEventsOnExternalMouse");
125​ Prop<bool> m_disableEventsOnExternalMouseDefault = Prop<bool>("disableEventsOnExternalMouseDefault");
126​
127​ QString m_name;
28}; 128​};
29 129​
30#endif // LIBINPUTTOUCHPAD_H 130​#endif // LIBINPUTTOUCHPAD_H