- new

Changed files:
    xorg-app-xman-xaw.patch -> 1.1

1 files changed, 1231 insertions, 0 deletions

diff --git a/xorg-app-xman-xaw.patch b/xorg-app-xman-xaw.patch
new file mode 100644
index 0000000..906ade7
--- /dev/null
+++ b/xorg-app-xman-xaw.patch
@@ -0,0 +1,1231 @@
+commit f3579250f8aa332f2015cb1352ed8b7373eb10db
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Wed Aug 20 10:32:52 2008 -0400
+
+    xaw8 is gone, use xaw7
+
+diff --git a/configure.ac b/configure.ac
+index a219b35..dc33c8a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -61,7 +61,7 @@ if test x$LOCALMANPATH != x; then
+ fi
+ 
+ # Checks for pkg-config packages
+-XAW_CHECK_XPRINT_SUPPORT(XMAN)
++PKG_CHECK_MODULES(XMAN, xaw7)
+ 
+ AC_ARG_WITH(manconfig,
+         AC_HELP_STRING([--with-manconfig=<filename>],
+commit 5722ca728763e7ec57088593e76ba84db61a726c
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Thu Aug 21 00:38:27 2008 +0200
+
+    Remove xprint remnants
+
+diff --git a/Makefile.am b/Makefile.am
+index 3354a69..d0e75f3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -50,12 +50,6 @@ xman_SOURCES =	\
+         vendor.h \
+         version.h
+ 
+-if XAW_USE_XPRINT
+-xman_SOURCES += \
+-        print.c \
+-        print.h
+-endif
+-
+ appman_PRE = \
+         xman.man
+ 
+@@ -63,26 +57,16 @@ appman_PRE = \
+ 
+ appdefaultdir = @appdefaultdir@
+ 
+-if XAW_USE_XPRINT
+-app-defaults/Xman: app-defaults/Xman-xprint.ad
+-	ln -s Xman-xprint.ad app-defaults/Xman
+-else
+-app-defaults/Xman: app-defaults/Xman-noxprint.ad
+-	ln -s Xman-noxprint.ad app-defaults/Xman
+-endif
+-
+ appdefault_DATA = app-defaults/Xman
+ 
+-EXTRA_DIST = app-defaults/Xman-xprint.ad app-defaults/Xman-noxprint.ad
+-
+-CLEANFILES = app-defaults/Xman
++EXTRA_DIST = app-defaults/Xman
+ 
+ appmandir = $(APP_MAN_DIR)
+ 
+ appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+ 
+ EXTRA_DIST += $(appman_PRE)
+-CLEANFILES += $(appman_DATA)
++CLEANFILES = $(appman_DATA)
+ 
+ SED = sed
+ 
+diff --git a/app-defaults/Xman b/app-defaults/Xman
+new file mode 100644
+index 0000000..3f08b02
+--- /dev/null
++++ b/app-defaults/Xman
+@@ -0,0 +1,195 @@
++*input:				True
++
++*topBox:			True
++*topBox.Title:			Xman
++*topBox.IconName:		Xman
++
++*manualBrowser.Title:		Manual Page
++*manualBrowser.IconName:	Manual Page
++*manualBrowser.geometry:	600x600
++
++*manualFontBold:		-*-courier-bold-r-*-*-*-120-*-*-*-*-*-*
++*manualFontItalic:		-*-courier-medium-o-*-*-*-120-*-*-*-*-*-*
++*manualFontNormal:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
++*manualFontSymbol:		-*-symbol-*-*-*-*-*-120-*-*-*-*-*-*
++!*directoryFontNormal:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
++*directoryFontNormal:		-*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
++!*directoryFontNormal:		-*-lucida-bold-r-*-*-*-120-*-*-*-*-*-*
++
++!*SimpleMenu.BackingStore:	Always
++!*SimpleMenu.SaveUnder:		Off
++
++*horizPane.orientation: 	horizontal
++*horizPane*showGrip:		False
++*horizPane.min:			22
++*horizPane.max:			22
++*topLabel.BorderWidth:		0
++*search*label.BorderWidth:	0
++
++*search*dialog*value:		Xman
++
++!*optionMenu.Label:		Options
++!*sectionMenu.Label:		Sections
++
++*horizPane*options.Label:	Options
++*horizPane*sections.Label:	Sections
++
++*helpButton.Label:		Help
++*helpButton.Tip:		Open help browser
++
++*quitButton.Label:		Quit
++*quitButton.Tip:		Quit Xman
++
++*manpageButton.Label:		Manual Page
++*manpageButton.Tip:		Open new manpage browser
++
++*topLabel.Label:		Manual Browser
++
++!*SimpleMenu*menuLabel*vertSpace: 100
++!*SimpleMenu*menuLabel*leftMargin: 20
++
++*displayDirectory.Label:	Display Directory 
++*displayManualPage.Label:	Display Manual Page
++*help.Label:			Help
++*help.geometry:			600x600
++*search.Label:			Search
++*removeThisManpage.Label:	Remove This Manpage
++*help*removeThisManpage.Label:	Remove Help
++*openNewManpage.Label:		Open New Manpage
++*showVersion.Label:		Show Version
++*quit.Label:			Quit
++
++*pleaseStandBy*Label:		Formatting Manual Page, Please Stand By...
++
++*search*dialog.Label:		Type string to search for:
++*search*apropos.Label:		Apropos
++*search*manualPage.Label:	Manual Page
++*search*cancel.Label:		Cancel
++
++*likeToSave*dialog.Label:	Would you like to save this formatted Manual Page?
++*likeToSave*yes.Label:		Yes
++*likeToSave*no.Label:		No
++
++*translations: 		#override \
++		Ctrl<Key>q: Quit() \n\
++		Ctrl<Key>c: Quit() \n\
++		Ctrl<Key>n: CreateNewManpage() \n\
++		Ctrl<Key>h: PopupHelp() \n\
++		Ctrl<Key>s: PopupSearch()
++
++*help*Paned.manualPage.translations:#override \
++		Ctrl<Btn1Down>: \
++			XawPositionSimpleMenu(optionMenu) \
++			MenuPopup(optionMenu) \n\
++		Ctrl<Key>q: Quit() \n\
++		Ctrl<Key>c: Quit() \n\
++		Ctrl<Key>r: RemoveThisManpage() \n\
++		Ctrl<Key>n: CreateNewManpage() \n\
++		Ctrl<Key>h: PopupHelp() \n\
++		Ctrl<Key>d: GotoPage(Directory) \n\
++		Ctrl<Key>m: GotoPage(ManualPage) \n\
++		Ctrl<Key>v: ShowVersion() \n\
++		<Key>Prior: Page(Back) \n\
++		<Key>Next : Page(Forward) \n\
++		Shift<Btn4Down>,<Btn4Up>: Page(Line,-1) \n\
++	        Shift<Btn5Down>,<Btn5Up>: Page(Line,1) \n\
++	        Ctrl<Btn4Down>,<Btn4Up>: Page(Back) \n\
++		Ctrl<Btn5Down>,<Btn5Up>: Page(Forward) \n\
++		None<Btn4Down>,<Btn4Up>: Page(Line,-5) \n\
++		None<Btn5Down>,<Btn5Up>: Page(Line,5)
++
++*manualBrowser*manualPage.translations:  #override \
++		Ctrl<Btn1Down>: \
++			XawPositionSimpleMenu(optionMenu) \
++			MenuPopup(optionMenu) \n\
++		Ctrl<Btn2Down>: \
++			XawPositionSimpleMenu(sectionMenu) \
++			MenuPopup(sectionMenu) \n\
++		Shift<Btn2Down>,<Btn2Up>:GotoPage(Directory)\n\
++		Ctrl<Key>q: Quit() \n\
++		Ctrl<Key>c: Quit() \n\
++		Ctrl<Key>r: RemoveThisManpage() \n\
++		Ctrl<Key>n: CreateNewManpage() \n\
++		Ctrl<Key>h: PopupHelp() \n\
++		Ctrl<Key>d: GotoPage(Directory) \n\
++		Ctrl<Key>m: GotoPage(ManualPage) \n\
++		Ctrl<Key>v: ShowVersion() \n\
++		<Key>Prior: Page(Back) \n\
++		<Key>Next : Page(Forward) \n\
++		Shift<Btn4Down>,<Btn4Up>: Page(Line,-1) \n\
++	        Shift<Btn5Down>,<Btn5Up>: Page(Line,1) \n\
++	        Ctrl<Btn4Down>,<Btn4Up>: Page(Back) \n\
++		Ctrl<Btn5Down>,<Btn5Up>: Page(Forward) \n\
++		None<Btn4Down>,<Btn4Up>: Page(Line,-5) \n\
++		None<Btn5Down>,<Btn5Up>: Page(Line,5) \n\
++		Ctrl<Key>s: PopupSearch()
++
++!*manualBrowser*directory.background: Grey80
++*manualBrowser*directory.translations:   #override \
++		Ctrl<Btn1Down>: \
++			XawPositionSimpleMenu(optionMenu) \
++			MenuPopup(optionMenu) \n\
++		Ctrl<Btn2Down>: \
++			XawPositionSimpleMenu(sectionMenu) \
++			MenuPopup(sectionMenu) \n\
++		Shift<Btn2Down>,<Btn2Up>: GotoPage(Manpage) \n\
++		Ctrl<Key>q: Quit() \n\
++		Ctrl<Key>c: Quit() \n\
++		Ctrl<Key>r: RemoveThisManpage() \n\
++		Ctrl<Key>n: CreateNewManpage() \n\
++		Ctrl<Key>h: PopupHelp() \n\
++		Ctrl<Key>d: GotoPage(Directory) \n\
++		Ctrl<Key>m: GotoPage(ManualPage) \n\
++		Ctrl<Key>v: ShowVersion() \n\
++		Ctrl<Key>s: PopupSearch()
++
++*manualBrowser*search*manualPage.translations: 	#augment \
++		<Btn1Down>,<Btn1Up>: Search(Manpage) reset()
++
++*manualBrowser*search*apropos.translations:		#augment \
++		<Btn1Down>,<Btn1Up>: Search(Apropos) reset()
++
++*manualBrowser*search*cancel*translations:  	#augment \
++		<Btn1Down>,<Btn1Up>: Search(Cancel) reset()
++
++*manualBrowser*search*value*translations:		#override \
++		<Key>Return: Search(Manpage) \n\
++		Ctrl<Key>m:  Search(Manpage)
++
++*topBox*search*manualPage.translations: 		#augment \
++		<Btn1Down>,<Btn1Up>: Search(Manpage, Open) reset()
++
++*topBox*search*apropos.translations:		#augment \
++		<Btn1Down>,<Btn1Up>: Search(Apropos, Open) reset()
++
++*topBox*search*cancel*translations:  		#augment \
++		<Btn1Down>,<Btn1Up>: Search(Cancel, Open) reset()
++
++*topBox*search*value*translations:			#override \
++		<Key>Return: Search(Manpage, Open) \n\
++		Ctrl<Key>m:  Search(Manpage, Open)
++
++*manualBrowser*likeToSave*yes.translations:	#override \
++		<Btn1Down>,<Btn1Up>: SaveFormattedPage(Save) reset() \n\
++		<Key>y:   SaveFormattedPage(Save) \n\
++		<Key>n:   SaveFormattedPage(Cancel) 
++
++*manualBrowser*likeToSave*no.translations:	#override \
++		<Btn1Down>,<Btn1Up>: SaveFormattedPage(Cancel) reset() \n\
++		<Key>y:	  SaveFormattedPage(Save) \n\
++		<Key>n:	  SaveFormattedPage(Cancel) 
++
++*manualBrowser*likeToSave*translations:	#override \
++		<Key>y:	  SaveFormattedPage(Save) \n\
++		<Key>n:	  SaveFormattedPage(Cancel) 
++
++*helpButton.translations:	#augment \
++		<Btn1Down>,<Btn1Up>: PopupHelp() reset()
++
++*quitButton.translations:	#augment \
++		<Btn1Down>,<Btn1Up>: Quit() reset()
++
++*manpageButton.translations: #augment \
++		<Btn1Down>,<Btn1Up>: CreateNewManpage() reset()
++
++! EOF.
+diff --git a/app-defaults/Xman-noxprint.ad b/app-defaults/Xman-noxprint.ad
+deleted file mode 100644
+index 3f08b02..0000000
+--- a/app-defaults/Xman-noxprint.ad
++++ /dev/null
+@@ -1,195 +0,0 @@
+-*input:				True
+-
+-*topBox:			True
+-*topBox.Title:			Xman
+-*topBox.IconName:		Xman
+-
+-*manualBrowser.Title:		Manual Page
+-*manualBrowser.IconName:	Manual Page
+-*manualBrowser.geometry:	600x600
+-
+-*manualFontBold:		-*-courier-bold-r-*-*-*-120-*-*-*-*-*-*
+-*manualFontItalic:		-*-courier-medium-o-*-*-*-120-*-*-*-*-*-*
+-*manualFontNormal:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
+-*manualFontSymbol:		-*-symbol-*-*-*-*-*-120-*-*-*-*-*-*
+-!*directoryFontNormal:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
+-*directoryFontNormal:		-*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
+-!*directoryFontNormal:		-*-lucida-bold-r-*-*-*-120-*-*-*-*-*-*
+-
+-!*SimpleMenu.BackingStore:	Always
+-!*SimpleMenu.SaveUnder:		Off
+-
+-*horizPane.orientation: 	horizontal
+-*horizPane*showGrip:		False
+-*horizPane.min:			22
+-*horizPane.max:			22
+-*topLabel.BorderWidth:		0
+-*search*label.BorderWidth:	0
+-
+-*search*dialog*value:		Xman
+-
+-!*optionMenu.Label:		Options
+-!*sectionMenu.Label:		Sections
+-
+-*horizPane*options.Label:	Options
+-*horizPane*sections.Label:	Sections
+-
+-*helpButton.Label:		Help
+-*helpButton.Tip:		Open help browser
+-
+-*quitButton.Label:		Quit
+-*quitButton.Tip:		Quit Xman
+-
+-*manpageButton.Label:		Manual Page
+-*manpageButton.Tip:		Open new manpage browser
+-
+-*topLabel.Label:		Manual Browser
+-
+-!*SimpleMenu*menuLabel*vertSpace: 100
+-!*SimpleMenu*menuLabel*leftMargin: 20
+-
+-*displayDirectory.Label:	Display Directory 
+-*displayManualPage.Label:	Display Manual Page
+-*help.Label:			Help
+-*help.geometry:			600x600
+-*search.Label:			Search
+-*removeThisManpage.Label:	Remove This Manpage
+-*help*removeThisManpage.Label:	Remove Help
+-*openNewManpage.Label:		Open New Manpage
+-*showVersion.Label:		Show Version
+-*quit.Label:			Quit
+-
+-*pleaseStandBy*Label:		Formatting Manual Page, Please Stand By...
+-
+-*search*dialog.Label:		Type string to search for:
+-*search*apropos.Label:		Apropos
+-*search*manualPage.Label:	Manual Page
+-*search*cancel.Label:		Cancel
+-
+-*likeToSave*dialog.Label:	Would you like to save this formatted Manual Page?
+-*likeToSave*yes.Label:		Yes
+-*likeToSave*no.Label:		No
+-
+-*translations: 		#override \
+-		Ctrl<Key>q: Quit() \n\
+-		Ctrl<Key>c: Quit() \n\
+-		Ctrl<Key>n: CreateNewManpage() \n\
+-		Ctrl<Key>h: PopupHelp() \n\
+-		Ctrl<Key>s: PopupSearch()
+-
+-*help*Paned.manualPage.translations:#override \
+-		Ctrl<Btn1Down>: \
+-			XawPositionSimpleMenu(optionMenu) \
+-			MenuPopup(optionMenu) \n\
+-		Ctrl<Key>q: Quit() \n\
+-		Ctrl<Key>c: Quit() \n\
+-		Ctrl<Key>r: RemoveThisManpage() \n\
+-		Ctrl<Key>n: CreateNewManpage() \n\
+-		Ctrl<Key>h: PopupHelp() \n\
+-		Ctrl<Key>d: GotoPage(Directory) \n\
+-		Ctrl<Key>m: GotoPage(ManualPage) \n\
+-		Ctrl<Key>v: ShowVersion() \n\
+-		<Key>Prior: Page(Back) \n\
+-		<Key>Next : Page(Forward) \n\
+-		Shift<Btn4Down>,<Btn4Up>: Page(Line,-1) \n\
+-	        Shift<Btn5Down>,<Btn5Up>: Page(Line,1) \n\
+-	        Ctrl<Btn4Down>,<Btn4Up>: Page(Back) \n\
+-		Ctrl<Btn5Down>,<Btn5Up>: Page(Forward) \n\
+-		None<Btn4Down>,<Btn4Up>: Page(Line,-5) \n\
+-		None<Btn5Down>,<Btn5Up>: Page(Line,5)
+-
+-*manualBrowser*manualPage.translations:  #override \
+-		Ctrl<Btn1Down>: \
+-			XawPositionSimpleMenu(optionMenu) \
+-			MenuPopup(optionMenu) \n\
+-		Ctrl<Btn2Down>: \
+-			XawPositionSimpleMenu(sectionMenu) \
+-			MenuPopup(sectionMenu) \n\
+-		Shift<Btn2Down>,<Btn2Up>:GotoPage(Directory)\n\
+-		Ctrl<Key>q: Quit() \n\
+-		Ctrl<Key>c: Quit() \n\
+-		Ctrl<Key>r: RemoveThisManpage() \n\
+-		Ctrl<Key>n: CreateNewManpage() \n\
+-		Ctrl<Key>h: PopupHelp() \n\
+-		Ctrl<Key>d: GotoPage(Directory) \n\
+-		Ctrl<Key>m: GotoPage(ManualPage) \n\
+-		Ctrl<Key>v: ShowVersion() \n\
+-		<Key>Prior: Page(Back) \n\
+-		<Key>Next : Page(Forward) \n\
+-		Shift<Btn4Down>,<Btn4Up>: Page(Line,-1) \n\
+-	        Shift<Btn5Down>,<Btn5Up>: Page(Line,1) \n\
+-	        Ctrl<Btn4Down>,<Btn4Up>: Page(Back) \n\
+-		Ctrl<Btn5Down>,<Btn5Up>: Page(Forward) \n\
+-		None<Btn4Down>,<Btn4Up>: Page(Line,-5) \n\
+-		None<Btn5Down>,<Btn5Up>: Page(Line,5) \n\
+-		Ctrl<Key>s: PopupSearch()
+-
+-!*manualBrowser*directory.background: Grey80
+-*manualBrowser*directory.translations:   #override \
+-		Ctrl<Btn1Down>: \
+-			XawPositionSimpleMenu(optionMenu) \
+-			MenuPopup(optionMenu) \n\
+-		Ctrl<Btn2Down>: \
+-			XawPositionSimpleMenu(sectionMenu) \
+-			MenuPopup(sectionMenu) \n\
+-		Shift<Btn2Down>,<Btn2Up>: GotoPage(Manpage) \n\
+-		Ctrl<Key>q: Quit() \n\
+-		Ctrl<Key>c: Quit() \n\
+-		Ctrl<Key>r: RemoveThisManpage() \n\
+-		Ctrl<Key>n: CreateNewManpage() \n\
+-		Ctrl<Key>h: PopupHelp() \n\
+-		Ctrl<Key>d: GotoPage(Directory) \n\
+-		Ctrl<Key>m: GotoPage(ManualPage) \n\
+-		Ctrl<Key>v: ShowVersion() \n\
+-		Ctrl<Key>s: PopupSearch()
+-
+-*manualBrowser*search*manualPage.translations: 	#augment \
+-		<Btn1Down>,<Btn1Up>: Search(Manpage) reset()
+-
+-*manualBrowser*search*apropos.translations:		#augment \
+-		<Btn1Down>,<Btn1Up>: Search(Apropos) reset()
+-
+-*manualBrowser*search*cancel*translations:  	#augment \
+-		<Btn1Down>,<Btn1Up>: Search(Cancel) reset()
+-
+-*manualBrowser*search*value*translations:		#override \
+-		<Key>Return: Search(Manpage) \n\
+-		Ctrl<Key>m:  Search(Manpage)
+-
+-*topBox*search*manualPage.translations: 		#augment \
+-		<Btn1Down>,<Btn1Up>: Search(Manpage, Open) reset()
+-
+-*topBox*search*apropos.translations:		#augment \
+-		<Btn1Down>,<Btn1Up>: Search(Apropos, Open) reset()
+-
+-*topBox*search*cancel*translations:  		#augment \
+-		<Btn1Down>,<Btn1Up>: Search(Cancel, Open) reset()
+-
+-*topBox*search*value*translations:			#override \
+-		<Key>Return: Search(Manpage, Open) \n\
+-		Ctrl<Key>m:  Search(Manpage, Open)
+-
+-*manualBrowser*likeToSave*yes.translations:	#override \
+-		<Btn1Down>,<Btn1Up>: SaveFormattedPage(Save) reset() \n\
+-		<Key>y:   SaveFormattedPage(Save) \n\
+-		<Key>n:   SaveFormattedPage(Cancel) 
+-
+-*manualBrowser*likeToSave*no.translations:	#override \
+-		<Btn1Down>,<Btn1Up>: SaveFormattedPage(Cancel) reset() \n\
+-		<Key>y:	  SaveFormattedPage(Save) \n\
+-		<Key>n:	  SaveFormattedPage(Cancel) 
+-
+-*manualBrowser*likeToSave*translations:	#override \
+-		<Key>y:	  SaveFormattedPage(Save) \n\
+-		<Key>n:	  SaveFormattedPage(Cancel) 
+-
+-*helpButton.translations:	#augment \
+-		<Btn1Down>,<Btn1Up>: PopupHelp() reset()
+-
+-*quitButton.translations:	#augment \
+-		<Btn1Down>,<Btn1Up>: Quit() reset()
+-
+-*manpageButton.translations: #augment \
+-		<Btn1Down>,<Btn1Up>: CreateNewManpage() reset()
+-
+-! EOF.
+diff --git a/app-defaults/Xman-xprint.ad b/app-defaults/Xman-xprint.ad
+deleted file mode 100644
+index 2598a98..0000000
+--- a/app-defaults/Xman-xprint.ad
++++ /dev/null
+@@ -1,294 +0,0 @@
+-*input:				True
+-
+-*topBox:			True
+-*topBox.Title:			Xman
+-*topBox.IconName:		Xman
+-
+-*manualBrowser.Title:		Manual Page
+-*manualBrowser.IconName:	Manual Page
+-*manualBrowser.geometry:	600x600
+-
+-*manualFontBold:		-*-courier-bold-r-*-*-*-120-*-*-*-*-*-*
+-*manualFontItalic:		-*-courier-medium-o-*-*-*-120-*-*-*-*-*-*
+-*manualFontNormal:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
+-*manualFontSymbol:		-*-symbol-*-*-*-*-*-120-*-*-*-*-*-*
+-!*directoryFontNormal:		-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*
+-*directoryFontNormal:		-*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
+-!*directoryFontNormal:		-*-lucida-bold-r-*-*-*-120-*-*-*-*-*-*
+-
+-!*SimpleMenu.BackingStore:	Always
+-!*SimpleMenu.SaveUnder:		Off
+-
+-*horizPane.orientation: 	horizontal
+-*horizPane*showGrip:		False
+-*horizPane.min:			22
+-*horizPane.max:			22
+-*topLabel.BorderWidth:		0
+-*search*label.BorderWidth:	0
+-
+-*search*dialog*value:		Xman
+-
+-!*optionMenu.Label:		Options
+-!*sectionMenu.Label:		Sections
+-
+-*horizPane*options.Label:	Options
+-*horizPane*sections.Label:	Sections
+-
+-*helpButton.Label:		Help
+-*helpButton.Tip:		Open help browser
+-
+-*quitButton.Label:		Quit
+-*quitButton.Tip:		Quit Xman
+-
+-*manpageButton.Label:		Manual Page
+-*manpageButton.Tip:		Open new manpage browser
+-
+-*topLabel.Label:		Manual Browser
+-
+-!*SimpleMenu*menuLabel*vertSpace: 100
+-!*SimpleMenu*menuLabel*leftMargin: 20
+-
+-*displayDirectory.Label:	Display Directory 
+-*displayManualPage.Label:	Display Manual Page
+-*help.Label:			Help
+-*help.geometry:			600x600
+-*search.Label:			Search
+-*removeThisManpage.Label:	Remove This Manpage
+-*help*removeThisManpage.Label:	Remove Help
+-*openNewManpage.Label:		Open New Manpage
+-*printManualPage.Label:		Print This Manpage
+-*showVersion.Label:		Show Version
+-*quit.Label:			Quit
+-
+-*pleaseStandBy*Label:		Formatting Manual Page, Please Stand By...
+-
+-*search*dialog.Label:		Type string to search for:
+-*search*apropos.Label:		Apropos
+-*search*manualPage.Label:	Manual Page
+-*search*cancel.Label:		Cancel
+-
+-*likeToSave*dialog.Label:	Would you like to save this formatted Manual Page?
+-*likeToSave*yes.Label:		Yes
+-*likeToSave*no.Label:		No
+-
+-*translations: 		#override \
+-		Ctrl<Key>q: Quit() \n\
+-		Ctrl<Key>c: Quit() \n\
+-		Ctrl<Key>n: CreateNewManpage() \n\
+-		Ctrl<Key>h: PopupHelp() \n\
+-		Ctrl<Key>s: PopupSearch()
+-
+-*help*Paned.manualPage.translations:#override \
+-		Ctrl<Btn1Down>: \
+-			XawPositionSimpleMenu(optionMenu) \
+-			MenuPopup(optionMenu) \n\
+-		Ctrl<Key>q: Quit() \n\
+-		Ctrl<Key>c: Quit() \n\
+-		Ctrl<Key>r: RemoveThisManpage() \n\
+-		Ctrl<Key>n: CreateNewManpage() \n\
+-		Ctrl<Key>h: PopupHelp() \n\
+-		Ctrl<Key>d: GotoPage(Directory) \n\
+-		Ctrl<Key>m: GotoPage(ManualPage) \n\
+-                Ctrl<Key>p: PrintThisManpage() \n\
+-		Ctrl<Key>v: ShowVersion() \n\
+-		<Key>Prior: Page(Back) \n\
+-		<Key>Next : Page(Forward) \n\
+-		Shift<Btn4Down>,<Btn4Up>: Page(Line,-1) \n\
+-	        Shift<Btn5Down>,<Btn5Up>: Page(Line,1) \n\
+-	        Ctrl<Btn4Down>,<Btn4Up>: Page(Back) \n\
+-		Ctrl<Btn5Down>,<Btn5Up>: Page(Forward) \n\
+-		None<Btn4Down>,<Btn4Up>: Page(Line,-5) \n\
+-		None<Btn5Down>,<Btn5Up>: Page(Line,5)
+-
+-*manualBrowser*manualPage.translations:  #override \
+-		Ctrl<Btn1Down>: \
+-			XawPositionSimpleMenu(optionMenu) \
+-			MenuPopup(optionMenu) \n\
+-		Ctrl<Btn2Down>: \
+-			XawPositionSimpleMenu(sectionMenu) \
+-			MenuPopup(sectionMenu) \n\
+-		Shift<Btn2Down>,<Btn2Up>:GotoPage(Directory)\n\
+-		Ctrl<Key>q: Quit() \n\
+-		Ctrl<Key>c: Quit() \n\
+-		Ctrl<Key>r: RemoveThisManpage() \n\
+-		Ctrl<Key>n: CreateNewManpage() \n\
+-		Ctrl<Key>h: PopupHelp() \n\
+-		Ctrl<Key>d: GotoPage(Directory) \n\
+-		Ctrl<Key>m: GotoPage(ManualPage) \n\
+-                Ctrl<Key>p: PrintThisManpage() \n\
+-		Ctrl<Key>v: ShowVersion() \n\
+-		<Key>Prior: Page(Back) \n\
+-		<Key>Next : Page(Forward) \n\
+-		Shift<Btn4Down>,<Btn4Up>: Page(Line,-1) \n\
+-	        Shift<Btn5Down>,<Btn5Up>: Page(Line,1) \n\
+-	        Ctrl<Btn4Down>,<Btn4Up>: Page(Back) \n\
+-		Ctrl<Btn5Down>,<Btn5Up>: Page(Forward) \n\
+-		None<Btn4Down>,<Btn4Up>: Page(Line,-5) \n\
+-		None<Btn5Down>,<Btn5Up>: Page(Line,5) \n\
+-		Ctrl<Key>s: PopupSearch()
+-
+-!*manualBrowser*directory.background: Grey80
+-*manualBrowser*directory.translations:   #override \
+-		Ctrl<Btn1Down>: \
+-			XawPositionSimpleMenu(optionMenu) \
+-			MenuPopup(optionMenu) \n\
+-		Ctrl<Btn2Down>: \
+-			XawPositionSimpleMenu(sectionMenu) \
+-			MenuPopup(sectionMenu) \n\
+-		Shift<Btn2Down>,<Btn2Up>: GotoPage(Manpage) \n\
+-		Ctrl<Key>q: Quit() \n\
+-		Ctrl<Key>c: Quit() \n\
+-		Ctrl<Key>r: RemoveThisManpage() \n\
+-		Ctrl<Key>n: CreateNewManpage() \n\
+-		Ctrl<Key>h: PopupHelp() \n\
+-		Ctrl<Key>d: GotoPage(Directory) \n\
+-		Ctrl<Key>m: GotoPage(ManualPage) \n\
+-		Ctrl<Key>v: ShowVersion() \n\
+-		Ctrl<Key>s: PopupSearch()
+-
+-*manualBrowser*search*manualPage.translations: 	#augment \
+-		<Btn1Down>,<Btn1Up>: Search(Manpage) reset()
+-
+-*manualBrowser*search*apropos.translations:		#augment \
+-		<Btn1Down>,<Btn1Up>: Search(Apropos) reset()
+-
+-*manualBrowser*search*cancel*translations:  	#augment \
+-		<Btn1Down>,<Btn1Up>: Search(Cancel) reset()
+-
+-*manualBrowser*search*value*translations:		#override \
+-		<Key>Return: Search(Manpage) \n\
+-		Ctrl<Key>m:  Search(Manpage)
+-
+-*topBox*search*manualPage.translations: 		#augment \
+-		<Btn1Down>,<Btn1Up>: Search(Manpage, Open) reset()
+-
+-*topBox*search*apropos.translations:		#augment \
+-		<Btn1Down>,<Btn1Up>: Search(Apropos, Open) reset()
+-
+-*topBox*search*cancel*translations:  		#augment \
+-		<Btn1Down>,<Btn1Up>: Search(Cancel, Open) reset()
+-
+-*topBox*search*value*translations:			#override \
+-		<Key>Return: Search(Manpage, Open) \n\
+-		Ctrl<Key>m:  Search(Manpage, Open)
+-
+-*manualBrowser*likeToSave*yes.translations:	#override \
+-		<Btn1Down>,<Btn1Up>: SaveFormattedPage(Save) reset() \n\
+-		<Key>y:   SaveFormattedPage(Save) \n\
+-		<Key>n:   SaveFormattedPage(Cancel) 
+-
+-*manualBrowser*likeToSave*no.translations:	#override \
+-		<Btn1Down>,<Btn1Up>: SaveFormattedPage(Cancel) reset() \n\
+-		<Key>y:	  SaveFormattedPage(Save) \n\
+-		<Key>n:	  SaveFormattedPage(Cancel) 
+-
+-*manualBrowser*likeToSave*translations:	#override \
+-		<Key>y:	  SaveFormattedPage(Save) \n\
+-		<Key>n:	  SaveFormattedPage(Cancel) 
+-
+-*helpButton.translations:	#augment \
+-		<Btn1Down>,<Btn1Up>: PopupHelp() reset()
+-
+-*quitButton.translations:	#augment \
+-		<Btn1Down>,<Btn1Up>: Quit() reset()
+-
+-*manpageButton.translations: #augment \
+-		<Btn1Down>,<Btn1Up>: CreateNewManpage() reset()
+-
+-! Use "white" as background for printing
+-*printshell*background:   white
+-
+-! Print dialog
+-*printdialogshell*geometry:                       600x120
+-*printdialogshell*title:                          Print
+-*printdialogshell*main*ok.fromVert:               innerform
+-*printdialogshell*main*ok.label:                  Print
+-*printdialogshell*main*ok.tip:                    Print
+-*printdialogshell*main*setup.fromHoriz:           ok
+-*printdialogshell*main*setup.fromVert:            innerform
+-*printdialogshell*main*setup.label:               Setup...
+-*printdialogshell*main*setup.tip:                 Configure print job options (page size, orientation, etc.)
+-*printdialogshell*main*cancel.fromHoriz:          setup
+-*printdialogshell*main*cancel.fromVert:           innerform
+-*printdialogshell*main*cancel.label:              Cancel
+-*printdialogshell*main*cancel.tip:                Cancel printing
+-*printdialogshell*main*desclabel.label:           Printer Description:
+-*printdialogshell*main*desclabel.tip:             Short description of printer
+-*printdialogshell*main*desc.fromHoriz:            desclabel
+-*printdialogshell*main*desc.tip:                  Short description of printer
+-*printdialogshell*main*info.fromHoriz:            desc
+-*printdialogshell*main*info.label:                Printer info...
+-*printdialogshell*main*info.tip:                  Display additional information about this printer
+-*printdialogshell*main*namelabel.fromVert:        desclabel
+-*printdialogshell*main*namelabel.label:           Printer Name:
+-*printdialogshell*main*namelabel.tip:             Name of selected printer
+-*printdialogshell*main*name.fromHoriz:            namelabel
+-*printdialogshell*main*name.fromVert:             desclabel
+-*printdialogshell*main*name.tip:                  Name of selected printer
+-*printdialogshell*main*selectprinter.fromHoriz:   name
+-*printdialogshell*main*selectprinter.fromVert:    desclabel
+-*printdialogshell*main*selectprinter.label:       Select Printer...
+-*printdialogshell*main*selectprinter.label:       Select Printer...
+-*printdialogshell*main*selectprinter.tip:         Select a different printer
+-*printdialogshell*main*filenamelabel.fromVert:    namelabel
+-*printdialogshell*main*filenamelabel.label:       File Name:
+-*printdialogshell*main*filenamelabel.tip:         File where the output should be stored
+-*printdialogshell*main*filename.fromHoriz:        filenamelabel
+-*printdialogshell*main*filename.fromVert:         namelabel
+-*printdialogshell*main*filename.tip:              File where the output should be stored
+-*printdialogshell*main*selectfile.fromHoriz:      filename
+-*printdialogshell*main*selectfile.fromVert:       namelabel
+-*printdialogshell*main*selectfile.label:          Select File...
+-*printdialogshell*main*selectfile.tip:            Select file where the output should be stored
+-*printdialogshell*main*printtoprinter.fromVert:   filenamelabel
+-*printdialogshell*main*printtoprinter.label:      Print to Printer
+-*printdialogshell*main*printtoprinter.tip:        Send print job to printer
+-*printdialogshell*main*printtofile.fromVert:      filenamelabel
+-*printdialogshell*main*printtofile.fromHoriz:     printtoprinter
+-*printdialogshell*main*printtofile.label:         Print to File
+-*printdialogshell*main*printtofile.tip:           Save print job in a file
+-
+-! Print job options dialog
+-*printdialogshell*setup*geometry:                     600x400
+-*printdialogshell*setup*title:                        Print: Print job options
+-*printdialogshell*setup*ok.fromVert:                  list
+-*printdialogshell*setup*ok.label:                     OK
+-*printdialogshell*setup*ok.tip:                       Commit changes
+-*printdialogshell*setup*cancel.fromHoriz:             ok
+-*printdialogshell*setup*cancel.fromVert:              list
+-*printdialogshell*setup*cancel.label:                 Cancel
+-*printdialogshell*setup*cancel.tip:                   Cancel and reset to defaults
+-*printdialogshell*setup*paperlist.tip:                Select paper size
+-*printdialogshell*setup*resolutionlist.fromHoriz:     paperlist
+-*printdialogshell*setup*resolutionlist.tip:           Select page resolution
+-*printdialogshell*setup*orientationlist.fromHoriz:    resolutionlist
+-*printdialogshell*setup*orientationlist.tip:          Select page orientation
+-*printdialogshell*setup*plexlist.fromHoriz:           orientationlist
+-*printdialogshell*setup*plexlist.tip:                 Select page plex mode (simplex, duplex, etc.)
+-*printdialogshell*setup*colorspacelist.fromHoriz:     plexlist
+-*printdialogshell*setup*colorspacelist.tip:           Select color space (color, grayscale, CYMK, etc.)
+-*printdialogshell*setup*jobcopieslabel.fromVert:      paperlist
+-*printdialogshell*setup*jobcopieslabel.tip:           Set number of job copies
+-*printdialogshell*setup*jobcopieslabel.label:         Job Copies:
+-*printdialogshell*setup*jobcopies.fromHoriz:          jobcopieslabel
+-*printdialogshell*setup*jobcopies.fromVert:           paperlist
+-*printdialogshell*setup*jobcopies.tip:                Set number of job copies
+-
+-! Printer selection
+-*printdialogshell*printerselection*geometry:          400x150
+-*printdialogshell*printerselection*title:             Print: Select printer
+-*printdialogshell*printerselection*ok.fromVert:       list
+-*printdialogshell*printerselection*ok.label:          OK
+-*printdialogshell*printerselection*ok.tip:            Switch printer
+-*printdialogshell*printerselection*cancel.fromHoriz:  ok
+-*printdialogshell*printerselection*cancel.fromVert:   list
+-*printdialogshell*printerselection*cancel.label:      Cancel
+-*printdialogshell*printerselection*cancel.tip:        Cancel printer selection
+-*printdialogshell*printerselection*list.tip:          Select printer name from list
+-
+-! Select job file
+-*printdialogshell*selectfile*geometry:          400x80
+-*printdialogshell*selectfile*title:             Print: Select job file
+-*printdialogshell*selectfile*dialog.label:      Select Filename:
+-
+-! EOF.
+diff --git a/print.c b/print.c
+deleted file mode 100644
+index 0d5b1d3..0000000
+--- a/print.c
++++ /dev/null
+@@ -1,396 +0,0 @@
+-/*
+- * $Xorg: print.c,v 1.1 2004/04/30 02:05:54 gisburn Exp $
+- *
+-Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
+-
+-Permission to use, copy, modify, distribute, and sell this software and its
+-documentation for any purpose is hereby granted without fee, provided that
+-the above copyright notice appear in all copies and that both that
+-copyright notice and this permission notice appear in supporting
+-documentation.
+-
+-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
+-OPEN GROUP 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 name of The Open Group shall not be
+-used in advertising or otherwise to promote the sale, use or other dealings
+-in this Software without prior written authorization from The Open Group.
+- *
+- */
+-
+-/* Turn a NULL pointer string into an empty string */
+-#define NULLSTR(x) (((x)!=NULL)?(x):(""))
+-
+-#define Error(x) { printf x ; exit(EXIT_FAILURE); }
+-#define Assertion(expr, msg) { if (!(expr)) { Error msg } }
+-#define Log(x)   { if(True) printf x; }
+-
+-#include "print.h"
+-#include "ScrollByL.h"
+-#include <X11/Xaw/Form.h>
+-#include <X11/Xaw/Label.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+-
+-static Widget
+-CreatePrintShell(Widget    videoshell,
+-                 Screen   *pscreen,
+-                 Visual   *pvisual,
+-                 String    printshell_name,
+-                 ArgList   args,
+-                 Cardinal  numargs)
+-{
+-    String   videoname,
+-             videoclass;
+-    Widget   pappshell,
+-             printshell;
+-    Display *pdpy = XDisplayOfScreen(pscreen);
+-    int      dummyc = 0;
+-    String   dummys = "";
+-    Cardinal shell_n;
+-    Arg      shell_args[5];
+-
+-    XtGetApplicationNameAndClass(XtDisplay(videoshell), 
+-                                 &videoname, &videoclass);
+-
+-    /* XXX: Why is the |dummyc|&&|dummys| stuff needed here ? */
+-    XtDisplayInitialize(XtWidgetToApplicationContext(videoshell), pdpy,
+-                        videoname, videoclass,
+-                        NULL, 0,
+-                        &dummyc, &dummys);
+-
+-    shell_n = 0;
+-    XtSetArg(shell_args[shell_n], XtNscreen, pscreen); shell_n++;
+-    if (pvisual) {
+-        XtSetArg(shell_args[shell_n], XtNvisual, pvisual); shell_n++;
+-    }
+-    pappshell = XtAppCreateShell(videoname, videoclass,
+-                                   applicationShellWidgetClass,
+-                                   pdpy,
+-                                   shell_args, shell_n);
+-    printshell = XtCreatePopupShell(printshell_name,
+-                                    xawPrintShellWidgetClass,
+-                                    pappshell, args, numargs);
+-                                
+-
+-    /* we're mapping/unmapping at start/end page time */
+-    XtSetMappedWhenManaged(printshell, False);
+-
+-    /* We realise the widget when we're done with building the widget tree... */
+-    
+-    return printshell;
+-}
+-
+-typedef struct
+-{
+-  const char       *programname;
+-  Widget            toplevel;
+-  Bool              isPrinting;
+-  Widget            printshell;
+-  struct
+-  {
+-      Widget  form;
+-      Widget  pageheaderlabel;
+-      Widget  manpage;
+-  } content; /* content to print */
+-  int               numpages;
+-  Display          *pdpy;
+-  Screen           *pscreen;
+-  XPContext         pcontext;
+-  XtCallbackProc    pdpyDestroyCallback;
+-  void             *printtofile_handle;
+-  const char       *jobtitle;
+-} AppPrintData;
+-
+-static AppPrintData  apdx;
+-static AppPrintData *apd = &apdx;
+-
+-/* "Count" pages in a scrollByLineWidgetClass widget */
+-static
+-long CountPages(Widget sblw)
+-{
+-    long     num_pages = 0;
+-    Cardinal n;
+-    Arg      args[3];
+-    int      num_total_lines   = 0,
+-             num_visible_lines = 0;
+-    
+-    n = 0;
+-    XtSetArg(args[n], XtNNumTotalLines,   &num_total_lines);   n++;
+-    XtSetArg(args[n], XtNNumVisibleLines, &num_visible_lines); n++;
+-    XtGetValues(sblw, args, n);
+-    
+-#define DIV_ROUND_UP(a, b) (((a)+((b)-1)) / (b))
+-    /* scrollByLineWidgetClass's "Page(forward)" always overlaps by one
+-     * line so we use |num_visible_lines-1| instead of |num_visible_lines| */
+-    num_pages = DIV_ROUND_UP(num_total_lines, num_visible_lines-1);
+-#undef DIV_ROUND_UP
+-
+-    return num_pages;
+-}
+-
+-static void 
+-PageSetupCB(Widget widget, XtPointer client_data, XtPointer call_data)
+-{
+-    Widget                       pshell = widget;
+-    XawPrintShellCallbackStruct *psp    = (XawPrintShellCallbackStruct *)call_data;
+-    AppPrintData                *p      = (AppPrintData *)client_data;
+-   
+-    Log(("--> PageSetupCB\n"));
+-
+-    if (!psp->last_page_in_job) {
+-        int  currpage;
+-        char buffer[256];
+-
+-        XtVaGetValues(pshell, XawNcurrPageNumInJob, &currpage, NULL);
+-
+-        sprintf(buffer, "Title: %s / Page: %d/%d", p->jobtitle, currpage, p->numpages);
+-        XtVaSetValues(apd->content.pageheaderlabel, XtNlabel, buffer, NULL);
+-
+-        /* Note: XawPrintShell's pagecount starts with '1'
+-         * (=first page is page no. '1') */
+-        if (currpage > 1) {
+-            String params[] = { "Forward" };
+-            Log(("pagedown %d\n", currpage));
+-            /* "Page(Forward)" is scrollByLineWidgetClass's way to
+-             * move one page forward */
+-            XtCallActionProc(p->content.manpage, "Page", NULL, params, ONE);
+-        }
+-        else
+-        {
+-            Log(("first page\n"));
+-        }              
+-      
+-        if (currpage >= p->numpages) {
+-            psp->last_page_in_job = True;
+-        }
+-    }
+-}
+-
+-static
+-void FinishPrinting(AppPrintData *p)
+-{
+-    /* Wait for the job to finish */
+-    if (p->printtofile_handle) {
+-        if (XpuWaitForPrintFileChild(p->printtofile_handle) != XPGetDocFinished) {
+-            fprintf(stderr, "%s: Error while printing to file.\n", apd->programname);
+-        }
+-        p->printtofile_handle = NULL;
+-    }   
+-
+-    /* Avoid that the manpage object tries to close the |FILE *|-handle at destruction time */
+-    XtVaSetValues(p->content.manpage, XtNfile, NULL, NULL);
+-
+-    if (p->printshell) {
+-        XtDestroyWidget(p->printshell);
+-        p->printshell = NULL;
+-    }
+-  
+-    /* Two issues here:
+-     * 1. The print display connection is owned by the print dialog
+-     *    To avoid any problems with that use a callback back to the main
+-     *    application which calls
+-     *    |XawPrintDialogClosePrinterConnection(w, False)| to ask the
+-     *    print dialog widget to close all print display resources and
+-     *    disown the object.
+-     * 2. We have to use XpDestroyContext() and XtCloseDisplay()
+-     *    instead of XpuClosePrinterDisplay() to make libXt happy...
+-     *
+-     * Call callback... */
+-    (*apd->pdpyDestroyCallback)(p->toplevel, NULL, NULL); /* HACK! */
+-
+-    /* ... and then get rid of the display */
+-    if (p->pcontext != None) {
+-        XpDestroyContext(p->pdpy, p->pcontext);
+-    }
+-    XtCloseDisplay(p->pdpy);
+-
+-    p->toplevel   = NULL;
+-    p->isPrinting = False;
+-    p->pdpy       = NULL;
+-    p->pscreen    = NULL;
+-    p->pcontext   = None;
+-}
+-
+-static
+-void PrintEndJobCB(Widget pshell, XtPointer client_data, XtPointer call_data)
+-{
+-    AppPrintData *p = (AppPrintData *)client_data;
+-
+-    Log(("--> PrintEndJobCB\n"));
+-
+-    /* Finish printing and destroy print shell (it's legal to destroy Xt
+-     * widgets from within it's own callbacks) */
+-    FinishPrinting(p);
+-}
+-
+-static
+-XFontStruct *GetPrintTextFont(Display *pdpy, const char *fontprefix, long dpi_x, long dpi_y)
+-{
+-    XFontStruct *font;
+-    char         fontname[1024];
+-
+-    sprintf(fontname, "%s--*-120-%ld-%ld-*-*-iso8859-1", fontprefix, dpi_x, dpi_y);
+-    font = XLoadQueryFont(pdpy, fontname);
+-    if (!font) {    
+-        sprintf(fontname, "-adobe-courier-medium-r-normal--*-120-%ld-%ld-*-*-iso8859-1", dpi_x, dpi_y);
+-        font = XLoadQueryFont(pdpy, fontname);
+-    }
+-    if (!font) {          
+-        sprintf(fontname, "-*-*-*-*-*-*-*-120-%ld-%ld-*-*-iso8859-1", dpi_x, dpi_y);
+-        font = XLoadQueryFont(pdpy, fontname);
+-    }
+-    if (!font)
+-        Error(("XLoadQueryFont failure.\n"));
+-    return font;
+-
+-}
+-
+-void DoPrintManpage(const char *programname,
+-                    FILE *manpagefile, Widget toplevel,
+-                    Display *pdpy, XPContext pcontext,
+-                    XpuColorspaceRec *colorspace,
+-                    XtCallbackProc pdpyDestroyCB,
+-                    const char *jobtitle, const char *toFile)
+-{
+-    long               dpi_x = 0L,
+-                       dpi_y = 0L;
+-    int                n;
+-    Arg                args[20];
+-    XFontStruct       *printFontNormal;
+-    XFontStruct       *printFontBold;
+-    XFontStruct       *printFontItalic;
+-    XFontStruct       *printFontSymbol;
+-
+-    if (!manpagefile) {
+-        Error(("DoPrintManpage: No FILE given."));
+-    }
+-       
+-    apd->programname         = programname;
+-    apd->pdpyDestroyCallback = pdpyDestroyCB;
+-  
+-    if (apd->isPrinting) {
+-        fprintf(stderr, "%s: Already busy with printing.\n", apd->programname);
+-        return;
+-    } 
+-        
+-    /* Configure the print context (paper size, title etc.)
+-     * We must do this before creating any Xt widgets - otherwise they will
+-     * make wrong assuptions about fonts, resultions etc. ...
+-     */
+-    XpuSetJobTitle(pdpy, pcontext, jobtitle);
+-    
+-    /* Configuration done, set the context */
+-    XpSetContext(pdpy, pcontext);   
+-
+-    /* Get default printer resolution */   
+-    if (XpuGetResolution(pdpy, pcontext, &dpi_x, &dpi_y) != 1) {
+-        fprintf(stderr, "%s: No default resolution for printer.\n", apd->programname);
+-        XpuClosePrinterDisplay(pdpy, pcontext);
+-        return;
+-    }
+-    
+-    apd->toplevel = toplevel;
+-    apd->pdpy     = pdpy;
+-    apd->pcontext = pcontext;
+-    apd->pscreen  = XpGetScreenOfContext(pdpy, pcontext);
+-    apd->jobtitle = jobtitle;
+-
+-    n = 0;
+-    /* Override any geometry resource settings as XawPrintShell adjusts it's size
+-     * to the current page siue when |XawPrintLAYOUTMODE_DRAWABLEAREA| or
+-     * |XawPrintLAYOUTMODE_PAGESIZE| are used. */
+-    XtSetArg(args[n], XtNgeometry,    "+0+0");                          n++;
+-    XtSetArg(args[n], XawNlayoutMode, XawPrintLAYOUTMODE_DRAWABLEAREA); n++;
+-    if (colorspace) {
+-        printf("Setting visual to id=0x%lx.\n", colorspace->visualinfo.visualid);
+-    }
+-    apd->printshell = CreatePrintShell(toplevel, apd->pscreen, 
+-                                       (colorspace?(colorspace->visualinfo.visual):(NULL)),
+-                                       "printshell", args, n);
+-
+-    n = 0;
+-    XtSetArg(args[n], XtNresizable,            True);            n++;
+-    XtSetArg(args[n], XtNright,                XtChainRight);    n++;
+-    apd->content.form = XtCreateManagedWidget("form", formWidgetClass, apd->printshell, args, n);
+-
+-    printFontNormal = GetPrintTextFont(pdpy, "-*-courier-medium-r-*", dpi_x, dpi_y);
+-    printFontBold   = GetPrintTextFont(pdpy, "-*-courier-bold-r-*",   dpi_x, dpi_y);
+-    printFontItalic = GetPrintTextFont(pdpy, "-*-courier-medium-o-*", dpi_x, dpi_y);
+-    printFontSymbol = GetPrintTextFont(pdpy, "-*-symbol-*-*-*",       dpi_x, dpi_y);
+-
+-    n = 0;
+-    XtSetArg(args[n], XtNfromHoriz,            NULL);            n++;
+-    XtSetArg(args[n], XtNfromVert,             NULL);            n++;
+-    XtSetArg(args[n], XtNtop,                  XtChainTop);      n++;
+-    XtSetArg(args[n], XtNright,                XtChainRight);    n++;
+-    XtSetArg(args[n], XtNresizable,            True);            n++;
+-    XtSetArg(args[n], XtNfont,                 printFontNormal); n++; /* fontset would be better */
+-    XtSetArg(args[n], XtNlabel,                "Page: n/n");     n++;
+-    XtSetArg(args[n], XtNjustify,              XtJustifyRight);  n++;
+-    apd->content.pageheaderlabel = XtCreateManagedWidget("pageinfo", labelWidgetClass, apd->content.form, args, n);
+-
+-    n = 0;
+-    XtSetArg(args[n], XtNfile,             manpagefile);                  n++;
+-
+-/* Usually I would expect that using |XtNfromVert, apd->content.pageheaderlabel|
+- * would be the correct way to place the text widget with the main content below
+- * the page header widget - but for an unknown reason this doesn not work: The
+- * text widget squishes itself into the bottom half of the page and only occupies
+- * 1/2 of the page's with... ;-(( */
+-#define WORKAROUND_FOR_SOMETHING_IS_WRONG 1
+-#ifdef WORKAROUND_FOR_SOMETHING_IS_WRONG
+-    XtSetArg(args[n], XtNtop,              XtChainTop);                   n++;
+-    XtSetArg(args[n], XtNright,            XtChainRight);                 n++;
+-    XtSetArg(args[n], XtNvertDistance,     (printFontNormal->ascent+printFontNormal->descent+2)*2); n++;    
+-#else
+-    XtSetArg(args[n], XtNfromHoriz,        NULL);                         n++;
+-    XtSetArg(args[n], XtNfromVert,         apd->content.pageheaderlabel); n++;
+-#endif
+-
+-    XtSetArg(args[n], XtNmanualFontNormal, printFontNormal);              n++;
+-    XtSetArg(args[n], XtNmanualFontBold,   printFontBold);                n++;
+-    XtSetArg(args[n], XtNmanualFontItalic, printFontItalic);              n++;
+-    XtSetArg(args[n], XtNmanualFontSymbol, printFontSymbol);              n++;
+-    apd->content.manpage = XtCreateManagedWidget("manpage", scrollByLineWidgetClass, apd->content.form, args, n);
+-   
+-    XtAddCallback(apd->printshell, XawNpageSetupCallback, PageSetupCB,   (XtPointer)apd);
+-    XtAddCallback(apd->printshell, XawNendJobCallback,    PrintEndJobCB, (XtPointer)apd);
+-
+-    /* Realise print shell (which will set position+size of the child
+-     * widgets based on the current page size) */
+-    XtRealizeWidget(apd->printshell);
+-    
+-    /* Count number of pages in the manpage widget */
+-    apd->numpages = CountPages(apd->content.manpage);
+-
+-    /* Make sure that the Xt machinery is really using the right screen (assertion) */
+-    if (XpGetScreenOfContext(XtDisplay(apd->printshell), apd->pcontext) != XtScreen(apd->printshell))
+-        Error(("Widget's screen != print screen. BAD.\n"));
+-
+-    apd->isPrinting = True;
+-
+-    if (toFile) {
+-        printf("%s: Printing to file '%s'...\n", apd->programname, toFile);
+-        apd->printtofile_handle = XpuStartJobToFile(pdpy, pcontext, toFile);
+-        if (!apd->printtofile_handle) {
+-            perror("XpuStartJobToFile failure");
+-            apd->isPrinting = False;
+-            return;
+-        }
+-    }
+-    else
+-    {
+-        printf("%s: Printing to printer...\n", apd->programname);
+-        XpuStartJobToSpooler(pdpy);
+-    }
+-}
+-
+-
+diff --git a/print.h b/print.h
+deleted file mode 100644
+index 892cd6c..0000000
+--- a/print.h
++++ /dev/null
+@@ -1,50 +0,0 @@
+-/*
+- * $Xorg: print.h,v 1.1 2004/04/30 02:05:54 gisburn Exp $
+- *
+-Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
+-
+-Permission to use, copy, modify, distribute, and sell this software and its
+-documentation for any purpose is hereby granted without fee, provided that
+-the above copyright notice appear in all copies and that both that
+-copyright notice and this permission notice appear in supporting
+-documentation.
+-
+-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
+-OPEN GROUP 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 name of The Open Group shall not be
+-used in advertising or otherwise to promote the sale, use or other dealings
+-in this Software without prior written authorization from The Open Group.
+- *
+- */
+-
+-#ifndef XMAN_PRINT_H
+-#define XMAN_PRINT_H 1
+-
+-#include <X11/Intrinsic.h>
+-#include <X11/StringDefs.h>
+-#include <X11/Shell.h>
+-#include <X11/Xaw/Print.h>
+-#include <X11/Xaw/Cardinals.h>
+-#include <X11/XprintUtil/xprintutil.h>
+-
+-#define PrintMsg(x) { printf("xman: "); printf x ; }
+-
+-/* Prototypes */
+-void DoPrintManpage(const char *programname,
+-                    FILE *manpage,
+-                    Widget toplevel, 
+-                    Display *pdpy, XPContext pcontext,
+-                    XpuColorspaceRec *colorspace,
+-                    XtCallbackProc printDisplayDestroyCallback,
+-                    const char *jobTitle,
+-                    const char *toFile);
+-
+-#endif /* !XMAN_PRINT_H */