Attachment 17205 Details for Bug 14109 – Patch to fix incorrect usage of variables within xf86EloReadInput

[patch] Patch to fix incorrect usage of variables within xf86EloReadInput

patch3.pat (text/plain), 3.46 KB, created by William Brack on 2008-06-17 20:11:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: William Brack

Created: 2008-06-17 20:11:04 UTC

Size: 3.46 KB

patch

obsolete

>--- xf86Elo.c	2008-06-17 07:46:56.000000000 -0700
>+++ xf86Elo.c	2008-06-17 13:09:06.000000000 -0700
>@@ -392,6 +392,7 @@
>   EloPrivatePtr			priv = (EloPrivatePtr)(local->private);
>   int				cur_x, cur_y;
>   int				state;
>+#if GET_ABI_MAJOR(XINPUT_ABI) == 0
>    int first = 0; /* since convert is expecting 0 */
>    int num = 2; /* since convert is expecting 0 */
>    int v0 = 0; /* = cur_x - based on the debug output this is what v0 is */
>@@ -400,14 +401,13 @@
>    int v3 = 0; /* not used in convert */
>    int v4 = 0; /* not used in convert */
>    int v5 = 0; /* not used in convert */
>-   int x; /* output */
>-   int y; /* output */
>+#endif
> 
>   DBG(4, ErrorF("Entering ReadInput\n"));
>   /*
>    * Try to get a packet.
>    */
>-  while (xf86WaitForInput(local->fd, ELO_MAX_WAIT) > 0) {
>+  while (xf86WaitForInput(local->fd, ELO_MAX_WAIT/100) > 0) {
>       if(xf86EloGetPacket(priv->packet_buf,
> 		       &priv->packet_buf_p,
> 		       &priv->checksum,
>@@ -424,7 +424,7 @@
>           cur_x = WORD_ASSEMBLY(priv->packet_buf[3], priv->packet_buf[4]);
>           cur_y = WORD_ASSEMBLY(priv->packet_buf[5], priv->packet_buf[6]);
>           state = priv->packet_buf[2] & 0x07;
>-
>+#if GET_ABI_MAJOR(XINPUT_ABI) == 0
>           /*
>            * MHALAS: Based on the description in xf86XInputSetScreen
>            * this code must be called from ReadInput BEFORE any events
>@@ -437,17 +437,18 @@
>            * calib and before posting the event.
>            */
> 
>-          DBG(3, ErrorF("EloConvert Before Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, x, y));
>+          DBG(3, ErrorF("EloConvert Before Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, cur_x, cur_y));
>           v0 = cur_x; /* based on the debug output this is what v0 is */
>-          v1 = cur_y; /* based on the debug output this is what v0 is */
>+          v1 = cur_y; /* based on the debug output this is what v1 is */
>           /*
>            * Use the conversion method to send correct coordinates
>            * since it contains all necessary logic
>            */
>-          xf86EloConvert(local, first, num, v0, v1, v2, v3, v4, v5, &x, &y);
>-          DBG(3, ErrorF("EloConvert During Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, x, y));
>-          xf86XInputSetScreen(local, priv->screen_no, x, y);
>-          DBG(3, ErrorF("EloConvert After Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, x, y));
>+          xf86EloConvert(local, first, num, v0, v1, v2, v3, v4, v5, &cur_x, &cur_y);
>+          DBG(3, ErrorF("EloConvert During Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, cur_x, cur_y));
>+#endif
>+          xf86XInputSetScreen(local, priv->screen_no, cur_x, cur_y);
>+          DBG(3, ErrorF("EloConvert After Fix: Screen(%d) - x(%d), y(%d)\n", priv->screen_no, cur_x, cur_y));
> 
>           /*
>            * Send events.
>@@ -456,13 +457,13 @@
>            * location has changed as DIX assumes this. This is why we always
>            * emit a motion, regardless of the kind of packet processed.
>            */
>-          xf86PostMotionEvent(local->dev, TRUE, 0, 2, x, y);
>+          xf86PostMotionEvent(local->dev, TRUE, 0, 2, cur_x, cur_y);
> 
>           /*
>            * Emit a button press or release.
>            */
>           if (state == ELO_PRESS || state == ELO_RELEASE) {
>-              xf86PostButtonEvent(local->dev, TRUE, 1, state == ELO_PRESS, 0, 2, x, y);
>+              xf86PostButtonEvent(local->dev, TRUE, 1, state == ELO_PRESS, 0, 2, cur_x, cur_y);
>           }
> 
>           DBG(3, ErrorF("TouchScreen: x(%d), y(%d), %s\n",

Actions: View | Splinter Review

Attachments on bug 14109: 16658 | 17158 | 17205 | 30705 | 32095

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.