diff options
| author | Adam Jackson <ajax@redhat.com> | 2019-10-16 14:41:20 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2019-10-30 16:17:04 +0000 |
| commit | 43fc5307804edc9a09e7ad8794a02b5e18c4f9db (patch) | |
| tree | f05a98104a99baf43215367f604c65f72ac2cee2 /include | |
| parent | 2d1ed64d2aedb1af5476ba011bbd36ddcf00c311 (diff) | |
include: Move some input-related default #defines to input.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/input.h | 22 | ||||
| -rw-r--r-- | include/site.h | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/include/input.h b/include/input.h index b658e9989..e57de626d 100644 --- a/include/input.h +++ b/include/input.h @@ -59,6 +59,28 @@ SOFTWARE. #include "os.h" #include <X11/extensions/XI2.h> +#define DEFAULT_KEYBOARD_CLICK 0 +#define DEFAULT_BELL 50 +#define DEFAULT_BELL_PITCH 400 +#define DEFAULT_BELL_DURATION 100 +#define DEFAULT_AUTOREPEAT TRUE +#define DEFAULT_AUTOREPEATS {\ + 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\ + 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} + +#define DEFAULT_LEDS 0x0 /* all off */ +#define DEFAULT_LEDS_MASK 0xffffffff /* 32 */ +#define DEFAULT_INT_RESOLUTION 1000 +#define DEFAULT_INT_MIN_VALUE 0 +#define DEFAULT_INT_MAX_VALUE 100 +#define DEFAULT_INT_DISPLAYED 0 + +#define DEFAULT_PTR_NUMERATOR 2 +#define DEFAULT_PTR_DENOMINATOR 1 +#define DEFAULT_PTR_THRESHOLD 4 + #define DEVICE_INIT 0 #define DEVICE_ON 1 #define DEVICE_OFF 2 diff --git a/include/site.h b/include/site.h index 524b8547d..c9dc2d202 100644 --- a/include/site.h +++ b/include/site.h @@ -51,28 +51,6 @@ SOFTWARE. * The following constants contain default values for all of the variables * that can be initialized on the server command line or in the environment. */ -#define DEFAULT_KEYBOARD_CLICK 0 -#define DEFAULT_BELL 50 -#define DEFAULT_BELL_PITCH 400 -#define DEFAULT_BELL_DURATION 100 -#define DEFAULT_AUTOREPEAT TRUE -#define DEFAULT_AUTOREPEATS {\ - 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\ - 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,\ - 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} - -#define DEFAULT_LEDS 0x0 /* all off */ -#define DEFAULT_LEDS_MASK 0xffffffff /* 32 */ -#define DEFAULT_INT_RESOLUTION 1000 -#define DEFAULT_INT_MIN_VALUE 0 -#define DEFAULT_INT_MAX_VALUE 100 -#define DEFAULT_INT_DISPLAYED 0 - -#define DEFAULT_PTR_NUMERATOR 2 -#define DEFAULT_PTR_DENOMINATOR 1 -#define DEFAULT_PTR_THRESHOLD 4 - #define DEFAULT_SCREEN_SAVER_TIME (10 * (60 * 1000)) #define DEFAULT_SCREEN_SAVER_INTERVAL (10 * (60 * 1000)) #define DEFAULT_SCREEN_SAVER_BLANKING PreferBlanking |