X-Git-Url: https://git.distorted.org.uk/~mdw/xtoys/blobdiff_plain/642e1d683b654aa7115e2ed815940c1fd7da0206..f3b35b6bbd646fb0e676ef3d64c91b38ff9f9162:/xwait.c

diff --git a/xwait.c b/xwait.c
index 45bb426..06e0e5c 100644
--- a/xwait.c
+++ b/xwait.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: xwait.c,v 1.2 1998/11/18 21:25:06 mdw Exp $
+ * $Id: xwait.c,v 1.3 1998/11/21 22:30:27 mdw Exp $
  *
  * Wait until prodded by another X client
  *
@@ -29,6 +29,10 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: xwait.c,v $
+ * Revision 1.3  1998/11/21 22:30:27  mdw
+ * Support GNU-style long options throughout, and introduce proper help
+ * text to all programs.  Update manual pages to match.
+ *
  * Revision 1.2  1998/11/18 21:25:06  mdw
  * Reap dead children as they arrive.  The previous shell may have
  * carelessly left them behind.
@@ -52,6 +56,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
+#include "mdwopt.h"
+#include "quis.h"
 #include "xwait.h"
 
 /*----- Main code ---------------------------------------------------------*/
@@ -66,6 +72,16 @@ static void sigchld(int sig)
 
 /* --- @main@ --- */
 
+static void version(FILE *fp)
+{
+  fprintf(fp, "%s (xtoys version " VERSION ")\n", QUIS);
+}
+
+static void usage(FILE *fp)
+{
+  fprintf(fp, "Usage: %s [-f] [-d DISPLAY] [-a ATOM] [-m MSG]\n", QUIS);
+}
+
 int main(int argc, char *argv[])
 {
   char *display = 0;
@@ -82,11 +98,57 @@ int main(int argc, char *argv[])
 
   /* --- Parse options --- */
 
+  ego(argv[0]);
+
   for (;;) {
-    int i = getopt(argc, argv, "d:a:m:f");
+    static struct option opt[] = {
+      { "help", 	0,			0,	'h' },
+      { "usage", 	0,			0,	'u' },
+      { "version", 	0,			0,	'v' },
+      { "display", 	required_argument,	0,	'd' },
+      { "atom",		required_argument,	0,	'a' },
+      { "msg",		required_argument,	0,	'm' },
+      { "force",	0,			0,	'f' },
+      {	0,		0,			0,	0 }
+    };
+
+    int i = getopt_long(argc, argv, "d:a:m:f", opt, 0);
     if (i < 0)
       break;
     switch (i) {
+      case 'h':
+	version(stdout);
+	fputs("\n", stdout);
+	usage(stdout);
+	fputs(
+"\n"
+"Waits until signalled by `xtell' or `xshutdown'.  Specifically, waits\n"
+"until a property with name ATOM is written to the root window with\n"
+"contents MSG.\n"
+"\n"
+"Options:\n"
+"\n"
+"-h, --help		Display this help text\n"
+"-u, --usage		Display a short usage summary\n"
+"-v, --version		Display the program's version number\n"
+"\n"
+"-d, --display=DISPLAY	Choose X display to connect to\n"
+"-f, --force		Run even if this property is waited for by another\n"
+"			process\n"
+"-a, --atom=ATOM		Choose property name to listen for\n"
+"-m, --msg=MSG		Choose value of property to wait for\n",
+          stdout);
+	exit(0);
+	break;
+      case 'u':
+	usage(stdout);
+	exit(0);
+	break;
+      case 'v':
+	version(stdout);
+	exit(0);
+	break;
+	
       case 'd':
 	display = optarg;
 	break;
@@ -100,8 +162,7 @@ int main(int argc, char *argv[])
 	f |= f_force;
 	break;
       default:
-	fprintf(stderr,
-		"Usage: xwait [-f] [-d DISPLAY] [-a ATOM] [-m MSG]\n");
+	usage(stderr);
 	exit(EXIT_FAILURE);
 	break;
     }