xterm: Changes to 'debian-unstable'
MANIFEST | 2 +-
button.c | 39 ++++++++++++++++++++-------------------
debian/changelog | 8 ++++++++
fontutils.c | 8 ++++----
version.h | 4 ++--
xterm.log.html | 15 ++++++++++++++-
6 files changed, 49 insertions(+), 27 deletions(-)
New commits:
commit 8df1ee112d2a24b6e3daa4daaab34bfc85b07729
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Oct 22 21:10:04 2010 +0200
New upstream release
Fix a regression in fontname logic from patch #263, thanks to Vincent
Lefevre (Closes: #600707).
diff --git a/debian/changelog b/debian/changelog
index 0066bb8..cd67ce7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xterm (265-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ + Fix a regression in fontname logic from patch #263, thanks to
+ Vincent Lefevre (Closes: #600707).
+
+ -- Cyril Brulebois <kibi@debian.org> Fri, 22 Oct 2010 21:07:27 +0200
+
xterm (264-1) unstable; urgency=low
* New upstream release:
commit 7c49776bdc523ca345d765ef91020b9726346e71
Author: Cyril Brulebois <kibi@debian.org>
Date: Fri Oct 22 21:05:11 2010 +0200
Import xterm 265
diff --git a/MANIFEST b/MANIFEST
index 5f04908..fb673de 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-264, version xterm-264
+MANIFEST for xterm-265, version xterm-265
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/button.c b/button.c
index abaa880..9693186 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.389 2010/10/13 09:37:08 tom Exp $ */
+/* $XTermId: button.c,v 1.390 2010/10/22 00:53:57 tom Exp $ */
/*
* Copyright 1999-2009,2010 by Thomas E. Dickey
@@ -180,9 +180,10 @@ EmitMousePosition(TScreen * screen, Char line[], unsigned count, int value)
? EXT_MOUSE_LIMIT
: MOUSE_LIMIT);
- /* Add pointer position to key sequence
-
- * In extended mode we encode large positions as two-byte UTF-8
+ /*
+ * Add pointer position to key sequence
+ *
+ * In extended mode we encode large positions as two-byte UTF-8.
*
* NOTE: historically, it was possible to emit 256, which became
* zero by truncation to 8 bits. While this was arguably a bug,
@@ -211,29 +212,30 @@ SendMousePosition(XtermWidget xw, XEvent * event)
switch (screen->send_mouse_pos) {
case MOUSE_OFF:
/* If send_mouse_pos mode isn't on, we shouldn't be here */
- return False;
+ break;
case BTN_EVENT_MOUSE:
case ANY_EVENT_MOUSE:
- /* xterm extension for motion reporting. June 1998 */
- /* EditorButton() will distinguish between the modes */
- switch (event->type) {
- case MotionNotify:
- my_event->button = 0;
- /* FALLTHRU */
- case ButtonPress:
- /* FALLTHRU */
- case ButtonRelease:
- EditorButton(xw, my_event);
- result = True;
- break;
+ if (KeyModifiers(event) == 0 || KeyModifiers(event) == ControlMask) {
+ /* xterm extension for motion reporting. June 1998 */
+ /* EditorButton() will distinguish between the modes */
+ switch (event->type) {
+ case MotionNotify:
+ my_event->button = 0;
+ /* FALLTHRU */
+ case ButtonPress:
+ /* FALLTHRU */
+ case ButtonRelease:
+ EditorButton(xw, my_event);
+ result = True;
+ break;
+ }
}
break;
default:
/* Make sure the event is an appropriate type */
if (IsBtnEvent(event)) {
-
switch (screen->send_mouse_pos) {
case X10_MOUSE: /* X10 compatibility sequences */
@@ -315,7 +317,6 @@ SendLocatorPosition(XtermWidget xw, XButtonEvent * event)
/* Make sure the event is an appropriate type */
if ((!IsBtnEvent(event) &&
-
!screen->loc_filter) ||
(BtnModifiers(event) != 0 && BtnModifiers(event) != ControlMask))
return (False);
diff --git a/fontutils.c b/fontutils.c
index 34c6498..2fce86a 100644
--- a/fontutils.c
+++ b/fontutils.c
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.350 2010/10/14 09:27:25 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.351 2010/10/22 09:02:10 tom Exp $ */
/************************************************************
@@ -235,7 +235,7 @@ check_fontname(const char *name)
{
Boolean result = True;
- if (name == 0) {
+ if (IsEmpty(name)) {
TRACE(("fontname missing\n"));
result = False;
} else if (strlen(name) >= MAX_FONTNAME - 1) {
@@ -1238,7 +1238,7 @@ typedef struct {
} SubResourceRec;
#define MERGE_SUBFONT(src,dst,name) \
- if (dst.name == 0) { \
+ if (IsEmpty(dst.name)) { \
TRACE(("MERGE_SUBFONT " #dst "." #name " merge %s\n", NonNull(src.name))); \
dst.name = src.name; \
} else { \
@@ -1294,7 +1294,7 @@ xtermLoadVTFonts(XtermWidget xw, String myName, String myClass)
COPY_MENU_FONTS(xw->screen, original);
}
- if (myName == 0 || *myName == 0) {
+ if (IsEmpty(myName)) {
TRACE(("xtermLoadVTFonts restoring original\n"));
xw->misc.default_font = original.default_font;
COPY_MENU_FONTS(original, xw->screen);
diff --git a/version.h b/version.h
index b3f1260..a234208 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
/*
- * $XTermId: version.h,v 1.322 2010/10/14 08:33:49 tom Exp $
+ * $XTermId: version.h,v 1.323 2010/10/22 00:54:53 tom Exp $
* ----------------------------------------------------------------------------
* this file is part of xterm
*
@@ -39,7 +39,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 264
+#define XTERM_PATCH 265
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff --git a/xterm.log.html b/xterm.log.html
index 8f33190..32a554f 100644
--- a/xterm.log.html
+++ b/xterm.log.html
@@ -31,7 +31,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.977 2010/10/14 08:53:32 tom Exp $
+ $XTermId: xterm.log.html,v 1.980 2010/10/22 09:54:49 tom Exp $
-->
<HTML>
<HEAD>
@@ -56,6 +56,7 @@ Most of these are summarized in the XFree86 CHANGELOG
is the latest version of this file.
<UL>
+<LI><A HREF="#xterm_265">Patch #265 - 2010/10/22</A>
<LI><A HREF="#xterm_264">Patch #264 - 2010/10/14</A>
<LI><A HREF="#xterm_263">Patch #263 - 2010/10/13</A>
<LI><A HREF="#xterm_262">Patch #262 - 2010/8/30</A>
@@ -323,6 +324,18 @@ is the latest version of this file.
<LI><A HREF="#xterm_01">Patch #1 - 1996/1/6</A>
</UL>
+<H1><A NAME="xterm_265">Patch #265 - 2010/10/22</A></H1>
+<ul>
+ <li>fix a regression in fontname logic from
+ <a href="#xterm_263">patch #263</a> changes
+ (Debian #600707, reported by Vincent Lefevre).
+
+ <li>revert modification of any-event/any-button protocol from
+ <a href="#xterm_263">patch #263</a> changes.
+ It interferes with selection using a
+ shifted mouse button (reports by Neil Bird, Bram Moolenaar).
+</ul>
+
<H1><A NAME="xterm_264">Patch #264 - 2010/10/14</A></H1>
<ul>
<li>replace a null-pointer check with check for empty string in
Reply to: