diff options
| -rw-r--r-- | src/GsWidget.cxx | 16 | ||||
| -rw-r--r-- | src/flpsed.cxx | 17 |
2 files changed, 22 insertions, 11 deletions
diff --git a/src/GsWidget.cxx b/src/GsWidget.cxx index dc134d2..1bb2e53 100644 --- a/src/GsWidget.cxx +++ b/src/GsWidget.cxx @@ -238,15 +238,15 @@ int GsWidget::zoom(int p) { zoom_percent = p; kill_gs(); - - // Clear widget - fl_begin_offscreen(offscreen); - fl_color(FL_WHITE); - fl_rectf(0, 0, w(), h()); - fl_end_offscreen(); - redraw(); - + if (offscreen) { + // Clear widget with current size + fl_begin_offscreen(offscreen); + fl_color(FL_WHITE); + fl_rectf(0, 0, w(), h()); + fl_end_offscreen(); + redraw(); + fl_delete_offscreen(offscreen); offscreen = 0; } diff --git a/src/flpsed.cxx b/src/flpsed.cxx index f7014e8..b9f879f 100644 --- a/src/flpsed.cxx +++ b/src/flpsed.cxx @@ -356,11 +356,12 @@ Fl_Menu_Item size_menu[] = { void usage() { fprintf(stderr, - "usage: flpsed [-hbd] [-t <tag>=<value>] [<infile>] [<outfile>]\n" + "usage: flpsed [-hbdz] [-t <tag>=<value>] [<infile>] [<outfile>]\n" " -h print this message\n" " -b batch mode (no gui)\n" " -d dump tags and values from a document\n" " to stdout (this implies -b)\n" + " -z <zoom> set the zoom percentage (e.g. 200)\n" " -t <tag>=<value> set text to <value> where tag is <tag>\n" " <infile> optional input file; in batch mode if no\n" " input file is given, input is read from stdin\n" @@ -384,9 +385,10 @@ int main(int argc, char** argv) { struct {char *tag; char *value;} tv[TV_LEN]; int tv_idx = 0, my_argc; FILE *in_fp = NULL, *out_fp = NULL; + int zoom_val = 0; err = 0; - while ((c = getopt(argc, argv, "hdbt:g:d:f:i:s:")) != -1) { + while ((c = getopt(argc, argv, "hdbt:z:g:d:f:i:s:")) != -1) { switch (c) { case 'h': usage(); @@ -418,6 +420,9 @@ int main(int argc, char** argv) { } free(tmp); break; + case 'z': + zoom_val = atoi(optarg); + break; default: i = optind -1; n = Fl::arg(argc, argv, i); @@ -524,6 +529,7 @@ int main(int argc, char** argv) { psed_p = new PSEditor(0, 0, 700, 900); psed_p->property_changed_callback(property_changed_cb); scroll->end(); + fl_open_display(); Fl::add_handler(xev_handler); @@ -533,7 +539,12 @@ int main(int argc, char** argv) { win->end(); win->callback((Fl_Callback *)quit_cb); win->show(1, argv); - + + + if (zoom_val) { + psed_p->zoom(zoom_val); + } + if (in_fp) { sleep(1); // this seems to be necessary on fast systems to make the // GHOSTVIEW property available to ghostsscript. |