X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Fos_unix.cpp;h=9109fbb58648c0d9cb3e945446718070be939b81;hb=bf56e2c8e1afa857cd5e313c19948040e41b8227;hp=2635d672f8760f2689087bd0e0d96f23aa4fe20f;hpb=4342411297de880ddd4c950c45b91258c78b8635;p=lyx.git

diff --git a/src/support/os_unix.cpp b/src/support/os_unix.cpp
index 2635d672f8..9109fbb586 100644
--- a/src/support/os_unix.cpp
+++ b/src/support/os_unix.cpp
@@ -28,6 +28,8 @@
 
 #ifdef __APPLE__
 #include <CoreServices/CoreServices.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CFArray.h>
 #endif
 
 using namespace std;
@@ -272,43 +274,54 @@ bool autoOpenFile(string const & filename, auto_open_mode const mode,
 {
 #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;
 
-	string const texinputs = os::latex_path_list(
-			replaceCurdirPath(path, lyxrc.texinputs_prefix));
-	string const oldval = getEnv("TEXINPUTS");
-	string const newval = ".:" + texinputs + ":" + oldval;
-	if (!path.empty() && !lyxrc.texinputs_prefix.empty())
-		setEnv("TEXINPUTS", newval);
-
-	LSLaunchFSRefSpec inLaunchSpec;
-	inLaunchSpec.appRef = &outAppRef;
-	inLaunchSpec.numDocs = 1;
-	inLaunchSpec.itemRefs = &fileref;
-	inLaunchSpec.passThruParams = NULL;
-	inLaunchSpec.launchFlags = kLSLaunchDefaults;
-	inLaunchSpec.asyncRefCon = NULL;
-	status = LSOpenFromRefSpec(&inLaunchSpec, NULL);
-
-	if (!path.empty() && !lyxrc.texinputs_prefix.empty())
-		setEnv("TEXINPUTS", oldval);
+	CFURLRef docURLs[] = { docURL };
+	CFArrayRef launchItems = CFArrayCreate(
+		NULL,
+		(const void**)docURLs, sizeof(docURLs) / sizeof(CFURLRef),
+		NULL);
+	LSLaunchURLSpec launchUrlSpec = {
+		appURL, launchItems, NULL, kLSLaunchDefaults, NULL
+	};
 
-	return status != kLSApplicationNotFoundErr;
+	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;