Attachment 266141 Details for Bug 384311 – synaptics-0.14.6.diff

[patch] synaptics-0.14.6.diff

synaptics-0.14.6.diff (text/plain), 3.94 KB, created by Pierre Ossman on 2007-11-21 17:04:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Ossman

Created: 2007-11-21 17:04:53 UTC

Size: 3.94 KB

patch

obsolete

>--- Imakefile
>+++ Imakefile
>@@ -0,0 +1,29 @@
>+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/Imakefile,v 1.5 2001/08/13 19:35:00 dawes Exp $
>+
>+#define IHaveModules
>+#include <Server.tmpl>
>+
>+SRCS = ps2comm.c synaptics.c eventcomm.c psmcomm.c alpscomm.c
>+OBJS = ps2comm.o synaptics.o eventcomm.o psmcomm.o alpscomm.o
>+
>+DRIVER = synaptics
>+
>+DEFINES = -DVERSION="\"`cat VERSION`\"" -DVERSION_ID="`cat VERSION_ID`"
>+
>+INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \
>+	   -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) \
>+	   -I$(EXTINCSRC) -I/usr/include/X11 -I/usr/include/xorg
>+
>+#if MakeHasPosixVariableSubstitutions
>+SubdirLibraryRule($(OBJS))
>+#endif
>+
>+ModuleObjectRule()
>+
>+ObjectModuleTarget($(DRIVER),$(OBJS))
>+
>+InstallObjectModule($(DRIVER),$(MODULEDIR),input)
>+
>+DependTarget()
>+
>+InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input)
>diff -x Makefile -u -r ../synaptics-0.14.5.orig/eventcomm.c ./eventcomm.c
>--- ../synaptics-0.14.5.orig/eventcomm.c	2006-07-19 12:23:31.000000000 +0200
>+++ ./eventcomm.c	2006-07-19 12:32:35.000000000 +0200
>@@ -17,6 +17,10 @@
>  *
>  */
> 
>+#include <stdio.h>
>+#include <fcntl.h>
>+#include <errno.h>
>+
> #include "eventcomm.h"
> #include "synproto.h"
> #include "synaptics.h"
>diff -x Makefile -u -r ../synaptics-0.14.5.orig/psmcomm.c ./psmcomm.c
>--- ../synaptics-0.14.5.orig/psmcomm.c	2006-07-19 12:23:31.000000000 +0200
>+++ ./psmcomm.c	2006-07-19 12:33:56.000000000 +0200
>@@ -28,6 +28,9 @@
>  *
>  */
> 
>+#include <errno.h>
>+#include <string.h>
>+
> #include "psmcomm.h"
> #include "synproto.h"
> #include "synaptics.h"
>diff -u -p -r ../synaptics-0.14.6.old/ps2comm.c ./ps2comm.c
>--- ../synaptics-0.14.6.old/ps2comm.c	2007-09-30 13:00:31.787883750 +0200
>+++ ./ps2comm.c	2007-09-30 13:01:35.707878500 +0200
>@@ -60,6 +60,12 @@
> #define PS2DBG(x)
> #endif
> 
>+/* defines vanished from xf86Xinput.h */
>+
>+#ifndef DBG
>+#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;}
>+#endif
>+
> /*****************************************************************************
>  *	PS/2 Utility functions.
>  *     Many parts adapted from tpconfig.c by C. Scott Ananian
>diff -u -p -r ../synaptics-0.14.6.old/synaptics.c ./synaptics.c
>--- ../synaptics-0.14.6.old/synaptics.c	2007-09-30 13:00:31.767882500 +0200
>+++ ./synaptics.c	2007-09-30 13:20:22.526300250 +0200
>@@ -72,6 +72,11 @@
> #include <xf86Optrec.h>  		/* needed for Options */
> #endif
> 
>+/* defines vanished from xf86Xinput.h */
>+
>+#ifndef DBG
>+#define DBG(lvl, f) {if ((lvl) <= xf86GetVerbosity()) f;}
>+#endif
> 
> /*****************************************************************************
>  *	Local Headers
>@@ -321,8 +326,10 @@ SynapticsPreInit(InputDriverPtr drv, IDe
>     local->private_flags           = 0;
>     local->flags                   = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
>     local->conf_idev               = dev;
>+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
>     local->motion_history_proc     = xf86GetMotionEvents;
>     local->history_size            = 0;
>+#endif
>     local->always_core_feedback    = 0;
> 
>     xf86Msg(X_INFO, "Synaptics touchpad driver version %s (%d)\n", VERSION, VERSION_ID);
>@@ -613,8 +620,18 @@ DeviceInit(DeviceIntPtr dev)
> 
>     InitPointerDeviceStruct((DevicePtr)dev, map,
> 			    SYN_MAX_BUTTONS,
>-			    miPointerGetMotionEvents, SynapticsCtrl,
>-			    miPointerGetMotionBufferSize());
>+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
>+			    miPointerGetMotionEvents,
>+#else
>+			    GetMotionHistory,
>+#endif
>+			    SynapticsCtrl,
>+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
>+			    miPointerGetMotionBufferSize()
>+#else
>+			    GetMotionHistorySize(), 2
>+#endif
>+			    );
> 
>     /* X valuator */
>     xf86InitValuatorAxisStruct(dev, 0, 0, -1, 1, 0, 1);
>@@ -623,7 +640,9 @@ DeviceInit(DeviceIntPtr dev)
>     xf86InitValuatorAxisStruct(dev, 1, 0, -1, 1, 0, 1);
>     xf86InitValuatorDefaults(dev, 1);
> 
>+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
>     xf86MotionHistoryAllocate(local);
>+#endif
> 
>     if (!alloc_param_data(local))
> 	return !Success;

Actions: View | Diff

Attachments on bug 384311: 266141