===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c,v
retrieving revision 1.16
retrieving revision 1.21
diff -u -p -r1.16 -r1.21
--- OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c	2002/07/11 12:35:03	1.16
+++ OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c	2002/08/02 02:28:29	1.21
@@ -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.15 2002/07/11 03:34:34 takayama Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c,v 1.20 2002/07/30 03:54:36 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -72,6 +72,7 @@ XFontStruct *sffs;
 #endif
 
 struct canvas *canvas[MAXCANVAS];
+struct canvas *closed_canvas[MAXCANVAS];
 struct canvas *current_can;
 #endif /* __DARWIN__ */
 
@@ -81,7 +82,6 @@ struct canvas *current_can;
 #endif
 
 static char *dname;
-static int remotes;
 static int depth,scrn;
 
 extern JMP_BUF ox_env;
@@ -94,6 +94,7 @@ static struct PlotResources {
 	Pixel ForePixel,BackPixel,DashPixel;
 	char *ForeName,*BackName,*DashName;
 	Boolean Reverse;
+	Boolean UpsideDown;
 } PlotResources;
 
 #define forePixel PlotResources.ForePixel
@@ -103,6 +104,7 @@ static struct PlotResources {
 #define backName PlotResources.BackName
 #define dashName PlotResources.DashName
 #define reverse PlotResources.Reverse
+#define upsidedown PlotResources.UpsideDown
 
 Cursor create_cursor();
 
@@ -357,7 +359,12 @@ search_active_canvas()
 	return -1;
 }
 
-	 
+void popup_canvas(index)
+{
+	clear_pixmap(canvas[index]);
+	XtPopup(canvas[index]->shell,XtGrabNone);
+	copy_to_canvas(canvas[index]);
+}
 
 void destroy_canvas(w,can,calldata)
 Widget w;
@@ -365,11 +372,14 @@ struct canvas *can;
 XtPointer calldata;
 {
 	XtPopdown(can->shell); 
-	XtDestroyWidget(can->shell);
+/*	XtDestroyWidget(can->shell); */
 	XFlush(display);
 	if ( can == current_can ) {
 		reset_busy(can); current_can = 0;
 	}
+	if ( closed_canvas[can->index] )
+		XtDestroyWidget(closed_canvas[can->index]->shell);
+	closed_canvas[can->index] = can;
 	canvas[can->index] = 0;
 }
 
@@ -528,8 +538,7 @@ struct canvas *can;
 
 	width = can->width; height = can->height;
 
-	sprintf(buf,"%s : %d/%d", can->wname?can->wname:"Plot",
-		remotes,can->index);
+	sprintf(buf,"%s : %d", can->wname?can->wname:"Plot",can->index);
 	XtSetArg(arg[0],XtNiconName,buf);
 	can->shell =
 		XtCreatePopupShell("shell",topLevelShellWidgetClass,toplevel,arg,1);
@@ -639,6 +648,7 @@ struct canvas *can;
 }
 
 static XrmOptionDescRec options[] = {
+{"-upsidedown","*upsidedown",XrmoptionNoArg,"on"},
 {"-reverse","*reverse",XrmoptionNoArg,"on"},
 {"-fg","*foreground",XrmoptionSepArg,NULL},
 {"-bg","*background",XrmoptionSepArg,NULL},
@@ -647,6 +657,8 @@ static XrmOptionDescRec options[] = {
 #define offset(name) XtOffset(struct PlotResources *,name)
 
 static XtResource resources[] = {
+{"upsidedown","UpsideDown",XtRBoolean,sizeof(Boolean),
+	offset(UpsideDown),XtRBoolean,&upsidedown},
 {"reverse","Reverse",XtRBoolean,sizeof(Boolean),
 	offset(Reverse),XtRBoolean,&reverse},
 {"foreground","Foreground",XtRString,sizeof(char *),
@@ -1144,7 +1156,7 @@ static void generate_psfile(can,fp)
 	  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);
+	  generatePS_from_image(fp,image,can->width,can->height,color,colorSize,can,tableOfxcolorForPS,upsidedown);
 	}else{
 	  fprintf(stderr,"Cannot print on this system\n");
 	}
@@ -1179,7 +1191,7 @@ struct canvas *can;
 static struct sm_btree *sm_newNode(unsigned long v);
 static int sm_insert(struct sm_btree *node,unsigned long v);
 static int sm_count(struct sm_btree *rootp);
-#define MALLOC(a) GC_malloc(a)
+
 struct sm_btree {
   unsigned long p;
   struct sm_btree * left;