debian/changelog | 11 + debian/patches/101_resolution_detect_option.patch | 133 ++++++++--------- debian/patches/118_quell_error_msg.patch | 42 ++--- debian/patches/124_syndaemon_events.patch | 32 +--- debian/patches/125_option_rec_revert.patch | 167 +++++++++++----------- 5 files changed, 191 insertions(+), 194 deletions(-)
New commits: commit 26289949bb2154434450c34c7883a438bfd3a392 Author: Maarten Lankhorst <maarten.lankho...@canonical.com> Date: Mon May 21 13:53:14 2012 +0200 Refresh patches for indentation changes * Merged from Debian unstable * Refreshed patches for indentation changes - 101_resolution_detect_option.patch - 118_quell_error_msg.patch - 124_syndaemon_events.patch - 125_option_rec_revert.patch diff --git a/debian/changelog b/debian/changelog index fe08970..3e27367 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +xserver-xorg-input-synaptics (1.6.1-1ubuntu1) UNRELEASED; urgency=low + + * Merged from Debian unstable + * Refreshed patches for indentation changes + - 101_resolution_detect_option.patch + - 118_quell_error_msg.patch + - 124_syndaemon_events.patch + - 125_option_rec_revert.patch + + -- Maarten Lankhorst <maarten.lankho...@canonical.com> Mon, 21 May 2012 13:50:48 +0200 + xserver-xorg-input-synaptics (1.6.1-1) unstable; urgency=low [ Julien Cristau ] diff --git a/debian/patches/101_resolution_detect_option.patch b/debian/patches/101_resolution_detect_option.patch index 4257ea1..7037952 100644 --- a/debian/patches/101_resolution_detect_option.patch +++ b/debian/patches/101_resolution_detect_option.patch @@ -1,8 +1,6 @@ -Index: xserver-xorg-input-synaptics/include/synaptics-properties.h -=================================================================== ---- xserver-xorg-input-synaptics.orig/include/synaptics-properties.h 2011-07-05 11:49:41.241347626 +0300 -+++ xserver-xorg-input-synaptics/include/synaptics-properties.h 2011-07-05 11:54:23.291347670 +0300 -@@ -140,6 +140,9 @@ +--- a/include/synaptics-properties.h ++++ b/include/synaptics-properties.h +@@ -143,6 +143,9 @@ #define SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR "Synaptics Pressure Motion Factor" /* 8 bit (BOOL) */ @@ -12,11 +10,9 @@ Index: xserver-xorg-input-synaptics/include/synaptics-properties.h #define SYNAPTICS_PROP_GRAB "Synaptics Grab Event Device" /* 8 bit (BOOL), 1 value, tap-and-drag */ -Index: xserver-xorg-input-synaptics/man/synaptics.man -=================================================================== ---- xserver-xorg-input-synaptics.orig/man/synaptics.man 2011-07-05 11:49:41.231347626 +0300 -+++ xserver-xorg-input-synaptics/man/synaptics.man 2011-07-05 11:54:23.291347670 +0300 -@@ -457,6 +457,18 @@ +--- a/man/synaptics.man ++++ b/man/synaptics.man +@@ -461,6 +461,18 @@ TapAndDragGesture option to false. Property: "Synaptics Gestures" . .TP @@ -35,7 +31,7 @@ Index: xserver-xorg-input-synaptics/man/synaptics.man .BI "Option \*qVertResolution\*q \*q" integer \*q Resolution of X coordinates in units/millimeter. The value is used together with HorizResolution to compensate unequal vertical and -@@ -898,6 +910,10 @@ +@@ -941,6 +953,10 @@ FLOAT, 2 values, min, max. .TP 7 @@ -46,92 +42,85 @@ Index: xserver-xorg-input-synaptics/man/synaptics.man .BI "Synaptics Grab Event Device" 8 bit (BOOL). -Index: xserver-xorg-input-synaptics/src/properties.c -=================================================================== ---- xserver-xorg-input-synaptics.orig/src/properties.c 2011-07-05 11:49:41.271347626 +0300 -+++ xserver-xorg-input-synaptics/src/properties.c 2011-07-05 11:54:23.291347670 +0300 -@@ -77,6 +77,7 @@ - Atom prop_coastspeed = 0; - Atom prop_pressuremotion = 0; +--- a/src/properties.c ++++ b/src/properties.c +@@ -87,6 +87,7 @@ + Atom prop_coastspeed = 0; + Atom prop_pressuremotion = 0; Atom prop_pressuremotion_factor = 0; -+Atom prop_resolution_detect = 0; - Atom prop_grab = 0; - Atom prop_gestures = 0; - Atom prop_capabilities = 0; -@@ -255,7 +256,7 @@ - fvalues[1] = para->press_motion_max_factor; - - prop_pressuremotion_factor = InitFloatAtom(pInfo->dev, SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR, 2, fvalues); -- -+ prop_resolution_detect = InitAtom(pInfo->dev, SYNAPTICS_PROP_RESOLUTION_DETECT, 8, 1, ¶->resolution_detect); - prop_grab = InitAtom(pInfo->dev, SYNAPTICS_PROP_GRAB, 8, 1, ¶->grab_event_device); - - values[0] = para->tap_and_drag_gesture; -@@ -628,6 +629,12 @@ ++Atom prop_resolution_detect = 0; + Atom prop_grab = 0; + Atom prop_gestures = 0; + Atom prop_capabilities = 0; +@@ -343,6 +344,10 @@ + InitFloatAtom(pInfo->dev, SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR, 2, + fvalues); ++ prop_resolution_detect = ++ InitAtom(pInfo->dev, SYNAPTICS_PROP_RESOLUTION_DETECT, 8, 1, ++ ¶->resolution_detect); ++ + prop_grab = + InitAtom(pInfo->dev, SYNAPTICS_PROP_GRAB, 8, 1, + ¶->grab_event_device); +@@ -776,6 +781,12 @@ para->press_motion_min_z = press[0]; para->press_motion_max_z = press[1]; -+ } else if (property == prop_resolution_detect) -+ { + } ++ else if (property == prop_resolution_detect) { + if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER) + return BadMatch; + + para->resolution_detect = *(BOOL*)prop->data; - } else if (property == prop_grab) - { ++ } + else if (property == prop_grab) { if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER) -Index: xserver-xorg-input-synaptics/src/synaptics.c -=================================================================== ---- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-07-05 11:49:41.261347626 +0300 -+++ xserver-xorg-input-synaptics/src/synaptics.c 2011-07-05 11:54:36.601347672 +0300 -@@ -579,6 +579,7 @@ - pars->single_tap_timeout = xf86SetIntOption(opts, "SingleTapTimeout", 180); - pars->press_motion_min_z = xf86SetIntOption(opts, "PressureMotionMinZ", pressureMotionMinZ); - pars->press_motion_max_z = xf86SetIntOption(opts, "PressureMotionMaxZ", pressureMotionMaxZ); -+ pars->resolution_detect = xf86SetBoolOption(opts, "ResolutionDetect", TRUE); + return BadMatch; +--- a/src/synaptics.c ++++ b/src/synaptics.c +@@ -787,6 +787,7 @@ + xf86SetIntOption(opts, "PressureMotionMinZ", pressureMotionMinZ); + pars->press_motion_max_z = + xf86SetIntOption(opts, "PressureMotionMaxZ", pressureMotionMaxZ); ++ pars->resolution_detect = xf86SetBoolOption(opts, "ResolutionDetect", TRUE); pars->min_speed = xf86SetRealOption(opts, "MinSpeed", 0.4); pars->max_speed = xf86SetRealOption(opts, "MaxSpeed", 0.7); -@@ -1039,7 +1040,7 @@ - #endif +@@ -1399,7 +1400,7 @@ + } /* X valuator */ -- if (priv->minx < priv->maxx) -+ if (priv->minx < priv->maxx && priv->synpara.resolution_detect) - { +- if (priv->minx < priv->maxx) { ++ if (priv->minx < priv->maxx && priv->synpara.resolution_detect) { min = priv->minx; max = priv->maxx; -@@ -1061,7 +1062,7 @@ + } +@@ -1417,7 +1418,7 @@ xf86InitValuatorDefaults(dev, 0); /* Y valuator */ -- if (priv->miny < priv->maxy) -+ if (priv->miny < priv->maxy && priv->synpara.resolution_detect) - { +- if (priv->miny < priv->maxy) { ++ if (priv->miny < priv->maxy && priv->synpara.resolution_detect) { min = priv->miny; max = priv->maxy; -Index: xserver-xorg-input-synaptics/src/synapticsstr.h -=================================================================== ---- xserver-xorg-input-synaptics.orig/src/synapticsstr.h 2011-07-05 11:49:41.251347626 +0300 -+++ xserver-xorg-input-synaptics/src/synapticsstr.h 2011-07-05 11:54:33.021347672 +0300 -@@ -155,6 +155,7 @@ - int press_motion_max_z; /* finger pressure at which maximum pressure motion factor is applied */ - double press_motion_min_factor; /* factor applied on speed when finger pressure is at minimum */ - double press_motion_max_factor; /* factor applied on speed when finger pressure is at minimum */ -+ Bool resolution_detect; /* report pad size to xserver? */ - Bool grab_event_device; /* grab event device for exclusive use? */ - Bool tap_and_drag_gesture; /* Switches the tap-and-drag gesture on/off */ - unsigned int resolution_horiz; /* horizontal resolution of touchpad in units/mm */ -Index: xserver-xorg-input-synaptics/tools/synclient.c -=================================================================== ---- xserver-xorg-input-synaptics.orig/tools/synclient.c 2011-07-05 11:49:41.281347626 +0300 -+++ xserver-xorg-input-synaptics/tools/synclient.c 2011-07-05 11:54:31.731347670 +0300 -@@ -137,6 +137,8 @@ + } +--- a/src/synapticsstr.h ++++ b/src/synapticsstr.h +@@ -174,6 +174,7 @@ + int press_motion_max_z; /* finger pressure at which maximum pressure motion factor is applied */ + double press_motion_min_factor; /* factor applied on speed when finger pressure is at minimum */ + double press_motion_max_factor; /* factor applied on speed when finger pressure is at minimum */ ++ Bool resolution_detect; /* report pad size to xserver? */ + Bool grab_event_device; /* grab event device for exclusive use? */ + Bool tap_and_drag_gesture; /* Switches the tap-and-drag gesture on/off */ + unsigned int resolution_horiz; /* horizontal resolution of touchpad in units/mm */ +--- a/tools/synclient.c ++++ b/tools/synclient.c +@@ -136,6 +136,7 @@ {"PressureMotionMaxZ", PT_INT, 1, 255, SYNAPTICS_PROP_PRESSURE_MOTION, 32, 1}, {"PressureMotionMinFactor", PT_DOUBLE, 0, 10.0,SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR, 0 /*float*/, 0}, {"PressureMotionMaxFactor", PT_DOUBLE, 0, 10.0,SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR, 0 /*float*/, 1}, + {"ResolutionDetect", PT_BOOL, 0, 1, SYNAPTICS_PROP_RESOLUTION_DETECT, 8, 0}, -+ {"GrabEventDevice", PT_BOOL, 0, 1, SYNAPTICS_PROP_GRAB, 8, 0}, {"TapAndDragGesture", PT_BOOL, 0, 1, SYNAPTICS_PROP_GESTURES, 8, 0}, {"AreaLeftEdge", PT_INT, 0, 10000, SYNAPTICS_PROP_AREA, 32, 0}, diff --git a/debian/patches/118_quell_error_msg.patch b/debian/patches/118_quell_error_msg.patch index d6fac22..9718f98 100644 --- a/debian/patches/118_quell_error_msg.patch +++ b/debian/patches/118_quell_error_msg.patch @@ -1,30 +1,26 @@ -Index: xserver-xorg-input-synaptics/tools/synclient.c -=================================================================== ---- xserver-xorg-input-synaptics.orig/tools/synclient.c 2011-07-05 11:54:31.731347670 +0300 -+++ xserver-xorg-input-synaptics/tools/synclient.c 2011-07-05 11:55:06.211347676 +0300 -@@ -391,9 +391,7 @@ - unwind: +--- a/tools/synclient.c ++++ b/tools/synclient.c +@@ -406,9 +406,7 @@ + unwind: XFree(properties); XFreeDeviceList(info); - if (!dev) - fprintf(stderr, "Unable to find a synaptics device.\n"); -- else if (error && dev) -+ if (error && dev) - { - XCloseDevice(dpy, dev); - dev = NULL; -Index: xserver-xorg-input-synaptics/tools/syndaemon.c -=================================================================== ---- xserver-xorg-input-synaptics.orig/tools/syndaemon.c 2011-07-05 11:54:31.751347670 +0300 -+++ xserver-xorg-input-synaptics/tools/syndaemon.c 2011-07-05 11:55:06.211347676 +0300 -@@ -512,9 +512,7 @@ - unwind: +- else if (error && dev) { ++ if (error && dev) { + XCloseDevice(dpy, dev); + dev = NULL; + } +--- a/tools/syndaemon.c ++++ b/tools/syndaemon.c +@@ -529,9 +529,7 @@ + unwind: XFree(properties); XFreeDeviceList(info); - if (!dev) -- fprintf(stderr, "Unable to find a synaptics device.\n"); -- else if (error && dev) -+ if (error && dev) - { - XCloseDevice(dpy, dev); - dev = NULL; +- fprintf(stderr, "Unable to find a synaptics device.\n"); +- else if (error && dev) { ++ if (error && dev) { + XCloseDevice(dpy, dev); + dev = NULL; + } diff --git a/debian/patches/124_syndaemon_events.patch b/debian/patches/124_syndaemon_events.patch index 05f8a47..f2d185b 100644 --- a/debian/patches/124_syndaemon_events.patch +++ b/debian/patches/124_syndaemon_events.patch @@ -22,22 +22,20 @@ probably should not be committed upstream though. tools/syndaemon.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) -Index: xserver-xorg-input-synaptics/tools/syndaemon.c -=================================================================== ---- xserver-xorg-input-synaptics.orig/tools/syndaemon.c 2011-07-05 11:55:06.211347676 +0300 -+++ xserver-xorg-input-synaptics/tools/syndaemon.c 2011-07-05 11:55:19.281347678 +0300 -@@ -429,6 +429,14 @@ - fprintf(stderr, "bad event received, major opcode %d\n", event.type); - } +--- a/tools/syndaemon.c ++++ b/tools/syndaemon.c +@@ -450,6 +450,14 @@ + event.type); + } -+ /* If there are any events left over, they are in error. Drain them -+ * from the connection queue so we don't get stuck. */ -+ while (XEventsQueued(dpy_data, QueuedAlready) > 0) { -+ XEvent event; -+ XNextEvent(dpy_data, &event); -+ fprintf(stderr, "bad event received, major opcode %d\n", event.type); -+ } ++ /* If there are any events left over, they are in error. Drain them ++ * from the connection queue so we don't get stuck. */ ++ while (XEventsQueued(dpy_data, QueuedAlready) > 0) { ++ XEvent event; ++ XNextEvent(dpy_data, &event); ++ fprintf(stderr, "bad event received, major opcode %d\n", event.type); ++ } + - if (!ignore_modifier_keys && cbres.key_event) { - disable_event = 1; - } + if (!ignore_modifier_keys && cbres.key_event) { + disable_event = 1; + } diff --git a/debian/patches/125_option_rec_revert.patch b/debian/patches/125_option_rec_revert.patch index a55aeeb..3f38f89 100644 --- a/debian/patches/125_option_rec_revert.patch +++ b/debian/patches/125_option_rec_revert.patch @@ -1,15 +1,15 @@ --- a/test/fake-symbols.c +++ b/test/fake-symbols.c -@@ -26,7 +26,7 @@ xf86WaitForInput (int fd, int timeout) +@@ -26,7 +26,7 @@ } _X_EXPORT int --xf86OpenSerial (OPTTYPE options) -+xf86OpenSerial (pointer options) +-xf86OpenSerial(OPTTYPE options) ++xf86OpenSerial(pointer options) { return 0; } -@@ -37,43 +37,43 @@ xf86SetSerialSpeed (int fd, int speed) +@@ -37,44 +37,44 @@ return 0; } @@ -42,6 +42,7 @@ { return NULL; } + -_X_EXPORT CONST char * -xf86FindOptionValue(OPTTYPE options, const char *name) +_X_EXPORT char * @@ -63,7 +64,7 @@ { return NULL; } -@@ -85,7 +85,7 @@ xf86NameCmp(const char *s1, const char * +@@ -86,7 +86,7 @@ } _X_EXPORT char * @@ -72,7 +73,7 @@ { return NULL; } -@@ -196,8 +196,8 @@ xf86DeleteInput(InputInfoPtr pInp, int f +@@ -185,8 +185,8 @@ return; } @@ -83,7 +84,7 @@ { return NULL; } -@@ -225,7 +225,7 @@ xf86PostKeyboardEvent(DeviceIntPtr +@@ -213,7 +213,7 @@ } _X_EXPORT int @@ -92,28 +93,27 @@ { return 0; } -@@ -254,7 +254,7 @@ InitPtrFeedbackClassDeviceStruct(DeviceI +@@ -240,7 +240,7 @@ _X_EXPORT int - XIChangeDeviceProperty (DeviceIntPtr dev, Atom property, Atom type, - int format, int mode, unsigned long len, -- OPTTYPE value, Bool sendevent) -+ pointer value, Bool sendevent) + XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type, + int format, int mode, unsigned long len, +- OPTTYPE value, Bool sendevent) ++ pointer value, Bool sendevent) { return 0; } -@@ -367,15 +367,15 @@ InitValuatorClassDeviceStruct(DeviceIntP +@@ -344,14 +344,14 @@ + return FALSE; } - -_X_EXPORT OPTTYPE --xf86ReplaceStrOption(OPTTYPE optlist, const char *name, const char* val) +-xf86ReplaceStrOption(OPTTYPE optlist, const char *name, const char *val) +_X_EXPORT pointer -+xf86ReplaceStrOption(pointer optlist, const char *name, const char* val) ++xf86ReplaceStrOption(pointer optlist, const char *name, const char *val) { return NULL; } - -_X_EXPORT OPTTYPE -xf86NextOption(OPTTYPE list) +_X_EXPORT pointer @@ -121,7 +121,7 @@ { return NULL; } -@@ -424,14 +424,14 @@ InitFocusClassDeviceStruct(DeviceIntPtr +@@ -393,13 +393,13 @@ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 void @@ -132,15 +132,14 @@ void xf86CollectInputOptions(InputInfoPtr pInfo, - const char **defaultOpts, -- OPTTYPE extraOpts) -+ pointer extraOpts) +- const char **defaultOpts, OPTTYPE extraOpts) ++ const char **defaultOpts, pointer extraOpts) { } --- a/test/fake-symbols.h +++ b/test/fake-symbols.h -@@ -1,37 +1,29 @@ +@@ -1,40 +1,32 @@ #include <xorg-server.h> #include <xf86Xinput.h> @@ -149,101 +148,105 @@ -#define CONST const -#else -#define OPTTYPE pointer --#define CONST +-#define CONST -#endif - - extern int xf86ReadSerial (int fd, void *buf, int count); - extern int xf86WriteSerial (int fd, const void *buf, int count); - extern int xf86CloseSerial (int fd); - extern int xf86WaitForInput (int fd, int timeout); --extern int xf86OpenSerial (OPTTYPE options); -+extern int xf86OpenSerial (pointer options); - extern int xf86SetSerialSpeed (int fd, int speed); - --extern OPTTYPE xf86ReplaceIntOption(OPTTYPE optlist, const char *name, const int val); --extern OPTTYPE xf86AddNewOption(OPTTYPE head, const char *name, const char *val); --extern char* xf86OptionName(OPTTYPE opt); --extern CONST char* xf86FindOptionValue(OPTTYPE options, const char *name); -+extern pointer xf86ReplaceIntOption(pointer optlist, const char *name, const int val); -+extern pointer xf86AddNewOption(pointer head, const char *name, const char *val); -+extern char* xf86OptionName(pointer opt); -+extern char* xf86FindOptionValue(pointer options, const char *name); + extern int xf86ReadSerial(int fd, void *buf, int count); + extern int xf86WriteSerial(int fd, const void *buf, int count); + extern int xf86CloseSerial(int fd); + extern int xf86WaitForInput(int fd, int timeout); +-extern int xf86OpenSerial(OPTTYPE options); ++extern int xf86OpenSerial(pointer options); + extern int xf86SetSerialSpeed(int fd, int speed); + +-extern OPTTYPE xf86ReplaceIntOption(OPTTYPE optlist, const char *name, ++extern pointer xf86ReplaceIntOption(pointer optlist, const char *name, + const int val); +-extern OPTTYPE xf86AddNewOption(OPTTYPE head, const char *name, ++extern pointer xf86AddNewOption(pointer head, const char *name, + const char *val); +-extern char *xf86OptionName(OPTTYPE opt); +-extern CONST char *xf86FindOptionValue(OPTTYPE options, const char *name); ++extern char *xf86OptionName(pointer opt); ++extern char *xf86FindOptionValue(pointer options, const char *name); extern int xf86NameCmp(const char *s1, const char *s2); --extern char* xf86CheckStrOption(OPTTYPE optlist, const char *name, char *deflt); -+extern char* xf86CheckStrOption(pointer optlist, const char *name, char *deflt); - +-extern char *xf86CheckStrOption(OPTTYPE optlist, const char *name, char *deflt); ++extern char *xf86CheckStrOption(pointer optlist, const char *name, char *deflt); --extern char * xf86SetStrOption(OPTTYPE optlist, const char *name, CONST char *deflt); +-extern char *xf86SetStrOption(OPTTYPE optlist, const char *name, +- CONST char *deflt); -extern int xf86SetBoolOption(OPTTYPE optlist, const char *name, int deflt); --extern OPTTYPE xf86AddNewOption(OPTTYPE head, const char *name, const char *val); --extern CONST char* xf86FindOptionValue(OPTTYPE options, const char *name); --extern char* xf86OptionName(OPTTYPE opt); --extern char *xf86OptionValue(OPTTYPE opt); -+extern char * xf86SetStrOption(pointer optlist, const char *name, char *deflt); +-extern OPTTYPE xf86AddNewOption(OPTTYPE head, const char *name, ++extern char *xf86SetStrOption(pointer optlist, const char *name, ++ char *deflt); +extern int xf86SetBoolOption(pointer optlist, const char *name, int deflt); -+extern pointer xf86AddNewOption(pointer head, const char *name, const char *val); -+extern char* xf86FindOptionValue(pointer options, const char *name); -+extern char* xf86OptionName(pointer opt); ++extern pointer xf86AddNewOption(pointer head, const char *name, + const char *val); +-extern CONST char *xf86FindOptionValue(OPTTYPE options, const char *name); +-extern char *xf86OptionName(OPTTYPE opt); +-extern char *xf86OptionValue(OPTTYPE opt); ++extern char *xf86FindOptionValue(pointer options, const char *name); ++extern char *xf86OptionName(pointer opt); +extern char *xf86OptionValue(pointer opt); extern int xf86NameCmp(const char *s1, const char *s2); --extern char * xf86CheckStrOption(OPTTYPE optlist, const char *name, char *deflt); -+extern char * xf86CheckStrOption(pointer optlist, const char *name, char *deflt); +-extern char *xf86CheckStrOption(OPTTYPE optlist, const char *name, char *deflt); ++extern char *xf86CheckStrOption(pointer optlist, const char *name, char *deflt); extern void xf86AddEnabledDevice(InputInfoPtr pInfo); extern void xf86RemoveEnabledDevice(InputInfoPtr pInfo); extern Atom XIGetKnownProperty(char *name); -@@ -61,7 +52,7 @@ XISetDevicePropertyDeletable(DeviceIntPt +@@ -60,7 +52,7 @@ extern InputInfoPtr xf86FirstLocalDevice(void); extern void xf86DeleteInput(InputInfoPtr pInp, int flags); -extern OPTTYPE xf86OptionListDuplicate(OPTTYPE options); +extern pointer xf86OptionListDuplicate(pointer options); extern Bool - InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons, Atom* labels, - CARD8 *map); -@@ -73,7 +64,7 @@ xf86PostKeyboardEvent(DeviceIntPtr - unsigned int key_code, - int is_down); - extern int --xf86SetIntOption(OPTTYPE optlist, const char *name, int deflt); -+xf86SetIntOption(pointer optlist, const char *name, int deflt); + + InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons, Atom *labels, +@@ -73,7 +65,7 @@ extern void - xf86PostButtonEventP(DeviceIntPtr device, - int is_absolute, -@@ -91,7 +82,7 @@ InitPtrFeedbackClassDeviceStruct(DeviceI + xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int key_code, int is_down); extern int - XIChangeDeviceProperty (DeviceIntPtr dev, Atom property, Atom type, - int format, int mode, unsigned long len, -- OPTTYPE value, Bool sendevent); -+ pointer value, Bool sendevent); - extern CARD32 GetTimeInMillis (void); +- xf86SetIntOption(OPTTYPE optlist, const char *name, int deflt); ++ xf86SetIntOption(pointer optlist, const char *name, int deflt); + extern void + + xf86PostButtonEventP(DeviceIntPtr device, +@@ -91,7 +83,7 @@ + + XIChangeDeviceProperty(DeviceIntPtr dev, Atom property, Atom type, + int format, int mode, unsigned long len, +- OPTTYPE value, Bool sendevent); ++ pointer value, Bool sendevent); + extern CARD32 GetTimeInMillis(void); extern int -@@ -140,10 +131,10 @@ extern Bool +@@ -143,10 +135,10 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels, int numMotionEvents, int mode); -extern OPTTYPE --xf86ReplaceStrOption(OPTTYPE optlist, const char *name, const char* val); +-xf86ReplaceStrOption(OPTTYPE optlist, const char *name, const char *val); +extern pointer -+xf86ReplaceStrOption(pointer optlist, const char *name, const char* val); ++xf86ReplaceStrOption(pointer optlist, const char *name, const char *val); -extern OPTTYPE xf86NextOption(OPTTYPE list); +extern pointer xf86NextOption(pointer list); extern int - XIGetDeviceProperty (DeviceIntPtr dev, Atom property, XIPropertyValuePtr *value); -@@ -167,12 +158,12 @@ extern Bool InitFocusClassDeviceStruct(D + +@@ -169,12 +161,12 @@ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 extern void --xf86ProcessCommonOptions(InputInfoPtr pInfo, OPTTYPE list); -+xf86ProcessCommonOptions(InputInfoPtr pInfo, pointer list); +- xf86ProcessCommonOptions(InputInfoPtr pInfo, OPTTYPE list); ++ xf86ProcessCommonOptions(InputInfoPtr pInfo, pointer list); extern void + xf86CollectInputOptions(InputInfoPtr pInfo, - const char **defaultOpts, -- OPTTYPE extraOpts); -+ pointer extraOpts); +- const char **defaultOpts, OPTTYPE extraOpts); ++ const char **defaultOpts, pointer extraOpts); + + extern InputInfoPtr xf86AllocateInput(InputDriverPtr drv, int flags); - extern InputInfoPtr - xf86AllocateInput(InputDriverPtr drv, int flags); -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1swrgu-0002yv...@vasks.debian.org