[Scsh-checkins] CVS: scx/c/xlib graphics.c,1.3,1.4

[David Frese <frese@users.sourceforge.net>]

Update of /cvsroot/scsh/scx/c/xlib
In directory usw-pr-cvs1:/tmp/cvs-serv16064

Modified Files:
        graphics.c 
Log Message:
new: event.c, and some changes.


Index: graphics.c
===================================================================
RCS file: /cvsroot/scsh/scx/c/xlib/graphics.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** graphics.c  2001/07/04 14:21:56     1.3
--- graphics.c  2001/07/09 13:39:15     1.4
***************
*** 2,10 ****
  #include "scheme48.h"
  
! 
  extern XDrawPoints(), XDrawLines(), XDrawRectangle(), XFillRectangle();
  extern XDrawRectangles(), XFillRectangles(), XDrawArc(), XFillArc();
  extern XDrawArcs(), XFillArcs(), XFillPolygon();
! 
  
  
--- 2,10 ----
  #include "scheme48.h"
  
! /*
  extern XDrawPoints(), XDrawLines(), XDrawRectangle(), XFillRectangle();
  extern XDrawRectangles(), XFillRectangles(), XDrawArc(), XFillArc();
  extern XDrawArcs(), XFillArcs(), XFillPolygon();
! */
  
  
***************
*** 96,100 ****
    int mode;
    Vector_To_XPoints(vec, p, n);
!   mode = !S48_EQ_P(relative, S48_FALSE) ? CoordModePrevious : CoordModeOrigin;
    XDrawPoints(EXTRACT_DISPLAY(Xdisplay), EXTRACT_DRAWABLE(Xdrawable),
              EXTRACT_GCONTEXT(Xgcontext), p, n, mode);
--- 96,100 ----
    int mode;
    Vector_To_XPoints(vec, p, n);
!   mode = !S48_FALSE_P(relative) ? CoordModePrevious : CoordModeOrigin;
    XDrawPoints(EXTRACT_DISPLAY(Xdisplay), EXTRACT_DRAWABLE(Xdrawable),
              EXTRACT_GCONTEXT(Xgcontext), p, n, mode);
***************
*** 118,126 ****
  s48_value Draw_Lines(s48_value Xdisplay, s48_value Xdrawalbe,
                     s48_value Xgcontext, s48_value vec, s48_value relative){
!   int n = S48_VECTOR_LENGHT(vec);
    XPoint p[n];
    int mode;
!   Vector_To_Points(vec, p, n);
!   mode = !S48_EQ_P(relative, S48_FALSE) ? CoordModePrevious : CoordModeOrigin;
    XDrawLines(EXTRACT_DISPLAY(Xdisplay), EXTRACT_DRAWABLE(Xdrawalbe),
             EXTRACT_GCONTEXT(Xgcontext), p, n, mode);
--- 118,126 ----
  s48_value Draw_Lines(s48_value Xdisplay, s48_value Xdrawalbe,
                     s48_value Xgcontext, s48_value vec, s48_value relative){
!   int n = S48_VECTOR_LENGTH(vec);
    XPoint p[n];
    int mode;
!   Vector_To_XPoints(vec, p, n);
!   mode = !S48_FALSE_P(relative) ? CoordModePrevious : CoordModeOrigin;
    XDrawLines(EXTRACT_DISPLAY(Xdisplay), EXTRACT_DRAWABLE(Xdrawalbe),
             EXTRACT_GCONTEXT(Xgcontext), p, n, mode);
***************
*** 205,209 ****
    int n = S48_VECTOR_LENGTH(vec);
    XRectangle p[n];
!   Vector_To_Rectangle(vec, p, n);
    XFillRectangles(EXTRACT_DISPLAY(Xdisplay), EXTRACT_DRAWABLE(Xdrawable),
                  EXTRACT_GCONTEXT(Xgcontext), p, n);
--- 205,209 ----
    int n = S48_VECTOR_LENGTH(vec);
    XRectangle p[n];
!   Vector_To_XRectangle(vec, p, n);
    XFillRectangles(EXTRACT_DISPLAY(Xdisplay), EXTRACT_DRAWABLE(Xdrawable),
                  EXTRACT_GCONTEXT(Xgcontext), p, n);
***************
*** 290,294 ****
    XPoint p[n];
    Vector_To_XPoints(vec, p, n);
!   mode = !S48_EQ_P(relative, S48_FALSE) ? CoordModePrevious : CoordModeOrigin;
    XFillPolygon(EXTRACT_DISPLAY(Xdisplay), EXTRACT_DRAWABLE(Xdrawable),
               EXTRACT_GCONTEXT(Xgcontext), p, n, sh, mode);
--- 290,294 ----
    XPoint p[n];
    Vector_To_XPoints(vec, p, n);
!   mode = !S48_FALSE_P(relative) ? CoordModePrevious : CoordModeOrigin;
    XFillPolygon(EXTRACT_DISPLAY(Xdisplay), EXTRACT_DRAWABLE(Xdrawable),
               EXTRACT_GCONTEXT(Xgcontext), p, n, sh, mode);