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