From d8a43cf290af683456dd6736c0f50b114349a3d9 Mon Sep 17 00:00:00 2001 From: Alexander Tkachev Date: Thu, 14 Jul 2016 13:12:33 +0600 Subject: CLOUD: Add openUrl() for POSIX --- backends/networking/browser/openurl-posix.cpp | 77 +++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 backends/networking/browser/openurl-posix.cpp (limited to 'backends/networking/browser/openurl-posix.cpp') diff --git a/backends/networking/browser/openurl-posix.cpp b/backends/networking/browser/openurl-posix.cpp new file mode 100644 index 0000000000..562c1ad53b --- /dev/null +++ b/backends/networking/browser/openurl-posix.cpp @@ -0,0 +1,77 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * 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 the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#define FORBIDDEN_SYMBOL_ALLOW_ALL + +#include "backends/networking/browser/openurl.h" +#include "common/textconsole.h" +#include + +namespace Networking { +namespace Browser { + +namespace { +bool launch(const Common::String client, const Common::String &url) { + // FIXME: system's input must be heavily escaped + // well, when url's specified by user + // it's OK now (urls are hardcoded somewhere in GUI) + Common::String cmd = client + " " + url; + return (system(cmd.c_str()) != -1); +} +} + +bool openUrl(const Common::String &url) { + // inspired by Qt's "qdesktopservices_x11.cpp" + + // try "standards" + if (launch("xdg-open", url)) + return true; + if (launch(getenv("DEFAULT_BROWSER"), url)) + return true; + if (launch(getenv("BROWSER"), url)) + return true; + + // try desktop environment specific tools + if (launch("gnome-open", url)) // gnome + return true; + if (launch("kfmclient openURL", url)) // kde + return true; + if (launch("exo-open", url)) // xfce + return true; + + // try browser names + if (launch("firefox", url)) + return true; + if (launch("mozilla", url)) + return true; + if (launch("netscape", url)) + return true; + if (launch("opera", url)) + return true; + + warning("Networking::Browser::openUrl() (POSIX) failed to open URL"); + return false; +} + +} // End of namespace Browser +} // End of namespace Networking + -- cgit v1.2.3 From 438ba985a4a97a8695a6e6fdda6930694976c07b Mon Sep 17 00:00:00 2001 From: Alexander Tkachev Date: Thu, 21 Jul 2016 11:44:36 +0600 Subject: JANITORIAL: Remove spaces at the end of the line I knew there were some, but I wanted to fix them once, instead of doing it all the time. --- backends/networking/browser/openurl-posix.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'backends/networking/browser/openurl-posix.cpp') diff --git a/backends/networking/browser/openurl-posix.cpp b/backends/networking/browser/openurl-posix.cpp index 562c1ad53b..0e56119b4f 100644 --- a/backends/networking/browser/openurl-posix.cpp +++ b/backends/networking/browser/openurl-posix.cpp @@ -29,7 +29,7 @@ namespace Networking { namespace Browser { -namespace { +namespace { bool launch(const Common::String client, const Common::String &url) { // FIXME: system's input must be heavily escaped // well, when url's specified by user @@ -41,10 +41,10 @@ bool launch(const Common::String client, const Common::String &url) { bool openUrl(const Common::String &url) { // inspired by Qt's "qdesktopservices_x11.cpp" - + // try "standards" if (launch("xdg-open", url)) - return true; + return true; if (launch(getenv("DEFAULT_BROWSER"), url)) return true; if (launch(getenv("BROWSER"), url)) @@ -67,7 +67,7 @@ bool openUrl(const Common::String &url) { return true; if (launch("opera", url)) return true; - + warning("Networking::Browser::openUrl() (POSIX) failed to open URL"); return false; } -- cgit v1.2.3 From 9254df2d9614b2cc8e35a3abbdc593e54616a322 Mon Sep 17 00:00:00 2001 From: Peter Bozsó Date: Thu, 21 Jul 2016 09:29:54 +0200 Subject: CLOUD: Fix code formatting --- backends/networking/browser/openurl-posix.cpp | 62 +++++++++++++-------------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'backends/networking/browser/openurl-posix.cpp') diff --git a/backends/networking/browser/openurl-posix.cpp b/backends/networking/browser/openurl-posix.cpp index 0e56119b4f..429a379fcf 100644 --- a/backends/networking/browser/openurl-posix.cpp +++ b/backends/networking/browser/openurl-posix.cpp @@ -31,45 +31,45 @@ namespace Browser { namespace { bool launch(const Common::String client, const Common::String &url) { - // FIXME: system's input must be heavily escaped - // well, when url's specified by user - // it's OK now (urls are hardcoded somewhere in GUI) - Common::String cmd = client + " " + url; - return (system(cmd.c_str()) != -1); + // FIXME: system's input must be heavily escaped + // well, when url's specified by user + // it's OK now (urls are hardcoded somewhere in GUI) + Common::String cmd = client + " " + url; + return (system(cmd.c_str()) != -1); } } bool openUrl(const Common::String &url) { - // inspired by Qt's "qdesktopservices_x11.cpp" + // inspired by Qt's "qdesktopservices_x11.cpp" - // try "standards" - if (launch("xdg-open", url)) - return true; - if (launch(getenv("DEFAULT_BROWSER"), url)) - return true; - if (launch(getenv("BROWSER"), url)) - return true; + // try "standards" + if (launch("xdg-open", url)) + return true; + if (launch(getenv("DEFAULT_BROWSER"), url)) + return true; + if (launch(getenv("BROWSER"), url)) + return true; - // try desktop environment specific tools - if (launch("gnome-open", url)) // gnome - return true; - if (launch("kfmclient openURL", url)) // kde - return true; - if (launch("exo-open", url)) // xfce - return true; + // try desktop environment specific tools + if (launch("gnome-open", url)) // gnome + return true; + if (launch("kfmclient openURL", url)) // kde + return true; + if (launch("exo-open", url)) // xfce + return true; - // try browser names - if (launch("firefox", url)) - return true; - if (launch("mozilla", url)) - return true; - if (launch("netscape", url)) - return true; - if (launch("opera", url)) - return true; + // try browser names + if (launch("firefox", url)) + return true; + if (launch("mozilla", url)) + return true; + if (launch("netscape", url)) + return true; + if (launch("opera", url)) + return true; - warning("Networking::Browser::openUrl() (POSIX) failed to open URL"); - return false; + warning("Networking::Browser::openUrl() (POSIX) failed to open URL"); + return false; } } // End of namespace Browser -- cgit v1.2.3