---- XFree86-4.2.1/xc/programs/xterm/XTerm.ad~ Thu Sep 5 10:05:48 2002
-+++ XFree86-4.2.1/xc/programs/xterm/XTerm.ad Thu Sep 5 10:05:48 2002
-@@ -5,115 +5,115 @@
- !
- ! $XFree86: xc/programs/xterm/XTerm.ad,v 3.22 2002/01/05 22:05:02 dickey Exp $
-
--XTerm.JoinSession:False
-+XTerm.JoinSession: False
-
--*SimpleMenu*BackingStore: NotUseful
--*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
--*SimpleMenu*menuLabel.vertSpace: 100
--*SimpleMenu*HorizontalMargins: 16
--*SimpleMenu*Sme.height: 16
--
--*SimpleMenu*Cursor: left_ptr
--
--*mainMenu.Label: Main Options
--*mainMenu*securekbd*Label: Secure Keyboard
--*mainMenu*allowsends*Label: Allow SendEvents
--*mainMenu*logging*Label: Log to File
--*mainMenu*print*Label: Print Window
--*mainMenu*redraw*Label: Redraw Window
--*mainMenu*8-bit control*Label: 8-Bit Controls
--*mainMenu*backarrow key*Label: Backarrow Key (BS/DEL)
--*mainMenu*num-lock*Label: Alt/NumLock Modifiers
--*mainMenu*meta-esc*Label: Meta Sends Escape
--*mainMenu*delete-is-del*Label: Delete is DEL
--*mainMenu*oldFunctionKeys*Label: Old Function-Keys
--*mainMenu*sunFunctionKeys*Label: Sun Function-Keys
--*mainMenu*sunKeyboard*Label: VT220 Keyboard
--*mainMenu*hpFunctionKeys*Label: HP Function-Keys
--*mainMenu*scoFunctionKeys*Label: SCO Function-Keys
--*mainMenu*suspend*Label: Send STOP Signal
--*mainMenu*continue*Label: Send CONT Signal
--*mainMenu*interrupt*Label: Send INT Signal
--*mainMenu*hangup*Label: Send HUP Signal
--*mainMenu*terminate*Label: Send TERM Signal
--*mainMenu*kill*Label: Send KILL Signal
--*mainMenu*quit*Label: Quit
--
--*vtMenu.Label: VT Options
--*vtMenu*scrollbar*Label: Enable Scrollbar
--*vtMenu*jumpscroll*Label: Enable Jump Scroll
--*vtMenu*reversevideo*Label: Enable Reverse Video
--*vtMenu*autowrap*Label: Enable Auto Wraparound
--*vtMenu*reversewrap*Label: Enable Reverse Wraparound
--*vtMenu*autolinefeed*Label: Enable Auto Linefeed
--*vtMenu*appcursor*Label: Enable Application Cursor Keys
--*vtMenu*appkeypad*Label: Enable Application Keypad
--*vtMenu*scrollkey*Label: Scroll to Bottom on Key Press
--*vtMenu*scrollttyoutput*Label: Scroll to Bottom on Tty Output
--*vtMenu*allow132*Label: Allow 80/132 Column Switching
--*vtMenu*cursesemul*Label: Enable Curses Emulation
--*vtMenu*visualbell*Label: Enable Visual Bell
--*vtMenu*poponbell*Label: Enable Pop on Bell
--*vtMenu*marginbell*Label: Enable Margin Bell
--*vtMenu*cursorblink*Label: Enable Blinking Cursor
--*vtMenu*titeInhibit*Label: Enable Alternate Screen Switching
--*vtMenu*activeicon*Label: Enable Active Icon
--*vtMenu*softreset*Label: Do Soft Reset
--*vtMenu*hardreset*Label: Do Full Reset
--*vtMenu*clearsavedlines*Label: Reset and Clear Saved Lines
--*vtMenu*tekshow*Label: Show Tek Window
--*vtMenu*tekmode*Label: Switch to Tek Mode
--*vtMenu*vthide*Label: Hide VT Window
--*vtMenu*altscreen*Label: Show Alternate Screen
--
--*fontMenu.Label: VT Fonts
--*fontMenu*fontdefault*Label: Default
--*fontMenu*font1*Label: Unreadable
--*VT100*font1: nil2
--*IconFont: nil2
--*fontMenu*font2*Label: Tiny
--*VT100*font2: 5x7
--*fontMenu*font3*Label: Small
--*VT100*font3: 6x10
--*fontMenu*font4*Label: Medium
--*VT100*font4: 7x13
--*fontMenu*font5*Label: Large
--*VT100*font5: 9x15
--*fontMenu*font6*Label: Huge
--*VT100*font6: 10x20
--*fontMenu*fontescape*Label: Escape Sequence
-+*SimpleMenu*BackingStore: NotUseful
-+*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
-+*SimpleMenu*menuLabel.vertSpace: 100
-+*SimpleMenu*HorizontalMargins: 16
-+*SimpleMenu*Sme.height: 16
-+
-+*SimpleMenu*Cursor: left_ptr
-+
-+*mainMenu.Label: Main Options
-+*mainMenu*securekbd*Label: Secure Keyboard
-+*mainMenu*allowsends*Label: Allow SendEvents
-+*mainMenu*logging*Label: Log to File
-+*mainMenu*print*Label: Print Window
-+*mainMenu*redraw*Label: Redraw Window
-+*mainMenu*8-bit control*Label 8-Bit Controls
-+*mainMenu*backarrow key*Label: Backarrow Key (BS/DEL)
-+*mainMenu*num-lock*Label: Alt/NumLock Modifiers
-+*mainMenu*meta-esc*Label: Meta Sends Escape
-+*mainMenu*delete-is-del*Label: Delete is DEL
-+*mainMenu*oldFunctionKeys*Label: Old Function-Keys
-+*mainMenu*sunFunctionKeys*Label: Sun Function-Keys
-+*mainMenu*sunKeyboard*Label: VT220 Keyboard
-+*mainMenu*hpFunctionKeys*Label: HP Function-Keys
-+*mainMenu*scoFunctionKeys*Label: SCO Function-Keys
-+*mainMenu*suspend*Label: Send STOP Signal
-+*mainMenu*continue*Label: Send CONT Signal
-+*mainMenu*interrupt*Label: Send INT Signal
-+*mainMenu*hangup*Label: Send HUP Signal
-+*mainMenu*terminate*Label: Send TERM Signal
-+*mainMenu*kill*Label: Send KILL Signal
-+*mainMenu*quit*Label: Quit
-+
-+*vtMenu.Label: VT Options
-+*vtMenu*scrollbar*Label: Enable Scrollbar
-+*vtMenu*jumpscroll*Label: Enable Jump Scroll
-+*vtMenu*reversevideo*Label: Enable Reverse Video
-+*vtMenu*autowrap*Label: Enable Auto Wraparound
-+*vtMenu*reversewrap*Label: Enable Reverse Wraparound
-+*vtMenu*autolinefeed*Label: Enable Auto Linefeed
-+*vtMenu*appcursor*Label: Enable Application Cursor Keys
-+*vtMenu*appkeypad*Label: Enable Application Keypad
-+*vtMenu*scrollkey*Label: Scroll to Bottom on Key Press
-+*vtMenu*scrollttyoutput*Label: Scroll to Bottom on Tty Output
-+*vtMenu*allow132*Label: Allow 80/132 Column Switching
-+*vtMenu*cursesemul*Label: Enable Curses Emulation
-+*vtMenu*visualbell*Label: Enable Visual Bell
-+*vtMenu*poponbell*Label: Enable Pop on Bell
-+*vtMenu*marginbell*Label: Enable Margin Bell
-+*vtMenu*cursorblink*Label: Enable Blinking Cursor
-+*vtMenu*titeInhibit*Label: Enable Alternate Screen Switching
-+*vtMenu*activeicon*Label: Enable Active Icon
-+*vtMenu*softreset*Label: Do Soft Reset
-+*vtMenu*hardreset*Label: Do Full Reset
-+*vtMenu*clearsavedlines*Label: Reset and Clear Saved Lines
-+*vtMenu*tekshow*Label: Show Tek Window
-+*vtMenu*tekmode*Label: Switch to Tek Mode
-+*vtMenu*vthide*Label: Hide VT Window
-+*vtMenu*altscreen*Label: Show Alternate Screen
-+
-+*fontMenu.Label: VT Fonts
-+*fontMenu*fontdefault*Label: Default
-+*fontMenu*font1*Label: Unreadable
-+*VT100*font1: nil2
-+*IconFont: nil2
-+*fontMenu*font2*Label: Tiny
-+*VT100*font2: 5x7
-+*fontMenu*font3*Label: Small
-+*VT100*font3: 6x10
-+*fontMenu*font4*Label: Medium
-+*VT100*font4: 7x13
-+*fontMenu*font5*Label: Large
-+*VT100*font5: 9x15
-+*fontMenu*font6*Label: Huge
-+*VT100*font6: 10x20
-+*fontMenu*fontescape*Label: Escape Sequence
- *fontMenu*fontsel*Label: Selection
- !fontescape and fontsel overridden by application
--*fontMenu*font-linedrawing*Label: Line-Drawing Characters
--*fontMenu*font-doublesize*Label: Doublesized Characters
--*fontMenu*font-loadable*Label: VT220 Soft Fonts
--
--*tekMenu.Label: Tek Options
--*tekMenu*tektextlarge*Label: Large Characters
--*tekMenu*tektext2*Label: #2 Size Characters
--*tekMenu*tektext3*Label: #3 Size Characters
--*tekMenu*tektextsmall*Label: Small Characters
--*tekMenu*tekpage*Label: PAGE
--*tekMenu*tekreset*Label: RESET
--*tekMenu*tekcopy*Label: COPY
--*tekMenu*vtshow*Label: Show VT Window
--*tekMenu*vtmode*Label: Switch to VT Mode
--*tekMenu*tekhide*Label: Hide Tek Window
--
--*tek4014*fontLarge: 9x15
--*tek4014*font2: 8x13
--*tek4014*font3: 6x13
--*tek4014*fontSmall: 6x10
-+*fontMenu*font-linedrawing*Label: Line-Drawing Characters
-+*fontMenu*font-doublesize*Label: Doublesized Characters
-+*fontMenu*font-loadable*Label: VT220 Soft Fonts
-+
-+*tekMenu.Label: Tek Options
-+*tekMenu*tektextlarge*Label: Large Characters
-+*tekMenu*tektext2*Label: #2 Size Characters
-+*tekMenu*tektext3*Label: #3 Size Characters
-+*tekMenu*tektextsmall*Label: Small Characters
-+*tekMenu*tekpage*Label: PAGE
-+*tekMenu*tekreset*Label: RESET
-+*tekMenu*tekcopy*Label: COPY
-+*tekMenu*vtshow*Label: Show VT Window
-+*tekMenu*vtmode*Label: Switch to VT Mode
-+*tekMenu*tekhide*Label: Hide Tek Window
-+
-+*tek4014*fontLarge: 9x15
-+*tek4014*font2: 8x13
-+*tek4014*font3: 6x13
-+*tek4014*fontSmall: 6x10
-
- ! Enable Colour by default.
--
--*VT100*colorMode: on
--*VT100*boldColors: on
--*VT100*dynamicColors: on
-+*VT100*colorMode: on
-+*VT100*boldColors: on
-+*VT100*dynamicColors: on
+diff -urN xc.orig/programs/xterm/XTerm.ad xc/programs/xterm/XTerm.ad
+--- xc.orig/programs/xterm/XTerm.ad Mon Dec 30 15:54:16 2002
++++ xc/programs/xterm/XTerm.ad Mon Dec 30 20:05:06 2002
+@@ -115,8 +115,8 @@
+ *VT100*dynamicColors: on
! Uncomment this to use color for underline attribute
-!*VT100*colorULMode: on
-!*VT100*underLine: off
-+*VT100*colorULMode: on
-+*VT100*colorULMode: on
-+*VT100*underLine: on
++*VT100*colorULMode: on
++*VT100*underLine: on
! Uncomment this to use color for the bold attribute
!*VT100*colorBDMode: on
-@@ -121,21 +121,181 @@
- ! Uncomment this to use the bold/underline colors in preference to other colors
- !*VT100*colorAttrMode: on
-
--*VT100*color0: black
--*VT100*color1: red3
--*VT100*color2: green3
--*VT100*color3: yellow3
--*VT100*color4: blue3
--*VT100*color5: magenta3
--*VT100*color6: cyan3
--*VT100*color7: gray90
--*VT100*color8: gray30
--*VT100*color9: red
--*VT100*color10: green
--*VT100*color11: yellow
--*VT100*color12: blue
--*VT100*color13: magenta
--*VT100*color14: cyan
--*VT100*color15: white
--*VT100*colorUL: yellow
--*VT100*colorBD: white
-+*VT100*color0: black
-+*VT100*color1: red3
-+*VT100*color2: green3
-+*VT100*color3: yellow3
-+*VT100*color4: blue3
-+*VT100*color5: magenta3
-+*VT100*color6: cyan3
-+*VT100*color7: gray90
-+*VT100*color8: gray30
-+*VT100*color9: red
-+*VT100*color10: green
-+*VT100*color11: yellow
-+*VT100*color12: blue
-+*VT100*color13: magenta
-+*VT100*color14: cyan
-+*VT100*color15: white
-+*VT100*colorBD: white
-+*VT100*colorUL: green
+@@ -142,3 +142,176 @@
+ *VT100*color15: white
+ *VT100*colorUL: yellow
+ *VT100*colorBD: white
+
+! This file causes when loaded using xrdb correct behaviour of xterm
-+! is you are using enclosed xterm.tcap and xterm.ti.
++! if you are using enclosed xterm.tcap and xterm.ti.
+! Some keys would never normally work if they weren't here (like Alt
+! something), some key definitions differ from one termcap/terminfo
+! to the other. You may delete any line if you find out that mc
+ <Key>KP_Enter: string(\015)\n\
+ <Key>KP_Equal: string(=)\n\
+ <Key>KP_Multiply: string(*)\n\
-+ @Num_Lock<Key>KP_Subtract: string(-)\n\
-+ <Key>KP_Add: string(+)\n\
-+ <Key>KP_Divide: string(/)\n\
-+ <Key>KP_Enter: string(\015)\n\
-+ <Key>KP_Equal: string(=)\n\
-+ <Key>KP_Multiply: string(*)\n\
+ <Key>KP_Subtract: string(-)\n\
++ Shift<Key>KP_Home: scroll-back(100,page)\n\
++ Shift<Key>KP_End: scroll-forw(100,page)\n\
++ <Key>KP_Home: string(0x1b) string("[1~")\n\
++ <Key>KP_End: string(0x1b) string("[4~")\n\
+ Shift<Key>Prior:scroll-back(1,page)\n\
+ Shift<Key>Next:scroll-forw(1,page)\n\
+ <Key>F16: start-extend() select-end(PRIMARY, CUT_BUFFER0, CLIPBOARD)\n\
+ <Key>F18: insert-selection(PRIMARY, CLIPBOARD)\n\
+ <Key>F27: scroll-back(100,page)\n\
+ <Key>R13: scroll-forw(100,page)\n\
-+ <Key>KP_Home: string(0x1b) string("[1~")\n\
-+ <Key>KP_End: string(0x1b) string("[4~")\n\
++ Ctrl<Key>Home: string(0x1b) string("[1;5H")\n\
++ Shift<Key>Home: string(0x1b) string("[1;2H")\n\
+ ~Meta<Key>Home: string(0x1b) string("[1~")\n\
+ Meta<Key>Home: string(0x1b) string(0x1b) string("[1~")\n\
++ Ctrl<Key>End: string(0x1b) string("[1;5F")\n\
++ Shift<Key>End: string(0x1b) string("[1;2F")\n\
+ ~Meta<Key>End: string(0x1b) string("[4~")\n\
+ Meta<Key>End: string(0x1b) string(0x1b) string("[4~")\n\
++ Ctrl<Key>Insert: string(0x1b) string("[2;5~")\n\
++ Shift<Key>Insert: string(0x1b) string("[2;2~")\n\
+ ~Meta<Key>Insert: string(0x1b) string("[2~")\n\
+ Meta<Key>Insert: string(0x1b) string(0x1b) string("[2~")\n\
++ Ctrl<Key>Delete: string(0x1b) string("[3;5~")\n\
++ Shift<Key>Delete: string(0x1b) string("[3;2~")\n\
+ ~Meta<Key>Delete: string(0x1b) string("[3~")\n\
+ Meta<Key>Delete: string(0x1b) string(0x1b) string("[3~")\n\
++ Ctrl<Key>Page_Up: string(0x1b) string("[5;5~")\n\
+ ~Meta<Key>Page_Up: string(0x1b) string("[5~")\n\
+ Meta<Key>Page_Up: string(0x1b) string(0x1b) string("[5~")\n\
++ Ctrl<Key>Page_Down: string(0x1b) string("[6;5~")\n\
+ ~Meta<Key>Page_Down: string(0x1b) string("[6~")\n\
+ Meta<Key>Page_Down: string(0x1b) string(0x1b) string("[6~")\n\
+ ~Meta<Key>BackSpace: string(0x08)\n\
+ Meta<Key>BackSpace: string(0x1b) string(0x08)\n\
++ Ctrl<Key>Up: string(0x1b) string("[1;5A")\n\
++ Shift<Key>Up: string(0x1b) string("O2A")\n\
+ ~Meta<Key>Up: string(0x1b) string("OA")\n\
+ Meta<Key>Up: string(0x1b) string(0x1b) string("OA")\n\
++ Ctrl<Key>Down: string(0x1b) string("[1;5B")\n\
++ Shift<Key>Down: string(0x1b) string("O2B")\n\
+ ~Meta<Key>Down: string(0x1b) string("OB")\n\
+ Meta<Key>Down: string(0x1b) string(0x1b) string("OB")\n\
++ Ctrl<Key>Left: string(0x1b) string("[1;5D")\n\
++ Shift<Key>Left: string(0x1b) string("O2D")\n\
+ ~Meta<Key>Left: string(0x1b) string("OD")\n\
+ Meta<Key>Left: string(0x1b) string(0x1b) string("OD")\n\
++ Ctrl<Key>Right: string(0x1b) string("[1;5C")\n\
++ Shift<Key>Right: string(0x1b) string("O2C")\n\
+ ~Meta<Key>Right: string(0x1b) string("OC")\n\
+ Meta<Key>Right: string(0x1b) string(0x1b) string("OC")\n\
+ ~Meta<Key>Return: string(0x0d)\n\
+ Meta<Key>Return: string(0x1b) string(0x0d)\n\
+ ~Meta<Key>Tab: string(0x09)\n\
+ Meta<Key>Tab: string(0x1b) string(0x09)\n\
-+ ~Shift<Key>F1: string(0x1b) string("[11~")\n\
-+ ~Shift<Key>F2: string(0x1b) string("[12~")\n\
-+ ~Shift<Key>F3: string(0x1b) string("[13~")\n\
-+ ~Shift<Key>F4: string(0x1b) string("[14~")\n\
-+ ~Shift<Key>F5: string(0x1b) string("[15~")\n\
-+ ~Shift<Key>F6: string(0x1b) string("[17~")\n\
-+ ~Shift<Key>F7: string(0x1b) string("[18~")\n\
-+ ~Shift<Key>F8: string(0x1b) string("[19~")\n\
-+ ~Shift<Key>F9: string(0x1b) string("[20~")\n\
-+ ~Shift<Key>F10: string(0x1b) string("[21~")\n\
++ ~s<Key>F1: string(0x1b) string("[11~")\n\
++ ~s<Key>F2: string(0x1b) string("[12~")\n\
++ ~s<Key>F3: string(0x1b) string("[13~")\n\
++ ~s<Key>F4: string(0x1b) string("[14~")\n\
++ ~s<Key>F5: string(0x1b) string("[15~")\n\
++ ~s<Key>F6: string(0x1b) string("[17~")\n\
++ ~s<Key>F7: string(0x1b) string("[18~")\n\
++ ~s<Key>F8: string(0x1b) string("[19~")\n\
++ ~s<Key>F9: string(0x1b) string("[20~")\n\
++ ~s<Key>F10: string(0x1b) string("[21~")\n\
+ <Key>F11: string(0x1b) string("[23~")\n\
+ <Key>F12: string(0x1b) string("[24~")\n\
+ <Key>F13: string(0x1b) string("[25~")\n\
+ <Key>F18: string(0x1b) string("[32~")\n\
+ <Key>F19: string(0x1b) string("[33~")\n\
+ <Key>F20: string(0x1b) string("[34~")\n\
-+ Shift<Key>F1: string(0x1b) string("[23~")\n\
-+ Shift<Key>F2: string(0x1b) string("[24~")\n\
-+ Shift<Key>F3: string(0x1b) string("[25~")\n\
-+ Shift<Key>F4: string(0x1b) string("[26~")\n\
-+ Shift<Key>F5: string(0x1b) string("[28~")\n\
-+ Shift<Key>F6: string(0x1b) string("[29~")\n\
-+ Shift<Key>F7: string(0x1b) string("[31~")\n\
-+ Shift<Key>F8: string(0x1b) string("[32~")\n\
-+ Shift<Key>F9: string(0x1b) string("[33~")\n\
-+ Shift<Key>F10: string(0x1b) string("[34~")\n\
-+ Shift<Key>Home: scroll-back(100,page)\n\
-+ Shift<Key>End: scroll-forw(100,page)\n\
-+ Shift<Key>KP_Home: scroll-back(100,page)\n\
-+ Shift<Key>KP_End: scroll-forw(100,page)\n\
+ s<Key>F1: string(0x1b) string("[23~")\n\
+ s<Key>F2: string(0x1b) string("[24~")\n\
+ s<Key>F3: string(0x1b) string("[25~")\n\
+ a<Key>Return: string(0x1b) string(0x0d)\n\
+ a<Key>Tab: string(0x1b) string(0x09)\n\
+ a<Key>space: string(0x1b) string(" ")\n\
++ a<Key>1: string(0x1b) string("1")\n\
++ a<Key>2: string(0x1b) string("2")\n\
++ a<Key>3: string(0x1b) string("3")\n\
++ a<Key>4: string(0x1b) string("4")\n\
++ a<Key>5: string(0x1b) string("5")\n\
++ a<Key>6: string(0x1b) string("6")\n\
++ a<Key>7: string(0x1b) string("7")\n\
++ a<Key>8: string(0x1b) string("8")\n\
++ a<Key>9: string(0x1b) string("9")\n\
++ a<Key>0: string(0x1b) string("0")\n\
+ a<Key>a: string(0x1b) string("a")\n\
+ a<Key>b: string(0x1b) string("b")\n\
+ a<Key>c: string(0x1b) string("c")\n\
+ a<Key>e: string(0x1b) string("e")\n\
+ a<Key>f: string(0x1b) string("f")\n\
+ a<Key>g: string(0x1b) string("g")\n\
++ a s<Key>h: string(0x1b) string("H")\n\
+ a<Key>h: string(0x1b) string("h")\n\
+ a<Key>i: string(0x1b) string("i")\n\
+ a<Key>j: string(0x1b) string("j")\n\
+ a<Key>x: string(0x1b) string("x")\n\
+ a<Key>y: string(0x1b) string("y")\n\
+ a<Key>z: string(0x1b) string("z")
++! a s<Key>/: string(0x1b) string("?")\n\
++! a s<Key>1: string(0x1b) string("!")