luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Modified the "plot svg" command to remove the window trimmings 

(scrollbar, title bar, etc.) from the output if the command is
called from the non-GUI-wrapper environment (where the border area
is part of the rendered output).  This was required due to an
unsolved bug in which calling magic to write SVG output from the
wrapper in some pathological case exposed a Tk bug that caused
the Tk grid manager to infinite loop, filling memory without
limit.
This commit is contained in:
Tim Edwards 2020-06-30 16:07:31 -04:00
parent 6812e7cd10
commit 52dadcff08
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.30
8.3.31

7
plot/plotCmd.c
View File

@ -98,6 +98,7 @@ CmdPlot(w, cmd)
int iwidth, scale;
#ifdef HAVE_LIBCAIRO
int flags;
extern void GrTCairoPlotSVG();
#endif
@ -271,7 +272,13 @@ CmdPlot(w, cmd)
cmdPlotOption[PLOTSVG]);
return;
}
flags = window->w_flags;
/* In case this is called from a non-GUI wrapper window, remove */
/* the window border widgets from the rendered display. */
window->w_flags &= ~(WIND_SCROLLABLE | WIND_SCROLLBARS | WIND_CAPTION
| WIND_BORDER);
GrTCairoPlotSVG(cmd->tx_argv[2], window);
window->w_flags = flags;
return;
#endif