1 $Id: patches 57 2005-11-05 23:19:39Z branden $
3 desktop.c, doors.c, iconmgr.c, list.c, menus.c, util.c:
4 Eliminate redefinitions of strdup().
7 Replace VTWMLIBDIR symbol with VTWMCONFDIR since all we use it for is
8 installation of the configuration file. Create a new TWMCONFDIR symbol,
9 which we use to locate twm's configration file. If Imake defines
10 EtcX11Directory, use a subdirectory of ETCX11DIR for vtwm's
11 configuration; otherwise, use a subdirectory of LIBDIR.
14 + Add copyright notice to the manpage itself, copied from the copyright
15 information on TWM's source files in X11R4, from which VTWM was forked.
16 + Remove commented-out local macro definition from manpage (which also
18 + Fix up the .TH directive:
19 - Downcase the command name (rendering a command's name in full caps is
20 a presentation decision).
21 - Change the date to reflect my modifications.
22 - Indicate the source as "VTWM 5.4.6b", not "X11R4-6", since this
23 manual page is independently maintained by the VTWM hackers.
24 + Fix up the NAME section:
25 - Remove spurious paragraph break at the beginning of the section.
26 - Use \- instead of - to separate the manpage's name and summary and so
27 that mkwhatis is less easily confused. (See man(7).)
28 + Rename the SYNTAX section to SYNOPSIS. (See man(7).)
29 + Use an macros for type face selection in the SYNOPSIS section.
30 + Use \- instead of - in the SYNOPSIS section to notate literal dashes
31 that the user will type (e.g., when specifying command-line options).
32 + Rename the SIGNALS section to ASYNCHRONOUS EVENTS (after SUSv3
34 + Rename the ENVIRONMENT VARIABLES section to ENVIRONMENT. (See
36 + Use "an" typeface macros instead of roff \f escapes for font changes
37 where practical in the ASYNCHRONOUS EVENTS, BUGS, FILES,
38 ENVIRONMENT, COPYRIGHT, and SEE ALSO sections.
39 + Quote multi-word arguments to the .SH macro in the ASYNCHRONOUS
40 EVENTS and AUTHORS AND CONTRIBUTORS sections.
41 + Use \(oq and \(cq named characters instead of literal double-quotes
43 + Italicize signal names in the ASYNCHRONOUS EVENTS section.
44 + Put a newline at the ends of sentences per the GNU Roff info
46 + Move the SEE ALSO section to the end of the page.
47 + Update COPYRIGHT section based on the information I gathered from
48 trawling the source tree.
52 ===================================================================
53 --- Imakefile (revision 46)
54 +++ Imakefile (working copy)
56 XCOMM Installation path for the binary
57 VTWMBINDIR = $(BINDIR)
59 -XCOMM Installation path for the system resource file
60 - VTWMLIBDIR = $(LIBDIR)/twm
62 + * If EtcX11Directory is defined, we're using a relatively modern X.Org or
65 +#ifdef EtcX11Directory
66 + CONFDIR = $(ETCX11DIR)
71 +XCOMM Installation path for VTWM's system resource file
72 + VTWMCONFDIR = $(CONFDIR)/vtwm
74 +XCOMM Location where we search for TWM's system resource file
75 + TWMCONFDIR = $(CONFDIR)/twm
77 XCOMM Installation path for the man page
78 VTWMMANDIR = $(MANDIR)
81 SpecialObjectRule(events.o,gram.h,$(NEED_SELECT_H))
83 SpecialObjectRule(parse.o,gram.h,$(NEED_YYLINENO_V) \
84 -'-DSYSTEM_VTWMRC="'$(VTWMLIBDIR)'/system.vtwmrc"' \
85 -'-DSYSTEM_TWMRC="'$(VTWMLIBDIR)'/system.twmrc"')
86 +'-DSYSTEM_VTWMRC="'$(VTWMCONFDIR)'/system.vtwmrc"' \
87 +'-DSYSTEM_TWMRC="'$(VTWMCONFDIR)'/system.twmrc"')
89 SpecialObjectRule(add_window.o applets.o icons.o \
90 list.o regions.o sound.o twm.o,gram.h,NullParameter)
93 InstallProgram(vtwm,$(VTWMBINDIR))
94 InstallManPage(vtwm,$(VTWMMANDIR))
95 -InstallNonExecFile(system.vtwmrc,$(VTWMLIBDIR))
96 +InstallNonExecFile(system.vtwmrc,$(VTWMCONFDIR))
98 depend:: lex.c gram.c deftwmrc.c lastmake.c vtwm.man
101 ===================================================================
102 --- iconmgr.c (revision 46)
103 +++ iconmgr.c (working copy)
105 int strcmp(); /* missing from string.h in AUX 2.0 */
108 -#define strdup Strdup /* avoid conflict with system header files */
109 -extern char *strdup(char *);
112 static int ComputeIconMgrWindowHeight();
115 ===================================================================
116 --- util.c (revision 46)
117 +++ util.c (working copy)
119 #define ZOOMSLEEP 50000 /* arbitrary, but pleasing, msec value */
122 -#define strdup Strdup /* avoid conflict with system header files */
123 -extern char *strdup(char *);
126 * All instances of Scr->TitleBevelWidth and Scr->BorderBevelWidth
127 * were a hard value of 2 - djhjr - 4/29/98
129 ===================================================================
130 --- doors.c (revision 46)
131 +++ doors.c (working copy)
134 #include "add_window.h"
136 -#define strdup Strdup /* avoid conflict with system header files */
142 - s2 = malloc((unsigned) strlen(s1)+1);
143 - return (s2 == NULL ? NULL : strcpy(s2,s1));
146 extern void SetMapStateProp();
147 extern TwmDoor *door_add_internal();
148 extern void twmrc_error_prefix();
150 ===================================================================
151 --- desktop.c (revision 46)
152 +++ desktop.c (working copy)
157 -#define strdup Strdup /* avoid conflict with system header files */
158 -extern char *strdup(char *);
160 extern void SetRealScreenInternal();
161 extern void SetRealScreen();
162 extern void SnapRealScreen();
164 ===================================================================
165 --- list.c (revision 46)
166 +++ list.c (working copy)
169 #define REGCOMP_FLAGS (REG_EXTENDED | REG_NOSUB)
171 -#define strdup Strdup /* avoid conflict with system header files */
172 -extern char *strdup(char *);
174 struct name_list_struct
176 name_list *next; /* pointer to the next name */
178 ===================================================================
179 --- menus.c (revision 46)
180 +++ menus.c (working copy)
185 -#define strdup Strdup /* avoid conflict with system header files */
186 -extern char *strdup(char *);
188 extern void IconUp(), IconDown(), CreateIconWindow();
190 /* djhjr - 4/26/99 */
192 ===================================================================
193 --- doc/vtwm.man (revision 46)
194 +++ doc/vtwm.man (working copy)
197 -.\" .de EX \"Begin example
210 -.\" .ta .3i .6i .9i 1.2i 1.5i 1.8i
211 -.TH VTWM 1 "Release 5.4.7" "X11R4-6"
212 +.\" Copyright 1988 by Evans & Sutherland Computer Corporation,
213 +.\" Salt Lake City, Utah
214 +.\" Portions Copyright 1989 by the Massachusetts Institute of Technology
215 +.\" Cambridge, Massachusetts
217 +.\" All Rights Reserved
219 +.\" Permission to use, copy, modify, and distribute this software and
220 +.\" its documentation for any purpose and without fee is hereby
221 +.\" granted, provided that the above copyright notice appear in all
222 +.\" copies and that both that copyright notice and this permis-
223 +.\" sion notice appear in supporting documentation, and that the
224 +.\" names of Evans & Sutherland and M.I.T. not be used in advertising
225 +.\" in publicity pertaining to distribution of the software without
226 +.\" specific, written prior permission.
228 +.\" EVANS & SUTHERLAND AND M.I.T. DISCLAIM ALL WARRANTIES WITH REGARD
229 +.\" TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
230 +.\" ABILITY AND FITNESS, IN NO EVENT SHALL EVANS & SUTHERLAND OR
231 +.\" M.I.T. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAM-
232 +.\" AGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
233 +.\" OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
234 +.\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE
235 +.\" OR PERFORMANCE OF THIS SOFTWARE.
236 .\"*********************************************************************
237 .\" Important note: At the time 5.4.4 was released, this manual page
238 .\" conformed to Sun's guidelines for manual page markup, passed
240 .\" in subsequent edits to preserve these important invariants!
241 .\"*********************************************************************
242 .\"=====================================================================
243 +.TH vtwm 1 "2005-06-28" "VTWM 5.4.7"
246 vtwm - Virtual Tab Window Manager for the X Window System
248 .\"=====================================================================
251 -\&\fBvtwm\fP [\fB-d\fP \fIdisplay\fP] [\fB-f\fP [\fIinitfile\fP]]
252 -[\fB-m\fP [\fIoptions\fP]] [\fB-p\fP] [\fB-s\fP] [\fB-v\fP]
279 .\"=====================================================================
282 @@ -2552,11 +2581,22 @@
283 accomplishes the same thing. This is but a simple example of RE usage,
284 and as such doesn't demonstrate or leverage their capabilities.
285 .\"=====================================================================
287 -It is possible to issue a \fBf.restart\fP via a UNIX signal, to ease
288 -debugging of \fBvtwm\fP resource files. To do this, send a SIGUSR1 to the
289 -\&\fBvtwm\fP process ID (written to \fI$HOME/vtwm.pid\fP).
290 -See \fBkill\fP(1) or \fBslay\fP(1).
291 +.SH "ASYNCHRONOUS EVENTS"
292 +It is possible to issue an
294 +via a Unix signal, to ease debugging of
301 +process ID (written to
302 +.IR $HOME/vtwm.pid ).
307 .\"=====================================================================
309 There are precious few safeguards against binding functions to objects
310 @@ -2565,65 +2605,59 @@
311 Double clicking very fast to get the constrained move function will sometimes
312 cause the window to move, even though the pointer is not moved.
314 -It is possible to "lose" windows in the virtual desktop by placing them
315 -in a large desktop area, then shrinking the desktop so as to remove them
316 -from view. They are still there, of course, but are unreachable until the
317 -desktop is grown sufficiently large again.
318 +It is possible to \(oqlose\(cq windows in the virtual desktop by placing
319 +them in a large desktop area, then shrinking the desktop so as to remove
321 +They are still there, of course, but are unreachable until the
323 -See the \fIBUGS\fP file in the distribution for others.
326 +file in the distribution for others.
327 .\"=====================================================================
330 -Searched for in the order shown:
333 -\&\fI$HOME/.vtwmrc.<screen number>\fP
334 -\&\fI$HOME/.vtwmrc\fP
335 -\&\fI$VTWMDIR/twm/system.vtwmrc\fP
336 -\&\fI$HOME/.twmrc.<screen number>\fP
337 -\&\fI$HOME/.twmrc\fP
338 -\&\fI$VTWMDIR/twm/system.twmrc\fP
341 +.IR $HOME/.vtwmrc. screen-number
345 +.I $VTWMETCMDIR/vtwm/system.vtwmrc
347 +.IR $HOME/.twmrc. screen-number
351 +.I $VTWMETCMDIR/twm/system.vtwmrc
354 +will search for and use as its configuration file.
355 +They are searched for in the order shown, and the first readable file
360 +contains the ID of the user's
362 +process; see the description of the
369 -\&\fI$HOME/vtwm.pid\fP
371 .\"=====================================================================
372 -.SH "ENVIRONMENT VARIABLES"
373 -.IP "\fBDISPLAY\fP" 8
374 -This variable is used to determine which X server to use. It is also set
375 -during \fBf.exec\fP so that programs come up on the proper screen.
380 +This variable is used to determine which X server to use.
381 +It is also set during
383 +so that programs come up on the proper screen.
386 This variable is used as the prefix for files that begin with a tilde and
387 -for locating the \fBvtwm\fP startup file.
391 .\"=====================================================================
398 -\&\fBre_format\fP(7) or \fBegrep\fP(1),
399 -\&\fBrplayd\fP(8) and \fBrplay.helpers\fP(5),
409 -.\"=====================================================================
411 -Portions copyright 1988 Evans & Sutherland Computer Corporation; portions
412 -copyright 1989 Hewlett-Packard Company and the Massachusetts Institute of
413 -Technology; portions copyright 2001 D. J. Hawkey Jr..
415 -See \fBX\fP(1) for a full statement of rights and permissions.
416 -.\"=====================================================================
417 -.SH AUTHORS AND CONTRIBUTORS
418 +.SH "AUTHORS AND CONTRIBUTORS"
419 Tom LaStrange, Solbourne Computer; Jim Fulton, MIT X Consortium;
420 Steve Pitschke, Stardent Computer; Keith Packard, MIT X Consortium;
421 Dave Payne, Apple Computer; Nick Williams <njw@athena.mit.edu>;
422 @@ -2665,4 +2699,44 @@
423 Tim Wiess <tim@zetaflops.net>,
425 Claude Lecommandeur, (ctwm), <lecom@sic.epfl.ch>
426 +.\"=====================================================================
428 +Copyright 1988 Evans & Sutherland Computer Corporation
430 +Copyright 1989 Massachusetts Institute of Technology
432 +Copyright 1990 Dave Edmondson
434 +Copyright 1990 Imperial College of Science, Technology & Medicine
436 +Copyright 1990, 1991 Groupe Bull
438 +Copyright 2001 David J. Hawkey Jr.
440 +See the copyright notices in the
442 +source distribution for copyright license statements.
443 +On Debian systems, these may also be found in the file
444 +.IR /usr/share/doc/vtwm/copyright .
445 +.\"=====================================================================
465 .\"==============================[The End]==============================
466 +.\" vim:set ai et sts=4 sw=4 tw=72: