Merge lp:~muktupavels/xorg-server/lp-1209008 into lp:ubuntu/utopic/xorg-server

Proposed by Alberts Muktupāvels on 2014-07-01
Status: Merged
Merge reported by: Alberts Muktupāvels
Merged at revision: not available
Proposed branch: lp:~muktupavels/xorg-server/lp-1209008
Merge into: lp:ubuntu/utopic/xorg-server
Diff against target: 127395 lines (+41074/-58511)
559 files modified
.dir-locals.el (+1/-0)
COPYING (+1/-0)
ChangeLog (+7713/-544)
Makefile.am (+14/-0)
Makefile.in (+17/-1)
Xext/Makefile.in (+9/-1)
Xext/panoramiX.c (+11/-14)
Xext/panoramiXsrv.h (+1/-0)
Xext/saver.c (+2/-4)
Xext/security.c (+8/-3)
Xext/shm.c (+230/-12)
Xext/shmint.h (+24/-0)
Xext/sync.c (+149/-63)
Xext/syncsrv.h (+13/-0)
Xext/xvdisp.c (+5/-16)
Xext/xvmain.c (+2/-2)
Xi/Makefile.in (+9/-1)
Xi/chgdctl.c (+6/-0)
Xi/exevents.c (+39/-20)
Xi/extinit.c (+2/-0)
Xi/grabdev.c (+1/-4)
Xi/setdval.c (+3/-0)
Xi/setmode.c (+4/-0)
Xi/xiallowev.c (+1/-1)
Xi/xibarriers.c (+12/-0)
Xi/xibarriers.h (+2/-2)
Xi/xichangehierarchy.c (+4/-0)
Xi/xipassivegrab.c (+5/-1)
aclocal.m4 (+1519/-1324)
composite/Makefile.in (+9/-1)
composite/compalloc.c (+2/-2)
composite/compext.c (+6/-1)
composite/compinit.c (+5/-2)
composite/compoverlay.c (+4/-1)
config/10-quirks.conf (+54/-0)
config/Makefile.am (+2/-2)
config/Makefile.in (+11/-3)
config/hal.c (+13/-3)
config/non-seat0.conf.multi-seat (+18/-0)
config/udev.c (+15/-4)
configure (+4345/-2291)
configure.ac (+290/-88)
damageext/Makefile.in (+9/-1)
damageext/damageext.c (+353/-78)
damageext/damageextint.h (+3/-0)
dbe/Makefile.am (+1/-2)
dbe/Makefile.in (+10/-3)
dbe/dbe.c (+5/-76)
dbe/dbestruct.h (+14/-7)
dbe/midbe.c (+41/-93)
dbe/midbestr.h (+0/-75)
debian/changelog (+373/-2)
debian/compat (+1/-1)
debian/control (+56/-39)
debian/patches/02_improve-posix-saved-ids-check.diff (+0/-65)
debian/patches/02_kbsd-input-devd.diff (+551/-0)
debian/patches/04_hashtabletest-s390x.diff (+0/-27)
debian/patches/10_Include-missing-selection-h.diff (+0/-20)
debian/patches/190_cache-xkbcomp_output_for_fast_start_up.patch (+92/-30)
debian/patches/29b1484bb9555e45067669cbfe68a3c40596f4ff.patch (+44/-0)
debian/patches/aarch64.patch (+0/-39)
debian/patches/autoconfig-fixup-tell-changed-so-randr-clients-can-t.patch (+0/-192)
debian/patches/disable-rotation-transform-gpuscreens.patch (+22/-0)
debian/patches/drm_device_keep_trying.patch (+172/-0)
debian/patches/fix-detach-gpu.patch (+89/-0)
debian/patches/fix-ftbfs-ppc64el.patch (+13/-0)
debian/patches/include-selection-h.patch (+0/-12)
debian/patches/mi-dont-process-disabled.patch (+62/-0)
debian/patches/os-use-libunwind-to-generate-backtraces.patch (+0/-206)
debian/patches/pixman-validate.patch (+27/-0)
debian/patches/ppc64el-endian-fix.patch (+34/-0)
debian/patches/rrcrtc-brackets-are-hard.patch (+42/-0)
debian/patches/series (+15/-14)
debian/patches/xephyr-glx-register.patch (+0/-39)
debian/patches/xf86-detach-scanout.patch (+0/-87)
debian/patches/xf86-ignore-conflicting-rr-caps.patch (+20/-0)
debian/patches/xi-dont-copy-too-much.patch (+67/-0)
debian/patches/xi2-resize-touch.patch (+34/-0)
debian/patches/xmir.patch (+935/-413)
debian/patches/xrandr-rroutputchanged-main.patch (+63/-0)
debian/rules (+55/-25)
debian/serverminver (+3/-3)
debian/xorg-server-source.install (+1/-0)
debian/xserver-xfbdev.install (+0/-1)
dix/Makefile.am (+2/-1)
dix/Makefile.in (+19/-9)
dix/cursor.c (+0/-6)
dix/devices.c (+38/-11)
dix/dispatch.c (+53/-70)
dix/dixfonts.c (+11/-3)
dix/dixutils.c (+7/-1)
dix/events.c (+91/-32)
dix/getevents.c (+30/-18)
dix/globals.c (+0/-1)
dix/inpututils.c (+16/-19)
dix/main.c (+7/-5)
dix/pixmap.c (+0/-1)
dix/privates.c (+0/-1)
dix/ptrveloc.c (+2/-3)
dix/region.c (+15/-0)
dix/registry.c (+17/-8)
dix/stubmain.c (+35/-0)
dix/window.c (+11/-10)
doc/Makefile.in (+9/-1)
doc/dtrace/Makefile.in (+9/-1)
dri3/Makefile.am (+13/-0)
dri3/Makefile.in (+805/-0)
dri3/dri3.c (+92/-0)
dri3/dri3.h (+65/-0)
dri3/dri3_event.c (+163/-0)
dri3/dri3_priv.h (+80/-0)
dri3/dri3_request.c (+395/-0)
dri3/dri3_screen.c (+86/-0)
dri3/dri3int.h (+26/-0)
exa/Makefile.am (+1/-5)
exa/Makefile.in (+10/-5)
exa/exa_classic.c (+0/-1)
exa/exa_migration_mixed.c (+7/-5)
exa/exa_mixed.c (+7/-6)
fb/Makefile.in (+9/-1)
fb/fb.h (+0/-34)
fb/fbcopy.c (+0/-27)
fb/fbpict.c (+2/-6)
fb/wfbrename.h (+1/-0)
glx/Makefile.am (+6/-18)
glx/Makefile.in (+19/-27)
glx/createcontext.c (+3/-1)
glx/dispatch.h (+0/-19816)
glx/extension_string.c (+7/-0)
glx/extension_string.h (+6/-0)
glx/glapi.c (+0/-504)
glx/glapi.h (+0/-135)
glx/glapi_gentable.c (+0/-10058)
glx/glapitable.h (+0/-1016)
glx/glprocs.h (+0/-3534)
glx/glthread.h (+0/-234)
glx/glxcmds.c (+162/-60)
glx/glxcmdsswap.c (+0/-4)
glx/glxcontext.h (+5/-6)
glx/glxdri.c (+0/-1168)
glx/glxdri2.c (+44/-34)
glx/glxdricommon.c (+67/-8)
glx/glxdriswrast.c (+8/-7)
glx/glxext.c (+40/-15)
glx/glxext.h (+16/-0)
glx/glxscreens.c (+7/-10)
glx/glxscreens.h (+3/-5)
glx/glxserver.h (+16/-0)
glx/indirect_dispatch.c (+1668/-2492)
glx/indirect_dispatch.h (+252/-350)
glx/indirect_dispatch_swap.c (+1958/-3081)
glx/indirect_program.c (+30/-33)
glx/indirect_reqsize.c (+35/-74)
glx/indirect_reqsize.h (+20/-33)
glx/indirect_size.h (+7/-5)
glx/indirect_size_get.c (+96/-112)
glx/indirect_size_get.h (+5/-11)
glx/indirect_table.c (+221/-247)
glx/indirect_texture_compression.c (+8/-19)
glx/indirect_util.c (+1/-6)
glx/render2.c (+37/-40)
glx/render2swap.c (+37/-40)
glx/renderpix.c (+10/-16)
glx/renderpixswap.c (+10/-16)
glx/single2.c (+7/-11)
glx/single2swap.c (+6/-10)
glx/singlepix.c (+32/-55)
glx/singlepixswap.c (+32/-56)
glx/singlesize.c (+3/-7)
glx/swap_interval.c (+0/-4)
glx/xfont.c (+11/-19)
hw/Makefile.in (+9/-1)
hw/dmx/Makefile.am (+0/-2)
hw/dmx/Makefile.in (+17/-12)
hw/dmx/config/Makefile.in (+9/-1)
hw/dmx/config/dmxcompat.c (+4/-0)
hw/dmx/config/man/Makefile.in (+9/-1)
hw/dmx/config/parser.c (+1949/-700)
hw/dmx/config/parser.h (+86/-18)
hw/dmx/dmx.h (+0/-4)
hw/dmx/dmx_glxvisuals.c (+23/-9)
hw/dmx/dmxcursor.c (+0/-2)
hw/dmx/dmxextension.c (+3/-0)
hw/dmx/dmxinit.c (+5/-11)
hw/dmx/dmxpict.c (+0/-4)
hw/dmx/dmxscrinit.c (+110/-163)
hw/dmx/dmxshadow.c (+0/-70)
hw/dmx/dmxshadow.h (+0/-46)
hw/dmx/doc/Makefile.in (+9/-1)
hw/dmx/doxygen/Makefile.in (+9/-1)
hw/dmx/examples/Makefile.in (+9/-1)
hw/dmx/glxProxy/Makefile.am (+0/-1)
hw/dmx/glxProxy/Makefile.in (+12/-7)
hw/dmx/glxProxy/glxcmds.c (+39/-21)
hw/dmx/glxProxy/glxext.c (+0/-6)
hw/dmx/glxProxy/glxscreens.c (+3/-6)
hw/dmx/glxProxy/glxserver.h (+0/-2)
hw/dmx/glxProxy/glxsingle.c (+21/-17)
hw/dmx/glxProxy/glxutil.c (+0/-37)
hw/dmx/glxProxy/glxutil.h (+0/-2)
hw/dmx/glxProxy/glxvendor.c (+20/-16)
hw/dmx/input/Makefile.in (+9/-1)
hw/dmx/input/dmxbackend.c (+1/-5)
hw/dmx/input/dmxcommon.c (+0/-5)
hw/dmx/input/dmxevents.c (+1/-2)
hw/dmx/input/usb-private.h (+2/-2)
hw/dmx/man/Makefile.in (+9/-1)
hw/dmx/man/Xdmx.man (+0/-10)
hw/kdrive/Makefile.in (+9/-1)
hw/kdrive/ephyr/Makefile.am (+41/-56)
hw/kdrive/ephyr/Makefile.in (+91/-131)
hw/kdrive/ephyr/XF86dri.c (+0/-647)
hw/kdrive/ephyr/ephyr.c (+347/-147)
hw/kdrive/ephyr/ephyr.h (+16/-4)
hw/kdrive/ephyr/ephyrdri.c (+145/-59)
hw/kdrive/ephyr/ephyrdri.h (+1/-1)
hw/kdrive/ephyr/ephyrdriext.c (+11/-21)
hw/kdrive/ephyr/ephyrglxext.c (+6/-8)
hw/kdrive/ephyr/ephyrhostglx.c (+216/-478)
hw/kdrive/ephyr/ephyrhostglx.h (+6/-5)
hw/kdrive/ephyr/ephyrhostproxy.c (+0/-91)
hw/kdrive/ephyr/ephyrhostproxy.h (+0/-51)
hw/kdrive/ephyr/ephyrhostvideo.c (+0/-975)
hw/kdrive/ephyr/ephyrhostvideo.h (+0/-231)
hw/kdrive/ephyr/ephyrinit.c (+38/-5)
hw/kdrive/ephyr/ephyrproxyext.c (+0/-115)
hw/kdrive/ephyr/ephyrproxyext.h (+0/-33)
hw/kdrive/ephyr/ephyrvideo.c (+427/-377)
hw/kdrive/ephyr/hostx.c (+530/-753)
hw/kdrive/ephyr/hostx.h (+19/-83)
hw/kdrive/ephyr/man/Makefile.in (+9/-1)
hw/kdrive/ephyr/man/Xephyr.man (+5/-1)
hw/kdrive/ephyr/os.c (+1/-1)
hw/kdrive/ephyr/xf86dri.h (+0/-124)
hw/kdrive/fake/Makefile.am (+1/-1)
hw/kdrive/fake/Makefile.in (+10/-2)
hw/kdrive/fbdev/Makefile.am (+1/-1)
hw/kdrive/fbdev/Makefile.in (+10/-2)
hw/kdrive/fbdev/fbdev.c (+140/-31)
hw/kdrive/fbdev/fbdev.h (+1/-1)
hw/kdrive/linux/Makefile.am (+1/-1)
hw/kdrive/linux/Makefile.in (+10/-2)
hw/kdrive/linux/evdev.c (+1/-1)
hw/kdrive/linux/linux.c (+1/-1)
hw/kdrive/linux/mouse.c (+3/-9)
hw/kdrive/linux/ps2.c (+1/-1)
hw/kdrive/src/Makefile.am (+1/-1)
hw/kdrive/src/Makefile.in (+10/-2)
hw/kdrive/src/kdrive.c (+7/-5)
hw/kdrive/src/kdrive.h (+11/-9)
hw/kdrive/src/kinput.c (+15/-27)
hw/kdrive/src/kxv.c (+0/-2)
hw/vfb/Makefile.in (+9/-1)
hw/vfb/man/Makefile.in (+9/-1)
hw/xfree86/Makefile.am (+24/-21)
hw/xfree86/Makefile.in (+43/-30)
hw/xfree86/common/Makefile.am (+1/-1)
hw/xfree86/common/Makefile.in (+10/-2)
hw/xfree86/common/compiler.h (+1/-1)
hw/xfree86/common/xf86.h (+0/-25)
hw/xfree86/common/xf86AutoConfig.c (+9/-8)
hw/xfree86/common/xf86Bus.c (+5/-0)
hw/xfree86/common/xf86Config.c (+2/-1)
hw/xfree86/common/xf86Configure.c (+2/-0)
hw/xfree86/common/xf86Cursor.c (+0/-3)
hw/xfree86/common/xf86DPMS.c (+8/-1)
hw/xfree86/common/xf86Events.c (+22/-10)
hw/xfree86/common/xf86Helper.c (+10/-4)
hw/xfree86/common/xf86Mode.c (+7/-10)
hw/xfree86/common/xf86Module.h (+3/-3)
hw/xfree86/common/xf86Option.c (+1/-1)
hw/xfree86/common/xf86RandR.c (+9/-7)
hw/xfree86/common/xf86fbman.c (+7/-5)
hw/xfree86/common/xf86platformBus.c (+6/-0)
hw/xfree86/common/xf86sbusBus.c (+4/-2)
hw/xfree86/common/xf86xvmc.c (+3/-1)
hw/xfree86/ddc/Makefile.am (+1/-1)
hw/xfree86/ddc/Makefile.in (+10/-2)
hw/xfree86/ddc/ddc.c (+4/-3)
hw/xfree86/ddc/xf86DDC.h (+0/-2)
hw/xfree86/dixmods/Makefile.am (+2/-2)
hw/xfree86/dixmods/Makefile.in (+14/-4)
hw/xfree86/dixmods/glxmodule.c (+0/-3)
hw/xfree86/doc/Makefile.in (+9/-1)
hw/xfree86/dri/Makefile.in (+9/-1)
hw/xfree86/dri2/Makefile.in (+9/-1)
hw/xfree86/dri2/dri2.c (+1/-18)
hw/xfree86/dri2/dri2ext.c (+5/-0)
hw/xfree86/exa/Makefile.am (+1/-1)
hw/xfree86/exa/Makefile.in (+10/-2)
hw/xfree86/exa/man/Makefile.in (+9/-1)
hw/xfree86/fbdevhw/Makefile.am (+1/-1)
hw/xfree86/fbdevhw/Makefile.in (+10/-2)
hw/xfree86/fbdevhw/fbdevhw.c (+1/-0)
hw/xfree86/fbdevhw/man/Makefile.in (+9/-1)
hw/xfree86/i2c/Makefile.am (+1/-1)
hw/xfree86/i2c/Makefile.in (+10/-2)
hw/xfree86/int10/Makefile.am (+3/-3)
hw/xfree86/int10/Makefile.in (+11/-4)
hw/xfree86/loader/Makefile.am (+1/-1)
hw/xfree86/loader/Makefile.in (+10/-2)
hw/xfree86/man/Makefile.in (+9/-1)
hw/xfree86/man/xorg.conf.man (+17/-1)
hw/xfree86/modes/Makefile.am (+2/-4)
hw/xfree86/modes/Makefile.in (+12/-6)
hw/xfree86/modes/xf86Crtc.c (+108/-4)
hw/xfree86/modes/xf86Crtc.h (+0/-3)
hw/xfree86/modes/xf86DisplayIDModes.c (+1/-0)
hw/xfree86/modes/xf86Modes.h (+3/-3)
hw/xfree86/modes/xf86RandR12.c (+19/-3)
hw/xfree86/modes/xf86RandR12.h (+0/-3)
hw/xfree86/modes/xf86Rename.h (+0/-94)
hw/xfree86/modes/xf86Rotate.c (+1/-5)
hw/xfree86/os-support/Makefile.in (+9/-1)
hw/xfree86/os-support/bsd/Makefile.am (+1/-1)
hw/xfree86/os-support/bsd/Makefile.in (+10/-2)
hw/xfree86/os-support/bus/Makefile.am (+1/-1)
hw/xfree86/os-support/bus/Makefile.in (+10/-2)
hw/xfree86/os-support/bus/Sbus.c (+6/-2)
hw/xfree86/os-support/hurd/Makefile.am (+1/-1)
hw/xfree86/os-support/hurd/Makefile.in (+10/-2)
hw/xfree86/os-support/hurd/hurd_init.c (+1/-0)
hw/xfree86/os-support/hurd/hurd_mmap.c (+1/-0)
hw/xfree86/os-support/hurd/hurd_video.c (+1/-0)
hw/xfree86/os-support/linux/Makefile.am (+1/-1)
hw/xfree86/os-support/linux/Makefile.in (+10/-2)
hw/xfree86/os-support/linux/lnx_platform.c (+10/-4)
hw/xfree86/os-support/linux/lnx_video.c (+2/-1)
hw/xfree86/os-support/misc/Makefile.am (+1/-1)
hw/xfree86/os-support/misc/Makefile.in (+10/-2)
hw/xfree86/os-support/shared/vidmem.c (+0/-13)
hw/xfree86/os-support/solaris/Makefile.am (+1/-1)
hw/xfree86/os-support/solaris/Makefile.in (+10/-2)
hw/xfree86/os-support/stub/Makefile.am (+1/-1)
hw/xfree86/os-support/stub/Makefile.in (+10/-2)
hw/xfree86/os-support/xf86OSpriv.h (+0/-2)
hw/xfree86/os-support/xf86_OSlib.h (+0/-5)
hw/xfree86/os-support/xf86_OSproc.h (+0/-2)
hw/xfree86/parser/Makefile.am (+1/-1)
hw/xfree86/parser/Makefile.in (+10/-2)
hw/xfree86/parser/write.c (+2/-1)
hw/xfree86/ramdac/Makefile.am (+1/-1)
hw/xfree86/ramdac/Makefile.in (+10/-2)
hw/xfree86/ramdac/xf86Cursor.c (+0/-1)
hw/xfree86/sdksyms.sh (+4/-0)
hw/xfree86/shadowfb/Makefile.am (+1/-1)
hw/xfree86/shadowfb/Makefile.in (+10/-2)
hw/xfree86/utils/Makefile.in (+9/-1)
hw/xfree86/utils/cvt/Makefile.am (+2/-1)
hw/xfree86/utils/cvt/Makefile.in (+11/-2)
hw/xfree86/utils/cvt/cvt.c (+1/-0)
hw/xfree86/utils/gtf/Makefile.in (+9/-1)
hw/xfree86/utils/man/Makefile.in (+9/-1)
hw/xfree86/vbe/Makefile.am (+2/-1)
hw/xfree86/vbe/Makefile.in (+11/-2)
hw/xfree86/vbe/vbe.c (+3/-15)
hw/xfree86/vgahw/Makefile.am (+1/-1)
hw/xfree86/vgahw/Makefile.in (+10/-2)
hw/xfree86/x86emu/Makefile.am (+1/-1)
hw/xfree86/x86emu/Makefile.in (+10/-2)
hw/xfree86/x86emu/decode.c (+10/-0)
hw/xfree86/x86emu/x86emu/regs.h (+9/-0)
hw/xfree86/x86emu/x86emu/x86emui.h (+11/-1)
hw/xnest/Args.h (+1/-1)
hw/xnest/GCOps.c (+13/-0)
hw/xnest/Makefile.in (+9/-1)
hw/xnest/Pixmap.c (+15/-0)
hw/xnest/Screen.c (+1/-0)
hw/xnest/XNPixmap.h (+2/-0)
hw/xnest/man/Makefile.in (+9/-1)
hw/xquartz/GL/Makefile.in (+9/-1)
hw/xquartz/GL/glcontextmodes.c (+0/-1)
hw/xquartz/GL/indirect.c (+13/-13)
hw/xquartz/GL/visualConfigs.c (+3/-3)
hw/xquartz/Makefile.am (+3/-2)
hw/xquartz/Makefile.in (+16/-8)
hw/xquartz/X11Application.m (+13/-0)
hw/xquartz/X11Controller.m (+6/-6)
hw/xquartz/applewm.c (+16/-0)
hw/xquartz/bundle/Info.plist.cpp (+4/-4)
hw/xquartz/bundle/Makefile.in (+9/-1)
hw/xquartz/darwinfb.h (+1/-1)
hw/xquartz/mach-startup/Makefile.in (+9/-1)
hw/xquartz/mach-startup/stub.c (+4/-0)
hw/xquartz/man/Makefile.in (+9/-1)
hw/xquartz/pbproxy/Makefile.in (+9/-1)
hw/xquartz/pbproxy/x-selection.m (+1/-2)
hw/xquartz/pseudoramiX.c (+0/-516)
hw/xquartz/pseudoramiX.h (+0/-10)
hw/xquartz/quartz.c (+3/-0)
hw/xquartz/xpr/Makefile.am (+1/-0)
hw/xquartz/xpr/Makefile.in (+10/-1)
hw/xquartz/xpr/appledri.c (+10/-0)
hw/xquartz/xpr/x-hook.c (+9/-24)
hw/xquartz/xpr/xprCursor.c (+0/-2)
hw/xwin/InitInput.c (+0/-1)
hw/xwin/InitOutput.c (+40/-0)
hw/xwin/Makefile.am (+7/-3)
hw/xwin/Makefile.in (+26/-13)
hw/xwin/XWin.exe.manifest (+1/-1)
hw/xwin/glx/Makefile.am (+30/-10)
hw/xwin/glx/Makefile.in (+135/-31)
hw/xwin/glx/gen_gl_wrappers.py (+483/-323)
hw/xwin/glx/glshim.c (+124/-0)
hw/xwin/glx/glthunk.c (+87/-0)
hw/xwin/glx/glwindows.h (+2/-5)
hw/xwin/glx/glwrap.c (+0/-146)
hw/xwin/glx/indirect.c (+23/-22)
hw/xwin/man/Makefile.in (+9/-1)
hw/xwin/win.h (+15/-14)
hw/xwin/winauth.c (+3/-4)
hw/xwin/winclipboard.h (+0/-4)
hw/xwin/winclipboardthread.c (+4/-12)
hw/xwin/winclipboardwndproc.c (+0/-11)
hw/xwin/winclipboardwrappers.c (+0/-2)
hw/xwin/wincursor.c (+23/-20)
hw/xwin/windialogs.c (+29/-47)
hw/xwin/winfillsp.c (+1/-1)
hw/xwin/winglobals.c (+1/-1)
hw/xwin/winglobals.h (+4/-1)
hw/xwin/winkeybd.c (+46/-26)
hw/xwin/winmessages.h (+1/-1)
hw/xwin/winmouse.c (+28/-22)
hw/xwin/winmsgwindow.c (+180/-0)
hw/xwin/winmultiwindowclass.c (+20/-13)
hw/xwin/winmultiwindowclass.h (+1/-1)
hw/xwin/winmultiwindowicons.c (+5/-1)
hw/xwin/winmultiwindowwindow.c (+6/-9)
hw/xwin/winmultiwindowwm.c (+29/-27)
hw/xwin/winmultiwindowwndproc.c (+21/-9)
hw/xwin/winpfbdd.c (+0/-13)
hw/xwin/winprefs.c (+7/-22)
hw/xwin/winprefs.h (+9/-9)
hw/xwin/winprefsyacc.c (+2008/-725)
hw/xwin/winprefsyacc.h (+118/-33)
hw/xwin/winscrinit.c (+1/-5)
hw/xwin/winsetsp.c (+29/-23)
hw/xwin/wintrayicon.c (+1/-1)
hw/xwin/winwin32rootless.c (+22/-22)
hw/xwin/winwin32rootlesswindow.c (+3/-5)
hw/xwin/winwin32rootlesswndproc.c (+18/-9)
hw/xwin/winwindow.c (+0/-4)
hw/xwin/winwindow.h (+1/-0)
hw/xwin/winwindowswm.c (+3/-18)
hw/xwin/winwndproc.c (+19/-8)
include/Makefile.am (+1/-0)
include/Makefile.in (+10/-1)
include/busfault.h (+48/-0)
include/callback.h (+1/-0)
include/cursorstr.h (+0/-2)
include/dix-config.h.in (+29/-0)
include/dix.h (+11/-0)
include/dixstruct.h (+12/-12)
include/do-not-use-config.h.in (+65/-3)
include/extinit.h (+10/-2)
include/input.h (+14/-9)
include/inputstr.h (+1/-1)
include/list.h (+1/-1)
include/misc.h (+29/-0)
include/os.h (+10/-0)
include/privates.h (+0/-1)
include/protocol-versions.h (+12/-0)
include/regionstr.h (+2/-0)
include/registry.h (+2/-0)
include/servermd.h (+14/-0)
include/xkbsrv.h (+3/-0)
include/xorg-config.h.in (+6/-0)
include/xorg-server.h.in (+12/-0)
man/Makefile.in (+9/-1)
mi/Makefile.in (+9/-1)
mi/mieq.c (+1/-1)
mi/miinitext.c (+7/-6)
mi/mipointer.c (+3/-20)
mi/mipointer.h (+0/-12)
mi/misprite.c (+1/-9)
mi/miwideline.c (+3/-3)
miext/Makefile.in (+9/-1)
miext/damage/Makefile.am (+1/-1)
miext/damage/Makefile.in (+10/-2)
miext/damage/damage.c (+27/-129)
miext/damage/damage.h (+1/-19)
miext/damage/damagestr.h (+0/-3)
miext/rootless/Makefile.in (+9/-1)
miext/rootless/rootlessWindow.c (+3/-3)
miext/shadow/Makefile.am (+5/-0)
miext/shadow/Makefile.in (+21/-3)
miext/shadow/c2p_core.h (+187/-0)
miext/shadow/shadow.c (+1/-1)
miext/shadow/shadow.h (+12/-0)
miext/shadow/shafb4.c (+139/-0)
miext/shadow/shafb8.c (+143/-0)
miext/shadow/shiplan2p4.c (+136/-0)
miext/shadow/shiplan2p8.c (+137/-0)
miext/shadow/shpacked.c (+0/-1)
miext/sync/Makefile.am (+9/-2)
miext/sync/Makefile.in (+24/-11)
miext/sync/misync.c (+17/-29)
miext/sync/misync.h (+22/-1)
miext/sync/misyncfd.c (+99/-0)
miext/sync/misyncfd.h (+45/-0)
miext/sync/misyncshm.c (+186/-0)
miext/sync/misyncshm.h (+28/-0)
miext/sync/misyncstr.h (+15/-0)
os/Makefile.am (+10/-0)
os/Makefile.in (+26/-7)
os/WaitFor.c (+6/-1)
os/access.c (+4/-4)
os/backtrace.c (+78/-2)
os/busfault.c (+150/-0)
os/connection.c (+1/-1)
os/io.c (+62/-38)
os/log.c (+3/-0)
os/osinit.c (+16/-2)
os/utils.c (+78/-2)
os/xdmcp.c (+1/-1)
os/xstrans.c (+2/-0)
present/Makefile.am (+17/-0)
present/Makefile.in (+815/-0)
present/present.c (+911/-0)
present/present.h (+127/-0)
present/present_event.c (+247/-0)
present/present_fake.c (+140/-0)
present/present_fence.c (+139/-0)
present/present_notify.c (+114/-0)
present/present_priv.h (+302/-0)
present/present_request.c (+331/-0)
present/present_screen.c (+236/-0)
present/presentext.h (+29/-0)
pseudoramiX/Makefile.am (+7/-0)
pseudoramiX/Makefile.in (+739/-0)
pseudoramiX/pseudoramiX.c (+516/-0)
pseudoramiX/pseudoramiX.h (+10/-0)
randr/Makefile.in (+9/-1)
randr/randr.c (+119/-1)
randr/randrstr.h (+12/-0)
randr/rrcrtc.c (+8/-7)
randr/rrinfo.c (+1/-1)
randr/rroutput.c (+6/-1)
randr/rrpointer.c (+1/-1)
randr/rrprovider.c (+25/-0)
randr/rrscreen.c (+1/-1)
record/Makefile.in (+9/-1)
record/record.c (+4/-0)
render/Makefile.in (+9/-1)
test/Makefile.am (+14/-5)
test/Makefile.in (+30/-17)
test/hashtabletest.c (+4/-0)
test/input.c (+1/-1)
test/signal-logging.c (+2/-1)
test/xi2/Makefile.am (+1/-1)
test/xi2/Makefile.in (+10/-2)
test/xi2/protocol-xipassivegrabdevice.c (+8/-1)
xfixes/Makefile.in (+9/-1)
xfixes/cursor.c (+2/-8)
xfixes/region.c (+26/-0)
xkb/Makefile.in (+9/-1)
xkb/xkb.c (+1/-2)
xkb/xkbActions.c (+81/-70)
xkb/xkbInit.c (+22/-4)
To merge this branch: bzr merge lp:~muktupavels/xorg-server/lp-1209008
Reviewer Review Type Date Requested Status
Ubuntu branches 2014-07-01 Pending
Review via email: mp+225162@code.launchpad.net

Commit message

Add upstream patch to fix "No devices detected" error for seats other than seat0. (LP: #1209008)

Description of the change

Add upstream patch to fix "No devices detected" error for seats other than seat0. (LP: #1209008)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.dir-locals.el'
2--- .dir-locals.el 1970-01-01 00:00:00 +0000
3+++ .dir-locals.el 2014-07-01 14:18:40 +0000
4@@ -0,0 +1,1 @@
5+((c-mode . ((c-basic-offset . 4) (indent-tabs-mode . nil))))
6\ No newline at end of file
7
8=== modified file 'COPYING'
9--- COPYING 2013-08-14 10:52:17 +0000
10+++ COPYING 2014-07-01 14:18:40 +0000
11@@ -20,6 +20,7 @@
12 Copyright © 2007-2009 Red Hat, Inc.
13 Copyright © 2005-2008 Daniel Stone
14 Copyright © 2006-2009 Simon Thum
15+Copyright © 2003-2008, 2013 Geert Uytterhoeven
16 Copyright © 2006 Luc Verhaegen
17
18 Permission is hereby granted, free of charge, to any person obtaining a
19
20=== modified file 'ChangeLog'
21--- ChangeLog 2013-08-14 10:52:17 +0000
22+++ ChangeLog 2014-07-01 14:18:40 +0000
23@@ -1,54 +1,5548 @@
24-commit bc41226f7741098e55a3b0df924986991576d50a
25-Merge: 4ebd618 2cd62dc
26-Author: Matt Dew <marcoz@osource.org>
27-Date: Thu Jul 25 22:56:24 2013 -0600
28-
29- Merge branch 'server-1.14-touch-fixes' of git://people.freedesktop.org/~whot/xserver into server-1.14-branch
30-
31-commit 4ebd618bc5ef71507e708e7191091828eca3a7e8
32-Author: Matt Dew <marcoz@osource.org>
33-Date: Thu Jul 25 22:24:00 2013 -0600
34-
35- Bah, bad rev number. Fixed: changed 1.14.3-rc1 to 1.14.2.901
36-
37-commit fef66ffe7a7e899a9126a1e431b94d881163b00d
38-Author: Matt Dew <marcoz@osource.org>
39-Date: Thu Jul 25 22:02:26 2013 -0600
40-
41- bump rev from 1.14.2 to 1.14.3-rc1
42-
43-commit 2cd62dc02b67c70d2417b2ccd307ead9596a2967
44-Author: Peter Hutterer <peter.hutterer@who-t.net>
45-Date: Fri Mar 1 08:43:58 2013 +1000
46-
47- Xi: return !Success from DeliverTouchEmulatedEvent if we didn't deliver
48-
49- All callers currently ignore the new value, so this patch has no effect.
50- Inverse call graph:
51-
52- DeliverTouchEmulatedEvent
53- DeliverEmulatedMotionEvent Ignores value
54- DeliverTouchBeginEvent
55- DeliverTouchEvent
56- DeliverTouchEvents Ignores value
57- DeliverTouchEndEvent
58- DeliverTouchEvent
59- DeliverTouchEvents Ignores value
60-
61- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
62- Reviewed-by: Keith Packard <keithp@keithp.com>
63- (cherry picked from commit 9978b57b8d94f061d72a67b99a02b0ba16a11429)
64-
65-commit c203568905bcbb65fb1e079b626d2c1e90ecb72d
66-Author: Peter Hutterer <peter.hutterer@who-t.net>
67-Date: Mon May 13 15:22:12 2013 +1000
68-
69- Xi: fix warning - remove unused 'rc'
70-
71- Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
72- (cherry picked from commit fd5ea0237db6d725a48f76b706135df9d3246b82)
73-
74-commit 93f063c40dc4b339ae9114551071c57b52d98dba
75+commit 9182af8a09c326bb4b01d3645fb2936e93f02242
76+Author: Matt Dew <marcoz@osource.org>
77+Date: Sun Apr 13 20:55:40 2014 -0600
78+
79+ Bump version to 1.15.1
80+
81+commit eec04d76a39a7334de4e00ef9f0f6e44c92b3d91
82+Author: Eric Anholt <eric@anholt.net>
83+Date: Thu Mar 6 18:50:07 2014 -0800
84+
85+ glx: Clear new FBConfig attributes to 0 by default.
86+
87+ The visualSelectGroup wasn't getting set (since our DRI drivers don't
88+ use it), and and since it's the top priority in the sort order, you
89+ got random sorting of your visuals unless malloc really returned you
90+ new memory. This manifested as Xephyr -glamor rendering to a
91+ multisampled window on my system, which as you might guess was
92+ slightly lower performance than expected.
93+
94+ Signed-off-by: Eric Anholt <eric@anholt.net>
95+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
96+
97+commit d6268c25a8d33241d817977a84f127f8ef0cb9ee
98+Author: Julien Cristau <jcristau@debian.org>
99+Date: Wed Mar 26 23:24:20 2014 +0100
100+
101+ Xephyr: restore initial window resize lost in xcb conversion
102+
103+ The XResizeWindow call wasn't replaced by the xcb equivalent, so we
104+ were no longer setting the initial window size, only wm size hints.
105+
106+ Regression from commit a2b73da "Xephyr: start converting hostx.c over to
107+ xcb"
108+
109+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=74849
110+
111+ Signed-off-by: Julien Cristau <jcristau@debian.org>
112+ Reported-by: Laércio de Sousa <lbsousajr@gmail.com>
113+ Tested-by: Jon TURNEY <jon.turney@dronecode.org.uk>
114+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
115+ Signed-off-by: Keith Packard <keithp@keithp.com>
116+
117+commit 300458fb8ad0a7957e941cd65f47d204c7886e22
118+Author: Matt Dew <marcoz@osource.org>
119+Date: Fri Mar 21 23:49:41 2014 -0600
120+
121+ Bump bersion to 1.15.0.901
122+
123+commit c971864565eb114e4b34f17b0d2244e8e6e1e005
124+Author: Peter Hutterer <peter.hutterer@who-t.net>
125+Date: Wed Feb 26 07:54:56 2014 +1000
126+
127+ config: search for PnPID on all parents (#75513)
128+
129+ The PnPID for a device may not be on the immediate parent, so search up the
130+ device tree until we find one.
131+
132+ X.Org Bug 75513 <http://bugs.freedesktop.org/show_bug.cgi?id=75513>
133+
134+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
135+ Tested-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
136+ (cherry picked from commit 795066477ee81b5b82e490eac8bed6b656d01f17)
137+
138+commit 2cbbe80efc485d2d05b06efe1e2e01f81f3e06f6
139+Author: Peter Hutterer <peter.hutterer@who-t.net>
140+Date: Thu Feb 20 13:18:05 2014 +1000
141+
142+ Xi: check for invalid modifiers for XI2 passive grabs
143+
144+ The other values are checked correctly, but if a modifier was outside the
145+ allowed range, it would go unnoticed and cause a out-of-bounds read error for
146+ any mask equal or larger than 256. The DetailRec where we store the grab masks
147+ is only sized to 8 * sizeof(Mask).
148+
149+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
150+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
151+ (cherry picked from commit 0f10cfd4b903d4db293ec47c8a9a0d8b33965803)
152+
153+commit b3656c0b52d57333c64f932676a237d0f3a97f36
154+Author: Mark Kettenis <kettenis@openbsd.org>
155+Date: Sun Dec 15 14:31:10 2013 +0100
156+
157+ sync: Avoid ridiculously long timeouts
158+
159+ On OpenBSD, passing a timeout longer than 100000000 seconds to select(2) will
160+ make it fail with EINVAL. As this is original 4.4BSD behaviour it is not
161+ inconceivable that other systems suffer from the same problem. And Linux,
162+ though not suffering from any 4.4BSD heritage, briefly did something similar:
163+
164+ <https://lkml.org/lkml/2012/8/31/263>
165+
166+ So avoid calling AdjustWaitForDelay() instead of setting the timeout to
167+ (effectively) ULONG_MAX milliseconds.
168+
169+ Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
170+ Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
171+ (cherry picked from commit ddeca927498c9df3b5e62c7bf05e31e2a3aeaa52)
172+
173+commit b332cd20ee14049606e3656490d13a8efa6b23ee
174+Merge: f41ab8c 5e0432f
175+Author: Matt Dew <marcoz@osource.org>
176+Date: Thu Mar 6 22:03:03 2014 -0700
177+
178+ Merge branch 'server-1.15-branch' of git://people.freedesktop.org/~jeremyhu/xserver into server-1.15-branch
179+
180+commit f41ab8c60780ea8f87354e536e5b73cb23878eb7
181+Author: Peter Hutterer <peter.hutterer@who-t.net>
182+Date: Fri Jan 24 18:32:54 2014 +1000
183+
184+ dix: prevent a driver from initializing or submitting buttons > MAX_BUTTONS
185+
186+ The server internally relies on arrays with a MAX_BUTTONS maximum size (which
187+ is the max the core protocol can transport). Make sure a driver adheres to
188+ that.
189+
190+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
191+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
192+ (cherry picked from commit 87ca80a7196949597113225405f3e4ee03bbee13)
193+
194+commit 4447d71b9a74afe91aaf4cc01eae12a44ef09306
195+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
196+Date: Tue Jan 28 20:27:51 2014 -0800
197+
198+ xf86DeleteScreen: move check for NULL pScrn before first dereference
199+
200+ Flagged by cppcheck 1.62:
201+ [hw/xfree86/common/xf86Helper.c:220] -> [hw/xfree86/common/xf86Helper.c:231]:
202+ (warning) Possible null pointer dereference: pScrn - otherwise it is
203+ redundant to check it against null.
204+
205+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
206+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
207+ Signed-off-by: Keith Packard <keithp@keithp.com>
208+ (cherry picked from commit c1ac89c793614797e08d3d8e7fc9ba55be899130)
209+
210+commit 2ac840a14958fe74170518ee2c3a6b2dd88b20bd
211+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
212+Date: Tue Jan 28 20:27:50 2014 -0800
213+
214+ On realloc failure, free font_path_string instead of leaking it
215+
216+ Flagged by cppcheck 1.62:
217+ [dix/dixfonts.c:1792]: (error) Common realloc mistake:
218+ 'font_path_string' nulled but not freed upon failure
219+
220+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
221+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
222+ Signed-off-by: Keith Packard <keithp@keithp.com>
223+ (cherry picked from commit e6733ae91b7be52930f22a87de15fa05819ef948)
224+
225+commit 157cc02fc13c998bba70e1652907972015e15e8e
226+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
227+Date: Fri Jan 24 23:42:49 2014 -0800
228+
229+ Check for calloc() failure in add_master()
230+
231+ Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
232+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
233+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
234+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
235+ (cherry picked from commit 9fc19168e7ca6308275bf8769d1ccb982f88465b)
236+
237+commit f11c5938d732af717aeebbbf3b356138f3411bb7
238+Author: Peter Hutterer <peter.hutterer@who-t.net>
239+Date: Fri Jan 24 16:51:02 2014 +1000
240+
241+ Xi: fix modifier offset in XIPassiveGrab swapping function
242+
243+ The request is followed by mask_len 4-byte units, then followed by the actual
244+ modifiers.
245+
246+ Also fix up the swapping test, which had the same issue.
247+
248+ Reported-by: Alan Coopersmith <alan.coopersmith@oracle.com>
249+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
250+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
251+ (cherry picked from commit 76b3be75b62657e346731444736f7e4d200beb5b)
252+
253+ Conflicts:
254+ test/xi2/protocol-xipassivegrabdevice.c
255+
256+commit 345b7ead1dd262020e10b4aeb71044d46d16e134
257+Author: Peter Hutterer <peter.hutterer@who-t.net>
258+Date: Mon Jan 13 17:00:23 2014 +1000
259+
260+ os: restrict display names to digits
261+
262+ We call atoi() on the server's display to get the socket but otherwise use the
263+ unmodified display for log file name, xkb paths, etc. This results in
264+ Xorg :banana being the equivalent of Xorg :0, except for the log files being
265+ in /var/log/Xorg.banana.log. I'm not sure there's a good use-case for this
266+ behaviour.
267+
268+ Check the display for something that looks reasonable, i.e. digits only, but
269+ do allow for :0.0 (i.e. digits, followed by a period, followed by one or two
270+ digits).
271+
272+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
273+ Reviewed-by: Keith Packard <keithp@keithp.com>
274+ (cherry picked from commit 71baa466b1f6b02fe503f9a3089b7b9d61aa0f80)
275+
276+commit 940d6a8e9d3544696654d5e68c615ab887f81945
277+Author: Carlos Garnacho <carlosg@gnome.org>
278+Date: Thu Jan 2 21:33:30 2014 +0100
279+
280+ Xi: Ensure DeviceChanged is emitted after grabs are deactivated
281+
282+ When a grab on a slave device is deactivated, the master device must
283+ be checked, just in case there were events from other devices while
284+ the slave device was stolen away by the passive grab. This may
285+ introduce misbehaviors on mismatching valuators and device features
286+ later on UpdateDeviceState().
287+
288+ Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
289+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
290+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
291+ (cherry picked from commit b2d5ee2e3684951b611fd2068d57cc65fd8305a3)
292+
293+commit 47da6e3f47a55aeeef2c849067dd2d09fc2fe481
294+Author: Peter Hutterer <peter.hutterer@who-t.net>
295+Date: Fri Jan 24 18:16:54 2014 +1000
296+
297+ dix: fix button state check before changing a button mapping
298+
299+ dev->button->down is a bitmask, not a normal array. Use the helper function to
300+ check, we technically allow the mapping to change after the physical button
301+ has been pressed (but not yet processed yet), so only check BUTTON_PROCESSED.
302+
303+ From XSetPointerMapping(3):
304+ "If any of the buttons to be altered are logically in the down state,
305+ XSetPointerMapping returns MappingBusy, and the mapping is not changed."
306+
307+ Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
308+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
309+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
310+ (cherry picked from commit 25d10464f440b8b34594b7c988a99a830ea39a29)
311+
312+commit 5e0432f797d58fe1a69ef538694f65bbba38737f
313+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
314+Date: Wed Jan 1 11:10:41 2014 -0800
315+
316+ XQuartz: Avoid passing uninitialized pointers to X11ApplicationSetWindowMenu in AppleWMSetWindowMenu
317+
318+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
319+ (cherry picked from commit 77df653ae3d8448be21221711851acde12c6bc1a)
320+
321+commit 859ced56d9ee168796c2fcf7fa6056e0c1491f3a
322+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
323+Date: Wed Jan 1 11:04:07 2014 -0800
324+
325+ XQuartz: Check for allocated memory before using it in AppleWMSetWindowMenu
326+
327+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
328+ (cherry picked from commit 3bc608a361a01043b226fb9aaebf88f6fd852925)
329+
330+commit 9444955d16f85926c75ee8eafb0ca796dcf16439
331+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
332+Date: Wed Jan 1 11:00:40 2014 -0800
333+
334+ XQuartz: Silence a clang static analysis warning about a memory leak
335+
336+ It seems the alanyzer can't comprehend dixSetPrivate().
337+
338+ quartz.c:119:12: warning: Potential leak of memory pointed to by 'displayInfo'
339+ return quartzProcs->AddScreen(index, pScreen);
340+ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
341+
342+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
343+ (cherry picked from commit 64327226ddfba8f0653615cd678d2d4336fb993d)
344+
345+commit 64b0669d1c062e7e11fb0e3b8ea7fe56113fc86f
346+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
347+Date: Wed Jan 1 10:55:10 2014 -0800
348+
349+ XQuartz: Silence a clang static analysis warning about a possible memory leak on exit
350+
351+ stub.c:356:9: warning: Potential leak of memory pointed to by 'newargv'
352+ asl_log(aslc, NULL, ASL_LEVEL_ERR,
353+ ^~~~~~~
354+ stub.c:356:9: warning: Potential leak of memory pointed to by 'newenvp'
355+ asl_log(aslc, NULL, ASL_LEVEL_ERR,
356+ ^~~~~~~
357+ 2 warnings generated.
358+
359+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
360+ (cherry picked from commit b2f6b3497c33a4897afae80a2cf69c596b9f81e8)
361+
362+commit 472e8e5d1c26573cef4bd42451230ef47791ed6f
363+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
364+Date: Wed Jan 1 10:47:52 2014 -0800
365+
366+ XQuartz: Validate length in appledri before swapping
367+
368+ Avoids potential memory corruption from bad requests
369+
370+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
371+ (cherry picked from commit a03f096a85537d9e881cedaa6cb71aca43a97086)
372+
373+commit 782fe5c174def75a9e4cb188c00c2fec72821472
374+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
375+Date: Wed Jan 1 10:39:56 2014 -0800
376+
377+ XQuartz: Validate screen in AppleDRIQueryDirectRenderingCapable requests
378+
379+ Return an error to the caller rather than crashing the server on
380+ invalid screens.
381+
382+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
383+ (cherry picked from commit b3572c0d1ab7888ac26d6b2b8be6d1d19ed9af3f)
384+
385+commit 045122566c0532378b50c1af3ffec3254e416fe2
386+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
387+Date: Sun Dec 29 12:45:23 2013 -0800
388+
389+ XQuartz: Simplify hook_run to quiet static analyzer
390+
391+ x-hook.c:96:9: warning: Called function pointer is an uninitalized pointer value
392+ (*fun[i])(arg, data[i]);
393+ ^~~~~~~~~~~~~~~~~~~~~~~
394+ 1 warning generated.
395+
396+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
397+ (cherry picked from commit 959e8f23af7850fcaf40d6c67f5228241a36a9ab)
398+
399+commit 33b2ae0f3b4a80fd962d876f7437d98fcfc27791
400+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
401+Date: Sun Dec 29 12:41:18 2013 -0800
402+
403+ XQuartz: Mark applicationWillTerminate: noreturn
404+
405+ X11Controller.m:938:1: warning: method 'applicationWillTerminate:' could be declared with attribute 'noreturn'
406+ [-Wmissing-noreturn,Semantic Issue]
407+ {
408+ ^
409+
410+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
411+ (cherry picked from commit f79af1941776fd6f1ec26c50603fcc35ca7d514b)
412+
413+commit 404f26866147be1c26585e59d9795e87e0c3e5fa
414+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
415+Date: Sun Dec 29 12:36:51 2013 -0800
416+
417+ XQuartz: Fix get_proc_address signature
418+
419+ indirect.c:675:28: warning: incompatible pointer types passing 'glx_gpa_proc (*)(const char *)' to parameter of type
420+ 'glx_gpa_proc' (aka 'glx_func_ptr (*)(const char *)') [-Wincompatible-pointer-types,Semantic Issue]
421+ __glXsetGetProcAddress(&get_proc_address);
422+ ^~~~~~~~~~~~~~~~~
423+ ../../../glx/glxserver.h:122:42: note: passing argument to parameter 'get_proc_address' here [Semantic Issue]
424+ void __glXsetGetProcAddress(glx_gpa_proc get_proc_address);
425+ ^
426+
427+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
428+ (cherry picked from commit ea80279e292e59a9fe9651489f03e9f2f39810d9)
429+
430+commit 7803c4075b824ece79af0425cee736025c41d901
431+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
432+Date: Sun Dec 29 12:31:23 2013 -0800
433+
434+ XQuartz: Fix darwinfb.h header guard
435+
436+ ./darwinfb.h:28:9: warning: '_DARWIN_FB_H' is used as a header guard here, followed by #define of a different macro
437+ [-Wheader-guard,Lexical or Preprocessor Issue]
438+ ^~~~~~~~~~~~
439+ ./darwinfb.h:29:9: note: '_DARWIN_DB_H' is defined here; did you mean '_DARWIN_FB_H'? [Lexical or Preprocessor Issue]
440+ ^~~~~~~~~~~~
441+ _DARWIN_FB_H
442+
443+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
444+ (cherry picked from commit 2e3ebec9520719a8e5c3c92390e83bcb5216f978)
445+
446+commit 6c055f0d78349ff08a570c5dcc92c6f7b6924993
447+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
448+Date: Sun Dec 29 12:22:55 2013 -0800
449+
450+ XQuartz: Silence some static analyzer warnings by annotating referencing counts
451+
452+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
453+ (cherry picked from commit 9da6c0918f40359f28fe8889d5b7cae7efcc8377)
454+
455+commit 2ea973e12f5d954211e1d10085a4c74581b43aca
456+Author: Keith Packard <keithp@keithp.com>
457+Date: Fri Dec 27 09:50:55 2013 -0800
458+
459+ Bump version to 1.15.0
460+
461+ Signed-off-by: Keith Packard <keithp@keithp.com>
462+
463+commit 2eb9915eea358f941702d3dad7434197991885c5
464+Author: Keith Packard <keithp@keithp.com>
465+Date: Thu Dec 12 15:48:08 2013 -0800
466+
467+ present: Set complete notify mode to Skip as needed
468+
469+ Skipped present pixmap calls were not setting the mode to
470+ PresentCompleteModeSkip for skipped operations.
471+
472+ Signed-off-by: Keith Packard <keithp@keithp.com>
473+
474+commit e487babd525ef1bd016ec7b283fa08cf9e6c6f4f
475+Author: Keith Packard <keithp@keithp.com>
476+Date: Thu Dec 12 14:52:35 2013 -0800
477+
478+ present: Don't abandon presents which are already queued for flip
479+
480+ Presents which are not marked 'queued' and are in the window present
481+ list are waiting for the flip event; discarding those won't work very
482+ well (it'll end up trashing displayed content for the next frame), so
483+ skip over those when looking for duplicate frame presents
484+
485+ Signed-off-by: Keith Packard <keithp@keithp.com>
486+
487+commit ca3a5b2a8f9f627bbaa9883e16512a21c2a0b81d
488+Author: Keith Packard <keithp@keithp.com>
489+Date: Thu Dec 12 14:17:40 2013 -0800
490+
491+ present: Handle PresentOptionAsync for copy mode
492+
493+ Check for Async flag and execute immediately if set, otherwise wait
494+ for the next appropriate vblank before copying.
495+
496+ Signed-off-by: Keith Packard <keithp@keithp.com>
497+
498+commit a68df147421da21528b5be2d34678383922fa352
499+Author: Keith Packard <keithp@keithp.com>
500+Date: Thu Dec 19 14:31:07 2013 -0800
501+
502+ Bump version to 1.14.99.905 (1.15 RC5)
503+
504+ Another week, another RC. This should be the last before 1.15 final
505+
506+ Signed-off-by: Keith Packard <keithp@keithp.com>
507+
508+commit 4b1ead9d3400acc3402c2480d7cc0527750c32f0
509+Merge: 4d62646 929795d
510+Author: Keith Packard <keithp@keithp.com>
511+Date: Thu Dec 19 14:14:59 2013 -0800
512+
513+ Merge remote-tracking branch 'whot/for-keith'
514+
515+commit 4d62646142718024b0981eb4f1fd0131e829161f
516+Merge: f4bfb14 81ba89d
517+Author: Keith Packard <keithp@keithp.com>
518+Date: Mon Dec 16 09:27:57 2013 -0800
519+
520+ Merge remote-tracking branch 'jeremyhu/master'
521+
522+commit f4bfb14f53a939574da1f5995f0dad949898b86a
523+Author: Adam Jackson <ajax@redhat.com>
524+Date: Thu Dec 12 10:57:40 2013 -0500
525+
526+ configure: Fix a typo near dri3/shmfence detection
527+
528+ " is not the mate of ].
529+
530+ Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
531+ Signed-off-by: Adam Jackson <ajax@redhat.com>
532+
533+commit 8248b4af31ef71ac03158871b77f20eb456dbe38
534+Author: Adam Jackson <ajax@redhat.com>
535+Date: Fri Dec 13 15:07:48 2013 -0500
536+
537+ glx: Add null pointer protection to __glGetProcAddress
538+
539+ This can't happen when GLX is the backing window system, but can
540+ elsewhere. We may as well protect against it at a high level.
541+
542+ Reviewed-by: Eric Anholt <eric@anholt.net>
543+ Signed-off-by: Adam Jackson <ajax@redhat.com>
544+
545+commit 128449dd6498a2f74c3770f89a9dae0f70e2b351
546+Author: Adam Jackson <ajax@redhat.com>
547+Date: Fri Dec 13 11:39:16 2013 -0500
548+
549+ present: Don't use the major/minor version from the protocol headers
550+
551+ We want to advertise the version we implement, not the version the
552+ protocol headers happen to describe.
553+
554+ Reviewed-by: Jasper St. Pierre <<jstpierre@mecheye.net>
555+ Signed-off-by: Adam Jackson <ajax@redhat.com>
556+
557+commit ec6087bf070131bc3a26848fb9fb840f09b0e19d
558+Author: Adam Jackson <ajax@redhat.com>
559+Date: Fri Dec 13 11:36:38 2013 -0500
560+
561+ dri3: Don't use the major/minor version from the protocol headers
562+
563+ We want to advertise the version we implement, not the version the
564+ protocol headers happen to describe.
565+
566+ Reviewed-by: Jasper St. Pierre <<jstpierre@mecheye.net>
567+ Signed-off-by: Adam Jackson <ajax@redhat.com>
568+
569+commit e6fafd3de70d315130fb6e5732cfd02a5901b788
570+Author: Adam Jackson <ajax@redhat.com>
571+Date: Fri Dec 13 11:28:59 2013 -0500
572+
573+ dri3: Guard against buggy clients
574+
575+ There's nothing to stop a client from sending these requests to screens
576+ without DRI3 support, and if they do, we'll crash. Let's not do that.
577+
578+ Reviewed-by: Jasper St. Pierre <<jstpierre@mecheye.net>
579+ Signed-off-by: Adam Jackson <ajax@redhat.com>
580+
581+commit 81ba89d6703a22178a153aa39478ba2d4bde262b
582+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
583+Date: Fri Dec 13 01:39:44 2013 -0800
584+
585+ configure.ac: Add PRESENT_LIB to XQUARTZ_LIBS
586+
587+ Undefined symbols for architecture x86_64:
588+ "_present_extension_init", referenced from:
589+ _staticExtensions in libXquartz.a(miinitext.o)
590+ "_present_register_complete_notify", referenced from:
591+ ___glXregisterPresentCompleteNotify in libglx.a(glxcmds.o)
592+
593+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
594+
595+commit d7c9235ee261b0f780320985233e00dec5e2689c
596+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
597+Date: Sat Dec 7 01:36:33 2013 -0800
598+
599+ XQuartz: Use asl_log_descriptor to log stdout/stderr of child processes
600+
601+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
602+
603+commit ad8111d7c971ce448905c733d65ba0cfc72bdca4
604+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
605+Date: Sat Dec 7 01:14:37 2013 -0800
606+
607+ darwin: Don't leave stdin/stdout closed
608+
609+ <rdar://problem/15609419>
610+
611+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
612+
613+commit 929795d50d788358d6269ce423f72c6cc40e334b
614+Author: Peter Hutterer <peter.hutterer@who-t.net>
615+Date: Tue Dec 3 10:14:51 2013 +1000
616+
617+ dix: fix check for grab type
618+
619+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
620+
621+commit 23394c7fea0f5c33333198c87ecfecc9f6c6a791
622+Author: Peter Hutterer <peter.hutterer@who-t.net>
623+Date: Tue Dec 3 08:36:45 2013 +1000
624+
625+ Xi: ungrab device when releasing a passive grab without ButtonReleaseMask (#71878)
626+
627+ If an touch triggers an async button grab and that grab does not have the
628+ ButtonReleaseMask set, the TouchEnd is never delivered, deliveries is 0 and
629+ the grab is never deactivated.
630+
631+ If the grab is pointer async and keyboard sync, the keyboard events are stuck
632+ in EnqueueEvent until some other pointer event terminates the grab.
633+
634+ Change this to check for the number of listeners. If we're about to deliver a
635+ TouchEnd to a passive pointer grab, the number of listeners is already 1 -
636+ pointer grabs always accept so other listeners were removed.
637+
638+ X.Org Bug 71878 <http://bugs.freedesktop.org/show_bug.cgi?id=71878>
639+
640+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
641+
642+commit c1d30b5bd7f90e68bc38404fd0cc32578d6d3018
643+Author: Ben Gamari <bgamari.foss@gmail.com>
644+Date: Thu Nov 21 21:24:20 2013 -0500
645+
646+ Xi: Don't ActivateEarlyAccept POINTER_REGULAR listeners
647+
648+ Bug #71878 describes a bug resulting in the server ceasing to respond to
649+ keyboard input after a touch event. The problem might be the following:
650+
651+ DeliverTouchBeginEvent tries to deliver an event to a listener of type
652+ LISTENER_POINTER_REGULAR, taking the following if branch,
653+
654+ if (listener->type == LISTENER_POINTER_REGULAR ||
655+ listener->type == LISTENER_POINTER_GRAB) {
656+ rc = DeliverTouchEmulatedEvent(dev, ti, ev, listener, client, win,
657+ grab, xi2mask);
658+ if (rc == Success) {
659+ listener->state = LISTENER_IS_OWNER;
660+ /* async grabs cannot replay, so automatically accept this touch */
661+ if (dev->deviceGrab.grab &&
662+ dev->deviceGrab.fromPassiveGrab &&
663+ dev->deviceGrab.grab->pointerMode == GrabModeAsync)
664+ ActivateEarlyAccept(dev, ti);
665+ }
666+ goto out;
667+ }
668+
669+ DeliverTouchEmulatedEvent succeeds. The deviceGrab meets all
670+ three of the conditions of the inner if, enters
671+ ActivateEarlyAccept which then fails due to,
672+
673+ BUG_RETURN(ti->listeners[0].type != LISTENER_GRAB &&
674+ ti->listeners[0].type != LISTENER_POINTER_GRAB);
675+
676+ That is, despite listener->type == LISTENER_POINTER_REGULAR. With my
677+ non-existent knowledge of XINPUT, it seems like the solution here
678+ might be to only ActivateEarlyAccept when listener->type ==
679+ LISTENER_POINTER_GRAB.
680+
681+ Signed-off-by: Ben Gamari <bgamari.foss@gmail.com>
682+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
683+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
684+
685+commit fe07ec19e212a68076560d243a2a935c54589068
686+Author: Keith Packard <keithp@keithp.com>
687+Date: Tue Dec 10 11:27:47 2013 -0800
688+
689+ present: recursively set window pixmaps on flip
690+
691+ Newly created windows inherit the pixmap of their parent, similarly,
692+ reparenting a tree inherits the pixmap of the destination tree.
693+
694+ Making present preserve the invariant that unredirected windows always
695+ have the same pixmap as their parent ensures that the above cases work
696+ correctly.
697+
698+ v2: name the recursive function to 'set_tree_pixmap' instead of 'set_window_pixmap'
699+
700+ Signed-off-by: Keith Packard <keithp@keithp.com>
701+ Reviewed-by: Adam Jackson <ajax@redhat.com>
702+
703+commit b3533d0b212b6747a8f9a01931253d6bdb648ee2
704+Author: Keith Packard <keithp@keithp.com>
705+Date: Tue Dec 10 10:29:11 2013 -0800
706+
707+ Bump version to 1.14.99.904 (1.15 RC4)
708+
709+ Signed-off-by: Keith Packard <keithp@keithp.com>
710+
711+commit 9a4d7572fe3be16bb5aded5f48d4217fdf725b1d
712+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
713+Date: Thu Sep 27 18:59:45 2012 +0100
714+
715+ hw/xwin/glx: Rewrite WGL wrappers after Xserver conversion to direct GL dispatch
716+
717+ v1: Rewrite by Marc Haesen of the WGL wrapper function generation script to use
718+ Khronos group XML.
719+
720+ v2: Remove -dispatchheader option, since dispatch.h doesn't exist anymore, use
721+ the private glapi interface to construct the GL dispatch table for the native
722+ WGL thunks.
723+
724+ v3:
725+ Rewrite to generate shims for the OpenGL 1.2.1 (GL 1.2 + GL_ARB_imaging
726+ +GL_ARB_multitexture + GL_ARB_texture_compression(?)) functions the server links
727+ directly with rather than libGL.
728+
729+ These shims dispatch to either the mesa GL DLL, or a thunking DLL containing
730+ cdecl-to-stcall wrapper functions for the native GL DLL.
731+
732+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
733+ Reviewed-by: Adam Jackson <ajax@redhat.com>
734+
735+commit cb48877a3c4cfb1ae2248000fcd3443e3092bdaa
736+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
737+Date: Fri Dec 6 14:00:21 2013 +0000
738+
739+ glx: Consistently use ARB-suffixed names for ARB_multitexture functions
740+
741+ At the moment we have a mix of ARB and non-ARB suffixed forms for ARB_multitexture functions
742+ e.g. glMultiTexCoord1fvARB and glMultiTexCoord1dv
743+
744+ Consistently use the ARB-suffixed form, assuming that is present in all libGL
745+ which provide the OpenGL 1.2.1 ABI we expect to be able to directly link with.
746+
747+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
748+ Reviewed-by: Adam Jackson <ajax@redhat.com>
749+
750+commit 1a021f57a1e75ab63e8f87704f0394162402c4d4
751+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
752+Date: Sun Dec 1 22:25:46 2013 +0000
753+
754+ ephyr: Fix compilation when ./configure'd with --enable-debug
755+
756+ /jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c: In function ‘ephyrProcessMouseMotion’:
757+ /jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c:946:188: error: ‘ephyrCurScreen’ undeclared (first use in this function)
758+ /jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c: In function ‘ephyrProcessButtonPress’:
759+ /jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c:980:186: error: ‘ephyrCurScreen’ undeclared (first use in this function)
760+ /jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c: In function ‘ephyrProcessButtonRelease’:
761+ /jhbuild/checkout/xorg/xserver/hw/kdrive/ephyr/ephyr.c:1007:186: error: ‘ephyrCurScreen’ undeclared (first use in this function)
762+
763+ Fix ephyr compilation when ./configure'd with --enable-debug after commit
764+ 46cf6bf5692ef751ec9d17ae2292565d4b13f14b, some instances of ephyrCurScreen were
765+ not converted to screen->pScreen->myNum.
766+
767+ v2: Don't use a trivial local variable which will be unused when ./configure'd
768+ with --disable-debug
769+
770+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
771+ Reviewed-by: Adam Jackson <ajax@redhat.com>
772+
773+commit 875dbcef5bfcb6a94ef8456be6151e133408793f
774+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
775+Date: Fri Nov 29 14:29:20 2013 +0000
776+
777+ configure.ac: Link XWin with present extension if we are building with it enabled
778+
779+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
780+ Reviewed-by: Adam Jackson <ajax@redhat.com>
781+
782+commit e61e19959d9138d5b81b1f25b7aa3e257918170d
783+Author: Adam Jackson <ajax@redhat.com>
784+Date: Tue Dec 3 13:45:43 2013 -0500
785+
786+ xquartz/glx: Convert to non-glapi dispatch
787+
788+ CGL doesn't have anything like glXGetProcAddress, and the old code just
789+ called down to dlsym in any case. It's a little mind-warping since
790+ dlopening a framework actually loads multiple dylibs, but that's just
791+ how OSX rolls.
792+
793+ Signed-off-by: Adam Jackson <ajax@redhat.com>
794+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
795+
796+commit a668aa0e41bc33ff2db7f9c53b6dc321a96926a9
797+Author: Adam Jackson <ajax@redhat.com>
798+Date: Tue Dec 3 15:03:13 2013 -0500
799+
800+ drisw: Wire up GetProcAddress
801+
802+ Signed-off-by: Adam Jackson <ajax@redhat.com>
803+ Reviewed-by: Keith Packard <keithp@keithp.com>
804+
805+commit 4fcdfeb7bc55d00d50d7f89788d9b929946ae3d9
806+Author: Adam Jackson <ajax@redhat.com>
807+Date: Tue Dec 3 15:02:57 2013 -0500
808+
809+ dri2: wire up GetProcAddress
810+
811+ Signed-off-by: Adam Jackson <ajax@redhat.com>
812+ Reviewed-by: Keith Packard <keithp@keithp.com>
813+
814+commit 47f00b3920be9d8df8b148263d744934f3a02cd4
815+Author: Adam Jackson <ajax@redhat.com>
816+Date: Tue Dec 3 15:01:44 2013 -0500
817+
818+ glx: Untangle the prototypes around the GetProcAddress thunk
819+
820+ Signed-off-by: Adam Jackson <ajax@redhat.com>
821+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
822+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
823+
824+commit c1fd143f2847ef425ec9891d9e1cba44a1bb007d
825+Author: Adam Jackson <ajax@redhat.com>
826+Date: Tue Dec 3 13:11:52 2013 -0500
827+
828+ glx: Remove function stubs
829+
830+ Now that we're calling non-1.2 ABI things by function pointer this is no
831+ longer needed.
832+
833+ Signed-off-by: Adam Jackson <ajax@redhat.com>
834+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
835+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
836+
837+commit 6b93e1f5ff39c6ac5b0d97d4245aeac9113eed8b
838+Author: Adam Jackson <ajax@redhat.com>
839+Date: Tue Dec 3 13:11:09 2013 -0500
840+
841+ glx: Convert non-generated function pointer thunking
842+
843+ Same concept as the generated code conversion.
844+
845+ Signed-off-by: Adam Jackson <ajax@redhat.com>
846+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
847+
848+commit c4567a376083eb7b142a7f003ddf8372d376ea86
849+Author: Adam Jackson <ajax@redhat.com>
850+Date: Tue Dec 3 12:40:24 2013 -0500
851+
852+ glx: Convert generated code function pointer thunking
853+
854+ We're meant not to call these by name due to ABI. Rather than try to
855+ generate a bunch of little stub functions that do the lookup, just
856+ inline it all directly into the calling function.
857+
858+ This does not cache results. That's fine, this is not a performance
859+ path, and if we're atop WGL then we effectively have to do this every
860+ time anyway because wglGetProcAddress results are context-dependent.
861+
862+ Signed-off-by: Adam Jackson <ajax@redhat.com>
863+ Jon TURNEY <jon.turney@dronecode.org.uk>
864+
865+commit f69f4f417c6807405e45289b39a80f1b9a55f9e6
866+Author: Keith Packard <keithp@keithp.com>
867+Date: Tue Dec 10 07:09:17 2013 -0800
868+
869+ Depend on latest glproto (1.4.17)
870+
871+ Signed-off-by: Keith Packard <keithp@keithp.com>
872+
873+commit 576f3d36dd324bd0d16c9968f1ded5c5eead3569
874+Author: Adam Jackson <ajax@redhat.com>
875+Date: Mon Dec 9 13:16:01 2013 -0500
876+
877+ damageext: Die if we can't create the Xinerama resource type
878+
879+ Reviewed-by: Keith Packard <keithp@keithp.com>
880+ Signed-off-by: Adam Jackson <ajax@redhat.com>
881+
882+commit f10f36d91db1b21c2ce5a531b4fa5f96fcbdc2f0
883+Author: Adam Jackson <ajax@redhat.com>
884+Date: Mon Sep 16 15:17:26 2013 -0400
885+
886+ damageext: Xineramify (v7)
887+
888+ v7: Don't bother making resources for the backing listeners. [keithp]
889+
890+ This is now slightly unlike how other resources are xineramified. We
891+ create N+1 internal damage listeners, one that's a real resource and
892+ reflects the protocol view, and then one per backend screen where the
893+ report function piles onto the protocol view. The internal listeners
894+ are not stored in the resource database directly, they just hang off the
895+ xinerama resource. We don't wrap Subtract at the dispatch level, but we
896+ do extend it for the Xinerama case to clip to the root window geometry.
897+
898+ As a result of the N+1 design here, the damage reports we generate are
899+ not quite minimal. However they are indistinguishable from sequential
900+ rendering events happening before the client hears damage, and we don't
901+ need to add a post-dispatch callback just for this one extension.
902+
903+ Add is probably (still) somewhat broken since it will only hit screen 0,
904+ but Add really only exists for DRI1's sake, and DRI1 disables itself
905+ with Xinerama enabled anyway. In the absence of a use case, I'm leaving
906+ it unwrapped under Xinerama; if someone wants to define how it ought to
907+ work, be my guest.
908+
909+ Reviewed-by: Keith Packard <keithp@keithp.com>
910+ Signed-off-by: Adam Jackson <ajax@redhat.com>
911+
912+commit 808303fe5232ba0320ae5a4310b1ed1322e85f1d
913+Author: Adam Jackson <ajax@redhat.com>
914+Date: Mon Nov 4 17:49:34 2013 -0500
915+
916+ fixes: Fix PanoramiXSetWindowShapeRegion for root windows (v2)
917+
918+ Root windows in Xinerama are in the coordinate space of their root window
919+ pixmap, not in protocol space.
920+
921+ v2: Only translate for root windows, sice the window shape is
922+ drawable-relative.
923+
924+ Reviewed-by: Keith Packard <keithp@keithp.com>
925+ Signed-off-by: Adam Jackson <ajax@redhat.com>
926+
927+commit 5c10c7ea2129b70015e745523918d143cc29318d
928+Author: Adam Jackson <ajax@redhat.com>
929+Date: Mon Nov 4 17:49:33 2013 -0500
930+
931+ fixes: Fix PanoramiXSetPictureClipRegion for root windows (v2)
932+
933+ Root windows in Xinerama are in the coordinate space of their root
934+ window pixmap, not in protocol space. This fixes 'xcompmgr -n' when
935+ Xinerama is active.
936+
937+ v2: Only translate for root windows, since the clip origin is
938+ drawable-relative.
939+
940+ Reviewed-by: Keith Packard <keithp@keithp.com>
941+ Signed-off-by: Adam Jackson <ajax@redhat.com>
942+
943+commit 1dd839a425adc6e5a1dc377003ed86a374d81f0b
944+Author: Adam Jackson <ajax@redhat.com>
945+Date: Thu Nov 7 13:59:30 2013 -0500
946+
947+ composite: Fix COW creation for Xinerama (v2)
948+
949+ Say you have two 800x600 screens left/right of each other. A window
950+ that's 200x200 at +700+0 in protocol coordinate space will appear to be
951+ at -100+0 in the coordinate space of the right hand screen. Put another
952+ way: windows are in the coordinate space of their root window pixmap.
953+
954+ We weren't doing this translation for the COW, so when rendering came in
955+ to it you'd see the top-left chunk of the COW on all screens. Cool
956+ effect and all, but wrong.
957+
958+ v2: Only translate when Xinerama is active [keithp]
959+
960+ Reviewed-by: Keith Packard <keithp@keithp.com>
961+ Signed-off-by: Adam Jackson <ajax@redhat.com>
962+
963+commit 8dbe456abae1a32fb6c5c74fa456bc7301cccabe
964+Author: Adam Jackson <ajax@redhat.com>
965+Date: Tue Oct 29 10:44:07 2013 -0400
966+
967+ xinerama: Export the screen region
968+
969+ damageext wants this so it can intersect subtract requests against the
970+ root window geometry.
971+
972+ Reviewed-by: Keith Packard <keithp@keithp.com>
973+ Signed-off-by: Adam Jackson <ajax@redhat.com>
974+
975+commit c6d4c2a24140feee4ceae48c4c74fedcae9b68b3
976+Author: Adam Jackson <ajax@redhat.com>
977+Date: Fri Nov 15 15:13:31 2013 -0500
978+
979+ xfree86: Prefer fbdev to vesa
980+
981+ On UEFI machines you'd prefer fbdev to grab efifb instead of vesa trying
982+ to initialize and failing in a way we can't unwind from. On BIOS
983+ machines this is harmless: either there is an fbdev driver and it'll
984+ probably be more capable, or there's not and vesa will kick in anyway.
985+
986+ Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
987+ Reviewed-by: Eric Anholt <eric@anholt.net>
988+ Signed-off-by: Adam Jackson <ajax@redhat.com>
989+
990+commit 7b5d4f147fdef9edfeaa9c6565375111079efd11
991+Author: Adam Jackson <ajax@redhat.com>
992+Date: Tue Nov 5 10:12:28 2013 -0500
993+
994+ composite: Don't double-redirect if someone asks for backing store twice
995+
996+ v2: Belt-and-suspenders the unredirection path [vsyrjala]
997+
998+ Reviewed-by: Keith Packard <keithp@keithp.com>
999+ Signed-off-by: Adam Jackson <ajax@redhat.com>
1000+
1001+commit a2b2c271e0ca87d3188ba2741b6db9bbbdc599f5
1002+Author: Adam Jackson <ajax@redhat.com>
1003+Date: Tue Nov 5 10:08:17 2013 -0500
1004+
1005+ composite: Automatically enable backing store support on the screen
1006+
1007+ ... unless you explicitly disabled it with -bs on the command line, or
1008+ with the corresponding thing in xorg.conf.
1009+
1010+ v2: Drop a bogus hunk from compChangeWindowAttributes [vsyrjala]
1011+ v3: s/TRUE/WhenMapped/ [jcristau]
1012+
1013+ Reviewed-by: Keith Packard <keithp@keithp.com>
1014+ Signed-off-by: Adam Jackson <ajax@redhat.com>
1015+
1016+commit e0cac005608a2e5618c7be59701318d684e0bb93
1017+Author: Adam Jackson <ajax@redhat.com>
1018+Date: Tue Nov 5 09:58:17 2013 -0500
1019+
1020+ bs: Set the screen's bs support level to WhenMapped
1021+
1022+ Since we're using RedirectAutomatic to do this, we don't actually
1023+ preserve contents when unmapped.
1024+
1025+ v2: Don't say WhenMapped if Composite didn't initialize [vsyrjala]
1026+
1027+ Reviewed-by: Julien Cristau <jcristau@debian.org>
1028+ Signed-off-by: Adam Jackson <ajax@redhat.com>
1029+
1030+commit b61ccd5d9d368f3fbbae27ce14ac02a3db1884c4
1031+Author: Adam Jackson <ajax@redhat.com>
1032+Date: Tue Nov 5 10:20:04 2013 -0500
1033+
1034+ smartsched: Tweak the default scheduler intervals
1035+
1036+ A default timeslice of 20ms means a pathological client can ruin up to
1037+ two frames per scheduler tick. And a fifth of a second is just insane.
1038+
1039+ Pick two different numbers out of the hat. A 5ms slice means you can
1040+ probably keep up with two or three abusive clients, and letting it burst
1041+ to 15ms should give you about all the timeslice you need for a
1042+ fullscreen game (that's doing server-side rendering for some reason).
1043+
1044+ If you're running on a system with a 10ms granularity on SIGALRM, then
1045+ this effectively changes the intervals to 10ms and 30ms. Which is still
1046+ better, just not as better.
1047+
1048+ I suspect this is about as good as we can do without actually going
1049+ preemptive, which is an entire other nightmare.
1050+
1051+ Reviewed-by: Julien Cristau <jcristau@debian.org>
1052+ Signed-off-by: Adam Jackson <ajax@redhat.com>
1053+
1054+commit 66310ea2893811614b3c3aade8992624a95a6ee7
1055+Author: Adam Jackson <ajax@redhat.com>
1056+Date: Fri Nov 8 09:22:37 2013 -0500
1057+
1058+ dri3: Disable when Xinerama is active
1059+
1060+ Pretty sure this can't work.
1061+
1062+ Reviewed-by: Julien Cristau <jcristau@debian.org>
1063+ Signed-off-by: Adam Jackson <ajax@redhat.com>
1064+
1065+commit 793fd5eefb0e417614d77fe1522c6548587fbd4e
1066+Author: Adam Jackson <ajax@redhat.com>
1067+Date: Fri Nov 8 09:20:29 2013 -0500
1068+
1069+ dri2: Disable when Xinerama is active
1070+
1071+ Would only work on ScreenRec 0, which means it's broken.
1072+
1073+ Reviewed-by: Julien Cristau <jcristau@debian.org>
1074+ Signed-off-by: Adam Jackson <ajax@redhat.com>
1075+
1076+commit 2bf92108294805c5c6fef249c2f7de6ecf4975d8
1077+Author: Adam Jackson <ajax@redhat.com>
1078+Date: Fri Nov 8 09:06:59 2013 -0500
1079+
1080+ present: Disable when Xinerama is active
1081+
1082+ Among much else Present depends on RANDR types, and RANDR isn't properly
1083+ Xinerama-aware yet anyway.
1084+
1085+ Reviewed-by: Julien Cristau <jcristau@debian.org>
1086+ Signed-off-by: Adam Jackson <ajax@redhat.com>
1087+
1088+commit ac772cb187ddf7e04b8f4b3a071b90f18f4488d0
1089+Author: Eric Anholt <eric@anholt.net>
1090+Date: Thu Nov 14 17:40:47 2013 -0800
1091+
1092+ glx: Fix incorrect use of dri_interface.h version defines in driver probing.
1093+
1094+ If we extend __DRI_CORE or __DRI_SWRAST in dri_interface.h to allow a
1095+ new version, it shouldn't make old server code retroactively require
1096+ the new version from swrast drivers.
1097+
1098+ Notably, new Mesa defines __DRI_SWRAST version 4, but we still want to
1099+ be able to probe version 1 drivers, since we don't use any features
1100+ beyond version 1 of the struct.
1101+
1102+ Signed-off-by: Keith Packard <keithp@keithp.com>
1103+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
1104+
1105+commit 6e926b18ca1b182253bac435a1d53caaff7ffff6
1106+Author: Eric Anholt <eric@anholt.net>
1107+Date: Thu Nov 14 17:40:46 2013 -0800
1108+
1109+ glx: Fix incorrect use of dri_interface.h version defines in extensions.
1110+
1111+ Those defines are so you can compile-time check "do I have a
1112+ dri_interface.h that defines this new field of the struct?" You don't
1113+ want the server to claim it implements the new struct just because you
1114+ installed a new copy of Mesa.
1115+
1116+ Signed-off-by: Keith Packard <keithp@keithp.com>
1117+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
1118+
1119+commit 57a8ce927332e855dd29ff30210a211a907adb25
1120+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
1121+Date: Fri Nov 29 12:26:43 2013 +0000
1122+
1123+ configure.ac: Fixup for "Require libpciaccess for int10"
1124+
1125+ On 16/11/2013 01:00, Connor Behan wrote:
1126+ > A --disable-pciaccess build will fail with an int10 module other than
1127+ > stub.
1128+ >
1129+ > Signed-off-by: Connor Behan <connor.behan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
1130+ > ---
1131+ > configure.ac | 3 +++
1132+ > 1 file changed, 3 insertions(+)
1133+ >
1134+ > diff --git a/configure.ac b/configure.ac
1135+ > index 5e621e0..a843770 100644
1136+ > --- a/configure.ac
1137+ > +++ b/configure.ac
1138+ > @@ -1822,6 +1822,9 @@ if test "x$XORG" = xyes; then
1139+ > if test "x$CONFIG_UDEV_KMS" = xyes; then
1140+ > AC_MSG_ERROR([Platform device enumeration requires libpciaccess])
1141+ > fi
1142+ > + if test "x$INT10" != xstub; then
1143+ > + AC_MSG_ERROR([Cannot build int10 without libpciaccess])
1144+ > + fi
1145+ > fi
1146+ > AC_MSG_RESULT([$PCI])
1147+ >
1148+
1149+ This causes my build to fail where --disable-int10-module --disable-pciaccess
1150+ is the default (as INT10 still has the default value 'x86emu')
1151+
1152+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
1153+ Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1154+ Tested-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1155+ Signed-off-by: Keith Packard <keithp@keithp.com>
1156+
1157+commit 653d33941b0808ef910aaa5f3aeab05d9c1a100b
1158+Author: Keith Packard <keithp@keithp.com>
1159+Date: Tue Nov 26 12:18:12 2013 -0800
1160+
1161+ present: Report damage when flipping
1162+
1163+ Limit damage to the 'update' region.
1164+
1165+ Signed-off-by: Keith Packard <keithp@keithp.com>
1166+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1167+
1168+commit 5cf12c9569ac3d83fe1b7a8376c15f8f0b01655e
1169+Author: Keith Packard <keithp@keithp.com>
1170+Date: Tue Nov 26 12:10:48 2013 -0800
1171+
1172+ present: Also set the root window pixmap when flipping
1173+
1174+ This makes sure that things like software cursors continue to work
1175+ while the screen is flipped.
1176+
1177+ Signed-off-by: Keith Packard <keithp@keithp.com>
1178+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1179+
1180+commit 4aa77378de69efdc10bced6ba650b0ebff50c112
1181+Author: Keith Packard <keithp@keithp.com>
1182+Date: Tue Nov 26 12:06:57 2013 -0800
1183+
1184+ present: Clear target_crtc if driver lacks Present support
1185+
1186+ If the driver doesn't have the necessary hooks for Present, then the
1187+ target_crtc needs to be set to NULL to make sure the extension uses
1188+ the present_fake code.
1189+
1190+ Signed-off-by: Keith Packard <keithp@keithp.com>
1191+ Tested-by: Fredrik Höglund <fredrik@kde.org>
1192+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1193+
1194+commit 3dd5bfe540b295bb37a2c2fd0ba4a31fb217612b
1195+Author: Keith Packard <keithp@keithp.com>
1196+Date: Thu Nov 21 22:48:31 2013 -0800
1197+
1198+ present: Send GLX_BufferSwapComplete events from present extension
1199+
1200+ This allows GL to support the GLX_INTEL_swap_event extension.
1201+
1202+ v2: Return GLX_BLIT_COMPLETE_INTEL for unknown swap types
1203+
1204+ Signed-off-by: Keith Packard <keithp@keithp.com>
1205+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1206+
1207+commit cde86e68fcb716f34c90f5a16eb868870f5c85e4
1208+Author: Keith Packard <keithp@keithp.com>
1209+Date: Mon Nov 25 23:06:08 2013 -0800
1210+
1211+ present: Set window pixmap to flipped pixmap
1212+
1213+ This makes other drawing to the window appear on the screen.
1214+
1215+ Note that no child windows can be affected because only full-screen
1216+ windows are eligible for flipping, and so we only need to set pixmap
1217+ for the window itself.
1218+
1219+ Signed-off-by: Keith Packard <keithp@keithp.com>
1220+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1221+
1222+commit 04e138846e128670d409798aa2e797c3c5503a47
1223+Author: Keith Packard <keithp@keithp.com>
1224+Date: Mon Nov 25 23:10:17 2013 -0800
1225+
1226+ present: Leave vblank on window list until flip complete
1227+
1228+ If the window is destroyed, then we've got cleanup work to do, even if
1229+ the vblank has already been executed -- we need to clear the window
1230+ pointer so that we don't try to deliver events to it.
1231+
1232+ Leaving it on the window list meant that when walking that list, we
1233+ need to know whether the vblank is waiting to be executed or waiting
1234+ for the flip to complete, so a new 'queued' flag was added to the
1235+ vblank to distinguish between the two states.
1236+
1237+ Signed-off-by: Keith Packard <keithp@keithp.com>
1238+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1239+
1240+commit b121d62accb8c346b4e1b1bce99586e13712f04a
1241+Author: Keith Packard <keithp@keithp.com>
1242+Date: Tue Nov 26 03:07:55 2013 -0800
1243+
1244+ present: Add a debug output line when skipping a pending present
1245+
1246+ When an application provides two pixmaps for the same MSC, the
1247+ previous one is skipped. This just dumps out some information at that point
1248+
1249+ Signed-off-by: Keith Packard <keithp@keithp.com>
1250+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1251+
1252+commit eafba23b34be31c141ddafb8380520ac9a0622ac
1253+Author: Keith Packard <keithp@keithp.com>
1254+Date: Thu Nov 21 22:45:18 2013 -0800
1255+
1256+ miext/sync: Handle libxshmfence API change
1257+
1258+ libxshmfence had an unfortunate 'int32_t' type for the mapped fence.
1259+ That changed to exposing a 'struct shmfence' instead, which is nice
1260+ and opaque and offers fine type checking across the API.
1261+
1262+ This patch requires the newer version of the library and uses
1263+ the new interface type.
1264+
1265+ Signed-off-by: Keith Packard <keithp@keithp.com>
1266+ Reviewed-by: Julien Cristau <jcristau@debian.org>
1267+
1268+commit b6d7ed4d787a652e8150532f384bfdf51760f3c2
1269+Author: Keith Packard <keithp@keithp.com>
1270+Date: Thu Nov 21 22:12:34 2013 -0800
1271+
1272+ miext: Move SyncShm FDs out of the way of clients
1273+
1274+ Applications may end up allocating a bunch of shmfence objects, each
1275+ of which uses a file descriptor, which must be kept open lest some
1276+ other client ask for a copy of it later on.
1277+
1278+ Lacking an API that can turn a memory mapping back into a file
1279+ descriptor, about the best we can do is push the file descriptors out
1280+ of the way of other X clients so that we don't run out of the ability
1281+ to accept new connections.
1282+
1283+ This uses fcntl F_GETFD to push the FD up above MAXCLIENTS.
1284+
1285+ Signed-off-by: Keith Packard <keithp@keithp.com>
1286+ Reviewed-by: Julien Cristau <jcristau@debian.org>
1287+
1288+commit cc63204926c6da83d9221c5f8c0dc8f5e2f2481d
1289+Author: Keith Packard <keithp@keithp.com>
1290+Date: Wed Nov 13 14:16:33 2013 +0900
1291+
1292+ Xext: Use SHMDIR and O_TMPFILE when creating mapping files
1293+
1294+ ShmCreateSegment asks for a file descriptor for a memory mapped file
1295+ created by the X server. This patch uses O_TMPFILE where available,
1296+ and also uses the SHMDIR directory to store the files, both for the
1297+ O_TMPFILE and mkstemp cases.
1298+
1299+ Signed-off-by: Keith Packard <keithp@keithp.com>
1300+ Reviewed-by: Julien Cristau <jcristau@debian.org>
1301+
1302+commit 5a969f0928b84da5cfe0777dfb542caaacc915ad
1303+Author: Keith Packard <keithp@keithp.com>
1304+Date: Wed Nov 13 12:17:10 2013 +0900
1305+
1306+ Select directory for MIT-SHM temp files at configure time
1307+
1308+ By default, this looks through a list of directories to find one which
1309+ exists, but can be overridden with --with-shared-memory-dir=PATH
1310+
1311+ This patch doesn't actually do anything with this directory, just
1312+ makes it available in the configuration
1313+
1314+ Signed-off-by: Keith Packard <keithp@keithp.com>
1315+ Reviewed-by: Julien Cristau <jcristau@debian.org>
1316+
1317+commit d695cb7fb6bb8fd159a332d902673edbbd2237d7
1318+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
1319+Date: Mon Nov 25 22:19:34 2013 -0800
1320+
1321+ Xdmx: Initialize DMX extension even if not built with GLX support
1322+
1323+ dmxAddExtensions takes an argument to determine if it should just
1324+ initialize the DMX extension, or both DMX & GLX, but if GLX wasn't
1325+ compiled in, the entire call was #ifdef'ed out, leaving the DMX
1326+ extension unavailable.
1327+
1328+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
1329+ Reviewed-by: Julien Cristau <jcristau@debian.org>
1330+ Signed-off-by: Keith Packard <keithp@keithp.com>
1331+
1332+commit bd70def07754357d26b86c287037eb3884631daf
1333+Author: Connor Behan <connor.behan@gmail.com>
1334+Date: Fri Nov 15 17:00:40 2013 -0800
1335+
1336+ configure.ac: Require libpciaccess for int10
1337+
1338+ A --disable-pciaccess build will fail with an int10 module other than
1339+ stub.
1340+
1341+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
1342+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1343+ Signed-off-by: Keith Packard <keithp@keithp.com>
1344+
1345+commit a575c1dc64c10bc88bd0e963ebb8ab137f59a078
1346+Author: Connor Behan <connor.behan@gmail.com>
1347+Date: Fri Nov 15 17:00:20 2013 -0800
1348+
1349+ configure.ac: Require libpciaccess for platform bus support
1350+
1351+ There is currently no reason to build with --enable-config-udev-kms and
1352+ --disable-pciaccess but anyone who tries this should know that the build
1353+ will fail.
1354+
1355+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
1356+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1357+ Signed-off-by: Keith Packard <keithp@keithp.com>
1358+
1359+commit 361dfe74eaa2f1eddb54abdecca1d8b1b3f58704
1360+Author: Connor Behan <connor.behan@gmail.com>
1361+Date: Fri Nov 15 17:00:00 2013 -0800
1362+
1363+ configure.ac: Add whitespace near PCI configuration
1364+
1365+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
1366+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1367+ Signed-off-by: Keith Packard <keithp@keithp.com>
1368+
1369+commit 80481267662c8687e73081237913fa561e7a6561
1370+Author: Keith Packard <keithp@keithp.com>
1371+Date: Sat Nov 23 22:22:37 2013 -0800
1372+
1373+ Bump release to 1.14.99.903 (1.15 RC3)
1374+
1375+ Signed-off-by: Keith Packard <keithp@keithp.com>
1376+
1377+commit f1604002a32b7f098c2a16b4a8649c694af570c8
1378+Author: Keith Packard <keithp@keithp.com>
1379+Date: Mon Nov 18 22:36:17 2013 -0800
1380+
1381+ miext: Ensure xshmfence is only called when driver supports it
1382+
1383+ This provides a place for drivers to insert their own FD-based
1384+ SyncFence implementations, and prevents applications from using DRI3
1385+ SyncFence creation functions unless the driver has some support for
1386+ them.
1387+
1388+ Signed-off-by: Keith Packard <keithp@keithp.com>
1389+ Tested-by: Fredrik Höglund <fredrik@kde.org>
1390+
1391+commit 037566c57caff93fd7717f385d4b532b81f19c77
1392+Author: Keith Packard <keithp@keithp.com>
1393+Date: Mon Nov 18 22:33:27 2013 -0800
1394+
1395+ Xext: Recover from miSyncInitFenceFromFD failure without crashing
1396+
1397+ miSyncDestroyFence must not be called unless miSyncInitFence has been
1398+ invoked, so if miSyncInitFenceFromFD fails, we must free the fence
1399+ manually.
1400+
1401+ Signed-off-by: Keith Packard <keithp@keithp.com>
1402+ Tested-by: Fredrik Höglund <fredrik@kde.org>
1403+
1404+commit e7000534a456fdf9cd4eaada3193846c8525f740
1405+Author: Chris Wilson <chris@chris-wilson.co.uk>
1406+Date: Sat Oct 5 08:47:03 2013 +0100
1407+
1408+ glx/glxdri2: Unwrap EnterVT/LeaveVT upon CloseScreen
1409+
1410+ In a similar spirit to
1411+
1412+ commit d75e8146c414bfd512ba5dbd4a83acb334bbe19b
1413+ Author: Keith Packard <keithp@keithp.com>
1414+ Date: Mon Jul 12 16:01:34 2010 -0700
1415+
1416+ Unwrap/rewrap EnterVT/LeaveVT completely, Fixes 28998
1417+
1418+ we need to unwrap our pScrn->EnterVT/LeaveVT hooks around server
1419+ regeneration or else we cause an infinite recursion on the next VT
1420+ switch afterwards.
1421+
1422+ Bugzilla: https://bugs.launchpad.net/ubuntu/+source/xserver-xorg-video-intel/+bug/1235516
1423+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
1424+ Reviewed-by: Keith Packard <keithp@keithp.com>
1425+ Signed-off-by: Keith Packard <keithp@keithp.com>
1426+
1427+commit 6d5883bd7e5b765f8f0548501b825d9e56840799
1428+Author: Keith Packard <keithp@keithp.com>
1429+Date: Sat Nov 23 16:19:46 2013 -0800
1430+
1431+ xnest: Ignore GetImage() error in xnestGetImage() (v3)
1432+
1433+ (I found an amended version of this patch and applied the difference
1434+ here - keithp)
1435+
1436+ v3: Don't call Xsync before restoring error handler as any errors
1437+ generated by XGetImage() should be processed when this call
1438+ returns as suggested by Jamey Sharp <jamey@minilop.net>
1439+
1440+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
1441+ Reviewed-by: Jamey Sharp <jamey@minilop.net>
1442+
1443+commit 6403cbb143c67872ca9c58e3116ae7942def0ae1
1444+Author: Keith Packard <keithp@keithp.com>
1445+Date: Tue Nov 19 22:13:54 2013 -0800
1446+
1447+ present: When unflipping, copy to flip window rather than screen
1448+
1449+ unflip happens after the clip lists have been updated, so instead of
1450+ smashing the whole screen and drawing over other windows, just draw to
1451+ the original flip window; it'll have the right clip list and so the
1452+ copy will work just fine.
1453+
1454+ Signed-off-by: Keith Packard <keithp@keithp.com>
1455+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1456+
1457+commit 8bdd2ccc776ded3f527596b5009ef25129aa3287
1458+Author: Keith Packard <keithp@keithp.com>
1459+Date: Mon Nov 11 18:03:42 2013 -0800
1460+
1461+ present: Block for wait_fence in present_execute
1462+
1463+ Pend presentation until wait_fence is also triggered by having the
1464+ SyncFence trigger invoke present_execute once triggered.
1465+
1466+ Signed-off-by: Keith Packard <keithp@keithp.com>
1467+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1468+
1469+commit e5a188cb919edee2e3a03054276bce0db02f7b62
1470+Author: Keith Packard <keithp@keithp.com>
1471+Date: Sat Nov 9 12:36:47 2013 -0800
1472+
1473+ present: Signal destroyed flip window with vblank->window == NULL
1474+
1475+ This eliminates dereferencing freed window pointers when there is a
1476+ flip for that window in progress. The flip will complete, and then
1477+ immediately get undone (as we can't stop an in-progress flip).
1478+
1479+ Remove the vblank->window_destroyed field as we can signal this with
1480+ vblank->window == NULL instead.
1481+
1482+ Change check to vblank->window == NULL in:
1483+
1484+ present_flip_notify
1485+
1486+ Add check for vblank->window == NULL in:
1487+ present_vblank_notify
1488+ present_execute
1489+
1490+ present_flip_notify was also using vblank->window->drawable.pScreen,
1491+ so stop doing that and use vblank->screen instead.
1492+
1493+ Signed-off-by: Keith Packard <keithp@keithp.com>
1494+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1495+
1496+commit a5bcc4f7b9499caf8993f0a6ef96088553399ca3
1497+Author: Keith Packard <keithp@keithp.com>
1498+Date: Sat Nov 9 12:33:02 2013 -0800
1499+
1500+ present: Ignore event_id 0 from driver vblank notify
1501+
1502+ We use event_id 0 to mean 'no such event'; if a driver sends us that
1503+ event_id, make sure we don't accidentally match it.
1504+
1505+ Signed-off-by: Keith Packard <keithp@keithp.com>
1506+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1507+
1508+commit 4f3c37a1f17ffcfbbff71d217e1caad3d0148c90
1509+Author: Keith Packard <keithp@keithp.com>
1510+Date: Thu Nov 7 14:17:12 2013 -0800
1511+
1512+ present: Round fake MSC computations intead of truncating
1513+
1514+ If the timer fired too early, we'd sometimes mis-compute the MSC for
1515+ fake vblanks. Rounding the computation to the nearest MSC fixes this nicely.
1516+
1517+ Signed-off-by: Keith Packard <keithp@keithp.com>
1518+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1519+
1520+commit da9997f89f14ab619f244d5b2e80a423b028c789
1521+Author: Peter Hutterer <peter.hutterer@who-t.net>
1522+Date: Tue Nov 19 08:07:09 2013 +1000
1523+
1524+ configure: allow for --enable-libunwind and --disable-libunwind
1525+
1526+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1527+ Reviewed-by: Keith Packard <keithp@keithp.com>
1528+ Signed-off-by: Keith Packard <keithp@keithp.com>
1529+
1530+commit 29240e5cbf6e7f875b128fc7bfc4d56b2350835a
1531+Merge: 0492deb 8ff7e32
1532+Author: Keith Packard <keithp@keithp.com>
1533+Date: Thu Nov 14 17:02:04 2013 +0900
1534+
1535+ Merge remote-tracking branch 'whot/for-keith'
1536+
1537+commit 0492deb8f8238b7782e5a706ec6219d88aa1091d
1538+Author: Adam Jackson <ajax@redhat.com>
1539+Date: Tue Oct 29 12:09:27 2013 -0400
1540+
1541+ mieq: Bump default queue size to 512
1542+
1543+ Based on some bugzilla scraping I did around November 2012. Of xserver
1544+ bugs in Red Hat bugzilla with an EQ size message in the log, the
1545+ distribution looked like:
1546+
1547+ String | Matches
1548+ -------------------------------------
1549+ Increasing EQ size to 512 | 460
1550+ Increasing EQ size to 1024 | 52
1551+ Increasing EQ size to 2048 | 6
1552+ Increasing EQ size to 4096 | 0
1553+
1554+ Most of the "512" ones appear to be mostly harmless, some relatively
1555+ expensive path in either rendering or resource destruction simply taking
1556+ too long due to external pressures like paging or CPU contention. So
1557+ let's raise the initial queue size, both to reduce the number of
1558+ spurious abrt reports and to drop fewer events in all but the most
1559+ pathological cases.
1560+
1561+ Signed-off-by: Adam Jackson <ajax@redhat.com>
1562+ Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
1563+ Signed-off-by: Keith Packard <keithp@keithp.com>
1564+
1565+commit d1440783a7367ff0d0c47d256bbca3b3cf8a5034
1566+Author: Dave Airlie <airlied@redhat.com>
1567+Date: Tue Oct 29 12:09:26 2013 -0400
1568+
1569+ xfree86: return NULL for compat output if no outputs.
1570+
1571+ With outputless GPUs showing up we crash here if there are not outputs
1572+ try and recover with a bit of grace.
1573+
1574+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1575+ Signed-off-by: Dave Airlie <airlied@redhat.com>
1576+ Signed-off-by: Keith Packard <keithp@keithp.com>
1577+
1578+commit d7ee27e5e415778240919082c83a65226c6f17e6
1579+Author: Dan Horák <dan@danny.cz>
1580+Date: Tue Oct 29 12:09:25 2013 -0400
1581+
1582+ test: build the touch test only when building Xorg
1583+
1584+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1585+ Signed-off-by: Dan Horák <dan@danny.cz>
1586+ Signed-off-by: Keith Packard <keithp@keithp.com>
1587+
1588+commit 8ff7e32c3ef7b0c13c4ab9664f651e9782d35a85
1589+Author: Peter Hutterer <peter.hutterer@who-t.net>
1590+Date: Wed Nov 13 17:14:11 2013 +1000
1591+
1592+ include: export key_is_down and friends
1593+
1594+ VNC needs key_is_down to check if a key is processed as down before it
1595+ simulates various key releases. Make it available, because I seriously can't
1596+ be bothered thinking about how to rewrite VNC to not need that.
1597+
1598+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1599+ Acked-by: Keith Packard <keithp@keithp.com>
1600+
1601+commit 0ba7fc8472f1227fd1cd51bd58048f164b8ea1ab
1602+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
1603+Date: Tue Nov 12 14:46:04 2013 -0800
1604+
1605+ Stop including inline assembly .il file for Solaris Studio builds
1606+
1607+ Since all the inb/outb/etc. use in the X server itself (except for
1608+ xf86SlowBcopy) has been replaced by calls to libpciaccess, we no
1609+ longer need to pass inline assembly files to replace the gcc inline
1610+ assembly from hw/xfree86/common/compiler.h when building Xorg itself.
1611+
1612+ The .il files are still generated and installed in the SDK for the
1613+ benefit of drivers who may use them.
1614+
1615+ Binary diff of before and after showed that xf86SlowBcopy was the
1616+ only function changed across the Xorg binary and all modules built
1617+ in the Xserver build, it just calls the outb() function now instead
1618+ of having the outb instructions inlined, making it a slightly slower
1619+ bcopy.
1620+
1621+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
1622+ Reviewed-by: Keith Packard <keithp@keithp.com>
1623+ Signed-off-by: Keith Packard <keithp@keithp.com>
1624+
1625+commit 550baf38f6096658f0bcf0ad647c4fedf93132f2
1626+Author: Peter Hutterer <peter.hutterer@who-t.net>
1627+Date: Fri Oct 4 10:55:52 2013 +1000
1628+
1629+ kdrive: fix cursor jumps on CursorOffScreen behavior
1630+
1631+ This patch fixes cursor jumps when there is a grab on the Xephyr window and
1632+ the pointer moves outside the window.
1633+
1634+ So on two side-by-side 640x480 screens, a coordinate of 0/481
1635+ triggers KdCursorOffscreen.
1636+
1637+ If the delta between two screens is 0, they share the same offset for
1638+ that dimension. When searching for the new screen, the loop always rules out
1639+ the current screen. So we get to the second screen, trigger the conditions
1640+ where dy <= 0 and decide that this new screen is the correct one. The result
1641+ is that whenever KdCursorOffScreen is called, the pointer jumps to the other
1642+ screen.
1643+
1644+ Change to check for dy < 0 etc. so that the cursor stays on the same screen if
1645+ there is no other screen at the target location.
1646+
1647+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1648+ Reviewed-by: Keith Packard <keithp@keithp.com>
1649+
1650+commit a94d945065177d73f3ee8dc0b9147264ba281136
1651+Author: Peter Hutterer <peter.hutterer@who-t.net>
1652+Date: Tue Oct 29 14:24:41 2013 +1000
1653+
1654+ kdrive: modify ephyr events to use POINTER_DESKTOP and scale them to that
1655+
1656+ A multi-head Xephyr instance has the pointer stuck on one screen
1657+ because of bad coordinate calculation. The coordinates passed to
1658+ GetPointerEvents are per-screen, so the cursor gets stuck on the left-most
1659+ screen by default.
1660+
1661+ Adjust and mark the events as POINTER_DESKTOP, so the DIX
1662+ can adjust them accordingly.
1663+
1664+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1665+ Reviewed-by: Keith Packard <keithp@keithp.com>
1666+
1667+commit d66832a3b8a8675f1e5f3656dcb1bbe95598f0ea
1668+Author: Keith Packard <keithp@keithp.com>
1669+Date: Thu Nov 14 13:21:54 2013 +1000
1670+
1671+ kdrive: handle WxH as valid geometry spec
1672+
1673+ If a screen size was specified as WxH, the loop returned early and kdOrigin
1674+ was never advanced. Thus, screen->origin was always 0 (or whatever was given
1675+ at the -origin commandline flag).
1676+
1677+ If a screen size was given with a bit depth (WxHxD), kdOrigin would always
1678+ advance by the current screen, offsetting the next screen.
1679+
1680+ Signed-off-by: Keith Packard <keithp@keithp.com>
1681+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
1682+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1683+
1684+commit c8c5105c1d5c093675d7f571f158147f22f7572b
1685+Author: Peter Hutterer <peter.hutterer@who-t.net>
1686+Date: Tue Oct 29 14:33:56 2013 +1000
1687+
1688+ ephyr: xcb_connect returns an error, not NULL
1689+
1690+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
1691+ Reviewed-by: Keith Packard <keithp@keithp.com>
1692+
1693+commit 2aa67ccef6ad8f51deb94b66defc668ddb7d226c
1694+Author: Keith Packard <keithp@keithp.com>
1695+Date: Thu Nov 14 10:26:20 2013 +0900
1696+
1697+ Update to version 1.14.99.902
1698+
1699+ 1.15 RC2
1700+
1701+ Signed-off-by: Keith Packard <keithp@keithp.com>
1702+
1703+commit 9309d2a009a6a3b6090fc377fc7a3eded1a34dc0
1704+Author: Keith Packard <keithp@keithp.com>
1705+Date: Wed Nov 13 07:01:45 2013 +0900
1706+
1707+ xext: Fix shmint.h to not use headers outside of sdk_HEADERS
1708+
1709+ shmint.h is part of sdk_HEADERS, and so can't use anything not
1710+ included in sdk_HEADERS.
1711+
1712+ busfault.h includes dix-config.h which is not. Leave the use of
1713+ struct busfault in shmint.h and move the include of busfault.h to
1714+ shm.c.
1715+
1716+ protocol-versions.h is not part of sdk_HEADERS, so instead of using
1717+ that, just use XTRANS_SEND_FDS to choose whether to expose the fd
1718+ passing requests directly.
1719+
1720+ Reported-by: Julien Cristau <jcristau@debian.org>
1721+ Signed-off-by: Keith Packard <keithp@keithp.com>
1722+ Tested-by: Knut Petersen <Knut_Petersen@t-online.de>
1723+ Reviewed-by: Julien Cristau <jcristau@debian.org>
1724+
1725+ v2: also avoid using protocol-versions.h
1726+
1727+commit 4a251f5883b042cd902c192060a0be2b11148f2b
1728+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1729+Date: Fri Nov 8 14:55:33 2013 -0800
1730+
1731+ xfree86: Fix build without libpciaccess
1732+
1733+ Regression fix from commit 04ab07ca19236d6c9a947e065fb69b0dd0d16639
1734+
1735+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1736+ Reviewed-by: Connor Behan <connor.behan@gmail.com>
1737+
1738+commit 5b02d5b7aaabf1ba8dcbdfe4525b7995b4e79f92
1739+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
1740+Date: Thu Nov 7 21:08:56 2013 -0800
1741+
1742+ Enable XTRANS_SEND_FDS on Solaris too.
1743+
1744+ Requires passing through the __EXTENSIONS__ and _XOPEN_SOURCE defines
1745+ in order to expose the msg_control members in struct msghdr.
1746+
1747+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
1748+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1749+
1750+commit c4c154d18ef42dc550f2675a9ee88e07b1ca6bed
1751+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
1752+Date: Thu Nov 7 21:05:33 2013 -0800
1753+
1754+ Avoid conflicts with Solaris <sys/regset.h> defines that clash with our names
1755+
1756+ When building on Solaris with _XOPEN_SOURCE set to a recent XPG release,
1757+ <stdlib.h> and other core headers start including <sys/regset.h>, which
1758+ has a bunch of unfortunately named macros such as "CS", "ES", etc. for
1759+ x86 & x64 registers which clash with existing variable & struct member
1760+ names in Xorg - so #undef these so they don't interfere with our use.
1761+
1762+ (Yes, have filed a bug against the system headers for exposing these,
1763+ but this solves the problem for building on existing releases.)
1764+
1765+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
1766+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1767+
1768+commit d7f9be0f8541368bf1a095ad1fbe7f38be6d3d15
1769+Author: Keith Packard <keithp@keithp.com>
1770+Date: Mon Nov 11 15:48:41 2013 -0800
1771+
1772+ Proper spelling of MAP_ANONYMOUS is MAP_ANON.
1773+
1774+ The former doesn't exist on BSD and the latter is available everywhere
1775+ AFAIK (checked Solaris and Linux).
1776+
1777+ You also might want to wrap that line ;).
1778+
1779+ Reported-by: Mark Kettenis <mark.kettenis@xs4all.nl>
1780+ Signed-off-by: Keith Packard <keithp@keithp.com>
1781+
1782+commit fc84166e65c35ad75f566b135dcfc305ad5a2fde
1783+Author: Keith Packard <keithp@keithp.com>
1784+Date: Thu Nov 7 15:18:28 2013 -0800
1785+
1786+ Get rid of the rest of the FD passing code when XTRANS_SEND_FDS isn't set
1787+
1788+ req_fds and SetReqFds in include/dixstruct.h
1789+
1790+ ReadFdFromClient, WriteFdToClient and the FD flushing in os/io.c
1791+
1792+ Signed-off-by: Keith Packard <keithp@keithp.com>
1793+
1794+commit a239e6faf3fce848ac0d10c48f8e817db68a493c
1795+Merge: 43e5a43 f70a8bf
1796+Author: Keith Packard <keithp@keithp.com>
1797+Date: Mon Nov 11 15:26:12 2013 -0800
1798+
1799+ Merge remote-tracking branch 'jeremyhu/master'
1800+
1801+commit 43e5a43fa8994e50cf01dd954118f4ef2c4e7933
1802+Author: Adam Jackson <ajax@redhat.com>
1803+Date: Thu Nov 7 12:01:41 2013 -0500
1804+
1805+ present: Don't try to initialize when building without present support
1806+
1807+ There's a --disable-present, so it'd be nice if it worked.
1808+
1809+ Signed-off-by: Adam Jackson <ajax@redhat.com>
1810+ Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
1811+ Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
1812+ Signed-off-by: Keith Packard <keithp@keithp.com>
1813+
1814+commit 0822a23e048b12c98c654e8b6af711c5f2c97141
1815+Author: Keith Packard <keithp@keithp.com>
1816+Date: Thu Nov 7 03:19:42 2013 -0800
1817+
1818+ present: Change debug output a bit to help diagnose missing vblank signals
1819+
1820+ Signed-off-by: Keith Packard <keithp@keithp.com>
1821+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1822+
1823+commit 20bb49ae9ba11d3dccfba191483cd682d9c9d96c
1824+Author: Keith Packard <keithp@keithp.com>
1825+Date: Wed Nov 6 23:56:26 2013 -0800
1826+
1827+ Present: Check for window/fence destroyed when idling pixmaps
1828+
1829+ A client destroying objects in the middle of an unflip can end up
1830+ having the screen flip window or fence set to NULL in the unflip
1831+ notify path. Check for these and don't try to use those objects.
1832+
1833+ Signed-off-by: Keith Packard <keithp@keithp.com>
1834+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1835+
1836+commit 41da295eb50fa08eaacd0ecde99f43a716fcb41a
1837+Author: Keith Packard <keithp@keithp.com>
1838+Date: Sun Nov 3 13:12:40 2013 -0800
1839+
1840+ Trap SIGBUS to handle truncated shared memory segments
1841+
1842+ If a client passes a section of memory via file descriptor and then
1843+ subsequently truncates that file, the underlying pages will be freed
1844+ and the addresses invalidated. Subsequent accesses to the page will
1845+ fail with a SIGBUS error.
1846+
1847+ Trap that SIGBUS, figure out which segment was causing the error and
1848+ then allocate new pages to fill in for that region. Mark the offending
1849+ shared segment as invalid and free the resource ID so that the client
1850+ will be able to tell when subsequently attempting to use the segment.
1851+
1852+ Signed-off-by: Keith Packard <keithp@keithp.com>
1853+
1854+ v2: Use MAP_FIXED to simplify the recovery logic (Mark Kettenis)
1855+ v3: Also catch errors in ShmCreateSegment
1856+
1857+ Conflicts:
1858+ include/dix-config.h.in
1859+ include/xorg-config.h.in
1860+
1861+commit 719e880d7698d92f9b854b217ef9680aaa446f2e
1862+Author: Keith Packard <keithp@keithp.com>
1863+Date: Wed Nov 6 23:22:51 2013 -0800
1864+
1865+ Require libXtrans version 1.3.2
1866+
1867+ This has the FD passing support included
1868+
1869+ Signed-off-by: Keith Packard <keithp@keithp.com>
1870+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1871+
1872+commit bee2ec54049377e0033d49abff20d7bd069c62aa
1873+Author: Keith Packard <keithp@keithp.com>
1874+Date: Sun Nov 3 10:08:15 2013 -0800
1875+
1876+ Xext: Enable MIT-SHM FD-passing request definitions only when possible
1877+
1878+ Check to see if xtrans FD passing is available and use that to
1879+ advertise the appropriate version of the SHM extension
1880+
1881+ Signed-off-by: Keith Packard <keithp@keithp.com>
1882+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
1883+
1884+commit ea8acfe3e2f74a46c3f1e91809b4b99af18502b7
1885+Author: Keith Packard <keithp@keithp.com>
1886+Date: Wed Nov 6 23:06:28 2013 -0800
1887+
1888+ Require xextproto version 7.2.99.901
1889+
1890+ This includes the MIT-SHM FD passing requests
1891+
1892+ Signed-off-by: Keith Packard <keithp@keithp.com>
1893+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
1894+
1895+commit 914672fefacc15386041e7c2bc3beed4faf45e9d
1896+Author: Keith Packard <keithp@keithp.com>
1897+Date: Thu Nov 7 14:20:26 2013 -0800
1898+
1899+ Remove dix-config.h config variables from xorg-config.h
1900+
1901+ xorg-config.h includes dix-config, so there's no need to duplicate.
1902+
1903+ Signed-off-by: Keith Packard <keithp@keithp.com>
1904+
1905+commit 7aad79c5a582ece301d950bd65f0bcb4b9956e86
1906+Author: Keith Packard <keithp@keithp.com>
1907+Date: Wed Nov 6 23:05:46 2013 -0800
1908+
1909+ Make XTrans FD passing support optional. Define only on Linux
1910+
1911+ Until other operating systems have a libXtrans port for FD passing,
1912+ disable this on non-Linux systems.
1913+
1914+ Note that this define affects how libXtrans gets built into the X
1915+ server, which is why it need only define the symbol
1916+
1917+ Signed-off-by: Keith Packard <keithp@keithp.com>
1918+
1919+commit f70a8bf3714d89bccaad36841ef9149e91ad3bba
1920+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1921+Date: Sun Nov 10 11:40:27 2013 -0800
1922+
1923+ XQuartz: Don't sleep forever on exit if usleep() returns an error
1924+
1925+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1926+
1927+commit ebcc1c214c466582d7b92826b4860256fd9c582a
1928+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1929+Date: Sun Nov 10 11:26:49 2013 -0800
1930+
1931+ XQuartz: Update Info.plist copyright years
1932+
1933+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1934+
1935+commit 81c123ea2dd833864f7ba217791e59acca0f7c97
1936+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1937+Date: Mon Nov 4 12:13:45 2013 -0800
1938+
1939+ configure.ac: Move GLX section after DRI
1940+
1941+ The GLX section of configura.ac checks the state of DRI2, so it
1942+ needs to be after DRI2=auto is resolved.
1943+
1944+ Also reset libgl requirement to 7.1.0 in non-dri2 case.
1945+
1946+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
1947+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1948+
1949+commit ab4b1fb38a61feb73d8336cc7a3399eb9d3d25be
1950+Author: Andreas Schwab <schwab@suse.de>
1951+Date: Thu Aug 15 12:03:42 2013 +0200
1952+
1953+ ARM64: Add support for aarch64
1954+
1955+ Signed-off-by: Andreas Schwab <schwab@suse.de>
1956+ Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
1957+ Reviewed-by: Adam Jackson <ajax@redhat.com>
1958+ Signed-off-by: Keith Packard <keithp@keithp.com>
1959+
1960+commit 8fcf82cbf015609e00b3feb9bc567133c7aee5cf
1961+Author: Keith Packard <keithp@keithp.com>
1962+Date: Tue Nov 5 18:39:11 2013 -0800
1963+
1964+ Use $GL_LIBS instead of -lGL for linking
1965+
1966+ -lGL presumes that the GL library is in the system path, while
1967+ $GL_LIBS is auto-detected.
1968+
1969+ Signed-off-by: Keith Packard <keithp@keithp.com>
1970+
1971+commit f348935e7d2c84a438aba08eee2f2c4e0dc77d20
1972+Author: Keith Packard <keithp@keithp.com>
1973+Date: Tue Nov 5 18:37:12 2013 -0800
1974+
1975+ Link with xshmfence, reference miSyncShmScreenInit in sdksyms
1976+
1977+ This gets the server to link with xshmfence again, and also ensures
1978+ that the miSyncShm code is linked into the server with the reference
1979+ from sdksyms.
1980+
1981+ Signed-off-by: Keith Packard <keithp@keithp.com>
1982+
1983+commit 5f1e832694e57986c0185048a941b3af51b2f85f
1984+Author: Julien Cristau <jcristau@debian.org>
1985+Date: Tue Nov 5 07:08:21 2013 -0800
1986+
1987+ os: Actually use the computed clockid in GetTimeInMicros
1988+
1989+ The selection of which clock to use for this function was not actually
1990+ getting used when fetching the final clock value.
1991+
1992+ Reported-by: Julien Cristau <jcristau@debian.org>
1993+ Signed-off-by: Keith Packard <keithp@keithp.com>
1994+
1995+commit 903a058370645ea075ea98d380fd565efb6160c9
1996+Author: Keith Packard <keithp@keithp.com>
1997+Date: Mon Nov 4 19:01:26 2013 -0800
1998+
1999+ hw/xfree86: Link libdri3 only when DRI3 is defined
2000+
2001+ Don't attempt to link non-existant libraries...
2002+
2003+ Signed-off-by: Keith Packard <keithp@keithp.com>
2004+
2005+commit aaf0e29619196a283fee7ead2020a91032d84f48
2006+Author: Keith Packard <keithp@keithp.com>
2007+Date: Sun Nov 3 09:56:02 2013 -0800
2008+
2009+ Disable DRI3 and sync fence FD functions if xshmfence isn't available
2010+
2011+ Make sure the server can build when the xshmfence library isn't present
2012+
2013+ Signed-off-by: Keith Packard <keithp@keithp.com>
2014+
2015+commit 33c85beed521c9db140cadd8c5aa9992398ee1fe
2016+Author: Keith Packard <keithp@keithp.com>
2017+Date: Fri Nov 1 01:01:58 2013 -0700
2018+
2019+ Set version to 1.14.99.901 (1.15 RC1)
2020+
2021+ Signed-off-by: Keith Packard <keithp@keithp.com>
2022+
2023+commit 9db1d66f6d2c6857de220d8f1c08965962fe1416
2024+Author: Keith Packard <keithp@keithp.com>
2025+Date: Fri Nov 1 01:43:59 2013 -0700
2026+
2027+ Add dri3 and present directorys to distribution
2028+
2029+ Signed-off-by: Keith Packard <keithp@keithp.com>
2030+
2031+commit 977e2644b1d9e13b44debcb9a372bbc832ee32a3
2032+Merge: 66c5ee0 f36f5a6
2033+Author: Keith Packard <keithp@keithp.com>
2034+Date: Fri Nov 1 00:34:18 2013 -0700
2035+
2036+ Merge remote-tracking branch 'whot/for-keith'
2037+
2038+commit 66c5ee0ff4690e630a69656331fd9d545c99c26c
2039+Author: Egbert Eich <eich@freedesktop.org>
2040+Date: Wed Aug 14 18:18:56 2013 +0200
2041+
2042+ config/APM: Add option to disable building of APM support on Linux
2043+
2044+ APM support in the Xserver was used to restore the console mode
2045+ prior to a power management event. This was to ensure the mode
2046+ upon suspend/resume was one that the system firmware or kernel
2047+ could deal with.
2048+ APM support is now largely obsolete, KMS drivers don't require a
2049+ mode restoration anyhow. Therefore it should be possible to disable
2050+ this feature.
2051+
2052+ (small modification by keithp - move test for XF86PM flag after check
2053+ for APM, then move XF86PM flag to xorg-config.h.in)
2054+
2055+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
2056+ Tested-by: Keith Packard <keithp@keithp.com>
2057+ Signed-off-by: Keith Packard <keithp@keithp.com>
2058+
2059+commit f36f5a65f639b6524191d888d5bf89e73027156c
2060+Author: Peter Hutterer <peter.hutterer@who-t.net>
2061+Date: Wed Oct 30 15:40:58 2013 +1000
2062+
2063+ sync: fix corner-case in triggering idle alarms
2064+
2065+ ProcessInputEvent() resets the device idle times. If idle time was higher than
2066+ the lower bracket, this should trigger an event in the idle time wakeup
2067+ handler.
2068+
2069+ If processing is slow, the idle time may advance past the lower bracket
2070+ between the reset and the time the BlockHandler is called. In that case, we'd
2071+ never schedule a wakeup to handle the event, causing us to randomly miss
2072+ events.
2073+
2074+ Ran tests with a neg transition trigger on 5ms with 200 repeats of the test
2075+ and it succeeded. Anything below that gets a bit tricky to make sure the
2076+ server sees the same idle time as the client usleeps for.
2077+
2078+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2079+ Reviewed-by: Keith Packard <keithp@keithp.com>
2080+
2081+commit f994d99539192a10a8c83047e11991f52e0ca677
2082+Author: Egbert Eich <eich@freedesktop.org>
2083+Date: Wed Aug 14 18:18:39 2013 +0200
2084+
2085+ config/ACPI: Add option to disable building of ACPI support on Linux
2086+
2087+ ACPI support in the Xserver was used to restore the console mode
2088+ prior to a power management event. This was to ensure the mode
2089+ upon suspend/resume was one that the system firmware or kernel
2090+ could deal with.
2091+ The feature depended on acpid to be running. Most of this functionality
2092+ is now take over by systemd, KMS drivers don't require a mode restoration
2093+ anyhow. Therefore it should be possible to disable this feature under
2094+ some circumstances.
2095+
2096+ Tested-by: Keith Packard <keithp@keithp.com>
2097+ Signed-off-by: Keith Packard <keithp@keithp.com>
2098+
2099+commit 2aa5092b88174cb9988076ae96298217c97ad75f
2100+Author: Egbert Eich <eich@freedesktop.org>
2101+Date: Mon Aug 12 18:21:33 2013 +0200
2102+
2103+ DDX/Randr: Avoid server crash when xrandr SetConfig is called while switched away
2104+
2105+ A call to Xrandr SetScreenConfig (for randr 1.1) causes the Xserver to
2106+ crash when xf86SetViewport() which does not check if the hardware is
2107+ accessible.
2108+ Wrap accesses to xf86SetViewport() with if (vtSema) { ... } to avoid that.
2109+
2110+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
2111+ Reviewed-by: Keith Packard <keithp@keithp.com>
2112+ Signed-off-by: Keith Packard <keithp@keithp.com>
2113+
2114+commit 508e05777aba823c93a2417cc26d18c9f061ca26
2115+Author: Egbert Eich <eich@freedesktop.org>
2116+Date: Mon Aug 12 18:20:36 2013 +0200
2117+
2118+ DDX/Events: Distinguish between Input- and GeneralHandlers in xf86VTSwitch()
2119+
2120+ When enabling/disabling input handlers in xf86VTSwitch() we treat Input-
2121+ and GeneralHandlers equally. The result is that after a VT switch the
2122+ masks for EnabledDevices and AllSockets are equal and the distiction
2123+ between both types is lost.
2124+
2125+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
2126+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2127+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2128+ Signed-off-by: Keith Packard <keithp@keithp.com>
2129+
2130+commit 0cb33ce34081d7d123ec565582d7d19bdb3964ad
2131+Author: Egbert Eich <eich@freedesktop.org>
2132+Date: Sat Oct 5 08:02:28 2013 +0200
2133+
2134+ DDX/modes: Add a sanity check when using screen sizes from EDID
2135+
2136+ EDID sometimes lies about screen sizes. Since the screen size is used
2137+ by clients to determine the DPI a wrong ration will lead to terrible
2138+ looking fonts.
2139+ Add a sanity check for the h/v ratio cutting off at 2.4. This would
2140+ still accept the cinemascope aspect ratio as valid.
2141+ Also add message suggesting to add a quirk table entry.
2142+
2143+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
2144+ Reviewed-by: Keith Packard <keithp@keithp.com>
2145+ Signed-off-by: Keith Packard <keithp@keithp.com>
2146+
2147+commit 41d4beb2616ceb3f1a1b8694733e85bae70de59a
2148+Author: Egbert Eich <eich@freedesktop.org>
2149+Date: Wed Aug 14 11:50:26 2013 +0200
2150+
2151+ DDX/DPMS: Call dixSaveScreens() also when screen is turned on
2152+
2153+ DMPS calls dixSaveScreens() when turned off but not when turned
2154+ on. In most cases this is irrelevant as DPMS is done when a
2155+ key is hit in which case dixSaveScreens() will be called to
2156+ unblank anyhow. This isn't the case if we use xset (or the
2157+ DPMS extension directly) to unblank.
2158+ Check screenIsSaved to make sure the state needs to be changed
2159+ before calling dixSaveScreens().
2160+
2161+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
2162+ Reviewed-by: Keith Packard <keithp@keithp.com>
2163+ Signed-off-by: Keith Packard <keithp@keithp.com>
2164+
2165+commit 623c4147650d0404cfbea0f9b7df66dc7d928e00
2166+Author: Søren Sandmann Pedersen <ssp@redhat.com>
2167+Date: Mon Oct 21 17:11:56 2013 -0400
2168+
2169+ ephyr: Ensure stride of private framebuffer is multiple of 4
2170+
2171+ The fb layer of X can't deal with strides that are not a multiple of
2172+ 4, so when Xephyr allocates its own framebuffer it should make sure to
2173+ align it.
2174+
2175+ This fixes crashes and rendering corruption when Xephyr runs in a
2176+ depth that is different from the host X server and its screen size is
2177+ not a multiple of 4 / depth. (This is particularly easy to trigger if
2178+ you use the -resizeable option).
2179+
2180+ Reviewed-by: Eric Anholt <eric@anholt.net>
2181+ Signed-off-by: Soren Sandmann <ssp@redhat.com>
2182+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2183+
2184+commit 97cf53cc2ad7ecfdd495133bad31d0ec7d939326
2185+Author: Søren Sandmann Pedersen <ssp@redhat.com>
2186+Date: Mon Oct 21 16:58:54 2013 -0400
2187+
2188+ ephyr: hostx_screen_init(): Fix bits_per_pixel and bytes_per_line
2189+
2190+ When the depth of the Xephyr server matches that of the host X server,
2191+ Xephyr simply uses the buffer associated with the XImage as its
2192+ framebuffer. In this case, it is correct to get the bits_per_pixel and
2193+ bytes_per_line values returned from hostx_screen_init() from the XImage.
2194+
2195+ However, when the depth doesn't match the host, Xephyr uses a private
2196+ framebuffer that is periodically copied to the XImage. In this case,
2197+ the returned values of bits_per_pixel and bytes_per_line should be
2198+ those of the private framebuffer, not those of the XImage.
2199+
2200+ Reviewed-by: Eric Anholt <eric@anholt.net>
2201+ Signed-off-by: Soren Sandmann <ssp@redhat.com>
2202+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2203+
2204+commit 55246b67b755d4c1039d54971fe3f77ea60d604e
2205+Author: Søren Sandmann Pedersen <ssp@redhat.com>
2206+Date: Tue Oct 8 17:45:40 2013 -0400
2207+
2208+ xf86AddBusDeviceToConfigure(): Store device in DevToConfig[i].pVideo
2209+
2210+ After fc3ab84d the pVideo field in DevToConfig[i] is no longer
2211+ initialized, so it's always NULL. This causes the duplicate finding
2212+ algorithm in the beginning of the function to not work anymore as it
2213+ is based on this field.
2214+
2215+ The symptom of this bug is that X -configure reports
2216+
2217+ Number of created screens does not match number of detected devices.
2218+ Configuration failed.
2219+ Server terminated with error (2). Closing log file.
2220+
2221+ rather than producing a working config file.
2222+
2223+ This patch fixes that bug by initializing the field before calling
2224+ xf86PciConfigureNewDev().
2225+
2226+ Cc: tvignatti@gmail.com
2227+ Signed-off-by: Soren Sandmann <ssp@redhat.com>
2228+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2229+
2230+commit 95bf478b78e466002c382bcde7d4d62591e9215d
2231+Merge: abf5d5a bb745f2
2232+Author: Keith Packard <keithp@keithp.com>
2233+Date: Thu Oct 31 18:18:19 2013 -0700
2234+
2235+ Merge remote-tracking branch 'jeremyhu/master'
2236+
2237+commit abf5d5ac12437ebe156b4dd500c2acd69eea3654
2238+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2239+Date: Thu Oct 31 08:57:56 2013 -0700
2240+
2241+ miext/damage: Partial revert of "Only wrap into the GC ops chain if there's a listener (v3)"
2242+
2243+ Fixes regression from: 4dc2a76740d921c824a4d8193f39dd373475f02a
2244+
2245+ http://lists.x.org/archives/xorg-devel/2013-May/036241.html
2246+ https://trac.macports.org/ticket/38993
2247+
2248+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2249+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2250+ Signed-off-by: Keith Packard <keithp@keithp.com>
2251+
2252+commit e4636072949a76477fe7c9d54662a0b3536b1372
2253+Merge: 17ed7ac 5c5c1b7
2254+Author: Keith Packard <keithp@keithp.com>
2255+Date: Thu Oct 31 17:05:48 2013 -0700
2256+
2257+ Merge remote-tracking branch 'keithp/dri3'
2258+
2259+commit 17ed7ac1fe7426d66f688087c09da5ff1dbb41d3
2260+Author: Adam Jackson <ajax@redhat.com>
2261+Date: Thu Oct 31 18:39:22 2013 -0400
2262+
2263+ glx: Lie about GLX_Y_INVERTED_EXT
2264+
2265+ Well, that was lame. The problem with reporting y inversion honestly is
2266+ that libGL asks the driver _its_ opinion of Y inversion, which it just
2267+ fabricates from whole cloth. So then when libGL goes to compare the
2268+ driver's idea of fbconfigs with that of the server - a fairly dumb idea
2269+ to begin with - nothing matches, and direct rendering fails, and
2270+ sadness.
2271+
2272+ So until the DRI drivers are fixed we should just continue to lie about
2273+ Y inversion. GLX_DONT_CARE is what libGL would make up for that
2274+ attribute if we hadn't sent it, so just send that instead.
2275+
2276+ Signed-off-by: Adam Jackson <ajax@redhat.com>
2277+ Tested-by: Keith Packard <keithp@keithp.com>
2278+ Signed-off-by: Keith Packard <keithp@keithp.com>
2279+
2280+commit 5c5c1b77982a9af7279a90bc3c2be48adaa9c778
2281+Author: Keith Packard <keithp@keithp.com>
2282+Date: Thu Jul 11 16:11:57 2013 -0700
2283+
2284+ present: Add Present extension
2285+
2286+ Provides both a software implementation using timers and driver hooks
2287+ to base everything on vblank intervals.
2288+
2289+ Signed-off-by: Keith Packard <keithp@keithp.com>
2290+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2291+
2292+commit 563138298868f62501875d3016f03469dcffaad0
2293+Author: Keith Packard <keithp@keithp.com>
2294+Date: Tue Apr 9 19:59:39 2013 -0700
2295+
2296+ dri3: Add DRI3 extension
2297+
2298+ Adds DRM compatible fences using futexes.
2299+ Uses FD passing to get pixmaps from DRM applications.
2300+
2301+ Signed-off-by: Keith Packard <keithp@keithp.com>
2302+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2303+
2304+commit fdec793cdc2ef9a6ea66b311cb1068a7bd4a3be3
2305+Author: Keith Packard <keithp@keithp.com>
2306+Date: Thu Jan 17 13:46:55 2013 -0800
2307+
2308+ Add support for MIT-SHM AttachFd request
2309+
2310+ This passes a file descriptor from the client to the server, which is
2311+ then mmap'd
2312+
2313+ Signed-off-by: Keith Packard <keithp@keithp.com>
2314+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2315+
2316+commit 9fd35daa3160fd36f00ed354bfcbefefa1353cce
2317+Author: Keith Packard <keithp@keithp.com>
2318+Date: Thu Jan 17 13:43:02 2013 -0800
2319+
2320+ Add interfaces to get FDs from clients over the socket
2321+
2322+ This adds two interfaces:
2323+
2324+ void SetReqFds(ClientPtr client, int req_fds)
2325+
2326+ Marks the number of file descriptors expected for this
2327+ request. Call this before any request processing so that
2328+ any un-retrieved file descriptors will be closed
2329+ automatically.
2330+
2331+ int ReadFdFromClient(ClientPtr client)
2332+
2333+ Reads the next queued file descriptor from the connection. If
2334+ this request is not expecting any more file descriptors, or
2335+ if there are no more file descriptors available from the
2336+ connection, then this will return -1.
2337+
2338+ Signed-off-by: Keith Packard <keithp@keithp.com>
2339+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2340+
2341+commit 264fc3abe5f18341d0cf9ddb6766e10e4154e447
2342+Author: Keith Packard <keithp@keithp.com>
2343+Date: Thu Oct 31 13:01:46 2013 -0700
2344+
2345+ misync: Don't smash custom screen sync functions
2346+
2347+ There was a check to avoid smashing custom functions, but the sense
2348+ was backwards causing it to always smash them, and also not set them otherwise.
2349+
2350+ Signed-off-by: Keith Packard <keithp@keithp.com>
2351+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2352+
2353+commit 2d96948ab5c952b68875ac63844cf7d778d4bf63
2354+Author: Keith Packard <keithp@keithp.com>
2355+Date: Thu Jul 11 16:10:34 2013 -0700
2356+
2357+ os: Add GetTimeInMicros
2358+
2359+ 64-bit higher resolution current time value.
2360+
2361+ Signed-off-by: Keith Packard <keithp@keithp.com>
2362+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2363+
2364+commit 0c33f47281c36726848daf513fb0483cdea57bff
2365+Author: Keith Packard <keithp@keithp.com>
2366+Date: Thu Jul 11 16:09:34 2013 -0700
2367+
2368+ Add swapll to byte swap 64-bit datatypes
2369+
2370+ Signed-off-by: Keith Packard <keithp@keithp.com>
2371+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2372+
2373+commit 26f013ba45b08a02bb028a461af68288a86fadb1
2374+Author: Keith Packard <keithp@keithp.com>
2375+Date: Thu Jul 11 16:08:41 2013 -0700
2376+
2377+ Add a RegionDuplicate function
2378+
2379+ This allocates a new region structure and copies a source region into
2380+ it in a single API rather than forcing the caller to do both steps themselves.
2381+
2382+ Signed-off-by: Keith Packard <keithp@keithp.com>
2383+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2384+
2385+commit d25c217964eb1fe54c3a54bca4cac7f47b4b9fdf
2386+Author: Keith Packard <keithp@keithp.com>
2387+Date: Mon Jan 14 14:24:36 2013 -0800
2388+
2389+ Clean up a couple of warnings in os/
2390+
2391+ Signed-off-by: Keith Packard <keithp@keithp.com>
2392+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2393+
2394+commit 7710f2b927ec8e3c631f72d66d494b523377b48e
2395+Author: Keith Packard <keithp@keithp.com>
2396+Date: Fri Jan 18 21:43:40 2013 -0800
2397+
2398+ Xext: Move MIT-SHM 'ShmDesc' to shmint.h
2399+
2400+ This data structure is required to use shared memory objects in any
2401+ extension. That includes the Xv extension, which (before this patch)
2402+ duplicated the definition of this structure in its own code.
2403+
2404+ Signed-off-by: Keith Packard <keithp@keithp.com>
2405+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2406+
2407+commit e8961b718d82f1c081ec110d8d962f64e8406b82
2408+Author: Peter Hutterer <peter.hutterer@who-t.net>
2409+Date: Tue Oct 22 14:24:52 2013 +1000
2410+
2411+ os: use a constant for backtrace array size
2412+
2413+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2414+ Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
2415+
2416+commit f12a9ed870017f35cf6d2a82b1405e843aae42ac
2417+Author: Peter Hutterer <peter.hutterer@who-t.net>
2418+Date: Tue Oct 29 15:24:11 2013 +1000
2419+
2420+ configure: remove a comment
2421+
2422+ 94ed0ba1b5043ad9fc33b42756af447d5ab15bbd moved backtracing into the DIX, so
2423+ this comment is outdated. since no-one noticed and it's easier to just grep
2424+ than update file references, remove the comment.
2425+
2426+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2427+ Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
2428+
2429+commit bb745f2b45768d0936f3960951e1a5cee8b03194
2430+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2431+Date: Thu Oct 31 08:50:57 2013 -0700
2432+
2433+ XQuartz: Bump bundle version to 2.7.6
2434+
2435+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
2436+
2437+commit 2eedf42c229e2251035d716a96b654222155cd51
2438+Author: Adam Jackson <ajax@redhat.com>
2439+Date: Thu Oct 31 09:23:52 2013 -0400
2440+
2441+ dri: Fix GLX_Y_INVERTED_EXT fbconfig attribute
2442+
2443+ We're Y-inverted from GL's coordinates, so this is correct. gnome-shell
2444+ doesn't seem to check this - somewhat reasonable since the only server
2445+ that answered the other way around was Xglx - but kwin does, and
2446+ upside-down hilarity ensues.
2447+
2448+ Tested-by: maelcum on #xorg-devel
2449+ Signed-off-by: Adam Jackson <ajax@redhat.com>
2450+ Signed-off-by: Keith Packard <keithp@keithp.com>
2451+
2452+commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa
2453+Author: Adam Jackson <ajax@redhat.com>
2454+Date: Tue Oct 29 12:58:14 2013 -0400
2455+
2456+ xfree86: Bump video/input/extension ABIs for 1.15
2457+
2458+ Signed-off-by: Adam Jackson <ajax@redhat.com>
2459+ Reviewed-by: Julien Cristau <jcristau@debian.org>
2460+ Signed-off-by: Keith Packard <keithp@keithp.com>
2461+
2462+commit 899451ae595f5f51a500295c624bf7ad14aca602
2463+Author: Keith Packard <keithp@keithp.com>
2464+Date: Wed Oct 30 08:54:24 2013 -0700
2465+
2466+ kdrive/ephyr: Don't discard one-time driver structure at server reset
2467+
2468+ KdScreenInfo is constructed at server startup time, and not
2469+ re-generated at server reset time. Freeing the 'driver' element at
2470+ reset time means this information is lost, and the server crashes
2471+ pretty quickly afterwards.
2472+
2473+ Signed-off-by: Keith Packard <keithp@keithp.com>
2474+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2475+
2476+commit 85ae44f07fa21b4a48d95d736dc8135bd4f751d0
2477+Author: Michal Srb <msrb@suse.com>
2478+Date: Wed Oct 30 13:33:51 2013 +0200
2479+
2480+ randr: deliver Output and Crtc events of attached output providers.
2481+
2482+ Consider all attached output providers when looking for changed outputs and
2483+ crtcs.
2484+
2485+ Reviewed-by: Dave Airlie <airlied@redhat.com>
2486+ Signed-off-by: Michal Srb <msrb@suse.com>
2487+ Signed-off-by: Keith Packard <keithp@keithp.com>
2488+
2489+commit a9ca93dcf9a711b3d60fbad31cbd44e0c82b6f42
2490+Author: Michal Srb <msrb@suse.com>
2491+Date: Wed Oct 30 13:33:50 2013 +0200
2492+
2493+ randr: send RRResourceChangeNotify event
2494+
2495+ Send RRResourceChangeNotify event when provider, output or crtc was created or
2496+ destroyed. I.e. when the list of resources returned by RRGetScreenResources and
2497+ RRGetProviders changes.
2498+
2499+ Reviewed-by: Dave Airlie <airlied@redhat.com>
2500+ Signed-off-by: Michal Srb <msrb@suse.com>
2501+ Signed-off-by: Keith Packard <keithp@keithp.com>
2502+
2503+commit 4b39ea8a918fe6117bf34dc1cba67a4e56d0d1fb
2504+Author: Michal Srb <msrb@suse.com>
2505+Date: Wed Oct 30 13:33:49 2013 +0200
2506+
2507+ randr: send RRProviderChangeNotify event
2508+
2509+ Send RRProviderChangeNotify event when a provider becomes output source or
2510+ offload sink.
2511+
2512+ Reviewed-by: Dave Airlie <airlied@redhat.com>
2513+ Signed-off-by: Michal Srb <msrb@suse.com>
2514+ Signed-off-by: Keith Packard <keithp@keithp.com>
2515+
2516+commit 1470c0a132806fb2ce817515ad4ddfe66eb7c98f
2517+Merge: 04ab07c 9f4afe7
2518+Author: Keith Packard <keithp@keithp.com>
2519+Date: Tue Oct 29 21:00:13 2013 -0700
2520+
2521+ Merge remote-tracking branch 'whot/for-keith'
2522+
2523+commit 9f4afe7e835cf9c513387ae01eaf8b7a6ba4aac9
2524+Author: Gaetan Nadon <memsize@videotron.ca>
2525+Date: Mon Oct 28 18:32:36 2013 -0400
2526+
2527+ config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
2528+
2529+ Fix Automake warning: AC_OUTPUT should be used without arguments.
2530+ www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files
2531+
2532+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2533+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2534+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2535+
2536+commit e16dea72d6f45dd6d7788362bb7dbe76263719b1
2537+Author: Peter Hutterer <peter.hutterer@who-t.net>
2538+Date: Wed Oct 23 15:16:25 2013 +1000
2539+
2540+ dmx: queue button events with a flags of 0
2541+
2542+ Setting POINTER_SCREEN with a unset valuator mask causes a jump to 0/0. Set
2543+ the flags to 0 so we don't generate any motion on a button event.
2544+
2545+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2546+ Reviewed-by: Keith Packard <keithp@keithp.com>
2547+
2548+commit 04ab07ca19236d6c9a947e065fb69b0dd0d16639
2549+Author: Connor Behan <connor.behan@gmail.com>
2550+Date: Thu Oct 17 18:26:28 2013 -0700
2551+
2552+ xfree86: Find primary entity when bus types are nominally different
2553+
2554+ As of server 1.13, systems with DRM and Udev will have BUS_PLATFORM as
2555+ their primary bus type. However, drivers not implementing a
2556+ platformProbe function will still create entities of type BUS_PCI. We
2557+ need to account for this when checking for the primary entity.
2558+
2559+ Signed-off-by: Connor Behan <connor.behan@gmail.com>
2560+ Acked-by: Tormod Volden <debian.tormod@gmail.com>
2561+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2562+ Signed-off-by: Keith Packard <keithp@keithp.com>
2563+
2564+commit b32a4c91ccd479638c2bd2c0143b6ea170c717d1
2565+Merge: be66809 c671e93
2566+Author: Keith Packard <keithp@keithp.com>
2567+Date: Tue Oct 29 09:37:30 2013 -0700
2568+
2569+ Merge remote-tracking branch 'idr/glx-float-fbconfig'
2570+
2571+commit be6680967a479eedbcab2fe1718c5f981e1029c7
2572+Author: Adam Jackson <ajax@redhat.com>
2573+Date: Wed Jul 10 10:00:46 2013 -0400
2574+
2575+ glx: convert to direct GL dispatch (v2)
2576+
2577+ We now expect to be linked against something that provides the GL API,
2578+ instead of manually grubbing about in the DRI driver's dispatch table.
2579+ Since the GLX we expose calls GL functions that are meant to be looked
2580+ up dynamically, also add a way to thunk through to GetProcAddress.
2581+
2582+ This includes a refresh of the generated sources, which requires a
2583+ correspondingly new Mesa.
2584+
2585+ The GetProcAddress stubs are at the moment merely enough to make this
2586+ link against Mesa 9.2, but should really be provided for everything not
2587+ in the OpenGL 1.2 ABI.
2588+
2589+ v2: Explicitly hide the GetProcAddress stubs so we can't conflict with
2590+ libGL symbols; fix leading tab/space issues [anholt]
2591+
2592+ Reviewed-by: Keith Packard <keithp@keithp.com>
2593+ Signed-off-by: Adam Jackson <ajax@redhat.com>
2594+
2595+commit 8aacf47e1778d8b72811b025a82452b933d3c1f2
2596+Author: Adam Jackson <ajax@redhat.com>
2597+Date: Fri Oct 4 12:58:19 2013 -0400
2598+
2599+ glx: Remove DRI1 AIGLX (v2)
2600+
2601+ Mesa doesn't ship DRI1 drivers as of 8.0, which is about 18 months and
2602+ three releases ago. The main reason to have wanted DRI1 AIGLX was to
2603+ get a GLX compositor working, but DRI1's (lack of) memory management API
2604+ meant that the cost of a GLX compositor was breaking direct GLX apps,
2605+ which isn't a great tradeoff.
2606+
2607+ Of the DRI1 drivers Mesa has dropped, I believe only mga stands to lose
2608+ some functionality here, since it and only it has support for
2609+ NV_texture_rectangle. Since that's required for every extant GLX
2610+ compositor I know of, I conclude that anybody with a savage, say, would
2611+ probably not notice AIGLX going away, since they wouldn't be running a
2612+ GLX compositor in the first place.
2613+
2614+ In the future we'd like to use GL in the server in a more natural way,
2615+ as just another EGL client, including in the GLX implementation itself.
2616+ Since there's no EGL implemented for DRI1 drivers, this would already
2617+ doom AIGLX on DRI1 (short of entirely forking the GLX implementation,
2618+ which I'm not enthusiastic about).
2619+
2620+ v2: Remove DRI1 from AIGLX conditionals in configure.ac [anholt]
2621+
2622+ Reviewed-by: Eric Anholt <eric@anholt.net>
2623+ Signed-off-by: Adam Jackson <ajax@redhat.com>
2624+
2625+commit 7f5adf73a0f9a951a6df201532b4031d38054369
2626+Author: Adam Jackson <ajax@redhat.com>
2627+Date: Wed Oct 2 17:38:05 2013 -0400
2628+
2629+ glx: Simplify glXDestroyContext
2630+
2631+ We can just free the resource unconditionally here. ContextGone (which
2632+ FreeResourceByType will call) already does:
2633+
2634+ cx->idExists = GL_FALSE;
2635+ if (!cx->currentClient) {
2636+ __glXFreeContext(cx);
2637+ }
2638+
2639+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2640+ Signed-off-by: Adam Jackson <ajax@redhat.com>
2641+
2642+commit 53653f4889dcaea0cf67f8a4180af71eeb4b2f6b
2643+Author: Adam Jackson <ajax@redhat.com>
2644+Date: Mon Aug 5 15:46:11 2013 -0400
2645+
2646+ glx: Fix a corner case in DrawableGone
2647+
2648+ Losing the drawable does not change our notion of current client. Since
2649+ the GL under us doesn't understand having a current context without
2650+ current drawables (sigh), we do still need to loseCurrent so that we
2651+ re-bind the context on the next request.
2652+
2653+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65030
2654+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2655+ Signed-off-by: Adam Jackson <ajax@redhat.com>
2656+
2657+commit 276d8057aa7f6e36c9c874257a6383f416c5cedd
2658+Author: Adam Jackson <ajax@redhat.com>
2659+Date: Sat Aug 3 09:47:55 2013 -0400
2660+
2661+ glx: Fix memory leak in context garbage collection (v2)
2662+
2663+ I broke this, back in:
2664+
2665+ commit a48dadc98a28c969741979b70b7a639f24f4cbbd
2666+ Author: Adam Jackson <ajax@redhat.com>
2667+ Date: Mon Mar 21 11:59:29 2011 -0400
2668+
2669+ glx: Reimplement context tags
2670+
2671+ In that, I changed the glx client state to not explicitly track the list
2672+ of current contexts for the client (since that was what we were deriving
2673+ tags from). The bug was that I removed the code for same from
2674+ glxClientCallback without noticing that it had the side effect of
2675+ effectively de-currenting those contexts, so that ContextGone could free
2676+ them. So, if you had a client exit with a context still current, the
2677+ context's memory would leak. Not a huge deal for direct clients, but
2678+ viciously bad for indirect, since the swrast context state at the bottom
2679+ of Mesa is like 15M.
2680+
2681+ Fix this by promoting Bool isCurrent to ClientPtr currentClient, so that
2682+ we have a back-pointer to chase when walking the list of contexts when
2683+ ClientStateGone happens.
2684+
2685+ v2: Explicitly call __glXFreeContext on the ClientStateGone path. Our
2686+ current context might be one we got from EXT_import_context and whose
2687+ creating client has since died. Without the explicit call, the creating
2688+ client's FreeClientResources would not free the context because it's
2689+ still current, and the using client's FreeClientResources would not free
2690+ the context because it's not an XID it created. This matches the logic
2691+ from a48dadc.
2692+
2693+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2694+ Signed-off-by: Adam Jackson <ajax@redhat.com>
2695+
2696+commit 75b362763cca8b6139582ad85e3b58f0b2e30a1c
2697+Author: Adam Jackson <ajax@redhat.com>
2698+Date: Tue Oct 8 15:02:44 2013 -0400
2699+
2700+ glx: Only take a Pixmap reference if creating the GLXPixmap succeeded
2701+
2702+ Reviewed-by: Julien Cristau <jcristau@debian.org>
2703+ Signed-off-by: Adam Jackson <ajax@redhat.com>
2704+
2705+commit 4292a39c8014f9f4920bed3001802e4a3e523c5e
2706+Author: Peter Hutterer <peter.hutterer@who-t.net>
2707+Date: Mon Oct 28 12:10:10 2013 +1000
2708+
2709+ Xi: fix logic error when calculating emulated motion events
2710+
2711+ gcc -Wlogical-op
2712+ exevents.c: In function 'DeliverEmulatedMotionEvent':
2713+ exevents.c:1480:13: warning: logical 'or' of collectively exhaustive
2714+ tests is always true [-Wlogical-op]
2715+
2716+ The relevant snippet of exevents.c:
2717+
2718+ 1479 if (ti->listeners[0].type != LISTENER_POINTER_REGULAR ||
2719+ 1480 ti->listeners[0].type != LISTENER_POINTER_GRAB)
2720+ 1481 return;
2721+
2722+ This condition was always true, causing dropped motion events.
2723+
2724+ Reported-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2725+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2726+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2727+
2728+commit c671e935e7c44d4711ba9588ee96cb9796b879e6
2729+Author: Daniel Czarnowski <daniel.czarnowski@intel.com>
2730+Date: Mon Oct 21 19:48:38 2013 +0200
2731+
2732+ glx: Enable GLX_ARB_fbconfig_float for DRI2 drivers
2733+
2734+ v2 (idr): Maintain sort order of extension list. Fixed rebase error
2735+ (comment header for initializeExtensions was in front of
2736+ __glXDRIinvalidateBuffers). Re-write commit message.
2737+
2738+ Signed-off-by: Daniel Czarnowski <daniel.czarnowski@intel.com>
2739+ Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2740+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2741+
2742+commit ccc8bb1153ec669f7540a174a81a8ec0e0d6dd67
2743+Author: Daniel Czarnowski <daniel.czarnowski@intel.com>
2744+Date: Wed Oct 23 12:53:59 2013 +0200
2745+
2746+ glx: Handle float config types in glxConvertConfigs
2747+
2748+ Replaces old use of floatMode attribute with new, extended range of
2749+ values in __DRI_ATTRIB_RENDER_TYPE. Also adds new conditions, where the
2750+ float modes support requires it. Enables support for not only float
2751+ configs, but packed float configs as well.
2752+
2753+ v2 (idr): Whitespace and formatting fixes. Refactor render type
2754+ vs. pbuffer checking to a separate function that includes a quote from
2755+ the spec. Re-write commit message. Fix compiler warnings:
2756+
2757+ glxdricommon.c: In function 'glxConvertConfigs':
2758+ glxdricommon.c:212:35: warning: pointer targets in passing argument 3 of 'core->getConfigAttrib' differ in signedness [-Wpointer-sign]
2759+ glxdricommon.c:212:35: note: expected 'unsigned int *' but argument is of type 'int *'
2760+ glxdricommon.c:230:35: warning: pointer targets in passing argument 3 of 'core->getConfigAttrib' differ in signedness [-Wpointer-sign]
2761+ glxdricommon.c:230:35: note: expected 'unsigned int *' but argument is of type 'int *'
2762+
2763+ Signed-off-by: Daniel Czarnowski <daniel.czarnowski@intel.com>
2764+ Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2765+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2766+
2767+commit 4e5eb15b4cc170499cf87e6633c1737f0b1c514b
2768+Author: Daniel Czarnowski <daniel.czarnowski@intel.com>
2769+Date: Mon Oct 21 19:57:53 2013 +0200
2770+
2771+ glx: Correctly set render type enum
2772+
2773+ The type specified is bits, but the context wants an enum.
2774+
2775+ v2 (idr): Fix various whitespace and formatting problems. Rename
2776+ convFBconfRenderTypeBits2CtxRenderType to
2777+ renderTypeBitsToRenderTypeEnum. Re-write commit message.
2778+
2779+ Signed-off-by: Daniel Czarnowski <daniel.czarnowski@intel.com>
2780+ Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2781+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2782+
2783+commit eabb523aa45f3d8940cadac197ef1225fbfd5c56
2784+Author: Daniel Czarnowski <daniel.czarnowski@intel.com>
2785+Date: Mon Oct 21 19:45:35 2013 +0200
2786+
2787+ glx: Allow float renderType in glXCreateContextAttribsARB
2788+
2789+ This enables GLX_RGBA_FLOAT_TYPE_ARB and
2790+ GLX_RGBA_UNSIGNED_FLOAT_TYPE_EXT as valid renderType parameters to
2791+ glXCreateContextAttribsARB.
2792+
2793+ v2 (idr) : Use C-style comments and fix word wrapping. Re-write commit
2794+ message.
2795+
2796+ Signed-off-by: Daniel Czarnowski <daniel.czarnowski@intel.com>
2797+ Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
2798+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
2799+
2800+commit 7ecfab47eb221dbb996ea6c033348b8eceaeb893
2801+Author: Eric Anholt <eric@anholt.net>
2802+Date: Tue Oct 22 14:22:04 2013 -0700
2803+
2804+ glx: Add support for the new DRI loader entrypoint.
2805+
2806+ This is going to be exposed (and not the old entrypoint) for some DRI
2807+ drivers once the megadrivers series lands, and the plan is to
2808+ eventually transition all drivers to that. Hopefully this is
2809+ unobtrusive enough to merge to stable X servers so that they can be
2810+ compatible with new Mesa versions.
2811+
2812+ v2: typo fix in the comment
2813+
2814+ Signed-off-by: Eric Anholt <eric@anholt.net>
2815+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2816+ Signed-off-by: Keith Packard <keithp@keithp.com>
2817+
2818+commit 83bb366e71ef41165998eed2934208f84714a37e
2819+Author: Strake <strake888@gmail.com>
2820+Date: Thu Oct 17 23:20:20 2013 -0500
2821+
2822+ unbreak KdEnableInput
2823+
2824+ pi = ki = 0 here, so not follow them.
2825+
2826+ Signed-off-by: Strake <strake888@gmail.com>
2827+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2828+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2829+
2830+commit 8db4121a3c7104548fd4a138ac1d1bdea5fd22d9
2831+Author: Keith Packard <keithp@keithp.com>
2832+Date: Fri Oct 18 17:31:01 2013 -0700
2833+
2834+ Update to version 1.14.99.3
2835+
2836+ Signed-off-by: Keith Packard <keithp@keithp.com>
2837+
2838+commit e3220d7bae4548bf64e5879c981ad070ac1f78f7
2839+Merge: 73b2660 2523a44
2840+Author: Keith Packard <keithp@keithp.com>
2841+Date: Fri Oct 18 17:22:52 2013 -0700
2842+
2843+ Merge commit '2523a445a09a75a8baf642608d099a5e12d5437f'
2844+
2845+ This is merging the commits along Peter's for-keith branch, without
2846+ also merging in the spurious merge at the top of that branch.
2847+
2848+commit f8662a133690773692dfa392ecfa3b8b56af8fa9
2849+Merge: 7cf1b59 2523a44
2850+Author: Peter Hutterer <peter.hutterer@who-t.net>
2851+Date: Fri Oct 18 16:50:12 2013 +1000
2852+
2853+ Merge branch 'xsync-transition-bug-59644' into for-keith
2854+
2855+commit 2523a445a09a75a8baf642608d099a5e12d5437f
2856+Author: Peter Hutterer <peter.hutterer@who-t.net>
2857+Date: Thu Oct 17 12:02:27 2013 +1000
2858+
2859+ sync: split updating and triggering a counter up
2860+
2861+ Now that the brackets are always the nearest change points (regardless of
2862+ transition) we need to update the counters whenever we check for any updates.
2863+
2864+ Otherwise we end up with a situation where counter->value is out of date and
2865+ an alarm doesn't trigger because we're still using the value from last time
2866+ something actually triggered.
2867+
2868+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2869+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2870+ Reviewed-by: Keith Packard <keithp@keithp.com>
2871+
2872+commit e57ec99b03b2ad840c384a97ab2766ce9da0f5cc
2873+Author: Peter Hutterer <peter.hutterer@who-t.net>
2874+Date: Wed Oct 16 16:31:15 2013 +1000
2875+
2876+ sync: always set the brackets (#59644)
2877+
2878+ The current code sets bracket_greater to the first trigger after the current
2879+ value, and bracket_less to the last trigger before the current value.
2880+
2881+ For example, the idle timer with three negative and three positive transitions
2882+ would set this:
2883+
2884+ nt1 nt2 nt3
2885+ |--------|------|--|------- idle --|---|--|-----> t
2886+ pt1 pt2 pt3
2887+ bracket_less == nt2
2888+ bracket_greater == pt2
2889+
2890+ This is an optimization so we can skip code paths in the block/wakeup handlers
2891+ if the current value doesn't meet any of the trigger requirements. Those
2892+ handlers largely do a
2893+ if (bracket_less is less than current value &&
2894+ bracket_greater is greater than current value)
2895+ return, nothing to do
2896+
2897+ However, unless the bracket values are updated at the correct time, the
2898+ following may happen:
2899+
2900+ nt
2901+ |--------------|---------- idle ------|--------> t
2902+ pt
2903+
2904+ In this case, neither bracket is set, we're past the pos transition and not
2905+ yet at the neg transition. idle may now go past nt, but the brackets are not
2906+ updated. If idle is then reset to 0, no alarm is triggered for nt. Likewise,
2907+ idle may now go past pt and no alarm is triggered.
2908+
2909+ Changing an alarm or triggering an alarm will re-calculate the brackets, so
2910+ this bug is somewhat random. If any other client triggers an alarm when the
2911+ brackets are wrongly NULL, the recalculation will set them this bug may not
2912+ appear.
2913+
2914+ This patch changes the behavior, so that the brackets are always the nearest
2915+ positive or negative transitions to the current counter value. In the example
2916+ above, nt will trigger a wakeup and a re-calculation of the brackets, so that
2917+ going past it in the negative direction will then cause the proper alarm
2918+ triggers.
2919+
2920+ Or, in Keith's words:
2921+
2922+ Timer currently past a positive trigger
2923+ No bracket values, because no trigger in range
2924+
2925+ Timer moves backwards before the positive trigger
2926+ Brackets not reset, even though there is now a trigger in range
2927+
2928+ Timer moves forward past the positive trigger
2929+ Trigger doesn't fire because brackets not set
2930+
2931+ Setting the LT bracket in this case will cause everything to get
2932+ re-evaluated when the sync value moves backwards before the trigger
2933+ value.
2934+
2935+ X.Org Bug 59644 <http://bugs.freedesktop.org/show_bug.cgi?id=59644>
2936+
2937+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2938+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2939+ Reviewed-by: Keith Packard <keithp@keithp.com>
2940+
2941+commit 06b87aa528d7a739ba20101a1f83b1a428691a01
2942+Author: Peter Hutterer <peter.hutterer@who-t.net>
2943+Date: Wed Oct 16 10:08:46 2013 +1000
2944+
2945+ sync: if the idle time was reset, force alarms to trigger (#70476)
2946+
2947+ The time between the idle reset and the IdleTimeWakeupHandler to be called is
2948+ indeterminate. Clients with an PositiveTransition or NegativeTransition alarm
2949+ on a low threshold may miss an alarm.
2950+
2951+ Work around this by keeping a reset flag for each device. When the
2952+ WakeupHandler triggers and the reset flag is set, we force a re-calculation of
2953+ everything and pretend the current idle time is zero. Immediately after is the
2954+ next calculation with the real idle time.
2955+
2956+ Relatively reproducible test case: Set up a XSyncNegativeTransition alarm for
2957+ a threshold of 1 ms. May trigger, may not.
2958+
2959+ X.Org Bug 70476 <http://bugs.freedesktop.org/show_bug.cgi?id=70476>
2960+
2961+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2962+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2963+ Reviewed-by: Keith Packard <keithp@keithp.com>
2964+
2965+commit efc1035ca958f2c9d266338a308518a0834b1773
2966+Author: Peter Hutterer <peter.hutterer@who-t.net>
2967+Date: Wed Oct 16 09:36:01 2013 +1000
2968+
2969+ dix: provide accessor methods for the last device event time
2970+
2971+ And now that we have the accessors, localize it. No functional changes, just
2972+ preparing for a future change.
2973+
2974+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2975+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2976+ Reviewed-by: Keith Packard <keithp@keithp.com>
2977+
2978+commit b7c9bd9cf276e92a73be57ff2ed32b47a80f13fb
2979+Author: Peter Hutterer <peter.hutterer@who-t.net>
2980+Date: Wed Oct 16 09:21:47 2013 +1000
2981+
2982+ sync: supply the counter from IdleTimeBlockHandler
2983+
2984+ The main idletime counter has an initialized deviceid, might as well be
2985+ supplying it properly. Without this, we'd only ever check the XIAllDevices
2986+ counter, so the wait would never be adjusted for the device-specific triggers.
2987+
2988+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2989+ Reviewed-by: Adam Jackson <ajax@redhat.com>
2990+ Reviewed-by: Keith Packard <keithp@keithp.com>
2991+
2992+commit 2efe49c1029f959fe80879bcf50df42e8b80451d
2993+Author: Peter Hutterer <peter.hutterer@who-t.net>
2994+Date: Wed Oct 16 13:01:01 2013 +1000
2995+
2996+ sync: always call BracketValues when recalculating upper/lower brackets
2997+
2998+ Both ServertimeBracketValues and IdleTimeBracketValues copy the value into
2999+ there SysCounter privates. Call it for a NULL set as well, so we don't end up
3000+ with stale pointers and we can remove the block/wakeup handlers.
3001+
3002+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
3003+ Reviewed-by: Adam Jackson <ajax@redhat.com>
3004+ Reviewed-by: Keith Packard <keithp@keithp.com>
3005+
3006+commit 5c7cfd4c6978834551848e1be62af240102e39b5
3007+Author: Peter Hutterer <peter.hutterer@who-t.net>
3008+Date: Tue Oct 15 10:11:20 2013 +1000
3009+
3010+ sync: compress two if statements
3011+
3012+ No functional changes, just merges a > and == condition into a >= condition.
3013+
3014+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
3015+ Reviewed-by: Adam Jackson <ajax@redhat.com>
3016+ Reviewed-by: Keith Packard <keithp@keithp.com>
3017+
3018+commit 73b2660d7273d175d279d22f8ca0c3932a14ff1c
3019+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
3020+Date: Mon Sep 16 21:47:16 2013 -0700
3021+
3022+ Avoid use-after-free in dix/dixfonts.c: doImageText() [CVE-2013-4396]
3023+
3024+ Save a pointer to the passed in closure structure before copying it
3025+ and overwriting the *c pointer to point to our copy instead of the
3026+ original. If we hit an error, once we free(c), reset c to point to
3027+ the original structure before jumping to the cleanup code that
3028+ references *c.
3029+
3030+ Since one of the errors being checked for is whether the server was
3031+ able to malloc(c->nChars * itemSize), the client can potentially pass
3032+ a number of characters chosen to cause the malloc to fail and the
3033+ error path to be taken, resulting in the read from freed memory.
3034+
3035+ Since the memory is accessed almost immediately afterwards, and the
3036+ X server is mostly single threaded, the odds of the free memory having
3037+ invalid contents are low with most malloc implementations when not using
3038+ memory debugging features, but some allocators will definitely overwrite
3039+ the memory there, leading to a likely crash.
3040+
3041+ Reported-by: Pedro Ribeiro <pedrib@gmail.com>
3042+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
3043+ Reviewed-by: Julien Cristau <jcristau@debian.org>
3044+
3045+commit 8afe20d4e34adcfd29bdf43a01d55335ea2c5dba
3046+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
3047+Date: Mon Sep 16 21:45:29 2013 -0700
3048+
3049+ Update GLX dependencies now that DRI & DRI2 are builtins, not modules
3050+
3051+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
3052+
3053+commit 2704bdb24a2c7bac65b90e05f1a68438b34ecf58
3054+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
3055+Date: Tue Sep 3 22:53:28 2013 -0700
3056+
3057+ DMX glxproxy: Don't allocate & copy data just to free it unused
3058+
3059+ Two functions in the DMX glxproxy code loop over all the backend
3060+ screens, starting at the highest numbered and counting down to
3061+ the lowest.
3062+
3063+ Previously, for each screen, the code would allocate a buffer
3064+ large enough to read the reply from the backend, copy that reply
3065+ into the buffer, and then if it wasn't the final screen, free it.
3066+ Only the buffer from the final screen is used, to pass on to the
3067+ client in the reply.
3068+
3069+ This modifies it to just immediately discard the responses from
3070+ the screens as we loop through it, only doing the allocate & copy
3071+ work for the one buffer we pass back to the client.
3072+
3073+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
3074+ Reviewed-by: Alex Deucher <aleander.deucher@amd.com>
3075+
3076+commit 6c06c268adbab63ebe7490489aa030724cbdc54b
3077+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
3078+Date: Sun Aug 18 18:02:49 2013 -0700
3079+
3080+ Skip damage calls if DamageCreate fails in exa functions
3081+
3082+ Fixes parfait errors such as:
3083+ Null pointer dereference (CWE 476): Write to null pointer pDamage
3084+ at line 1833 of miext/damage/damage.c in function 'DamageRegister'.
3085+ Function DamageCreate may return constant 'NULL' at line 1775,
3086+ called at line 232 of exa/exa_migration_mixed.c
3087+ in function 'exaPrepareAccessReg_mixed'.
3088+ Constant 'NULL' passed into function DamageRegister,
3089+ argument pDamage, from call at line 237.
3090+ Null pointer introduced at line 1775 of miext/damage/damage.c
3091+ in function 'DamageCreate'.
3092+ Null pointer dereference (CWE 476): Write to null pointer pDamage
3093+ at line 1833 of miext/damage/damage.c in function 'DamageRegister'.
3094+ Function DamageCreate may return constant 'NULL' at line 1775,
3095+ called at line 104 of exa/exa_mixed.c
3096+ in function 'exaCreatePixmap_mixed'.
3097+ Constant 'NULL' passed into function DamageRegister,
3098+ argument pDamage, from call at line 109.
3099+ Null pointer introduced at line 1775 of miext/damage/damage.c
3100+ in function 'DamageCreate'.
3101+
3102+ Checks are similar to handling results of other calls to DamageCreate.
3103+
3104+ [ This bug was found by the Parfait 1.3.0 bug checking tool.
3105+ http://labs.oracle.com/pls/apex/f?p=labs:49:::::P49_PROJECT_ID:13 ]
3106+
3107+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
3108+
3109+commit 7cf1b595c8c8f9776a39559d2878cf90af3f2859
3110+Author: Peter Hutterer <peter.hutterer@who-t.net>
3111+Date: Wed Sep 4 15:34:29 2013 +1000
3112+
3113+ dix: only deliver for the current grab type
3114+
3115+ Use the grabtype to determine which type of event to send - all other events
3116+ are pointless and may result in erroneous events being delivered.
3117+
3118+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
3119+
3120+commit 78944d62ffc7fec6f75b6f514ab7a139ba9bc77b
3121+Author: Peter Hutterer <peter.hutterer@who-t.net>
3122+Date: Wed Sep 4 15:34:28 2013 +1000
3123+
3124+ dix: don't attempt to deliver an event for a different grabtype
3125+
3126+ For an active grab, grab->eventMask can be either the core or the XI1 mask.
3127+ With the overlap of event filters, calling DeliverOneGrabbedEvent(XI1) for a
3128+ ProximityOut event will trigger if the client has selected for enter events -
3129+ the filter is the same for both.
3130+
3131+ Thus, we end up delivering a proximity event to a client not expecting one.
3132+
3133+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
3134+
3135+commit 6159811a1aaf848016dbfa7bde68df097027870c
3136+Author: Peter Hutterer <peter.hutterer@who-t.net>
3137+Date: Wed Sep 4 15:34:27 2013 +1000
3138+
3139+ include: change grabtypes to start at 1
3140+
3141+ Avoid erroneous detection of an unset grabtype as CORE
3142+
3143+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
3144+
3145+commit be6ea80b79b3d6eb97106ea142e01acbdf059995
3146+Author: Peter Hutterer <peter.hutterer@who-t.net>
3147+Date: Wed Sep 4 15:34:26 2013 +1000
3148+
3149+ dix: only allow button and key events to freeze a sync'd pointer
3150+
3151+ If a client calls XAllowEvents(SyncPointer) it expects events as normal until
3152+ the next button press or release event - that freezes the device. An e.g.
3153+ proximity event must thus not freeze the pointer.
3154+
3155+ As per the spec, only button and key events may do so, so narrow it to these
3156+ cases.
3157+
3158+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
3159+
3160+commit 93a27b2dd0d7ed51120f42456a91a7c59902ebc2
3161+Author: Michele Baldessari <michele@acksyn.org>
3162+Date: Sun Sep 15 19:30:38 2013 +0100
3163+
3164+ Xephyr: restore cursor visibility
3165+
3166+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=69388
3167+
3168+ Commit c100211034ab69ce453a1644fb61c6808d7e3eda (dix: only show the cursor
3169+ if a window defines one (#58398)) broke the default cursor behaviour in
3170+ Xephyr (unless run with -retro). Restore the default cursor visibility
3171+ so that '-retro' or '-host-cursor' are not needed to have a visible
3172+ cursor.
3173+
3174+ Signed-off-by: Michele Baldessari <michele@acksyn.org>
3175+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3176+
3177+ as of ba387cf21f7d95987211f75d8024601e7d64e322 "ephyr: Use host (HW) cursors
3178+ by default." this only applies if -sw-cursor is given on the cmdline.
3179+
3180+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
3181+
3182+commit 70efc799cbeec26f19831b3b14c0d4646198a077
3183+Author: Michele Baldessari <michele@acksyn.org>
3184+Date: Sun Sep 15 19:56:34 2013 +0100
3185+
3186+ Fix Xephyr compilation when DEBUG is enabled
3187+
3188+ When DEBUG is enabled Xephyr compilation fails:
3189+ ephyrdriext.c:343:133: error: 'is_ok' undeclared (first use in this
3190+ function)
3191+ EPHYR_LOG("leave. is_ok:%d\n", is_ok);
3192+
3193+ Just reemove bogus is_ok variable.
3194+
3195+ Signed-off-by: Michele Baldessari <michele@acksyn.org>
3196+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3197+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
3198+
3199+commit 5ac4bfca64bd75474e550b26bc1195a5ca245752
3200+Author: Adam Jackson <ajax@redhat.com>
3201+Date: Tue Sep 10 14:18:18 2013 -0400
3202+
3203+ input: calloc minimization for xi2mask_new
3204+
3205+ There's no reason to do this as (nmasks + 2) callocs, and it's a
3206+ surprisingly hot path. Turns out you hit this ~once per passive grab,
3207+ and you do a few bajillion passive grab changes every time you enter or
3208+ leave the overview in gnome-shell. According to a callgrind of Xorg
3209+ with gnome-shell-perf-tool run against it:
3210+
3211+ Ir before: 721437275
3212+ Ir after: 454227086
3213+
3214+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3215+ Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
3216+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
3217+
3218+commit 44d502c6f1d03a9e548f0941cde0228b6fde8394
3219+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
3220+Date: Sun Oct 6 16:45:52 2013 +0100
3221+
3222+ hw/xwin: Fix for "glx: Remove screen number from __GLXconfig"
3223+
3224+ Fix compilation after commit c3c976f54c3c282d6fa6c8360688e036bc43d210 "glx:
3225+ Remove screen number from __GLXconfig"
3226+
3227+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
3228+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
3229+ Reviewed-by: Adam Jackson <ajax@redhat.com>
3230+
3231+commit 6a9bd103cb993e873cb82664b677ceed73c0bd85
3232+Merge: ea3b7db 8aae28e
3233+Author: Keith Packard <keithp@keithp.com>
3234+Date: Mon Oct 7 17:29:38 2013 -0700
3235+
3236+ Merge remote-tracking branch 'jeremyhu/master'
3237+
3238+commit ea3b7db4b747f883ef7b8b524ee13bf8a63add14
3239+Author: Emil Velikov <emil.l.velikov@gmail.com>
3240+Date: Mon Oct 7 18:29:25 2013 +0100
3241+
3242+ configure.ac: Include missing proto declarations in SDK_REQUIRED_MODULES
3243+
3244+ Commits a1d41e311c21e, 7d859bd87834d & 3ed2c6e11298c made extinit.h require
3245+ the XF86 Big Font, XRes & ScrnSaver proto headers, but failed to add them
3246+ to the SDK_REQUIRED_MODULES so pkg-config would find them for driver builds.
3247+
3248+ Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
3249+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
3250+ Signed-off-by: Keith Packard <keithp@keithp.com>
3251+
3252+commit 8aae28e3cbdd49bfa8d940a4a517c94a53b94f86
3253+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
3254+Date: Sun Oct 6 09:20:45 2013 -0700
3255+
3256+ XQuartz: Dont't set screen on __GLXConfig
3257+
3258+ Fixes regression introduced by c3c976f54c3c282d6fa6c8360688e036bc43d210
3259+
3260+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
3261+
3262+commit c5f8eb968efa970201712105a1ac880b517e7b6d
3263+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
3264+Date: Sun Oct 6 09:18:15 2013 -0700
3265+
3266+ rootless: Use miCopyRegion instead of fbCopyRegion
3267+
3268+ Fixes regression introduced by e657635dbe6b92875b0e88370557c2cbab673a49
3269+
3270+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
3271+
3272+commit ccbe17b1c6da1ad9d085fc8133cdd15dc7004a4a
3273+Author: Pino Toscano <toscano.pino@tiscali.it>
3274+Date: Wed Aug 28 17:15:03 2013 +0200
3275+
3276+ os: move <arpa/inet.h> for any !win32 system
3277+
3278+ It is needed in IPv6 configurations (for inet_pton) also when
3279+ SIOCGIFCONF is not defined.
3280+
3281+ Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
3282+ Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
3283+ Signed-off-by: Julien Cristau <jcristau@debian.org>
3284+
3285+commit c079b8e675dd2762c9e07fe5d8c07612299dceb7
3286+Author: Pino Toscano <toscano.pino@tiscali.it>
3287+Date: Wed Aug 28 17:04:48 2013 +0200
3288+
3289+ xfree86/hurd: include <hurd.h>
3290+
3291+ Needed for using get_privileged_port.
3292+
3293+ Signed-off-by: Pino Toscano <toscano.pino@tiscali.it>
3294+ Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
3295+ Signed-off-by: Julien Cristau <jcristau@debian.org>
3296+
3297+commit f0659a7f68a5a334879af01a6a63742eab1bf5de
3298+Author: Keith Packard <keithp@keithp.com>
3299+Date: Fri Oct 4 16:44:46 2013 -0700
3300+
3301+ Bump version to 1.14.99.2
3302+
3303+ Signed-off-by: Keith Packard <keithp@keithp.com>
3304+
3305+commit f2d149b6d10edea7233d93c7e19f71decf11dc62
3306+Author: Keith Packard <keithp@keithp.com>
3307+Date: Fri Oct 4 16:43:41 2013 -0700
3308+
3309+ kdrive/ephyr: Remove duplicate ephyrExtensions and ephyrExtensionInit decls
3310+
3311+ These were duplicated when GLX support was re-added on two different branches.
3312+
3313+ Signed-off-by: Keith Packard <keithp@keithp.com>
3314+
3315+commit e0a678f0596f3547b98d74d5f0438b484b059458
3316+Author: Gaetan Nadon <memsize@videotron.ca>
3317+Date: Sat Sep 28 15:26:38 2013 -0400
3318+
3319+ xfree86: add a comment as to why the logdir is created
3320+
3321+ Without the logdir, the xserver will write the content of the log file on the
3322+ terminal stating that it cannot be written and will stop.
3323+
3324+ Refer to https://bugs.freedesktop.org/show_bug.cgi?id=3889
3325+
3326+ Reviewed-By: Matt Dew <marcoz@osource.org>
3327+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
3328+ Signed-off-by: Keith Packard <keithp@keithp.com>
3329+
3330+commit 5bdbf2dba3f7da4a593b286020eab0c7857e940c
3331+Author: Gaetan Nadon <memsize@videotron.ca>
3332+Date: Sat Sep 28 15:26:37 2013 -0400
3333+
3334+ xfree86: Use $(MKDIR_P) for better code portability
3335+
3336+ Still true that we should not use the lower case $(mkdir_p) version.
3337+ However, remove the 2005 comment as the MKDIR_P is widely used now.
3338+
3339+ Reviewed-By: Matt Dew <marcoz@osource.org>
3340+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
3341+ Signed-off-by: Keith Packard <keithp@keithp.com>
3342+
3343+commit b8cfb0dc8426754b477b561bc158b8a24c143ddf
3344+Author: Gaetan Nadon <memsize@videotron.ca>
3345+Date: Sat Sep 28 15:26:36 2013 -0400
3346+
3347+ Uninstall X link and CYGWIN libXorg.exe.a in local install targets
3348+
3349+ It is our duty to uninstall any files and/or directories that we installed
3350+ through install-data-local and install-exec-hook.
3351+
3352+ Currently the X symbolic link to Xorg remains on disk after running
3353+ make uninstall.
3354+
3355+ Note the exception for logdir which is usually shared by other modules.
3356+
3357+ Reviewed-By: Matt Dew <marcoz@osource.org>
3358+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
3359+ Signed-off-by: Keith Packard <keithp@keithp.com>
3360+
3361+commit 35a528e49269c3df75486cc606e51a8c1c083c06
3362+Author: Gaetan Nadon <memsize@videotron.ca>
3363+Date: Sat Sep 28 15:26:35 2013 -0400
3364+
3365+ Xorg binary: use install-exec-hook rather than install-exec-local
3366+
3367+ The former was explicitly designed to execute additional code after the binary
3368+ has been installed. The latter can be executed in any order, hence it's
3369+ current dependency on install-binPROGRAMS as a workaround.
3370+
3371+ The CYGWIN libXorg.exe.a target is an installation target rather than
3372+ a post-installation one, so it should not be done as a hook. It does not depend
3373+ on the Xorg executable being installed.
3374+
3375+ Automake:
3376+ "These hooks are run after all other install rules of the appropriate type,
3377+ exec or data, have completed. So, for instance, it is possible to perform
3378+ post-installation modifications using an install hook".
3379+
3380+ "With the -local targets, there is no particular guarantee of execution order;
3381+ typically, they are run early, but with parallel make, there is no way
3382+ to be sure of that".
3383+
3384+ Reviewed-by: Eric Anholt <eric@anholt.net>
3385+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
3386+ Signed-off-by: Keith Packard <keithp@keithp.com>
3387+
3388+commit a1d87576a30008253eb0cc92b44c9718f6665062
3389+Author: Gaetan Nadon <memsize@videotron.ca>
3390+Date: Sat Sep 28 15:26:34 2013 -0400
3391+
3392+ Use $(LN_S) provided by AC_PROG_LN_S macro to create links
3393+
3394+ For better code portability.
3395+
3396+ Reviewed-By: Matt Dew <marcoz@osource.org>
3397+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
3398+ Signed-off-by: Keith Packard <keithp@keithp.com>
3399+
3400+commit 28c8e1910797970dbf1d40794f1804a8fcc812bc
3401+Author: Gaetan Nadon <memsize@videotron.ca>
3402+Date: Sat Sep 28 15:26:33 2013 -0400
3403+
3404+ The Xorg binary is missing the extension $(EXEEXT) in the makefile
3405+
3406+ This is not a problem on UNIX platforms, but on CYGWIN it creates a broken
3407+ link to Xorg rather than a link to Xorg.exe.
3408+
3409+ From the CYGWIN log on tinderbox, we can see that the executable Xorg.exe is
3410+ installed correctly. We can see the command used to create the link:
3411+
3412+ (cd /jhbuild/install/[...]/install/bin && rm -f X && ln -s Xorg X)
3413+
3414+ Note that the "relink" makefile target correctly appends $(EXEEXT) to Xorg.
3415+
3416+ Reviewed-By: Matt Dew <marcoz@osource.org>
3417+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
3418+ Signed-off-by: Keith Packard <keithp@keithp.com>
3419+
3420+commit f3b529bf25db2700addbafc7aa4fc5b126ba9929
3421+Merge: 4399bd3 abc2bfc
3422+Author: Keith Packard <keithp@keithp.com>
3423+Date: Fri Oct 4 14:04:48 2013 -0700
3424+
3425+ Merge remote-tracking branch 'anholt/ephyr-fixes'
3426+
3427+commit 4399bd38326b81f7b92365346504d7c6354772a9
3428+Author: Gaetan Nadon <memsize@videotron.ca>
3429+Date: Mon Sep 30 13:30:46 2013 -0400
3430+
3431+ miext/shadow: missing c2p_core.h breaks "make distcheck" target.
3432+
3433+ Reviewed-by: Julien Cristau <jcristau@debian.org>
3434+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
3435+ Signed-off-by: Keith Packard <keithp@keithp.com>
3436+
3437+commit 9ccb4a63982942fdce19609d2cadbd8e51708462
3438+Merge: 5d2ec69 da5e201
3439+Author: Keith Packard <keithp@keithp.com>
3440+Date: Fri Oct 4 13:54:55 2013 -0700
3441+
3442+ Merge remote-tracking branch 'whot/for-keith'
3443+
3444+commit 5d2ec6933f6bb5116666ca1bfb07f0f20bf2a0b5
3445+Merge: 7d3d4ae 6ee4d9f
3446+Author: Keith Packard <keithp@keithp.com>
3447+Date: Fri Oct 4 13:50:04 2013 -0700
3448+
3449+ Merge remote-tracking branch 'ajax/xserver-next'
3450+
3451+commit da5e20127a5b6e11a47eb6e61f3ea87b056cdf5f
3452+Author: Gaetan Nadon <memsize@videotron.ca>
3453+Date: Thu Sep 19 19:13:35 2013 -0400
3454+
3455+ test: add new os executable to .gitignore
3456+
3457+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
3458+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3459+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
3460+
3461+commit c73c36b537f996574628e69681833ea37dec2b6e
3462+Author: Laércio de Sousa <lbsousajr@gmail.com>
3463+Date: Wed Sep 18 13:42:17 2013 -0300
3464+
3465+ xserver: enable InputClass option "GrabDevice" by default for non-seat0 seats (#69478)
3466+
3467+ This patch contributes to fill the remaining gaps which make
3468+ systemd-multi-seat-x wrapper still necessary in some multiseat setups.
3469+
3470+ This also replaces previous evdev patch that does the same thing
3471+ for that particular driver.
3472+
3473+ When option "-seat" is passed with an argument different from "seat0",
3474+ option "GrabDevice" for input devices is enabled by default
3475+ (no need of enabling it in xorg.conf's "InputClass" section).
3476+
3477+ Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=69478
3478+
3479+ Signed-off-by: Laércio de Sousa <lbsousajr@gmail.com>
3480+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3481+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
3482+
3483+commit 160c2db32d0b9ee5316a44179a6af4f4722e3d0a
3484+Author: Peter Hutterer <peter.hutterer@who-t.net>
3485+Date: Wed Sep 18 16:04:44 2013 +1000
3486+
3487+ dmx: provide enough space for axis mappings
3488+
3489+ relmap/absmap is used as a evdev-axis-to-x-axis mapping. ABS_X maps to
3490+ axis 0, ABS_Y to 1, etc. skipping over non-existing axes so that the third bit
3491+ set in the ABS_* range is axis 2, and so on. This requires us to actually have
3492+ enough space to have all the ABS_*/REL_* range.
3493+
3494+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
3495+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
3496+
3497+commit 7d3d4ae55dd6ee338439e2424ac423b1df80501b
3498+Author: Keith Packard <keithp@keithp.com>
3499+Date: Fri Sep 20 14:43:41 2013 -0500
3500+
3501+ damage: Must translate initial window damage by window offset
3502+
3503+ Damage is reported relative to the drawable origin, but the window
3504+ borderClip is absolute. Translate the region by the window position
3505+ before reporting damage to adjust.
3506+
3507+ Reported-by: Adam Jackson <ajax@redhat.com>
3508+ Signed-off-by: Keith Packard <keithp@keithp.com>
3509+ Reviewed-by: Adam Jackson <ajax@redhat.com>
3510+
3511+commit 8010d3a48bd0b224dcb0883e39c2351ad364d846
3512+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
3513+Date: Sun Sep 15 08:10:33 2013 -0700
3514+
3515+ XQuartz: pbproxy: Fix build with -DDEBUG
3516+
3517+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
3518+
3519+commit 39c548da0cf0522ad246630605b96751ab6d39c0
3520+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
3521+Date: Sun Sep 15 08:07:44 2013 -0700
3522+
3523+ XQuartz: Fix build with moved pseudoramiX
3524+
3525+ Regression from: e716baedc4d8e52a60f43ef21aba771b340d8c8b
3526+
3527+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
3528+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
3529+
3530+commit 6ee4d9f94ae2cc27c39381d7554134d9b4807a65
3531+Author: Adam Jackson <ajax@redhat.com>
3532+Date: Tue Jul 9 11:19:11 2013 -0400
3533+
3534+ glx: Fill in some missing attributes from DoGetFBConfigs
3535+
3536+ Reviewed-by: Eric Anholt <eric@anholt.net>
3537+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3538+
3539+commit b257fabff00ae925bb7e70364dd1d738634087c9
3540+Author: Adam Jackson <ajax@redhat.com>
3541+Date: Thu Jul 4 10:31:40 2013 -0400
3542+
3543+ glx: Remove a dead comment
3544+
3545+ Reviewed-by: Eric Anholt <eric@anholt.net>
3546+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3547+
3548+commit abd086502123086ce3d1fba25c159bb022d2750f
3549+Author: Adam Jackson <ajax@redhat.com>
3550+Date: Mon Jul 8 17:01:13 2013 -0400
3551+
3552+ glx: Catch another failure case in drawable creation
3553+
3554+ Reviewed-by: Eric Anholt <eric@anholt.net>
3555+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3556+
3557+commit c3c976f54c3c282d6fa6c8360688e036bc43d210
3558+Author: Adam Jackson <ajax@redhat.com>
3559+Date: Mon Jul 8 12:28:56 2013 -0400
3560+
3561+ glx: Remove screen number from __GLXconfig
3562+
3563+ Not used. There's no real reason to match against this instead of
3564+ matching against fbconfig or visual ID anyway.
3565+
3566+ Reviewed-by: Eric Anholt <eric@anholt.net>
3567+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3568+
3569+commit 1d1484e9bd55d1fa8316b1574754f28d5d31a076
3570+Author: Adam Jackson <ajax@redhat.com>
3571+Date: Mon Jul 8 12:09:13 2013 -0400
3572+
3573+ glx: Remove pixmapMode from __GLXconfig
3574+
3575+ This has never been filled in with anything meaningful afaict, and you
3576+ can't get to it from the client in any event.
3577+
3578+ Reviewed-by: Eric Anholt <eric@anholt.net>
3579+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3580+
3581+commit 34e6e60105796ad015469c10921c5ff09acf7eb0
3582+Author: Adam Jackson <ajax@redhat.com>
3583+Date: Tue Jul 2 12:33:36 2013 -0400
3584+
3585+ glx: Remove support for NV_vertex_program and NV_fragment_program
3586+
3587+ Mesa doesn't implement these anymore, never really did outside of swrast
3588+ anyway.
3589+
3590+ Reviewed-by: Eric Anholt <eric@anholt.net>
3591+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3592+
3593+commit acf14c1de766c4ea206cd7ce7f25b780a589d33c
3594+Author: Adam Jackson <ajax@redhat.com>
3595+Date: Tue Jul 2 10:35:19 2013 -0400
3596+
3597+ glx: realloc style fix in RenderLarge
3598+
3599+ Reviewed-by: Eric Anholt <eric@anholt.net>
3600+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3601+
3602+commit 9ebf739a6864c9ec38bf72f63ef2e3b9cd1951db
3603+Author: Adam Jackson <ajax@redhat.com>
3604+Date: Tue Jul 2 10:30:40 2013 -0400
3605+
3606+ glx: Eliminate a small malloc from QueryContext
3607+
3608+ No reason to have that be a failure path.
3609+
3610+ Reviewed-by: Eric Anholt <eric@anholt.net>
3611+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3612+
3613+commit b99f7975407f111b99d772cd28224d7dc1b34fe4
3614+Author: Adam Jackson <ajax@redhat.com>
3615+Date: Fri Nov 9 18:05:27 2012 -0500
3616+
3617+ glx: Handle failure to create the pixmap backing the pbuffer
3618+
3619+ We happen not to sanitize the width/height we pass to CreatePixmap here,
3620+ oops. It's not exploitable, but it's certainly a crash, so let's just
3621+ throw BadAlloc instead.
3622+
3623+ Reviewed-by: Eric Anholt <eric@anholt.net>
3624+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3625+
3626+commit 22fbfdcb31f335c22053a0e29f0e73c03cd70a76
3627+Author: Adam Jackson <ajax@redhat.com>
3628+Date: Fri Nov 9 17:52:12 2012 -0500
3629+
3630+ glx: Implement GLX_PRESERVED_CONTENTS drawable attribute
3631+
3632+ We back pixmaps with pbuffers so they're never actually clobbered. Say
3633+ so when asked.
3634+
3635+ Reviewed-by: Eric Anholt <eric@anholt.net>
3636+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3637+
3638+commit 2e20b8382cdf37ae5a2802f85b8f06a370f9645d
3639+Author: Adam Jackson <ajax@redhat.com>
3640+Date: Fri Nov 9 17:12:49 2012 -0500
3641+
3642+ glx: Implement GLX_FBCONFIG_ID in GetDrawableAttributes
3643+
3644+ Required by GLX 1.4, section 3.3.6, "Querying Attributes".
3645+
3646+ Reviewed-by: Eric Anholt <eric@anholt.net>
3647+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3648+
3649+commit 0d76191baeee005982754ac18ca995742e32d8c1
3650+Author: Adam Jackson <ajax@redhat.com>
3651+Date: Fri Nov 9 17:10:57 2012 -0500
3652+
3653+ glx: Implement GLX_{WIDTH,HEIGHT} in GetDrawableAttributes
3654+
3655+ Required by GLX 1.4, section 3.3.6, "Querying Attributes".
3656+
3657+ Reviewed-by: Eric Anholt <eric@anholt.net>
3658+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3659+
3660+commit d11f13e383dda1e9cabe32793d261d46edc44418
3661+Author: Adam Jackson <ajax@redhat.com>
3662+Date: Fri Nov 9 17:07:20 2012 -0500
3663+
3664+ glx: Compute number of attributes in GetDrawableAttributes on the fly
3665+
3666+ This doesn't have any effect yet, but is needed to properly build the
3667+ reply for pbuffers.
3668+
3669+ Reviewed-by: Eric Anholt <eric@anholt.net>
3670+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3671+
3672+commit 468b57324f838144d79e3a9d85a0bde853578c4b
3673+Author: Adam Jackson <ajax@redhat.com>
3674+Date: Fri Nov 9 16:48:16 2012 -0500
3675+
3676+ glx: Style fixes
3677+
3678+ Reviewed-by: Eric Anholt <eric@anholt.net>
3679+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3680+
3681+commit 2b181ad0952851f47f23dcb1a36471685313c13e
3682+Author: Adam Jackson <ajax@redhat.com>
3683+Date: Fri Nov 9 16:33:54 2012 -0500
3684+
3685+ glx: Pull GLX vendor string out of __GLXscreen
3686+
3687+ Given how we're currently implementing GLX this can't meaningfully vary
3688+ per-screen.
3689+
3690+ Reviewed-by: Eric Anholt <eric@anholt.net>
3691+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3692+
3693+commit b9c489cf13e1ad35b7d9bea9de8d85e929374d17
3694+Author: Adam Jackson <ajax@redhat.com>
3695+Date: Wed Oct 31 10:05:24 2012 -0400
3696+
3697+ glx: Remove unused bits from the context struct
3698+
3699+ Reviewed-by: Eric Anholt <eric@anholt.net>
3700+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3701+
3702+commit f579cc85c29f52b575c62e6ae1e16eb87c506bd3
3703+Author: Adam Jackson <ajax@redhat.com>
3704+Date: Thu Jul 4 10:08:40 2013 -0400
3705+
3706+ glxproxy: Don't track GLCLientm{aj,in}orVersion
3707+
3708+ Basically just a port of 62f06b0d to glxproxy.
3709+
3710+ Reviewed-by: Eric Anholt <eric@anholt.net>
3711+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3712+
3713+commit e549ffb5f19cf044bc3e2d368a6f081f8b84bfaa
3714+Author: Adam Jackson <ajax@redhat.com>
3715+Date: Tue Oct 30 18:20:43 2012 -0400
3716+
3717+ dmx/glx: Remove unused __glXNop
3718+
3719+ Reviewed-by: Eric Anholt <eric@anholt.net>
3720+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3721+
3722+commit d962b8ed272d4a8921c0dadf16cd926484e30d10
3723+Author: Adam Jackson <ajax@redhat.com>
3724+Date: Thu Aug 22 16:42:23 2013 -0400
3725+
3726+ damageext: Style fix
3727+
3728+ Reviewed-by: Eric Anholt <eric@anholt.net>
3729+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3730+
3731+commit c90add0f1ce0c85aea7a60635de765848d778266
3732+Author: Adam Jackson <ajax@redhat.com>
3733+Date: Wed Aug 21 11:57:24 2013 -0400
3734+
3735+ damage: Remove "post-rendering" hooks
3736+
3737+ This is a revert of 974db58f5b730c3770ee461665a02dd4334d1dea. There are
3738+ no consumers of this API, we must not need it.
3739+
3740+ Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
3741+ Reviewed-by: Eric Anholt <eric@anholt.net>
3742+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3743+
3744+commit 0f3f8e4295d4c05f33b93e0ffd2f6f8cd5759bf7
3745+Author: Adam Jackson <ajax@redhat.com>
3746+Date: Wed Aug 21 11:13:11 2013 -0400
3747+
3748+ damage: Don't rewrite Text ops to GlyphBlt ops
3749+
3750+ There's no particularly good reason to, and it breaks Xnest.
3751+
3752+ Bugzilla: http://bugs.freedesktop.org/2454
3753+ Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
3754+ Reviewed-by: Eric Anholt <eric@anholt.net>
3755+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3756+
3757+commit d08966227e7d567df8d26eebc80f35f886e59a4a
3758+Author: Adam Jackson <ajax@redhat.com>
3759+Date: Mon Aug 26 14:03:51 2013 -0400
3760+
3761+ damage: Simplify DamageUnregister
3762+
3763+ You can only register one drawable on a given damage, so there's no
3764+ reason to require the caller to specify the drawable, the damage is
3765+ enough. The implementation would do something fairly horrible if you
3766+ _did_ pass mismatched drawable and damage, so let's avoid the problem
3767+ entirely.
3768+
3769+ v2: Simplify xf86RotateDestroy even more [anholt]
3770+
3771+ Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
3772+ Reviewed-by: Eric Anholt <eric@anholt.net>
3773+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3774+
3775+commit 28708a045de7d9043d20fb06b61c44a46eb5526b
3776+Author: Adam Jackson <ajax@redhat.com>
3777+Date: Mon Aug 26 13:52:14 2013 -0400
3778+
3779+ damage: Implicitly unregister on destroy
3780+
3781+ There's no reason not to, and it simplifies quite a few callers.
3782+
3783+ Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
3784+ Reviewed-by: Eric Anholt <eric@anholt.net>
3785+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3786+
3787+commit e657635dbe6b92875b0e88370557c2cbab673a49
3788+Author: Adam Jackson <ajax@redhat.com>
3789+Date: Thu Oct 18 14:24:23 2012 -0400
3790+
3791+ fb: Remove unused compatibility wrappers
3792+
3793+ Originally added in early 2009, not being used elsewhere anymore.
3794+
3795+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3796+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3797+
3798+commit e4b15125bb06c97f1f34f7074fcdb597e718399c
3799+Author: Adam Jackson <ajax@redhat.com>
3800+Date: Thu Oct 18 14:24:22 2012 -0400
3801+
3802+ mipointer: Remove deprecated miPointerCurrentScreen
3803+
3804+ The only remaining use was in some debugging code in DMX.
3805+
3806+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3807+ Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
3808+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3809+
3810+commit b5d66b9513a0f1e13f5c5bc9e0958f4eac9bf6c3
3811+Author: Adam Jackson <ajax@redhat.com>
3812+Date: Thu Oct 18 14:24:21 2012 -0400
3813+
3814+ xfree86: Remove deprecated unimplemented xf86MapReadSideEffects
3815+
3816+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3817+ Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
3818+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3819+
3820+commit abbd85742a390e18497b96902a0c0d976739e3bd
3821+Author: Adam Jackson <ajax@redhat.com>
3822+Date: Thu Oct 18 14:24:20 2012 -0400
3823+
3824+ dix: FIXES is not optional
3825+
3826+ It's already not optional at configure time, this just makes it so at
3827+ build time too.
3828+
3829+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3830+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3831+
3832+commit dff81687f5eac3eac9b49f58d4654cc30add2547
3833+Author: Adam Jackson <ajax@redhat.com>
3834+Date: Thu Oct 18 14:24:19 2012 -0400
3835+
3836+ vbe: Don't try to load the ddc submodule
3837+
3838+ DDC is built into the server now.
3839+
3840+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3841+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3842+
3843+commit bb82191bcfa8042f8d98ec8b1c6616dc31d2c5c8
3844+Author: Adam Jackson <ajax@redhat.com>
3845+Date: Thu Oct 18 14:24:18 2012 -0400
3846+
3847+ misprite: Delete some dead private storage
3848+
3849+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3850+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3851+
3852+commit 3639ab4ce25dc82a3f8592b7322198f1d2aca5f9
3853+Author: Adam Jackson <ajax@redhat.com>
3854+Date: Tue Oct 16 14:56:25 2012 -0400
3855+
3856+ dri2: Don't bother with xf86LoaderCheckSymbol("DRI2Connect")
3857+
3858+ The DRI2 code is now built-in to the server, even for Xorg. The only
3859+ thing this could protect against is trying to run a libglx built with
3860+ DRI2 support against an Xorg built without it, which is firmly in
3861+ "doctor it hurts when I do this" territory.
3862+
3863+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3864+ Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
3865+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3866+
3867+commit 13b507409f9e01adebba50e7eb801b52e52692ba
3868+Author: Adam Jackson <ajax@redhat.com>
3869+Date: Tue Oct 16 14:56:23 2012 -0400
3870+
3871+ list: Avoid using X types
3872+
3873+ In particular, Bool. This is not an ABI break:
3874+
3875+ /usr/include/X11/Xdefs.h:typedef int Bool;
3876+
3877+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3878+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3879+
3880+commit dbe10ef0e35659ee0e5db73f29670a3894a3e3f5
3881+Author: Adam Jackson <ajax@redhat.com>
3882+Date: Tue Oct 16 14:56:22 2012 -0400
3883+
3884+ dbe: Fold the window private private into the window private
3885+
3886+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3887+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3888+
3889+commit 1489637d567b0034a916f88079b5f360e7fce99c
3890+Author: Adam Jackson <ajax@redhat.com>
3891+Date: Tue Oct 16 14:56:21 2012 -0400
3892+
3893+ dbe: Fold midbe reset into dix
3894+
3895+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3896+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3897+
3898+commit 44d770750069486a8452fb2384f9b85745268e61
3899+Author: Adam Jackson <ajax@redhat.com>
3900+Date: Tue Oct 16 14:56:20 2012 -0400
3901+
3902+ dbe: Drop the unused idiom support
3903+
3904+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3905+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3906+
3907+commit 8cce0cf4d378f6fa52bc2cd277737b8986ab683c
3908+Author: Adam Jackson <ajax@redhat.com>
3909+Date: Tue Oct 16 14:56:19 2012 -0400
3910+
3911+ damage: Remove the 'damage window' resource type.
3912+
3913+ Note that the existing code never actually creates a resource of this
3914+ type, so it can't possibly do anything. This is clearly meant to track
3915+ window destruction and clean up any associated Damages, but that's
3916+ already handled by miext/damage's DestroyWindow wrapper.
3917+
3918+ Previous discussion:
3919+ http://lists.freedesktop.org/archives/xorg-devel/2011-March/020847.html
3920+
3921+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3922+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3923+
3924+commit e674815e0a217ac01ec2d6a8517f8466b27fb39f
3925+Author: Adam Jackson <ajax@redhat.com>
3926+Date: Tue Oct 16 14:56:18 2012 -0400
3927+
3928+ dmx: Remove ShadowFB support
3929+
3930+ This has been listed as deprecated ever since DMX was merged.
3931+
3932+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3933+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3934+
3935+commit 19d3a7cb5db3188210830efa746987ba50d839e9
3936+Author: Adam Jackson <ajax@redhat.com>
3937+Date: Tue Oct 16 14:56:17 2012 -0400
3938+
3939+ dix: Remove a dead parameter from DoGetImage
3940+
3941+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3942+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3943+
3944+commit 4dca026880da90cff9734cf5787c5b57c02e7310
3945+Author: Adam Jackson <ajax@redhat.com>
3946+Date: Tue Oct 16 14:56:16 2012 -0400
3947+
3948+ mipointer: Remove EnqueueEvent from miPointerScreenFuncRec
3949+
3950+ No DDX overrode this, and we never actually called through that slot
3951+ anyway.
3952+
3953+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3954+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3955+
3956+commit ad076dc6e82019defa422500710b3b42c6309e39
3957+Author: Adam Jackson <ajax@redhat.com>
3958+Date: Tue Oct 16 14:56:15 2012 -0400
3959+
3960+ mipointer: Flatten calls to mieqSwitchScreen
3961+
3962+ No DDX was overriding this.
3963+
3964+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3965+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3966+
3967+commit e2b14a1d3bb27e86ff1d7aaf59af850d06263ef5
3968+Author: Adam Jackson <ajax@redhat.com>
3969+Date: Tue Oct 16 14:56:14 2012 -0400
3970+
3971+ os: Factor out some common code in input buffer handling
3972+
3973+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
3974+ Signed-off-by: Adam Jackson <ajax@redhat.com>
3975+
3976+commit 65fca558848acd907483d3c85c7cd4db5560f1b4
3977+Author: Radek Doulik <rodo@novell.com>
3978+Date: Tue Aug 13 08:45:47 2013 +0200
3979+
3980+ xnest: Ignore GetImage() error in xnestGetImage()
3981+
3982+ When an Xnest instance is not viewable it will crash when a client in
3983+ that instance calls GetImage. This is because the Xnest server will
3984+ itself receives a BadMatch error.
3985+ This patch ignores the error. The application which has requested the
3986+ image will receive garbage - this however is fully legal according
3987+ to the specs as obscured areas will always contain garbage if there
3988+ isn't some sort of backing store as discussed in
3989+ https://bugs.freedesktop.org/show_bug.cgi?id=9488
3990+ The applied patch is a version from Dadek Doulik.
3991+
3992+ v2: Call XSync() before changing error handlers as suggested by
3993+ Daniel Stone <daniel@fooishbar.org>.
3994+
3995+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
3996+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
3997+
3998+commit b902c8abb6d03e68c93e13881a350523b5ac900c
3999+Author: Michal Srb <msrb@novell.com>
4000+Date: Tue Aug 6 16:56:53 2013 +0200
4001+
4002+ Xnest: Implement xnestModifyPixmapHeader
4003+
4004+ Xnest variant of ModifyPixmapHeader that creates new Pixmap in parent X
4005+ server if it's size is modified from 0x0 to anything bigger.
4006+
4007+ xnestCreatePixmap doesn't create pixmap in parent X server if it has
4008+ dimensions 0x0. If it is later resized and accessed, Xnest will be
4009+ aborted with BadDrawable error from parent X server because it will
4010+ use XID 0. This happens with ScratchPixmap, for example as used from
4011+ XaceCensorImage. Applications using XACE crash Xnest.
4012+
4013+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4014+
4015+commit 132507eba93e4dfd466d5c30c9b818cdc6f8536e
4016+Author: Peter Harris <pharris@opentext.com>
4017+Date: Mon Jul 15 19:44:45 2013 -0400
4018+
4019+ security: Don't count RetainPermanent clients twice
4020+
4021+ If a RetainPermanent client is subsequently killed by a KillClient
4022+ request, the reference count is decremented twice. This can cause the
4023+ server to prematurely kill other clients using the same Authorization.
4024+
4025+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4026+ Signed-off-by: Peter Harris <pharris@opentext.com>
4027+
4028+commit 20c2a3bcb11b5baf564e2c73a477ba23f5ae2b10
4029+Author: Peter Harris <pharris@opentext.com>
4030+Date: Mon Jul 15 19:44:29 2013 -0400
4031+
4032+ mi: Avoid stack smash when drawing dashed lines
4033+
4034+ X.org Bug 54013 <https://bugs.freedesktop.org/show_bug.cgi?id=54013>
4035+
4036+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4037+ Signed-off-by: Peter Harris <pharris@opentext.com>
4038+
4039+commit 9bf46610a9d20962854016032de4567974e87957
4040+Author: Chris Wilson <chris@chris-wilson.co.uk>
4041+Date: Fri Jun 21 22:58:31 2013 +0100
4042+
4043+ os: Immediately queue initial WriteToClient
4044+
4045+ If we immediately put the WriteToClient() buffer into the socket's write
4046+ queue, not only do we benefit from sending the response back to client
4047+ earlier, but we also avoid the overhead of copying the data into our own
4048+ staging buffer and causing extra work in the next select(). The write is
4049+ effectively free as typically we may only send one reply per client per
4050+ select() call, so the cost of the FlushClient() is the same.
4051+
4052+ shmget10: 26400 -> 110000
4053+ getimage10: 25000 -> 108000
4054+
4055+ shmget500: 3160 -> 13500
4056+ getimage500: 1000 -> 1010
4057+
4058+ The knock-on effect is that on a mostly idle composited desktop, the CPU
4059+ overhead is dominated by the memmove in WriteToClient, which is in turn
4060+ eliminated by this patch.
4061+
4062+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4063+ Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
4064+
4065+commit ceffb34774d44ada83cc1994d20c8d65b46bd555
4066+Author: Laurent Carlier <lordheavym@gmail.com>
4067+Date: Sat Jun 8 00:43:56 2013 +0200
4068+
4069+ ephyr: restore GLX support
4070+
4071+ It was removed since version 1.13
4072+
4073+ Signed-off-by: Sebastien Bacher <seb128@ubuntu.com>
4074+ Acked-by: Daniel Stone <daniel@fooishbar.org>
4075+
4076+commit f37972f4a67b49ba9649310a6778bd1bf31e0130
4077+Author: Keith Packard <keithp@keithp.com>
4078+Date: Wed Apr 24 14:58:27 2013 -0700
4079+
4080+ miext/sync: Fix multi-screen support in SyncFence initialization
4081+
4082+ miSyncSetup was checking to see if the screen private key had been
4083+ registered, and if so, skipping the setup of the provided screen.
4084+
4085+ Instead, it should register the private index only once, but then
4086+ initialize the screen unless it has already been initialized. This
4087+ latter step allows drivers to initialize the sync private structures
4088+ before the Sync extension itself is initialized.
4089+
4090+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4091+ Signed-off-by: Keith Packard <keithp@keithp.com>
4092+
4093+commit 1c8beedfe4343377fa3504f8ab71430cc137b22c
4094+Author: Adam Jackson <ajax@redhat.com>
4095+Date: Wed Aug 21 14:12:52 2013 -0400
4096+
4097+ randr: Fix a copypasta bug in CRTC confinement
4098+
4099+ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
4100+ Signed-off-by: Adam Jackson <ajax@redhat.com>
4101+
4102+commit 47ff382d1fce25a8b097d45b79489e891f1f1228
4103+Merge: 6f89ae3 3752a81
4104+Author: Keith Packard <keithp@keithp.com>
4105+Date: Mon Sep 9 15:13:42 2013 -0700
4106+
4107+ Merge remote-tracking branch 'jturney/master'
4108+
4109+commit 6f89ae3e64c4dfeea508813e546c10ba1da3ea8e
4110+Author: Thomas Klausner <wiz@NetBSD.org>
4111+Date: Wed Sep 4 20:06:07 2013 +0200
4112+
4113+ Fix typo in configure warning.
4114+
4115+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
4116+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
4117+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
4118+
4119+commit 47218a6e09549781fd61dbf5e0d3d5c81da64323
4120+Author: Thomas Klausner <wiz@NetBSD.org>
4121+Date: Wed Sep 4 20:05:51 2013 +0200
4122+
4123+ Fix bug in cursor handling.
4124+
4125+ CreateCursor (Xlib call XCreatePixmapCursor) with a non-bitmap
4126+ source pixmap and a None mask is supposed to error out with BadMatch,
4127+ but didn't.
4128+
4129+ From der Mouse <mouse@Rodents-Montreal.ORG>, changed following
4130+ comments by Alan Coopersmith <alan.coopersmith@oracle.com>.
4131+
4132+ Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
4133+ Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
4134+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
4135+
4136+commit 1110b71e360195aab040d835b54540ab558638c5
4137+Author: Chris Clayton <chris2553@googlemail.com>
4138+Date: Wed Sep 4 15:42:04 2013 +1000
4139+
4140+ kdrive: fix build error on gcc 4.8 for out-of-bounds array access
4141+
4142+ I'm getting a error building xorg-server-1.14.1.902 with thelatest snapshot
4143+ of gcc-4.8:
4144+
4145+ input.c:225:43: error: array subscript is above array bounds
4146+ [-Werror=array-bounds]
4147+
4148+ This is because kdNumInputFds can become equal to KD_MAX_INPUT_FDS in
4149+ KdRegisterFd(). This means that in KdUnregisterFd(), kdInputFds[j + 1] can
4150+ be beyond the end of the array.
4151+
4152+ Signed-off-by: Chris Clayton <chris2553@googlemail.com>
4153+ Reviewed-by: Keith Packard <keithp@keithp.com>
4154+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
4155+
4156+commit abc2bfca16adcd1e5657d4ce54f4e1335d5ed53f
4157+Author: Sebastien Bacher <seb128@ubuntu.com>
4158+Date: Fri Aug 23 21:21:44 2013 +0200
4159+
4160+ kdrive: initialize GLX for xephyr
4161+
4162+ Like commit ac1a60e7b6f06fd075cc5bf55d6bc67206a01d29, re-add
4163+ initialization of GLX after it was accidentally dropped from non-Xorg
4164+ servers in 5f5bbbe543f65c48ecbb5cce80116a86ca3fbe86.
4165+
4166+ Signed-off-by: Sebastien Bacher <seb128@ubuntu.com>
4167+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62346
4168+ Reviewed-by: Eric Anholt <eric@anholt.net>
4169+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4170+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4171+ Signed-off-by: Eric Anholt <eric@anholt.net>
4172+
4173+commit aa5534ec6931ffcc81cca76b98785d57de8e0e52
4174+Author: Eric Anholt <eric@anholt.net>
4175+Date: Fri Aug 23 11:23:00 2013 -0700
4176+
4177+ ephyr: Do grab/ungrab for ctrl+shift, not just shift+ctrl.
4178+
4179+ Given that the window title says "ctrl+shift", having pressing those
4180+ keys in that order not ungrab you is fairly mean.
4181+
4182+ Signed-off-by: Eric Anholt <eric@anholt.net>
4183+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4184+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4185+
4186+commit 5cc15e1c427bacd73db7381df3474a23f7616624
4187+Author: Eric Anholt <eric@anholt.net>
4188+Date: Fri Aug 23 11:19:17 2013 -0700
4189+
4190+ ephyr: Flush the X connection when updating the window title.
4191+
4192+ Otherwise when you're doing the ctrl-shift mouse grab thing, you
4193+ don't know what state you're in until the next rendering occurs.
4194+
4195+ Signed-off-by: Eric Anholt <eric@anholt.net>
4196+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4197+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4198+
4199+commit ba387cf21f7d95987211f75d8024601e7d64e322
4200+Author: Eric Anholt <eric@anholt.net>
4201+Date: Fri Aug 23 11:17:14 2013 -0700
4202+
4203+ ephyr: Use host (HW) cursors by default.
4204+
4205+ Unless you're working on the sw cursor rendering code, you surely want
4206+ to have real hardware cursors.
4207+
4208+ Signed-off-by: Eric Anholt <eric@anholt.net>
4209+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4210+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4211+
4212+commit 0f5a2f13dc284dd5f0f28e2c4323b2e08d253a7d
4213+Author: Eric Anholt <eric@anholt.net>
4214+Date: Fri Aug 23 11:04:22 2013 -0700
4215+
4216+ ephyr: Garbage collect some DOA host window clipping code.
4217+
4218+ Introduced in 79782726617d4b5a4f9b376f21936d035fc870e1 but never used.
4219+
4220+ Signed-off-by: Eric Anholt <eric@anholt.net>
4221+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4222+
4223+commit 090de17d361dc9828203a2562565d6499998db46
4224+Author: Eric Anholt <eric@anholt.net>
4225+Date: Fri Aug 23 10:56:22 2013 -0700
4226+
4227+ ephyr: Garbage collect some dead XV clipping code.
4228+
4229+ Signed-off-by: Eric Anholt <eric@anholt.net>
4230+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4231+
4232+commit 347d0fa6961c2b3dc4efd4e7cca8ef98cd3ea06e
4233+Author: Eric Anholt <eric@anholt.net>
4234+Date: Fri Aug 23 10:44:23 2013 -0700
4235+
4236+ ephyr: Remove the helper libs for each of the optional components.
4237+
4238+ Note that EXTRA_DIST was always unnecessary, because automake notices
4239+ conditional compile of source files and includes them.
4240+
4241+ Copyright header is added because git noted that this was a 61%
4242+ rewrite.
4243+
4244+ Signed-off-by: Eric Anholt <eric@anholt.net>
4245+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4246+
4247+commit 74dff87790dbb3dcb23634f1e8cd54018e5ddc9d
4248+Author: Eric Anholt <eric@anholt.net>
4249+Date: Fri Aug 23 10:40:52 2013 -0700
4250+
4251+ ephyr: Remove the remaining bits of host/server XV split.
4252+
4253+ Signed-off-by: Eric Anholt <eric@anholt.net>
4254+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4255+
4256+commit 2f994dfe9d1add9ea8cb9c88ddb0d15843854788
4257+Author: Eric Anholt <eric@anholt.net>
4258+Date: Fri Aug 23 10:14:36 2013 -0700
4259+
4260+ ephyr: Remove the host/server split of the actual XV video operations.
4261+
4262+ I suspect there's more cleanup possible in ephyrHostXVPutImage() by
4263+ sticking a bunch of the args in the port priv earlier.
4264+
4265+ Signed-off-by: Eric Anholt <eric@anholt.net>
4266+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4267+
4268+commit 0b7ce74315213ccd31802847e5a83e67090ded14
4269+Author: Eric Anholt <eric@anholt.net>
4270+Date: Fri Aug 23 10:01:23 2013 -0700
4271+
4272+ ephyr: Remove another host/server split for XV image formats.
4273+
4274+ Signed-off-by: Eric Anholt <eric@anholt.net>
4275+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4276+
4277+commit 1dcc28bcb402d7286d18b41b469062a5c176d7eb
4278+Author: Eric Anholt <eric@anholt.net>
4279+Date: Thu Aug 22 17:00:41 2013 -0700
4280+
4281+ ephyr: Remove the host/server split for video encodings.
4282+
4283+ Signed-off-by: Eric Anholt <eric@anholt.net>
4284+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4285+
4286+commit 28a37757e11068b4594f4128a0d64c6bc9a53ee0
4287+Author: Eric Anholt <eric@anholt.net>
4288+Date: Thu Aug 22 17:26:21 2013 -0700
4289+
4290+ ephyr: Remove the host/server split for XV formats.
4291+
4292+ Signed-off-by: Eric Anholt <eric@anholt.net>
4293+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4294+
4295+commit 41134d393a37dd5b971b018a3888fbfea0b9c736
4296+Author: Eric Anholt <eric@anholt.net>
4297+Date: Thu Aug 22 17:21:37 2013 -0700
4298+
4299+ ephyr: Remove the host/server split for XV attributes.
4300+
4301+ v2: Fix leaks of xcb replies (caught by Julien)
4302+
4303+ Signed-off-by: Eric Anholt <eric@anholt.net>
4304+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4305+
4306+commit 1342a93c49beb6e4924534304119d57fa587ad0f
4307+Author: Eric Anholt <eric@anholt.net>
4308+Date: Thu Aug 22 17:26:08 2013 -0700
4309+
4310+ ephyr: Remove the host/server split for XV adaptors.
4311+
4312+ Signed-off-by: Eric Anholt <eric@anholt.net>
4313+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4314+
4315+commit fad79d2e3e53de4f25b3d1dd7accb558464a4a46
4316+Author: Eric Anholt <eric@anholt.net>
4317+Date: Sun Aug 18 20:08:32 2013 +0200
4318+
4319+ ephyr: Refactor XV adaptor feature detection.
4320+
4321+ This obviously wanted a helper function beforehand, but even more so
4322+ now that we have XCB.
4323+
4324+ Signed-off-by: Eric Anholt <eric@anholt.net>
4325+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4326+
4327+commit 7a9c311add62026972419ef0b04a55680072bfeb
4328+Author: Eric Anholt <eric@anholt.net>
4329+Date: Sun Aug 18 20:02:53 2013 +0200
4330+
4331+ ephyr: Remove some pointless indirection in the XV code.
4332+
4333+ Now that we have XCB on the server side, we don't need to split these
4334+ functions out.
4335+
4336+ Signed-off-by: Eric Anholt <eric@anholt.net>
4337+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4338+
4339+commit 46cf6bf5692ef751ec9d17ae2292565d4b13f14b
4340+Author: Eric Anholt <eric@anholt.net>
4341+Date: Sun Aug 18 18:38:29 2013 +0200
4342+
4343+ ephyr: Move event processing into ephyr.c.
4344+
4345+ No more extra event structure to translate between hostx.c and
4346+ ephyr.c!
4347+
4348+ Signed-off-by: Eric Anholt <eric@anholt.net>
4349+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4350+
4351+commit 847c856effde482c13cdefcdca8176cee3bf67c4
4352+Author: Eric Anholt <eric@anholt.net>
4353+Date: Sun Aug 18 17:28:08 2013 +0200
4354+
4355+ ephyr: Move the host screen info into the kdrive screen private.
4356+
4357+ We can include xcb bits from the same place as server headers, so
4358+ there's no need to hide them any more.
4359+
4360+ Signed-off-by: Eric Anholt <eric@anholt.net>
4361+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4362+
4363+commit 8dadc78e233f341f1ecb8d404de03d98ab210620
4364+Author: Eric Anholt <eric@anholt.net>
4365+Date: Sun Aug 18 16:45:06 2013 +0200
4366+
4367+ ephyr: Rename and use the proper type for what was host_screen->info.
4368+
4369+ Now that we can include server headers in talking to host X, we don't
4370+ need to hide any more.
4371+
4372+ Signed-off-by: Eric Anholt <eric@anholt.net>
4373+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4374+
4375+commit 18d836f6dde46bcac8b794d34f76032688c28851
4376+Author: Eric Anholt <eric@anholt.net>
4377+Date: Sun Aug 18 14:12:45 2013 +0200
4378+
4379+ ephyr: Expose a single function for detecting extensions.
4380+
4381+ v2: Fix trying to include xcb-dri in the non-dri-build case (Noted by
4382+ Julien)
4383+
4384+ Signed-off-by: Eric Anholt <eric@anholt.net>
4385+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4386+
4387+commit 3aacb22d6473480c31fb08f0b2527747dbf5be57
4388+Author: Eric Anholt <eric@anholt.net>
4389+Date: Sun Aug 18 14:01:53 2013 +0200
4390+
4391+ ephyr: Drop dead ephyrHostAtomToLocal code.
4392+
4393+ Signed-off-by: Eric Anholt <eric@anholt.net>
4394+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4395+
4396+commit 4aaad0bfbcef018eb36839b1d034c3f60022694a
4397+Author: Julien Cristau <jcristau@debian.org>
4398+Date: Wed Oct 20 20:10:43 2010 +0200
4399+
4400+ Xephyr: we're not using Xlib anymore, no need to undef _XSERVER64
4401+
4402+ Drop obsolete comments about interaction between Xlib code and that
4403+ macro, and stop undefining it.
4404+
4405+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4406+ Reviewed-by: Eric Anholt <eric@anholt.net>
4407+
4408+commit 0fc2f9f04a44599f598380d4df992bec60c0e3a1
4409+Author: Julien Cristau <jcristau@debian.org>
4410+Date: Sat Sep 25 16:05:07 2010 +0200
4411+
4412+ Xephyr: handle errors in event loop
4413+
4414+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4415+ Reviewed-by: Eric Anholt <eric@anholt.net>
4416+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
4417+
4418+commit 3309a73c826f02c4b2e14180a3254546314ec323
4419+Author: Julien Cristau <jcristau@debian.org>
4420+Date: Fri Jun 25 14:20:57 2010 +0100
4421+
4422+ Xephyr: drop remaining Xlib dependency
4423+
4424+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
4425+ Reviewed-by: Eric Anholt <eric@anholt.net>
4426+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4427+
4428+commit 7da2174cf93f59b7e0372a6dc9d37a510076e187
4429+Author: Julien Cristau <jcristau@debian.org>
4430+Date: Mon Jun 21 14:39:03 2010 +0100
4431+
4432+ Xephyr: move glx code to xcb
4433+
4434+ v2: Rebase on master, notably adding XCB for
4435+ X_GLXvop_MakeCurrentReadSGI (anholt).
4436+ v3: Fix use-after-free (caught by Julien).
4437+
4438+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1)
4439+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4440+ Signed-off-by: Eric Anholt <eric@anholt.net>
4441+
4442+commit 19c2699b954e2978301c4449dfccc7ca40bf6ae6
4443+Author: Julien Cristau <jcristau@debian.org>
4444+Date: Wed Jun 23 18:36:00 2010 +0100
4445+
4446+ Xephyr: remove unused DRI1 code
4447+
4448+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
4449+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4450+
4451+commit 68b7db19e8d3c1ac55a811327d3058f4c8fb45ec
4452+Author: Julien Cristau <jcristau@debian.org>
4453+Date: Sun Jun 20 00:07:08 2010 +0100
4454+
4455+ Xephyr: move ephyrdri over to xcb
4456+
4457+ Require new xcb-xf86dri to get fixed GetDrawableInfo.
4458+
4459+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
4460+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4461+
4462+commit aea119cd05807ed77336f96a40f8e4607c6ce169
4463+Author: Julien Cristau <jcristau@debian.org>
4464+Date: Sun Jun 20 11:13:26 2010 +0100
4465+
4466+ Xephyr: use xcb-xv instead of libXv
4467+
4468+ v2: Massive, conflict-filled rebase. I think I resolved everything
4469+ right, but this host xv code makes my eyes bleed. Touch-tested XV
4470+ after the rebase (anholt).
4471+
4472+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1)
4473+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4474+ Signed-off-by: Eric Anholt <eric@anholt.net>
4475+
4476+commit 3ea75a59d5fec3c4099388724942e216f2344328
4477+Author: Julien Cristau <jcristau@debian.org>
4478+Date: Mon Jun 21 17:20:32 2010 +0100
4479+
4480+ Xephyr: use xcb for event handling
4481+
4482+ v2: Rebase on indentation changes, squash in a simpler variant of the
4483+ later event compression patch, fix server hang or segfault on
4484+ window close by reimplementing the x_io_error_handler in the new
4485+ XCB event loop (anholt).
4486+
4487+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1)
4488+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4489+ Signed-off-by: Eric Anholt <eric@anholt.net>
4490+
4491+commit ff26845252889f7cc3258a0d3aa116189acc6aae
4492+Author: Julien Cristau <jcristau@debian.org>
4493+Date: Thu Jun 24 23:45:16 2010 +0100
4494+
4495+ Xephyr: some more hostx.c xcb-ification
4496+
4497+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
4498+ Reviewed-by: Eric Anholt <eric@anholt.net>
4499+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4500+
4501+commit 9b55f76a265aab0d9943a40208a38800e5782ba5
4502+Author: Julien Cristau <jcristau@debian.org>
4503+Date: Thu Jun 24 23:35:15 2010 +0100
4504+
4505+ Xephyr: move HostX.visual to xcb
4506+
4507+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
4508+ Reviewed-by: Eric Anholt <eric@anholt.net>
4509+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4510+
4511+commit 126312fb4a6e06024a306341e675163108426390
4512+Author: Julien Cristau <jcristau@debian.org>
4513+Date: Thu Jun 24 23:26:48 2010 +0100
4514+
4515+ Xephyr: replace XKeycodeToKeysym with xcb-keysyms
4516+
4517+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
4518+ Reviewed-by: Eric Anholt <eric@anholt.net>
4519+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4520+
4521+commit 8543d3fdfd47d2a0423f3ef8e7429c23c5d6b053
4522+Author: Julien Cristau <jcristau@debian.org>
4523+Date: Thu Jun 24 23:17:32 2010 +0100
4524+
4525+ Xephyr: delete unused hostx_get_extension_info function
4526+
4527+ v2: Also remove the prototype (anholt)
4528+
4529+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1)
4530+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4531+ Signed-off-by: Eric Anholt <eric@anholt.net>
4532+
4533+commit d72c11b9df4a98fd80cb6635d34964483e33bc41
4534+Author: Julien Cristau <jcristau@debian.org>
4535+Date: Mon Jun 21 14:25:11 2010 +0100
4536+
4537+ Xephyr: delete unused proxy code
4538+
4539+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
4540+ Reviewed-by: Eric Anholt <eric@anholt.net>
4541+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4542+
4543+commit a71ea3f96769da157dde82a591e43264820772ac
4544+Author: Julien Cristau <jcristau@debian.org>
4545+Date: Sun Jun 20 23:34:54 2010 +0100
4546+
4547+ Xephyr: xcb-ify visual list construction
4548+
4549+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
4550+ Reviewed-by: Eric Anholt <eric@anholt.net>
4551+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4552+
4553+commit ac2b0348c00d692ec1bd8d6c8ab99e9198e755a7
4554+Author: Julien Cristau <jcristau@debian.org>
4555+Date: Sun Jun 20 23:34:39 2010 +0100
4556+
4557+ Xephyr: xcb-ify pointer/keyboard grab
4558+
4559+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
4560+ Reviewed-by: Eric Anholt <eric@anholt.net>
4561+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4562+
4563+commit 1f93e6b350d1b9a058009052a666a2e8796708cb
4564+Author: Julien Cristau <jcristau@debian.org>
4565+Date: Sun Jun 20 23:34:03 2010 +0100
4566+
4567+ Xephyr: no need for XDisplayKeycodes
4568+
4569+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
4570+ Reviewed-by: Eric Anholt <eric@anholt.net>
4571+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4572+
4573+commit 73398e5bf61c30e69a40a19a1057c2263fbb91ef
4574+Author: Julien Cristau <jcristau@debian.org>
4575+Date: Thu Jun 24 23:00:38 2010 +0100
4576+
4577+ Xephyr: use xcb-shape instead of XShape*
4578+
4579+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
4580+ Reviewed-by: Eric Anholt <eric@anholt.net>
4581+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4582+
4583+commit a2b73da78de4e627965213d24a6c33f243a60eb6
4584+Author: Julien Cristau <jcristau@debian.org>
4585+Date: Sun Jun 20 00:05:40 2010 +0100
4586+
4587+ Xephyr: start converting hostx.c over to xcb
4588+
4589+ v2: Dropped the hostx_load_keymap changes, now that that function is
4590+ gutted (anholt).
4591+
4592+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1)
4593+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4594+ Signed-off-by: Eric Anholt <eric@anholt.net>
4595+
4596+commit 762606b4cdfb57c5202ae128ce4dbb8afe172d4e
4597+Author: Julien Cristau <jcristau@debian.org>
4598+Date: Fri Jun 25 17:59:13 2010 +0100
4599+
4600+ Xephyr: stop loading the host's keymap
4601+
4602+ This isn't used anywhere.
4603+
4604+ v2: Rebase to the top of the patch series (anholt)
4605+
4606+ Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> (v1)
4607+ Signed-off-by: Julien Cristau <jcristau@debian.org>
4608+ Signed-off-by: Eric Anholt <eric@anholt.net>
4609+
4610+commit 3752a815800626ae93f64a856f5889aa6636344e
4611+Author: Marc Haesen <marha@users.sourceforge.net>
4612+Date: Sat Aug 10 17:38:38 2013 +0100
4613+
4614+ hw/xwin: Remove unnecessary and incorrect HWND casts
4615+
4616+ Signed-off-by: Marc Haesen <marha@users.sourceforge.net>
4617+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4618+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4619+
4620+commit 34932cef6cc800fbdf2f375506057ed8cd1e07f6
4621+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
4622+Date: Mon Apr 1 13:43:00 2013 +0100
4623+
4624+ hw/xwin: Fix compilation of winauth.c with -Werror=implicit-function-declaration
4625+
4626+ /jhbuild/checkout/xorg/xserver/hw/xwin/winauth.c: In function ‘MitGenerateCookie’:
4627+ /jhbuild/checkout/xorg/xserver/hw/xwin/winauth.c:87:5: error: implicit declaration of function ‘MitAddCookie’ [-Werror=implicit-function-declaration]
4628+
4629+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4630+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4631+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4632+
4633+commit 2a08554a0bf80b862c15676c31ecd463b616518c
4634+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
4635+Date: Mon Jun 17 23:54:01 2013 +0100
4636+
4637+ hw/xwin: Remove unused extern g_fUseUnicode from winclipboardwndproc.c
4638+
4639+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk
4640+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4641+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4642+
4643+commit 69401f38a697c941ea58351028f4cd4b810f9188
4644+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
4645+Date: Mon Jun 17 18:37:26 2013 +0100
4646+
4647+ hw/xwin: Remove unneeded forward declaration of winProcessXEventsTimeout()
4648+
4649+ Remove unneeded forward declaration of winProcessXEventsTimeout(), the actual
4650+ definition immediately follows.
4651+
4652+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4653+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4654+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4655+
4656+commit 9c45a1ad44f12ac25e1c3b7a18a3bceb85a2cf38
4657+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
4658+Date: Mon Jun 17 16:58:47 2013 +0100
4659+
4660+ hw/xwin: Remove prototype for non-existent winDeinitClipboard()
4661+
4662+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4663+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4664+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4665+
4666+commit acc46fc217352b94f77a6b5b14808ea89875a2a1
4667+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
4668+Date: Mon Jun 17 00:40:13 2013 +0100
4669+
4670+ hw/xwin: Remove unused externs from winclipboardwrappers.c
4671+
4672+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4673+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4674+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4675+
4676+commit fcc7767f8cd6c318861b1060ef6a3936750a0dd2
4677+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
4678+Date: Mon Jun 10 17:31:12 2013 +0100
4679+
4680+ hw/xwin: Remove unused winProcQueryTreeOrig variable
4681+
4682+ Unused since 47c7b6d3e626497747ae2780f259a15b8e6c846f "Remove no-longer needed
4683+ tricks used to prevent the clipboard client from being killed"
4684+
4685+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4686+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4687+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4688+
4689+commit 8fa882a980abea6f05b4b59447a187aea2c793a1
4690+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
4691+Date: Sat Aug 10 12:41:07 2013 +0100
4692+
4693+ hw/xwin: Fix ARGB cursor conversion on x86_64
4694+
4695+ Fix erroneous use of unsigned long * for lpBits in winXCursorToHCURSOR() which
4696+ leads to ARGB cursors being vertically streched on x86_64 by interleaving blank
4697+ rows of pixels.
4698+
4699+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4700+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4701+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4702+
4703+commit 4bfb2dce5eea4923eaf86eca33b96087b28235f5
4704+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
4705+Date: Sun Apr 7 23:59:44 2013 +0100
4706+
4707+ hw/xwin: Fix an issue in winSetSpansNativeGDI() identifed by -Warray-bounds
4708+
4709+ The BITMAPINFO local only has room for a single RBGQUAD in bmiColors, but we
4710+ access two (black and white for a mono-color DIB). Fix by changing to a dynamic
4711+ allocation big enough for a BITMAPINFO and a RGBQUAD.
4712+
4713+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4714+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4715+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4716+
4717+commit 784c006adb22c6693ad30dd0b1b05369cfaa7b5e
4718+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
4719+Date: Sat Aug 10 11:55:23 2013 +0100
4720+
4721+ hw/xwin: Fix -Warray-bounds warning in winXCursorToHCURSOR()
4722+
4723+ Rewrite winXCursorToHCURSOR() so access to BITMAPINFO bmiColors member doesn't
4724+ trigger an -Warray-bounds warning.
4725+
4726+ Note that the underlying storage is allocated as a BITMAPV4HEADER, so has
4727+ sufficent room for the extra RGBQUADs bmiColors after the BITMAPINFO bmiHeader.
4728+
4729+ wincursor.c: In function 'winSetCursor':
4730+ wincursor.c:293:24: error: array subscript is above array bounds [-Werror=array-bounds]
4731+ wincursor.c:294:24: error: array subscript is above array bounds [-Werror=array-bounds]
4732+ wincursor.c:295:24: error: array subscript is above array bounds [-Werror=array-bounds]
4733+ wincursor.c:296:24: error: array subscript is above array bounds [-Werror=array-bounds]
4734+ wincursor.c:297:24: error: array subscript is above array bounds [-Werror=array-bounds]
4735+ wincursor.c:298:24: error: array subscript is above array bounds [-Werror=array-bounds]
4736+ wincursor.c:299:24: error: array subscript is above array bounds [-Werror=array-bounds]
4737+ wincursor.c:300:24: error: array subscript is above array bounds [-Werror=array-bounds]
4738+
4739+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4740+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4741+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4742+
4743+commit 41d03c9ccce665b919b180bbb819b78c750aa325
4744+Author: Marc Haesen <marha@users.sourceforge.net>
4745+Date: Fri Aug 2 18:19:22 2013 +0100
4746+
4747+ hw/xwin: Correct size of _WINDOWSWM_NATIVE_HWND property on x86_64
4748+
4749+ Use the correct size of a HWND on x86_64 in XChangeProperty() and
4750+ XGetWindowProperty() calls for the _WINDOWSWM_NATIVE_HWND property.
4751+
4752+ Signed-off-by: Marc Haesen <marha@users.sourceforge.net>
4753+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4754+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4755+
4756+commit 390cfec10ef7d52391f890c7593ac82a7d77d856
4757+Author: Colin Harrison <colin.harrison@virgin.net>
4758+Date: Fri Aug 9 16:48:12 2013 +0100
4759+
4760+ hw/xwin: Correct winprefs.c function signatures for x64.
4761+
4762+ Correct SetupRootMenu(), SetupSysMenu(), HandleCustomWM_INITMENU() and
4763+ HandleCustomWM_COMMAND() function signatures which use unsigned long parameters,
4764+ where just a specific HWND or HMENU handle type should have been used.
4765+
4766+ Signed-off-by: Colin Harrison <colin.harrison@virgin.net>
4767+ Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4768+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4769+
4770+commit e716baedc4d8e52a60f43ef21aba771b340d8c8b
4771+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
4772+Date: Sat Mar 31 14:42:45 2012 +0100
4773+
4774+ Move pseudoramiX code where it can be shared between Xwin and Xquartz
4775+
4776+ Move pseudoramiX code to a separate top-level directory. Link Xwin and Xquartz
4777+ with libPseudoramiX
4778+
4779+ I'm not sure moving this to a top-level directory is appropriate, but I'm not
4780+ sure where else it fits.
4781+
4782+ Future work: pseudoramiX can probably be consolidated with the rrxinerama code
4783+ (which I think provides fake xinerama data when real XINERAMA is disabled and we
4784+ only have one screen)
4785+
4786+ v2: fix distcheck
4787+
4788+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4789+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4790+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4791+
4792+commit ce0217b98261dcf8b20cfb743831965dda1950ec
4793+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
4794+Date: Sat Aug 10 12:35:55 2013 +0100
4795+
4796+ hw/xwin: Fix winglobals.h for MinGW64 build
4797+
4798+ Include pthread.h in winglobals.h to fix build with latest MinGW64 headers
4799+
4800+ In file included from
4801+ winmultiwindowicons.c:47:0:
4802+ winglobals.h:92:1: error: unknown type name ‘pthread_mutex_t’
4803+
4804+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4805+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4806+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4807+
4808+commit b27756dbe6a1be4633ec47a8fe92a4c217f68f93
4809+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
4810+Date: Sun Aug 11 12:15:11 2013 +0100
4811+
4812+ hw/xwin: Fix inclusion of shlobj.h in MinGW64 build
4813+
4814+ Fix build with latest MinGW64 headers by wrapping Status type in shlobj.h as well
4815+
4816+ In file included from InitOutput.c:51:0:
4817+ /usr/i686-w64-mingw32/sys-root/mingw/include/shlobj.h:1231:44: error: expected identifier or ‘(’ before ‘int’
4818+ /usr/i686-w64-mingw32/sys-root/mingw/include/shlobj.h:1248:44: error: expected identifier or ‘(’ before ‘int’
4819+
4820+ Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
4821+ Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
4822+ Reviewed-by: Marc Haesen <marha@users.sourceforge.net>
4823+
4824+commit 94d4e29aedc69431fa9b299ca1b67947173d7a24
4825+Author: Peter Hutterer <peter.hutterer@who-t.net>
4826+Date: Mon Aug 26 15:51:46 2013 +1000
4827+
4828+ Xi: allow for XIAllowEvent requests larger than XI < 2.2 size (#68554)
4829+
4830+ XIAllowEvents changed length in XI 2.2 (for the touchid). A bug in libXi
4831+ causes libXi to always use the new request length if the server supports
4832+ 2.2, regardless of the client's XIQueryVersion request.
4833+
4834+ The server takes the client's XIQueryVersion request into account though,
4835+ resulting in a BadLength error if a 2.[0,1] client calls XIAllowEvents on a
4836+ XI 2.2+ server.
4837+
4838+ Can't fix this in libXi, so work around this in the server.
4839+
4840+ X.Org Bug 68554 <http://bugs.freedesktop.org/show_bug.cgi?id=68554>
4841+
4842+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
4843+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4844+
4845+commit 82939e02392cbb880313fe92957091ff89ce2f2b
4846+Author: Peter Hutterer <peter.hutterer@who-t.net>
4847+Date: Fri Aug 16 15:30:59 2013 +1000
4848+
4849+ dix: check for grab type before checking XI2 mask
4850+
4851+ if the grab type isn't XI2, grab->xi2mask is random. That random data may
4852+ have the enter/leave mask set, leading to events sent to the client that the
4853+ client can't handler.
4854+
4855+ Source of these errors:
4856+ _xgeWireToEvent: Unknown extension 131, this should never happen.
4857+
4858+ Simplest reproducer:
4859+ Start Xephyr, press button inside window, move out. As the pointer leaves
4860+ the Xephyr window, the errors appear.
4861+
4862+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
4863+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4864+
4865+commit 16894df1ffb6fe21bf723dd954578e8d934799ca
4866+Author: Peter Hutterer <peter.hutterer@who-t.net>
4867+Date: Fri Aug 16 10:55:09 2013 +1000
4868+
4869+ Xi: replace loop with memset
4870+
4871+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
4872+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4873+
4874+commit 8f2292b683f591052da2fe94fb3831a3c9a5aa61
4875+Author: Peter Hutterer <peter.hutterer@who-t.net>
4876+Date: Fri Aug 16 11:05:49 2013 +1000
4877+
4878+ include: wrap EMASKSIZE in parentheses
4879+
4880+ Otherwise things like EMASKSIZE * foo will yield interesting results.
4881+
4882+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
4883+ Reviewed-by: Adam Jackson <ajax@redhat.com>
4884+
4885+commit d803f296c616ccf55711cf0af9e7d3eae2edda16
4886+Author: Peter Hutterer <peter.hutterer@who-t.net>
4887+Date: Fri Aug 23 09:04:01 2013 +1000
4888+
4889+ test: fix the gcc diagnostics pragma
4890+
4891+ pop without push restores the commandline options. The proper way is to
4892+ push, then ignore, then pop.
4893+
4894+ And while we're at it, change the pop argument to a comment - pop ignores
4895+ the argument, but be proper about it.
4896+
4897+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
4898+
4899+commit 05ea6307fa4f0bee3d3bf536396059f3906791a0
4900+Author: Egbert Eich <eich@freedesktop.org>
4901+Date: Fri Aug 16 19:52:16 2013 +0200
4902+
4903+ DIX/Xi: Pass correct client to CheckDeviceGrabAndHintWindow()
4904+
4905+ If we have a client which has registered for a DeviceButton grab
4906+ be sure to pass this to CheckDeviceGrabAndHintWindow(). Since the
4907+ order of clients is arbitrary there is no guarantee that the last
4908+ client in the list is the one that belongs to this class.
4909+
4910+ Signed-off-by: Egbert Eich <eich@freedesktop.org>
4911+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
4912+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
4913+
4914+commit e01a3f65d3e6d92f92ef2992b338cc9625bde082
4915+Author: Eric Anholt <eric@anholt.net>
4916+Date: Sat Aug 17 14:50:37 2013 +0200
4917+
4918+ ephyr: Fix warning about XID vs unsigned long * by changing function args
4919+
4920+ There's no reason to pass the data back out to the caller, since the
4921+ caller was dropping it on the floor. The original data is a CARD32,
4922+ so no need to mess with weird unsigned longs.
4923+
4924+ Signed-off-by: Eric Anholt <eric@anholt.net>
4925+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4926+
4927+commit f1cefe020bd21c07dfcc9f204e79939499abbd35
4928+Author: Eric Anholt <eric@anholt.net>
4929+Date: Sat Aug 17 14:38:08 2013 +0200
4930+
4931+ ephyr: Drop is_ok logging.
4932+
4933+ The only cases that lead to !is_ok are already EPHYR_LOG_ERROR, and it
4934+ fixes set-but-unused compiler warnings.
4935+
4936+ Signed-off-by: Eric Anholt <eric@anholt.net>
4937+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4938+
4939+commit 77c7a2014e3942b55c0b78308edf02eab33f2e60
4940+Author: Eric Anholt <eric@anholt.net>
4941+Date: Sat Aug 17 14:36:09 2013 +0200
4942+
4943+ kdrive: Fix const cast warnings in arguments processing.
4944+
4945+ Signed-off-by: Eric Anholt <eric@anholt.net>
4946+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4947+
4948+commit 7107937e473a3557c37d719cb100b2e9b09075dd
4949+Author: Eric Anholt <eric@anholt.net>
4950+Date: Sat Aug 17 13:11:17 2013 +0200
4951+
4952+ kdrive: Fix const cast warnings in driver name handling.
4953+
4954+ Signed-off-by: Eric Anholt <eric@anholt.net>
4955+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4956+
4957+commit 56c405d46a86853771a0b808da4c8a9ef626960c
4958+Author: Eric Anholt <eric@anholt.net>
4959+Date: Sat Aug 17 13:07:23 2013 +0200
4960+
4961+ kdrive: Fix a few easy cast warnings.
4962+
4963+ Signed-off-by: Eric Anholt <eric@anholt.net>
4964+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4965+
4966+commit a9c48a07eea50468fa47ab178cdd91edb0b5727f
4967+Author: Eric Anholt <eric@anholt.net>
4968+Date: Sat Aug 17 13:06:23 2013 +0200
4969+
4970+ kdrive: Drop dead code.
4971+
4972+ This is unused as of the introduction of a helper in
4973+ e7150db5350bc2113ff4126019b489847a4dc217
4974+
4975+ Signed-off-by: Eric Anholt <eric@anholt.net>
4976+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4977+
4978+commit 873ae962bdb7559c952b5955ba262285701982a8
4979+Author: Eric Anholt <eric@anholt.net>
4980+Date: Sat Aug 17 13:01:57 2013 +0200
4981+
4982+ ephyr: Fix dead code warning.
4983+
4984+ Signed-off-by: Eric Anholt <eric@anholt.net>
4985+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4986+
4987+commit 34af2eebe19e2f8afe35a5614d4d44fa4fd89d6b
4988+Author: Eric Anholt <eric@anholt.net>
4989+Date: Sat Aug 17 13:01:32 2013 +0200
4990+
4991+ ephyr: Fix const-cast warnings for setting window title.
4992+
4993+ Signed-off-by: Eric Anholt <eric@anholt.net>
4994+ Reviewed-by: Julien Cristau <jcristau@debian.org>
4995+
4996+commit 7edf5066db48434739ac64e0576fbb4fdf0f37f9
4997+Author: Eric Anholt <eric@anholt.net>
4998+Date: Sat Aug 17 12:54:33 2013 +0200
4999+
5000+ ephyr: Fix const cast warnings in ephyrhostvideo.
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches