Changeset 4e8195 in git

Timestamp:

Jul 20, 2005, 10:00:29 AM (19 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cf2307dc9864719fabb9577ce88d785d229b1eea

Parents:

d3c2f999d4d790673490486a0f05709ba9720804

Message:

Makefile.in
---> htmlhelp API wird gelinkt

fehelp.cc
---> htmlhelp als Standardbrowser für ixWin eingebaut,
      Allozierung von Browserarray auch wenn help.cnf anwesend,
      abhängig von ixWin

sing_win.cc, sing_win.h
---> API Call für HTML Help, Position HTML_DIR/Manual.chm


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

Location:

Singular

Files:

• Makefile.in (modified) (1 diff)
• fehelp.cc (modified) (10 diffs)
• sing_win.cc (modified) (2 diffs)
• sing_win.h (modified) (1 diff)

Singular/Makefile.in

@@ -75 +75 @@
 LIBS            = -lm @NEED_LIBS@ 
 else
-LIBS            = -lsingfac -lsingcf -lntl  -static -lreadline -Xlinker -Bdynamic -lgmp -lcygncurses6 
+LIBS            = -lsingfac -lsingcf -lntl  -static -lreadline -lhtmlhelp -Xlinker -Bdynamic -lgmp -lcygncurses6 
 endif
 MP_LIBS         = @MP_LIBS@

Singular/fehelp.cc

@@ -4 +4 @@
 /*
 * ABSTRACT: help system
-* versin $Id: fehelp.cc,v 1.43 2005-05-06 10:08:43 Singular Exp $
+* versin $Id: fehelp.cc,v 1.44 2005-07-20 08:00:28 wienand Exp $
 */
 
@@ -75 +75 @@
 static void heHtmlHelp(heEntry hentry,int);
 static void heWinHelp(heEntry hentry,int);
+static void heWinHtmlHelp(heEntry hentry,int);
 #include "sing_win.h"
 #endif
@@ -206 +207 @@
     }
     fseek(f,0,SEEK_SET);
+#ifdef ix86_Win
+    // for the 6(!) default browsers
+    heHelpBrowsers=(heBrowser_s*)omAlloc0((br+7)*sizeof(heBrowser_s));
+#else
     // for the 4(!) default browsers
     heHelpBrowsers=(heBrowser_s*)omAlloc0((br+4)*sizeof(heBrowser_s));
+#endif
     br=0;
     while (fgets( buf, sizeof(buf), f))
@@ -232 +238 @@
   {
 #ifdef ix86_Win
-    // for the 6(!) default browsers
-    heHelpBrowsers=(heBrowser_s*)omAlloc0(6*sizeof(heBrowser_s));
+    // for the 7(!) default browsers
+    heHelpBrowsers=(heBrowser_s*)omAlloc0(7*sizeof(heBrowser_s));
 #else
     // for the 4(!) default browsers
@@ -240 +246 @@
   }
 #ifdef ix86_Win
+  heHelpBrowsers[br].browser="htmlhelp";
+  heHelpBrowsers[br].init_proc=heGenInit;
+  heHelpBrowsers[br].help_proc=heWinHtmlHelp;
+  heHelpBrowsers[br].required="h";
+  heHelpBrowsers[br].action=NULL;
+  br++;
   heHelpBrowsers[br].browser="winhlp";
   heHelpBrowsers[br].init_proc=heGenInit;
   heHelpBrowsers[br].help_proc=heWinHelp;
   heHelpBrowsers[br].required="h";
-  //heHelpBrowsers[br].action=NULL;
+  heHelpBrowsers[br].action=NULL;
   br++;
   heHelpBrowsers[br].browser="html";
@@ -250 +262 @@
   heHelpBrowsers[br].help_proc=heHtmlHelp;
   heHelpBrowsers[br].required="h";
-  //heHelpBrowsers[br].action=NULL;
+  heHelpBrowsers[br].action=NULL;
   br++;
 #endif
@@ -257 +269 @@
   heHelpBrowsers[br].help_proc=heBuiltinHelp;
   heHelpBrowsers[br].required="i";
-  //heHelpBrowsers[br].action=NULL;
+  heHelpBrowsers[br].action=NULL;
   br++;
   heHelpBrowsers[br].browser="dummy";
   heHelpBrowsers[br].init_proc=heDummyInit;
   heHelpBrowsers[br].help_proc=heDummyHelp;
-  //heHelpBrowsers[br].required=NULL;
-  //heHelpBrowsers[br].action=NULL;
+  heHelpBrowsers[br].required=NULL;
+  heHelpBrowsers[br].action=NULL;
   br++;
   heHelpBrowsers[br].browser="emacs";
   heHelpBrowsers[br].init_proc=heEmacsInit;
   heHelpBrowsers[br].help_proc=heEmacsHelp;
-  //heHelpBrowsers[br].required=NULL;
-  //heHelpBrowsers[br].action=NULL;
-  //br++;
-  //heHelpBrowsers[br].browser=NULL;
-  //heHelpBrowsers[br].init_proc=NULL;
-  //heHelpBrowsers[br].help_proc=NULL;
-  //heHelpBrowsers[br].required=NULL;
-  //heHelpBrowsers[br].action=NULL;
+  heHelpBrowsers[br].required=NULL;
+  heHelpBrowsers[br].action=NULL;
+  br++;
+  heHelpBrowsers[br].browser=NULL;
+  heHelpBrowsers[br].init_proc=NULL;
+  heHelpBrowsers[br].help_proc=NULL;
+  heHelpBrowsers[br].required=NULL;
+  heHelpBrowsers[br].action=NULL;
 }
 
@@ -701 +713 @@
         hePrintHelpStr(hh,s_help,s);
       }
-      else Print("package %s not found\n",s); 
+      else Print("package %s not found\n",s);
     }
     return FALSE;
@@ -901 +913 @@
   return TRUE;
 }
+
 #ifdef ix86_Win
+
 static void heHtmlHelp(heEntry hentry, int br)
 {
@@ -911 +925 @@
 
   heOpenWinntUrl(url, (html_dir != NULL ? 1 : 0));
+}
+
+static void heWinHtmlHelp(heEntry hentry, int br)
+// Function to call the Microsoft HTML Help System
+// Uses API Call Function in sing_win.cc
+{
+  char keyw[MAX_HE_ENTRY_LENGTH];
+  if ((hentry!=NULL)&&(hentry->key!=NULL))
+    strcpy(keyw,hentry->key);
+  else
+    strcpy(keyw," ");
+  char* helppath = feResource('h' /*"HtmlDir"*/);
+  const char *filename="/Manual.chm";
+  int helppath_len=0;
+  if (helppath!=NULL) helppath_len=strlen(helppath);
+  char *callpath=(char *)omAlloc0(helppath_len+strlen(filename)+1);
+  if ((helppath!=NULL) && (*helppath>' '))
+    strcpy(callpath,helppath);
+  strcat(callpath,filename);
+  heOpenWinHtmlHelp(keyw,callpath);
+  omfree(callpath);
 }
 

Singular/sing_win.cc

@@ -3 +3 @@
 #include <windows.h>
 #include <winuser.h>
+#include <htmlhelp.h>
 #include <sys/cygwin.h>
 #include <stdio.h>
@@ -8 +9 @@
 #define MAXPATHLEN 1024
 #endif
+
+void heOpenWinHtmlHelp(const char* keyw, char* helppath )
+// API Call Sequence for Microsoft HTML Help System
+{
+  char path[MAXPATHLEN];
+#ifdef TEST
+  printf("keyw:%s\n", keyw);
+#endif
+  cygwin_conv_to_full_win32_path(helppath, path);
+#ifdef TEST
+  printf("path:%s\n", path);
+#endif
+HH_AKLINK link;
+   link.cbStruct =     sizeof(HH_AKLINK) ;
+   link.fReserved =    FALSE ;
+   link.pszKeywords =  keyw;
+   link.pszUrl =       NULL ;
+   link.pszMsgText =   NULL ;
+   link.pszMsgTitle =  NULL ;
+   link.pszWindow =    NULL ;
+   link.fIndexOnFail = TRUE ;
+  HtmlHelp(NULL, "..\\html\\Manual.chm", HH_KEYWORD_LOOKUP, (DWORD)&link);
+}
 
 void heOpenWinntHlp(const char* keyw, char* helppath )

Singular/sing_win.h

@@ -4 +4 @@
 #ifdef ix86_Win
 
+void heOpenWinHtmlHelp(const char* keyw, char* helppath );
 void heOpenWinntHlp(const char* keyw, char* helppath );
 void heOpenWinntUrl(const char* url, int local);