X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_cygwin.cpp;h=c2bdb387a699bd0979511d314f68a05dc2f3e208;hb=522f3517e1d7f61ed2bbcafe0632f50cb3e8ae2f;hp=2f6b9b4b5740ae79a88746afaf6b37fb7d5a47ca;hpb=92f491b3f885f99d93c6753959e481d973627253;p=lyx.git diff --git a/src/support/os_cygwin.cpp b/src/support/os_cygwin.cpp index 2f6b9b4b57..c2bdb387a6 100644 --- a/src/support/os_cygwin.cpp +++ b/src/support/os_cygwin.cpp @@ -15,11 +15,16 @@ #include +#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 #include @@ -38,13 +43,16 @@ using namespace std; namespace lyx { -void emergencyCleanup(); +void lyx_exit(int); namespace support { 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 @@ -112,7 +120,7 @@ string convert_path_list(string const & p, PathStyle const & target) char * ptr = new char[size]; if (ptr && cygwin_conv_path_list(target, pc, ptr, size) == 0) { string const path_list = subst(ptr, '\\', '/'); - delete ptr; + delete [] ptr; return path_list; } else lyxerr << "LyX: Cannot convert path list: " << p << endl; @@ -178,7 +186,7 @@ string convert_path_list(string const & p, PathStyle const & target) cygwin_posix_to_win32_path_list(pc, ptr); string path_list = subst(ptr, '\\', '/'); - delete ptr; + delete [] ptr; return path_list; } } @@ -194,7 +202,7 @@ BOOL terminate_handler(DWORD event) if (event == CTRL_CLOSE_EVENT || event == CTRL_LOGOFF_EVENT || event == CTRL_SHUTDOWN_EVENT) { - lyx::emergencyCleanup(); + lyx::lyx_exit(1); return TRUE; } return FALSE; @@ -202,8 +210,15 @@ BOOL terminate_handler(DWORD event) } // namespace anon -void init(int, char *[]) +void init(int argc, char * argv[]) { + argc_ = argc; + argv_ = argv; + + // Set environment's default locale + setlocale(LC_ALL, ""); + setlocale(LC_NUMERIC, "C"); + // Make sure that the TEMP variable is set // and sync the Windows environment. setenv("TEMP", "/tmp", false); @@ -214,6 +229,17 @@ void init(int, char *[]) } +string utf8_argv(int i) +{ + LASSERT(i < argc_, return ""); + return to_utf8(from_local8bit(argv_[i])); +} + + +void remove_internal_args(int, int) +{} + + string current_root() { return string("/"); @@ -290,6 +316,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 +351,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 +396,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 +433,51 @@ 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 otherinputs = os::latex_path_list(path); + string const sep = windows_style_tex_paths_ ? ";" : ":"; + string const oldtexinputs = getEnv("TEXINPUTS"); + string const newtexinputs = "." + sep + texinputs + sep + oldtexinputs; + string const oldbibinputs = getEnv("BIBINPUTS"); + string const newbibinputs = "." + sep + otherinputs + sep + oldbibinputs; + string const oldbstinputs = getEnv("BSTINPUTS"); + string const newbstinputs = "." + sep + otherinputs + sep + oldbstinputs; + string const oldtexfonts = getEnv("TEXFONTS"); + string const newtexfonts = "." + sep + otherinputs + sep + oldtexfonts; + if (!path.empty() && !lyxrc.texinputs_prefix.empty()) { + setEnv("TEXINPUTS", newtexinputs); + setEnv("BIBINPUTS", newbibinputs); + setEnv("BSTINPUTS", newbstinputs); + setEnv("TEXFONTS", newtexfonts); + cygwin_internal(CW_SYNC_WINENV); + } + + string win_path; + try { + win_path = to_local8bit(from_utf8(convert_path(filename, PathStyle(windows)))); + } catch (...) { + LYXERR0("Cannot encode file name `" << filename << "' to local 8 bit encoding"); + return false; + } + + // 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(ShellExecute(NULL, action, - win_path.c_str(), NULL, NULL, 1)) > 32; + bool success = reinterpret_cast(ShellExecute(NULL, action, + win_path.c_str(), NULL, NULL, 1)) > 32; + + if (!path.empty() && !lyxrc.texinputs_prefix.empty()) { + setEnv("TEXINPUTS", oldtexinputs); + setEnv("BIBINPUTS", oldbibinputs); + setEnv("BSTINPUTS", oldbstinputs); + setEnv("TEXFONTS", oldtexfonts); + cygwin_internal(CW_SYNC_WINENV); + } + return success; } @@ -405,7 +485,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