xscope: Changes to 'master'

[Alan Coopersmith]

 fd.c     |   48 +++++++++++++++++++++++++++++++-----------------
 prtype.c |    4 ++--
 scope.c  |    2 +-
 3 files changed, 34 insertions(+), 20 deletions(-)

New commits:
commit ea0a2788b1e82f2b19a3c46e6d42d0a86fd17f38
Author: Peter Jeremy <peterjeremy at acm.org>
Date:   Tue Feb 28 08:38:46 2012 +1100

    Bug 46696 - Try alternate protocol on X11 connection failure.
    
    In USE_XTRANS mode, MakeConnection() cycles through a selection of
    protocol choices until it finds one where it can open a socket to
    the server.  It then attempts an X11 connection via that socket and
    aborts if one isn't possible.
    
    This patch modifies the code to try an alternate protocol if the X11
    connection fails.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=46696
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit c328376384a64f6dbdc476a1d6c5244aad8261ec
Author: Peter Jeremy <peterjeremy at acm.org>
Date:   Mon Feb 27 20:46:29 2012 +1100

    Bug 46691 - xscope-1.3.1 deadlocks if client or server would block
    
    https://bugs.freedesktop.org/show_bug.cgi?id=46691
    
    Use correct write FD to select() on.
    
    FlushFD() contains logic to handle the Xclient or Xserver blocking on
    a write() by changing the global read and write fd_set's so that
    MainLoop() will select() on the blocking write FD instead of the peer
    read FD.  Unfortunately, the code contains a logic error so that it
    winds up select()ing for write on the peer FD instead of the blocked FD.
    
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit b21c6c52bb8109329d7eb63072f8ebf41a42a7f9
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sun Jul 8 11:12:27 2012 -0700

    Use __XFDS_BITS macros from Xpoll.h instead of direct __fds_bits access
    
    Different platforms use different names for the fd_set members,
    so use the existing Xpoll.h macros for greater portability.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit e63977f320b8678d66bb061b9502dc0764a5427f
Author: Peter Jeremy <peterjeremy at acm.org>
Date:   Mon Feb 27 19:08:25 2012 +1100

    Bug 46689 - xscope fd_set debug output is undefined
    
    https://bugs.freedesktop.org/show_bug.cgi?id=46689
    
    Change fd_set debug output to display actual contents of first 32 or 64 bits.
    
    In xscope-1.3.1, MainLoop() contains debug(128,...) code that appears
    intended to display the fd_set contents before and after the main
    select() call.  In most implementations, fd_set will be a struct though
    it is printed as an int, thus the actual debug output is unlikely to
    usefully reflect the actual fd_set contents.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>

commit 3bc1cf3e11be566e3d342834abe8fde7f5983a80
Author: Peter Jeremy <peterjeremy at acm.org>
Date:   Mon Feb 27 13:39:58 2012 +1100

    Bug 46664 - xscope prints only half the characters in 16-bit strings
    
    https://bugs.freedesktop.org/show_bug.cgi?id=46664
    
    The length fields for PolyText16 and ImageText16 represent the number of
    16-bit characters in the request but PrintString16() and PrintTString16()
    treat the lengths as the number of octets in the string - thus printing
    only half of the characters.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>