2001-09-14  Gergely Nagy  <address@hidden>

	* src/actions.c (cmd_startup_message): new command
	* src/actions.h: prototype for it
	* src/main.c (init_defaults): init defaults.startup_message to 1
	(main): only display welcome message if startup_message is true
	* src/data.h: added startup_message to rp_defaults

diff -ur ratpoison.unsetenv/src/actions.c ratpoison/src/actions.c
--- ratpoison.unsetenv/src/actions.c	Fri Sep 14 11:15:15 2001
+++ ratpoison/src/actions.c	Fri Sep 14 11:12:47 2001
@@ -69,6 +69,7 @@
     {"unsetenv",	cmd_unsetenv,	arg_STRING},
     {"link",		cmd_link,	arg_STRING},
     {"chdir",		cmd_chdir,	arg_STRING},
+    {"startup_message", cmd_startup_message, arg_STRING},
 
     /* Commands to set default behavior. */
     {"defbarloc",	cmd_defbarloc, 		arg_STRING},
@@ -1881,6 +1882,20 @@
   cmd = resolve_command_from_keydesc ((char *)data, 0);
   if (cmd)
     command (interactive, cmd);
+
+  return NULL;
+}
+
+char *
+cmd_startup_message (int interactive, void *data)
+{
+  char *state = (char *)data;
+
+  if (!strcmp (state, "on") || !strcmp (state, "1") ||
+      !strcmp (state, "true") )
+    defaults.startup_message = 1;
+  else
+    defaults.startup_message = 0;
 
   return NULL;
 }
diff -ur ratpoison.unsetenv/src/actions.h ratpoison/src/actions.h
--- ratpoison.unsetenv/src/actions.h	Fri Sep 14 11:15:15 2001
+++ ratpoison/src/actions.h	Fri Sep 14 11:13:37 2001
@@ -94,6 +94,7 @@
 char * cmd_unsetenv (int interactive, void *data);
 char * cmd_link (int interactive, void *data);
 char * cmd_chdir (int interactive, void *data);
+char * cmd_startup_message (int interactive, void *data);
 
 /* void cmd_xterm (void *data); */
 
diff -ur ratpoison.unsetenv/src/data.h ratpoison/src/data.h
--- ratpoison.unsetenv/src/data.h	Sun Sep  9 05:09:46 2001
+++ ratpoison/src/data.h	Fri Sep 14 11:10:03 2001
@@ -157,6 +157,8 @@
 
   /* Which name to use: wm_name, res_name, res_class. */
   int win_name;
+
+  int startup_message;
 };
 
 extern struct rp_defaults defaults;
diff -ur ratpoison.unsetenv/src/main.c ratpoison/src/main.c
--- ratpoison.unsetenv/src/main.c	Fri Sep 14 11:06:29 2001
+++ ratpoison/src/main.c	Fri Sep 14 11:10:51 2001
@@ -381,6 +381,7 @@
     }
 
   defaults.win_name = 0;
+  defaults.startup_message = 1;
 }
 
 int
@@ -517,7 +518,8 @@
   read_startup_files ();
 
   /* Indicate to the user that ratpoison has booted. */
-  show_welcome_message();
+  if (defaults.startup_message)
+    show_welcome_message();
 
   /* If no window has focus, give the key_window focus. */
   if (current_window() == NULL)