rpms/xterm/devel xterm-223-border.patch, NONE, 1.1 xterm-223-fontsize.patch, NONE, 1.1 xterm-223-resources.patch, NONE, 1.1 xterm.spec, 1.50, 1.51 xterm-212-redhat-resources.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Jan 18 14:35:33 UTC 2007
Author: mlichvar
Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32327
Modified Files:
xterm.spec
Added Files:
xterm-223-border.patch xterm-223-fontsize.patch
xterm-223-resources.patch
Removed Files:
xterm-212-redhat-resources.patch
Log Message:
- make xterm binary sgid utempter (#222847)
- fix font size changes with -fa option (#222340)
- fix redrawing of internal border (#223027)
- enable metaSendsEscape resource and set modifyFunctionKeys to 0 by default
Resolves: #222847, #222340, #223027
xterm-223-border.patch:
util.c | 4 +---
1 files changed, 1 insertion(+), 3 deletions(-)
--- NEW FILE xterm-223-border.patch ---
--- xterm-223/util.c.border 2006-11-29 23:52:10.000000000 +0100
+++ xterm-223/util.c 2007-01-18 15:04:43.000000000 +0100
@@ -1433,9 +1433,7 @@
y0 = (rect_y - OriginY(screen));
y1 = (y0 + rect_height);
- if (getXtermBackground(xw, xw->flags, xw->cur_background) !=
- xw->core.background_pixel &&
- (x0 < 0 ||
+ if ((x0 < 0 ||
y0 < 0 ||
x1 > Width(screen) ||
y1 > Height(screen))) {
xterm-223-fontsize.patch:
charproc.c | 71 +++++++++++++++++++++++++++++++++++++--------------------
fontutils.c | 5 ++--
menu.c | 6 ++--
misc.c | 11 +++++---
version.h | 4 +--
xterm.log.html | 16 ++++++++++++
6 files changed, 77 insertions(+), 36 deletions(-)
--- NEW FILE xterm-223-fontsize.patch ---
# patch by Thomas E. Dickey <dickey at invisible-island.net>
# created Wed Jan 17 01:22:38 UTC 2007
# ------------------------------------------------------------------------------
# charproc.c | 71 ++++++++++++++++++++++++++++++++++++-------------------
# fontutils.c | 5 ++-
# menu.c | 6 ++--
# misc.c | 11 +++++---
# version.h | 4 +--
# xterm.log.html | 16 +++++++++++-
# 6 files changed, 77 insertions(+), 36 deletions(-)
# ------------------------------------------------------------------------------
Index: charproc.c
--- xterm-223+/charproc.c 2006-11-28 20:45:37.000000000 +0000
+++ xterm-223b/charproc.c 2007-01-17 01:18:01.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.740 2006/11/28 20:45:37 tom Exp $ */
+/* $XTermId: charproc.c,v 1.742 2007/01/17 01:18:01 tom Exp $ */
/* $XFree86: xc/programs/xterm/charproc.c,v 3.185 2006/06/20 00:42:38 dickey Exp $ */
@@ -7446,35 +7446,55 @@
/* ARGSUSED */
static void
-DoSetSelectedFont(Widget w GCC_UNUSED,
+DoSetSelectedFont(Widget w,
XtPointer client_data GCC_UNUSED,
Atom * selection GCC_UNUSED,
Atom * type,
XtPointer value,
- unsigned long *length GCC_UNUSED,
+ unsigned long *length,
int *format)
{
- char *val = (char *) value;
- int len;
- if (*type != XA_STRING || *format != 8) {
+ if (!IsXtermWidget(w) || *type != XA_STRING || *format != 8) {
Bell(XkbBI_MinorError, 0);
- return;
- }
- len = strlen(val);
- if (len > 0) {
- if (val[len - 1] == '\n')
- val[len - 1] = '\0';
- /* Do some sanity checking to avoid sending a long selection
- back to the server in an OpenFont that is unlikely to succeed.
- XLFD allows up to 255 characters and no control characters;
- we are a little more liberal here. */
- if (len > 1000 || strchr(val, '\n'))
- return;
- if (!xtermLoadFont(term,
- xtermFontName(val),
- True,
- fontMenu_fontsel))
- Bell(XkbBI_MinorError, 0);
+ } else {
+ XtermWidget xw = (XtermWidget) w;
+ char *save = xw->screen.MenuFontName(fontMenu_fontsel);
+ char *val = (char *) value;
+ char *test = 0;
+ char *used = 0;
+ int len = strlen(val);
+
+ if (len > (int) *length) {
+ len = (int) *length;
+ }
+ if (len > 0) {
+ val[len] = '\0';
+ used = x_strtrim(val);
+ TRACE(("DoSetSelectedFont(%s)\n", val));
+ /* Do some sanity checking to avoid sending a long selection
+ back to the server in an OpenFont that is unlikely to succeed.
+ XLFD allows up to 255 characters and no control characters;
+ we are a little more liberal here. */
+ if (len < 1000
+ && !strchr(val, '\n')
+ && (test = x_strdup(val)) != 0) {
+ xw->screen.MenuFontName(fontMenu_fontsel) = test;
+ if (!xtermLoadFont(term,
+ xtermFontName(val),
+ True,
+ fontMenu_fontsel)) {
+ Bell(XkbBI_MinorError, 0);
+ free(test);
+ xw->screen.MenuFontName(fontMenu_fontsel) = save;
+ } else {
+ free(save);
+ }
+ } else {
+ Bell(XkbBI_MinorError, 0);
+ }
+ if (used != val)
+ free(used);
+ }
}
}
@@ -7488,7 +7508,10 @@
Atom target;
if (!atom_name)
- atom_name = "PRIMARY";
+ atom_name = (xw->screen.mappedSelect
+ ? xw->screen.mappedSelect[0]
+ : "PRIMARY");
+ TRACE(("FindFontSelection(%s)\n", atom_name));
for (pAtom = atoms, a = atomCount; a; a--, pAtom++) {
if (strcmp(atom_name, XmuNameOfAtom(*pAtom)) == 0)
Index: fontutils.c
--- xterm-223+/fontutils.c 2006-11-29 21:57:00.000000000 +0000
+++ xterm-223b/fontutils.c 2007-01-15 01:20:08.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.219 2006/11/29 21:57:00 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.220 2007/01/15 01:20:08 tom Exp $ */
/*
* $XFree86: xc/programs/xterm/fontutils.c,v 1.60 2006/04/30 21:55:39 dickey Exp $
@@ -6,7 +6,7 @@
/************************************************************
-Copyright 1998-2005,2006 by Thomas E. Dickey
+Copyright 1998-2006,2007 by Thomas E. Dickey
All Rights Reserved
@@ -1493,6 +1493,7 @@
* but this is simpler than adding another resource value - and
* as noted above, the data for the fixed fonts are available.
*/
+ lookupOneFontSize(screen, 0);
lookupOneFontSize(screen, fontnum);
if (fontnum == fontMenu_fontdefault) {
face_size = 14.0;
Index: menu.c
--- xterm-223+/menu.c 2006-11-23 01:18:29.000000000 +0000
+++ xterm-223b/menu.c 2007-01-16 21:38:02.000000000 +0000
@@ -1,8 +1,8 @@
-/* $XTermId: menu.c,v 1.222 2006/11/23 01:18:29 tom Exp $ */
+/* $XTermId: menu.c,v 1.223 2007/01/16 21:38:02 tom Exp $ */
/*
-Copyright 1999-2005,2006 by Thomas E. Dickey
+Copyright 1999-2006,2007 by Thomas E. Dickey
All Rights Reserved
@@ -656,7 +656,7 @@
set_menu_font(True);
SetItemSensitivity(
fontMenuEntries[fontMenu_fontescape].widget,
- (screen->menu_font_names[fontMenu_fontescape]
+ (screen->menu_font_names[fontMenu_fontescape][fNorm]
? True : False));
#if OPT_BOX_CHARS
update_font_boxchars();
Index: misc.c
--- xterm-223+/misc.c 2006-11-30 22:25:33.000000000 +0000
+++ xterm-223b/misc.c 2007-01-16 23:24:48.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.332 2006/11/30 22:25:33 tom Exp $ */
+/* $XTermId: misc.c,v 1.333 2007/01/16 23:24:48 tom Exp $ */
/* $XFree86: xc/programs/xterm/misc.c,v 3.107 2006/06/19 00:36:51 dickey Exp $ */
@@ -1860,6 +1860,7 @@
unparseputc1(xw, final);
unparse_end(xw);
} else if (buf != 0) {
+ int num = screen->menu_font_number;
VTFontNames fonts;
memset(&fonts, 0, sizeof(fonts));
@@ -1870,7 +1871,6 @@
* corresponding menu font entry.
*/
if (*buf == '#') {
- int num = screen->menu_font_number;
int rel = 0;
if (*++buf == '+') {
@@ -1893,19 +1893,22 @@
num = 0;
}
- if (rel != 0)
+ if (rel != 0) {
num = lookupRelativeFontSize(screen,
screen->menu_font_number, rel);
+ }
if (num < 0
|| num > fontMenu_lastBuiltin
|| (buf = screen->MenuFontName(num)) == 0) {
Bell(XkbBI_MinorError, 0);
break;
}
+ } else {
+ num = fontMenu_fontescape;
}
fonts.f_n = buf;
- SetVTFont(xw, fontMenu_fontescape, True, &fonts);
+ SetVTFont(xw, num, True, &fonts);
}
#endif /* OPT_SHIFT_FONTS */
break;
Index: version.h
--- xterm-223+/version.h 2006-11-30 22:23:57.000000000 +0000
+++ xterm-223b/version.h 2007-01-16 20:11:25.000000000 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.278 2006/11/30 22:23:57 tom Exp $ */
+/* $XTermId: version.h,v 1.279 2007/01/16 20:11:25 tom Exp $ */
/* $XFree86: xc/programs/xterm/version.h,v 3.126 2006/06/20 00:42:38 dickey Exp $ */
/*
@@ -7,7 +7,7 @@
* version of X to which this version of xterm has been built. The number in
* parentheses is my patch number (T.Dickey).
*/
-#define XTERM_PATCH 223
+#define XTERM_PATCH 224
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
Index: xterm.log.html
--- xterm-223+/xterm.log.html 2006-12-01 01:10:03.000000000 +0000
+++ xterm-223b/xterm.log.html 2007-01-17 00:25:55.000000000 +0000
@@ -20,7 +20,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF *
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.499 2006/12/01 01:10:03 tom Exp $
+ $XTermId: xterm.log.html,v 1.502 2007/01/17 00:25:55 tom Exp $
$XFree86: xc/programs/xterm/xterm.log.html,v 1.151 2006/06/20 00:42:38 dickey Exp $
-->
<HTML>
@@ -46,6 +46,7 @@
is the latest version of this file.
<UL>
+<LI><A HREF="#xterm_dev">Development</A>
<LI><A HREF="#xterm_223">Patch #223 - 2006/11/30</A>
<LI><A HREF="#xterm_222">Patch #222 - 2006/10/17</A>
<LI><A HREF="#xterm_221">Patch #221 - 2006/10/1</A>
@@ -272,6 +273,19 @@
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+<H1><A NAME="xterm_dev">Development</A></H1>
+<ul>
+ <li>make <code>Selection</code> of <code>VT Fonts</code> work with
+ <code>selectToClipboard</code> resource.
+
+ <li>correct length calculation for <code>Selection</code> entry of
+ <code>VT Fonts</code> menu, broken since it ignored the
+ actual selection length since X11R4.
+
+ <li>fixes for fontsize changes with <code>-fa</code> option (Redhat
+ Bugzilla #222340).
+</ul>
+
<H1><A NAME="xterm_223">Patch #223 - 2006/11/30</A></H1>
<ul>
<li>add <code>--enable-rectangles</code> configure option (request by
xterm-223-resources.patch:
XTerm.ad | 8 ++++++++
1 files changed, 8 insertions(+)
--- NEW FILE xterm-223-resources.patch ---
--- xterm-223/XTerm.ad.redhat-resources 2006-06-24 16:34:45.000000000 +0200
+++ xterm-223/XTerm.ad 2007-01-08 18:13:38.000000000 +0100
@@ -186,3 +186,11 @@
!
! Alternatively,
!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
+
+! Red Hat Defaults:
+*VT100*eightBitInput: 0
+*VT100*metaSendsEscape: 1
+*VT100*backarrowKey: 0
+*VT100*scrollBar: 1
+*VT100*utf8Title: 1
+*VT100*modifyFunctionKeys: 0
Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xterm.spec 7 Dec 2006 09:33:58 -0000 1.50
+++ xterm.spec 18 Jan 2007 14:35:31 -0000 1.51
@@ -1,7 +1,7 @@
Summary: xterm terminal emulator for the X Window System
Name: xterm
Version: 223
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://dickey.his.com/xterm
License: MIT
Group: User Interface/X
@@ -12,9 +12,11 @@
Source0: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
Source1: ftp://invisible-island.net/xterm/16colors.txt
-Patch1: xterm-212-redhat-resources.patch
+Patch1: xterm-223-resources.patch
Patch2: xterm-222-can-2003-0063.patch
Patch3: xterm-222-man-page_paths.patch
+Patch4: xterm-223-fontsize.patch
+Patch5: xterm-223-border.patch
%{?!enable_trace: %define enable_trace 0}
@@ -31,6 +33,8 @@
%patch1 -p1 -b .redhat-resources
%patch2 -p1 -b .can-2003-0063
%patch3 -p1 -b .man-page_paths
+%patch4 -p1 -b .fontsize
+%patch5 -p1 -b .border
%build
%configure \
@@ -44,6 +48,7 @@
--with-app-defaults=%{x11_app_defaults_dir} \
--with-utempter \
--with-tty-group=tty \
+ --with-utmp-setgid=utempter \
--disable-full-tgetent
make %{?_smp_mflags}
@@ -60,9 +65,9 @@
%files
%defattr(-,root,root)
%doc xterm.log.html ctlseqs.txt 16colors.txt README.i18n
+%attr(2755,root,utempter) %{_bindir}/xterm
%{_bindir}/resize
%{_bindir}/uxterm
-%{_bindir}/xterm
%{_mandir}/man1/resize.1*
%{_mandir}/man1/xterm.1*
%{x11_app_defaults_dir}/UXTerm
@@ -70,6 +75,12 @@
%{x11_app_defaults_dir}/XTerm-color
%changelog
+* Thu Jan 18 2007 Miroslav Lichvar <mlichvar at redhat.com> 223-2
+- make xterm binary sgid utempter (#222847)
+- fix font size changes with -fa option (#222340)
+- fix redrawing of internal border (#223027)
+- enable metaSendsEscape resource and set modifyFunctionKeys to 0 by default
+
* Thu Dec 07 2006 Miroslav Lichvar <mlichvar at redhat.com> 223-1
- update to 223
--- xterm-212-redhat-resources.patch DELETED ---
More information about the fedora-cvs-commits
mailing list