[PULL] hw/xwin fixes + a warning fix

[Jon TURNEY]

Hi Keith,

Please consider pulling into master.

Thanks.

The following changes since commit 02775efb8930291cc62fc84086c97da75b912a55:

  int10: Fix unmapping of the BIOS scratch area (2012-01-25 09:26:23 -0800)

are available in the git repository at:
  git://people.freedesktop.org/~jturney/xserver xserver-next

Colin Harrison (3):
      hw/xwin: Ignore WM_DISPLAYCHANGE messages with 0 bpp
      hw/xwin: Fix winEnqueueMotion() for change in miPointerSetPosition()
      hw/xwin: Fix spelling of 'Canadian' in winkeybd.h

Jon TURNEY (9):
      Xext: Warning fix for shm.c
      hw/xwin: Give the X window for the clipboard integration client a name
      hw/xwin: Chain IOError handlers to avoid longjmp across threads
      hw/xwin: Remove some redundant OS version reporting
      hw/xwin: In multiwindow mode, don't grab native input focus for new
windows which hint they don't want it
      hw/xwin: turn on -emulate3buttons if less than 3 mouse buttons are reported
      hw/xwin: Handle the virtual key code generated by the Fn key on IBM
Lenovo laptops
      hw/xwin: Handle more motif window decoration hinting
      hw/xwin: Avoid WIN_WINDOW_PROP races during Windows window destruction

Michel Hummel (3):
      hw/xwin: Automatically restart clipboard thread
      hw/xwin: Remove no-longer needed tricks used to prevent the clipboard
client from being killed
      hw/xwin: Mitigate a race condition in clipboard thread initialization

Oliver Schmidt (1):
      hw/xwin: Fix AltGr key sometimes firing an additional Ctrl-L key

Roland Cassard (1):
      hw/xwin: Don't assume we'll always have converted the clipboard
selection after 2 attempts

Yaakov Selkowitz (1):
      hw/xwin: Improve XWinrc loading and error recovery

 Xext/shm.c                      |    2 +-
 hw/xwin/InitInput.c             |    6 --
 hw/xwin/InitOutput.c            |   31 +++++++++-
 hw/xwin/man/XWin.man            |    3 +-
 hw/xwin/win.h                   |    2 +
 hw/xwin/winclipboard.h          |    2 +
 hw/xwin/winclipboardthread.c    |   93 +++++++++++++++++++++++++-----
 hw/xwin/winclipboardunicode.c   |    4 +-
 hw/xwin/winclipboardwndproc.c   |   23 +------
 hw/xwin/winclipboardwrappers.c  |  122 +--------------------------------------
 hw/xwin/winengine.c             |   14 -----
 hw/xwin/winglobals.c            |    2 -
 hw/xwin/winkeybd.c              |   95 ++++++++++++++++++------------
 hw/xwin/winkeybd.h              |    6 +-
 hw/xwin/winkeynames.h           |    2 +-
 hw/xwin/winmouse.c              |    6 +-
 hw/xwin/winmultiwindowclass.h   |   10 +++
 hw/xwin/winmultiwindowwindow.c  |    2 -
 hw/xwin/winmultiwindowwm.c      |   72 +++++++++++++++++------
 hw/xwin/winmultiwindowwndproc.c |   25 +++++++-
 hw/xwin/winprefs.c              |   74 ++++++++++++++++++-----
 hw/xwin/winprefslex.l           |   10 ++-
 hw/xwin/winprocarg.c            |   15 ++++-
 hw/xwin/winwindow.h             |   11 ++-
 hw/xwin/winwndproc.c            |   12 +++-
 25 files changed, 365 insertions(+), 279 deletions(-)