[PULL] hw/xwin fixes

[Jon TURNEY]

On 23/07/2013 19:29, Keith Packard wrote:
> Jon TURNEY writes:
> 
>>       Allow DDX to provide a main()
> 
> Is it necessary to duplicate the stub main in hw/xwin/InitOutput?

Good point, it's clearly not needed.

> (also, you might fix your copyright date :-)

I'm pretty sure I wrote it in 2012 and I haven't changed it since then :-)

Branch updated and re-pushed.



The following changes since commit d5ebe20f9ba9569351c4a41449866679fd60ba45:

  Merge remote-tracking branch 'alanc/master' (2013-07-22 20:34:41 -0700)

are available in the git repository at:


  git://people.freedesktop.org/~jturney/xserver master

for you to fetch changes up to 43ac0491e36cdbb716b5c9d39c97d0aba3bebd75:

  hw/xwin: Fix numerous 64-bit format/type cast issues with debug printing of
pointers (2013-07-23 23:59:44 +0100)

----------------------------------------------------------------
Colin Harrison (1):
      hw/xwin: Fix possible crash in winMultiWindowGetClassHint

Jon TURNEY (12):
      Allow DDX to provide a main()
      hw/xwin: Improve WM_ENDSESSION handling using separate messaging window
thread
      hw/xwin: _NET_WM_STATE is ATOM[] not ATOM
      hw/xwin: Remove an extra '\n' from some log messages
      hw/xwin: Change winTranslateKey() to return it's result as it's return value
      hw/xwin: Remove unneeded WM_XBUTTON message defines
      hw/xwin: Map extra mouse buttons 1 and 2 to X buttons 8 and 9
      hw/xwin: Handle WM_MOUSEHWHEEL
      hw/xwin: Avoid a null dereference if CreateDIBSection() fails in
NetWMToWinIconAlpha()
      configure.ac: Check for python at configure time when building XWin with
AIGLX
      hw/xwin: Remove obsolete WIN_XEVENTS_SHUTDOWN
      hw/xwin: Fix numerous 64-bit format/type cast issues with debug printing
of pointers

Oliver Schmidt (1):
      hw/xwin: Consider left and right modifier keys independently on gaining
focus

 configure.ac                      |   6 +++++-
 dix/Makefile.am                   |   3 ++-
 dix/main.c                        |   6 +-----
 dix/stubmain.c                    |  35 +++++++++++++++++++++++++++++++++++
 hw/xwin/InitOutput.c              |  36 ++++++++++++++++++++++++++++++++++++
 hw/xwin/Makefile.am               |   3 ++-
 hw/xwin/glx/Makefile.am           |   4 ++--
 hw/xwin/win.h                     |  29 +++++++++++++++--------------
 hw/xwin/winclipboard.h            |   1 -
 hw/xwin/winclipboardthread.c      |  11 ++---------
 hw/xwin/winfillsp.c               |   2 +-
 hw/xwin/winglobals.c              |   1 +
 hw/xwin/winglobals.h              |   2 ++
 hw/xwin/winkeybd.c                |  62
++++++++++++++++++++++++++++++++++++++++++--------------------
 hw/xwin/winmessages.h             |   2 +-
 hw/xwin/winmouse.c                |  50
++++++++++++++++++++++++++++----------------------
 hw/xwin/winmsgwindow.c            | 180
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 hw/xwin/winmultiwindowclass.c     |  21 ++++++++++++++-------
 hw/xwin/winmultiwindowicons.c     |   4 ++++
 hw/xwin/winmultiwindowwm.c        |  36 ++++++++++++++++++++----------------
 hw/xwin/winmultiwindowwndproc.c   |  16 ++++++++++++++--
 hw/xwin/winscrinit.c              |   2 +-
 hw/xwin/winwin32rootless.c        |  44
++++++++++++++++++++++----------------------
 hw/xwin/winwin32rootlesswindow.c  |   4 ++--
 hw/xwin/winwin32rootlesswndproc.c |  27 ++++++++++++++++++---------
 hw/xwin/winwindow.h               |   1 +
 hw/xwin/winwindowswm.c            |   6 +++---
 hw/xwin/winwndproc.c              |  25 +++++++++++++++++++------
 28 files changed, 473 insertions(+), 146 deletions(-)
 create mode 100644 dix/stubmain.c
 create mode 100644 hw/xwin/winmsgwindow.c