Skip to content

Remove unnecessary WCM_PAD flag and clean up WCM_LCD #366

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

Merged
Pinglinux merged 2 commits into from
Oct 15, 2025
+0 −64
Merged

Remove unnecessary WCM_PAD flag and clean up WCM_LCD #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
141452b
Remove hardcoded TabletSetFeature(common, WCM_LCD)
Sep 25, 2025
f5469a8
Remove hardcoded TabletSetFeature(common, WCM_PAD)
Sep 30, 2025
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
63 changes: 0 additions & 63 deletions src/wcmConfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,8 +729,6 @@ static void wcmSpecialTypeKeys(WacomCommonPtr common)
case 0x398: /* MobileStudio Pro 13 */
case 0x399: /* MobileStudio Pro 16 */
case 0x3AA: /* MobileStudio Pro 16 */
TabletSetFeature(common, WCM_LCD);
_fallthrough_;
case 0x357: /* Intuos Pro 2 M */
case 0x358: /* Intuos Pro 2 L */
case 0x360: /* Intuos Pro 2 M (Bluetooth) */
Expand Down Expand Up @@ -774,38 +772,13 @@ static void wcmSpecialTypeKeys(WacomCommonPtr common)
TabletSetFeature(common, WCM_DUALINPUT);
break;

/* P4 display tablets */
case 0x30: /* PL400 */
case 0x31: /* PL500 */
case 0x32: /* PL600 */
case 0x33: /* PL600SX */
case 0x34: /* PL550 */
case 0x35: /* PL800 */
case 0x37: /* PL700 */
case 0x38: /* PL510 */
case 0x39: /* PL710 */
case 0x3A: /* DTI520 */
case 0xC0: /* DTF720 */
case 0xC2: /* DTF720a */
case 0xC4: /* DTF521 */
case 0xC7: /* DTU1931 */
case 0xCE: /* DTU2231 */
case 0xF0: /* DTU1631 */

/* Wacom One display tablet */
case 0x3A6: /* DTC133 */
TabletSetFeature(common, WCM_LCD);
break;

/* tablets support menu strips */
case 0x3F: /* CintiqV5 */
case 0xC5: /* CintiqV5 */
case 0xC6: /* CintiqV5 */
case 0xCC: /* CinitqV5 */
case 0xFA: /* Cintiq 22HD */
case 0x5B: /* Cintiq 22HDT Pen */
TabletSetFeature(common, WCM_LCD);
_fallthrough_;
case 0xB0: /* I3 */
case 0xB1: /* I3 */
case 0xB2: /* I3 */
Expand Down Expand Up @@ -858,36 +831,6 @@ static void wcmSpecialTypeKeys(WacomCommonPtr common)
case 0x3AE:/* Cintiq 16 */
case 0x3B0:/* DTK-1660E */
TabletSetFeature(common, WCM_ROTATION);
_fallthrough_;
case 0xF6: /* Cintiq 24HDT Touch */
case 0x57: /* DTK2241 */
case 0x59: /* DTH2242 Pen */
case 0x5D: /* DTH2242 Touch */
case 0x5E: /* Cintiq 22HDT Touch */
case 0x309:/* Cintiq Companion Hybrid Touch */
case 0x30C:/* Cintiq Companion Touch */
case 0x326:/* Cintiq Companion 2 Touch */
case 0x32C:/* Cintiq 27QHDT Touch */
case 0x32F:/* DTU-1031X */
case 0x335:/* Cintiq 13HDT Touch */
case 0x336:/* DTU-1141 */
case 0x343:/* DTK-1651 */
case 0x34A:/* MobileStudio Pro 13 Touch */
case 0x34B:/* MobileStudio Pro 16 Touch */
case 0x353:/* Cintiq Pro 13 FHD Touch */
case 0x354:/* Cintiq Pro 13 UHD Touch */
case 0x355:/* Cintiq Pro 24 Touch */
case 0x356:/* Cintiq Pro 32 Touch */
case 0x359:/* DTU-1141B */
case 0x35A:/* DTH-1152*/
case 0x368:/* DTH-1152 Touch */
case 0x382:/* DTK-2451 */
case 0x37D:/* DTH-2452 */
case 0x37E:/* DTH-2452 Touch */
case 0x39A:/* MobileStudio Pro 13 Touch */
case 0x39B:/* MobileStudio Pro 16 Touch */
case 0x3AC:/* MobileStudio Pro 16 Touch */
TabletSetFeature(common, WCM_LCD);
break;
}
}
Expand All @@ -908,12 +851,6 @@ static void wcmDeviceTypeKeys(WacomDevicePtr priv)
if (ISBITSET(common->wcmKeys, BTN_TOOL_PEN))
TabletSetFeature(priv->common, WCM_PEN);

if (ISBITSET (common->wcmKeys, BTN_0) ||
ISBITSET (common->wcmKeys, BTN_FORWARD))
{
TabletSetFeature(priv->common, WCM_PAD);
}

/* This handles both protocol 4 and 5 meanings of wcmKeys */
if (common->wcmProtocolLevel == WCM_PROTOCOL_4)
{
Expand Down
1 change: 0 additions & 1 deletion src/xf86WacomDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ struct _WacomModel
/* Each tablet may have one or more of the following
* features */
#define WCM_PEN 0x00000001 /* Tablet supports pens */
#define WCM_PAD 0x00000002 /* Has a pad tool */

#define WCM_1FGT 0x00000004 /* One finger touch */
#define WCM_2FGT 0x00000008 /* Two finger touch */
Expand Down