X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXLog.C;h=bd7f7e58d10fe4815f07064b370f13884e59cfc4;hb=a858be7332e331e0244e4dba7b0931b6072ffd3d;hp=e62c417a6509be718d192a48292317292e94cf70;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/src/LaTeXLog.C b/src/LaTeXLog.C
index e62c417a65..bd7f7e58d1 100644
--- a/src/LaTeXLog.C
+++ b/src/LaTeXLog.C
@@ -1,61 +1,62 @@
 #include <config.h>
 
-#include <stdlib.h>
+#include <cstdlib>
 #include FORMS_H_LOCATION
 #include "buffer.h"
 #include "latexoptions.h"
 #include "lyx_main.h"
 #include "LString.h"
-#include "FileInfo.h"
-#include "filetools.h"
-#include "pathstack.h"
+#include "support/FileInfo.h"
+#include "support/filetools.h"
+#include "support/path.h"
 #include "lyxrc.h"
 #include "BufferView.h"
 #include "gettext.h"
 
-// 	$Id: LaTeXLog.C,v 1.1 1999/09/27 18:44:36 larsbj Exp $	
-
-#if !defined(lint) && !defined(WITH_WARNINGS)
-static char vcid[] = "$Id: LaTeXLog.C,v 1.1 1999/09/27 18:44:36 larsbj Exp $";
-#endif /* lint */
-
-/* Prototypes */
 extern FD_LaTeXLog *fd_latex_log;
 extern BufferView *current_view;
 
 void ShowLatexLog()
 {
-    LString filename, fname, bname, path;
-    bool use_build = false;
+	string filename, fname, bname, path;
+	bool use_build = false;
+	static int ow = -1, oh;
 
-    filename = current_view->currentBuffer()->getFileName();
-    if (!filename.empty()) {
-	fname = SpaceLess(ChangeExtension(filename, ".log", true));
-	bname = SpaceLess(ChangeExtension(filename, lyxrc->literate_extension + ".out", true));
-	path = OnlyPath(filename);
-	if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)) {
-		path = current_view->currentBuffer()->tmppath;
+	filename = current_view->currentBuffer()->getFileName();
+	if (!filename.empty()) {
+		fname = SpaceLess(ChangeExtension(filename, ".log", true));
+		bname = SpaceLess(ChangeExtension(filename,
+						  lyxrc->literate_extension + ".out", true));
+		path = OnlyPath(filename);
+		if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)) {
+			path = current_view->currentBuffer()->tmppath;
+		}
+		FileInfo f_fi(path + fname), b_fi(path + bname);
+		if (b_fi.exist())
+			if (!f_fi.exist()
+			    || f_fi.getModificationTime() < b_fi.getModificationTime())
+				use_build = true; // If no Latex log or Build log is newer, show Build log
+		Path p(path); // path to LaTeX file
+		if (!fl_load_browser(fd_latex_log->browser_latexlog,
+				     use_build ? bname.c_str() : fname.c_str()))
+			fl_add_browser_line(fd_latex_log->browser_latexlog,
+					    _("Unable to show log file!"));
+	} else {
+		fl_add_browser_line(fd_latex_log->browser_latexlog,
+			       _("NO LATEX LOG FILE!"));
+	}
+	if (fd_latex_log->LaTeXLog->visible) {
+		fl_raise_form(fd_latex_log->LaTeXLog);
+	} else {
+		fl_show_form(fd_latex_log->LaTeXLog,
+			     FL_PLACE_MOUSE | FL_FREE_SIZE,FL_FULLBORDER,
+			     use_build ? _("Build Program Log") : _("LaTeX Log"));
+		if (ow < 0) {
+			ow = fd_latex_log->LaTeXLog->w;
+			oh = fd_latex_log->LaTeXLog->h;
+		}
+		fl_set_form_minsize(fd_latex_log->LaTeXLog, ow, oh);
 	}
-	FileInfo f_fi(path + fname), b_fi(path + bname);
-	if (b_fi.exist())
-	    if ( ! f_fi.exist()
-		 || f_fi.getModificationTime() < b_fi.getModificationTime())
-	        use_build = true; // If no Latex log or Build log is newer, show Build log
-	PathPush(path); // path to LaTeX file
-    }
-    if (!fl_load_browser(fd_latex_log->browser_latexlog,
-			 (use_build)?bname.c_str():fname.c_str()))
-        fl_add_browser_line(fd_latex_log->browser_latexlog, _("NO LATEX LOG FILE!"));
-    if (fd_latex_log->LaTeXLog->visible) {
-	fl_raise_form(fd_latex_log->LaTeXLog);
-    }
-    else {
-	fl_show_form(fd_latex_log->LaTeXLog,
-		     FL_PLACE_MOUSE | FL_FREE_SIZE,FL_FULLBORDER,
-		     (use_build)?_("Build Program Log"):_("LaTeX Log"));
-    }
-    if (!filename.empty())
-        PathPop();
 }
 
 void LatexLogClose(FL_OBJECT *, long)