[RFC XI 2.1 - xserver 6/9] Make EventIsDeliverable non-static

Chase Douglas chase.douglas at canonical.com
Mon Nov 15 10:36:37 PST 2010


On 11/12/2010 10:13 PM, Cyril Brulebois wrote:
> Cyril Brulebois <kibi at debian.org> (13/11/2010):
>>> +extern WindowPtr XYToWindow(SpritePtr pSprite, int x, int y);
>>    ^^^^^^           ^^^^^^^^^^
>>        Collateral damage?
> 
> Apparently, that was intended, since it's used in a later commit
> (“Input: Add initial multitouch support from Xi 2.1”), just not
> documented in that commit, nor completely done.
> 
>> Removing the quoted line fixes it.
> 
> Instead, the fix would rather be removing the following lines from
> dix/events.c in the same commit:
> | -static WindowPtr XYToWindow(
> | -    SpritePtr pSprite,
> | -    int x,
> | -    int y
> | -);
> | -
> 
> as well as removing the “static” keyword in front of the function
> definition (in the same file)..
> 
> so that XYToWindow() is no longer static, for real. That seems to
> allow building with patches getting applied one by one (except for
> the <stdint.h> include issue I mentioned in another mail).

Thanks for finding this conflation of commits. I've separated the
XYToWindow non-static change to a separate commit, and I'll push the
changes to my branch on fdo in a bit.

-- Chase


More information about the xorg-devel mailing list