=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c,v retrieving revision 1.8 retrieving revision 1.11 diff -u -p -r1.8 -r1.11 --- OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c 2000/10/24 01:53:53 1.8 +++ OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c 2000/11/09 02:30:44 1.11 @@ -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.7 2000/10/15 10:58:11 takayama Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/plot/ox_plot_xevent.c,v 1.10 2000/11/09 01:51:12 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -149,7 +149,7 @@ XButtonEvent *ev; case Button1: e.x = ev->x; e.y = ev->y; draw_frame0(can->window,spos,e); - if ( !busy ) { + if ( !busy && can->mode != MODE_INTERACTIVE ) { if ( can->mode == MODE_PLOT ) plot_resize(can,spos,e); else @@ -704,12 +704,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 +728,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}; @@ -1120,4 +1134,11 @@ static void method_is_not_available() { strcat(m,Printing_methods[PrintingMethod]); strcat(m,MSG2); warning(Can,m); +} + +clear_pixmap(can) +struct canvas *can; +{ + XFillRectangle(display,can->pix,clearGC,0,0,can->width,can->height); + XFlush(display); }