Skip to content

feat: replace kernel file with udev for touchpad control #987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fly602 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: replace kernel file with udev for touchpad control #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions common/systemdunit/transientunit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,16 @@ func (t *TransientUnit) WaitforFinish(sigLoop *dbusutil.SignalLoop) bool {
return false
}
t.unit.InitSignalExt(sigLoop, true)
var result = make(chan string)
var result = make(chan string, 1) // buffered channel to prevent blocking
t.unit.ConnectPropertiesChanged(func(interfaceName string, changedProperties map[string]dbus.Variant, invalidatedProperties []string) {
_, ok := changedProperties["ActiveState"]
if ok {
val := changedProperties["ActiveState"].String()
result <- val
select {
case result <- val:
default:
// channel is full or closed, skip this update
}
}
})
defer func() {
Expand Down
10 changes: 8 additions & 2 deletions inputdevices1/ifc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
package inputdevices

import (
"fmt"

"github.com/godbus/dbus/v5"
langselector "github.com/linuxdeepin/dde-daemon/langselector1"
"github.com/linuxdeepin/go-lib/dbusutil"
Expand All @@ -31,8 +33,12 @@ func (tpad *Touchpad) Reset() *dbus.Error {
}

func (tpad *Touchpad) Enable(enabled bool) *dbus.Error {
tpad.enable(enabled)
return nil
sysTP := tpad.sysTouchPad
if sysTP != nil {
return dbusutil.ToError(sysTP.SetTouchpadEnable(0, enabled))
} else {
return dbusutil.ToError(fmt.Errorf("system touchpad is nul"))
}
}

func (w *Wacom) Reset() *dbus.Error {
Expand Down
13 changes: 13 additions & 0 deletions inputdevices1/inputdevices_dbusutil.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions inputdevices1/mouse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (m *Mouse) init() {
tpad := m.touchPad

if !m.Exist {
if tpad.Exist && tpad.TPadEnable.Get() {
if tpad.Exist && tpad.TPadEnable {
tpad.setDisableTemporary(false)
}
return
Expand All @@ -107,7 +107,7 @@ func (m *Mouse) init() {
m.enableAdaptiveAccelProfile()
m.motionAcceleration()
m.motionThreshold()
if m.DisableTpad.Get() && tpad.TPadEnable.Get() {
if m.DisableTpad.Get() && tpad.TPadEnable {
m.disableTouchPad()
}
}
Expand Down
129 changes: 65 additions & 64 deletions inputdevices1/touchpad.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,14 @@ const (
)

type Touchpad struct {
service *dbusutil.Service
PropsMu sync.RWMutex
Exist bool
DeviceList string
service *dbusutil.Service
PropsMu sync.RWMutex
sysTouchPad inputdevices.Touchpad
Exist bool
DeviceList string

// dbusutil-gen: ignore-below
TPadEnable dconfig.Bool `prop:"access:rw"`
TPadEnable bool `prop:"access:rw"` // 通过监听 system 端 Enable 属性动态更新，不使用 dconfig
LeftHanded dconfig.Bool `prop:"access:rw"`
DisableIfTyping dconfig.Bool `prop:"access:rw"`
NaturalScroll dconfig.Bool `prop:"access:rw"`
Expand Down Expand Up @@ -98,7 +99,6 @@ func newTouchpad(service *dbusutil.Service) *Touchpad {
panic("Touchpad DConfig initialization failed - cannot continue without dconfig support")
}

tpad.TPadEnable.Bind(tpad.dsgTouchpadConfig, dconfigKeyTouchpadEnabled)
tpad.LeftHanded.Bind(tpad.dsgTouchpadConfig, dconfigKeyTouchpadLeftHanded)
tpad.DisableIfTyping.Bind(tpad.dsgTouchpadConfig, dconfigKeyTouchpadDisableTyping)
tpad.NaturalScroll.Bind(tpad.dsgTouchpadConfig, dconfigKeyTouchpadNaturalScroll)
Expand All @@ -117,18 +117,47 @@ func newTouchpad(service *dbusutil.Service) *Touchpad {
tpad.DoubleClick.Bind(tpad.dsgMouseConfig, dconfigKeyDoubleClick)
tpad.DragThreshold.Bind(tpad.dsgMouseConfig, dconfigKeyDragThreshold)

// TODO: treeland环境暂不支持
if hasTreeLand {
return tpad
}
tpad.updateDXTpads()

if conn, err := dbus.SystemBus(); err != nil {
logger.Warning(err)
} else {
tpad.systemConn = conn
tpad.systemSigLoop = dbusutil.NewSignalLoop(conn, 10)
tpad.sysTouchPad, err = inputdevices.NewTouchpad(tpad.systemConn, "/org/deepin/dde/InputDevices1/Touchpad")
if err != nil {
logger.Warning(err)
} else {
// 在这里注册信号监听，避免 init 中重复注册
tpad.sysTouchPad.InitSignalExt(tpad.systemSigLoop, true)
tpad.sysTouchPad.Enable().ConnectChanged(func(hasValue bool, value bool) {
if !hasValue {
return
}
logger.Infof("System touchpad Enable changed: %v", value)
tpad.enable(value)
})
// 因为通过udev禁用触控板时， libinput感知不到触控板，通过系统touchpad查询是否存在触控板设备
tpad.sysTouchPad.DeviceList().ConnectChanged(func(hasValue bool, value []string) {
if !hasValue {
return
}
logger.Infof("System touchpad DeviceList changed: %v", value)
if !tpad.TPadEnable {
if len(value) == 0 {
tpad.setPropExist(false)
} else {
tpad.setPropExist(true)
}
}
})
tpad.systemSigLoop.Start()
tpad.TPadEnable, _ = tpad.sysTouchPad.Enable().Get(0)
}
}
// TODO: treeland环境暂不支持
if hasTreeLand {
return tpad
}
tpad.updateDXTpads()

return tpad
}
Expand Down Expand Up @@ -180,28 +209,15 @@ func (tpad *Touchpad) init() {
return
}

if tpad.systemConn != nil {
sysTouchPad, err := inputdevices.NewTouchpad(tpad.systemConn, "/org/deepin/dde/InputDevices1/Touchpad")
if err != nil {
// 从 system 端获取初始状态
if tpad.sysTouchPad != nil {
if enabled, err := tpad.sysTouchPad.Enable().Get(0); err != nil {
logger.Warning(err)
} else {
sysTouchPad.InitSignalExt(tpad.systemSigLoop, true)
sysTouchPad.Enable().ConnectChanged(func(hasValue bool, value bool) {
if !hasValue {
return
}
tpad.enable(value)
})
if enabled, err := sysTouchPad.Enable().Get(0); err != nil {
logger.Warning(err)
} else {
tpad.TPadEnable.Set(enabled)
}
tpad.setPropTPadEnable(enabled)
}
}

currentState := tpad.TPadEnable.Get()
tpad.forceEnable(currentState)
tpad.enableLeftHanded()
tpad.enableNaturalScroll()
tpad.enableEdgeScroll()
Expand All @@ -213,10 +229,6 @@ func (tpad *Touchpad) init() {
tpad.disableWhileTyping()
tpad.enablePalmDetect()
tpad.setPalmDimensions()

if tpad.systemSigLoop != nil {
tpad.systemSigLoop.Start()
}
}

func (tpad *Touchpad) handleDeviceChanged() {
Expand All @@ -238,44 +250,46 @@ func (tpad *Touchpad) updateDXTpads() {

tpad.PropsMu.Lock()
var v string
if len(tpad.devInfos) == 0 {
tpad.setPropExist(false)
if tpad.TPadEnable {
if len(tpad.devInfos) == 0 {
tpad.setPropExist(false)
} else {
tpad.setPropExist(true)
v = tpad.devInfos.string()
}
} else {
tpad.setPropExist(true)
v = tpad.devInfos.string()
if tpad.sysTouchPad != nil {
sysTpList, _ := tpad.sysTouchPad.DeviceList().Get(0)
tpad.setPropExist(len(sysTpList) > 0)
}
}

tpad.setPropDeviceList(v)
tpad.PropsMu.Unlock()
}

// 受鼠标禁用触控板影响，临时关闭触控板
func (tpad *Touchpad) setDisableTemporary(disable bool) {
if disable == tpad.disableTemporary {
return
}
if len(tpad.devInfos) > 0 {
for _, v := range tpad.devInfos {
err := v.Enable(!disable && tpad.TPadEnable.Get())
err := v.Enable(!disable && tpad.TPadEnable)
if err != nil {
logger.Warningf("Enable '%v - %v' failed: %v",
v.Id, v.Name, err)
}
}
}
tpad.disableTemporary = disable
}

func (tpad *Touchpad) enable(enabled bool) {
if enabled == tpad.TPadEnable.Get() {
if enabled == tpad.TPadEnable {
return
}
tpad.forceEnable(enabled)
}

func (tpad *Touchpad) forceEnable(enabled bool) {
if len(tpad.devInfos) > 0 {
// 禁用时有system 的touchpad设置
// 重新开启时，需要考虑插入鼠标时禁用触控板
if len(tpad.devInfos) > 0 && enabled {
for _, v := range tpad.devInfos {
err := v.Enable(!tpad.disableTemporary && enabled)
err := v.Enable(!tpad.disableTemporary)
if err != nil {
logger.Warningf("Enable '%v - %v' failed: %v",
v.Id, v.Name, err)
Expand All @@ -284,13 +298,7 @@ func (tpad *Touchpad) forceEnable(enabled bool) {
}

enableGesture(enabled)
tpad.TPadEnable.Set(enabled)
sysTouchPad, err := inputdevices.NewTouchpad(tpad.systemConn, "/org/deepin/dde/InputDevices1/Touchpad")
if err == nil && sysTouchPad != nil {
if err = sysTouchPad.SetTouchpadEnable(0, enabled); err != nil {
logger.Warning(err)
}
}
tpad.setPropTPadEnable(enabled)
}

func (tpad *Touchpad) enableLeftHanded() {
Expand Down Expand Up @@ -544,7 +552,7 @@ func enableGesture(enabled bool) {
return
}

dconfig.SetValue("dconfig", enabled)
dconfig.SetValue("touchpadEnabled", enabled)
}

func (tpad *Touchpad) initTouchpadDConfig() error {
Expand All @@ -562,13 +570,6 @@ func (tpad *Touchpad) initTouchpadDConfig() error {
tpad.dsgTouchpadConfig.ConnectValueChanged(func(key string) {
logger.Debugf("Touchpad dconfig value changed: %s", key)
switch key {
case dconfigKeyTouchpadEnabled:
enabled, err := tpad.dsgTouchpadConfig.GetValueBool(dconfigKeyTouchpadEnabled)
if err != nil {
logger.Warningf("Failed to get touchpad enabled value from dconfig: %v", err)
} else {
tpad.enable(enabled)
}
case dconfigKeyTouchpadLeftHanded:
tpad.enableLeftHanded()
case dconfigKeyTouchpadDisableTyping:
Expand Down
2 changes: 1 addition & 1 deletion system/inputdevices1/libinput.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func log_handler_go(priority C.enum_libinput_log_priority, cstr *C.char) {
case C.LIBINPUT_LOG_PRIORITY_INFO:
logger.Info(str)
case C.LIBINPUT_LOG_PRIORITY_ERROR:
logger.Error(str)
logger.Warning(str)
}
}

Expand Down
Loading