diff options
| author | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2012-06-12 18:59:43 +0000 |
|---|---|---|
| committer | Alexandr Shadchin <shadchin@cvs.openbsd.org> | 2012-06-12 18:59:43 +0000 |
| commit | 874fdc19e5d5dda393bb9371becd84c4d4fc5e34 (patch) | |
| tree | ef335514e58e2fa2881c7763c47c314eb1f21e48 /driver/xf86-input-synaptics/include | |
| parent | a379c2621fd06ff037401d8a10272140b9b81c0e (diff) | |
Update to xf86-input-synaptics 1.6.1
ok matthieu@
Diffstat (limited to 'driver/xf86-input-synaptics/include')
| -rw-r--r-- | driver/xf86-input-synaptics/include/Makefile.in | 4 | ||||
| -rw-r--r-- | driver/xf86-input-synaptics/include/synaptics-properties.h | 8 | ||||
| -rw-r--r-- | driver/xf86-input-synaptics/include/synaptics.h | 39 |
3 files changed, 30 insertions, 21 deletions
diff --git a/driver/xf86-input-synaptics/include/Makefile.in b/driver/xf86-input-synaptics/include/Makefile.in index 5b3b5aff9..583d61927 100644 --- a/driver/xf86-input-synaptics/include/Makefile.in +++ b/driver/xf86-input-synaptics/include/Makefile.in @@ -157,6 +157,8 @@ MANIFEST_TOOL = @MANIFEST_TOOL@ MAN_SUBSTS = @MAN_SUBSTS@ MISC_MAN_DIR = @MISC_MAN_DIR@ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@ +MTDEV_CFLAGS = @MTDEV_CFLAGS@ +MTDEV_LIBS = @MTDEV_LIBS@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ @@ -178,6 +180,8 @@ SHELL = @SHELL@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ VERSION = @VERSION@ +XI22_CFLAGS = @XI22_CFLAGS@ +XI22_LIBS = @XI22_LIBS@ XI_CFLAGS = @XI_CFLAGS@ XI_LIBS = @XI_LIBS@ XORG_CFLAGS = @XORG_CFLAGS@ diff --git a/driver/xf86-input-synaptics/include/synaptics-properties.h b/driver/xf86-input-synaptics/include/synaptics-properties.h index c550cefb4..ad7a50248 100644 --- a/driver/xf86-input-synaptics/include/synaptics-properties.h +++ b/driver/xf86-input-synaptics/include/synaptics-properties.h @@ -49,6 +49,9 @@ #define SYNAPTICS_PROP_TAP_DURATIONS "Synaptics Tap Durations" /* 8 bit (BOOL) */ +#define SYNAPTICS_PROP_CLICKPAD "Synaptics ClickPad" + +/* 8 bit (BOOL) */ #define SYNAPTICS_PROP_TAP_FAST "Synaptics Tap FastTap" /* 32 bit */ @@ -155,7 +158,10 @@ /* 32 bit, 4 values, left, right, top, bottom */ #define SYNAPTICS_PROP_AREA "Synaptics Area" +/* 32 bit, 4 values, left, right, top, buttom */ +#define SYNAPTICS_PROP_SOFTBUTTON_AREAS "Synaptics Soft Button Areas" + /* 32 Bit Integer, 2 values, horizontal hysteresis, vertical hysteresis */ #define SYNAPTICS_PROP_NOISE_CANCELLATION "Synaptics Noise Cancellation" -#endif /* _SYNAPTICS_PROPERTIES_H_ */ +#endif /* _SYNAPTICS_PROPERTIES_H_ */ diff --git a/driver/xf86-input-synaptics/include/synaptics.h b/driver/xf86-input-synaptics/include/synaptics.h index eee9c6eb2..3d4832fdd 100644 --- a/driver/xf86-input-synaptics/include/synaptics.h +++ b/driver/xf86-input-synaptics/include/synaptics.h @@ -29,36 +29,35 @@ * Used by driver and the shared memory configurator *****************************************************************************/ typedef enum { - RT_TAP = 0, /* Right top corner */ - RB_TAP, /* Right bottom corner */ - LT_TAP, /* Left top corner */ - LB_TAP, /* Left bottom corner */ - F1_TAP, /* Non-corner tap, one finger */ - F2_TAP, /* Non-corner tap, two fingers */ - F3_TAP, /* Non-corner tap, three fingers */ + RT_TAP = 0, /* Right top corner */ + RB_TAP, /* Right bottom corner */ + LT_TAP, /* Left top corner */ + LB_TAP, /* Left bottom corner */ + F1_TAP, /* Non-corner tap, one finger */ + F2_TAP, /* Non-corner tap, two fingers */ + F3_TAP, /* Non-corner tap, three fingers */ MAX_TAP } TapEvent; typedef enum { - F1_CLICK1 = 0, /* Click left, one finger */ - F2_CLICK1, /* Click left, two fingers */ - F3_CLICK1, /* Click left, three fingers */ + F1_CLICK1 = 0, /* Click left, one finger */ + F2_CLICK1, /* Click left, two fingers */ + F3_CLICK1, /* Click left, three fingers */ MAX_CLICK } ClickFingerEvent; -#define SYN_MAX_BUTTONS 12 /* Max number of mouse buttons */ +#define SYN_MAX_BUTTONS 12 /* Max number of mouse buttons */ #define SHM_SYNAPTICS 23947 -typedef struct _SynapticsSHM -{ - int version; /* Driver version */ +typedef struct _SynapticsSHM { + int version; /* Driver version */ /* Current device state */ - int x, y; /* actual x, y coordinates */ - int z; /* pressure value */ - int numFingers; /* number of fingers */ - int fingerWidth; /* finger width value */ - int left, right, up, down; /* left/right/up/down buttons */ + int x, y; /* actual x, y coordinates */ + int z; /* pressure value */ + int numFingers; /* number of fingers */ + int fingerWidth; /* finger width value */ + int left, right, up, down; /* left/right/up/down buttons */ Bool multi[8]; Bool middle; } SynapticsSHM; @@ -69,4 +68,4 @@ typedef struct _SynapticsSHM #define SBR_MIN 10 #define SBR_MAX 1000 -#endif /* _SYNAPTICS_H_ */ +#endif /* _SYNAPTICS_H_ */ |