--- vtwm-5.4.7.orig/.gitignore +++ vtwm-5.4.7/.gitignore @@ -0,0 +1,9 @@ +Makefile +*.o +gram.[ch] +lex.c +system.vtwmrc +vtwm +vtwm._man +vtwm.man +build-stamp --- vtwm-5.4.7.orig/Imakefile +++ vtwm-5.4.7/Imakefile @@ -56,8 +56,21 @@ XCOMM Installation path for the binary VTWMBINDIR = $(BINDIR) -XCOMM Installation path for the system resource file - VTWMLIBDIR = $(LIBDIR)/twm +/* + * If EtcX11Directory is defined, we're using a relatively modern X.Org or + * XFree86 release. + */ +#ifdef EtcX11Directory + CONFDIR = $(ETCX11DIR) +#else + CONFDIR = $(LIBDIR) +#endif + +XCOMM Installation path for VTWM's system resource file + VTWMCONFDIR = $(CONFDIR)/vtwm + +XCOMM Location where we search for TWM's system resource file + TWMCONFDIR = $(CONFDIR)/twm XCOMM Installation path for the man page VTWMMANDIR = $(MANDIR) @@ -113,8 +126,8 @@ SpecialObjectRule(events.o,gram.h,$(NEED_SELECT_H)) SpecialObjectRule(parse.o,gram.h,$(NEED_YYLINENO_V) \ -'-DSYSTEM_VTWMRC="'$(VTWMLIBDIR)'/system.vtwmrc"' \ -'-DSYSTEM_TWMRC="'$(VTWMLIBDIR)'/system.twmrc"') +'-DSYSTEM_VTWMRC="'$(VTWMCONFDIR)'/system.vtwmrc"' \ +'-DSYSTEM_TWMRC="'$(VTWMCONFDIR)'/system.twmrc"') SpecialObjectRule(add_window.o applets.o icons.o \ list.o regions.o sound.o twm.o,gram.h,NullParameter) @@ -123,7 +136,7 @@ InstallProgram(vtwm,$(VTWMBINDIR)) InstallManPage(vtwm,$(VTWMMANDIR)) -InstallNonExecFile(system.vtwmrc,$(VTWMLIBDIR)) +InstallNonExecFile(system.vtwmrc,$(VTWMCONFDIR)) depend:: lex.c gram.c deftwmrc.c lastmake.c vtwm.man @@ -161,8 +174,13 @@ echo ' */' >>$@ echo '' >>$@ echo 'char *lastmake[] = {' >>lastmake.c +ifdef SOURCE_DATE_EPOCH + echo ' "Platform: -",' >>$@ + echo ' "Build: '`LC_ALL=C date --utc --date=@$${SOURCE_DATE_EPOCH}`'",' >>$@ +else echo ' "Platform: '`uname -r -s`'",' >>$@ echo ' "Build: '`date`'",' >>$@ +endif echo ' "" };' >>$@ system.vtwmrc: --- vtwm-5.4.7.orig/debian/.gitignore +++ vtwm-5.4.7/debian/.gitignore @@ -0,0 +1,8 @@ +.debhelper +README.Debian +files +*.debhelper.log +vtwm.post*.debhelper +vtwm.substvars +vtwm +debhelper-*-stamp --- vtwm-5.4.7.orig/debian/changelog +++ vtwm-5.4.7/debian/changelog @@ -0,0 +1,312 @@ +vtwm (5.4.7-7) unstable; urgency=medium + + * debian/compat: Bump to 12 (stretch-backports) and fix: + - Delete obsolete "install" target from rules + - Pass INSTALL="install --strip-program=true" to make install + - Pass --no-parallel to dh + Closes: #965873. + * debian: Add a missing file to gitignore. + + -- Ian Jackson Sat, 25 Dec 2021 17:44:40 +0000 + +vtwm (5.4.7-6) unstable; urgency=medium + + * switch to dh(1); now provides newly required rules targets. + Closes: #999188. + + -- Ian Jackson Fri, 17 Dec 2021 18:20:38 +0000 + +vtwm (5.4.7-5) unstable; urgency=medium + + Bugfix: + * Use the self-pipe trick to fix the signal handling bug, instead + of sigprocmask. Closes:#850079. + + -- Ian Jackson Wed, 04 Jan 2017 01:07:10 +0000 + +vtwm (5.4.7-4) unstable; urgency=medium + + Bugfixes: + * Block signals during the event loop. Closes:#692233. + (Review other bugs. None of them look fixable now.) + + Packaging: + * Make myself the maintainer. Closes:#522263. + * .gitignore: Add a .gitignore covering files outside debian/ generated + by dpkg-buildpackage -uc -b on amd64. + * .gitignore: Add a debian/.gitignore too. + + -- Ian Jackson Tue, 03 Jan 2017 00:10:43 +0000 + +vtwm (5.4.7-3) unstable; urgency=medium + + * QA upload. + * Set Maintainer to Debian QA Group. (See: #522263) + * Add Build-Depends: libfl-dev. (Closes: #846455) + + [ Chris Lamb ] + * Make the build reproducible. (Closes: #831661) + + -- Andreas Beckmann Fri, 09 Dec 2016 18:09:56 +0100 + +vtwm (5.4.7-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix dependency on old packages (Closes: #485227, #515518) + * Move homepage out of the description into its own field. + * Update menu's file section + * Update the path to install-menu (Closes: #483196) + * Add dummy binary-indep target (Closes: #395759) + * Add watch file + * Bump debhelper compat to five + * Don't ignore errors by make clean + + -- Raphael Geissert Wed, 08 Jul 2009 02:00:47 -0500 + +vtwm (5.4.7-2.1) unstable; urgency=low + + * NMU + * Update for X11R7 (Closes: #365286) + - debian/rules: modify make with path to /usr/lib + - debian/{postinst,prerm}: modify path for update-alternatives + + -- Julien Danjou Tue, 23 May 2006 12:12:14 +0200 + +vtwm (5.4.7-2) unstable; urgency=low + + * Add build-dependency on librplay3-dev to fix FTBFS (librplay3-dev does not + depend on libc6-dev for some reason, so I didn't catch this when scrubbing + my chroot. Sigh.) + + -- Branden Robinson Sun, 6 Nov 2005 09:44:15 -0500 + +vtwm (5.4.7-1) unstable; urgency=low + + * Merge new upstream release. + + This release is dedicated to the memory of David J. Hawkey, Jr., who + passed away in 2004. VTWM is now team-developed by the VTWM hackers at + http://www.vtwm.org/, and Callum Gibson is the release manager. + + See /usr/share/doc/vtwm/HISTORY for a comprehensive list of new + features, behavior changes, and bug fixes. + * Bump Debian standards version to 3.6.2; no changes necessary. + * Update URL in package description. + * Tweak Debian rules file: + + Explicitly set optimization to -O0 if DEB_BUILD_OPTS contains "noopt". + + Export the CDEBUGFLAGS variable instead of manually passing it to Make. + + Make shell style tweaks. + * Remove Debian patch to remove increment of yylineno variable from parse.c; + upstream has "#ifdef"ed it out so that it can be restored for systems + where lex doesn't define and use this variable for itself. + * Ship more upstream documentation files: 4.6.ANNOUNCE, 4.6.README, + 4.7.README, DEVELOPERS, HISTORY, and SOUND. + * Remove "SunkFocusWindowTitle" configuration parameter from + debian/system.vtwmrc-menu, since it is no longer supported. + * Fix menu-method file to background launched apps, so the window manager + doesn't wedge. Whoops. Thanks to Matthew A. Micholson for the patch! + (Closes: #319510) + + -- Branden Robinson Sat, 5 Nov 2005 19:35:41 -0500 + +vtwm (5.4.6b-1) unstable; urgency=low + + * Update to new upstream version. (Closes: #193695) + + Fixes problem where certain window types (often transient dialogs) cause + VTWM to restart itself. (Closes: #286951) + + The "VirtualDesktopFont" configuration variable is now documented under + that name, instead of the incorrect "VirtualFont". (Closes: #201738) + * Resync Debian patches with new version. + + Fix for gram.y is now upstream. + + Replace VTWMLIBDIR symbol with VTWMCONFDIR since all we use it for is + installation of the configuration file. Create a new TWMCONFDIR symbol, + which we use to locate twm's configration file. If Imake defines + EtcX11Directory, use a subdirectory of ETCX11DIR for vtwm's + configuration; otherwise, use a subdirectory of LIBDIR. (This is an + improved -- and hopefully upstream-tolerable -- version of a patch + previously applied.) + * Update copyright information: + + Update URL to new source version and hosting location. + + Update list of copyright holders, authors and contributors based on + current version of manual page. + + Undocument Martin "Joey" Schulze as a Debian package author, as he + wasn't responsible for *this* packaging (which has been done at least 3 + times from scratch in the past 10 years, most recently by me). + Acknowledge Joey's previous packaging. + + Update my copyright notice. I have never signed a written instrument + assigning my copyright in the packaging desiderata to Software in the + Public Interest, Inc., so it's probably misleading to claim the + copyright belongs to them. + * Rewrite package's extended description based on current information from + upstream. + * Update build-dependencies to depend on real X protocol header and library + development packages, rather than xlibs-dev, which is a dummy package + nowadays. + * Update menu item quoting functions in vtwm's menu-method file to align + them with twm's, which are a little easier to understand. + * Add support for launching other window managers to menu-method file, using + VTWM's f.startwm function. Add 10 points to vtwm command's alternatives + priority per Debian Policy section 11.8.4. (Closes: #194158) + * Re-case VTWM's name in its menu entry per upstream usage. + * Use a debian/compat file instead of the DH_COMPAT variable in the rules + file, per debhelper(7). + * Add "FixManagedVirtualGeometries" and "FixTransientVirtualGeometries" to + system.vtwmrc-menu file per suggestion from Neil Stewart; this should fix + various problems with placement of transient and pop-up dialog windows. + (Closes: #194110, #225945) + * Grab fix to twm's parse.c from XFree86 CVS (revision 1.9, 2001/04/23) that + fixes line numbers in error messages about the vtwmrc file from being + double their correct value. (Closes: #201741) + * Bump Standards-Version to 3.6.1; no changes necessary. + * Quote strings in menu file, per Lintian. + * Tidy up the manual page in several respects: + + Add copyright notice to the manual page itself, copied from the + copyright information on twm's source files in X11R4, from which VTWM + was forked. + + Fix up the .TH directive: + - Downcase the command name (rendering a command's name in full caps is + a presentation decision). + - Change the date to reflect my modifications. + - Indicate the source as "VTWM 5.4.6b", not "X11R4-6", since this + manual page is independently maintained by the VTWM hackers. + + Fix up the NAME section: + - Remove spurious paragraph break at the beginning of the section. + - Use \- instead of - to separate the manpage's name and summary and so + that mkwhatis is less easily confused. (See man(7).) + + Rename the SYNTAX section to SYNOPSIS. (See man(7).) + + Use an macros for type face selection in the SYNOPSIS section. + + Use \- instead of - in the SYNOPSIS section to notate literal dashes + that the user will type (e.g., when specifying command-line options). + + Rename the SIGNALS section to ASYNCHRONOUS EVENTS (after SUSv3 + manpages). + + Rename the ENVIRONMENT VARIABLES section to ENVIRONMENT. (See + man(7).) + + Use "an" typeface macros instead of roff \f escapes for font changes + where practical in the ASYNCHRONOUS EVENTS, BUGS, FILES, + ENVIRONMENT, COPYRIGHT, and SEE ALSO sections. + + Quote multi-word arguments to the .SH macro in the ASYNCHRONOUS + EVENTS and AUTHORS AND CONTRIBUTORS sections. + + Use \(oq and \(cq named characters instead of literal double-quotes + in the BUGS section. + + Italicize signal names in the ASYNCHRONOUS EVENTS section. + + Put a newline at the ends of sentences per the GNU Roff info + documentation. + + Move the SEE ALSO section to the end of the page. + + Update COPYRIGHT section based on the information I gathered from + trawling the source tree. + + -- Branden Robinson Thu, 30 Dec 2004 23:20:05 -0500 + +vtwm (5.4.5a-12) unstable; urgency=medium + + * Fix FTBFS bug caused by GNU Bison 1.50 and later, hence urgency. + + * gram.y: fix syntax error (thanks, Matt Kraai) (Closes: #166271) + + * debian/conffiles: deleted; debhelper takes care of this + * debian/control: incremented Standards-Version to 3.5.8 (no changes + necessary) + * debian/patches: regenerated; include new patch to gram.y + + -- Branden Robinson Mon, 25 Nov 2002 01:11:30 -0500 + +vtwm (5.4.5a-11) unstable; urgency=low + + * debian/rules: s/CFLAGS/CDEBUGFLAGS/; Imake-using packages should use + CDEBUGFLAGS instead of CFLAGS. Using CFLAGS didn't hurt vtwm but it + doesn't work in the general case. + + -- Branden Robinson Thu, 3 Oct 2002 01:42:38 -0500 + +vtwm (5.4.5a-10) unstable; urgency=low + + * debian/changelog.Debian.old: move Martin Schulze's asyntactic old + changelog entries from 3+ years ago into this file; they cause the Vim + syntax highlighter to glow red, and that annoys me + * debian/copyright: updated + * debian/control: + - add versioning to build-dependency on debhelper (>= 4.0) + - correct improper case in Standards-Version, and increment it to 3.5.7 + * debian/patches: + - new file containing all changes to upstream source, referenced by + debian/copyright + * debian/rules: + - use debhelper version 4 compatibility + - support "noopt" flag in DEB_BUILD_OPTIONS + - clean up paths in install rule + - miscellaneous cosmetic cleanups + + -- Branden Robinson Thu, 3 Oct 2002 01:18:40 -0500 + +vtwm (5.4.5a-9) unstable; urgency=low + + * debian/conffiles: mark /etc/menu-methods/vtwm as a conffile + (Closes: #132203) + * lintian 1.20.17 clean + + -- Branden Robinson Sun, 3 Feb 2002 15:16:10 -0500 + +vtwm (5.4.5a-8) unstable; urgency=low + + * debian/control: add debhelper to Build-Depends + * debian/rules: don't ship upstream INSTALL file anymore; instead do some + seddage to extract the "RUNTIME HINTS" section and write it out as + README.Debian + * lintian 1.20.11 clean + + -- Branden Robinson Fri, 30 Mar 2001 03:06:57 -0500 + +vtwm (5.4.5a-7) unstable; urgency=low + + * debian/prerm: update-alternatives should only be called on remove or + deconfigure + + -- Branden Robinson Thu, 22 Feb 2001 22:31:54 -0500 + +vtwm (5.4.5a-6) unstable; urgency=low + + * debian/control: + - changed build dependencies to xutils, xlibs-dev, flex, bison + - bumped Standards-Version to 3.5.2 (no changes required) + + -- Branden Robinson Thu, 22 Feb 2001 13:03:34 -0500 + +vtwm (5.4.5a-5) unstable; urgency=low + + * added bison and xpm4g-dev to Build-Depends (Closes: #54601) + + -- Branden Robinson Thu, 13 Jan 2000 00:49:58 -0500 + +vtwm (5.4.5a-4) unstable; urgency=low + + * correct menu-method with respect to menu entries with embedded quotes + + -- Branden Robinson Thu, 6 Jan 2000 14:58:49 -0500 + +vtwm (5.4.5a-3) unstable; urgency=low + + * made compliant with Standards Version 3.1.1 + * made compliant with new proposed X Window System policies + * debian/control: + - added Build-Depends + - Provides: x-window-manager + * debian/postinst: stepped alternative priority down to 40 + + -- Branden Robinson Sun, 2 Jan 2000 14:40:49 -0500 + +vtwm (5.4.5a-2) unstable; urgency=low + + * debian/postinst: whack /etc/X11/vtwm on purge (Closes: #49213) + + -- Branden Robinson Sat, 6 Nov 1999 03:14:28 -0500 + +vtwm (5.4.5a-1) unstable; urgency=medium + + * New maintainer. + * New upstream source. + * Repackaged from scratch. + * Integrated with Debian menu system. + * Imakefile: looks in correct place for rc files (Closes: #43474) + * {util.c,list.c,doors.c,desktop.c,iconmgr.c,menus.c}: remove + declarations and definitions of strdup to suppress compiler warnings; + just use libc's strdup instead + + -- Branden Robinson Sat, 30 Oct 1999 17:42:31 -0400 --- vtwm-5.4.7.orig/debian/changelog.Debian.old +++ vtwm-5.4.7/debian/changelog.Debian.old @@ -0,0 +1,21 @@ +vtwm (5.4.4-3) frozen unstable; urgency=medium, closes=20992 + + * Re-Upload as the last removed the .orig.tar.gz dependency + and executable of debian/rules (closes: Bug#20992) + + -- Martin Schulze Tue, 14 Apr 1998 01:51:23 +0200 + +vtwm (5.4.4-2) froen unstable; urgency=medium + + * Correct permissions for conffiles (lintian) + * Correct permissions for changelog (lintian) + * Correct permissions for manpage (lintian) + + -- Martin Schulze Tue, 24 Mar 1998 00:27:38 +0100 + +vtwm (5.4.4-1) unstable; urgency=low + + * New upstream source + * Re-packaged + + -- Martin Schulze Sun, 1 Mar 1998 10:56:10 +0100 --- vtwm-5.4.7.orig/debian/compat +++ vtwm-5.4.7/debian/compat @@ -0,0 +1 @@ +12 --- vtwm-5.4.7.orig/debian/control +++ vtwm-5.4.7/debian/control @@ -0,0 +1,36 @@ +Source: vtwm +Section: x11 +Priority: optional +Maintainer: Ian Jackson +Build-Depends: + debhelper (>= 5), + xutils-dev, + x11proto-core-dev, + libx11-dev, + libxext-dev, + libxmu-dev, + libxpm-dev, + libxt-dev, + libsm-dev, + libice-dev, + librplay3-dev, + flex, + bison, + libfl-dev, +Standards-Version: 3.6.2 +Homepage: http://www.vtwm.org/ + +Package: vtwm +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Provides: x-window-manager +Description: Virtual Tab Window Manager + VTWM is an enhanced version of the Tab window manager (TWM) that adds many + features -- primarily a virtual desktop, meaning that what is currently on + screen is just a portion of a larger workspace. What portion of the virtual + desktop that is displayed, and whatever windows might be visible within it, + are simple point-and-click operations within a scaled representation of the + workspace. +# $Id: control 66 2005-11-06 15:01:09Z branden $ +# +# vim:set ai et sts=4 sw=4 tw=78: --- vtwm-5.4.7.orig/debian/copyright +++ vtwm-5.4.7/debian/copyright @@ -0,0 +1,225 @@ +Package: vtwm +Obtained from: + http://www.vtwm.org/downloads/vtwm-5.4.7.tar.gz + svn://necrotic.deadbeast.net/vtwm/tags/debian/5.4.7-1 +Upstream authors: + Tom LaStrange, Solbourne Computer; Jim Fulton, MIT X Consortium; + Steve Pitschke, Stardent Computer; Keith Packard, MIT X Consortium; + Dave Payne, Apple Computer; Nick Williams ; + Dave Edmondson, Santa Cruz Operation, ; + Dana Chee, Bellcore (R5 conversion), ; + Warren Jessop, University of Washington, ; + Gilligan ; + Tim Ramsey ; + Ralph Betza ; + Michael Kutzner ; + Stig Ostholm ; + M. Eyckmans ; + Tony Brannigan ; + Alec Wolman ; + ; + Marcel Mol ; + Darren S. Embry ; + Chris P. Ross ; + Paul Falstad ; + D. J. Hawkey Jr., (version 5.4), , + with + Erik Agsjo , + Ugen Antsilevitch , + Nelson H. F. Beebe , + Michael Dales , + Michel Eyckmans , + Callum Gibson , + Jason Gloudon , + Nicholas Jacobs , + Caveh Frank Jalali + Takeharu Kato , + Goran Larsson , + Rolf Neugebauer , + Steve Ratcliffe , + Seth Robertson , + Mehul N. Sanghvi , + Tim Wiess , + acknowledging + Claude Lecommandeur, (ctwm), +Debian package author: Branden Robinson + +Branden Robinson would like to acknowledge Martin "Joey" Schulze for his +previous packaging of vtwm. + +Debian's changes to the upstream sources are available in the file +debian/patches. + +Debian copyright/licensing: + + Unless otherwise noted, all modifications and additions to vtwm found in + Debian packages bear the following copyright and license terms: + + Copyright 1999-2002, 2004 Branden Robinson + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +Upstream copyright/licensing: + +1) add_window.c + add_window.h + doc/vtwm.man + events.c + events.h + gc.c + gc.h + gram.y + lex.l + list.c + list.h + menus.c + menus.h + parse.c + parse.h + resize.c + resize.h + twm.c + twm.h + util.c + util.h + version.c + version.h + + Copyright 1988 by Evans & Sutherland Computer Corporation, + Salt Lake City, Utah + Portions Copyright 1989 by the Massachusetts Institute of Technology + Cambridge, Massachusetts + + All Rights Reserved + + Permission to use, copy, modify, and distribute this software and + its documentation for any purpose and without fee is hereby + granted, provided that the above copyright notice appear in all + copies and that both that copyright notice and this permis- + sion notice appear in supporting documentation, and that the + names of Evans & Sutherland and M.I.T. not be used in advertising + in publicity pertaining to distribution of the software without + specific, written prior permission. + + EVANS & SUTHERLAND AND M.I.T. DISCLAIM ALL WARRANTIES WITH REGARD + TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT- + ABILITY AND FITNESS, IN NO EVENT SHALL EVANS & SUTHERLAND OR + M.I.T. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAM- + AGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA + OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE + OR PERFORMANCE OF THIS SOFTWARE. + +2) applets.c + cursor.c + iconmgr.c + iconmgr.h + icons.c + regions.c + regions.h + screen.h + + Copyright 1989 Massachusetts Institute of Technology + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of M.I.T. not be used in advertising + or publicity pertaining to distribution of the software without specific, + written prior permission. M.I.T. makes no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. + + M.I.T. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL M.I.T. + BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION + OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +3) desktop.c + desktop.h + doors.c + doors.h + + Copyright 1990 Dave Edmondson. + Copyright 1990 Imperial College of Science, Technology & Medicine. + + All Rights Reserved. + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the names of Dave Edmondson or Imperial College + not be used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. Dave Edmondson and + Imperial College make no representations about the suitability of this + software for any purpose. It is provided "as is" without express or + implied warranty. + +4) sound.c + sound.h + + Copyright 2001 David J. Hawkey Jr. + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of the copyright holder or the author not + be used in advertising or publicity pertaining to distribution of the + software without specific, written prior permission. The copyright holder + and the author make no representations about the suitability of this + software for any purpose. It is provided "as is" without express or + implied warranty. + + THE COPYRIGHT HOLDER AND THE AUTHOR DISCLAIM ALL WARRANTIES WITH REGARD + TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDER OR THE AUTHOR BE LIABLE + FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +5) nexpm.c + + Copyright 1990, 1991 GROUPE BULL + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided + that the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation, and that the name of GROUPE BULL not be used in advertising + or publicity pertaining to distribution of the software without specific, + written prior permission. GROUPE BULL makes no representations about the + suitability of this software for any purpose. It is provided "as is" + without express or implied warranty. + + GROUPE BULL disclaims all warranties with regard to this software, + including all implied warranties of merchantability and fitness, + in no event shall GROUPE BULL be liable for any special, + indirect or consequential damages or any damages + whatsoever resulting from loss of use, data or profits, + whether in an action of contract, negligence or other tortious + action, arising out of or in connection with the use + or performance of this software. + +$Id: copyright 58 2005-11-05 23:23:20Z branden $ --- vtwm-5.4.7.orig/debian/menu +++ vtwm-5.4.7/debian/menu @@ -0,0 +1,8 @@ +# $Id: menu 47 2005-11-05 22:22:55Z branden $ +?package(vtwm):\ + needs="wm"\ + section="Window Managers"\ + longtitle="Virtual Tab Window Manager"\ + title="VTWM"\ + command="vtwm" +# vim:set ai et sts=4 sw=4 tw=80: --- vtwm-5.4.7.orig/debian/menu-method +++ vtwm-5.4.7/debian/menu-method @@ -0,0 +1,32 @@ +#!/usr/bin/install-menu + +# $Id: menu-method 63 2005-11-06 00:36:48Z branden $ + +compat="menu-1" + +!include menu.h + +compat="menu-2" + +# q($arg): backslash-escape double quotes in $arg +function q($com) = esc($com,"\""); + +# apply($command, $action): run $command using window manager function $action +function apply($com, $action) = " \"" q(title()) "\" " $action " \"" q($com) " &\"\n"; + +supported; + x11 = apply($command, "f.exec"); + text = apply(term(), "f.exec"); + wm = apply($command, "f.startwm"); +endsupported; + +startmenu= "menu \"" $section "\"\n{\n"; +endmenu= "}\n"; +submenutitle=" \"" title() "\" f.menu \"" $section "\"\n"; +genmenu= "menudefs.hook"; +rcfile= "system.vtwmrc"; +examplercfile="system.vtwmrc-menu"; +rootprefix= "/etc/X11/vtwm/"; +userprefix= "/.vtwm/"; + +# vim:set ai et sts=4 sw=4 tw=80: --- vtwm-5.4.7.orig/debian/patches +++ vtwm-5.4.7/debian/patches @@ -0,0 +1,466 @@ +$Id: patches 57 2005-11-05 23:19:39Z branden $ + +desktop.c, doors.c, iconmgr.c, list.c, menus.c, util.c: + Eliminate redefinitions of strdup(). + +Imakefile: + Replace VTWMLIBDIR symbol with VTWMCONFDIR since all we use it for is + installation of the configuration file. Create a new TWMCONFDIR symbol, + which we use to locate twm's configration file. If Imake defines + EtcX11Directory, use a subdirectory of ETCX11DIR for vtwm's + configuration; otherwise, use a subdirectory of LIBDIR. + +doc/vtwm.man: + + Add copyright notice to the manpage itself, copied from the copyright + information on TWM's source files in X11R4, from which VTWM was forked. + + Remove commented-out local macro definition from manpage (which also + dates back to X11R4). + + Fix up the .TH directive: + - Downcase the command name (rendering a command's name in full caps is + a presentation decision). + - Change the date to reflect my modifications. + - Indicate the source as "VTWM 5.4.6b", not "X11R4-6", since this + manual page is independently maintained by the VTWM hackers. + + Fix up the NAME section: + - Remove spurious paragraph break at the beginning of the section. + - Use \- instead of - to separate the manpage's name and summary and so + that mkwhatis is less easily confused. (See man(7).) + + Rename the SYNTAX section to SYNOPSIS. (See man(7).) + + Use an macros for type face selection in the SYNOPSIS section. + + Use \- instead of - in the SYNOPSIS section to notate literal dashes + that the user will type (e.g., when specifying command-line options). + + Rename the SIGNALS section to ASYNCHRONOUS EVENTS (after SUSv3 + manpages). + + Rename the ENVIRONMENT VARIABLES section to ENVIRONMENT. (See + man(7).) + + Use "an" typeface macros instead of roff \f escapes for font changes + where practical in the ASYNCHRONOUS EVENTS, BUGS, FILES, + ENVIRONMENT, COPYRIGHT, and SEE ALSO sections. + + Quote multi-word arguments to the .SH macro in the ASYNCHRONOUS + EVENTS and AUTHORS AND CONTRIBUTORS sections. + + Use \(oq and \(cq named characters instead of literal double-quotes + in the BUGS section. + + Italicize signal names in the ASYNCHRONOUS EVENTS section. + + Put a newline at the ends of sentences per the GNU Roff info + documentation. + + Move the SEE ALSO section to the end of the page. + + Update COPYRIGHT section based on the information I gathered from + trawling the source tree. + + Add a Vim modeline. + +Index: Imakefile +=================================================================== +--- Imakefile (revision 46) ++++ Imakefile (working copy) +@@ -56,9 +56,22 @@ + XCOMM Installation path for the binary + VTWMBINDIR = $(BINDIR) + +-XCOMM Installation path for the system resource file +- VTWMLIBDIR = $(LIBDIR)/twm ++/* ++ * If EtcX11Directory is defined, we're using a relatively modern X.Org or ++ * XFree86 release. ++ */ ++#ifdef EtcX11Directory ++ CONFDIR = $(ETCX11DIR) ++#else ++ CONFDIR = $(LIBDIR) ++#endif + ++XCOMM Installation path for VTWM's system resource file ++ VTWMCONFDIR = $(CONFDIR)/vtwm ++ ++XCOMM Location where we search for TWM's system resource file ++ TWMCONFDIR = $(CONFDIR)/twm ++ + XCOMM Installation path for the man page + VTWMMANDIR = $(MANDIR) + +@@ -113,8 +126,8 @@ + SpecialObjectRule(events.o,gram.h,$(NEED_SELECT_H)) + + SpecialObjectRule(parse.o,gram.h,$(NEED_YYLINENO_V) \ +-'-DSYSTEM_VTWMRC="'$(VTWMLIBDIR)'/system.vtwmrc"' \ +-'-DSYSTEM_TWMRC="'$(VTWMLIBDIR)'/system.twmrc"') ++'-DSYSTEM_VTWMRC="'$(VTWMCONFDIR)'/system.vtwmrc"' \ ++'-DSYSTEM_TWMRC="'$(VTWMCONFDIR)'/system.twmrc"') + + SpecialObjectRule(add_window.o applets.o icons.o \ + list.o regions.o sound.o twm.o,gram.h,NullParameter) +@@ -123,7 +136,7 @@ + + InstallProgram(vtwm,$(VTWMBINDIR)) + InstallManPage(vtwm,$(VTWMMANDIR)) +-InstallNonExecFile(system.vtwmrc,$(VTWMLIBDIR)) ++InstallNonExecFile(system.vtwmrc,$(VTWMCONFDIR)) + + depend:: lex.c gram.c deftwmrc.c lastmake.c vtwm.man + +Index: iconmgr.c +=================================================================== +--- iconmgr.c (revision 46) ++++ iconmgr.c (working copy) +@@ -45,9 +45,6 @@ + int strcmp(); /* missing from string.h in AUX 2.0 */ + #endif + +-#define strdup Strdup /* avoid conflict with system header files */ +-extern char *strdup(char *); +- + /* djhjr - 5/2/98 */ + static int ComputeIconMgrWindowHeight(); + +Index: util.c +=================================================================== +--- util.c (revision 46) ++++ util.c (working copy) +@@ -89,9 +89,6 @@ + #define ZOOMSLEEP 50000 /* arbitrary, but pleasing, msec value */ + #endif + +-#define strdup Strdup /* avoid conflict with system header files */ +-extern char *strdup(char *); +- + /* + * All instances of Scr->TitleBevelWidth and Scr->BorderBevelWidth + * were a hard value of 2 - djhjr - 4/29/98 +Index: doors.c +=================================================================== +--- doors.c (revision 46) ++++ doors.c (working copy) +@@ -24,16 +24,6 @@ + #include "desktop.h" + #include "add_window.h" + +-#define strdup Strdup /* avoid conflict with system header files */ +-char *strdup(s1) +-char * s1; +-{ +- char *s2; +- +- s2 = malloc((unsigned) strlen(s1)+1); +- return (s2 == NULL ? NULL : strcpy(s2,s1)); +-} +- + extern void SetMapStateProp(); + extern TwmDoor *door_add_internal(); + extern void twmrc_error_prefix(); +Index: desktop.c +=================================================================== +--- desktop.c (revision 46) ++++ desktop.c (working copy) +@@ -26,9 +26,6 @@ + #include "events.h" + #include "desktop.h" + +-#define strdup Strdup /* avoid conflict with system header files */ +-extern char *strdup(char *); +- + extern void SetRealScreenInternal(); + extern void SetRealScreen(); + extern void SnapRealScreen(); +Index: list.c +=================================================================== +--- list.c (revision 46) ++++ list.c (working copy) +@@ -60,9 +60,6 @@ + + #define REGCOMP_FLAGS (REG_EXTENDED | REG_NOSUB) + +-#define strdup Strdup /* avoid conflict with system header files */ +-extern char *strdup(char *); +- + struct name_list_struct + { + name_list *next; /* pointer to the next name */ +Index: menus.c +=================================================================== +--- menus.c (revision 46) ++++ menus.c (working copy) +@@ -69,9 +69,6 @@ + #endif + #include "version.h" + +-#define strdup Strdup /* avoid conflict with system header files */ +-extern char *strdup(char *); +- + extern void IconUp(), IconDown(), CreateIconWindow(); + + /* djhjr - 4/26/99 */ +Index: doc/vtwm.man +=================================================================== +--- doc/vtwm.man (revision 46) ++++ doc/vtwm.man (working copy) +@@ -1,19 +1,27 @@ +-.\" twm +-.\" .de EX \"Begin example +-.\" .ne 5 +-.\" .if n .sp 1 +-.\" .if t .sp .5 +-.\" .nf +-.\" .in +.5i +-.\" .. +-.\" .de EE +-.\" .fi +-.\" .in -.5i +-.\" .if n .sp 1 +-.\" .if t .sp .5 +-.\" .. +-.\" .ta .3i .6i .9i 1.2i 1.5i 1.8i +-.TH VTWM 1 "Release 5.4.7" "X11R4-6" ++.\" Copyright 1988 by Evans & Sutherland Computer Corporation, ++.\" Salt Lake City, Utah ++.\" Portions Copyright 1989 by the Massachusetts Institute of Technology ++.\" Cambridge, Massachusetts ++.\" ++.\" All Rights Reserved ++.\" ++.\" Permission to use, copy, modify, and distribute this software and ++.\" its documentation for any purpose and without fee is hereby ++.\" granted, provided that the above copyright notice appear in all ++.\" copies and that both that copyright notice and this permis- ++.\" sion notice appear in supporting documentation, and that the ++.\" names of Evans & Sutherland and M.I.T. not be used in advertising ++.\" in publicity pertaining to distribution of the software without ++.\" specific, written prior permission. ++.\" ++.\" EVANS & SUTHERLAND AND M.I.T. DISCLAIM ALL WARRANTIES WITH REGARD ++.\" TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT- ++.\" ABILITY AND FITNESS, IN NO EVENT SHALL EVANS & SUTHERLAND OR ++.\" M.I.T. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAM- ++.\" AGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA ++.\" OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++.\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE ++.\" OR PERFORMANCE OF THIS SOFTWARE. + .\"********************************************************************* + .\" Important note: At the time 5.4.4 was released, this manual page + .\" conformed to Sun's guidelines for manual page markup, passed +@@ -22,16 +30,37 @@ + .\" in subsequent edits to preserve these important invariants! + .\"********************************************************************* + .\"===================================================================== ++.TH vtwm 1 "2005-06-28" "VTWM 5.4.7" + .SH NAME + .PP + vtwm - Virtual Tab Window Manager for the X Window System + .PP + .\"===================================================================== +-.SH SYNTAX +-.PP +-\&\fBvtwm\fP [\fB-d\fP \fIdisplay\fP] [\fB-f\fP [\fIinitfile\fP]] +-[\fB-m\fP [\fIoptions\fP]] [\fB-p\fP] [\fB-s\fP] [\fB-v\fP] +-.PP ++.SH SYNOPSIS ++.B vtwm ++[ ++.B \-d ++.I display ++] ++[ ++.B \-f ++.I initfile ++] ++[ ++.B \-m ++[ ++.I m4-options ++] ++] ++[ ++.B \-p ++] ++[ ++.B \-s ++] ++[ ++.B \-v ++] + .\"===================================================================== + .SH DESCRIPTION + .PP +@@ -2552,11 +2581,22 @@ + accomplishes the same thing. This is but a simple example of RE usage, + and as such doesn't demonstrate or leverage their capabilities. + .\"===================================================================== +-.SH SIGNALS +-It is possible to issue a \fBf.restart\fP via a UNIX signal, to ease +-debugging of \fBvtwm\fP resource files. To do this, send a SIGUSR1 to the +-\&\fBvtwm\fP process ID (written to \fI$HOME/vtwm.pid\fP). +-See \fBkill\fP(1) or \fBslay\fP(1). ++.SH "ASYNCHRONOUS EVENTS" ++It is possible to issue an ++.B f.restart ++via a Unix signal, to ease debugging of ++.B vtwm ++resource files. ++To do this, send a ++.I SIGUSR1 ++to the ++.B vtwm ++process ID (written to ++.IR $HOME/vtwm.pid ). ++See ++.BR kill (1) ++or ++.BR slay (1). + .\"===================================================================== + .SH BUGS + There are precious few safeguards against binding functions to objects +@@ -2565,65 +2605,59 @@ + Double clicking very fast to get the constrained move function will sometimes + cause the window to move, even though the pointer is not moved. + .PP +-It is possible to "lose" windows in the virtual desktop by placing them +-in a large desktop area, then shrinking the desktop so as to remove them +-from view. They are still there, of course, but are unreachable until the +-desktop is grown sufficiently large again. ++It is possible to \(oqlose\(cq windows in the virtual desktop by placing ++them in a large desktop area, then shrinking the desktop so as to remove ++them from view. ++They are still there, of course, but are unreachable until the + .PP +-See the \fIBUGS\fP file in the distribution for others. ++See the ++.I BUGS ++file in the distribution for others. + .\"===================================================================== + .SH FILES +-.PP +-Searched for in the order shown: +-.RS 4 +-.nf +-\&\fI$HOME/.vtwmrc.\fP +-\&\fI$HOME/.vtwmrc\fP +-\&\fI$VTWMDIR/twm/system.vtwmrc\fP +-\&\fI$HOME/.twmrc.\fP +-\&\fI$HOME/.twmrc\fP +-\&\fI$VTWMDIR/twm/system.twmrc\fP ++.PD 0 ++.TP ++.IR $HOME/.vtwmrc. screen-number ++.TP ++.I $HOME/.vtwmrc ++.TP ++.I $VTWMETCMDIR/vtwm/system.vtwmrc ++.TP ++.IR $HOME/.twmrc. screen-number ++.TP ++.I $HOME/.twmrc ++.TP ++.I $VTWMETCMDIR/twm/system.vtwmrc ++are files ++.B vtwm ++will search for and use as its configuration file. ++They are searched for in the order shown, and the first readable file ++found is used. ++.PD 1 ++.TP ++.I $HOME/vtwm.pid ++contains the ID of the user's ++.B vtwm ++process; see the description of the ++.B \-p ++option above. + .fi +-.RE +-.PP +-.nf +-\&\fI$HOME/vtwm.pid\fP +-.fi + .\"===================================================================== +-.SH "ENVIRONMENT VARIABLES" +-.IP "\fBDISPLAY\fP" 8 +-This variable is used to determine which X server to use. It is also set +-during \fBf.exec\fP so that programs come up on the proper screen. +-.IP "\fBHOME\fP" 8 ++.SH ENVIRONMENT ++.TP ++.B DISPLAY ++This variable is used to determine which X server to use. ++It is also set during ++.B f.exec ++so that programs come up on the proper screen. ++.TP ++.B HOME + This variable is used as the prefix for files that begin with a tilde and +-for locating the \fBvtwm\fP startup file. ++for locating the ++.B vtwm ++startup file. + .\"===================================================================== +-.SH "SEE ALSO" +-\&\fBbitmap\fP(5), +-\&\fBctwm\fP(1), +-\&\fBm4\fP(1), +-\&\fBmwm\fP(1), +-\&\fBpixmap\fP(5), +-\&\fBre_format\fP(7) or \fBegrep\fP(1), +-\&\fBrplayd\fP(8) and \fBrplay.helpers\fP(5), +-\&\fBtvtwm\fP(1), +-\&\fBtwm\fP(1), +-\&\fBvuewm\fP(1), +-\&\fBX\fP(1), +-\&\fBxdm\fP(1), +-\&\fBxinit\fP(1), +-\&\fBxmodmap\fP(1), +-\&\fBxrdb\fP(1), +-\&\fBXserver\fP(1) +-.\"===================================================================== +-.SH COPYRIGHT +-Portions copyright 1988 Evans & Sutherland Computer Corporation; portions +-copyright 1989 Hewlett-Packard Company and the Massachusetts Institute of +-Technology; portions copyright 2001 D. J. Hawkey Jr.. +-.PP +-See \fBX\fP(1) for a full statement of rights and permissions. +-.\"===================================================================== +-.SH AUTHORS AND CONTRIBUTORS ++.SH "AUTHORS AND CONTRIBUTORS" + Tom LaStrange, Solbourne Computer; Jim Fulton, MIT X Consortium; + Steve Pitschke, Stardent Computer; Keith Packard, MIT X Consortium; + Dave Payne, Apple Computer; Nick Williams ; +@@ -2665,4 +2699,44 @@ + Tim Wiess , + acknowledging + Claude Lecommandeur, (ctwm), ++.\"===================================================================== ++.SH COPYRIGHT ++Copyright 1988 Evans & Sutherland Computer Corporation ++.br ++Copyright 1989 Massachusetts Institute of Technology ++.br ++Copyright 1990 Dave Edmondson ++.br ++Copyright 1990 Imperial College of Science, Technology & Medicine ++.br ++Copyright 1990, 1991 Groupe Bull ++.br ++Copyright 2001 David J. Hawkey Jr. ++.PP ++See the copyright notices in the ++.B vtwm ++source distribution for copyright license statements. ++On Debian systems, these may also be found in the file ++.IR /usr/share/doc/vtwm/copyright . ++.\"===================================================================== ++.SH "SEE ALSO" ++.BR bitmap (1), ++.BR ctwm (1), ++.BR m4 (1), ++.BR mwm (1), ++.BR pixmap (1), ++.BR regex (7) ++or ++.BR egrep (1), ++.BR rplayd (8), ++.BR tvtwm (1), ++.BR twm (1), ++.BR vuewm (1), ++.BR X (1), ++.BR xdm (1), ++.BR xinit (1), ++.BR xmodmap (1), ++.BR xrdb (1), ++.BR Xserver (1) + .\"==============================[The End]============================== ++.\" vim:set ai et sts=4 sw=4 tw=72: --- vtwm-5.4.7.orig/debian/postinst +++ vtwm-5.4.7/debian/postinst @@ -0,0 +1,24 @@ +#!/bin/sh +# Debian vtwm package post-installation script +# Copyright 1999 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# $Id: postinst 47 2005-11-05 22:22:55Z branden $ + +set -e + +trap "echo ;\ + echo 'Received signal. Aborting configuration of vtwm package.' ;\ + echo ;\ + exit 1" 1 2 3 15 + +#DEBHELPER# + +update-alternatives --install /usr/bin/x-window-manager x-window-manager \ + /usr/bin/vtwm 50 --slave /usr/share/man/man1/x-window-manager.1.gz \ + x-window-manager.1.gz /usr/share/man/man1/vtwm.1x.gz + +exit 0 + +# vim:set ai et sts=4 sw=4 tw=80: --- vtwm-5.4.7.orig/debian/postrm +++ vtwm-5.4.7/debian/postrm @@ -0,0 +1,26 @@ +#!/bin/sh +# Debian vtwm package post-removal script +# Copyright 1999 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# $Id: postrm 47 2005-11-05 22:22:55Z branden $ + +set -e + +trap "echo ;\ + echo 'Received signal. Aborting removal of vtwm package.' ;\ + echo ;\ + exit 1" 1 2 3 15 + +#DEBHELPER# + +if [ "$1" = "purge" ]; then + if [ -d /etc/X11/vtwm ]; then + rm -r /etc/X11/vtwm + fi +fi + +exit 0 + +# vim:set ai et sts=4 sw=4 tw=80: --- vtwm-5.4.7.orig/debian/prerm +++ vtwm-5.4.7/debian/prerm @@ -0,0 +1,27 @@ +#!/bin/sh +# Debian vtwm package pre-removal script +# Copyright 1999, 2001 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# $Id: prerm 47 2005-11-05 22:22:55Z branden $ + +set -e + +trap "echo ;\ + echo 'Received signal. Aborting removal of vtwm package.' ;\ + echo ;\ + exit 1" 1 2 3 15 + +#DEBHELPER# + +case "$1" in + upgrade|failed-upgrade) ;; + remove|deconfigure) + update-alternatives --remove x-window-manager /usr/bin/vtwm + ;; +esac + +exit 0 + +# vim:set ai et sts=4 sw=4 tw=80: --- vtwm-5.4.7.orig/debian/rules +++ vtwm-5.4.7/debian/rules @@ -0,0 +1,82 @@ +#!/usr/bin/make -f +# Debian package build rules file for vtwm +# Copyright 1997-1999 Joey Hess. +# Copyright 1999 Branden Robinson. +# Licensed under the GNU General Public License, version 2. See the file +# /usr/share/common-licenses/GPL or . + +# $Id: rules 60 2005-11-05 23:32:57Z branden $ + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +CDEBUGFLAGS=-g +# Does DEB_BUILD_OPTIONS contain the "noopt" flag? +ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +# don't get rid of the space in the next line +CDEBUGFLAGS+= -O2 +else +CDEBUGFLAGS+= -O0 +endif +export CDEBUGFLAGS + +%: + dh $@ --no-parallel + +override_dh_auto_configure: + xmkmf + +override_dh_auto_build: + $(MAKE) LIBDIR=/usr/lib TWMDIR=/usr/lib/X11/twm + +override_dh_auto_clean: + [ ! -f Makefile ] || $(MAKE) clean + rm -f Makefile + +override_dh_clean: + dh_clean debian/README.Debian + +override_dh_auto_install: + $(MAKE) DESTDIR=debian/vtwm install install.man \ + INSTALL="install --strip-program=true" + rm debian/vtwm/etc/X11/vtwm/system.vtwmrc + install -m 644 debian/system.vtwmrc-menu debian/vtwm/etc/X11/vtwm + + sed -n '/^RUNTIME HINTS/,$$p' debian/README.Debian + +# Do not ship the following files from the doc/ directory: +# doc/CHANGELOG (dh_installchangelog handles this) +# doc/INSTALL (handled above in install target) +override_dh_installdocs: + dh_installdocs \ + doc/1.README \ + doc/2.1.ANNOUNCE \ + doc/2.1.README \ + doc/2.2.README \ + doc/2.README \ + doc/3.FUTURE \ + doc/3.README \ + doc/4.4.ANNOUNCE \ + doc/4.4.FUTURE \ + doc/4.4.README \ + doc/4.5.ANNOUNCE \ + doc/4.5.README \ + doc/4.6.ANNOUNCE \ + doc/4.6.README \ + doc/4.7.README \ + doc/4.ANNOUNCE \ + doc/4.FUTURE \ + doc/4.README \ + doc/BUGS \ + doc/DEVELOPERS \ + doc/HISTORY \ + doc/SOUND \ + doc/WISHLIST + +override_dh_installexamples: + dh_installexamples system.vtwmrc.2D system.vtwmrc.3D + +override_dh_installchangelogs: + dh_installchangelogs doc/CHANGELOG + +# vim:set ai noet sts=8 sw=8 tw=80: --- vtwm-5.4.7.orig/debian/system.vtwmrc-menu +++ vtwm-5.4.7/debian/system.vtwmrc-menu @@ -0,0 +1,182 @@ +# $Id: system.vtwmrc-menu 62 2005-11-06 00:12:18Z branden $ + +# Based on: +# $XConsortium: system.twmrc,v 1.8 91/04/23 21:10:58 gildea Exp $ + +# +# Variables +# + +NoGrabServer +NoDefaults +RestartPreviousState +ShowIconManager +SortIconManager +IconifyByUnmapping +RightHandSidePulldownMenus + +ButtonColorIsFrame +ShallowReliefWindowButton + +FixManagedVirtualGeometries +FixTransientVirtualGeometries + +BorderWidth 6 + +BorderBevelWidth 2 +ButtonBevelWidth 1 +IconBevelWidth 2 +IconManagerBevelWidth 1 +InfoBevelWidth 2 +MenuBevelWidth 2 +TitleBevelWidth 1 + +ClearBevelContrast 40 +DarkBevelContrast 40 + +MoveDelta 3 + +ResizeRegion "NorthEast" +VirtualDesktop "3x3-0-0" 16 + +TitleFont "-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*" +ResizeFont "-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*" +MenuFont "-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*" +MenuTitleFont "-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*" +IconFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*" +InfoFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*" +IconManagerFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*" + +# +# Lists +# + +WarpCursor + +NailedDown +{ + "VTWM Icon Manager" + "VTWM Desktop" +} + +NoTitle +{ + "VTWM Icon Manager" +} + +DontShowInDisplay +{ + "VTWM Icon Manager" + "VTWM Desktop" +} + +IconManagerDontShow +{ + "VTWM Icon Manager" + "VTWM Desktop" +} + +Color +{ + BorderColor "grey70" + BorderTileBackground "gray60" + BorderTileForeground "gray60" + DefaultBackground "maroon" + DefaultForeground "gray85" + TitleBackground "maroon" + TitleForeground "gray85" + MenuBackground "maroon" + MenuForeground "gray85" + MenuTitleBackground "gray70" + MenuTitleForeground "maroon" + IconBackground "maroon" + IconForeground "gray85" + IconBorderColor "gray85" + IconManagerBackground "maroon" + IconManagerForeground "gray85" + VirtualBackground "maroon" + VirtualForeground "black" + DesktopDisplayBackground "grey60" +} + +# +# Functions and Bindings +# + +Function "move-or-lower" { f.move f.deltastop f.lower } +Function "move-or-raise" { f.move f.deltastop f.raise } +Function "move-or-iconify" { f.move f.deltastop f.iconify } + +LeftTitleButton ":xpm:bar" = f.menu "windowops" +RightTitleButton ":xpm:dot" = f.iconify +RightTitleButton ":xpm:resize" = f.resize + +Button1 = : root : f.menu "main" +Button2 = : root : f.menu "windowops" +Button3 = : root : f.version + +Button1 = : title : f.function "move-or-raise" +Button3 = : title : f.lower + +Button1 = : frame : f.function "move-or-raise" +Button2 = : frame : f.resize +Button3 = : frame : f.iconify + +Button1 = : icon : f.function "move-or-iconify" +Button3 = : icon : f.menu "windowops" + +Button1 = : iconmgr : f.iconify +Button3 = : iconmgr : f.warp + +Button1 = : virtual | desktop : f.movescreen + +# +# Menus +# + +menu "main" +{ + "Main Menu" f.title + "Debian" f.menu "/Debian" + "" f.separator + "Show Icon Manager" f.showiconmgr + "Hide Icon Manager" f.hideiconmgr + "" f.separator + "Show Desktop" f.showdesktopdisplay + "Hide Desktop" f.hidedesktopdisplay + "" f.separator + "Exit" f.menu "Quit-Verify" +} + +menu "Quit-Verify" +{ + "Really quit VTWM?" f.title + "No, restart VTWM" f.restart + "Yes, really quit" f.quit +} + +menu "windowops" +{ + "Window Ops" f.title + "Autoraise" f.autoraise + "Raise" f.raise + "Lower" f.lower + "Nail" f.nail + "" f.separator + "Move" f.move + "Size" f.resize + "Iconify" f.iconify + "" f.separator + "Fullzoom" f.fullzoom + "Horizoom" f.horizoom + "Vertzoom" f.zoom + "" f.separator + "Identify" f.identify + "" f.separator + "Delete" f.delete + "Destroy" f.destroy +} + +include-menu-defs + +# vim:set ai noet sts=8 sw=8 tw=80: --- vtwm-5.4.7.orig/debian/watch +++ vtwm-5.4.7/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://www.vtwm.org/downloads/vtwm-([\d.]+)\.tar\.gz --- vtwm-5.4.7.orig/desktop.c +++ vtwm-5.4.7/desktop.c @@ -26,9 +26,6 @@ #include "events.h" #include "desktop.h" -#define strdup Strdup /* avoid conflict with system header files */ -extern char *strdup(char *); - extern void SetRealScreenInternal(); extern void SetRealScreen(); extern void SnapRealScreen(); --- vtwm-5.4.7.orig/doc/vtwm.man +++ vtwm-5.4.7/doc/vtwm.man @@ -1,19 +1,27 @@ -.\" twm -.\" .de EX \"Begin example -.\" .ne 5 -.\" .if n .sp 1 -.\" .if t .sp .5 -.\" .nf -.\" .in +.5i -.\" .. -.\" .de EE -.\" .fi -.\" .in -.5i -.\" .if n .sp 1 -.\" .if t .sp .5 -.\" .. -.\" .ta .3i .6i .9i 1.2i 1.5i 1.8i -.TH VTWM 1 "Release 5.4.7" "X11R4-6" +.\" Copyright 1988 by Evans & Sutherland Computer Corporation, +.\" Salt Lake City, Utah +.\" Portions Copyright 1989 by the Massachusetts Institute of Technology +.\" Cambridge, Massachusetts +.\" +.\" All Rights Reserved +.\" +.\" Permission to use, copy, modify, and distribute this software and +.\" its documentation for any purpose and without fee is hereby +.\" granted, provided that the above copyright notice appear in all +.\" copies and that both that copyright notice and this permis- +.\" sion notice appear in supporting documentation, and that the +.\" names of Evans & Sutherland and M.I.T. not be used in advertising +.\" in publicity pertaining to distribution of the software without +.\" specific, written prior permission. +.\" +.\" EVANS & SUTHERLAND AND M.I.T. DISCLAIM ALL WARRANTIES WITH REGARD +.\" TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT- +.\" ABILITY AND FITNESS, IN NO EVENT SHALL EVANS & SUTHERLAND OR +.\" M.I.T. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAM- +.\" AGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA +.\" OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +.\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE +.\" OR PERFORMANCE OF THIS SOFTWARE. .\"********************************************************************* .\" Important note: At the time 5.4.4 was released, this manual page .\" conformed to Sun's guidelines for manual page markup, passed @@ -22,16 +30,37 @@ .\" in subsequent edits to preserve these important invariants! .\"********************************************************************* .\"===================================================================== +.TH vtwm 1 "2005-06-28" "VTWM 5.4.7" .SH NAME .PP vtwm - Virtual Tab Window Manager for the X Window System .PP .\"===================================================================== -.SH SYNTAX -.PP -\&\fBvtwm\fP [\fB-d\fP \fIdisplay\fP] [\fB-f\fP [\fIinitfile\fP]] -[\fB-m\fP [\fIoptions\fP]] [\fB-p\fP] [\fB-s\fP] [\fB-v\fP] -.PP +.SH SYNOPSIS +.B vtwm +[ +.B \-d +.I display +] +[ +.B \-f +.I initfile +] +[ +.B \-m +[ +.I m4-options +] +] +[ +.B \-p +] +[ +.B \-s +] +[ +.B \-v +] .\"===================================================================== .SH DESCRIPTION .PP @@ -2552,11 +2581,22 @@ accomplishes the same thing. This is but a simple example of RE usage, and as such doesn't demonstrate or leverage their capabilities. .\"===================================================================== -.SH SIGNALS -It is possible to issue a \fBf.restart\fP via a UNIX signal, to ease -debugging of \fBvtwm\fP resource files. To do this, send a SIGUSR1 to the -\&\fBvtwm\fP process ID (written to \fI$HOME/vtwm.pid\fP). -See \fBkill\fP(1) or \fBslay\fP(1). +.SH "ASYNCHRONOUS EVENTS" +It is possible to issue an +.B f.restart +via a Unix signal, to ease debugging of +.B vtwm +resource files. +To do this, send a +.I SIGUSR1 +to the +.B vtwm +process ID (written to +.IR $HOME/vtwm.pid ). +See +.BR kill (1) +or +.BR slay (1). .\"===================================================================== .SH BUGS There are precious few safeguards against binding functions to objects @@ -2565,65 +2605,59 @@ Double clicking very fast to get the constrained move function will sometimes cause the window to move, even though the pointer is not moved. .PP -It is possible to "lose" windows in the virtual desktop by placing them -in a large desktop area, then shrinking the desktop so as to remove them -from view. They are still there, of course, but are unreachable until the -desktop is grown sufficiently large again. +It is possible to \(oqlose\(cq windows in the virtual desktop by placing +them in a large desktop area, then shrinking the desktop so as to remove +them from view. +They are still there, of course, but are unreachable until the .PP -See the \fIBUGS\fP file in the distribution for others. +See the +.I BUGS +file in the distribution for others. .\"===================================================================== .SH FILES -.PP -Searched for in the order shown: -.RS 4 -.nf -\&\fI$HOME/.vtwmrc.\fP -\&\fI$HOME/.vtwmrc\fP -\&\fI$VTWMDIR/twm/system.vtwmrc\fP -\&\fI$HOME/.twmrc.\fP -\&\fI$HOME/.twmrc\fP -\&\fI$VTWMDIR/twm/system.twmrc\fP -.fi -.RE -.PP -.nf -\&\fI$HOME/vtwm.pid\fP +.PD 0 +.TP +.IR $HOME/.vtwmrc. screen-number +.TP +.I $HOME/.vtwmrc +.TP +.I $VTWMETCMDIR/vtwm/system.vtwmrc +.TP +.IR $HOME/.twmrc. screen-number +.TP +.I $HOME/.twmrc +.TP +.I $VTWMETCMDIR/twm/system.vtwmrc +are files +.B vtwm +will search for and use as its configuration file. +They are searched for in the order shown, and the first readable file +found is used. +.PD 1 +.TP +.I $HOME/vtwm.pid +contains the ID of the user's +.B vtwm +process; see the description of the +.B \-p +option above. .fi .\"===================================================================== -.SH "ENVIRONMENT VARIABLES" -.IP "\fBDISPLAY\fP" 8 -This variable is used to determine which X server to use. It is also set -during \fBf.exec\fP so that programs come up on the proper screen. -.IP "\fBHOME\fP" 8 +.SH ENVIRONMENT +.TP +.B DISPLAY +This variable is used to determine which X server to use. +It is also set during +.B f.exec +so that programs come up on the proper screen. +.TP +.B HOME This variable is used as the prefix for files that begin with a tilde and -for locating the \fBvtwm\fP startup file. -.\"===================================================================== -.SH "SEE ALSO" -\&\fBbitmap\fP(5), -\&\fBctwm\fP(1), -\&\fBm4\fP(1), -\&\fBmwm\fP(1), -\&\fBpixmap\fP(5), -\&\fBre_format\fP(7) or \fBegrep\fP(1), -\&\fBrplayd\fP(8) and \fBrplay.helpers\fP(5), -\&\fBtvtwm\fP(1), -\&\fBtwm\fP(1), -\&\fBvuewm\fP(1), -\&\fBX\fP(1), -\&\fBxdm\fP(1), -\&\fBxinit\fP(1), -\&\fBxmodmap\fP(1), -\&\fBxrdb\fP(1), -\&\fBXserver\fP(1) -.\"===================================================================== -.SH COPYRIGHT -Portions copyright 1988 Evans & Sutherland Computer Corporation; portions -copyright 1989 Hewlett-Packard Company and the Massachusetts Institute of -Technology; portions copyright 2001 D. J. Hawkey Jr.. -.PP -See \fBX\fP(1) for a full statement of rights and permissions. +for locating the +.B vtwm +startup file. .\"===================================================================== -.SH AUTHORS AND CONTRIBUTORS +.SH "AUTHORS AND CONTRIBUTORS" Tom LaStrange, Solbourne Computer; Jim Fulton, MIT X Consortium; Steve Pitschke, Stardent Computer; Keith Packard, MIT X Consortium; Dave Payne, Apple Computer; Nick Williams ; @@ -2665,4 +2699,44 @@ Tim Wiess , acknowledging Claude Lecommandeur, (ctwm), +.\"===================================================================== +.SH COPYRIGHT +Copyright 1988 Evans & Sutherland Computer Corporation +.br +Copyright 1989 Massachusetts Institute of Technology +.br +Copyright 1990 Dave Edmondson +.br +Copyright 1990 Imperial College of Science, Technology & Medicine +.br +Copyright 1990, 1991 Groupe Bull +.br +Copyright 2001 David J. Hawkey Jr. +.PP +See the copyright notices in the +.B vtwm +source distribution for copyright license statements. +On Debian systems, these may also be found in the file +.IR /usr/share/doc/vtwm/copyright . +.\"===================================================================== +.SH "SEE ALSO" +.BR bitmap (1), +.BR ctwm (1), +.BR m4 (1), +.BR mwm (1), +.BR pixmap (1), +.BR regex (7) +or +.BR egrep (1), +.BR rplayd (8), +.BR tvtwm (1), +.BR twm (1), +.BR vuewm (1), +.BR X (1), +.BR xdm (1), +.BR xinit (1), +.BR xmodmap (1), +.BR xrdb (1), +.BR Xserver (1) .\"==============================[The End]============================== +.\" vim:set ai et sts=4 sw=4 tw=72: --- vtwm-5.4.7.orig/doors.c +++ vtwm-5.4.7/doors.c @@ -24,16 +24,6 @@ #include "desktop.h" #include "add_window.h" -#define strdup Strdup /* avoid conflict with system header files */ -char *strdup(s1) -char * s1; -{ - char *s2; - - s2 = malloc((unsigned) strlen(s1)+1); - return (s2 == NULL ? NULL : strcpy(s2,s1)); -} - extern void SetMapStateProp(); extern TwmDoor *door_add_internal(); extern void twmrc_error_prefix(); --- vtwm-5.4.7.orig/events.c +++ vtwm-5.4.7/events.c @@ -38,6 +38,9 @@ #include #include +#include +#include +#include #include "twm.h" #include #include "add_window.h" @@ -63,6 +66,9 @@ #include /* RAISEDELAY */ #include #endif +#include +#include +#include extern void IconDown(); /* djhjr - 4/26/99 */ @@ -362,6 +368,68 @@ /*********************************************************************** * + * Procedures: + * HandleSignal use instead of signal + * + *********************************************************************** + */ + +#define HANDLE_SIG_MAX 256 /* increase means changing type written to pipe */ + +static SigProc signaltable[HANDLE_SIG_MAX]; +static int sigselfpipe[2] = { -1, -1 }; + +static void +SelfPipeHandler(sig) + int sig; +{ + unsigned char sigchar = sig; + int esave; + + esave = errno; + write(sigselfpipe[1], &sigchar, 1); + errno = esave; +} + +void +HandleSignal(sig, func) + int sig; + SigProc func; +{ + struct sigaction sa; + int r, i; + + if (sigselfpipe[0] == -1) { + r = pipe(sigselfpipe); + if (r) { perror("pipe for signals"); exit(-1); } + for (i = 0; i < 2; i++) { + r = fcntl(sigselfpipe[i], F_GETFL); + if (r<0) { perror("fcntl get for pipe"); exit(-1); } + r |= O_NONBLOCK; + r = fcntl(sigselfpipe[i], F_SETFL, r); + if (r<0) { perror("fcntl get for pipe"); exit(-1); } + } + } + + assert(sig < HANDLE_SIG_MAX); + + r = sigaction(sig, NULL, &sa); + if (r) { perror("sigaction get"); exit(-1); } + + if (sa.sa_handler != SIG_DFL) + return; + + signaltable[sig] = func; + memset(&sa, 0, sizeof(sa)); + sa.sa_handler = SelfPipeHandler; + sigemptyset(&sa.sa_mask); + sa.sa_flags = SA_RESTART; + r = sigaction(sig, &sa, NULL); + if (r) { perror("sigaction set"); exit(-1); } +} + +/*********************************************************************** + * * Procedure: * HandleEvents - handle X events * @@ -371,6 +439,14 @@ void HandleEvents() { + struct pollfd pfds[2]; + pfds[0].fd = ConnectionNumber(dpy); + pfds[0].events = POLLIN|POLLPRI; + pfds[1].fd = sigselfpipe[0]; + pfds[1].events = POLLIN|POLLPRI; + sigset_t emptyset; + sigemptyset(&emptyset); + while (TRUE) { if (enter_flag && !QLength(dpy)) { @@ -384,7 +460,32 @@ InstallWindowColormaps(ColormapNotify, (TwmWindow *) NULL); } WindowMoved = FALSE; - XNextEvent(dpy, &Event); + while (!XCheckMaskEvent(dpy, -1 /* wot no AllEventMask */, &Event)) { + int r; + unsigned char signum; + r = poll(pfds, 2, -1); + if (r<0 && errno!=EINTR) { + perror("vtwm: poll failed"); + exit(-1); + } + for (;;) { + r = read(sigselfpipe[0], &signum, 1); + if (r < 0) { + if (errno == EINTR) continue; + if (errno == EAGAIN) break; + if (errno == EWOULDBLOCK) break; + perror("vtwm: read signal self-pipe"); + exit(-1); + } + if (!r) { + fputs("signal self-pipe read EOF!",stderr); + exit(-1); + } + assert(signum < HANDLE_SIG_MAX); + assert(signaltable[signum]); + signaltable[signum](signum); + } + } (void) DispatchEvent (); } } --- vtwm-5.4.7.orig/events.h +++ vtwm-5.4.7/events.h @@ -77,6 +77,8 @@ extern void RedoDoorName(); /* djhjr - 2/28/99 */ extern void RedoListWindow(); /* djhjr - 3/1/99 */ +extern void HandleSignal(); + extern event_proc EventHandler[]; extern Window DragWindow; extern int origDragX; --- vtwm-5.4.7.orig/iconmgr.c +++ vtwm-5.4.7/iconmgr.c @@ -45,9 +45,6 @@ int strcmp(); /* missing from string.h in AUX 2.0 */ #endif -#define strdup Strdup /* avoid conflict with system header files */ -extern char *strdup(char *); - /* djhjr - 5/2/98 */ static int ComputeIconMgrWindowHeight(); --- vtwm-5.4.7.orig/list.c +++ vtwm-5.4.7/list.c @@ -60,9 +60,6 @@ #define REGCOMP_FLAGS (REG_EXTENDED | REG_NOSUB) -#define strdup Strdup /* avoid conflict with system header files */ -extern char *strdup(char *); - struct name_list_struct { name_list *next; /* pointer to the next name */ --- vtwm-5.4.7.orig/menus.c +++ vtwm-5.4.7/menus.c @@ -69,9 +69,6 @@ #endif #include "version.h" -#define strdup Strdup /* avoid conflict with system header files */ -extern char *strdup(char *); - extern void IconUp(), IconDown(), CreateIconWindow(); /* djhjr - 4/26/99 */ --- vtwm-5.4.7.orig/twm.c +++ vtwm-5.4.7/twm.c @@ -258,13 +258,13 @@ /* djhjr - 6/22/01 */ #ifndef NO_SOUND_SUPPORT #define sounddonehandler(sig) \ - if (signal (sig, SIG_IGN) != SIG_IGN) (void) signal (sig, PlaySoundDone) + HandleSignal (sig, PlaySoundDone) #else #define sounddonehandler(sig) \ - if (signal (sig, SIG_IGN) != SIG_IGN) (void) signal (sig, Done) + HandleSignal (sig, Done) #endif #define donehandler(sig) \ - if (signal (sig, SIG_IGN) != SIG_IGN) (void) signal (sig, Done) + HandleSignal (sig, Done) sounddonehandler (SIGINT); sounddonehandler (SIGHUP); @@ -282,7 +282,7 @@ #undef donehandler /* djhjr - 7/31/98 */ - signal (SIGUSR1, QueueRestartVtwm); + HandleSignal (SIGUSR1, QueueRestartVtwm); Home = getenv("HOME"); if (Home == NULL) --- vtwm-5.4.7.orig/util.c +++ vtwm-5.4.7/util.c @@ -89,9 +89,6 @@ #define ZOOMSLEEP 50000 /* arbitrary, but pleasing, msec value */ #endif -#define strdup Strdup /* avoid conflict with system header files */ -extern char *strdup(char *); - /* * All instances of Scr->TitleBevelWidth and Scr->BorderBevelWidth * were a hard value of 2 - djhjr - 4/29/98