Hello community,
here is the log from the commit of package xterm
checked in at Mon Apr 21 18:58:12 CEST 2008.
--------
--- xterm/xterm.changes 2008-03-03 09:41:04.000000000 +0100
+++ /mounts/work_src_done/STABLE/xterm/xterm.changes 2008-04-21 15:42:21.688470000 +0200
@@ -1,0 +2,29 @@
+Mon Apr 21 16:00:01 CEST 2008 - sndirsch@suse.de
+
+- update to bugfix release xterm-235
+ * add control sequences for some of the recent resource/menu
+ settings:
+ + altSendsEscape (private mode 1039)
+ + keepSelection (private mode 1040)
+ + selectToClipboard (private mode 1041)
+ + bellIsUrgent (private mode 1042)
+ + popOnBell (private mode 1043)
+ * add resource formatOtherKeys to provide an alternate escape
+ sequence format for the modifyOtherKeys resource (request by
+ Paul LeoNerd Evans).
+ * adjust saved-cursor position if the window is resized while
+ displaying the alternate screen (Novell #196880, Debian
+ #383384).
+ * improve pointer-checks to fix a bug exposed by resizing during
+ initialization under StumpWM window manager (Fedora Bugzilla
+ #437928).
+ * modify unselectwindow() to ensure that the mouse pointer is not
+ hidden after xterm loses focus (report by Jeremy Huddleston).
+ * add special check for fd_mask on Mac OS X (report by Jeremy
+ Huddleston).
+ * add dylib to autoconf's suffix list used for checking the result
+ from xmkmf, to work with Mac OS X (report by Jeremy Huddleston).
+ * correct initialization of bold- and wide-, wide-bold fonts which
+ may be set via the utf8Fonts subresource (Debian #347790).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xterm.spec ++++++
--- /var/tmp/diff_new_pack.x31283/_old 2008-04-21 18:57:55.000000000 +0200
+++ /var/tmp/diff_new_pack.x31283/_new 2008-04-21 18:57:55.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package xterm (Version 234)
+# spec file for package xterm (Version 235)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -19,7 +19,7 @@
Group: System/X11/Utilities
Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm
AutoReqProv: on
-Version: 234
+Version: 235
Release: 1
Summary: The basic X terminal program
Source: %name.tar.gz
@@ -269,6 +269,32 @@
/usr/share/pixmaps/*
%changelog
+* Mon Apr 21 2008 sndirsch@suse.de
+- update to bugfix release xterm-235
+ * add control sequences for some of the recent resource/menu
+ settings:
+ + altSendsEscape (private mode 1039)
+ + keepSelection (private mode 1040)
+ + selectToClipboard (private mode 1041)
+ + bellIsUrgent (private mode 1042)
+ + popOnBell (private mode 1043)
+ * add resource formatOtherKeys to provide an alternate escape
+ sequence format for the modifyOtherKeys resource (request by
+ Paul LeoNerd Evans).
+ * adjust saved-cursor position if the window is resized while
+ displaying the alternate screen (Novell #196880, Debian
+ [#383384]).
+ * improve pointer-checks to fix a bug exposed by resizing during
+ initialization under StumpWM window manager (Fedora Bugzilla
+ [#437928]).
+ * modify unselectwindow() to ensure that the mouse pointer is not
+ hidden after xterm loses focus (report by Jeremy Huddleston).
+ * add special check for fd_mask on Mac OS X (report by Jeremy
+ Huddleston).
+ * add dylib to autoconf's suffix list used for checking the result
+ from xmkmf, to work with Mac OS X (report by Jeremy Huddleston).
+ * correct initialization of bold- and wide-, wide-bold fonts which
+ may be set via the utf8Fonts subresource (Debian #347790).
* Mon Mar 03 2008 sndirsch@suse.de
- update to bugfix release xterm-234
* modify sinstall.sh to use POSIX locale to bypass GNU ls changes
@@ -292,12 +318,12 @@
* minor documentation fixes (patch by Slava Semushin)
* add makefile actions to install KOI8RXTerm app-defaults
file (patch by Julien Cristau).
-* Tue Jan 01 2008 sndirsch@suse.de
+* Wed Jan 02 2008 sndirsch@suse.de
- update to xterm-230:
* mainly bugfixes
* Wed Sep 19 2007 sndirsch@suse.de
- set foreground color as well; fixes xterm -rv (Bug #283984)
-* Fri Aug 31 2007 mfabian@suse.de
+* Sat Sep 01 2007 mfabian@suse.de
- Bugzilla #306943: add xorg-x11 to BuildRequires because of
‘bdftopcf’. Let the build fail if ‘bdftopcf’ is missing.
- change app-defaults to use these fonts for wide characters
@@ -376,7 +402,7 @@
(Bug #283984)
* Thu Mar 29 2007 dmueller@suse.de
- add ncurses-devel BuildRequires
-* Sat Mar 24 2007 sndirsch@suse.de
+* Sun Mar 25 2007 sndirsch@suse.de
- Patch #225 - 2007/3/24:
* add useClipping resource to allow clipping to be disabled.
* use XftDrawSetClipRectangles to work around Xft pixel-trash
++++++ xterm.tar.gz ++++++
++++ 3678 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-234/charproc.c new/xterm-235/charproc.c
--- old/xterm-234/charproc.c 2008-02-29 02:55:13.000000000 +0100
+++ new/xterm-235/charproc.c 2008-04-21 00:08:42.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.836 2008/02/29 01:55:13 tom Exp $ */
+/* $XTermId: charproc.c,v 1.842 2008/04/20 22:08:42 tom Exp $ */
/*
@@ -614,6 +614,8 @@
keyboard.modify_1st.other_keys, 0),
Ires(XtNmodifyStringKeys, XtCModifyStringKeys,
keyboard.modify_1st.string_keys, 0),
+ Ires(XtNformatOtherKeys, XtCFormatOtherKeys,
+ keyboard.format_keys, 0),
#endif
#if OPT_NUM_LOCK
@@ -2884,10 +2886,8 @@
myState.lastchar = -1; /* not a legal IChar */
myState.nextstate = -1; /* not a legal state */
- for (;;) {
- if (!doparsing(xw, doinput(), &myState))
- return;
- }
+ do {
+ } while (doparsing(xw, doinput(), &myState));
}
static Char *v_buffer; /* pointer to physical buffer */
@@ -4003,6 +4003,28 @@
set_bool_mode(screen->delete_is_del);
update_delete_del();
break;
+#if OPT_NUM_LOCK
+ case 1039:
+ set_bool_mode(screen->alt_sends_esc);
+ update_alt_esc();
+ break;
+#endif
+ case 1040:
+ set_bool_mode(screen->keepSelection);
+ update_keepSelection();
+ break;
+ case 1041:
+ set_bool_mode(screen->selectToClipboard);
+ update_selectToClipboard();
+ break;
+ case 1042:
+ set_bool_mode(screen->bellIsUrgent);
+ update_bellIsUrgent();
+ break;
+ case 1043:
+ set_bool_mode(screen->poponbell);
+ update_poponbell();
+ break;
case 1048:
if (!xw->misc.titeInhibit) {
if (IsSM())
@@ -4760,6 +4782,13 @@
ScrnUpdate(xw, 0, 0, rows, MaxCols(screen), False);
}
+Bool
+CheckBufPtrs(TScreen * screen)
+{
+ return (screen->visbuf != 0
+ && screen->altbuf != 0);
+}
+
/*
* Swap buffer line pointers between alternate and regular screens.
* visbuf contains pointers from allbuf or altbuf for the visible screen,
@@ -4770,11 +4799,13 @@
void
SwitchBufPtrs(TScreen * screen)
{
- size_t len = ScrnPointers(screen, (unsigned) MaxRows(screen));
+ if (CheckBufPtrs(screen)) {
+ size_t len = ScrnPointers(screen, (unsigned) MaxRows(screen));
- memcpy((char *) screen->save_ptr, (char *) screen->visbuf, len);
- memcpy((char *) screen->visbuf, (char *) screen->altbuf, len);
- memcpy((char *) screen->altbuf, (char *) screen->save_ptr, len);
+ memcpy((char *) screen->save_ptr, (char *) screen->visbuf, len);
+ memcpy((char *) screen->visbuf, (char *) screen->altbuf, len);
+ memcpy((char *) screen->altbuf, (char *) screen->save_ptr, len);
+ }
}
void
@@ -4808,11 +4839,13 @@
Tpushb = Tpushback;
}
#endif
+ screen->is_running = True;
if (!setjmp(VTend))
VTparse(term);
StopBlinking(screen);
HideCursor();
screen->cursor_set = OFF;
+ TRACE(("... VTRun\n"));
}
/*ARGSUSED*/
@@ -5892,6 +5925,7 @@
init_Ires(keyboard.modify_1st.keypad_keys);
init_Ires(keyboard.modify_1st.other_keys);
init_Ires(keyboard.modify_1st.string_keys);
+ init_Ires(keyboard.format_keys);
wnew->keyboard.modify_now = wnew->keyboard.modify_1st;
#endif
@@ -6338,14 +6372,18 @@
screen->savedlines = 0;
- if (xw->misc.scrollbar) {
- screen->fullVwin.sb_info.width = 0;
- ScrollBarOn(xw, False, True);
- }
for (i = 0; i < 2; ++i) {
screen->alternate = !screen->alternate;
CursorSave(xw);
}
+
+ /*
+ * Do this last, since it may change the layout via a resize.
+ */
+ if (xw->misc.scrollbar) {
+ screen->fullVwin.sb_info.width = 0;
+ ScrollBarOn(xw, False, True);
+ }
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-234/configure.in new/xterm-235/configure.in
--- old/xterm-234/configure.in 2008-02-24 22:46:37.000000000 +0100
+++ new/xterm-235/configure.in 2008-03-26 01:55:11.000000000 +0100
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.241 2008/02/24 21:46:37 tom Exp $
+dnl $XTermId: configure.in,v 1.244 2008/03/26 00:55:11 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -46,7 +46,7 @@
AC_PROG_CC
AC_PROG_CPP
-AC_GCC_TRADITIONAL
+AC_PROG_GCC_TRADITIONAL
AC_PROG_AWK
AC_PROG_INSTALL
AC_PROG_LN_S
@@ -59,7 +59,7 @@
### checks for compiler characteristics
CF_ANSI_CC_CHECK
-AC_CONST
+AC_C_CONST
CF_PROG_EXT
CF_XOPEN_SOURCE
CF_SIGWINCH
@@ -277,7 +277,7 @@
)
CF_X_ATHENA
-CF_TYPE_FD_SET
+CF_TYPE_FD_MASK
CF_TERMIO_C_ISPEED
LIBS="$LIBS $X_EXTRA_LIBS"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-234/ctlseqs.ms new/xterm-235/ctlseqs.ms
--- old/xterm-234/ctlseqs.ms 2008-01-27 18:39:00.000000000 +0100
+++ new/xterm-235/ctlseqs.ms 2008-04-21 00:24:36.000000000 +0200
@@ -1,6 +1,6 @@
.\"#! troff -ms $1 -*- Nroff -*-
.\" "Xterm Control Sequences" document
-.\" $XTermId: ctlseqs.ms,v 1.186 2008/01/27 17:39:00 tom Exp $
+.\" $XTermId: ctlseqs.ms,v 1.188 2008/04/20 22:24:36 tom Exp $
.\"
.\"
.\" Copyright 1996-2007,2008 by Thomas E. Dickey
@@ -772,10 +772,21 @@
\*(Ps = \*1\*0\*1\*1 \(-> Scroll to bottom on key press (rxvt).
\*(Ps = \*1\*0\*3\*4 \(-> Interpret "meta" key, sets eighth bit.
(enables the \fBeightBitInput\fP resource).
- \*(Ps = \*1\*0\*3\*5 \(-> Enable special modifiers for Alt and NumLock keys.
+ \*(Ps = \*1\*0\*3\*5 \(-> Enable special modifiers for Alt and NumLock keys
+(enables the \fBnumLock\fP resource).
\*(Ps = \*1\*0\*3\*6 \(-> Send ESC when Meta modifies a key
(enables the \fBmetaSendsEscape\fP resource).
\*(Ps = \*1\*0\*3\*7 \(-> Send DEL from the editing-keypad Delete key
+ \*(Ps = \*1\*0\*3\*9 \(-> Send ESC when Alt modifies a key
+(enables the \fBaltSendsEscape\fP resource).
+ \*(Ps = \*1\*0\*4\*0 \(-> Keep selection even if not highlighted
+(enables the \fBkeepSelection\fP resource).
+ \*(Ps = \*1\*0\*4\*1 \(-> Use the CLIPBOARD selection
+(enables the \fBselectToClipboard\fP resource).
+ \*(Ps = \*1\*0\*4\*2 \(-> Enable Urgency window manager hint when Control-G is received
+(enables the \fBbellIsUrgent\fP resource).
+ \*(Ps = \*1\*0\*4\*3 \(-> Enable raising of the window when Control-G is received
+(enables the \fBpopOnBell\fP resource).
\*(Ps = \*1\*0\*4\*7 \(-> Use Alternate Screen Buffer (unless
disabled by the \fBtiteInhibit\fP resource)
\*(Ps = \*1\*0\*4\*8 \(-> Save cursor as in DECSC (unless
@@ -853,10 +864,21 @@
\*(Ps = \*1\*0\*1\*1 \(-> Don't scroll to bottom on key press (rxvt).
\*(Ps = \*1\*0\*3\*4 \(-> Don't interpret "meta" key
(disables the \fBeightBitInput\fP resource).
- \*(Ps = \*1\*0\*3\*5 \(-> Disable special modifiers for Alt and NumLock keys.
+ \*(Ps = \*1\*0\*3\*5 \(-> Disable special modifiers for Alt and NumLock keys
+(disables the \fBnumLock\fP resource).
\*(Ps = \*1\*0\*3\*6 \(-> Don't send ESC when Meta modifies a key
(disables the \fBmetaSendsEscape\fP resource).
\*(Ps = \*1\*0\*3\*7 \(-> Send VT220 Remove from the editing-keypad Delete key
+ \*(Ps = \*1\*0\*3\*9 \(-> Don't send ESC when Alt modifies a key
+(disables the \fBaltSendsEscape\fP resource).
+ \*(Ps = \*1\*0\*4\*0 \(-> Do not keep selection when not highlighted
+(disables the \fBkeepSelection\fP resource).
+ \*(Ps = \*1\*0\*4\*1 \(-> Use the PRIMARY selection.
+(disables the \fBselectToClipboard\fP resource).
+ \*(Ps = \*1\*0\*4\*2 \(-> Disable Urgency window manager hint when Control-G is received
+(disables the \fBbellIsUrgent\fP resource).
+ \*(Ps = \*1\*0\*4\*3 \(-> Disable raising of the window when Control-G is received
+(disables the \fBpopOnBell\fP resource).
\*(Ps = \*1\*0\*4\*7 \(-> Use Normal Screen Buffer, clearing screen
first if in the Alternate Screen (unless
disabled by the \fBtiteInhibit\fP resource)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-234/ctlseqs.txt new/xterm-235/ctlseqs.txt
--- old/xterm-234/ctlseqs.txt 2008-01-27 18:41:41.000000000 +0100
+++ new/xterm-235/ctlseqs.txt 2008-04-21 00:40:05.000000000 +0200
@@ -331,10 +331,20 @@
Ps = 1 0 3 4 -> Interpret "meta" key, sets eighth bit.
(enables the eightBitInput resource).
Ps = 1 0 3 5 -> Enable special modifiers for Alt and Num-
- Lock keys.
+ Lock keys (enables the numLock resource).
Ps = 1 0 3 6 -> Send ESC when Meta modifies a key (enables
the metaSendsEscape resource).
Ps = 1 0 3 7 -> Send DEL from the editing-keypad Delete key
+ Ps = 1 0 3 9 -> Send ESC when Alt modifies a key (enables
+ the altSendsEscape resource).
+ Ps = 1 0 4 0 -> Keep selection even if not highlighted
+ (enables the keepSelection resource).
+ Ps = 1 0 4 1 -> Use the CLIPBOARD selection (enables the
+ selectToClipboard resource).
+ Ps = 1 0 4 2 -> Enable Urgency window manager hint when
+ Control-G is received (enables the bellIsUrgent resource).
+ Ps = 1 0 4 3 -> Enable raising of the window when Control-G
+ is received (enables the popOnBell resource).
Ps = 1 0 4 7 -> Use Alternate Screen Buffer (unless dis-
abled by the titeInhibit resource)
Ps = 1 0 4 8 -> Save cursor as in DECSC (unless disabled by
@@ -408,11 +418,21 @@
Ps = 1 0 3 4 -> Don't interpret "meta" key (disables the
eightBitInput resource).
Ps = 1 0 3 5 -> Disable special modifiers for Alt and Num-
- Lock keys.
+ Lock keys (disables the numLock resource).
Ps = 1 0 3 6 -> Don't send ESC when Meta modifies a key
(disables the metaSendsEscape resource).
Ps = 1 0 3 7 -> Send VT220 Remove from the editing-keypad
Delete key
+ Ps = 1 0 3 9 -> Don't send ESC when Alt modifies a key
+ (disables the altSendsEscape resource).
+ Ps = 1 0 4 0 -> Do not keep selection when not highlighted
+ (disables the keepSelection resource).
+ Ps = 1 0 4 1 -> Use the PRIMARY selection. (disables the
+ selectToClipboard resource).
+ Ps = 1 0 4 2 -> Disable Urgency window manager hint when
+ Control-G is received (disables the bellIsUrgent resource).
+ Ps = 1 0 4 3 -> Disable raising of the window when Control-
+ G is received (disables the popOnBell resource).
Ps = 1 0 4 7 -> Use Normal Screen Buffer, clearing screen
first if in the Alternate Screen (unless disabled by the
titeInhibit resource)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-234/cursor.c new/xterm-235/cursor.c
--- old/xterm-234/cursor.c 2007-07-07 14:14:51.000000000 +0200
+++ new/xterm-235/cursor.c 2008-04-20 23:06:22.000000000 +0200
@@ -1,9 +1,9 @@
-/* $XTermId: cursor.c,v 1.43 2007/07/07 12:14:51 tom Exp $ */
+/* $XTermId: cursor.c,v 1.45 2008/04/20 21:06:22 tom Exp $ */
/* $XFree86: xc/programs/xterm/cursor.c,v 3.20 2006/02/13 01:14:58 dickey Exp $ */
/*
- * Copyright 2002-2006,2007 by Thomas E. Dickey
+ * Copyright 2002-2007,2008 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -241,6 +241,26 @@
}
/*
+ * When resizing the window, if we're showing the alternate screen, we still
+ * have to adjust the saved cursor from the normal screen to account for
+ * shifting of the saved-line region in/out of the viewable window.
+ */
+void
+AdjustSavedCursor(XtermWidget xw, int adjust)
+{
+ TScreen *screen = &xw->screen;
+
+ if (screen->alternate) {
+ SavedCursor *sc = &screen->sc[screen->alternate == False];
+
+ if (adjust > 0) {
+ TRACE(("AdjustSavedCursor %d -> %d\n", sc->row, sc->row - adjust));
+ sc->row += adjust;
+ }
+ }
+}
+
+/*
* Save Cursor and Attributes
*/
void
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-234/fontutils.c new/xterm-235/fontutils.c
--- old/xterm-234/fontutils.c 2008-02-29 01:25:16.000000000 +0100
+++ new/xterm-235/fontutils.c 2008-04-18 01:23:37.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.270 2008/02/29 00:25:16 Andrea.Odetti Exp $ */
+/* $XTermId: fontutils.c,v 1.272 2008/04/17 23:23:37 tom Exp $ */
/************************************************************
@@ -1204,6 +1204,11 @@
w->misc.default_font = subresourceRec.default_font;
COPY_MENU_FONTS(subresourceRec, w->screen);
w->screen.MenuFontName(fontMenu_default) = w->misc.default_font.f_n;
+ w->screen.menu_font_names[0][fBold] = w->misc.default_font.f_b;
+#if OPT_WIDE_CHARS
+ w->screen.menu_font_names[0][fWide] = w->misc.default_font.f_w;
+ w->screen.menu_font_names[0][fWBold] = w->misc.default_font.f_wb;
+#endif
} else {
TRACE(("...no resources found\n"));
status = False;
@@ -1740,8 +1745,7 @@
}
TRACE(("xtermUpdateFontInfo {{\n"));
DoResizeScreen(xw); /* set to the new natural size */
- if (screen->scrollWidget)
- ResizeScrollBar(xw);
+ ResizeScrollBar(xw);
Redraw();
TRACE(("... }} xtermUpdateFontInfo\n"));
#ifdef SCROLLBAR_RIGHT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-234/input.c new/xterm-235/input.c
--- old/xterm-234/input.c 2007-12-31 22:11:19.000000000 +0100
+++ new/xterm-235/input.c 2008-04-20 22:27:18.000000000 +0200
@@ -1,7 +1,7 @@
-/* $XTermId: input.c,v 1.296 2007/12/31 21:11:19 tom Exp $ */
+/* $XTermId: input.c,v 1.299 2008/04/20 20:27:18 tom Exp $ */
/*
- * Copyright 1999-2006,2007 by Thomas E. Dickey
+ * Copyright 1999-2007,2008 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -75,6 +75,7 @@
#endif
#include