Xprint/ -> hw/xprint
XpConfig -> hw/xprint/config
This commit is contained in:
parent
868e2cab70
commit
71fbda8049
13
Makefile.am
13
Makefile.am
|
@ -26,11 +26,6 @@ if GLX
|
||||||
GLX_DIR=GL
|
GLX_DIR=GL
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if XPRINT
|
|
||||||
XPDDX_DIR=Xprint
|
|
||||||
XPCONFIG_DIR=XpConfig
|
|
||||||
endif
|
|
||||||
|
|
||||||
if XINPUT
|
if XINPUT
|
||||||
XINPUT_DIR=Xi
|
XINPUT_DIR=Xi
|
||||||
endif
|
endif
|
||||||
|
@ -64,9 +59,7 @@ SUBDIRS = \
|
||||||
$(COMPOSITE_DIR) \
|
$(COMPOSITE_DIR) \
|
||||||
$(GLX_DIR) \
|
$(GLX_DIR) \
|
||||||
exa \
|
exa \
|
||||||
hw \
|
hw
|
||||||
$(XPDDX_DIR) \
|
|
||||||
$(XPCONFIG_DIR)
|
|
||||||
|
|
||||||
aclocaldir = $(datadir)/aclocal
|
aclocaldir = $(datadir)/aclocal
|
||||||
aclocal_DATA = xorg-server.m4
|
aclocal_DATA = xorg-server.m4
|
||||||
|
@ -101,9 +94,7 @@ DIST_SUBDIRS = \
|
||||||
composite \
|
composite \
|
||||||
GL \
|
GL \
|
||||||
exa \
|
exa \
|
||||||
hw \
|
hw
|
||||||
Xprint \
|
|
||||||
XpConfig
|
|
||||||
|
|
||||||
# gross hack
|
# gross hack
|
||||||
relink: all
|
relink: all
|
||||||
|
|
|
@ -85,8 +85,8 @@ copyright holders.
|
||||||
#include <X11/Xatom.h>
|
#include <X11/Xatom.h>
|
||||||
#include <X11/extensions/Print.h>
|
#include <X11/extensions/Print.h>
|
||||||
#include <X11/extensions/Printstr.h>
|
#include <X11/extensions/Printstr.h>
|
||||||
#include "../Xprint/DiPrint.h"
|
#include "../hw/xprint/DiPrint.h"
|
||||||
#include "../Xprint/attributes.h"
|
#include "../hw/xprint/attributes.h"
|
||||||
#include "modinit.h"
|
#include "modinit.h"
|
||||||
|
|
||||||
static void XpResetProc(ExtensionEntry *);
|
static void XpResetProc(ExtensionEntry *);
|
||||||
|
|
|
@ -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 <dix-config.h>
|
|
||||||
#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;
|
|
||||||
}
|
|
72
configure.ac
72
configure.ac
|
@ -1727,41 +1727,41 @@ hw/kdrive/smi/Makefile
|
||||||
hw/kdrive/src/Makefile
|
hw/kdrive/src/Makefile
|
||||||
hw/kdrive/vesa/Makefile
|
hw/kdrive/vesa/Makefile
|
||||||
hw/kdrive/via/Makefile
|
hw/kdrive/via/Makefile
|
||||||
Xprint/Makefile
|
hw/xprint/Makefile
|
||||||
Xprint/doc/Makefile
|
hw/xprint/doc/Makefile
|
||||||
Xprint/pcl/Makefile
|
hw/xprint/pcl/Makefile
|
||||||
Xprint/pcl-mono/Makefile
|
hw/xprint/pcl-mono/Makefile
|
||||||
Xprint/raster/Makefile
|
hw/xprint/raster/Makefile
|
||||||
Xprint/ps/Makefile
|
hw/xprint/ps/Makefile
|
||||||
Xprint/etc/Makefile
|
hw/xprint/etc/Makefile
|
||||||
Xprint/etc/Xsession.d/Makefile
|
hw/xprint/etc/Xsession.d/Makefile
|
||||||
Xprint/etc/init.d/Makefile
|
hw/xprint/etc/init.d/Makefile
|
||||||
Xprint/etc/profile.d/Makefile
|
hw/xprint/etc/profile.d/Makefile
|
||||||
XpConfig/Makefile
|
hw/xprint/config/Makefile
|
||||||
XpConfig/C/print/attributes/Makefile
|
hw/xprint/config/C/print/attributes/Makefile
|
||||||
XpConfig/C/print/ddx-config/Makefile
|
hw/xprint/config/C/print/ddx-config/Makefile
|
||||||
XpConfig/C/print/ddx-config/raster/Makefile
|
hw/xprint/config/C/print/ddx-config/raster/Makefile
|
||||||
XpConfig/C/print/models/CANONBJ10E-GS/Makefile
|
hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile
|
||||||
XpConfig/C/print/models/PSdefault/fonts/Makefile
|
hw/xprint/config/C/print/models/PSdefault/fonts/Makefile
|
||||||
XpConfig/C/print/models/PSdefault/Makefile
|
hw/xprint/config/C/print/models/PSdefault/Makefile
|
||||||
XpConfig/C/print/models/PSspooldir/Makefile
|
hw/xprint/config/C/print/models/PSspooldir/Makefile
|
||||||
XpConfig/C/print/models/SPSPARC2/Makefile
|
hw/xprint/config/C/print/models/SPSPARC2/Makefile
|
||||||
XpConfig/C/print/models/SPSPARC2/fonts/Makefile
|
hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile
|
||||||
XpConfig/C/print/models/GSdefault/Makefile
|
hw/xprint/config/C/print/models/GSdefault/Makefile
|
||||||
XpConfig/C/print/models/HPLJ4050-PS/Makefile
|
hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile
|
||||||
XpConfig/C/print/models/HPLJ4050-PS/fonts/Makefile
|
hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile
|
||||||
XpConfig/C/print/models/Makefile
|
hw/xprint/config/C/print/models/Makefile
|
||||||
XpConfig/C/print/models/PS2PDFspooldir-GS/Makefile
|
hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile
|
||||||
XpConfig/C/print/models/CANONC3200-PS/Makefile
|
hw/xprint/config/C/print/models/CANONC3200-PS/Makefile
|
||||||
XpConfig/C/print/models/CANONC3200-PS/fonts/Makefile
|
hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile
|
||||||
XpConfig/C/print/models/HPLJ4family/fonts/Makefile
|
hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile
|
||||||
XpConfig/C/print/models/HPLJ4family/Makefile
|
hw/xprint/config/C/print/models/HPLJ4family/Makefile
|
||||||
XpConfig/C/print/models/HPDJ1600C/Makefile
|
hw/xprint/config/C/print/models/HPDJ1600C/Makefile
|
||||||
XpConfig/C/print/models/HPDJ1600C/fonts/Makefile
|
hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile
|
||||||
XpConfig/C/print/Makefile
|
hw/xprint/config/C/print/Makefile
|
||||||
XpConfig/C/Makefile
|
hw/xprint/config/C/Makefile
|
||||||
XpConfig/en_US/print/attributes/Makefile
|
hw/xprint/config/en_US/print/attributes/Makefile
|
||||||
XpConfig/en_US/print/Makefile
|
hw/xprint/config/en_US/print/Makefile
|
||||||
XpConfig/en_US/Makefile
|
hw/xprint/config/en_US/Makefile
|
||||||
xorg-server.pc
|
xorg-server.pc
|
||||||
])
|
])
|
||||||
|
|
|
@ -26,6 +26,10 @@ if KDRIVE
|
||||||
KDRIVE_SUBDIRS = kdrive
|
KDRIVE_SUBDIRS = kdrive
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if XPRINT
|
||||||
|
XPRINT_SUBDIRS = xprint
|
||||||
|
endif
|
||||||
|
|
||||||
# need to add darwin support here
|
# need to add darwin support here
|
||||||
|
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
|
@ -35,9 +39,10 @@ SUBDIRS = \
|
||||||
$(XVFB_SUBDIRS) \
|
$(XVFB_SUBDIRS) \
|
||||||
$(XNEST_SUBDIRS) \
|
$(XNEST_SUBDIRS) \
|
||||||
$(DMX_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:
|
relink:
|
||||||
for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done
|
for i in $(SUBDIRS) ; do $(MAKE) -C $$i relink ; done
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
SUBDIRS = doc pcl pcl-mono raster ps etc
|
SUBDIRS = doc pcl pcl-mono raster ps etc config
|
||||||
|
|
||||||
bin_PROGRAMS = Xprt
|
bin_PROGRAMS = Xprt
|
||||||
|
|
||||||
|
@ -9,8 +9,8 @@ Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
|
||||||
|
|
||||||
Xprt_LDFLAGS = -L$(top_srcdir)
|
Xprt_LDFLAGS = -L$(top_srcdir)
|
||||||
Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \
|
Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la \
|
||||||
pcl/libpcl.la pcl-mono/libpcl.la ../fb/libfb.la \
|
pcl/libpcl.la pcl-mono/libpcl.la ../../fb/libfb.la \
|
||||||
../render/librender.la ../mi/libmi.la ../Xext/libXext.la \
|
../../render/librender.la ../../mi/libmi.la ../../Xext/libXext.la \
|
||||||
@FREETYPE_LIBS@
|
@FREETYPE_LIBS@
|
||||||
|
|
||||||
miinitext-wrapper.c:
|
miinitext-wrapper.c:
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user