make error messages about unhandled X11 events GUI debug messages; use temp file...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5751 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/ChangeLog b/src/ChangeLog
index a87d768169c40900b385ddd66d5b645049e67313..e1a9379bdc7f411248b561128d45e30f7efe2ddc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-18  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * converter.C (convert): if from and to files are the same, use a
+       temporary files as intermediary
+
 2002-11-22  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * commandtags.h: 

diff --git a/src/converter.C b/src/converter.C
index 17e07d7d8a59c7a227ea0b02a0ac52e2ac1e4c54..c37a0028855308fd9db5a3156a92a895167c8caf 100644 (file)
--- a/src/converter.C
+++ b/src/converter.C
@@ -623,6 +623,14 @@ bool Converters::convert(Buffer const * buffer,
                                  subst(conv.result_file,
                                        token_base, OnlyFilename(from_base)));
 
+               // if input and output files are equal, we use a
+               // temporary file as intermediary (JMarc)
+               string real_outfile;
+               if (outfile == infile) {
+                       real_outfile = infile;
+                       outfile = AddName(buffer->tmppath, "tmpfile.out");
+               }
+
                if (conv.latex) {
                        run_latex = true;
                        string command = subst(conv.command, token_from, "");
@@ -673,6 +681,16 @@ bool Converters::convert(Buffer const * buffer,
                        } else
                                res = one.startscript(type, command);
 
+                       if (!real_outfile.empty()) {
+                               if (!lyx::rename(outfile, real_outfile))
+                                       res = -1;
+                               else
+                                       lyxerr[Debug::FILES]
+                                               << "renaming file " << outfile
+                                               << " to " << real_outfile
+                                               << endl;
+                       }
+                       
                        if (!conv.parselog.empty()) {
                                string const logfile =  infile2 + ".log";
                                string const script = LibScriptSearch(conv.parselog);

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index bfab9e118ef228e36878138cb1f85999925980e8..76576ab36afcc7b24f4a1984b7d5d1b65f6601ff 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-29  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * lyx_gui.C (start): make "unhandled X11 event" debug message
+       optional (on GUI)
+
 2002-11-29  Angus Leeming  <leeming@lyx.org>
 
        * Tooltips.C (init): allow tooltips to be reset.

diff --git a/src/frontends/xforms/lyx_gui.C b/src/frontends/xforms/lyx_gui.C
index 944e78dba38519f7106ddc35435812598edcbfc5..b668a283b532078fcac9bd11031cf3eda25a6d6a 100644 (file)
--- a/src/frontends/xforms/lyx_gui.C
+++ b/src/frontends/xforms/lyx_gui.C
@@ -312,10 +312,11 @@ void lyx_gui::start(string const & batch, vector<string> const & files)
                if (fl_check_forms() == FL_EVENT) {
                        XEvent ev;
                        fl_XNextEvent(&ev);
-                       lyxerr << "Received unhandled X11 event" << endl;
-                       lyxerr << "Type: " << ev.xany.type
-                              << " Target: 0x" << hex << ev.xany.window
-                              << dec << endl;
+                       lyxerr[Debug::GUI]
+                               << "Received unhandled X11 event" << endl
+                               << "Type: " << ev.xany.type
+                               << " Target: 0x" << hex << ev.xany.window
+                               << dec << endl;
                }
        }