X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fopenuri.cc;h=0d744ae50d56bac379296865988eb01ac670cd5a;hb=7258c6334db4e8c895fc556ae1ed550f0c70ead1;hp=45154d0ad1b1501357b3e8f74294383ca89b0892;hpb=e701adea419300f2cf7e760f14e7b17b9046b478;p=ardour.git

diff --git a/libs/pbd/openuri.cc b/libs/pbd/openuri.cc
index 45154d0ad1..0d744ae50d 100644
--- a/libs/pbd/openuri.cc
+++ b/libs/pbd/openuri.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Paul Davis 
+    Copyright (C) 2012 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -28,11 +28,23 @@
 #include "pbd/epa.h"
 #include "pbd/openuri.h"
 
+#ifdef __APPLE__
+#include <curl/curl.h>
+	extern bool cocoa_open_url (const char*);
+#endif
+
+#ifdef PLATFORM_WINDOWS
+	#include <windows.h>
+	#include <shellapi.h>
+#endif
+
 bool
 PBD::open_uri (const char* uri)
 {
-#ifdef __APPLE__
-	extern bool cocoa_open_url (const char*);
+#ifdef PLATFORM_WINDOWS
+	ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOWNORMAL);
+	return true;
+#elif __APPLE__
 	return cocoa_open_url (uri);
 #else
 	EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
@@ -46,17 +58,41 @@ PBD::open_uri (const char* uri)
 		global_epa->restore ();
 	}
 
+	std::string s(uri);
+	while (s.find("\\") != std::string::npos)
+		s.replace(s.find("\\"), 1, "\\\\");
+	while (s.find("\"") != std::string::npos)
+		s.replace(s.find("\\"), 1, "\\\"");
+
 	std::string command = "xdg-open ";
-	command += uri;
+	command += '"' + s + '"';
 	command += " &";
-	system (command.c_str());
+	(void) system (command.c_str());
 
 	return true;
 #endif
 }
 
 bool
-PBD::open_uri (const std::string& uri) 
+PBD::open_uri (const std::string& uri)
 {
 	return open_uri (uri.c_str());
 }
+
+bool
+PBD::open_folder (const std::string& d)
+{
+#ifdef __APPLE__
+	CURL *curl = curl_easy_init ();
+	bool rv = false;
+	if (curl) {
+		char * e = curl_easy_escape (curl, d.c_str(), d.size());
+		std::string url = "file:///" + std::string(e);
+		rv = PBD::open_uri (url);
+		curl_free (e);
+	}
+	return rv;
+#else
+	return PBD::open_uri (d);
+#endif
+}