Commit 2fb58862 authored by Egbert Eich's avatar Egbert Eich

Merging XORG-CURRENT into trunk

parent 0664db19

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
# $Xorg: model-config,v 1.3 2000/08/17 19:48:04 cpqbld Exp $
SPSPARC2.printer-model: "SunPics SPARCprinter II"
SPSPARC2.printer-resolutions-supported: 300
SPSPARC2.content-orientations-supported: portrait landscape
SPSPARC2.document-formats-supported: {PostScript 2}
SPSPARC2.plexes-supported: simplex
SPSPARC2.xp-ddx-identifier: XP-POSTSCRIPT
SPSPARC2.xp-embedded-formats-supported: { PostScript 2 }
*xp-setup-proviso: setup-optional
SPSPARC2.medium-source-sizes-supported: \
# $Xprint.org: SPSPARC2 model-config,v 1.4 2002/11/07 19:48:04 gisburn Exp $
*content-orientations-supported: portrait landscape
*descriptor: SunPics SPARCprinter II
*document-formats-supported: {POSTSCRIPT 2}
*input-trays-supported:
*medium-source-sizes-supported: \
{ '' {na-letter FALSE {6.35 209.55 6.35 273.05}} \
{na-legal FALSE {6.35 209.55 6.35 349.25}} \
{iso-a4 FALSE {6.35 203.65 6.35 290.65}}}
*plexes-supported: simplex
*printer-model: "SunPics SPARCprinter II"
*printer-resolutions-supported: 300
*xp-ddx-identifier: XP-POSTSCRIPT
*xp-listfonts-modes-supported: xp-list-internal-printer-fonts xp-list-glyph-fonts
*xp-embedded-formats-supported: {POSTSCRIPT 2}
*xp-raw-formats-supported: {POSTSCRIPT 2}
*xp-setup-proviso: setup-optional
# EOF.
# $Xorg: document,v 1.2 2002/11/30 22:10:03 gisburn Exp $
# Document DPA-Object initial attribute values for en_US(-like) locales
#
# Note that the defaults (for all locales) are set in
# ${XPCONFIGDIR}/C/print/attributes/document
# Values in ${XPCONFIGDIR}/${LANG}/print/attributes/document are used to
# set/override these defaults for a specific locale on demand
# US and some other countries use US-Letter as default paper size
# ("C"-locale default is "ISO-A4")
*default-medium: na-letter
# EOF.
......@@ -30,8 +30,6 @@ 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/AttrValid.c,v 1.5 2001/12/21 21:02:04 dawes Exp $ */
#include <scrnintstr.h>
#include "attributes.h"
......@@ -46,7 +44,7 @@ static XpOidMediumDiscreteSizeList DefaultMediumSizeList = {
&DefaultMediumSize, 1
};
static XpOidMediumSourceSize DefaultMediumSourceSize = {
xpoid_unspecified, XpOidMediumSS_DISCRETE, { &DefaultMediumSizeList }
xpoid_unspecified, XpOidMediumSS_DISCRETE, &DefaultMediumSizeList
};
static XpOidMediumSS DefaultMediumSS = {
&DefaultMediumSourceSize, 1
......@@ -298,7 +296,7 @@ XpPutMediumSSAttr(XpContextPtr pContext,
}
const XpOidMediumSS*
XpGetDefaultMediumSS(void)
XpGetDefaultMediumSS()
{
return &DefaultMediumSS;
}
......
......@@ -30,7 +30,6 @@ 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/AttrValid.h,v 1.7 2001/12/21 21:02:04 dawes Exp $ */
#ifndef _Xp_AttrValid_h
#define _Xp_AttrValid_h
......@@ -85,7 +84,7 @@ typedef struct
#define XpPutStringAttr(pContext, pool, oid, value) \
XpPutOneAttribute(pContext, pool, XpOidString(oid), value)
#ifdef _XP_PRINT_SERVER_ /* needed for XpContextPtr in Printstr.h */
#ifdef _XP_PRINT_SERVER_ /* needed for XpContextPtr in Printstr.h */
/*
* XpOid-valued attribute access
......@@ -179,7 +178,7 @@ void XpPutMediumSSAttr(XpContextPtr pContext,
XPAttributes pool,
XpOid oid,
const XpOidMediumSS* msss);
const XpOidMediumSS* XpGetDefaultMediumSS(void);
const XpOidMediumSS* XpGetDefaultMediumSS();
/*
* XpOidTrayMediumList-valued attribute access
......@@ -193,15 +192,12 @@ void XpPutTrayMediumListAttr(XpContextPtr pContext,
XPAttributes pool,
XpOid oid,
const XpOidTrayMediumList* tm);
BOOL XpOidTrayMediumListHasTray(const XpOidTrayMediumList* list, XpOid tray);
/*
* Attribute pool validation
*/
void XpValidateAttributePool(XpContextPtr pContext,
XPAttributes pool,
const XpValidatePoolsRec* vpr);
void XpValidateNotificationProfile(XpContextPtr pContext);
void XpValidatePrinterPool(XpContextPtr pContext,
const XpValidatePoolsRec* vpr);
void XpValidateJobPool(XpContextPtr pContext,
......@@ -210,9 +206,6 @@ void XpValidateDocumentPool(XpContextPtr pContext,
const XpValidatePoolsRec* vpr);
void XpValidatePagePool(XpContextPtr pContext,
const XpValidatePoolsRec* vpr);
void XpValidatePrinterMediaAttrs(XpContextPtr pContext,
const XpOidList* valid_trays,
const XpOidList* valid_sizes);
#endif /* _XP_PRINT_SERVER_ */
......
......@@ -30,8 +30,6 @@ 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/DiPrint.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */
/*
* The XpDiListEntry struct is the type of each element of the array
* handed back to the extension code to handle a GetPrinterList request.
......
......@@ -50,7 +50,6 @@ copyright holders.
** *********************************************************
**
********************************************************************/
/* $XFree86: xc/programs/Xserver/Xprint/Init.c,v 1.15 2003/10/29 22:11:54 tsi Exp $ */
#include <unistd.h>
#include <stdlib.h>
......@@ -91,6 +90,7 @@ typedef char *XPointer;
#include "attributes.h"
#include "os.h"
#include "spooler.h"
static void GenericScreenInit(
int index,
......@@ -116,57 +116,6 @@ static Bool InitPrintDrivers(
#define MODELDIRNAME "/models"
#define FONTDIRNAME "/fonts"
/*
* The string LIST_QUEUES is fed to a shell to generate an ordered
* list of available printers on the system. These string definitions
* are taken from the file PrintSubSys.C within the code for the
* dtprintinfo program.
*/
#ifdef AIXV4
const char *LIST_QUEUES = "lsallq | grep -v '^bsh$' | sort";
#else
#ifdef hpux
const char *LIST_QUEUES = "LANG=C lpstat -v | "
"awk '"
" $2 == \"for\" "
" { "
" x = match($3, /:/); "
" print substr($3, 1, x-1)"
" }' | sort";
#else
#ifdef __osf__
const char *LIST_QUEUES = "LANG=C lpstat -v | "
"nawk '"
" $2 == \"for\" "
" { print $4 }' "
" | sort";
#else
#ifdef __uxp__
const char *LIST_QUEUES = "LANG=C lpstat -v | "
"nawk '"
" $4 == \"for\" "
" { "
" x = match($5, /:/); "
" print substr($5, 1, x-1)"
" }' | sort";
#else
#if defined(CSRG_BASED) || defined(linux) || defined(ISC) || defined(__GNUC__)
const char *LIST_QUEUES = "LANG=C lpc status | grep -v '^\t' | "
"sed -e /:/s/// | sort";
#else
const char *LIST_QUEUES = "LANG=C lpstat -v | "
"nawk '"
" $2 == \"for\" "
" { "
" x = match($3, /:/); "
" print substr($3, 1, x-1)"
" }' | sort";
#endif
#endif
#endif
#endif
#endif
#ifdef XPRASTERDDX
static
......@@ -183,9 +132,9 @@ PixmapFormatRec RasterPixmapFormats[] = {
static
PixmapFormatRec ColorPclPixmapFormats[] = {
{ 1, 1, BITMAP_SCANLINE_PAD },
{ 8, 8, BITMAP_SCANLINE_PAD },
{ 24,32, BITMAP_SCANLINE_PAD }
{ 1, 1, BITMAP_SCANLINE_PAD },
{ 8, 8, BITMAP_SCANLINE_PAD },
{ 24, 32, BITMAP_SCANLINE_PAD }
};