memory stats in info panel

ChangeLog

@@ -12,6 +12,11 @@ Changes since version 0.62.0:
 - added option for f'n windoze cycling..
 - added --create-stdcmap and made std colormap creation off by default
 - updated get/setstyle to account for new options
+- fixed crash on restart bug
+- made GNOME wm hints take precedence over KDE.. KDE hint will only be read
+  if GNOME hints dont exist
+- updated kwm hint support (maximize hint)
+- added memory usage in info panel
 
 Changes since version 0.61.1:
 .............................

README

@@ -309,9 +309,15 @@ bug report.
 
 To make a usefull backtrace, you need a core file with debugging
 information produced by Window Maker when it crashes. It should 
-have been installed without stripping too. If you
+have been installed without stripping too. 
-get the dialog window telling you that wmaker crashed and asks you
+
-what to do, tell it to "Abort and leave a core file".
+To compile wmaker with debugging information:
+
+./configure
+make CFLAGS=-g
+
+If you get the dialog window telling you that wmaker crashed and 
+asks you what to do, tell it to "Abort and leave a core file".
 
 script
 cd src

WINGs/puzzle.c

@@ -128,7 +128,6 @@ void ResetGame(void)
 }
 
 
-
 void buttonClick(WMWidget *w, void *ptr)
 {
     char buffer[300];

WPrefs.app/po/Makefile.in

@@ -62,7 +62,6 @@ host_triplet = @host@
 AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
-DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
 DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@

WindowMaker/Defaults/WMWindowAttributes.in

@@ -5,6 +5,8 @@
   Dockit = {Icon = GNUstep3D.#extension#;};
   DockApp = {NoAppIcon = NO;};
   WMSoundServer = {Icon = sound.#extension#;};
+  panel.Panel = {NoAppIcon = YES;};
+  gmc.Gmc = {NoAppIcon = YES;};
   XTerm = {Icon = Terminal.#extension#;};
   NXTerm = {Icon = Terminal.#extension#;};
   ScilabGraphic0.Xscilab = {KeepInsideScreen=YES;};

configure.in

@@ -100,7 +100,7 @@ dnl not used anywhere
 dnl AC_FUNC_MEMCMP  
 AC_FUNC_VPRINTF
 AC_FUNC_ALLOCA
-AC_CHECK_FUNCS(gethostname select poll strerror strncasecmp setpgid atexit)
+AC_CHECK_FUNCS(gethostname select poll strerror strncasecmp setpgid atexit mallinfo)
 
 
 
@@ -153,7 +153,7 @@ dnl AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_TIME
 AC_CHECK_HEADERS(fcntl.h limits.h sys/ioctl.h sys/time.h sys/types.h\
-		libintl.h sys/select.h poll.h)
+		libintl.h sys/select.h poll.h malloc.h)
 
 
 

contrib/Makefile.in

@@ -62,7 +62,6 @@ host_triplet = @host@
 AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
-DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
 DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@

doc/Makefile.in

@@ -62,7 +62,6 @@ host_triplet = @host@
 AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
-DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
 DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@

po/Makefile.in

@@ -62,7 +62,6 @@ host_triplet = @host@
 AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
-DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
 DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@

src/dialog.c

@@ -36,6 +36,10 @@
 #include <dirent.h>
 #include <limits.h>
 
+#ifdef HAVE_MALLOC_H
+#include <malloc.h>
+#endif
+
 #include <signal.h>
 #ifdef __FreeBSD__
 #include <sys/signal.h>
@@ -1181,6 +1185,16 @@ wShowInfoPanel(WScreen *scr)
 	    (unsigned)scr->w_visual->visualid,
 	    visuals[scr->w_visual->class], scr->w_depth, version);
 
+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
+    {
+	struct mallinfo ma = mallinfo();
+	sprintf(buffer+strlen(buffer), 
+		"Total allocated memory: %i kB. Total memory in use: %i kB.\n",
+		(ma.arena+ma.hblkhd)/1024, (ma.uordblks+ma.hblkhd)/1024);
+	
+    }
+#endif
+    
     strcat(buffer, "Supported image formats: ");
     strl = RSupportedFileFormats();
     for (i=0; strl[i]!=NULL; i++) {

src/screen.c

@@ -724,7 +724,7 @@ wScreenInit(int screen_number)
 
     
     /* will only be accounted for in PseudoColor */
-    if (wPreferences.flags.createstdcmap) {
+    if (wPreferences.flags.create_stdcmap) {
 	rattr.standard_colormap_mode = RCreateStdColormap;
     } else {
 	rattr.standard_colormap_mode = RUseStdColormap;

test/Makefile.in

@@ -62,7 +62,6 @@ host_triplet = @host@
 AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
-DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
 DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@

util/Makefile.am

@@ -10,7 +10,8 @@ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
 EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c \
 		wkdemenu.pl
 
-INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
+INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
+	@HEADER_SEARCH_PATH@
 
 # X_EXTRA_LIBS is for libproplist in systems that need -lsocket
 liblist= @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@

util/Makefile.in

@@ -102,7 +102,7 @@ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
 EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c 		wkdemenu.pl
 
 
-INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib 	@HEADER_SEARCH_PATH@
+INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib 	@HEADER_SEARCH_PATH@
 
 
 # X_EXTRA_LIBS is for libproplist in systems that need -lsocket

util/wmsetbg.c

@@ -209,12 +209,12 @@ parseTexture(RContext *rc, char *text)
 	 case 'H':
 	    gtype = RHorizontalGradient;
 	    iwidth = scrWidth;
-	    iheight = 8;
+	    iheight = 32;
 	    break;
 	 case 'V':
 	 case 'v':
 	    gtype = RVerticalGradient;
-	    iwidth = 8;
+	    iwidth = 32;
 	    iheight = scrHeight;
 	    break;
 	 default:
@@ -302,12 +302,12 @@ parseTexture(RContext *rc, char *text)
 	 case 'H':
 	    gtype = RHorizontalGradient;
 	    iwidth = scrWidth;
-	    iheight = 8;
+	    iheight = 32;
 	    break;
 	 case 'V':
 	 case 'v':
 	    gtype = RVerticalGradient;
-	    iwidth = 8;
+	    iwidth = 32;
 	    iheight = scrHeight;
 	    break;
 	 default:

wmlib/Makefile.am

@@ -5,7 +5,7 @@ lib_LIBRARIES = libWMaker.a
 
 include_HEADERS = WMaker.h
 
-INCLUDES = @XCFLAGS@
+INCLUDES = $(DFLAGS) @XCFLAGS@
 
 libWMaker_a_SOURCES = 	\
 	menu.c 		\

wmlib/Makefile.in

@@ -62,7 +62,6 @@ host_triplet = @host@
 AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
-DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
 DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
@@ -100,7 +99,7 @@ lib_LIBRARIES = libWMaker.a
 
 include_HEADERS = WMaker.h
 
-INCLUDES = @DFLAGS@ @XCFLAGS@
+INCLUDES = $(DFLAGS) @XCFLAGS@
 
 libWMaker_a_SOURCES =  	menu.c 			app.c 			event.c 		command.c		app.h			menu.h	
 

wrlib/Makefile.am

@@ -57,7 +57,7 @@ x86_specific.o: x86_specific.c
 
 
 
-INCLUDES = @HEADER_SEARCH_PATH@
+INCLUDES = $(DFLAGS) @HEADER_SEARCH_PATH@
 
 LIBLIST = $(top_builddir)/wrlib/libwraster.la @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm
 

wrlib/convert.c

@@ -180,6 +180,7 @@ convertTrueColor_generic(RXImage *ximg, RImage *image,
     unsigned char *ptr = image->data;
     int channels = image->format == RRGBAFormat ? 4 : 3;
 
+
     /* convert and dither the image to XImage */
     for (y=0; y<image->height; y++) {
 	nerr[0] = 0;