This series of patches removes support for the ancient XInput ABI 0.x from the synaptics driver, which in turn makes some more cleanup patches possible. There seems to be a consensus that supporting XInput ABI older than 2.x is not really needed any more [1].
Caveat: do we need some changes to the configure script to detect building against a very old X server? Cheers, Magnus [1] http://lists.freedesktop.org/archives/xorg/2008-October/039276.html
Remove support for XInput ABI 0.x
Signed-off-by: Magnus Kessler <[EMAIL PROTECTED]>
diff --git a/src/synaptics.c b/src/synaptics.c
index 50bb6de..0286af8 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -68,10 +68,6 @@
#include <xf86Xinput.h>
#include <exevents.h>
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
-#include "mipointer.h"
-#endif
-
#include "synaptics.h"
#include "synapticsstr.h"
#include "synaptics-properties.h"
@@ -531,10 +527,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
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\n", PACKAGE_VERSION);
@@ -585,10 +577,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
goto SetupProc_fail;
}
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- local->history_size = xf86SetIntOption(opts, "HistorySize", 0);
-#endif
-
xf86ProcessCommonOptions(local, local->options);
local->flags |= XI86_CONFIGURED;
@@ -760,17 +748,11 @@ DeviceInit(DeviceIntPtr dev)
InitPointerDeviceStruct((DevicePtr)dev, map,
SYN_MAX_BUTTONS,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- miPointerGetMotionEvents,
-#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
GetMotionHistory,
#endif
SynapticsCtrl,
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- miPointerGetMotionBufferSize()
-#else
GetMotionHistorySize(), 2
-#endif
);
/* X valuator */
if (priv->minx < priv->maxx)
@@ -785,10 +767,6 @@ 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;
Remove all uses of DBG macro.
DBG macro was only supported with XInput ABI 0.x
Signed-off-by: Magnus Kessler <[EMAIL PROTECTED]>
diff --git a/src/synaptics.c b/src/synaptics.c
index 0286af8..36c510b 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -97,10 +97,6 @@ typedef enum {
#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
#endif
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 1
-#define DBG(a,b)
-#endif
-
/*****************************************************************************
* Forward declaration
****************************************************************************/
@@ -570,8 +566,6 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
goto SetupProc_fail;
priv->comm.buffer = XisbNew(local->fd, 200);
- DBG(9, XisbTrace(priv->comm.buffer, 1));
-
if (!QueryHardware(local)) {
xf86Msg(X_ERROR, "%s Unable to query/initialize Synaptics hardware.\n", local->name);
goto SetupProc_fail;
@@ -626,15 +620,6 @@ static void SynapticsUnInit(InputDriverPtr drv,
static void
SynapticsCtrl(DeviceIntPtr device, PtrCtrl *ctrl)
{
- DBG(3, ErrorF("SynapticsCtrl called.\n"));
- /*
- pInfo = device->public.devicePrivate;
- pMse = pInfo->private;
-
- pMse->num = ctrl->num;
- pMse->den = ctrl->den;
- pMse->threshold = ctrl->threshold;
- */
}
static Bool
@@ -668,8 +653,6 @@ DeviceOn(DeviceIntPtr dev)
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
SynapticsPrivate *priv = (SynapticsPrivate *) (local->private);
- DBG(3, ErrorF("Synaptics DeviceOn called\n"));
-
SetDeviceAndProtocol(local);
local->fd = xf86OpenSerial(local->options);
if (local->fd == -1) {
@@ -702,8 +685,6 @@ DeviceOff(DeviceIntPtr dev)
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
SynapticsPrivate *priv = (SynapticsPrivate *) (local->private);
- DBG(3, ErrorF("Synaptics DeviceOff called\n"));
-
if (local->fd != -1) {
TimerFree(priv->timer);
priv->timer = NULL;
@@ -739,8 +720,6 @@ DeviceInit(DeviceIntPtr dev)
unsigned char map[SYN_MAX_BUTTONS + 1];
int i;
- DBG(3, ErrorF("Synaptics DeviceInit called\n"));
-
for (i = 0; i <= SYN_MAX_BUTTONS; i++)
map[i] = i;
@@ -1101,33 +1080,26 @@ SelectTapButton(SynapticsPrivate *priv, edge_type edge)
default:
switch (edge) {
case RIGHT_TOP_EDGE:
- DBG(7, ErrorF("right top edge\n"));
tap = RT_TAP;
break;
case RIGHT_BOTTOM_EDGE:
- DBG(7, ErrorF("right bottom edge\n"));
tap = RB_TAP;
break;
case LEFT_TOP_EDGE:
- DBG(7, ErrorF("left top edge\n"));
tap = LT_TAP;
break;
case LEFT_BOTTOM_EDGE:
- DBG(7, ErrorF("left bottom edge\n"));
tap = LB_TAP;
break;
default:
- DBG(7, ErrorF("no edge\n"));
tap = F1_TAP;
break;
}
break;
case 2:
- DBG(7, ErrorF("two finger tap\n"));
tap = F2_TAP;
break;
case 3:
- DBG(7, ErrorF("three finger tap\n"));
tap = F3_TAP;
break;
}
@@ -1140,7 +1112,6 @@ static void
SetTapState(SynapticsPrivate *priv, enum TapState tap_state, int millis)
{
SynapticsSHM *para = priv->synpara;
- DBG(7, ErrorF("SetTapState - %d -> %d (millis:%d)\n", priv->tap_state, tap_state, millis));
switch (tap_state) {
case TS_START:
priv->tap_button_state = TBS_BUTTON_UP;
@@ -1177,9 +1148,6 @@ SetTapState(SynapticsPrivate *priv, enum TapState tap_state, int millis)
static void
SetMovingState(SynapticsPrivate *priv, enum MovingState moving_state, int millis)
{
- DBG(7, ErrorF("SetMovingState - %d -> %d center at %d/%d (millis:%d)\n", priv->moving_state,
- moving_state,priv->hwState.x, priv->hwState.y, millis));
-
if (moving_state == MS_TRACKSTICK) {
priv->trackstick_neutral_x = priv->hwState.x;
priv->trackstick_neutral_y = priv->hwState.y;
@@ -1598,7 +1566,6 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
priv->circ_scroll_on = TRUE;
priv->circ_scroll_vert = TRUE;
priv->scroll_a = angle(priv, hw->x, hw->y);
- DBG(7, ErrorF("circular scroll detected on edge\n"));
}
}
}
@@ -1610,14 +1577,12 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
priv->vert_scroll_twofinger_on = TRUE;
priv->vert_scroll_edge_on = FALSE;
priv->scroll_y = hw->y;
- DBG(7, ErrorF("vert two-finger scroll detected\n"));
}
if (!priv->horiz_scroll_twofinger_on &&
(para->scroll_twofinger_horiz) && (para->scroll_dist_horiz != 0)) {
priv->horiz_scroll_twofinger_on = TRUE;
priv->horiz_scroll_edge_on = FALSE;
priv->scroll_x = hw->x;
- DBG(7, ErrorF("horiz two-finger scroll detected\n"));
}
}
}
@@ -1627,13 +1592,11 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
(edge & RIGHT_EDGE)) {
priv->vert_scroll_edge_on = TRUE;
priv->scroll_y = hw->y;
- DBG(7, ErrorF("vert edge scroll detected on right edge\n"));
}
if ((para->scroll_edge_horiz) && (para->scroll_dist_horiz != 0) &&
(edge & BOTTOM_EDGE)) {
priv->horiz_scroll_edge_on = TRUE;
priv->scroll_x = hw->x;
- DBG(7, ErrorF("horiz edge scroll detected on bottom edge\n"));
}
}
}
@@ -1643,27 +1606,22 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
Bool oldh = priv->horiz_scroll_edge_on || (priv->circ_scroll_on && !priv->circ_scroll_vert);
if (priv->circ_scroll_on && !finger) {
/* circular scroll locks in until finger is raised */
- DBG(7, ErrorF("cicular scroll off\n"));
priv->circ_scroll_on = FALSE;
}
if (hw->numFingers < 2) {
if (priv->vert_scroll_twofinger_on) {
- DBG(7, ErrorF("vert two-finger scroll off\n"));
priv->vert_scroll_twofinger_on = FALSE;
}
if (priv->horiz_scroll_twofinger_on) {
- DBG(7, ErrorF("horiz two-finger scroll off\n"));
priv->horiz_scroll_twofinger_on = FALSE;
}
}
if (priv->vert_scroll_edge_on && (!(edge & RIGHT_EDGE) || !finger)) {
- DBG(7, ErrorF("vert edge scroll off\n"));
priv->vert_scroll_edge_on = FALSE;
}
if (priv->horiz_scroll_edge_on && (!(edge & BOTTOM_EDGE) || !finger)) {
- DBG(7, ErrorF("horiz edge scroll off\n"));
priv->horiz_scroll_edge_on = FALSE;
}
/* If we were corner edge scrolling (coasting),
@@ -1673,7 +1631,6 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
((edge & RIGHT_EDGE) && (edge & (TOP_EDGE | BOTTOM_EDGE))) ||
((edge & BOTTOM_EDGE) && (edge & (LEFT_EDGE | RIGHT_EDGE))) ;
if (!is_in_corner || !finger) {
- DBG(7, ErrorF("corner edge scroll off\n"));
stop_coasting(priv);
}
}
@@ -1696,7 +1653,6 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
/* FYI: We can generate multiple start_coasting requests if
* we're in the corner, but we were moving so slowly when we
* got here that we didn't actually start coasting. */
- DBG(7, ErrorF("corner edge scroll on\n"));
start_coasting(priv, hw, edge, TRUE);
}
} else if (para->circular_scrolling) {
@@ -1704,7 +1660,6 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
priv->circ_scroll_on = TRUE;
priv->circ_scroll_vert = TRUE;
priv->scroll_a = angle(priv, hw->x, hw->y);
- DBG(7, ErrorF("switching to circular scrolling\n"));
}
}
/* Same treatment for horizontal scrolling */
@@ -1715,7 +1670,6 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
/* FYI: We can generate multiple start_coasting requests if
* we're in the corner, but we were moving so slowly when we
* got here that we didn't actually start coasting. */
- DBG(7, ErrorF("corner edge scroll on\n"));
start_coasting(priv, hw, edge, FALSE);
}
} else if (para->circular_scrolling) {
@@ -1723,7 +1677,6 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw,
priv->circ_scroll_on = TRUE;
priv->circ_scroll_vert = FALSE;
priv->scroll_a = angle(priv, hw->x, hw->y);
- DBG(7, ErrorF("switching to circular scrolling\n"));
}
}
@@ -2101,7 +2054,6 @@ HandleState(LocalDevicePtr local, struct SynapticsHwState *hw)
static int
ControlProc(LocalDevicePtr local, xDeviceCtl * control)
{
- DBG(3, ErrorF("Control Proc called\n"));
return Success;
}
@@ -2109,13 +2061,11 @@ ControlProc(LocalDevicePtr local, xDeviceCtl * control)
static void
CloseProc(LocalDevicePtr local)
{
- DBG(3, ErrorF("Close Proc called\n"));
}
static int
SwitchMode(ClientPtr client, DeviceIntPtr dev, int mode)
{
- ErrorF("SwitchMode called\n");
return Success;
}
Convert last remaining ErrorF to xf86Msg
Signed-off-by: Magnus.Kessler <[EMAIL PROTECTED]>
diff --git a/src/synaptics.c b/src/synaptics.c
index 36c510b..cedf675 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -537,7 +537,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
/* open the touchpad device */
local->fd = xf86OpenSerial(local->options);
if (local->fd == -1) {
- ErrorF("Synaptics driver unable to open device\n");
+ xf86Msg(X_ERROR, "Synaptics driver unable to open device\n");
goto SetupProc_fail;
}
xf86ErrorFVerb(6, "port opened successfully\n");
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
