Attachment 20211 Details for Bug 18479 – patch for xmh

[patch] patch for xmh

0001-xmh-enable-VPATH-build-reorganize-app-default-files.patch (text/plain), 14.47 KB, created by Peter Breitenlohner on 2008-11-11 01:21:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Breitenlohner

Created: 2008-11-11 01:21:01 UTC

Size: 14.47 KB

patch

obsolete

>From 241b695992167918d7acd216e18ee57d7d1ae96b Mon Sep 17 00:00:00 2001
>From: Peter Breitenlohner <peb@mppmu.mpg.de>
>Date: Mon, 10 Nov 2008 19:57:10 +0100
>Subject: [PATCH] enable VPATH build, reorganize app default files
>
>---
> Makefile.am         |   20 ++-----
> app-defaults/Xmh    |  173 +++++++++++++++++++++++++++++++++++++++++++++++++++
> app-defaults/Xmh.ad |  173 ---------------------------------------------------
> 3 files changed, 178 insertions(+), 188 deletions(-)
> create mode 100644 app-defaults/Xmh
> delete mode 100644 app-defaults/Xmh.ad
>
>diff --git a/Makefile.am b/Makefile.am
>index f930a3c..ab6fe88 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -62,21 +62,13 @@ xmh_SOURCES =	\
> appman_PRE = \
>         xmh.man
> 
>-# App default files  (*.ad)
>+# App default files
> 
> appdefaultdir = @appdefaultdir@
> 
>-
>-APPDEFAULTFILES = \
>+dist_appdefault_DATA = \
>         app-defaults/Xmh
> 
>-SUFFIXES = .ad
>-
>-.ad:
>-	cp $< $@
>-
>-appdefault_DATA = $(APPDEFAULTFILES)
>-
> # bitmap files
> 
> bitmapdir = $(includedir)/X11/bitmaps
>@@ -85,9 +77,7 @@ dist_bitmap_DATA = black6 box6
> 
> #
> 
>-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) Xmh.sample
>-
>-CLEANFILES = $(APPDEFAULTFILES)
>+EXTRA_DIST = Xmh.sample
> 
> 
> appmandir = $(APP_MAN_DIR)
>@@ -95,7 +85,7 @@ appmandir = $(APP_MAN_DIR)
> appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
> 
> EXTRA_DIST += $(appman_PRE)
>-CLEANFILES += $(appman_DATA)
>+CLEANFILES = $(appman_DATA)
> 
> SED = sed
> 
>@@ -116,7 +106,7 @@ MAN_SUBSTS = \
> 	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
> 	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
> 
>-SUFFIXES += .$(APP_MAN_SUFFIX) .man
>+SUFFIXES = .$(APP_MAN_SUFFIX) .man
> 
> .man.$(APP_MAN_SUFFIX):
> 	sed $(MAN_SUBSTS) < $< > $@
>diff --git a/app-defaults/Xmh b/app-defaults/Xmh
>new file mode 100644
>index 0000000..fd71a5c
>--- /dev/null
>+++ b/app-defaults/Xmh
>@@ -0,0 +1,173 @@
>+! $XConsortium: Xmh.ad,v 1.32 94/02/09 19:44:06 gildea Exp $
>+! AppDefaultsVersion should only be defined in the site-wide file
>+Xmh.AppDefaultsVersion:		1
>+
>+Xmh.Geometry:			508x750
>+Xmh.ReplyInsertFilter:		cat
>+Xmh.SendBreakWidth:		2000
>+*ShapeStyle:			Oval
>+*Command.BorderWidth:	1
>+*MenuButton.BorderWidth:	1
>+*toc*cursor:			left_ptr
>+
>+*menuBox.folderButton.Label:	Folder
>+*menuBox.tocButton.Label:	Table of Contents
>+*menuBox.messageButton.Label:	Message
>+*menuBox.sequenceButton.Label:	Sequence
>+*menuBox.viewButton.Label:	View
>+*menuBox.optionButton.Label:	Options
>+*SimpleMenu*SmeLine.Height:	20
>+
>+*close.Label:			Close Window
>+*compose.Label:			Compose Message
>+*open.Label:			Open Folder
>+*openInNew.Label:		Open Folder in New Window
>+*create.Label:			Create Folder
>+*folderMenu*delete.Label:	Delete Folder
>+*inc.Label:			Incorporate New Mail
>+*next.Label:			View Next Message
>+*prev.Label:			View Previous
>+*delete.Label:			Delete
>+*move.Label:			Move
>+*copy.Label:			Copy as Link
>+*unmark.Label:			Unmark
>+*viewNew.Label:			View In New
>+*reply.Label:			Reply
>+*forward.Label:			Forward
>+*useAsComp.Label:		Use as Composition
>+*commit.Label:			Commit Changes
>+*print.Label:			Print
>+*pack.Label:			Pack Folder
>+*sort.Label:			Sort Folder
>+*rescan.Label:			Rescan Folder
>+*pick.Label:			Pick
>+*openSeq.Label:			Open Sequence
>+*addToSeq.Label:		Add to Sequence
>+*removeFromSeq.Label:		Remove from Sequence
>+*deleteSeq.Label:		Delete Sequence
>+*edit.Label:			Edit Message
>+*save.Label:			Save Message
>+*send.Label:			Send
>+*reset.Label:			New Headers
>+*insert.Label:			Insert
>+*optionMenu*reverse.Label:	Read in Reverse
>+
>+Xmh.notice.Dialog.Text.BorderWidth: 0
>+Xmh.notice.Dialog.Text.TextSink.Font: -*-courier-bold-r-*--*-120-*-*-*-*-iso8859-1
>+Xmh.notice.Dialog.confirm.Label:Acknowledged
>+Xmh.notice.BorderWidth:		2
>+Xmh.confirm.Dialog.yes.Label:	Yes
>+Xmh.confirm.Dialog.no.Label:	No
>+Xmh.prompt.Dialog.okay.Label:	Okay
>+Xmh.prompt.Dialog.cancel.Label:	Cancel
>+Xmh.error.Dialog.OK.Label:	Acknowledged
>+
>+*toc.rightMargin:		0
>+*toc.scrollVertical:		WhenNeeded
>+*view.scrollVertical:		Always
>+*view.scrollHorizontal:		WhenNeeded
>+*view.autoFill:			True
>+*comp.scrollVertical:		Always
>+*comp.scrollHorizontal:		WhenNeeded
>+*comp.autoFill:			True
>+
>+*sequenceMenu.Translations: #override\n\
>+<Btn2Up>:XtMenuPopdown()notify()XmhOpenSequence()unhighlight()\n\
>+<Btn3Up>:XtMenuPopdown()XmhPushSequence()notify()XmhAddToSequence()XmhPopSequence()unhighlight()\n\
>+<BtnUp>:XtMenuPopdown()notify()unhighlight()\n
>+
>+*sequenceMenu.baseTranslations: #override\n\
>+<Btn2Up>:XtMenuPopdown()notify()XmhOpenSequence()unhighlight()\n\
>+<Btn3Up>:XtMenuPopdown()XmhPushSequence()notify()XmhAddToSequence()XmhPopSequence()unhighlight()\n\
>+<BtnUp>:XtMenuPopdown()notify()unhighlight()\n
>+
>+*folders*MenuButton.Translations:#override\n\
>+<BtnDown>:set()XmhPopupFolderMenu()\n\
>+<Btn2Up>:XmhSetCurrentFolder()XmhOpenFolder()reset()\n\
>+<Btn3Up>:XmhPushFolder()XmhSetCurrentFolder()XmhMarkMove()XmhPopFolder()reset()\n\
>+<BtnUp>:XmhSetCurrentFolder()reset()\n\
>+<LeaveWindow>:reset()XmhLeaveFolderButton()\n
>+
>+*folders*MenuButton.baseTranslations:#override\n\
>+<BtnDown>:set()XmhPopupFolderMenu()\n\
>+<Btn2Up>:XmhSetCurrentFolder()XmhOpenFolder()reset()\n\
>+<Btn3Up>:XmhPushFolder()XmhSetCurrentFolder()XmhMarkMove()XmhPopFolder()reset()\n\
>+<BtnUp>:XmhSetCurrentFolder()reset()\n\
>+<LeaveWindow>:reset()XmhLeaveFolderButton()\n
>+
>+*folders*SimpleMenu.Translations:#override\n\
>+<Btn2Up>:XtMenuPopdown()notify()XmhOpenFolder()unhighlight()\n\
>+<Btn3Up>:XtMenuPopdown()XmhPushFolder()notify()XmhMarkMove()XmhPopFolder()unhighlight()\n\
>+<BtnUp>:XtMenuPopdown()notify()unhighlight()\n
>+
>+*folders*SimpleMenu.baseTranslations:#override\n\
>+<Btn2Up>:XtMenuPopdown()notify()XmhOpenFolder()unhighlight()\n\
>+<Btn3Up>:XtMenuPopdown()XmhPushFolder()notify()XmhMarkMove()XmhPopFolder()unhighlight()\n\
>+<BtnUp>:XtMenuPopdown()notify()unhighlight()\n
>+
>+*toc.Translations: #override\n\
>+	<Btn2Down>: select-start()\n\
>+	<Btn2Up>:select-end(PRIMARY)XmhViewNextMessage()\n\
>+	Ctrl<Key>R:	no-op(RingBell)\n\
>+	Ctrl<Key>S:	no-op(RingBell)\n
>+
>+*toc.baseTranslations: #override\n\
>+	<Btn2Down>: select-start()\n\
>+	<Btn2Up>:select-end(PRIMARY)XmhViewNextMessage()\n\
>+	Ctrl<Key>R:	no-op(RingBell)\n\
>+	Ctrl<Key>S:	no-op(RingBell)\n
>+
>+*toc.Accelerators: #override\n\
>+	:Ctrl<Key>V:	next-page()\n\
>+	:Meta<Key>V:	previous-page()\n
>+*view.Accelerators: #override\n\
>+	:Ctrl<Key>v:	next-page()\n\
>+	:Meta<Key>v:	previous-page()\n
>+
>+*tocMenu.Accelerators: #override\n\
>+	:Meta<Key>I:	XmhIncorporateNewMail()\n\
>+	:Meta<Key>C: 	XmhCommitChanges()\n\
>+	:Meta<Key>R:	XmhForceRescan()\n\
>+	:Meta<Key>P:	XmhPackFolder()\n\
>+	:Meta<Key>S:	XmhSortFolder()\n
>+
>+*messageMenu.Accelerators: #override\n\
>+	 Meta<Key>space: XmhViewNextMessage()\n\
>+	:Meta<Key>c:	XmhMarkCopy()\n\
>+	:Meta<Key>d:	XmhMarkDelete()\n\
>+	:Meta<Key>f:	XmhForward()\n\
>+	:Meta<Key>m:	XmhMarkMove()\n\
>+	:Meta<Key>n:	XmhViewNextMessage()\n\
>+	:Meta<Key>p:	XmhViewPreviousMessage()\n\
>+	:Meta<Key>r:	XmhReply()\n\
>+	:Meta<Key>u:	XmhUnmark()\n
>+
>+*viewButtons.close.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhCloseView()unset()\n
>+*viewButtons.reply.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhViewReply()unset()\n
>+*viewButtons.forward.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhViewForward()unset()\n
>+*viewButtons.useAsComp.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhViewUseAsComposition()unset()\n
>+*viewButtons.edit.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhEditView()unset()\n
>+*viewButtons.save.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhSaveView()unset()\n
>+*viewButtons.print.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhPrintView()unset()\n
>+*viewButtons.delete.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhViewMarkDelete()unset()\n
>+
>+*compButtons.close.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhCloseView()unset()\n
>+*compButtons.send.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhSend()unset()\n
>+*compButtons.reset.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhResetCompose()unset()\n
>+*compButtons.compose.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhComposeMessage()unset()\n
>+*compButtons.save.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhSave()unset()\n
>+*compButtons.insert.Translations:#override\n\
>+	<Btn1Down>,<Btn1Up>:	XmhInsert()unset()\n
>diff --git a/app-defaults/Xmh.ad b/app-defaults/Xmh.ad
>deleted file mode 100644
>index fd71a5c..0000000
>--- a/app-defaults/Xmh.ad
>+++ /dev/null
>@@ -1,173 +0,0 @@
>-! $XConsortium: Xmh.ad,v 1.32 94/02/09 19:44:06 gildea Exp $
>-! AppDefaultsVersion should only be defined in the site-wide file
>-Xmh.AppDefaultsVersion:		1
>-
>-Xmh.Geometry:			508x750
>-Xmh.ReplyInsertFilter:		cat
>-Xmh.SendBreakWidth:		2000
>-*ShapeStyle:			Oval
>-*Command.BorderWidth:	1
>-*MenuButton.BorderWidth:	1
>-*toc*cursor:			left_ptr
>-
>-*menuBox.folderButton.Label:	Folder
>-*menuBox.tocButton.Label:	Table of Contents
>-*menuBox.messageButton.Label:	Message
>-*menuBox.sequenceButton.Label:	Sequence
>-*menuBox.viewButton.Label:	View
>-*menuBox.optionButton.Label:	Options
>-*SimpleMenu*SmeLine.Height:	20
>-
>-*close.Label:			Close Window
>-*compose.Label:			Compose Message
>-*open.Label:			Open Folder
>-*openInNew.Label:		Open Folder in New Window
>-*create.Label:			Create Folder
>-*folderMenu*delete.Label:	Delete Folder
>-*inc.Label:			Incorporate New Mail
>-*next.Label:			View Next Message
>-*prev.Label:			View Previous
>-*delete.Label:			Delete
>-*move.Label:			Move
>-*copy.Label:			Copy as Link
>-*unmark.Label:			Unmark
>-*viewNew.Label:			View In New
>-*reply.Label:			Reply
>-*forward.Label:			Forward
>-*useAsComp.Label:		Use as Composition
>-*commit.Label:			Commit Changes
>-*print.Label:			Print
>-*pack.Label:			Pack Folder
>-*sort.Label:			Sort Folder
>-*rescan.Label:			Rescan Folder
>-*pick.Label:			Pick
>-*openSeq.Label:			Open Sequence
>-*addToSeq.Label:		Add to Sequence
>-*removeFromSeq.Label:		Remove from Sequence
>-*deleteSeq.Label:		Delete Sequence
>-*edit.Label:			Edit Message
>-*save.Label:			Save Message
>-*send.Label:			Send
>-*reset.Label:			New Headers
>-*insert.Label:			Insert
>-*optionMenu*reverse.Label:	Read in Reverse
>-
>-Xmh.notice.Dialog.Text.BorderWidth: 0
>-Xmh.notice.Dialog.Text.TextSink.Font: -*-courier-bold-r-*--*-120-*-*-*-*-iso8859-1
>-Xmh.notice.Dialog.confirm.Label:Acknowledged
>-Xmh.notice.BorderWidth:		2
>-Xmh.confirm.Dialog.yes.Label:	Yes
>-Xmh.confirm.Dialog.no.Label:	No
>-Xmh.prompt.Dialog.okay.Label:	Okay
>-Xmh.prompt.Dialog.cancel.Label:	Cancel
>-Xmh.error.Dialog.OK.Label:	Acknowledged
>-
>-*toc.rightMargin:		0
>-*toc.scrollVertical:		WhenNeeded
>-*view.scrollVertical:		Always
>-*view.scrollHorizontal:		WhenNeeded
>-*view.autoFill:			True
>-*comp.scrollVertical:		Always
>-*comp.scrollHorizontal:		WhenNeeded
>-*comp.autoFill:			True
>-
>-*sequenceMenu.Translations: #override\n\
>-<Btn2Up>:XtMenuPopdown()notify()XmhOpenSequence()unhighlight()\n\
>-<Btn3Up>:XtMenuPopdown()XmhPushSequence()notify()XmhAddToSequence()XmhPopSequence()unhighlight()\n\
>-<BtnUp>:XtMenuPopdown()notify()unhighlight()\n
>-
>-*sequenceMenu.baseTranslations: #override\n\
>-<Btn2Up>:XtMenuPopdown()notify()XmhOpenSequence()unhighlight()\n\
>-<Btn3Up>:XtMenuPopdown()XmhPushSequence()notify()XmhAddToSequence()XmhPopSequence()unhighlight()\n\
>-<BtnUp>:XtMenuPopdown()notify()unhighlight()\n
>-
>-*folders*MenuButton.Translations:#override\n\
>-<BtnDown>:set()XmhPopupFolderMenu()\n\
>-<Btn2Up>:XmhSetCurrentFolder()XmhOpenFolder()reset()\n\
>-<Btn3Up>:XmhPushFolder()XmhSetCurrentFolder()XmhMarkMove()XmhPopFolder()reset()\n\
>-<BtnUp>:XmhSetCurrentFolder()reset()\n\
>-<LeaveWindow>:reset()XmhLeaveFolderButton()\n
>-
>-*folders*MenuButton.baseTranslations:#override\n\
>-<BtnDown>:set()XmhPopupFolderMenu()\n\
>-<Btn2Up>:XmhSetCurrentFolder()XmhOpenFolder()reset()\n\
>-<Btn3Up>:XmhPushFolder()XmhSetCurrentFolder()XmhMarkMove()XmhPopFolder()reset()\n\
>-<BtnUp>:XmhSetCurrentFolder()reset()\n\
>-<LeaveWindow>:reset()XmhLeaveFolderButton()\n
>-
>-*folders*SimpleMenu.Translations:#override\n\
>-<Btn2Up>:XtMenuPopdown()notify()XmhOpenFolder()unhighlight()\n\
>-<Btn3Up>:XtMenuPopdown()XmhPushFolder()notify()XmhMarkMove()XmhPopFolder()unhighlight()\n\
>-<BtnUp>:XtMenuPopdown()notify()unhighlight()\n
>-
>-*folders*SimpleMenu.baseTranslations:#override\n\
>-<Btn2Up>:XtMenuPopdown()notify()XmhOpenFolder()unhighlight()\n\
>-<Btn3Up>:XtMenuPopdown()XmhPushFolder()notify()XmhMarkMove()XmhPopFolder()unhighlight()\n\
>-<BtnUp>:XtMenuPopdown()notify()unhighlight()\n
>-
>-*toc.Translations: #override\n\
>-	<Btn2Down>: select-start()\n\
>-	<Btn2Up>:select-end(PRIMARY)XmhViewNextMessage()\n\
>-	Ctrl<Key>R:	no-op(RingBell)\n\
>-	Ctrl<Key>S:	no-op(RingBell)\n
>-
>-*toc.baseTranslations: #override\n\
>-	<Btn2Down>: select-start()\n\
>-	<Btn2Up>:select-end(PRIMARY)XmhViewNextMessage()\n\
>-	Ctrl<Key>R:	no-op(RingBell)\n\
>-	Ctrl<Key>S:	no-op(RingBell)\n
>-
>-*toc.Accelerators: #override\n\
>-	:Ctrl<Key>V:	next-page()\n\
>-	:Meta<Key>V:	previous-page()\n
>-*view.Accelerators: #override\n\
>-	:Ctrl<Key>v:	next-page()\n\
>-	:Meta<Key>v:	previous-page()\n
>-
>-*tocMenu.Accelerators: #override\n\
>-	:Meta<Key>I:	XmhIncorporateNewMail()\n\
>-	:Meta<Key>C: 	XmhCommitChanges()\n\
>-	:Meta<Key>R:	XmhForceRescan()\n\
>-	:Meta<Key>P:	XmhPackFolder()\n\
>-	:Meta<Key>S:	XmhSortFolder()\n
>-
>-*messageMenu.Accelerators: #override\n\
>-	 Meta<Key>space: XmhViewNextMessage()\n\
>-	:Meta<Key>c:	XmhMarkCopy()\n\
>-	:Meta<Key>d:	XmhMarkDelete()\n\
>-	:Meta<Key>f:	XmhForward()\n\
>-	:Meta<Key>m:	XmhMarkMove()\n\
>-	:Meta<Key>n:	XmhViewNextMessage()\n\
>-	:Meta<Key>p:	XmhViewPreviousMessage()\n\
>-	:Meta<Key>r:	XmhReply()\n\
>-	:Meta<Key>u:	XmhUnmark()\n
>-
>-*viewButtons.close.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhCloseView()unset()\n
>-*viewButtons.reply.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhViewReply()unset()\n
>-*viewButtons.forward.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhViewForward()unset()\n
>-*viewButtons.useAsComp.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhViewUseAsComposition()unset()\n
>-*viewButtons.edit.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhEditView()unset()\n
>-*viewButtons.save.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhSaveView()unset()\n
>-*viewButtons.print.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhPrintView()unset()\n
>-*viewButtons.delete.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhViewMarkDelete()unset()\n
>-
>-*compButtons.close.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhCloseView()unset()\n
>-*compButtons.send.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhSend()unset()\n
>-*compButtons.reset.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhResetCompose()unset()\n
>-*compButtons.compose.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhComposeMessage()unset()\n
>-*compButtons.save.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhSave()unset()\n
>-*compButtons.insert.Translations:#override\n\
>-	<Btn1Down>,<Btn1Up>:	XmhInsert()unset()\n
>-- 
>1.6.0.3
>

Actions: View | Splinter Review

Attachments on bug 18479: 20208 | 20209 | 20210 | 20211 | 20212

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.