X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-command.c;h=41613c7dcbcd2f05ecc4681f98d4f7c7df7be61a;hb=40eacb5812ef7c0e3374fb139afbb4f5bc8bbfb5;hp=684fd4e347af27042914b61806357d21fd7a9ebb;hpb=14627f4038ada5d11456f3770090f3c39740d70f;p=xscreensaver

diff --git a/driver/xscreensaver-command.c b/driver/xscreensaver-command.c
index 684fd4e3..41613c7d 100644
--- a/driver/xscreensaver-command.c
+++ b/driver/xscreensaver-command.c
@@ -1,5 +1,4 @@
-/* xscreensaver-command, Copyright (c) 1991-2000
- *  by Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver-command, Copyright (c) 1991-2003 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -16,6 +15,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <time.h>
 #include <sys/time.h>
 #include <sys/types.h>
 
@@ -52,7 +52,7 @@ static char *usage = "\n\
 usage: %s -<option>\n\
 \n\
   This program provides external control of a running xscreensaver process.\n\
-  Version %s, copyright (c) 1991-2000 Jamie Zawinski <jwz@jwz.org>.\n\
+  Version %s, copyright (c) 1991-2003 Jamie Zawinski <jwz@jwz.org>.\n\
 \n\
   The xscreensaver program is a daemon that runs in the background.\n\
   You control a running xscreensaver process by sending it messages\n\
@@ -147,8 +147,12 @@ main (int argc, char **argv)
   char *dpyname = 0;
   Atom *cmd = 0;
   long arg = 0L;
+  char *s;
 
   progname = argv[0];
+  s = strrchr (progname, '/');
+  if (s) progname = s+1;
+
   screensaver_version = (char *) malloc (5);
   memcpy (screensaver_version, screensaver_id + 17, 4);
   screensaver_version [4] = 0;
@@ -252,6 +256,15 @@ main (int argc, char **argv)
 
 
   if (!dpyname) dpyname = (char *) getenv ("DISPLAY");
+
+  if (!dpyname)
+    {
+      dpyname = ":0.0";
+      fprintf (stderr,
+               "%s: warning: $DISPLAY is not set: defaulting to \"%s\".\n",
+               progname, dpyname);
+    }
+
   dpy = XOpenDisplay (dpyname);
   if (!dpy)
     {
@@ -389,7 +402,7 @@ watch (Display *dpy)
               if (running && changed)
                 {
                   int i;
-                  fprintf (stdout, "RUN", s);
+                  fprintf (stdout, "RUN");
                   for (i = 2; i < nitems; i++)
                     fprintf (stdout, " %d", (int) data[i]);
                   fprintf (stdout, "\n");