* figinset.C - part of LyX project
*/
-extern int reverse_video;
-extern long int background_pixels;
-
/* Rework of path-handling (Matthias 04.07.1996 )
* ------------------------------------------------
* figinsets keep an absolute path to the eps-file.
#include <config.h>
+#include <fstream>
+#include <queue>
+#include <list>
+#include <algorithm>
+#include <vector>
+
#include <unistd.h>
#include <csignal>
#include <sys/wait.h>
#include <cstdlib>
#include <cctype>
#include <cmath>
-#include <fstream>
-#include <queue>
-using std::ofstream;
-using std::ifstream;
-using std::queue;
#include "figinset.h"
#include "lyx.h"
#include "support/filetools.h"
#include "LyXView.h" // just because of form_main
#include "debug.h"
-#include "lyxdraw.h"
#include "LaTeXFeatures.h"
#include "lyxrc.h"
#include "gettext.h"
#include "lyx_gui_misc.h" // CancelCloseBoxCB
#include "support/FileInfo.h"
#include "support/lyxlib.h"
+#include "Painter.h"
+#include "font.h"
+#include "bufferview_funcs.h"
+#include "ColorHandler.h"
-extern BufferView * current_view;
-#if 0
-static volatile bool alarmed;
+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;
-#if 0
-//inline
-extern "C" void waitalarm(int)
-{
- alarmed = true;
-}
-#endif
extern char ** environ; // is this only redundtant on linux systems? Lgb.
-extern void UpdateInset(Inset * inset, bool mark_dirty = true);
-// better for asyncron updating:
-void PutInsetIntoInsetUpdateList(Inset * inset);
-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
figdata * data; // we are doing it for this data
};
-struct pidwait {
- int pid; /* pid to wait for */
- pidwait * next; /* next */
-};
-
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<Figref *> figures_type;
+typedef vector<figdata *> bitmaps_type;
+static figures_type figures; // all figures
+static bitmaps_type bitmaps; // all bitmaps
static queue<queue_element> gsqueue; // queue for ghostscripting
static bool gs_gray; // is grayscale?
static int gs_allcolors; // number of all colors
-static pidwait * pw = 0; // pid wait list
+static list<int> pidwaitlist; // pid wait list
+
+static
+GC createGC()
+{
+ XGCValues val;
+ val.foreground = BlackPixel(fl_display,
+ DefaultScreen(fl_display));
+
+ val.function=GXcopy;
+ val.graphics_exposures = false;
+ val.line_style = LineSolid;
+ val.line_width = 0;
+ return XCreateGC(fl_display, RootWindow(fl_display, 0),
+ GCForeground | GCFunction | GCGraphicsExposures
+ | GCLineWidth | GCLineStyle , &val);
+}
+static
+GC local_gc_copy;
-extern Colormap color_map;
+static
void addpidwait(int pid)
{
// adds pid to pid wait list
- register pidwait * p = new pidwait;
-
- p->pid = pid;
- p->next = pw;
- pw = p;
+ pidwaitlist.push_back(pid);
if (lyxerr.debugging()) {
- lyxerr << "Pids to wait for: " << p->pid << endl;
- while (p->next) {
- p = p->next;
- lyxerr << p->pid << endl;
+ lyxerr << "Pids to wait for: \n";
+ for (list<int>::const_iterator cit = pidwaitlist.begin();
+ cit != pidwaitlist.end(); ++cit) {
+ lyxerr << (*cit) << '\n';
}
+ lyxerr << flush;
}
}
-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<XClientMessageEvent*>(ev);
if(lyxerr.debugging()) {
// 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<long>((*it)->bitmap) ==
+ static_cast<long>(e->data.l[1])) {
// found the one
- figdata * p = bitmaps[i];
+ figdata * p = (*it);
p->gsdone = true;
// first update p->bitmap, if necessary
&& 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, y, wid1, spc1 = gs_spc-1,
- spc2 = gs_spc * gs_spc, wid = p->wid,
- forkstat;
+ int i;
+ int y;
+ int wid1;
+ int spc1 = gs_spc - 1;
+ int spc2 = gs_spc * gs_spc;
+ int wid = p->wid;
+ int forkstat;
Display * tmpdisp;
- GC gc = getGC(gc_copy);
+ GC gc = local_gc_copy;
XGetWindowAttributes(fl_display,
fl_get_canvas_id(
<< "Cannot fork, using slow "
"method for pixmap translation." << endl;
tmpdisp = fl_display;
- } else if (forkstat > 0) {
+ } else if (forkstat > 0) { // parent
// register child
if (lyxerr.debugging()) {
lyxerr << "Spawned child "
<< forkstat << endl;
}
addpidwait(forkstat);
- break; // in parent process
- } else {
+ break;
+ } else { // child
tmpdisp = XOpenDisplay(XDisplayName(0));
XFlush(tmpdisp);
}
// query current colormap
XColor * cmap = new XColor[gs_allcolors];
for (i = 0; i < gs_allcolors; ++i) cmap[i].pixel = i;
- XQueryColors(tmpdisp, color_map, cmap, gs_allcolors);
+ XQueryColors(tmpdisp,
+ fl_state[fl_get_vclass()]
+ .colormap, cmap,
+ gs_allcolors);
XFlush(tmpdisp);
wid1 = p->wid - 1;
// now we process all the image
}
}
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;
}
}
-static void AllocColors(int num)
+static
+void AllocColors(int num)
// allocate color cube numxnumxnum, if possible
{
if (lyxerr.debugging()) {
xcol.green = 65535 * ((i / num) % num) / (num - 1);
xcol.blue = 65535 * (i % num) / (num - 1);
xcol.flags = DoRed | DoGreen | DoBlue;
- if (!XAllocColor(fl_display, color_map, &xcol)) {
- if (i) XFreeColors(fl_display, color_map,
+ if (!XAllocColor(fl_display,
+ fl_state[fl_get_vclass()].colormap, &xcol)) {
+ if (i) XFreeColors(fl_display,
+ fl_state[fl_get_vclass()].colormap,
gs_pixels, i, 0);
if(lyxerr.debugging()) {
lyxerr << "Cannot allocate color cube "
for (int i = 0; i < num; ++i) {
xcol.red = xcol.green = xcol.blue = 65535 * i / (num - 1);
xcol.flags = DoRed | DoGreen | DoBlue;
- if (!XAllocColor(fl_display, color_map, &xcol)) {
- if (i) XFreeColors(fl_display, color_map,
+ if (!XAllocColor(fl_display,
+ fl_state[fl_get_vclass()].colormap, &xcol)) {
+ if (i) XFreeColors(fl_display,
+ fl_state[fl_get_vclass()].colormap,
gs_pixels, i, 0);
if (lyxerr.debugging()) {
lyxerr << "Cannot allocate grayscale "
}
+static
void InitFigures()
{
- bmparrsize = figarrsize = figallocchunk;
- typedef Figref * Figref_p;
- figures = new Figref_p[figallocchunk];
- //figures = static_cast<Figref**>
- // (malloc(sizeof(Figref*) * figallocchunk));
- typedef figdata * figdata_p;
- bitmaps = new figdata_p[figallocchunk];
- //bitmaps = static_cast<figdata**>
- //(malloc(sizeof(figdata*) * 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) {
bittable[i] = char(~k);
}
- fl_add_canvas_handler(figinset_canvas, ClientMessage,
- GhostscriptMsg, current_view->owner()->getMainForm());
-
- // now we have to init color_map
- if (!color_map) color_map = DefaultColormap(fl_display,
- DefaultScreen(fl_display));
// allocate color cube on pseudo-color display
// first get visual
gs_color = false;
+ 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()
{
- //free(figures);
- //free(bitmaps);
- 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,
GhostscriptMsg);
-
- if (gs_color) {
- lyxerr.debug() << "Freeing up the colors..." << endl;
- XFreeColors(fl_display, color_map, gs_pixels,
- gs_num_pixels, 0);
- /******????????????????? what's planes in this case ??????***/
- }
-}
-
-
-int FindBmpIndex(figdata * tmpdata)
-{
- int i = 0;
- while (i < bmpinsref) {
- if (bitmaps[i] == tmpdata) return i;
- ++i;
- }
- return i;
-}
-
-
-static void chpixmap(Pixmap, int, int)
-{
-#if 0
- Display * tempdisp = XOpenDisplay(XDisplayName(0));
-
- // here read the pixmap and change all colors to those we
- // have allocated
-
- XCloseDisplay(tempdisp);
-#endif
}
-static void freefigdata(figdata * tmpdata)
+static
+void freefigdata(figdata * tmpdata)
{
tmpdata->ref--;
if (tmpdata->ref) return;
if (tmpdata->gspid > 0) {
int pid = tmpdata->gspid;
- char buf[128];
- // change Pixmap according to our allocated colormap
- chpixmap(tmpdata->bitmap, tmpdata->wid, tmpdata->hgh);
// 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()
+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
}
while (gsrunning < MAXGS) {
- char tbuf[384], tbuf2[80];
+ //char tbuf[384]; //, tbuf2[80];
Atom * prop;
int nprop, i;
continue;
}
- int pid = fork();
+ int pid = ::fork();
if (pid == -1) {
if (lyxerr.debugging()) {
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 "
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);
}
XFree(reinterpret_cast<char *>(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()) {
<< "] GHOSTVIEW property"
" found. Waiting." << endl;
}
-#if 0
-#ifdef WITH_WARNINGS
-#warning What is this doing? (wouldn't a sleep(1); work too?')
-#endif
- alarm(1);
- alarmed = false;
- signal(SIGALRM, waitalarm);
- while (!alarmed) pause();
-#else
- sleep(1);
-#endif
+ 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<unsigned char*>(tbuf),
- strlen(tbuf));
+ reinterpret_cast<unsigned char*>(const_cast<char*>(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<unsigned char*>(const_cast<char*>(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
- if (reverse_video) {
- sprintf(tbuf+1, " %ld %ld", WhitePixelOfScreen(
- DefaultScreenOfDisplay(fl_display)),
- background_pixels);
- } else {
- sprintf(tbuf+1, " %ld %ld", BlackPixelOfScreen(
- DefaultScreenOfDisplay(fl_display)),
- background_pixels);
- }
-
+ 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<unsigned char*>(const_cast<char*>(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<unsigned char*>(tbuf),
- strlen(tbuf));
+ reinterpret_cast<unsigned char*>(const_cast<char*>(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];
- //env = static_cast<char **>
- // (malloc(sizeof(char*) * (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?
}
}
-static void addwait(int psx, int psy, int pswid, int pshgh, figdata * data)
+static
+void addwait(int psx, int psy, int pswid, int pshgh, figdata * data)
{
// recompute the stuff and put in the queue
queue_element p;
}
-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)
+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)
{
/* 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];
- //figdata ** tmp = static_cast<figdata**>
- // (malloc(sizeof(figdata*) * bmparrsize));
- memcpy(tmp, bitmaps,
- sizeof(figdata*) * (bmparrsize - figallocchunk));
- delete[] bitmaps;
- //free(bitmaps);
- bitmaps = tmp;
}
figdata * p = new figdata;
- bitmaps[bmpinsref-1] = p;
p->wid = wid;
p->hgh = hgh;
p->raw_wid = raw_wid;
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);
}
-static void getbitmap(figdata * p)
+static
+void getbitmap(figdata * p)
{
p->gspid = -1;
}
-static void makeupdatelist(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;
}
- //UpdateInset(figures[i]->inset);
// add inset figures[i]->inset into to_update list
- PutInsetIntoInsetUpdateList(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;
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]);
- gsrunning--;
+ makeupdatelist((*it));
+ --gsrunning;
runqueue();
pid_handled = true;
}
}
if (!pid_handled) {
lyxerr.debug() << "Checking pid in pidwait" << endl;
- pidwait * p = pw, * prev = 0;
- while (p) {
- if (pid == p->pid) {
- lyxerr.debug() << "Found pid in pidwait" << endl;
- lyxerr.debug() << "Caught child pid of recompute routine " << pid << endl;
- if (prev)
- prev->next = p->next;
- else
- pw = p->next;
- delete p;
- break;
- }
- prev = p;
- p = p->next;
+ list<int>::iterator it = find(pidwaitlist.begin(),
+ pidwaitlist.end(), pid);
+ if (it != pidwaitlist.end()) {
+ lyxerr.debug() << "Found pid in pidwait\n"
+ << "Caught child pid of recompute "
+ "routine" << pid << endl;
+ pidwaitlist.erase(it);
}
}
-
if (pid == -1) {
lyxerr.debug() << "waitpid error" << endl;
switch (errno) {
}
-static void getbitmaps()
+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)
+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];
- //Figref ** tmp = static_cast<Figref**>
- // (malloc(sizeof(Figref*)*figarrsize));
- memcpy(tmp, figures,
- sizeof(Figref*)*(figarrsize-figallocchunk));
- delete[] figures;
- //free(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()) {
}
-int FindFigIndex(Figref * tmpfig)
-{
- int i = 0;
- while (i < figinsref) {
- if (figures[i] == tmpfig) return i;
- ++i;
- }
- return i;
-}
-
-
-static void UnregisterFigure(InsetFig * fi)
+static
+void UnregisterFigure(InsetFig * fi)
{
Figref * tmpfig = fi->figure;
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();
}
}
-int InsetFig::Ascent(LyXFont const &) const
+int InsetFig::ascent(Painter &, LyXFont const &) const
{
return hgh + 3;
}
-int InsetFig::Descent(LyXFont const &) const
+int InsetFig::descent(Painter &, LyXFont const &) const
{
return 1;
}
-int InsetFig::Width(LyXFont const &) const
+int InsetFig::width(Painter &, LyXFont const &) const
{
return wid + 2;
}
-void InsetFig::Draw(LyXFont font, LyXScreen & scr, int baseline, float & x)
+void InsetFig::draw(Painter & pain, LyXFont const & f,
+ int baseline, float & x) const
{
+ LyXFont font(f);
+
if (bitmap_waiting) getbitmaps();
-
+
// I wish that I didn't have to use this
// but the figinset code is so complicated so
// I don't want to fiddle with it now.
- unsigned long pm = scr.getForeground();
-
+
if (figure && figure->data && figure->data->bitmap &&
!figure->data->reading && !figure->data->broken) {
// draw the bitmap
- XCopyArea(fl_display, figure->data->bitmap, pm, getGC(gc_copy),
- 0, 0, wid, hgh, int(x+1), baseline-hgh);
- XFlush(fl_display);
- if (flags & 4) XDrawRectangle(fl_display, pm, getGC(gc_copy),
- int(x), baseline - hgh - 1,
- wid+1, hgh+1);
+ pain.pixmap(int(x + 1), baseline - hgh,
+ wid, hgh, figure->data->bitmap);
+
+ if (flags & 4)
+ pain.rectangle(int(x), baseline - hgh - 1,
+ wid + 1, hgh + 1);
+
} else {
char * msg = 0;
// draw frame
- XDrawRectangle(fl_display, pm, getGC(gc_copy),
- int(x),
- baseline - hgh - 1, wid+1, hgh+1);
+ pain.rectangle(x, baseline - hgh - 1, wid + 1, hgh + 1);
+
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);
+ font.setFamily(LyXFont::SANS_FAMILY);
+ font.setSize(LyXFont::SIZE_FOOTNOTE);
string justname = OnlyFilename (fname);
- font.drawString(justname, pm,
- baseline - font.maxAscent() - 4,
- int(x) + 8);
- font.setSize (LyXFont::SIZE_TINY);
- font.drawText (msg, strlen(msg), pm,
- baseline - 4,
- int(x) + 8);
-
+ pain.text(int(x + 8), baseline - lyxfont::maxAscent(font) - 4,
+ justname, font);
+
+ font.setSize(LyXFont::SIZE_TINY);
+ pain.text(int(x + 8), baseline - 4, msg, strlen(msg), font);
}
- x += Width(font); // ?
+ x += width(pain, font); // ?
}
-void InsetFig::Write(ostream & os)
+void InsetFig::Write(ostream & os) const
{
Regenerate();
os << "Figure size " << wid << " " << hgh << "\n";
}
-int InsetFig::Latex(ostream & os, signed char /* fragile*/ )
+int InsetFig::Latex(ostream & os,
+ bool /* fragile*/, bool /* fs*/) const
{
Regenerate();
if (!cmd.empty()) os << cmd << " ";
}
-int InsetFig::Latex(string & file, signed char /* fragile*/ )
+int InsetFig::Ascii(ostream &) const
{
- Regenerate();
- file += cmd + ' ';
return 0;
}
-int InsetFig::Linuxdoc(string &/*file*/)
+int InsetFig::Linuxdoc(ostream &) const
{
return 0;
}
-int InsetFig::DocBook(string & file)
+int InsetFig::DocBook(ostream & os) const
{
string figurename = fname;
if(suffixIs(figurename, ".eps"))
- figurename.erase(fname.length() - 5);
+ figurename.erase(fname.length() - 4);
- file += "@<graphic fileref=\"" + figurename + "\"></graphic>";
+ os << "@<graphic fileref=\"" << figurename << "\"></graphic>";
return 0;
}
}
-unsigned char InsetFig::Editable() const
+Inset::EDITABLE InsetFig::Editable() const
{
- return 1;
+ return IS_EDITABLE;
}
}
-void InsetFig::Edit(int, int)
+char const * InsetFig::EditMessage() const
+{
+ return _("Opened figure");
+}
+
+
+void InsetFig::Edit(BufferView * bv, int, int, unsigned int)
{
lyxerr.debug() << "Editing InsetFig." << endl;
Regenerate();
// We should have RO-versions of the form instead.
// The actual prevention of altering a readonly doc
// is done in CallbackFig()
- if(current_view->buffer()->isReadonly())
- WarnReadonly(current_view->buffer()->fileName());
+ if(bv->buffer()->isReadonly())
+ WarnReadonly(bv->buffer()->fileName());
if (!form) {
form = create_form_Figure();
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,
}
-void InsetFig::Regenerate()
+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;
string resizeW, resizeH;
cmd = "\\fbox{\\rule[-0.5in]{0pt}{1in}";
cmd += _("empty figure path");
cmd += '}';
- //if (form) fl_set_object_label(form->cmd, "");
return;
}
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*{";
if (angle != 0) {
- char buf[10];
- sprintf(buf, "%g", angle);
// \rotatebox{angle}{text}
- rotate = "\\rotatebox{";
- rotate += buf;
- rotate += "}{";
+ rotate = "\\rotatebox{" + tostr(angle) + "}{";
}
cmdbuf = recmd;
}
cmd = cmdbuf;
-
- //if (form) fl_set_object_label(form->cmd, cmd.c_str());
}
float txhgh = atof(fl_get_input(form->Height));
if (!tfname || !*tfname) {
- //fl_set_object_label(form->cmd, "");
- //fl_redraw_object(form->cmd);
- cmd = "\\fbox{\\rule[-0.5in]{0pt}{1in}";
- cmd += _("empty figure path");
+ cmd = "\\fbox{\\rule[-0.5in]{0pt}{1in}";
+ cmd += _("empty figure path");
cmd += '}';
return;
}
string fname2 = MakeRelPath(tfname, buf1);
// \includegraphics*[<llx,lly>][<urx,ury>]{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()) {
}
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()) {
/* 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;
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,
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;
} else {
if (!fname.empty()) {
changedfname = true;
- fname.clear();
+ fname.erase();
}
}
subcaption = fl_get_input(form->Subcaption);
lyxerr << "Update: ["
<< wid << 'x' << hgh << ']' << endl;
}
- UpdateInset(this);
+ current_view->updateInset(this, true);
if (arg == 8) {
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?
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?
}
-inline void DisableFigurePanel(FD_Figure * const form)
+inline
+void DisableFigurePanel(FD_Figure * const form)
{
fl_deactivate_object(form->EpsFile);
fl_deactivate_object(form->Browse);
}
-inline void EnableFigurePanel(FD_Figure * const form)
+inline
+void EnableFigurePanel(FD_Figure * const form)
{
fl_activate_object(form->EpsFile);
fl_activate_object(form->Browse);
void InsetFig::RestoreForm()
{
- char buf[32];
-
EnableFigurePanel(form);
twtype = wtype;
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);
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);
bool error = false;
do {
- ProhibitInput();
+ ProhibitInput(current_view);
if (once) {
p = fileDlg.Select(_("EPS Figure"),
current_figure_path,
p = fileDlg.Select(_("EPS Figure"), buf,
"*ps", string());
}
- AllowInput();
+ AllowInput(current_view);
if (p.empty()) return;
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());
}
/* 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;
}
}
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);
}
}
projects / lyx.git / blobdiff