xorg-server: Changes to 'upstream-experimental'
GL/glx/glxdri.c | 39
GL/glx/renderpix.c | 1
GL/glx/renderpixswap.c | 1
GL/glx/singlepix.c | 1
GL/glx/singlesize.h | 1
GL/glx/xfont.c | 1
XTrap/xtrapdiswp.c | 1
XTrap/xtrapditbl.c | 1
Xext/fontcache.c | 2
Xext/panoramiX.h | 1
Xext/sampleEVI.c | 1
Xext/security.c | 8
Xext/shmint.h | 2
Xext/xcalibrate.c | 2
Xext/xvdisp.h | 2
Xi/exevents.c | 6
afb/afbbres.c | 1
afb/afbbresd.c | 1
afb/afbbstore.c | 1
afb/afbfont.c | 1
afb/afbmisc.c | 1
afb/afbpntwin.c | 1
cfb/cfbcppl.c | 2
cfb/cfbtab.h | 2
composite/compalloc.c | 16
composite/compext.c | 16
composite/compinit.c | 2
composite/compint.h | 2
composite/compwindow.c | 35
configure.ac | 42
damageext/damageext.c | 2
damageext/damageext.h | 2
damageext/damageextint.h | 2
dbe/dbestruct.h | 1
dbe/midbe.h | 3
dix/devices.c | 77
dix/dispatch.c | 10
dix/dixutils.c | 2
dix/events.c | 32
dix/getevents.c | 1
dix/grabs.c | 47
dix/main.c | 2
dix/resource.c | 2
dix/tables.c | 15
dix/window.c | 14
dix/xpstubs.c | 1
exa/exa_accel.c | 27
exa/exa_offscreen.c | 2
fb/Makefile.am | 21
fb/fb.h | 3
fb/fb24_32.h | 2
fb/fballpriv.c | 2
fb/fbarc.c | 2
fb/fbbits.c | 2
fb/fbbits.h | 2
fb/fbblt.c | 2
fb/fbbltone.c | 2
fb/fbbstore.c | 2
fb/fbcopy.c | 27
fb/fbfill.c | 58
fb/fbfillrect.c | 2
fb/fbfillsp.c | 2
fb/fbgc.c | 2
fb/fbgetsp.c | 2
fb/fbimage.c | 2
fb/fbline.c | 2
fb/fbmmx.c | 2898 --------------------
fb/fbmmx.h | 294 --
fb/fbpict.c | 474 ---
fb/fbpixmap.c | 2
fb/fbpoint.c | 2
fb/fbpush.c | 2
fb/fbrop.h | 2
fb/fbseg.c | 2
fb/fbsetsp.c | 2
fb/fbsolid.c | 2
fb/fbstipple.c | 2
fb/fbtile.c | 14
fb/fbtrap.c | 4
fb/fbutil.c | 2
fb/fbwindow.c | 45
fb/wfbrename.h | 2
hw/darwin/apple/X11Application.h | 1
hw/darwin/apple/X11Controller.h | 1
hw/darwin/apple/bundle-main.c | 1
hw/darwin/quartz/XApplication.h | 1
hw/darwin/quartz/cr/cr.h | 1
hw/darwin/quartz/keysym2ucs.c | 3
hw/darwin/quartz/keysym2ucs.h | 3
hw/darwin/quartz/quartzKeyboard.c | 1
hw/darwin/quartz/xpr/Xplugin.h | 1
hw/darwin/quartz/xpr/appledri.h | 1
hw/darwin/quartz/xpr/appledristr.h | 1
hw/darwin/quartz/xpr/x-hash.c | 1
hw/darwin/quartz/xpr/x-hash.h | 1
hw/darwin/quartz/xpr/x-hook.c | 2
hw/darwin/quartz/xpr/x-hook.h | 2
hw/darwin/quartz/xpr/x-list.c | 1
hw/darwin/quartz/xpr/x-list.h | 1
hw/dmx/config/Canvas.c | 1
hw/dmx/config/Canvas.h | 1
hw/dmx/config/CanvasP.h | 1
hw/dmx/config/dmxcompat.c | 1
hw/dmx/config/dmxcompat.h | 1
hw/dmx/config/dmxconfig.c | 1
hw/dmx/config/dmxconfig.h | 1
hw/dmx/config/dmxparse.c | 1
hw/dmx/config/dmxparse.h | 1
hw/dmx/config/dmxprint.c | 1
hw/dmx/config/dmxprint.h | 1
hw/dmx/config/dmxtodmx.c | 1
hw/dmx/config/vdltodmx.c | 1
hw/dmx/config/xdmxconfig.c | 3
hw/dmx/dmx.c | 1
hw/dmx/dmx.h | 1
hw/dmx/dmxcb.c | 1
hw/dmx/dmxcb.h | 1
hw/dmx/dmxclient.h | 1
hw/dmx/dmxcmap.c | 1
hw/dmx/dmxcmap.h | 1
hw/dmx/dmxcursor.c | 1
hw/dmx/dmxcursor.h | 1
hw/dmx/dmxdpms.c | 1
hw/dmx/dmxdpms.h | 1
hw/dmx/dmxextension.c | 1
hw/dmx/dmxextension.h | 1
hw/dmx/dmxfont.c | 1
hw/dmx/dmxfont.h | 1
hw/dmx/dmxgc.c | 1
hw/dmx/dmxgc.h | 1
hw/dmx/dmxgcops.c | 1
hw/dmx/dmxgcops.h | 1
hw/dmx/dmxinit.c | 1
hw/dmx/dmxinit.h | 1
hw/dmx/dmxinput.c | 1
hw/dmx/dmxinput.h | 1
hw/dmx/dmxlog.c | 1
hw/dmx/dmxlog.h | 1
hw/dmx/dmxpict.c | 1
hw/dmx/dmxpict.h | 1
hw/dmx/dmxpixmap.c | 1
hw/dmx/dmxpixmap.h | 1
hw/dmx/dmxprop.c | 1
hw/dmx/dmxprop.h | 1
hw/dmx/dmxscrinit.c | 1
hw/dmx/dmxscrinit.h | 1
hw/dmx/dmxshadow.c | 1
hw/dmx/dmxshadow.h | 1
hw/dmx/dmxstat.c | 1
hw/dmx/dmxstat.h | 1
hw/dmx/dmxsync.c | 1
hw/dmx/dmxsync.h | 1
hw/dmx/dmxvisual.c | 1
hw/dmx/dmxvisual.h | 1
hw/dmx/dmxwindow.c | 1
hw/dmx/dmxwindow.h | 1
hw/dmx/examples/dmxaddinput.c | 1
hw/dmx/examples/dmxaddscreen.c | 1
hw/dmx/examples/dmxreconfig.c | 1
hw/dmx/examples/dmxresize.c | 1
hw/dmx/examples/dmxrminput.c | 1
hw/dmx/examples/dmxrmscreen.c | 1
hw/dmx/examples/dmxwininfo.c | 1
hw/dmx/examples/ev.c | 1
hw/dmx/examples/evi.c | 1
hw/dmx/examples/res.c | 1
hw/dmx/examples/xbell.c | 1
hw/dmx/examples/xdmx.c | 1
hw/dmx/examples/xinput.c | 1
hw/dmx/examples/xled.c | 1
hw/dmx/examples/xtest.c | 1
hw/dmx/glxProxy/glxswap.c | 1
hw/dmx/glxProxy/glxswap.h | 1
hw/dmx/input/ChkNotMaskEv.c | 1
hw/dmx/input/ChkNotMaskEv.h | 1
hw/dmx/input/dmxarg.c | 1
hw/dmx/input/dmxarg.h | 1
hw/dmx/input/dmxbackend.c | 1
hw/dmx/input/dmxbackend.h | 1
hw/dmx/input/dmxcommon.c | 1
hw/dmx/input/dmxcommon.h | 1
hw/dmx/input/dmxconsole.c | 1
hw/dmx/input/dmxconsole.h | 1
hw/dmx/input/dmxdetach.c | 1
hw/dmx/input/dmxdummy.c | 1
hw/dmx/input/dmxdummy.h | 1
hw/dmx/input/dmxeq.c | 1
hw/dmx/input/dmxeq.h | 1
hw/dmx/input/dmxevents.c | 1
hw/dmx/input/dmxevents.h | 1
hw/dmx/input/dmxinputinit.c | 1
hw/dmx/input/dmxinputinit.h | 1
hw/dmx/input/dmxmap.c | 1
hw/dmx/input/dmxmap.h | 1
hw/dmx/input/dmxmotion.c | 1
hw/dmx/input/dmxmotion.h | 1
hw/dmx/input/dmxsigio.c | 1
hw/dmx/input/dmxsigio.h | 1
hw/dmx/input/dmxxinput.c | 1
hw/dmx/input/lnx-keyboard.c | 1
hw/dmx/input/lnx-keyboard.h | 1
hw/dmx/input/lnx-ms.c | 1
hw/dmx/input/lnx-ms.h | 1
hw/dmx/input/lnx-ps2.c | 1
hw/dmx/input/lnx-ps2.h | 1
hw/dmx/input/usb-common.c | 1
hw/dmx/input/usb-common.h | 1
hw/dmx/input/usb-keyboard.c | 1
hw/dmx/input/usb-keyboard.h | 1
hw/dmx/input/usb-mouse.c | 1
hw/dmx/input/usb-mouse.h | 1
hw/dmx/input/usb-other.c | 1
hw/dmx/input/usb-other.h | 1
hw/dmx/input/usb-private.h | 1
hw/kdrive/ati/Makefile.am | 2
hw/kdrive/ati/ati.c | 3
hw/kdrive/ati/ati.h | 3
hw/kdrive/ati/ati_cursor.c | 1
hw/kdrive/ati/ati_dma.c | 3
hw/kdrive/ati/ati_dma.h | 1
hw/kdrive/ati/ati_draw.c | 3
hw/kdrive/ati/ati_draw.h | 1
hw/kdrive/ati/ati_drawtmp.h | 3
hw/kdrive/ati/ati_dri.c | 3
hw/kdrive/ati/ati_dri.h | 3
hw/kdrive/ati/ati_reg.h | 1
hw/kdrive/ati/ati_sarea.h | 4
hw/kdrive/ati/ati_stub.c | 3
hw/kdrive/ati/ati_video.c | 1
hw/kdrive/ati/r128_blendtmp.h | 3
hw/kdrive/ati/r128_composite.c | 1
hw/kdrive/ati/radeon_composite.c | 3
hw/kdrive/chips/Makefile.am | 2
hw/kdrive/chips/chips.c | 1
hw/kdrive/chips/chips.h | 3
hw/kdrive/chips/chipsdraw.c | 3
hw/kdrive/chips/chipsstub.c | 3
hw/kdrive/ephyr/Makefile.am | 2
hw/kdrive/epson/Makefile.am | 2
hw/kdrive/epson/epson13806.c | 1
hw/kdrive/epson/epson13806.h | 1
hw/kdrive/epson/epson13806draw.c | 1
hw/kdrive/epson/epson13806draw.h | 1
hw/kdrive/epson/epson13806reg.h | 1
hw/kdrive/epson/epson13806stub.c | 1
hw/kdrive/fake/fake.c | 2
hw/kdrive/fake/fake.h | 2
hw/kdrive/fake/fakeinit.c | 2
hw/kdrive/fake/kbd.c | 3
hw/kdrive/fake/mouse.c | 2
hw/kdrive/fake/os.c | 2
hw/kdrive/fbdev/Makefile.am | 2
hw/kdrive/fbdev/fbdev.c | 3
hw/kdrive/fbdev/fbdev.h | 3
hw/kdrive/fbdev/fbinit.c | 3
hw/kdrive/i810/Makefile.am | 2
hw/kdrive/i810/i810.c | 3
hw/kdrive/i810/i810.h | 2
hw/kdrive/i810/i810_cursor.c | 4
hw/kdrive/i810/i810_reg.h | 1
hw/kdrive/i810/i810stub.c | 1
hw/kdrive/igs/igs.c | 2
hw/kdrive/igs/igs.h | 2
hw/kdrive/igs/igscmap.c | 2
hw/kdrive/igs/igscurs.c | 2
hw/kdrive/igs/igsdraw.c | 2
hw/kdrive/igs/igsdraw.h | 2
hw/kdrive/igs/igsreg.c | 2
hw/kdrive/igs/igsreg.h | 2
hw/kdrive/igs/igsstub.c | 2
hw/kdrive/ipaq/ipaq.c | 1
hw/kdrive/itsy/itsy.c | 3
hw/kdrive/itsy/itsy.h | 3
hw/kdrive/itsy/kbd.c | 3
hw/kdrive/itsy/ts.c | 3
hw/kdrive/linux/agp.c | 2
hw/kdrive/linux/bus.c | 2
hw/kdrive/linux/evdev.c | 6
hw/kdrive/linux/keyboard.c | 2
hw/kdrive/linux/klinux.h | 2
hw/kdrive/linux/linux.c | 2
hw/kdrive/linux/mouse.c | 2
hw/kdrive/linux/ms.c | 1
hw/kdrive/linux/ps2.c | 2
hw/kdrive/linux/ts.c | 2
hw/kdrive/mach64/Makefile.am | 2
hw/kdrive/mach64/mach64.c | 1
hw/kdrive/mach64/mach64.h | 3
hw/kdrive/mach64/mach64curs.c | 3
hw/kdrive/mach64/mach64draw.c | 3
hw/kdrive/mach64/mach64draw.h | 3
hw/kdrive/mach64/mach64stub.c | 3
hw/kdrive/mach64/mach64video.c | 1
hw/kdrive/mga/Makefile.am | 2
hw/kdrive/mga/g400_common.h | 3
hw/kdrive/mga/g400_composite.c | 3
hw/kdrive/mga/mga.c | 3
hw/kdrive/mga/mga.h | 3
hw/kdrive/mga/mgadraw.c | 3
hw/kdrive/mga/mgastub.c | 3
hw/kdrive/neomagic/Makefile.am | 2
hw/kdrive/nvidia/Makefile.am | 2
hw/kdrive/nvidia/nvidia.c | 2
hw/kdrive/nvidia/nvidia.h | 2
hw/kdrive/nvidia/nvidiacurs.c | 3
hw/kdrive/nvidia/nvidiadraw.c | 2
hw/kdrive/nvidia/nvidiadraw.h | 3
hw/kdrive/nvidia/nvidiastub.c | 2
hw/kdrive/nvidia/nvidiavideo.c | 2
hw/kdrive/pcmcia/modes.h | 1
hw/kdrive/pcmcia/pcmcia.c | 1
hw/kdrive/pcmcia/pcmcia.h | 1
hw/kdrive/pcmcia/pcmciacurs.c | 1
hw/kdrive/pcmcia/pcmciarotate.c | 2
hw/kdrive/pcmcia/pcmciashadow.c | 1
hw/kdrive/pcmcia/pcmciastub.c | 1
hw/kdrive/pm2/Makefile.am | 2
hw/kdrive/r128/Makefile.am | 2
hw/kdrive/r128/r128.c | 3
hw/kdrive/r128/r128.h | 3
hw/kdrive/r128/r128draw.c | 3
hw/kdrive/r128/r128stub.c | 3
hw/kdrive/savage/s3.c | 3
hw/kdrive/savage/s3.h | 3
hw/kdrive/savage/s3clock.c | 3
hw/kdrive/savage/s3cmap.c | 3
hw/kdrive/savage/s3curs.c | 3
hw/kdrive/savage/s3draw.c | 3
hw/kdrive/savage/s3draw.h | 3
hw/kdrive/savage/s3gc.c | 3
hw/kdrive/savage/s3reg.c | 3
hw/kdrive/savage/s3reg.h | 3
hw/kdrive/savage/s3rtst.c | 3
hw/kdrive/savage/s3stub.c | 3
hw/kdrive/sdl/sdl.c | 3
hw/kdrive/sis300/sis.c | 3
hw/kdrive/sis300/sis.h | 3
hw/kdrive/sis300/sis_draw.c | 3
hw/kdrive/sis300/sis_stub.c | 3
hw/kdrive/sis530/sis.c | 3
hw/kdrive/sis530/sis.h | 3
hw/kdrive/sis530/sisclock.c | 3
hw/kdrive/sis530/siscmap.c | 3
hw/kdrive/sis530/siscurs.c | 3
hw/kdrive/sis530/sisdraw.c | 3
hw/kdrive/sis530/sisdraw.h | 3
hw/kdrive/sis530/sisio.c | 3
hw/kdrive/sis530/sisstub.c | 3
hw/kdrive/smi/Makefile.am | 2
hw/kdrive/smi/smi.h | 2
hw/kdrive/smi/smidraw.c | 2
hw/kdrive/smi/smidraw.h | 2
hw/kdrive/smi/smistub.c | 2
hw/kdrive/src/kaa.c | 2
hw/kdrive/src/kaa.h | 2
hw/kdrive/src/kaapict.c | 2
hw/kdrive/src/kasync.c | 3
hw/kdrive/src/kcmap.c | 3
hw/kdrive/src/kcolor.c | 3
hw/kdrive/src/kcurscol.c | 2
hw/kdrive/src/kdrive.c | 2
hw/kdrive/src/kdrive.h | 3
hw/kdrive/src/kinfo.c | 3
hw/kdrive/src/kinput.c | 10
hw/kdrive/src/kkeymap.c | 3
hw/kdrive/src/kkeymap.h | 3
hw/kdrive/src/kloadmap.c | 3
hw/kdrive/src/kmap.c | 3
hw/kdrive/src/kmode.c | 2
hw/kdrive/src/knoop.c | 3
hw/kdrive/src/koffscreen.c | 2
hw/kdrive/src/kshadow.c | 2
hw/kdrive/src/ktest.c | 3
hw/kdrive/src/kxv.c | 2
hw/kdrive/src/kxv.h | 2
hw/kdrive/src/vga.c | 3
hw/kdrive/src/vga.h | 3
hw/kdrive/trident/trident.c | 1
hw/kdrive/trident/trident.h | 3
hw/kdrive/trident/tridentcurs.c | 3
hw/kdrive/trident/tridentdraw.c | 3
hw/kdrive/trident/tridentdraw.h | 3
hw/kdrive/trident/tridentstub.c | 3
hw/kdrive/trio/s3.c | 3
hw/kdrive/trio/s3.h | 3
hw/kdrive/trio/s3clock.c | 3
hw/kdrive/trio/s3cmap.c | 3
hw/kdrive/trio/s3curs.c | 3
hw/kdrive/trio/s3stub.c | 3
hw/kdrive/ts300/ts300.c | 3
hw/kdrive/vesa/Makefile.am | 2
hw/kdrive/vesa/vbe.c | 1
hw/kdrive/vesa/vbe.h | 1
hw/kdrive/vesa/vesa.c | 1
hw/kdrive/vesa/vesa.h | 1
hw/kdrive/vesa/vesainit.c | 1
hw/kdrive/vesa/vga.c | 2
hw/kdrive/vesa/vga.h | 2
hw/kdrive/vesa/vm86.c | 2
hw/kdrive/vesa/vm86.h | 2
hw/kdrive/via/Makefile.am | 2
hw/kdrive/vxworks/vxkbd.c | 2
hw/kdrive/vxworks/vxmouse.c | 2
hw/kdrive/vxworks/vxworks.c | 2
hw/xfree86/common/atKeynames.h | 2
hw/xfree86/common/compiler.h | 2
hw/xfree86/common/modeline2c.pl | 3
hw/xfree86/common/xf86Build.h.in | 1
hw/xfree86/common/xf86Bus.c | 2
hw/xfree86/common/xf86Config.c | 169 -
hw/xfree86/common/xf86Configure.c | 10
hw/xfree86/common/xf86Cursor.c | 2
hw/xfree86/common/xf86Debug.c | 4
hw/xfree86/common/xf86DefModes.c | 5
hw/xfree86/common/xf86Events.c | 21
hw/xfree86/common/xf86Init.c | 38
hw/xfree86/common/xf86MiscExt.c | 4
hw/xfree86/common/xf86Mode.c | 5
hw/xfree86/common/xf86Module.h | 7
hw/xfree86/common/xf86PM.c | 4
hw/xfree86/common/xf86Version.h | 3
hw/xfree86/common/xf86XKB.c | 1
hw/xfree86/common/xf86Xinput.c | 67
hw/xfree86/common/xf86Xinput.h | 3
hw/xfree86/common/xf86str.h | 2
hw/xfree86/common/xisb.c | 4
hw/xfree86/common/xisb.h | 1
hw/xfree86/ddc/Makefile.am | 4
hw/xfree86/ddc/ddcProperty.c | 11
hw/xfree86/ddc/edid.h | 4
hw/xfree86/ddc/interpret_vdif.c | 132
hw/xfree86/ddc/print_vdif.c | 225 -
hw/xfree86/ddc/vdif.h | 174 -
hw/xfree86/ddc/xf86DDC.c | 41
hw/xfree86/ddc/xf86DDC.h | 8
hw/xfree86/dixmods/extmod/xf86dgaext.h | 2
hw/xfree86/doc/man/xorg.conf.man.pre | 20
hw/xfree86/dri/dri.c | 46
hw/xfree86/dri/drimodule.c | 2
hw/xfree86/dri/xf86dri.c | 34
hw/xfree86/dummylib/fatalerror.c | 2
hw/xfree86/dummylib/pcitestmulti.c | 2
hw/xfree86/dummylib/verrorf.c | 2
hw/xfree86/dummylib/xf86allocscripi.c | 2
hw/xfree86/dummylib/xf86getpagesize.c | 2
hw/xfree86/dummylib/xf86getverb.c | 2
hw/xfree86/dummylib/xf86info.c | 2
hw/xfree86/dummylib/xf86screens.c | 2
hw/xfree86/dummylib/xf86servisinit.c | 2
hw/xfree86/dummylib/xf86verbose.c | 2
hw/xfree86/i2c/uda1380.c | 2
hw/xfree86/i2c/uda1380.h | 3
hw/xfree86/int10/helper_exec.c | 119
hw/xfree86/loader/loadmod.c | 7
hw/xfree86/loader/os.c | 2
hw/xfree86/loader/xf86sym.c | 14
hw/xfree86/modes/xf86Crtc.c | 11
hw/xfree86/modes/xf86EdidModes.c | 20
hw/xfree86/modes/xf86Modes.c | 3
hw/xfree86/modes/xf86RandR12.c | 27
hw/xfree86/os-support/README.OS-lib | 1
hw/xfree86/os-support/assyntax.h | 3
hw/xfree86/os-support/bsd/alpha_video.c | 2
hw/xfree86/os-support/bsd/arm_video.c | 2
hw/xfree86/os-support/bsd/bsd_VTsw.c | 1
hw/xfree86/os-support/bsd/bsd_apm.c | 2
hw/xfree86/os-support/bsd/bsd_init.c | 1
hw/xfree86/os-support/bsd/bsd_kmod.c | 2
hw/xfree86/os-support/bsd/bsd_kqueue_apm.c | 1
hw/xfree86/os-support/bsd/i386_video.c | 2
hw/xfree86/os-support/bsd/libusb/data.c | 2
hw/xfree86/os-support/bsd/libusb/descr.c | 2
hw/xfree86/os-support/bsd/libusb/parse.c | 2
hw/xfree86/os-support/bsd/libusb/usage.c | 2
hw/xfree86/os-support/bsd/libusb/usb.h | 2
hw/xfree86/os-support/bsd/libusb/usbvar.h | 2
hw/xfree86/os-support/bsd/memrange.h | 3
hw/xfree86/os-support/bsd/ppc_video.c | 2
hw/xfree86/os-support/bsd/sparc64_video.c | 3
hw/xfree86/os-support/bus/Pci.c | 2
hw/xfree86/os-support/hurd/hurd_init.c | 1
hw/xfree86/os-support/hurd/hurd_mmap.c | 1
hw/xfree86/os-support/hurd/hurd_mouse.c | 1
hw/xfree86/os-support/hurd/hurd_video.c | 1
hw/xfree86/os-support/linux/int10/vm86/linux_vm86.c | 2
hw/xfree86/os-support/linux/lnx_init.c | 1
hw/xfree86/os-support/linux/lnx_jstk.c | 2
hw/xfree86/os-support/linux/lnx_video.c | 68
hw/xfree86/os-support/misc/Delay.c | 4
hw/xfree86/os-support/misc/IODelay.c | 3
hw/xfree86/os-support/misc/SlowBcopy.c | 6
hw/xfree86/os-support/misc/xf86_IlHack.c | 2
hw/xfree86/os-support/misc/xf86_Util.c | 1
hw/xfree86/os-support/sco/VTsw_sco.c | 1
hw/xfree86/os-support/sco/sco_init.c | 1
hw/xfree86/os-support/sco/sco_iop.c | 2
hw/xfree86/os-support/sco/sco_mouse.c | 2
hw/xfree86/os-support/sco/sco_video.c | 1
hw/xfree86/os-support/shared/VTsw_noop.c | 1
hw/xfree86/os-support/shared/VTsw_usl.c | 1
hw/xfree86/os-support/shared/agp_noop.c | 3
hw/xfree86/os-support/shared/bios_devmem.c | 1
hw/xfree86/os-support/shared/bios_mmap.c | 1
hw/xfree86/os-support/shared/ioperm_noop.c | 1
hw/xfree86/os-support/shared/libc_wrapper.c | 34
hw/xfree86/os-support/shared/posix_tty.c | 2
hw/xfree86/os-support/shared/sigiostubs.c | 3
hw/xfree86/os-support/shared/stdPci.c | 3
hw/xfree86/os-support/shared/stdResource.c | 6
hw/xfree86/os-support/shared/vidmem.c | 3
hw/xfree86/os-support/shared/xf86Axp.h | 2
hw/xfree86/os-support/sysv/sysv_init.c | 1
hw/xfree86/os-support/sysv/sysv_video.c | 1
hw/xfree86/os-support/usl/usl_init.c | 2
hw/xfree86/os-support/usl/usl_iop.c | 1
hw/xfree86/os-support/usl/usl_video.c | 2
hw/xfree86/os-support/usl/usl_vtsw.c | 2
hw/xfree86/os-support/xf86_OSlib.h | 40
hw/xfree86/os-support/xf86_ansic.h | 18
hw/xfree86/parser/Files.c | 20
hw/xfree86/parser/scan.c | 23
hw/xfree86/parser/write.c | 3
hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c | 5
hw/xfree86/utils/kbd_mode/sun-kbd_mode.c | 1
hw/xfree86/utils/xorgcfg/card-cfg.h | 1
hw/xfree86/utils/xorgcfg/config.h | 27
hw/xfree86/utils/xorgcfg/help.h | 2
hw/xfree86/utils/xorgcfg/mouse-cfg.c | 3
hw/xfree86/utils/xorgcfg/mouse-cfg.h | 2
hw/xfree86/utils/xorgcfg/stubs.c | 4
hw/xfree86/utils/xorgcfg/text-mode.c | 17
hw/xfree86/utils/xorgconfig/cards.c | 20
hw/xfree86/utils/xorgconfig/cards.h | 7
hw/xfree86/utils/xorgconfig/xorgconfig.c | 88
hw/xfree86/vbe/vbe.c | 70
hw/xfree86/vbe/vbe.h | 16
hw/xfree86/vgahw/vgaCmap.c | 1
hw/xfree86/x86emu/debug.c | 2
hw/xfree86/xaa/xaaROP.c | 2
hw/xfree86/xaa/xaarop.h | 2
hw/xfree86/xf4bpp/OScompiler.h | 1
hw/xfree86/xf4bpp/emulOpStip.c | 1
hw/xfree86/xf4bpp/emulRepAre.c | 1
hw/xfree86/xf4bpp/emulTile.c | 1
hw/xfree86/xf4bpp/ibmTrace.h | 8
hw/xfree86/xf4bpp/mfbbres.c | 1
hw/xfree86/xf4bpp/mfbbresd.c | 1
hw/xfree86/xf4bpp/mfbfillarc.c | 2
hw/xfree86/xf4bpp/mfbhrzvert.c | 1
hw/xfree86/xf4bpp/mfbimggblt.c | 2
hw/xfree86/xf4bpp/mfbline.c | 1
hw/xfree86/xf4bpp/mfbzerarc.c | 3
hw/xfree86/xf4bpp/offscreen.c | 1
hw/xfree86/xf4bpp/ppcArea.c | 1
hw/xfree86/xf4bpp/ppcBStore.c | 1
hw/xfree86/xf4bpp/ppcCReduce.c | 2
hw/xfree86/xf4bpp/ppcClip.c | 1
hw/xfree86/xf4bpp/ppcCpArea.c | 2
hw/xfree86/xf4bpp/ppcDepth.c | 2
hw/xfree86/xf4bpp/ppcFillRct.c | 1
hw/xfree86/xf4bpp/ppcGC.c | 2
hw/xfree86/xf4bpp/ppcGCstr.h | 1
hw/xfree86/xf4bpp/ppcGetSp.c | 2
hw/xfree86/xf4bpp/ppcIO.c | 1
hw/xfree86/xf4bpp/ppcImg.c | 2
hw/xfree86/xf4bpp/ppcPixFS.c | 1
hw/xfree86/xf4bpp/ppcPixmap.c | 1
hw/xfree86/xf4bpp/ppcPntWin.c | 1
hw/xfree86/xf4bpp/ppcPolyPnt.c | 1
hw/xfree86/xf4bpp/ppcQuery.c | 1
hw/xfree86/xf4bpp/ppcRslvC.c | 2
hw/xfree86/xf4bpp/ppcSetSp.c | 1
hw/xfree86/xf4bpp/ppcSpMcro.h | 1
hw/xfree86/xf4bpp/ppcWinFS.c | 1
hw/xfree86/xf4bpp/ppcWindow.c | 1
hw/xfree86/xf4bpp/vgaBitBlt.c | 4
hw/xfree86/xf4bpp/vgaGC.c | 2
hw/xfree86/xf4bpp/vgaImages.c | 1
hw/xfree86/xf4bpp/vgaReg.h | 2
hw/xfree86/xf4bpp/vgaSolid.c | 2
hw/xfree86/xf4bpp/vgaStipple.c | 1
hw/xfree86/xf4bpp/vgaVideo.h | 2
hw/xfree86/xf4bpp/wm3.c | 7
hw/xfree86/xf4bpp/wm3.h | 7
hw/xfree86/xf8_32bpp/cfbcpyplane.c | 2
hw/xfree86/xf8_32bpp/cfbgcmisc.c | 2
hw/xgl/egl/evdev.c | 2
hw/xgl/egl/kinput.c | 3
hw/xgl/egl/kkeymap.h | 3
hw/xnest/Args.c | 1
hw/xnest/Args.h | 1
hw/xnest/Color.c | 1
hw/xnest/Color.h | 1
hw/xnest/Drawable.h | 1
hw/xnest/Events.h | 1
hw/xnest/GCOps.h | 1
hw/xnest/Handlers.h | 1
hw/xnest/Keyboard.h | 1
hw/xnest/Makefile.am | 3
hw/xnest/Pointer.c | 1
hw/xnest/Pointer.h | 1
hw/xnest/Screen.h | 1
hw/xnest/Visual.c | 1
hw/xnest/Visual.h | 1
hw/xnest/XNFont.h | 2
hw/xnest/XNGC.h | 1
hw/xnest/Xnest.h | 1
hw/xnest/os2Stub.c | 387 --
hw/xprint/ValTree.c | 1
hw/xprint/attributes.c | 1
hw/xprint/pcl/PclFonts.c | 1
hw/xprint/spooler.c | 1
hw/xwin/InitInput.c | 1
hw/xwin/InitOutput.c | 1
hw/xwin/ddraw.h | 2
hw/xwin/winconfig.h | 1
hw/xwin/winkeymap.h | 1
hw/xwin/winkeynames.h | 1
hw/xwin/winmsg.c | 1
hw/xwin/winmsg.h | 2
hw/xwin/winmultiwindowclass.c | 1
hw/xwin/winmultiwindowclass.h | 2
hw/xwin/winprefs.c | 1
hw/xwin/winprefs.h | 1
hw/xwin/winrop.c | 1
hw/xwin/wintrayicon.c | 1
include/dixstruct.h | 4
include/os.h | 2
include/pixmap.h | 1
include/pixmapstr.h | 1
include/servermd.h | 2
include/window.h | 1
include/windowstr.h | 29
mfb/mfbwindow.c | 1
mi/mieq.c | 24
mi/mipoly.c | 1
mi/mistruct.h | 1
mi/mivalidate.h | 2
mi/mivaltree.c | 31
miext/cw/cw.c | 1
miext/cw/cw.h | 1
miext/cw/cw_ops.c | 1
miext/cw/cw_render.c | 1
miext/damage/damage.c | 2
miext/damage/damage.h | 2
miext/damage/damagestr.h | 2
miext/shadow/shadow.c | 2
miext/shadow/shalloc.c | 2
miext/shadow/shrot16pack.c | 2
miext/shadow/shrot16pack_180.c | 2
miext/shadow/shrot16pack_270.c | 2
miext/shadow/shrot16pack_270YX.c | 2
miext/shadow/shrot16pack_90.c | 2
miext/shadow/shrot16pack_90YX.c | 2
miext/shadow/shrot32pack.c | 2
miext/shadow/shrot32pack_180.c | 2
miext/shadow/shrot32pack_270.c | 2
miext/shadow/shrot32pack_90.c | 2
miext/shadow/shrot8pack.c | 2
miext/shadow/shrot8pack_180.c | 2
miext/shadow/shrot8pack_270.c | 2
miext/shadow/shrot8pack_90.c | 2
miext/shadow/shrotpackYX.h | 2
os/Makefile.am | 3
os/WaitFor.c | 3
os/access.c | 40
os/auth.c | 12
os/connection.c | 37
os/io.c | 6
os/k5auth.c | 799 -----
os/log.c | 3
os/oscolor.c | 11
os/osdep.h | 25
os/osinit.c | 2
os/strlcat.c | 3
os/strlcpy.c | 3
os/utils.c | 26
record/set.h | 2
render/filter.c | 2
render/mipict.c | 58
render/mipict.h | 6
render/picturestr.h | 6
render/render.c | 2
render/renderedge.c | 2
render/renderedge.h | 2
xfixes/cursor.c | 2
xfixes/region.c | 2
xfixes/saveset.c | 2
xfixes/select.c | 2
xfixes/xfixes.h | 2
xfixes/xfixesint.h | 2
xkb/ddxFakeBtn.c | 1
xkb/ddxInit.c | 1
xkb/ddxKeyClick.c | 1
xkb/ddxLEDs.c | 1
xkb/ddxLoad.c | 24
xkb/xkbInit.c | 2
xkb/xkbPrOtherEv.c | 1
xkb/xkbout.c | 2
xkb/xkbtext.c | 2
700 files changed, 1060 insertions(+), 7496 deletions(-)
New commits:
commit f106c04b627d9f57b38627971dc79c75129e66d6
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 3 14:47:19 2007 -0700
Have Composite always report server version.
It was reporting the lessor of the server and client versions, which doesn't
make sense with the 0.4 semantic change in clipping.
diff --git a/composite/compext.c b/composite/compext.c
index 9cf6bfe..944f8d8 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -138,11 +138,7 @@ ProcCompositeQueryVersion (ClientPtr client)
rep.minorVersion = stuff->minorVersion;
} else {
rep.majorVersion = SERVER_COMPOSITE_MAJOR;
- if (stuff->majorVersion == SERVER_COMPOSITE_MAJOR &&
- stuff->minorVersion < SERVER_COMPOSITE_MINOR)
- rep.minorVersion = stuff->minorVersion;
- else
- rep.minorVersion = SERVER_COMPOSITE_MINOR;
+ rep.minorVersion = SERVER_COMPOSITE_MINOR;
}
pCompositeClient->major_version = rep.majorVersion;
pCompositeClient->minor_version = rep.minorVersion;
commit 4f88d68bdb90cc7d12170355105b4fd020acd306
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 3 14:43:17 2007 -0700
Force advertised Composite version to 0.4 instead of using header version.
Installed protocol header version may be newer than the server code base.
Use internal version number for Composite extension to make sure the server
doesn't advertise capabilities it doesn't support.
diff --git a/composite/compext.c b/composite/compext.c
index 3a43be3..9cf6bfe 100644
--- a/composite/compext.c
+++ b/composite/compext.c
@@ -46,6 +46,9 @@
#include "compint.h"
+#define SERVER_COMPOSITE_MAJOR 0
+#define SERVER_COMPOSITE_MINOR 4
+
static CARD8 CompositeReqCode;
static int CompositeClientPrivateIndex;
RESTYPE CompositeClientWindowType;
@@ -130,16 +133,16 @@ ProcCompositeQueryVersion (ClientPtr client)
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
- if (stuff->majorVersion < COMPOSITE_MAJOR) {
+ if (stuff->majorVersion < SERVER_COMPOSITE_MAJOR) {
rep.majorVersion = stuff->majorVersion;
rep.minorVersion = stuff->minorVersion;
} else {
- rep.majorVersion = COMPOSITE_MAJOR;
- if (stuff->majorVersion == COMPOSITE_MAJOR &&
- stuff->minorVersion < COMPOSITE_MINOR)
+ rep.majorVersion = SERVER_COMPOSITE_MAJOR;
+ if (stuff->majorVersion == SERVER_COMPOSITE_MAJOR &&
+ stuff->minorVersion < SERVER_COMPOSITE_MINOR)
rep.minorVersion = stuff->minorVersion;
else
- rep.minorVersion = COMPOSITE_MINOR;
+ rep.minorVersion = SERVER_COMPOSITE_MINOR;
}
pCompositeClient->major_version = rep.majorVersion;
pCompositeClient->minor_version = rep.minorVersion;
commit 866f092ca0160a366add01b48ad03438926c4d16
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 3 14:29:11 2007 -0700
Make Composite manual redirect windows not clip their parent.
This patch changes the semantics of manual redirect windows so that they no
longer affect the clip list of their parent. Doing this means the parent can
draw to the area covered by the child without using IncludeInferiors. More
importantly, this also means that the parent receives expose events when
that region is damaged by other actions.
diff --git a/composite/compalloc.c b/composite/compalloc.c
index 5ea015b..1a7e4a0 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -204,7 +204,7 @@ compFreeClientWindow (WindowPtr pWin, XID id)
EnableMapUnmapEvents (pWin);
}
- if (pWin->redirectDraw)
+ if (pWin->redirectDraw != RedirectDrawNone)
compFreePixmap (pWin);
if (cw->damage)
@@ -216,7 +216,7 @@ compFreeClientWindow (WindowPtr pWin, XID id)
xfree (cw);
}
else if (cw->update == CompositeRedirectAutomatic &&
- !cw->damageRegistered && pWin->redirectDraw)
+ !cw->damageRegistered && pWin->redirectDraw != RedirectDrawNone)
{
DamageRegister (&pWin->drawable, cw->damage);
cw->damageRegistered = TRUE;
@@ -506,7 +506,11 @@ compAllocPixmap (WindowPtr pWin)
if (!pPixmap)
return FALSE;
- pWin->redirectDraw = TRUE;
+ if (cw->update == CompositeRedirectAutomatic)
+ pWin->redirectDraw = RedirectDrawAutomatic;
+ else
+ pWin->redirectDraw = RedirectDrawManual;
+
compSetPixmap (pWin, pPixmap);
cw->oldx = COMP_ORIGIN_INVALID;
cw->oldy = COMP_ORIGIN_INVALID;
@@ -541,7 +545,7 @@ compFreePixmap (WindowPtr pWin)
REGION_COPY (pScreen, &pWin->borderClip, &cw->borderClip);
pRedirectPixmap = (*pScreen->GetWindowPixmap) (pWin);
pParentPixmap = (*pScreen->GetWindowPixmap) (pWin->parent);
- pWin->redirectDraw = FALSE;
+ pWin->redirectDraw = RedirectDrawNone;
compSetPixmap (pWin, pParentPixmap);
(*pScreen->DestroyPixmap) (pRedirectPixmap);
}
@@ -562,7 +566,7 @@ compReallocPixmap (WindowPtr pWin, int draw_x, int draw_y,
int pix_x, pix_y;
int pix_w, pix_h;
- assert (cw && pWin->redirectDraw);
+ assert (cw && pWin->redirectDraw != RedirectDrawNone);
cw->oldx = pOld->screen_x;
cw->oldy = pOld->screen_y;
pix_x = draw_x - bw;
diff --git a/composite/compwindow.c b/composite/compwindow.c
index 9114fff..6633163 100644
--- a/composite/compwindow.c
+++ b/composite/compwindow.c
@@ -57,10 +57,10 @@ compCheckWindow (WindowPtr pWin, pointer data)
if (!pWin->parent)
{
- assert (!pWin->redirectDraw);
+ assert (pWin->redirectDraw == RedirectDrawNone);
assert (pWinPixmap == pScreenPixmap);
}
- else if (pWin->redirectDraw)
+ else if (pWin->redirectDraw != RedirectDrawNone)
{
assert (pWinPixmap != pParentPixmap);
assert (pWinPixmap != pScreenPixmap);
@@ -111,7 +111,7 @@ compSetPixmapVisitWindow (WindowPtr pWindow, pointer data)
CompPixmapVisitPtr pVisit = (CompPixmapVisitPtr) data;
ScreenPtr pScreen = pWindow->drawable.pScreen;
- if (pWindow != pVisit->pWindow && pWindow->redirectDraw)
+ if (pWindow != pVisit->pWindow && pWindow->redirectDraw != RedirectDrawNone)
return WT_DONTWALKCHILDREN;
(*pScreen->SetWindowPixmap) (pWindow, pVisit->pPixmap);
/*
@@ -155,7 +155,7 @@ compCheckRedirect (WindowPtr pWin)
}
}
- if (should != pWin->redirectDraw)
+ if (should != (pWin->redirectDraw != RedirectDrawNone))
{
if (should)
return compAllocPixmap (pWin);
@@ -179,10 +179,11 @@ compPositionWindow (WindowPtr pWin, int x, int y)
compCheckRedirect (pWin);
*/
#ifdef COMPOSITE_DEBUG
- if (pWin->redirectDraw != (pWin->viewable && (GetCompWindow(pWin) != NULL)))
+ if ((pWin->redirectDraw != RedirectDrawNone) !=
+ (pWin->viewable && (GetCompWindow(pWin) != NULL)))
abort ();
#endif
- if (pWin->redirectDraw)
+ if (pWin->redirectDraw != RedirectDrawNone)
{
PixmapPtr pPixmap = (*pScreen->GetWindowPixmap) (pWin);
int bw = wBorderWidth (pWin);
@@ -329,7 +330,7 @@ compMoveWindow (WindowPtr pWin, int x, int y, WindowPtr pSib, VTKind kind)
CompScreenPtr cs = GetCompScreen (pScreen);
compCheckTree (pScreen);
- if (pWin->redirectDraw)
+ if (pWin->redirectDraw != RedirectDrawNone)
{
WindowPtr pParent;
int draw_x, draw_y;
@@ -353,7 +354,7 @@ compMoveWindow (WindowPtr pWin, int x, int y, WindowPtr pSib, VTKind kind)
cs->MoveWindow = pScreen->MoveWindow;
pScreen->MoveWindow = compMoveWindow;
- if (pWin->redirectDraw)
+ if (pWin->redirectDraw != RedirectDrawNone)
{
CompWindowPtr cw = GetCompWindow (pWin);
if (cw->pOldPixmap)
@@ -374,7 +375,7 @@ compResizeWindow (WindowPtr pWin, int x, int y,
CompScreenPtr cs = GetCompScreen (pScreen);
compCheckTree (pScreen);
- if (pWin->redirectDraw)
+ if (pWin->redirectDraw != RedirectDrawNone)
{
WindowPtr pParent;
int draw_x, draw_y;
@@ -395,7 +396,7 @@ compResizeWindow (WindowPtr pWin, int x, int y,
(*pScreen->ResizeWindow) (pWin, x, y, w, h, pSib);
cs->ResizeWindow = pScreen->ResizeWindow;
pScreen->ResizeWindow = compResizeWindow;
- if (pWin->redirectDraw)
+ if (pWin->redirectDraw != RedirectDrawNone)
{
CompWindowPtr cw = GetCompWindow (pWin);
if (cw->pOldPixmap)
@@ -414,7 +415,7 @@ compChangeBorderWidth (WindowPtr pWin, unsigned int bw)
CompScreenPtr cs = GetCompScreen (pScreen);
compCheckTree (pScreen);
- if (pWin->redirectDraw)
+ if (pWin->redirectDraw != RedirectDrawNone)
{
WindowPtr pParent;
int draw_x, draw_y;
@@ -436,7 +437,7 @@ compChangeBorderWidth (WindowPtr pWin, unsigned int bw)
(*pScreen->ChangeBorderWidth) (pWin, bw);
cs->ChangeBorderWidth = pScreen->ChangeBorderWidth;
pScreen->ChangeBorderWidth = compChangeBorderWidth;
- if (pWin->redirectDraw)
+ if (pWin->redirectDraw != RedirectDrawNone)
{
CompWindowPtr cw = GetCompWindow (pWin);
if (cw->pOldPixmap)
@@ -480,7 +481,7 @@ compReparentWindow (WindowPtr pWin, WindowPtr pPriorParent)
/*
* Reset pixmap pointers as appropriate
*/
- if (pWin->parent && !pWin->redirectDraw)
+ if (pWin->parent && pWin->redirectDraw != RedirectDrawNone)
compSetPixmap (pWin, (*pScreen->GetWindowPixmap) (pWin->parent));
/*
* Call down to next function
@@ -499,7 +500,7 @@ compCopyWindow (WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
CompScreenPtr cs = GetCompScreen (pScreen);
int dx = 0, dy = 0;
- if (pWin->redirectDraw)
+ if (pWin->redirectDraw != RedirectDrawNone)
{
PixmapPtr pPixmap = (*pScreen->GetWindowPixmap) (pWin);
CompWindowPtr cw = GetCompWindow (pWin);
@@ -624,7 +625,7 @@ compDestroyWindow (WindowPtr pWin)
while ((csw = GetCompSubwindows (pWin)))
FreeResource (csw->clients->id, RT_NONE);
- if (pWin->redirectDraw)
+ if (pWin->redirectDraw != RedirectDrawNone)
compFreePixmap (pWin);
ret = (*pScreen->DestroyWindow) (pWin);
cs->DestroyWindow = pScreen->DestroyWindow;
@@ -768,7 +769,7 @@ compWindowUpdate (WindowPtr pWin)
for (pChild = pWin->lastChild; pChild; pChild = pChild->prevSib)
compWindowUpdate (pChild);
- if (pWin->redirectDraw)
+ if (pWin->redirectDraw != RedirectDrawNone)
{
CompWindowPtr cw = GetCompWindow(pWin);
diff --git a/configure.ac b/configure.ac
index 06473ef..5ee9ad7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,7 +649,7 @@ fi
AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes])
if test "x$COMPOSITE" = xyes; then
AC_DEFINE(COMPOSITE, 1, [Support Composite Extension])
- REQUIRED_MODULES="$REQUIRED_MODULES [compositeproto >= 0.3]"
+ REQUIRED_MODULES="$REQUIRED_MODULES [compositeproto >= 0.4]"
COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la'
COMPOSITE_INC='-I$(top_srcdir)/composite'
fi
diff --git a/dix/window.c b/dix/window.c
index 96002eb..be4ea2c 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -298,7 +298,7 @@ SetWindowToDefaults(WindowPtr pWin)
pWin->dontPropagate = 0;
Reply to: