Merge lp://staging/~oif-team/frame/trunk.v1.0.2 into lp://staging/frame

Inconsistent #ifdef'ing around ABS_MT_DISTANCE: sometimes #if 0, sometimes #ifdef ABS_MT_DISTANCE.

You might want to fix that before committing.

Other than that, I find no obvious problems.

1. Velocity compensation for unchanged touches seems to work fine for mtdev, but works terribly for xi 2.1. I think this is due to the X timestamps being poorly correlated to evdev/device timing. We need to disable velocity compensation in the xi 2.1 branch for now. I think we should look into adding device timestamps as a valuator in xi.

2. I've changed the version number of libXi for our multitouch changes. There could be a 1.4.2 released between now and when the upstream libXI has xi 2.1 support, so I downgraded the version to 1.4.1.99.1. This change is not in the ppa, but will be in the ubuntu version of the package. Thus, the configure.ac check should be updated for it.

3. A minor nitpick :). configure.ac is checking for the x11 package twice. You can get rid of the following line:

PKG_CHECK_MODULES([X11], [x11])

Here is a patch for position filter inhibit for xi, please test :-)

diff --git a/src/frame-xi2.c b/src/frame-xi2.c
index 7fc38fd..98a43bd 100644
--- a/src/frame-xi2.c
+++ b/src/frame-xi2.c
@@ -288,6 +288,8 @@ utouch_frame_pump_xi2(utouch_frame_handle fh, const XIDevice
Event *ev)
   for (i = 0; i < nbit; i++)
    if (XIMaskIsSet(mask, i))
     handle_event(fh, slot, i, value[num++]);
+ /* no velocity adjustments without device time stamps */
+ slot->vx = slot->vy = 0;
   if (ev->evtype == XI_TouchEnd)
    utouch_frame_get_current_slot(fh)->id = -1;
   return utouch_frame_sync(fh, ev->time);

> Inconsistent #ifdef'ing around ABS_MT_DISTANCE: sometimes #if 0, sometimes
> #ifdef ABS_MT_DISTANCE.
>
> You might want to fix that before committing.
>
> Other than that, I find no obvious problems.

This is obviously not right, but placed here because of a missing variable in xserver-properties.h. I will add that variable to the ifdef instead.

I think all comments are now addressed. Pushed a new version of v1.0.2.

My concerns were addressed, good to go.