svn merge ^/branches/released .

1 files changed, 158 insertions, 161 deletions

diff --git a/libXaw/src/TextTr.c b/libXaw/src/TextTr.c
index 059a79201..5c524196a 100644
--- a/libXaw/src/TextTr.c
+++ b/libXaw/src/TextTr.c
@@ -1,161 +1,158 @@
-/* $Xorg: TextTr.c,v 1.4 2001/02/09 02:03:47 xorgcvs Exp $ */
-
-/*
-
-Copyright 1991, 1994, 1998  The Open Group
-
-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.
-
-*/
-/* $XFree86: xc/lib/Xaw/TextTr.c,v 3.15 2001/01/17 19:42:35 dawes Exp $ */
-
-/* INTERNATIONALIZATION:
-
-The OMRON R5 contrib added the following action to the old TextTr:
-
-	Ctrl<Key>backslash:	reconnect-im()
-
-This is needed when the im is killed or otherwise becomes unreachable.
-This keystroke is evil (inconvenient, hard-to-remember, not obvious)
-so I am adding one more translation:
-
-	<Key>Kanji:		reconnect-im()
-
-The Japanese user typically hits their Kanji key when they want to do
-input.  This merely makes sure the input is connected.
-*/
-
-#include <X11/Xaw/Text.h>
-
-char _XawDefaultTextTranslations[] =
-"c<Key>A:"		"beginning-of-line()\n"
-"c<Key>B:"		"backward-character()\n"
-"c<Key>C:"		"insert-selection(CUT_BUFFER0)\n"
-"c<Key>D:"		"delete-next-character()\n"
-"c<Key>E:"		"end-of-line()\n"
-"c<Key>F:"		"forward-character()\n"
-#ifndef OLDXAW
-"c<Key>G:"		"keyboard-reset()\n"
-#else
-"c<Key>G:"		"multiply(Reset)\n"
-#endif
-"c<Key>H:"		"delete-previous-character()\n"
-"c<Key>J:"		"newline-and-indent()\n"
-"c<Key>K:"		"kill-to-end-of-line()\n"
-"c<Key>L:"		"redraw-display()\n"
-"c<Key>M:"		"newline()\n"
-"c<Key>N:"		"next-line()\n"
-"c<Key>O:"		"newline-and-backup()\n"
-"c<Key>P:"		"previous-line()\n"
-"c<Key>R:"		"search(backward)\n"
-"c<Key>S:"		"search(forward)\n"
-"c<Key>T:"		"transpose-characters()\n"
-#ifndef OLDXAW
-"c<Key>U:"		"multiply(Start)\n"
-#else
-"c<Key>U:"		"multiply(4)\n"
-#endif
-"c<Key>V:"		"next-page()\n"
-"c<Key>W:"		"kill-selection()\n"
-"c<Key>Y:"		"insert-selection(SECONDARY)\n"
-"c<Key>Z:"		"scroll-one-line-up()\n"
-"m<Key>B:"		"backward-word()\n"
-"m<Key>C:"		"capitalize-word()\n"
-"m<Key>F:"		"forward-word()\n"
-"m<Key>I:"		"insert-file()\n"
-"m<Key>K:"		"kill-to-end-of-paragraph()\n"
-"m<Key>L:"		"downcase-word()\n"
-"m<Key>Q:"		"form-paragraph()\n"
-"m<Key>U:"		"upcase-word()\n"
-"m<Key>V:"		"previous-page()\n"
-#ifndef OLDXAW
-"m<Key>Y:"		"kill-ring-yank()\n"
-#endif
-"m<Key>Z:"		"scroll-one-line-down()\n"
-"~s m<Key>d:"		"kill-word(alnum)\n"
-"s m<Key>d:"		"delete-next-word(alnum)\n"
-"~s m<Key>h:"		"backward-kill-word(alnum)\n"
-"s m<Key>h:"		"delete-previous-word(alnum)\n"
-":m<Key>\\<:"		"beginning-of-file()\n"
-":m<Key>\\>:"		"end-of-file()\n"
-":m<Key>]:"		"forward-paragraph()\n"
-":m<Key>[:"		"backward-paragraph()\n"
-"~s m<Key>Delete:"	"backward-kill-word(alnum)\n"
-"s m<Key>Delete:"	"delete-previous-word(alnum)\n"
-"~s m<Key>BackSpace:"	"backward-kill-word(alnum)\n"
-"s m<Key>BackSpace:"	"delete-previous-word(alnum)\n"
-"c<Key>Left:"		"backward-word(alnum)\n"
-"c<Key>Right:"		"forward-word(alnum)\n"
-"c<Key>Up:"		"backward-paragraph()\n"
-"c<Key>Down:"		"forward-paragraph()\n"
-"<Key>Home:"		"beginning-of-file()\n"
-":<Key>KP_Home:"	"beginning-of-file()\n"
-"<Key>End:"		"end-of-file()\n"
-":<Key>KP_End:"		"end-of-file()\n"
-"<Key>Next:"		"next-page()\n"
-":<Key>KP_Next:"	"next-page()\n"
-"<Key>Prior:"		"previous-page()\n"
-":<Key>KP_Prior:"	"previous-page()\n"
-"<Key>Right:"		"forward-character()\n"
-":<Key>KP_Right:"	"forward-character()\n"
-"<Key>Left:"		"backward-character()\n"
-":<Key>KP_Left:"	"backward-character()\n"
-"<Key>Down:"		"next-line()\n"
-":<Key>KP_Down:"	"next-line()\n"
-"<Key>Up:"		"previous-line()\n"
-":<Key>KP_Up:"		"previous-line()\n"
-"<Key>Delete:"		"delete()\n"
-":<Key>KP_Delete:"	"delete()\n"
-"<Key>BackSpace:"	"delete-previous-character()\n"
-"<Key>Linefeed:"	"newline-and-indent()\n"
-"<Key>Return:"		"newline()\n"
-":<Key>KP_Enter:"	"newline()\n"
-"c<Key>backslash:"	"reconnect-im()\n"
-"<Key>Kanji:"		"reconnect-im()\n"
-#ifndef OLDXAW
-":<Key>0:"		"numeric(0)\n"
-":<Key>1:"		"numeric(1)\n"
-":<Key>2:"		"numeric(2)\n"
-":<Key>3:"		"numeric(3)\n"
-":<Key>4:"		"numeric(4)\n"
-":<Key>5:"		"numeric(5)\n"
-":<Key>6:"		"numeric(6)\n"
-":<Key>7:"		"numeric(7)\n"
-":<Key>8:"		"numeric(8)\n"
-":<Key>9:"		"numeric(9)\n"
-":<Key>-:"		"numeric(-)\n"
-":c<Key>_:"		"undo()\n"
-#endif
-"s <Key>Insert:"	"insert-selection(PRIMARY, CUT_BUFFER0)\n"
-"<Ctrl>Q,<Key>:"	"insert-char()\n"
-"<Key>:"		"insert-char()\n"
-"<Enter>:"		"enter-window()\n"
-"<Leave>:"		"leave-window()\n"
-"<FocusIn>:"		"focus-in()\n"
-"<FocusOut>:"		"focus-out()\n"
-"<Btn1Down>:"		"select-start()\n"
-"<Btn1Motion>:"		"extend-adjust()\n"
-"<Btn1Up>:"		"extend-end(PRIMARY, CUT_BUFFER0)\n"
-"<Btn2Down>:"		"insert-selection(PRIMARY, CUT_BUFFER0)\n"
-"<Btn3Down>:"		"extend-start()\n"
-"<Btn3Motion>:"		"extend-adjust()\n"
-"<Btn3Up>:"		"extend-end(PRIMARY, CUT_BUFFER0)\n"
-;
+/*

+

+Copyright 1991, 1994, 1998  The Open Group

+

+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.

+

+*/

+

+/* INTERNATIONALIZATION:

+

+The OMRON R5 contrib added the following action to the old TextTr:

+

+	Ctrl<Key>backslash:	reconnect-im()

+

+This is needed when the im is killed or otherwise becomes unreachable.

+This keystroke is evil (inconvenient, hard-to-remember, not obvious)

+so I am adding one more translation:

+

+	<Key>Kanji:		reconnect-im()

+

+The Japanese user typically hits their Kanji key when they want to do

+input.  This merely makes sure the input is connected.

+*/

+

+#include <X11/Xaw/Text.h>

+

+char _XawDefaultTextTranslations[] =

+"c<Key>A:"		"beginning-of-line()\n"

+"c<Key>B:"		"backward-character()\n"

+"c<Key>C:"		"insert-selection(CUT_BUFFER0)\n"

+"c<Key>D:"		"delete-next-character()\n"

+"c<Key>E:"		"end-of-line()\n"

+"c<Key>F:"		"forward-character()\n"

+#ifndef OLDXAW

+"c<Key>G:"		"keyboard-reset()\n"

+#else

+"c<Key>G:"		"multiply(Reset)\n"

+#endif

+"c<Key>H:"		"delete-previous-character()\n"

+"c<Key>J:"		"newline-and-indent()\n"

+"c<Key>K:"		"kill-to-end-of-line()\n"

+"c<Key>L:"		"redraw-display()\n"

+"c<Key>M:"		"newline()\n"

+"c<Key>N:"		"next-line()\n"

+"c<Key>O:"		"newline-and-backup()\n"

+"c<Key>P:"		"previous-line()\n"

+"c<Key>R:"		"search(backward)\n"

+"c<Key>S:"		"search(forward)\n"

+"c<Key>T:"		"transpose-characters()\n"

+#ifndef OLDXAW

+"c<Key>U:"		"multiply(Start)\n"

+#else

+"c<Key>U:"		"multiply(4)\n"

+#endif

+"c<Key>V:"		"next-page()\n"

+"c<Key>W:"		"kill-selection()\n"

+"c<Key>Y:"		"insert-selection(SECONDARY)\n"

+"c<Key>Z:"		"scroll-one-line-up()\n"

+"m<Key>B:"		"backward-word()\n"

+"m<Key>C:"		"capitalize-word()\n"

+"m<Key>F:"		"forward-word()\n"

+"m<Key>I:"		"insert-file()\n"

+"m<Key>K:"		"kill-to-end-of-paragraph()\n"

+"m<Key>L:"		"downcase-word()\n"

+"m<Key>Q:"		"form-paragraph()\n"

+"m<Key>U:"		"upcase-word()\n"

+"m<Key>V:"		"previous-page()\n"

+#ifndef OLDXAW

+"m<Key>Y:"		"kill-ring-yank()\n"

+#endif

+"m<Key>Z:"		"scroll-one-line-down()\n"

+"~s m<Key>d:"		"kill-word(alnum)\n"

+"s m<Key>d:"		"delete-next-word(alnum)\n"

+"~s m<Key>h:"		"backward-kill-word(alnum)\n"

+"s m<Key>h:"		"delete-previous-word(alnum)\n"

+":m<Key>\\<:"		"beginning-of-file()\n"

+":m<Key>\\>:"		"end-of-file()\n"

+":m<Key>]:"		"forward-paragraph()\n"

+":m<Key>[:"		"backward-paragraph()\n"

+"~s m<Key>Delete:"	"backward-kill-word(alnum)\n"

+"s m<Key>Delete:"	"delete-previous-word(alnum)\n"

+"~s m<Key>BackSpace:"	"backward-kill-word(alnum)\n"

+"s m<Key>BackSpace:"	"delete-previous-word(alnum)\n"

+"c<Key>Left:"		"backward-word(alnum)\n"

+"c<Key>Right:"		"forward-word(alnum)\n"

+"c<Key>Up:"		"backward-paragraph()\n"

+"c<Key>Down:"		"forward-paragraph()\n"

+"<Key>Home:"		"beginning-of-file()\n"

+":<Key>KP_Home:"	"beginning-of-file()\n"

+"<Key>End:"		"end-of-file()\n"

+":<Key>KP_End:"		"end-of-file()\n"

+"<Key>Next:"		"next-page()\n"

+":<Key>KP_Next:"	"next-page()\n"

+"<Key>Prior:"		"previous-page()\n"

+":<Key>KP_Prior:"	"previous-page()\n"

+"<Key>Right:"		"forward-character()\n"

+":<Key>KP_Right:"	"forward-character()\n"

+"<Key>Left:"		"backward-character()\n"

+":<Key>KP_Left:"	"backward-character()\n"

+"<Key>Down:"		"next-line()\n"

+":<Key>KP_Down:"	"next-line()\n"

+"<Key>Up:"		"previous-line()\n"

+":<Key>KP_Up:"		"previous-line()\n"

+"<Key>Delete:"		"delete()\n"

+":<Key>KP_Delete:"	"delete()\n"

+"<Key>BackSpace:"	"delete-previous-character()\n"

+"<Key>Linefeed:"	"newline-and-indent()\n"

+"<Key>Return:"		"newline()\n"

+":<Key>KP_Enter:"	"newline()\n"

+"c<Key>backslash:"	"reconnect-im()\n"

+"<Key>Kanji:"		"reconnect-im()\n"

+#ifndef OLDXAW

+":<Key>0:"		"numeric(0)\n"

+":<Key>1:"		"numeric(1)\n"

+":<Key>2:"		"numeric(2)\n"

+":<Key>3:"		"numeric(3)\n"

+":<Key>4:"		"numeric(4)\n"

+":<Key>5:"		"numeric(5)\n"

+":<Key>6:"		"numeric(6)\n"

+":<Key>7:"		"numeric(7)\n"

+":<Key>8:"		"numeric(8)\n"

+":<Key>9:"		"numeric(9)\n"

+":<Key>-:"		"numeric(-)\n"

+":c<Key>_:"		"undo()\n"

+#endif

+"s <Key>Insert:"	"insert-selection(PRIMARY, CUT_BUFFER0)\n"

+"<Ctrl>Q,<Key>:"	"insert-char()\n"

+"<Key>:"		"insert-char()\n"

+"<Enter>:"		"enter-window()\n"

+"<Leave>:"		"leave-window()\n"

+"<FocusIn>:"		"focus-in()\n"

+"<FocusOut>:"		"focus-out()\n"

+"<Btn1Down>:"		"select-start()\n"

+"<Btn1Motion>:"		"extend-adjust()\n"

+"<Btn1Up>:"		"extend-end(PRIMARY, CUT_BUFFER0)\n"

+"<Btn2Down>:"		"insert-selection(PRIMARY, CUT_BUFFER0)\n"

+"<Btn3Down>:"		"extend-start()\n"

+"<Btn3Motion>:"		"extend-adjust()\n"

+"<Btn3Up>:"		"extend-end(PRIMARY, CUT_BUFFER0)\n"

+;