CVSROOT: /home/x-cvs Module name: xc Changes by: [EMAIL PROTECTED] 06/02/19 07:51:32
Log message: 217. A rework of the way extension support is built into servers to allow for servers with different sets of extensions in the same build. This starts with an idea introduced in David Dawes's TinyX work, and extends it to also apply to the Xprt, Xnest, Xvfb, Xdmx and Xsun* servers. The changes include: - Add, as a comment, a definition for what makes an extension pervasive. - TOGCUP is not a pervasive extension, but XSYNC, BIGREQS and XRES are. - Consolidate #define's for the Xv, XvMC and XRES extensions. - Flip, in favour of the majority case, MITSHM's default decision WRT whether or not a framebuffer stores pixmap data in the server's virtual address space. MI is now independent of MITSHM and MITSHM is no longer a pervasive extension. - Add a DIX helper to determine whether Xinerama is active and use it instead of #ifdef'ed code in all loadable modules. Re-implement, as a screen wrapper, Xinerama's PaintWindow*() hacks. Move down to DIX Xinerama's only MI hook. Both MI and loadable module objects are now independent of Xinerama. - Add more XCSECURITY-related DIX helpers. Loadable module objects that provide their own extensions (e.g. apm) are now independent of the core binary's support for XCSECURITY. - Extend DBE to allow for front and back buffer revalidations (to be used in future changes to restore the only existing example of DBE hardware acceleration after converting the sunffb driver to fb, XAA & Render). This is the change that chronologically started all this. - Separate Xv and XvMC extensions more cleanly. - Move Xserver/*/tiny directories under Xserver/hw/tinyx. - Fix !PrintOnlyServer builds. - Clean up Xserver/Imakefile. - Remove remaining traces of Xdec* servers. - Fix parallel make bug in Xserver/Imakefile caused by unintentional symbol re-use. - Accomodate XWin more cleanly by not "skipping" over Xserver/hw. - Remove all extension stub code (no longer needed). `make World` is required to correctly build these changes. In fact, I recommend staring from a fresh checkout. These changes are bundled as one commit due to module versioning considerations. (Marc La France) Modified files: xc/config/cf/: X11.tmpl cygwin.cf dmx.cf xfree86.cf xc/include/extensions/: XShm.h shmstr.h xc/lib/font/: Imakefile xc/programs/Xserver/: Imakefile xc/programs/Xserver/GL/dri/: dri.c xc/programs/Xserver/XTrap/: Imakefile xc/programs/Xserver/Xext/: Imakefile panoramiX.c panoramiXSwap.c panoramiXprocs.c shm.c xprint.c xvdisp.c xc/programs/Xserver/Xext/extmod/: Imakefile modinit.c modinit.h xc/programs/Xserver/Xi/: Imakefile xc/programs/Xserver/Xprint/: Imakefile Init.c ddxInit.c xc/programs/Xserver/Xprint/pcl/: Imakefile PclInit.c xc/programs/Xserver/Xprint/ps/: Imakefile PsInit.c xc/programs/Xserver/Xprint/raster/: Imakefile xc/programs/Xserver/cfb/: cfbpntwin.c xc/programs/Xserver/dbe/: Imakefile dbe.c dbeproc.h dbestruct.h midbe.c midbe.h midbestr.h xc/programs/Xserver/dix/: Imakefile dixutils.c events.c main.c resource.c xc/programs/Xserver/fb/: fboverlay.c fbwindow.c xc/programs/Xserver/hw/: Imakefile xc/programs/Xserver/hw/darwin/: darwin.c xc/programs/Xserver/hw/dmx/: Imakefile xc/programs/Xserver/hw/dmx/glxProxy/: Imakefile xc/programs/Xserver/hw/sun/: Imakefile sunInit.c sunIo.c xc/programs/Xserver/hw/sunLynx/: Imakefile sunLyInit.c xc/programs/Xserver/hw/tinyx/: Imakefile tinyx.c xc/programs/Xserver/hw/vfb/: Imakefile InitInput.c xc/programs/Xserver/hw/xfree86/: CHANGELOG xc/programs/Xserver/hw/xfree86/common/: Imakefile xf86Module.h xc/programs/Xserver/hw/xfree86/drivers/apm/: Imakefile apm_rush.c xc/programs/Xserver/hw/xfree86/drivers/i810/: i830_video.c xc/programs/Xserver/hw/xfree86/drivers/sis/: sis_driver.c xc/programs/Xserver/hw/xfree86/drivers/xgi/: xgi_driver.c xc/programs/Xserver/hw/xfree86/input/wacom/: xf86Wacom.c xc/programs/Xserver/hw/xfree86/loader/: Imakefile dixsym.c extsym.c misym.c xc/programs/Xserver/hw/xfree86/xaa/: xaaOverlay.c xaaPaintWin.c xc/programs/Xserver/hw/xfree86/xf8_32bpp/: cfbpntwin.c xc/programs/Xserver/hw/xnest/: Imakefile Init.c xc/programs/Xserver/include/: dix.h resource.h windowstr.h xc/programs/Xserver/mi/: Imakefile miexpose.c miinitext.c miscrinit.c xc/programs/Xserver/miext/rootless/safeAlpha/: safeAlphaWindow.c xc/programs/Xserver/os/: Imakefile WaitFor.c utils.c xc/programs/Xserver/randr/: Imakefile xc/programs/Xserver/record/: Imakefile xc/programs/Xserver/render/: Imakefile picture.c xc/programs/Xserver/xkb/: Imakefile xc/programs/xfs/os/: Imakefile Added files: xc/programs/Xserver/Xprint/XTrap/: Imakefile xc/programs/Xserver/Xprint/Xext/: Imakefile xc/programs/Xserver/Xprint/dbe/: Imakefile xc/programs/Xserver/Xprint/dix/: Imakefile xc/programs/Xserver/Xprint/os/: Imakefile xc/programs/Xserver/Xprint/randr/: Imakefile xc/programs/Xserver/Xprint/record/: Imakefile xc/programs/Xserver/Xprint/render/: Imakefile xc/programs/Xserver/hw/dmx/Xext/: Imakefile xc/programs/Xserver/hw/dmx/dix/: Imakefile xc/programs/Xserver/hw/dmx/os/: Imakefile xc/programs/Xserver/hw/sun/XTrap/: Imakefile xc/programs/Xserver/hw/sun/Xext/: Imakefile xc/programs/Xserver/hw/sun/dbe/: Imakefile xc/programs/Xserver/hw/sun/dix/: Imakefile xc/programs/Xserver/hw/sun/os/: Imakefile xc/programs/Xserver/hw/sun/randr/: Imakefile xc/programs/Xserver/hw/sun/record/: Imakefile xc/programs/Xserver/hw/sun/render/: Imakefile xc/programs/Xserver/hw/sun/xkb/: Imakefile xc/programs/Xserver/hw/sunLynx/XTrap/: Imakefile xc/programs/Xserver/hw/sunLynx/Xext/: Imakefile xc/programs/Xserver/hw/sunLynx/dbe/: Imakefile xc/programs/Xserver/hw/sunLynx/dix/: Imakefile xc/programs/Xserver/hw/sunLynx/os/: Imakefile xc/programs/Xserver/hw/sunLynx/randr/: Imakefile xc/programs/Xserver/hw/sunLynx/record/: Imakefile xc/programs/Xserver/hw/sunLynx/render/: Imakefile xc/programs/Xserver/hw/sunLynx/xkb/: Imakefile xc/programs/Xserver/hw/tinyx/Xext/: Imakefile xc/programs/Xserver/hw/tinyx/dix/: Imakefile xc/programs/Xserver/hw/tinyx/os/: Imakefile xc/programs/Xserver/hw/tinyx/randr/: Imakefile xc/programs/Xserver/hw/tinyx/render/: Imakefile xc/programs/Xserver/hw/vfb/XTrap/: Imakefile xc/programs/Xserver/hw/vfb/Xext/: Imakefile xc/programs/Xserver/hw/vfb/dbe/: Imakefile xc/programs/Xserver/hw/vfb/dix/: Imakefile xc/programs/Xserver/hw/vfb/os/: Imakefile xc/programs/Xserver/hw/vfb/randr/: Imakefile xc/programs/Xserver/hw/vfb/record/: Imakefile xc/programs/Xserver/hw/vfb/render/: Imakefile xc/programs/Xserver/hw/xnest/XTrap/: Imakefile xc/programs/Xserver/hw/xnest/Xext/: Imakefile xc/programs/Xserver/hw/xnest/dbe/: Imakefile xc/programs/Xserver/hw/xnest/dix/: Imakefile xc/programs/Xserver/hw/xnest/os/: Imakefile xc/programs/Xserver/hw/xnest/randr/: Imakefile xc/programs/Xserver/hw/xnest/record/: Imakefile xc/programs/Xserver/hw/xnest/render/: Imakefile xc/programs/Xserver/hw/xnest/xkb/: Imakefile Removed files: xc/programs/Xserver/Xext/: dpmsstubs.c xc/programs/Xserver/Xext/tiny/: Imakefile xc/programs/Xserver/Xi/: stubs.c xc/programs/Xserver/dix/: xpstubs.c xc/programs/Xserver/dix/tiny/: Imakefile xc/programs/Xserver/os/tiny/: Imakefile xc/programs/Xserver/randr/tiny/: Imakefile xc/programs/Xserver/render/tiny/: Imakefile Revision Changes Path 1.290 +397 -201 xc/config/cf/X11.tmpl 3.63 +2 -5 xc/config/cf/cygwin.cf 1.4 +5 -28 xc/config/cf/dmx.cf 3.503 +2 -29 xc/config/cf/xfree86.cf 1.14 +4 -1 xc/include/extensions/XShm.h 3.6 +5 -1 xc/include/extensions/shmstr.h 3.42 +2 -2 xc/lib/font/Imakefile 3.318 +1113 -815 xc/programs/Xserver/Imakefile 1.44 +5 -21 xc/programs/Xserver/GL/dri/dri.c 1.6 +7 -2 xc/programs/Xserver/XTrap/Imakefile 3.51 +104 -66 xc/programs/Xserver/Xext/Imakefile 3.46 +62 -15 xc/programs/Xserver/Xext/panoramiX.c 3.13 +5 -1 xc/programs/Xserver/Xext/panoramiXSwap.c 3.40 +5 -1 xc/programs/Xserver/Xext/panoramiXprocs.c 3.47 +26 -15 xc/programs/Xserver/Xext/shm.c 1.18 +2 -1 xc/programs/Xserver/Xext/xprint.c 1.32 +3 -3 xc/programs/Xserver/Xext/xvdisp.c 1.27 +49 -29 xc/programs/Xserver/Xext/extmod/Imakefile 1.19 +3 -1 xc/programs/Xserver/Xext/extmod/modinit.c 1.5 +6 -6 xc/programs/Xserver/Xext/extmod/modinit.h 3.5 +1 -2 xc/programs/Xserver/Xi/Imakefile 1.24 +78 -45 xc/programs/Xserver/Xprint/Imakefile 1.17 +10 -2 xc/programs/Xserver/Xprint/Init.c 1.18 +2 -111 xc/programs/Xserver/Xprint/ddxInit.c 1.10 +12 -11 xc/programs/Xserver/Xprint/pcl/Imakefile 1.14 +10 -1 xc/programs/Xserver/Xprint/pcl/PclInit.c 1.11 +14 -14 xc/programs/Xserver/Xprint/ps/Imakefile 1.16 +10 -1 xc/programs/Xserver/Xprint/ps/PsInit.c 1.9 +8 -8 xc/programs/Xserver/Xprint/raster/Imakefile 3.11 +3 -34 xc/programs/Xserver/cfb/cfbpntwin.c 3.15 +8 -3 xc/programs/Xserver/dbe/Imakefile 3.14 +13 -10 xc/programs/Xserver/dbe/dbe.c 1.2 +13 -3 xc/programs/Xserver/dbe/dbeproc.h 3.5 +2 -1 xc/programs/Xserver/dbe/dbestruct.h 3.8 +3 -16 xc/programs/Xserver/dbe/midbe.c 3.4 +5 -1 xc/programs/Xserver/dbe/midbe.h 3.3 +4 -1 xc/programs/Xserver/dbe/midbestr.h 3.24 +44 -59 xc/programs/Xserver/dix/Imakefile 3.17 +49 -3 xc/programs/Xserver/dix/dixutils.c 3.58 +38 -6 xc/programs/Xserver/dix/events.c 3.49 +19 -3 xc/programs/Xserver/dix/main.c 3.17 +20 -6 xc/programs/Xserver/dix/resource.c 1.8 +1 -5 xc/programs/Xserver/fb/fboverlay.c 1.13 +2 -17 xc/programs/Xserver/fb/fbwindow.c 1.4 +52 -10 xc/programs/Xserver/hw/Imakefile 1.60 +1 -5 xc/programs/Xserver/hw/darwin/darwin.c 1.11 +13 -26 xc/programs/Xserver/hw/dmx/Imakefile 1.7 +2 -2 xc/programs/Xserver/hw/dmx/glxProxy/Imakefile 1.12 +58 -46 xc/programs/Xserver/hw/sun/Imakefile 3.16 +1 -26 xc/programs/Xserver/hw/sun/sunInit.c 3.12 +1 -6 xc/programs/Xserver/hw/sun/sunIo.c 3.6 +70 -55 xc/programs/Xserver/hw/sunLynx/Imakefile 3.12 +1 -26 xc/programs/Xserver/hw/sunLynx/sunLyInit.c 1.7 +17 -11 xc/programs/Xserver/hw/tinyx/Imakefile 1.2 +2 -54 xc/programs/Xserver/hw/tinyx/tinyx.c 3.33 +37 -22 xc/programs/Xserver/hw/vfb/Imakefile 3.12 +1 -20 xc/programs/Xserver/hw/vfb/InitInput.c 3.3668 +37 -1 xc/programs/Xserver/hw/xfree86/CHANGELOG 3.161 +11 -4 xc/programs/Xserver/hw/xfree86/common/Imakefile 1.44 +8 -8 xc/programs/Xserver/hw/xfree86/common/xf86Module.h 1.28 +5 -3 xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile 1.15 +8 -4 xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c 1.26 +15 -23 xc/programs/Xserver/hw/xfree86/drivers/i810/i830_video.c 1.203 +17 -1 xc/programs/Xserver/hw/xfree86/drivers/sis/sis_driver.c 1.8 +8 -1 xc/programs/Xserver/hw/xfree86/drivers/xgi/xgi_driver.c 1.50 +7 -12 xc/programs/Xserver/hw/xfree86/input/wacom/xf86Wacom.c 1.44 +3 -9 xc/programs/Xserver/hw/xfree86/loader/Imakefile 1.70 +8 -7 xc/programs/Xserver/hw/xfree86/loader/dixsym.c 1.11 +7 -2 xc/programs/Xserver/hw/xfree86/loader/extsym.c 1.40 +2 -6 xc/programs/Xserver/hw/xfree86/loader/misym.c 1.18 +1 -16 xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c 1.13 +1 -16 xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c 1.7 +2 -24 xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c 3.31 +42 -12 xc/programs/Xserver/hw/xnest/Imakefile 3.28 +1 -30 xc/programs/Xserver/hw/xnest/Init.c 3.30 +86 -124 xc/programs/Xserver/include/dix.h 1.14 +5 -20 xc/programs/Xserver/include/resource.h 1.9 +8 -3 xc/programs/Xserver/include/windowstr.h 3.37 +5 -13 xc/programs/Xserver/mi/Imakefile 3.13 +1 -37 xc/programs/Xserver/mi/miexpose.c 3.78 +17 -21 xc/programs/Xserver/mi/miinitext.c 3.19 +1 -10 xc/programs/Xserver/mi/miscrinit.c 1.3 +1 -17 xc/programs/Xserver/miext/rootless/safeAlpha/safeAlphaWindow.c 3.47 +17 -29 xc/programs/Xserver/os/Imakefile 3.50 +22 -31 xc/programs/Xserver/os/WaitFor.c 3.108 +8 -3 xc/programs/Xserver/os/utils.c 1.5 +5 -15 xc/programs/Xserver/randr/Imakefile 1.18 +7 -3 xc/programs/Xserver/record/Imakefile 1.14 +5 -15 xc/programs/Xserver/render/Imakefile 1.32 +2 -2 xc/programs/Xserver/render/picture.c 3.25 +42 -6 xc/programs/Xserver/xkb/Imakefile 3.12 +5 -3 xc/programs/xfs/os/Imakefile _______________________________________________ Cvs-commit mailing list Cvs-commit@XFree86.Org http://XFree86.Org/mailman/listinfo/cvs-commit