* figinset.C - part of LyX project
*/
-extern int reverse_video;
extern long int background_pixels;
/* Rework of path-handling (Matthias 04.07.1996 )
#include <cctype>
#include <cmath>
#include <fstream>
+#include <queue>
+#include <list>
+#include <algorithm>
using std::ofstream;
+using std::ifstream;
+using std::queue;
+using std::list;
+using std::find;
+using std::flush;
#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"
extern BufferView * current_view;
-#if 0
-static volatile bool alarmed;
-#endif
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();
-#define DEG2PI 57.295779513
-#define figallocchunk 32
+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 {
- float rx, ry; /* resolution x and y */
- int ofsx, ofsy; /* x and y translation */
- figdata * data; /* we are doing it for this data */
- queue * next; /* next item in queue */
-};
-
-struct pidwait {
- int pid; /* pid to wait for */
- pidwait * next; /* next */
+struct queue_element {
+ float rx, ry; // resolution x and y
+ int ofsx, ofsy; // x and y translation
+ figdata * data; // we are doing it for this data
};
-#define MAXGS 3 /* maximum 3 gs's at a time */
+static int const MAXGS = 3; /* maximum 3 gs's at a time */
static Figref ** figures; /* all the figures */
static figdata ** bitmaps; /* all the bitmaps */
-static queue * gsqueue = 0; /* queue for ghostscripting */
+
+static queue<queue_element> gsqueue; // queue for ghostscripting
+
static int gsrunning = 0; /* currently so many gs's are running */
static bool bitmap_waiting = false; /* bitmaps are waiting finished */
static char bittable[256]; /* bit reversion table */
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
+
+//extern Colormap color_map;
+
+
+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 FD_form_main * fd_form_main;
-extern Colormap color_map;
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 *)
+ XEvent * ev, void *)
{
char tmp[128];
}
// 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]) {
// found the one
p->gsdone = true;
// first update p->bitmap, if necessary
- if (p->bitmap != None && p->flags > (1|8) && gs_color && p->wid) {
+ if (p->bitmap != None
+ && 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(
- figinset_canvas), &wa);
+ XGetWindowAttributes(fl_display,
+ fl_get_canvas_id(
+ figinset_canvas),
+ &wa);
XFlush(fl_display);
if (lyxerr.debugging()) {
lyxerr << "Starting image translation "
<< "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
- //cmap = (XColor *) malloc(gs_allcolors*sizeof(XColor));
- XColor * cmap = new XColor[gs_allcolors];
- for (i = 0; i < gs_allcolors; ++i) cmap[i].pixel = i;
- XQueryColors(tmpdisp, color_map, cmap, gs_allcolors);
- XFlush(tmpdisp);
- wid1 = p->wid - 1;
+ XColor * cmap = new XColor[gs_allcolors];
+ for (i = 0; i < gs_allcolors; ++i) cmap[i].pixel = i;
+ XQueryColors(tmpdisp,
+ fl_state[fl_get_vclass()]
+ .colormap, cmap,
+ gs_allcolors);
+ XFlush(tmpdisp);
+ wid1 = p->wid - 1;
// now we process all the image
- for (y = 0; y < p->hgh; ++y) {
- for (int x = 0; x < wid; ++x) {
- XColor * pc = cmap +
- XGetPixel(im, x, y);
- XFlush(tmpdisp);
- XPutPixel(im, x, y,
- gs_pixels[((pc->red+6553)*
- spc1/65535)*spc2+((pc->green+6553)*
- spc1/65535)*gs_spc+((pc->blue+6553)*
- spc1/65535)]);
- XFlush(tmpdisp);
+ for (y = 0; y < p->hgh; ++y) {
+ for (int x = 0; x < wid; ++x) {
+ XColor * pc = cmap +
+ XGetPixel(im, x, y);
+ XFlush(tmpdisp);
+ XPutPixel(im, x, y,
+ gs_pixels[((pc->red+6553)*
+ spc1/65535)*spc2+((pc->green+6553)*
+ spc1/65535)*gs_spc+((pc->blue+6553)*
+ spc1/65535)]);
+ XFlush(tmpdisp);
+ }
}
- }
// This must be correct.
- delete [] cmap;
- if (lyxerr.debugging()) {
- lyxerr << "Putting image back" << endl;
- }
- XPutImage(tmpdisp, p->bitmap, gc, im, 0, 0,
- 0, 0, p->wid, p->hgh);
- XDestroyImage(im);
- if (lyxerr.debugging()) {
- lyxerr << "Done translation" << endl;
- }
+ delete [] cmap;
+ if (lyxerr.debugging()) {
+ lyxerr << "Putting image back"
+ << endl;
+ }
+ XPutImage(tmpdisp, p->bitmap,
+ gc, im, 0, 0,
+ 0, 0, p->wid, p->hgh);
+ XDestroyImage(im);
+ if (lyxerr.debugging()) {
+ lyxerr << "Done translation"
+ << endl;
+ }
}
noim:
if (lyxerr.debugging()) {
lyxerr << "Killing gs "
<< p->gspid << endl;
}
- kill(p->gspid, SIGHUP);
+ lyx::kill(p->gspid, SIGHUP);
sprintf(tmp, "%s/~lyxgs%d.ps",
system_tempdir.c_str(),
lyxerr << "Killing gs "
<< p->gspid << endl;
}
- kill(p->gspid, SIGHUP);
+ lyx::kill(p->gspid, SIGHUP);
sprintf(tmp, "%s/~lyxgs%d.ps",
system_tempdir.c_str(),
}
-static void AllocColors(int num)
+static
+void AllocColors(int num)
// allocate color cube numxnumxnum, if possible
{
- XColor xcol;
- int i;
-
if (lyxerr.debugging()) {
lyxerr << "Allocating color cube " << num
<< 'x' << num << 'x' << num << endl;
return;
}
if (num > 5) num = 5;
- for (i = 0; i < num*num*num; ++i) {
- xcol.red = 65535*(i/(num*num))/(num-1);
- xcol.green = 65535*((i/num) % num)/(num-1);
- xcol.blue = 65535*(i % num)/(num-1);
+ XColor xcol;
+ for (int i = 0; i < num * num * num; ++i) {
+ xcol.red = 65535 * (i / (num * num)) / (num - 1);
+ 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 "
<< num << endl;;
}
- AllocColors(num-1);
+ AllocColors(num - 1);
return;
}
gs_pixels[i] = xcol.pixel;
gs_color = true;
gs_gray = false;
gs_spc = num;
- gs_num_pixels = num*num*num;
+ gs_num_pixels = num * num * num;
}
-static void AllocGrays(int num)
// allocate grayscale ramp
+static
+void AllocGrays(int num)
{
- XColor xcol;
- int i;
-
if (lyxerr.debugging()) {
- lyxerr << "Allocating grayscale ramp "
+ lyxerr << "Allocating grayscale colormap "
<< num << endl;
}
return;
}
if (num > 128) num = 128;
- for (i = 0; i < num; ++i) {
- xcol.red = xcol.green = xcol.blue = 65535*i/(num-1);
+ XColor xcol;
+ 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 "
<< num << endl;
}
- AllocGrays(num/2);
+ AllocGrays(num / 2);
return;
}
gs_pixels[i] = xcol.pixel;
void InitFigures()
{
- unsigned int i, j, k;
- Visual *vi;
-
bmparrsize = figarrsize = figallocchunk;
- figures = static_cast<Figref**>(malloc(sizeof(Figref*)*figallocchunk));
- bitmaps = static_cast<figdata**>(malloc(sizeof(figdata*)*figallocchunk));
+ typedef Figref * Figref_p;
+ figures = new Figref_p[figallocchunk];
+ typedef figdata * figdata_p;
+ bitmaps = new figdata_p[figallocchunk];
- for (i = 0; i < 256; ++i) {
+ unsigned int k;
+ for (unsigned int i = 0; i < 256; ++i) {
k = 0;
- for (j = 0; j < 8; ++j)
+ for (unsigned int j = 0; j < 8; ++j)
if (i & (1 << (7-j))) k |= 1 << j;
bittable[i] = char(~k);
}
fl_add_canvas_handler(figinset_canvas, ClientMessage,
- GhostscriptMsg, fd_form_main);
+ 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;
+ local_gc_copy = createGC();
- vi = DefaultVisual(fl_display, DefaultScreen(fl_display));
+ 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) );
+ (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) {
} else {
// allocate normal color
int i = 5;
- while (i*i*i*2 > vi->map_entries) --i;
+ while (i * i * i * 2 > vi->map_entries) --i;
AllocColors(i);
}
gs_allcolors = vi->map_entries;
void DoneFigures()
{
- free(figures);
- free(bitmaps);
+ delete[] figures;
+ delete[] bitmaps;
figarrsize = 0;
bmparrsize = 0;
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 FindBmpIndex(figdata * tmpdata)
{
int i = 0;
while (i < bmpinsref) {
}
-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;
- kill(pid, SIGKILL);
+ lyx::kill(pid, SIGKILL);
sprintf(buf, "%s/~lyxgs%d.ps", system_tempdir.c_str(), pid);
unlink(buf);
}
int i = FindBmpIndex(tmpdata);
--bmpinsref;
while (i < bmpinsref) {
- bitmaps[i] = bitmaps[i+1];
+ bitmaps[i] = bitmaps[i + 1];
++i;
}
}
-static void runqueue()
+static
+void runqueue()
{
// run queued requests for ghostscript, if any
if (!gsrunning && gs_color && !gs_xcolor) {
Atom * prop;
int nprop, i;
- if (!gsqueue) {
+ if (gsqueue.empty()) {
if (!gsrunning && gs_xcolor) {
// de-allocate rest of colors
// *****
}
return;
}
- queue * p = gsqueue;
-
+ queue_element * p = &gsqueue.front();
if (!p->data) {
- delete p;
+ gsqueue.pop();
continue;
}
// 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!
+ // #warning BUG seems that the only bug here
+ // might be the hardcoded dpi.. Bummer!
if (lyxerr.debugging()) {
lyxerr << "Will set GHOSTVIEW property to ["
// wait until property is deleted if executing multiple
// ghostscripts
for (;;) {
- // grab server to prevent other child interfering
- // with setting GHOSTVIEW property
+ // grab server to prevent other child
+ // interfering with setting GHOSTVIEW property
if (lyxerr.debugging()) {
- lyxerr << "Grabbing the server" << endl;
+ lyxerr << "Grabbing the server"
+ << endl;
}
XGrabServer(tempdisp);
- prop = XListProperties(tempdisp, fl_get_canvas_id(
+ prop = XListProperties(tempdisp,
+ fl_get_canvas_id(
figinset_canvas), &nprop);
if (!prop) break;
bool err = true;
for (i = 0; i < nprop; ++i) {
- char * p = XGetAtomName(tempdisp, prop[i]);
+ char * p = XGetAtomName(tempdisp,
+ prop[i]);
if (strcmp(p, "GHOSTVIEW") == 0) {
err = false;
break;
}
XFree(p);
}
- XFree(reinterpret_cast<char *>(prop)); /* jc: */
+ 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
+ // ok, property found, we must wait until
+ // ghostscript deletes it
if (lyxerr.debugging()) {
- lyxerr << "Releasing the server" << endl;
- lyxerr << "["
+ lyxerr << "Releasing the server\n["
<< getpid()
<< "] 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
}
XChangeProperty(tempdisp,
break;
}
- 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);
- }
+ sprintf(tbuf+1, " %ld %ld", BlackPixelOfScreen(
+ DefaultScreenOfDisplay(fl_display)),
+ fl_get_pixel(FL_WHITE));
XChangeProperty(tempdisp,
fl_get_canvas_id(figinset_canvas),
- XInternAtom(tempdisp, "GHOSTVIEW_COLORS", false),
+ XInternAtom(tempdisp,
+ "GHOSTVIEW_COLORS", false),
XInternAtom(tempdisp, "STRING", false),
8, PropModeReplace,
reinterpret_cast<unsigned char*>(tbuf),
// set up environment
while (environ[ne]) ++ne;
- env = static_cast<char **>(malloc(sizeof(char*)*(ne+2)));
+ typedef char * char_p;
+ env = new char_p[ne + 2];
env[0] = tbuf2;
- memcpy(&env[1], environ, sizeof(char*)*(ne+1));
+ memcpy(&env[1], environ, sizeof(char*) * (ne + 1));
environ = env;
// now make gs command
sprintf(tbuf, "%s/~lyxgs%d.ps", system_tempdir.c_str(),
int(getpid()));
if (lyxerr.debugging()) {
- printf("starting gs %s %s, pid: %d\n", tbuf,
- p->data->fname.c_str(), int(getpid()));
+ lyxerr << "starting gs " << tbuf << " "
+ << p->data->fname
+ << ", pid: " << getpid() << endl;
}
int err = execlp(lyxrc->ps_command.c_str(),
if (lyxerr.debugging()) {
lyxerr << "GS [" << pid << "] started" << endl;
}
- gsqueue = gsqueue->next;
- gsrunning++;
+
p->data->gspid = pid;
- delete p;
+ ++gsrunning;
+ gsqueue.pop();
}
}
-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 * p = new queue;
- p->ofsx = psx;
- p->ofsy = psy;
- p->rx = (float(data->raw_wid) * 72.0)/pswid;
- p->ry = (float(data->raw_hgh) * 72.0)/pshgh;
+ queue_element p;
+ p.ofsx = psx;
+ p.ofsy = psy;
+ p.rx = (float(data->raw_wid) * 72.0) / pswid;
+ p.ry = (float(data->raw_hgh) * 72.0) / pshgh;
- p->data = data;
- p->next = 0;
+ p.data = data;
- // now put into queue
- queue * p2 = gsqueue;
- if (!gsqueue) gsqueue = p;
- else {
- while (p2->next) p2 = p2->next;
- p2->next = p;
- }
+ gsqueue.push(p);
// if possible, run the queue
runqueue();
}
-static figdata * getfigdata(int wid, int hgh, string const & fname,
+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)
{
if (bmpinsref > bmparrsize) {
// allocate more space
bmparrsize += figallocchunk;
- figdata ** tmp = static_cast<figdata**>(malloc(sizeof(figdata*)*bmparrsize));
- memcpy(tmp, bitmaps, sizeof(figdata*)*(bmparrsize-figallocchunk));
- free(bitmaps);
+ 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;
}
-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) {
<< figures[i]->inset
<< endl;
}
- //UpdateInset(figures[i]->inset);
// add inset figures[i]->inset into to_update list
- PutInsetIntoInsetUpdateList(figures[i]->inset);
+ current_view->pushIntoUpdateList(figures[i]->inset);
}
}
p->broken = true;
}
makeupdatelist(bitmaps[i]);
- gsrunning--;
+ --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;
- free(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)
}
-static void RegisterFigure(InsetFig *fi)
+static
+void RegisterFigure(InsetFig * fi)
{
if (figinsref == 0) InitFigures();
fi->form = 0;
if (figinsref > figarrsize) {
// allocate more space
figarrsize += figallocchunk;
- Figref **tmp = static_cast<Figref**>(malloc(sizeof(Figref*)*figarrsize));
- memcpy(tmp, figures, sizeof(Figref*)*(figarrsize-figallocchunk));
- free(figures);
+ 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;
}
-static void UnregisterFigure(InsetFig * fi)
+static
+void UnregisterFigure(InsetFig * fi)
{
Figref * tmpfig = fi->figure;
#warning Reactivate this free_form calls
#else
fl_free_form(tmpfig->inset->form->Figure);
- free(tmpfig->inset->form);
+ free(tmpfig->inset->form); // Why free?
tmpfig->inset->form = 0;
#endif
}
}
-static char * NextToken(FILE * myfile)
+static
+string NextToken(istream & is)
{
- char * token = 0;
+ string token;
char c;
- int i = 0;
-
- if (!feof(myfile)) {
- token = new char[256];
+ if (!is.eof()) {
do {
- c = fgetc(myfile);
- token[i++]= c;
- } while (!feof(myfile) && !isspace(c));
-
- token[i-1]= '\0'; /* just the end of a command */
+ is.get(c);
+ token += c;
+ } while (!is.eof() && !isspace(c));
+ token.erase(token.length() - 1); // remove the isspace
}
return token;
}
pflags = flags = 9;
psubfigure = subfigure = false;
xwid = xhgh = angle = 0;
+ pswid = pshgh = 0;
raw_wid = raw_hgh = 0;
changedfname = false;
RegisterFigure(this);
}
-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 ... ]");
+ 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]");
-
+ if (fname.empty()) msg = _("[no file]");
+ 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 - font.maxAscent() - 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";
if (!fname.empty()) {
- string buf1 = OnlyPath(owner->fileName());
- string fname2 = MakeRelPath(fname, buf1);
- os << "file " << fname2 << "\n";
+ string buf1 = OnlyPath(owner->fileName());
+ string fname2 = MakeRelPath(fname, buf1);
+ os << "file " << fname2 << "\n";
}
if (!subcaption.empty())
os << "subcaption " << subcaption << "\n";
- if (wtype) os << "width " << wtype << " " << xwid << "\n";
- if (htype) os << "height " << htype << " " << xhgh << "\n";
+ if (wtype) os << "width " << static_cast<int>(wtype) << " " << xwid << "\n";
+ if (htype) os << "height " << static_cast<int>(htype) << " " << xhgh << "\n";
if (angle != 0) os << "angle " << angle << "\n";
os << "flags " << flags << "\n";
if (subfigure) os << "subfigure\n";
}
-int InsetFig::Latex(ostream & os, signed char /* fragile*/ )
+int InsetFig::Latex(ostream & os, signed char /* fragile*/ ) const
{
Regenerate();
if (!cmd.empty()) os << cmd << " ";
}
-int InsetFig::Latex(string & file, signed char /* fragile*/ )
+#ifndef USE_OSTREAM_ONLY
+int InsetFig::Latex(string & file, signed char /* fragile*/ ) const
{
Regenerate();
file += cmd + ' ';
}
-int InsetFig::Linuxdoc(string &/*file*/)
+int InsetFig::Linuxdoc(string &/*file*/) const
{
return 0;
}
-int InsetFig::DocBook(string & file)
+int InsetFig::DocBook(string & file) const
{
- string figurename= fname;
+ string figurename = fname;
if(suffixIs(figurename, ".eps"))
figurename.erase(fname.length() - 5);
return 0;
}
+#else
+
+int InsetFig::Linuxdoc(ostream &) const
+{
+ return 0;
+}
+
+
+int InsetFig::DocBook(ostream & os) const
+{
+ string figurename = fname;
+
+ if(suffixIs(figurename, ".eps"))
+ figurename.erase(fname.length() - 5);
+
+ os << "@<graphic fileref=\"" << figurename << "\"></graphic>";
+ return 0;
+}
+#endif
+
void InsetFig::Validate(LaTeXFeatures & features) const
{
}
-unsigned char InsetFig::Editable() const
+Inset::EDITABLE InsetFig::Editable() const
{
- return 1;
+ return IS_EDITABLE;
}
}
-void InsetFig::Edit(int, int)
+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();
+ if(bv->buffer()->isReadonly())
+ WarnReadonly(bv->buffer()->fileName());
if (!form) {
form = create_form_Figure();
tmp->pshgh = pshgh;
tmp->fname = fname;
if (!fname.empty() && (flags & 3) && !lyxrc->ps_command.empty()) {
- // do not display if there is "do not display" chosen (Matthias 260696)
+ // do not display if there is
+ // "do not display" chosen (Matthias 260696)
tmp->figure->data = getfigdata(wid, hgh, fname, psx, psy,
pswid, pshgh, raw_wid, raw_hgh,
angle, flags & (3|8));
}
-void InsetFig::Regenerate()
+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;
}
if (subfigure) {
if (!subcaption.empty())
cmdbuf = "\\subfigure[" + subcaption +
- "]{" + cmdbuf + "}";
+ "]{" + cmdbuf + "}";
else
cmdbuf = "\\subfigure{" + cmdbuf + "}";
}
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 += '}';
if (!recmd.empty()) cmdbuf += '}';
if (psubfigure && !tsubcap.empty()) {
cmdbuf = string("\\subfigure{") + tsubcap
- + string("}{") + cmdbuf + "}";
+ + string("}{") + cmdbuf + "}";
}
}
// compiler warnings.
break;
}
- if (htype && !wtype && frame_hgh) newx = newy*frame_wid/frame_hgh;
+ if (htype && !wtype && frame_hgh)
+ newx = newy*frame_wid/frame_hgh;
} else {
newx = wid;
newy = hgh;
figdata * pf = figure->data;
// get new data
- if (!fname.empty() && (flags & 3) && !lyxrc->ps_command.empty()) {
+ if (!fname.empty() && (flags & 3)
+ && !lyxrc->ps_command.empty()) {
// do not display if there is "do not display"
// chosen (Matthias 260696)
figure->data = getfigdata(wid, hgh, fname,
void InsetFig::GetPSSizes()
{
-#ifdef WITH_WARNINGS
-#warning rewrite this method to use ifstream
-#endif
/* get %%BoundingBox: from postscript file */
- char * p = 0;
/* defaults to associated size
* ..just in case the PS-file is not readable (Henner, 24-Aug-97)
pshgh = hgh;
if (fname.empty()) return;
+ string p;
+ ifstream ifs(fname.c_str());
- FilePtr f(fname, FilePtr::read);
-
- if (!f()) return; // file not found !!!!
+ if (!ifs) return; // file not found !!!!
/* defaults to A4 page */
psx = 0;
pswid = 595;
pshgh = 842;
- int lastchar = fgetc(f);
+ char lastchar = 0; ifs.get(lastchar);
for (;;) {
- int c = fgetc(f);
- if (c == EOF) {
+ char c = 0; ifs.get(c);
+ if (ifs.eof()) {
lyxerr.debug() << "End of (E)PS file reached and"
" no BoundingBox!" << endl;
break;
}
if (c == '%' && lastchar == '%') {
- p = NextToken(f);
- if (!p) break;
+ p = NextToken(ifs);
+ 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;
- if (strcmp(p, "BoundingBox:") == 0) {
+ lyxerr.debug() << "Token: `" << p << "'" << endl;
+ if (p == "BoundingBox:") {
float fpsx, fpsy, fpswid, fpshgh;
- if (fscanf(f, "%f %f %f %f", &fpsx, &fpsy,
- &fpswid, &fpshgh) == 4) {
+ if (ifs >> fpsx >> fpsy >> fpswid >> fpshgh) {
psx = int(fpsx);
psy = int(fpsy);
pswid = int(fpswid);
pshgh = int(fpshgh);
- }
-
+ }
if (lyxerr.debugging()) {
lyxerr << "%%%%BoundingBox:"
<< psx << ' '
break;
}
c = 0;
- delete[] p;
- p = 0;
}
lastchar = c;
}
- if (p) delete[] p;
pswid -= psx;
pshgh -= psy;
char const * p;
if (lyxerr.debugging()) {
- printf("Figure callback, arg %ld\n", arg);
+ lyxerr << "Figure callback, arg " << arg << endl;
}
switch (arg) {
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);
#warning Reactivate this free_form calls
#else
fl_free_form(form->Figure);
- free(form);
+ free(form); // Why free?
form = 0;
#endif
}
#warning Jug, is this still a problem?
#else
fl_free_form(form->Figure);
- free(form);
+ free(form); // Why free?
form = 0;
#endif
break;
}
-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);
buf = MakeAbsPath(p, buf2);
buf = OnlyPath(buf);
} else {
- buf = OnlyPath(owner->fileName().c_str());
+ buf = OnlyPath(owner->fileName().c_str());
}
// Does user clipart directory exist?
string bufclip = AddName (user_lyxdir, "clipart");
FileInfo fileInfo(bufclip);
if (!(fileInfo.isOK() && fileInfo.isDir()))
- // No - bail out to system clipart directory
- bufclip = AddName (system_lyxdir, "clipart");
+ // No - bail out to system clipart directory
+ bufclip = AddName (system_lyxdir, "clipart");
fileDlg.SetButton(0, _("Clipart"), bufclip);
do {
ProhibitInput();
if (once) {
- p = fileDlg.Select(_("EPS Figure"), current_figure_path,
+ p = fileDlg.Select(_("EPS Figure"),
+ current_figure_path,
"*ps", string());
} else {
p = fileDlg.Select(_("EPS Figure"), buf,
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;
- }
+ {
+ 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());
projects / lyx.git / blobdiff