Attachment 56595 Details for Bug 116181

[patch] only the int-vs-long fixes from 0.14.4

synaptics-0.14.3-64bit-fix.diff (text/plain), 5.21 KB, created by Forgotten User ZhJd0F0L3x on 2005-11-07 16:37:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forgotten User ZhJd0F0L3x

Created: 2005-11-07 16:37:15 UTC

Size: 5.21 KB

patch

obsolete

>diff -ruNp synaptics-0.14.3/synaptics.c synaptics-0.14.4/synaptics.c
>--- synaptics-0.14.3/synaptics.c	2005-07-10 00:09:40.000000000 +0200
>+++ synaptics-0.14.4/synaptics.c	2005-11-05 21:59:23.000000000 +0100
>@@ -96,7 +96,7 @@ typedef enum {
> 
> #define MAX(a, b) (((a)>(b))?(a):(b))
> #define MIN(a, b) (((a)<(b))?(a):(b))
>-#define TIME_DIFF(a, b) ((long)((a)-(b)))
>+#define TIME_DIFF(a, b) ((int)((a)-(b)))
> #define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
> 
> #ifndef M_PI
>@@ -276,7 +276,6 @@ SynapticsPreInit(InputDriverPtr drv, IDe
>     pointer optList;
> #endif
>     char *str_par;
>-    unsigned long now;
>     SynapticsSHM *pars;
>     char *repeater;
> 
>@@ -331,12 +330,11 @@ SynapticsPreInit(InputDriverPtr drv, IDe
>     priv->timer = NULL;
>     priv->repeatButtons = 0;
>     priv->nextRepeat = 0;
>-    now = GetTimeInMillis();
>     priv->count_packet_finger = 0;
>     priv->tap_state = TS_START;
>     priv->tap_button = 0;
>     priv->tap_button_state = TBS_BUTTON_UP;
>-    priv->touch_on.millis = now;
>+    priv->touch_on.millis = 0;
> 
>     /* install shared memory or normal memory for parameters */
>     priv->shm_config = xf86SetBoolOption(local->options, "SHMConfig", FALSE);
>@@ -811,11 +806,11 @@ ReadInput(LocalDevicePtr local)
> }
> 
> static int
>-HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, long *delay)
>+HandleMidButtonEmulation(SynapticsPrivate *priv, struct SynapticsHwState *hw, int *delay)
> {
>     SynapticsSHM *para = priv->synpara;
>     Bool done = FALSE;
>-    long timeleft;
>+    int timeleft;
>     int mid = 0;
> 
>     while (!done) {
>@@ -1045,8 +1040,8 @@ HandleTapProcessing(SynapticsPrivate *pr
> {
>     SynapticsSHM *para = priv->synpara;
>     Bool touch, release, is_timeout, move;
>-    long timeleft, timeout;
>-    long delay = 1000000000;
>+    int timeleft, timeout;
>+    int delay = 1000000000;
> 
>     if (priv->palm)
> 	return delay;
>@@ -1169,7 +1164,7 @@ estimate_delta(double x0, double x1, dou
>     return x0 * 0.3 + x1 * 0.1 - x2 * 0.1 - x3 * 0.3;
> }
> 
>-static long
>+static int
> ComputeDeltas(SynapticsPrivate *priv, struct SynapticsHwState *hw,
> 	      edge_type edge, int *dxP, int *dyP)
> {
>@@ -1178,7 +1173,7 @@ ComputeDeltas(SynapticsPrivate *priv, st
>     int dist;
>     double dx, dy;
>     double speed, integral;
>-    long delay = 1000000000;
>+    int delay = 1000000000;
> 
>     dx = dy = 0;
> 
>@@ -1520,8 +1516,8 @@ HandleState(LocalDevicePtr local, struct
>     int change;
>     struct ScrollData scroll;
>     int double_click, repeat_delay;
>-    long delay = 1000000000;
>-    long timeleft;
>+    int delay = 1000000000;
>+    int timeleft;
>     int i;
> 
>     /* update hardware state in shared memory */
>diff -ruNp synaptics-0.14.3/synaptics.h synaptics-0.14.4/synaptics.h
>--- synaptics-0.14.3/synaptics.h	2005-07-10 00:09:40.000000000 +0200
>+++ synaptics-0.14.4/synaptics.h	2005-11-05 21:59:23.000000000 +0100
>@@ -49,10 +49,10 @@ typedef struct _SynapticsSHM
>     /* Parameter data */
>     int	left_edge, right_edge, top_edge, bottom_edge; /* edge coordinates absolute */
>     int	finger_low, finger_high;	    /* finger detection values in Z-values */
>-    unsigned long tap_time;
>+    int tap_time;
>     int tap_move;			    /* max. tapping time and movement in packets and coord. */
>-    unsigned long tap_time_2;		    /* max. tapping time for double taps */
>-    unsigned long click_time;		    /* The duration of a single click */
>+    int tap_time_2;			    /* max. tapping time for double taps */
>+    int click_time;			    /* The duration of a single click */
>     Bool fast_taps;			    /* Faster reaction to single taps */
>     int emulate_mid_button_time;	    /* Max time between left and right button presses to
> 					       emulate a middle button press. */
>@@ -121,7 +121,7 @@ typedef struct _SynapticsSHM
> typedef struct _SynapticsMoveHist
> {
>     int x, y;
>-    unsigned int millis;
>+    int millis;
> } SynapticsMoveHistRec;
> 
> enum MidButtonEmulation {
>@@ -177,9 +177,9 @@ typedef struct _SynapticsPrivateRec
>     int scroll_y;			/* last y-scroll position */
>     int scroll_x;			/* last x-scroll position */
>     double scroll_a;			/* last angle-scroll position */
>-    unsigned long count_packet_finger;	/* packet counter with finger on the touchpad */
>-    unsigned int button_delay_millis;	/* button delay for 3rd button emulation */
>-    unsigned int prev_up;		/* Previous up button value, for double click emulation */
>+    int count_packet_finger;		/* packet counter with finger on the touchpad */
>+    int button_delay_millis;		/* button delay for 3rd button emulation */
>+    Bool prev_up;			/* Previous up button value, for double click emulation */
>     Bool finger_flag;			/* previous finger */
> 
>     enum TapState tap_state;		/* State of tap processing */
>@@ -201,7 +203,7 @@ typedef struct _SynapticsPrivateRec
>     double frac_x, frac_y;		/* absolute -> relative fraction */
>     enum MidButtonEmulation mid_emu_state;	/* emulated 3rd button */
>     int repeatButtons;			/* buttons for repeat */
>-    unsigned long nextRepeat;		/* Time when to trigger next auto repeat event */
>+    int nextRepeat;			/* Time when to trigger next auto repeat event */
>     int lastButtons;			/* last state of the buttons */
>     int palm;				/* Set to true when palm detected, reset to false when
> 					   palm/finger contact disappears */
>

Actions: View | Diff

Attachments on bug 116181: 56595