From 851ab9aa99e9bda38f88b5f5ade096c9137e11c8 Mon Sep 17 00:00:00 2001 From: Parabola Date: Wed, 23 Nov 2011 16:27:38 +0000 Subject: Wed Nov 23 16:27:34 UTC 2011 --- testing/xorg-server/10-quirks.conf | 10 - testing/xorg-server/PKGBUILD | 205 --------------- ...ssive-keygrabs-on-the-XIAll-Master-Device.patch | 31 --- testing/xorg-server/autoconfig-nvidia.patch | 29 --- testing/xorg-server/autoconfig-sis.patch | 19 -- testing/xorg-server/git-fixes.patch | 161 ------------ testing/xorg-server/revert-trapezoids.patch | 179 ------------- .../xserver-1.11.2-record-crasher.patch | 241 ------------------ testing/xorg-server/xvfb-run | 180 ------------- testing/xorg-server/xvfb-run.1 | 282 --------------------- 10 files changed, 1337 deletions(-) delete mode 100644 testing/xorg-server/10-quirks.conf delete mode 100644 testing/xorg-server/PKGBUILD delete mode 100644 testing/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch delete mode 100644 testing/xorg-server/autoconfig-nvidia.patch delete mode 100644 testing/xorg-server/autoconfig-sis.patch delete mode 100644 testing/xorg-server/git-fixes.patch delete mode 100644 testing/xorg-server/revert-trapezoids.patch delete mode 100644 testing/xorg-server/xserver-1.11.2-record-crasher.patch delete mode 100644 testing/xorg-server/xvfb-run delete mode 100644 testing/xorg-server/xvfb-run.1 (limited to 'testing/xorg-server') diff --git a/testing/xorg-server/10-quirks.conf b/testing/xorg-server/10-quirks.conf deleted file mode 100644 index 7afad22dc..000000000 --- a/testing/xorg-server/10-quirks.conf +++ /dev/null @@ -1,10 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD deleted file mode 100644 index c2a5e2c4f..000000000 --- a/testing/xorg-server/PKGBUILD +++ /dev/null @@ -1,205 +0,0 @@ -# $Id: PKGBUILD 142829 2011-11-16 11:34:48Z jgc $ -# Maintainer: Jan de Groot - -pkgbase=xorg-server -pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.11.2 -pkgrel=2 -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'udev' 'libgcrypt') -options=('!libtool') -source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - autoconfig-nvidia.patch - autoconfig-sis.patch - revert-trapezoids.patch - git-fixes.patch - xserver-1.11.2-record-crasher.patch - Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch - xvfb-run - xvfb-run.1 - 10-quirks.conf) -md5sums=('8796fff441e5435ee36a72579008af24' - '6c7e87d63ac4b535e19a80c89d0cf091' - 'f8194638ca4872c2b0a67862a70bcebf' - 'f6c84f4936f8e00abdfbd9fb4eda83fb' - '6fb42ec979ecd6125b6599f54dc00d14' - '3f9de4dbfee2da90167192d8ca9eb2b4' - '47f9b979fe38043b42ff86eeee6fd0d0' - '52fd3effd80d7bc6c1660d4ecf23d31c' - '376c70308715cd2643f7bff936d9934b' - 'd4f7dfc6be4ef4e2c6dd7632a9d88abe') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" - - # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i "${srcdir}/autoconfig-sis.patch" - - # Revert commit that causes huge slowdowns with binary nVidia driver - patch -Np1 -i "${srcdir}/revert-trapezoids.patch" - - # Add post-release patches from 1.11 branch - patch -Np1 -i "${srcdir}/git-fixes.patch" - - # From Fedora. - # Upstream URL: http://patchwork.freedesktop.org/patch/7866/ - patch -Np1 -i "${srcdir}/xserver-1.11.2-record-crasher.patch" - - # From Fedora. - # Upstream URL: https://bugs.freedesktop.org/show_bug.cgi?id=42298 - patch -Np1 -i "${srcdir}/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch" - - autoreconf -fi - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-xorg \ - --enable-xephyr \ - --enable-glx-tls \ - --enable-kdrive \ - --enable-install-setuid \ - --enable-config-udev \ - --disable-config-dbus \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -i hw/Makefile -} - -package_xorg-server-common() { - pkgdesc="Xorg server common files" - depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - - cd "${srcdir}/${pkgbase}-${pkgver}" - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" - install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" - - make -C xkb DESTDIR="${pkgdir}" install-data - - install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/lib/xorg" - install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" -} - -package_xorg-server() { - pkgdesc="Xorg X server" - depends=(libxdmcp libxfont udev libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) - backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') - provides=('x-server') - groups=('xorg') - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/etc/X11" - mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" - install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" - - rmdir "${pkgdir}/usr/share/X11" - - # Needed for non-mesa drivers, libgl will restore it - mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ - "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - -package_xorg-server-xephyr() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" -} - -package_xorg-server-xvfb() { - pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" - make DESTDIR="${pkgdir}" install - - install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" - install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" -} - -package_xorg-server-xnest() { - pkgdesc="A nested X server that runs as an X application" - depends=(libxfont libxext libgcrypt pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" -} - -package_xorg-server-xdmx() { - pkgdesc="Distributed Multihead X Server and utilities" - depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) - - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" -} - -package_xorg-server-devel() { - pkgdesc="Development files for the X.Org X server" - depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}" install - - rm -rf "${pkgdir}/usr/bin" - rm -rf "${pkgdir}/usr/share/man" - rm -rf "${pkgdir}/usr/share/doc" - rm -rf "${pkgdir}/usr/share/X11" - rm -rf "${pkgdir}/usr/lib/xorg" - rm -rf "${pkgdir}/var" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" -} diff --git a/testing/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch b/testing/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch deleted file mode 100644 index 8bddb2945..000000000 --- a/testing/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 97f2af5876dab0dfab06be735416f3fc950ed39e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 27 Oct 2011 11:03:39 +1000 -Subject: [PATCH] Xi: allow passive keygrabs on the XIAll(Master)Devices fake - devices - -They don't have a KeyClassRec, but we must still allow passive grabs on -them. - -Signed-off-by: Peter Hutterer -Tested-by: Bastien Nocera ---- - Xi/exevents.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Xi/exevents.c b/Xi/exevents.c -index 053c76f..edf2c39 100644 ---- a/Xi/exevents.c -+++ b/Xi/exevents.c -@@ -1495,7 +1495,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device, - rc = CheckGrabValues(client, param); - if (rc != Success) - return rc; -- if (k == NULL) -+ if ((dev->id != XIAllDevices && dev->id != XIAllMasterDevices) && k == NULL) - return BadMatch; - if (grabtype == GRABTYPE_XI) - { --- -1.7.7 - diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch deleted file mode 100644 index baa2eb601..000000000 --- a/testing/xorg-server/autoconfig-nvidia.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/hw/xfree86/common/xf86pciBus.c -+++ b/hw/xfree86/common/xf86pciBus.c -@@ -1123,7 +1123,25 @@ videoPtrToDriverList(struct pci_device * - break; - case 0x102b: driverList[0] = "mga"; break; - case 0x10c8: driverList[0] = "neomagic"; break; -- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; -+ case 0x10de: case 0x12d2: -+ switch (dev->device_id) { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[0] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[0] = "nv"; -+ break; -+ default: -+ driverList[0] = "nouveau"; -+ driverList[1] = "nv"; -+ driverList[2] = "nvidia"; -+ break; -+ } -+ break; - case 0x1106: driverList[0] = "openchrome"; break; - case 0x1b36: driverList[0] = "qxl"; break; - case 0x1163: driverList[0] = "rendition"; break; diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch deleted file mode 100644 index d936efaaa..000000000 --- a/testing/xorg-server/autoconfig-sis.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 -+++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1140,7 +1140,15 @@ - driverList[0] = "savage"; break; - } - break; -- case 0x1039: driverList[0] = "sis"; break; -+ case 0x1039: -+ switch (dev->device_id) -+ { -+ case 0x6350: case 0x6351: -+ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; -+ default: -+ driverList[0] = "sis"; break; -+ } -+ break; - case 0x126f: driverList[0] = "siliconmotion"; break; - case 0x121a: - if (dev->device_id < 0x0003) diff --git a/testing/xorg-server/git-fixes.patch b/testing/xorg-server/git-fixes.patch deleted file mode 100644 index 27da61eca..000000000 --- a/testing/xorg-server/git-fixes.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 89626304ea1ad316c5b7145a40f09377148cff21 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Thu, 20 Oct 2011 13:43:01 +0000 -Subject: xf86Crtc: handle no outputs with no modes harder. - -If you started an X server with no connected outputs, we pick a default -1024x768 mode, however if you then ran an xvidmode using app against that -server it would segfault the server due to not finding any valid modes. - -This was due to the no output mode set code, only adding the modes to the -scrn->modes once, when something called randr 1.2 xf86SetScrnInfoModes would -get called and remove all the modes and we'd end up with 0. - -This change fixes xf86SetScrnInfoModes to always report a scrn mode of at -least 1024x768, and pushes the initial configuration to just call it instead -of setting up the mode itself. - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=746926 - -I've seen other bugs like this on other distros so it might also actually fix them. - -Signed-off-by: Dave Airlie -Reviewed-by: Keith Packard -Signed-off-by: Keith Packard -(cherry picked from commit 17416e88dcfcc584fe5f87580d5d2b719b3521c3) ---- -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index d75cd77..8906806 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1915,19 +1915,25 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn) - break; - } - -- if (scrn->modes != NULL) { -- /* For some reason, scrn->modes is circular, unlike the other mode -- * lists. How great is that? -- */ -- for (last = scrn->modes; last && last->next; last = last->next) -- ; -- last->next = scrn->modes; -- scrn->modes->prev = last; -- if (mode) { -- while (scrn->modes != mode) -- scrn->modes = scrn->modes->next; -- } -+ if (!scrn->modes) { -+ scrn->modes = xf86ModesAdd(scrn->modes, -+ xf86CVTMode(scrn->display->virtualX, -+ scrn->display->virtualY, -+ 60, 0, 0)); -+ } -+ -+ /* For some reason, scrn->modes is circular, unlike the other mode -+ * lists. How great is that? -+ */ -+ for (last = scrn->modes; last && last->next; last = last->next) -+ ; -+ last->next = scrn->modes; -+ scrn->modes->prev = last; -+ if (mode) { -+ while (scrn->modes != mode) -+ scrn->modes = scrn->modes->next; - } -+ - scrn->currentMode = scrn->modes; - #ifdef XFreeXDGA - if (scrn->pScreen) -@@ -2529,16 +2535,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - width, height); - } - -- if (have_outputs) { -- /* Mirror output modes to scrn mode list */ -- xf86SetScrnInfoModes (scrn); -- } else { -- /* Clear any existing modes from scrn->modes */ -- while (scrn->modes != NULL) -- xf86DeleteMode(&scrn->modes, scrn->modes); -- scrn->modes = xf86ModesAdd(scrn->modes, -- xf86CVTMode(width, height, 60, 0, 0)); -- } -+ xf86SetScrnInfoModes (scrn); - - success = TRUE; - bailout: --- -cgit v0.9.0.2-2-gbebe -From 97f2ae60fc0cc755abd8b88df826fcb1a20464fe Mon Sep 17 00:00:00 2001 -From: Christopher Yeleighton -Date: Tue, 25 Oct 2011 01:47:06 +0000 -Subject: Bug 38420: Xvfb crashes in miInitVisuals() when started with depth=2 - -https://bugs.freedesktop.org/show_bug.cgi?id=38420 - -Exit with fatal error message, not segfault. - -Signed-off-by: Alan Coopersmith -Reviewed-by: Jeremy Huddleston -Signed-off-by: Keith Packard -(cherry picked from commit 7d50211ab57a35910d79fc3f67ae89aff91fa995) ---- -diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c -index 31ed505..dce3f84 100644 ---- a/hw/vfb/InitOutput.c -+++ b/hw/vfb/InitOutput.c -@@ -864,6 +864,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) - (1 << DirectColor)), - 10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff); - break; -+ default: -+ return FALSE; - } - - miSetPixmapDepths (); --- -cgit v0.9.0.2-2-gbebe -From 34bb83b9df20ff63dbb147ed661f39efb8bae8e4 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 24 Oct 2011 02:00:32 +0000 -Subject: dix: block signals when closing all devices - -When closing down all devices, we manually unset master for all attached -devices, but the device's sprite info still points to the master's sprite -info. This leaves us a window where the master is freed already but the -device isn't yet. A signal during that window causes dereference of the -already freed spriteInfo in mieqEnqueue's EnqueueScreen macro. - -Simply block signals when removing all devices. It's not like we're really -worrying about high-responsive input at this stage. - -https://bugzilla.redhat.com/show_bug.cgi?id=737031 - -Signed-off-by: Peter Hutterer -Reviewed-by: Julien Cristau -(cherry picked from commit d7c44a7c9760449bef263413ad3b20f19b1dc95a) ---- -diff --git a/dix/devices.c b/dix/devices.c -index 0ccf252..cbdd4ea 100644 ---- a/dix/devices.c -+++ b/dix/devices.c -@@ -982,6 +982,8 @@ CloseDownDevices(void) - { - DeviceIntPtr dev; - -+ OsBlockSignals(); -+ - /* Float all SDs before closing them. Note that at this point resources - * (e.g. cursors) have been freed already, so we can't just call - * AttachDevice(NULL, dev, NULL). Instead, we have to forcibly set master -@@ -1004,6 +1006,8 @@ CloseDownDevices(void) - inputInfo.keyboard = NULL; - inputInfo.pointer = NULL; - XkbDeleteRulesDflts(); -+ -+ OsReleaseSignals(); - } - - /** --- -cgit v0.9.0.2-2-gbebe diff --git a/testing/xorg-server/revert-trapezoids.patch b/testing/xorg-server/revert-trapezoids.patch deleted file mode 100644 index b9046c5cb..000000000 --- a/testing/xorg-server/revert-trapezoids.patch +++ /dev/null @@ -1,179 +0,0 @@ -diff -ru a/fb/fbpict.c b/fb/fbpict.c ---- a/fb/fbpict.c 2011-08-01 01:44:24.000000000 +0200 -+++ b/fb/fbpict.c 2011-10-05 22:45:29.000000000 +0200 -@@ -364,7 +364,7 @@ - ps->Glyphs = miGlyphs; - ps->CompositeRects = miCompositeRects; - ps->RasterizeTrapezoid = fbRasterizeTrapezoid; -- ps->Trapezoids = fbTrapezoids; -+ ps->Trapezoids = miTrapezoids; - ps->AddTraps = fbAddTraps; - ps->AddTriangles = fbAddTriangles; - ps->Triangles = fbTriangles; -diff -ru a/render/mipict.c b/render/mipict.c ---- a/render/mipict.c 2011-04-04 05:19:50.000000000 +0200 -+++ b/render/mipict.c 2011-10-05 22:02:53.000000000 +0200 -@@ -573,6 +573,67 @@ - } - } - -+void -+miTrapezoids (CARD8 op, -+ PicturePtr pSrc, -+ PicturePtr pDst, -+ PictFormatPtr maskFormat, -+ INT16 xSrc, -+ INT16 ySrc, -+ int ntrap, -+ xTrapezoid *traps) -+{ -+ ScreenPtr pScreen = pDst->pDrawable->pScreen; -+ PictureScreenPtr ps = GetPictureScreen(pScreen); -+ -+ /* -+ * Check for solid alpha add -+ */ -+ if (op == PictOpAdd && miIsSolidAlpha (pSrc)) -+ { -+ for (; ntrap; ntrap--, traps++) -+ (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0); -+ } -+ else if (maskFormat) -+ { -+ PicturePtr pPicture; -+ BoxRec bounds; -+ INT16 xDst, yDst; -+ INT16 xRel, yRel; -+ -+ xDst = traps[0].left.p1.x >> 16; -+ yDst = traps[0].left.p1.y >> 16; -+ -+ miTrapezoidBounds (ntrap, traps, &bounds); -+ if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) -+ return; -+ pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat, -+ bounds.x2 - bounds.x1, -+ bounds.y2 - bounds.y1); -+ if (!pPicture) -+ return; -+ for (; ntrap; ntrap--, traps++) -+ (*ps->RasterizeTrapezoid) (pPicture, traps, -+ -bounds.x1, -bounds.y1); -+ xRel = bounds.x1 + xSrc - xDst; -+ yRel = bounds.y1 + ySrc - yDst; -+ CompositePicture (op, pSrc, pPicture, pDst, -+ xRel, yRel, 0, 0, bounds.x1, bounds.y1, -+ bounds.x2 - bounds.x1, -+ bounds.y2 - bounds.y1); -+ FreePicture (pPicture, 0); -+ } -+ else -+ { -+ if (pDst->polyEdge == PolyEdgeSharp) -+ maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1); -+ else -+ maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8); -+ for (; ntrap; ntrap--, traps++) -+ miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps); -+ } -+} -+ - Bool - miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) - { -@@ -599,7 +660,7 @@ - ps->Composite = 0; /* requires DDX support */ - ps->Glyphs = miGlyphs; - ps->CompositeRects = miCompositeRects; -- ps->Trapezoids = 0; -+ ps->Trapezoids = miTrapezoids; - ps->Triangles = 0; - - ps->RasterizeTrapezoid = 0; /* requires DDX support */ -diff -ru a/render/mipict.h b/render/mipict.h ---- a/render/mipict.h 2011-04-04 05:19:50.000000000 +0200 -+++ b/render/mipict.h 2011-10-05 22:06:19.000000000 +0200 -@@ -129,6 +129,23 @@ - CARD32 pixel, - xRenderColor *color); - -+extern _X_EXPORT PicturePtr -+miCreateAlphaPicture (ScreenPtr pScreen, -+ PicturePtr pDst, -+ PictFormatPtr pPictFormat, -+ CARD16 width, -+ CARD16 height); -+ -+extern _X_EXPORT void -+miTrapezoids (CARD8 op, -+ PicturePtr pSrc, -+ PicturePtr pDst, -+ PictFormatPtr maskFormat, -+ INT16 xSrc, -+ INT16 ySrc, -+ int ntrap, -+ xTrapezoid *traps); -+ - extern _X_EXPORT Bool - miIsSolidAlpha (PicturePtr pSrc); - -diff -ru a/render/mitrap.c b/render/mitrap.c ---- a/render/mitrap.c 2011-04-04 05:19:50.000000000 +0200 -+++ b/render/mitrap.c 2011-10-05 22:05:29.000000000 +0200 -@@ -34,6 +34,55 @@ - #include "picturestr.h" - #include "mipict.h" - -+PicturePtr -+miCreateAlphaPicture (ScreenPtr pScreen, -+ PicturePtr pDst, -+ PictFormatPtr pPictFormat, -+ CARD16 width, -+ CARD16 height) -+{ -+ PixmapPtr pPixmap; -+ PicturePtr pPicture; -+ GCPtr pGC; -+ int error; -+ xRectangle rect; -+ -+ if (width > 32767 || height > 32767) -+ return 0; -+ -+ if (!pPictFormat) -+ { -+ if (pDst->polyEdge == PolyEdgeSharp) -+ pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1); -+ else -+ pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8); -+ if (!pPictFormat) -+ return 0; -+ } -+ -+ pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, -+ pPictFormat->depth, 0); -+ if (!pPixmap) -+ return 0; -+ pGC = GetScratchGC (pPixmap->drawable.depth, pScreen); -+ if (!pGC) -+ { -+ (*pScreen->DestroyPixmap) (pPixmap); -+ return 0; -+ } -+ ValidateGC (&pPixmap->drawable, pGC); -+ rect.x = 0; -+ rect.y = 0; -+ rect.width = width; -+ rect.height = height; -+ (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect); -+ FreeScratchGC (pGC); -+ pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat, -+ 0, 0, serverClient, &error); -+ (*pScreen->DestroyPixmap) (pPixmap); -+ return pPicture; -+} -+ - static xFixed - miLineFixedX (xLineFixed *l, xFixed y, Bool ceil) - { - diff --git a/testing/xorg-server/xserver-1.11.2-record-crasher.patch b/testing/xorg-server/xserver-1.11.2-record-crasher.patch deleted file mode 100644 index 3af207bb9..000000000 --- a/testing/xorg-server/xserver-1.11.2-record-crasher.patch +++ /dev/null @@ -1,241 +0,0 @@ -From patchwork Tue Nov 8 18:22:13 2011 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: Save major/minor opcodes in ClientRec for RecordAReply -Date: Tue, 08 Nov 2011 18:22:13 -0000 -From: Keith Packard -X-Patchwork-Id: 7866 -Message-Id: <1320776533-3120-1-git-send-email-keithp@keithp.com> -To: xorg-devel@lists.freedesktop.org - -The record extension needs the major and minor opcodes in the reply -hook, but the request buffer may have been freed by the time the hook -is invoked. Saving the request major and minor codes as the request is -executed avoids fetching from the defunct request buffer. - -This patch also eliminates the public MinorOpcodeOfRequest function, -making it static to dispatch. Usages of that function have been -replaced with direct access to the new ClientRec field. - -Signed-off-by: Keith Packard -Reviewed-by: Rami Ylimäki - ---- -Here's what I was thinking of to fix this -- just record the major and -minor opcodes of the request in the ClientRec during Dispatch and then -using those fields in RecordAReply instead of fetching the discarded -request buffer. - -This is entirely untested; I don't know how to make the old code break. - - Xext/security.c | 4 +--- - Xext/xselinux_hooks.c | 4 ++-- - dix/dispatch.c | 31 ++++++++++++++++++++++--------- - dix/extension.c | 14 -------------- - include/dixstruct.h | 1 + - include/extension.h | 2 -- - record/record.c | 8 +++----- - 7 files changed, 29 insertions(+), 35 deletions(-) - -[ fedora: technically this is an ABI breaker since it's changing ClientRec, - but hopefully not in a way that matters. If it does matter, easiest thing - to do is have Record add a hook for XaceHookDispatch. - ajax ] - -diff --git a/Xext/security.c b/Xext/security.c -index 08d8158..b0d82ab 100644 ---- a/Xext/security.c -+++ b/Xext/security.c -@@ -148,9 +148,7 @@ SecurityLabelInitial(void) - static _X_INLINE const char * - SecurityLookupRequestName(ClientPtr client) - { -- int major = ((xReq *)client->requestBuffer)->reqType; -- int minor = MinorOpcodeOfRequest(client); -- return LookupRequestName(major, minor); -+ return LookupRequestName(client->majorOp, client->minorOp); - } - - -diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c -index f1d8e5d..0d4c9ab 100644 ---- a/Xext/xselinux_hooks.c -+++ b/Xext/xselinux_hooks.c -@@ -263,8 +263,8 @@ SELinuxAudit(void *auditdata, - if (client) { - REQUEST(xReq); - if (stuff) { -- major = stuff->reqType; -- minor = MinorOpcodeOfRequest(client); -+ major = client->majorOp; -+ minor = client->minorOp; - } - } - if (audit->id) -diff --git a/dix/dispatch.c b/dix/dispatch.c -index 6e33615..3600acd 100644 ---- a/dix/dispatch.c -+++ b/dix/dispatch.c -@@ -337,7 +337,20 @@ DisableLimitedSchedulingLatency(void) - SmartScheduleLatencyLimited = 0; - } - --#define MAJOROP ((xReq *)client->requestBuffer)->reqType -+static inline unsigned short -+MinorOpcodeOfRequest(ClientPtr client) -+{ -+ unsigned char major; -+ ExtensionEntry *ext; -+ -+ major = ((xReq *)client->requestBuffer)->reqType; -+ if (major < EXTENSION_BASE) -+ return 0; -+ ext = GetExtensionEntry(major); -+ if (!ext) -+ return 0; -+ return ext->MinorOpcode (client); -+} - - void - Dispatch(void) -@@ -419,21 +432,23 @@ Dispatch(void) - } - - client->sequence++; -+ client->majorOp = ((xReq *)client->requestBuffer)->reqType; -+ client->minorOp = MinorOpcodeOfRequest(client); - #ifdef XSERVER_DTRACE -- XSERVER_REQUEST_START(LookupMajorName(MAJOROP), MAJOROP, -+ XSERVER_REQUEST_START(LookupMajorName(client->majorOp), client->majorOp, - ((xReq *)client->requestBuffer)->length, - client->index, client->requestBuffer); - #endif - if (result > (maxBigRequestSize << 2)) - result = BadLength; - else { -- result = XaceHookDispatch(client, MAJOROP); -+ result = XaceHookDispatch(client, client->majorOp); - if (result == Success) -- result = (* client->requestVector[MAJOROP])(client); -+ result = (* client->requestVector[client->majorOp])(client); - XaceHookAuditEnd(client, result); - } - #ifdef XSERVER_DTRACE -- XSERVER_REQUEST_DONE(LookupMajorName(MAJOROP), MAJOROP, -+ XSERVER_REQUEST_DONE(LookupMajorName(client->majorOp), client->majorOp, - client->sequence, client->index, result); - #endif - -@@ -444,8 +459,8 @@ Dispatch(void) - } - else if (result != Success) - { -- SendErrorToClient(client, MAJOROP, -- MinorOpcodeOfRequest(client), -+ SendErrorToClient(client, client->majorOp, -+ client->minorOp, - client->errorValue, result); - break; - } -@@ -466,8 +481,6 @@ Dispatch(void) - SmartScheduleLatencyLimited = 0; - } - --#undef MAJOROP -- - static int VendorRelease = VENDOR_RELEASE; - static char *VendorString = VENDOR_NAME; - -diff --git a/dix/extension.c b/dix/extension.c -index c7bbac5..b677cdb 100644 ---- a/dix/extension.c -+++ b/dix/extension.c -@@ -228,20 +228,6 @@ StandardMinorOpcode(ClientPtr client) - return ((xReq *)client->requestBuffer)->data; - } - --unsigned short --MinorOpcodeOfRequest(ClientPtr client) --{ -- unsigned char major; -- -- major = ((xReq *)client->requestBuffer)->reqType; -- if (major < EXTENSION_BASE) -- return 0; -- major -= EXTENSION_BASE; -- if (major >= NumExtensions) -- return 0; -- return (*extensions[major]->MinorOpcode)(client); --} -- - void - CloseDownExtensions(void) - { -diff --git a/include/dixstruct.h b/include/dixstruct.h -index 6cc9614..0a85f40 100644 ---- a/include/dixstruct.h -+++ b/include/dixstruct.h -@@ -122,6 +122,7 @@ typedef struct _Client { - - DeviceIntPtr clientPtr; - ClientIdPtr clientIds; -+ unsigned short majorOp, minorOp; - } ClientRec; - - /* -diff --git a/include/extension.h b/include/extension.h -index 29a11c3..9249951 100644 ---- a/include/extension.h -+++ b/include/extension.h -@@ -52,8 +52,6 @@ _XFUNCPROTOBEGIN - - extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client*/); - --extern _X_EXPORT unsigned short MinorOpcodeOfRequest(ClientPtr /*client*/); -- - extern _X_EXPORT Bool EnableDisableExtension(char *name, Bool enable); - - extern _X_EXPORT void EnableDisableExtensionError(char *name, Bool enable); -diff --git a/record/record.c b/record/record.c -index 68311ac..4a0fe23 100644 ---- a/record/record.c -+++ b/record/record.c -@@ -546,7 +546,7 @@ RecordARequest(ClientPtr client) - } - else /* extension, check minor opcode */ - { -- int minorop = MinorOpcodeOfRequest(client); -+ int minorop = client->minorOp; - int numMinOpInfo; - RecordMinorOpPtr pMinorOpInfo = pRCAP->pRequestMinOpInfo; - -@@ -603,12 +603,9 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) - RecordContextPtr pContext; - RecordClientsAndProtocolPtr pRCAP; - int eci; -- int majorop; - ReplyInfoRec *pri = (ReplyInfoRec *)calldata; - ClientPtr client = pri->client; -- REQUEST(xReq); - -- majorop = stuff->reqType; - for (eci = 0; eci < numEnabledContexts; eci++) - { - pContext = ppAllContexts[eci]; -@@ -616,6 +613,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) - NULL); - if (pRCAP) - { -+ int majorop = client->majorOp; - if (pContext->continuedReply) - { - RecordAProtocolElement(pContext, client, XRecordFromServer, -@@ -635,7 +633,7 @@ RecordAReply(CallbackListPtr *pcbl, pointer nulldata, pointer calldata) - } - else /* extension, check minor opcode */ - { -- int minorop = MinorOpcodeOfRequest(client); -+ int minorop = client->minorOp; - int numMinOpInfo; - RecordMinorOpPtr pMinorOpInfo = pRCAP->pReplyMinOpInfo; - assert (pMinorOpInfo); diff --git a/testing/xorg-server/xvfb-run b/testing/xorg-server/xvfb-run deleted file mode 100644 index 4c2f4e0d3..000000000 --- a/testing/xorg-server/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/testing/xorg-server/xvfb-run.1 b/testing/xorg-server/xvfb-run.1 deleted file mode 100644 index 137d3a196..000000000 --- a/testing/xorg-server/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson . -.\" -.\" This is free software; you may redistribute it and/or modify -.\" it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2, -.\" or (at your option) any later version. -.\" -.\" This is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: -- cgit v1.2.3-54-g00ecf