xorg/driver/xf86-input-citron - [PATCH] Don't call xf86SoundKbdBell and xf86XInputSetSendCoreEvents

[pcpa at mandriva.com.br]

Quoting Peter Hutterer <mailinglists at who-t.net>:

> Paulo Cesar Pereira de Andrade wrote:
> >>From db54ce9ef38b2b6d6f5991bf8fc0a9dface11907 Mon Sep 17 00:00:00 2001
> > From: Paulo Cesar Pereira de Andrade <pcpa at mandriva.com.br>
> > Date: Wed, 30 Jan 2008 16:47:18 -0200
> > Subject: [PATCH] Don't call xf86SoundKbdBell and 
> xf86XInputSetSendCoreEvents
> >
> > Only call those functions if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0.
> > ---
> >  src/citron.c |    4 ++++
> >  1 files changed, 4 insertions(+), 0 deletions(-)
> >
> > diff --git a/src/citron.c b/src/citron.c
> > index 42152b5..e024370 100644
> > --- a/src/citron.c
> > +++ b/src/citron.c
> > @@ -169,7 +169,9 @@ char version[]="Touch Driver V2.2.0  (c) 
> 1999-2006 Citron GmbH";
> >  /* extern void xf86SoundKbdBell(int loudness, int pitch, int duration); */
> >
> >  /* #define CIT_TIM	*/	/* Enable timer */
> > +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
> >  #define CIT_BEEP		/* enable beep feature */
> > +#endif
>
> I'm not particularly happy about this hunk.
>
> please put the ifdef into the cit_Beep and cit_BeepKey functions.

  Thanks again for the revivew. Is there some alternative to
xf86SoundKbdBell? If it exists, it would probably be a better
fix. The code that uses it is also very dependant on pc speaker.

  I made an alternate branch to create the new patch attached.



  I have been compiling everything with verbose gcc options, but not
checked many logs. But in this case there is only one warning:

citron.c:155:1: warning: "NEED_XF86_TYPES" redefined
In file included from ../config.h:4,
                 from citron.c:131:
/home/paulo/xorg/include/xorg/xorg-server.h:63:1: warning: this is the 
location
of the previous definition

  Maybe this also needs correction.

> Cheers,
>    Peter

Paulo


-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Don-t-call-xf86SoundKbdBell-and-xf86XInputSetSendCor.patch
Type: text/x-patch
Size: 2037 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg/attachments/20080204/1a68f0fa/attachment.bin>