[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#226386: marked as done (rxvt: Control+Shift+Prior/Next doesn't work)



Your message dated Tue, 04 Oct 2005 22:32:07 -0700
with message-id <E1EN1st-0002B8-00@spohr.debian.org>
and subject line Bug#226386: fixed in rxvt 1:2.6.4-9
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 6 Jan 2004 10:57:58 +0000
>From alexis@cecm.usp.br Tue Jan 06 04:57:57 2004
Return-path: <alexis@cecm.usp.br>
Received: from 200-158-234-146.dsl.telesp.net.br (rory.example.net) [200.158.234.146] 
	by master.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 1AdoIe-0000p4-00; Tue, 06 Jan 2004 04:19:00 -0600
Received: by rory.example.net (Postfix, from userid 1000)
	id 08948A0F5; Tue,  6 Jan 2004 08:18:39 -0200 (BRST)
Date: Tue, 6 Jan 2004 08:18:39 -0200
From: "Alexis S. L. Carvalho" <alexis@cecm.usp.br>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: rxvt: Control+Shift+Prior/Next doesn't work
Message-ID: <20040106101839.GA3084@cecm.usp.br>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="rwEMma7ioTxnRzrJ"
Content-Disposition: inline
X-Reportbug-Version: 2.37
X-Editor: Vim-602 http://www.vim.org
User-Agent: Mutt/1.5.4i
Delivered-To: submit@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 
	2.60-master.debian.org_2003_11_25-bugs.debian.org_2004_1_5 
	(1.212-2003-09-23-exp) on master.debian.org
X-Spam-Status: No, hits=-2.9 required=4.0 tests=HAS_PACKAGE,UPPERCASE_25_50 
	autolearn=no 
	version=2.60-master.debian.org_2003_11_25-bugs.debian.org_2004_1_5
X-Spam-Level: 


--rwEMma7ioTxnRzrJ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Package: rxvt
Version: 1:2.6.4-6
Severity: normal
Tags: patch

Hi

(Prior = PageUp, Next = PageDown)

According to /usr/share/doc/rxvt/rxvtRef.txt.gz (and to a comment in the
source code), Ctrl+Shift+Prior should generate ESC[5@ .  But it actually
scrolls up, as if I had pressed just Shift+Prior .

The problem lies in the file src/command.c in the function lookup_key.
When checking whether to scroll, it only checks whether Shift is
pressed, no caring whether Ctrl or Meta are also pressed or not.

The attached patch fixes this for me - but I haven't tested all the
#ifdef'd alternatives.

Alexis


-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux rory 2.4.23-rc1 #1 Sat Nov 15 04:15:09 BRST 2003 i686
Locale: LANG=C, LC_CTYPE=pt_BR

Versions of packages rxvt depends on:
ii  base-passwd                 3.5.5        Debian base system master password
ii  libc6                       2.3.2.ds1-10 GNU C Library: Shared libraries an
ii  xlibs                       4.2.1-15     X Window System client libraries

-- no debconf information


--rwEMma7ioTxnRzrJ
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="scroll-up_down.patch"

 rxvt-2.6.4-alexis/src/command.h |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

diff -puN src/command.h~scroll-up_down src/command.h
--- rxvt-2.6.4/src/command.h~scroll-up_down	2004-01-05 19:52:04.000000000 -0200
+++ rxvt-2.6.4-alexis/src/command.h	2004-01-05 20:17:11.000000000 -0200
@@ -196,20 +196,27 @@ typedef struct {
 
 #ifdef SCROLL_ON_SHIFT
 # define SCROLL_SHIFTKEY (shft)
+# define NOSCROLL_SHIFTKEY 0
 #else
 # define SCROLL_SHIFTKEY 0
+# define NOSCROLL_SHIFTKEY (shft)
 #endif
 #ifdef SCROLL_ON_CTRL
 # define SCROLL_CTRLKEY  (ctrl)
+# define NOSCROLL_CTRLKEY 0
 #else
 # define SCROLL_CTRLKEY 0
+# define NOSCROLL_CTRLKEY (ctrl)
 #endif
 #ifdef SCROLL_ON_META
 # define SCROLL_METAKEY  (meta)
+# define NOSCROLL_METAKEY 0
 #else
 # define SCROLL_METAKEY 0
+# define NOSCROLL_METAKEY (meta)
 #endif
-#define IS_SCROLL_MOD  (SCROLL_SHIFTKEY || SCROLL_CTRLKEY || SCROLL_METAKEY)
+#define IS_SCROLL_MOD  ((SCROLL_SHIFTKEY || SCROLL_CTRLKEY || SCROLL_METAKEY) \
+              && (!NOSCROLL_SHIFTKEY && !NOSCROLL_CTRLKEY && !NOSCROLL_METAKEY))
 
 typedef struct XCNQueue_t {
     struct XCNQueue_t *next;

_

--rwEMma7ioTxnRzrJ--

---------------------------------------
Received: (at 226386-close) by bugs.debian.org; 5 Oct 2005 05:38:02 +0000
>From katie@spohr.debian.org Tue Oct 04 22:38:02 2005
Return-path: <katie@spohr.debian.org>
Received: from katie by spohr.debian.org with local (Exim 3.36 1 (Debian))
	id 1EN1st-0002B8-00; Tue, 04 Oct 2005 22:32:07 -0700
From: David Moreno Garza <damog@debian.org>
To: 226386-close@bugs.debian.org
X-Katie: $Revision: 1.56 $
Subject: Bug#226386: fixed in rxvt 1:2.6.4-9
Message-Id: <E1EN1st-0002B8-00@spohr.debian.org>
Sender: Archive Administrator <katie@spohr.debian.org>
Date: Tue, 04 Oct 2005 22:32:07 -0700
Delivered-To: 226386-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level: 
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER 
	autolearn=no version=2.60-bugs.debian.org_2005_01_02

Source: rxvt
Source-Version: 1:2.6.4-9

We believe that the bug you reported is fixed in the latest version of
rxvt, which is due to be installed in the Debian FTP archive:

rxvt-ml_2.6.4-9_i386.deb
  to pool/main/r/rxvt/rxvt-ml_2.6.4-9_i386.deb
rxvt_2.6.4-9.diff.gz
  to pool/main/r/rxvt/rxvt_2.6.4-9.diff.gz
rxvt_2.6.4-9.dsc
  to pool/main/r/rxvt/rxvt_2.6.4-9.dsc
rxvt_2.6.4-9_i386.deb
  to pool/main/r/rxvt/rxvt_2.6.4-9_i386.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 226386@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
David Moreno Garza <damog@debian.org> (supplier of updated rxvt package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Tue,  4 Oct 2005 23:20:36 -0500
Source: rxvt
Binary: rxvt-ml rxvt
Architecture: source i386
Version: 1:2.6.4-9
Distribution: unstable
Urgency: low
Maintainer: David Moreno Garza <damog@debian.org>
Changed-By: David Moreno Garza <damog@debian.org>
Description: 
 rxvt       - VT102 terminal emulator for the X Window System
 rxvt-ml    - multi-lingual VT102 terminal emulator for the X Window System
Closes: 226386 248861 296667 321340 322391
Changes: 
 rxvt (1:2.6.4-9) unstable; urgency=low
 .
   * The "Let's bring rxvt to real life again" revision release.
   * New maintainer (Closes: #321340).
   * Applied patch to get Control+Shift+Prior/Next to work.
   	(Closes: #226386, thanks to Alexis S. L. Carvalho).
   * Applied patch to make a POSIX debian/rules.
   	(Closes: #322391, thanks to Tommy Pettersson).
   * Fixed all documentation about cutchars.
   	(Closes: #296667, thanks to Xavier Renaut).
   * Updated policy version compliant.
   * menu commands brought to normal life (Closes: #248861).
Files: 
 136f1e810c0c4562b3770059e300e8e4 580 x11 optional rxvt_2.6.4-9.dsc
 01b5313c544d3267fe0d2ad668e92ae0 28757 x11 optional rxvt_2.6.4-9.diff.gz
 9fea0dbb9be8f34b0994dfac7bbdd9c3 231690 x11 optional rxvt_2.6.4-9_i386.deb
 67c191eb2bf4c9feb8bef6f26edb19f9 275240 x11 optional rxvt-ml_2.6.4-9_i386.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFDQ2KlmBxf18ZxJX0RAtQiAJsFJOou5dLYWuL7c4erIuUt4joopgCgrrej
13Ok43Drx+dGS4gcjzVXW5k=
=GHcb
-----END PGP SIGNATURE-----



Reply to: