pool/xterm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 232778 from home:pcerny:factory

Browse Source 
- Patch #304 - 2014/05/03
  * add debugging check for parsing table entries, fixed a few
    inconsistencies.
  * handle utmp/utmpx strings consistently with new function that
    null-pads unused locations.
  * build-fix for imake configuration with FreeBSD 9 and later,
    to account for replacing utmp with utmpx.
  * improve handling of the fontsel (font-selection) menu item:
    + initialize the menu entry differently if the toolbar
      configuration is used, i.e., enabling it without attempting
      to use the current selection as a font name. Because of the
      way in which the toolbar is setup, this attempt usually
      failed, and would result in a warning.
    + if the menu action fails, e.g., no font can be loaded for
      the given selected name, then recover by resuming with the
      current font. Before, the recovery went to the default
      font. That was done to work around missing bitmap font in
      patch #276.
  * document OSC 119 in the control sequences listing (report by
    Egmont Koblinger).
  * modify special handling of XF86Paste or SunPaste keysyms (see
    patch #227) to use the standard shift/lock modifiers in case
    those are, for example, used in level 3 in an XKB file (patch
    by Matthieu Herrb).
  * configure macro updates:
    + drop the -no-gcc option from CF_INTEL_COMPILER
    + modify CF_XOPEN_SOURCE to suppress the check for defining
      _XOPEN_SOURCE on Solaris
  * reduce bss storage used for ReGIS/Sixel modules, as well as
    cleanup storage usage in other modules.

OBS-URL: https://build.opensuse.org/request/show/232778
OBS-URL: https://build.opensuse.org/package/show/X11:terminals/xterm?expand=0&rev=92
This commit is contained in:
Petr Cerny 2014-05-05 22:05:44 +00:00 committed by Git OBS Bridge
parent e98a89fb5f
commit 7927eeb02d
10 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xterm-303.tgz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8af29987bda9b77205ebf6233aaa5c347e5f2407310b62ac9ba92a658257f058
size 1129416

3
xterm-304.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d3af3934a7d27783005f1025a544d3dfede793b9444dec056bfefdefe02dd7a7
size 1159060

6
xterm-303.tgz.asc → xterm-304.tgz.asc
View File

@ -2,7 +2,7 @@
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info
iEYEABECAAYFAlMZMywACgkQcCNT4Pfkjtuv/wCgjtfbjk27jfWLMckIdB0nh7o8
nfcAn2z2RebAwZBwaM7ToTtKf5ENAol6
=AeDe
iEYEABECAAYFAlNlWTMACgkQcCNT4PfkjtsuBQCgkf0ZDbXnDWfJCeM8U8Pwe4CB
vQ4An2YxwOIfz07fxiWdfUGpELzDIzuK
=FTJD
-----END PGP SIGNATURE-----

20
xterm-double_width_fonts.patch
View File

@ -1,7 +1,7 @@
diff --git a/fontutils.c b/fontutils.c
--- a/fontutils.c
+++ b/fontutils.c
@@ -636,77 +636,29 @@ is_double_width_font(XFontStruct * fs)
@@ -641,77 +641,29 @@ is_double_width_font(XFontStruct *fs)
{
return ((2 * fs->min_bounds.width) == fs->max_bounds.width);
}
@ -11,7 +11,7 @@ diff --git a/fontutils.c b/fontutils.c
#if OPT_WIDE_CHARS && OPT_RENDERFONT && defined(HAVE_TYPE_FCCHAR32)
-#define HALF_WIDTH_TEST_STRING "1234567890"
-
-/* '1234567890' in Chinese characters in UTF-8 */
-#define FULL_WIDTH_TEST_STRING "\xe4\xb8\x80\xe4\xba\x8c\xe4\xb8\x89" \
- "\xe5\x9b\x9b\xe4\xba\x94" \
@ -26,18 +26,19 @@ diff --git a/fontutils.c b/fontutils.c
-
-#define HALF_WIDTH_CHAR1 0x0031 /* '1' */
-#define HALF_WIDTH_CHAR2 0x0057 /* 'W' */
+
#define FULL_WIDTH_CHAR1 0x4E00 /* CJK Ideograph 'number one' */
#define FULL_WIDTH_CHAR2 0xAC00 /* Korean script syllable 'Ka' */
static Bool
is_double_width_font_xft(Display *dpy, XftFont * font)
is_double_width_font_xft(Display *dpy, XftFont *font)
{
- XGlyphInfo gi1, gi2;
- FcChar32 c1 = HALF_WIDTH_CHAR1, c2 = HALF_WIDTH_CHAR2;
- String fwstr = FULL_WIDTH_TEST_STRING;
- String hwstr = HALF_WIDTH_TEST_STRING;
-
/* Some Korean fonts don't have Chinese characters at all. */
- /* Some Korean fonts don't have Chinese characters at all. */
- if (!XftCharExists(dpy, font, FULL_WIDTH_CHAR1)) {
- if (!XftCharExists(dpy, font, FULL_WIDTH_CHAR2))
- return False; /* Not a CJK font */
@ -71,11 +72,12 @@ diff --git a/fontutils.c b/fontutils.c
- * In the meantime, we have to check both possibilities.
- */
- return ((2 * gi1.xOff == gi2.xOff) || (gi1.xOff == gi2.xOff));
+ if (XftCharExists(dpy, font, FULL_WIDTH_CHAR1) ||
+ XftCharExists(dpy, font, FULL_WIDTH_CHAR2))
+ return True; /* CJK font */
+ else
+ return False; /* Not a CJK font */
+ /* Some Korean fonts don't have Chinese characters at all. */
+ if (XftCharExists(dpy, font, FULL_WIDTH_CHAR1) ||
+ XftCharExists(dpy, font, FULL_WIDTH_CHAR2))
+ return True; /* CJK font */
+ else
+ return False; /* Not a CJK font */
}
#else
#define is_double_width_font_xft(dpy, xftfont) 0

2
xterm-enable_libtinfo.patch
View File

@ -29,7 +29,7 @@ diff --git a/aclocal.m4 b/aclocal.m4
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5581,20 +5581,20 @@ echo "$as_me:5580: checking for $cf_test
@@ -5585,20 +5585,20 @@ echo "$as_me:5584: checking for $cf_test
echo $ECHO_N "checking for $cf_test_message function... $ECHO_C" >&6
if test "${cf_cv_lib_tgetent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6

2
xterm-forbid_window_and_font_ops.patch
View File

@ -28,7 +28,7 @@ diff --git a/XTerm.ad b/XTerm.ad
diff --git a/xterm.man b/xterm.man
--- a/xterm.man
+++ b/xterm.man
@@ -1702,17 +1702,17 @@ The default is \*(``false\*(''.
@@ -1809,17 +1809,17 @@ The default is \*(``false\*(''.
.TP
.B "allowColorOps (\fPclass\fB AllowColorOps)"
Specifies whether control sequences that set/query the dynamic colors should be allowed.

2
xterm-settings.patch
View File

@ -286,7 +286,7 @@ diff --git a/XTerm.ad b/XTerm.ad
diff --git a/xterm.man b/xterm.man
--- a/xterm.man
+++ b/xterm.man
@@ -4032,19 +4032,23 @@ This option specifies the font to be use
@@ -4144,19 +4144,23 @@ This option specifies the font to be use
in the \*(``OverTheSpot\*('' input method.
.IP
In \*(``OverTheSpot\*('' preedit type, the preedit (preconversion)

2
xterm-sigwinch.patch
View File

@ -1,7 +1,7 @@
diff --git a/screen.c b/screen.c
--- a/screen.c
+++ b/screen.c
@@ -2211,17 +2211,17 @@ ScreenResize(XtermWidget xw,
@@ -2207,17 +2207,17 @@ ScreenResize(XtermWidget xw,
#ifdef USE_STRUCT_WINSIZE
ts.ws_xpixel = (ttySize_t) width;
ts.ws_ypixel = (ttySize_t) height;

38
xterm.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Mon May 5 19:31:19 UTC 2014 - pcerny@suse.com
- Patch #304 - 2014/05/03
* add debugging check for parsing table entries, fixed a few
inconsistencies.
* handle utmp/utmpx strings consistently with new function that
null-pads unused locations.
* build-fix for imake configuration with FreeBSD 9 and later,
to account for replacing utmp with utmpx.
* improve handling of the fontsel (font-selection) menu item:
+ initialize the menu entry differently if the toolbar
configuration is used, i.e., enabling it without attempting
to use the current selection as a font name. Because of the
way in which the toolbar is setup, this attempt usually
failed, and would result in a warning.
+ if the menu action fails, e.g., no font can be loaded for
the given selected name, then recover by resuming with the
current font. Before, the recovery went to the default
font. That was done to work around missing bitmap font in
patch #276.
* document OSC 119 in the control sequences listing (report by
Egmont Koblinger).
* modify special handling of XF86Paste or SunPaste keysyms (see
patch #227) to use the standard shift/lock modifiers in case
those are, for example, used in level 3 in an XKB file (patch
by Matthieu Herrb).
* configure macro updates:
+ drop the -no-gcc option from CF_INTEL_COMPILER
+ modify CF_XOPEN_SOURCE to suppress the check for defining
_XOPEN_SOURCE on Solaris
* reduce bss storage used for ReGIS/Sixel modules, as well as
cleanup storage usage in other modules.
* initial changes for ReGIS support (patch by Ross Combs):
+ document control-sequences
+ separate ifdef's for sixel and color-register features
+ add configuration for VT382
-------------------------------------------------------------------
Fri Mar 7 07:00:52 UTC 2014 - meissner@suse.com

2
xterm.spec
View File

@ -52,7 +52,7 @@ Provides: xorg-x11:/usr/X11R6/bin/xterm
%if 0%{?suse_version} > 1210
Requires: luit
%endif
Version: 303
Version: 304
Release: 0
Summary: The basic X terminal program
License: MIT