Changeset 127
- Timestamp:
- Sep 17, 2006, 8:25:32 AM (14 years ago)
- Location:
- trunk/Lucide
- Files:
-
- 1 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Lucide/BIN/Lucide.lng
r123 r127 72 72 MSGS_FILE_SAVE_ERROR=Error saving file! 73 73 MSGS_PAGE=Page 74 MSGS_ERROR_STARTING_BROWSER=Error starting browser! 74 75 75 76 # -
trunk/Lucide/SOURCE/gui/aboutDlg.cpp
r91 r127 45 45 #include "lucide_res.h" 46 46 47 void setLinkPointer( HPOINTER hp );48 void toLink( HWND hwnd );47 extern "C" void setLinkPointer( HPOINTER hp ); 48 extern "C" void toLink( HWND hwnd ); 49 49 BOOL DrawTransparentBitmap( HAB hab, HPS hpsDraw, PPOINTL drawptl, HBITMAP hbmp ); 50 50 -
trunk/Lucide/SOURCE/gui/docViewer.cpp
r126 r127 54 54 55 55 // OpenWatcom headers doesn't have GpiDrawBits() declaration 56 extern "C" { 56 extern "C" 57 { 57 58 LONG APIENTRY GpiDrawBits(HPS hps, PVOID pBits, PBITMAPINFO2 pbmiInfoTable, 58 59 LONG lCount, PPOINTL aptlPoints, LONG lRop, ULONG flOptions); … … 1703 1704 if ( links[ pg ]->_buffer[i].link.type == LU_LINK_TYPE_EXTERNAL_URI ) 1704 1705 { 1705 WinMessageBox( HWND_DESKTOP, hMainFrame, 1706 links[ pg ]->_buffer[i].link.uri, "URI", 1, 1707 MB_OK | MB_INFORMATION | MB_MOVEABLE ); 1706 if ( !startBrowser( links[ pg ]->_buffer[i].link.uri ) ) 1707 { 1708 char *m = newstrdupL( MSGS_ERROR_STARTING_BROWSER ); 1709 WinMessageBox( HWND_DESKTOP, hMainFrame, m, 1710 NULL, 0, MB_OK | MB_ICONEXCLAMATION | MB_MOVEABLE ); 1711 delete m; 1712 } 1708 1713 } 1709 1714 else if ( links[ pg ]->_buffer[i].link.type == LU_LINK_TYPE_TITLE ) -
trunk/Lucide/SOURCE/gui/linklab.c
r35 r127 6 6 */ 7 7 8 #define INCL_DOS9 8 #define INCL_WIN 10 9 #define INCL_GPI … … 15 14 16 15 16 int startBrowser( const char *url ); 17 18 17 19 #define MAXTEXTLEN 256 18 20 19 21 static HPOINTER handPtr = NULLHANDLE; 20 static char browserExe[ CCHMAXPATH ] = "";21 static char browserDir[ CCHMAXPATH ] = "";22 22 23 23 typedef struct … … 41 41 char *text = (char *)malloc( MAXTEXTLEN ); 42 42 WinQueryWindowText( hwnd, MAXTEXTLEN, text); 43 hps = WinBeginPaint( hwnd , 0L, 0L );44 GpiQueryFontMetrics( hps , sizeof( FONTMETRICS ), &fm );45 memset( &fat , 0, sizeof( fat ) );43 hps = WinBeginPaint( hwnd, 0L, 0L ); 44 GpiQueryFontMetrics( hps, sizeof( FONTMETRICS ), &fm ); 45 memset( &fat, 0, sizeof( fat ) ); 46 46 fat.usRecordLength = sizeof( FATTRS ); 47 47 fat.lMatch = fm.lMatch; 48 48 fat.fsSelection = FATTR_SEL_UNDERSCORE; 49 strcpy( fat.szFacename 50 GpiDeleteSetId( hps 51 GpiCreateLogFont( hps , 0 , 1, &fat );52 GpiSetCharSet( hps 53 WinQueryWindowRect( hwnd 49 strcpy( fat.szFacename, fm.szFacename ); 50 GpiDeleteSetId( hps, 1 ); 51 GpiCreateLogFont( hps, 0, 1, &fat ); 52 GpiSetCharSet( hps, 1 ); 53 WinQueryWindowRect( hwnd, &ld->textRect ); 54 54 style = WinQueryWindowULong( hwnd, QWL_STYLE ); 55 55 style &= DT_LEFT|DT_CENTER|DT_RIGHT|DT_TOP|DT_VCENTER|DT_BOTTOM; … … 83 83 case WM_BUTTON1CLICK: 84 84 { 85 PROGDETAILS pd;86 85 char *text; 87 86 POINTL ptl; 88 87 89 if ( strcmp( browserExe, "" ) == 0 ) break;90 91 88 ptl.x = SHORT1FROMMP( mp1 ); 92 89 ptl.y = SHORT2FROMMP( mp1 ); 93 if ( !WinPtInRect( WinQueryAnchorBlock( hwnd ), &ld->textRect, &ptl) ) 90 if ( !WinPtInRect( WinQueryAnchorBlock( hwnd ), &ld->textRect, &ptl) ) { 94 91 break; 92 } 95 93 96 if ( ld->url == NULL ) 97 { 94 if ( ld->url == NULL ) { 98 95 text = (char *)malloc( MAXTEXTLEN ); 99 96 WinQueryWindowText( hwnd, MAXTEXTLEN, text); 100 97 } 101 else text = strdup( ld->url ); 98 else { 99 text = strdup( ld->url ); 100 } 102 101 103 pd.Length = sizeof( PROGDETAILS ); 104 pd.progt.progc = PROG_DEFAULT; 105 pd.progt.fbVisible = SHE_VISIBLE; 106 pd.pszTitle = NULL; 107 pd.pszExecutable = browserExe; 108 pd.pszParameters = NULL; 109 pd.pszStartupDir = ( browserDir[0] == 0 ) ? NULL : browserDir; 110 pd.pszIcon = NULL; 111 pd.pszEnvironment = NULL; 112 pd.swpInitial.fl = SWP_ACTIVATE; 113 pd.swpInitial.cy = 0; 114 pd.swpInitial.cx = 0; 115 pd.swpInitial.y = 0; 116 pd.swpInitial.x = 0; 117 pd.swpInitial.hwndInsertBehind = HWND_TOP; 118 pd.swpInitial.hwnd = NULLHANDLE; 119 pd.swpInitial.ulReserved1 = 0; 120 pd.swpInitial.ulReserved2 = 0; 121 WinStartApp( NULLHANDLE , &pd , text , NULL , 0 ); 102 startBrowser( text ); 103 122 104 free( text ); 123 105 } … … 126 108 case WM_DESTROY: 127 109 ld->labelProc( hwnd, msg, mp1, mp2 ); 128 if ( ld->url != NULL ) free( ld->url ); 110 if ( ld->url != NULL ) { 111 free( ld->url ); 112 } 129 113 free( ld ); 130 114 return (MRESULT)FALSE; 131 115 } 116 132 117 return ld->labelProc( hwnd, msg, mp1, mp2 ); 133 118 } 134 119 135 static void detectBrowser( void )136 {137 char *prfApp = "WPURLDEFAULTSETTINGS";138 139 if ( strcmp( browserExe, "" ) == 0 )140 {141 PrfQueryProfileString( HINI_USER, prfApp, "DefaultBrowserExe", "",142 browserExe, CCHMAXPATH );143 PrfQueryProfileString( HINI_USER, prfApp, "DefaultWorkingDir", "",144 browserDir, CCHMAXPATH );145 }146 147 if ( strcmp( browserExe, "" ) == 0 )148 {149 APIRET rc;150 rc = DosSearchPath( SEARCH_CUR_DIRECTORY | SEARCH_ENVIRONMENT | SEARCH_IGNORENETERRS ,151 "PATH", "NETSCAPE.EXE", browserExe, CCHMAXPATH );152 if ( rc != 0 ) strcpy( browserExe , "" );153 }154 }155 120 156 121 void setLinkPointer( HPOINTER hp ) … … 163 128 { 164 129 linkData *ld; 165 detectBrowser();166 130 ld = (linkData *)malloc( sizeof( linkData ) ); 167 131 memset( ld, 0, sizeof( linkData ) ); … … 174 138 { 175 139 linkData *ld; 176 detectBrowser();177 140 ld = (linkData *)malloc( sizeof( linkData ) ); 178 141 memset( ld, 0, sizeof( linkData ) ); -
trunk/Lucide/SOURCE/gui/luutils.h
r88 r127 87 87 #endif 88 88 89 extern "C" int startBrowser( const char *url ); 90 89 91 90 92 #endif // __LUUTILS_H -
trunk/Lucide/SOURCE/gui/makefile
r114 r127 23 23 24 24 .C.OBJ: 25 W PP386 @make.cfg -fo$@ $<25 WCC386 -zq -zp=4 -bm -sg -fo$@ $< 26 26 27 27 .idl.xh: … … 37 37 fontsInfoDlg.obj docInfoDlg.obj findDlg.obj progressDlg.obj \ 38 38 aboutDlg.obj settingsDlg.obj lusettings.obj printDlg.obj \ 39 print.obj 39 print.obj stbrowser.obj 40 40 41 41 Lucide.exe: $(OBJS) Lucide.res … … 68 68 file $(OBJDIR)\intern.obj 69 69 file $(OBJDIR)\messages.obj 70 file $(OBJDIR)\stbrowser.obj 70 71 name $(EXEDIR)\Lucide 71 72 lib ..\plugins\ludoc\ludoc … … 107 108 linklab.obj: linklab.c 108 109 wwbtn.obj: wwbtn.c 110 stbrowser.obj: stbrowser.c 109 111 110 112 -
trunk/Lucide/SOURCE/gui/messages.cpp
r102 r127 62 62 const char *MSGS_FILE_SAVE_ERROR = "MSGS_FILE_SAVE_ERROR"; 63 63 const char *MSGS_PAGE = "MSGS_PAGE"; 64 const char *MSGS_ERROR_STARTING_BROWSER = "MSGS_ERROR_STARTING_BROWSER"; 64 65 65 66 // Settings dialog -
trunk/Lucide/SOURCE/gui/messages.h
r102 r127 62 62 extern const char *MSGS_FILE_SAVE_ERROR; 63 63 extern const char *MSGS_PAGE; 64 extern const char *MSGS_ERROR_STARTING_BROWSER; 64 65 65 66 // Settings dialog
Note: See TracChangeset
for help on using the changeset viewer.