xf86-input-evtouch/xorg1.7_patch.diff

   1 --- evtouch.c.orig      2009-11-03 15:07:20.972895967 +0100
   2 +++ evtouch.c   2009-11-03 15:06:55.872895469 +0100
   3 @@ -166,7 +166,7 @@
   4  }
   5
   6
   7 -XF86ModuleData evtouchModuleData = {&VersionRec, Plug, Unplug };
   8 +_X_EXPORT XF86ModuleData evtouchModuleData = {&VersionRec, Plug, Unplug };
   9
  10  #endif /* XFree86LOADER */
  11
  12 @@ -590,6 +590,10 @@
  13          EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private);
  14          unsigned char map[EV_MAX_BUTTONS];
  15          int i;
  16 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
  17 +        Atom btn_label;
  18 +        Atom axis_labels[2] = { 0, 0 };
  19 +#endif
  20
  21          for (i = 0; i < EV_MAX_BUTTONS; i++)
  22                  map[i] = i;
  23 @@ -628,7 +632,11 @@
  24          /*
  25           * Device reports button press for 5 buttons.
  26           */
  27 -        if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, map) == FALSE)
  28 +        if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS,
  29 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
  30 +                 &btn_label,
  31 +#endif
  32 +                 map) == FALSE)
  33          {
  34                  ErrorF("Unable to allocate EVTouch touchscreen ButtonClassDeviceStruct\n");
  35                  return BadAlloc;
  36 @@ -653,18 +661,29 @@
  37           * Axes min and max values are reported in raw coordinates.
  38           */
  39          if (InitValuatorClassDeviceStruct(dev, 2,
  40 -                                          local->history_size, Absolute) == FALSE)
  41 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
  42 +                                     axis_labels,
  43 +#endif
  44 +                              local->history_size, Absolute) == FALSE)
  45          {
  46                  ErrorF ("Unable to allocate EVTouch touchscreen ValuatorClassDeviceStruct\n");
  47                  return !Success;
  48          }
  49
  50 -        xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width,
  51 +        xf86InitValuatorAxisStruct(dev, 0,
  52 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
  53 +                                          axis_labels[0],
  54 +#endif
  55 +                                   0, priv->screen_width,
  56                                     1024,
  57                                     EV_AXIS_MIN_RES /* min_res */ ,
  58                                     EV_AXIS_MAX_RES /* max_res */ );
  59          xf86InitValuatorDefaults(dev, 0);
  60 -        xf86InitValuatorAxisStruct(dev, 1, 0, priv->screen_height,
  61 +        xf86InitValuatorAxisStruct(dev, 1,
  62 +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
  63 +                                          axis_labels[1],
  64 +#endif
  65 +                                   0, priv->screen_height,
  66                                     1024,
  67                                     EV_AXIS_MIN_RES /* min_res */ ,
  68                                     EV_AXIS_MAX_RES /* max_res */ );