Document my Wysiwyg hook:  `reload on signal'

*** chimera/chimera.man.orig	Sat Apr 13 01:14:41 1996
--- chimera/chimera.man	Sun Feb 14 15:46:00 1999
***************
*** 6,11 ****
--- 6,13 ----
  
  .SH SYNOPSIS
  .B chimera
+ [\-s] [\-p]
+ .\" should later extend to allow ghostview syntax: [\-[no]reopen_sig] [\-[no]pid_report]
  .RI [ URL ]
  
  .SH DESCRIPTION
***************
*** 20,31 ****
--- 22,66 ----
  The usual Xt options like geometry can also be specified on the command
  line.
  
+ .SH OPTIONS
+ .IP "\fB-p (\fPclass\fB pidReport)\fP" 1i
+ .\" should later extend to allow ghostview syntax: .IP "\fBpid_report (\fPclass\fB PidReport)\fP" 1i
+ .\" added by Julian H. Stacey <jhs@
+ Prints the process number on startup.
+ Usually used with 
+ .\" \fBreopen_sig\fP.
+ \fB-s\fP.
+ The default value is ``false''.
+ .\"
+ .IP "\fB-s (\fPclass\fB reopenSig)\fP" 1i
+ .\" should later extend to allow ghostview syntax: .IP "\fBreopen_sig (\fPclass\fB ReopenSig)\fP" 1i
+ Accept SIGUSR1 as a signal requesting reload (& thus redisplay).
+ Usually used with 
+ .\" \fBpid_report\fP.
+ \fB-p\fP.
+ The default value is ``false''.
+ .br
+ These hooks 
+ .\" \fBpid_report\fP 
+ \fB-p\fP 
+ & 
+ .\" \fBreopen_sig\fP
+ \fB-s\fP
+ were added to work with \fBvi -C\fP.
+ All three together when used correctly, allow for example:
+ a vi edit xterm of a source to be run
+ alonside a chimera display, so that every time the vi file is written,
+ the html file is [regenerated from master sources if appropriate , &] redisplayed automatically.
+ 
  .SH RESOURCES
  The following resources are Chimera specific resources:
  
  .IP "\fBhomeURL\fP"
  This string is used to specify the URL for the page displayed by default
  when chimera is first started.  The default is defined at compile time.
+ 
+ .IP "\fBreopenSig\fP"
+ .IP "\fBpidReport\fP"
  
  .SH "SEE ALSO"
  lynx(1), Mosaic(1), netscape(1)


*** chimera/main.c.orig	Mon Sep 29 03:33:24 1997
--- chimera/main.c	Sun Feb 14 16:04:24 1999
***************
*** 59,64 ****
--- 59,67 ----
  int argc;
  char **argv;
  {
+   extern int optind;
+   int ch ;
+ 
    char base_url[255];
  
    signal(SIGINT, sigigh_handler);
***************
*** 67,72 ****
--- 70,105 ----
    signal(SIGTERM, sigigh_handler);
    signal(SIGPIPE, SIG_IGN);
  
+   while ((ch = getopt(argc, argv, "sp")) != EOF)
+     switch(ch) 
+       {
+       case 's':	/* should extend this to accept --[no]reopen_sig 
+ 			as in ghostview */
+         /* reload on SIGUSR1 */
+         /* JJLATER root.reopenSig = True ; */
+         break;
+       case 'p': /* should extend this to accept --[no]pid_report 
+ 			as in ghostview */
+         /* print process number */
+         /* JJLATER root.pidReport = True ; */
+         break;
+       case '?':
+       default:
+         /* usage(); */
+         exit(-1);
+         break;
+       }
+   /* optind starts at 1, thus with chimera -s -p fred.html, optind=3 */
+   argc -= (optind -1) ;
+   *(argv + (optind -1)) = *argv  ; /* copy "chimera" for display above window */
+   argv += (optind -1) ;
+ 
+   /* Ignore any unexpectedly early SIGUSR1, though as we've not reported
+    * our process id yet, it'll be hard for someone to find, except with
+    * ps(1). 
+    */
+   /* if JJLATER (root.reopenSig) signal(SIGUSR1,SIG_IGN); */
+ 
    StartReaper();
  
    globalcres = ResourcesCreate(argc, argv);
## next bit fails to apply to 4.4
## ***************
## *** 82,87 ****
## --- 115,200 ----
##     if (argc > 1) HeadCreate(globalcres,
##   			   RequestCreate(globalcres, argv[1], base_url), NULL);
##     else HeadCreate(globalcres, NULL, NULL);
## + 
## + #if 0
## + # This jhs patch from chimera 1 is not yet ported to chimera-2
## + #	====================
## + #	***************
## + #	*** 193,198 ****
## + #	  	offset(openButtonShortcut), XtRImmediate, (XtPointer)True },
## + #	    { "localIndexFiles", "LocalIndexFiles", XtRString, sizeof(char *),
## + #	  	offset(localIndexFiles), XtRString, (XtPointer)"index.html" },
## + #	  };
## + #	  
## + #	  static XtActionsRec actionsList[] =
## + #	--- 193,202 ----
## + #	  	offset(openButtonShortcut), XtRImmediate, (XtPointer)True },
## + #	    { "localIndexFiles", "LocalIndexFiles", XtRString, sizeof(char *),
## + #	  	offset(localIndexFiles), XtRString, (XtPointer)"index.html" },
## + #	+   { "reopenSig", XtCBoolean, XtRBoolean, sizeof(Boolean),
## + #	+ 	offset(reopenSig), XtRImmediate, (XtPointer)False },
## + #	+   { "pidReport", XtCBoolean, XtRBoolean, sizeof(Boolean),
## + #	+ 	offset(pidReport), XtRImmediate, (XtPointer)False },
## + #	  };
## + #	  
## + #	  static XtActionsRec actionsList[] =
## + #	***************
## + #	*** 252,262 ****
## + #	    signal(SIGALRM, SIG_IGN);	/* changed when necessary in src/net.c */
## + #	    signal(SIGPIPE, SIG_IGN);
## + #	  
## + #	    StartReaper();
## + #	  
## + #	    root.toplevel = XtAppInitialize(&(root.appcon), "Chimera", NULL, 0,
## + #	  				  &argc, argv, fallback_resources, NULL, 0);
## + #	    if (root.toplevel == 0) exit(1);
## + #	  
## + #	    /*
## + #	     * Grab up the resources.
## + #	--- 258,328 ----
## + #	    signal(SIGALRM, SIG_IGN);	/* changed when necessary in src/net.c */
## + #	    signal(SIGPIPE, SIG_IGN);
## + #	  
## + #	    StartReaper();
## + #	  
## + #	    root.toplevel = XtAppInitialize(&(root.appcon), "Chimera", NULL, 0,
## + #	  				  &argc, argv, fallback_resources, NULL, 0);
## + #	    if (root.toplevel == 0) exit(1);
## + #	+ 
## + #	+ /* I would like to do the following
## + #	+  *		if (root.reopenSig == True) and 
## + #	+  *		if (root.pidReport == True)
## + #	+  *       much later, in case there is some more 
## + #	+  *       initialising that chimera wants to do, but using xxgdb I 
## + #	+  *       determined that the call to XtGetApplicationResources zeroes 
## + #	+  *		root.reopenSig and root.pidReport
## + #	+  */
## + #	+   if (root.reopenSig == True)
## + #	+     {
## + #	+     signal(SIGUSR1,ReloadAction) ;
## + #	+     /* Set signal handling  before printing process number, so no one
## + #	+      * can send a an unexpectd SIGUSR1 that would kill us.
## + #	+      * I put off accepting first signal while ghostview is presumably
## + #	+      * initialising stuff that maybe needed for the resize function
## + #	+      * (that I never wrote, merely grabbed shared use of).
## + #	+      # I also presume there's not much advantage to accepting
## + #	+      * a SIGUSR1 reopen till now.
## + #	+      */
## + #	+     }
## + #	+   if (root.pidReport == True)
## + #	+     {
## + #	+     printf("%d\n",(int)(getpid()));
## + #	+     /* Before I added the flush, when I called this from a makefile,
## + #	+      * with a vi process about to start, (needing the signal number)
## + #	+      the pid was printed too late.
## + #	+      */
## + #	+     fflush(stdout);
## + #	+     }
## + #	  
## + #	    /*
## + #	     * Grab up the resources.
## + #	====================
## + #endif
  
    /*
     * And away we go...
# does not apply to 4.1.1-RELEASE
# *** src/widget.h.orig	Fri Apr 18 13:18:38 1997
# --- src/widget.h	Fri Oct  2 00:13:07 1998
# ***************
# *** 68,73 ****
# --- 68,75 ----
#     Boolean cacheIgnoreExpires;
#     Boolean openButtonShortcut; /* enable foo.com -> http://foo.com/ shortcut */
#     char *localIndexFiles; /* look for index.html etc. in local directories */
# +   Boolean reopenSig;
# +   Boolean pidReport;
#   
#     /*
#      * Private data

#==============================
#  Below is appended the old equivalent for chimera-1.65
# 
# *** src/chimera.man.orig	Sun Jun 18 12:41:48 1995
# --- src/chimera.man	Sun Jun 18 16:14:09 1995
# ***************
# *** 6,11 ****
# --- 6,13 ----
#   
#   .SH SYNOPSIS
#   .B chimera
# + [\-s] [\-p]
# + .\" should later extend to allow ghostview syntax: [\-[no]reopen_sig] [\-[no]pid_report]
#   .RI [ URL ]
#   
#   .SH DESCRIPTION
# ***************
# *** 22,27 ****
# --- 24,59 ----
#   The usual Xt options like geometry can also be specified on the command
#   line.
#   
# + .SH OPTIONS
# + .IP "\fB-p (\fPclass\fB pidReport)\fP" 1i
# + .\" should later extend to allow ghostview syntax: .IP "\fBpid_report (\fPclass\fB PidReport)\fP" 1i
# + .\" added by Julian H. Stacey <jhs@
# + Prints the process number on startup.
# + Usually used with 
# + .\" \fBreopen_sig\fP.
# + \fB-s\fP.
# + The default value is ``false''.
# + .\"
# + .IP "\fB-s (\fPclass\fB reopenSig)\fP" 1i
# + .\" should later extend to allow ghostview syntax: .IP "\fBreopen_sig (\fPclass\fB ReopenSig)\fP" 1i
# + Accept SIGUSR1 as a signal requesting reload (& thus redisplay).
# + Usually used with 
# + .\" \fBpid_report\fP.
# + \fB-p\fP.
# + The default value is ``false''.
# + .br
# + These hooks 
# + .\" \fBpid_report\fP 
# + \fB-p\fP 
# + & 
# + .\" \fBreopen_sig\fP
# + \fB-s\fP
# + were added to work with \fBvi -C\fP.
# + All three together when used correctly, allow for example:
# + a vi edit xterm of a source to be run
# + alonside a chimera display, so that every time the vi file is written,
# + the html file is [regenerated from master sources if appropriate , &] redisplayed automatically.
# + 
#   .SH RESOURCES
#   The following resources are Chimera specific resources:
#   
# ***************
# *** 41,46 ****
# --- 73,82 ----
#   .IP "\fBprotocolFiles\fP"
#   
#   .IP "\fBmailCapFiles\fP"
# + 
# + .IP "\fBreopenSig\fP"
# + 
# + .IP "\fBpidReport\fP"
#   
#   .SH "SEE ALSO"
#   lynx(1), Mosaic(1)
# *** src/main.c.orig	Sat Apr  1 03:45:19 1995
# --- src/main.c	Wed Jun 21 09:48:16 1995
# ***************
# *** 183,188 ****
# --- 183,192 ----
#   	offset(cacheIgnoreExpires), XtRImmediate, (XtPointer)False },
#     { "gammaCorrect", "GammaCorrect", XtRFloat, sizeof(float),
#   	offset(gamma), XtRImmediate, (XtPointer)0 },
# +   { "reopenSig", XtCBoolean, XtRBoolean, sizeof(Boolean),
# + 	offset(reopenSig), XtRImmediate, (XtPointer)False },
# +   { "pidReport", XtCBoolean, XtRBoolean, sizeof(Boolean),
# + 	offset(pidReport), XtRImmediate, (XtPointer)False },
#   };
#   
#   static XtActionsRec actionsList[] =
# ***************
# *** 225,230 ****
# --- 229,236 ----
#     char path[MAXPATHLEN + 1];
#     char *cwd;
#     Atom delete;
# +   int ch ;
# +   extern int optind;
#   
#   #ifdef SOCKS
#     SOCKSinit(argv[0]);
# ***************
# *** 241,251 ****
# --- 247,317 ----
#     signal(SIGTERM, sigigh_handler);
#     signal(SIGPIPE, SIG_IGN);
#   
# +   while ((ch = getopt(argc, argv, "sp")) != EOF)
# +     switch(ch) 
# +       {
# +       case 's':	/* should extend this to accept --[no]reopen_sig 
# + 			as in ghostview */
# +         /* reload on SIGUSR1 */
# +         root.reopenSig = True ;
# +         break;
# +       case 'p': /* should extend this to accept --[no]pid_report 
# + 			as in ghostview */
# +         /* print process number */
# +         root.pidReport = True ;
# +         break;
# +       case '?':
# +       default:
# +         /* usage(); */
# +         exit(-1);
# +         break;
# +       }
# +   /* optind starts at 1, thus with chmimera -s -p fred.html optind=3 */
# +   argc -= (optind -1) ;
# +   *(argv + (optind -1)) = *argv  ; /* copy "chimera" for display above window */
# +   argv += (optind -1) ;
# + 
# +   /* Ignore any unexpectedly early SIGUSR1, though as we've not reported
# +    * our process id yet, it'll be hard for someone to find, except with
# +    * ps(1). 
# +    */
# +   if (root.reopenSig) signal(SIGUSR1,SIG_IGN);
# + 
#     StartReaper();
#   
#     root.toplevel = XtAppInitialize(&(root.appcon), "Chimera", NULL, 0,
#   				  &argc, argv, fallback_resources, NULL, 0);
#     if (root.toplevel == 0) exit(1);
# + 
# + /* I would like to do the following
# +  *		if (root.reopenSig == True) and 
# +  *		if (root.pidReport == True)
# +  *       much later, in case there is some more 
# +  *       initialising that chimera wants to do, but using xxgdb I 
# +  *       determined that the call to XtGetApplicationResources zeroes 
# +  *		root.reopenSig and root.pidReport
# +  */
# +   if (root.reopenSig == True)
# +     {
# +     signal(SIGUSR1,ReloadAction) ;
# +     /* Set signal handling  before printing process number, so no one
# +      * can send a an unexpectd SIGUSR1 that would kill us.
# +      * I put off accepting first signal while ghostview is presumably
# +      * initialising stuff that maybe needed for the resize function
# +      * (that I never wrote, merely grabbed shared use of).
# +      # I also presume there's not much advantage to accepting
# +      * a SIGUSR1 reopen till now.
# +      */
# +     }
# +   if (root.pidReport == True)
# +     {
# +     printf("%d\n",(int)(getpid()));
# +     /* Before I added the flush, when I called this from a makefile,
# +      * with a vi process about to start, (needing the signal number)
# +      the pid was printed too late.
# +      */
# +     fflush(stdout);
# +     }
#   
#     /*
#      * Grab up the resources.
# *** src/widget.h.orig	Sun Jun 18 14:00:11 1995
# --- src/widget.h	Sun Jun 18 14:02:00 1995
# ***************
# *** 65,70 ****
# --- 65,72 ----
#     float gamma;
#     int maxColors; /* maximum colors per inline image */
#     Boolean cacheIgnoreExpires;
# +   Boolean reopenSig;
# +   Boolean pidReport;
#   
#     /*
#      * Private data