wok-undigest annotate xorg-xf86-input-evtouch/stuff/evtouch.u @ rev 1227

copied perl recipe from wok-next
author Hans-G?nter Theisgen
date Fri Nov 15 17:49:31 2019 +0100 (2019-11-15)
parents
children
rev   line source
pankso@1111 1 Remove unused variables and code just to make gcc happy
pankso@1111 2
pankso@1111 3 Index: xserver-xorg-input-evtouch/evtouch.c
pankso@1111 4 ===================================================================
pankso@1111 5 --- xserver-xorg-input-evtouch.orig/evtouch.c 2009-01-21 20:06:50.647249439 +0900
pankso@1111 6 +++ xserver-xorg-input-evtouch/evtouch.c 2009-01-21 20:07:39.518253785 +0900
pankso@1111 7 @@ -352,7 +352,6 @@ void EVTouchProcessAbs(EVTouchPrivatePtr
pankso@1111 8 void EVTouchProcessRel(EVTouchPrivatePtr priv)
pankso@1111 9 {
pankso@1111 10 struct input_event *ev; /* packet being/just read */
pankso@1111 11 - int dummy;
pankso@1111 12
pankso@1111 13 ev = &priv->ev;
pankso@1111 14 if ( ev->code == REL_X ) {
pankso@1111 15 @@ -745,17 +744,6 @@ EVTouchNewPacket (EVTouchPrivatePtr priv
pankso@1111 16
pankso@1111 17
pankso@1111 18
pankso@1111 19 -static unsigned char
pankso@1111 20 -EVTouchRead(EVTouchPrivatePtr priv)
pankso@1111 21 -{
pankso@1111 22 - unsigned char c;
pankso@1111 23 - XisbBlockDuration (priv->buffer, EV_TIMEOUT);
pankso@1111 24 - c = XisbRead(priv->buffer);
pankso@1111 25 - return (c);
pankso@1111 26 -}
pankso@1111 27 -
pankso@1111 28 -
pankso@1111 29 -
pankso@1111 30 static Bool
pankso@1111 31 EVTouchGetPacket (EVTouchPrivatePtr priv)
pankso@1111 32 {
pankso@1111 33 From: Thomas Jaeger <ThJaeger@gmail.com>
pankso@1111 34 Date: Sun, 22 Mar 2009 20:58:58 -0400
pankso@1111 35 Subject: Make calibration work on xserver-1.6
pankso@1111 36
pankso@1111 37 Stolen from Ubuntu.
pankso@1111 38
pankso@1111 39 Index: xserver-xorg-input-evtouch/ev_calibrate.c
pankso@1111 40 ===================================================================
pankso@1111 41 --- xserver-xorg-input-evtouch.orig/ev_calibrate.c
pankso@1111 42 +++ xserver-xorg-input-evtouch/ev_calibrate.c
pankso@1111 43 @@ -218,7 +218,7 @@
pankso@1111 44 int cap_style = CapButt; /* style of the line's edje and */
pankso@1111 45 int join_style = JoinBevel; /* joined lines. */
pankso@1111 46
pankso@1111 47 - int event_mask = ExposureMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask;
pankso@1111 48 + int event_mask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | KeyPressMask;
pankso@1111 49
pankso@1111 50 int depth;
pankso@1111 51 int screen_num;
pankso@1111 52 Index: xserver-xorg-input-evtouch/evtouch.c
pankso@1111 53 ===================================================================
pankso@1111 54 --- xserver-xorg-input-evtouch.orig/evtouch.c
pankso@1111 55 +++ xserver-xorg-input-evtouch/evtouch.c
pankso@1111 56 @@ -306,7 +306,7 @@
pankso@1111 57 }
pankso@1111 58
pankso@1111 59 if (pos_changed == 1) {
pankso@1111 60 -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
pankso@1111 61 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
pankso@1111 62 ConvertProc(priv->local, 0, 2,
pankso@1111 63 priv->raw_x, priv->raw_y,
pankso@1111 64 0, 0, 0, 0,
pankso@1111 65 @@ -369,7 +369,7 @@
pankso@1111 66 priv->raw_y = priv->min_y;
pankso@1111 67 }
pankso@1111 68
pankso@1111 69 -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
pankso@1111 70 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
pankso@1111 71 ConvertProc(priv->local, 0, 2,
pankso@1111 72 priv->raw_x, priv->raw_y,
pankso@1111 73 0, 0, 0, 0,
pankso@1111 74 Index: xserver-xorg-input-evtouch/evtouch.c
pankso@1111 75 ===================================================================
pankso@1111 76 --- xserver-xorg-input-evtouch.orig/evtouch.c
pankso@1111 77 +++ xserver-xorg-input-evtouch/evtouch.c
pankso@1111 78 @@ -30,10 +30,8 @@
pankso@1111 79
pankso@1111 80 #define _evdev_touch_C_
pankso@1111 81
pankso@1111 82 -#include <xf86Version.h>
pankso@1111 83 -#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0)
pankso@1111 84 +#include <xorgVersion.h>
pankso@1111 85 #define XFREE86_V4
pankso@1111 86 -#endif
pankso@1111 87
pankso@1111 88 /*****************************************************************************
pankso@1111 89 * Standard Headers
pankso@1111 90 @@ -74,7 +72,6 @@
pankso@1111 91 #include "xf86_OSproc.h"
pankso@1111 92 #include "xf86Xinput.h"
pankso@1111 93 #include "exevents.h"
pankso@1111 94 -#include "xf86OSmouse.h"
pankso@1111 95 #include "randrstr.h"
pankso@1111 96
pankso@1111 97 #ifndef NEED_XF86_TYPES
pankso@1111 98 @@ -139,7 +136,7 @@
pankso@1111 99 "Kenan Esau",
pankso@1111 100 MODINFOSTRING1,
pankso@1111 101 MODINFOSTRING2,
pankso@1111 102 - XF86_VERSION_CURRENT,
pankso@1111 103 + XORG_VERSION_CURRENT,
pankso@1111 104 0, 8, 8,
pankso@1111 105 ABI_CLASS_XINPUT,
pankso@1111 106 ABI_XINPUT_VERSION,
pankso@1111 107 @@ -590,6 +587,10 @@
pankso@1111 108 EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private);
pankso@1111 109 unsigned char map[EV_MAX_BUTTONS];
pankso@1111 110 int i;
pankso@1111 111 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
pankso@1111 112 + Atom btn_label;
pankso@1111 113 + Atom axis_labels[2] = { 0, 0 };
pankso@1111 114 +#endif
pankso@1111 115
pankso@1111 116 for (i = 0; i < EV_MAX_BUTTONS; i++)
pankso@1111 117 map[i] = i;
pankso@1111 118 @@ -628,7 +629,11 @@
pankso@1111 119 /*
pankso@1111 120 * Device reports button press for 5 buttons.
pankso@1111 121 */
pankso@1111 122 - if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, map) == FALSE)
pankso@1111 123 + if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS,
pankso@1111 124 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
pankso@1111 125 + &btn_label,
pankso@1111 126 +#endif
pankso@1111 127 + map) == FALSE)
pankso@1111 128 {
pankso@1111 129 ErrorF("Unable to allocate EVTouch touchscreen ButtonClassDeviceStruct\n");
pankso@1111 130 return BadAlloc;
pankso@1111 131 @@ -652,26 +657,43 @@
pankso@1111 132 * Device reports motions on 2 axes in absolute coordinates.
pankso@1111 133 * Axes min and max values are reported in raw coordinates.
pankso@1111 134 */
pankso@1111 135 - if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents,
pankso@1111 136 + if (InitValuatorClassDeviceStruct(dev, 2,
pankso@1111 137 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
pankso@1111 138 + axis_labels,
pankso@1111 139 +#endif
pankso@1111 140 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
pankso@1111 141 + xf86GetMotionEvents,
pankso@1111 142 +#endif
pankso@1111 143 local->history_size, Absolute) == FALSE)
pankso@1111 144 {
pankso@1111 145 ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n");
pankso@1111 146 return !Success;
pankso@1111 147 }
pankso@1111 148
pankso@1111 149 -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
pankso@1111 150 - xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width,
pankso@1111 151 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
pankso@1111 152 + xf86InitValuatorAxisStruct(dev, 0,
pankso@1111 153 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
pankso@1111 154 + axis_labels[0],
pankso@1111 155 +#endif
pankso@1111 156 + 0, priv->screen_width,
pankso@1111 157 1024,
pankso@1111 158 EV_AXIS_MIN_RES /* min_res */ ,
pankso@1111 159 EV_AXIS_MAX_RES /* max_res */ );
pankso@1111 160 xf86InitValuatorDefaults(dev, 0);
pankso@1111 161 - xf86InitValuatorAxisStruct(dev, 1, 0, priv->screen_height,
pankso@1111 162 + xf86InitValuatorAxisStruct(dev, 1,
pankso@1111 163 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
pankso@1111 164 + axis_labels[1],
pankso@1111 165 +#endif
pankso@1111 166 + 0, priv->screen_height,
pankso@1111 167 1024,
pankso@1111 168 EV_AXIS_MIN_RES /* min_res */ ,
pankso@1111 169 EV_AXIS_MAX_RES /* max_res */ );
pankso@1111 170 xf86InitValuatorDefaults(dev, 1);
pankso@1111 171 #else
pankso@1111 172 xf86InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x,
pankso@1111 173 + 1024,
pankso@1111 174 + EV_AXIS_MIN_RES /* min_res */ ,
pankso@1111 175 + EV_AXIS_MAX_RES /* max_res */ );
pankso@1111 176 xf86InitValuatorDefaults(dev, 1);
pankso@1111 177 #endif
pankso@1111 178