fix: 解决PS鼠标类型的触控板引起的崩溃问题

解决PS鼠标类型的触控板引起的崩溃问题 Log: 解决PS鼠标类型的触控板引起的崩溃问题 pms: BUG-298693
linuxdeepin · Jan 7, 2025 · 8f2560a · 8f2560a
1 parent 2620c0f
commit 8f2560a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/dxinput/touchpad.go b/dxinput/touchpad.go
@@ -53,14 +53,18 @@ func NewTouchpad(id int32) (*Touchpad, error) {
 }
 
 func NewTouchpadFromDevInfo(dev *DeviceInfo) (*Touchpad, error) {
-	if dev == nil || dev.Type != DevTypeTouchpad {
+	if dev == nil || (dev.Type != DevTypeTouchpad && dev.Type != DevTypeMouse) {
 		return nil, fmt.Errorf("Not a touchpad device(%d - %s)", dev.Id, dev.Name)
 	}
 
+	isLibinputUsed := utils.IsPropertyExist(dev.Id, libinputPropTapEnabled)
+	if !isLibinputUsed && dev.Type == DevTypeMouse {
+		isLibinputUsed = utils.IsPropertyExist(dev.Id, libinputPropButtonScrollingButton)
+	}
 	return &Touchpad{
 		Id:             dev.Id,
 		Name:           dev.Name,
-		isLibinputUsed: utils.IsPropertyExist(dev.Id, libinputPropTapEnabled),
+		isLibinputUsed: isLibinputUsed,
 	}, nil
 }
 

diff --git a/dxinput/utils/list.c b/dxinput/utils/list.c
@@ -51,7 +51,8 @@ list_device(int* num)
     DeviceInfo* devs = NULL;
     for (i = 0; i < all_num; i++) {
         if ((xinfos[i].use != XISlavePointer &&
-                xinfos[i].use != XISlaveKeyboard)) {
+                xinfos[i].use != XISlaveKeyboard &&
+                xinfos[i].use != XIFloatingSlave)) {
             continue;
         }