debian/0000755000000000000000000000000012217415034007165 5ustar debian/source/0000755000000000000000000000000012167434025010472 5ustar debian/source/format0000644000000000000000000000001412167343037011702 0ustar 3.0 (quilt) debian/control0000644000000000000000000000312212167656325010604 0ustar Source: rxvt Section: x11 Priority: optional Maintainer: George Gensure Build-Depends: libx11-dev, libxt-dev, libxpm-dev, debhelper (>= 9), autotools-dev Standards-Version: 3.9.4 Homepage: http://rxvt.sourceforge.net/ Package: rxvt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: x-terminal-emulator Description: VT102 terminal emulator for the X Window System Rxvt is an 8-bit clean, color xterm replacement that uses significantly less memory than a conventional xterm, mostly since it doesn't support toolkit configurability or Tek graphics, but also since features can be removed at compile-time to reflect your needs. . The distribution also includes rclock, the smaller/better xclock replacement with appointment scheduling and xbiff functionality. Package: rxvt-ml Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: rxvt Suggests: xfonts-intl-european, xfonts-intl-chinese (>= 1.1-4) | xfonts-cmex-big5p, xcin (>= 2.5.0-0.2) Provides: x-terminal-emulator Description: multi-lingual VT102 terminal emulator for the X Window System Rxvt is an 8-bit clean, color xterm replacement that uses significantly less memory than a conventional xterm, mostly since it doesn't support toolkit configurability or Tek graphics, but also since features can be removed at compile-time to reflect your needs. . This package contains three versions of rxvt: krxvt and crxvt, which support Japanese and Chinese characters, and grxvt, which supports both ELOT-928 (ISO-8859-7 standard) and IBM-437 keyboard translations for Greek character entry. debian/rxvt-ml.doc-base0000644000000000000000000000040712167570555012214 0ustar Document: rxvt-ml Title: RXVT multi-lingual User's Manual Author: Geoff Wing Abstract: multi-lingual variant of RXVT. Section: Terminal Emulators Format: HTML Index: /usr/share/doc/rxvt-ml/html/rxvt.html Files: /usr/share/doc/rxvt-ml/html/*.html debian/rxvt-ml.override0000644000000000000000000000033012167320645012342 0ustar rxvt-ml: setgid-binary usr/bin/grxvt 2755 root/utmp rxvt-ml: setgid-binary usr/bin/krxvt 2755 root/utmp rxvt-ml: setgid-binary usr/bin/crxvt-big5 2755 root/utmp rxvt-ml: setgid-binary usr/bin/crxvt-gb 2755 root/utmp debian/crxvt0000644000000000000000000000072712167320645010273 0ustar #!/bin/sh # # This is a wrapper script that tests the locale and executes the # appropriate version of rxvt. if [ "$LC_ALL" = "zh_TW.Big5" ]; then ext=big5 elif [ "$LC_ALL" = "zh_CN.GB2312" ]; then ext=gb elif [ "$LC_CTYPE" = "zh_TW.Big5" ]; then ext=big5 elif [ "$LC_CTYPE" = "zh_CN.GB2312" ]; then ext=gb elif [ "$LANG" = "zh_TW.Big5" ]; then ext=big5 elif [ "$LANG" = "zh_CN.GB2312" ]; then ext=gb else ext=big5 fi exec /usr/bin/crxvt-"$ext" "$@" debian/krxvt.10000644000000000000000000000234612167320645010441 0ustar .\" @(#)krxvt.1 -*- nroff -*- .\"------- .TH KRXVT 1 "14 July 1999" "X Version 11" "X Tools" .SH NAME krxvt, crxvt, grxvt \- a multi-lingual VT102 emulator for the X window system .SH SYNOPSIS .B krxvt .RI [ options ] .RB [ \-e .I command .RI [ args ]] .br .B crxvt .RI [ options ] .RB [ \-e .I command .RI [ args ]] .br .B grxvt .RI [ options ] .RB [ \-e .I command .RI [ args ]] .br .SH DESCRIPTION .BR krxvt , .BR crxvt , and .B grxvt are versions of .B rxvt that have been compiled with support for non-latin character sets. .B krxvt supports Japanese (kanji) characters; .B crxvt-big5 supports Chinese (big5) characters; .B crxvt-gb supports Chinese (GB) characters; and .B grxvt supports greek keyboards. .B rxvt is a color vt102 terminal emulator intended as an .IR xterm (1) replacement for users who do not require features such as Tektronix 4014 emulation and toolkit-style configurability. As a result, .B rxvt uses much less swap space \(em a significant advantage on a machine serving many X sessions. .LP More complete description of .B rxvt and its derivatives can be found in the .IR rxvt (1) manual page. .SH SEE ALSO .IR rxvt (1), .SH AUTHOR This manual page was written by Brian Mays for .BR "Debian GNU/Linux" . debian/rxvt.override0000644000000000000000000000015212167320645011736 0ustar rxvt: setgid-binary usr/bin/rxvt-xterm 2755 root/utmp rxvt: setgid-binary usr/bin/rxvt-xpm 2755 root/utmp debian/compat0000644000000000000000000000000212167656146010402 0ustar 9 debian/rxvt-ml.prerm0000644000000000000000000000063712167605522011662 0ustar #!/bin/sh set -e if [ "$1" = "remove" ]; then update-alternatives --remove x-terminal-emulator /usr/bin/crxvt update-alternatives --remove x-terminal-emulator /usr/bin/krxvt update-alternatives --remove x-terminal-emulator /usr/bin/grxvt update-alternatives --remove rxvt /usr/bin/crxvt update-alternatives --remove rxvt /usr/bin/krxvt update-alternatives --remove rxvt /usr/bin/grxvt fi #DEBHELPER# debian/rxvt-ml.postinst0000644000000000000000000000233012167605517012414 0ustar #!/bin/sh set -e if [ "$1" = "configure" ]; then update-alternatives --install /usr/bin/x-terminal-emulator \ x-terminal-emulator /usr/bin/crxvt 8 \ --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ x-terminal-emulator.1.gz /usr/share/man/man1/crxvt.1.gz update-alternatives --install /usr/bin/x-terminal-emulator \ x-terminal-emulator /usr/bin/krxvt 9 \ --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ x-terminal-emulator.1.gz /usr/share/man/man1/krxvt.1.gz update-alternatives --install /usr/bin/x-terminal-emulator \ x-terminal-emulator /usr/bin/grxvt 8 \ --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ x-terminal-emulator.1.gz /usr/share/man/man1/grxvt.1.gz update-alternatives --install /usr/bin/rxvt \ rxvt /usr/bin/grxvt 20 \ --slave /usr/share/man/man1/rxvt.1.gz \ rxvt.1.gz /usr/share/man/man1/grxvt.1.gz update-alternatives --install /usr/bin/rxvt \ rxvt /usr/bin/krxvt 25 \ --slave /usr/share/man/man1/rxvt.1.gz \ rxvt.1.gz /usr/share/man/man1/krxvt.1.gz update-alternatives --install /usr/bin/rxvt \ rxvt /usr/bin/crxvt 20 \ --slave /usr/share/man/man1/rxvt.1.gz \ rxvt.1.gz /usr/share/man/man1/crxvt.1.gz fi #DEBHELPER# debian/rxvt.prerm0000644000000000000000000000047212167605457011260 0ustar #!/bin/sh set -e if [ "$1" = "remove" ]; then update-alternatives --remove x-terminal-emulator /usr/bin/rxvt-xterm update-alternatives --remove x-terminal-emulator /usr/bin/rxvt-xpm update-alternatives --remove rxvt /usr/bin/rxvt-xterm update-alternatives --remove rxvt /usr/bin/rxvt-xpm fi #DEBHELPER# debian/rxvt.menu-method0000644000000000000000000000122612167320645012344 0ustar #!/usr/bin/install-menu # -*- mode: shell-script; -*- # compat="menu-1" !include menu.h compat="menu-2" function ex($com)="{" title() "}\t" $com "\\r\n"; function xex($com)="{" title() "}\t" $com "&\\r\n"; supported; x11= xex($command); text= ex($command); endsupported; preoutput="#Automatically generated file. Do not edit (see /usr/doc/menu/html)\n\nSee the rxvt(1) man page for details on using this file.\n\n[menu]\n"; postoutput="[show]\n[done]\n"; startmenu=""; endmenu=""; submenutitle=$section "\n"; genmenu="rxvt.menu"; rootprefix="/etc/X11/"; userprefix="/.rxvt/"; mainmenutitle="Debian"; rootsection="/Debian"; treewalk="(M)" debian/rxvt.links0000644000000000000000000000010412167320645011234 0ustar usr/share/man/man1/rxvt-xterm.1.gz usr/share/man/man1/rxvt-xpm.1.gz debian/FAQ.Debian0000644000000000000000000001314212167320645010710 0ustar Debian RXVT Frequently Asked Questions Brian Mays This file contains the answers to some frequently asked questions about Debian GNU/Linux's prepackaged version of rxvt -- a VT102 emulator for the X window system. 1. Why does rxvt no longer use background pixmaps? The rxvt command is by default a symbolic link to rxvt-xterm (rxvt- debian in versions before 2.4.5-1). This binary has been compiled to be a smaller, more efficient xterm replacement. Therefore, the more exotic features, such as XPM and menu support, have been left out. Debian's rxvt package also contains another version of rxvt called rxvt-xpm which has all of the extra compile-time features included. To make this the default rxvt--that is, the version that is run when the user enters rxvt on the command line--set the symbolic link /etc/alternatives/rxvt to point to /usr/bin/X11/rxvt-xpm. This can be done with the following command. Execute as root update-alternatives --config rxvt or reassigning the link manually with ln -sf /usr/bin/X11/rxvt-xpm /etc/alternatives/rxvt 2. Why are the fonts used by the new version of rxvt larger than those used by the old version? The upstream developers decided to change the default font from fixed (which also is used by xterm) to 7x14. There are several ways to change the font used by rxvt. First, it is possible to use Alt- and Alt- keys to shift to a larger or smaller font, and the font can be changed on the command line via the -fn option. Finally, it is possible to use an X resource to set the default font. To use this, add the following to your .Xresources file: Rxvt.font: font To ensure that xterm and rxvt use the same font, you can use the following in .Xresources: XTerm*font: font More options for changing rxvt's fonts are available. See the rxvt(1) manual page for more details. 3. Why doesn't my BackSpace key work in some applications? Most likely this problem is caused by an incorrect rxvt terminfo entry. Upgrade to the latest version of the ncurses-base package. If the problem persists, you can manually install the correct terminfo entry which is located in doc/etc/rxvt.terminfo of Debian's rxvt source tree. With this file in the current directory, execute as root tic rxvt.terminfo Make sure that the TERMINFO environment variable is not set when you do this. 4. Rxvt uses too many colors for my monitor. How do I disable the extra colors? Rxvt only uses 16 colors (not including the colors used by a background pixmap), which is not very many. However, all of the colors are reconfigurable using run time options. For example, to keep rxvt from using dark grey (grey25) for bold text, running it with rxvt --colorBD 0 This tells rxvt to use color 0 (black) for bold characters. To enable this permanently, place the following in your .Xresources file: Rxvt.colorBD: 0 More options for changing rxvt's colors are available. See the rxvt(1) manual page for more details. 5. Rxvt doesn't start. Instead it returns the following error message: rxvt: can't open slave tty (null) What is wrong? As of version 2.6.0, rxvt uses the new Unix98 pseudo-ttys. Therefore, ensure that the "/dev/pts" directory is mounted and has the correct file permissions. 6. Why doesn't rxvt read the ".Xdefaults" file? Rxvt was compiled without internal Xresources support. Therefore, it uses the X server resource database like most other X clients. To set rxvt resources, either add them to your "~/.Xresources" file, which is read when starting your X session, or use the xrdb(1) program. 7. I upgraded from version 2.4.5 (or earlier) to 2.6.1 (or later). Why have my window tiles and icon names have changed? The most common source of this problem is using the "-name" command line option to set the title and icon name while also using the "-e" command line option. The bahavior of rxvt has changed. The "-e" command line option now sets the window title and icon name to be the basename of the program being executed if neither "-title" ("-T") nor "-n" are given on the command line. Therefore, using "-name" to do this no longer works. Instead, use the rxvt "-title" and "-n" options. 8. How do I get special keys to work with bash in an rxvt window? The easiest way to accomplish this is to edit the ".inputrc" configuration file. See bash(1) for the format of this file. Each sequence in the Rxvt Technical Reference (the "rxvtRef" files in the package documentation) can be bound to a particular action by adding lines to this file of the form "keyseq": function-name or macro The escape key should be represented in keyseq by "\e". For example, the following lines could be used to bind the arrow keys to move the cursor one word to the right or left when combined with the control key: "\Oc": forward-word "\Od": backward-word More help with Debian's version of rxvt is available on the debian-users mailing list (at "debian-users@lists.debian.org"). If you have any suggestions for improving this document or if you have any additional questions that you think should be included here, please send them to "rxvt@packages.debian.org". debian/rxvt.postinst0000644000000000000000000000156212172757655012023 0ustar #!/bin/sh set -e if [ "$1" = "configure" ]; then update-alternatives --install /usr/bin/x-terminal-emulator \ x-terminal-emulator /usr/bin/rxvt-xterm 10 \ --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ x-terminal-emulator.1.gz /usr/share/man/man1/rxvt-xterm.1.gz update-alternatives --install /usr/bin/x-terminal-emulator \ x-terminal-emulator /usr/bin/rxvt-xpm 8 \ --slave /usr/share/man/man1/x-terminal-emulator.1.gz \ x-terminal-emulator.1.gz /usr/share/man/man1/rxvt-xpm.1.gz update-alternatives --install /usr/bin/rxvt \ rxvt /usr/bin/rxvt-xterm 30 \ --slave /usr/share/man/man1/rxvt.1.gz \ rxvt.1.gz /usr/share/man/man1/rxvt-xterm.1.gz update-alternatives --install /usr/bin/rxvt \ rxvt /usr/bin/rxvt-xpm 20 \ --slave /usr/share/man/man1/rxvt.1.gz \ rxvt.1.gz /usr/share/man/man1/rxvt-xpm.1.gz fi #DEBHELPER# debian/rxvt.docs0000644000000000000000000000014312167320645011047 0ustar doc/BUGS doc/FAQ doc/README.* doc/rxvtRef.txt doc/xterm.seq debian/FAQ.Debian debian/README.Debian debian/rxvt-ml.links0000644000000000000000000000037012167320645011647 0ustar usr/share/man/man1/krxvt.1.gz usr/share/man/man1/crxvt-big5.1.gz usr/share/man/man1/krxvt.1.gz usr/share/man/man1/crxvt-gb.1.gz usr/share/man/man1/krxvt.1.gz usr/share/man/man1/crxvt.1.gz usr/share/man/man1/krxvt.1.gz usr/share/man/man1/grxvt.1.gz debian/rxvt-ml.docs0000644000000000000000000000014312167320645011455 0ustar doc/BUGS doc/FAQ doc/README.* doc/rxvtRef.txt doc/xterm.seq debian/FAQ.Debian debian/README.Debian debian/rxvt-ml.install0000644000000000000000000000031412167320645012173 0ustar src/krxvt src/crxvt-big5 src/crxvt-gb src/grxvt debian/crxvt usr/bin debian/krxvt.1 usr/share/man/man1 doc/menu/* usr/share/doc/rxvt-ml/examples doc/rxvt.html doc/rxvtRef*.html usr/share/doc/rxvt-ml/html debian/rxvt.doc-base0000644000000000000000000000042612167567643011613 0ustar Document: rxvt Title: RXVT User's Manual Author: Geoff Wing Abstract: RXVT, our extended virtual terminal, is a terminal emulator for X11. Section: Terminal Emulators Format: HTML Index: /usr/share/doc/rxvt/html/rxvt.html Files: /usr/share/doc/rxvt/html/*.html debian/rxvt.dirs0000644000000000000000000000007012167320645011057 0ustar usr/share/lintian/overrides usr/share/doc/rxvt/examples debian/rules0000755000000000000000000001075212207523202010246 0ustar #!/usr/bin/make -f CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) CFLAGS := $(shell dpkg-buildflags --get CFLAGS) -Wall -g LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) INSTALL = install INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 INSTALL_SCRIPT = $(INSTALL) -p -o root -g root -m 755 INSTALL_DIR = $(INSTALL) -p -d -o root -g root -m 755 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O3 endif ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) endif DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE)) confflags= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) else confflags= --build $(DEB_BUILD_GNU_TYPE) endif CFG_BASE := --prefix=/usr --mandir=$${prefix}/share/man --enable-utmp --enable-wtmp \ --enable-xim --enable-ttygid --enable-xgetdefault --with-term=rxvt \ --with-x $(confflags) --enable-rxvt-scroll --enable-mousewheel \ --enable-keepscrolling CFG_XPM := $(CFG_BASE) --enable-xpm-background --enable-transparency --enable-menubar \ --enable-graphics --with-xpm-includes=/usr/include/X11 --with-xpm UTMP_SHELLS := debian/rxvt/usr/bin/rxvt-xterm debian/rxvt/usr/bin/rxvt-xpm \ debian/rxvt-ml/usr/bin/krxvt debian/rxvt-ml/usr/bin/grxvt \ debian/rxvt-ml/usr/bin/crxvt-big5 debian/rxvt-ml/usr/bin/crxvt-gb .PHONY: clean build install binary-indep binary-arch binary clean: dh_testdir dh_testroot rm -f install.stamp build.stamp [ ! -f Makefile ] || $(MAKE) -i distclean rm -f src/rxvt-xterm src/rxvt-xpm src/krxvt src/grxvt src/crxvt-gb src/crxvt-big5 rm -f doc/rxvt.1 rxvt-xterm.1 src/rxvtlib.h doc/Makefile doc/yodl/rxvtRef.yo dh_clean build: build-arch build-indep build-arch: build.stamp build-indep: build.stamp build.stamp: dh_testdir ./configure $(CFG_BASE) --without-xpm echo "#define PTYS_ARE_GETPT 1" >> config.h $(MAKE) $(MAKEFLAGS) $(CROSS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' all clock mv src/rxvt src/rxvt-xterm cp doc/rxvt.tbl rxvt-xterm.1 $(MAKE) -C src clean ./configure $(CFG_XPM) --enable-xterm-scroll --enable-next-scroll echo "#define PTYS_ARE_GETPT 1" >> config.h $(MAKE) $(MAKEFLAGS) $(CROSS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' rxvt mv src/rxvt src/rxvt-xpm $(MAKE) -C src clean ./configure $(CFG_XPM) --enable-kanji --disable-big5 --disable-gb --disable-greek echo "#define PTYS_ARE_GETPT 1" >> config.h $(MAKE) $(MAKEFLAGS) $(CROSS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' rxvt mv src/rxvt src/krxvt $(MAKE) -C src clean ./configure $(CFG_XPM) --disable-kanji --enable-big5 --disable-gb --disable-greek echo "#define PTYS_ARE_GETPT 1" >> config.h $(MAKE) $(MAKEFLAGS) $(CROSS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' rxvt mv src/rxvt src/crxvt-big5 $(MAKE) -C src clean ./configure $(CFG_XPM) --disable-kanji --disable-big5 --enable-gb --disable-greek echo "#define PTYS_ARE_GETPT 1" >> config.h $(MAKE) $(MAKEFLAGS) $(CROSS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' rxvt mv src/rxvt src/crxvt-gb $(MAKE) -C src clean ./configure $(CFG_XPM) --disable-kanji --disable-big5 --disable-gb --enable-greek echo "#define PTYS_ARE_GETPT 1" >> config.h $(MAKE) $(MAKEFLAGS) $(CROSS) CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS)' rxvt mv src/rxvt src/grxvt touch build.stamp install: install.stamp install.stamp: build dh_testdir dh_testroot dh_install dh_installdirs touch install.stamp binary: binary-arch binary-indep binary-indep: build install binary-arch: build install dh_testdir dh_testroot cp debian/rxvt.override debian/rxvt/usr/share/lintian/overrides/rxvt cp debian/rxvt-ml.override debian/rxvt-ml/usr/share/lintian/overrides/rxvt-ml dh_installdocs chmod 0644 debian/rxvt/usr/share/doc/rxvt/examples/* \ debian/rxvt-ml/usr/share/doc/rxvt-ml/examples/* dh_installchangelogs doc/changes.txt dh_installmenu dh_fixperms for SH in $(UTMP_SHELLS); do \ chown root.utmp $$SH; \ chmod 2755 $$SH; \ done dh_compress dh_link dh_strip dh_shlibdeps dh_gencontrol dh_md5sums dh_installdeb dh_builddeb debian/patches/0000755000000000000000000000000012211774554010625 5ustar debian/patches/multi-byte-font-width-72371.patch0000644000000000000000000002103412211765774016507 0ustar Debian Bug #72371 different width multi-byte font support If the width of the multi-byte font is not twice as much as the one of the single-byte font, rxvt can't display multi-byte characters correctly. Original issue posted and patch provided by Shugo Maeda Applied in Debian package version 2.6.3-4 Updated for upstream version 2.7.10 --- a/src/graphics.c +++ b/src/graphics.c @@ -160,17 +160,17 @@ x -= (XTextWidth(r->TermWin.font, data->text, data->coords[3]) >> 1); if ((align & VERTICAL_ALIGNMENT) == TOP_TEXT) - y += r->TermWin.font->ascent; + y += r->TermWin.fascent; else if ((align & VERTICAL_ALIGNMENT) == BOTTOM_TEXT) - y -= r->TermWin.font->descent; + y -= r->TermWin.fdescent; if ((align & VERTICAL_ALIGNMENT) == VCENTER_TEXT) - y -= r->TermWin.font->descent - + ((r->TermWin.font->ascent + r->TermWin.font->descent) >> 1); + y -= r->TermWin.fdescent + + ((r->TermWin.fascent + r->TermWin.fdescent) >> 1); if ((align & VERTICAL_ALIGNMENT) == VCAPS_CENTER_TEXT) - y += (r->TermWin.font->ascent >> 1); + y += (r->TermWin.fascent >> 1); - XPMClearArea(r->Xdisplay, grwin->win, x, y - r->TermWin.font->ascent, + XPMClearArea(r->Xdisplay, grwin->win, x, y - r->TermWin.fascent, Width2Pixel(data->coords[3]), Height2Pixel(1), 0); XDrawString(r->Xdisplay, grwin->win, r->TermWin.gc, x, y, data->text, data->coords[3]); --- a/src/main.c +++ b/src/main.c @@ -643,6 +643,9 @@ recheckfonts = !(fw == r->TermWin.fwidth && fh == r->TermWin.fheight); r->TermWin.fwidth = fw; r->TermWin.fheight = fh; + r->TermWin.fascent = r->TermWin.font->ascent; + r->TermWin.fdescent = r->TermWin.font->descent; + r->TermWin.fontdiff = 0; /* check that size of boldFont is okay */ #ifndef NO_BOLDFONT @@ -714,9 +717,16 @@ if (recheckfonts) if (r->TermWin.mfont != NULL) { fw = rxvt_get_fontwidest(r->TermWin.mfont); - fh = r->TermWin.mfont->ascent + r->TermWin.mfont->descent; - if (fw > (r->TermWin.fwidth * 2) || fh > r->TermWin.fheight) - r->TermWin.mfont = NULL; + if (r->TermWin.mfont->ascent > r->TermWin.fascent) { + r->TermWin.fascent = r->TermWin.mfont->ascent; + r->TermWin.fontdiff = 1; + } + if (r->TermWin.mfont->descent > r->TermWin.fdescent) { + r->TermWin.fdescent = r->TermWin.mfont->descent; + r->TermWin.fontdiff = 1; + } + if (r->TermWin.fontdiff) + r->TermWin.fheight = r->TermWin.fascent + r->TermWin.fdescent; if (fw == (r->TermWin.fwidth * 2) /* && fh==r->TermWin.fheight */ ) r->TermWin.propfont &= ~PROPFONT_MULTI; else --- a/src/rxvtlib.h.in +++ b/src/rxvtlib.h.in @@ -100,7 +100,10 @@ u_int16_t height; /* window height [pixels] */ u_int16_t fwidth; /* font width [pixels] */ u_int16_t fheight; /* font height [pixels] */ + u_int16_t fascent; /* font ascent [pixels] */ + u_int16_t fdescent; /* font descent [pixels] */ u_int16_t propfont; /* font proportional flags */ + u_int16_t fontdiff; /* font size different */ u_int16_t ncol; /* window columns [characters] */ u_int16_t nrow; /* window rows [characters] */ u_int16_t focus; /* window has focus */ --- a/src/screen.c +++ b/src/screen.c @@ -1886,7 +1886,7 @@ */ #define DRAW_STRING(Func, x, y, str, len) \ - Func(r->Xdisplay, drawBuffer, r->TermWin.gc, (x), (y), (str), (len)) + Func(r, r->Xdisplay, drawBuffer, r->TermWin.gc, (x), (y), (str), (len)) #if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD) # define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink)) @@ -1906,6 +1906,109 @@ #define IS_FONT_CHAR(X, Y) \ ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) +#ifdef MULTICHAR_SET +static int +mfont_draw_string16(rxvt_t *r, + Display *display, + Drawable d, + GC gc, + int x, + int y, + XChar2b *str, + int len) +{ + while (len > 0) { + XDrawString16(display, d, gc, x, y, str, 1); + if (str->byte1 == '\0') { + x += r->TermWin.fwidth; + } + else { + x += r->TermWin.fwidth * 2; + } + str++; + len--; + } + return 0; +} + +static int +mfont_draw_image_string16(rxvt_t *r, + Display *display, + Drawable d, + GC gc, + int x, + int y, + XChar2b *str, + int len) +{ + while (len > 0) { + XDrawImageString16(display, d, gc, x, y, str, 1); + if (str->byte1 == '\0') { + x += r->TermWin.fwidth; + } + else { + x += r->TermWin.fwidth * 2; + } + str++; + len--; + } + return 0; +} + +static int +draw_string16(rxvt_t *r, + Display *display, + Drawable d, + GC gc, + int x, + int y, + XChar2b *str, + int len) +{ + XDrawString16(display, d, gc, x, y, str, len); +} + +static int +draw_image_string16(rxvt_t *r, + Display *display, + Drawable d, + GC gc, + int x, + int y, + XChar2b *str, + int len) +{ + XDrawImageString16(display, d, gc, x, y, str, len); +} + +#endif + +static int +draw_string(rxvt_t *r, + Display *display, + Drawable d, + GC gc, + int x, + int y, + char *str, + int len) +{ + XDrawString(display, d, gc, x, y, str, len); +} + +static int +draw_image_string(rxvt_t *r, + Display *display, + Drawable d, + GC gc, + int x, + int y, + char *str, + int len) +{ + XDrawImageString(display, d, gc, x, y, str, len); +} + /* EXTPROTO */ void rxvt_scr_refresh(rxvt_t *r, unsigned char refresh_type) @@ -1940,8 +2043,8 @@ text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ char *buffer; /* local copy of r->h->buffer */ struct rxvt_hidden *h = r->h; - int (*draw_string) () = XDrawString; - int (*draw_image_string) () = XDrawImageString; + int (*draw_string_func) () = draw_string; + int (*draw_image_string_func) () = draw_image_string; if (refresh_type == NO_REFRESH || !r->TermWin.mapped) return; @@ -2210,7 +2313,7 @@ * E2: OK, now the real pass */ ypixelc = (int)Row2Pixel(row); - ypixel = ypixelc + r->TermWin.font->ascent; + ypixel = ypixelc + r->TermWin.fascent; for (col = 0; col < r->TermWin.ncol; col++) { unsigned char fontdiff,/* current font size != base font size */ @@ -2237,7 +2340,7 @@ } /* redraw one or more characters */ - fontdiff = 0; + fontdiff = r->TermWin.fontdiff; len = 0; buffer[len++] = dtp[col] = stp[col]; drp[col] = rend; @@ -2259,9 +2362,14 @@ wbyte = 1; XSetFont(r->Xdisplay, r->TermWin.gc, r->TermWin.mfont->fid); - fontdiff = (r->TermWin.propfont & PROPFONT_MULTI); - draw_string = XDrawString16; - draw_image_string = XDrawImageString16; + fontdiff |= (r->TermWin.propfont & PROPFONT_MULTI) ? 1 : 0; + if (r->TermWin.propfont & PROPFONT_MULTI) { + draw_string_func = mfont_draw_string16; + draw_image_string_func = mfont_draw_image_string16; + } else { + draw_string_func = draw_string16; + draw_image_string_func = draw_image_string16; + } } if (r->TermWin.mfont == NULL) { buffer[0] = buffer[1] = ' '; @@ -2305,8 +2413,8 @@ if (wbyte) { wbyte = 0; XSetFont(r->Xdisplay, r->TermWin.gc, r->TermWin.font->fid); - draw_string = XDrawString; - draw_image_string = XDrawImageString; + draw_string_func = draw_string; + draw_image_string_func = draw_image_string; } #else { @@ -2415,11 +2523,12 @@ && r->TermWin.boldFont != NULL) { bfont = 1; XSetFont(r->Xdisplay, r->TermWin.gc, r->TermWin.boldFont->fid); - fontdiff = (r->TermWin.propfont & PROPFONT_BOLD); + fontdiff |= (r->TermWin.propfont & PROPFONT_BOLD) ? 1 : 0; rend &= ~RS_Bold; /* we've taken care of it */ } else if (bfont) { bfont = 0; - XSetFont(r->Xdisplay, r->TermWin.gc, r->TermWin.font->fid); + if (!wbyte) + XSetFont(r->Xdisplay, r->TermWin.gc, r->TermWin.font->fid); } #endif /* @@ -2444,9 +2553,10 @@ - r->TermWin.lineSpace)); gcvalue.foreground = gctmp; XChangeGC(r->Xdisplay, r->TermWin.gc, GCForeground, &gcvalue); - DRAW_STRING(draw_string, xpixel, ypixel, buffer, wlen); + DRAW_STRING(draw_string_func, xpixel, ypixel, buffer, wlen); } else - DRAW_STRING(draw_image_string, xpixel, ypixel, buffer, wlen); + DRAW_STRING(draw_image_string_func, xpixel, ypixel, + buffer, wlen); #ifndef NO_BOLDOVERSTRIKE # ifdef NO_BOLDOVERSTRIKE_MULTI debian/patches/paste-crash-217472.patch0000644000000000000000000000147512205010154014611 0ustar --- a/src/main.c +++ b/src/main.c @@ -93,8 +93,10 @@ XSynchronize(r->Xdisplay, True); XSetErrorHandler((XErrorHandler) abort); #else +#if 0 XSetErrorHandler((XErrorHandler) rxvt_xerror_handler); #endif +#endif #ifdef HAVE_SCROLLBARS if (r->Options & Opt_scrollBar) --- a/src/screen.c +++ b/src/screen.c @@ -3640,9 +3640,8 @@ target_list[3] = (Atom) r->h->xa[XA_COMPOUND_TEXT]; #endif XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_ATOM, - (8 * sizeof(target_list[0])), PropModeReplace, - (unsigned char *)target_list, - (sizeof(target_list) / sizeof(target_list[0]))); + 32, PropModeReplace, (unsigned char *)target_list, + (sizeof(target_list) / atom_size)); ev.property = rq->property; } else if (rq->target == r->h->xa[XA_MULTIPLE]) { /* TODO: Handle MULTIPLE */ debian/patches/static-kstate-declarations-288459.patch0000644000000000000000000000135012167703325017652 0ustar Debian Bug #288459 FTBFS (amd64/gcc-4.0): static declaration of 'kstate_add_xlat' follows non-static declaration Replace kstate_* static functions with non-static declarations in src/grkelot.c Original issue posted and patch provided by Andreas Jochens Applied in rxvt_2.6.4-7 --- a/src/grkelot.c +++ b/src/grkelot.c @@ -159,9 +159,9 @@ #define NUM_XLAT_TYPES (sizeof(xlat_type) / sizeof(xlat_type[0])) -static void kstate_add_xlat(char *str); -static void kstate_add_switcher(char *str); -static void kstate_set_life(char *str); +void kstate_add_xlat(char *str); +void kstate_add_switcher(char *str); +void kstate_set_life(char *str); /* --- Functions ------------- */ /* INTPROTO */ debian/patches/scrollbar-style-doc.patch0000644000000000000000000000127412207523340015524 0ustar Add a note in the manpage regarding the missing manpage style support in the rxvt-xterm binary. Originally applied in rxvt-beta by hesso@pool.math.tu-berlin.de --- a/doc/rxvt.tbl +++ b/doc/rxvt.tbl @@ -350,7 +350,7 @@ is xterm style with 2\&.20 old word selection, or anything else which gives xterm style selection\&. .IP "\fBscrollstyle:\fP \fImode\fP" -Set scrollbar style to \fBrxvt\fP, \fBnext\fP or \fBxterm\fP +Set scrollbar style to \fBrxvt\fP, \fBnext\fP or \fBxterm\fP (only supported by the \fBrxvt-xpm\fP binary) .IP "\fBtitle:\fP \fIstring\fP" Set window title string, the default title is the command-line specified after the \fB-e\fP option, if any, otherwise the application debian/patches/series0000644000000000000000000000102212211774554012035 0ustar debian-rxvt-monochrome.patch rclock-precision.patch var-mail-spool.patch java-selection-paste-341200.patch buffer-overflow-108384.patch multi-byte-font-width-72371.patch console-read-dev-xconsole-35387.patch static-kstate-declarations-288459.patch no-unspecified-display-target-469296.patch control-shift-prior-next-226386.patch elvisnox-cursor-invisible-70515.patch lintian-doc-fixes.patch cutchars-docs-169415.patch screen-nlines-assertion.patch scrollbar-style-doc.patch decrease-wm-race-likeliness-202497.patch rxvt-tbl.patch debian/patches/cutchars-docs-169415.patch0000644000000000000000000000125312204657415015156 0ustar Debian Bug #169415 ~ is in default cutchars Posted by James R. Van Zandt Original request was for behavior change for default cutchars to match docs, however I prefer to update the documentation to reflect the defaults and let users choose to override in Xresources or cmdline as appropriate to not break existing behavior. --- a/doc/rxvt.tbl +++ b/doc/rxvt.tbl @@ -472,7 +472,7 @@ The characters used as delimiters for double-click word selection\&. The built-in default: .br -\fBBACKSLASH `"\'&()*,;<=>?@[]{|}\fP +\fB"&'()*,;<=>?@[\\]^`{|}~ .IP "\fBpreeditType:\fP \fIstyle\fP" \fBOverTheSpot\fP, \fBOffTheSpot\fP, \fBRoot\fP; option \fB-pt\fP\&. debian/patches/clean-rxvtlib-header.patch0000644000000000000000000000074012167700475015650 0ustar Removed rxvtlib.h during clean to avoid errors when rebuilding with dpkg-buildpackage, which thinks that rxvtlib.h is a modified source. --- a/src/Makefile.in +++ b/src/Makefile.in @@ -113,7 +113,7 @@ alldoc: clean: - $(RMF) rxvt core a.out *.o *.lo *.bak *~ *.intpro *.extpro .libs/* librxvt.la tmpproto .protos *.tmp + $(RMF) rxvtlib.h rxvt core a.out *.o *.lo *.bak *~ *.intpro *.extpro .libs/* librxvt.la tmpproto .protos *.tmp realclean: clean $(RMF) tags librxvt.h debian/patches/no-unspecified-display-target-469296.patch0000644000000000000000000000354412167703265020275 0ustar Debian Bug #469296 opens terminal on unspecified display A patch for rxvt to not use :0 if unset both in rxvt and in rclock Original issue posted and patch provided by Bernhard R. Link Applied in rxvt_2.6.4-13 --- a/src/init.c +++ b/src/init.c @@ -532,14 +532,13 @@ /* * Open display, get options/resources and create the window */ - if ((rs[Rs_display_name] = getenv("DISPLAY")) == NULL) - rs[Rs_display_name] = ":0"; + rs[Rs_display_name] = getenv("DISPLAY"); rxvt_get_options(r, r_argc, r_argv); free(r_argv); #ifdef LOCAL_X_IS_UNIX - if (rs[Rs_display_name][0] == ':') { + if (rs[Rs_display_name] && strncmp(rs[Rs_display_name], ":0", 2) == 0) { val = rxvt_malloc(5 + STRLEN(rs[Rs_display_name])); STRCPY(val, "unix"); STRCAT(val, rs[Rs_display_name]); @@ -550,9 +549,13 @@ if (r->Xdisplay == NULL && (r->Xdisplay = XOpenDisplay(rs[Rs_display_name])) == NULL) { - rxvt_print_error("can't open display %s", rs[Rs_display_name]); + rxvt_print_error("can't open display %s", + rs[Rs_display_name]?rs[Rs_display_name]: + "as no -display option given and DISPLAY not set"); exit(EXIT_FAILURE); } + if (rs[Rs_display_name] == NULL) + rs[Rs_display_name] = XDisplayString(r->Xdisplay); rxvt_extract_resources(r, r->Xdisplay, rs[Rs_name]); --- a/rclock/rclock.c +++ b/rclock/rclock.c @@ -324,9 +324,6 @@ CheckMaildir(); #endif - if ((display_name = getenv ("DISPLAY")) == NULL) - display_name = ":0"; - /* parse the command line */ for (i = 1; i < argc; i += 2) { @@ -424,7 +421,9 @@ Xdisplay = XOpenDisplay (display_name); if (!Xdisplay) { - print_error ("can't open display %s", display_name); + print_error ("can't open display %s", display_name?display_name: + getenv("DISPLAY")?getenv("DISPLAY"): + "as no -d given and DISPLAY not set"); goto Abort; } debian/patches/decrease-wm-race-likeliness-202497.patch0000644000000000000000000000144712211770615017657 0ustar Debian Bug #202497 Initialize the terminal dimensions earlier to reduce the probability that the wm interferes. Originally applied in rxvt-beta as submitted by Ingo Koehne --- a/src/init.c +++ b/src/init.c @@ -1330,6 +1330,9 @@ /* need to trap SIGURG for SVR4 (Unixware) rlogin */ /* signal (SIGURG, SIG_DFL); */ + /* set window size */ + rxvt_tt_winsize(STDIN_FILENO, r->TermWin.ncol, r->TermWin.nrow); + #ifndef __QNX__ /* spin off the command interpreter */ switch (r->h->cmd_pid = fork()) { @@ -1413,9 +1416,6 @@ #endif /* SRIOCSREDIR */ } - /* set window size */ - rxvt_tt_winsize(STDIN_FILENO, r->TermWin.ncol, r->TermWin.nrow); - /* reset signals and spin off the command interpreter */ signal(SIGINT, SIG_DFL); signal(SIGQUIT, SIG_DFL); debian/patches/rclock-precision.patch0000644000000000000000000002121012170011522015067 0ustar A patch by Wolfgang Pietsch to make rclock's hour hand move smoothly. Unconditional concatenation of a semicolon to a command to execute on the periodic schedule of rclock was changed to be aware of a terminating '&' for backgrounding, and avoided with an already present semicolon. Applied in 2.6.4-13 --- a/rclock/rclock.c +++ b/rclock/rclock.c @@ -705,19 +705,68 @@ Draw_Window (mywindow_t * W, int full_redraw) { /* pre-computed values for sin() x1000, to avoid using floats */ - static const short Sin [60] = { - 0, - 105, 208, 309, 407, 500, 588, 669, - 743, 809, 866, 914, 951, 978, 995, - 1000, - 995, 978, 951, 914, 866, 809, 743, - 669, 588, 500, 407, 309, 208, 105, - 0, - -105, -208, -309, -407, -500, -588, -669, - -743, -809, -866, -914, -951, -978, -995, - -1000, - -995, -978, -951, -914, -866, -809, -743, - -669, -588, -500, -407, -309, -208, -105 + static const short Sin [720] = { + 0, + 9, 17, 26, 35, 44, 52, 61, 70, 78, 87, 96, 105, + 113, 122, 131, 139, 148, 156, 165, 174, 182, 191, 199, 208, + 216, 225, 233, 242, 250, 259, 267, 276, 284, 292, 301, 309, + 317, 326, 334, 342, 350, 358, 367, 375, 383, 391, 399, 407, + 415, 423, 431, 438, 446, 454, 462, 469, 477, 485, 492, 500, + 508, 515, 522, 530, 537, 545, 552, 559, 566, 574, 581, 588, + 595, 602, 609, 616, 623, 629, 636, 643, 649, 656, 663, 669, + 676, 682, 688, 695, 701, 707, 713, 719, 725, 731, 737, 743, + 749, 755, 760, 766, 772, 777, 783, 788, 793, 799, 804, 809, + 814, 819, 824, 829, 834, 839, 843, 848, 853, 857, 862, 866, + 870, 875, 879, 883, 887, 891, 895, 899, 903, 906, 910, 914, + 917, 921, 924, 927, 930, 934, 937, 940, 943, 946, 948, 951, + 954, 956, 959, 961, 964, 966, 968, 970, 972, 974, 976, 978, + 980, 982, 983, 985, 986, 988, 989, 990, 991, 993, 994, 995, + 995, 996, 997, 998, 998, 999, 999, 999, 1000, 1000, 1000, 1000, + 1000, 1000, 1000, 999, 999, 999, 998, 998, 997, 996, 995, 995, + 994, 993, 991, 990, 989, 988, 986, 985, 983, 982, 980, 978, + 976, 974, 972, 970, 968, 966, 964, 961, 959, 956, 954, 951, + 948, 946, 943, 940, 937, 934, 930, 927, 924, 921, 917, 914, + 910, 906, 903, 899, 895, 891, 887, 883, 879, 875, 870, 866, + 862, 857, 853, 848, 843, 839, 834, 829, 824, 819, 814, 809, + 804, 799, 793, 788, 783, 777, 772, 766, 760, 755, 749, 743, + 737, 731, 725, 719, 713, 707, 701, 695, 688, 682, 676, 669, + 663, 656, 649, 643, 636, 629, 623, 616, 609, 602, 595, 588, + 581, 574, 566, 559, 552, 545, 537, 530, 523, 515, 508, 500, + 492, 485, 477, 469, 462, 454, 446, 438, 431, 423, 415, 407, + 399, 391, 383, 375, 367, 358, 350, 342, 334, 326, 317, 309, + 301, 292, 284, 276, 267, 259, 250, 242, 233, 225, 216, 208, + 199, 191, 182, 174, 165, 156, 148, 139, 131, 122, 113, 105, + 96, 87, 78, 70, 61, 52, 44, 35, 26, 17, 9, 0, + -9, -17, -26, -35, -44, -52, -61, -70, -78, -87, -96, -105, + -113, -122, -131, -139, -148, -156, -165, -174, -182, -191, -199, -208, + -216, -225, -233, -242, -250, -259, -267, -276, -284, -292, -301, -309, + -317, -326, -334, -342, -350, -358, -366, -375, -383, -391, -399, -407, + -415, -423, -431, -438, -446, -454, -462, -469, -477, -485, -492, -500, + -508, -515, -522, -530, -537, -545, -552, -559, -566, -574, -581, -588, + -595, -602, -609, -616, -623, -629, -636, -643, -649, -656, -663, -669, + -676, -682, -688, -695, -701, -707, -713, -719, -725, -731, -737, -743, + -749, -755, -760, -766, -772, -777, -783, -788, -793, -799, -804, -809, + -814, -819, -824, -829, -834, -839, -843, -848, -853, -857, -862, -866, + -870, -875, -879, -883, -887, -891, -895, -899, -903, -906, -910, -914, + -917, -921, -924, -927, -930, -934, -937, -940, -943, -946, -948, -951, + -954, -956, -959, -961, -964, -966, -968, -970, -972, -974, -976, -978, + -980, -982, -983, -985, -986, -988, -989, -990, -991, -993, -994, -995, + -995, -996, -997, -998, -998, -999, -999, -999, -1000, -1000, -1000, -1000, + -1000, -1000, -1000, -999, -999, -999, -998, -998, -997, -996, -995, -995, + -994, -993, -991, -990, -989, -988, -986, -985, -983, -982, -980, -978, + -976, -974, -972, -970, -968, -966, -964, -961, -959, -956, -954, -951, + -948, -946, -943, -940, -937, -934, -930, -927, -924, -921, -917, -914, + -910, -906, -903, -899, -895, -891, -887, -883, -879, -875, -870, -866, + -862, -857, -853, -848, -843, -839, -834, -829, -824, -819, -814, -809, + -804, -799, -793, -788, -783, -777, -772, -766, -760, -755, -749, -743, + -737, -731, -725, -719, -713, -707, -701, -695, -688, -682, -676, -669, + -663, -656, -649, -643, -636, -629, -623, -616, -609, -602, -595, -588, + -581, -574, -566, -559, -552, -545, -537, -530, -523, -515, -508, -500, + -492, -485, -477, -469, -462, -454, -446, -438, -431, -423, -415, -407, + -399, -391, -383, -375, -367, -358, -350, -342, -334, -326, -317, -309, + -301, -292, -284, -276, -267, -259, -250, -242, -233, -225, -216, -208, + -199, -191, -182, -174, -165, -156, -148, -139, -131, -122, -113, -105, + -96, -87, -78, -70, -61, -52, -44, -35, -26, -17, -9, }; static int savedDay = -1; @@ -905,26 +954,26 @@ ctr_x = (W->width / 2); ctr_y = (W->height / 2); -#define XPOS(i,val) (ctr_x + (W->width * Sin[i%60] * (val) + 100000) / 200000) -#define YPOS(i,val) (ctr_y - (W->height * Sin[(i+15)%60] * (val) + 100000) / 200000) +#define XPOS(i,val) (ctr_x + (W->width * Sin[i%720] * (val) + 100000) / 200000) +#define YPOS(i,val) (ctr_y - (W->height * Sin[(i+180)%720] * (val) + 100000) / 200000) /* * how to draw the clock face */ /* calculate the positions of the hands */ { - int angle = (tmval->tm_hour % 12) * 5 + (tmval->tm_min / 12); + int angle = (tmval->tm_hour % 12) * 60 + tmval->tm_min; HandsNow.h_x = XPOS (angle, 60); HandsNow.h_y = YPOS (angle, 60); } { - int angle = tmval->tm_min; + int angle = (tmval->tm_min * 12); HandsNow.m_x = XPOS (angle, 80); HandsNow.m_y = YPOS (angle, 80); } if (clockUpdate == 1) { - int angle = tmval->tm_sec; + int angle = (tmval->tm_sec * 12); HandsNow.s_x = XPOS (angle, 85); HandsNow.s_y = YPOS (angle, 85); } @@ -955,7 +1004,7 @@ * I believe this should be drawn always so it does not get * "swept away" by the minute hand. */ -#ifdef REMINDERS && DATE_ON_CLOCK_FACE +#if defined(REMINDERS) && defined(DATE_ON_CLOCK_FACE) if( show_date) { char date[10]; @@ -971,22 +1020,22 @@ if (full_redraw) { - int angle; + int mintick; /* * draw clock face */ #ifdef SUBTICKS - for (angle = 0; angle < 60; angle++) + for (mintick = 0; mintick < 60; mintick++) XDrawPoint (Xdisplay, W->win, X_gc, - XPOS (angle, 95), - YPOS (angle, 95)); + XPOS ((mintick * 12), 95), + YPOS ((mintick * 12), 95)); #endif - for (angle = 0; angle < 60; angle += 5) + for (mintick = 0; mintick < 60; mintick += 5) XDrawLine (Xdisplay, W->win, X_gc, - XPOS (angle, 90), - YPOS (angle, 90), - XPOS (angle, 100), - YPOS (angle, 100)); + XPOS ((mintick * 12), 90), + YPOS ((mintick * 12), 90), + XPOS ((mintick * 12), 100), + YPOS ((mintick * 12), 100)); } else if (memcmp (pHandsOld, &HandsNow, sizeof(hands_t))) { @@ -1258,8 +1307,16 @@ int n = (sizeof(execPrgm) - strlen (execPrgm) - 2); if ((n > 0) && (n >= strlen (prgm))) { - /* for co-occurring programs */ - strcat (execPrgm, ";"); + /* for co-occurring programs */ + switch (execPrgm[strlen (execPrgm)-1]) + { + case '&': + case ';': + break; + default: + strcat (execPrgm, ";"); + break; + } strncat (execPrgm, prgm, n); } } debian/patches/elvisnox-cursor-invisible-70515.patch0000644000000000000000000000132012167703046017463 0ustar Debian Bug #70515 elvisnox cursor invisible in rxvt when I run elvisnox in a rxvt terminal, elvisnox changes to reverse video, but unfortunately, the cursor is hardly visible. If you #define CURSOR_COLOR_IS_RENDITION_COLOR in screen.c and recompile rxvt, the cursor color will change as appropriate. Correction suggested by Nicholas Riley, confirmed by upstream maint Geoff Wing Applied in rxvt_2.6.4-3 --- a/src/feature.h +++ b/src/feature.h @@ -370,6 +370,10 @@ */ /* #define LOCAL_X_IS_UNIX */ +/* Debian modification to change the cursor color to the foreground + color */ +#define CURSOR_COLOR_IS_RENDITION_COLOR + /* * Have DISPLAY environment variable & "\E[7n" transmit display with IP number */ debian/patches/console-read-dev-xconsole-35387.patch0000644000000000000000000000075712167702657017332 0ustar Debian Bug #35387 -C option should read from /dev/xconsole, not /dev/console Changed CONSOLE macro definition to be /dev/xconsole, from /dev/console This patch originally applied in rxvt_2.6.3-9 --- a/src/init.h +++ b/src/init.h @@ -150,7 +150,7 @@ # define ONLCR 0 /* QNX, at least */ #endif -#define CONSOLE "/dev/console" /* console device */ +#define CONSOLE "/dev/xconsole" /* console device */ #include "init.intpro" /* PROTOS for internal routines */ #endif /* _INIT_H_ */ debian/patches/lintian-doc-fixes.patch0000644000000000000000000001045012167706540015163 0ustar documentation problems identified with lintian Escaping minus signs scattered throughout rxvt and rclock manpage sources. Replacing spaces with underscores in NAME section of rxvt and rclock manpages. --- a/doc/rxvt.tbl +++ b/doc/rxvt.tbl @@ -1,10 +1,10 @@ .TH "RXVT" "1" "26 MARCH 2003" "X Version 11" "X Tools" .SH "NAME" -rxvt (ouR XVT) \- a VT102 emulator for the X window system +rxvt_(ouR_XVT) \- a VT102 emulator for the X window system .PP .SH "SYNOPSIS" .PP -\fBrxvt\fP [options] [-e command [ args ]] +\fBrxvt\fP [options] [\-e command [ args ]] .PP .SH "DESCRIPTION" .PP @@ -21,18 +21,18 @@ In keeping with the smaller-is-better philosophy, options may be eliminated or default values chosen at compile-time, so options and defaults listed may not accurately reflect the version installed on your system\&. -`rxvt -h\' gives a list of major compile-time options on the \fIOptions\fP line\&. +`rxvt \-h\' gives a list of major compile-time options on the \fIOptions\fP line\&. Option descriptions may be prefixed with which compile option each is dependent upon\&. e\&.g\&. `Compile \fIXIM\fP:\' requires \fIXIM\fP on the \fIOptions\fP -line\&. Note: `rxvt -help\' gives a list of all command-line options compiled +line\&. Note: `rxvt \-help\' gives a list of all command-line options compiled into your version\&. .PP Note that \fBrxvt\fP permits the resource name to be used as a long-option (--/++ option) so the potential command-line options are far greater than those listed\&. -For example: `rxvt --loginShell --color1 Orange\'\&. +For example: `rxvt \-\-loginShell \-\-color1 Orange\'\&. .PP -Also note that if you do not explictly specify a font (\fB-fn\fP and \fB-fm\fP) +Also note that if you do not explicitly specify a font (\fB-fn\fP and \fB-fm\fP) or a multichar encoding method (\fB-km\fP), rxvt will select a font for the preferable encoding according to your locale\&. Supported encodings are: \fBISO-8859-\fPn (n=\fB1\fP\&.\&.\&.\fB15\fP), \fBKOI8-R\fP, \fBKOI8-U\fP, \fBEUC-JP\fP, @@ -202,9 +202,9 @@ in some window managers\&. .SH "RESOURCES (available also as long-options)" .PP -Note: `rxvt --help\' gives a list of all resources (long options) compiled +Note: `rxvt \-\-help\' gives a list of all resources (long options) compiled into your version\&. -If compiled with internal Xresources support (i\&.e\&. \fBrxvt -h\fP lists +If compiled with internal Xresources support (i\&.e\&. \fBrxvt \-h\fP lists \fB\&.Xdefaults\fP) then \fBrxvt\fP accepts application defaults set in XAPPLOADDIR/Rxvt (compile-time defined: usually \fB/usr/lib/X11/app-defaults/Rxvt\fP) and resources set in \fB~/\&.Xdefaults\fP, @@ -408,19 +408,19 @@ \fBTrue\fP: scroll to bottom when tty receives output; option(+si)\&. \fBFalse\fP: do not scroll to bottom when tty receives output; -option(-si)\&. +option(\-si)\&. .IP "\fBscrollWithBuffer:\fP \fIboolean\fP" \fBTrue\fP: scroll with scrollback buffer when tty recieves new lines (and \fBscrollTtyOutput\fP is False); option(+sw)\&. \fBFalse\fP: do not scroll with scrollback buffer when tty recieves new lines; -option(-sw)\&. +option(\-sw)\&. .IP "\fBscrollTtyKeypress:\fP \fIboolean\fP" \fBTrue\fP: scroll to bottom when a non-special key is pressed\&. Special keys are those which are intercepted by rxvt for special handling and are not passed onto the shell; -option(-sk)\&. +option(\-sk)\&. \fBFalse\fP: do not scroll to bottom when a non-special key is pressed; option(+sk)\&. .IP "\fBsmallfont_key:\fP \fIkeysym\fP" --- a/rclock/rclock.1.in +++ b/rclock/rclock.1.in @@ -2,8 +2,7 @@ .TH RCLOCK 1 @RXVT_DATE@ "X Version 11" "X Tools" .UC .SH NAME -rclock (ouR CLOCK) -\(em clock and appointment reminder for X11 +rclock \- clock and appointment reminder for X11 .SH SYNOPSIS .B rclock .RI [ options ] @@ -164,16 +163,16 @@ # ~/.rclock - My appointment file # startup functions -; xsetroot -solid Black & +; xsetroot \-solid Black & # cron functions -10:00; xsetroot -solid Grey25 & -14:00; xsetroot -solid Grey75 & +10:00; xsetroot \-solid Grey25 & +14:00; xsetroot \-solid Grey75 & # daily/weekly reminders -08:15 mtwrf * Good Morning!\\nRead News?; rxvt -e News +08:15 mtwrf * Good Morning!\\nRead News?; rxvt \-e News 12:00 mtwrf * Lunch Time! 17:00 mtwrf * Go Home 23:00 mtwrf * Still Here? Go to bed debian/patches/control-shift-prior-next-226386.patch0000644000000000000000000000166512167702740017324 0ustar Debian Bug #226386 Control+Shift+Prior/Next doesn't work Issue and patch posted by Alexis S. L. Carvalho Applied in rxvt_2.6.4-9 --- a/src/command.h +++ b/src/command.h @@ -44,20 +44,27 @@ #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)) /* * ESC-Z processing: debian/patches/rxvt-tbl.patch0000644000000000000000000002112612211774542013427 0ustar rxvt.tbl syntax fixes Applied originally in rxvt-beta by root@hejre.minidns.net --- a/doc/rxvt.tbl +++ b/doc/rxvt.tbl @@ -1,3 +1,4 @@ +'\" t .TH "RXVT" "1" "26 MARCH 2003" "X Version 11" "X Tools" .SH "NAME" rxvt_(ouR_XVT) \- a VT102 emulator for the X window system @@ -17,20 +18,20 @@ .PP .SH "OPTIONS" .PP -The \fBrxvt\fP options (mostly a subset of \fIxterm\fP\'s) are listed below\&. +The \fBrxvt\fP options (mostly a subset of \fIxterm\fP's) are listed below\&. In keeping with the smaller-is-better philosophy, options may be eliminated or default values chosen at compile-time, so options and defaults listed may not accurately reflect the version installed on your system\&. -`rxvt \-h\' gives a list of major compile-time options on the \fIOptions\fP line\&. +\(lqrxvt \-h\(rq gives a list of major compile-time options on the \fIOptions\fP line\&. Option descriptions may be prefixed with which compile option each is -dependent upon\&. e\&.g\&. `Compile \fIXIM\fP:\' requires \fIXIM\fP on the \fIOptions\fP -line\&. Note: `rxvt \-help\' gives a list of all command-line options compiled +dependent upon\&. e\&.g\&. \(lqCompile \fIXIM\fP:\(rq requires \fIXIM\fP on the \fIOptions\fP +line\&. Note: \(lqrxvt \-help\(rq gives a list of all command-line options compiled into your version\&. .PP Note that \fBrxvt\fP permits the resource name to be used as a long-option (--/++ option) so the potential command-line options are far greater than those listed\&. -For example: `rxvt \-\-loginShell \-\-color1 Orange\'\&. +For example: \(lqrxvt \-\-loginShell \-\-color1 Orange\(rq\&. .PP Also note that if you do not explicitly specify a font (\fB-fn\fP and \fB-fm\fP) or a multichar encoding method (\fB-km\fP), rxvt will select a font for the @@ -56,7 +57,7 @@ Turn on/off jump scrolling; resource \fBjumpScroll\fP\&. .IP "\fB-ip\fP|\fB+ip\fP" -Turn on/off inheriting parent window\'s pixmap\&. Alternative form +Turn on/off inheriting parent window's pixmap\&. Alternative form is \fB-tr\fP; resource \fBinheritPixmap\fP\&. .IP "\fB-bg\fP \fIcolour\fP" @@ -69,7 +70,7 @@ Compile \fIXPM\fP: Specify XPM file for the background and also optionally specify its scaling with a geometry string\&. Note you may need to add quotes to avoid special shell interpretation of -the `;\' in the command-line; +the \(lq;\(rq in the command-line; resource \fBbackgroundPixmap\fP\&. .IP "\fB-cr\fP \fIcolour\fP" The cursor colour; @@ -107,7 +108,7 @@ .IP "\fB-name\fP \fIname\fP" Specify the application name under which resources are to be obtained, rather than the default executable file name\&. -Name should not contain `\&.\' or `*\' characters\&. +Name should not contain \(lq\&.\(rq or \(lq*\(rq characters\&. Also sets the icon and title name\&. .IP "\fB-ls\fP|\fB+ls\fP" Start as a login-shell/sub-shell; @@ -165,7 +166,10 @@ \fBTERM\fP environment variable\&. This terminal type must exist in the \fItermcap(5)\fP database and should have \fIli#\fP and \fIco#\fP entries; resource \fBtermName\fP\&. -.IP "\fB-e\fP \fIcommand [arguments]\fP" +.IP "\fB-im\fP \fImethod\fP" +This option specifies the input method to use; +resource \fBinputMethod\fP\&. +.IP "\fB-e\fP \fIcommand [arguments]\fP" Run the command with its command-line arguments in the \fBrxvt\fP window; also sets the window title and icon name to be the basename of the program being executed if neither \fI-title\fP (\fI-T\fP) nor @@ -198,11 +202,11 @@ resource \fImodifier\fP\&. .IP "\fB-xrm\fP \fIresourcestring\fP" No effect on rxvt\&. Simply passes through an argument to be made -available in the instance\'s argument list\&. Appears in \fIWM_COMMAND\fP +available in the instance's argument list\&. Appears in \fIWM_COMMAND\fP in some window managers\&. .SH "RESOURCES (available also as long-options)" .PP -Note: `rxvt \-\-help\' gives a list of all resources (long options) compiled +Note: \(lqrxvt \-\-help\(rq gives a list of all resources (long options) compiled into your version\&. If compiled with internal Xresources support (i\&.e\&. \fBrxvt \-h\fP lists \fB\&.Xdefaults\fP) then \fBrxvt\fP accepts application defaults set in @@ -223,11 +227,11 @@ 80x24]; option \fB-geometry\fP\&. .IP "\fBbackground:\fP \fIcolour\fP" -Use the specified colour as the window\'s background colour [default +Use the specified colour as the window's background colour [default White]; option \fB-bg\fP\&. .IP "\fBforeground:\fP \fIcolour\fP" -Use the specified colour as the window\'s foreground colour [default +Use the specified colour as the window's foreground colour [default Black]; option \fB-fg\fP\&. .IP "\fBcolor\fP\fIn\fP\fB:\fP \fIcolour\fP" @@ -268,26 +272,26 @@ \fBFalse\fP: specify that smooth scrolling should be used; option \fB+j\fP\&. .IP "\fBinheritPixmap:\fP \fIboolean\fP" -\fBTrue\fP: make the background inherit the parent windows\' pixmap, +\fBTrue\fP: make the background inherit the parent windows' pixmap, giving artificial transparency\&. -\fBFalse\fP: do not inherit the parent windows\' pixmap\&. +\fBFalse\fP: do not inherit the parent windows' pixmap\&. .IP "\fBscrollColor:\fP \fIcolour\fP" Use the specified colour for the scrollbar [default #B2B2B2]\&. .IP "\fBtroughColor:\fP \fIcolour\fP" -Use the specified colour for the scrollbar\'s trough area [default +Use the specified colour for the scrollbar's trough area [default #969696]\&. Only relevant for normal (non XTerm/NeXT) scrollbar\&. .IP "\fBbackgroundPixmap:\fP \fIfile[;geom]\fP" -Use the specified XPM file (note the `\&.xpm\' extension is optional) +Use the specified XPM file (note the \(lq\&.xpm\(rq extension is optional) for the background and also optionally specify its scaling with a -geometry string \fBWxH+X+Y\fP, in which \fB"W" / "H"\fP specify the -horizontal/vertical scale (percent) and \fB"X" / "Y"\fP locate the +geometry string \fBWxH+X+Y\fP, in which \fB\(lqW\(rq / \(lqH\(rq\fP specify the +horizontal/vertical scale (percent) and \fB\(lqX\(rq / \(lqY\(rq\fP locate the image centre (percent)\&. A scale of 0 displays the image with tiling\&. A scale of 1 displays the image without any scaling\&. A scale of 2 to 9 specifies an integer number of images in that direction\&. No image will be magnified beyond 10 times its original size\&. The maximum permitted scale is 1000\&. [default 0x0+50+50] .IP "\fBmenu:\fP \fIfile[;tag]\fP" -Read in the specified menu file (note the `\&.menu\' extension is +Read in the specified menu file (note the \(lq\&.menu\(rq extension is optional) and also optionally specify a starting tag to find\&. See the reference documentation for details on the syntax for the menuBar\&. .IP "\fBpath:\fP \fIpath\fP" @@ -357,8 +361,8 @@ name; option \fB-title\fP\&. .IP "\fBiconName:\fP \fIstring\fP" -Set the name used to label the window\'s icon or displayed in an icon -manager window, it also sets the window\'s title unless it is +Set the name used to label the window's icon or displayed in an icon +manager window, it also sets the window's title unless it is explicitly set; option \fB-n\fP\&. .IP "\fBmapAlert:\fP \fIboolean\fP" @@ -371,7 +375,7 @@ \fBFalse\fP: no visual bell [default]; option \fB+vb\fP\&. .IP "\fBloginShell:\fP \fIboolean\fP" -\fBTrue\fP: start as a login shell by prepending a `-\' to \fBargv[0]\fP +\fBTrue\fP: start as a login shell by prepending a \(lq-\(rq to \fBargv[0]\fP of the shell; option \fB-ls\fP\&. \fBFalse\fP: start as a normal sub-shell [default]; @@ -585,7 +589,7 @@ as a number 0-15, as a convenient shorthand to reference the colour name of color0-color15\&. .PP -Note that \fB-rv\fP (\fB"reverseVideo: True"\fP) simulates reverse video by +Note that \fB-rv\fP (\fB\(lqreverseVideo: True\(rq\fP) simulates reverse video by always swapping the foreground/background colours\&. This is in contrast to \fIxterm\fP(1) where the colours are only swapped if they have not otherwise been specified\&. @@ -608,6 +612,16 @@ .IP "\fB/usr/lib/X11/rgb\&.txt\fP" Color names\&. .PP +.SH "DEBIAN NOTES" +.PP +The standard Debian \fBrxvt\fP package provides two versions of the +\fBrxvt\fP binary: +.IP "\fBrxvt-xterm\fP" +This version is compiled with no XPM support. It has been configured to +be a smaller, more efficient xterm substitute. +.IP "\fBrxvt-xpm\fP" +This version is compiled with XPM and menu support. +.PP .SH "SEE ALSO" .PP \fIxterm\fP(1), \fIsh\fP(1), \fIresize\fP(1), \fIX\fP(1), \fIpty\fP(4), \fItty\fP(4), @@ -622,7 +636,7 @@ .PP Cursor change support is not yet implemented\&. .PP -Click-and-drag doesn\'t work with X11 mouse report overriding\&. +Click-and-drag doesn't work with X11 mouse report overriding\&. .PP Graphics support is fairly crude\&. .PP debian/patches/buffer-overflow-108384.patch0000644000000000000000000000134412167702627015531 0ustar Debian bug #108384 RXVT Vulnerability Originally Posted by Samuel "Zorgon" Dralet Versions 2.6.2 contain a buffer overflow vulnerability. As rxvt is installed setgid utmp on Debian 2.2, an attacker might be able to successfully exploit this vulnerability and gain special privileges on the local system. Resolved originally in version 2.6.3-12 This vulnerability is still present in upstream 2.7.10. --- a/src/command.c +++ b/src/command.c @@ -3098,7 +3098,7 @@ unsigned char buf[256]; va_start(arg_ptr, fmt); - vsprintf((char *)buf, fmt, arg_ptr); + vsnprintf((char *)buf, sizeof(buf), fmt, arg_ptr); va_end(arg_ptr); rxvt_tt_write(r, buf, (unsigned int)STRLEN(buf)); } debian/patches/java-selection-paste-341200.patch0000644000000000000000000000436012205010302016367 0ustar Debian Bug #341200 selection cannot be pasted into Java applications on amd64 Atom is a 64 bit type in the amd64 architecture but, when passing XA_ATOM arguments to XChangeProperty, one must use a "format" argument of 32 but pass an array of 64 bit Atoms to the function. Original issue posted and patch provided by Martin Dorey Applied in rxvt_2.6.4-10 --- a/src/screen.c +++ b/src/screen.c @@ -28,8 +28,6 @@ #include "rxvt.h" /* NECESSARY */ #include "screen.intpro" /* PROTOS for internal routines */ -#include /* get the typedef for CARD32 */ - /* ------------------------------------------------------------------------- */ #ifdef MULTICHAR_SET @@ -3498,14 +3496,6 @@ /* ------------------------------------------------------------------------- */ /* - * On some systems, the Atom typedef is 64 bits wide. We need to have a type - * that is exactly 32 bits wide, because a format of 64 is not allowed by - * the X11 protocol. - */ -typedef CARD32 Atom32; - -/* ------------------------------------------------------------------------- */ -/* * Respond to a request for our current selection * EXT: SelectionRequest */ @@ -3515,9 +3505,9 @@ { XSelectionEvent ev; #ifdef USE_XIM - Atom32 target_list[4]; + Atom target_list[4]; #else - Atom32 target_list[3]; + Atom target_list[3]; #endif Atom target; XTextProperty ct; @@ -3533,15 +3523,14 @@ ev.time = rq->time; if (rq->target == r->h->xa[XA_TARGETS]) { - target_list[0] = (Atom32) r->h->xa[XA_TARGETS]; - target_list[1] = (Atom32) XA_STRING; - target_list[2] = (Atom32) r->h->xa[XA_TEXT]; + target_list[0] = (Atom) r->h->xa[XA_TARGETS]; + target_list[1] = (Atom) XA_STRING; + target_list[2] = (Atom) r->h->xa[XA_TEXT]; #ifdef USE_XIM - target_list[3] = (Atom32) r->h->xa[XA_COMPOUND_TEXT]; + target_list[3] = (Atom) r->h->xa[XA_COMPOUND_TEXT]; #endif XChangeProperty(r->Xdisplay, rq->requestor, rq->property, XA_ATOM, - (8 * sizeof(target_list[0])), PropModeReplace, - (unsigned char *)target_list, + 32, PropModeReplace, (unsigned char *)target_list, (sizeof(target_list) / sizeof(target_list[0]))); ev.property = rq->property; } else if (rq->target == r->h->xa[XA_MULTIPLE]) { debian/patches/debian-rxvt-monochrome.patch0000644000000000000000000000717712167677025016256 0ustar modified the termcap/terminfo entries supplied in the source modified rxvt to set TERM=rxvt or rxvt-m Debian RXVT provides a monochrome differentiated version of both termcap and terminfo, and will appropriately set the TERM env var when the X display depth matches monochrome. --- a/doc/etc/rxvt.termcap +++ b/doc/etc/rxvt.termcap @@ -1,3 +1,28 @@ +# Debian's changes: +# Debian has uses two termcap/terminfo entries: +# rxvt for color displays +# rxvt-m for monochrome displays +rxvt-m|monochrome rxvt terminal emulator (X Window System):\ + :am:eo:km:ms:ut:xn:xo:\ + :co#80:it#8:li#24:Co#8:pa#64:\ + :AB=\E[4%dm:AF=\E[3%dm:AL=\E[%dL:\ + :DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\ + :K1=\EOw:K2=\EOu:K3=\EOy:K4=\EOq:K5=\EOs:LE=\E[%dD:\ + :RI=\E[%dC:UP=\E[%dA:\ + :ae=^O:al=\E[L:as=^N:bl=^G:cd=\E[J:\ + :ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cr=^M:\ + :cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:do=^J:\ + :ho=\E[H:i1=\E[?47l\E=\E[?1l:ic=\E[@:\ + :is=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l:\ + :k0=\E[21~:k1=\E[11~:k2=\E[12~:k3=\E[13~:k4=\E[14~:\ + :k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:k9=\E[20~:\ + :kD=\E[3~:kI=\E[2~:kN=\E[6~:kP=\E[5~:kb=^H:kd=\E[B:ke=\E>:\ + :kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:le=^H:mb=\E[5m:\ + :md=\E[1m:me=\E[m:mr=\E[7m:nd=\E[C:op=\E[m:rc=\E8:sc=\E7:\ + :se=\E[27m:sf=^J:so=\E[7m:sr=\EM:st=\EH:ta=^I:\ + :te=\E[?47l\E8:ti=\E7\E[?47h:ue=\E[24m:up=\E[A:us=\E[4m:\ + :vb=\E[?5h\E[?5l:ve=\E[?25h:vi=\E[?25l:vs=\E[?25h:\ + :@7=\E[8~:kh=\E[7~: rxvt|rxvt terminal emulator (X Window System):\ :am:eo:km:ms:ut:xn:xo:\ :co#80:it#8:li#24:Co#8:pa#64:\ --- a/doc/etc/rxvt.terminfo +++ b/doc/etc/rxvt.terminfo @@ -13,7 +13,13 @@ # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM. # Since rxvt is not really compatible with xterm, it should be configured as # "rxvt-basic" (monochrom) and "rxvt" -rxvt-basic|rxvt terminal base (X Window System), +# +# Debian's changes: +# Debian has uses two termcap/terminfo entries: +# rxvt for color displays +# rxvt-m for monochrome displays +# Debian also prefers ^? for kbs (backspace). +rxvt-m|monochrome rxvt terminal emulator (X Window System), am, bce, eo, km, msgr, xenl, xon, cols#80, it#8, lines#24, acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, @@ -29,7 +35,7 @@ ind=^J, is1=\E[?47l\E=\E[?1l, is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kLFT=\E[d, kNXT=\E[6$, - kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy, kb2=\EOu, kbs=^H, + kPRV=\E[5$, kRIT=\E[c, ka1=\EOw, ka3=\EOy, kb2=\EOu, kbs=^?, kc1=\EOq, kc3=\EOs, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kel=\E[8\^, kend=\E[8~, kent=\EOM, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~, @@ -52,4 +58,4 @@ colors#8, pairs#64, op=\E[39;49m, setab=\E[%p1%{40}%+%dm, setaf=\E[%p1%{30}%+%dm, - use=rxvt-basic, + use=rxvt-m, --- a/src/init.c +++ b/src/init.c @@ -749,8 +752,19 @@ * sizeof(char)); sprintf(r->h->env_term, "TERM=%s", r->h->rs[Rs_term_name]); putenv(r->h->env_term); - } else + } else { + /* Debian hack: We at Debian prefer to be correct. Therefore, we + use TERM=rxvt on color displays and TERM=rxvt-m (the -m stands + for monochrome, see terminfo(5)) on monochrome displays. For + some unknown reason, the upstream maintianers don't recognize + the usefulness of this. Oh well. */ +#ifndef KANJI + if (XDEPTH <= 2) + putenv("TERM=" TERMENV "-m"); + else +#endif putenv("TERM=" TERMENV); + } #ifdef HAVE_UNSETENV /* avoid passing old settings and confusing term size */ debian/patches/var-mail-spool.patch0000644000000000000000000000062112167674445014517 0ustar configured rclock to use "/var/spool/mail/" for the mail spool --- a/rclock/feature.h +++ b/rclock/feature.h @@ -58,7 +58,7 @@ #define MAIL /* #define MAIL_BELL */ /* #define MAIL_SPAWN "xmh\ -font\ 7x14\&" */ -/* #define MAIL_SPOOL "/var/spool/mail/" */ +#define MAIL_SPOOL "/var/spool/mail/" /*----------------------------------------------------------------------* * #define CLOCKUPDATE 30 debian/patches/screen-nlines-assertion.patch0000644000000000000000000000077612211770615016424 0ustar Fix off-by-one error in assertion. Originally applied in rxvt-beta by hesso@pool.math.tu-berlin.de --- a/src/screen.c +++ b/src/screen.c @@ -1799,7 +1799,7 @@ D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, r->TermWin.view_start)); #ifdef DEBUG_STRICT - assert((nlines >= 1) && (nlines <= r->TermWin.nrow)); + assert((nlines >= 0) && (nlines <= r->TermWin.nrow)); #endif oldviewstart = r->TermWin.view_start; if (direction == UP) { debian/rxvt.install0000644000000000000000000000030112167320645011561 0ustar src/rxvt-xterm src/rxvt-xpm rclock/rclock usr/bin rxvt-xterm.1 rclock/rclock.1 usr/share/man/man1 doc/menu/* usr/share/doc/rxvt/examples doc/rxvt.html doc/rxvtRef*.html usr/share/doc/rxvt/html debian/watch0000644000000000000000000000012612171370712010217 0ustar version=3 http://sf.net/rxvt/rxvt-(.+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) debian/rxvt-ml.dirs0000644000000000000000000000007312167320645011470 0ustar usr/share/lintian/overrides usr/share/doc/rxvt-ml/examples debian/README.Debian0000644000000000000000000000504112167320645011235 0ustar Debian RXVT README File Brian Mays INTRODUCTION This is the Debian GNU/Linux prepackaged version of rxvt -- a VT102 emulator for the X window system. Debian's version of rxvt now allows multiple versions of rxvt (each compiled with different features) to be installed on a Debian system. The Debian's official rxvt package contains two versions of the rxvt binary: rxvt-xterm Compiled with no XPM support. It has been configured to be a smaller, more efficient xterm substitute. rxvt-xpm Compiled with XPM and menu support. By default, /usr/bin/X11/rxvt will point to rxvt-xterm, however this can be changed by modifying the /etc/alternatives/rxvt symlink. COMPILING A CUSTOM VERSION OF RXVT AND RCLOCK Building your own custom version of rxvt is relatively simple: 1) Unpack the rxvt source and go to the root directory of the source tree. 2) Edit the src/feature.h file to select the desired compile-time options. You should also configure rxvt with ./configure --prefix /usr [ option ... ] where a list of options can be found from configure's --help option. 3) Execute as root: debian/rules rxvt-custom This will build a package, called rxvt-custom, that will contain your customized version of rxvt. After installing this package, you can change the /etc/alternatives/rxvt symlink to point to /usr/bin/X11/rxvt-custom with the following command: update-alternatives --config rxvt or reassigning the link manually with ln -sf /usr/bin/X11/rxvt-custom /etc/alternatives/rxvt It is also possible to build a customized version of rclock. The procedure is the same (substituting rclock everywhere for rxvt), except that the compile-time options are contained in rclock/feature.h. The rxvt-custom and rclock-custom rules in the debian/rules makefile use several make variables which can be changed on the command line: custom_name Names the package rxvt- custom_maintainer Changes of the Maintainer field custom_desc Changes of the Description field For example, a package called rxvt-big5 could be created with debian/rules rxvt-custom custom_name=big5 \ custom_maintainer='Your name here' \ custom_desc='A version of rxvt with big fonts' SEE ALSO rxvt(1), The Rxvt FAQ (in /usr/share/doc/rxvt/FAQ.gz on Debian systems), The Debian Rxvt FAQ (in /usr/share/doc/rxvt/FAQ.Debian.gz on Debian systems). debian/rxvt-ml.menu0000644000000000000000000000150512167320645011474 0ustar ?package(rxvt-ml):needs="x11" section="Applications/Terminal Emulators" \ longtitle="KRxvt: terminal emulator for X with Japanese support" title="KRxvt"\ command="/usr/bin/krxvt" ?package(rxvt-ml):needs="x11" section="Applications/Terminal Emulators" \ longtitle="CRxvt: terminal emulator for X with Chinese (Big5) support" title="CRxvt (Big5) "\ command="/usr/bin/crxvt-big5 -im xcin -pt Root" ?package(rxvt-ml):needs="x11" section="Applications/Terminal Emulators" \ longtitle="CRxvt: terminal emulator for X with Chinese (GB) support" title="CRxvt (GB)"\ command="/usr/bin/crxvt-gb -im xcin-zh_CN.GB2312 -pt Root" ?package(rxvt-ml):needs="x11" section="Applications/Terminal Emulators" \ longtitle="GRxvt: terminal emulator for X with Greek support" title="GRxvt"\ command="/usr/bin/grxvt" debian/copyright0000644000000000000000000000626712171527103011133 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: rxvt Source: http://sourceforge.net/projects/rxvt/ Files: * Copyright: 1992 John Bovey, University of Canterbury 1994 Robert Nation 1995 Garrett D'Amore 1997 mj olesen 1997-1998 Oezguer Kesim 1998 Geoff Wing License: GPLv2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. . On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. Files: rclock/* Copyright: 1992-1993 Robert Nation 1998 Oezguer Kesim License: GPLv2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. . On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. Files: debian/* Copyright: 1996-2002 Brian Mays 2013 George Gensure License: GPLv2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. . On Debian GNU/Linux systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. debian/changelog0000644000000000000000000006245512217415026011054 0ustar rxvt (1:2.7.10-5) unstable; urgency=low * Applied the following patches which were applied to rxvt-beta: - screen-nlines-assertion: corrects an off-by-one error in an assertion during page scrolling with DEBUG_STRICT enabled - scrollbar-style-doc: adds a caveat to the scrollstyle resource/long option that non-rxvt is available only in rxvt-xpm - decrease-wm-race-likeliness-202497: initialize the terminal dimensions earlier to reduce the probability that the window manager interferes - rxvt-tbl: rxvt.tbl syntax fixes * Enable xterm and next style scrollbars build options for the xterm-xpm target in debian/rules. * Corrected merge of multi-byte-font-width-72371.patch, which was applied to bold font sections instead of multibyte fonts, causing crashes. Closes: #721876. -- George Gensure Wed, 28 Aug 2013 21:51:20 -0400 rxvt (1:2.7.10-4) unstable; urgency=low * Changed cutchars documentation to match default values. Closes: #169415. * Fixed patch for #341200 applied incorrectly during dquilt translation, originally fixed in 1:2.6.4-10. Closes: #217472. -- George Gensure Sat, 17 Aug 2013 08:48:57 -0400 rxvt (1:2.7.10-3) unstable; urgency=low * Enabled rxvt original scrollbars explicitly in rules. Required configure enabled option with 2.7. Closes: #718538. * Also enabled mousewheel scrolling and keepscroll (held scroll button), which were features on by default in 2.6. -- George Gensure Thu, 01 Aug 2013 21:11:43 -0400 rxvt (1:2.7.10-2) unstable; urgency=low * Removed update-alternatives --remove-all for rclock -- George Gensure Sun, 21 Jul 2013 09:18:39 -0400 rxvt (1:2.7.10-1) unstable; urgency=low * New upstream version. * New maintainer. Closes: #698991. * Added DEB_BUILD_OPTIONS parsing support to rules for noopt, nostrip, and parallel. nocheck is not supported, as there is no testing target. * Update standards version to 3.9.4 * Package version bumped to 3.0 (quilt) * debhelper bumped to version 9 * Winnowed down diffs to files against upstream corrections. Anything left in patches is either a debian configuration or unpatched upstream. * Split version 1 patches into individual 3.0 (quilt) patches named for bug/feature descriptions and bug tracker tags if available. * Patched documentation to account for lintian recommendations of minus/hyphen conflation. * Added doc-base entries for html documentation. * Added lintian recommendation of ${misc:Depends} to Depends * Updated copyright information, matching to upstream license of GPL-2, and upgrading format to debian copyright version 1 * Added dpkg-buildflags substitutions for CPP/C/LDFLAGS per lintian * Added set -e to pre/post scripts for packages per lintian * Remove src/librxvt.h (generated) in clean target * Changed debian/watch to find the most current (and future) versions of upstream dist from 2.6-specific. -- George Gensure Wed, 10 Jul 2013 14:02:13 -0400 rxvt (1:2.6.4-14) unstable; urgency=high * Add crossbuild support. Thanks to Neil Williams. Closes: #465214. * Finally fix scrollbuffer-related SEGV bug. Thanks to Josip Rodin for his help in debugging this! Closes: #445360. * Raise urgency (two RC bug fixes, 445360 and 462512). -- Jan Christoph Nordholz Thu, 24 Apr 2008 00:51:00 +0200 rxvt (1:2.6.4-13) unstable; urgency=low * Include a patch by Wolfgang Pietsch to make rclock's hour hand move smoothly. * Adjust the menu files to the new policy. * Bump Standards version to 3.7.3. * Fix NAME manpage sections to please mandb. * Intersperse 'make clean' invocations between the builds of the several build flavours. Closes: #462512. * Do not silently default to display ":0" if DISPLAY is unset. Closes: #469296. * Add watch file. -- Jan Christoph Nordholz Fri, 11 Apr 2008 01:36:43 +0200 rxvt (1:2.6.4-12) unstable; urgency=low * Remove the obsolete package xfonts-cjk from Suggests. * Correct a ./configure flag typo that broke X resources handling. * Reintroduce the fix for #261996 (override for pty support detection in chroot environments). -- Jan Christoph Nordholz Sun, 08 Jul 2007 01:33:45 +0200 rxvt (1:2.6.4-11) unstable; urgency=low * New maintainer. Thanks, David! Closes: #388211. * Move build system to debhelper. * Bump Standards compliance level to 3.7.2. * Fix x-terminal-emulator alternative handling, adjust priority values to those of similar programs. Closes: #379134. * Get rid of ancient rclock alternative. Closes: #176111. * Correct manpage type, closes: #429411. * Drop the versioned base-passwd dependency and the conflicts with xcingb and suidmanager - all packages in question predate the woody release. -- Jan Christoph Nordholz Thu, 10 May 2007 10:51:45 +0200 rxvt (1:2.6.4-10) unstable; urgency=low * Fixing a problem when selecting and pasting info on amd64. - Closes: #341200, thanks to Martin Dorey. -- David Moreno Garza Wed, 30 Nov 2005 19:35:43 -0600 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). -- David Moreno Garza Tue, 4 Oct 2005 23:20:36 -0500 rxvt (1:2.6.4-8) unstable; urgency=low * QA Upload * Build with -O2. Besides being the value policy demands this may also circumvent the ICE on m68k for now -- Frank Lichtenheld Wed, 10 Aug 2005 16:59:47 +0200 rxvt (1:2.6.4-7) unstable; urgency=low * QA Upload * Change Maintainer to QA Group * Apply patch by Andreas Jochens to fix FTBFS with gcc 4.0 (Closes: #288459) * Apply patch by Adam Borowski to fix invalid escape code for Kpad2 in application cursor mode (Closes: #180474) * Apply patch by Samuel Thibault to fix segfault on exit (Closes: #197265, #269115) * Bump Standards-Version to 3.5.9 because I'm not sure if we're compliant with 3.5.10 (see upgrading-checklist regarding xterm compatibility) and I have no time to check. Updated the CFLAGS handling in debian/rules * Use only needed Build-Depends instead of xlibs-dev * Clean-up fixes: + Quote strings in menu-ml + Install menu files to /usr/share/menu, not to /usr/lib/menu + don't set usr/doc link in postinst-ml + remove possible bashism in preinst{,-ml} -- Frank Lichtenheld Sun, 7 Aug 2005 00:28:28 +0200 rxvt (1:2.6.4-6.2) unstable; urgency=medium * NMU * rxvt "miscompiles" on linux 2.6 in sbuild fix this by editing config.h after configure to use the right PTY type (Closes: #261996) * urgency medium to get the security fix into testing soon * Some small clean-up changes: - don't create usr/doc symlink in postinst - quote values in menu file -- Frank Lichtenheld Wed, 4 Aug 2004 00:34:36 +0200 rxvt (1:2.6.4-6.1) unstable; urgency=low * NMU. * CAN-2003-0066 Arbitrary command execution a.o. via escape sequencies (Closes: Bug#244810) -- Matthias Urlichs Wed, 28 Jul 2004 15:36:06 +0200 rxvt (1:2.6.4-6) unstable; urgency=low * Added patch from Geoff Wing to check for EAGAIN. (Closes: Bug#111785) -- Brian Mays Tue, 9 Apr 2002 13:07:48 -0400 rxvt (1:2.6.4-5) unstable; urgency=medium * Modified postinst to ignore an existing /usr/doc/$package directory. * Updated FAQ to cover binding key sequences in bash. -- Brian Mays Wed, 20 Mar 2002 12:58:43 -0500 rxvt (1:2.6.4-4) unstable; urgency=low * Removed alternatives for rclock. * Added x-t-e alternative for rxvt-xpm. -- Brian Mays Wed, 13 Mar 2002 12:51:31 -0500 rxvt (1:2.6.4-3) unstable; urgency=low * Fixed symlink /usr/doc -> ../share/doc. * Fixed reference to GPL. * Improved stripping of binaries. * Added patch from Geoff Wing to bind specific X resources before global resources. (Closes: Bug#105656) * Added hack to change the cursor color whenever foreground color is changed. (Closes: Bug#70515, Bug#116908) * Added hack from vivek@etla.org to catch the ST escape sequence. (Closes: Bug#120948) * Fixed broken alternatives linke to /usr/man. (Closes: Bug#121308) * Fixed bug in rclock preventing it from accepting "-iconic" as the last argument. * Removed mechanism for building "custom" rxvt packages. * Fixed permissions on conffile control file. -- Brian Mays Mon, 4 Feb 2002 08:04:09 -0500 rxvt (1:2.6.4-2) unstable; urgency=low * Moved stuff out of /usr/X11R6 to satisfy section 12.8.7 of the policy manual. * Fixed the rxvt man page to use proper quotes and apostrophes instead of an opening single quote and an acute accent. (Closes: Bug#120310) -- Brian Mays Tue, 20 Nov 2001 12:11:45 -0500 rxvt (1:2.6.4-1) unstable; urgency=low * New upstream version. -- Brian Mays Tue, 6 Nov 2001 21:19:59 -0500 rxvt (1:2.6.3-13) unstable; urgency=low * Rebuilt with current libraries. (Closes: Bug#112479) -- Brian Mays Thu, 25 Oct 2001 15:37:56 -0400 rxvt (1:2.6.3-12) unstable; urgency=low * Added patch to prevent a buffer overflow. (Closes: Bug#108384) -- Brian Mays Sun, 19 Aug 2001 10:50:53 -0400 rxvt (1:2.6.3-10) unstable; urgency=low * Updated rxvt documentation. (Closes: Bug#65973, Bug#105651) -- Brian Mays Wed, 25 Jul 2001 12:44:40 -0400 rxvt (1:2.6.3-9) unstable; urgency=low * Added rxvt menu method for Debian's menu facility. (Closes: Bug#96844) * The "-C" option now uses /dev/xconsole. (Closes: Bug#35387) * Removed "-g" gcc option as per policy. -- Brian Mays Mon, 16 Jul 2001 20:06:29 -0400 rxvt (1:2.6.3-8) unstable; urgency=low * Removed suidmanager support (I always hated that stupid program). -- Brian Mays Wed, 24 Jan 2001 12:46:15 -0500 rxvt (1:2.6.3-7) unstable; urgency=low * Rebuilt with newer X libraries. -- Brian Mays Tue, 23 Jan 2001 13:48:29 -0500 rxvt (1:2.6.3-6) unstable; urgency=low * Removed patch from Geoff Wing to fix problem with locales. This patch ended up breaking locales. (Closes: Bug#75723, Bug#75756) * Applied patch from from Shugo Maeda to check the second byte of multi-byte characters. (Closes: Bug#75691) -- Brian Mays Mon, 30 Oct 2000 10:12:50 -0500 rxvt (1:2.6.3-5) unstable; urgency=low * Added patch from Geoff Wing to fix problem with locales. (Closes: Bug#71733) -- Brian Mays Wed, 25 Oct 2000 14:01:33 -0400 rxvt (1:2.6.3-4) unstable; urgency=low * Added patch from Shugo Maeda to fix a problem displaying bold multi-byte characters. (Closes: Bug#72370) * Added patch from Shugo Maeda to fix a problem displaying multi-byte fonts with different widths (Closes: Bug#72371) -- Brian Mays Tue, 24 Oct 2000 12:44:42 -0400 rxvt (1:2.6.3-3) unstable; urgency=low * Added code to rxvt-ml's packaging scripts to clean up the old bug whereby the package would suid-register the crxvt script. (Closes: Bug#66127) * Changed the menu entry in rxvt-ml to use the proper input method for crxvt-gb. (Closes: Bug#70999) -- Brian Mays Mon, 11 Sep 2000 13:17:58 -0400 rxvt (1:2.6.3-2) unstable; urgency=low * Added patch from Geoff Wing to fix the dead (compose) key. (Closes: Bug#68774) * Fixed reverse video bug. (Closes: Bug#69471) -- Brian Mays Sun, 20 Aug 2000 09:50:53 -0400 rxvt (1:2.6.3-1) unstable; urgency=low * New upstream version. -- Brian Mays Thu, 27 Jul 2000 11:59:02 -0400 rxvt (1:2.6.2-4) unstable; urgency=low * Applied patch to fix a bug with underlining. (Closes: Bug#67139) -- Brian Mays Tue, 18 Jul 2000 09:52:36 -0400 rxvt (1:2.6.2-3) frozen unstable; urgency=low * Compressed the manpages in the rxvt-ml package. (Closes: Bug#66127) * Changed the copyright file to refer to the new common-licenses directory. * Added comment to the rxvt man page that pixmap features might not be available if XPM support is not compiled in. (Closes: Bug#65973) -- Brian Mays Thu, 6 Jul 2000 12:57:01 -0400 rxvt (1:2.6.2-2) frozen unstable; urgency=low * Fixed bug in postinst/prerm scripts that did not properly set the crxvt binaries to setgid utmp. (Closes: Bug#65728) -- Brian Mays Fri, 16 Jun 2000 07:20:00 -0400 rxvt (1:2.6.2-1) frozen unstable; urgency=low * New upstream (bug fix) version - Bug Fixes Only! * Moved x-terminal-emulator slave manpage link to under /usr/share. (Closes: Bug#63736) -- Brian Mays Mon, 8 May 2000 13:27:51 -0400 rxvt (1:2.6.1-11) frozen unstable; urgency=low * Added dependency on base-passwd for utmp group. (Closes: Bug#60648) * Updated the Debian rxvt FAQ. -- Brian Mays Sat, 18 Mar 2000 15:36:00 -0500 rxvt (1:2.6.1-10) frozen unstable; urgency=low * Made the Multibyte character cursor movement an optional feature. To activate it, use the "mcCursor" resource. (Closes: Bug#58521) -- Brian Mays Sat, 19 Feb 2000 12:06:10 -0500 rxvt (1:2.6.1-9) unstable frozen; urgency=low * Added patch from Chuan-kai Lin solves an little annoying cursor movement problem that occurs with multibyte characters. (Closes: Bug#50146) -- Brian Mays Thu, 17 Feb 2000 09:49:44 -0500 rxvt (1:2.6.1-8) frozen unstable; urgency=low * Removed the "-ls" flag from the rxvt menu entries. (Closes: Bug#57222) -- Brian Mays Tue, 8 Feb 2000 17:47:49 -0500 rxvt (1:2.6.1-7) frozen unstable; urgency=low * Fixed suidregister support. (Closes: Bug#55921) * Fixed the "Suggests" field of rxvt-ml to account for changing package names. (Closes: Bug#55922) -- Brian Mays Sat, 22 Jan 2000 16:15:41 -0500 rxvt (1:2.6.1-6) frozen unstable; urgency=low * Although it is not required by policy, added suidregister support. (Closes: Bug#46826) * Added build-time dependencies. -- Brian Mays Mon, 17 Jan 2000 13:20:58 -0500 rxvt (1:2.6.1-5) unstable; urgency=low * Added an additional question to the Debian rxvt FAQ about using "-name" with "-e" on the command line. -- Brian Mays Mon, 13 Dec 1999 15:58:36 -0500 rxvt (1:2.6.1-4) unstable; urgency=low * Applied patch from Satoshi Koike to fix a seg fault bug. (Closes: Bug#52017) * Added menu hint for rclock. (Closes: Bug#52004) * Added description of "-im" to the rxvt man page. (Closes: Bug#51897) -- Brian Mays Mon, 6 Dec 1999 19:42:07 -0500 rxvt (1:2.6.1-3) unstable; urgency=low * Added a patch to multilingual rxvt, which gives a fall-back when a selection cannot be converted properly to the correct encoding. (Provided by Isaac To ) (Closes: Bug#47057) -- Brian Mays Mon, 11 Oct 1999 11:58:17 -0400 rxvt (1:2.6.1-2) unstable; urgency=low * Fixed FHS /usr/doc -> /usr/share/doc transition scheme. (Closes: Bug#46264) * Added x-terminal-emulator virtual package support. (Closes: Bug#45957) * Removed annoying feature causing rxvt to set DISPLAY=unix:0.0. (Closes: Bug#46441) * Fixed overflow error causing the scrollbar slider to wrap around to the top. (Closes: Bug#46784) -- Brian Mays Wed, 6 Oct 1999 11:10:30 -0400 rxvt (1:2.6.1-1) unstable; urgency=low * New upstream version. (Closes: Bug#43855) * Modified to conform to the FHS. -- Brian Mays Thu, 16 Sep 1999 20:06:39 -0400 rxvt (1:2.6.0-6) unstable; urgency=low * Added support for the new utmp group. Rxvt is no longer suid. -- Brian Mays Fri, 30 Jul 1999 09:16:54 -0400 rxvt (1:2.6.0-5) unstable; urgency=low * Fixed another bug in the crxvt wrapper script. (Closes: Bug#41657) -- Brian Mays Tue, 20 Jul 1999 08:23:02 -0400 rxvt (1:2.6.0-4) unstable; urgency=low * Fixed the package description of rxvt-ml. (Closes: Bug#41396) * Fixed a couple of mistakes in the crxvt wrapper script. (Closes: Bug#41590) * Modified the menu entries in rxvt-ml to include both versions of crxvt. (Closes: Bug#41607) -- Brian Mays Mon, 19 Jul 1999 10:22:31 -0400 rxvt (1:2.6.0-3) unstable; urgency=low * Fixed bug in rclock causing trouble dealing with co-occurring programs. * Added release-notes to the rxvt-ml package. * Added Chinese GB support to rxvt-ml. * Moved the doc directory to under /usr/share as per the FHS. * Added a section on /dev/pts to the FAQ. (Closes: Bug#41079) -- Brian Mays Wed, 14 Jul 1999 14:46:29 -0400 rxvt (1:2.6.0-2) unstable; urgency=low * Added patch from Carlos Carvalho , to prevent rxvt from changing the owner/group of the tty, since grantpt is used. * Removed the *.orig and *.rej files from the source. (Closes: Bug#39407) -- Brian Mays Mon, 14 Jun 1999 12:10:12 -0400 rxvt (1:2.6.0-1) unstable; urgency=high * New upstream version. * Added update-menus to the rxvt-ml postinst script. * Fixed bug in adding man pages to rxvt-ml. (Closes: Bug#38132) * Changed crxvt menu entry to use xcin. -- Brian Mays Tue, 8 Jun 1999 17:53:57 -0400 rxvt (1:2.4.5-19) unstable; urgency=low * Added a krxvt, crxvt, grxvt manual page. (Closes: Bug#36042) * Changed the description of the rxvt package. (Closes: Bug#37467) * Disabled utmp support. -- Brian Mays Sun, 16 May 1999 17:16:15 -0400 rxvt (1:2.4.5-18) unstable; urgency=low * Fixed bug in how rxvt handles reverse video when clearing parts of the screen. -- Brian Mays Sun, 11 Apr 1999 20:39:50 -0400 rxvt (1:2.4.5-17) unstable; urgency=low * Disabled usage of utmpx.h because it's incompatible with glibc2.1 (closes: Bug#33065) -- Brian Mays Sun, 14 Feb 1999 17:57:56 -0500 rxvt (1:2.4.5-16) frozen unstable; urgency=low * Fixed rxvt's menu file. (Closes: Bug#32993) -- Brian Mays Sat, 6 Feb 1999 12:36:18 -0500 rxvt (1:2.4.5-15) frozen unstable; urgency=low * Added patch (from Anthony Fok ) so that xcin works with rxvt-ml. (crxvt is broken otherwise.) -- Brian Mays Mon, 21 Dec 1998 18:50:55 -0500 rxvt (1:2.4.5-14) frozen unstable; urgency=low * Fixed rxvt-ml's menu support. (Closes: Bug#29790) -- Brian Mays Fri, 20 Nov 1998 23:20:09 -0500 rxvt (1:2.4.5-13) frozen unstable; urgency=low * Added menu entries for rxvt-ml. (closes: Bug#29481) -- Brian Mays Sun, 15 Nov 1998 17:47:19 -0500 rxvt (1:2.4.5-12) frozen unstable; urgency=low * Fixed a bug causing rxvt to segfault sometimes when the number of rows is decreased. (Fixes: Bug#28628, Bug#28971) -- Brian Mays Fri, 6 Nov 1998 14:34:39 -0500 rxvt (1:2.4.5-11) unstable; urgency=low * Fixed bug causing rxvt to repeat keysyms (when, for example, a dead key is pressed). (Fixes: Bug#27136) -- Brian Mays Tue, 29 Sep 1998 11:00:50 -0400 rxvt (1:2.4.5-10) unstable; urgency=low * Added a patch to allow rxvt to be dockable in WindowMaker. -- Brian Mays Thu, 24 Sep 1998 09:56:16 -0400 rxvt (1:2.4.5-9) unstable; urgency=low * Added new binary package: rxvt-ml, which contains several versions of rxvt with support for kanji and Chinese Big5 fonts and Greek keyboards. * Changed termname option/Xresource to termName, so that it is consistent with xterm and the rxvt man page. * Added an rclock menu entry. -- Brian Mays Wed, 23 Sep 1998 09:21:44 -0400 rxvt (1:2.4.5-8) unstable; urgency=low * Modified define_key to always return False. (Fixes: Bug#24921) * Fixed a bug that causes a segfault if per_char is NULL. (Fixes: Bug#24576) -- Brian Mays Thu, 23 Jul 1998 12:47:24 -0400 rxvt (1:2.4.5-7) frozen unstable; urgency=low * Added examples for rxvt's menubar feature to /usr/doc/rxvt/examples. (Fixes: Bug#21477) -- Brian Mays Tue, 21 Apr 1998 09:39:47 -0400 rxvt (1:2.4.5-6) frozen unstable; urgency=low * Modified the alternative mechanism to use /usr/X11R6/bin. (Fixes: Bug#20409) -- Brian Mays Sat, 4 Apr 1998 20:08:08 -0500 rxvt (1:2.4.5-5) frozen unstable; urgency=low * Modified the behavior of HOME/END to comply with more traditional rxvt instead of the Linux console. Fixes bug#20308. -- Brian Mays Thu, 26 Mar 1998 18:37:41 -0500 rxvt (1:2.4.5-4) unstable; urgency=low * Modified the source to detect Xlocale and use the locales specified by the environment. Fixes: Bug#18754. -- Brian Mays Mon, 2 Mar 1998 13:48:03 -0500 rxvt (1:2.4.5-3) unstable; urgency=low * Removed old FSF address from copyright file. -- Brian Mays Thu, 12 Feb 1998 17:43:24 -0500 rxvt (1:2.4.5-2) unstable; urgency=low * Activated USE_XGETDEFAULT to use X11R6 resources. * Added a Debian FAQ file. * Revised the Debian's README file. * Fixed debian/rules so that it does not reconfigure when building a custom version of rxvt. * Corrected some errors in the (upstream) FAQ about setting BackSpace to ^H or ^? with escape sequences. -- Brian Mays Fri, 16 Jan 1998 13:56:00 -0500 rxvt (1:2.4.5-1) unstable; urgency=low * New upstream release (with new license: GPL). * Cleaned up code changes. * Refined Debian's README file. * Renamed rxvt-debian to rxvt-xterm. -- Brian Mays Mon, 5 Jan 1998 16:37:43 -0500 rxvt (2.20-10) unstable; urgency=low * fixed rxvt's absolute postioning (hpa & vpa) codes. * fixed rxvt's erase (ech) code. * Disabled DONT_GUESS_BACKSPACE feature. * Change TERM to rxvt-m for monochrome displays. -- Brian Mays Mon, 8 Dec 1997 23:50:13 -0500 rxvt (2.20-9) unstable; urgency=low * Enabled DONT_GUESS_BACKSPACE feature. Now rxvt uses ^H for the Backspace key by default. -- Brian Mays Sat, 6 Dec 1997 12:31:30 -0500 rxvt (2.20-8) unstable; urgency=low * Rebuild with libc6/xlib6g. -- Brian Mays Thu, 9 Oct 1997 20:16:15 -0400 rxvt (2.20-7) unstable; urgency=low * Rebuild with libc5. * Disabled wtmp support (which no longer works with new format). -- Brian Mays Tue, 26 Aug 1997 11:40:50 -0400 rxvt (2.20-6) unstable; urgency=low * Libc6 release. * Changed compile-time option to use XGetDefault(). * Fixed a bug preventing rxvt from setting a utmp entry. -- Brian Mays Thu, 7 Aug 1997 15:15:50 -0400 rxvt (2.20-5) frozen unstable; urgency=low * Fixed Debian menu support. * Changed rxvt to set TERM="rxvt" for color displays. -- Brian Mays Wed, 28 May 1997 16:10:41 -0400 rxvt (2.20-4) unstable; urgency=low * Added menu support. * Changed optimization flag to -O3. * Added feature to allow users to build customized versions of rxvt and rclock. -- Brian Mays Sun, 20 Apr 1997 13:45:20 -0400 rxvt (2.20-3) unstable; urgency=low * Fixed a bug causing problems when displaying some fonts. -- Brian Mays Wed, 5 Mar 1997 17:54:51 -0500 rxvt (2.20-2) unstable; urgency=low * Fixed screen.c to enable bold (Fixes Bug#7368). -- Brian Mays Thu, 13 Feb 1997 11:49:11 -0500 rxvt (2.20-1) unstable; urgency=low * New upstream version. * Renamed /usr/doc/rxvt/changes.txt to changelog. -- Brian Mays Tue, 28 Jan 1997 13:15:02 -0500 rxvt (2.18-5) unstable; urgency=low * Enabled FAKE_RESOURCES and KEYSYM_RESOURCE. -- Brian Mays Wed, 23 Oct 1996 09:50:19 -0400 rxvt (2.18-4) unstable; urgency=low * Enabled LINUX_HOME_END feature. -- Brian Mays Mon, 21 Oct 1996 13:34:45 -0400 rxvt (2.18-3) unstable; urgency=low * Fixed rxvt to provide bold and set TERM to `xterm' instead of `xterm-color'. -- Brian Mays Sat, 28 Sep 1996 09:28:37 -0400 rxvt (2.18-2) unstable; urgency=low * Moved binaries to /usr/X11R6/bin (Bug#4606). * made rxvt suid (Bug#4606). -- Brian Mays Fri, 27 Sep 1996 11:33:46 -0400 rxvt (2.18-1) unstable; urgency=low * New upstream version. * New maintainer. * New source format (2.1.1.0). -- Brian Mays Thu, 26 Sep 1996 10:40:50 -0400 debian/rxvt.menu0000644000000000000000000000054612167320645011072 0ustar ?package(rxvt):needs="x11" section="Games/Tools" \ hints="Clocks" \ longtitle="Rclock: another clock for X" title="Rclock"\ command="/usr/bin/rclock" ?package(rxvt):needs="x11" section="Applications/Terminal Emulators" \ longtitle="Rxvt: terminal emulator for X" title="Rxvt"\ command="/usr/bin/rxvt-xterm" debian/Debian_Changes0000644000000000000000000000173012167320645011732 0ustar Changes: * added Debian GNU/Linux package maintenance system files * modified the termcap/terminfo entries supplied in the source * modified rxvt to set TERM=rxvt or rxvt-m * configured rclock to use "/var/spool/mail/" for the mail spool * modified the Makefile.in files so that they can be run via make -f * fixed overflow error causing the scrollbar slider to wrap around to the top * added a patch to multilingual rxvt, which gives a fall-back when a selection cannot be converted properly to the correct encoding (Provided by Isaac To ) * fixed a bug in the configure script preventing it from properly detect shared libraries * added hack to change the cursor color whenever foreground color is changed * added hack to catch the ST escape sequence * added patch from Geoff Wing to bind specific X resources before global resources * fixed bug in rclock preventing it from accepting '-iconic' as the last argument