[PATCH v2 02/42] dix: split positionSprite into scale_to_desktop and positionSprite

[Jamey Sharp]

Welp, I'm happy!

Reviewed-by: Jamey Sharp <jamey at minilop.net>

On Fri, Dec 16, 2011 at 10:28:31AM +1000, Peter Hutterer wrote:
> For future touch points, we need positionSprite to calculate the coordinates
> but we don't want to actually change the cursor position for non-emulating
> touches.
> 
> No functional changes at this point.
> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
> Changes to v1:
> - instead of an update argument to positionSprite to exit early (before the
>   miPointerSetPosition call), split into two functions.
> 
> This implies a change to [PATCH 19/42 dix: generate touchpoints from
> driver-submitted data] which changed from
> 
> scr = positionSprite(pDev, emulate_pointer, ....)
> to
> scr = scale_to_desktop(...)
> if (emulate_pointer)
>    scr = positionSprite(...)
> 
> I'll skip that patch to keep noise low on the list.
> 
>  dix/getevents.c |   72 +++++++++++++++++++++++++++++++++++++++---------------
>  1 files changed, 52 insertions(+), 20 deletions(-)
> 
> diff --git a/dix/getevents.c b/dix/getevents.c
> index 57d8c17..ea62ca8 100644
> --- a/dix/getevents.c
> +++ b/dix/getevents.c
> @@ -786,36 +786,28 @@ scale_from_screen(DeviceIntPtr dev, ValuatorMask *mask)
>  
>  
>  /**
> - * If we have HW cursors, this actually moves the visible sprite. If not, we
> - * just do all the screen crossing, etc.
> - *
> - * We scale from device to screen coordinates here, call
> - * miPointerSetPosition() and then scale back into device coordinates (if
> - * needed). miPSP will change x/y if the screen was crossed.
> + * Scale from (absolute) device to screen coordinates here,
>   *
> - * The coordinates provided are always absolute. The parameter mode
> - * specifies whether it was relative or absolute movement that landed us at
> - * those coordinates. see fill_pointer_events for information on coordinate
> - * systems.
> + * The coordinates provided are always absolute. see fill_pointer_events for
> + * information on coordinate systems.
>   *
>   * @param dev The device to be moved.
> - * @param mode Movement mode (Absolute or Relative)
> - * @param[in,out] mask Mask of axis values for this event, returns the
> - * per-screen device coordinates after confinement
> + * @param mask Mask of axis values for this event
>   * @param[out] devx x desktop-wide coordinate in device coordinate system
>   * @param[out] devy y desktop-wide coordinate in device coordinate system
>   * @param[out] screenx x coordinate in desktop coordinate system
>   * @param[out] screeny y coordinate in desktop coordinate system
>   */
>  static ScreenPtr
> -positionSprite(DeviceIntPtr dev, int mode, ValuatorMask *mask,
> -               double *devx, double *devy,
> -               double *screenx, double *screeny)
> +scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask,
> +                 double *devx, double *devy,
> +                 double *screenx, double *screeny)
>  {
> -    double x, y;
> -    double tmpx, tmpy;
>      ScreenPtr scr = miPointerGetScreen(dev);
> +    double x, y;
>  
> +    BUG_WARN(!dev->valuator);
> +    BUG_WARN(dev->valuator->numAxes < 2);
>      if (!dev->valuator || dev->valuator->numAxes < 2)
>          return scr;
>  
> @@ -834,11 +826,48 @@ positionSprite(DeviceIntPtr dev, int mode, ValuatorMask *mask,
>      *screeny = rescaleValuatorAxis(y, dev->valuator->axes + 1, NULL,
>                                     screenInfo.y, screenInfo.height);
>  
> -    tmpx = *screenx;
> -    tmpy = *screeny;
>      *devx = x;
>      *devy = y;
>  
> +    return scr;
> +}
> +
> +/**
> + * If we have HW cursors, this actually moves the visible sprite. If not, we
> + * just do all the screen crossing, etc.
> + *
> + * We use the screen coordinates here, call miPointerSetPosition() and then
> + * scale back into device coordinates (if needed). miPSP will change x/y if
> + * the screen was crossed.
> + *
> + * The coordinates provided are always absolute. The parameter mode
> + * specifies whether it was relative or absolute movement that landed us at
> + * those coordinates. see fill_pointer_events for information on coordinate
> + * systems.
> + *
> + * @param dev The device to be moved.
> + * @param mode Movement mode (Absolute or Relative)
> + * @param[out] mask Mask of axis values for this event, returns the
> + * per-screen device coordinates after confinement
> + * @param[in,out] devx x desktop-wide coordinate in device coordinate system
> + * @param[in,out] devy y desktop-wide coordinate in device coordinate system
> + * @param[in,out] screenx x coordinate in desktop coordinate system
> + * @param[in,out] screeny y coordinate in desktop coordinate system
> + */
> +static ScreenPtr
> +positionSprite(DeviceIntPtr dev, int mode, ValuatorMask *mask,
> +               double *devx, double *devy,
> +               double *screenx, double *screeny)
> +{
> +    ScreenPtr scr = miPointerGetScreen(dev);
> +    double tmpx, tmpy;
> +
> +    if (!dev->valuator || dev->valuator->numAxes < 2)
> +        return scr;
> +
> +    tmpx = *screenx;
> +    tmpy = *screeny;
> +
>      /* miPointerSetPosition takes care of crossing screens for us, as well as
>       * clipping to the current screen. Coordinates returned are in desktop
>       * coord system */
> @@ -858,11 +887,13 @@ positionSprite(DeviceIntPtr dev, int mode, ValuatorMask *mask,
>  
>      /* Recalculate the per-screen device coordinates */
>      if (valuator_mask_isset(mask, 0)) {
> +        double x;
>          x = rescaleValuatorAxis(*screenx - scr->x, NULL, dev->valuator->axes + 0,
>                                  0, scr->width);
>          valuator_mask_set_double(mask, 0, x);
>      }
>      if (valuator_mask_isset(mask, 1)) {
> +        double y;
>          y = rescaleValuatorAxis(*screeny - scr->y, NULL, dev->valuator->axes + 1,
>                                  0, scr->height);
>          valuator_mask_set_double(mask, 1, y);
> @@ -1251,6 +1282,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
>      if ((flags & POINTER_NORAW) == 0)
>          set_raw_valuators(raw, &mask, raw->valuators.data);
>  
> +    scale_to_desktop(pDev, &mask, &devx, &devy, &screenx, &screeny);
>      scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
>                           &mask, &devx, &devy, &screenx, &screeny);
>  
> -- 
> 1.7.7.1
> 
> Cheers,
>   Peter
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20111215/e7b7bc1c/attachment.pgp>