ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/px/x11image.c
(Generate patch)

Comparing ray/src/px/x11image.c (file contents):
Revision 1.21 by greg, Fri May 3 12:01:44 1991 UTC vs.
Revision 1.22 by greg, Fri May 3 13:28:39 1991 UTC

# Line 81 | Line 81 | double  exposure = 1.0;                        /* exposure compensation use
81  
82   int  wrongformat = 0;                   /* input in another format? */
83  
84 – int  imready = 0;                       /* is image up? */
85 –
84   GC      revgc;                          /* graphics context with GXinvert */
85  
86   XRASTER *ourras;                        /* our stored image */
# Line 250 | Line 248 | init()                 /* get data and open window */
248          XSetFunction(thedisplay, revgc, GXinvert);
249          XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay,
250                          XC_diamond_cross));
251 +        XStoreName(thedisplay, wind, fname == NULL ? progname : fname);
252          if (geometry != NULL) {
253                  bzero((char *)&oursizhints, sizeof(oursizhints));
254                  i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y,
# Line 282 | Line 281 | init()                 /* get data and open window */
281                          |ButtonMotionMask|StructureNotifyMask
282                          |KeyPressMask|ExposureMask);
283          XMapWindow(thedisplay, wind);
285 –                                /* make sure the image is up */
286 –        do
287 –                getevent();
288 –        while (!imready);
289 –                                /* store name as ready signal */
290 –        XStoreName(thedisplay, wind, fname == NULL ? progname : fname);
284          return;
285   memerr:
286          quiterr("out of memory");
# Line 394 | Line 387 | getevent()                             /* process the next event */
387                  break;
388          case Expose:
389                  redraw(e.e.x, e.e.y, e.e.width, e.e.height);
397 –                imready++;
390                  break;
391          case ButtonPress:
392                  if (e.b.state & (ShiftMask|ControlMask))

Diff Legend

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