X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_cygwin.cpp;h=1de0da6ef195c50c58d6b2a7964c09ce9867b832;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=bd84776e76d65ead4ee5d07b4759148962d23032;hpb=0695afbc55d4f9ea1633ff44ae6ee82f9a646ed8;p=lyx.git diff --git a/src/support/os_cygwin.cpp b/src/support/os_cygwin.cpp index bd84776e76..1de0da6ef1 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 @@ -29,19 +34,25 @@ #include #include +#include #include +#include + 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 @@ -62,6 +73,63 @@ bool is_windows_path(string const & p) } +// Starting from Cygwin 1.7, new APIs for path conversions were introduced. +// The old ones are now deprecated, so avoid them if we detect a modern Cygwin. + +#if CYGWIN_VERSION_DLL_MAJOR >= 1007 + +enum PathStyle { + posix = CCP_WIN_A_TO_POSIX | CCP_RELATIVE, + windows = CCP_POSIX_TO_WIN_A | CCP_RELATIVE +}; + + +/// Convert a path to or from posix style. +/// \p p is encoded in local 8bit encoding or utf8. +/// The result is returned in the same encoding as \p p. +string convert_path(string const & p, PathStyle const & target) +{ + if ((target == posix && is_posix_path(p)) || + (target == windows && is_windows_path(p))) + return p; + + char path_buf[PATH_MAX]; + + // cygwin_conv_path does not care about the encoding. + if (cygwin_conv_path(target, p.c_str(), path_buf, sizeof(path_buf))) { + lyxerr << "LyX: Cannot convert path: " << p << endl; + return subst(p, '\\', '/'); + } + return subst(path_buf, '\\', '/'); +} + + +/// Convert a path list to or from posix style. +/// \p p is encoded in local 8bit encoding or utf8. +/// The result is returned in the same encoding as \p p. +string convert_path_list(string const & p, PathStyle const & target) +{ + if (p.empty()) + return p; + + char const * const pc = p.c_str(); + PathStyle const actual = cygwin_posix_path_list_p(pc) ? posix : windows; + + if (target != actual) { + int const size = cygwin_conv_path_list(target, pc, NULL, 0); + char * ptr = new char[size]; + if (ptr && cygwin_conv_path_list(target, pc, ptr, size) == 0) { + string const path_list = subst(ptr, '\\', '/'); + delete [] ptr; + return path_list; + } else + lyxerr << "LyX: Cannot convert path list: " << p << endl; + } + return subst(p, '\\', '/'); +} + +#else + enum PathStyle { posix, windows @@ -118,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; } } @@ -126,13 +194,15 @@ string convert_path_list(string const & p, PathStyle const & target) return subst(p, '\\', '/'); } +#endif + 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; @@ -140,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); @@ -152,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("/"); @@ -228,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)); @@ -257,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('%'); @@ -289,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 ':'; } @@ -329,13 +433,46 @@ 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); + } + + QString const win_path = + toqstr(convert_path(filename, PathStyle(windows))); + // 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; + wchar_t const * action = (mode == VIEW) ? L"open" : L"edit"; + bool success = reinterpret_cast(ShellExecuteW(NULL, action, + reinterpret_cast(win_path.utf16()), + 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; } @@ -343,7 +480,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