--- CHANGELOG.orig Mon Feb 2 06:12:31 1998 +++ CHANGELOG Thu Feb 5 15:38:41 1998 @@ -7,6 +7,16 @@ ============ vtwm-5.4.N.tar.gz ============= hawkeyd@visi.com (D. J. Hawkey Jr. aka djhjr) + February 5, 1998 + [*akefile*] [events.c] [menus.c] [util.c] [version.c] + Applied patches submitted by Takeharu Kato + (magician@maekawa.is.uec.ac.jp) to fix a fault causing a + SIGSEGV in the info window, and the use of a depreciated + constant in the XPM library. Tweaks to accomodate these + made to the *akefile*s. + + vtwm-5.4.4-to-5.4.4a.txt patch file released. + February 2, 1998 VTWM 5.4.4 released for public consumption. @@ -41,7 +51,7 @@ [*akefile*] [add_window.c] [cursor.c] [desktop.c] [doors.c] [events.c] [gc.c] [icons.c] [list.c] [menus.c] [parse.c] [resize.c] - [twm.c] [util.c] [util.h] [screen.h] [gram.y] + [twm.c] [util.c] [util.h] [version.c] [screen.h] [gram.y] Rewrote most of the 3D border code, adding, among other things, drawing the top border segment when 3D borders are used with squeezed titles! Simplified the meaning of the SqueezeTitle --- Imakefile.orig Wed Jan 21 05:27:36 1998 +++ Imakefile Thu Feb 5 15:34:12 1998 @@ -18,6 +18,12 @@ XCOMM To omit platform and build info in the version window, uncomment this XCOMM #define NO_BUILD_INFO +XCOMM For those systems that have sys/select.h, uncomment this +XCOMM #define HAVE_SELECT_H + +XCOMM For those systems that have process.h, uncomment this +XCOMM #define HAVE_PROCESS_H + XCOMM For those systems that have TWM installed in locations other than XCOMM the "default" for the $(LIBDIR) macro, change this to match VTWMDIR = $(LIBDIR)/twm @@ -61,24 +67,39 @@ AllTarget(vtwm) -#ifdef NO_XPM_SUPPORT -SpecialObjectRule(icons.o,icons.c,'-DNO_XPM_SUPPORT') -SpecialObjectRule(util.o,util.c,'-DNO_XPM_SUPPORT') -#endif - + MENUS_DEFS = #ifdef NO_BUILD_INFO -XCOMM SpecialObjectRule(menus.o,menus.c,'-DNO_BUILD_INFO') + MENUS_DEFS += -DNO_BUILD_INFO #endif +#ifdef HAVE_PROCESS_H + MENUS_DEFS += -DHAVE_PROCESS_H +#endif +#if !HasPutenv + MENUS_DEFS += -DNO_PUTENV +#endif +SpecialObjectRule(menus.o,menus.c,$(MENUS_DEFS)) + UTIL_DEFS = +#ifdef NO_XPM_SUPPORT + UTIL_DEFS += -DNO_XPM_SUPPORT +#endif +#if !HasPutenv + UTIL_DEFS += -DNO_PUTENV +#endif +SpecialObjectRule(util.o,util.c,$(UTIL_DEFS)) + +#ifdef HAVE_SELECT_H +SpecialObjectRule(events.o,events.c,'-DHAVE_SELECT_H') +#endif + +#ifdef NO_XPM_SUPPORT +SpecialObjectRule(icons.o,icons.c,'-DNO_XPM_SUPPORT') +#endif + SpecialObjectRule(parse.o,parse.c,\ '-DSYSTEM_VTWMRC="'$(VTWMDIR)'/system.vtwmrc"' \ '-DSYSTEM_TWMRC="'$(VTWMDIR)'/system.twmrc"') -#if !HasPutenv -SpecialObjectRule(util.o,util.c,'-DNO_PUTENV') -SpecialObjectRule(menus.o,menus.c,'-DNO_PUTENV') -#endif - depend:: lex.c gram.c deftwmrc.c lastmake.c ComplexProgramTarget(vtwm) @@ -112,7 +133,7 @@ echo 'char *lastmake[] = {' >>lastmake.c echo ' "Platform: '`uname -s`' Version '`uname -v`' Release '`uname -r`'",' >>$@ echo ' "Build: '`date`'",' >>$@ - echo '};' >>$@ + echo ' "" };' >>$@ XCOMM Handy for developers to check the man page dw vtwm.dw: vtwm.man --- Makefile.QNX.orig Wed Jan 21 18:04:05 1998 +++ Makefile.QNX Thu Feb 5 15:08:03 1998 @@ -12,24 +12,26 @@ # To omit XPM image support for icons, uncomment this (version # 3.4h of the XPM library is the earliest supported I know of) -# #define NO_XPM_SUPPORT +#XPM_DEFINE = -DNO_XPM_SUPPORT +# and comment this +SYS_LIBRARIES = -lXpm # To omit platform and build info in the version window, uncomment this -# #define NO_BUILD_INFO +#INFO_DEFINE = -DNO_BUILD_INFO +# If your system has putenv(), comment this +PUTENV_DEFINE = -DNO_PUTENV + +# If your system doesn't have sys/select.h, comment this +SELECT_DEFINE = -DHAVE_SELECT_H + +# If your system doesn't have process.h, comment this +PROCESS_DEFINE = -DHAVE_PROCESS_H + # For those systems that have TWM installed in locations other than # the "default" for the $(LIBDIR) macro, change this to match VTWMDIR = $(LIBDIR)/twm -# If you don't have putenv() -# #define NO_PUTENV - -DEBUG_DEFS = -STD_DEFINES = -D__QNX__ -DMetroLink -DSTRINGS_ALIGNED -DNO_REGEX -DBOGUS_MB_MAX -EXTRA_DEFINES = -PROTO_DEFINES = -DEFINES = $(DEBUG_DEFS) - CDEBUGFLAGS = CCOPTIONS = -Otx -zp1 -mf -b -j -Wc,-s -N32k -w4 @@ -37,8 +39,6 @@ # ============= Start of less common editables ================== -# #define DEBUG - MV = mv RM = rm -f CC = cc @@ -74,19 +74,20 @@ EXTRA_LIBRARIES = -lXqnx -lsocket LDLIBS = $(LOCAL_LIBRARIES) $(EXTRA_LIBRARIES) $(SYS_LIBRARIES) -#ifndef NO_XPM_SUPPORT -SYS_LIBRARIES = -lXpm -#endif - INCLUDES = EXTRA_INCLUDES = STD_INCLUDES = ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(STD_INCLUDES) -ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(DEFINES) -CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -L$(USRLIBDIR) +STD_DEFINES = -D__QNX__ -DMetroLink -DSTRINGS_ALIGNED -DNO_REGEX -DBOGUS_MB_MAX +EXTRA_DEFINES = $(XPM_DEFINE) $(INFO_DEFINE) $(PUTENV_DEFINE) $(SELECT_DEFINE) $(PROCESS_DEFINE) +PROTO_DEFINES = +ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) + +CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) -L$(USRLIBDIR) + SRCS = gram.c lex.c deftwmrc.c add_window.c gc.c list.c twm.c \ parse.c menus.c events.c resize.c util.c version.c iconmgr.c \ cursor.c icons.c desktop.c doors.c lastmake.c @@ -150,7 +151,7 @@ echo 'char *lastmake[] = {' >>lastmake.c echo ' "Platform: '`uname -s`' Version '`uname -v`' Release '`uname -r`'",' >>$@ echo ' "Build: '`date`'",' >>$@ - echo '};' >>$@ + echo ' "" };' >>$@ # Handy for developers to check the man page dw vtwm.dw: vtwm.man --- events.c.orig Wed Jan 21 15:59:30 1998 +++ events.c Thu Feb 5 12:00:20 1998 @@ -50,8 +50,13 @@ #include "iconmgr.h" #include "version.h" #include "desktop.h" -#include /*RAISEDELAY*/ -#include /*RAISEDELAY*/ +/* Submitted by Takeharu Kato */ +#ifdef HAVE_SELECT_H +#include /* RAISEDELAY */ +#else +#include /* RAISEDELAY */ +#include /* RAISEDELAY */ +#endif extern void IconDown(); --- menus.c.orig Tue Feb 3 05:42:39 1998 +++ menus.c Thu Feb 5 14:08:47 1998 @@ -40,6 +40,11 @@ #endif #include #include +#ifdef HAVE_PROCESS_H +#include +#else +#include +#endif #include #include /* DSE */ #include "twm.h" @@ -3777,7 +3782,7 @@ static void Identify (t) TwmWindow *t; { - int i, j, n, twidth, width, height; + int i, n, twidth, width, height; int x, y; unsigned int wwidth, wheight, bw, depth; Window junk; @@ -3813,16 +3818,20 @@ Info[n++][0] = '\0'; } - /* djhjr - 9/19/96 */ #ifndef NO_BUILD_INFO else { i = 0; - do { - j = sprintf(Info[n++], "%s", lastmake[i++]); - } while (j); - Info[n][0] = '\0'; + + /* + * Was a 'do ... while()' that accessed unallocated memory. + * This and the change to Imakefile submitted by Takeharu Kato + */ + while (lastmake[i][0] != '\0') + (void) sprintf(Info[n++], "%s", lastmake[i++]); + + Info[n++][0] = '\0'; } #endif --- util.c.orig Wed Jan 21 18:24:20 1998 +++ util.c Thu Feb 5 06:58:58 1998 @@ -647,7 +647,8 @@ bigname = ExpandFilename (name); if (!bigname) return None; - attributes.valuemask = XpmReturnAllocPixels; + /* was 'XpmReturnAllocPixels' - Submitted by Takeharu Kato */ + attributes.valuemask = XpmReturnPixels; if( (ErrorStatus = XpmReadFileToPixmap(dpy, Scr->Root, bigname, &pixmap, &mask, &attributes)) != XpmSuccess){ pixmap = None; @@ -667,7 +668,8 @@ } (void) sprintf (bigname, "%s/%s", Scr->IconDirectory, name); - attributes.valuemask = XpmReturnAllocPixels; + /* was 'XpmReturnAllocPixels' - Submitted by Takeharu Kato */ + attributes.valuemask = XpmReturnPixels; ErrorStatus = XpmReadFileToPixmap(dpy, Scr->Root, bigname, &pixmap, &mask, &attributes); } --- version.c.orig Fri Jan 2 05:21:59 1998 +++ version.c Thu Feb 5 07:35:11 1998 @@ -40,5 +40,8 @@ /* djhjr - 1/1/98 char *Version = "Virtual Desktop TWM (VTWM) - R5 Release 5.4.3"; */ +/* djhjr - 2/5/98 char *Version = "Virtual Desktop TWM (VTWM) - X11R4-6 Release 5.4.4"; +*/ +char *Version = "Virtual Desktop TWM (VTWM) - X11R4-6 Release 5.4.4a"; --- vtwm.man.orig Wed Jan 28 07:34:26 1998 +++ vtwm.man Thu Feb 5 08:10:15 1998 @@ -13,7 +13,7 @@ .\" .if t .sp .5 .\" .. .\" .ta .3i .6i .9i 1.2i 1.5i 1.8i -.TH VTWM 1 "Release 5.4.4" "X11R4-6" +.TH VTWM 1 "Release 5.4.4a" "X11R4-6" .\"********************************************************************* .\" Important note: At the time 5.4.4 was released, this manual page .\" conformed to Sun's guidelines for manual page markup, passed @@ -2017,6 +2017,7 @@ Claude Lecommandeur, SPIL (ctwm code) ; Nelson H. F. Beebe (portability) ; Jason Gloudon (XPM icons) ; -Nicholas Jacobs (nicholas_jacobs@hotmail.com); +Nicholas Jacobs ; +Takeharu Kato ; D. J. Hawkey Jr. (3D; maint) .\"==============================[The End]==============================