X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Ffiginset.C;h=e39691c7d8349d694a374407e8916a30360e3428;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=58697d0dfc1fb24b008637a68b5225626e4d8f68;hpb=b3e20a15e74bc3a419ed6d01e49dccc11192b205;p=lyx.git diff --git a/src/insets/figinset.C b/src/insets/figinset.C index 58697d0dfc..e39691c7d8 100644 --- a/src/insets/figinset.C +++ b/src/insets/figinset.C @@ -2,8 +2,6 @@ * figinset.C - part of LyX project */ -extern long int background_pixels; - /* Rework of path-handling (Matthias 04.07.1996 ) * ------------------------------------------------ * figinsets keep an absolute path to the eps-file. @@ -30,6 +28,12 @@ extern long int background_pixels; #include +#include +#include +#include +#include +#include + #include #include #include @@ -38,16 +42,6 @@ extern long int background_pixels; #include #include #include -#include -#include -#include -#include -using std::ofstream; -using std::ifstream; -using std::queue; -using std::list; -using std::find; -using std::flush; #include "figinset.h" #include "lyx.h" @@ -64,22 +58,30 @@ using std::flush; #include "support/FileInfo.h" #include "support/lyxlib.h" #include "Painter.h" +#include "font.h" +#include "bufferview_funcs.h" +#include "ColorHandler.h" + +using std::ostream; +using std::istream; +using std::ofstream; +using std::ifstream; +using std::queue; +using std::list; +using std::vector; +using std::find; +using std::flush; +using std::endl; +#ifdef HAVE_SSTREAM +using std::ostringstream; +#endif extern BufferView * current_view; extern FL_OBJECT * figinset_canvas; extern char ** environ; // is this only redundtant on linux systems? Lgb. -extern void ProhibitInput(); -extern void AllowInput(); - static float const DEG2PI = 57.295779513; -static int const figallocchunk = 32; - -static int figinsref = 0; /* number of figures */ -static int figarrsize = 0; /* current max number of figures */ -static int bmpinsref = 0; /* number of bitmaps */ -static int bmparrsize = 0; /* current max number of bitmaps */ struct queue_element { float rx, ry; // resolution x and y @@ -89,8 +91,10 @@ struct queue_element { static int const MAXGS = 3; /* maximum 3 gs's at a time */ -static Figref ** figures; /* all the figures */ -static figdata ** bitmaps; /* all the bitmaps */ +typedef vector figures_type; +typedef vector bitmaps_type; +static figures_type figures; // all figures +static bitmaps_type bitmaps; // all bitmaps static queue gsqueue; // queue for ghostscripting @@ -109,10 +113,6 @@ static int gs_allcolors; // number of all colors static list pidwaitlist; // pid wait list -//extern Colormap color_map; - - - static GC createGC() { @@ -133,6 +133,7 @@ static GC local_gc_copy; +static void addpidwait(int pid) { // adds pid to pid wait list @@ -149,11 +150,27 @@ void addpidwait(int pid) } -extern "C" int GhostscriptMsg(FL_OBJECT *, Window, int, int, - XEvent * ev, void *) +static +string make_tmp(int pid) { - char tmp[128]; + return system_tempdir + "/~lyxgs" + tostr(pid) + ".ps"; +} + +static +void kill_gs(int pid, int sig) +{ + if (lyxerr.debugging()) + lyxerr << "Killing gs " << pid << endl; + lyx::kill(pid, sig); + unlink(make_tmp(pid).c_str()); +} + + +extern "C" // static +int GhostscriptMsg(FL_OBJECT *, Window, int, int, + XEvent * ev, void *) +{ XClientMessageEvent * e = reinterpret_cast(ev); if(lyxerr.debugging()) { @@ -163,10 +180,12 @@ extern "C" int GhostscriptMsg(FL_OBJECT *, Window, int, int, // just kill gs, that way it will work for sure // This loop looks like S**T so it probably is... - for (int i = 0; i < bmpinsref; ++i) - if ((long)bitmaps[i]->bitmap == (long)e->data.l[1]) { + for (bitmaps_type::iterator it = bitmaps.begin(); + it != bitmaps.end(); ++it) + if (static_cast((*it)->bitmap) == + static_cast(e->data.l[1])) { // found the one - figdata * p = bitmaps[i]; + figdata * p = (*it); p->gsdone = true; // first update p->bitmap, if necessary @@ -174,13 +193,12 @@ extern "C" int GhostscriptMsg(FL_OBJECT *, Window, int, int, && p->flags > (1|8) && gs_color && p->wid) { // query current colormap and re-render // the pixmap with proper colors - //XColor * cmap; XWindowAttributes wa; register XImage * im; int i; int y; int wid1; - int spc1 = gs_spc-1; + int spc1 = gs_spc - 1; int spc2 = gs_spc * gs_spc; int wid = p->wid; int forkstat; @@ -271,31 +289,13 @@ extern "C" int GhostscriptMsg(FL_OBJECT *, Window, int, int, } } noim: - if (lyxerr.debugging()) { - lyxerr << "Killing gs " - << p->gspid << endl; - } - lyx::kill(p->gspid, SIGHUP); - - sprintf(tmp, "%s/~lyxgs%d.ps", - system_tempdir.c_str(), - p->gspid); - unlink(tmp); + kill_gs(p->gspid, SIGHUP); if (forkstat == 0) { XCloseDisplay(tmpdisp); _exit(0); } } else { - if (lyxerr.debugging()) { - lyxerr << "Killing gs " - << p->gspid << endl; - } - lyx::kill(p->gspid, SIGHUP); - - sprintf(tmp, "%s/~lyxgs%d.ps", - system_tempdir.c_str(), - p->gspid); - unlink(tmp); + kill_gs(p->gspid, SIGHUP); } break; } @@ -384,13 +384,12 @@ void AllocGrays(int num) } +static void InitFigures() { - bmparrsize = figarrsize = figallocchunk; - typedef Figref * Figref_p; - figures = new Figref_p[figallocchunk]; - typedef figdata * figdata_p; - bitmaps = new figdata_p[figallocchunk]; + // if bitmaps and figures are not empty we will leak mem + figures.clear(); + bitmaps.clear(); unsigned int k; for (unsigned int i = 0; i < 256; ++i) { @@ -400,46 +399,50 @@ void InitFigures() bittable[i] = char(~k); } - fl_add_canvas_handler(figinset_canvas, ClientMessage, - GhostscriptMsg, current_view->owner()->getMainForm()); - // allocate color cube on pseudo-color display // first get visual gs_color = false; - local_gc_copy = createGC(); + if (lyxrc.use_gui) { + fl_add_canvas_handler(figinset_canvas, ClientMessage, + GhostscriptMsg, + current_view->owner()->getMainForm()); - Visual * vi = DefaultVisual(fl_display, DefaultScreen(fl_display)); - if (lyxerr.debugging()) { - printf("Visual ID: %ld, class: %d, bprgb: %d, mapsz: %d\n", - vi->visualid, vi->c_class, - vi->bits_per_rgb, vi->map_entries); - } - color_visual = ( (vi->c_class == StaticColor) || - (vi->c_class == PseudoColor) || - (vi->c_class == TrueColor) || - (vi->c_class == DirectColor) ); - if ((vi->c_class & 1) == 0) return; - // now allocate colors - if (vi->c_class == GrayScale) { - // allocate grayscale - AllocGrays(vi->map_entries/2); - } else { - // allocate normal color - int i = 5; - while (i * i * i * 2 > vi->map_entries) --i; - AllocColors(i); + local_gc_copy = createGC(); + + Visual * vi = DefaultVisual(fl_display, + DefaultScreen(fl_display)); + if (lyxerr.debugging()) { + printf("Visual ID: %ld, class: %d, bprgb: %d, mapsz: %d\n", + vi->visualid, vi->c_class, + vi->bits_per_rgb, vi->map_entries); + } + color_visual = ( (vi->c_class == StaticColor) || + (vi->c_class == PseudoColor) || + (vi->c_class == TrueColor) || + (vi->c_class == DirectColor) ); + if ((vi->c_class & 1) == 0) return; + // now allocate colors + if (vi->c_class == GrayScale) { + // allocate grayscale + AllocGrays(vi->map_entries/2); + } else { + // allocate normal color + int i = 5; + while (i * i * i * 2 > vi->map_entries) --i; + AllocColors(i); + } + gs_allcolors = vi->map_entries; } - gs_allcolors = vi->map_entries; } +static void DoneFigures() { - delete[] figures; - delete[] bitmaps; - figarrsize = 0; - bmparrsize = 0; - + // if bitmaps and figures are not empty we will leak mem + bitmaps.clear(); + figures.clear(); + lyxerr.debug() << "Unregistering figures..." << endl; fl_remove_canvas_handler(figinset_canvas, ClientMessage, @@ -447,17 +450,6 @@ void DoneFigures() } -int FindBmpIndex(figdata * tmpdata) -{ - int i = 0; - while (i < bmpinsref) { - if (bitmaps[i] == tmpdata) return i; - ++i; - } - return i; -} - - static void freefigdata(figdata * tmpdata) { @@ -466,28 +458,24 @@ void freefigdata(figdata * tmpdata) if (tmpdata->gspid > 0) { int pid = tmpdata->gspid; - char buf[128]; // kill ghostscript and unlink it's files tmpdata->gspid = -1; - lyx::kill(pid, SIGKILL); - sprintf(buf, "%s/~lyxgs%d.ps", system_tempdir.c_str(), pid); - unlink(buf); + kill_gs(pid, SIGKILL); } if (tmpdata->bitmap) XFreePixmap(fl_display, tmpdata->bitmap); + bitmaps.erase(find(bitmaps.begin(), bitmaps.end(), tmpdata)); delete tmpdata; - int i = FindBmpIndex(tmpdata); - --bmpinsref; - while (i < bmpinsref) { - bitmaps[i] = bitmaps[i + 1]; - ++i; - } } static void runqueue() { + // This _have_ to be set before the fork! + unsigned long background_pixel = + lyxColorHandler->colorPixel(LColor::background); + // run queued requests for ghostscript, if any if (!gsrunning && gs_color && !gs_xcolor) { // here alloc all colors, so that gs will use only @@ -497,7 +485,7 @@ void runqueue() } while (gsrunning < MAXGS) { - char tbuf[384], tbuf2[80]; + //char tbuf[384]; //, tbuf2[80]; Atom * prop; int nprop, i; @@ -515,7 +503,7 @@ void runqueue() continue; } - int pid = fork(); + int pid = ::fork(); if (pid == -1) { if (lyxerr.debugging()) { @@ -527,15 +515,13 @@ void runqueue() return; } if (pid == 0) { // child - char ** env, rbuf[80], gbuf[40]; + char ** env; int ne = 0; Display * tempdisp = XOpenDisplay(XDisplayName(0)); // create translation file - sprintf(tbuf, "%s/~lyxgs%d.ps", system_tempdir.c_str(), - int(getpid())); - - ofstream ofs(tbuf); + ofstream ofs; + ofs.open(make_tmp(getpid()).c_str()); ofs << "gsave clippath pathbbox grestore\n" << "4 dict begin\n" << "/ury exch def /urx exch def /lly exch def " @@ -552,29 +538,49 @@ void runqueue() ofs.close(); // Don't remove this. // gs process - set ghostview environment first - sprintf(tbuf2, "GHOSTVIEW=%ld %ld", fl_get_canvas_id( - figinset_canvas), p->data->bitmap); - +#ifdef HAVE_SSTREAM + ostringstream t2; +#else + char tbuf2[80]; + ostrstream t2(tbuf2, sizeof(tbuf2)); +#endif + t2 << "GHOSTVIEW=" << fl_get_canvas_id(figinset_canvas) + << ' ' << p->data->bitmap; +#ifndef HAVE_SSTREAM + t2 << '\0'; +#endif // now set up ghostview property on a window - sprintf(tbuf, "0 0 0 0 %d %d 72 72 0 0 0 0", - p->data->wid, p->data->hgh); // #warning BUG seems that the only bug here // might be the hardcoded dpi.. Bummer! +#ifdef HAVE_SSTREAM + ostringstream t1; +#else + char tbuf[384]; + ostrstream t1(tbuf, sizeof(tbuf)); +#endif + t1 << "0 0 0 0 " << p->data->wid << ' ' + << p->data->hgh << " 72 72 0 0 0 0"; +#ifndef HAVE_SSTREAM + t1 << '\0'; +#endif if (lyxerr.debugging()) { lyxerr << "Will set GHOSTVIEW property to [" - << tbuf << "]" << endl; + << t1.str() << "]" << endl; } // wait until property is deleted if executing multiple // ghostscripts + XGrabServer(tempdisp); for (;;) { // grab server to prevent other child // interfering with setting GHOSTVIEW property + // The grabbing goes on for too long, is it + // really needed? (Lgb) + // I moved most of the grabs... (Lgb) if (lyxerr.debugging()) { lyxerr << "Grabbing the server" << endl; } - XGrabServer(tempdisp); prop = XListProperties(tempdisp, fl_get_canvas_id( figinset_canvas), &nprop); @@ -592,9 +598,6 @@ void runqueue() } XFree(reinterpret_cast(prop)); // jc: if (err) break; - // release the server - XUngrabServer(tempdisp); - XFlush(tempdisp); // ok, property found, we must wait until // ghostscript deletes it if (lyxerr.debugging()) { @@ -603,90 +606,134 @@ void runqueue() << "] GHOSTVIEW property" " found. Waiting." << endl; } - - sleep(1); + XUngrabServer(tempdisp); + XFlush(tempdisp); + ::sleep(1); + XGrabServer(tempdisp); } - +#ifdef HAVE_SSTREAM XChangeProperty(tempdisp, fl_get_canvas_id(figinset_canvas), XInternAtom(tempdisp, "GHOSTVIEW", false), XInternAtom(tempdisp, "STRING", false), 8, PropModeAppend, - reinterpret_cast(tbuf), - strlen(tbuf)); + reinterpret_cast(const_cast(t1.str().c_str())), + t1.str().size()); +#else + XChangeProperty(tempdisp, + fl_get_canvas_id(figinset_canvas), + XInternAtom(tempdisp, "GHOSTVIEW", false), + XInternAtom(tempdisp, "STRING", false), + 8, PropModeAppend, + reinterpret_cast(const_cast(t1.str())), + ::strlen(t1.str())); +#endif + XUngrabServer(tempdisp); + XFlush(tempdisp); + +#ifdef HAVE_SSTREAM + ostringstream t3; +#else + //char tbuf[384]; + ostrstream t3(tbuf, sizeof(tbuf)); +#endif switch (p->data->flags & 3) { - case 0: tbuf[0] = 'H'; break; // Hidden - case 1: tbuf[0] = 'M'; break; // Mono - case 2: tbuf[0] = 'G'; break; // Gray + case 0: t3 << 'H'; break; // Hidden + case 1: t3 << 'M'; break; // Mono + case 2: t3 << 'G'; break; // Gray case 3: if (color_visual) - tbuf[0] = 'C'; // Color + t3 << 'C'; // Color else - tbuf[0] = 'G'; // Gray + t3 << 'G'; // Gray break; } + + t3 << ' ' << BlackPixelOfScreen(DefaultScreenOfDisplay(tempdisp)) + << ' ' << background_pixel; +#ifndef HAVE_SSTREAM + t3 << '\0'; +#endif - sprintf(tbuf+1, " %ld %ld", BlackPixelOfScreen( - DefaultScreenOfDisplay(fl_display)), - fl_get_pixel(FL_WHITE)); - + XGrabServer(tempdisp); +#ifdef HAVE_SSTREAM + XChangeProperty(tempdisp, + fl_get_canvas_id(figinset_canvas), + XInternAtom(tempdisp, + "GHOSTVIEW_COLORS", false), + XInternAtom(tempdisp, "STRING", false), + 8, PropModeReplace, + reinterpret_cast(const_cast(t3.str().c_str())), + t3.str().size()); +#else XChangeProperty(tempdisp, fl_get_canvas_id(figinset_canvas), XInternAtom(tempdisp, "GHOSTVIEW_COLORS", false), XInternAtom(tempdisp, "STRING", false), 8, PropModeReplace, - reinterpret_cast(tbuf), - strlen(tbuf)); + reinterpret_cast(const_cast(t3.str())), + ::strlen(t3.str())); +#endif XUngrabServer(tempdisp); XFlush(tempdisp); + if (lyxerr.debugging()) { lyxerr << "Releasing the server" << endl; } XCloseDisplay(tempdisp); // set up environment - while (environ[ne]) ++ne; + while (environ[ne]) + ++ne; typedef char * char_p; env = new char_p[ne + 2]; +#ifdef HAVE_SSTREAM + string tmp = t2.str().c_str(); + env[0] = new char[tmp.size() + 1]; + std::copy(tmp.begin(), tmp.end(), env[0]); + env[0][tmp.size()] = '\0'; +#else env[0] = tbuf2; - memcpy(&env[1], environ, sizeof(char*) * (ne + 1)); +#endif + ::memcpy(&env[1], environ, sizeof(char*) * (ne + 1)); environ = env; // now make gs command // close(0); // close(1); do NOT close. If GS writes out // errors it would hang. (Matthias 290596) - sprintf(rbuf, "-r%gx%g", p->rx, p->ry); - sprintf(gbuf, "-g%dx%d", p->data->wid, p->data->hgh); + + string rbuf = "-r" + tostr(p->rx) + "x" + tostr(p->ry); + string gbuf = "-g" + tostr(p->data->wid) + "x" + tostr(p->data->hgh); + // now chdir into dir with .eps file, to be on the safe // side - chdir(OnlyPath(p->data->fname).c_str()); + ::chdir(OnlyPath(p->data->fname).c_str()); // make temp file name - sprintf(tbuf, "%s/~lyxgs%d.ps", system_tempdir.c_str(), - int(getpid())); + string tmpf = make_tmp(getpid()); if (lyxerr.debugging()) { - lyxerr << "starting gs " << tbuf << " " + lyxerr << "starting gs " << tmpf << " " << p->data->fname << ", pid: " << getpid() << endl; } - int err = execlp(lyxrc->ps_command.c_str(), - lyxrc->ps_command.c_str(), + int err = ::execlp(lyxrc.ps_command.c_str(), + lyxrc.ps_command.c_str(), "-sDEVICE=x11", "-dNOPAUSE", "-dQUIET", "-dSAFER", - rbuf, gbuf, tbuf, + rbuf.c_str(), gbuf.c_str(), tmpf.c_str(), p->data->fname.c_str(), "showpage.ps", "quit.ps", "-", 0); // if we are still there, an error occurred. lyxerr << "Error executing ghostscript. " << "Code: " << err << endl; lyxerr.debug() << "Cmd: " - << lyxrc->ps_command + << lyxrc.ps_command << " -sDEVICE=x11 " - << tbuf << ' ' + << tmpf.c_str() << ' ' << p->data->fname << endl; _exit(0); // no gs? } @@ -723,37 +770,24 @@ void addwait(int psx, int psy, int pswid, int pshgh, figdata * data) static figdata * getfigdata(int wid, int hgh, string const & fname, - int psx, int psy, int pswid, int pshgh, - int raw_wid, int raw_hgh, float angle, char flags) + int psx, int psy, int pswid, int pshgh, + int raw_wid, int raw_hgh, float angle, char flags) { /* first search for an exact match with fname and width/height */ - if (fname.empty()) return 0; + if (fname.empty() || !IsFileReadable(fname)) + return 0; - int i = 0; - while (i < bmpinsref) { - if (bitmaps[i]->wid == wid && bitmaps[i]->hgh == hgh && - bitmaps[i]->flags == flags && bitmaps[i]->fname == fname && - bitmaps[i]->angle == angle) { - bitmaps[i]->ref++; - return bitmaps[i]; + for (bitmaps_type::iterator it = bitmaps.begin(); + it != bitmaps.end(); ++it) { + if ((*it)->wid == wid && (*it)->hgh == hgh && + (*it)->flags == flags && (*it)->fname == fname && + (*it)->angle == angle) { + (*it)->ref++; + return (*it); } - ++i; - } - /* not found -> create new record or return 0 if no record */ - ++bmpinsref; - if (bmpinsref > bmparrsize) { - // allocate more space - bmparrsize += figallocchunk; - typedef figdata * figdata_p; - figdata ** tmp = new figdata_p[bmparrsize]; - memcpy(tmp, bitmaps, - sizeof(figdata*) * (bmparrsize - figallocchunk)); - delete[] bitmaps; - bitmaps = tmp; } figdata * p = new figdata; - bitmaps[bmpinsref-1] = p; p->wid = wid; p->hgh = hgh; p->raw_wid = raw_wid; @@ -761,6 +795,7 @@ figdata * getfigdata(int wid, int hgh, string const & fname, p->angle = angle; p->fname = fname; p->flags = flags; + bitmaps.push_back(p); XWindowAttributes wa; XGetWindowAttributes(fl_display, fl_get_canvas_id( figinset_canvas), &wa); @@ -803,30 +838,33 @@ void getbitmap(figdata * p) static void makeupdatelist(figdata * p) { - for (int i = 0; i < figinsref; ++i) - if (figures[i]->data == p) { + for(figures_type::iterator it = figures.begin(); + it != figures.end(); ++it) + if ((*it)->data == p) { if (lyxerr.debugging()) { lyxerr << "Updating inset " - << figures[i]->inset + << (*it)->inset << endl; } // add inset figures[i]->inset into to_update list - current_view->pushIntoUpdateList(figures[i]->inset); + current_view->pushIntoUpdateList((*it)->inset); } } +// this func is only "called" in spellchecker.C void sigchldchecker(pid_t pid, int * status) { lyxerr.debug() << "Got pid = " << pid << endl; bool pid_handled = false; - for (int i = bmpinsref - 1; i >= 0; --i) { - if (bitmaps[i]->reading && pid == bitmaps[i]->gspid) { + for (bitmaps_type::iterator it = bitmaps.begin(); + it != bitmaps.end(); ++it) { + if ((*it)->reading && pid == (*it)->gspid) { lyxerr.debug() << "Found pid in bitmaps" << endl; // now read the file and remove it from disk - figdata * p = bitmaps[i]; + figdata * p = (*it); p->reading = false; - if (bitmaps[i]->gsdone) *status = 0; + if ((*it)->gsdone) *status = 0; if (*status == 0) { lyxerr.debug() << "GS [" << pid << "] exit OK." << endl; @@ -843,15 +881,11 @@ void sigchldchecker(pid_t pid, int * status) p->broken = false; } else { // remove temporary files - char tmp[128]; - sprintf(tmp, "%s/~lyxgs%d.ps", - system_tempdir.c_str(), - p->gspid); - unlink(tmp); + unlink(make_tmp(p->gspid).c_str()); p->gspid = -1; p->broken = true; } - makeupdatelist(bitmaps[i]); + makeupdatelist((*it)); --gsrunning; runqueue(); pid_handled = true; @@ -902,32 +936,22 @@ static void getbitmaps() { bitmap_waiting = false; - for (int i = 0; i < bmpinsref; ++i) - if (bitmaps[i]->gspid > 0 && !bitmaps[i]->reading) - getbitmap(bitmaps[i]); + for (bitmaps_type::iterator it = bitmaps.begin(); + it != bitmaps.end(); ++it) + if ((*it)->gspid > 0 && !(*it)->reading) + getbitmap((*it)); } static void RegisterFigure(InsetFig * fi) { - if (figinsref == 0) InitFigures(); + if (figures.empty()) InitFigures(); fi->form = 0; - ++figinsref; - if (figinsref > figarrsize) { - // allocate more space - figarrsize += figallocchunk; - typedef Figref * Figref_p; - Figref ** tmp = new Figref_p[figarrsize]; - memcpy(tmp, figures, - sizeof(Figref*) * (figarrsize-figallocchunk)); - delete[] figures; - figures = tmp; - } Figref * tmpfig = new Figref; tmpfig->data = 0; tmpfig->inset = fi; - figures[figinsref-1] = tmpfig; + figures.push_back(tmpfig); fi->figure = tmpfig; if (lyxerr.debugging()) { @@ -937,17 +961,6 @@ void RegisterFigure(InsetFig * fi) } -int FindFigIndex(Figref * tmpfig) -{ - int i = 0; - while (i < figinsref) { - if (figures[i] == tmpfig) return i; - ++i; - } - return i; -} - - static void UnregisterFigure(InsetFig * fi) { @@ -961,38 +974,17 @@ void UnregisterFigure(InsetFig * fi) fl_hide_form(tmpfig->inset->form->Figure); } #if FL_REVISION == 89 -#warning Reactivate this free_form calls + // CHECK Reactivate this free_form calls #else fl_free_form(tmpfig->inset->form->Figure); free(tmpfig->inset->form); // Why free? tmpfig->inset->form = 0; #endif } - int i = FindFigIndex(tmpfig); - --figinsref; - while (i < figinsref) { - figures[i] = figures[i+1]; - ++i; - } + figures.erase(find(figures.begin(), figures.end(), tmpfig)); delete tmpfig; - if (figinsref == 0) DoneFigures(); -} - - -static -string NextToken(istream & is) -{ - string token; - char c; - if (!is.eof()) { - do { - is.get(c); - token += c; - } while (!is.eof() && !isspace(c)); - token.erase(token.length() - 1); // remove the isspace - } - return token; + if (figures.empty()) DoneFigures(); } @@ -1071,17 +1063,22 @@ void InsetFig::draw(Painter & pain, LyXFont const & f, if (figure && figure->data) { if (figure->data->broken) msg = _("[render error]"); else if (figure->data->reading) msg = _("[rendering ... ]"); - } else - if (fname.empty()) msg = _("[no file]"); - else if ((flags & 3) == 0) msg = _("[not displayed]"); - else if (lyxrc->ps_command.empty()) msg = _("[no ghostscript]"); + } + else if (fname.empty()) + msg = _("[no file]"); + else if (!IsFileReadable(fname)) + msg = _("[bad file name]"); + else if ((flags & 3) == 0) + msg = _("[not displayed]"); + else if (lyxrc.ps_command.empty()) + msg = _("[no ghostscript]"); if (!msg) msg = _("[unknown error]"); font.setFamily(LyXFont::SANS_FAMILY); font.setSize(LyXFont::SIZE_FOOTNOTE); string justname = OnlyFilename (fname); - pain.text(int(x + 8), baseline - font.maxAscent() - 4, + pain.text(int(x + 8), baseline - lyxfont::maxAscent(font) - 4, justname, font); font.setSize(LyXFont::SIZE_TINY); @@ -1194,7 +1191,8 @@ void InsetFig::Read(LyXLex & lex) } -int InsetFig::Latex(ostream & os, signed char /* fragile*/ ) const +int InsetFig::Latex(ostream & os, + bool /* fragile*/, bool /* fs*/) const { Regenerate(); if (!cmd.empty()) os << cmd << " "; @@ -1202,34 +1200,12 @@ int InsetFig::Latex(ostream & os, signed char /* fragile*/ ) const } -#ifndef USE_OSTREAM_ONLY -int InsetFig::Latex(string & file, signed char /* fragile*/ ) const -{ - Regenerate(); - file += cmd + ' '; - return 0; -} - - -int InsetFig::Linuxdoc(string &/*file*/) const +int InsetFig::Ascii(ostream &) const { return 0; } -int InsetFig::DocBook(string & file) const -{ - string figurename = fname; - - if(suffixIs(figurename, ".eps")) - figurename.erase(fname.length() - 5); - - file += "@"; - return 0; -} - -#else - int InsetFig::Linuxdoc(ostream &) const { return 0; @@ -1241,12 +1217,11 @@ int InsetFig::DocBook(ostream & os) const string figurename = fname; if(suffixIs(figurename, ".eps")) - figurename.erase(fname.length() - 5); + figurename.erase(fname.length() - 4); os << "@"; return 0; } -#endif void InsetFig::Validate(LaTeXFeatures & features) const @@ -1268,6 +1243,12 @@ bool InsetFig::Deletable() const } +char const * InsetFig::EditMessage() const +{ + return _("Opened figure"); +} + + void InsetFig::Edit(BufferView * bv, int, int, unsigned int) { lyxerr.debug() << "Editing InsetFig." << endl; @@ -1324,7 +1305,9 @@ Inset * InsetFig::Clone() const tmp->pswid = pswid; tmp->pshgh = pshgh; tmp->fname = fname; - if (!fname.empty() && (flags & 3) && !lyxrc->ps_command.empty()) { + if (!fname.empty() && IsFileReadable(fname) + && (flags & 3) && !lyxrc.ps_command.empty() + && lyxrc.use_gui) { // do not display if there is // "do not display" chosen (Matthias 260696) tmp->figure->data = getfigdata(wid, hgh, fname, psx, psy, @@ -1345,6 +1328,31 @@ Inset::Code InsetFig::LyxCode() const } +static +string stringify(InsetFig::HWTYPE hw, float f, string suffix) +{ + string res; + switch (hw) { + case InsetFig::DEF: + break; + case InsetFig::CM:// \resizebox*{h-length}{v-length}{text} + res = tostr(f) + "cm"; + break; + case InsetFig::IN: + res = tostr(f) + "in"; + break; + case InsetFig::PER_PAGE: + res = tostr(f/100) + "\\text" + suffix; + break; + case InsetFig::PER_COL: + // Doesn't occur for htype... + res = tostr(f/100) + "\\column" + suffix; + break; + } + return res; +} + + void InsetFig::Regenerate() const { string cmdbuf; @@ -1362,69 +1370,8 @@ void InsetFig::Regenerate() const string fname2 = MakeRelPath(fname, buf1); string gcmd = "\\includegraphics{" + fname2 + '}'; - - switch (wtype) { - case DEF: - break; - case CM:{// \resizebox*{h-length}{v-length}{text} - char buf[10]; - sprintf(buf, "%g", xwid); // should find better - resizeW = buf; - resizeW += "cm"; - break; - } - case IN: { - char buf[10]; - sprintf(buf, "%g", xwid); - resizeW = buf; - resizeW += "in"; - break; - } - case PER_PAGE:{ - char buf[10]; - sprintf(buf, "%g", xwid/100); - resizeW = buf; - resizeW += "\\textwidth"; - break; - } - case PER_COL:{ - char buf[10]; - sprintf(buf, "%g", xwid/100); - resizeW = buf; - resizeW += "\\columnwidth"; - break; - } - } - - switch (htype) { - case DEF: - break; - case CM: { - char buf[10]; - sprintf(buf, "%g", xhgh); - resizeH = buf; - resizeH += "cm"; - break; - } - case IN:{ - char buf[10]; - sprintf(buf, "%g", xhgh); - resizeH = buf; - resizeH += "in"; - break; - } - case PER_PAGE: { - char buf[10]; - sprintf(buf, "%g", xhgh/100); - resizeH = buf; - resizeH += "\\textheight"; - break; - } - case PER_COL: { - // Doesn't occur; case exists to suppress compiler warnings. - break; - } - } + resizeW = stringify(wtype, xwid, "width"); + resizeH = stringify(htype, xhgh, "height"); if (!resizeW.empty() || !resizeH.empty()) { recmd = "\\resizebox*{"; @@ -1442,12 +1389,8 @@ void InsetFig::Regenerate() const if (angle != 0) { - char buf[10]; - sprintf(buf, "%g", angle); // \rotatebox{angle}{text} - rotate = "\\rotatebox{"; - rotate += buf; - rotate += "}{"; + rotate = "\\rotatebox{" + tostr(angle) + "}{"; } cmdbuf = recmd; @@ -1480,8 +1423,8 @@ void InsetFig::TempRegenerate() float txhgh = atof(fl_get_input(form->Height)); if (!tfname || !*tfname) { - cmd = "\\fbox{\\rule[-0.5in]{0pt}{1in}"; - cmd += _("empty figure path"); + cmd = "\\fbox{\\rule[-0.5in]{0pt}{1in}"; + cmd += _("empty figure path"); cmd += '}'; return; } @@ -1490,69 +1433,9 @@ void InsetFig::TempRegenerate() string fname2 = MakeRelPath(tfname, buf1); // \includegraphics*[][]{file} string gcmd = "\\includegraphics{" + fname2 + '}'; - - switch (twtype) { - case DEF: - break; - case CM: {// \resizebox*{h-length}{v-length}{text} - char buf[10]; - sprintf(buf, "%g", txwid); // should find better - resizeW = buf; - resizeW += "cm"; - break; - } - case IN: { - char buf[10]; - sprintf(buf, "%g", txwid); - resizeW = buf; - resizeW += "in"; - break; - } - case PER_PAGE: { - char buf[10]; - sprintf(buf, "%g", txwid/100); - resizeW = buf; - resizeW += "\\textwidth"; - break; - } - case PER_COL: { - char buf[10]; - sprintf(buf, "%g", txwid/100); - resizeW = buf; - resizeW += "\\columnwidth"; - break; - } - } - switch (thtype) { - case DEF: - break; - case CM: { - char buf[10]; - sprintf(buf, "%g", txhgh); - resizeH = buf; - resizeH += "cm"; - break; - } - case IN: { - char buf[10]; - sprintf(buf, "%g", txhgh); - resizeH = buf; - resizeH += "in"; - break; - } - case PER_PAGE: { - char buf[10]; - sprintf(buf, "%g", txhgh/100); - resizeH = buf; - resizeH += "\\textheight"; - break; - } - case PER_COL: { - // Doesn't occur; case exists to suppress compiler warnings. - break; - } - } + resizeW = stringify(twtype, txwid, "width"); + resizeH = stringify(thtype, txhgh, "height"); // \resizebox*{h-length}{v-length}{text} if (!resizeW.empty() || !resizeH.empty()) { @@ -1570,17 +1453,11 @@ void InsetFig::TempRegenerate() } if (tangle != 0) { - char buf[10]; - sprintf(buf, "%g", tangle); // \rotatebox{angle}{text} - rotate = "\\rotatebox{"; - rotate += buf; - rotate += "}{"; + rotate = "\\rotatebox{" + tostr(tangle) + "}{"; } - cmdbuf = recmd; - cmdbuf += rotate; - cmdbuf += gcmd; + cmdbuf = recmd + rotate + gcmd; if (!rotate.empty()) cmdbuf += '}'; if (!recmd.empty()) cmdbuf += '}'; if (psubfigure && !tsubcap.empty()) { @@ -1605,7 +1482,7 @@ void InsetFig::Recompute() /* now recompute wid and hgh, and if that is changed, set changed */ /* this depends on chosen size of the picture and its bbox */ // This will be redone in 0.13 ... (hen) - if (!fname.empty()) { + if (!fname.empty() && IsFileReadable(fname)) { // say, total width is 595 pts, as A4 in TeX, thats in 1/72" */ newx = frame_wid; @@ -1684,8 +1561,8 @@ void InsetFig::Recompute() figdata * pf = figure->data; // get new data - if (!fname.empty() && (flags & 3) - && !lyxrc->ps_command.empty()) { + if (!fname.empty() && IsFileReadable(fname) && (flags & 3) + && !lyxrc.ps_command.empty()) { // do not display if there is "do not display" // chosen (Matthias 260696) figure->data = getfigdata(wid, hgh, fname, @@ -1735,11 +1612,8 @@ void InsetFig::GetPSSizes() break; } if (c == '%' && lastchar == '%') { - p = NextToken(ifs); + ifs >> p; if (p.empty()) break; - // we should not use this, with it we cannot - // discover bounding box and end of file. - //if (strcmp(p, "EndComments") == 0) break; lyxerr.debug() << "Token: `" << p << "'" << endl; if (p == "BoundingBox:") { float fpsx, fpsy, fpswid, fpshgh; @@ -1894,7 +1768,7 @@ void InsetFig::CallbackFig(long arg) } else { if (!fname.empty()) { changedfname = true; - fname.clear(); + fname.erase(); } } subcaption = fl_get_input(form->Subcaption); @@ -1911,7 +1785,7 @@ void InsetFig::CallbackFig(long arg) fl_set_focus_object(form->Figure, form->OkBtn); fl_hide_form(form->Figure); #if FL_REVISION == 89 -#warning Reactivate this free_form calls + // CHECK Reactivate this free_form calls #else fl_free_form(form->Figure); free(form); // Why free? @@ -1928,8 +1802,8 @@ void InsetFig::CallbackFig(long arg) fl_set_focus_object(form->Figure, form->OkBtn); fl_hide_form(form->Figure); #if FL_REVISION == 89 -#warning Reactivate this free_form calls -#warning Jug, is this still a problem? + // CHECK Reactivate this free_form calls + // Jug, is this still a problem? #else fl_free_form(form->Figure); free(form); // Why free? @@ -2018,8 +1892,6 @@ void EnableFigurePanel(FD_Figure * const form) void InsetFig::RestoreForm() { - char buf[32]; - EnableFigurePanel(form); twtype = wtype; @@ -2057,12 +1929,9 @@ void InsetFig::RestoreForm() fl_set_button(form->Subfigure, (subfigure != 0)); pflags = flags; psubfigure = subfigure; - sprintf(buf, "%g", xwid); - fl_set_input(form->Width, buf); - sprintf(buf, "%g", xhgh); - fl_set_input(form->Height, buf); - sprintf(buf, "%g", angle); - fl_set_input(form->Angle, buf); + fl_set_input(form->Width, tostr(xwid).c_str()); + fl_set_input(form->Height, tostr(xhgh).c_str()); + fl_set_input(form->Angle, tostr(angle).c_str()); if (!fname.empty()){ string buf1 = OnlyPath(owner->fileName()); string fname2 = MakeRelPath(fname, buf1); @@ -2094,8 +1963,8 @@ void InsetFig::Preview(char const * p) string buf2 = MakeAbsPath(p, buf1); lyxerr << "Error during rendering " - << execlp(lyxrc->view_pspic_command.c_str(), - lyxrc->view_pspic_command.c_str(), + << execlp(lyxrc.view_pspic_command.c_str(), + lyxrc.view_pspic_command.c_str(), buf2.c_str(), 0) << endl; _exit(0); @@ -2136,7 +2005,7 @@ void InsetFig::BrowseFile() bool error = false; do { - ProhibitInput(); + ProhibitInput(current_view); if (once) { p = fileDlg.Select(_("EPS Figure"), current_figure_path, @@ -2145,7 +2014,7 @@ void InsetFig::BrowseFile() p = fileDlg.Select(_("EPS Figure"), buf, "*ps", string()); } - AllowInput(); + AllowInput(current_view); if (p.empty()) return; @@ -2154,14 +2023,13 @@ void InsetFig::BrowseFile() once = 1; if (contains(p, "#") || contains(p, "~") || contains(p, "$") - || contains(p, "%") || contains(p, " ")) - { - WriteAlert(_("Filename can't contain any " - "of these characters:"), - // xgettext:no-c-format - _("space, '#', '~', '$' or '%'.")); - error = true; - } + || contains(p, "%") || contains(p, " ")) { + WriteAlert(_("Filename can't contain any " + "of these characters:"), + // xgettext:no-c-format + _("space, '#', '~', '$' or '%'.")); + error = true; + } } while (error); if (form) fl_set_input(form->EpsFile, buf.c_str()); @@ -2177,14 +2045,15 @@ void GraphicsCB(FL_OBJECT * obj, long arg) } /* find inset we were reacting to */ - for (int i = 0; i < figinsref; ++i) - if (figures[i]->inset->form && figures[i]->inset->form->Figure + for (figures_type::iterator it = figures.begin(); + it != figures.end(); ++it) + if ((*it)->inset->form && (*it)->inset->form->Figure == obj->form) { - if (lyxerr.debugging()) { - lyxerr << "Calling back figure " << i << endl; + lyxerr << "Calling back figure " + << (*it) << endl; } - figures[i]->inset->CallbackFig(arg); + (*it)->inset->CallbackFig(arg); return; } } @@ -2192,13 +2061,14 @@ void GraphicsCB(FL_OBJECT * obj, long arg) void HideFiguresPopups() { - for (int i = 0; i < figinsref; ++i) - if (figures[i]->inset->form - && figures[i]->inset->form->Figure->visible) { + for (figures_type::iterator it = figures.begin(); + it != figures.end(); ++it) + if ((*it)->inset->form + && (*it)->inset->form->Figure->visible) { if (lyxerr.debugging()) { - lyxerr << "Hiding figure " << i << endl; + lyxerr << "Hiding figure " << (*it) << endl; } // hide and free the form - figures[i]->inset->CallbackFig(9); + (*it)->inset->CallbackFig(9); } }