X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_cygwin.cpp;h=b1c2fefd88de30d68700c028ab232b15e0700708;hb=f1ab5dfc5878bc736fd185279a0ef7a185b2d8d8;hp=f402cbfce5f996d5c7bd721cc2265884fb435b19;hpb=4c92ec8383d2e050e44cdf96320804edf86425ba;p=lyx.git

diff --git a/src/support/os_cygwin.cpp b/src/support/os_cygwin.cpp
index f402cbfce5..b1c2fefd88 100644
--- a/src/support/os_cygwin.cpp
+++ b/src/support/os_cygwin.cpp
@@ -15,11 +15,16 @@
 
 #include <config.h>
 
+#include "LyXRC.h"
+
 #include "support/os.h"
 
+#include "support/debug.h"
+#include "support/environment.h"
 #include "support/FileName.h"
+#include "support/filetools.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
-#include "support/debug.h"
 
 #include <windows.h>
 #include <io.h>
@@ -45,6 +50,9 @@ namespace os {
 
 namespace {
 
+int argc_ = 0;
+char ** argv_ = 0;
+
 bool windows_style_tex_paths_ = false;
 
 // In both is_posix_path() and is_windows_path() it is assumed that
@@ -202,8 +210,11 @@ BOOL terminate_handler(DWORD event)
 
 } // namespace anon
 
-void init(int, char *[])
+void init(int argc, char * argv[])
 {
+	argc_ = argc;
+	argv_ = argv;
+
 	// Make sure that the TEMP variable is set
 	// and sync the Windows environment.
 	setenv("TEMP", "/tmp", false);
@@ -214,6 +225,17 @@ void init(int, char *[])
 }
 
 
+string utf8_argv(int i)
+{
+	LASSERT(i < argc_, /**/);
+	return to_utf8(from_local8bit(argv_[i]));
+}
+
+
+void remove_internal_args(int, int)
+{}
+
+
 string current_root()
 {
 	return string("/");
@@ -290,6 +312,12 @@ string internal_path(string const & p)
 }
 
 
+string safe_internal_path(string const & p, file_access)
+{
+	return convert_path(p, PathStyle(posix));
+}
+
+
 string external_path_list(string const & p)
 {
 	return convert_path_list(p, PathStyle(posix));
@@ -319,6 +347,19 @@ string latex_path(string const & p)
 }
 
 
+string latex_path_list(string const & 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_)
+		return convert_path_list(p, PathStyle(windows));
+
+	return convert_path_list(p, PathStyle(posix));
+}
+
+
 bool is_valid_strftime(string const & p)
 {
 	string::size_type pos = p.find_first_of('%');
@@ -351,20 +392,17 @@ string const & nulldev()
 }
 
 
-bool is_terminal(io_channel channel)
-{
-	return isatty(channel);
-}
-
-
 shell_type shell()
 {
 	return UNIX;
 }
 
 
-char path_separator()
+char path_separator(path_type type)
 {
+	if (type == TEXENGINE)
+		return windows_style_tex_paths_ ? ';' : ':';
+
 	return ':';
 }
 
@@ -391,13 +429,30 @@ 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);
+		cygwin_internal(CW_SYNC_WINENV);
+	}
+
 	// reference: http://msdn.microsoft.com/en-us/library/bb762153.aspx
 	string const win_path = to_local8bit(from_utf8(convert_path(filename, PathStyle(windows))));
 	char const * action = (mode == VIEW) ? "open" : "edit";
-	return reinterpret_cast<int>(ShellExecute(NULL, action,
-		win_path.c_str(), NULL, NULL, 1)) > 32;
+	bool success = reinterpret_cast<int>(ShellExecute(NULL, action,
+					win_path.c_str(), NULL, NULL, 1)) > 32;
+
+	if (!path.empty() && !lyxrc.texinputs_prefix.empty()) {
+		setEnv("TEXINPUTS", oldval);
+		cygwin_internal(CW_SYNC_WINENV);
+	}
+	return success;
 }
 
 
@@ -405,7 +460,7 @@ string real_path(string const & path)
 {
 	char rpath[PATH_MAX + 1];
 	char * result = realpath(path.c_str(), rpath);
-	return FileName::fromFilesystemEncoding(result ? rpath : path).absFilename();
+	return FileName::fromFilesystemEncoding(result ? rpath : path).absFileName();
 }
 
 } // namespace os