xorg-server: Changes to 'debian-unstable'
COPYING | 24
ChangeLog | 8901 ++++++++++++++++++++---
Xext/dpms.c | 10
Xext/dpmsstubs.c | 10
Xext/panoramiX.c | 2
Xext/panoramiX.h | 2
Xext/panoramiXprocs.c | 16
Xext/saver.c | 16
Xext/security.c | 5
Xext/shm.c | 16
Xext/sync.c | 2
Xext/syncsrv.h | 8
Xext/xres.c | 12
Xext/xvdisp.c | 106
Xext/xvdix.h | 45
Xext/xvmain.c | 164
Xi/exevents.c | 5
composite/compalloc.c | 8
composite/compext.c | 7
composite/compinit.c | 25
composite/compint.h | 3
composite/compoverlay.c | 4
composite/compwindow.c | 7
config/config.c | 161
config/udev.c | 17
configure.ac | 123
dbe/dbe.c | 16
dbe/dbestruct.h | 12
dbe/midbe.c | 14
dbe/midbe.h | 8
debian/changelog | 40
debian/compat | 2
debian/control | 13
debian/copyright | 27
debian/patches/09_Xserver-man-iglx.diff | 16
debian/patches/series | 3
debian/rules | 23
debian/serverminver | 4
debian/upstream/signing-key.asc | 41
debian/xserver-xorg-core.install | 1
devbook.am | 10
dix/atom.c | 8
dix/colormap.c | 34
dix/cursor.c | 8
dix/devices.c | 64
dix/dispatch.c | 72
dix/dispatch.h | 2
dix/dixfonts.c | 6
dix/dixutils.c | 12
dix/events.c | 1
dix/extension.c | 10
dix/gc.c | 25
dix/getevents.c | 28
dix/globals.c | 8
dix/glyphcurs.c | 8
dix/grabs.c | 16
dix/inpututils.c | 2
dix/main.c | 10
dix/pixmap.c | 18
dix/property.c | 8
dix/protocol.txt | 30
dix/region.c | 22
dix/registry.c | 94
dix/resource.c | 18
dix/selection.c | 10
dix/swaprep.c | 8
dix/swapreq.c | 8
dix/tables.c | 8
dix/window.c | 111
doc/Makefile.am | 2
doc/Xserver-spec.xml | 6
doc/filter-xmlto.sh | 21
dri3/dri3.c | 10
dri3/dri3.h | 2
exa/exa.c | 2
exa/exa.h | 8
exa/exa_accel.c | 20
exa/exa_glyphs.c | 8
exa/exa_priv.h | 19
exa/exa_render.c | 4
exa/exa_unaccel.c | 11
fb/Makefile.am | 2
fb/fb.h | 342
fb/fb24_32.c | 2
fb/fb24_32.h | 2
fb/fbbits.c | 12
fb/fbblt.c | 271
fb/fbbltone.c | 320
fb/fbcopy.c | 2
fb/fbfill.c | 84
fb/fbfillrect.c | 2
fb/fbgc.c | 85
fb/fbglyph.c | 10
fb/fbline.c | 4
fb/fboverlay.c | 7
fb/fboverlay.h | 6
fb/fbpict.c | 18
fb/fbpict.h | 4
fb/fbpixmap.c | 6
fb/fbpoint.c | 2
fb/fbpush.c | 4
fb/fbrop.h | 12
fb/fbscreen.c | 4
fb/fbseg.c | 22
fb/fbstipple.c | 264
fb/fbtile.c | 163
fb/fbutil.c | 308
fb/fbwindow.c | 4
fb/wfbrename.h | 25
glamor/Makefile.am | 16
glamor/glamor.c | 161
glamor/glamor.h | 27
glamor/glamor_copy.c | 747 +
glamor/glamor_copyarea.c | 626 -
glamor/glamor_copyplane.c | 75
glamor/glamor_copywindow.c | 56
glamor/glamor_core.c | 204
glamor/glamor_dash.c | 370
glamor/glamor_egl.c | 96
glamor/glamor_egl_stubs.c | 2
glamor/glamor_eglmodule.c | 1
glamor/glamor_fbo.c | 8
glamor/glamor_fill.c | 356
glamor/glamor_font.c | 8
glamor/glamor_glyphblt.c | 154
glamor/glamor_glyphs.c | 96
glamor/glamor_gradient.c | 19
glamor/glamor_largepixmap.c | 118
glamor/glamor_lines.c | 187
glamor/glamor_picture.c | 20
glamor/glamor_pixmap.c | 580 -
glamor/glamor_points.c | 3
glamor/glamor_polylines.c | 136
glamor/glamor_prepare.c | 271
glamor/glamor_prepare.h | 52
glamor/glamor_priv.h | 328
glamor/glamor_program.c | 59
glamor/glamor_program.h | 6
glamor/glamor_render.c | 99
glamor/glamor_segment.c | 44
glamor/glamor_segs.c | 188
glamor/glamor_spans.c | 5
glamor/glamor_sync.c | 119
glamor/glamor_text.c | 6
glamor/glamor_tile.c | 293
glamor/glamor_transfer.c | 105
glamor/glamor_transform.c | 72
glamor/glamor_trapezoid.c | 1718 ----
glamor/glamor_utils.c | 79
glamor/glamor_utils.h | 218
glamor/glamor_xv.c | 311
glx/glxbyteorder.h | 8
glx/glxcmds.c | 105
glx/glxdri2.c | 6
glx/glxdriswrast.c | 2
glx/glxext.c | 8
glx/glxext.h | 1
glx/glxscreens.c | 2
glx/glxscreens.h | 2
glx/indirect_dispatch.c | 6
glx/indirect_dispatch.h | 6
glx/indirect_dispatch_swap.c | 6
glx/indirect_program.c | 6
glx/indirect_reqsize.c | 6
glx/indirect_reqsize.h | 6
glx/indirect_size.h | 6
glx/indirect_size_get.c | 6
glx/indirect_size_get.h | 6
glx/indirect_table.c | 6
glx/indirect_table.h | 6
glx/indirect_texture_compression.c | 6
glx/indirect_util.c | 8
glx/indirect_util.h | 6
glx/rensize.c | 4
hw/dmx/config/Canvas.c | 2
hw/dmx/config/dmxprint.c | 2
hw/dmx/dmxgc.c | 12
hw/dmx/dmxgcops.c | 8
hw/dmx/dmxpict.h | 2
hw/dmx/dmxwindow.c | 4
hw/dmx/dmxwindow.h | 3
hw/dmx/glxProxy/glxcmds.c | 16
hw/dmx/glxProxy/glxsingle.c | 4
hw/dmx/glxProxy/glxvendor.c | 4
hw/dmx/input/ChkNotMaskEv.c | 2
hw/dmx/input/lnx-keyboard.c | 20
hw/dmx/input/lnx-ms.c | 2
hw/kdrive/Xkdrive.man | 7
hw/kdrive/ephyr/Makefile.am | 6
hw/kdrive/ephyr/ephyr.c | 56
hw/kdrive/ephyr/ephyr.h | 23
hw/kdrive/ephyr/ephyr_glamor_glx.c | 24
hw/kdrive/ephyr/ephyr_glamor_xv.c | 161
hw/kdrive/ephyr/ephyrcursor.c | 262
hw/kdrive/ephyr/ephyrdri.c | 4
hw/kdrive/ephyr/ephyrdri.h | 4
hw/kdrive/ephyr/ephyrdriext.c | 4
hw/kdrive/ephyr/ephyrdriext.h | 4
hw/kdrive/ephyr/ephyrglxext.c | 4
hw/kdrive/ephyr/ephyrglxext.h | 4
hw/kdrive/ephyr/ephyrhostglx.c | 4
hw/kdrive/ephyr/ephyrhostglx.h | 4
hw/kdrive/ephyr/ephyrinit.c | 133
hw/kdrive/ephyr/ephyrlog.h | 4
hw/kdrive/ephyr/ephyrvideo.c | 38
hw/kdrive/ephyr/hostx.c | 275
hw/kdrive/ephyr/hostx.h | 20
hw/kdrive/ephyr/man/Xephyr.man | 3
hw/kdrive/ephyr/os.c | 4
hw/kdrive/fake/Makefile.am | 1
hw/kdrive/fbdev/Makefile.am | 1
hw/kdrive/src/kdrive.c | 31
hw/kdrive/src/kdrive.h | 16
hw/kdrive/src/kxv.c | 359
hw/kdrive/src/kxv.h | 39
hw/vfb/InitOutput.c | 55
hw/xfree86/Makefile.am | 6
hw/xfree86/Xorg.sh.in | 4
hw/xfree86/common/Makefile.am | 4
hw/xfree86/common/compiler.h | 663 -
hw/xfree86/common/xf86.h | 8
hw/xfree86/common/xf86AutoConfig.c | 9
hw/xfree86/common/xf86Bus.c | 2
hw/xfree86/common/xf86Config.c | 69
hw/xfree86/common/xf86Configure.c | 5
hw/xfree86/common/xf86Cursor.c | 19
hw/xfree86/common/xf86Events.c | 8
hw/xfree86/common/xf86Globals.c | 1
hw/xfree86/common/xf86Init.c | 25
hw/xfree86/common/xf86Mode.c | 8
hw/xfree86/common/xf86Module.h | 4
hw/xfree86/common/xf86PciInfo.h | 2
hw/xfree86/common/xf86Privstr.h | 8
hw/xfree86/common/xf86RandR.c | 32
hw/xfree86/common/xf86VGAarbiterPriv.h | 10
hw/xfree86/common/xf86Xinput.c | 16
hw/xfree86/common/xf86Xinput.h | 11
hw/xfree86/common/xf86cmap.c | 50
hw/xfree86/common/xf86fbman.c | 6
hw/xfree86/common/xf86pciBus.c | 39
hw/xfree86/common/xf86platformBus.c | 85
hw/xfree86/common/xf86platformBus.h | 104
hw/xfree86/common/xf86str.h | 4
hw/xfree86/common/xf86vmode.c | 8
hw/xfree86/common/xf86xv.c | 302
hw/xfree86/common/xf86xv.h | 41
hw/xfree86/common/xf86xvmc.h | 10
hw/xfree86/common/xf86xvpriv.h | 2
hw/xfree86/ddc/ddc.c | 68
hw/xfree86/ddc/edid.h | 8
hw/xfree86/ddc/print_edid.c | 2
hw/xfree86/ddc/xf86DDC.h | 11
hw/xfree86/dixmods/extmod/modinit.h | 80
hw/xfree86/dixmods/xkbKillSrv.c | 16
hw/xfree86/dixmods/xkbVT.c | 16
hw/xfree86/doc/README.DRIcomp | 3
hw/xfree86/doc/Registry | 1
hw/xfree86/doc/ddxDesign.xml | 35
hw/xfree86/dri/dri.c | 81
hw/xfree86/dri/dri.h | 11
hw/xfree86/dri/sarea.h | 10
hw/xfree86/dri2/Makefile.am | 2
hw/xfree86/dri2/dri2.c | 66
hw/xfree86/dri2/pci_ids/Makefile.am | 11
hw/xfree86/dri2/pci_ids/i810_pci_ids.h | 4
hw/xfree86/dri2/pci_ids/i915_pci_ids.h | 15
hw/xfree86/dri2/pci_ids/i965_pci_ids.h | 115
hw/xfree86/dri2/pci_ids/pci_id_driver_map.h | 80
hw/xfree86/dri2/pci_ids/r200_pci_ids.h | 24
hw/xfree86/dri2/pci_ids/r300_pci_ids.h | 227
hw/xfree86/dri2/pci_ids/r600_pci_ids.h | 327
hw/xfree86/dri2/pci_ids/radeon_pci_ids.h | 23
hw/xfree86/dri2/pci_ids/radeonsi_pci_ids.h | 157
hw/xfree86/dri2/pci_ids/vmwgfx_pci_ids.h | 1
hw/xfree86/drivers/Makefile.am | 5
hw/xfree86/drivers/modesetting/Makefile.am | 69
hw/xfree86/drivers/modesetting/dri2.c | 861 ++
hw/xfree86/drivers/modesetting/driver.c | 1245 +++
hw/xfree86/drivers/modesetting/driver.h | 137
hw/xfree86/drivers/modesetting/drmmode_display.c | 1822 ++++
hw/xfree86/drivers/modesetting/drmmode_display.h | 174
hw/xfree86/drivers/modesetting/dumb_bo.c | 138
hw/xfree86/drivers/modesetting/dumb_bo.h | 45
hw/xfree86/drivers/modesetting/modesetting.man | 57
hw/xfree86/drivers/modesetting/present.c | 228
hw/xfree86/drivers/modesetting/vblank.c | 402 +
hw/xfree86/fbdevhw/fbdevhw.c | 2
hw/xfree86/glamor_egl/Makefile.am | 3
hw/xfree86/glamor_egl/glamor_xf86_xv.c | 185
hw/xfree86/i2c/Makefile.am | 36
hw/xfree86/i2c/bt829.c | 822 --
hw/xfree86/i2c/bt829.h | 103
hw/xfree86/i2c/bt829_module.c | 20
hw/xfree86/i2c/fi1236.c | 686 -
hw/xfree86/i2c/fi1236.h | 113
hw/xfree86/i2c/fi1236_module.c | 24
hw/xfree86/i2c/msp3430.c | 779 --
hw/xfree86/i2c/msp3430.h | 116
hw/xfree86/i2c/msp3430_module.c | 24
hw/xfree86/i2c/tda8425.c | 83
hw/xfree86/i2c/tda8425.h | 44
hw/xfree86/i2c/tda8425_module.c | 24
hw/xfree86/i2c/tda9850.c | 136
hw/xfree86/i2c/tda9850.h | 43
hw/xfree86/i2c/tda9850_module.c | 24
hw/xfree86/i2c/tda9885.c | 100
hw/xfree86/i2c/tda9885.h | 63
hw/xfree86/i2c/tda9885_module.c | 24
hw/xfree86/i2c/uda1380.c | 196
hw/xfree86/i2c/uda1380.h | 81
hw/xfree86/i2c/uda1380_module.c | 24
hw/xfree86/i2c/xf86i2c.c | 40
hw/xfree86/i2c/xf86i2c.h | 2
hw/xfree86/int10/generic.c | 52
hw/xfree86/loader/loader.c | 23
hw/xfree86/loader/loadmod.c | 164
hw/xfree86/man/Xorg.wrap.man | 2
hw/xfree86/man/xorg.conf.man | 22
hw/xfree86/modes/Makefile.am | 1
hw/xfree86/modes/xf86Crtc.c | 4
hw/xfree86/modes/xf86Crtc.h | 12
hw/xfree86/modes/xf86DisplayIDModes.c | 444 -
hw/xfree86/modes/xf86RandR12.c | 4
hw/xfree86/modes/xf86Rotate.c | 21
hw/xfree86/modes/xf86cvt.c | 4
hw/xfree86/modes/xf86gtf.c | 10
hw/xfree86/os-support/bsd/Makefile.am | 4
hw/xfree86/os-support/bsd/alpha_video.c | 466 -
hw/xfree86/os-support/bsd/arm_video.c | 451 -
hw/xfree86/os-support/bsd/bsd_apm.c | 2
hw/xfree86/os-support/bsd/bsd_axp.c | 71
hw/xfree86/os-support/bsd/bsd_bell.c | 20
hw/xfree86/os-support/bsd/bsd_ev56.c | 24
hw/xfree86/os-support/bsd/bsd_init.c | 24
hw/xfree86/os-support/bsd/bsd_kqueue_apm.c | 16
hw/xfree86/os-support/bsd/i386_video.c | 584 -
hw/xfree86/os-support/bsd/ppc_video.c | 76
hw/xfree86/os-support/bsd/sparc64_video.c | 60
hw/xfree86/os-support/bus/xf86Pci.h | 21
hw/xfree86/os-support/hurd/Makefile.am | 2
hw/xfree86/os-support/hurd/hurd_mmap.c | 94
hw/xfree86/os-support/hurd/hurd_video.c | 69
hw/xfree86/os-support/linux/Makefile.am | 10
hw/xfree86/os-support/linux/int10/linux.c | 19
hw/xfree86/os-support/linux/lnx_agp.c | 4
hw/xfree86/os-support/linux/lnx_axp.c | 103
hw/xfree86/os-support/linux/lnx_ev56.c | 24
hw/xfree86/os-support/linux/lnx_init.c | 6
hw/xfree86/os-support/linux/lnx_kmod.c | 2
hw/xfree86/os-support/linux/lnx_platform.c | 52
hw/xfree86/os-support/linux/lnx_video.c | 688 -
hw/xfree86/os-support/linux/systemd-logind.c | 19
hw/xfree86/os-support/misc/SlowBcopy.c | 8
hw/xfree86/os-support/shared/bios_mmap.c | 135
hw/xfree86/os-support/shared/ioperm_noop.c | 2
hw/xfree86/os-support/shared/sigio.c | 6
hw/xfree86/os-support/shared/vidmem.c | 205
hw/xfree86/os-support/shared/xf86Axp.c | 60
hw/xfree86/os-support/shared/xf86Axp.h | 33
hw/xfree86/os-support/solaris/sun_apm.c | 2
hw/xfree86/os-support/solaris/sun_init.c | 33
hw/xfree86/os-support/solaris/sun_vid.c | 140
hw/xfree86/os-support/stub/Makefile.am | 1
hw/xfree86/os-support/stub/stub_bios.c | 12
hw/xfree86/os-support/xf86OSpriv.h | 13
hw/xfree86/os-support/xf86_OSlib.h | 39
hw/xfree86/os-support/xf86_OSproc.h | 54
hw/xfree86/parser/Configint.h | 18
hw/xfree86/parser/DRI.c | 8
hw/xfree86/parser/Device.c | 26
hw/xfree86/parser/Files.c | 14
hw/xfree86/parser/Flags.c | 16
hw/xfree86/parser/Input.c | 16
hw/xfree86/parser/Layout.c | 16
hw/xfree86/parser/Module.c | 16
hw/xfree86/parser/Monitor.c | 18
hw/xfree86/parser/Pointer.c | 16
hw/xfree86/parser/Screen.c | 16
hw/xfree86/parser/Vendor.c | 16
hw/xfree86/parser/Video.c | 16
hw/xfree86/parser/read.c | 22
hw/xfree86/parser/scan.c | 36
hw/xfree86/parser/write.c | 14
hw/xfree86/parser/xf86Optrec.h | 18
hw/xfree86/parser/xf86Parser.h | 19
hw/xfree86/parser/xf86tokens.h | 19
hw/xfree86/ramdac/IBM.c | 4
hw/xfree86/ramdac/TI.c | 2
hw/xfree86/ramdac/xf86Cursor.c | 6
hw/xfree86/ramdac/xf86HWCurs.c | 2
hw/xfree86/ramdac/xf86RamDac.h | 4
hw/xfree86/ramdac/xf86RamDacCmap.c | 1
hw/xfree86/sdksyms.sh | 17
hw/xfree86/shadowfb/shadowfb.h | 2
hw/xfree86/utils/gtf/gtf.c | 26
hw/xfree86/vbe/vbe.c | 4
hw/xfree86/vbe/vbe.h | 4
hw/xfree86/vgahw/Makefile.am | 2
hw/xfree86/vgahw/vgaCmap.c | 276
hw/xfree86/vgahw/vgaHW.c | 8
hw/xfree86/vgahw/vgaHW.h | 2
hw/xfree86/x86emu/debug.c | 4
hw/xfree86/x86emu/ops.c | 22
hw/xfree86/x86emu/prim_ops.c | 70
hw/xfree86/x86emu/sys.c | 6
hw/xfree86/x86emu/x86emu/regs.h | 10
hw/xfree86/x86emu/x86emu/x86emui.h | 2
hw/xfree86/xorg-wrapper.c | 10
hw/xnest/Color.c | 2
hw/xnest/GC.c | 56
hw/xnest/Keyboard.c | 13
hw/xnest/Window.c | 4
hw/xnest/XNGC.h | 1
hw/xnest/XNWindow.h | 3
hw/xnest/Xnest.h | 2
hw/xquartz/darwin.c | 8
hw/xquartz/darwinEvents.c | 4
hw/xquartz/xpr/dri.c | 72
hw/xquartz/xpr/dri.h | 12
hw/xwayland/Makefile.am | 2
hw/xwayland/xwayland-cursor.c | 26
hw/xwayland/xwayland-glamor.c | 10
hw/xwayland/xwayland-input.c | 115
hw/xwayland/xwayland-output.c | 4
hw/xwayland/xwayland.c | 55
hw/xwayland/xwayland.h | 10
hw/xwin/InitInput.c | 3
hw/xwin/InitOutput.c | 58
hw/xwin/Makefile.am | 69
hw/xwin/XWin.rc | 1
hw/xwin/ddraw.h | 6
hw/xwin/glx/.gitignore | 5
hw/xwin/glx/gen_gl_wrappers.py | 109
hw/xwin/glx/glshim.c | 3
hw/xwin/glx/glwindows.h | 5
hw/xwin/glx/indirect.c | 19
hw/xwin/glx/winpriv.c | 2
hw/xwin/man/XWin.man | 10
hw/xwin/win.h | 186
hw/xwin/winSetAppUserModelID.c | 2
hw/xwin/winclip.c | 42
hw/xwin/winclipboard.h | 126
hw/xwin/winclipboard/Makefile.am | 25
hw/xwin/winclipboard/debug.c | 52
hw/xwin/winclipboard/internal.h | 117
hw/xwin/winclipboard/textconv.c | 151
hw/xwin/winclipboard/thread.c | 504 +
hw/xwin/winclipboard/winclipboard.h | 38
hw/xwin/winclipboard/wndproc.c | 596 +
hw/xwin/winclipboard/xevents.c | 864 ++
hw/xwin/winclipboard/xwinclip.c | 134
hw/xwin/winclipboard/xwinclip.man | 64
hw/xwin/winclipboardinit.c | 150
hw/xwin/winclipboardtextconv.c | 147
hw/xwin/winclipboardthread.c | 467 -
hw/xwin/winclipboardwndproc.c | 529 -
hw/xwin/winclipboardwrappers.c | 232
hw/xwin/winclipboardxevents.c | 703 -
hw/xwin/wincmap.c | 2
hw/xwin/winconfig.c | 10
hw/xwin/winconfig.h | 1
hw/xwin/wincreatewnd.c | 26
hw/xwin/wincursor.c | 10
hw/xwin/windialogs.c | 19
hw/xwin/windisplay.c | 64
hw/xwin/windisplay.h | 34
hw/xwin/winengine.c | 23
hw/xwin/winfillsp.c | 842 --
hw/xwin/winfont.c | 82
hw/xwin/wingc.c | 235
hw/xwin/wingetsp.c | 171
hw/xwin/winglobals.c | 13
hw/xwin/winglobals.h | 4
hw/xwin/winlayouts.h | 2
hw/xwin/winmisc.c | 63
hw/xwin/winmsg.h | 2
hw/xwin/winmsgwindow.c | 5
hw/xwin/winmultiwindowicons.c | 4
hw/xwin/winmultiwindowshape.c | 2
hw/xwin/winmultiwindowwindow.c | 20
hw/xwin/winmultiwindowwm.c | 9
hw/xwin/winmultiwindowwndproc.c | 4
hw/xwin/winnativegdi.c | 491 -
hw/xwin/winpfbdd.c | 620 -
hw/xwin/winpixmap.c | 223
hw/xwin/winpolyline.c | 53
hw/xwin/winprefs.c | 10
hw/xwin/winprefslex.l | 2
hw/xwin/winprefsyacc.y | 11
hw/xwin/winprocarg.c | 41
hw/xwin/winresource.h | 1
hw/xwin/winrop.c | 142
hw/xwin/winscrinit.c | 143
hw/xwin/winsetsp.c | 175
hw/xwin/winshaddd.c | 8
hw/xwin/winshadddnl.c | 10
hw/xwin/winshadgdi.c | 10
hw/xwin/wintrayicon.c | 19
hw/xwin/winwin32rootlesswndproc.c | 2
hw/xwin/winwindow.c | 219
hw/xwin/winwindowswm.c | 2
hw/xwin/winwndproc.c | 29
include/callback.h | 18
include/closure.h | 8
include/colormap.h | 24
include/colormapst.h | 8
include/cursor.h | 12
include/cursorstr.h | 10
include/dbus-core.h | 2
include/dix-config.h.in | 28
include/dix.h | 83
include/dixfont.h | 10
include/dixgrabs.h | 4
include/extension.h | 8
include/extnsionst.h | 10
include/gc.h | 12
include/gcstruct.h | 63
include/hotplug.h | 69
include/input.h | 21
include/inputstr.h | 14
include/list.h | 2
include/misc.h | 18
include/miscstruct.h | 8
include/os.h | 117
include/pixmap.h | 28
include/pixmapstr.h | 11
include/property.h | 44
include/propertyst.h | 10
include/region.h | 8
include/regionstr.h | 2
include/registry.h | 40
include/resource.h | 84
include/rgb.h | 8
include/screenint.h | 8
include/scrnintstr.h | 134
include/selection.h | 10
include/servermd.h | 296
include/site.h | 14
include/window.h | 28
include/windowstr.h | 11
include/xkbfile.h | 18
include/xkbsrv.h | 34
include/xkbstr.h | 24
include/xorg-config.h.in | 6
include/xorg-server.h.in | 7
include/xsha1.h | 2
man/Xserver.man | 9
mi/Makefile.am | 11
mi/mi.h | 149
mi/miarc.c | 255
mi/mibitblt.c | 48
mi/micmap.c | 44
mi/micoord.h | 20
mi/micopy.c | 8
mi/micursor.c | 68
mi/midash.c | 9
mi/midispcur.c | 4
mi/miexpose.c | 127
mi/mifillarc.c | 156
mi/mifillarc.h | 9
mi/mifillrct.c | 10
mi/mifpoly.h | 50
mi/mifpolycon.c | 249
mi/migc.c | 45
mi/miglblt.c | 8
mi/miinitext.c | 8
mi/mioverlay.c | 72
mi/mipointer.c | 23
mi/mipoly.c | 627 +
mi/mipoly.h | 22
mi/mipolycon.c | 235
mi/mipolygen.c | 213
mi/mipolypnt.c | 8
mi/mipolyrect.c | 8
mi/mipolyseg.c | 10
mi/mipolytext.c | 8
mi/mipolyutil.c | 369
mi/mipushpxl.c | 8
mi/miscrinit.c | 5
mi/mispans.c | 526 -
mi/mispans.h | 87
mi/misprite.c | 4
mi/mistruct.h | 8
mi/mivaltree.c | 72
mi/miwideline.c | 546 +
mi/miwideline.h | 26
mi/miwindow.c | 63
mi/mizerarc.c | 2
mi/mizerclip.c | 8
mi/mizerline.c | 28
miext/damage/damage.c | 2
miext/rootless/rootless.h | 2
miext/rootless/rootlessGC.c | 2
miext/rootless/rootlessValTree.c | 97
miext/rootless/rootlessWindow.c | 6
miext/shadow/shadow.c | 54
miext/shadow/shadow.h | 6
miext/shadow/shrotate.c | 2
miext/sync/misyncfd.c | 4
os/WaitFor.c | 18
os/access.c | 198
os/auth.c | 8
os/backtrace.c | 4
os/busfault.c | 2
os/connection.c | 27
os/io.c | 17
os/log.c | 47
os/oscolor.c | 1562 ++--
os/osdep.h | 8
os/osinit.c | 20
os/utils.c | 80
os/xdmcp.c | 23
os/xsha1.c | 25
present/present.c | 55
present/present.h | 1
present/present_event.c | 4
present/present_priv.h | 2
present/present_screen.c | 1
randr/randrstr.h | 20
randr/rrcrtc.c | 6
randr/rroutput.c | 1
randr/rrpointer.c | 11
randr/rrprovider.c | 2
randr/rrscreen.c | 2
randr/rrtransform.c | 2
randr/rrtransform.h | 2
randr/rrxinerama.c | 2
record/record.c | 20
render/animcur.c | 2
render/glyph.c | 2
render/glyphstr.h | 2
render/mipict.c | 34
render/mipict.h | 2
render/mirect.c | 2
render/picture.c | 129
render/picture.h | 8
render/picturestr.h | 6
render/render.c | 4
test/Makefile.am | 5
test/list.c | 24
test/signal-logging.c | 7
test/xi2/protocol-common.c | 26
xfixes/cursor.c | 22
xfixes/region.c | 27
xkb/XKBAlloc.c | 16
xkb/XKBGAlloc.c | 16
xkb/XKBMAlloc.c | 18
xkb/XKBMisc.c | 16
xkb/ddxBeep.c | 16
xkb/ddxCtrls.c | 16
xkb/ddxKillSrv.c | 16
xkb/ddxLEDs.c | 16
xkb/ddxLoad.c | 16
xkb/ddxVT.c | 16
xkb/maprules.c | 18
xkb/xkb.c | 18
xkb/xkbAccessX.c | 18
xkb/xkbActions.c | 16
xkb/xkbEvents.c | 25
xkb/xkbInit.c | 22
xkb/xkbLEDs.c | 44
xkb/xkbPrKeyEv.c | 16
xkb/xkbSwap.c | 16
xkb/xkbUtils.c | 16
xkb/xkbfmisc.c | 18
xkb/xkbgeom.h | 16
xkb/xkbout.c | 18
xkb/xkbtext.c | 18
xkb/xkmread.c | 18
669 files changed, 27934 insertions(+), 30241 deletions(-)
New commits:
commit 80e2b7d508b9533ccceb29f99aa0d96e36bb3b24
Author: Sven Joachim <svenjoac@gmx.de>
Date: Wed Jun 24 17:59:08 2015 +0200
Update debian/upstream/signing-key.asc
diff --git a/debian/changelog b/debian/changelog
index 31fc0a2..5802892 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg-server (2:1.17.2-1) UNRELEASED; urgency=medium
+ unauthorised local client access in XWayland [CVE-2015-3164]
(Closes: #788410)
* Install the modesetting.4 manpage into xserver-xorg-core (Closes: #789646)
+ * Update debian/upstream/signing-key.asc.
-- Sven Joachim <svenjoac@gmx.de> Wed, 24 Jun 2015 17:17:25 +0200
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
index 1e34b0c..2395a38 100644
--- a/debian/upstream/signing-key.asc
+++ b/debian/upstream/signing-key.asc
@@ -279,3 +279,44 @@ gksZFyWOfV82jHBeu+O0xJNU/9xvZsJF4TORrRWRO1o1gkF7x/oBk7yilh+mSq1P
DNOWZJQhmuWMtbOUL2WMkKRPDwJrcbwpt3bc6aZCeAH1SSRLEe9Y+2uLeneTMA==
=+xMJ
-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+GBF1
+=bYOv
+-----END PGP PUBLIC KEY BLOCK-----
commit 21e27c726f26efceff8f5e8dab695c5226973f5b
Author: Sven Joachim <svenjoac@gmx.de>
Date: Wed Jun 24 17:57:46 2015 +0200
Install the modesetting.4 manpage into xserver-xorg-core
diff --git a/debian/changelog b/debian/changelog
index 534b2d8..31fc0a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg-server (2:1.17.2-1) UNRELEASED; urgency=medium
+ int10: Fix error check for pci_device_map_legacy (Closes: #787144)
+ unauthorised local client access in XWayland [CVE-2015-3164]
(Closes: #788410)
+ * Install the modesetting.4 manpage into xserver-xorg-core (Closes: #789646)
-- Sven Joachim <svenjoac@gmx.de> Wed, 24 Jun 2015 17:17:25 +0200
diff --git a/debian/xserver-xorg-core.install b/debian/xserver-xorg-core.install
index 517db7a..6c06117 100644
--- a/debian/xserver-xorg-core.install
+++ b/debian/xserver-xorg-core.install
@@ -9,4 +9,5 @@ main/usr/bin/cvt usr/bin
main/usr/bin/gtf usr/bin
main/usr/share/man/man1/cvt.1 usr/share/man/man1
main/usr/share/man/man1/gtf.1 usr/share/man/man1
+main/usr/share/man/man4/modesetting.4 usr/share/man/man4
main/usr/share/X11/xorg.conf.d usr/share/X11/
commit 18b9d95e7fa3d55984c61c666f492d068793c17b
Author: Sven Joachim <svenjoac@gmx.de>
Date: Wed Jun 24 17:17:41 2015 +0200
New upstream release
Fixing at least five bugs reported in the BTS.
diff --git a/debian/changelog b/debian/changelog
index d40249f..534b2d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+xorg-server (2:1.17.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ + symbols: Fix sdksyms.sh to cope with gcc5 (Closes: #778187)
+ + os/access: fix regression in server interpreted auth (Closes: #784687)
+ + dix: Fix image byte order on big endian hardware (Closes: #785474)
+ + int10: Fix error check for pci_device_map_legacy (Closes: #787144)
+ + unauthorised local client access in XWayland [CVE-2015-3164]
+ (Closes: #788410)
+
+ -- Sven Joachim <svenjoac@gmx.de> Wed, 24 Jun 2015 17:17:25 +0200
+
xorg-server (2:1.17.1-2) experimental; urgency=medium
* Disable libdrm support on hurd and in the kfreebsd udeb build, so we don't
commit 2123f7682d522619f101b05fb75efa75dabbe371
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jun 16 11:42:47 2015 -0400
xserver 1.17.2
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 847b5c4..d8f0e74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.60)
-AC_INIT([xorg-server], 1.17.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2015-02-10"
+AC_INIT([xorg-server], 1.17.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="2015-06-16"
RELEASE_NAME="lambic"
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
commit 8a5fb096d43577a061f7769d9257cbedaac998ef
Author: Dave Airlie <airlied@redhat.com>
Date: Thu May 28 05:30:01 2015 +0000
glamor: don't do render ops with matching source/dest (v2)
XRender defines this, GL really doesn't like it.
kwin 4.x and qt 4.x seem to make this happen for the
gradient in the titlebar, and on radeonsi/r600 hw
this draws all kinds of wrong.
v2: bump this up a level, and check it earlier.
(I assume the XXXX was for this case.)
[This corresponds to fa12f2c150b2f50de9dac4a2b09265f13af353af in master,
fixed up for 1.17 branch. - ajax]
Signed-off-by: Dave Airlie <airlied@redhat.com>
diff --git a/glamor/glamor_largepixmap.c b/glamor/glamor_largepixmap.c
index 9b24584..b9c3b9a 100644
--- a/glamor/glamor_largepixmap.c
+++ b/glamor/glamor_largepixmap.c
@@ -1046,6 +1046,15 @@ glamor_composite_largepixmap_region(CARD8 op,
int source_repeat_type = 0, mask_repeat_type = 0;
int ok = TRUE;
+ if (source_pixmap_priv == dest_pixmap_priv) {
+ glamor_fallback("source and dest pixmaps are the same\n");
+ return FALSE;
+ }
+ if (mask_pixmap_priv == dest_pixmap_priv) {
+ glamor_fallback("mask and dest pixmaps are the same\n");
+ return FALSE;
+ }
+
if (source->repeat)
source_repeat_type = source->repeatType;
else
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 2386f2e..d9b16ea 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -1400,6 +1400,7 @@ glamor_composite_clipped_region(CARD8 op,
{
ScreenPtr screen = dest->pDrawable->pScreen;
PixmapPtr source_pixmap = NULL, mask_pixmap = NULL;
+ PixmapPtr dest_pixmap = glamor_get_drawable_pixmap(dest->pDrawable);
PicturePtr temp_src = source, temp_mask = mask;
glamor_pixmap_private *temp_src_priv = source_pixmap_priv;
glamor_pixmap_private *temp_mask_priv = mask_pixmap_priv;
@@ -1502,7 +1503,14 @@ glamor_composite_clipped_region(CARD8 op,
}
}
- /*XXXXX, self copy? */
+ if (source_pixmap == dest_pixmap) {
+ glamor_fallback("source and dest pixmaps are the same\n");
+ goto out;
+ }
+ if (mask_pixmap == dest_pixmap) {
+ glamor_fallback("mask and dest pixmaps are the same\n");
+ goto out;
+ }
x_dest += dest->pDrawable->x;
y_dest += dest->pDrawable->y;
commit ea9e02184399e9979654544dde8926912a8aa2c8
Author: Rui Matos <tiagomatos@gmail.com>
Date: Wed May 27 12:08:45 2015 +0200
xwayland: Throttle our cursor surface updates with a frame callback
In some extreme cases with animated cursors at a high frame rate we
could end up filling the wl_display outgoing buffer and end up with
wl_display_flush() failing.
In any case, using the frame callback to throttle ourselves is the
right thing to do.
Signed-off-by: Rui Matos <tiagomatos@gmail.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit cbb7eb73b5399e31a7afb800363504d539df0ecf)
diff --git a/hw/xwayland/xwayland-cursor.c b/hw/xwayland/xwayland-cursor.c
index 5a9d1fe..c137e1e 100644
--- a/hw/xwayland/xwayland-cursor.c
+++ b/hw/xwayland/xwayland-cursor.c
@@ -82,6 +82,23 @@ xwl_unrealize_cursor(DeviceIntPtr device, ScreenPtr screen, CursorPtr cursor)
return xwl_shm_destroy_pixmap(pixmap);
}
+static void
+frame_callback(void *data,
+ struct wl_callback *callback,
+ uint32_t time)
+{
+ struct xwl_seat *xwl_seat = data;
+ xwl_seat->cursor_frame_cb = NULL;
+ if (xwl_seat->cursor_needs_update) {
+ xwl_seat->cursor_needs_update = FALSE;
+ xwl_seat_set_cursor(xwl_seat);
+ }
+}
+
+static const struct wl_callback_listener frame_listener = {
+ frame_callback
+};
+
void
xwl_seat_set_cursor(struct xwl_seat *xwl_seat)
{
@@ -98,6 +115,11 @@ xwl_seat_set_cursor(struct xwl_seat *xwl_seat)
return;
}
+ if (xwl_seat->cursor_frame_cb) {
+ xwl_seat->cursor_needs_update = TRUE;
+ return;
+ }
+
cursor = xwl_seat->x_cursor;
pixmap = dixGetPrivate(&cursor->devPrivates, &xwl_cursor_private_key);
stride = cursor->bits->width * 4;
@@ -117,6 +139,10 @@ xwl_seat_set_cursor(struct xwl_seat *xwl_seat)
wl_surface_damage(xwl_seat->cursor, 0, 0,
xwl_seat->x_cursor->bits->width,
xwl_seat->x_cursor->bits->height);
+
+ xwl_seat->cursor_frame_cb = wl_surface_frame(xwl_seat->cursor);
+ wl_callback_add_listener(xwl_seat->cursor_frame_cb, &frame_listener, xwl_seat);
+
wl_surface_commit(xwl_seat->cursor);
}
diff --git a/hw/xwayland/xwayland-input.c b/hw/xwayland/xwayland-input.c
index cbffea7..4639048 100644
--- a/hw/xwayland/xwayland-input.c
+++ b/hw/xwayland/xwayland-input.c
@@ -569,6 +569,8 @@ xwl_seat_destroy(struct xwl_seat *xwl_seat)
RemoveDevice(xwl_seat->keyboard, FALSE);
wl_seat_destroy(xwl_seat->seat);
wl_surface_destroy(xwl_seat->cursor);
+ if (xwl_seat->cursor_frame_cb)
+ wl_callback_destroy(xwl_seat->cursor_frame_cb);
wl_array_release(&xwl_seat->keys);
free(xwl_seat);
}
diff --git a/hw/xwayland/xwayland.h b/hw/xwayland/xwayland.h
index cfb343d..28b0c99 100644
--- a/hw/xwayland/xwayland.h
+++ b/hw/xwayland/xwayland.h
@@ -115,12 +115,14 @@ struct xwl_seat {
struct wl_pointer *wl_pointer;
struct wl_keyboard *wl_keyboard;
struct wl_array keys;
- struct wl_surface *cursor;
struct xwl_window *focus_window;
uint32_t id;
uint32_t pointer_enter_serial;
struct xorg_list link;
CursorPtr x_cursor;
+ struct wl_surface *cursor;
+ struct wl_callback *cursor_frame_cb;
+ Bool cursor_needs_update;
size_t keymap_size;
char *keymap;
commit 6cc61df989c7764097c9b21d71386e230fa13cd4
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri Feb 6 08:25:42 2015 +0000
present: Copy unflip contents back to the Screen Pixmap
Reply to: