X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_win32.cpp;h=b58397d202640cc5cac395f913e7c4c8c1b421d1;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=87899a838bbc4fac24945246f3e4bac8f67beda3;hpb=10f13704647f02562ebc9cbde9daa4359fdf39e7;p=lyx.git

diff --git a/src/support/os_win32.cpp b/src/support/os_win32.cpp
index 87899a838b..b58397d202 100644
--- a/src/support/os_win32.cpp
+++ b/src/support/os_win32.cpp
@@ -6,6 +6,7 @@
  * \author Ruurd A. Reitsma
  * \author Claus Hentschel
  * \author Angus Leeming
+ * \author Enrico Forestieri
  *
  * Full author contact details are available in file CREDITS.
  *
@@ -14,10 +15,13 @@
 
 #include <config.h>
 
+#include "LyXRC.h"
+
 #include "support/os.h"
 #include "support/os_win32.h"
 
 #include "support/debug.h"
+#include "support/environment.h"
 #include "support/FileName.h"
 #include "support/gettext.h"
 #include "support/filetools.h"
@@ -52,6 +56,16 @@
 #define ASSOCF_INIT_IGNOREUNKNOWN 0
 #endif
 
+#if defined(__MINGW32__)
+#include <stdio.h>
+#endif
+
+
+extern "C" {
+extern void __wgetmainargs(int * argc, wchar_t *** argv, wchar_t *** envp,
+			   int expand_wildcards, int * new_mode);
+}
+
 using namespace std;
 
 namespace lyx {
@@ -63,6 +77,9 @@ namespace os {
 
 namespace {
 
+int argc_ = 0;
+wchar_t ** argv_ = 0;
+
 bool windows_style_tex_paths_ = true;
 
 string cygdrive = "/cygdrive";
@@ -80,7 +97,7 @@ BOOL terminate_handler(DWORD event)
 
 } // namespace anon
 
-void init(int /* argc */, char * argv[])
+void init(int argc, char * argv[])
 {
 	/* Note from Angus, 17 Jan 2005:
 	 *
@@ -138,6 +155,13 @@ void init(int /* argc */, char * argv[])
 	 * lyx is invoked as a parameter of hidecmd.exe.
 	 */
 
+
+	// Get the wide program arguments array
+	wchar_t ** envp = 0;
+	int newmode = 0;
+	__wgetmainargs(&argc_, &argv_, &envp, -1, &newmode);
+	LASSERT(argc == argc_, /**/);
+
 	// If Cygwin is detected, query the cygdrive prefix.
 	// The cygdrive prefix is needed for translating windows style paths
 	// to posix style paths in LaTeX files when the Cygwin teTeX is used.
@@ -186,6 +210,21 @@ void init(int /* argc */, char * argv[])
 }
 
 
+string utf8_argv(int i)
+{
+	LASSERT(i < argc_, /**/);
+	return fromqstr(QString::fromWCharArray(argv_[i]));
+}
+
+
+void remove_internal_args(int i, int num)
+{
+	argc_ -= num;
+	for (int j = i; j < argc_; ++j)
+		argv_[j] = argv_[j + num];
+}
+
+
 string current_root()
 {
 	// _getdrive returns the current drive (1=A, 2=B, and so on).
@@ -282,12 +321,13 @@ static QString const get_long_path(QString const & short_path)
 
 static QString const get_short_path(QString const & long_path, file_access how)
 {
-	// CreateFileW and GetShortPathNameW needs the path in utf16 encoding.
+	// CreateFileW and GetShortPathNameW need the path in utf16 encoding.
 	if (how == CREATE) {
 		HANDLE h = CreateFileW((wchar_t *) long_path.utf16(),
 				GENERIC_WRITE, 0, NULL, CREATE_NEW,
 				FILE_ATTRIBUTE_NORMAL, NULL);
-		if (h == INVALID_HANDLE_VALUE)
+		if (h == INVALID_HANDLE_VALUE
+		    && GetLastError() != ERROR_FILE_EXISTS)
 			return long_path;
 		CloseHandle(h);
 	}
@@ -348,6 +388,38 @@ string latex_path(string const & p)
 }
 
 
+string latex_path_list(string const & p)
+{
+	if (p.empty())
+		return p;
+
+	// We may need a posix style path or a windows style path (depending
+	// on windows_style_tex_paths_), but we use always forward slashes,
+	// since this is standard for all tex engines.
+
+	if (!windows_style_tex_paths_) {
+		string pathlist;
+		for (size_t i = 0, k = 0; i != string::npos; k = i) {
+			i = p.find(';', i);
+			string path = subst(p.substr(k, i - k), '\\', '/');
+			if (FileName::isAbsolute(path)) {
+				string const drive = path.substr(0, 2);
+				string const cygprefix = cygdrive + "/"
+							+ drive.substr(0, 1);
+				path = subst(path, drive, cygprefix);
+			}
+			pathlist += path;
+			if (i != string::npos) {
+				pathlist += ':';
+				++i;
+			}
+		}
+		return pathlist;
+	}
+	return subst(p, '\\', '/');
+}
+
+
 bool is_valid_strftime(string const & p)
 {
 	string::size_type pos = p.find_first_of('%');
@@ -380,34 +452,17 @@ string const & nulldev()
 }
 
 
-bool is_terminal(io_channel channel)
-{
-	switch (channel) {
-	case STDIN:
-		if (GetStdHandle(STD_INPUT_HANDLE) == NULL)
-			return false;
-		break;
-	case STDOUT:
-		if (GetStdHandle(STD_OUTPUT_HANDLE) == NULL)
-			return false;
-		break;
-	case STDERR:
-		if (GetStdHandle(STD_ERROR_HANDLE) == NULL)
-			return false;
-		break;
-	}
-	return true;
-}
-
-
 shell_type shell()
 {
 	return CMD_EXE;
 }
 
 
-char path_separator()
+char path_separator(path_type type)
 {
+	if (type == TEXENGINE)
+		return windows_style_tex_paths_ ? ';' : ':';
+
 	return ';';
 }
 
@@ -484,12 +539,25 @@ bool canAutoOpenFile(string const & ext, auto_open_mode const mode)
 }
 
 
-bool autoOpenFile(string const & filename, auto_open_mode const mode)
+bool autoOpenFile(string const & filename, auto_open_mode const mode,
+		  string const & path)
 {
+	string const texinputs = os::latex_path_list(
+			replaceCurdirPath(path, lyxrc.texinputs_prefix));
+	string const sep = windows_style_tex_paths_ ? ";" : ":";
+	string const oldval = getEnv("TEXINPUTS");
+	string const newval = "." + sep + texinputs + sep + oldval;
+	if (!path.empty() && !lyxrc.texinputs_prefix.empty())
+		setEnv("TEXINPUTS", newval);
+
 	// reference: http://msdn.microsoft.com/en-us/library/bb762153.aspx
 	char const * action = (mode == VIEW) ? "open" : "edit";
-	return reinterpret_cast<int>(ShellExecute(NULL, action,
+	bool success = reinterpret_cast<int>(ShellExecute(NULL, action,
 		to_local8bit(from_utf8(filename)).c_str(), NULL, NULL, 1)) > 32;
+
+	if (!path.empty() && !lyxrc.texinputs_prefix.empty())
+		setEnv("TEXINPUTS", oldval);
+	return success;
 }
 
 
@@ -586,7 +654,7 @@ string real_path(string const & path)
 	CloseHandle(hmap);
 	CloseHandle(hpath);
 	string const retpath = subst(string(realpath), '\\', '/');
-	return FileName::fromFilesystemEncoding(retpath).absFilename();
+	return FileName::fromFilesystemEncoding(retpath).absFileName();
 }
 
 } // namespace os