* move libprint sources into libs, as it is a 3rdparty lib

* move libprint headers into libs headers folder accordingly
* merge all shared folders sources into kits print, we might build later on a
  real print kit, propably also to access cups from an nicely API, atm static
* move all shared headers into private print, also pr_server.h from interface
* adjust build to work with the changed folder layout



git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26570 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/print/MarginView.h

@@ -0,0 +1,222 @@
+/*
+
+MarginView.h
+
+Copyright (c) 2002 OpenBeOS.
+
+Authors:
+	Philippe Houdoin
+	Simon Gauvin
+	Michael Pfeiffer
+
+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
+AUTHORS OR 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.
+
+	Documentation:
+
+	The MarginView is designed to be a self contained component that manages
+	the display of a BBox control that shows a graphic of a page and its'
+	margings. The component also includes text fields that are used to mofify
+	the margin values and a popup to change the units used for the margins.
+
+	There are two interfaces for the MarginView component:
+
+	1) Set methods:
+		- page size
+		- orientation
+
+	   Get methods to retrieve:
+		- margins
+		- page size
+
+		The method interface is available for the parent Component to call on
+		the MarginView in response to the Window receiveing messages from
+		other BControls that it contains, such as a Page Size popup. The
+		Get methods are used to extract the page size and margins so that
+		the printer driver may put these values into a BMessage for printing.
+
+	2) 'Optional' Message interface:
+		- Set Page Size
+		- Flip Orientation
+
+		The message interface is available for GUI Controls, BPopupMenu to send
+		messages to the MarginView if the parent Window is not used to handle
+		the messages.
+
+	General Use of MarginView component:
+
+		1) Simply construct a new MarginView object with the margins
+			you want as defaults and add this view to the parent view
+			of the dialog.
+
+			MarginView *mv;
+			mv = new MarginView(viewSizeRect, pageWidth, pageHeight);
+			parentView->AddChild(mv);
+
+			* you can also set the margins in the constructor, and the units:
+
+			mv = new MarginView(viewSizeRect, pageWidth, pageHeight
+						marginRect, kUnitPointS);
+
+			! but remeber to have the marginRect values match the UNITS :-)
+
+		2) Set Page Size with methods:
+
+			mv-SetPageSize( pageWidth, pageHeight );
+			mv->UpdateView();
+
+		3) Set Page Size with BMessage:
+
+			BMessage* msg = new BMessage(CHANGE_PAGE_SIZE);
+			msg->AddFloat("width", pageWidth);
+			msg->AddFloat("height", pageHeight);
+			mv->PostMessage(msg);
+
+		4) Flip Page with methods:
+
+			mv-SetPageSize( pageHeight, pageWidth );
+			mv->UpdateView();
+
+		5) Flip Page with BMessage:
+
+			BMessage* msg = new BMessage(FLIP_PAGE);
+			mv->Looper()->PostMessage(msg);
+
+		Note: the MarginView DOES NOT keep track of the orientation. This
+				should be done by the code for the Page setup dialog.
+
+		6) Get Page Size
+
+			BPoint pageSize = mv->GetPageSize();
+
+		7) Get Margins
+
+			BRect margins = mv->GetMargins();
+
+		8) Get Units
+
+			uint32 units = mv->GetUnits();
+
+			where units is one of:
+				kUnitInch,  72 points/in
+				kUnitCM,    28.346 points/cm
+				kUnitPoint, 1 point/point
+*/
+
+#ifndef _MARGIN_VIEW_H
+#define _MARGIN_VIEW_H
+
+#include <InterfaceKit.h>
+#include <Looper.h>
+
+class BTextControl;
+class MarginManager;
+
+// Messages that the MarginManager accepts
+const uint32 TOP_MARGIN_CHANGED    = 'tchg';
+const uint32 RIGHT_MARGIN_CHANGED  = 'rchg';
+const uint32 LEFT_MARGIN_CHANGED   = 'lchg';
+const uint32 BOTTOM_MARGIN_CHANGED = 'bchg';
+const uint32 MARGIN_CHANGED        = 'mchg';
+const uint32 CHANGE_PAGE_SIZE      = 'chps';
+const uint32 FLIP_PAGE             = 'flip';
+const uint32 MARGIN_UNIT_CHANGED   = 'mucg';
+
+enum MarginUnit {
+	kUnitInch = 0,
+	kUnitCM,
+	kUnitPoint
+};
+
+/**
+ * Class MarginView
+ */
+class MarginView : public BBox
+{
+friend class MarginManager;
+
+public:
+							MarginView(BRect rect, int32 pageWidth = 0,
+								int32 pageHeight = 0,
+								BRect margins = BRect(1, 1, 1, 1), // 1 inch
+								MarginUnit unit = kUnitInch);
+
+	virtual					~MarginView();
+
+	virtual	void			AttachedToWindow();
+	virtual	void			Draw(BRect rect);
+	virtual	void			FrameResized(float width, float height);
+	virtual	void			MessageReceived(BMessage *msg);
+
+			// point.x = width, point.y = height
+			BPoint			PageSize() const;
+			void			SetPageSize(float pageWidth, float pageHeight);
+
+			// margin
+			BRect			Margin() const;
+
+			// units
+			MarginUnit		Unit() const;
+
+			// will cause a recalc and redraw
+			void			UpdateView(uint32 msg);
+
+private:
+			// all the GUI construction code
+			void			_ConstructGUI();
+
+			// utility method
+			void			_AllowOnlyNumbers(BTextControl *textControl,
+								int32 maxNum);
+
+			// performed internally using text fields
+			void			_SetMargin(BRect margin);
+
+			// performed internally using the supplied popup
+			void			_SetMarginUnit(MarginUnit unit);
+
+			// Calculate the view size for the margins
+			void			_CalculateViewSize(uint32 msg);
+
+private:
+			BTextControl*	fTop;
+			BTextControl*	fBottom;
+			BTextControl*	fLeft;
+			BTextControl*	fRight;
+
+			// rect that holds the margins for the page as a set of point offsets
+			BRect			fMargins;
+
+			// the maximum size of the page view calculated from the view size
+			float			fMaxPageWidth;
+			float			fMaxPageHeight;
+
+			// the actual size of the page in points
+			float			fPageHeight;
+			float			fPageWidth;
+
+			// the units used to calculate the page size
+			MarginUnit		fMarginUnit;
+			float			fUnitValue;
+
+			// the size of the drawing area we have to draw the view in pixels
+			float			fViewHeight;
+			float			fViewWidth;
+};
+
+#endif // _MARGIN_VIEW_H

src/add-ons/print/Jamfile

@@ -1,5 +1,4 @@
 SubDir HAIKU_TOP src add-ons print ;
 
-SubInclude HAIKU_TOP src add-ons print shared ;
 SubInclude HAIKU_TOP src add-ons print drivers ;
 SubInclude HAIKU_TOP src add-ons print transports ;

src/add-ons/print/drivers/Jamfile

@@ -1,6 +1,5 @@
 SubDir HAIKU_TOP src add-ons print drivers ;
 
-SubInclude HAIKU_TOP src add-ons print drivers shared ;
 SubInclude HAIKU_TOP src add-ons print drivers canon_lips ;
 SubInclude HAIKU_TOP src add-ons print drivers pcl5 ;
 SubInclude HAIKU_TOP src add-ons print drivers pcl6 ;

src/add-ons/print/drivers/canon_lips/lips3/Jamfile

@@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons print drivers canon_lips lips3 ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print libprint ] ; 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; 
+SubDirHdrs [ FDirName $(HAIKU_TOP) headers libs print libprint ] ;
 
 AddResources Canon\ LIPS3\ Compatible : Lips3.rdef ;
 

src/add-ons/print/drivers/canon_lips/lips4/Jamfile

@@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons print drivers canon_lips lips4 ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print libprint ] ; 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; 
+SubDirHdrs [ FDirName $(HAIKU_TOP) headers libs print libprint ] ;
 
 AddResources Canon\ LIPS4\ Compatible : Lips4.rdef ;
 

src/add-ons/print/drivers/pcl5/Jamfile

@@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons print drivers pcl5 ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print libprint ] ; 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; 
+SubDirHdrs [ FDirName $(HAIKU_TOP) headers libs print libprint ] ;
 
 AddResources PCL5\ Compatible : PCL5.rsrc ;
 

src/add-ons/print/drivers/pcl6/Jamfile

@@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons print drivers pcl6 ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print libprint ] ; 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; 
+SubDirHdrs [ FDirName $(HAIKU_TOP) headers libs print libprint ] ;
 
 AddResources PCL6\ Compatible : PCL6.rsrc ;
 

src/add-ons/print/drivers/pdf/source/Jamfile

@@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons print drivers pdf source ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print ] ; 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; 
+UsePrivateHeaders print ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) src libs pdflib libs pdflib ] ;
 
 AddResources PDF\ Writer : 

src/add-ons/print/drivers/postscript/Jamfile

@@ -2,8 +2,7 @@ SubDir HAIKU_TOP src add-ons print drivers postscript ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print libprint ] ; 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; 
+SubDirHdrs [ FDirName $(HAIKU_TOP) headers libs print libprint ] ;
 
 AddResources PS\ Compatible : PS.rsrc ;
 

src/add-ons/print/drivers/preview/Jamfile

@@ -2,10 +2,7 @@ SubDir HAIKU_TOP src add-ons print drivers preview ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print ] ;
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ;
-
-UsePrivateHeaders interface ;
+UsePrivateHeaders print ;
 
 AddResources Preview : Preview.rsrc ;
 

src/add-ons/print/drivers/shared/Jamfile

@@ -1,4 +0,0 @@
-SubDir HAIKU_TOP src add-ons print drivers shared ;
-
-SubInclude HAIKU_TOP src add-ons print drivers shared utils ;
-SubInclude HAIKU_TOP src add-ons print drivers shared libprint ;

src/add-ons/print/drivers/shared/utils/Jamfile

@@ -1,12 +0,0 @@
-SubDir HAIKU_TOP src add-ons print drivers shared utils ;
-
-SetSubDirSupportedPlatformsBeOSCompatible ;
-
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; 
-
-StaticLibrary libprintutils.a :
-	InterfaceUtils.cpp
-	MarginView.cpp
-	Utils.cpp
-;
-

src/add-ons/print/shared/Jamfile

@@ -1,32 +0,0 @@
-SubDir HAIKU_TOP src add-ons print shared ;
-
-SetSubDirSupportedPlatformsBeOSCompatible ;
-
-UsePrivateHeaders interface print ;
-
-StaticLibrary 
-	libprintutils.a
-	: 
-	PicturePrinter.cpp
-	PrintJobReader.cpp
-	PictureIterator.cpp
-	PrintTransport.cpp
-	;
-
-# StaticLibrary
-#	libprinttransportaddon.a
-#	:
-#	PrintTransportAddOn.cpp
-#	;
-
-Objects
-	PrintTransportAddOn.cpp 
-;
-
-
-#StaticLibrary
-#	libprinterdriveraddon.a
-#	:
-#	PrinterDriverAddOn.cpp
-#	;
-

src/add-ons/print/transports/parallel_port/Jamfile

@@ -2,17 +2,15 @@ SubDir HAIKU_TOP src add-ons print transports parallel_port ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+UsePrivateHeaders print ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons print transports shared ] ;
-UsePrivateHeaders interface print ;
 
 Addon Parallel\ Port :
 	ParallelTransport.cpp
-	PrintTransportAddOn.o
-	: be
+	: be libprintutils.a
 ;
 
-ObjectReferences <src!add-ons!print!shared>PrintTransportAddOn.o ;
-
 Package haiku-printingkit-cvs :
 	Parallel\ Port :
 	boot home config add-ons Print transport ;
+

src/add-ons/print/transports/serial_port/Jamfile

@@ -2,17 +2,15 @@ SubDir HAIKU_TOP src add-ons print transports serial_port ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+UsePrivateHeaders print ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons print transports shared ] ;
-UsePrivateHeaders interface print ;
 
 Addon Serial\ Port :
 	SerialTransport.cpp
-	PrintTransportAddOn.o
-	: be
+	: be libprintutils.a
 ;
 
-ObjectReferences <src!add-ons!print!shared>PrintTransportAddOn.o ;
-
 Package haiku-printingkit-cvs :
 	Serial\ Port :
 	boot home config add-ons Print transport ;
+

src/add-ons/print/transports/usb_port/Jamfile

@@ -2,17 +2,15 @@ SubDir HAIKU_TOP src add-ons print transports usb_port ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+UsePrivateHeaders print ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons print transports shared ] ;
-UsePrivateHeaders interface print ;
 
 Addon USB\ Port :
 	USBTransport.cpp
-	PrintTransportAddOn.o
-	: be
+	: be libprintutils.a
 ;
 
-ObjectReferences <src!add-ons!print!shared>PrintTransportAddOn.o ;
-
 Package haiku-printingkit-cvs :
 	USB\ Port :
 	boot home config add-ons Print transport ;
+

src/kits/Jamfile

@@ -94,6 +94,7 @@ SubInclude HAIKU_TOP src kits midi ;
 SubInclude HAIKU_TOP src kits midi2 ;
 SubInclude HAIKU_TOP src kits network ;
 SubInclude HAIKU_TOP src kits opengl ;
+SubInclude HAIKU_TOP src kits print ;
 SubInclude HAIKU_TOP src kits screensaver ;
 SubInclude HAIKU_TOP src kits shared ;
 SubInclude HAIKU_TOP src kits storage ;

src/kits/interface/Jamfile

@@ -25,7 +25,7 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 
 SetSubDirSupportedPlatforms haiku libbe_test ;
 
-UsePrivateHeaders app input interface shared tracker ;
+UsePrivateHeaders app input print interface shared tracker ;
 UseLibraryHeaders icon png zlib ;
 
 

src/kits/print/Jamfile

@@ -0,0 +1,20 @@
+SubDir HAIKU_TOP src kits print ;
+
+SetSubDirSupportedPlatformsBeOSCompatible ;
+
+UsePrivateHeaders shared print ;
+
+StaticLibrary libprintutils.a :
+	BeUtils.cpp
+	BeUtilsTranslation.cpp
+	FolderWatcher.cpp
+	InterfaceUtils.cpp
+	Jobs.cpp
+	MarginView.cpp
+	PrintJobReader.cpp
+	PicturePrinter.cpp
+	PrintTransport.cpp
+	PictureIterator.cpp
+	PrintTransportAddOn.cpp
+	Utils.cpp
+;

src/libs/Jamfile

@@ -16,6 +16,7 @@ SubInclude HAIKU_TOP src libs lp_solve ;
 SubInclude HAIKU_TOP src libs ncurses ;
 SubInclude HAIKU_TOP src libs pdflib ;
 SubInclude HAIKU_TOP src libs png ;
+SubInclude HAIKU_TOP src libs print ;
 SubInclude HAIKU_TOP src libs stdc++ ;
 SubInclude HAIKU_TOP src libs termcap ;
 SubInclude HAIKU_TOP src libs util ;

src/libs/print/Jamfile

@@ -0,0 +1,3 @@
+SubDir HAIKU_TOP src libs print ;
+
+SubInclude HAIKU_TOP src libs print libprint ;

src/libs/print/libprint/Jamfile

@@ -1,13 +1,9 @@
-SubDir HAIKU_TOP src add-ons print drivers shared libprint ;
+SubDir HAIKU_TOP src libs print libprint ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print libprint ] ; 
-
-# for BeUtils.h
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print ] ; 
-# for Utils.h, InterfaceUtils.h
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers private print utils ] ; 
+UsePrivateHeaders print ;
+SubDirHdrs [ FDirName $(HAIKU_TOP) headers libs print libprint ] ; 
 
 StaticLibrary libprint.a :
 	AboutBox.cpp

src/preferences/print/Jamfile

@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src preferences print ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UsePrivateHeaders interface shared print ;
+UsePrivateHeaders shared print ;
 
 Preference Printers :
 	AddPrinterDialog.cpp

src/servers/print/Jamfile

@@ -2,22 +2,13 @@ SubDir HAIKU_TOP src servers print ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-SubInclude HAIKU_TOP src servers print shared ;
+UsePrivateHeaders shared print ;
 
-SubDir HAIKU_TOP src servers print ;
-
-UsePrivateHeaders shared interface print ;
-UsePrivateHeaders print ;
-
-AddResources
-	print_server
-	:
+AddResources print_server :
 	print_server.rdef
-	;
+;
 
-Server 
-	print_server 
-	:
+Server print_server :
 	PrintServerApp.cpp
 	PrintServerApp.R5.cpp
 	PrintServerApp.Scripting.cpp
@@ -28,16 +19,14 @@ Server
 	ResourceManager.cpp
 	Settings.cpp
 	ConfigWindow.cpp
-	;
+;
 
-LinkAgainst 
-	print_server 
-	: 
+LinkAgainst print_server : 
 	be 
 	root
 	translation
 	libprintutils.a
-	;
+;
 
 Package haiku-printingkit-cvs :
 	print_server :

src/servers/print/shared/Jamfile

@@ -1,14 +0,0 @@
-SubDir HAIKU_TOP src servers print shared ;
-
-SetSubDirSupportedPlatformsBeOSCompatible ;
-
-UsePrivateHeaders shared interface print ;
-
-StaticLibrary 
-	libprintutils.a
-	: 
-	BeUtils.cpp
-	BeUtilsTranslation.cpp
-	FolderWatcher.cpp
-	Jobs.cpp
-	;