===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c,v
retrieving revision 1.24
retrieving revision 1.27
diff -u -p -r1.24 -r1.27
--- OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c	2004/03/01 05:48:24	1.24
+++ OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c	2006/11/09 15:54:35	1.27
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c,v 1.23 2004/03/01 01:23:37 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c,v 1.26 2005/07/03 13:11:28 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -56,6 +56,10 @@
 #include <X11/Xaw/Paned.h>
 
 static void Quit();
+static void print_canvas(Widget w, struct canvas *can, XtPointer calldata);
+static void output_to_printer(Widget w, struct canvas *can, XtPointer calldata);
+static void print_canvas_to_file(Widget w, struct canvas *can, XtPointer calldata);
+static void printing_method(Widget w, struct canvas *can, XtPointer calldata);
 
 static Atom wm_delete_window;
 
@@ -554,7 +558,6 @@ struct canvas *can;
 	int i,width,height;
 	Arg arg[6];
 	char buf[BUFSIZ];
-	static void print_canvas();
 
 	width = can->width; height = can->height;
 
@@ -840,8 +843,13 @@ copy_to_canvas(can)
 struct canvas *can;
 {
 	if ( display ) {
-		XCopyArea(display,can->pix,can->window,
-			drawGC,0,0,can->width,can->height,0,0);
+		if ( can->color ) {
+			set_drawcolor(can->color);
+			XCopyArea(display,can->pix,can->window,
+				cdrawGC,0,0,can->width,can->height,0,0);
+		} else
+			XCopyArea(display,can->pix,can->window,
+				drawGC,0,0,can->width,can->height,0,0);
 		pline(display,can,can->window);
 		XFlush(display);
 	}
@@ -956,9 +964,6 @@ static void print_canvas(w,can,calldata)
   Widget entry;
   int i;
   Arg arg[1];
-  static void output_to_printer();
-  static void print_canvas_to_file();
-  static void printing_method();
 
   W = w;
   Can = can;
@@ -1170,7 +1175,7 @@ static void output_to_ps_printer(w,fbutton,call) 
 /* test sequence
    ox_launch(0,"ox_plot");
    ifplot(x^2-y^3);
-   drawcircle(0,0,100,0,0);
+   drawcircle(0,0,100,0xff000,0);
    */
 static int getColorSizeOfImageForPS(int xsize,int ysize,XImage *image,
                                     struct xcolorForPS **tableOfxcolorForPS);