ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/px/x11image.c

Comparing ray/src/px/x11image.c (file contents):
Revision 2.28 by greg, Mon Jul 19 15:18:05 1993 UTC vs.
Revision 2.29 by greg, Wed Oct 27 13:03:18 1993 UTC

#	Line 21 | Line 21 | static char SCCSid[] = "$SunId$ LBL";
21
22		#include  "standard.h"
23
24	+	#include  <signal.h>
25		#include  <X11/Xlib.h>
26		#include  <X11/cursorfont.h>
27		#include  <X11/Xutil.h>
#	Line 71 | Line 72 | int  scale = 0;                                /* scalefactor; power of two */
72		int  xoff = 0;                          /* x image offset */
73		int  yoff = 0;                          /* y image offset */
74
75	+	int  parent = 0;                        /* number of children, -1 if child */
76	+
77		VIEW  ourview = STDVIEW;                /* image view parameters */
78		int  gotview = 0;                       /* got parameters from file */
79
#	Line 116 | Line 119 | extern long  ftell();
119		Display  *thedisplay;
120		Atom  closedownAtom, wmProtocolsAtom;
121
122	+	int  noop() {}
123
124	+
125		main(argc, argv)
126		int  argc;
127		char  *argv[];
#	Line 125 | Line 130 | char  *argv[];
130		char  *gv;
131		int  headline();
132		int  i;
133	+	int  pid;
134
135		progname = argv[0];
136		if ((gv = getenv("GAMMA")) != NULL)
#	Line 170 | Line 176 | char  *argv[];
176		else
177		break;
178
179	<	if (i == argc-1) {
179	>	if (i > argc)
180	>	goto userr;
181	>	while (i < argc-1) {
182	>	if ((pid=fork()) == 0) {        /* a child for each picture */
183	>	parent = -1;
184	>	break;
185	>	}
186	>	if (pid < 0)
187	>	quiterr("fork failed");
188	>	parent++;
189	>	signal(SIGCONT, noop);
190	>	pause();                /* wait for wake-up call */
191	>	i++;
192	>	}
193	>	if (i < argc) {                 /* open picture file */
194		fname = argv[i];
195		fin = fopen(fname, "r");
196		if (fin == NULL) {
197		sprintf(errmsg, "cannot open file \"%s\"", fname);
198		quiterr(errmsg);
199		}
200	<	} else if (i != argc)
181	<	goto userr;
200	>	}
201		/* get header */
202		getheader(fin, headline, NULL);
203		/* get picture dimensions */
#	Line 194 | Line 213 | char  *argv[];
213
214		init(argc, argv);                       /* get file and open window */
215
216	+	if (parent < 0)
217	+	kill(getppid(), SIGCONT);       /* signal parent if child */
218	+
219		for ( ; ; )
220		getevent();             /* main loop */
221		userr:
222		fprintf(stderr,
223	<	"Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e +/-stops] pic\n",
223	>	"Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e +/-stops] pic ..\n",
224		progname);
225		exit(1);
226		}
#	Line 328 | Line 350 | char **argv;
350		quiterr(err)            /* print message and exit */
351		char  *err;
352		{
353	<	if (err != NULL) {
354	<	fprintf(stderr, "%s: %s\n", progname, err);
355	<	exit(1);
353	>	if (err != NULL)
354	>	fprintf(stderr, "%s: %s: %s\n", progname,
355	>	fname==NULL?"<stdin>":fname, err);
356	>	if (wind) {
357	>	XDestroyWindow(thedisplay, wind);
358	>	XFlush(thedisplay);
359		}
360	<	exit(0);
360	>	while (parent > 0 && wait(0) != -1)     /* wait for any children */
361	>	parent--;
362	>	exit(err != NULL);
363		}
364
365
#	Line 536 | Line 563 | getevent()                             /* process the next event */
563		else
564		getbox(&xev.xbutton);
565		break;
566	<	case ClientMessage:
566	>	case ClientMessage:
567		if ((xev.xclient.message_type == wmProtocolsAtom) &&
568		(xev.xclient.data.l[0] == closedownAtom))
569		quiterr(NULL);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)