Hi Keith,
Various patches from me.
Please consider pulling into master.
The following changes since commit 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56:
int10: Fix error check for pci_device_map_legacy (2015-03-13 12:31:21 +1000)
are available in the git repository at:
git://people.freedesktop.org/~jturney/xserver
for you to fetch changes up to 95e83ff87ab0149ab01c9299524dfbe37d9b21a2:
Don't allow both RandR XINERAMA and pseudoramiX XINERAMA extensions to
register (2015-03-24 14:46:39 +0000)
----------------------------------------------------------------
Jon TURNEY (13):
ephyr: Avoid a segfault with 'DISPLAY= Xephy -glamor'
os: XDMCP options like -query etc. should imply -listen tcp
os: Teach vpnprintf() how to handle "%*.*s"
hw/xwin/glx: Refactor parsing of the <proto> XML element
hw/xwin/glx: Improve code generator to deal with latest Khronos OpenGL
registry XML
hw/xwin: Report Cygwin version information in log
hw/xwin: Turn on -hostintitle by default
Make PseudoramiXExtensionInit() prototype more generally available
hw/xwin: Register native screens with pseudoramiX
hw/xwin: Only set native positions if XINERAMA is enabled
hw/xwin: Remove Shadow DirectDraw engine
hw/xwin: Report OS version in log
Don't allow both RandR XINERAMA and pseudoramiX XINERAMA extensions to
register
hw/kdrive/ephyr/hostx.c | 2 +-
hw/xquartz/quartz.c | 1 +
hw/xwin/InitOutput.c | 61 +-
hw/xwin/Makefile.am | 2 +-
hw/xwin/XWin.exe.manifest | 16 +-
hw/xwin/glx/gen_gl_wrappers.py | 96 ++--
hw/xwin/man/XWin.man | 11 +-
hw/xwin/win.h | 35 +-
hw/xwin/winengine.c | 26 -
hw/xwin/winglobals.c | 2 +-
hw/xwin/winos.c | 72 +++
hw/xwin/winprocarg.c | 20 +
hw/xwin/winscrinit.c | 23 +-
hw/xwin/winshaddd.c | 1221 ----------------------------------------
hw/xwin/winwndproc.c | 6 +-
include/Makefile.am | 1 +
include/extinit.h | 5 -
include/nonsdk_extinit.h | 35 ++
os/log.c | 28 +-
os/xdmcp.c | 17 +
pseudoramiX/pseudoramiX.c | 6 +-
pseudoramiX/pseudoramiX.h | 2 -
randr/rrxinerama.c | 5 +
23 files changed, 333 insertions(+), 1360 deletions(-)
create mode 100644 hw/xwin/winos.c
delete mode 100644 hw/xwin/winshaddd.c
create mode 100644 include/nonsdk_extinit.h
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
