[PATCH keyboard 3/3] Remove support for X input ABI < 12

[Peter Hutterer]

On Thu, Nov 26, 2015 at 10:22:59PM +0500, Alexandr Shadchin wrote:
> On Wed, Nov 25, 2015 at 07:19:48AM +1000, Peter Hutterer wrote:
> > On Tue, Nov 24, 2015 at 12:46:44PM +0500, Alexandr Shadchin wrote:
> > > Signed-off-by: Alexandr Shadchin <alexandr.shadchin at gmail.com>
> > 
> > do you have follow-up patches that require these changes? I'm ok merging
> > this set if it makes follow-ups easier, but a patchset just to remove
> > functionality seems a bit superfluous.
> > 
> > Cheers,
> >    Peter
> > 
> 
> Not yet. I found these changes in my repository.
> I considered that it makes sense, xorg-server 1.10 was released in 2011.
> 
> evdev and synaptics: xorg-server >= 1.12

ok, fair enough. pushed this patchset but in the future it'd be better to
have something requiring the removal, otherwise we're just churning code for
no particular reason.

   ccf63a6..9ab8998  master -> master

thanks

Cheers,
   Peter

> 
> > > ---
> > >  configure.ac |  2 +-
> > >  src/kbd.c    | 83 ++++++++++--------------------------------------------------
> > >  2 files changed, 14 insertions(+), 71 deletions(-)
> > > 
> > > diff --git a/configure.ac b/configure.ac
> > > index 6fd6576..993d5a8 100644
> > > --- a/configure.ac
> > > +++ b/configure.ac
> > > @@ -44,7 +44,7 @@ XORG_MACROS_VERSION(1.8)
> > >  XORG_DEFAULT_OPTIONS
> > >  
> > >  # Obtain compiler/linker options from server and required extensions
> > > -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4] xproto inputproto)
> > > +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto inputproto)
> > >  
> > >  # Define a configure option for an alternate input module directory
> > >  AC_ARG_WITH(xorg-module-dir,
> > > diff --git a/src/kbd.c b/src/kbd.c
> > > index 1ce4ee6..e378dcc 100644
> > > --- a/src/kbd.c
> > > +++ b/src/kbd.c
> > > @@ -53,11 +53,7 @@
> > >  /* Used to know when the first DEVICE_ON after a DEVICE_INIT is called */
> > >  #define INITFLAG	(1U << 31)
> > >  
> > > -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
> > > -static InputInfoPtr KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags);
> > > -#else
> > >  static int KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
> > > -#endif
> > >  static int KbdProc(DeviceIntPtr device, int what);
> > >  static void KbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl);
> > >  static void KbdBell(int percent, DeviceIntPtr dev, pointer ctrl, int unused);
> > > @@ -132,43 +128,8 @@ _X_EXPORT XF86ModuleData kbdModuleData = {
> > >      NULL
> > >  };
> > >  
> > > -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
> > > -static int
> > > -NewKbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
> > > -
> > > -static InputInfoPtr
> > > -KbdPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
> > > -{
> > > -    InputInfoPtr pInfo;
> > > -
> > > -    if (!(pInfo = xf86AllocateInput(drv, 0)))
> > > -	return NULL;
> > > -
> > > -    pInfo->name = dev->identifier;
> > > -    pInfo->flags = XI86_KEYBOARD_CAPABLE;
> > > -    pInfo->conversion_proc = NULL;
> > > -    pInfo->reverse_conversion_proc = NULL;
> > > -    pInfo->private_flags = 0;
> > > -    pInfo->always_core_feedback = NULL;
> > > -    pInfo->conf_idev = dev;
> > > -    pInfo->close_proc = NULL;
> > > -
> > > -    if (NewKbdPreInit(drv, pInfo, flags) == Success)
> > > -    {
> > > -        pInfo->flags |= XI86_CONFIGURED;
> > > -        return pInfo;
> > > -    }
> > > -
> > > -    xf86DeleteInput(pInfo, 0);
> > > -    return NULL;
> > > -}
> > > -
> > > -static int
> > > -NewKbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
> > > -#else
> > >  static int
> > >  KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
> > > -#endif
> > >  {
> > >      KbdDevPtr pKbd;
> > >      char *s;
> > > @@ -189,11 +150,7 @@ KbdPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
> > >      pInfo->dev = NULL;
> > >  
> > >      defaults = kbdDefaults;
> > > -    xf86CollectInputOptions(pInfo, defaults
> > > -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
> > > -            , NULL
> > > -#endif
> > > -            );
> > > +    xf86CollectInputOptions(pInfo, defaults);
> > >      xf86ProcessCommonOptions(pInfo, pInfo->options); 
> > >  
> > >      if (!(pKbd = calloc(sizeof(KbdDevRec), 1))) {
> > > @@ -335,6 +292,7 @@ KbdProc(DeviceIntPtr device, int what)
> > >  
> > >    InputInfoPtr pInfo = device->public.devicePrivate;
> > >    KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
> > > +  XkbRMLVOSet rmlvo;
> > >    KeySymsRec           keySyms;
> > >    CARD8                modMap[MAP_LENGTH];
> > >    int                  ret;
> > > @@ -348,23 +306,19 @@ KbdProc(DeviceIntPtr device, int what)
> > >           pKbd->KbdGetMapping(pInfo, &keySyms, modMap);
> > >  
> > >           device->public.on = FALSE;
> > > -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
> > > +         rmlvo.rules = xkb_rules;
> > > +         rmlvo.model = xkb_model;
> > > +         rmlvo.layout = xkb_layout;
> > > +         rmlvo.variant = xkb_variant;
> > > +         rmlvo.options = xkb_options;
> > > +
> > > +         if (!InitKeyboardDeviceStruct(device, &rmlvo, KbdBell, KbdCtrl))
> > >           {
> > > -             XkbRMLVOSet rmlvo;
> > > -             rmlvo.rules = xkb_rules;
> > > -             rmlvo.model = xkb_model;
> > > -             rmlvo.layout = xkb_layout;
> > > -             rmlvo.variant = xkb_variant;
> > > -             rmlvo.options = xkb_options;
> > > -
> > > -             if (!InitKeyboardDeviceStruct(device, &rmlvo, KbdBell, KbdCtrl))
> > > -             {
> > > -                 xf86Msg(X_ERROR, "%s: Keyboard initialization failed. This "
> > > -                         "could be a missing or incorrect setup of "
> > > -                         "xkeyboard-config.\n", device->name);
> > > +             xf86Msg(X_ERROR, "%s: Keyboard initialization failed. This "
> > > +                     "could be a missing or incorrect setup of "
> > > +                     "xkeyboard-config.\n", device->name);
> > >  
> > > -                 return BadValue;
> > > -             }
> > > +             return BadValue;
> > >           }
> > >  # ifdef XI_PROP_DEVICE_NODE
> > >           {
> > > @@ -381,17 +335,6 @@ KbdProc(DeviceIntPtr device, int what)
> > >               }
> > >           }
> > >  # endif /* XI_PROP_DEVICE_NODE */
> > > -#else
> > > -         {
> > > -             XkbComponentNamesRec xkbnames;
> > > -             memset(&xkbnames, 0, sizeof(xkbnames));
> > > -             XkbSetRulesDflts(xkb_rules, xkb_model, xkb_layout,
> > > -                              xkb_variant, xkb_options);
> > > -             XkbInitKeyboardDeviceStruct(device, &xkbnames, &keySyms,
> > > -                                         modMap, KbdBell,
> > > -                                         (KbdCtrlProcPtr)KbdCtrl);
> > > -         }
> > > -#endif /* XINPUT ABI 5*/
> > >           InitKBD(pInfo, TRUE);
> > >           break;
> > >    case DEVICE_ON:
> > > -- 
> > > 2.6.3
> > > 
> 
> -- 
> Alexandr Shadchin
>