libX11: Changes to 'master'

[Peter Hutterer]

 include/X11/Xlib.h |   16 ++++++++++++++++
 src/XlibInt.c      |   12 +++++++++++-
 src/xcb_io.c       |   13 +++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

New commits:
commit e9195db7257e418f83707233baeeb84b225caf4f
Merge: c34f76f475bc632490122e67b5a82575d69d5569 a7f85567a3e850fba0c44571453d2852ab1a09be
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Thu May 22 12:14:28 2008 +0930

    Merge branch 'master' into xge

commit c34f76f475bc632490122e67b5a82575d69d5569
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Mon May 12 21:46:24 2008 +0930

    Pull down extra bytes when reading a GenericEvent (non-xcb).
    
    I refuse to take any responsibily for this code. It works, I guess.
    But - all the flushing is done somewhere before that, so we might need to
    flush here. Under some circumstances anyway. Don't ask me, I'm an optical
    illusion.
    
    Build with xcb as transport layer highly recommended.

commit c9b2ff1e6a607463993afa4a8d085857d97cc2f3
Merge: 17d7dcbfced4a9417b33507bd3fd9b7dd8268242 9129057bdbff0ec9cd8bb780cf7f85f134a291eb
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Mon May 12 17:58:37 2008 +0930

    Merge branch 'master' into xge

commit 17d7dcbfced4a9417b33507bd3fd9b7dd8268242
Merge: 5dfefd3829d3ba7e41d5db0ad28e9dfee92fadd5 13ac80469f6958cabac596834e203bd9cb6d4c94
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Thu Dec 6 14:08:29 2007 +1030

    Merge branch 'master' into xge

commit 5dfefd3829d3ba7e41d5db0ad28e9dfee92fadd5
Merge: a68a1cd7cb990ba276fbc36a7591044d78b3d3c1 eff33ae525337ce2026be135a26464c7b1237113
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Thu Dec 6 13:57:09 2007 +1030

    Merge branch 'master' into xge
    
    Conflicts:
    
    	src/xcb_io.c

commit a68a1cd7cb990ba276fbc36a7591044d78b3d3c1
Author: Peter Hutterer <peter at cs.unisa.edu.au>
Date:   Tue May 15 16:54:01 2007 +0930

    Add XGenericEvent definition and handling for long events.