X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_unix.cpp;h=5a6c21fe63e72e98ca31e278e1c56ab3b8ba5d5f;hb=cc2835392294fb1e82a89b2ec3803f78c9183f18;hp=a9c040c6c9580ea2d366569c67e7b313b12564ad;hpb=b0936fac4c9897d647561f05af6ec09c3d7f1f05;p=lyx.git diff --git a/src/support/os_unix.cpp b/src/support/os_unix.cpp index a9c040c6c9..5a6c21fe63 100644 --- a/src/support/os_unix.cpp +++ b/src/support/os_unix.cpp @@ -12,17 +12,24 @@ #include +#include "LyXRC.h" + #include "support/os.h" #include "support/docstring.h" +#include "support/environment.h" #include "support/FileName.h" +#include "support/filetools.h" #include "support/lstrings.h" +#include "support/lassert.h" #include +#include #include -#include #ifdef __APPLE__ -#include +#include +#include +#include #endif using namespace std; @@ -31,7 +38,32 @@ namespace lyx { namespace support { namespace os { -void init(int, char *[]) +namespace { + +int argc_ = 0; +char ** argv_ = 0; + +} // namespace + +void init(int argc, char ** argv[]) +{ + argc_ = argc; + argv_ = *argv; + + // Set environment's default locale + setlocale(LC_ALL, ""); + setlocale(LC_NUMERIC, "C"); +} + + +string utf8_argv(int i) +{ + LASSERT(i < argc_, return ""); + return to_utf8(from_local8bit(argv_[i])); +} + + +void remove_internal_args(int, int) {} @@ -56,8 +88,13 @@ docstring::size_type common_path(docstring const & p1, docstring const & p2) docstring::size_type i = 0; docstring::size_type const p1_len = p1.length(); docstring::size_type const p2_len = p2.length(); +#ifdef __APPLE__ + while (i < p1_len && i < p2_len && uppercase(p1[i]) == uppercase(p2[i])) + ++i; +#else while (i < p1_len && i < p2_len && p1[i] == p2[i]) ++i; +#endif if ((i < p1_len && i < p2_len) || (i < p1_len && p1[i] != '/' && i == p2_len) || (i < p2_len && p2[i] != '/' && i == p1_len)) @@ -71,6 +108,49 @@ docstring::size_type common_path(docstring const & p1, docstring const & p2) } +bool path_prefix_is(string const & path, string const & pre) +{ +#ifdef __APPLE__ + return path_prefix_is(const_cast(path), pre, CASE_UNCHANGED); +#else + return prefixIs(path, pre); +#endif +} + + +bool path_prefix_is(string & path, string const & pre, path_case how) +{ +#ifdef __APPLE__ + docstring const p1 = from_utf8(path); + docstring const p2 = from_utf8(pre); + docstring::size_type const p1_len = p1.length(); + docstring::size_type const p2_len = p2.length(); + docstring::size_type common_len = common_path(p1, p2); + + if (p2[p2_len - 1] == '/' && p1_len != p2_len) + ++common_len; + + if (common_len != p2_len) + return false; + + if (how == CASE_ADJUSTED && !prefixIs(path, pre)) { + if (p1_len < common_len) + path = to_utf8(p2.substr(0, p1_len)); + else + path = to_utf8(p2 + p1.substr(common_len, + p1_len - common_len)); + } + + return true; +#else + // silence compiler warnings + (void)how; + + return prefixIs(path, pre); +#endif +} + + string external_path(string const & p) { return p; @@ -83,6 +163,12 @@ string internal_path(string const & p) } +string safe_internal_path(string const & p, file_access) +{ + return p; +} + + string external_path_list(string const & p) { return p; @@ -101,6 +187,12 @@ string latex_path(string const & p) } +string latex_path_list(string const & p) +{ + return p; +} + + bool is_valid_strftime(string const & p) { string::size_type pos = p.find_first_of('%'); @@ -137,7 +229,7 @@ shell_type shell() } -char path_separator() +char path_separator(path_type) { return ':'; } @@ -177,41 +269,64 @@ 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) { #ifdef __APPLE__ // Reference: http://developer.apple.com/documentation/Carbon/Reference/LaunchServicesReference/ - FSRef fileref; - OSStatus status = - FSPathMakeRef((UInt8 *) filename.c_str(), &fileref, NULL); - if (status != 0) - return false; - // this is what we would like to do but it seems that the // viewer for PDF is often quicktime... //LSRolesMask role = (mode == VIEW) ? kLSRolesViewer : kLSRolesEditor; (void)mode; LSRolesMask role = kLSRolesAll; - FSRef outAppRef; - status = LSGetApplicationForItem(&fileref, role, &outAppRef, NULL); + CFURLRef docURL = CFURLCreateFromFileSystemRepresentation( + NULL, (UInt8 *) filename.c_str(), filename.size(), false); + CFURLRef appURL; + OSStatus status = LSGetApplicationForURL(docURL, role, NULL, &appURL); if (status == kLSApplicationNotFoundErr) return false; - LSLaunchFSRefSpec inLaunchSpec; - inLaunchSpec.appRef = &outAppRef; - inLaunchSpec.numDocs = 1; - inLaunchSpec.itemRefs = &fileref; - inLaunchSpec.passThruParams = NULL; - inLaunchSpec.launchFlags = kLSLaunchDefaults; - inLaunchSpec.asyncRefCon = NULL; - status = LSOpenFromRefSpec(&inLaunchSpec, NULL); - - return status != kLSApplicationNotFoundErr; + CFURLRef docURLs[] = { docURL }; + CFArrayRef launchItems = CFArrayCreate( + NULL, + (const void**)docURLs, sizeof(docURLs) / sizeof(CFURLRef), + NULL); + LSLaunchURLSpec launchUrlSpec = { + appURL, launchItems, NULL, kLSLaunchDefaults, NULL + }; + + string const texinputs = os::latex_path_list( + replaceCurdirPath(path, lyxrc.texinputs_prefix)); + string const otherinputs = os::latex_path_list(path); + string const oldtexinputs = getEnv("TEXINPUTS"); + string const newtexinputs = ".:" + texinputs + ":" + oldtexinputs; + string const oldbibinputs = getEnv("BIBINPUTS"); + string const newbibinputs = ".:" + otherinputs + ":" + oldbibinputs; + string const oldbstinputs = getEnv("BSTINPUTS"); + string const newbstinputs = ".:" + otherinputs + ":" + oldbstinputs; + string const oldtexfonts = getEnv("TEXFONTS"); + string const newtexfonts = ".:" + otherinputs + ":" + oldtexfonts; + if (!path.empty() && !lyxrc.texinputs_prefix.empty()) { + setEnv("TEXINPUTS", newtexinputs); + setEnv("BIBINPUTS", newbibinputs); + setEnv("BSTINPUTS", newbstinputs); + setEnv("TEXFONTS", newtexfonts); + } + status = LSOpenFromURLSpec (&launchUrlSpec, NULL); + CFRelease(launchItems); + if (!path.empty() && !lyxrc.texinputs_prefix.empty()) { + setEnv("TEXINPUTS", oldtexinputs); + setEnv("BIBINPUTS", oldbibinputs); + setEnv("BSTINPUTS", oldbstinputs); + setEnv("TEXFONTS", oldtexfonts); + } + return status == 0; #else // silence compiler warnings (void)filename; (void)mode; + (void)path; // currently, no default viewer is tried for non-windows system // support for KDE/Gnome/Macintosh may be added later @@ -220,26 +335,18 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode) } -bool isSameFile(string const & fileone, string const & filetwo) -{ - struct stat st1; - struct stat st2; - - if (::stat(fileone.c_str(), &st1) == 0 - && ::stat(filetwo.c_str(), &st2) == 0) { - return st1.st_ino == st2.st_ino && st1.st_dev == st2.st_dev; - } - - // One or both files cannot be accessed. - return false; -} - - string real_path(string const & path) { +#ifdef HAVE_DEF_PATH_MAX 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(); +#else + char * result = realpath(path.c_str(), NULL); + string ret = FileName::fromFilesystemEncoding(result ? result : path).absFileName(); + free(result); + return ret; +#endif } } // namespace os