OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xterm?expand=0&rev=12

p_xterm-settings.diff

@@ -1,6 +1,5 @@
-diff -u -N -r ../xterm-212.orig/UXTerm.ad ./UXTerm.ad
+--- UXTerm.ad
---- ../xterm-212.orig/UXTerm.ad	2006-02-13 02:14:58.000000000 +0100
++++ UXTerm.ad	2006-04-15 21:39:45.509398000 +0200
-+++ ./UXTerm.ad	2006-04-15 21:39:45.509398735 +0200
 @@ -6,8 +6,14 @@
  ! to set resources for UTF-8 mode with corresponding fonts.
  ! See the uxterm script for an example.
@@ -52,9 +51,8 @@ diff -u -N -r ../xterm-212.orig/UXTerm.ad ./UXTerm.ad
  
  ! Here is an alternate set of fonts with better support for bold:
  !*VT100.font2:	-efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1
-diff -u -N -r ../xterm-212.orig/XTerm-col.ad ./XTerm-col.ad
+--- XTerm-col.ad
---- ../xterm-212.orig/XTerm-col.ad	2005-09-19 01:48:12.000000000 +0200
++++ XTerm-col.ad	2006-04-15 21:32:22.000000000 +0200
-+++ ./XTerm-col.ad	2006-04-15 21:32:22.000000000 +0200
 @@ -46,15 +46,15 @@
  *VT100*color1: red3
  *VT100*color2: green3
@@ -74,10 +72,9 @@ diff -u -N -r ../xterm-212.orig/XTerm-col.ad ./XTerm-col.ad
  *VT100*color13: magenta
  *VT100*color14: cyan
  *VT100*color15: white
-diff -u -N -r ../xterm-212.orig/XTerm.ad ./XTerm.ad
+--- XTerm.ad
---- ../xterm-212.orig/XTerm.ad	2006-04-10 02:34:36.000000000 +0200
++++ XTerm.ad	2007-07-12 17:16:32.931201796 +0200
-+++ ./XTerm.ad	2006-04-15 21:36:48.099315161 +0200
+@@ -67,21 +67,41 @@
-@@ -66,21 +66,41 @@
  *vtMenu*vthide*Label:  Hide VT Window
  *vtMenu*altscreen*Label:  Show Alternate Screen
  
@@ -126,7 +123,7 @@ diff -u -N -r ../xterm-212.orig/XTerm.ad ./XTerm.ad
  *fontMenu*fontescape*Label:	Escape Sequence
  *fontMenu*fontsel*Label:	Selection
  !fontescape and fontsel overridden by application
-@@ -91,12 +111,13 @@
+@@ -92,12 +112,13 @@
  *fontMenu*utf8-mode*Label:	UTF-8
  *fontMenu*utf8-title*Label:	UTF-8 Titles
  
@@ -146,7 +143,7 @@ diff -u -N -r ../xterm-212.orig/XTerm.ad ./XTerm.ad
  
  *tekMenu.Label:  Tek Options
  *tekMenu*tektextlarge*Label:  Large Characters
-@@ -186,3 +207,58 @@
+@@ -187,3 +208,56 @@
  !
  ! Alternatively,
  !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
@@ -183,11 +180,9 @@ diff -u -N -r ../xterm-212.orig/XTerm.ad ./XTerm.ad
 +
 +!! If Alt is not Meta use it for emacs line editing of e.g. bash,
 +!! define Pause key, and ignore DRemove on foreign displays.
++*altIsNotMeta:     true
++*altSendsEscape:   true
 +*VT100.Translations: #override \
-+   Alt<KeyPress>Shift_L,Alt<KeyPress>: string(0x01B) insert() \n\
-+   Alt<KeyPress>Shift_R,Alt<KeyPress>: string(0x01B) insert() \n\
-+   Alt Ctrl <KeyPress>: string(0x01B) insert() \n\
-+   Alt      <KeyPress>: string(0x01B) insert() \n\
 +   <Key>Pause:   string("\033[P") \n\
 +   <Key>DRemove: ignore()
 +
@@ -205,10 +200,9 @@ diff -u -N -r ../xterm-212.orig/XTerm.ad ./XTerm.ad
 +*charClass:  33:48,37:48,43:48,45-47:48,64:48,126:48,95:48
 +!! Bug #52655
 +*utf8Title: true
-diff -u -N -r ../xterm-212.orig/xterm.man ./xterm.man
+--- xterm.man
---- ../xterm-212.orig/xterm.man	2006-04-10 02:34:37.000000000 +0200
++++ xterm.man	2006-04-15 21:32:22.000000000 +0200
-+++ ./xterm.man	2006-04-15 21:32:22.000000000 +0200
+@@ -1153,7 +1153,8 @@ Application specific resources (e.g., "\
-@@ -1107,7 +1107,8 @@
  Tie the VTxxx \fBbackarrowKey\fP and \fBptyInitialErase\fP resources
  together by setting the DECBKM state according to whether the initial value of
  stty erase is a backspace (8) or delete (127) character.
@@ -218,7 +212,7 @@ diff -u -N -r ../xterm-212.orig/xterm.man ./xterm.man
  .TP 8
  .B "hold (\fPclass\fB Hold)"
  If true,
-@@ -2132,8 +2133,8 @@
+@@ -2415,8 +2416,8 @@ The default is
  ``XtDefaultBackground.''
  .TP 8
  .B "pointerShape (\fPclass\fB Cursor)"
@@ -228,8 +222,8 @@ diff -u -N -r ../xterm-212.orig/xterm.man ./xterm.man
 +Specifies the name of the shape of the pointer.  The default is ``top_left_arrow.''
  .TP 8
  .B "popOnBell (\fPclass\fB PopOnBell)"
- Specifies whether the window would be raised when Control-G is
+ Specifies whether the window would be raised when Control-G is received.
-@@ -2230,7 +2231,8 @@
+@@ -2512,7 +2513,8 @@ The default is 64.
  .B "scrollBar (\fPclass\fB ScrollBar)"
  Specifies whether or not the scrollbar should be displayed.
  The default is

xterm.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jul 12 17:19:32 CEST 2007 - werner@suse.de
+
+- no longer overwrite translation for the key ALT, use altIsNotMeta
+  to leave it for users choise using Meta or Alt mode (bug #262330)
+- add snooper to the sources which enables to seek for character
+  sequences used by e.g. xterm in Alt mode (bug #262330)
+
 -------------------------------------------------------------------
 Mon Jul  9 21:53:00 CEST 2007 - sndirsch@suse.de
 

xterm.spec

@@ -19,7 +19,7 @@ Group:          System/X11/Utilities
 Provides:       xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm
 Autoreqprov:    on
 Version:        227
-Release:        2
+Release:        4
 Summary:        The basic X terminal program
 Source:         %name.tar.gz
 Source1:        luitx
@@ -30,6 +30,8 @@ Source6:        terminal.png
 Source7:        vttest.tar.gz
 Source8:        20x20ja.bdf.bz2
 Source9:        20x20ko.bdf.bz2
+# Snoop for the escape sequence assignment of the keypad
+Source20:       snooper.tar.bz2
 Patch1:         p_xterm-settings.diff  
 Patch2:         p_xterm-sigwinch.diff
 Patch3:         bug-246573-tentative-patch.diff
@@ -258,6 +260,11 @@ rm -rf $RPM_BUILD_ROOT
 /usr/share/pixmaps/*
 
 %changelog
+* Thu Jul 12 2007 - werner@suse.de
+- no longer overwrite translation for the key ALT, use altIsNotMeta
+  to leave it for users choise using Meta or Alt mode (bug #262330)
+- add snooper to the sources which enables to seek for character
+  sequences used by e.g. xterm in Alt mode (bug #262330)
 * Mon Jul 09 2007 - sndirsch@suse.de
 - no longer package /usr/share/pixmaps to fix build
 * Sat Jun 30 2007 - sndirsch@suse.de