=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c,v retrieving revision 1.10 retrieving revision 1.15 diff -u -p -r1.10 -r1.15 --- OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c 2000/11/09 01:51:12 1.10 +++ OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c 2002/07/11 03:34:34 1.15 @@ -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.9 2000/11/07 06:06:40 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c,v 1.14 2002/01/30 08:31:34 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -55,6 +55,26 @@ #include #include +/* XXX : these lines are in plotg.c, but ld says they are not defined */ +#if __DARWIN__ +int stream; + +DISPLAY *display; +CURSOR normalcur,runningcur,errorcur; + +#if defined(VISUAL) +POINT start_point, end_point; +SIZE cansize; +#else +Window rootwin; +GC drawGC,dashGC,hlGC,scaleGC,clearGC,xorGC,colorGC,cdrawGC; +XFontStruct *sffs; +#endif + +struct canvas *canvas[MAXCANVAS]; +struct canvas *current_can; +#endif /* __DARWIN__ */ + #ifdef ABS #undef ABS #define ABS(a) ((a)>0?(a):-(a)) @@ -64,7 +84,7 @@ static char *dname; static int remotes; static int depth,scrn; -extern jmp_buf ox_env; +extern JMP_BUF ox_env; static Widget toplevel; static XtAppContext app_con; @@ -643,7 +663,7 @@ static XtResource resources[] = { offset(DashPixel),XtRPixel,(XtPointer)&dashPixel}, }; -init_plot_display(argc,argv) +int init_plot_display(argc,argv) int argc; char **argv; { @@ -652,7 +672,9 @@ char **argv; unsigned int tmp; for ( ac = argc, av = argv; ac; ac--, av++ ) - if ( index(*av,':') ) + if ( !strcmp(*av,"nox") ) + return 0; + else if ( index(*av,':') ) dname = *av; XtToolkitInitialize(); app_con = XtCreateApplicationContext(); @@ -660,7 +682,7 @@ char **argv; options,XtNumber(options),&argc,argv); if ( !display ) { fprintf(stderr,"Can't open display\n"); - exit(1); + return 0; } toplevel = XtAppCreateShell(0,"Plot",applicationShellWidgetClass, display,0,0); @@ -681,6 +703,7 @@ char **argv; create_gc(); create_font(); create_cursors(); + return 1; } static char *scalefont = "*-8-80-*"; @@ -704,12 +727,14 @@ create_gc() { scaleGC = XCreateGC(display,rootwin,0,NULL); xorGC = XCreateGC(display,rootwin,0,NULL); colorGC = XCreateGC(display,rootwin,0,NULL); + cdrawGC = XCreateGC(display,rootwin,0,NULL); XCopyGC(display,DefaultGC(display,scrn),(1L<<(GCLastBit+1))-1,drawGC); XCopyGC(display,DefaultGC(display,scrn),(1L<<(GCLastBit+1))-1,dashGC); XCopyGC(display,DefaultGC(display,scrn),(1L<<(GCLastBit+1))-1,clearGC); XCopyGC(display,DefaultGC(display,scrn),(1L<<(GCLastBit+1))-1,scaleGC); XCopyGC(display,DefaultGC(display,scrn),(1L<<(GCLastBit+1))-1,xorGC); XCopyGC(display,DefaultGC(display,scrn),(1L<<(GCLastBit+1))-1,colorGC); + XCopyGC(display,DefaultGC(display,scrn),(1L<<(GCLastBit+1))-1,cdrawGC); XSetForeground(display,drawGC,forePixel); XSetForeground(display,scaleGC,forePixel); XSetForeground(display,clearGC,backPixel); @@ -726,6 +751,18 @@ create_gc() { XSetForeground(display,colorGC,color.pixel); } +set_drawcolor(c) +unsigned int c; +{ + XColor color = {0,0x0,0x0,0x0,DoRed|DoGreen|DoBlue,0}; + + color.red = (c&0xff0000)>>8; + color.green = (c&0xff00); + color.blue = (c&0xff)<<8; + XAllocColor(display,DefaultColormap(display,scrn),&color); + XSetForeground(display,cdrawGC,color.pixel); +} + create_cursors() { static XColor fg = {0, 0x0, 0x0, 0x0,DoRed|DoGreen|DoBlue,0}; static XColor bg = {0, 0xffff, 0xffff, 0xffff,DoRed|DoGreen|DoBlue,0}; @@ -1084,6 +1121,9 @@ static void output_to_ps_printer(w,fbutton,call) ifplot(x^2-y^3); drawcircle(0,0,100,0,0); */ +static int getColorSizeOfImageForPS(int xsize,int ysize,XImage *image, + struct xcolorForPS **tableOfxcolorForPS); + static void generate_psfile(can,fp) struct canvas *can; FILE *fp; @@ -1093,6 +1133,7 @@ static void generate_psfile(can,fp) int color[1]; int colorSize = 1; char *m; + struct xcolorForPS *tableOfxcolorForPS; extern int PrintingMethod; fprintf(stderr,"generate_psfile\n"); if (PrintingMethod == PRINTING_METHOD_BITMAP) { @@ -1100,8 +1141,10 @@ static void generate_psfile(can,fp) fprintf(stderr,"generate_psfile: output to a file.\n"); image = XGetImage(display,can->pix, 0,0,can->width,can->height,-1,ZPixmap); - color[0] = 0; /* balck line */ - generatePS_from_image(fp,image,can->width,can->height,color,colorSize,can); + 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); }else{ fprintf(stderr,"Cannot print on this system\n"); } @@ -1128,3 +1171,80 @@ struct canvas *can; XFillRectangle(display,can->pix,clearGC,0,0,can->width,can->height); XFlush(display); } + +/* + The following functions are used to generate color postscript file. +*/ +/* In order to count colorSize, binary tree (sm_btree) is used. */ +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; + struct sm_btree * right; +}; +static struct sm_btree *sm_newNode(unsigned long v) { + struct sm_btree * n; + n = (struct sm_btree *)MALLOC(sizeof(struct sm_btree)); + if (n == NULL) { fprintf(stderr,"No more memory.\n"); exit(10); } + n->p = v; + n->left = NULL; + n->right = NULL; + return n; +} +static int sm_insert(struct sm_btree *node,unsigned long v) +{ + if (node->p == v) return; + if (node->p > v) { + if (node->left == NULL) { + node->left = sm_newNode(v); + return; + } + sm_insert(node->left,v); + } + if (node->p < v) { + if (node->right == NULL) { + node->right = sm_newNode(v); + return; + } + sm_insert(node->right,v); + } +} +static int sm_count(struct sm_btree *rootp) +{ + if (rootp == NULL) return 0; + return (1+sm_count(rootp->left)+sm_count(rootp->right)); +} + +static int getColorSizeOfImageForPS(int xsize,int ysize,XImage *image, + struct xcolorForPS **tableOfxcolorForPS) +{ + int x,y; + int size; + struct sm_btree root; + struct xcolorForPS *table; + root.p = 0; + root.left = NULL; root.right=NULL; + /* get color size */ + for (x=0; x