Changeset a529d3d in git


Ignore:
Timestamp:
Nov 27, 2013, 6:43:45 PM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
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:
1 added
1 edited

Legend:

Unmodified
Added
Removed
  • Singular/LIB/surf.lib

    r6b3f5d ra529d3d  
    7070"
    7171{
    72   string extra_surf_opts=" -x --auto-resize "; // remove this line for surf 0.9
    7372  string l = "/tmp/surf" + string(system("pid"));
    7473  string err_mes; // string containing error messages
     
    154153    {
    155154      surf_call = "((xwin -multiwindow -clipboard -silent-dup-error";
    156       surf_call = surf_call + " >/dev/null 2>&1 &) && sleep 5 && (surf";
    157       if (defined(extra_surf_opts))
    158       {
    159         surf_call = surf_call + " " + extra_surf_opts;
    160       }
     155      surf_call = surf_call + " >/dev/null 2>&1 &) && sleep 5 && (sinngularsurf ";
    161156      surf_call = surf_call + l + ">/dev/null 2>&1))";
    162157      surf_call = surf_call + "&& /bin/rm " + l;
     
    180175  else
    181176  {
    182     surf_call = "surf ";
    183     if (defined(extra_surf_opts))
    184     {
    185       surf_call = surf_call + " " + extra_surf_opts;
    186     }
     177    surf_call = "singularsurf ";
    187178    surf_call = surf_call + l + " >/dev/null 2>&1";
    188 
    189     if (system("uname") == "ppcMac-darwin")
    190     {
    191        surf_call = surf_call + " || " + "singularsurf "
    192                    + extra_surf_opts + " " + l + " >/dev/null 2>&1";
    193     }
    194 
    195     "Press q to exit from `surf`.";
     179    "Close window to exit from `singularurf`.";
     180
    196181    i = system("sh", surf_call);
    197182    if (i != 0)
     
    199184      err_mes = "calling `surf` failed" + newline
    200185              + " (The shell returned the error code "
    201               + string(i) + "." + newline
    202               + "  Make sure that the program Surfer is installed.)";
     186              + string(i) + ".";
    203187      ERROR(err_mes);
    204188    }
Note: See TracChangeset for help on using the changeset viewer.