From 1f8a4435232d7594fca09de215cf913962ff81fa Mon Sep 17 00:00:00 2001 From: "kjh-5727%comcast.net" Date: Tue, 7 Sep 2004 17:54:33 +0000 Subject: [PATCH] Bug 257381: Refactor postscript printer logic & support printing through CUPS. r/sr=roc. git-svn-id: svn://10.0.0.236/trunk@161851 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/src/ps/nsPaperPS.cpp | 72 ------------------ mozilla/gfx/src/ps/nsPaperPS.h | 126 ------------------------------- 2 files changed, 198 deletions(-) delete mode 100644 mozilla/gfx/src/ps/nsPaperPS.cpp delete mode 100644 mozilla/gfx/src/ps/nsPaperPS.h diff --git a/mozilla/gfx/src/ps/nsPaperPS.cpp b/mozilla/gfx/src/ps/nsPaperPS.cpp deleted file mode 100644 index 4f5d29d4ee3..00000000000 --- a/mozilla/gfx/src/ps/nsPaperPS.cpp +++ /dev/null @@ -1,72 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is developed for mozilla. The tables of paper sizes - * and paper orientations are based on tables from nsPostScriptObj.h. - * - * The Initial Developer of the Original Code is - * Kenneth Herron . - * Portions created by the Initial Developer are Copyright (C) 2004 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - -#include "nsPaperPS.h" -#include "plstr.h" - -#define COUNTOF(x) (sizeof(x) / sizeof((x)[0])) - -const nsPaperSizePS_ nsPaperSizePS::mList[] = -{ -#define SIZE_MM(x) (x) -#define SIZE_INCH(x) ((x) * 25.4) - { "A5", SIZE_MM(148), SIZE_MM(210), PR_TRUE }, - { "A4", SIZE_MM(210), SIZE_MM(297), PR_TRUE }, - { "A3", SIZE_MM(297), SIZE_MM(420), PR_TRUE }, - { "Letter", SIZE_INCH(8.5), SIZE_INCH(11), PR_FALSE }, - { "Legal", SIZE_INCH(8.5), SIZE_INCH(14), PR_FALSE }, - { "Executive", SIZE_INCH(7.5), SIZE_INCH(10), PR_FALSE }, -#undef SIZE_INCH -#undef SIZE_MM -}; - -const unsigned int nsPaperSizePS::mCount = COUNTOF(mList); - -PRBool -nsPaperSizePS::Find(const char *aName) -{ - for (int i = mCount; i--; ) { - if (!PL_strcasecmp(aName, mList[i].name)) { - mCurrent = i; - return PR_TRUE; - } - } - return PR_FALSE; -} diff --git a/mozilla/gfx/src/ps/nsPaperPS.h b/mozilla/gfx/src/ps/nsPaperPS.h deleted file mode 100644 index 2d5e79c4831..00000000000 --- a/mozilla/gfx/src/ps/nsPaperPS.h +++ /dev/null @@ -1,126 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is developed for mozilla. - * - * The Initial Developer of the Original Code is - * Kenneth Herron . - * Portions created by the Initial Developer are Copyright (C) 2004 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - -#ifndef _PAPERPS_H_ -#define _PAPERPS_H_ - -#include "prtypes.h" -#include "nsDebug.h" - -struct nsPaperSizePS_ { - const char *name; - float width_mm; - float height_mm; - PRBool isMetric; // Present to the user in metric, if possible -}; - -class nsPaperSizePS { - public: - /** --------------------------------------------------- - * Constructor - */ - nsPaperSizePS() { mCurrent = 0; } - - /** --------------------------------------------------- - * @return PR_TRUE if the cursor points past the last item. - */ - PRBool AtEnd() { return mCurrent >= mCount; } - - /** --------------------------------------------------- - * Position the cursor at the beginning of the paper size list. - * @return VOID - */ - void First() { mCurrent = 0; } - - /** --------------------------------------------------- - * Advance the cursor to the next item. - * @return VOID - */ - void Next() { - NS_WARN_IF_FALSE(!AtEnd(), "Invalid current item"); - mCurrent++; - } - - /** --------------------------------------------------- - * Point the cursor to the entry with the given paper name. - * @return PR_TRUE if pointing to a valid entry. - */ - PRBool Find(const char *aName); - - /** --------------------------------------------------- - * @return a pointer to the name of the current paper size - */ - const char *Name() { - NS_PRECONDITION(!AtEnd(), "Invalid current item"); - return mList[mCurrent].name; - } - - /** --------------------------------------------------- - * @return the width of the page in millimeters - */ - float Width_mm() { - NS_PRECONDITION(!AtEnd(), "Invalid current item"); - return mList[mCurrent].width_mm; - } - - /** --------------------------------------------------- - * @return the height of the page in millimeters - */ - float Height_mm() { - NS_PRECONDITION(!AtEnd(), "Invalid current item"); - return mList[mCurrent].height_mm; - } - - /** --------------------------------------------------- - * @return PR_TRUE if the paper should be presented to - * the user in metric units. - */ - PRBool IsMetric() { - NS_PRECONDITION(!AtEnd(), "Invalid current item"); - return mList[mCurrent].isMetric; - } - - private: - unsigned int mCurrent; - static const nsPaperSizePS_ mList[]; - static const unsigned int mCount; -}; - -#endif -