diff --git a/.gitignore b/.gitignore index ce396c928..429f677ff 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,12 @@ Makefile Makefile.in .deps .libs +.msg *.lo *.la *.a *.o +*~ aclocal.m4 autom4te.cache compile @@ -23,12 +25,6 @@ xorg-server.pc stamp-h? do-not-use-config.h do-not-use-config.h.in -XpConfig/C/print/Xprinters.ghostscript -Xprint/Xprt -Xprint/doc/Xprt.1x -Xprint/doc/Xprt.man -Xprint/dpmsstubs-wrapper.c -Xprint/miinitext-wrapper.c afb/afbbltC.c afb/afbbltCI.c afb/afbbltG.c @@ -216,6 +212,12 @@ hw/xfree86/xorg.c hw/xnest/Xnest hw/xnest/Xnest.1x hw/xnest/Xnest.man +hw/xprint/Xprt +hw/xprint/config/C/print/Xprinters.ghostscript +hw/xprint/doc/Xprt.1x +hw/xprint/doc/Xprt.man +hw/xprint/dpmsstubs-wrapper.c +hw/xprint/miinitext-wrapper.c include/dix-config.h include/kdrive-config.h include/xgl-config.h diff --git a/GL/glx/.gitignore b/GL/glx/.gitignore new file mode 100644 index 000000000..5cf6f0a44 --- /dev/null +++ b/GL/glx/.gitignore @@ -0,0 +1,5 @@ +indirect_size.h +glcontextmodes.c +glcontextmodes.h +glapi.c +glthread.c diff --git a/GL/mesa/.gitignore b/GL/mesa/.gitignore new file mode 100644 index 000000000..82ab82747 --- /dev/null +++ b/GL/mesa/.gitignore @@ -0,0 +1,32 @@ +X/drivers +X/glxheader.h +X/xmesaP.h +X/xm*.c +array_cache/*.c +array_cache/*.h +mesa/drivers +mesa/glxheader.h +mesa/xm*.c +glapi/*.c +glapi/*.h +main/*.c +main/*.h +math/*.c +math/*.h +ppc +shader/*.c +shader/*.h +shader/slang/*.c +shader/slang/*.h +shader/slang/library +shader/grammar/*.c +shader/grammar/*.h +sparc +swrast/*.c +swrast/*.h +swrast_setup/*.c +swrast_setup/*.h +tnl/*.c +tnl/*.h +x86 +x86-64 diff --git a/Makefile.am b/Makefile.am index 773e7690f..c425cc6bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,11 +26,6 @@ if GLX GLX_DIR=GL endif -if XPRINT -XPDDX_DIR=Xprint -XPCONFIG_DIR=XpConfig -endif - if XINPUT XINPUT_DIR=Xi endif @@ -64,9 +59,7 @@ SUBDIRS = \ $(COMPOSITE_DIR) \ $(GLX_DIR) \ exa \ - hw \ - $(XPDDX_DIR) \ - $(XPCONFIG_DIR) + hw aclocaldir = $(datadir)/aclocal aclocal_DATA = xorg-server.m4 @@ -101,9 +94,7 @@ DIST_SUBDIRS = \ composite \ GL \ exa \ - hw \ - Xprint \ - XpConfig + hw # gross hack relink: all diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c index 26da8cbb4..1c4f5ca06 100644 --- a/XTrap/xtrapdi.c +++ b/XTrap/xtrapdi.c @@ -170,7 +170,7 @@ static ClientList cmd_clients; /* Linked-list of clients using command key */ /*----------------------------* * Forward Declarations *----------------------------*/ -static void _SwapProc (int (**f1 )(), int (**f2 )()); +static void _SwapProc (int (**f1 )(void), int (**f2 )(void)); static void sXETrapEvent (xETrapDataEvent *from , xETrapDataEvent *to ); static int add_accelerator_node (ClientPtr client , ClientList *accel ); static void remove_accelerator_node (ClientPtr client , ClientList *accel ); @@ -886,14 +886,14 @@ int XETrapConfig(xXTrapConfigReq *request, ClientPtr client) { /* Client wants the XTrap rtn */ if (++(vectored_requests[i]) <= 1L) { /* first client, so do it */ - _SwapProc(&(XETrapProcVector[i]), &(ProcVector[i])); + _SwapProc(&(XETrapProcVector[i]), (int_function *)&(ProcVector[i])); } } else { /* Client wants the *real* rtn */ if (--(vectored_requests[i]) <= 0L) { /* No more clients using, so do it */ - _SwapProc(&(XETrapProcVector[i]), &(ProcVector[i])); + _SwapProc(&(XETrapProcVector[i]), (int_function *)&(ProcVector[i])); } } if (status == Success) @@ -1787,9 +1787,9 @@ static void update_protocol(xXTrapGetReq *reqptr, ClientPtr client) * lint from complaining about mixed types. It seems to work, but I would * probably classify this as a hack. */ -static void _SwapProc( register int (**f1)(), register int (**f2)()) +static void _SwapProc( register int (**f1)(void), register int (**f2)(void)) { - register int (*t1)() = *f1; + register int (*t1)(void) = *f1; *f1 = *f2; *f2 = t1; diff --git a/XTrap/xtrapdiswp.c b/XTrap/xtrapdiswp.c index b0fa43957..dc2a3383a 100644 --- a/XTrap/xtrapdiswp.c +++ b/XTrap/xtrapdiswp.c @@ -374,13 +374,13 @@ void XETSwSendEvent(register xSendEventReq *data) { register char n; xEvent eventT; - void (*proc)(); + EventSwapPtr proc; swapl(&(data->destination), n); swapl(&(data->eventMask), n); /* Swap event */ proc = EventSwapVector[data->event.u.u.type & 0177]; - if (!proc || (int (*)()) proc == (int (*)()) NotImplemented) + if (!proc || proc == NotImplemented) (*proc)(&(data->event), &eventT); data->event = eventT; swaps(&(data->length), n); diff --git a/Xext/xprint.c b/Xext/xprint.c index 60512d372..9a4f2653e 100644 --- a/Xext/xprint.c +++ b/Xext/xprint.c @@ -85,8 +85,8 @@ copyright holders. #include #include #include -#include "../Xprint/DiPrint.h" -#include "../Xprint/attributes.h" +#include "../hw/xprint/DiPrint.h" +#include "../hw/xprint/attributes.h" #include "modinit.h" static void XpResetProc(ExtensionEntry *); diff --git a/Xprint/pcl/PclPixmap.c b/Xprint/pcl/PclPixmap.c deleted file mode 100644 index 9449dfdd6..000000000 --- a/Xprint/pcl/PclPixmap.c +++ /dev/null @@ -1,85 +0,0 @@ -/* $Xorg: PclPixmap.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ -/******************************************************************* -** -** ********************************************************* -** * -** * File: PclPixmap.c -** * -** * Contents: -** * Pixmap handling code for the PCL DDX driver -** * -** * Created: 2/19/96 -** * -** ********************************************************* -** -********************************************************************/ -/* -(c) Copyright 1996 Hewlett-Packard Company -(c) Copyright 1996 International Business Machines Corp. -(c) Copyright 1996 Sun Microsystems, Inc. -(c) Copyright 1996 Novell, Inc. -(c) Copyright 1996 Digital Equipment Corp. -(c) Copyright 1996 Fujitsu Limited -(c) Copyright 1996 Hitachi, Ltd. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the names of the copyright holders shall -not be used in advertising or otherwise to promote the sale, use or other -dealings in this Software without prior written authorization from said -copyright holders. -*/ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixmap.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#include "Pcl.h" -#include "cfb.h" -#include "cfb32.h" -#include "mfb.h" -#include "pixmapstr.h" - -PixmapPtr -PclCreatePixmap(ScreenPtr pScreen, - int width, - int height, - int depth) -{ - if( depth == 1 ) - return mfbCreatePixmap( pScreen, width, height, depth ); - else if( depth <= 8 ) - return cfbCreatePixmap( pScreen, width, height, depth ); - else if( depth <= 32 ) - return cfb32CreatePixmap( pScreen, width, height, depth ); - return 0; -} - - -Bool -PclDestroyPixmap(PixmapPtr pPixmap) -{ - if( pPixmap->drawable.depth == 1 ) - return mfbDestroyPixmap( pPixmap ); - else if( pPixmap->drawable.depth <= 8 ) - return cfbDestroyPixmap( pPixmap ); - else if( pPixmap->drawable.depth <= 32 ) - return cfb32DestroyPixmap( pPixmap ); - return 0; -} diff --git a/configure.ac b/configure.ac index a75d2d180..fa1647cc3 100644 --- a/configure.ac +++ b/configure.ac @@ -1028,7 +1028,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' XORG_INCS="$XORG_DDXINCS $XORG_OSINCS" XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H" - XORG_LIBS="$MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $OS_LIB" + XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XPSTUBS_LIB $OS_LIB" AC_CHECK_LIB([dl], [dlopen], XORG_LIBS="$XORG_LIBS -ldl") @@ -1727,41 +1727,41 @@ hw/kdrive/smi/Makefile hw/kdrive/src/Makefile hw/kdrive/vesa/Makefile hw/kdrive/via/Makefile -Xprint/Makefile -Xprint/doc/Makefile -Xprint/pcl/Makefile -Xprint/pcl-mono/Makefile -Xprint/raster/Makefile -Xprint/ps/Makefile -Xprint/etc/Makefile -Xprint/etc/Xsession.d/Makefile -Xprint/etc/init.d/Makefile -Xprint/etc/profile.d/Makefile -XpConfig/Makefile -XpConfig/C/print/attributes/Makefile -XpConfig/C/print/ddx-config/Makefile -XpConfig/C/print/ddx-config/raster/Makefile -XpConfig/C/print/models/CANONBJ10E-GS/Makefile -XpConfig/C/print/models/PSdefault/fonts/Makefile -XpConfig/C/print/models/PSdefault/Makefile -XpConfig/C/print/models/PSspooldir/Makefile -XpConfig/C/print/models/SPSPARC2/Makefile -XpConfig/C/print/models/SPSPARC2/fonts/Makefile -XpConfig/C/print/models/GSdefault/Makefile -XpConfig/C/print/models/HPLJ4050-PS/Makefile -XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile -XpConfig/C/print/models/Makefile -XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile -XpConfig/C/print/models/CANONC3200-PS/Makefile -XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile -XpConfig/C/print/models/HPLJ4family/fonts/Makefile -XpConfig/C/print/models/HPLJ4family/Makefile -XpConfig/C/print/models/HPDJ1600C/Makefile -XpConfig/C/print/models/HPDJ1600C/fonts/Makefile -XpConfig/C/print/Makefile -XpConfig/C/Makefile -XpConfig/en_US/print/attributes/Makefile -XpConfig/en_US/print/Makefile -XpConfig/en_US/Makefile +hw/xprint/Makefile +hw/xprint/doc/Makefile +hw/xprint/pcl/Makefile +hw/xprint/pcl-mono/Makefile +hw/xprint/raster/Makefile +hw/xprint/ps/Makefile +hw/xprint/etc/Makefile +hw/xprint/etc/Xsession.d/Makefile +hw/xprint/etc/init.d/Makefile +hw/xprint/etc/profile.d/Makefile +hw/xprint/config/Makefile +hw/xprint/config/C/print/attributes/Makefile +hw/xprint/config/C/print/ddx-config/Makefile +hw/xprint/config/C/print/ddx-config/raster/Makefile +hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile +hw/xprint/config/C/print/models/PSdefault/fonts/Makefile +hw/xprint/config/C/print/models/PSdefault/Makefile +hw/xprint/config/C/print/models/PSspooldir/Makefile +hw/xprint/config/C/print/models/SPSPARC2/Makefile +hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile +hw/xprint/config/C/print/models/GSdefault/Makefile +hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile +hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile +hw/xprint/config/C/print/models/Makefile +hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile +hw/xprint/config/C/print/models/CANONC3200-PS/Makefile +hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile +hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile +hw/xprint/config/C/print/models/HPLJ4family/Makefile +hw/xprint/config/C/print/models/HPDJ1600C/Makefile +hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile +hw/xprint/config/C/print/Makefile +hw/xprint/config/C/Makefile +hw/xprint/config/en_US/print/attributes/Makefile +hw/xprint/config/en_US/print/Makefile +hw/xprint/config/en_US/Makefile xorg-server.pc ]) diff --git a/doc/.gitignore b/doc/.gitignore new file mode 100644 index 000000000..fa5407dda --- /dev/null +++ b/doc/.gitignore @@ -0,0 +1,2 @@ +Xserver.1 +Xserver.1x diff --git a/exa/exa.c b/exa/exa.c index 75d5c0d69..4b96af815 100644 --- a/exa/exa.c +++ b/exa/exa.c @@ -623,6 +623,10 @@ exaDriverInit (ScreenPtr pScreen, pExaScr->SavedDestroyPixmap = pScreen->DestroyPixmap; pScreen->DestroyPixmap = exaDestroyPixmap; + + LogMessage(X_INFO, "EXA(%d): Offscreen pixmap area of %d bytes\n", + pScreen->myNum, + pExaScr->info->memorySize - pExaScr->info->offScreenBase); } else { @@ -641,6 +645,22 @@ exaDriverInit (ScreenPtr pScreen, } } + LogMessage(X_INFO, "EXA(%d): Driver registered support for the following" + " operations:\n", pScreen->myNum); + assert(pScreenInfo->PrepareSolid != NULL); + LogMessage(X_INFO, " Solid\n"); + assert(pScreenInfo->PrepareCopy != NULL); + LogMessage(X_INFO, " Copy\n"); + if (pScreenInfo->PrepareComposite != NULL) { + LogMessage(X_INFO, " Composite (RENDER acceleration)\n"); + } + if (pScreenInfo->UploadToScreen != NULL) { + LogMessage(X_INFO, " UploadToScreen\n"); + } + if (pScreenInfo->DownloadFromScreen != NULL) { + LogMessage(X_INFO, " DownloadFromScreen\n"); + } + return TRUE; } diff --git a/exa/exa_migration.c b/exa/exa_migration.c index 57d651f80..06a4b9330 100644 --- a/exa/exa_migration.c +++ b/exa/exa_migration.c @@ -435,6 +435,8 @@ exaAssertNotDirty (PixmapPtr pPixmap) if (memcmp(dst, src, data_row_bytes) != 0) { abort(); } + dst += dst_pitch; + src += src_pitch; } exaFinishAccess(&pPixmap->drawable, EXA_PREPARE_SRC); } diff --git a/exa/exa_offscreen.c b/exa/exa_offscreen.c index b55802e1e..9e0aa5d25 100644 --- a/exa/exa_offscreen.c +++ b/exa/exa_offscreen.c @@ -413,7 +413,6 @@ exaOffscreenInit (ScreenPtr pScreen) if (!area) return FALSE; - area->state = ExaOffscreenAvail; area->base_offset = pExaScr->info->offScreenBase; area->offset = area->base_offset; @@ -422,10 +421,6 @@ exaOffscreenInit (ScreenPtr pScreen) area->next = NULL; area->score = 0; -#if DEBUG_OFFSCREEN - ErrorF("============ initial memory block of %d\n", area->size); -#endif - /* Add it to the free areas */ pExaScr->info->offScreenAreas = area; diff --git a/fb/fbcompose.c b/fb/fbcompose.c index c4f979d26..6f7e3e6ec 100644 --- a/fb/fbcompose.c +++ b/fb/fbcompose.c @@ -267,11 +267,11 @@ fbFetch_a4b4g4r4 (const FbBits *bits, int x, int width, CARD32 *buffer, miIndexe CARD32 r,g,b, a; a = ((p & 0xf000) | ((p & 0xf000) >> 4)) << 16; - b = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) << 12; + b = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) >> 4; g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8; - r = ((p & 0x000f) | ((p & 0x000f) << 4)); + r = ((p & 0x000f) | ((p & 0x000f) << 4)) << 16; *buffer++ = (a | r | g | b); - } + } } static FASTCALL void @@ -283,11 +283,11 @@ fbFetch_x4b4g4r4 (const FbBits *bits, int x, int width, CARD32 *buffer, miIndexe CARD32 p = *pixel++; CARD32 r,g,b; - b = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) << 12; + b = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) >> 4; g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8; - r = ((p & 0x000f) | ((p & 0x000f) << 4)); + r = ((p & 0x000f) | ((p & 0x000f) << 4)) << 16; *buffer++ = (0xff000000 | r | g | b); - } + } } static FASTCALL void @@ -758,9 +758,9 @@ fbFetchPixel_a4b4g4r4 (const FbBits *bits, int offset, miIndexedPtr indexed) CARD32 a,r,g,b; a = ((pixel & 0xf000) | ((pixel & 0xf000) >> 4)) << 16; - b = ((pixel & 0x0f00) | ((pixel & 0x0f00) >> 4)) << 12; + b = ((pixel & 0x0f00) | ((pixel & 0x0f00) >> 4)) >> 4; g = ((pixel & 0x00f0) | ((pixel & 0x00f0) >> 4)) << 8; - r = ((pixel & 0x000f) | ((pixel & 0x000f) << 4)); + r = ((pixel & 0x000f) | ((pixel & 0x000f) << 4)) << 16; return (a | r | g | b); } @@ -770,9 +770,9 @@ fbFetchPixel_x4b4g4r4 (const FbBits *bits, int offset, miIndexedPtr indexed) CARD32 pixel = ((CARD16 *) bits)[offset]; CARD32 r,g,b; - b = ((pixel & 0x0f00) | ((pixel & 0x0f00) >> 4)) << 12; + b = ((pixel & 0x0f00) | ((pixel & 0x0f00) >> 4)) >> 4; g = ((pixel & 0x00f0) | ((pixel & 0x00f0) >> 4)) << 8; - r = ((pixel & 0x000f) | ((pixel & 0x000f) << 4)); + r = ((pixel & 0x000f) | ((pixel & 0x000f) << 4)) << 16; return (0xff000000 | r | g | b); } @@ -849,6 +849,14 @@ fbFetchPixel_c8 (const FbBits *bits, int offset, miIndexedPtr indexed) return indexed->rgba[pixel]; } +static FASTCALL CARD32 +fbFetchPixel_x4a4 (const FbBits *bits, int offset, miIndexedPtr indexed) +{ + CARD32 pixel = ((CARD8 *) bits)[offset]; + + return ((pixel & 0xf) | ((pixel & 0xf) << 4)) << 24; +} + #define Fetch8(l,o) (((CARD8 *) (l))[(o) >> 2]) #if IMAGE_BYTE_ORDER == MSBFirst #define Fetch4(l,o) ((o) & 2 ? Fetch8(l,o) & 0xf : Fetch8(l,o) >> 4) @@ -988,6 +996,7 @@ static fetchPixelProc fetchPixelProcForPicture (PicturePtr pict) case PICT_a2b2g2r2: return fbFetchPixel_a2b2g2r2; case PICT_c8: return fbFetchPixel_c8; case PICT_g8: return fbFetchPixel_c8; + case PICT_x4a4: return fbFetchPixel_x4a4; /* 4bpp formats */ case PICT_a4: return fbFetchPixel_a4; @@ -3271,8 +3280,8 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 xFixed *params = pict->filter_params; INT32 cwidth = xFixedToInt(params[0]); INT32 cheight = xFixedToInt(params[1]); - int xoff = params[0] >> 1; - int yoff = params[1] >> 1; + int xoff = (params[0] - xFixed1) >> 1; + int yoff = (params[1] - xFixed1) >> 1; params += 2; for (i = 0; i < width; ++i) { if (!v.vector[2]) { @@ -3316,6 +3325,11 @@ static void fbFetchTransformed(PicturePtr pict, int x, int y, int width, CARD32 } } + satot >>= 16; + srtot >>= 16; + sgtot >>= 16; + sbtot >>= 16; + if (satot < 0) satot = 0; else if (satot > 0xff) satot = 0xff; if (srtot < 0) srtot = 0; else if (srtot > 0xff) srtot = 0xff; if (sgtot < 0) sgtot = 0; else if (sgtot > 0xff) sgtot = 0xff; diff --git a/fb/fbpict.c b/fb/fbpict.c index f248fdb84..55fb0a7ba 100644 --- a/fb/fbpict.c +++ b/fb/fbpict.c @@ -925,6 +925,8 @@ fbComposite (CARD8 op, #endif func = fbCompositeSolidMask_nx8x8888; break; + default: + break; } break; case PICT_a8r8g8b8: @@ -947,6 +949,8 @@ fbComposite (CARD8 op, #endif func = fbCompositeSolidMask_nx8888x0565C; break; + default: + break; } } break; @@ -970,6 +974,8 @@ fbComposite (CARD8 op, #endif func = fbCompositeSolidMask_nx8888x0565C; break; + default: + break; } } break; @@ -985,9 +991,15 @@ fbComposite (CARD8 op, case PICT_x8b8g8r8: func = fbCompositeSolidMask_nx1xn; break; + default: + break; } break; + default: + break; } + default: + break; } } else if (! srcRepeat) /* has mask and non-repeating source */ @@ -1016,8 +1028,12 @@ fbComposite (CARD8 op, func = fbCompositeSrc_8888RevNPx0565mmx; #endif break; + default: + break; } break; + default: + break; } break; case PICT_x8r8g8b8: @@ -1038,10 +1054,16 @@ fbComposite (CARD8 op, func = fbCompositeSrc_8888RevNPx0565mmx; #endif break; + default: + break; } break; + default: + break; } break; + default: + break; } break; } @@ -1094,8 +1116,12 @@ fbComposite (CARD8 op, } #endif break; + default: + break; } break; + default: + break; } } else if (! srcRepeat) @@ -1118,6 +1144,8 @@ fbComposite (CARD8 op, case PICT_r5g6b5: func = fbCompositeSrc_8888x0565; break; + default: + break; } break; case PICT_x8r8g8b8: @@ -1129,6 +1157,8 @@ fbComposite (CARD8 op, func = fbCompositeCopyAreammx; #endif break; + default: + break; } case PICT_x8b8g8r8: switch (pDst->format) { @@ -1139,6 +1169,8 @@ fbComposite (CARD8 op, func = fbCompositeCopyAreammx; #endif break; + default: + break; } break; case PICT_a8b8g8r8: @@ -1158,6 +1190,8 @@ fbComposite (CARD8 op, case PICT_b5g6r5: func = fbCompositeSrc_8888x0565; break; + default: + break; } break; case PICT_r5g6b5: @@ -1165,6 +1199,8 @@ fbComposite (CARD8 op, case PICT_r5g6b5: func = fbCompositeSrc_0565x0565; break; + default: + break; } break; case PICT_b5g6r5: @@ -1172,8 +1208,12 @@ fbComposite (CARD8 op, case PICT_b5g6r5: func = fbCompositeSrc_0565x0565; break; + default: + break; } break; + default: + break; } } } @@ -1192,6 +1232,8 @@ fbComposite (CARD8 op, #endif func = fbCompositeSrcAdd_8888x8888; break; + default: + break; } break; case PICT_a8b8g8r8: @@ -1204,6 +1246,8 @@ fbComposite (CARD8 op, #endif func = fbCompositeSrcAdd_8888x8888; break; + default: + break; } break; case PICT_a8: @@ -1216,6 +1260,8 @@ fbComposite (CARD8 op, #endif func = fbCompositeSrcAdd_8000x8000; break; + default: + break; } break; case PICT_a1: @@ -1223,8 +1269,12 @@ fbComposite (CARD8 op, case PICT_a1: func = fbCompositeSrcAdd_1000x1000; break; + default: + break; } break; + default: + break; } } break; diff --git a/hw/Makefile.am b/hw/Makefile.am index 4c35a5817..d00d6fb3f 100644 --- a/hw/Makefile.am +++ b/hw/Makefile.am @@ -26,6 +26,10 @@ if KDRIVE KDRIVE_SUBDIRS = kdrive endif +if XPRINT +XPRINT_SUBDIRS = xprint +endif + # need to add darwin support here SUBDIRS = \ @@ -35,9 +39,10 @@ SUBDIRS = \ $(XVFB_SUBDIRS) \ $(XNEST_SUBDIRS) \ $(DMX_SUBDIRS) \ - $(KDRIVE_SUBDIRS) + $(KDRIVE_SUBDIRS) \ + $(XPRINT_SUBDIRS) -DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl +DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl xprint relink: for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done diff --git a/hw/vfb/.gitignore b/hw/vfb/.gitignore new file mode 100644 index 000000000..e3225f65b --- /dev/null +++ b/hw/vfb/.gitignore @@ -0,0 +1,2 @@ +Xvfb.1 +Xvfb.1x diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index 86e3fbe14..212f79b7c 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -255,10 +255,12 @@ OsVendorFatalError() { } +#if defined(DDXBEFORERESET) void ddxBeforeReset(void) { return; } +#endif void ddxUseMsg() diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 68579f423..51c2e3bcc 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -36,13 +36,17 @@ DISTCLEANFILES = osandcommon.c xorg.c XORG_LIBS = \ @XORG_CORE_LIBS@ \ common/libinit.a \ - loader/libloader.a \ libosandcommon.la \ + rac/librac.a \ parser/libxf86config.a \ dummylib/libdummy.a \ dixmods/libdixmods.la \ + loader/libloader.a \ @XORG_LIBS@ +Xorg_DEPENDENCIES = \ + $(XORG_LIBS) + Xorg_LDADD = $(XORG_LIBS) \ @XSERVER_LIBS@ \ dixmods/libxorgxkb.la diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index e5ddb57fe..5a6d762ca 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.80 2004/02/05 18:24:59 eich Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. * @@ -2576,17 +2575,13 @@ xf86PostPreInit() if (xf86NumScreens > 1) needRAC = TRUE; -#ifdef XFree86LOADER xf86MsgVerb(X_INFO, 3, "do I need RAC?"); if (needRAC) { xf86ErrorFVerb(3, " Yes, I do.\n"); - - if (!xf86LoadOneModule("rac",NULL)) - FatalError("Cannot load RAC module\n"); - } else + } else { xf86ErrorFVerb(3, " No, I don't.\n"); -#endif + } xf86MsgVerb(X_INFO, 3, "resource ranges after preInit:\n"); xf86PrintResList(3, Acc); @@ -2599,22 +2594,12 @@ xf86PostScreenInit(void) ScreenPtr pScreen; unsigned int flags; int nummem = 0, numio = 0; -#ifdef XFree86LOADER - pointer xf86RACInit = NULL; -#endif - if (doFramebufferMode) { - SetSIGIOForState(OPERATING); - return; - } + if (doFramebufferMode) { + SetSIGIOForState(OPERATING); + return; + } -#ifdef XFree86LOADER - if (needRAC) { - xf86RACInit = LoaderSymbol("xf86RACInit"); - if (!xf86RACInit) - FatalError("Cannot resolve symbol \"xf86RACInit\"\n"); - } -#endif #ifdef DEBUG ErrorF("PostScreenInit generation: %i\n",serverGeneration); #endif @@ -2693,12 +2678,7 @@ xf86PostScreenInit(void) xf86ErrorFVerb(3, "Screen %d is using RAC for io\n", i); } -#ifdef XFree86LOADER - ((Bool(*)(ScreenPtr,unsigned int))xf86RACInit) - (pScreen,flags); -#else xf86RACInit(pScreen,flags); -#endif } } diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index db7b3f98c..3f456a13b 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -2116,7 +2116,11 @@ xf86RunVtInit(void) FatalError("xf86RunVtInit: fork failed (%s)\n", strerror(errno)); break; case 0: /* child */ - setuid(getuid()); + if (setuid(getuid()) == -1) { + xf86Msg(X_ERROR, "xf86RunVtInit: setuid failed (%s)\n", + strerror(errno)); + exit(255); + } /* set stdin, stdout to the consoleFd */ for (i = 0; i < 2; i++) { if (xf86Info.consoleFd != i) { diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c index c989cd232..8822bacc1 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -130,6 +130,17 @@ DDCAvailableOptions(void *unused) } #endif +/** + * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC1 are + * unset. EDID information blocks are interpreted and the results returned in + * an xf86MonPtr. + * + * This function does not affect the list of modes used by drivers -- it is up + * to the driver to decide policy on what to do with EDID information. + * + * @return pointer to a new xf86MonPtr containing the EDID information. + * @return NULL if no monitor attached or failure to interpret the EDID. + */ xf86MonPtr xf86DoEDID_DDC1( int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed, @@ -170,6 +181,17 @@ xf86DoEDID_DDC1( return tmp; } +/** + * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC2 are + * unset. EDID information blocks are interpreted and the results returned in + * an xf86MonPtr. + * + * This function does not affect the list of modes used by drivers -- it is up + * to the driver to decide policy on what to do with EDID information. + * + * @return pointer to a new xf86MonPtr containing the EDID information. + * @return NULL if no monitor attached or failure to interpret the EDID. + */ xf86MonPtr xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus) { diff --git a/hw/xfree86/doc/man/.gitignore b/hw/xfree86/doc/man/.gitignore new file mode 100644 index 000000000..d412e511b --- /dev/null +++ b/hw/xfree86/doc/man/.gitignore @@ -0,0 +1,4 @@ +Xorg.1 +Xorg.1x +xorg.conf.5 +xorg.conf.5x diff --git a/hw/xfree86/exa/examodule.c b/hw/xfree86/exa/examodule.c index 0a7b361c8..4dce58fd8 100644 --- a/hw/xfree86/exa/examodule.c +++ b/hw/xfree86/exa/examodule.c @@ -47,11 +47,22 @@ static int exaXorgScreenPrivateIndex; typedef enum { EXAOPT_MIGRATION_HEURISTIC, + EXAOPT_NO_COMPOSITE, + EXAOPT_NO_UTS, + EXAOPT_NO_DFS, } EXAOpts; static const OptionInfoRec EXAOptions[] = { - { EXAOPT_MIGRATION_HEURISTIC, "MigrationHeuristic", OPTV_ANYSTR, {0}, FALSE }, - { -1, NULL, OPTV_NONE, {0}, FALSE } + { EXAOPT_MIGRATION_HEURISTIC, "MigrationHeuristic", + OPTV_ANYSTR, {0}, FALSE }, + { EXAOPT_NO_COMPOSITE, "EXANoComposite", + OPTV_BOOLEAN, {0}, FALSE }, + { EXAOPT_NO_UTS, "EXANoUploadToScreen", + OPTV_BOOLEAN, {0}, FALSE }, + { EXAOPT_NO_DFS, "EXANoDownloadFromScreen", + OPTV_BOOLEAN, {0}, FALSE }, + { -1, NULL, + OPTV_NONE, {0}, FALSE } }; static Bool @@ -135,6 +146,26 @@ exaDDXDriverInit(ScreenPtr pScreen) } } + if (xf86IsOptionSet(pScreenPriv->options, EXAOPT_NO_COMPOSITE)) { + xf86DrvMsg(pScreen->myNum, X_INFO, + "EXA: Disabling Composite operation " + "(RENDER acceleration)\n"); + pExaScr->info->CheckComposite = NULL; + pExaScr->info->PrepareComposite = NULL; + } + + if (xf86IsOptionSet(pScreenPriv->options, EXAOPT_NO_UTS)) { + xf86DrvMsg(pScreen->myNum, X_INFO, + "EXA: Disabling UploadToScreen\n"); + pExaScr->info->UploadToScreen = NULL; + } + + if (xf86IsOptionSet(pScreenPriv->options, EXAOPT_NO_DFS)) { + xf86DrvMsg(pScreen->myNum, X_INFO, + "EXA: Disabling DownloadFromScreen\n"); + pExaScr->info->DownloadFromScreen = NULL; + } + pScreen->devPrivates[exaXorgScreenPrivateIndex].ptr = pScreenPriv; pScreenPriv->SavedEnableDisableFBAccess = pScrn->EnableDisableFBAccess; diff --git a/hw/xfree86/fbdevhw/.gitignore b/hw/xfree86/fbdevhw/.gitignore new file mode 100644 index 000000000..4c8446c75 --- /dev/null +++ b/hw/xfree86/fbdevhw/.gitignore @@ -0,0 +1,2 @@ +fbdevhw.4 +fbdevhw.4x diff --git a/hw/xfree86/getconfig/.gitignore b/hw/xfree86/getconfig/.gitignore new file mode 100644 index 000000000..dc5d5cb4d --- /dev/null +++ b/hw/xfree86/getconfig/.gitignore @@ -0,0 +1,4 @@ +getconfig.1 +getconfig.1x +getconfig.5 +getconfig.5x diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c index ea37414b2..742645bba 100644 --- a/hw/xfree86/i2c/fi1236.c +++ b/hw/xfree86/i2c/fi1236.c @@ -99,6 +99,7 @@ xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "MT2032: Company code 0x%02x%02x, pa } /* might be buggy */ +#if 0 static void MT2032_shutdown(FI1236Ptr f) { CARD8 data[10]; @@ -124,6 +125,7 @@ I2C_WriteRead(&(f->d), (I2CByte *)data, 4, NULL, 0); usleep(15000); } +#endif static void MT2032_dump_status(FI1236Ptr f); @@ -131,7 +133,7 @@ static void MT2032_init(FI1236Ptr f) { CARD8 data[10]; CARD8 value; -CARD8 xogc; +CARD8 xogc = 0x00; MT2032_getid(f); @@ -479,7 +481,7 @@ if(type==TUNER_TYPE_MT2032){ } -CARD32 AFC_TimerCallback(OsTimerPtr timer, CARD32 time, pointer data){ +static CARD32 AFC_TimerCallback(OsTimerPtr timer, CARD32 time, pointer data){ FI1236Ptr f=(FI1236Ptr)data; if(FI1236_AFC(f))return 150; else { @@ -517,7 +519,7 @@ void FI1236_tune(FI1236Ptr f, CARD32 frequency) xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Setting tuner band to %d\n", f->tuner_data.band); - xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Setting tuner frequency to %d\n", frequency); + xf86DrvMsg(f->d.pI2CBus->scrnIndex, X_INFO, "Setting tuner frequency to %d\n", (int)frequency); if ((f->type == TUNER_TYPE_FM1216ME) || (f->type == TUNER_TYPE_FI1236W)) { diff --git a/hw/xfree86/i2c/fi1236.h b/hw/xfree86/i2c/fi1236.h index dbb154671..7c1d07024 100644 --- a/hw/xfree86/i2c/fi1236.h +++ b/hw/xfree86/i2c/fi1236.h @@ -90,6 +90,7 @@ typedef struct { FI1236Ptr Detect_FI1236(I2CBusPtr b, I2CSlaveAddr addr); void FI1236_set_tuner_type(FI1236Ptr f, int type); void TUNER_set_frequency(FI1236Ptr f, CARD32 frequency); +void FI1236_tune(FI1236Ptr f, CARD32 frequency); int FI1236_AFC(FI1236Ptr f); int TUNER_get_afc_hint(FI1236Ptr f); void fi1236_dump_status(FI1236Ptr f); diff --git a/hw/xfree86/i2c/tda9850.c b/hw/xfree86/i2c/tda9850.c index e6afd8165..5b0c581ed 100644 --- a/hw/xfree86/i2c/tda9850.c +++ b/hw/xfree86/i2c/tda9850.c @@ -107,6 +107,6 @@ CARD16 tda9850_getstatus(TDA9850Ptr t) { CARD16 status; -I2C_WriteRead(&(t->d), NULL, 0, &status, 2); +I2C_WriteRead(&(t->d), NULL, 0, (I2CByte *)&status, 2); return status; } diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index 01c62e92e..502bb5aeb 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -1,10 +1,6 @@ noinst_LIBRARIES = libloader.a -INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \ - -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \ - -I$(srcdir)/../fbdevhw -I$(srcdir)/../xaa \ - -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb \ - -I$(srcdir)/../dixmods/extmod -I$(srcdir)/../../../miext/cw \ - -I$(srcdir)/../../../miext/damage + +INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser #AM_LDFLAGS = -r AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ @@ -15,10 +11,8 @@ endif EXTRA_DIST = \ dlloader.h \ - hash.h \ loader.h \ loaderProcs.h \ - sym.h \ SparcMulDiv.S libloader_a_SOURCES = \ @@ -29,10 +23,4 @@ libloader_a_SOURCES = \ loadfont.c \ dlloader.c \ os.c \ - dixsym.c \ - extsym.c \ - fontsym.c \ - misym.c \ - xf86sym.c \ - hash.c \ $(SPARC_SOURCES) diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c deleted file mode 100644 index 9ba50877e..000000000 --- a/hw/xfree86/loader/dixsym.c +++ /dev/null @@ -1,538 +0,0 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/loader/dixsym.c,v 1.21 2006/03/24 20:50:13 fredrik Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dixsym.c,v 1.63 2003/12/03 - * 17:11:29 tsi Exp $ */ - -/* - * Copyright 1995-1998 by Metro Link, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Metro Link, Inc. not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Metro Link, Inc. makes no - * representations about the suitability of this software for any purpose. - * It is provided "as is" without express or implied warranty. - * - * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ -/* - * Copyright (c) 1997-2003 by The XFree86 Project, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of the copyright holder(s) - * and author(s) shall not be used in advertising or otherwise to promote - * the sale, use or other dealings in this Software without prior written - * authorization from the copyright holder(s) and author(s). - */ - -#undef DBMALLOC -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - -#include "sym.h" -#include "colormap.h" -#include "cursor.h" -#include "cursorstr.h" -#include "dix.h" -#include "dixevents.h" -#include "dixfont.h" -#include "dixstruct.h" -#include "misc.h" -#include "globals.h" -#include "os.h" -#include "osdep.h" -#include "resource.h" -#include "servermd.h" -#include "scrnintstr.h" -#include "windowstr.h" -#include "extension.h" -#define EXTENSION_PROC_ARGS void * -#include "extnsionst.h" -#include "swaprep.h" -#include "swapreq.h" -#include "inputstr.h" -#include -#include "exevents.h" -#include "extinit.h" -#ifdef XV -#include "xvmodproc.h" -#endif -#include "dgaproc.h" -#ifdef RENDER -#include "mipict.h" -#include "renderedge.h" -#endif -#include "selection.h" -#ifdef XKB -#include -extern int XkbDfltRepeatDelay, XkbDfltRepeatInterval; -#endif - -extern Selection *CurrentSelections; -extern int NumCurrentSelections; - -/* DIX things */ - -LOOKUP dixLookupTab[] = { - - /* dix */ - /* atom.c */ - SYMFUNC(MakeAtom) - SYMFUNC(ValidAtom) - /* colormap.c */ - SYMFUNC(AllocColor) - SYMFUNC(CreateColormap) - SYMFUNC(FakeAllocColor) - SYMFUNC(FakeFreeColor) - SYMFUNC(FreeColors) - SYMFUNC(StoreColors) - SYMFUNC(TellLostMap) - SYMFUNC(TellGainedMap) - SYMFUNC(QueryColors) - /* cursor.c */ - SYMFUNC(FreeCursor) - /* devices.c */ - SYMFUNC(Ones) - SYMFUNC(InitButtonClassDeviceStruct) - SYMFUNC(InitFocusClassDeviceStruct) - SYMFUNC(InitLedFeedbackClassDeviceStruct) - SYMFUNC(InitPtrFeedbackClassDeviceStruct) - SYMFUNC(InitKbdFeedbackClassDeviceStruct) - SYMFUNC(InitIntegerFeedbackClassDeviceStruct) - SYMFUNC(InitStringFeedbackClassDeviceStruct) - SYMFUNC(InitBellFeedbackClassDeviceStruct) - SYMFUNC(InitValuatorClassDeviceStruct) - SYMFUNC(InitKeyClassDeviceStruct) - SYMFUNC(InitKeyboardDeviceStruct) - SYMFUNC(SendMappingNotify) - SYMFUNC(InitPointerDeviceStruct) - SYMFUNC(LookupKeyboardDevice) - SYMFUNC(LookupPointerDevice) - /* dispatch.c */ - SYMFUNC(SetInputCheck) - SYMFUNC(SendErrorToClient) - SYMFUNC(UpdateCurrentTime) - SYMFUNC(UpdateCurrentTimeIf) - SYMFUNC(ProcBadRequest) - SYMVAR(dispatchException) - SYMVAR(isItTimeToYield) - SYMVAR(ClientStateCallback) - SYMVAR(ServerGrabCallback) - SYMVAR(CurrentSelections) - SYMVAR(NumCurrentSelections) - /* dixfonts.c */ - SYMFUNC(CloseFont) - SYMFUNC(FontToXError) - SYMFUNC(LoadGlyphs) - SYMVAR(fpe_functions) - /* dixutils.c */ - SYMFUNC(AddCallback) - SYMFUNC(ClientSleep) - SYMFUNC(ClientTimeToServerTime) - SYMFUNC(ClientWakeup) - SYMFUNC(CompareTimeStamps) - SYMFUNC(CopyISOLatin1Lowered) - SYMFUNC(DeleteCallback) - SYMFUNC(LookupClient) - SYMFUNC(LookupDrawable) - SYMFUNC(LookupWindow) - SYMFUNC(NoopDDA) - SYMFUNC(QueueWorkProc) - SYMFUNC(RegisterBlockAndWakeupHandlers) - SYMFUNC(RemoveBlockAndWakeupHandlers) -#ifdef XCSECURITY - SYMFUNC(SecurityLookupDrawable) - SYMFUNC(SecurityLookupWindow) -#endif - /* events.c */ - SYMFUNC(CheckCursorConfinement) - SYMFUNC(DeliverEvents) - SYMFUNC(NewCurrentScreen) - SYMFUNC(PointerConfinedToScreen) - SYMFUNC(TryClientEvents) - SYMFUNC(WriteEventsToClient) - SYMFUNC(GetCurrentRootWindow) - SYMFUNC(GetSpritePosition) - SYMFUNC(GetSpriteWindow) - SYMFUNC(GetSpriteCursor) - SYMFUNC(WindowsRestructured) - SYMVAR(DeviceEventCallback) - SYMVAR(EventCallback) - SYMVAR(inputInfo) - SYMFUNC(SetCriticalEvent) -#ifdef PANORAMIX - SYMFUNC(XineramaGetCursorScreen) -#endif - /* property.c */ - SYMFUNC(ChangeWindowProperty) - /* extension.c */ - SYMFUNC(AddExtension) - SYMFUNC(AddExtensionAlias) - SYMFUNC(CheckExtension) - SYMFUNC(DeclareExtensionSecurity) - SYMFUNC(MinorOpcodeOfRequest) - SYMFUNC(StandardMinorOpcode) -#ifdef XEVIE - SYMVAR(xeviehot) - SYMVAR(xeviewin) -#endif - /* gc.c */ - SYMFUNC(CopyGC) - SYMFUNC(CreateGC) - SYMFUNC(CreateScratchGC) - SYMFUNC(ChangeGC) - SYMFUNC(dixChangeGC) - SYMFUNC(DoChangeGC) - SYMFUNC(FreeGC) - SYMFUNC(FreeScratchGC) - SYMFUNC(GetScratchGC) - SYMFUNC(SetClipRects) - SYMFUNC(ValidateGC) - SYMFUNC(VerifyRectOrder) - SYMFUNC(SetDashes) - /* globals.c */ - SYMVAR(ScreenSaverTime) -#ifdef DPMSExtension - SYMVAR(DPMSEnabled) - SYMVAR(DPMSCapableFlag) - SYMVAR(DPMSOffTime) - SYMVAR(DPMSPowerLevel) - SYMVAR(DPMSStandbyTime) - SYMVAR(DPMSSuspendTime) - SYMVAR(DPMSEnabledSwitch) - SYMVAR(DPMSDisabledSwitch) - SYMVAR(defaultDPMSEnabled) -#endif - /* bigreq */ - SYMVAR(maxBigRequestSize) -#ifdef XV - /* XXX These are exported from the DDX, not DIX. */ - SYMVAR(XvScreenInitProc) - SYMVAR(XvGetScreenIndexProc) - SYMVAR(XvGetRTPortProc) - SYMVAR(XvMCScreenInitProc) -#endif - SYMVAR(ScreenSaverBlanking) - SYMVAR(WindowTable) - SYMVAR(clients) - SYMVAR(currentMaxClients) - SYMVAR(currentTime) - SYMVAR(defaultColorVisualClass) - SYMVAR(display) - SYMVAR(globalSerialNumber) - SYMVAR(lastDeviceEventTime) - SYMVAR(monitorResolution) - SYMVAR(permitOldBugs) - SYMVAR(screenInfo) - SYMVAR(serverClient) - SYMVAR(serverGeneration) - /* main.c */ - SYMFUNC(NotImplemented) - SYMVAR(PixmapWidthPaddingInfo) - /* pixmap.c */ - SYMFUNC(AllocatePixmap) - SYMFUNC(GetScratchPixmapHeader) - SYMFUNC(FreeScratchPixmapHeader) - /* privates.c */ - SYMFUNC(AllocateClientPrivate) - SYMFUNC(AllocateClientPrivateIndex) - SYMFUNC(AllocateGCPrivate) - SYMFUNC(AllocateGCPrivateIndex) - SYMFUNC(AllocateWindowPrivate) - SYMFUNC(AllocateWindowPrivateIndex) - SYMFUNC(AllocateScreenPrivateIndex) - SYMFUNC(AllocateColormapPrivateIndex) - SYMFUNC(AllocateDevicePrivateIndex) - SYMFUNC(AllocateDevicePrivate) -#ifdef PIXPRIV - SYMFUNC(AllocatePixmapPrivateIndex) - SYMFUNC(AllocatePixmapPrivate) -#endif - /* resource.c */ - SYMFUNC(AddResource) - SYMFUNC(ChangeResourceValue) - SYMFUNC(CreateNewResourceClass) - SYMFUNC(CreateNewResourceType) - SYMFUNC(FakeClientID) - SYMFUNC(FreeResource) - SYMFUNC(FreeResourceByType) - SYMFUNC(GetXIDList) - SYMFUNC(GetXIDRange) - SYMFUNC(LookupIDByType) - SYMFUNC(LookupIDByClass) - SYMFUNC(LegalNewID) -#ifdef XCSECURITY - SYMFUNC(SecurityLookupIDByClass) - SYMFUNC(SecurityLookupIDByType) -#endif - SYMFUNC(FindClientResourcesByType) - SYMFUNC(FindAllClientResources) - SYMVAR(lastResourceType) - SYMVAR(TypeMask) -#ifdef RES - SYMFUNC(RegisterResourceName) - SYMVAR(ResourceNames) -#endif - /* swaprep.c */ - SYMFUNC(CopySwap32Write) - SYMFUNC(Swap32Write) - SYMFUNC(SwapConnSetupInfo) - SYMFUNC(SwapConnSetupPrefix) - /* swapreq.c */ - SYMFUNC(SwapShorts) - SYMFUNC(SwapLongs) - SYMFUNC(SwapColorItem) - /* tables.c */ - SYMVAR(EventSwapVector) - SYMVAR(ReplySwapVector) - SYMVAR(ProcVector) - /* window.c */ - SYMFUNC(ChangeWindowAttributes) - SYMFUNC(CheckWindowOptionalNeed) - SYMFUNC(CreateUnclippedWinSize) - SYMFUNC(CreateWindow) - SYMFUNC(FindWindowWithOptional) - SYMFUNC(GravityTranslate) - SYMFUNC(MakeWindowOptional) - SYMFUNC(MapWindow) - SYMFUNC(MoveWindowInStack) - SYMFUNC(NotClippedByChildren) - SYMFUNC(ResizeChildrenWinSize) - SYMFUNC(SaveScreens) - SYMFUNC(SendVisibilityNotify) - SYMFUNC(SetWinSize) - SYMFUNC(SetBorderSize) - SYMFUNC(TraverseTree) - SYMFUNC(UnmapWindow) - SYMFUNC(WalkTree) - SYMVAR(deltaSaveUndersViewable) - SYMVAR(numSaveUndersViewable) - SYMVAR(savedScreenInfo) - SYMVAR(screenIsSaved) - - /*os/ */ - /* access.c */ - SYMFUNC(LocalClient) - /* utils.c */ - SYMFUNC(Xstrdup) - SYMFUNC(XNFstrdup) - SYMVAR(Must_have_memory) - SYMFUNC(AdjustWaitForDelay) - SYMVAR(noTestExtensions) - SYMFUNC(GiveUp) - -#ifdef BIGREQS - SYMVAR(noBigReqExtension) -#endif -#ifdef COMPOSITE - SYMVAR(noCompositeExtension) -#endif -#ifdef DAMAGE - SYMVAR(noDamageExtension) -#endif -#ifdef DBE - SYMVAR(noDbeExtension) -#endif -#ifdef DPMSExtension - SYMVAR(noDPMSExtension) -#endif -#ifdef EVI - SYMVAR(noEVIExtension) -#endif -#ifdef FONTCACHE - SYMVAR(noFontCacheExtension) -#endif -#ifdef GLXEXT - SYMVAR(noGlxExtension) -#endif -#ifdef SCREENSAVER - SYMVAR(noScreenSaverExtension) -#endif -#ifdef MITSHM - SYMVAR(noMITShmExtension) -#endif -#ifdef MITMISC - SYMVAR(noMITMiscExtension) -#endif -#ifdef MULTIBUFFER - SYMVAR(noMultibufferExtension) -#endif -#ifdef RANDR - SYMVAR(noRRExtension) -#endif -#ifdef RENDER - SYMVAR(noRenderExtension) -#endif -#ifdef SHAPE - SYMVAR(noShapeExtension) -#endif -#ifdef XCSECURITY - SYMVAR(noSecurityExtension) -#endif -#ifdef XSYNC - SYMVAR(noSyncExtension) -#endif -#ifdef TOGCUP - SYMVAR(noXcupExtension) -#endif -#ifdef RES - SYMVAR(noResExtension) -#endif -#ifdef XAPPGROUP - SYMVAR(noXagExtension) -#endif -#ifdef XCMISC - SYMVAR(noXCMiscExtension) -#endif -#ifdef XEVIE - SYMVAR(noXevieExtension) -#endif -#ifdef XF86BIGFONT - SYMVAR(noXFree86BigfontExtension) -#endif -#ifdef XFreeXDGA - SYMVAR(noXFree86DGAExtension) -#endif -#ifdef XF86DRI - SYMVAR(noXFree86DRIExtension) -#endif -#ifdef XF86MISC - SYMVAR(noXFree86MiscExtension) -#endif -#ifdef XF86VIDMODE - SYMVAR(noXFree86VidModeExtension) -#endif -#ifdef XFIXES - SYMVAR(noXFixesExtension) -#endif -#ifdef XKB -/* |noXkbExtension| is defined in xc/programs/Xserver/xkb/xkbInit.c */ - SYMVAR(noXkbExtension) -#endif -#ifdef PANORAMIX - SYMVAR(noPanoramiXExtension) -#endif -#ifdef XINPUT - SYMVAR(noXInputExtension) -#endif -#ifdef XIDLE - SYMVAR(noXIdleExtension) -#endif -#ifdef XV - SYMVAR(noXvExtension) -#endif - - /* log.c */ - SYMFUNC(LogVWrite) - SYMFUNC(LogWrite) - SYMFUNC(LogVMessageVerb) - SYMFUNC(LogMessageVerb) - SYMFUNC(LogMessage) - SYMFUNC(FatalError) - SYMFUNC(VErrorF) - SYMFUNC(ErrorF) - SYMFUNC(Error) - /* xalloc.c */ - SYMFUNC(XNFalloc) - SYMFUNC(XNFcalloc) - SYMFUNC(XNFrealloc) - SYMFUNC(Xalloc) - SYMFUNC(Xcalloc) - SYMFUNC(Xfree) - SYMFUNC(Xrealloc) - /* WaitFor.c */ - SYMFUNC(TimerFree) - SYMFUNC(TimerSet) - SYMFUNC(TimerCancel) - /* io.c */ - SYMFUNC(WriteToClient) - SYMFUNC(SetCriticalOutputPending) - SYMVAR(FlushCallback) - SYMVAR(ReplyCallback) - SYMVAR(SkippedRequestsCallback) - SYMFUNC(ResetCurrentRequest) - /* connection.c */ - SYMFUNC(IgnoreClient) - SYMFUNC(AttendClient) - SYMFUNC(AddEnabledDevice) - SYMFUNC(RemoveEnabledDevice) - SYMFUNC(MakeClientGrabPervious) - SYMFUNC(MakeClientGrabImpervious) - SYMVAR(GrabInProgress) - -#ifdef XKB - /* xkb/xkbInit.c */ - SYMFUNC(XkbInitKeyboardDeviceStruct) - SYMFUNC(XkbSetRulesDflts) - SYMVAR(XkbDfltRepeatDelay) - SYMVAR(XkbDfltRepeatInterval) -#endif - -#ifdef XINPUT - /* Xi */ - /* exevents.c */ - SYMFUNC(InitValuatorAxisStruct) - SYMFUNC(InitProximityClassDeviceStruct) - /* extinit.c */ - SYMFUNC(AssignTypeAndName) -#endif - - /* xf86DGA.c */ - /* XXX This is exported from the DDX, not DIX. */ - SYMVAR(XDGAEventBase) - - /* librender.a */ -#ifdef RENDER - /* picture.c */ - SYMFUNC(PictureInit) - SYMFUNC(PictureTransformPoint) - SYMFUNC(PictureTransformPoint3d) - SYMFUNC(PictureGetSubpixelOrder) - SYMFUNC(PictureSetSubpixelOrder) - SYMVAR(PictureScreenPrivateIndex) - /* mipict.c */ - SYMFUNC(miPictureInit) - SYMFUNC(miComputeCompositeRegion) - /* miglyph.c */ - SYMFUNC(miGlyphs) - /* mirect.c */ - SYMFUNC(miCompositeRects) - /* filter.c */ - SYMFUNC(PictureAddFilter) - SYMFUNC(PictureSetFilterAlias) - /* renderedge.c */ - SYMFUNC(RenderSampleCeilY) - SYMFUNC(RenderSampleFloorY) - SYMFUNC(RenderEdgeStep) - SYMFUNC(RenderEdgeInit) - SYMFUNC(RenderLineFixedEdgeInit) -#endif - - {0, 0} -}; diff --git a/hw/xfree86/loader/dlloader.c b/hw/xfree86/loader/dlloader.c index 835deda49..3c62f863b 100644 --- a/hw/xfree86/loader/dlloader.c +++ b/hw/xfree86/loader/dlloader.c @@ -1,7 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.c,v 1.13 2003/10/15 16:29:02 dawes Exp $ */ - /* - * * Copyright (c) 1997 The XFree86 Project, Inc. * * Permission to use, copy, modify, distribute, and sell this software @@ -23,7 +20,18 @@ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. */ + * SOFTWARE. + */ + +/* + * Once upon a time, X had multiple loader backends, three of which were + * essentially libdl reimplementations. This was nonsense so we chucked + * it, but we still retain the factorization between loader API and + * platform implementation. This file is the libdl implementation, and + * currently the only backend. If you find yourself porting to a platform + * without working libdl - hpux, win32, some forsaken a.out host, etc. - + * make a new backend rather than hacking up this file. + */ #ifdef HAVE_XORG_CONFIG_H #include @@ -36,82 +44,67 @@ #include #include "os.h" -#include "sym.h" #include "loader.h" #include "dlloader.h" -#ifdef DL_LAZY +#if defined(DL_LAZY) #define DLOPEN_LAZY DL_LAZY -#else -#ifdef RTLD_LAZY +#elif defined(RTLD_LAZY) #define DLOPEN_LAZY RTLD_LAZY -#else -#ifdef __FreeBSD__ +#elif defined(__FreeBSD__) #define DLOPEN_LAZY 1 #else #define DLOPEN_LAZY 0 #endif -#endif -#endif -#ifdef LD_GLOBAL + +#if defined(LD_GLOBAL) #define DLOPEN_GLOBAL LD_GLOBAL -#else -#ifdef RTLD_GLOBAL +#elif defined(RTLD_GLOBAL) #define DLOPEN_GLOBAL RTLD_GLOBAL #else #define DLOPEN_GLOBAL 0 #endif -#endif #if defined(CSRG_BASED) && !defined(__ELF__) -#define NEED_UNDERSCORE_FOR_DLLSYM +#define DLSYM_PREFIX "_" +#else +#define DLSYM_PREFIX "" #endif -/* - * This structure contains all of the information about a module - * that has been loaded. - */ typedef struct { int handle; void *dlhandle; int flags; } DLModuleRec, *DLModulePtr; -/* - * a list of loaded modules XXX can be improved - */ +/* Hooray, yet another open coded linked list! FIXME */ typedef struct DLModuleList { DLModulePtr module; struct DLModuleList *next; } DLModuleList; -DLModuleList *dlModuleList = NULL; +static DLModuleList *dlModuleList = NULL; -void * +static void * DLFindSymbolLocal(pointer module, const char *name) { DLModulePtr dlfile = module; void *p; char *n; -#ifdef NEED_UNDERSCORE_FOR_DLLSYM - static const char symPrefix[] = "_"; -#else - static const char symPrefix[] = ""; -#endif + static const char symPrefix[] = DLSYM_PREFIX; - n = xf86loadermalloc(strlen(symPrefix) + strlen(name) + 1); - sprintf(n, "%s%s", symPrefix, name); + n = malloc(strlen(symPrefix) + strlen(name) + 1); + if (strlen(symPrefix)) + sprintf(n, "%s%s", symPrefix, name); + else + sprintf(n, "%s", name); p = dlsym(dlfile->dlhandle, n); - xf86loaderfree(n); + free(n); return p; } - -/* - * Search a symbol in the module list - */ void * DLFindSymbol(const char *name) { @@ -127,75 +120,59 @@ DLFindSymbol(const char *name) return NULL; } -/* - * public interface - */ void * -DLLoadModule(loaderPtr modrec, int fd, LOOKUP ** ppLookup, int flags) +DLLoadModule(loaderPtr modrec, int fd, int flags) { DLModulePtr dlfile; DLModuleList *l; int dlopen_flags; - if ((dlfile = xf86loadercalloc(1, sizeof(DLModuleRec))) == NULL) { - ErrorF("Unable to allocate DLModuleRec\n"); + if ((dlfile = calloc(1, sizeof(DLModuleRec))) == NULL) { + ErrorF("Unable to allocate DLModuleRec\n"); return NULL; } dlfile->handle = modrec->handle; if (flags & LD_FLAG_GLOBAL) - dlopen_flags = DLOPEN_LAZY | DLOPEN_GLOBAL; + dlopen_flags = DLOPEN_LAZY | DLOPEN_GLOBAL; else - dlopen_flags = DLOPEN_LAZY; + dlopen_flags = DLOPEN_LAZY; dlfile->dlhandle = dlopen(modrec->name, dlopen_flags); if (dlfile->dlhandle == NULL) { ErrorF("dlopen: %s\n", dlerror()); - xf86loaderfree(dlfile); + free(dlfile); return NULL; } - l = xf86loadermalloc(sizeof(DLModuleList)); + l = malloc(sizeof(DLModuleList)); l->module = dlfile; l->next = dlModuleList; dlModuleList = l; - *ppLookup = NULL; return (void *)dlfile; } -void -DLResolveSymbols(void *mod) -{ - return; -} - -int -DLCheckForUnresolved(void *mod) -{ - return 0; -} - void DLUnloadModule(void *modptr) { DLModulePtr dlfile = (DLModulePtr) modptr; DLModuleList *l, *p; - /* remove it from dlModuleList */ + /* remove it from dlModuleList. */ if (dlModuleList->module == modptr) { l = dlModuleList; dlModuleList = l->next; - xf86loaderfree(l); + free(l); } else { p = dlModuleList; for (l = dlModuleList->next; l != NULL; l = l->next) { if (l->module == modptr) { p->next = l->next; - xf86loaderfree(l); + free(l); break; } p = l; } } dlclose(dlfile->dlhandle); - xf86loaderfree(modptr); + free(modptr); } diff --git a/hw/xfree86/loader/dlloader.h b/hw/xfree86/loader/dlloader.h index 6475291b5..b705a18d0 100644 --- a/hw/xfree86/loader/dlloader.h +++ b/hw/xfree86/loader/dlloader.h @@ -19,19 +19,15 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/dlloader.h,v 1.2 1998/07/25 16:56:14 dawes Exp $ */ - #ifdef HAVE_XORG_CONFIG_H #include #endif #ifndef _DLLOADER_H #define _DLLOADER_H -extern void *DLLoadModule(loaderPtr, int, LOOKUP **, int flags); -extern void DLResolveSymbols(void *); -extern int DLCheckForUnresolved(void *); + +extern void *DLLoadModule(loaderPtr, int, int flags); extern void DLUnloadModule(void *); extern void *DLFindSymbol(const char *name); -extern void *DLFindSymbolLocal(pointer module, const char *name); #endif diff --git a/hw/xfree86/loader/extsym.c b/hw/xfree86/loader/extsym.c deleted file mode 100644 index 1a841ac9a..000000000 --- a/hw/xfree86/loader/extsym.c +++ /dev/null @@ -1,84 +0,0 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.5 2004/09/14 23:21:22 gisburn Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/extsym.c,v 1.9 2003/10/15 16:29:03 dawes Exp $ */ - -/* - * - * Copyright 1999-2003 by The XFree86 Project, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of The XFree86 Project, Inc. not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. The XFree86 Project, Inc. makes no - * representations about the suitability of this software for any purpose. - * It is provided "as is" without express or implied warranty. - * - * THE XFREE86 PROJECT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO - * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS, IN NO EVENT SHALL THE XFREE86 PROJECT, INC. BE LIABLE - * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN - * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING - * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS - * SOFTWARE. - */ - -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - -#include "resource.h" -#include "sym.h" -#include "misc.h" -#ifdef PANORAMIX -#include "panoramiX.h" -#endif -#include "sleepuntil.h" - -#ifdef HAS_SHM -extern int ShmCompletionCode; -extern int BadShmSegCode; -extern RESTYPE ShmSegType, ShmPixType; -#endif - -#ifdef PANORAMIX -extern Bool noPanoramiXExtension; -extern int PanoramiXNumScreens; -extern PanoramiXData *panoramiXdataPtr; -extern XID *PanoramiXVisualTable; -extern unsigned long XRT_WINDOW; -extern unsigned long XRT_PIXMAP; -extern unsigned long XRT_GC; -extern unsigned long XRT_COLORMAP; -extern unsigned long XRC_DRAWABLE; -extern Bool XineramaRegisterConnectionBlockCallback(void (*func) (void)); -extern int XineramaDeleteResource(pointer, XID); -#endif - -LOOKUP extLookupTab[] = { - - SYMFUNC(ClientSleepUntil) - -#ifdef HAS_SHM - SYMVAR(ShmCompletionCode) - SYMVAR(BadShmSegCode) - SYMVAR(ShmSegType) -#endif - -#ifdef PANORAMIX - SYMFUNC(XineramaRegisterConnectionBlockCallback) - SYMFUNC(XineramaDeleteResource) - SYMVAR(PanoramiXNumScreens) - SYMVAR(panoramiXdataPtr) - SYMVAR(PanoramiXVisualTable) - SYMVAR(XRT_WINDOW) - SYMVAR(XRT_PIXMAP) - SYMVAR(XRT_GC) - SYMVAR(XRT_COLORMAP) - SYMVAR(XRC_DRAWABLE) -#endif - - {0, 0} -}; diff --git a/hw/xfree86/loader/fontsym.c b/hw/xfree86/loader/fontsym.c deleted file mode 100644 index 5daf82802..000000000 --- a/hw/xfree86/loader/fontsym.c +++ /dev/null @@ -1,112 +0,0 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/fontsym.c,v 1.14 2003/12/20 20:04:34 dawes Exp $ */ -/* - * Copyright (c) 1998-2002 by The XFree86 Project, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of the copyright holder(s) - * and author(s) shall not be used in advertising or otherwise to promote - * the sale, use or other dealings in this Software without prior written - * authorization from the copyright holder(s) and author(s). - */ - -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - -#include -#include "sym.h" -#include -#include -#ifdef FONTENC_COMPATIBILITY -#include -#endif -#include -#include -#include -#include -#ifdef FONTCACHE -#define _FONTCACHE_SERVER_ -#include "fontcache.h" -#endif - -LOOKUP fontLookupTab[] = { - - SYMFUNC(TwoByteSwap) - SYMFUNC(FourByteSwap) - SYMFUNC(FontCouldBeTerminal) - SYMFUNC(BufFileRead) - SYMFUNC(BufFileWrite) - SYMFUNC(CheckFSFormat) - SYMFUNC(FontFileOpen) - SYMFUNC(FontFilePriorityRegisterRenderer) - SYMFUNC(FontFileRegisterRenderer) - SYMFUNC(FontParseXLFDName) - SYMFUNC(FontFileCloseFont) - SYMFUNC(FontFileOpenBitmap) - SYMFUNC(FontFileCompleteXLFD) - SYMFUNC(FontFileCountDashes) - SYMFUNC(FontFileFindNameInDir) - SYMFUNC(FontFileClose) - SYMFUNC(FontComputeInfoAccelerators) - SYMFUNC(FontDefaultFormat) - SYMFUNC(NameForAtom) - SYMFUNC(BitOrderInvert) - SYMFUNC(FontFileMatchRenderer) - SYMFUNC(RepadBitmap) - SYMFUNC(FontEncName) - SYMFUNC(FontEncRecode) - SYMFUNC(FontEncFind) - SYMFUNC(FontMapFind) - SYMFUNC(FontEncMapFind) - SYMFUNC(FontEncFromXLFD) - SYMFUNC(FontEncDirectory) - SYMFUNC(FontMapReverse) - SYMFUNC(FontMapReverseFree) - SYMFUNC(CreateFontRec) - SYMFUNC(DestroyFontRec) - SYMFUNC(GetGlyphs) - SYMFUNC(QueryGlyphExtents) - - SYMVAR(FontFileBitmapSources) - -#ifdef FONTENC_COMPATIBILITY - /* Obsolete backwards compatibility symbols -- fontencc.c */ - SYMFUNC(font_encoding_from_xlfd) - SYMFUNC(font_encoding_find) - SYMFUNC(font_encoding_recode) - SYMFUNC(font_encoding_name) - SYMFUNC(identifyEncodingFile) -#endif - -#ifdef FONTCACHE - /* fontcache.c */ - SYMFUNC(FontCacheGetSettings) - SYMFUNC(FontCacheGetStatistics) - SYMFUNC(FontCacheChangeSettings) - SYMFUNC(FontCacheOpenCache) - SYMFUNC(FontCacheCloseCache) - SYMFUNC(FontCacheSearchEntry) - SYMFUNC(FontCacheGetEntry) - SYMFUNC(FontCacheInsertEntry) - SYMFUNC(FontCacheGetBitmap) -#endif - - {0, 0} -}; diff --git a/hw/xfree86/loader/hash.c b/hw/xfree86/loader/hash.c deleted file mode 100644 index 393360f94..000000000 --- a/hw/xfree86/loader/hash.c +++ /dev/null @@ -1,356 +0,0 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.3 2005/04/20 12:25:34 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.c,v 1.24 2003/11/17 22:20:40 dawes Exp $ */ - -/* - * - * Copyright 1995-1998 by Metro Link, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Metro Link, Inc. not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Metro Link, Inc. makes no - * representations about the suitability of this software for any purpose. - * It is provided "as is" without express or implied warranty. - * - * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - -#include "os.h" -#include -#undef abs -#include -#include "sym.h" -#include "loader.h" -#include "hash.h" - -#if defined(Lynx) -#define MAXINT 32000 -#else -#include -#undef MAXINT -#define MAXINT INT_MAX -#endif - -/* Prototypes for static functions. */ -static unsigned int hashFunc(const char *); -static itemPtr LoaderHashFindNearest(unsigned long); - -static itemPtr LoaderhashTable[HASHSIZE]; - -#ifdef DEBUG -static int hashhits[HASHSIZE]; - -void -DumpHashHits(void) -{ - int i; - int depth = 0; - int dev = 0; - - for (i = 0; i < HASHSIZE; i++) { - ErrorF("hashhits[%d]=%d\n", i, hashhits[i]); - depth += hashhits[i]; - } - - depth /= HASHSIZE; - ErrorF("Average hash depth=%d\n", depth); - - for (i = 0; i < HASHSIZE; i++) { - if (hashhits[i] < depth) - dev += depth - hashhits[i]; - else - dev += hashhits[i] - depth; - } - - dev /= HASHSIZE; - ErrorF("Average hash deviation=%d\n", dev); -} -#endif - -static unsigned int -hashFunc(const char *string) -{ - int i = 0; - - while (i < 10 && string[i]) - i++; - - if (i < 5) { -#ifdef DEBUG - hashhits[i]++; -#endif - return i; - } - -/* - * Original has function -#define HASH ((string[ i-4 ] * string[i-3] + string[i-2] ) & (HASHSIZE-1)) - */ - -#define HASH ((string[i-5] * string[ i-4 ] + string[i-3] * string[i-2] ) & (HASHSIZE-1)) - -#ifdef DEBUG - hashhits[HASH]++; -#endif - - return HASH; -} - -void -LoaderHashAdd(itemPtr entry) -{ - int bucket = hashFunc(entry->name); - itemPtr oentry; - - if ((oentry = LoaderHashFind(entry->name)) != NULL) - LoaderDuplicateSymbol(entry->name, oentry->handle); - - entry->next = LoaderhashTable[bucket]; - LoaderhashTable[bucket] = entry; - return; -} - -void -LoaderAddSymbols(int handle, int module, LOOKUP *list) -{ - LOOKUP *l = list, *exports = NULL; - itemPtr i, exportsItem = NULL; - char *modname; - - if (!list) - return; - - /* - * First look for a symbol called ExportedSymbols. If it exists, - * only export the symbols that are listed in that array. Otherwise - * export all of the external symbols. - */ - modname = _LoaderHandleToCanonicalName(handle); - if (modname) { - char *exportname; - - exportname = xf86loadermalloc(strlen("ExportedSymbols") + - strlen(modname) + 1); - if (exportname) { - sprintf(exportname, "%sExportedSymbols", modname); - while (l->symName) { - if (strcmp(l->symName, exportname) == 0) { - exports = l; - ErrorF("LoaderAddSymbols: %s: %s found\n", modname, - exportname); - break; - } - l++; - } - xf86loaderfree(exportname); - } - } - - /* - * Allocate the exports list item first. - */ - if (exports) { - exportsItem = xf86loadermalloc(sizeof(itemRec)); - exportsItem->name = exports->symName; - exportsItem->address = (char *)exports->offset; - exportsItem->handle = handle; - exportsItem->module = module; - exportsItem->exports = NULL; - LoaderHashAdd(exportsItem); - } - - /* - * Visit every symbol in the lookup table, tagging it with the - * reference to the export list, if present. - */ - l = list; - while (l->symName) { - if (l != exports) { - i = xf86loadermalloc(sizeof(itemRec)); - i->name = l->symName; - i->address = (char *)l->offset; - i->handle = handle; - i->module = module; - i->exports = exportsItem; - LoaderHashAdd(i); - } - l++; - } -} - -itemPtr -LoaderHashDelete(const char *string) -{ - int bucket = hashFunc(string); - itemPtr entry; - itemPtr *entry2; - - entry = LoaderhashTable[bucket]; - entry2 = &(LoaderhashTable[bucket]); - while (entry) { - if (!strcmp(entry->name, string)) { - *entry2 = entry->next; - xf86loaderfree(entry->name); - xf86loaderfree(entry); - return 0; - } - entry2 = &(entry->next); - entry = entry->next; - } - return 0; -} - -itemPtr -LoaderHashFind(const char *string) -{ - int bucket = hashFunc(string); - itemPtr entry; - - entry = LoaderhashTable[bucket]; - while (entry) { - if (!strcmp(entry->name, string)) { - return entry; - } - entry = entry->next; - } - return 0; -} - -static itemPtr -LoaderHashFindNearest(unsigned long address) -{ - int i; - itemPtr entry, best_entry = 0; - long best_difference = MAXINT; - - for (i = 0; i < HASHSIZE; i++) { - entry = LoaderhashTable[i]; - while (entry) { - long difference = (long)address - (long)entry->address; - - if (difference >= 0) { - if (best_entry) { - if (difference < best_difference) { - best_entry = entry; - best_difference = difference; - } - } else { - best_entry = entry; - best_difference = difference; - } - } - entry = entry->next; - } - } - return best_entry; -} - -void -LoaderPrintSymbol(unsigned long address) -{ - itemPtr entry; - - entry = LoaderHashFindNearest(address); - if (entry) { - const char *module, *section; - -#if defined(__alpha__) || defined(__ia64__) - ErrorF("0x%016lx %s+%lx\n", (unsigned long)entry->address, - entry->name, address - (unsigned long)entry->address); -#else - ErrorF("0x%lx %s+%lx\n", (unsigned long)entry->address, entry->name, - address - (unsigned long)entry->address); -#endif - - if (_LoaderAddressToSection(address, &module, §ion)) - ErrorF("\tModule \"%s\"\n\tSection \"%s\"\n", module, section); - } else { - ErrorF("(null)\n"); - } -} - -void -LoaderPrintItem(itemPtr pItem) -{ - if (pItem) { - const char *module, *section; - -#if defined(__alpha__) || defined(__ia64__) - ErrorF("0x%016lx %s\n", (unsigned long)pItem->address, pItem->name); -#else - ErrorF("0x%lx %s\n", (unsigned long)pItem->address, pItem->name); -#endif - if (_LoaderAddressToSection((unsigned long)pItem->address, - &module, §ion)) - ErrorF("\tModule \"%s\"\n\tSection \"%s\"\n", module, section); - } else - ErrorF("(null)\n"); -} - -void -LoaderPrintAddress(const char *symbol) -{ - itemPtr entry; - - entry = LoaderHashFind(symbol); - LoaderPrintItem(entry); -} - -void -LoaderHashTraverse(void *card, int (*fnp)(void *, itemPtr)) -{ - int i; - itemPtr entry, last_entry = 0; - - for (i = 0; i < HASHSIZE; i++) { - last_entry = 0; - entry = LoaderhashTable[i]; - while (entry) { - if ((*fnp) (card, entry)) { - if (last_entry) { - last_entry->next = entry->next; - xf86loaderfree(entry->name); - xf86loaderfree(entry); - entry = last_entry->next; - } else { - LoaderhashTable[i] = entry->next; - xf86loaderfree(entry->name); - xf86loaderfree(entry); - entry = LoaderhashTable[i]; - } - } else { - last_entry = entry; - entry = entry->next; - } - } - } -} - -void -LoaderDumpSymbols() -{ - itemPtr entry; - int j; - - for (j = 0; j < HASHSIZE; j++) { - entry = LoaderhashTable[j]; - while (entry) { - LoaderPrintItem(entry); - entry = entry->next; - } - } - -} diff --git a/hw/xfree86/loader/hash.h b/hw/xfree86/loader/hash.h deleted file mode 100644 index 45617bd5f..000000000 --- a/hw/xfree86/loader/hash.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * - * Copyright 1995-1998 by Metro Link, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Metro Link, Inc. not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Metro Link, Inc. makes no - * representations about the suitability of this software for any purpose. - * It is provided "as is" without express or implied warranty. - * - * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/hash.h,v 1.2.2.2 1998/07/04 13:32:45 dawes Exp $ */ - -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - -#ifndef _HASH_H -#define _HASH_H - -#include "loader.h" - -typedef struct _HashIterator { - itemPtr pItem; - int bucket; -} HashIteratorRec, *HashIteratorPtr; - -#endif /* _HASH_H */ diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index 05df28103..da70b022a 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.c,v 1.71 2003/11/06 18:38:13 tsi Exp $ */ - /* * Copyright 1995-1998 by Metro Link, Inc. * @@ -71,7 +69,6 @@ #include #include "os.h" -#include "sym.h" #include "loader.h" #include "loaderProcs.h" #include "xf86.h" @@ -79,31 +76,11 @@ #include "compiler.h" -extern LOOKUP miLookupTab[]; -extern LOOKUP xfree86LookupTab[]; -extern LOOKUP dixLookupTab[]; -extern LOOKUP fontLookupTab[]; -extern LOOKUP extLookupTab[]; - -/* -#define DEBUG -#define DEBUGAR -#define DEBUGLIST -#define DEBUGMEM -*/ - -int check_unresolved_sema = 0; - #if defined(Lynx) && defined(sun) /* Cross build machine doesn;t have strerror() */ #define strerror(err) "strerror unsupported" #endif -#ifdef __UNIXOS2__ -void *os2ldcalloc(size_t, size_t); -#endif - -#ifdef HANDLE_IN_HASH_ENTRY /* * handles are used to identify files that are loaded. Even archives * are counted as a single file. @@ -113,7 +90,6 @@ void *os2ldcalloc(size_t, size_t); #define HANDLE_USED 1 static char freeHandles[MAX_HANDLE]; static int refCount[MAX_HANDLE]; -#endif #if defined(__sparc__) && defined(__GNUC__) && !defined(__FreeBSD__) # define SYMFUNCDOT(func) { "." #func, (funcptr)&__sparc_dot_ ## func }, @@ -133,26 +109,6 @@ DEFFUNCDOT(mul) DEFFUNCDOT(umul) DEFFUNCDOT(div) DEFFUNCDOT(udiv) -#ifdef linux -static LOOKUP SparcV89LookupTab[] = { - SYMFUNCDOT89(rem) - SYMFUNCDOT89(urem) - SYMFUNCDOT89(mul) - SYMFUNCDOT89(umul) - SYMFUNCDOT89(div) - SYMFUNCDOT89(udiv) - {0, 0} -}; -#endif -static LOOKUP SparcLookupTab[] = { - SYMFUNCDOT(rem) - SYMFUNCDOT(urem) - SYMFUNCDOT(mul) - SYMFUNCDOT(umul) - SYMFUNCDOT(div) - SYMFUNCDOT(udiv) - {0, 0} -}; #ifdef linux #if defined(__GNUC__) && defined(__GLIBC__) @@ -220,22 +176,6 @@ sparcUseHWMulDiv(void) */ static int moduleseq = 0; -/* - * GDB Interface - * ============= - * - * Linked list of loaded modules - gdb will traverse this to determine - * whether it needs to add the symbols for the loaded module. - */ -LDRModulePtr ModList = 0; - -/* Flag which gdb sets to let us know we're being debugged */ -char DebuggerPresent = 0; - -/* List of common symbols */ -LDRCommonPtr ldrCommons; -int nCommons; - typedef struct { int num; const char **list; @@ -253,29 +193,8 @@ static symlist reqList = { 0, NULL }; static int fatalReqSym = 0; /* Prototypes for static functions. */ -static int _GetModuleType(int, long); static loaderPtr _LoaderListPush(void); static loaderPtr _LoaderListPop(int); - /*ARGSUSED*/ static char * -ARCHIVEAddressToSection(void *modptr, unsigned long address) -{ - return NULL; -} - -/* - * Array containing entry points for different formats. - */ - -static loader_funcs funcs[] = { - /* LD_ELFDLOBJECT */ - {DLLoadModule, - DLResolveSymbols, - DLCheckForUnresolved, - ARCHIVEAddressToSection, - DLUnloadModule}, -}; - -int numloaders = sizeof(funcs) / sizeof(loader_funcs); void LoaderInit(void) @@ -287,20 +206,6 @@ LoaderInit(void) xf86Msg(X_ERROR, "LD_BIND_NOW is set, dlloader will NOT work!\n"); } - LoaderAddSymbols(-1, -1, miLookupTab); - LoaderAddSymbols(-1, -1, xfree86LookupTab); - LoaderAddSymbols(-1, -1, dixLookupTab); - LoaderAddSymbols(-1, -1, fontLookupTab); - LoaderAddSymbols(-1, -1, extLookupTab); -#if defined(__sparc__) && !defined(__FreeBSD__) -#ifdef linux - if (sparcUseHWMulDiv()) - LoaderAddSymbols(-1, -1, SparcV89LookupTab); - else -#endif - LoaderAddSymbols(-1, -1, SparcLookupTab); -#endif - xf86MsgVerb(X_INFO, 2, "Module ABI versions:\n"); xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC, GET_ABI_MAJOR(LoaderVersionInfo.ansicVersion), @@ -322,16 +227,6 @@ LoaderInit(void) if (osname) xf86MsgVerb(X_INFO, 2, "Loader running on %s\n", osname); -#if defined(linux) && \ - (defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \ - || ( defined __amd64__ && ! defined UseMMAP && ! defined DoMMAPedMerge)) - /* - * The glibc malloc uses mmap for large allocations anyway. This breaks - * some relocation types because the offset overflow. See loader.h for more - * details. We need to turn off this behavior here. - */ - mallopt(M_MMAP_MAX, 0); -#endif #if defined(__UNIXWARE__) && !defined(__GNUC__) /* For UnixWare we need to load the C Runtime libraries which are * normally auto-linked by the compiler. Otherwise we are bound to @@ -354,25 +249,12 @@ LoaderInit(void) #endif } -/* - * Determine what type of object is being loaded. - * This function is responsible for restoring the offset. - * The fd and offset are used here so that when Archive processing - * is enabled, individual elements of an archive can be evaluated - * so the correct loader_funcs can be determined. - */ -static int -_GetModuleType(int fd, long offset) -{ - return LD_ELFDLOBJECT; -} - static loaderPtr listHead = (loaderPtr) 0; static loaderPtr _LoaderListPush() { - loaderPtr item = xf86loadercalloc(1, sizeof(struct _loader)); + loaderPtr item = calloc(1, sizeof(struct _loader)); item->next = listHead; listHead = item; @@ -493,28 +375,6 @@ _LoaderModuleToName(int module) return 0; } -/* - * _LoaderAddressToSection() will return the name of the file & section - * that contains the given address. - */ -int -_LoaderAddressToSection(const unsigned long address, const char **module, - const char **section) -{ - loaderPtr item = listHead; - - while (item) { - if ((*section = - item->funcs->AddressToSection(item->private, address)) != NULL) { - *module = _LoaderModuleToName(item->module); - return 1; - } - item = item->next; - } - - return 0; -} - /* * Add a list of symbols to the referenced list. */ @@ -676,22 +536,15 @@ _LoaderHandleUnresolved(char *symbol, char *module) return (fatalsym); } -/* - * Relocation list manipulation routines - */ - -/* - * Public Interface to the loader. - */ +/* Public Interface to the loader. */ int LoaderOpen(const char *module, const char *cname, int handle, int *errmaj, int *errmin, int *wasLoaded, int flags) { loaderPtr tmp; - int new_handle, modtype; + int new_handle; int fd; - LOOKUP *pLookup; #if defined(DEBUG) ErrorF("LoaderOpen(%s)\n", module); @@ -757,26 +610,15 @@ LoaderOpen(const char *module, const char *cname, int handle, return -1; } - if ((modtype = _GetModuleType(fd, 0)) < 0) { - xf86Msg(X_ERROR, "%s is an unrecognized module type\n", module); - freeHandles[new_handle] = HANDLE_FREE; - if (errmaj) - *errmaj = LDR_UNKTYPE; - if (errmin) - *errmin = LDR_UNKTYPE; - return -1; - } - tmp = _LoaderListPush(); - tmp->name = xf86loadermalloc(strlen(module) + 1); + tmp->name = malloc(strlen(module) + 1); strcpy(tmp->name, module); - tmp->cname = xf86loadermalloc(strlen(cname) + 1); + tmp->cname = malloc(strlen(cname) + 1); strcpy(tmp->cname, cname); tmp->handle = new_handle; tmp->module = moduleseq++; - tmp->funcs = &funcs[modtype]; - if ((tmp->private = funcs[modtype].LoadModule(tmp, fd, &pLookup, flags)) == NULL) { + if ((tmp->private = DLLoadModule(tmp, fd, flags)) == NULL) { xf86Msg(X_ERROR, "Failed to load %s\n", module); _LoaderListPop(new_handle); freeHandles[new_handle] = HANDLE_FREE; @@ -787,11 +629,6 @@ LoaderOpen(const char *module, const char *cname, int handle, return -1; } - if (tmp->private != (void *)-1L) { - LoaderAddSymbols(new_handle, tmp->module, pLookup); - xf86loaderfree(pLookup); - } - close(fd); return new_handle; @@ -813,50 +650,13 @@ LoaderHandleOpen(int handle) _X_EXPORT void * LoaderSymbol(const char *sym) { - int i; - itemPtr item = NULL; - - for (i = 0; i < numloaders; i++) - funcs[i].ResolveSymbols(&funcs[i]); - - item = (itemPtr) LoaderHashFind(sym); - - if (item) - return item->address; - else - return (DLFindSymbol(sym)); -} - -int -LoaderResolveSymbols(void) -{ - int i; - - for (i = 0; i < numloaders; i++) - funcs[i].ResolveSymbols(&funcs[i]); - return 0; + return (DLFindSymbol(sym)); } _X_EXPORT int LoaderCheckUnresolved(int delay_flag) { - int i, ret = 0; - LoaderResolveOptions delayFlag = (LoaderResolveOptions)delay_flag; - - LoaderResolveSymbols(); - - if (delayFlag == LD_RESOLV_NOW) { - if (check_unresolved_sema > 0) - check_unresolved_sema--; - else - xf86Msg(X_WARNING, "LoaderCheckUnresolved: not enough " - "MAGIC_DONT_CHECK_UNRESOLVED\n"); - } - - if (!check_unresolved_sema || delayFlag == LD_RESOLV_FORCE) - for (i = 0; i < numloaders; i++) - if (funcs[i].CheckForUnresolved(&funcs[i])) - ret = 1; + int ret = 0; if (fatalReqSym) FatalError("Some required symbols were unresolved\n"); @@ -864,24 +664,6 @@ LoaderCheckUnresolved(int delay_flag) return ret; } -void xf86LoaderTrap(void); - -void -xf86LoaderTrap(void) -{ -} - -_X_EXPORT void -LoaderDefaultFunc(void) -{ - ErrorF("\n\n\tThis should not happen!\n" - "\tAn unresolved function was called!\n"); - - xf86LoaderTrap(); - - FatalError("\n"); -} - int LoaderUnload(int handle) { @@ -905,10 +687,10 @@ LoaderUnload(int handle) /* It is not a member of an archive */ xf86Msg(X_INFO, "Unloading %s\n", tmp->name); } - tmp->funcs->LoaderUnload(tmp->private); - xf86loaderfree(tmp->name); - xf86loaderfree(tmp->cname); - xf86loaderfree(tmp); + DLUnloadModule(tmp->private); + free(tmp->name); + free(tmp->cname); + free(tmp); } freeHandles[handle] = HANDLE_FREE; @@ -925,12 +707,6 @@ LoaderDuplicateSymbol(const char *symbol, const int handle) FatalError("Module load failure\n"); } -/* GDB Sync function */ -void -_loader_debug_state() -{ -} - unsigned long LoaderOptions = 0; void diff --git a/hw/xfree86/loader/loader.h b/hw/xfree86/loader/loader.h index 193adddda..c0913849d 100644 --- a/hw/xfree86/loader/loader.h +++ b/hw/xfree86/loader/loader.h @@ -1,7 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/loader.h,v 1.28 2003/11/06 18:38:14 tsi Exp $ */ - /* - * * Copyright 1995-1998 by Metro Link, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its @@ -56,134 +53,19 @@ #ifndef _LOADER_H #define _LOADER_H -#include "sym.h" - #if defined(Lynx) && defined(sun) #define const /**/ #endif -#if (defined(__i386__) || defined(__ix86)) && !defined(i386) -#define i386 -#endif #include #include #include -/* For LOOKUP definition */ -#include "sym.h" -#define LD_UNKNOWN -1 -#define LD_ELFDLOBJECT 0 -#define LD_PROCESSED_ARCHIVE -1 -/* #define UNINIT_SECTION */ -#define HANDLE_IN_HASH_ENTRY /* LoadModule proc flags; LD_FLAG_GLOBAL adds symbols to global * namespace, default is to keep symbols local to module. */ #define LD_FLAG_GLOBAL 1 -#define TestFree(a) if (a) { xfree (a); a = NULL; } -#define HASHDIV 10 -#define HASHSIZE (1< #include -extern int check_unresolved_sema; +#define TestFree(a) if (a) { xfree (a); a = NULL; } typedef struct _pattern { const char *pattern; @@ -93,7 +90,7 @@ static ModuleDescPtr doLoadModule(const char *, const char *, const char **, const XF86ModReqInfo *, int *, int *, int flags); -ModuleVersions LoaderVersionInfo = { +const ModuleVersions LoaderVersionInfo = { XORG_VERSION_CURRENT, ABI_ANSIC_VERSION, ABI_VIDEODRV_VERSION, @@ -102,17 +99,6 @@ ModuleVersions LoaderVersionInfo = { ABI_FONT_VERSION }; -#if 0 -void -LoaderFixups(void) -{ - /* Need to call LRS here because the frame buffers get loaded last, - * and the drivers depend on them. */ - - LoaderResolveSymbols(); -} -#endif - static void FreeStringList(char **paths) { @@ -225,15 +211,15 @@ static const char *stdSubdirs[] = { /* * Standard set of module name patterns to check, in order of preference * These are regular expressions (suitable for use with POSIX regex(3)). + * + * This list assumes that you're an ELFish platform and therefore your + * shared libraries are named something.so. If we're ever nuts enough + * to port this DDX to, say, Darwin, we'll need to fix this. */ static PatternRec stdPatterns[] = { {"^lib(.*)\\.so$",}, - {"^lib(.*)\\.a$",}, {"(.*)_drv\\.so$",}, - {"(.*)_drv\\.o$",}, {"(.*)\\.so$",}, - {"(.*)\\.a$",}, - {"(.*)\\.o$",}, {NULL,} }; @@ -432,7 +418,6 @@ FindModule(const char *module, const char *dir, const char **subdirlist, continue; strcpy(buf, dirpath); strcat(buf, *s); - /*xf86Msg(X_INFO,"OS2DIAG: FindModule: buf=%s\n",buf); */ if ((stat(buf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) { if (buf[dirlen - 1] != '/') { buf[dirlen++] = '/'; @@ -728,19 +713,11 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data, /* XXX Maybe this should be the other way around? */ if (min > reqmin) { xf86MsgVerb(X_WARNING, 2, "module ABI minor version (%d) " - "is new than that available (%d)\n", min, reqmin); + "is newer than that available (%d)\n", min, reqmin); return FALSE; } } } -#ifdef NOTYET - if (data->checksum) { - /* verify the checksum field */ - /* TO BE DONE */ - } else { - ErrorF("\t*** Checksum field is 0 - this module is untrusted!\n"); - } -#endif return TRUE; } @@ -867,7 +844,6 @@ doLoadModule(const char *module, const char *path, const char **subdirlist, int noncanonical = 0; char *m = NULL; - /*xf86Msg(X_INFO,"OS2DIAG: LoadModule: %s\n",module); */ xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"", module); patterns = InitPatterns(patternlist); @@ -1306,7 +1282,7 @@ LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin) msg = "module-specific error"; break; default: - msg = "uknown error"; + msg = "unknown error"; } if (name) xf86Msg(type, "%s: Failed to load module \"%s\" (%s, %d)\n", diff --git a/hw/xfree86/loader/misym.c b/hw/xfree86/loader/misym.c deleted file mode 100644 index dc3cb5a85..000000000 --- a/hw/xfree86/loader/misym.c +++ /dev/null @@ -1,225 +0,0 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/loader/misym.c,v 1.9 2005/10/18 04:02:31 aplattner Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/misym.c,v 1.38 2003/10/15 16:29:04 dawes Exp $ */ - -/* - * - * Copyright 1995,96 by Metro Link, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Metro Link, Inc. not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Metro Link, Inc. makes no - * representations about the suitability of this software for any purpose. - * It is provided "as is" without express or implied warranty. - * - * METRO LINK, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL METRO LINK, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -/* - * Copyright (c) 1997-2003 by The XFree86 Project, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of the copyright holder(s) - * and author(s) shall not be used in advertising or otherwise to promote - * the sale, use or other dealings in this Software without prior written - * authorization from the copyright holder(s) and author(s). - */ - -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - -#include "sym.h" -#include "misc.h" -#include "mi.h" -#include "mibank.h" -#include "miwideline.h" -#include "mibstore.h" -#include "cursor.h" -#include "mipointer.h" -#include "migc.h" -#include "miline.h" -#include "mizerarc.h" -#include "mifillarc.h" -#include "micmap.h" -#include "mioverlay.h" -#ifdef PANORAMIX -#include "resource.h" -#include "panoramiX.h" -#endif -#ifdef RENDER -#include "mipict.h" -#endif -#ifdef COMPOSITE -#include "cw.h" -#endif -#ifdef DAMAGE -#include "damage.h" -#endif - -/* mi things */ - -extern miPointerSpriteFuncRec miSpritePointerFuncs; - -LOOKUP miLookupTab[] = { - SYMFUNC(miClearToBackground) - SYMFUNC(miSendGraphicsExpose) - SYMFUNC(miModifyPixmapHeader) - SYMFUNC(miHandleValidateExposures) - SYMFUNC(miSetShape) - SYMFUNC(miChangeBorderWidth) - SYMFUNC(miShapedWindowIn) - SYMFUNC(miRectIn) - SYMFUNC(miZeroClipLine) - SYMFUNC(miZeroDashLine) - SYMFUNC(miClearDrawable) - SYMFUNC(miPolyPoint) - SYMFUNC(miStepDash) - SYMFUNC(miIntersect) - SYMFUNC(miRegionAppend) - SYMFUNC(miRegionCopy) - SYMFUNC(miRegionDestroy) - SYMFUNC(miRegionEmpty) - SYMFUNC(miRegionExtents) - SYMFUNC(miRegionInit) - SYMFUNC(miRegionNotEmpty) - SYMFUNC(miRegionEqual) - SYMFUNC(miRegionReset) - SYMFUNC(miRegionUninit) - SYMFUNC(miRegionValidate) - SYMFUNC(miTranslateRegion) - SYMFUNC(miHandleExposures) - SYMFUNC(miPolyFillRect) - SYMFUNC(miPolyFillArc) - SYMFUNC(miImageGlyphBlt) - SYMFUNC(miPolyGlyphBlt) - SYMFUNC(miFillPolygon) - SYMFUNC(miFillConvexPoly) - SYMFUNC(miPolySegment) - SYMFUNC(miZeroLine) - SYMFUNC(miWideLine) - SYMFUNC(miWideDash) - SYMFUNC(miZeroPolyArc) - SYMFUNC(miPolyArc) - SYMFUNC(miCreateGCOps) - SYMFUNC(miDestroyGCOps) - SYMFUNC(miComputeCompositeClip) - SYMFUNC(miChangeGC) - SYMFUNC(miCopyGC) - SYMFUNC(miDestroyGC) - SYMFUNC(miChangeClip) - SYMFUNC(miDestroyClip) - SYMFUNC(miCopyClip) - SYMFUNC(miPolyRectangle) - SYMFUNC(miPolyText8) - SYMFUNC(miPolyText16) - SYMFUNC(miImageText8) - SYMFUNC(miImageText16) - SYMFUNC(miRegionCreate) - SYMFUNC(miPaintWindow) - SYMFUNC(miZeroArcSetup) - SYMFUNC(miFillArcSetup) - SYMFUNC(miFillArcSliceSetup) - SYMFUNC(miFindMaxBand) - SYMFUNC(miClipSpans) - SYMFUNC(miAllocateGCPrivateIndex) - SYMFUNC(miScreenInit) - SYMFUNC(miGetScreenPixmap) - SYMFUNC(miSetScreenPixmap) - SYMFUNC(miPointerCurrentScreen) - SYMFUNC(miRectAlloc) - SYMFUNC(miInitializeBackingStore) - SYMFUNC(miInitializeBanking) - SYMFUNC(miModifyBanking) - SYMFUNC(miCopyPlane) - SYMFUNC(miCopyArea) - SYMFUNC(miCreateScreenResources) - SYMFUNC(miGetImage) - SYMFUNC(miPutImage) - SYMFUNC(miPushPixels) - SYMFUNC(miPointerInitialize) - SYMFUNC(miPointerPosition) - SYMFUNC(miRecolorCursor) - SYMFUNC(miPointerWarpCursor) - SYMFUNC(miDCInitialize) - SYMFUNC(miRectsToRegion) - SYMFUNC(miPointInRegion) - SYMFUNC(miInverse) - SYMFUNC(miSubtract) - SYMFUNC(miUnion) - SYMFUNC(miPolyBuildEdge) - SYMFUNC(miPolyBuildPoly) - SYMFUNC(miRoundJoinClip) - SYMFUNC(miRoundCapClip) - SYMFUNC(miSetZeroLineBias) - SYMFUNC(miResolveColor) - SYMFUNC(miInitializeColormap) - SYMFUNC(miInstallColormap) - SYMFUNC(miUninstallColormap) - SYMFUNC(miListInstalledColormaps) - SYMFUNC(miExpandDirectColors) - SYMFUNC(miCreateDefColormap) - SYMFUNC(miClearVisualTypes) - SYMFUNC(miSetVisualTypes) - SYMFUNC(miSetVisualTypesAndMasks) - SYMFUNC(miGetDefaultVisualMask) - SYMFUNC(miSetPixmapDepths) - SYMFUNC(miInitVisuals) - SYMFUNC(miWindowExposures) - SYMFUNC(miSegregateChildren) - SYMFUNC(miHookInitVisuals) - SYMFUNC(miPointerAbsoluteCursor) - SYMFUNC(miPointerGetMotionEvents) - SYMFUNC(miPointerGetMotionBufferSize) - SYMFUNC(miOverlayCopyUnderlay) - SYMFUNC(miOverlaySetTransFunction) - SYMFUNC(miOverlayCollectUnderlayRegions) - SYMFUNC(miInitOverlay) - SYMFUNC(miOverlayComputeCompositeClip) - SYMFUNC(miOverlayGetPrivateClips) - SYMFUNC(miOverlaySetRootClip) - SYMVAR(miEmptyBox) - SYMVAR(miEmptyData) - SYMVAR(miZeroLineScreenIndex) - SYMVAR(miSpritePointerFuncs) - SYMVAR(miPointerScreenIndex) - SYMVAR(miInstalledMaps) - SYMVAR(miInitVisualsProc) -#ifdef RENDER - SYMFUNC(miGlyphExtents) -#endif -#ifdef COMPOSITE - SYMFUNC(miDisableCompositeWrapper) -#endif -#ifdef DAMAGE - SYMFUNC(DamageDamageRegion) -#endif - - {0, 0} -}; diff --git a/hw/xfree86/loader/os.c b/hw/xfree86/loader/os.c index 4274200c3..42ab0bc70 100644 --- a/hw/xfree86/loader/os.c +++ b/hw/xfree86/loader/os.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/loader/os.c,v 1.4 2003/10/15 16:29:04 dawes Exp $ */ - /* * Copyright (c) 1999-2002 by The XFree86 Project, Inc. * @@ -38,6 +36,7 @@ * loader and by OS-specific modules. */ +#ifndef OSNAME #if defined(__linux__) #define OSNAME "linux" #elif defined(__FreeBSD__) @@ -67,6 +66,7 @@ #else #define OSNAME "unknown" #endif +#endif /* Return the OS name, and run-time OS version */ diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c index fc4edc378..1663893d9 100644 --- a/hw/xfree86/os-support/shared/libc_wrapper.c +++ b/hw/xfree86/os-support/shared/libc_wrapper.c @@ -1270,7 +1270,10 @@ xf86execl(const char *pathname, const char *arg, ...) #ifndef SELF_CONTAINED_WRAPPER xf86DisableIO(); #endif - setuid(getuid()); + if (setuid(getuid()) == -1) { + ErrorF("xf86Execl: setuid() failed: %s\n", strerror(errno)); + exit(255); + } #if !defined(SELF_CONTAINED_WRAPPER) /* set stdin, stdout to the consoleFD, and leave stderr alone */ for (i = 0; i < 2; i++) diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c index 285080d99..82baa5a04 100644 --- a/hw/xfree86/parser/write.c +++ b/hw/xfree86/parser/write.c @@ -170,7 +170,10 @@ xf86writeConfigFile (const char *filename, XF86ConfigPtr cptr) strerror(errno)); return 0; case 0: /* child */ - setuid(getuid()); + if (setuid(getuid() == -1) + FatalError("xf86writeConfigFile(): " + "setuid failed(%s)\n", + strerror(errno)); ret = doWriteConfigFile(filename, cptr); exit(ret); break; diff --git a/hw/xfree86/rac/Makefile.am b/hw/xfree86/rac/Makefile.am index 144159d5f..0e7cc72b5 100644 --- a/hw/xfree86/rac/Makefile.am +++ b/hw/xfree86/rac/Makefile.am @@ -1,6 +1,5 @@ -module_LTLIBRARIES = librac.la -librac_la_LDFLAGS = -avoid-version -librac_la_SOURCES = xf86RACmodule.c xf86RAC.c +module_LIBRARIES = librac.a +librac_a_SOURCES = xf86RAC.c sdk_HEADERS = xf86RAC.h diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c index 1f2d3a129..aba86226e 100644 --- a/hw/xfree86/rac/xf86RAC.c +++ b/hw/xfree86/rac/xf86RAC.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.5 1999/06/12 17:30:21 dawes Exp $ */ - #ifdef HAVE_XORG_CONFIG_H #include #endif @@ -243,12 +241,12 @@ static void RACCompositeRects(CARD8 op, PicturePtr pDst, xRenderColor *color, int nRect, xRectangle *rects); #endif -GCFuncs RACGCFuncs = { +static GCFuncs RACGCFuncs = { RACValidateGC, RACChangeGC, RACCopyGC, RACDestroyGC, RACChangeClip, RACDestroyClip, RACCopyClip }; -GCOps RACGCOps = { +static GCOps RACGCOps = { RACFillSpans, RACSetSpans, RACPutImage, RACCopyArea, RACCopyPlane, RACPolyPoint, RACPolylines, RACPolySegment, RACPolyRectangle, RACPolyArc, RACFillPolygon, RACPolyFillRect, @@ -257,13 +255,13 @@ GCOps RACGCOps = { {NULL} /* devPrivate */ }; -miPointerSpriteFuncRec RACSpriteFuncs = { +static miPointerSpriteFuncRec RACSpriteFuncs = { RACSpriteRealizeCursor, RACSpriteUnrealizeCursor, RACSpriteSetCursor, RACSpriteMoveCursor }; -int RACScreenIndex = -1; -int RACGCIndex = -1; +static int RACScreenIndex = -1; +static int RACGCIndex = -1; static unsigned long RACGeneration = 0; diff --git a/hw/xfree86/rac/xf86RACmodule.c b/hw/xfree86/rac/xf86RACmodule.c deleted file mode 100644 index 7b1bdac98..000000000 --- a/hw/xfree86/rac/xf86RACmodule.c +++ /dev/null @@ -1,21 +0,0 @@ -#ifdef HAVE_XORG_CONFIG_H -#include -#endif - -#include "xf86Module.h" - -static XF86ModuleVersionInfo racVersRec = -{ - "rac", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 0, 0, - ABI_CLASS_VIDEODRV, /* requires the video driver ABI */ - ABI_VIDEODRV_VERSION, - MOD_CLASS_NONE, - {0,0,0,0} -}; - -_X_EXPORT XF86ModuleData racModuleData = { &racVersRec, NULL, NULL }; diff --git a/hw/xfree86/utils/gtf/.gitignore b/hw/xfree86/utils/gtf/.gitignore new file mode 100644 index 000000000..741071d52 --- /dev/null +++ b/hw/xfree86/utils/gtf/.gitignore @@ -0,0 +1,2 @@ +gtf.1 +gtf.1x diff --git a/hw/xfree86/utils/pcitweak/.gitignore b/hw/xfree86/utils/pcitweak/.gitignore new file mode 100644 index 000000000..c866baf62 --- /dev/null +++ b/hw/xfree86/utils/pcitweak/.gitignore @@ -0,0 +1,3 @@ +pcitweak.1 +pcitweak.1x + diff --git a/hw/xfree86/utils/scanpci/.gitignore b/hw/xfree86/utils/scanpci/.gitignore new file mode 100644 index 000000000..b752c7455 --- /dev/null +++ b/hw/xfree86/utils/scanpci/.gitignore @@ -0,0 +1,2 @@ +scanpci.1 +scanpci.1x diff --git a/hw/xfree86/utils/xorgcfg/.gitignore b/hw/xfree86/utils/xorgcfg/.gitignore new file mode 100644 index 000000000..378869b1c --- /dev/null +++ b/hw/xfree86/utils/xorgcfg/.gitignore @@ -0,0 +1,2 @@ +xorgcfg.1 +xorgcfg.1x diff --git a/hw/xfree86/utils/xorgconfig/.gitignore b/hw/xfree86/utils/xorgconfig/.gitignore new file mode 100644 index 000000000..6f3cabd65 --- /dev/null +++ b/hw/xfree86/utils/xorgconfig/.gitignore @@ -0,0 +1 @@ +xorgconfig.1 diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c index 1a2de42f3..4aafb706b 100644 --- a/hw/xfree86/xf4bpp/ppcGC.c +++ b/hw/xfree86/xf4bpp/ppcGC.c @@ -97,8 +97,8 @@ SOFTWARE. */ static GCFuncs vgaGCFuncs = { xf4bppValidateGC, - (void (*)())NoopDDA, - (void (*)())NoopDDA, + (void (*)(GCPtr, unsigned long))NoopDDA, + (void (*)(GCPtr, unsigned long, GCPtr))NoopDDA, xf4bppDestroyGC, xf4bppChangeClip, xf4bppDestroyClip, diff --git a/hw/xnest/.gitignore b/hw/xnest/.gitignore new file mode 100644 index 000000000..fc92eb176 --- /dev/null +++ b/hw/xnest/.gitignore @@ -0,0 +1,2 @@ +Xnest.1 +Xnest.1x diff --git a/Xprint/AttrValid.c b/hw/xprint/AttrValid.c similarity index 100% rename from Xprint/AttrValid.c rename to hw/xprint/AttrValid.c diff --git a/Xprint/AttrValid.h b/hw/xprint/AttrValid.h similarity index 100% rename from Xprint/AttrValid.h rename to hw/xprint/AttrValid.h diff --git a/Xprint/DiPrint.h b/hw/xprint/DiPrint.h similarity index 100% rename from Xprint/DiPrint.h rename to hw/xprint/DiPrint.h diff --git a/Xprint/Init.c b/hw/xprint/Init.c similarity index 100% rename from Xprint/Init.c rename to hw/xprint/Init.c diff --git a/Xprint/Makefile.am b/hw/xprint/Makefile.am similarity index 83% rename from Xprint/Makefile.am rename to hw/xprint/Makefile.am index d2a26d641..46647a519 100644 --- a/Xprint/Makefile.am +++ b/hw/xprint/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = doc pcl pcl-mono raster ps etc +SUBDIRS = doc pcl pcl-mono raster ps etc config bin_PROGRAMS = Xprt @@ -9,8 +9,8 @@ Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ Xprt_LDFLAGS = -L$(top_srcdir) Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \ - pcl/libpcl.la pcl-mono/libpcl.la ../fb/libfb.la \ - ../render/librender.la ../mi/libmi.la ../Xext/libXext.la \ + pcl/libpcl.la pcl-mono/libpcl.la ../../fb/libfb.la \ + ../../render/librender.la ../../mi/libmi.la ../../Xext/libXext.la \ @FREETYPE_LIBS@ miinitext-wrapper.c: diff --git a/Xprint/Oid.c b/hw/xprint/Oid.c similarity index 100% rename from Xprint/Oid.c rename to hw/xprint/Oid.c diff --git a/Xprint/Oid.h b/hw/xprint/Oid.h similarity index 100% rename from Xprint/Oid.h rename to hw/xprint/Oid.h diff --git a/Xprint/OidDefs.h b/hw/xprint/OidDefs.h similarity index 100% rename from Xprint/OidDefs.h rename to hw/xprint/OidDefs.h diff --git a/Xprint/OidStrs.h b/hw/xprint/OidStrs.h similarity index 100% rename from Xprint/OidStrs.h rename to hw/xprint/OidStrs.h diff --git a/Xprint/Util.c b/hw/xprint/Util.c similarity index 100% rename from Xprint/Util.c rename to hw/xprint/Util.c diff --git a/Xprint/ValTree.c b/hw/xprint/ValTree.c similarity index 100% rename from Xprint/ValTree.c rename to hw/xprint/ValTree.c diff --git a/Xprint/attributes.c b/hw/xprint/attributes.c similarity index 100% rename from Xprint/attributes.c rename to hw/xprint/attributes.c diff --git a/Xprint/attributes.h b/hw/xprint/attributes.h similarity index 100% rename from Xprint/attributes.h rename to hw/xprint/attributes.h diff --git a/XpConfig/C/Makefile.am b/hw/xprint/config/C/Makefile.am similarity index 100% rename from XpConfig/C/Makefile.am rename to hw/xprint/config/C/Makefile.am diff --git a/XpConfig/C/print/Makefile.am b/hw/xprint/config/C/print/Makefile.am similarity index 100% rename from XpConfig/C/print/Makefile.am rename to hw/xprint/config/C/print/Makefile.am diff --git a/XpConfig/C/print/Xprinters b/hw/xprint/config/C/print/Xprinters similarity index 100% rename from XpConfig/C/print/Xprinters rename to hw/xprint/config/C/print/Xprinters diff --git a/XpConfig/C/print/attributes/Makefile.am b/hw/xprint/config/C/print/attributes/Makefile.am similarity index 100% rename from XpConfig/C/print/attributes/Makefile.am rename to hw/xprint/config/C/print/attributes/Makefile.am diff --git a/XpConfig/C/print/attributes/document b/hw/xprint/config/C/print/attributes/document similarity index 100% rename from XpConfig/C/print/attributes/document rename to hw/xprint/config/C/print/attributes/document diff --git a/XpConfig/C/print/attributes/job b/hw/xprint/config/C/print/attributes/job similarity index 100% rename from XpConfig/C/print/attributes/job rename to hw/xprint/config/C/print/attributes/job diff --git a/XpConfig/C/print/attributes/printer b/hw/xprint/config/C/print/attributes/printer similarity index 100% rename from XpConfig/C/print/attributes/printer rename to hw/xprint/config/C/print/attributes/printer diff --git a/XpConfig/C/print/ddx-config/Makefile.am b/hw/xprint/config/C/print/ddx-config/Makefile.am similarity index 100% rename from XpConfig/C/print/ddx-config/Makefile.am rename to hw/xprint/config/C/print/ddx-config/Makefile.am diff --git a/XpConfig/C/print/ddx-config/raster/Makefile.am b/hw/xprint/config/C/print/ddx-config/raster/Makefile.am similarity index 100% rename from XpConfig/C/print/ddx-config/raster/Makefile.am rename to hw/xprint/config/C/print/ddx-config/raster/Makefile.am diff --git a/XpConfig/C/print/ddx-config/raster/pcl b/hw/xprint/config/C/print/ddx-config/raster/pcl similarity index 100% rename from XpConfig/C/print/ddx-config/raster/pcl rename to hw/xprint/config/C/print/ddx-config/raster/pcl diff --git a/XpConfig/C/print/ddx-config/raster/postscript b/hw/xprint/config/C/print/ddx-config/raster/postscript similarity index 100% rename from XpConfig/C/print/ddx-config/raster/postscript rename to hw/xprint/config/C/print/ddx-config/raster/postscript diff --git a/XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am b/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.am similarity index 100% rename from XpConfig/C/print/models/CANONBJ10E-GS/Makefile.am rename to hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.am diff --git a/XpConfig/C/print/models/CANONBJ10E-GS/model-config b/hw/xprint/config/C/print/models/CANONBJ10E-GS/model-config similarity index 100% rename from XpConfig/C/print/models/CANONBJ10E-GS/model-config rename to hw/xprint/config/C/print/models/CANONBJ10E-GS/model-config diff --git a/XpConfig/C/print/models/CANONC3200-PS/Makefile.am b/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.am similarity index 100% rename from XpConfig/C/print/models/CANONC3200-PS/Makefile.am rename to hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.am diff --git a/XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am b/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am similarity index 100% rename from XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile.am rename to hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.am diff --git a/XpConfig/C/print/models/CANONC3200-PS/model-config b/hw/xprint/config/C/print/models/CANONC3200-PS/model-config similarity index 100% rename from XpConfig/C/print/models/CANONC3200-PS/model-config rename to hw/xprint/config/C/print/models/CANONC3200-PS/model-config diff --git a/XpConfig/C/print/models/GSdefault/Makefile.am b/hw/xprint/config/C/print/models/GSdefault/Makefile.am similarity index 100% rename from XpConfig/C/print/models/GSdefault/Makefile.am rename to hw/xprint/config/C/print/models/GSdefault/Makefile.am diff --git a/XpConfig/C/print/models/GSdefault/model-config b/hw/xprint/config/C/print/models/GSdefault/model-config similarity index 100% rename from XpConfig/C/print/models/GSdefault/model-config rename to hw/xprint/config/C/print/models/GSdefault/model-config diff --git a/XpConfig/C/print/models/HPDJ1600C/Makefile.am b/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.am similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/Makefile.am rename to hw/xprint/config/C/print/models/HPDJ1600C/Makefile.am diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00051.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00051.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00051.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00051.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00052.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00052.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00052.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00052.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00053.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00053.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00053.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00053.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00054.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00054.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00054.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00054.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00055.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00055.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00055.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00055.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00056.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00056.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00056.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00056.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00057.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00057.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00057.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00057.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00058.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00058.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00058.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00058.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00059.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00059.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00059.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00059.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00060.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00060.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00060.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00060.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00061.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00061.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00061.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00061.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00062.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00062.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00062.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00062.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00063.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00063.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00063.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00063.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00064.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00064.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00064.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00064.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00065.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00065.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00065.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00065.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00066.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00066.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00066.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00066.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00067.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00067.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00067.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00067.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00068.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00068.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00068.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00068.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00069.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00069.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00069.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00069.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00070.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00070.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00070.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00070.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00071.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00071.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00071.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00071.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00072.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00072.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00072.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00072.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00073.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00073.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00073.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00073.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00074.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00074.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00074.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00074.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00075.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00075.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00075.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00075.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00076.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00076.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00076.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00076.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00077.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00077.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00077.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00077.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00079.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00079.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00079.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00079.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00080.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00080.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00080.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00080.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00081.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00081.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00081.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00081.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00082.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00082.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00082.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00082.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00083.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00083.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00083.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00083.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00084.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00084.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00084.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00084.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00085.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00085.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00085.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00085.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00086.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00086.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00086.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00086.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00087.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00087.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00087.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00087.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00088.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00088.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00088.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00088.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00089.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00089.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00089.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00089.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00090.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00090.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00090.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00090.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00091.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00091.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00091.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00091.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00092.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00092.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00092.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00092.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00093.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00093.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00093.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00093.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/9nb00094.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00094.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/9nb00094.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/9nb00094.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/Makefile.am b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.am similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/Makefile.am rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.am diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/README b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/README similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/README rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/README diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/fonts.alias similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/fonts.alias rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/fonts.alias diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/fonts.dir b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/fonts.dir similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/fonts.dir rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/fonts.dir diff --git a/XpConfig/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf b/hw/xprint/config/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf rename to hw/xprint/config/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf diff --git a/XpConfig/C/print/models/HPDJ1600C/model-config b/hw/xprint/config/C/print/models/HPDJ1600C/model-config similarity index 100% rename from XpConfig/C/print/models/HPDJ1600C/model-config rename to hw/xprint/config/C/print/models/HPDJ1600C/model-config diff --git a/XpConfig/C/print/models/HPLJ4050-PS/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.am similarity index 100% rename from XpConfig/C/print/models/HPLJ4050-PS/Makefile.am rename to hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.am diff --git a/XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am similarity index 100% rename from XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile.am rename to hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.am diff --git a/XpConfig/C/print/models/HPLJ4050-PS/model-config b/hw/xprint/config/C/print/models/HPLJ4050-PS/model-config similarity index 100% rename from XpConfig/C/print/models/HPLJ4050-PS/model-config rename to hw/xprint/config/C/print/models/HPLJ4050-PS/model-config diff --git a/XpConfig/C/print/models/HPLJ4family/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4family/Makefile.am similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/Makefile.am rename to hw/xprint/config/C/print/models/HPLJ4family/Makefile.am diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00051.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00051.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00051.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00051.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00052.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00052.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00052.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00052.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00053.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00053.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00053.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00053.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00054.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00054.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00054.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00054.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00055.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00055.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00055.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00055.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00056.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00056.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00056.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00056.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00057.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00057.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00057.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00057.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00058.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00058.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00058.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00058.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00059.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00059.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00059.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00059.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00060.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00060.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00060.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00060.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00061.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00061.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00061.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00061.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00062.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00062.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00062.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00062.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00063.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00063.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00063.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00063.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00064.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00064.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00064.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00064.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00065.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00065.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00065.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00065.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00066.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00066.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00066.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00066.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00067.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00067.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00067.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00067.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00068.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00068.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00068.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00068.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00069.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00069.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00069.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00069.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00070.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00070.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00070.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00070.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00071.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00071.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00071.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00071.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00072.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00072.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00072.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00072.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00073.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00073.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00073.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00073.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00074.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00074.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00074.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00074.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00075.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00075.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00075.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00075.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00076.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00076.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00076.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00076.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00077.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00077.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00077.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00077.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00079.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00079.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00079.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00079.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00080.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00080.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00080.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00080.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00081.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00081.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00081.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00081.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00082.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00082.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00082.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00082.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00083.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00083.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00083.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00083.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00084.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00084.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00084.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00084.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00085.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00085.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00085.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00085.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00086.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00086.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00086.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00086.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00087.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00087.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00087.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00087.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00088.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00088.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00088.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00088.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00089.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00089.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00089.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00089.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00090.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00090.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00090.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00090.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00091.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00091.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00091.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00091.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00092.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00092.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00092.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00092.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00093.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00093.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00093.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00093.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/9nb00094.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00094.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/9nb00094.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/9nb00094.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am b/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.am similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/Makefile.am rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.am diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/README b/hw/xprint/config/C/print/models/HPLJ4family/fonts/README similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/README rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/README diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias b/hw/xprint/config/C/print/models/HPLJ4family/fonts/fonts.alias similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/fonts.alias rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/fonts.alias diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/fonts.dir b/hw/xprint/config/C/print/models/HPLJ4family/fonts/fonts.dir similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/fonts.dir rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/fonts.dir diff --git a/XpConfig/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf b/hw/xprint/config/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf rename to hw/xprint/config/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf diff --git a/XpConfig/C/print/models/HPLJ4family/model-config b/hw/xprint/config/C/print/models/HPLJ4family/model-config similarity index 100% rename from XpConfig/C/print/models/HPLJ4family/model-config rename to hw/xprint/config/C/print/models/HPLJ4family/model-config diff --git a/XpConfig/C/print/models/Makefile.am b/hw/xprint/config/C/print/models/Makefile.am similarity index 100% rename from XpConfig/C/print/models/Makefile.am rename to hw/xprint/config/C/print/models/Makefile.am diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am b/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.am similarity index 100% rename from XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile.am rename to hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.am diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/model-config b/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/model-config similarity index 100% rename from XpConfig/C/print/models/PS2PDFspooldir-GS/model-config rename to hw/xprint/config/C/print/models/PS2PDFspooldir-GS/model-config diff --git a/XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh b/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh similarity index 100% rename from XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh rename to hw/xprint/config/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh diff --git a/XpConfig/C/print/models/PSdefault/Makefile.am b/hw/xprint/config/C/print/models/PSdefault/Makefile.am similarity index 100% rename from XpConfig/C/print/models/PSdefault/Makefile.am rename to hw/xprint/config/C/print/models/PSdefault/Makefile.am diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/AvantGarde-DemiOblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier-Bold.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier-Bold.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Courier-Bold.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Courier-Bold.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Courier-BoldOblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier-Oblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier-Oblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Courier-Oblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Courier-Oblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Courier.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Courier.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Courier.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Courier.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-Bold.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-BoldOblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica-Oblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Helvetica.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Helvetica.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Helvetica.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-Book.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-BookOblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Makefile.am b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Makefile.am rename to hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-DemiItalic.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-Light.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-Light.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Souvenir-Light.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-Light.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Souvenir-LightItalic.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Symbol.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Symbol.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Symbol.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Symbol.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-Bold.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-Bold.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Times-Bold.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Times-Bold.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Times-BoldItalic.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-Italic.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-Italic.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Times-Italic.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Times-Italic.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/Times-Roman.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/Times-Roman.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/Times-Roman.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/Times-Roman.pmf diff --git a/XpConfig/C/print/models/PSdefault/fonts/ZapfDingbats.pmf b/hw/xprint/config/C/print/models/PSdefault/fonts/ZapfDingbats.pmf similarity index 100% rename from XpConfig/C/print/models/PSdefault/fonts/ZapfDingbats.pmf rename to hw/xprint/config/C/print/models/PSdefault/fonts/ZapfDingbats.pmf diff --git a/XpConfig/C/print/models/PSdefault/model-config b/hw/xprint/config/C/print/models/PSdefault/model-config similarity index 100% rename from XpConfig/C/print/models/PSdefault/model-config rename to hw/xprint/config/C/print/models/PSdefault/model-config diff --git a/XpConfig/C/print/models/PSspooldir/Makefile.am b/hw/xprint/config/C/print/models/PSspooldir/Makefile.am similarity index 100% rename from XpConfig/C/print/models/PSspooldir/Makefile.am rename to hw/xprint/config/C/print/models/PSspooldir/Makefile.am diff --git a/XpConfig/C/print/models/PSspooldir/model-config b/hw/xprint/config/C/print/models/PSspooldir/model-config similarity index 100% rename from XpConfig/C/print/models/PSspooldir/model-config rename to hw/xprint/config/C/print/models/PSspooldir/model-config diff --git a/XpConfig/C/print/models/PSspooldir/spooltodir.sh b/hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh similarity index 100% rename from XpConfig/C/print/models/PSspooldir/spooltodir.sh rename to hw/xprint/config/C/print/models/PSspooldir/spooltodir.sh diff --git a/XpConfig/C/print/models/SPSPARC2/Makefile.am b/hw/xprint/config/C/print/models/SPSPARC2/Makefile.am similarity index 100% rename from XpConfig/C/print/models/SPSPARC2/Makefile.am rename to hw/xprint/config/C/print/models/SPSPARC2/Makefile.am diff --git a/XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am b/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am similarity index 100% rename from XpConfig/C/print/models/SPSPARC2/fonts/Makefile.am rename to hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.am diff --git a/XpConfig/C/print/models/SPSPARC2/model-config b/hw/xprint/config/C/print/models/SPSPARC2/model-config similarity index 100% rename from XpConfig/C/print/models/SPSPARC2/model-config rename to hw/xprint/config/C/print/models/SPSPARC2/model-config diff --git a/XpConfig/Makefile.am b/hw/xprint/config/Makefile.am similarity index 100% rename from XpConfig/Makefile.am rename to hw/xprint/config/Makefile.am diff --git a/XpConfig/README b/hw/xprint/config/README similarity index 100% rename from XpConfig/README rename to hw/xprint/config/README diff --git a/XpConfig/en_US/Makefile.am b/hw/xprint/config/en_US/Makefile.am similarity index 100% rename from XpConfig/en_US/Makefile.am rename to hw/xprint/config/en_US/Makefile.am diff --git a/XpConfig/en_US/print/Makefile.am b/hw/xprint/config/en_US/print/Makefile.am similarity index 100% rename from XpConfig/en_US/print/Makefile.am rename to hw/xprint/config/en_US/print/Makefile.am diff --git a/XpConfig/en_US/print/attributes/Makefile.am b/hw/xprint/config/en_US/print/attributes/Makefile.am similarity index 100% rename from XpConfig/en_US/print/attributes/Makefile.am rename to hw/xprint/config/en_US/print/attributes/Makefile.am diff --git a/XpConfig/en_US/print/attributes/document b/hw/xprint/config/en_US/print/attributes/document similarity index 100% rename from XpConfig/en_US/print/attributes/document rename to hw/xprint/config/en_US/print/attributes/document diff --git a/Xprint/ddxInit.c b/hw/xprint/ddxInit.c similarity index 100% rename from Xprint/ddxInit.c rename to hw/xprint/ddxInit.c diff --git a/Xprint/doc/Makefile.am b/hw/xprint/doc/Makefile.am similarity index 100% rename from Xprint/doc/Makefile.am rename to hw/xprint/doc/Makefile.am diff --git a/Xprint/doc/Xprt.html b/hw/xprint/doc/Xprt.html similarity index 100% rename from Xprint/doc/Xprt.html rename to hw/xprint/doc/Xprt.html diff --git a/Xprint/doc/Xprt.man.pre b/hw/xprint/doc/Xprt.man.pre similarity index 100% rename from Xprint/doc/Xprt.man.pre rename to hw/xprint/doc/Xprt.man.pre diff --git a/Xprint/doc/Xprt.sgml b/hw/xprint/doc/Xprt.sgml similarity index 100% rename from Xprint/doc/Xprt.sgml rename to hw/xprint/doc/Xprt.sgml diff --git a/Xprint/etc/Makefile.am b/hw/xprint/etc/Makefile.am similarity index 100% rename from Xprint/etc/Makefile.am rename to hw/xprint/etc/Makefile.am diff --git a/Xprint/etc/Xsession.d/Makefile.am b/hw/xprint/etc/Xsession.d/Makefile.am similarity index 100% rename from Xprint/etc/Xsession.d/Makefile.am rename to hw/xprint/etc/Xsession.d/Makefile.am diff --git a/Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh b/hw/xprint/etc/Xsession.d/cde_xsessiond_xprint.sh similarity index 100% rename from Xprint/etc/Xsession.d/cde_xsessiond_xprint.sh rename to hw/xprint/etc/Xsession.d/cde_xsessiond_xprint.sh diff --git a/Xprint/etc/init.d/Makefile.am b/hw/xprint/etc/init.d/Makefile.am similarity index 100% rename from Xprint/etc/init.d/Makefile.am rename to hw/xprint/etc/init.d/Makefile.am diff --git a/Xprint/etc/init.d/xprint.cpp b/hw/xprint/etc/init.d/xprint.cpp similarity index 100% rename from Xprint/etc/init.d/xprint.cpp rename to hw/xprint/etc/init.d/xprint.cpp diff --git a/Xprint/etc/profile.d/Makefile.am b/hw/xprint/etc/profile.d/Makefile.am similarity index 100% rename from Xprint/etc/profile.d/Makefile.am rename to hw/xprint/etc/profile.d/Makefile.am diff --git a/Xprint/etc/profile.d/xprint.csh b/hw/xprint/etc/profile.d/xprint.csh similarity index 100% rename from Xprint/etc/profile.d/xprint.csh rename to hw/xprint/etc/profile.d/xprint.csh diff --git a/Xprint/etc/profile.d/xprint.sh b/hw/xprint/etc/profile.d/xprint.sh similarity index 100% rename from Xprint/etc/profile.d/xprint.sh rename to hw/xprint/etc/profile.d/xprint.sh diff --git a/Xprint/mediaSizes.c b/hw/xprint/mediaSizes.c similarity index 100% rename from Xprint/mediaSizes.c rename to hw/xprint/mediaSizes.c diff --git a/Xprint/pcl-mono/Makefile.am b/hw/xprint/pcl-mono/Makefile.am similarity index 100% rename from Xprint/pcl-mono/Makefile.am rename to hw/xprint/pcl-mono/Makefile.am diff --git a/Xprint/pcl/Makefile.am b/hw/xprint/pcl/Makefile.am similarity index 100% rename from Xprint/pcl/Makefile.am rename to hw/xprint/pcl/Makefile.am diff --git a/Xprint/pcl/Makefile.am.inc b/hw/xprint/pcl/Makefile.am.inc similarity index 88% rename from Xprint/pcl/Makefile.am.inc rename to hw/xprint/pcl/Makefile.am.inc index 585ce4839..38a784e13 100644 --- a/Xprint/pcl/Makefile.am.inc +++ b/hw/xprint/pcl/Makefile.am.inc @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/Xprint -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb +INCLUDES = -I$(top_srcdir)/hw/xprint AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ -D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER) @@ -19,7 +19,6 @@ libpcl_la_SOURCES = \ $(srcdir)/../pcl/Pclmap.h \ $(srcdir)/../pcl/PclMisc.c \ $(srcdir)/../pcl/PclPixel.c \ - $(srcdir)/../pcl/PclPixmap.c \ $(srcdir)/../pcl/PclPolygon.c \ $(srcdir)/../pcl/PclPrint.c \ $(srcdir)/../pcl/PclSFonts.c \ diff --git a/Xprint/pcl/Pcl.h b/hw/xprint/pcl/Pcl.h similarity index 100% rename from Xprint/pcl/Pcl.h rename to hw/xprint/pcl/Pcl.h diff --git a/Xprint/pcl/PclArc.c b/hw/xprint/pcl/PclArc.c similarity index 100% rename from Xprint/pcl/PclArc.c rename to hw/xprint/pcl/PclArc.c diff --git a/Xprint/pcl/PclArea.c b/hw/xprint/pcl/PclArea.c similarity index 100% rename from Xprint/pcl/PclArea.c rename to hw/xprint/pcl/PclArea.c diff --git a/Xprint/pcl/PclAttVal.c b/hw/xprint/pcl/PclAttVal.c similarity index 100% rename from Xprint/pcl/PclAttVal.c rename to hw/xprint/pcl/PclAttVal.c diff --git a/Xprint/pcl/PclAttr.c b/hw/xprint/pcl/PclAttr.c similarity index 100% rename from Xprint/pcl/PclAttr.c rename to hw/xprint/pcl/PclAttr.c diff --git a/Xprint/pcl/PclColor.c b/hw/xprint/pcl/PclColor.c similarity index 100% rename from Xprint/pcl/PclColor.c rename to hw/xprint/pcl/PclColor.c diff --git a/Xprint/pcl/PclCursor.c b/hw/xprint/pcl/PclCursor.c similarity index 100% rename from Xprint/pcl/PclCursor.c rename to hw/xprint/pcl/PclCursor.c diff --git a/Xprint/pcl/PclDef.h b/hw/xprint/pcl/PclDef.h similarity index 100% rename from Xprint/pcl/PclDef.h rename to hw/xprint/pcl/PclDef.h diff --git a/Xprint/pcl/PclFonts.c b/hw/xprint/pcl/PclFonts.c similarity index 100% rename from Xprint/pcl/PclFonts.c rename to hw/xprint/pcl/PclFonts.c diff --git a/Xprint/pcl/PclGC.c b/hw/xprint/pcl/PclGC.c similarity index 100% rename from Xprint/pcl/PclGC.c rename to hw/xprint/pcl/PclGC.c diff --git a/Xprint/pcl/PclInit.c b/hw/xprint/pcl/PclInit.c similarity index 100% rename from Xprint/pcl/PclInit.c rename to hw/xprint/pcl/PclInit.c diff --git a/Xprint/pcl/PclLine.c b/hw/xprint/pcl/PclLine.c similarity index 100% rename from Xprint/pcl/PclLine.c rename to hw/xprint/pcl/PclLine.c diff --git a/Xprint/pcl/PclMisc.c b/hw/xprint/pcl/PclMisc.c similarity index 100% rename from Xprint/pcl/PclMisc.c rename to hw/xprint/pcl/PclMisc.c diff --git a/Xprint/pcl/PclPixel.c b/hw/xprint/pcl/PclPixel.c similarity index 100% rename from Xprint/pcl/PclPixel.c rename to hw/xprint/pcl/PclPixel.c diff --git a/Xprint/pcl/PclPolygon.c b/hw/xprint/pcl/PclPolygon.c similarity index 100% rename from Xprint/pcl/PclPolygon.c rename to hw/xprint/pcl/PclPolygon.c diff --git a/Xprint/pcl/PclPrint.c b/hw/xprint/pcl/PclPrint.c similarity index 100% rename from Xprint/pcl/PclPrint.c rename to hw/xprint/pcl/PclPrint.c diff --git a/Xprint/pcl/PclSFonts.c b/hw/xprint/pcl/PclSFonts.c similarity index 100% rename from Xprint/pcl/PclSFonts.c rename to hw/xprint/pcl/PclSFonts.c diff --git a/Xprint/pcl/PclSFonts.h b/hw/xprint/pcl/PclSFonts.h similarity index 100% rename from Xprint/pcl/PclSFonts.h rename to hw/xprint/pcl/PclSFonts.h diff --git a/Xprint/pcl/PclSpans.c b/hw/xprint/pcl/PclSpans.c similarity index 100% rename from Xprint/pcl/PclSpans.c rename to hw/xprint/pcl/PclSpans.c diff --git a/Xprint/pcl/PclText.c b/hw/xprint/pcl/PclText.c similarity index 100% rename from Xprint/pcl/PclText.c rename to hw/xprint/pcl/PclText.c diff --git a/Xprint/pcl/PclWindow.c b/hw/xprint/pcl/PclWindow.c similarity index 100% rename from Xprint/pcl/PclWindow.c rename to hw/xprint/pcl/PclWindow.c diff --git a/Xprint/pcl/Pclmap.h b/hw/xprint/pcl/Pclmap.h similarity index 100% rename from Xprint/pcl/Pclmap.h rename to hw/xprint/pcl/Pclmap.h diff --git a/Xprint/ps/Makefile.am b/hw/xprint/ps/Makefile.am similarity index 94% rename from Xprint/ps/Makefile.am rename to hw/xprint/ps/Makefile.am index a05734d5f..90872d9da 100644 --- a/Xprint/ps/Makefile.am +++ b/hw/xprint/ps/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libps.la -INCLUDES = -I$(top_srcdir)/Xprint +INCLUDES = -I$(top_srcdir)/hw/xprint AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ @FREETYPE_CFLAGS@ \ -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT diff --git a/Xprint/ps/Ps.h b/hw/xprint/ps/Ps.h similarity index 100% rename from Xprint/ps/Ps.h rename to hw/xprint/ps/Ps.h diff --git a/Xprint/ps/PsArc.c b/hw/xprint/ps/PsArc.c similarity index 100% rename from Xprint/ps/PsArc.c rename to hw/xprint/ps/PsArc.c diff --git a/Xprint/ps/PsArea.c b/hw/xprint/ps/PsArea.c similarity index 100% rename from Xprint/ps/PsArea.c rename to hw/xprint/ps/PsArea.c diff --git a/Xprint/ps/PsAttVal.c b/hw/xprint/ps/PsAttVal.c similarity index 100% rename from Xprint/ps/PsAttVal.c rename to hw/xprint/ps/PsAttVal.c diff --git a/Xprint/ps/PsAttr.c b/hw/xprint/ps/PsAttr.c similarity index 100% rename from Xprint/ps/PsAttr.c rename to hw/xprint/ps/PsAttr.c diff --git a/Xprint/ps/PsCache.c b/hw/xprint/ps/PsCache.c similarity index 100% rename from Xprint/ps/PsCache.c rename to hw/xprint/ps/PsCache.c diff --git a/Xprint/ps/PsColor.c b/hw/xprint/ps/PsColor.c similarity index 100% rename from Xprint/ps/PsColor.c rename to hw/xprint/ps/PsColor.c diff --git a/Xprint/ps/PsDef.h b/hw/xprint/ps/PsDef.h similarity index 100% rename from Xprint/ps/PsDef.h rename to hw/xprint/ps/PsDef.h diff --git a/Xprint/ps/PsFTFonts.c b/hw/xprint/ps/PsFTFonts.c similarity index 100% rename from Xprint/ps/PsFTFonts.c rename to hw/xprint/ps/PsFTFonts.c diff --git a/Xprint/ps/PsFonts.c b/hw/xprint/ps/PsFonts.c similarity index 100% rename from Xprint/ps/PsFonts.c rename to hw/xprint/ps/PsFonts.c diff --git a/Xprint/ps/PsGC.c b/hw/xprint/ps/PsGC.c similarity index 100% rename from Xprint/ps/PsGC.c rename to hw/xprint/ps/PsGC.c diff --git a/Xprint/ps/PsImageUtil.c b/hw/xprint/ps/PsImageUtil.c similarity index 100% rename from Xprint/ps/PsImageUtil.c rename to hw/xprint/ps/PsImageUtil.c diff --git a/Xprint/ps/PsInit.c b/hw/xprint/ps/PsInit.c similarity index 100% rename from Xprint/ps/PsInit.c rename to hw/xprint/ps/PsInit.c diff --git a/Xprint/ps/PsLine.c b/hw/xprint/ps/PsLine.c similarity index 100% rename from Xprint/ps/PsLine.c rename to hw/xprint/ps/PsLine.c diff --git a/Xprint/ps/PsMisc.c b/hw/xprint/ps/PsMisc.c similarity index 100% rename from Xprint/ps/PsMisc.c rename to hw/xprint/ps/PsMisc.c diff --git a/Xprint/ps/PsPixel.c b/hw/xprint/ps/PsPixel.c similarity index 100% rename from Xprint/ps/PsPixel.c rename to hw/xprint/ps/PsPixel.c diff --git a/Xprint/ps/PsPixmap.c b/hw/xprint/ps/PsPixmap.c similarity index 100% rename from Xprint/ps/PsPixmap.c rename to hw/xprint/ps/PsPixmap.c diff --git a/Xprint/ps/PsPolygon.c b/hw/xprint/ps/PsPolygon.c similarity index 100% rename from Xprint/ps/PsPolygon.c rename to hw/xprint/ps/PsPolygon.c diff --git a/Xprint/ps/PsPrint.c b/hw/xprint/ps/PsPrint.c similarity index 100% rename from Xprint/ps/PsPrint.c rename to hw/xprint/ps/PsPrint.c diff --git a/Xprint/ps/PsSpans.c b/hw/xprint/ps/PsSpans.c similarity index 100% rename from Xprint/ps/PsSpans.c rename to hw/xprint/ps/PsSpans.c diff --git a/Xprint/ps/PsText.c b/hw/xprint/ps/PsText.c similarity index 100% rename from Xprint/ps/PsText.c rename to hw/xprint/ps/PsText.c diff --git a/Xprint/ps/PsWindow.c b/hw/xprint/ps/PsWindow.c similarity index 100% rename from Xprint/ps/PsWindow.c rename to hw/xprint/ps/PsWindow.c diff --git a/Xprint/ps/psout.c b/hw/xprint/ps/psout.c similarity index 100% rename from Xprint/ps/psout.c rename to hw/xprint/ps/psout.c diff --git a/Xprint/ps/psout.h b/hw/xprint/ps/psout.h similarity index 100% rename from Xprint/ps/psout.h rename to hw/xprint/ps/psout.h diff --git a/Xprint/ps/psout_ft.c b/hw/xprint/ps/psout_ft.c similarity index 100% rename from Xprint/ps/psout_ft.c rename to hw/xprint/ps/psout_ft.c diff --git a/Xprint/ps/psout_ftpstype1.c b/hw/xprint/ps/psout_ftpstype1.c similarity index 100% rename from Xprint/ps/psout_ftpstype1.c rename to hw/xprint/ps/psout_ftpstype1.c diff --git a/Xprint/ps/psout_ftpstype3.c b/hw/xprint/ps/psout_ftpstype3.c similarity index 100% rename from Xprint/ps/psout_ftpstype3.c rename to hw/xprint/ps/psout_ftpstype3.c diff --git a/Xprint/ps/ttf2pt1wrap.c b/hw/xprint/ps/ttf2pt1wrap.c similarity index 100% rename from Xprint/ps/ttf2pt1wrap.c rename to hw/xprint/ps/ttf2pt1wrap.c diff --git a/Xprint/raster/Makefile.am b/hw/xprint/raster/Makefile.am similarity index 83% rename from Xprint/raster/Makefile.am rename to hw/xprint/raster/Makefile.am index 4a2223115..fcd1e7334 100644 --- a/Xprint/raster/Makefile.am +++ b/hw/xprint/raster/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libraster.la -INCLUDES = -I$(top_srcdir)/Xprint +INCLUDES = -I$(top_srcdir)/hw/xprint AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ -D_XP_PRINT_SERVER_ -DPSZ=8 diff --git a/Xprint/raster/Raster.c b/hw/xprint/raster/Raster.c similarity index 100% rename from Xprint/raster/Raster.c rename to hw/xprint/raster/Raster.c diff --git a/Xprint/raster/Raster.h b/hw/xprint/raster/Raster.h similarity index 100% rename from Xprint/raster/Raster.h rename to hw/xprint/raster/Raster.h diff --git a/Xprint/raster/RasterAttVal.c b/hw/xprint/raster/RasterAttVal.c similarity index 100% rename from Xprint/raster/RasterAttVal.c rename to hw/xprint/raster/RasterAttVal.c diff --git a/Xprint/spooler.c b/hw/xprint/spooler.c similarity index 100% rename from Xprint/spooler.c rename to hw/xprint/spooler.c diff --git a/Xprint/spooler.h b/hw/xprint/spooler.h similarity index 100% rename from Xprint/spooler.h rename to hw/xprint/spooler.h diff --git a/miext/cw/cw_ops.c b/miext/cw/cw_ops.c index 6ba804bb3..80b72806c 100644 --- a/miext/cw/cw_ops.c +++ b/miext/cw/cw_ops.c @@ -28,6 +28,7 @@ #include #include "gcstruct.h" +#include "pixmapstr.h" #include "cw.h" #define SETUP_BACKING_DST(_pDst, _pGC) \ @@ -43,6 +44,9 @@ &src_off_y) #define PROLOGUE(pGC) do { \ + if (pBackingGC->serialNumber != pBackingDst->serialNumber) { \ + ValidateGC(pBackingDst, pBackingGC); \ + } \ pGC->funcs = pGCPrivate->wrapFuncs;\ pGC->ops = pGCPrivate->wrapOps;\ } while (0) diff --git a/os/utils.c b/os/utils.c index 43c6365a4..617d20119 100644 --- a/os/utils.c +++ b/os/utils.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xserver/xorg/os/utils.c,v 1.25 2006/03/25 19:52:05 ajax Exp $ */ +/* $XdotOrg: xserver/xorg/os/utils.c,v 1.26 2006-06-01 22:06:41 daniels Exp $ */ /* $Xorg: utils.c,v 1.5 2001/02/09 02:05:24 xorgcvs Exp $ */ /* @@ -1713,8 +1713,10 @@ System(char *command) case -1: /* error */ p = -1; case 0: /* child */ - setgid(getgid()); - setuid(getuid()); + if (setgid(getgid()) == -1) + _exit(127); + if (setuid(getuid()) == -1) + _exit(127); execl("/bin/sh", "sh", "-c", command, (char *)NULL); _exit(127); default: /* parent */ @@ -1765,8 +1767,10 @@ Popen(char *command, char *type) xfree(cur); return NULL; case 0: /* child */ - setgid(getgid()); - setuid(getuid()); + if (setgid(getgid()) == -1) + _exit(127); + if (setuid(getuid()) == -1) + _exit(127); if (*type == 'r') { if (pdes[1] != 1) { /* stdout */ @@ -1840,8 +1844,10 @@ Fopen(char *file, char *type) xfree(cur); return NULL; case 0: /* child */ - setgid(getgid()); - setuid(getuid()); + if (setgid(getgid()) == -1) + _exit(127); + if (setuid(getuid()) == -1) + _exit(127); if (*type == 'r') { if (pdes[1] != 1) { /* stdout */ diff --git a/render/picture.h b/render/picture.h index 778eb5c4c..e7d86ac39 100644 --- a/render/picture.h +++ b/render/picture.h @@ -68,61 +68,63 @@ typedef struct _Picture *PicturePtr; #define PICT_FORMAT_COLOR(f) (PICT_FORMAT_TYPE(f) & 2) /* 32bpp formats */ -#define PICT_a8r8g8b8 PICT_FORMAT(32,PICT_TYPE_ARGB,8,8,8,8) -#define PICT_x8r8g8b8 PICT_FORMAT(32,PICT_TYPE_ARGB,0,8,8,8) -#define PICT_a8b8g8r8 PICT_FORMAT(32,PICT_TYPE_ABGR,8,8,8,8) -#define PICT_x8b8g8r8 PICT_FORMAT(32,PICT_TYPE_ABGR,0,8,8,8) +typedef enum _PictFormatShort { + PICT_a8r8g8b8 = PICT_FORMAT(32,PICT_TYPE_ARGB,8,8,8,8), + PICT_x8r8g8b8 = PICT_FORMAT(32,PICT_TYPE_ARGB,0,8,8,8), + PICT_a8b8g8r8 = PICT_FORMAT(32,PICT_TYPE_ABGR,8,8,8,8), + PICT_x8b8g8r8 = PICT_FORMAT(32,PICT_TYPE_ABGR,0,8,8,8), /* 24bpp formats */ -#define PICT_r8g8b8 PICT_FORMAT(24,PICT_TYPE_ARGB,0,8,8,8) -#define PICT_b8g8r8 PICT_FORMAT(24,PICT_TYPE_ABGR,0,8,8,8) + PICT_r8g8b8 = PICT_FORMAT(24,PICT_TYPE_ARGB,0,8,8,8), + PICT_b8g8r8 = PICT_FORMAT(24,PICT_TYPE_ABGR,0,8,8,8), /* 16bpp formats */ -#define PICT_r5g6b5 PICT_FORMAT(16,PICT_TYPE_ARGB,0,5,6,5) -#define PICT_b5g6r5 PICT_FORMAT(16,PICT_TYPE_ABGR,0,5,6,5) + PICT_r5g6b5 = PICT_FORMAT(16,PICT_TYPE_ARGB,0,5,6,5), + PICT_b5g6r5 = PICT_FORMAT(16,PICT_TYPE_ABGR,0,5,6,5), -#define PICT_a1r5g5b5 PICT_FORMAT(16,PICT_TYPE_ARGB,1,5,5,5) -#define PICT_x1r5g5b5 PICT_FORMAT(16,PICT_TYPE_ARGB,0,5,5,5) -#define PICT_a1b5g5r5 PICT_FORMAT(16,PICT_TYPE_ABGR,1,5,5,5) -#define PICT_x1b5g5r5 PICT_FORMAT(16,PICT_TYPE_ABGR,0,5,5,5) -#define PICT_a4r4g4b4 PICT_FORMAT(16,PICT_TYPE_ARGB,4,4,4,4) -#define PICT_x4r4g4b4 PICT_FORMAT(16,PICT_TYPE_ARGB,0,4,4,4) -#define PICT_a4b4g4r4 PICT_FORMAT(16,PICT_TYPE_ABGR,4,4,4,4) -#define PICT_x4b4g4r4 PICT_FORMAT(16,PICT_TYPE_ABGR,0,4,4,4) + PICT_a1r5g5b5 = PICT_FORMAT(16,PICT_TYPE_ARGB,1,5,5,5), + PICT_x1r5g5b5 = PICT_FORMAT(16,PICT_TYPE_ARGB,0,5,5,5), + PICT_a1b5g5r5 = PICT_FORMAT(16,PICT_TYPE_ABGR,1,5,5,5), + PICT_x1b5g5r5 = PICT_FORMAT(16,PICT_TYPE_ABGR,0,5,5,5), + PICT_a4r4g4b4 = PICT_FORMAT(16,PICT_TYPE_ARGB,4,4,4,4), + PICT_x4r4g4b4 = PICT_FORMAT(16,PICT_TYPE_ARGB,0,4,4,4), + PICT_a4b4g4r4 = PICT_FORMAT(16,PICT_TYPE_ABGR,4,4,4,4), + PICT_x4b4g4r4 = PICT_FORMAT(16,PICT_TYPE_ABGR,0,4,4,4), /* 8bpp formats */ -#define PICT_a8 PICT_FORMAT(8,PICT_TYPE_A,8,0,0,0) -#define PICT_r3g3b2 PICT_FORMAT(8,PICT_TYPE_ARGB,0,3,3,2) -#define PICT_b2g3r3 PICT_FORMAT(8,PICT_TYPE_ABGR,0,3,3,2) -#define PICT_a2r2g2b2 PICT_FORMAT(8,PICT_TYPE_ARGB,2,2,2,2) -#define PICT_a2b2g2r2 PICT_FORMAT(8,PICT_TYPE_ABGR,2,2,2,2) + PICT_a8 = PICT_FORMAT(8,PICT_TYPE_A,8,0,0,0), + PICT_r3g3b2 = PICT_FORMAT(8,PICT_TYPE_ARGB,0,3,3,2), + PICT_b2g3r3 = PICT_FORMAT(8,PICT_TYPE_ABGR,0,3,3,2), + PICT_a2r2g2b2 = PICT_FORMAT(8,PICT_TYPE_ARGB,2,2,2,2), + PICT_a2b2g2r2 = PICT_FORMAT(8,PICT_TYPE_ABGR,2,2,2,2), -#define PICT_c8 PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0) -#define PICT_g8 PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0) + PICT_c8 = PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0), + PICT_g8 = PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0), -#define PICT_x4a4 PICT_FORMAT(8,PICT_TYPE_A,4,0,0,0) -#define PICT_x4r1g2b1 PICT_FORMAT(8,PICT_TYPE_ARGB,0,1,2,1) -#define PICT_x4b1g2r1 PICT_FORMAT(8,PICT_TYPE_ABGR,0,1,2,1) -#define PICT_x4a1r1g1b1 PICT_FORMAT(8,PICT_TYPE_ARGB,1,1,1,1) -#define PICT_x4a1b1g1r1 PICT_FORMAT(8,PICT_TYPE_ABGR,1,1,1,1) + PICT_x4a4 = PICT_FORMAT(8,PICT_TYPE_A,4,0,0,0), + PICT_x4r1g2b1 = PICT_FORMAT(8,PICT_TYPE_ARGB,0,1,2,1), + PICT_x4b1g2r1 = PICT_FORMAT(8,PICT_TYPE_ABGR,0,1,2,1), + PICT_x4a1r1g1b1 = PICT_FORMAT(8,PICT_TYPE_ARGB,1,1,1,1), + PICT_x4a1b1g1r1 = PICT_FORMAT(8,PICT_TYPE_ABGR,1,1,1,1), -#define PICT_x4c4 PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0) -#define PICT_x4g4 PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0) + PICT_x4c4 = PICT_FORMAT(8,PICT_TYPE_COLOR,0,0,0,0), + PICT_x4g4 = PICT_FORMAT(8,PICT_TYPE_GRAY,0,0,0,0), /* 4bpp formats */ -#define PICT_a4 PICT_FORMAT(4,PICT_TYPE_A,4,0,0,0) -#define PICT_r1g2b1 PICT_FORMAT(4,PICT_TYPE_ARGB,0,1,2,1) -#define PICT_b1g2r1 PICT_FORMAT(4,PICT_TYPE_ABGR,0,1,2,1) -#define PICT_a1r1g1b1 PICT_FORMAT(4,PICT_TYPE_ARGB,1,1,1,1) -#define PICT_a1b1g1r1 PICT_FORMAT(4,PICT_TYPE_ABGR,1,1,1,1) + PICT_a4 = PICT_FORMAT(4,PICT_TYPE_A,4,0,0,0), + PICT_r1g2b1 = PICT_FORMAT(4,PICT_TYPE_ARGB,0,1,2,1), + PICT_b1g2r1 = PICT_FORMAT(4,PICT_TYPE_ABGR,0,1,2,1), + PICT_a1r1g1b1 = PICT_FORMAT(4,PICT_TYPE_ARGB,1,1,1,1), + PICT_a1b1g1r1 = PICT_FORMAT(4,PICT_TYPE_ABGR,1,1,1,1), -#define PICT_c4 PICT_FORMAT(4,PICT_TYPE_COLOR,0,0,0,0) -#define PICT_g4 PICT_FORMAT(4,PICT_TYPE_GRAY,0,0,0,0) + PICT_c4 = PICT_FORMAT(4,PICT_TYPE_COLOR,0,0,0,0), + PICT_g4 = PICT_FORMAT(4,PICT_TYPE_GRAY,0,0,0,0), /* 1bpp formats */ -#define PICT_a1 PICT_FORMAT(1,PICT_TYPE_A,1,0,0,0) + PICT_a1 = PICT_FORMAT(1,PICT_TYPE_A,1,0,0,0), -#define PICT_g1 PICT_FORMAT(1,PICT_TYPE_GRAY,0,0,0,0) + PICT_g1 = PICT_FORMAT(1,PICT_TYPE_GRAY,0,0,0,0), +} PictFormatShort; /* * For dynamic indexed visuals (GrayScale and PseudoColor), these control the diff --git a/render/picturestr.h b/render/picturestr.h index e81d769d5..1ea91201e 100644 --- a/render/picturestr.h +++ b/render/picturestr.h @@ -129,7 +129,7 @@ typedef union _SourcePict { typedef struct _Picture { DrawablePtr pDrawable; PictFormatPtr pFormat; - CARD32 format; /* PICT_FORMAT */ + PictFormatShort format; /* PICT_FORMAT */ int refcnt; CARD32 id; PicturePtr pNext; /* chain on same drawable */