xserver: Branch 'master' - 14 commits

[Peter Hutterer]

On Tue, May 15, 2012 at 12:18:36PM +0200, Michal Suchanek wrote:
> Hello,
> 
> On 15 May 2012 06:20, Peter Hutterer <peter.hutterer at who-t.net> wrote:
> > On Mon, May 14, 2012 at 10:39:24AM -0700, Keith Packard wrote:
> 
> >> diff --git a/dix/enterleave.h b/dix/enterleave.h
> >> index 729059b..c937c0e 100644
> >> --- a/dix/enterleave.h
> >> +++ b/dix/enterleave.h
> >> @@ -60,9 +60,6 @@ extern void LeaveWindow(DeviceIntPtr dev);
> >>  extern void CoreFocusEvent(DeviceIntPtr kbd,
> >>                             int type, int mode, int detail, WindowPtr pWin);
> >>
> >> -extern void DeviceFocusEvent(DeviceIntPtr kbd,
> >> -                             int type, int mode, int detail, WindowPtr pWin);
> >> -
> >>  extern void SetFocusIn(DeviceIntPtr kbd, WindowPtr win);
> >>
> >>  extern void SetFocusOut(DeviceIntPtr dev);
> >
> > This hunk gives me
> >
> > enterleave.c: In function 'DeviceFocusOutEvents':
> > enterleave.c:618:9: error: implicit declaration of function
> > 'DeviceFocusEvent' [-Werror=implicit-function-declaration]
> > enterleave.c:618:9: warning: nested extern declaration of 'DeviceFocusEvent'
> > [-Wnested-externs]
> >
> 
> I did some compile tests but maybe this one slipped by.
> 
> Just add this additional hunk.

I think it'd be better to remove the DeviceFocusEvent() function from
exevents.h and leave it in enterleave.h instead, including that header where
needed. This way the focus/enter-leave functions are just in one header.

Cheers,
  Peter