public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wacom: add USB tablet support

Browse Source 
To be honest, it's more like "be less discriminating against USB tablets".
USB tablets usually get autodetected, device name is not necessary and defaulting to a serial touchscreen is a clear discrimination.
Unconditionally remapping buttons is generally not a good idea either.
Old defaults transformed into examples.
This commit is contained in:
Jan Malakhovski 2013-01-05 19:38:23 +00:00
parent a3ee9aac98
commit 4e64755b9d
1 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
modules/services/x11/hardware/wacom.nix
View File

@ -16,18 +16,41 @@ in
enable = mkOption { enable = mkOption {
default = false; default = false;
description = "Whether to enable the Wacom touchscreen/digitizer."; description = "Whether to enable the Wacom touchscreen/digitizer/tablet.";
}; };
device = mkOption { device = mkOption {
default = "/dev/ttyS0"; default = null;
description = "Device to use."; example = "/dev/ttyS0";
description = "Device to use. Set to null for autodetect (think USB tablet).";
}; };
forceDeviceType = mkOption { forceDeviceType = mkOption {
default = "ISDV4"; default = null;
example = null; example = "ISDV4";
description = "Some models (think touchscreen) require the device type to be specified."; description = "Some models (think touchscreen) require the device type to be specified. Set to null for autodetect (think USB tablet).";
};
stylusExtraConfig = mkOption {
default = "";
example = ''
Option "Button1" "2"
'';
description = "Lines to be added to Wacom_stylus InputDevice section.";
};
eraserExtraConfig = mkOption {
default = "";
example = ''
Option "Button2" "3"
'';
description = "Lines to be added to Wacom_eraser InputDevice section.";
};
cursorExtraConfig = mkOption {
default = "";
example = "";
description = "Lines to be added to Wacom_cursor InputDevice section.";
}; };
}; };
@ -44,8 +67,8 @@ in
services.xserver.serverLayoutSection = services.xserver.serverLayoutSection =
'' ''
InputDevice "Wacom_stylus" InputDevice "Wacom_stylus"
InputDevice "Wacom_cursor"
InputDevice "Wacom_eraser" InputDevice "Wacom_eraser"
InputDevice "Wacom_cursor"
''; '';
services.xserver.config = services.xserver.config =
@ -53,33 +76,40 @@ in
Section "InputDevice" Section "InputDevice"
Driver "wacom" Driver "wacom"
Identifier "Wacom_stylus" Identifier "Wacom_stylus"
Option "Device" "${cfg.device}" ${optionalString (cfg.device != null) ''
Option "Device" "${cfg.device}"
''}
Option "Type" "stylus" Option "Type" "stylus"
${optionalString (cfg.forceDeviceType != null) '' ${optionalString (cfg.forceDeviceType != null) ''
Option "ForceDevice" "${cfg.forceDeviceType}" Option "ForceDevice" "${cfg.forceDeviceType}"
''} ''}
Option "Button2" "3" ${cfg.stylusExtraConfig}
EndSection EndSection
Section "InputDevice" Section "InputDevice"
Driver "wacom" Driver "wacom"
Identifier "Wacom_eraser" Identifier "Wacom_eraser"
Option "Device" "${cfg.device}" ${optionalString (cfg.device != null) ''
Option "Device" "${cfg.device}"
''}
Option "Type" "eraser" Option "Type" "eraser"
${optionalString (cfg.forceDeviceType != null) '' ${optionalString (cfg.forceDeviceType != null) ''
Option "ForceDevice" "${cfg.forceDeviceType}" Option "ForceDevice" "${cfg.forceDeviceType}"
''} ''}
Option "Button1" "2" ${cfg.eraserExtraConfig}
EndSection EndSection
Section "InputDevice" Section "InputDevice"
Driver "wacom" Driver "wacom"
Identifier "Wacom_cursor" Identifier "Wacom_cursor"
Option "Device" "${cfg.device}" ${optionalString (cfg.device != null) ''
Option "Device" "${cfg.device}"
''}
Option "Type" "cursor" Option "Type" "cursor"
${optionalString (cfg.forceDeviceType != null) '' ${optionalString (cfg.forceDeviceType != null) ''
Option "ForceDevice" "${cfg.forceDeviceType}" Option "ForceDevice" "${cfg.forceDeviceType}"
''} ''}
${cfg.cursorExtraConfig}
EndSection EndSection
''; '';