Changeset ef0124 in git for Singular/fehelp.cc

Timestamp:

May 5, 2000, 8:40:34 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

ba9453910d26fdb676fa083bc02d866111ea5ece

Parents:

f9bfec9b7263804ac776257b32087185168b1000

Message:

*** empty log message ***


git-svn-id: file:///usr/local/Singular/svn/trunk@4290 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/fehelp.cc (modified) (14 diffs)

Singular/fehelp.cc

@@ -23 +23 @@
 #include "feOpt.h"
 
+
 /*****************************************************************
  *
@@ -64 +65 @@
 // browser functions
 static BOOLEAN heInfoInit(int);    static void heInfoHelp(heEntry hentry);
-#if ! defined(WINNT) && ! defined(macintosh)
+#if ! defined(macintosh)
 static BOOLEAN heNetscapeInit(int);static void heNetscapeHelp(heEntry hentry);
 static BOOLEAN heXinfoInit(int);   static void heXinfoHelp(heEntry hentry);
@@ -73 +74 @@
 static BOOLEAN heEmacsInit(int);   static void heEmacsHelp(heEntry hentry);
 
+#ifdef WINNT
+static void heHtmlHelp(heEntry hentry);
+extern "C" void heOpenWinntUrl(const char* url, int local);
+#endif
+
 static heBrowser heCurrentHelpBrowser = NULL;
 
@@ -84 +90 @@
 static heBrowser_s heHelpBrowsers[] =
 {
-#if ! defined(WINNT) && ! defined(macintosh)
+#ifdef WINNT
+  { "html",     heDummyInit,    heHtmlHelp},
+#endif
+#if ! defined(macintosh)
   { "netscape", heNetscapeInit, heNetscapeHelp},
   { "tkinfo",   heTkinfoInit,   heTkinfoHelp},
@@ -732 +741 @@
 }
 
-#if ! defined(WINNT) && ! defined(macintosh)
+#if ! defined(macintosh)
 static BOOLEAN heNetscapeInit(int warn)
 {
@@ -740 +749 @@
     return FALSE;
   }
+#ifndef WINNT
   if (getenv("DISPLAY") == NULL)
   {
@@ -746 +756 @@
     return FALSE;
   }
-
+#endif
   
   if (feResource('h' /*"HtmlDir"*/, (feOptValue(FE_OPT_ALLOW_NET)? 0 : warn)) 
@@ -787 +797 @@
     sprintf(url, "%s%s/index.htm", urltype, htmldir);
   }
+#ifndef WINNT
   sprintf(sys, "%s --remote 'OpenUrl(%s)' > /dev/null 2>&1",
+#else
+  sprintf(sys, "%s %s", 
+#endif
           feResource('N' /*"netscape"*/), url);
 
@@ -805 +819 @@
 }
 
+#ifdef WINNT
+static void heHtmlHelp(heEntry hentry)
+{
+  char url[MAXPATHLEN];
+  char* html_dir = feResource('h' /*"HtmlDir"*/);
+  sprintf(url, "%s/%s",
+          (html_dir != NULL ? html_dir : feResource('u' /*"ManualUrl"*/)),
+          (hentry!=NULL && *(hentry->url)!='\0' ? hentry->url : "index.htm"));
+
+  heOpenWinntUrl(url, (html_dir != NULL ? 1 : 0));
+}
+#endif
+
 static BOOLEAN heXinfoInit(int warn)
 {
+#ifndef WINNT
   if (getenv("DISPLAY") == NULL)
   {
@@ -813 +841 @@
     return FALSE;
   }
+#endif
   if (feResource('i', warn) == NULL)
   {
@@ -834 +863 @@
   char sys[MAX_SYSCMD_LEN];
 
+#ifdef WINNT 
+#define EXTRA_XTERM_ARGS "+vb -sb -fb Courier-bold-13 -tn linux -cr Red3"
+#else
+#define EXTRA_XTERM_ARGS ""
+#endif
+
   if (hentry != NULL && *(hentry->key) != '\0')
   {
     if (*(hentry->node) != '\0')
-      sprintf(sys, "%s -e %s -f %s --node='%s' &",
-              feResource('X'), feResource('I'), feResource('i'), hentry->node);
+      sprintf(sys, "%s %s -e %s -f %s --node='%s' &",
+              feResource('X'), EXTRA_XTERM_ARGS, 
+              feResource('I'), feResource('i'), hentry->node);
     else
-      sprintf(sys, "%s -e %s -f %s Index '%s' &",
-              feResource('X'), feResource('I'), feResource('i'), hentry->key);
+      sprintf(sys, "%s %s -e %s -f %s Index '%s' &",
+              feResource('X'), EXTRA_XTERM_ARGS,
+              feResource('I'), feResource('i'), hentry->key);
   }
   else
-    sprintf(sys, "%s -e %s -f %s --node=Top &",
-            feResource('X'), feResource('I'), feResource('i'));
+    sprintf(sys, "%s %s -e %s -f %s --node=Top &",
+            feResource('X'), EXTRA_XTERM_ARGS,
+            feResource('I'), feResource('i'));
   system(sys);
 }
@@ -851 +889 @@
 static BOOLEAN heTkinfoInit(int warn)
 {
+#ifndef WINNT
   if (getenv("DISPLAY") == NULL)
   {
@@ -857 +896 @@
     return FALSE;
   }
+#endif
   if (feResource('i', warn) == NULL)
   {
@@ -884 +924 @@
   system(sys);
 }
-#endif // ! defined(WINNT) && ! defined(macintosh)
+#endif // ! defined(macintosh)
 
 static BOOLEAN heDummyInit(int warn)