Use xdg-open in PApplet#launch(String)

GKFX · GKFX · commit 87458bd7b503 · 2015-11-25T20:00:37.000Z
diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java
@@ -3351,11 +3351,6 @@ public void frameRate(float fps) {
    * <p>
    * When run with an applet, uses the browser to open the url,
    * for applications, attempts to launch a browser with the url.
-   * <p>
-   * Works on Mac OS X and Windows. For Linux, use:
-   * <PRE>open(new String[] { "firefox", url });</PRE>
-   * or whatever you want as your browser, since Linux doesn't
-   * yet have a standard method for launching URLs.
    *
    * @param url the complete URL, as a String in quotes
    */
@@ -3430,25 +3425,20 @@ static public Process launch(String... args) {
       params = new String[] { "open" };
 
     } else if (platform == LINUX) {
-      if (openLauncher == null) {
-        // Attempt to use gnome-open
+      // xdg-open is in the Free Desktop Specification and really should just
+      // work on desktop Linux. Not risking it though.
+      final String[] launchers = {"xdg-open", "gnome-open", "kde-open"};
+      for (String l : launchers) {
+        if (openLauncher != null) break;
         try {
-          Process p = Runtime.getRuntime().exec(new String[] { "gnome-open" });
+          Process p = Runtime.getRuntime().exec(new String[] { l });
           /*int result =*/ p.waitFor();
           // Not installed will throw an IOException (JDK 1.4.2, Ubuntu 7.04)
-          openLauncher = "gnome-open";
-        } catch (Exception e) { }
-      }
-      if (openLauncher == null) {
-        // Attempt with kde-open
-        try {
-          Process p = Runtime.getRuntime().exec(new String[] { "kde-open" });
-          /*int result =*/ p.waitFor();
-          openLauncher = "kde-open";
+          openLauncher = l;
         } catch (Exception e) { }
       }
       if (openLauncher == null) {
-        System.err.println("Could not find gnome-open or kde-open, " +
+        System.err.println("Could not find xdg-, gnome-, or kde-open: " +
                            "the open() command may not work.");
       }
       if (openLauncher != null) {
