ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/x11.c
(Generate patch)

Comparing ray/src/rt/x11.c (file contents):
Revision 2.9 by greg, Thu Feb 11 16:33:10 1993 UTC vs.
Revision 2.12 by greg, Fri Jun 4 14:48:52 1993 UTC

# Line 11 | Line 11 | static char SCCSid[] = "$SunId$ LBL";
11   */
12  
13   #include  <stdio.h>
14 <
14 > #include  <math.h>
15   #include  <sys/ioctl.h>
16  
17   #include  <X11/Xlib.h>
# Line 78 | Line 78 | static struct driver  x11_driver = {
78          x11_comout, x11_comin, x11_flush, 1.0
79   };
80  
81 + static int  getpixels(), xnewcolr(), freepixels(),
82 +                getevent(), getkey(), fixwindow();
83 + static unsigned long  true_pixel();
84  
85 +
86   struct driver *
87   x11_init(name, id)              /* initialize driver */
88   char  *name, *id;
# Line 239 | Line 243 | x11_paintr(col, xmin, ymin, xmax, ymax)                /* fill a rec
243   COLOR  col;
244   int  xmin, ymin, xmax, ymax;
245   {
242        extern int  xnewcolr();         /* pixel assignment routine */
243        extern unsigned long  true_pixel();
246          unsigned long  pixel;
247  
248          if (!mapped)
# Line 321 | Line 323 | int  *xp, *yp;
323          if (c_last > c_first)                   /* key pressed */
324                  return(x11_getc());
325                                                  /* button pressed */
326 <        if (levptr(XButtonPressedEvent)->button & Button1)
326 >        if (levptr(XButtonPressedEvent)->button == Button1)
327                  return(MB1);
328 <        if (levptr(XButtonPressedEvent)->button & Button2)
328 >        if (levptr(XButtonPressedEvent)->button == Button2)
329                  return(MB2);
330 <        if (levptr(XButtonPressedEvent)->button & Button3)
330 >        if (levptr(XButtonPressedEvent)->button == Button3)
331                  return(MB3);
330        if (levptr(XButtonPressedEvent)->button & (Button4|Button5))
331                return(MB1);
332          return(ABORT);
333   }
334  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines