=================================================================== RCS file: /home/cvs/OpenXM_contrib/pari-2.2/src/graph/Attic/Gnuplot.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- OpenXM_contrib/pari-2.2/src/graph/Attic/Gnuplot.h 2001/10/02 11:17:07 1.1 +++ OpenXM_contrib/pari-2.2/src/graph/Attic/Gnuplot.h 2002/09/11 07:26:57 1.2 @@ -1,4 +1,4 @@ -/* $Id: Gnuplot.h,v 1.1 2001/10/02 11:17:07 noro Exp $ +/* $Id: Gnuplot.h,v 1.2 2002/09/11 07:26:57 noro Exp $ Copyright (C) 2000 The PARI group. @@ -472,7 +472,15 @@ void myterm_table_not_loaded_v4i4d(int term_xmin, int # define list_terms (*my_term_ftablep->term_funcs[TTABLE_LIST]) # define plotsizes_scale (*my_term_ftablep->set_sizesp) # define plotsizes_scale_get (*my_term_ftablep->get_sizesp) + +#ifdef USE_SET_FEEDBACK_RECTANGLE +/* If DLL has it, but was compiled with older Gnuplot.h */ # define set_mouse_feedback_rectangle (*my_term_ftablep->mouse_feedback_func) +#else +# define set_mouse_feedback_rectangle(term_xmin, term_xmax, term_ymin, term_ymax, plot_xmin, plot_xmax, plot_ymin, plot_ymax) \ + ((my_term_ftablep->loaded & 2) ? \ + ((*my_term_ftablep->mouse_feedback_func)(term_xmin, term_xmax, term_ymin, term_ymax, plot_xmin, plot_xmax, plot_ymin, plot_ymax), 0) : 0) +#endif /* defined USE_SET_FEEDBACK_RECTANGLE */ # define scaled_xmax() ((int)termprop(xmax)*plotsizes_scale_get(0)) # define scaled_ymax() ((int)termprop(ymax)*plotsizes_scale_get(1)) @@ -533,6 +541,7 @@ set_term_ftable(struct t_ftable *p) extern struct t_ftable *get_term_ftable(); #else /* !DYNAMIC_PLOTTING */ +#define set_mouse_feedback_rectangle mys_mouse_feedback_rectangle extern struct termentry term_tbl[]; extern double min_array[], max_array[]; @@ -571,7 +580,8 @@ plotsizes_get(int flag) { return (flag ? ysize : xsize struct t_ftable my_term_ftable = { - 1, (FUNC_PTR)&change_term, &term_set_output, + 2, /* bit 2 means it has mys_mouse_feedback_rectangle */ + (FUNC_PTR)&change_term, &term_set_output, &plotsizes_scale, &plotsizes_get, {&term_start_plot, &term_end_plot, &term_start_multiplot, &term_end_multiplot, &term_init, &list_terms},