xorg-server: Changes to 'upstream-experimental'
Makefile.am | 14
Xext/Makefile.am | 4
Xext/dpmsproc.h | 4
Xext/geext.c | 2
Xext/hashtable.c | 14
Xext/hashtable.h | 8
Xext/panoramiX.c | 20
Xext/panoramiXprocs.c | 164 +-
Xext/panoramiXsrv.h | 2
Xext/saver.c | 74 -
Xext/security.c | 34
Xext/shape.c | 46
Xext/shm.c | 36
Xext/sleepuntil.c | 36
Xext/sleepuntil.h | 4
Xext/sync.c | 57
Xext/syncsrv.h | 6
Xext/xace.c | 6
Xext/xacestr.h | 4
Xext/xres.c | 36
Xext/xselinux_ext.c | 8
Xext/xselinux_hooks.c | 32
Xext/xtest.c | 2
Xext/xvdisp.c | 32
Xext/xvdix.h | 2
Xext/xvmain.c | 28
Xext/xvmc.c | 24
Xext/xvmcext.h | 12
Xi/Makefile.am | 5
Xi/devbell.c | 6
Xi/exevents.c | 36
Xi/extinit.c | 2
Xi/grabdev.c | 2
Xi/listdev.c | 4
Xi/xibarriers.c | 4
Xi/xichangecursor.c | 2
Xi/xichangehierarchy.c | 4
Xi/xipassivegrab.c | 6
Xi/xiproperty.c | 8
composite/compalloc.c | 2
composite/compext.c | 39
composite/compinit.c | 26
composite/compint.h | 9
composite/compositeext.h | 4
composite/compoverlay.c | 4
composite/compwindow.c | 29
config/Makefile.am | 26
config/config-backends.h | 35
config/config.c | 130 +
config/dbus-core.c | 40
config/dbus.c | 407 -----
config/hal.c | 23
config/non-seat0.conf.multi-seat | 18
config/udev.c | 84 -
config/xorg-server.conf | 13
configure.ac | 223 ++-
damageext/damageext.c | 6
damageext/damageextint.h | 2
dbe/dbe.c | 12
dbe/midbe.c | 4
dix/colormap.c | 26
dix/cursor.c | 10
dix/devices.c | 45
dix/dispatch.c | 90 -
dix/dixfonts.c | 90 -
dix/dixutils.c | 41
dix/events.c | 75 -
dix/extension.c | 14
dix/gc.c | 16
dix/getevents.c | 13
dix/globals.c | 11
dix/glyphcurs.c | 2
dix/grabs.c | 17
dix/inpututils.c | 3
dix/main.c | 6
dix/pixmap.c | 2
dix/privates.c | 6
dix/property.c | 4
dix/protocol.txt | 11
dix/resource.c | 42
dix/touch.c | 2
dix/window.c | 34
dri3/dri3.h | 14
dri3/dri3_event.c | 6
dri3/dri3_request.c | 42
dri3/dri3_screen.c | 16
exa/exa.c | 14
exa/exa.h | 6
exa/exa_accel.c | 1
exa/exa_classic.c | 2
exa/exa_driver.c | 4
exa/exa_glyphs.c | 8
exa/exa_migration_classic.c | 8
exa/exa_mixed.c | 4
exa/exa_offscreen.c | 2
exa/exa_priv.h | 22
exa/exa_render.c | 6
exa/exa_unaccel.c | 4
fb/Makefile.am | 3
fb/fb.h | 16
fb/fb24_32.c | 4
fb/fb24_32.h | 4
fb/fbblt.c | 60
fb/fbglyph.c | 4
fb/fboverlay.c | 12
fb/fboverlay.h | 10
fb/fbpict.c | 4
fb/fbpict.h | 15
fb/fbpixmap.c | 2
fb/fbscreen.c | 10
glamor/Makefile.am | 51
glamor/glamor.c | 698 +++++++++
glamor/glamor.h | 460 ++++++
glamor/glamor_addtraps.c | 61
glamor/glamor_compositerects.c | 276 +++
glamor/glamor_context.h | 56
glamor/glamor_copyarea.c | 630 ++++++++
glamor/glamor_copyplane.c | 75 +
glamor/glamor_copywindow.c | 56
glamor/glamor_core.c | 561 +++++++
glamor/glamor_debug.h | 107 +
glamor/glamor_egl.c | 840 +++++++++++
glamor/glamor_egl_stubs.c | 56
glamor/glamor_eglmodule.c | 51
glamor/glamor_fbo.c | 585 +++++++
glamor/glamor_fill.c | 361 ++++
glamor/glamor_font.c | 186 ++
glamor/glamor_font.h | 49
glamor/glamor_getimage.c | 96 +
glamor/glamor_glx.c | 76 +
glamor/glamor_glyphblt.c | 323 ++++
glamor/glamor_glyphs.c | 1808 ++++++++++++++++++++++++
glamor/glamor_gradient.c | 1494 ++++++++++++++++++++
glamor/glamor_largepixmap.c | 1417 +++++++++++++++++++
glamor/glamor_picture.c | 131 +
glamor/glamor_pixmap.c | 1696 +++++++++++++++++++++++
glamor/glamor_points.c | 144 +
glamor/glamor_polylines.c | 136 +
glamor/glamor_priv.h | 1069 ++++++++++++++
glamor/glamor_program.c | 386 +++++
glamor/glamor_program.h | 94 +
glamor/glamor_putimage.c | 161 ++
glamor/glamor_rects.c | 189 ++
glamor/glamor_render.c | 1983 +++++++++++++++++++++++++++
glamor/glamor_segment.c | 39
glamor/glamor_spans.c | 438 +++++
glamor/glamor_text.c | 526 +++++++
glamor/glamor_tile.c | 298 ++++
glamor/glamor_transfer.c | 264 +++
glamor/glamor_transfer.h | 55
glamor/glamor_transform.c | 215 ++
glamor/glamor_transform.h | 87 +
glamor/glamor_trapezoid.c | 1826 ++++++++++++++++++++++++
glamor/glamor_triangles.c | 74 +
glamor/glamor_utils.h | 1513 ++++++++++++++++++++
glamor/glamor_vbo.c | 186 ++
glamor/glamor_window.c | 99 +
glamor/glamor_xv.c | 609 ++++++++
glx/glthread.c | 204 --
glx/glxcmds.c | 6
glx/glxdri2.c | 61
glx/glxdricommon.c | 4
glx/glxdriswrast.c | 25
glx/glxext.c | 8
glx/glxserver.h | 1
glx/indirect_program.c | 22
glx/indirect_texture_compression.c | 8
hw/Makefile.am | 9
hw/dmx/Makefile.am | 1
hw/dmx/config/Canvas.c | 8
hw/dmx/config/xdmxconfig.c | 6
hw/dmx/dmx.c | 4
hw/dmx/dmxclient.h | 11
hw/dmx/dmxextension.c | 32
hw/dmx/dmxfont.c | 2
hw/dmx/dmxgc.c | 2
hw/dmx/dmxgc.h | 2
hw/dmx/dmxgcops.c | 8
hw/dmx/dmxgcops.h | 4
hw/dmx/dmxinit.c | 4
hw/dmx/dmxpict.c | 20
hw/dmx/dmxpict.h | 2
hw/dmx/dmxstat.c | 2
hw/dmx/dmxsync.c | 6
hw/dmx/dmxwindow.c | 6
hw/dmx/glxProxy/glxcmds.c | 86 -
hw/dmx/glxProxy/glxext.c | 6
hw/dmx/glxProxy/glxswap.c | 4
hw/dmx/input/dmxbackend.c | 10
hw/dmx/input/dmxbackend.h | 10
hw/dmx/input/dmxcommon.c | 8
hw/dmx/input/dmxcommon.h | 6
hw/dmx/input/dmxconsole.c | 16
hw/dmx/input/dmxconsole.h | 12
hw/dmx/input/dmxevents.c | 3
hw/dmx/input/dmxinputinit.c | 25
hw/dmx/input/dmxinputinit.h | 26
hw/dmx/input/lnx-keyboard.c | 12
hw/dmx/input/lnx-keyboard.h | 12
hw/dmx/input/lnx-ms.c | 8
hw/dmx/input/lnx-ms.h | 8
hw/dmx/input/lnx-ps2.c | 8
hw/dmx/input/lnx-ps2.h | 8
hw/dmx/input/usb-common.c | 4
hw/dmx/input/usb-common.h | 4
hw/kdrive/ephyr/Makefile.am | 20
hw/kdrive/ephyr/ephyr.c | 95 +
hw/kdrive/ephyr/ephyr.h | 14
hw/kdrive/ephyr/ephyr_glamor_glx.c | 346 ++++
hw/kdrive/ephyr/ephyr_glamor_glx.h | 83 +
hw/kdrive/ephyr/ephyrdriext.c | 1
hw/kdrive/ephyr/ephyrinit.c | 21
hw/kdrive/ephyr/ephyrvideo.c | 40
hw/kdrive/ephyr/hostx.c | 143 +
hw/kdrive/linux/linux.c | 4
hw/kdrive/src/Makefile.am | 5
hw/kdrive/src/kcmap.c | 8
hw/kdrive/src/kdrive.c | 2
hw/kdrive/src/kdrive.h | 8
hw/kdrive/src/kinput.c | 8
hw/kdrive/src/kxv.c | 37
hw/kdrive/src/kxv.h | 56
hw/vfb/InitOutput.c | 31
hw/vfb/Makefile.am | 11
hw/xfree86/.gitignore | 1
hw/xfree86/Makefile.am | 25
hw/xfree86/Xorg.sh.in | 11
hw/xfree86/common/dgaproc.h | 2
hw/xfree86/common/vidmodeproc.h | 32
hw/xfree86/common/xf86.h | 65
hw/xfree86/common/xf86AutoConfig.c | 4
hw/xfree86/common/xf86Bus.c | 2
hw/xfree86/common/xf86Bus.h | 2
hw/xfree86/common/xf86Config.c | 74 -
hw/xfree86/common/xf86Config.h | 8
hw/xfree86/common/xf86Configure.c | 131 -
hw/xfree86/common/xf86DGA.c | 12
hw/xfree86/common/xf86DPMS.c | 2
hw/xfree86/common/xf86Events.c | 356 ++--
hw/xfree86/common/xf86Extensions.c | 6
hw/xfree86/common/xf86Globals.c | 2
hw/xfree86/common/xf86Helper.c | 77 -
hw/xfree86/common/xf86InPriv.h | 3
hw/xfree86/common/xf86Init.c | 43
hw/xfree86/common/xf86Mode.c | 4
hw/xfree86/common/xf86Module.h | 24
hw/xfree86/common/xf86Opt.h | 4
hw/xfree86/common/xf86Option.c | 5
hw/xfree86/common/xf86Optionstr.h | 6
hw/xfree86/common/xf86PM.c | 2
hw/xfree86/common/xf86Priv.h | 6
hw/xfree86/common/xf86Privstr.h | 8
hw/xfree86/common/xf86VGAarbiter.c | 12
hw/xfree86/common/xf86VGAarbiterPriv.h | 16
hw/xfree86/common/xf86VidMode.c | 40
hw/xfree86/common/xf86Xinput.c | 97 +
hw/xfree86/common/xf86Xinput.h | 16
hw/xfree86/common/xf86cmap.c | 2
hw/xfree86/common/xf86fbman.c | 21
hw/xfree86/common/xf86fbman.h | 16
hw/xfree86/common/xf86pciBus.c | 12
hw/xfree86/common/xf86pciBus.h | 2
hw/xfree86/common/xf86platformBus.c | 90 -
hw/xfree86/common/xf86platformBus.h | 18
hw/xfree86/common/xf86sbusBus.h | 14
hw/xfree86/common/xf86str.h | 97 -
hw/xfree86/common/xf86vmode.c | 18
hw/xfree86/common/xf86xv.c | 8
hw/xfree86/common/xf86xv.h | 30
hw/xfree86/common/xf86xvmc.h | 2
hw/xfree86/ddc/ddc.c | 2
hw/xfree86/ddc/interpret_edid.c | 137 +
hw/xfree86/ddc/xf86DDC.h | 2
hw/xfree86/dixmods/Makefile.am | 4
hw/xfree86/dixmods/glxmodule.c | 12
hw/xfree86/doc/ddxDesign.xml | 4
hw/xfree86/dri/dri.c | 73
hw/xfree86/dri/dri.h | 18
hw/xfree86/dri2/dri2.c | 6
hw/xfree86/exa/examodule.c | 2
hw/xfree86/fbdevhw/fbdevhw.c | 8
hw/xfree86/glamor_egl/Makefile.am | 43
hw/xfree86/i2c/bt829.c | 17
hw/xfree86/i2c/fi1236.c | 2
hw/xfree86/i2c/msp3430.c | 6
hw/xfree86/i2c/xf86i2c.h | 2
hw/xfree86/int10/generic.c | 54
hw/xfree86/int10/helper_exec.c | 208 +-
hw/xfree86/int10/helper_mem.c | 2
hw/xfree86/int10/stub.c | 2
hw/xfree86/int10/xf86int10.h | 76 -
hw/xfree86/int10/xf86x86emu.c | 12
hw/xfree86/loader/loaderProcs.h | 4
hw/xfree86/loader/loadmod.c | 22
hw/xfree86/man/Makefile.am | 5
hw/xfree86/man/Xorg.man | 6
hw/xfree86/man/Xorg.wrap.man | 67
hw/xfree86/man/Xwrapper.config.man | 1
hw/xfree86/man/xorg.conf.man | 6
hw/xfree86/modes/xf86Crtc.c | 72
hw/xfree86/modes/xf86Crtc.h | 4
hw/xfree86/modes/xf86Cursors.c | 35
hw/xfree86/modes/xf86EdidModes.c | 9
hw/xfree86/modes/xf86Modes.c | 6
hw/xfree86/modes/xf86RandR12.c | 15
hw/xfree86/modes/xf86Rotate.c | 9
hw/xfree86/modes/xf86cvt.c | 5
hw/xfree86/modes/xf86gtf.c | 2
hw/xfree86/os-support/bsd/alpha_video.c | 98 -
hw/xfree86/os-support/bsd/arm_video.c | 48
hw/xfree86/os-support/bsd/bsd_apm.c | 2
hw/xfree86/os-support/bsd/bsd_ev56.c | 48
hw/xfree86/os-support/bsd/bsd_kqueue_apm.c | 2
hw/xfree86/os-support/bsd/i386_video.c | 32
hw/xfree86/os-support/bsd/ppc_video.c | 10
hw/xfree86/os-support/bsd/sparc64_video.c | 10
hw/xfree86/os-support/bus/Sbus.c | 16
hw/xfree86/os-support/bus/nobus.c | 5
hw/xfree86/os-support/hurd/hurd_video.c | 6
hw/xfree86/os-support/linux/Makefile.am | 6
hw/xfree86/os-support/linux/int10/linux.c | 26
hw/xfree86/os-support/linux/lnx_acpi.c | 11
hw/xfree86/os-support/linux/lnx_apm.c | 2
hw/xfree86/os-support/linux/lnx_ev56.c | 36
hw/xfree86/os-support/linux/lnx_init.c | 30
hw/xfree86/os-support/linux/lnx_kmod.c | 4
hw/xfree86/os-support/linux/lnx_platform.c | 42
hw/xfree86/os-support/linux/lnx_video.c | 104 -
hw/xfree86/os-support/linux/systemd-logind.c | 605 ++++++++
hw/xfree86/os-support/shared/posix_tty.c | 6
hw/xfree86/os-support/shared/vidmem.c | 14
hw/xfree86/os-support/solaris/sun_apm.c | 2
hw/xfree86/os-support/solaris/sun_init.c | 2
hw/xfree86/os-support/solaris/sun_vid.c | 6
hw/xfree86/os-support/xf86OSpriv.h | 10
hw/xfree86/os-support/xf86_OSproc.h | 4
hw/xfree86/parser/Configint.h | 4
hw/xfree86/parser/DRI.c | 14
hw/xfree86/parser/Device.c | 45
hw/xfree86/parser/Extensions.c | 4
hw/xfree86/parser/Files.c | 18
hw/xfree86/parser/Flags.c | 29
hw/xfree86/parser/Input.c | 11
hw/xfree86/parser/InputClass.c | 71
hw/xfree86/parser/Layout.c | 33
hw/xfree86/parser/Module.c | 17
hw/xfree86/parser/Monitor.c | 87 -
hw/xfree86/parser/Pointer.c | 35
hw/xfree86/parser/Screen.c | 63
hw/xfree86/parser/Vendor.c | 9
hw/xfree86/parser/Video.c | 17
hw/xfree86/parser/configProcs.h | 4
hw/xfree86/parser/read.c | 103 -
hw/xfree86/parser/scan.c | 39
hw/xfree86/parser/xf86Parser.h | 84 -
hw/xfree86/ramdac/IBM.c | 6
hw/xfree86/ramdac/TI.c | 3
hw/xfree86/ramdac/xf86Cursor.c | 11
hw/xfree86/ramdac/xf86Cursor.h | 4
hw/xfree86/ramdac/xf86CursorPriv.h | 4
hw/xfree86/ramdac/xf86HWCurs.c | 27
hw/xfree86/sdksyms.sh | 1
hw/xfree86/shadowfb/shadow.c | 16
hw/xfree86/utils/cvt/cvt.c | 8
hw/xfree86/vbe/vbe.c | 12
hw/xfree86/vbe/vbe.h | 6
hw/xfree86/vbe/vbeModes.c | 6
hw/xfree86/vbe/vbeModes.h | 2
hw/xfree86/vgahw/Makefile.am | 1
hw/xfree86/vgahw/vgaCmap.c | 2
hw/xfree86/vgahw/vgaHW.h | 10
hw/xfree86/x86emu/ops.c | 172 +-
hw/xfree86/x86emu/x86emu/regs.h | 5
hw/xfree86/xorg-wrapper.c | 231 +++
hw/xnest/Color.c | 22
hw/xnest/Events.c | 6
hw/xnest/Font.c | 4
hw/xnest/GC.c | 6
hw/xnest/GCOps.c | 8
hw/xnest/GCOps.h | 4
hw/xnest/Handlers.c | 4
hw/xnest/Handlers.h | 6
hw/xnest/Init.c | 22
hw/xnest/Keyboard.c | 2
hw/xnest/Keyboard.h | 2
hw/xnest/Makefile.am | 9
hw/xnest/Pixmap.c | 2
hw/xnest/Window.c | 12
hw/xnest/XNGC.h | 2
hw/xnest/XNPixmap.h | 2
hw/xquartz/GL/indirect.c | 4
hw/xquartz/Makefile.am | 1
hw/xquartz/X11Application.m | 13
hw/xquartz/X11Controller.m | 2
hw/xquartz/applewm.c | 40
hw/xquartz/darwinfb.h | 2
hw/xquartz/mach-startup/stub.c | 4
hw/xquartz/quartz.c | 8
hw/xquartz/quartzCocoa.m | 8
hw/xquartz/quartzCommon.h | 4
hw/xquartz/xpr/appledri.c | 10
hw/xquartz/xpr/dri.c | 8
hw/xquartz/xpr/dri.h | 2
hw/xquartz/xpr/driWrap.c | 4
hw/xquartz/xpr/x-hook.c | 27
hw/xwayland/.gitignore | 3
hw/xwayland/Makefile.am | 30
hw/xwayland/xwayland-cursor.c | 193 ++
hw/xwayland/xwayland-cvt.c | 304 ++++
hw/xwayland/xwayland-input.c | 666 +++++++++
hw/xwayland/xwayland-output.c | 226 +++
hw/xwayland/xwayland-shm.c | 292 +++
hw/xwayland/xwayland.c | 652 ++++++++
hw/xwayland/xwayland.h | 164 ++
hw/xwin/InitInput.c | 9
hw/xwin/InitOutput.c | 17
hw/xwin/Makefile.am | 9
hw/xwin/glx/gen_gl_wrappers.py | 45
hw/xwin/glx/indirect.c | 4
hw/xwin/man/XWin.man | 6
hw/xwin/win.h | 17
hw/xwin/winallpriv.c | 4
hw/xwin/winauth.c | 4
hw/xwin/winblock.c | 2
hw/xwin/winclipboardinit.c | 2
hw/xwin/winclipboardxevents.c | 5
hw/xwin/wincmap.c | 2
hw/xwin/winconfig.c | 16
hw/xwin/winconfig.h | 26
hw/xwin/wincursor.c | 10
hw/xwin/windialogs.c | 56
hw/xwin/wingc.c | 4
hw/xwin/winglobals.c | 1
hw/xwin/winglobals.h | 1
hw/xwin/winkeybd.c | 6
hw/xwin/winmonitors.h | 2
hw/xwin/winmsgwindow.c | 4
hw/xwin/winmultiwindowicons.c | 26
hw/xwin/winmultiwindowwindow.c | 6
hw/xwin/winmultiwindowwm.c | 140 +
hw/xwin/winmultiwindowwndproc.c | 24
hw/xwin/winnativegdi.c | 3
hw/xwin/winpfbdd.c | 2
hw/xwin/winpixmap.c | 2
hw/xwin/winprefslex.l | 3
hw/xwin/winprefsyacc.y | 25
hw/xwin/winprocarg.c | 5
hw/xwin/winresource.h | 3
hw/xwin/winshaddd.c | 2
hw/xwin/winshadddnl.c | 2
hw/xwin/winshadgdi.c | 8
hw/xwin/winwakeup.c | 2
hw/xwin/winwin32rootless.c | 8
hw/xwin/winwindow.c | 6
hw/xwin/winwindowswm.c | 28
hw/xwin/winwndproc.c | 6
include/Makefile.am | 3
include/callback.h | 10
include/closestr.h | 4
include/colormap.h | 8
include/cursor.h | 2
include/dbus-core.h | 56
include/dix-config.h.in | 34
include/dix.h | 35
include/dixfont.h | 12
include/dixfontstubs.h | 2
include/dixgrabs.h | 2
include/dixstruct.h | 11
include/eventstr.h | 2
include/extension.h | 3
include/extnsionst.h | 6
include/gc.h | 4
include/gcstruct.h | 12
include/globals.h | 2
include/hotplug.h | 33
include/input.h | 15
include/inputstr.h | 2
include/miscstruct.h | 4
include/opaque.h | 8
include/os.h | 44
include/pixmap.h | 2
include/privates.h | 16
include/property.h | 4
include/propertyst.h | 2
include/resource.h | 42
include/scrnintstr.h | 17
include/systemd-logind.h | 45
include/window.h | 8
include/windowstr.h | 2
include/xkbrules.h | 28
include/xkbsrv.h | 32
include/xorg-config.h.in | 14
include/xorg-server.h.in | 3
include/xwin-config.h.in | 6
m4/xorg-tls.m4 | 4
manpages.am | 1
mi/mi.h | 14
mi/miarc.c | 2
mi/mibitblt.c | 2
mi/micmap.c | 2
mi/midispcur.c | 6
mi/mieq.c | 6
mi/miexpose.c | 2
mi/migc.c | 8
mi/migc.h | 49
mi/miglblt.c | 4
mi/miinitext.c | 46
mi/mioverlay.c | 4
mi/mipointer.c | 5
mi/mipolyrect.c | 2
mi/miscrinit.c | 17
mi/misprite.c | 6
mi/miwindow.c | 70
miext/damage/damage.c | 11
miext/damage/damagestr.h | 4
miext/rootless/rootlessCommon.c | 4
miext/rootless/rootlessGC.c | 12
miext/rootless/rootlessScreen.c | 6
miext/rootless/rootlessWindow.c | 2
miext/shadow/shadow.c | 8
miext/sync/misyncstr.h | 1
os/WaitFor.c | 12
os/access.c | 74 -
os/auth.c | 4
os/connection.c | 57
os/io.c | 17
os/log.c | 8
os/rpcauth.c | 4
os/utils.c | 45
os/xdmauth.c | 18
os/xdmcp.c | 91 -
present/present.c | 2
present/present_event.c | 6
present/present_fake.c | 2
present/present_request.c | 2
pseudoramiX/pseudoramiX.c | 8
randr/randr.c | 20
randr/randrstr.h | 14
randr/rrcrtc.c | 37
randr/rrdispatch.c | 6
randr/rrmode.c | 4
randr/rroutput.c | 4
randr/rrproperty.c | 14
randr/rrprovider.c | 4
randr/rrproviderproperty.c | 14
record/record.c | 61
render/animcur.c | 2
render/glyph.c | 8
render/glyphstr.h | 2
render/mipict.c | 8
render/mipict.h | 2
render/mirect.c | 2
render/picture.c | 28
render/picturestr.h | 10
render/render.c | 62
test/Makefile.am | 9
test/hashtabletest.c | 8
test/input.c | 58
test/os.c | 4
test/signal-logging.c | 17
test/touch.c | 20
test/xfree86.c | 3
test/xi2/protocol-common.c | 71
test/xi2/protocol-common.h | 4
test/xi2/protocol-xigetselectedevents.c | 2
test/xi2/protocol-xipassivegrabdevice.c | 15
test/xi2/protocol-xiquerydevice.c | 2
test/xi2/protocol-xiqueryversion.c | 4
test/xkb.c | 18
test/xtest.c | 2
xfixes/cursor.c | 36
xfixes/region.c | 20
xfixes/select.c | 12
xfixes/xfixes.c | 2
xfixes/xfixes.h | 2
xkb/ddxBeep.c | 10
xkb/ddxLoad.c | 246 ++-
xkb/maprules.c | 73
xkb/xkb.c | 26
xkb/xkbAccessX.c | 26
xkb/xkbActions.c | 108 -
xkb/xkbEvents.c | 4
xkb/xkbInit.c | 59
xkb/xkbUtils.c | 43
584 files changed, 32412 insertions(+), 5156 deletions(-)
New commits:
commit bd3de10f86a511886b0748d55fa19860314a0150
Author: Keith Packard <keithp@keithp.com>
Date: Tue Apr 8 14:25:18 2014 -0700
Bump to version 1.15.99.902. Closing the 1.16 merge window.
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/configure.ac b/configure.ac
index 70eceab..695a481 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,9 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.15.99.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2014-02-24"
-RELEASE_NAME="Szechuan Hot Pot"
+AC_INIT([xorg-server], 1.15.99.902, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2014-04-08"
+RELEASE_NAME="Glacier Blue"
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 6ec04a75deb1695820e337abbefe1929d5928f15
Author: Keith Packard <keithp@keithp.com>
Date: Fri Apr 4 16:28:43 2014 -0700
dri3: Fix dri3_open API change by adding new dri3_open_client
Xwayland will eventually need the current client in dri3_open. Simply
changing that API is not an option though as other drivers that
implement DRI3 will not have a matching function signature and will
crash when called.
Add a new dri3_open_client function pointer and bump
DRI3_SCREEN_INFO_VERSION so that drivers can be aware of the new
function which will be used in preference to the old function when
available.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anhole <eric@anholt.net>
diff --git a/dri3/dri3.h b/dri3/dri3.h
index 1c04cbd..edc7fa2 100644
--- a/dri3/dri3.h
+++ b/dri3/dri3.h
@@ -30,13 +30,17 @@
#include <X11/extensions/dri3proto.h>
#include <randrstr.h>
-#define DRI3_SCREEN_INFO_VERSION 0
+#define DRI3_SCREEN_INFO_VERSION 1
-typedef int (*dri3_open_proc)(ClientPtr client,
- ScreenPtr screen,
+typedef int (*dri3_open_proc)(ScreenPtr screen,
RRProviderPtr provider,
int *fd);
+typedef int (*dri3_open_client_proc)(ClientPtr client,
+ ScreenPtr screen,
+ RRProviderPtr provider,
+ int *fd);
+
typedef PixmapPtr (*dri3_pixmap_from_fd_proc) (ScreenPtr screen,
int fd,
CARD16 width,
@@ -56,6 +60,10 @@ typedef struct dri3_screen_info {
dri3_open_proc open;
dri3_pixmap_from_fd_proc pixmap_from_fd;
dri3_fd_from_pixmap_proc fd_from_pixmap;
+
+ /* Version 1 */
+ dri3_open_client_proc open_client;
+
} dri3_screen_info_rec, *dri3_screen_info_ptr;
extern _X_EXPORT Bool
diff --git a/dri3/dri3_screen.c b/dri3/dri3_screen.c
index bbf1d05..6c0c60c 100644
--- a/dri3/dri3_screen.c
+++ b/dri3/dri3_screen.c
@@ -30,6 +30,14 @@
#include <misyncshm.h>
#include <randrstr.h>
+static inline Bool has_open(dri3_screen_info_ptr info) {
+ if (info == NULL)
+ return FALSE;
+
+ return info->open != NULL ||
+ (info->version >= 1 && info->open_client != NULL);
+}
+
int
dri3_open(ClientPtr client, ScreenPtr screen, RRProviderPtr provider, int *fd)
{
@@ -37,10 +45,14 @@ dri3_open(ClientPtr client, ScreenPtr screen, RRProviderPtr provider, int *fd)
dri3_screen_info_ptr info = ds->info;
int rc;
- if (!info || !info->open)
+ if (!has_open(info))
return BadMatch;
- rc = (*info->open) (client, screen, provider, fd);
+ if (info->version >= 1 && info->open_client != NULL)
+ rc = (*info->open_client) (client, screen, provider, fd);
+ else
+ rc = (*info->open) (screen, provider, fd);
+
if (rc != Success)
return rc;
diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
index e2b6a92..d37de9b 100644
--- a/glamor/glamor_egl.c
+++ b/glamor/glamor_egl.c
@@ -608,10 +608,10 @@ glamor_egl_close_screen(ScreenPtr screen)
}
static int
-glamor_dri3_open(ClientPtr client,
- ScreenPtr screen,
- RRProviderPtr provider,
- int *fdp)
+glamor_dri3_open_client(ClientPtr client,
+ ScreenPtr screen,
+ RRProviderPtr provider,
+ int *fdp)
{
ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
struct glamor_egl_screen_private *glamor_egl =
@@ -658,8 +658,8 @@ glamor_dri3_open(ClientPtr client,
}
static dri3_screen_info_rec glamor_dri3_info = {
- .version = 0,
- .open = glamor_dri3_open,
+ .version = 1,
+ .open_client = glamor_dri3_open_client,
.pixmap_from_fd = glamor_pixmap_from_fd,
.fd_from_pixmap = glamor_fd_from_pixmap,
};
commit 901fbfbbbd71c0d82080957f8ba09eebbc786f2b
Author: Michael Thayer <michael.thayer@oracle.com>
Date: Mon Mar 31 11:21:42 2014 +0200
Add a return value to load_cursor_argb() to allow it to report failure
load_cursor_argb() may need to be able to fail and have the server fall back
to a software cursor in at least the following circumstances.
1) The hardware can only support some ARGB cursors and this does not just
depend on cursor size.
2) Virtual hardware may not wish to pass through a cursor to the host at a
particular time but may wish to accept the same cursor at another time.
This patch adds a return value to the API and makes the server do the
software fall-back on failure.
Signed-off-by: Michael Thayer <michael.thayer@oracle.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index e8c24f2..62ac95d 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -80,7 +80,7 @@ typedef enum {
* mask is 0xFFFF0000.
*/
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(16, 0)
+#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(17, 0)
#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 0)
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(8, 0)
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index c127d78..5407deb 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h
@@ -186,13 +186,13 @@ typedef struct _xf86CrtcFuncs {
/**
* Load monochrome image
*/
- void
+ Bool
(*load_cursor_image) (xf86CrtcPtr crtc, CARD8 *image);
/**
* Load ARGB image
*/
- void
+ Bool
(*load_cursor_argb) (xf86CrtcPtr crtc, CARD32 *image);
/**
diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c
index 2b0db34..10ef6f6 100644
--- a/hw/xfree86/modes/xf86Cursors.c
+++ b/hw/xfree86/modes/xf86Cursors.c
@@ -211,7 +211,7 @@ set_bit(CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask)
/*
* Load a two color cursor into a driver that supports only ARGB cursors
*/
-static void
+static Bool
xf86_crtc_convert_cursor_to_argb(xf86CrtcPtr crtc, unsigned char *src)
{
ScrnInfoPtr scrn = crtc->scrn;
@@ -244,7 +244,7 @@ xf86_crtc_convert_cursor_to_argb(xf86CrtcPtr crtc, unsigned char *src)
bits = 0;
cursor_image[y * cursor_info->MaxWidth + x] = bits;
}
- crtc->funcs->load_cursor_argb(crtc, cursor_image);
+ return crtc->funcs->load_cursor_argb(crtc, cursor_image);
}
/*
@@ -415,7 +415,7 @@ xf86_set_cursor_position(ScrnInfoPtr scrn, int x, int y)
/*
* Load a two-color cursor into a crtc, performing rotation as needed
*/
-static void
+static Bool
xf86_crtc_load_cursor_image(xf86CrtcPtr crtc, CARD8 *src)
{
ScrnInfoPtr scrn = crtc->scrn;
@@ -450,13 +450,13 @@ xf86_crtc_load_cursor_image(xf86CrtcPtr crtc, CARD8 *src)
set_bit(cursor_image, cursor_info, x, y, TRUE);
}
}
- crtc->funcs->load_cursor_image(crtc, cursor_image);
+ return crtc->funcs->load_cursor_image(crtc, cursor_image);
}
/*
* Load a cursor image into all active CRTCs
*/
-static void
+static Bool
xf86_load_cursor_image(ScrnInfoPtr scrn, unsigned char *src)
{
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
@@ -466,12 +466,17 @@ xf86_load_cursor_image(ScrnInfoPtr scrn, unsigned char *src)
xf86CrtcPtr crtc = xf86_config->crtc[c];
if (crtc->enabled) {
- if (crtc->funcs->load_cursor_image)
- xf86_crtc_load_cursor_image(crtc, src);
- else if (crtc->funcs->load_cursor_argb)
- xf86_crtc_convert_cursor_to_argb(crtc, src);
+ if (crtc->funcs->load_cursor_image) {
+ if (!xf86_crtc_load_cursor_image(crtc, src))
+ return FALSE;
+ } else if (crtc->funcs->load_cursor_argb) {
+ if (!xf86_crtc_convert_cursor_to_argb(crtc, src))
+ return FALSE;
+ } else
+ return FALSE;
}
}
+ return TRUE;
}
static Bool
@@ -516,7 +521,7 @@ xf86_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
return TRUE;
}
-static void
+static Bool
xf86_crtc_load_cursor_argb(xf86CrtcPtr crtc, CursorPtr cursor)
{
ScrnInfoPtr scrn = crtc->scrn;
@@ -544,10 +549,10 @@ xf86_crtc_load_cursor_argb(xf86CrtcPtr crtc, CursorPtr cursor)
cursor_image[y * image_width + x] = bits;
}
- crtc->funcs->load_cursor_argb(crtc, cursor_image);
+ return crtc->funcs->load_cursor_argb(crtc, cursor_image);
}
-static void
+static Bool
xf86_load_cursor_argb(ScrnInfoPtr scrn, CursorPtr cursor)
{
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
@@ -557,8 +562,10 @@ xf86_load_cursor_argb(ScrnInfoPtr scrn, CursorPtr cursor)
xf86CrtcPtr crtc = xf86_config->crtc[c];
if (crtc->enabled)
- xf86_crtc_load_cursor_argb(crtc, cursor);
+ if (!xf86_crtc_load_cursor_argb(crtc, cursor))
+ return FALSE;
}
+ return TRUE;
}
Bool
@@ -608,6 +615,8 @@ xf86_cursors_init(ScreenPtr screen, int max_width, int max_height, int flags)
* Called when anything on the screen is reconfigured.
*
* Reloads cursor images as needed, then adjusts cursor positions
+ * @note We assume that all hardware cursors to be loaded have already been
+ * found to be usable by the hardware.
*/
void
diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c
index bc71623..872d3d4 100644
--- a/hw/xfree86/ramdac/IBM.c
+++ b/hw/xfree86/ramdac/IBM.c
@@ -570,7 +570,7 @@ IBMramdac640SetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
(*ramdacPtr->WriteData) (pScrn, bg);
}
-static void
+static Bool
IBMramdac526LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
{
RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
@@ -582,9 +582,10 @@ IBMramdac526LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
*/
for (i = 0; i < 1024; i++)
(*ramdacPtr->WriteDAC) (pScrn, IBMRGB_curs_array + i, 0x00, (*src++));
+ return TRUE;
}
-static void
+static Bool
IBMramdac640LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
{
RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
@@ -596,6 +597,7 @@ IBMramdac640LoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
*/
for (i = 0; i < 1024; i++)
(*ramdacPtr->WriteDAC) (pScrn, RGB640_CURS_WRITE + i, 0x00, (*src++));
+ return TRUE;
}
static Bool
diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c
index 393b774..7d4e0d7 100644
--- a/hw/xfree86/ramdac/TI.c
+++ b/hw/xfree86/ramdac/TI.c
@@ -642,7 +642,7 @@ TIramdacSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
(*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_COLOR, 0, (fg & 0x000000ff));
}
-static void
+static Bool
TIramdacLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
{
RamDacRecPtr ramdacPtr = RAMDACSCRPTR(pScrn);
@@ -657,6 +657,7 @@ TIramdacLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src)
/* NOT_DONE: might need a delay here */
(*ramdacPtr->WriteDAC) (pScrn, TIDAC_CURS_RAM_DATA, 0, *(src++));
}
+ return TRUE;
}
static Bool
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
index 860704e..fac6822 100644
--- a/hw/xfree86/ramdac/xf86Cursor.c
+++ b/hw/xfree86/ramdac/xf86Cursor.c
@@ -352,12 +352,13 @@ xf86CursorSetCursor(DeviceIntPtr pDev, ScreenPtr pScreen, CursorPtr pCurs,
(*ScreenPriv->spriteFuncs->SetCursor) (pDev, pScreen,
NullCursor, x, y);
- xf86SetCursor(pScreen, cursor, x, y);
- ScreenPriv->SWCursor = FALSE;
- ScreenPriv->isUp = TRUE;
+ if (xf86SetCursor(pScreen, cursor, x, y)) {
+ ScreenPriv->SWCursor = FALSE;
+ ScreenPriv->isUp = TRUE;
- miPointerSetWaitForUpdate(pScreen, !infoPtr->pScrn->silkenMouse);
- return;
+ miPointerSetWaitForUpdate(pScreen, !infoPtr->pScrn->silkenMouse);
+ return;
+ }
}
miPointerSetWaitForUpdate(pScreen, TRUE);
diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h
index 5658e7b..1ecbdcd 100644
--- a/hw/xfree86/ramdac/xf86Cursor.h
+++ b/hw/xfree86/ramdac/xf86Cursor.h
@@ -12,7 +12,7 @@ typedef struct _xf86CursorInfoRec {
int MaxHeight;
void (*SetCursorColors) (ScrnInfoPtr pScrn, int bg, int fg);
void (*SetCursorPosition) (ScrnInfoPtr pScrn, int x, int y);
- void (*LoadCursorImage) (ScrnInfoPtr pScrn, unsigned char *bits);
+ Bool (*LoadCursorImage) (ScrnInfoPtr pScrn, unsigned char *bits);
void (*HideCursor) (ScrnInfoPtr pScrn);
void (*ShowCursor) (ScrnInfoPtr pScrn);
unsigned char *(*RealizeCursor) (struct _xf86CursorInfoRec *, CursorPtr);
@@ -20,7 +20,7 @@ typedef struct _xf86CursorInfoRec {
#ifdef ARGB_CURSOR
Bool (*UseHWCursorARGB) (ScreenPtr, CursorPtr);
- void (*LoadCursorARGB) (ScrnInfoPtr, CursorPtr);
+ Bool (*LoadCursorARGB) (ScrnInfoPtr, CursorPtr);
#endif
} xf86CursorInfoRec, *xf86CursorInfoPtr;
diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h
index a5d2aab..f34c1c7 100644
Reply to: