===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c	2007/01/30 00:28:26	1.28
+++ OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c	2007/01/30 03:25:52	1.29
@@ -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.27 2006/11/09 15:54:35 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c,v 1.28 2007/01/30 00:28:26 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -126,6 +126,8 @@ static struct PlotResources {
 #define reverse PlotResources.Reverse
 #define upsidedown PlotResources.UpsideDown
 
+Pixel BackPixel;
+
 Cursor create_cursor();
 
 #define blackPixel	BlackPixel(display,scrn)
@@ -559,6 +561,8 @@ struct canvas *can;
 	Arg arg[6];
 	char buf[BUFSIZ];
 
+	XImage *image;
+
 	width = can->width; height = can->height;
 
 	sprintf(buf,"%s : %d", can->wname?can->wname:"Plot",can->index);
@@ -657,6 +661,9 @@ struct canvas *can;
 	window = can->window = XtWindow(canvas);
 	pix = can->pix = XCreatePixmap(display,window,width,height,depth);
 	XFillRectangle(display,pix,clearGC,0,0,width,height);
+	image = XGetImage(display, can->pix, 0, 0, can->width, can->height,
+		-1, ZPixmap);
+	BackPixel = XGetPixel(image,0,0);
 	XDefineCursor(display,window,normalcur);
 	XFlush(display);
 	current_can = can;
@@ -958,220 +965,222 @@ static void print_canvas(w,can,calldata)
 	 struct canvas *can;
 	 XtPointer calldata;
 {
-  Widget fshell,fdialog;
-  extern struct canvas *Can;
-  extern Widget W;
-  Widget entry;
-  int i;
-  Arg arg[1];
+	Widget fshell,fdialog;
+	extern struct canvas *Can;
+	extern Widget W;
+	Widget entry;
+	int i;
+	Arg arg[1];
 
-  W = w;
-  Can = can;
-  create_popup(can->shell,"Print/Output PS file","",&fshell,&fdialog);
-  XawDialogAddButton(fdialog,"print",output_to_printer,w);
-  XawDialogAddButton(fdialog,"output PS file",print_canvas_to_file,w);
-  XawDialogAddButton(fdialog,"method",printing_method,w);
-  XawDialogAddButton(fdialog,"dismiss",cancel_output_to_file,w);
-  XtSetSensitive(w,False); XtPopup(fshell,XtGrabNone); 
-  SetWM_Proto(fshell);
+	W = w;
+	Can = can;
+	create_popup(can->shell,"Print/Output PS file","",&fshell,&fdialog);
+	XawDialogAddButton(fdialog,"print",output_to_printer,w);
+	XawDialogAddButton(fdialog,"output PS file",print_canvas_to_file,w);
+	XawDialogAddButton(fdialog,"method",printing_method,w);
+	XawDialogAddButton(fdialog,"dismiss",cancel_output_to_file,w);
+	XtSetSensitive(w,False); XtPopup(fshell,XtGrabNone); 
+	SetWM_Proto(fshell);
 }
 
-static void set_printing_method(Widget w,XtPointer number,XtPointer call_data) {
-  Widget shell;
-  extern int PrintingMethod;
-  PrintingMethod = (int) number;
-  fprintf(stderr,"PrintingMethod=%d\n",number);
-  shell = XtParent(XtParent(w));
-  XtPopdown(shell); XtDestroyWidget(shell);
+static void set_printing_method(Widget w,XtPointer number,XtPointer call_data)
+{
+	Widget shell;
+	extern int PrintingMethod;
+	PrintingMethod = (int) number;
+	fprintf(stderr,"PrintingMethod=%d\n",number);
+	shell = XtParent(XtParent(w));
+	XtPopdown(shell); XtDestroyWidget(shell);
 }
 
 static void printing_method(w,can,calldata)
-	 Widget w;
-	 struct canvas *can;
-	 XtPointer calldata;
+	Widget w;
+	struct canvas *can;
+	XtPointer calldata;
 {
-  Arg arg[10];
-  int i,n;
-  Widget fshell,fdialog;
-  extern struct canvas *Can;
-  extern int PrintingMethod;
+	Arg arg[10];
+	int i,n;
+	Widget fshell,fdialog;
+	extern struct canvas *Can;
+	extern int PrintingMethod;
 
-  w = W;
-  can = Can;
-  create_popup(can->shell,"Printing method",Printing_methods[PrintingMethod],
-			   &fshell,&fdialog);
-  n = 0;
-  XtSetArg(arg[n], XtNlabel, "Method: "); n++;
-  XtSetArg(arg[n], XtNvalue, Printing_methods[PrintingMethod]); n++;
-  XtSetValues(fdialog,arg,n);
-  for (i=0; i<N_printing_methods; i++) {
-	XawDialogAddButton(fdialog,Printing_methods[i],set_printing_method,(XtPointer) i);
-  }
-  XtSetSensitive(w,False); XtPopup(fshell,XtGrabNone);
-  SetWM_Proto(fshell);
+	w = W;
+	can = Can;
+	create_popup(can->shell,"Printing method",Printing_methods[PrintingMethod],
+			&fshell,&fdialog);
+	n = 0;
+	XtSetArg(arg[n], XtNlabel, "Method: "); n++;
+	XtSetArg(arg[n], XtNvalue, Printing_methods[PrintingMethod]); n++;
+	XtSetValues(fdialog,arg,n);
+	for (i=0; i<N_printing_methods; i++) {
+		XawDialogAddButton(
+			fdialog,Printing_methods[i],set_printing_method,(XtPointer) i);
+	}
+	XtSetSensitive(w,False); XtPopup(fshell,XtGrabNone);
+	SetWM_Proto(fshell);
 }
 static void print_canvas_to_file(w,can,calldata)
-	 Widget w;
-	 struct canvas *can;
-	 XtPointer calldata;
+	Widget w;
+	struct canvas *can;
+	XtPointer calldata;
 {
-  FILE *fp;
-  Arg arg[10];
-  int n;
-  static char *psfile = NULL;
-  Widget fshell,fdialog;
-  extern struct canvas *Can;
-  extern Widget PrintDialog;
-  extern char *Fname;
+	FILE *fp;
+	Arg arg[10];
+	int n;
+	static char *psfile = NULL;
+	Widget fshell,fdialog;
+	extern struct canvas *Can;
+	extern Widget PrintDialog;
+	extern char *Fname;
 
-  w = W;
-  can = Can;
-  if (psfile == NULL || Fname == NULL) psfile = "ox_plot.eps"; 
-  else psfile = Fname; 
-  create_popup(can->shell,"Output as PS file",psfile,&fshell,&fdialog);
-  n = 0;
-  XtSetArg(arg[n], XtNlabel, "File : "); n++;
-  XtSetArg(arg[n], XtNvalue, psfile); n++;
-  XtSetValues(fdialog,arg,n); 
-  XawDialogAddButton(fdialog,"output to file",output_to_file,w);
-  XawDialogAddButton(fdialog,"cancel",cancel_output_to_file,w);
-  PrintDialog = fdialog;
-  XtSetSensitive(w,False); XtPopup(fshell,XtGrabNone);
-  SetWM_Proto(fshell);
+	w = W;
+	can = Can;
+	if (psfile == NULL || Fname == NULL) psfile = "ox_plot.eps"; 
+	else psfile = Fname; 
+	create_popup(can->shell,"Output as PS file",psfile,&fshell,&fdialog);
+	n = 0;
+	XtSetArg(arg[n], XtNlabel, "File : "); n++;
+	XtSetArg(arg[n], XtNvalue, psfile); n++;
+	XtSetValues(fdialog,arg,n); 
+	XawDialogAddButton(fdialog,"output to file",output_to_file,w);
+	XawDialogAddButton(fdialog,"cancel",cancel_output_to_file,w);
+	PrintDialog = fdialog;
+	XtSetSensitive(w,False); XtPopup(fshell,XtGrabNone);
+	SetWM_Proto(fshell);
 }
 static void output_to_printer(w,can,calldata)
-	 Widget w;
-	 struct canvas *can;
-	 XtPointer calldata;
+	Widget w;
+	struct canvas *can;
+	XtPointer calldata;
 {
-  FILE *fp;
-  Arg arg[10];
-  int n;
-  static char *psfile = NULL;
-  Widget fshell,fdialog;
-  extern struct canvas *Can;
-  extern Widget PrintDialog_lp;
-  extern char *PrinterName;
+	FILE *fp;
+	Arg arg[10];
+	int n;
+	static char *psfile = NULL;
+	Widget fshell,fdialog;
+	extern struct canvas *Can;
+	extern Widget PrintDialog_lp;
+	extern char *PrinterName;
 
-  w = W;
-  can = Can;
-  if (psfile  == NULL || PrinterName == NULL) psfile = "lp";
-  else psfile = PrinterName;  
-  create_popup(can->shell,"Output PS file to printer",psfile,&fshell,&fdialog);
-  n = 0;
-  XtSetArg(arg[n], XtNlabel, "PS Printer Name : "); n++;
-  XtSetArg(arg[n], XtNvalue, psfile); n++;
-  XtSetValues(fdialog,arg,n); 
-  XawDialogAddButton(fdialog,"output to PS printer",output_to_ps_printer,w);
-  XawDialogAddButton(fdialog,"cancel",cancel_output_to_file,w);
-  PrintDialog_lp = fdialog;
-  XtSetSensitive(w,False); XtPopup(fshell,XtGrabNone);
-  SetWM_Proto(fshell);
+	w = W;
+	can = Can;
+	if (psfile  == NULL || PrinterName == NULL) psfile = "lp";
+	else psfile = PrinterName;  
+	create_popup(can->shell,"Output PS file to printer",psfile,&fshell,&fdialog);
+	n = 0;
+	XtSetArg(arg[n], XtNlabel, "PS Printer Name : "); n++;
+	XtSetArg(arg[n], XtNvalue, psfile); n++;
+	XtSetValues(fdialog,arg,n); 
+	XawDialogAddButton(fdialog,"output to PS printer",output_to_ps_printer,w);
+	XawDialogAddButton(fdialog,"cancel",cancel_output_to_file,w);
+	PrintDialog_lp = fdialog;
+	XtSetSensitive(w,False); XtPopup(fshell,XtGrabNone);
+	SetWM_Proto(fshell);
 }
 
-static void cancel_output_to_file(w,fbutton,call) 
-	 Widget w;
-	 XtPointer fbutton, call;
+static void cancel_output_to_file(w,fbutton,call)
+	Widget w;
+	XtPointer fbutton, call;
 {
-  Widget shell = XtParent(XtParent(w));
-  XtPopdown(shell); XtDestroyWidget(shell);
-  XtSetSensitive(fbutton,True);
+	Widget shell = XtParent(XtParent(w));
+	XtPopdown(shell); XtDestroyWidget(shell);
+	XtSetSensitive(fbutton,True);
 }
 
 static void output_to_file(w,fbutton,call) 
-	 Widget w;
-	 XtPointer fbutton, call;
+	Widget w;
+	XtPointer fbutton, call;
 {
-  char *fname;
-  FILE *fp;
-  int i;
-  char *m;
-  extern struct canvas *Can;
-  extern Widget PrintDialog;
-  extern int PrintingMethod;
-  Widget shell = XtParent(XtParent(w));
+	char *fname;
+	FILE *fp;
+	int i;
+	char *m;
+	extern struct canvas *Can;
+	extern Widget PrintDialog;
+	extern int PrintingMethod;
+	Widget shell = XtParent(XtParent(w));
 
-  if (PrintingMethod == PRINTING_METHOD_BITMAP) {
-  }else{
-	method_is_not_available();
-	XtPopdown(shell); XtDestroyWidget(shell);
-	XtSetSensitive(fbutton,True);
-	return;
-  }
+	if (PrintingMethod == PRINTING_METHOD_BITMAP) {
+		TODO;
+	}else{
+		method_is_not_available();
+		XtPopdown(shell); XtDestroyWidget(shell);
+		XtSetSensitive(fbutton,True);
+		return;
+	}
 
-  fname = XawDialogGetValueString(PrintDialog);
-  Fname = (char *)malloc(sizeof(char)*strlen(fname)+1);
-  strcpy(Fname,fname);
-  for (i=0; i<strlen(Fname); i++) {
-	if (Fname[i] == 0xd || Fname[i] == 0xa) {
-	  Fname[i] = 0; break;
+	fname = XawDialogGetValueString(PrintDialog);
+	Fname = (char *)malloc(sizeof(char)*strlen(fname)+1);
+	strcpy(Fname,fname);
+	for (i=0; i<strlen(Fname); i++) {
+		if (Fname[i] == 0xd || Fname[i] == 0xa) {
+			Fname[i] = 0; break;
+		}
 	}
-  }
-  fprintf(stderr,"fname=%s\n",Fname); fflush(NULL);
-  fp = fopen(Fname,"w");
-  if (fp == NULL) {
-	warning(Can,"Could not open the output file.");
-  }else{
-	generate_psfile(Can,fp);
-	fclose(fp);
-  }
+	fprintf(stderr,"fname=%s\n",Fname); fflush(NULL);
+	fp = fopen(Fname,"w");
+	if (fp == NULL) {
+		warning(Can,"Could not open the output file.");
+	}else{
+		generate_psfile(Can,fp);
+		fclose(fp);
+	}
 
-  XtPopdown(shell); XtDestroyWidget(shell);
-  XtSetSensitive(fbutton,True);
+	XtPopdown(shell); XtDestroyWidget(shell);
+	XtSetSensitive(fbutton,True);
 }
 
 static void output_to_ps_printer(w,fbutton,call) 
-	 Widget w;
-	 XtPointer fbutton, call;
+	Widget w;
+	XtPointer fbutton, call;
 {
-  char *printerName;
-  FILE *fp;
-  extern struct canvas *Can;
-  extern Widget PrintDialog_lp;
-  char fname[256];
-  char cmd[512];
-  static int id = 0;
-  int i;
-  Widget shell = XtParent(XtParent(w));
+	char *printerName;
+	FILE *fp;
+	extern struct canvas *Can;
+	extern Widget PrintDialog_lp;
+	char fname[256];
+	char cmd[512];
+	static int id = 0;
+	int i;
+	Widget shell = XtParent(XtParent(w));
 
-  if (PrintingMethod == PRINTING_METHOD_BITMAP) {
-  }else{
-	method_is_not_available();
-	XtPopdown(shell); XtDestroyWidget(shell);
-	XtSetSensitive(fbutton,True);
-	return;
-  }
+	if (PrintingMethod == PRINTING_METHOD_BITMAP) {
+	}else{
+		method_is_not_available();
+		XtPopdown(shell); XtDestroyWidget(shell);
+		XtSetSensitive(fbutton,True);
+		return;
+	}
 
-  sprintf(fname,"/tmp/ox_plot_%d.eps",(int) getpid(),id++);
+	sprintf(fname,"/tmp/ox_plot_%d.eps",(int) getpid(),id++);
 
-  printerName = XawDialogGetValueString(PrintDialog_lp);
-  PrinterName = (char *)malloc(sizeof(char)*strlen(printerName)+1);
-  strcpy(PrinterName,printerName);
-  for (i=0; i<strlen(PrinterName); i++) {
-	if (PrinterName[i] == 0xd || PrinterName[i] == 0xa) {
-	  PrinterName[i] = 0; break;
+	printerName = XawDialogGetValueString(PrintDialog_lp);
+	PrinterName = (char *)malloc(sizeof(char)*strlen(printerName)+1);
+	strcpy(PrinterName,printerName);
+	for (i=0; i<strlen(PrinterName); i++) {
+		if (PrinterName[i] == 0xd || PrinterName[i] == 0xa) {
+	  	PrinterName[i] = 0; break;
+		}
 	}
-  }
-  fprintf(stderr,"printerName=%s\n",PrinterName); fflush(NULL);
-  fp = fopen(fname,"w");
-  if (fp == NULL) {
-	warning(Can,"Could not open the output file.");
-  }else{
-	generate_psfile(Can,fp);
-	fclose(fp);
-  }
+	fprintf(stderr,"printerName=%s\n",PrinterName); fflush(NULL);
+	fp = fopen(fname,"w");
+	if (fp == NULL) {
+		warning(Can,"Could not open the output file.");
+	}else{
+		generate_psfile(Can,fp);
+		fclose(fp);
+	}
 
-  sprintf(cmd,"lpr -P%s %s",PrinterName,fname);
-  if (system(cmd)) {
-	warning(Can,"Unknown printer?");
-  }
-  sprintf(cmd,"rm -f %s",fname);
-  system(cmd);
-  XtPopdown(shell); XtDestroyWidget(shell);
-  XtSetSensitive(fbutton,True);
+	sprintf(cmd,"lpr -P%s %s",PrinterName,fname);
+	if (system(cmd)) {
+		warning(Can,"Unknown printer?");
+	}
+	sprintf(cmd,"rm -f %s",fname);
+	system(cmd);
+	XtPopdown(shell); XtDestroyWidget(shell);
+	XtSetSensitive(fbutton,True);
 }
 
-
 /* test sequence
    ox_launch(0,"ox_plot");
    ifplot(x^2-y^3);
@@ -1181,35 +1190,31 @@ static int getColorSizeOfImageForPS(int xsize,int ysiz
                                     struct xcolorForPS **tableOfxcolorForPS);
 
 static void generate_psfile(can,fp)
-	 struct canvas *can;
-	 FILE *fp;
+	struct canvas *can;
+	FILE *fp;
 {
-#if 0
-  int x,y;
-  XImage *image;
-  int color[1];
-  int colorSize = 1;
-  char *m;
-  struct xcolorForPS *tableOfxcolorForPS;
-  extern int PrintingMethod;
-  fprintf(stderr,"generate_psfile\n");
-  if (PrintingMethod == PRINTING_METHOD_BITMAP) {
-	if ( display ) {
-	  fprintf(stderr,"generate_psfile: output to a file.\n"); 
-	  image = XGetImage(display,can->pix,
+	int x,y;
+	XImage *image;
+	int color[1];
+	int colorSize = 1;
+	char *m;
+	struct xcolorForPS *tableOfxcolorForPS;
+	extern int PrintingMethod;
+	fprintf(stderr,"generate_psfile\n");
+	if (PrintingMethod == PRINTING_METHOD_BITMAP) {
+		if ( display ) {
+			fprintf(stderr,"generate_psfile: output to a file.\n"); 
+			image = XGetImage(display,can->pix,
 						0,0,can->width,can->height,-1,ZPixmap);
-	  colorSize =
-		getColorSizeOfImageForPS(can->width,can->height,image,&tableOfxcolorForPS);
-	  color[0] = 0; /* black line */
-	  generatePS_from_image(fp,image,can->width,can->height,color,colorSize,can,tableOfxcolorForPS,upsidedown);
+			color[0] = 0; /* black line */
+			PSFromImage(fp,image,can);
+		}else{
+		fprintf(stderr,"Cannot print on this system\n");
+		}
 	}else{
-	  fprintf(stderr,"Cannot print on this system\n");
+		method_is_not_available();
 	}
-  }else{
-	method_is_not_available();
-  }
-  fflush(NULL);
-#endif
+	fflush(NULL);
 }
 
 static void method_is_not_available() {
@@ -1375,4 +1380,3 @@ static int getColorSizeOfImageForPS(int xsize,int ysiz
   *tableOfxcolorForPS = table;
   return size;
 }
-