This commit is contained in:
parent
e49c6f5308
commit
c959cf5da7
@ -1,6 +1,7 @@
|
|||||||
--- UXTerm.ad
|
diff -ru xterm-239.orig//UXTerm.ad xterm-239/UXTerm.ad
|
||||||
+++ UXTerm.ad 2006-04-15 21:39:45.509398000 +0200
|
--- xterm-239.orig//UXTerm.ad 2006-02-13 02:14:58.000000000 +0100
|
||||||
@@ -6,8 +6,14 @@
|
+++ xterm-239/UXTerm.ad 2009-01-29 15:54:12.000000000 +0100
|
||||||
|
@@ -6,8 +6,19 @@
|
||||||
! to set resources for UTF-8 mode with corresponding fonts.
|
! to set resources for UTF-8 mode with corresponding fonts.
|
||||||
! See the uxterm script for an example.
|
! See the uxterm script for an example.
|
||||||
|
|
||||||
@ -11,11 +12,16 @@
|
|||||||
|
|
||||||
+! always use iso10646-1 fonts and luit for non-UTF-8 locales:
|
+! always use iso10646-1 fonts and luit for non-UTF-8 locales:
|
||||||
+*locale: true
|
+*locale: true
|
||||||
|
+
|
||||||
|
+! don't use the compiled in default of "*" for ximFont because this
|
||||||
|
+! leads to very slow startup times for zh_CN.UTF-8 and zh_HK.UTF-8 locales
|
||||||
|
+! (For details see https://bugzilla.novell.com/show_bug.cgi?id=464930):
|
||||||
|
+*ximFont: fixed
|
||||||
+
|
+
|
||||||
*fontMenu.Label: Unicode Fonts
|
*fontMenu.Label: Unicode Fonts
|
||||||
*VT100.utf8: 1
|
*VT100.utf8: 1
|
||||||
|
|
||||||
@@ -31,12 +37,29 @@
|
@@ -31,12 +42,29 @@
|
||||||
! Making the wide fonts associated with *VT100.font in this file allows uxterm
|
! Making the wide fonts associated with *VT100.font in this file allows uxterm
|
||||||
! to skip that step. It will use the fonts that the XTerm file gives for the
|
! to skip that step. It will use the fonts that the XTerm file gives for the
|
||||||
! *VT100.uft8Fonts.font pattern.
|
! *VT100.uft8Fonts.font pattern.
|
||||||
@ -51,8 +57,9 @@
|
|||||||
|
|
||||||
! Here is an alternate set of fonts with better support for bold:
|
! 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
|
!*VT100.font2: -efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1
|
||||||
--- XTerm-col.ad
|
diff -ru xterm-239.orig//XTerm-col.ad xterm-239/XTerm-col.ad
|
||||||
+++ XTerm-col.ad 2006-04-15 21:32:22.000000000 +0200
|
--- xterm-239.orig//XTerm-col.ad 2006-06-24 16:57:29.000000000 +0200
|
||||||
|
+++ xterm-239/XTerm-col.ad 2009-01-29 13:02:36.000000000 +0100
|
||||||
@@ -46,15 +46,15 @@
|
@@ -46,15 +46,15 @@
|
||||||
*VT100*color1: red3
|
*VT100*color1: red3
|
||||||
*VT100*color2: green3
|
*VT100*color2: green3
|
||||||
@ -72,15 +79,21 @@
|
|||||||
*VT100*color13: magenta
|
*VT100*color13: magenta
|
||||||
*VT100*color14: cyan
|
*VT100*color14: cyan
|
||||||
*VT100*color15: white
|
*VT100*color15: white
|
||||||
--- XTerm.ad
|
diff -ru xterm-239.orig//XTerm.ad xterm-239/XTerm.ad
|
||||||
+++ XTerm.ad 2007-07-12 17:16:32.931201796 +0200
|
--- xterm-239.orig//XTerm.ad 2007-11-26 19:42:37.000000000 +0100
|
||||||
@@ -67,21 +67,41 @@
|
+++ xterm-239/XTerm.ad 2009-01-29 15:54:00.000000000 +0100
|
||||||
|
@@ -67,21 +67,46 @@
|
||||||
*vtMenu*vthide*Label: Hide VT Window
|
*vtMenu*vthide*Label: Hide VT Window
|
||||||
*vtMenu*altscreen*Label: Show Alternate Screen
|
*vtMenu*altscreen*Label: Show Alternate Screen
|
||||||
|
|
||||||
+! always use iso10646-1 fonts and luit for non-UTF-8 locales:
|
+! always use iso10646-1 fonts and luit for non-UTF-8 locales:
|
||||||
+*locale: checkfont
|
+*locale: checkfont
|
||||||
+*localeFilter: /usr/bin/luitx
|
+*localeFilter: /usr/bin/luitx
|
||||||
|
+
|
||||||
|
+! don't use the compiled in default of "*" for ximFont because this
|
||||||
|
+! leads to very slow startup times for zh_CN.UTF-8 and zh_HK.UTF-8 locales
|
||||||
|
+! (For details see https://bugzilla.novell.com/show_bug.cgi?id=464930):
|
||||||
|
+*ximFont: fixed
|
||||||
+
|
+
|
||||||
*fontMenu.Label: VT Fonts
|
*fontMenu.Label: VT Fonts
|
||||||
*fontMenu*fontdefault*Label: Default
|
*fontMenu*fontdefault*Label: Default
|
||||||
@ -123,7 +136,7 @@
|
|||||||
*fontMenu*fontescape*Label: Escape Sequence
|
*fontMenu*fontescape*Label: Escape Sequence
|
||||||
*fontMenu*fontsel*Label: Selection
|
*fontMenu*fontsel*Label: Selection
|
||||||
!fontescape and fontsel overridden by application
|
!fontescape and fontsel overridden by application
|
||||||
@@ -92,12 +112,13 @@
|
@@ -92,12 +117,13 @@
|
||||||
*fontMenu*utf8-mode*Label: UTF-8
|
*fontMenu*utf8-mode*Label: UTF-8
|
||||||
*fontMenu*utf8-title*Label: UTF-8 Titles
|
*fontMenu*utf8-title*Label: UTF-8 Titles
|
||||||
|
|
||||||
@ -143,7 +156,7 @@
|
|||||||
|
|
||||||
*tekMenu.Label: Tek Options
|
*tekMenu.Label: Tek Options
|
||||||
*tekMenu*tektextlarge*Label: Large Characters
|
*tekMenu*tektextlarge*Label: Large Characters
|
||||||
@@ -187,3 +208,58 @@
|
@@ -187,3 +213,58 @@
|
||||||
!
|
!
|
||||||
! Alternatively,
|
! Alternatively,
|
||||||
!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
|
!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
|
||||||
@ -202,9 +215,10 @@
|
|||||||
+*charClass: 33:48,37:48,43:48,45-47:48,64:48,126:48,95:48
|
+*charClass: 33:48,37:48,43:48,45-47:48,64:48,126:48,95:48
|
||||||
+!! Bug #52655
|
+!! Bug #52655
|
||||||
+*utf8Title: true
|
+*utf8Title: true
|
||||||
--- xterm.man
|
diff -ru xterm-239.orig//xterm.man xterm-239/xterm.man
|
||||||
+++ xterm.man 2006-04-15 21:32:22.000000000 +0200
|
--- xterm-239.orig//xterm.man 2008-12-30 12:23:59.000000000 +0100
|
||||||
@@ -1153,7 +1153,8 @@ Application specific resources (e.g., "\
|
+++ xterm-239/xterm.man 2009-01-29 15:51:54.000000000 +0100
|
||||||
|
@@ -1169,7 +1169,8 @@
|
||||||
Tie the VTxxx \fBbackarrowKey\fP and \fBptyInitialErase\fP resources
|
Tie the VTxxx \fBbackarrowKey\fP and \fBptyInitialErase\fP resources
|
||||||
together by setting the DECBKM state according to whether the initial value of
|
together by setting the DECBKM state according to whether the initial value of
|
||||||
stty erase is a backspace (8) or delete (127) character.
|
stty erase is a backspace (8) or delete (127) character.
|
||||||
@ -214,8 +228,8 @@
|
|||||||
.TP 8
|
.TP 8
|
||||||
.B "hold (\fPclass\fB Hold)"
|
.B "hold (\fPclass\fB Hold)"
|
||||||
If true,
|
If true,
|
||||||
@@ -2415,8 +2416,8 @@ The default is
|
@@ -2587,8 +2588,8 @@
|
||||||
``XtDefaultBackground.''
|
.RE
|
||||||
.TP 8
|
.TP 8
|
||||||
.B "pointerShape (\fPclass\fB Cursor)"
|
.B "pointerShape (\fPclass\fB Cursor)"
|
||||||
-Specifies the name of the shape of the pointer.
|
-Specifies the name of the shape of the pointer.
|
||||||
@ -225,7 +239,7 @@
|
|||||||
.TP 8
|
.TP 8
|
||||||
.B "popOnBell (\fPclass\fB PopOnBell)"
|
.B "popOnBell (\fPclass\fB PopOnBell)"
|
||||||
Specifies whether the window would be raised when Control-G is received.
|
Specifies whether the window would be raised when Control-G is received.
|
||||||
@@ -2512,7 +2513,8 @@ The default is 64.
|
@@ -2690,7 +2691,8 @@
|
||||||
.B "scrollBar (\fPclass\fB ScrollBar)"
|
.B "scrollBar (\fPclass\fB ScrollBar)"
|
||||||
Specifies whether or not the scrollbar should be displayed.
|
Specifies whether or not the scrollbar should be displayed.
|
||||||
The default is
|
The default is
|
||||||
@ -235,3 +249,20 @@
|
|||||||
.TP 8
|
.TP 8
|
||||||
.B "scrollBarBorder (\fPclass\fB ScrollBarBorder)"
|
.B "scrollBarBorder (\fPclass\fB ScrollBarBorder)"
|
||||||
Specifies the width of the scrollbar border.
|
Specifies the width of the scrollbar border.
|
||||||
|
@@ -2945,9 +2947,13 @@
|
||||||
|
The XIM client must inform the XIM server of the cursor position.
|
||||||
|
For best results, the preedit string must be displayed with a proper font.
|
||||||
|
Therefore, \fIxterm\fP informs the XIM server of the proper font.
|
||||||
|
-The font is be supplied by a "fontset", whose default value is "*".
|
||||||
|
-This matches every font, the X library automatically chooses fonts with
|
||||||
|
-proper charsets.
|
||||||
|
+The font is be supplied by a "fontset", whose default value is
|
||||||
|
+"fixed" on openSUSE. The upstream default value is "*"
|
||||||
|
+which matches every font, the X library automatically chooses fonts with
|
||||||
|
+proper charsets. But this can be extremely slow in some locales and
|
||||||
|
+at least for the XIM servers "scim" and "kinput2" it doesn't improve
|
||||||
|
+anything, it just slows down the startup time of xterm.
|
||||||
|
+
|
||||||
|
The \fBximFont\fP resource is provided to override this default font setting.
|
||||||
|
.\"
|
||||||
|
.SS Tek4014 Widget Resources
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 29 15:55:23 CET 2009 - mfabian@suse.de
|
||||||
|
|
||||||
|
- bnc#464930: change the default for the ximFont resource from "*"
|
||||||
|
to "fixed", this still works fine with the XIM servers "scim"
|
||||||
|
and "kinput2" and speeds up the startup time of xterm
|
||||||
|
dramatically in zh_CN.UTF-8 and zh_HK.UTF-8 locales.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jan 13 14:39:25 CET 2009 - meissner@suse.de
|
Tue Jan 13 14:39:25 CET 2009 - meissner@suse.de
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ Group: System/X11/Utilities
|
|||||||
Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm
|
Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 239
|
Version: 239
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: The basic X terminal program
|
Summary: The basic X terminal program
|
||||||
Source: ftp://invisible-island.net/xterm/%name-%version.tar.bz2
|
Source: ftp://invisible-island.net/xterm/%name-%version.tar.bz2
|
||||||
Source1: luitx
|
Source1: luitx
|
||||||
@ -164,7 +164,7 @@ Authors:
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -b7
|
%setup -q -b7
|
||||||
%patch1 -p0 -b .xterm-settings
|
%patch1 -p1 -b .xterm-settings
|
||||||
%patch2 -p0 -b .xterm-sigwinch
|
%patch2 -p0 -b .xterm-sigwinch
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p0
|
%patch4 -p0
|
||||||
@ -279,6 +279,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
/usr/share/pixmaps/*
|
/usr/share/pixmaps/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 29 2009 mfabian@suse.de
|
||||||
|
- bnc#464930: change the default for the ximFont resource from "*"
|
||||||
|
to "fixed", this still works fine with the XIM servers "scim"
|
||||||
|
and "kinput2" and speeds up the startup time of xterm
|
||||||
|
dramatically in zh_CN.UTF-8 and zh_HK.UTF-8 locales.
|
||||||
* Tue Jan 13 2009 meissner@suse.de
|
* Tue Jan 13 2009 meissner@suse.de
|
||||||
- update to release xterm-239
|
- update to release xterm-239
|
||||||
* correct a cast in input.c, which broke translation of numeric
|
* correct a cast in input.c, which broke translation of numeric
|
||||||
|
Loading…
Reference in New Issue
Block a user