Changeset a529d3d in git

Timestamp:

Nov 27, 2013, 6:43:45 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c7bc5eaff214c4b2bb12986bdb87bced28aea9bccfe30abe22f2a184395e76b6d76d31f81a5c84d8

Parents:

6b3f5d8f5808907789567b6bbe03da3cd4e7e899

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-27 18:43:45+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-11-27 18:45:41+01:00

Message:

chg: singularsurf/surf/display instead of gtk-surf

Location:

Singular

Files:

• LIB/surf.lib (modified) (4 diffs)
• singularsurf (added)

Singular/LIB/surf.lib

@@ -70 +70 @@
 "
 {
-  string extra_surf_opts=" -x --auto-resize "; // remove this line for surf 0.9
   string l = "/tmp/surf" + string(system("pid"));
   string err_mes; // string containing error messages
@@ -154 +153 @@
     {
       surf_call = "((xwin -multiwindow -clipboard -silent-dup-error";
-      surf_call = surf_call + " >/dev/null 2>&1 &) && sleep 5 && (surf";
-      if (defined(extra_surf_opts))
-      {
-        surf_call = surf_call + " " + extra_surf_opts;
-      }
+      surf_call = surf_call + " >/dev/null 2>&1 &) && sleep 5 && (sinngularsurf ";
       surf_call = surf_call + l + ">/dev/null 2>&1))";
       surf_call = surf_call + "&& /bin/rm " + l;
@@ -180 +175 @@
   else
   {
-    surf_call = "surf ";
-    if (defined(extra_surf_opts))
-    {
-      surf_call = surf_call + " " + extra_surf_opts;
-    }
+    surf_call = "singularsurf ";
     surf_call = surf_call + l + " >/dev/null 2>&1";
-
-    if (system("uname") == "ppcMac-darwin")
-    {
-       surf_call = surf_call + " || " + "singularsurf "
-                   + extra_surf_opts + " " + l + " >/dev/null 2>&1";
-    }
-
-    "Press q to exit from `surf`.";
+    "Close window to exit from `singularurf`.";
+
     i = system("sh", surf_call);
     if (i != 0)
@@ -199 +184 @@
       err_mes = "calling `surf` failed" + newline
               + " (The shell returned the error code "
-              + string(i) + "." + newline
-              + "  Make sure that the program Surfer is installed.)";
+              + string(i) + ".";
       ERROR(err_mes);
     }