aboutsummaryrefslogtreecommitdiff
path: root/src/emuMB.c
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-09-26 13:47:24 +0930
committerPeter Hutterer <peter.hutterer@redhat.com>2008-09-30 12:24:03 +0930
commita77c2622cc7979cea6c1549f1978fae575b76c6c (patch)
treeddf944cc2f5f83f4486ac3fa65f7a8b0b33545a9 /src/emuMB.c
parentUse new property API (no ConfigureDP, less args to ChangeDP) (diff)
downloadxf86-input-evdev-a77c2622cc7979cea6c1549f1978fae575b76c6c.tar.gz
xf86-input-evdev-a77c2622cc7979cea6c1549f1978fae575b76c6c.tar.bz2
xf86-input-evdev-a77c2622cc7979cea6c1549f1978fae575b76c6c.zip
Add evdev-properties.h file with #defines for all property names.
Diffstat (limited to 'src/emuMB.c')
-rw-r--r--src/emuMB.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/emuMB.c b/src/emuMB.c
index 7456117..3235be4 100644
--- a/src/emuMB.c
+++ b/src/emuMB.c
@@ -39,6 +39,7 @@
#include <xf86Xinput.h>
#include <exevents.h>
+#include <evdev-properties.h>
#include "evdev.h"
enum {
@@ -48,12 +49,8 @@ enum {
};
#ifdef HAVE_PROPERTIES
-static const char *propname_mbemu = "Middle Button Emulation";
-static const char *propname_mbtimeout = "Middle Button Timeout";
-
static Atom prop_mbemu = 0; /* Middle button emulation on/off property */
static Atom prop_mbtimeout = 0; /* Middle button timeout property */
-
#endif
/*
* Lets create a simple finite-state machine for 3 button emulation:
@@ -367,7 +364,7 @@ EvdevMBEmuInitProperty(DeviceIntPtr dev)
if (!dev->button) /* don't init prop for keyboards */
return;
- prop_mbemu = MakeAtom((char*)propname_mbemu, strlen(propname_mbemu), TRUE);
+ prop_mbemu = MakeAtom(EVDEV_PROP_MIDBUTTON, strlen(EVDEV_PROP_MIDBUTTON), TRUE);
rc = XIChangeDeviceProperty(dev, prop_mbemu, XA_INTEGER, 8,
PropModeReplace, 1,
&pEvdev->emulateMB.enabled,
@@ -376,8 +373,8 @@ EvdevMBEmuInitProperty(DeviceIntPtr dev)
return;
XISetDevicePropertyDeletable(dev, prop_mbemu, FALSE);
- prop_mbtimeout = MakeAtom((char*)propname_mbtimeout,
- strlen(propname_mbtimeout),
+ prop_mbtimeout = MakeAtom(EVDEV_PROP_MIDBUTTON_TIMEOUT,
+ strlen(EVDEV_PROP_MIDBUTTON_TIMEOUT),
TRUE);
rc = XIChangeDeviceProperty(dev, prop_mbtimeout, XA_INTEGER, 16, PropModeReplace, 1,
&pEvdev->emulateMB.timeout, FALSE);