changes to fvwm that have not been included in 2.4.5 for unknown reasons

[Alexander Kotelnikov]

Hello


--- fvwm/read.c.orig	Tue Jan  8 02:47:05 2002
+++ fvwm/read.c	Tue Jan  8 02:52:40 2002
@@ -140,8 +140,15 @@
       tline[l - 1] = '\0';
 
     if (debugging)
+/* [EMAIL PROTECTED] 
+   tline is null  terminated anyway and contains no new-lines 
+ */
+/*
       fvwm_msg(DBG,"ReadSubFunc","Module switch %d, about to exec: '%.*s'",
 	       Module,strlen(tline)-1,tline);
+*/
+      fvwm_msg(DBG,"ReadSubFunc","Module switch %d, about to exec: '%s'",
+	       Module, tline);
 
     old_execute_function(tline, tmp_win, eventp, context, Module, 0, NULL);
     tline = fgets(line, (sizeof line) - 1, f);

or "have you ever run fvwm with -debug?"


--- fvwm/builtins.c.orig	Sun Jan 13 02:04:00 2002
+++ fvwm/builtins.c	Sun Jan 13 04:00:43 2002
@@ -782,6 +782,11 @@
   /* Not everyone has vfork! */
   if (!(fork())) /* child process */
   {
+    if ( setpgrp() == -1 )
+    {
+      fvwm_msg(ERR,"exec_function","setpgrp failed (%s)",strerror(errno));
+      exit(100);
+    }
     if (execl(exec_shell_name, exec_shell_name, "-c", cmd, NULL)==-1)
     {
       fvwm_msg(ERR,"exec_function","execl failed (%s)",strerror(errno));

And two more I've never wrote here:

--- libs/GetFont.c.orig	Tue Dec  5 18:22:40 2000
+++ libs/GetFont.c	Mon Jan 28 10:59:50 2002
@@ -59,38 +59,44 @@
   XFontSet fontset = NULL;
   char **ml;
   int mc;
+  int i;
   char *ds;
 
   if (fontname)
-    fontset = XCreateFontSet(disp,fontname,&ml,&mc,&ds);
-  if (!fontset && fontname)
-  {
-    fprintf(stderr,
+    if (!strcmp("fixed",fontname))
+      fontset = XCreateFontSet(disp,fontname,&ml,&mc,&ds);
+
+  else{
+     fprintf(stderr,
             "[FVWM][GetFontSetOrFixed]: "
-	    "WARNING -- can't get fontset %s, trying 'fixed'\n",
-            fontname);
+	    "WARNING -- fontname is a NULL-string\n");
   }
   if (!fontset)
   {
+    fprintf(stderr,
+            "[FVWM][GetFontSetOrFixed]: "
+	    "WARNING -- can't get fontset '%s', trying '-*-fixed-medium-r-normal-*-14-*-*-*-*-*-*-*'\n",
+            fontname);
     /* fixed should always be avail, so try that */
-#ifdef STRICTLY_FIXED
-    if ((fontset = XCreateFontSet(disp,"fixed",&ml,&mc,&ds))==NULL)
-    {
-      fprintf(stderr,
-	      "[FVWM][GetFontSetOrFixed]: "
-	      "ERROR -- can't get fontset 'fixed'\n");
-    }
-#else
-    /* Yes, you say it's not a *FIXED* font, but it helps you. */
     if ((fontset =
 	 XCreateFontSet(disp,
 			"-*-fixed-medium-r-normal-*-14-*-*-*-*-*-*-*",
 			&ml, &mc, &ds)) == NULL)
     {
       fprintf(stderr,"[FVWM][GetFontSetOrFixed]: "
-	      "ERROR -- can't get fontset 'fixed'\n");
+	      "ERROR -- can't get fontset '-*-fixed-medium-r-normal-*-14-*-*-*-*-*-*-*'\n");
+    }
+  }
+  if (fontset){
+    if (mc > 0) {
+      (void)fprintf(stderr, 
+		    "[FVWM][GetFontSetOrFixed][%s]:"
+		    "The following charsets are missing:\n", fontname);
+      for(i=0; i < mc; i++)
+	fprintf(stderr, " %s", ml[i]);
+      fprintf(stderr, "\n");
+      XFreeStringList(ml);
     }
-#endif
   }
 
   return fontset;

>From its manual page: "Clients should always call XSetLocaleModifiers
with a non-NULL modifier_list after setting the locale before they
call any locale-dependent Xlib routine.

And, please, add 
#! /usr/bin/perl
to utils/fvwm24_convert.in

Thanks for you attention,
-- 
Alexander Kotelnikov
Saint-Petersburg, Russia