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.
......
This diff is collapsed.
......@@ -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/Oid.c,v 1.6 2003/10/29 22:11:54 tsi Exp $ */
#include "attributes.h"
......@@ -274,7 +273,7 @@ XpOidParse(const char* value_string,
*/
if(ptr_return != (const char**)NULL)
*ptr_return = ptr+length;
return (XpOid)i;
return i;
}
/*
......@@ -751,7 +750,7 @@ XpOidLinkedListFirstOid(XpOidLinkedList* me)
XpOid
XpOidLinkedListNextOid(XpOidLinkedList* me)
{
if(me->current ? (me->current = me->current->next) != 0 : xFalse)
if(me->current ? me->current = me->current->next : xFalse)
return me->current->oid;
else
return xpoid_none;
......@@ -1652,6 +1651,8 @@ TrayMediumListValidate(XpOidTrayMediumList* me,
const XpOidMediumSS* msss)
{
int i_mss, i_ds, i_itm;
XpOidMediumDiscreteSizeList* ds_list;
int tray_count;
XpOid current_tray, current_medium;
XpOidMediumDiscreteSizeList* unspecified_tray_ds;
XpOidMediumDiscreteSizeList* tray_ds;
......@@ -1711,7 +1712,6 @@ TrayMediumListValidate(XpOidTrayMediumList* me,
* list
*/
if(tray_ds == (XpOidMediumDiscreteSizeList*)NULL)
{
if(unspecified_tray_ds == (XpOidMediumDiscreteSizeList*)NULL)
{
/*
......@@ -1722,10 +1722,7 @@ TrayMediumListValidate(XpOidTrayMediumList* me,
continue;
}
else
{
tray_ds = unspecified_tray_ds;
}
}
/*
* loop through the discrete sizes list, looking for a size that
* matches the medium for the current input tray
......@@ -2107,13 +2104,15 @@ const char* XpOidNotifyString(XpOidNotify notify)
{
switch(notify)
{
default:
case XPOID_NOTIFY_UNSUPPORTED:
return (const char*)NULL;
break;
case XPOID_NOTIFY_NONE:
return NOTIFY_NONE_STR;
break;
case XPOID_NOTIFY_EMAIL:
return NOTIFY_EMAIL_STR;
break;
}
}
......@@ -2238,7 +2237,7 @@ XpOidDocFmtNext(XpOidDocFmt* doc_fmt,
const char* first_nonws_ptr;
const char* format;
const char* variant;
const char* version = 0;
const char* version;
int format_len;
int variant_len;
int version_len;
......@@ -2551,12 +2550,10 @@ XpOidDocFmtListHasFmt(const XpOidDocFmtList* list,
* variants must both be NULL or match
*/
if(fmt->variant == (char*)NULL)
{
if(list->list[i].variant == (char*)NULL)
return xTrue;
else
continue;
}
if(list->list[i].variant == (char*)NULL)
continue;
if(strcmp(fmt->variant, list->list[i].variant) != 0)
......@@ -2565,12 +2562,10 @@ XpOidDocFmtListHasFmt(const XpOidDocFmtList* list,
* versions must both be NULL or match
*/
if(fmt->version == (char*)NULL)
{
if(list->list[i].version == (char*)NULL)
return xTrue;
else
continue;
}
if(list->list[i].version == (char*)NULL)
continue;
if(strcmp(fmt->version, list->list[i].version) == 0)
......
......@@ -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/Oid.h,v 1.4 2001/01/17 22:36:28 dawes Exp $ */
#ifndef _Xp_Oid_h
#define _Xp_Oid_h
......@@ -206,7 +205,7 @@ char* XpOidListString(const XpOidList*);
/*
* XpOidLinkedList public methods
*/
XpOidLinkedList* XpOidLinkedListNew(void);
XpOidLinkedList* XpOidLinkedListNew();
void XpOidLinkedListDelete(XpOidLinkedList*);
#define XpOidLinkedListCount(l) ((l) ? (l)->count : 0)
XpOid XpOidLinkedListGetOid(XpOidLinkedList* list, int i);
......
......@@ -133,6 +133,14 @@ typedef enum {
xpoid_val_medium_size_jis_b8,
xpoid_val_medium_size_jis_b9,
xpoid_val_medium_size_jis_b10,
xpoid_val_medium_size_hp_2x_postcard,
xpoid_val_medium_size_hp_european_edp,
xpoid_val_medium_size_hp_mini,
xpoid_val_medium_size_hp_postcard,
xpoid_val_medium_size_hp_tabloid,
xpoid_val_medium_size_hp_us_edp,
xpoid_val_medium_size_hp_us_government_legal,
xpoid_val_medium_size_hp_us_government_letter,
xpoid_val_plex_simplex,
xpoid_val_plex_duplex,
xpoid_val_plex_tumble,
......
......@@ -30,140 +30,144 @@ 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/OidStrs.h,v 1.5 2001/12/21 21:02:05 dawes Exp $ */
/* This is an automatically-generated file. Do not edit. */
static int XpOidStringMapCount = 127;
#define OIDATA(name) { name, sizeof(name)-1, 0, 0, 0 }
static const XpOidStringMapEntry XpOidStringMap[] = {
OIDATA(""),
OIDATA(""),