xterm: Changes to 'upstream-unstable'
MANIFEST | 2 +-
button.c | 10 ++++++----
input.c | 6 +++---
print.c | 10 +++++-----
testxmc.c | 16 ++++++++--------
version.h | 4 ++--
xterm.log.html | 14 +++++++++++---
7 files changed, 36 insertions(+), 26 deletions(-)
New commits:
commit 1ea13e4758104f85f7334ff403850bf754c94a37
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Jan 10 19:20:28 2009 +0100
Import xterm 239
diff --git a/MANIFEST b/MANIFEST
index f8d132a..9c9105a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-238, version xterm-238
+MANIFEST for xterm-239, version xterm-239
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/button.c b/button.c
index 6f5f3b1..d9e6dfc 100644
--- a/button.c
+++ b/button.c
@@ -1,7 +1,7 @@
-/* $XTermId: button.c,v 1.297 2008/10/05 23:32:52 tom Exp $ */
+/* $XTermId: button.c,v 1.298 2009/01/09 01:29:52 tom Exp $ */
/*
- * Copyright 1999-2007,2008 by Thomas E. Dickey
+ * Copyright 1999-2008,2009 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -334,8 +334,10 @@ SendLocatorPosition(XtermWidget xw, XEvent * event)
*/
state = (event->xbutton.state
& (Button1Mask | Button2Mask | Button3Mask | Button4Mask)) >> 8;
- state ^= 1 << button; /* update mask to "after" state */
- state = (state & ~(4 | 1)) | ((state & 1) ? 4 : 0) | ((state & 4) ? 1 : 0); /* swap Button1 & Button3 */
+ /* update mask to "after" state */
+ state ^= 1 << button;
+ /* swap Button1 & Button3 */
+ state = (state & ~(4 | 1)) | ((state & 1) ? 4 : 0) | ((state & 4) ? 1 : 0);
reply.a_param[1] = (ParmType) state;
reply.a_param[2] = (ParmType) row;
diff --git a/input.c b/input.c
index eed8ea6..5603806 100644
--- a/input.c
+++ b/input.c
@@ -1,7 +1,7 @@
-/* $XTermId: input.c,v 1.302 2008/12/30 17:20:39 tom Exp $ */
+/* $XTermId: input.c,v 1.303 2009/01/08 23:28:36 tom Exp $ */
/*
- * Copyright 1999-2007,2008 by Thomas E. Dickey
+ * Copyright 1999-2008,2009 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -984,7 +984,7 @@ Input(XtermWidget xw,
#ifdef XK_KP_Home
if (kd.keysym >= XK_KP_Home && kd.keysym <= XK_KP_Begin) {
TRACE(("...Input keypad before was " KEYSYM_FMT "\n", kd.keysym));
- kd.keysym += (unsigned) (XK_Home - XK_KP_Home);
+ kd.keysym += (KeySym) (XK_Home - XK_KP_Home);
TRACE(("...Input keypad changed to " KEYSYM_FMT "\n", kd.keysym));
}
#endif
diff --git a/print.c b/print.c
index e807fbc..555b41a 100644
--- a/print.c
+++ b/print.c
@@ -1,4 +1,4 @@
-/* $XTermId: print.c,v 1.80 2007/03/19 23:49:51 tom Exp $ */
+/* $XTermId: print.c,v 1.81 2009/01/09 01:43:01 tom Exp $ */
/*
* $XFree86: xc/programs/xterm/print.c,v 1.24 2006/06/19 00:36:51 dickey Exp $
@@ -6,7 +6,7 @@
/************************************************************
-Copyright 1997-2006,2007 by Thomas E. Dickey
+Copyright 1997-2007,2009 by Thomas E. Dickey
All Rights Reserved
@@ -193,7 +193,7 @@ printLine(int row, unsigned chr)
#endif
)
&& ch) {
- attr = (a[col] & SGR_MASK);
+ attr = CharOf(a[col] & SGR_MASK);
last_fg = fg;
last_bg = bg;
if (screen->print_attributes)
@@ -556,7 +556,7 @@ xtermPrinterControl(int chr)
case '4':
case '5':
case 'i':
- bfr[length++] = chr;
+ bfr[length++] = CharOf(chr);
for (n = 0; n < sizeof(tbl) / sizeof(tbl[0]); n++) {
size_t len = Strlen(tbl[n].seq);
@@ -580,7 +580,7 @@ xtermPrinterControl(int chr)
default:
for (n = 0; n < length; n++)
charToPrinter(bfr[n]);
- bfr[0] = chr;
+ bfr[0] = CharOf(chr);
length = 1;
return 0;
}
diff --git a/testxmc.c b/testxmc.c
index 747e7bf..1a116bc 100644
--- a/testxmc.c
+++ b/testxmc.c
@@ -1,4 +1,4 @@
-/* $XTermId: testxmc.c,v 1.34 2006/07/23 18:53:12 tom Exp $ */
+/* $XTermId: testxmc.c,v 1.35 2009/01/09 01:40:17 tom Exp $ */
/*
* $XFree86: xc/programs/xterm/testxmc.c,v 3.14 2006/02/13 01:14:59 dickey Exp $
@@ -6,7 +6,7 @@
/************************************************************
-Copyright 1997-2005,2006 by Thomas E. Dickey
+Copyright 1997-2006,2009 by Thomas E. Dickey
All Rights Reserved
@@ -92,8 +92,8 @@ authorization.
#include <xterm.h>
#include <data.h>
-#define MARK_ON(a) (my_attrs & a) != 0 && (xw->flags & (whichone = a)) == 0
-#define MARK_OFF(a) (my_attrs & a) != 0 && (xw->flags & (whichone = a)) != 0
+#define MARK_ON(a) (my_attrs & a) != 0 && (xw->flags & (whichone = CharOf(a))) == 0
+#define MARK_OFF(a) (my_attrs & a) != 0 && (xw->flags & (whichone = CharOf(a))) != 0
void
Mark_XMC(XtermWidget xw, int param)
@@ -102,7 +102,7 @@ Mark_XMC(XtermWidget xw, int param)
TScreen *screen = &(xw->screen);
Bool found = False;
- Char my_attrs = (screen->xmc_attributes & XMC_FLAGS);
+ Char my_attrs = CharOf(screen->xmc_attributes & XMC_FLAGS);
Char whichone = 0;
if (glitch == 0) {
@@ -180,7 +180,7 @@ Resolve_XMC(XtermWidget xw)
TScreen *screen = &(xw->screen);
Bool changed = False;
Char start;
- Char my_attrs = (screen->xmc_attributes & XMC_FLAGS);
+ Char my_attrs = CharOf(screen->xmc_attributes & XMC_FLAGS);
int row = screen->cur_row;
int col = screen->cur_col;
@@ -210,8 +210,8 @@ Resolve_XMC(XtermWidget xw)
if (XTERM_CELL(row, col) == XMC_GLITCH)
break;
if ((SCRN_BUF_ATTRS(screen, row)[col] & my_attrs) != start) {
- SCRN_BUF_ATTRS(screen, row)[col] = start |
- (SCRN_BUF_ATTRS(screen, row)[col] & ~my_attrs);
+ SCRN_BUF_ATTRS(screen, row)[col] =
+ CharOf(start | (SCRN_BUF_ATTRS(screen, row)[col] & ~my_attrs));
changed = True;
}
}
diff --git a/version.h b/version.h
index 4805aa6..ed4d2f1 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.294 2008/10/05 16:46:50 tom Exp $ */
+/* $XTermId: version.h,v 1.295 2009/01/08 23:30:16 tom Exp $ */
/*
* These definitions are used to build the string that's printed in response to
@@ -6,7 +6,7 @@
* version of X to which this version of xterm has been built. The number in
* parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 238
+#define XTERM_PATCH 239
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index d1fad6c..f3f8409 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
*****************************************************************************
- * Copyright 1996-2007,2008 by Thomas E. Dickey *
+ * Copyright 1996-2008,2009 by Thomas E. Dickey *
* All Rights Reserved. *
* *
* Permission to use, copy, modify, and distribute this software and its *
@@ -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.703 2008/12/30 19:09:49 tom Exp $
+ $XTermId: xterm.log.html,v 1.707 2009/01/09 02:02:49 tom Exp $
-->
<HTML>
<HEAD>
@@ -30,7 +30,7 @@
</HEAD>
<BODY>
<HR>
-Copyright © 1997-2007,2008 by <A
+Copyright © 1997-2008,2009 by <A
HREF="mailto:dickey@invisible-island.net";>Thomas E. Dickey</A>
<HR>
<H1>Contents</H1>
@@ -45,6 +45,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version of this file.
<UL>
+<LI><A HREF="#xterm_239">Patch #239 - 2001/1/8</A>
<LI><A HREF="#xterm_238">Patch #238 - 2008/12/30</A>
<LI><A HREF="#xterm_237">Patch #237 - 2008/09/14</A>
<LI><A HREF="#xterm_236">Patch #236 - 2008/07/27</A>
@@ -286,6 +287,13 @@ is the latest version of this file.
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+<H1><A NAME="xterm_239">Patch #239 - 2009/1/8</A></H1>
+<ul>
+ <li>correct a cast in input.c, which broke translation of numeric
+ keypad codes to pageup, pagedown, etc., on 64-bit platform
+ (Debian #511138, report by Larry Doolittle).
+</ul>
+
<H1><A NAME="xterm_238">Patch #238 - 2008/12/30</A></H1>
<ul>
<li>update configure macro CF_XOPEN_SOURCE for AIX 6.x and Mint
Reply to: