Changeset 127

Timestamp:

Sep 17, 2006, 8:25:32 AM (14 years ago)

Author:

Eugene Romanenko

Message:

start browser with external links

Location:

trunk/Lucide

Files:

• BIN/Lucide.lng (modified) (1 diff)
• SOURCE/gui/aboutDlg.cpp (modified) (1 diff)
• SOURCE/gui/docViewer.cpp (modified) (2 diffs)
• SOURCE/gui/linklab.c (modified) (7 diffs)
• SOURCE/gui/luutils.h (modified) (1 diff)
• SOURCE/gui/makefile (modified) (4 diffs)
• SOURCE/gui/messages.cpp (modified) (1 diff)
• SOURCE/gui/messages.h (modified) (1 diff)
• SOURCE/gui/stbrowser.c (added)

trunk/Lucide/BIN/Lucide.lng

@@ -72 +72 @@
 MSGS_FILE_SAVE_ERROR=Error saving file!
 MSGS_PAGE=Page
+MSGS_ERROR_STARTING_BROWSER=Error starting browser!
 
 #

trunk/Lucide/SOURCE/gui/aboutDlg.cpp

@@ -45 +45 @@
 #include "lucide_res.h"
 
-void setLinkPointer( HPOINTER hp );
-void toLink( HWND hwnd );
+extern "C" void setLinkPointer( HPOINTER hp );
+extern "C" void toLink( HWND hwnd );
 BOOL DrawTransparentBitmap( HAB hab, HPS hpsDraw, PPOINTL drawptl, HBITMAP hbmp );
 

trunk/Lucide/SOURCE/gui/docViewer.cpp

@@ -54 +54 @@
 
 // OpenWatcom headers doesn't have GpiDrawBits() declaration
-extern "C" {
+extern "C"
+{
     LONG APIENTRY GpiDrawBits(HPS hps, PVOID pBits, PBITMAPINFO2 pbmiInfoTable,
                               LONG lCount, PPOINTL aptlPoints, LONG lRop, ULONG flOptions);
@@ -1703 +1704 @@
                     if ( links[ pg ]->_buffer[i].link.type == LU_LINK_TYPE_EXTERNAL_URI )
                     {
-                        WinMessageBox( HWND_DESKTOP, hMainFrame,
-                            links[ pg ]->_buffer[i].link.uri, "URI", 1,
-                            MB_OK | MB_INFORMATION | MB_MOVEABLE );
+                        if ( !startBrowser( links[ pg ]->_buffer[i].link.uri ) )
+                        {
+                            char *m = newstrdupL( MSGS_ERROR_STARTING_BROWSER );
+                            WinMessageBox( HWND_DESKTOP, hMainFrame, m,
+                                       NULL, 0, MB_OK | MB_ICONEXCLAMATION | MB_MOVEABLE );
+                            delete m;
+                        }
                     }
                     else if ( links[ pg ]->_buffer[i].link.type == LU_LINK_TYPE_TITLE )

trunk/Lucide/SOURCE/gui/linklab.c

@@ -6 +6 @@
  */
 
-#define INCL_DOS
 #define INCL_WIN
 #define INCL_GPI
@@ -15 +14 @@
 
 
+int startBrowser( const char *url );
+
+
 #define MAXTEXTLEN 256
 
 static HPOINTER handPtr = NULLHANDLE;
-static char browserExe[ CCHMAXPATH ] = "";
-static char browserDir[ CCHMAXPATH ] = "";
 
 typedef struct
@@ -41 +41 @@
                 char *text = (char *)malloc( MAXTEXTLEN );
                 WinQueryWindowText( hwnd, MAXTEXTLEN, text);
-                hps = WinBeginPaint( hwnd , 0L , 0L );
-                GpiQueryFontMetrics( hps , sizeof( FONTMETRICS ) , &fm );
-                memset( &fat , 0 , sizeof( fat ) );
+                hps = WinBeginPaint( hwnd, 0L, 0L );
+                GpiQueryFontMetrics( hps, sizeof( FONTMETRICS ), &fm );
+                memset( &fat, 0, sizeof( fat ) );
                 fat.usRecordLength = sizeof( FATTRS );
                 fat.lMatch = fm.lMatch;
                 fat.fsSelection = FATTR_SEL_UNDERSCORE;
-                strcpy( fat.szFacename , fm.szFacename );
-                GpiDeleteSetId( hps , 1 );
-                GpiCreateLogFont( hps , 0 , 1 , &fat );
-                GpiSetCharSet( hps , 1 );
-                WinQueryWindowRect( hwnd , &ld->textRect );
+                strcpy( fat.szFacename, fm.szFacename );
+                GpiDeleteSetId( hps, 1 );
+                GpiCreateLogFont( hps, 0, 1, &fat );
+                GpiSetCharSet( hps, 1 );
+                WinQueryWindowRect( hwnd, &ld->textRect );
                 style = WinQueryWindowULong( hwnd, QWL_STYLE );
                 style &= DT_LEFT|DT_CENTER|DT_RIGHT|DT_TOP|DT_VCENTER|DT_BOTTOM;
@@ -83 +83 @@
         case WM_BUTTON1CLICK:
             {
-                PROGDETAILS pd;
                 char *text;
                 POINTL ptl;
 
-                if ( strcmp( browserExe, "" ) == 0 )  break;
-
                 ptl.x = SHORT1FROMMP( mp1 );
                 ptl.y = SHORT2FROMMP( mp1 );
-                if ( !WinPtInRect( WinQueryAnchorBlock( hwnd ), &ld->textRect, &ptl) )
+                if ( !WinPtInRect( WinQueryAnchorBlock( hwnd ), &ld->textRect, &ptl) ) {
                     break;
+                }
 
-                if ( ld->url == NULL )
-                {
+                if ( ld->url == NULL ) {
                     text = (char *)malloc( MAXTEXTLEN );
                     WinQueryWindowText( hwnd, MAXTEXTLEN, text);
                 }
-                else  text = strdup( ld->url );
+                else {
+                    text = strdup( ld->url );
+                }
 
-                pd.Length          = sizeof( PROGDETAILS );
-                pd.progt.progc     = PROG_DEFAULT;
-                pd.progt.fbVisible = SHE_VISIBLE;
-                pd.pszTitle        = NULL;
-                pd.pszExecutable   = browserExe;
-                pd.pszParameters   = NULL;
-                pd.pszStartupDir   = ( browserDir[0] == 0 ) ? NULL : browserDir;
-                pd.pszIcon         = NULL;
-                pd.pszEnvironment  = NULL;
-                pd.swpInitial.fl   = SWP_ACTIVATE;
-                pd.swpInitial.cy   = 0;
-                pd.swpInitial.cx   = 0;
-                pd.swpInitial.y    = 0;
-                pd.swpInitial.x    = 0;
-                pd.swpInitial.hwndInsertBehind = HWND_TOP;
-                pd.swpInitial.hwnd             = NULLHANDLE;
-                pd.swpInitial.ulReserved1      = 0;
-                pd.swpInitial.ulReserved2      = 0;
-                WinStartApp( NULLHANDLE , &pd , text , NULL , 0 );
+                startBrowser( text );
+
                 free( text );
             }
@@ -126 +108 @@
         case WM_DESTROY:
             ld->labelProc( hwnd, msg, mp1, mp2 );
-            if ( ld->url != NULL )  free( ld->url );
+            if ( ld->url != NULL ) {
+                free( ld->url );
+            }
             free( ld );
             return (MRESULT)FALSE;
     }
+
     return ld->labelProc( hwnd, msg, mp1, mp2 );
 }
 
-static void detectBrowser( void )
-{
-    char *prfApp = "WPURLDEFAULTSETTINGS";
-
-    if ( strcmp( browserExe, "" ) == 0 )
-    {
-        PrfQueryProfileString( HINI_USER, prfApp, "DefaultBrowserExe", "",
-                               browserExe, CCHMAXPATH );
-        PrfQueryProfileString( HINI_USER, prfApp, "DefaultWorkingDir", "",
-                               browserDir, CCHMAXPATH );
-    }
-
-    if ( strcmp( browserExe, "" ) == 0 )
-    {
-        APIRET rc;
-        rc = DosSearchPath( SEARCH_CUR_DIRECTORY | SEARCH_ENVIRONMENT | SEARCH_IGNORENETERRS ,
-                            "PATH", "NETSCAPE.EXE", browserExe, CCHMAXPATH );
-        if ( rc != 0 )  strcpy( browserExe , "" );
-    }
-}
 
 void setLinkPointer( HPOINTER hp )
@@ -163 +128 @@
 {
     linkData *ld;
-    detectBrowser();
     ld = (linkData *)malloc( sizeof( linkData ) );
     memset( ld, 0, sizeof( linkData ) );
@@ -174 +138 @@
 {
     linkData *ld;
-    detectBrowser();
     ld = (linkData *)malloc( sizeof( linkData ) );
     memset( ld, 0, sizeof( linkData ) );

trunk/Lucide/SOURCE/gui/luutils.h

@@ -87 +87 @@
 #endif
 
+extern "C" int startBrowser( const char *url );
+
 
 #endif // __LUUTILS_H

trunk/Lucide/SOURCE/gui/makefile

@@ -23 +23 @@
 
 .C.OBJ:
-     WPP386 @make.cfg -fo$@ $<
+     WCC386 -zq -zp=4 -bm -sg -fo$@ $<
 
 .idl.xh:
@@ -37 +37 @@
        fontsInfoDlg.obj docInfoDlg.obj findDlg.obj progressDlg.obj \
        aboutDlg.obj settingsDlg.obj lusettings.obj printDlg.obj \
-       print.obj
+       print.obj stbrowser.obj
 
 Lucide.exe: $(OBJS) Lucide.res
@@ -68 +68 @@
 file $(OBJDIR)\intern.obj
 file $(OBJDIR)\messages.obj
+file $(OBJDIR)\stbrowser.obj
 name $(EXEDIR)\Lucide
 lib ..\plugins\ludoc\ludoc
@@ -107 +108 @@
 linklab.obj:        linklab.c
 wwbtn.obj:          wwbtn.c
+stbrowser.obj:      stbrowser.c
 
 

trunk/Lucide/SOURCE/gui/messages.cpp

@@ -62 +62 @@
 const char *MSGS_FILE_SAVE_ERROR  = "MSGS_FILE_SAVE_ERROR";
 const char *MSGS_PAGE             = "MSGS_PAGE";
+const char *MSGS_ERROR_STARTING_BROWSER = "MSGS_ERROR_STARTING_BROWSER";
 
 // Settings dialog

trunk/Lucide/SOURCE/gui/messages.h

@@ -62 +62 @@
 extern const char *MSGS_FILE_SAVE_ERROR;
 extern const char *MSGS_PAGE;
+extern const char *MSGS_ERROR_STARTING_BROWSER;
 
 // Settings dialog