- added x11r6.9.0-mitri.diff (official CVE-2006-1525 fix)

[packages/X11.git] / XTerm.ad-pl

diff --git a/XTerm.ad-pl b/XTerm.ad-pl
index 5e0d6fa7319bcf168785a909e1bdcb781a573f23..e4bcbf5fc7f4f4f5174891a68176a66125648ec5 100644 (file)
--- a/XTerm.ad-pl
+++ b/XTerm.ad-pl
@@ -86,19 +86,19 @@ NXTerm.JoinSession:                 False
 
 *fontMenu.Label:                       Font terminala
 *fontMenu*fontdefault*Label:           Domy¶lny   (iso-8859-2)
-#VT100*font:                           -misc-*-bold-*-*-*-15-*-*-*-*-*-*-2
-*fontMenu*font1*Label:                 Nieczytelny
-*VT100*font1:                          nil2
-*fontMenu*font2*Label:                 Bardzo ma³y
-*VT100*font2:                          5x7
-*fontMenu*font3*Label:                 Ma³y
-*VT100*font3:                          6x10
-*fontMenu*font4*Label:                 ¦redni
-*VT100*font4:                          7x13
+*VT100*font:                           -misc-fixed-medium-r-*-*-13-*-*-*-*-*-*-2
+*fontMenu*font1*Label:                 Nieczytelny (iso-8859-2)
+*VT100*font1:                          -misc-fixed-medium-r-*-*-7-*-*-*-*-*-*-2
+*fontMenu*font2*Label:                 Bardzo ma³y (iso-8859-2)
+*VT100*font2:                          -misc-fixed-medium-r-*-*-10-*-*-*-*-*-*-2
+*fontMenu*font3*Label:                 Ma³y        (iso-8859-2)
+*VT100*font3:                          -misc-fixed-medium-r-semicondensed-*-13-*-*-*-*-*-*-2
+*fontMenu*font4*Label:                 ¦redni      (iso-8859-2)
+*VT100*font4:                          -misc-fixed-medium-r-*-*-15-*-*-*-*-*-*-2
 *fontMenu*font5*Label:                 Du¿y        (iso-8859-2)
-*VT100*font5:                          -misc-*-medium-*-*-*-15-*-*-*-*-*-*-2
+*VT100*font5:                          -misc-fixed-medium-r-*-*-18-*-*-*-*-*-*-2
 *fontMenu*font6*Label:                 Bardzo du¿y (iso-8859-2)
-*VT100*font6:                          -misc-*-medium-*-*-*-20-*-*-*-*-*-*-2
+*VT100*font6:                          -misc-fixed-medium-r-*-*-20-*-*-*-*-*-*-2
 *fontMenu*fontescape*Label:            Escape Sequence
 *fontMenu*fontsel*Label:               Zaznaczony
 !fontescape and fontsel overridden by application
@@ -193,40 +193,32 @@ NXTerm.JoinSession:                       False
        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(0x7f)\n\
        Meta<Key>BackSpace: string(0x1b) string(0x08)\n\
        Ctrl Shift<Key>Up: string(0x1b) string("[1;6A")\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\
+       Shift<Key>Up: string(0x1b) string("[1;2A")\n\
+       Meta<Key>Up: string(0x1b) string("[1;3A")\n\
        Ctrl Shift<Key>Down: string(0x1b) string("[1;6B")\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\
+       Shift<Key>Down: string(0x1b) string("[1;2B")\n\
+       Meta<Key>Down: string(0x1b) string("[1;3B")\n\
        Ctrl Shift<Key>Left: string(0x1b) string("[1;6D")\n\
        Ctrl<Key>Left: string(0x1b) string("[1;5D")\n\
-       Shift<Key>Left: string(0x1b) string("O2D")\n\
+       Shift<Key>Left: string(0x1b) string("[1;2D")\n\
        Mod5<Key>Left: string(0x1b) string("b")\n\
-       ~Meta<Key>Left: string(0x1b) string("OD")\n\
-       Meta<Key>Left: string(0x1b) string(0x1b) string("OD")\n\
+       Meta<Key>Left: string(0x1b) string("[1;3D")\n\
        Ctrl Shift<Key>Right: string(0x1b) string("[1;6C")\n\
        Ctrl<Key>Right: string(0x1b) string("[1;5C")\n\
-       Shift<Key>Right: string(0x1b) string("O2C")\n\
+       Shift<Key>Right: string(0x1b) string("[1;2C")\n\
        Mod5<Key>Right: string(0x1b) string("f")\n\
-       ~Meta<Key>Right: string(0x1b) string("OC")\n\
-       Meta<Key>Right: string(0x1b) string(0x1b) string("OC")\n\
+       Meta<Key>Right: string(0x1b) string("[1;3C")\n\
        ~Meta<Key>Return: string(0x0d)\n\
        Meta<Key>Return: string(0x1b) string(0x0d)\n\
        Ctrl<Key>Tab: string(0x1b) string(0x09)\n\
        Mod5<Key>Tab: string(0x1b) string(0x09)\n\
        ~Meta<Key>Tab: string(0x09)\n\
        Meta<Key>Tab: string(0x1b) string(0x09)\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\
@@ -243,21 +235,16 @@ NXTerm.JoinSession:                       False
        <Key>F18: string(0x1b) string("[32~")\n\
        <Key>F19: string(0x1b) string("[33~")\n\
        <Key>F20: string(0x1b) string("[34~")\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\
-       s<Key>F4: string(0x1b) string("[26~")\n\
        s<Key>F5: string(0x1b) string("[28~")\n\
        s<Key>F6: string(0x1b) string("[29~")\n\
        s<Key>F7: string(0x1b) string("[31~")\n\
        s<Key>F8: string(0x1b) string("[32~")\n\
        s<Key>F9: string(0x1b) string("[33~")\n\
        s<Key>F10: string(0x1b) string("[34~")\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 s<Key>question: string(0x1b) string("?")\n\
        a s<Key>exclam: string(0x1b) string("!")\n\
+       a <Key>period: string(0x1b) string(".")\n\
        a<Key>`: string(0x1b) string("`")\n\
        a<Key>1: string(0x1b) string("1")\n\
        a<Key>2: string(0x1b) string("2")\n\