+ Browser info saving

ide/text/fp.pas

@@ -62,6 +62,11 @@ begin
                 Delete(Param,1,1); { eat separator }
               INIPath:=copy(Param,2,255);
             end;
+{$ifdef go32v2}
+          'N' :
+             if UpCase(Param)='NOLFN' then
+               LFNSupport:=false;
+{$endif go32v2}
           'R' : { enter the directory last exited from (BP comp.) }
             begin
               Param:=copy(Param,2,255);
@@ -130,16 +135,17 @@ var CanExit : boolean;
 BEGIN
   {$ifdef DEV}HeapLimit:=4096;{$endif}
   writeln('þ Free Pascal IDE  Version '+VersionStr);
+
+  ProcessParams(true);
+
   StartupDir:=CompleteDir(FExpand('.'));
   IDEDir:=CompleteDir(DirOf(system.Paramstr(0)));
 
   RegisterIDEObjects;
   StreamError:=@MyStreamError;
 
-  ProcessParams(true);
-
 {$ifdef win32}
-  DosExecute(GetEnv('COMSPEC'),'/C echo Win32 mouse test');
+  DosExecute(GetEnv('COMSPEC'),'/C echo This dummy call gets the mouse to become visible');
 {$endif win32}
 {$ifdef VESA}
   InitVESAScreenModes;
@@ -207,7 +213,10 @@ BEGIN
 END.
 {
   $Log$
-  Revision 1.36  2000-01-10 15:53:37  pierre
+  Revision 1.37  2000-01-25 00:26:35  pierre
+   + Browser info saving
+
+  Revision 1.36  2000/01/10 15:53:37  pierre
   * WViews objects were not registered
 
   Revision 1.35  2000/01/03 11:38:33  michael

ide/text/fpcompil.pas

@@ -94,7 +94,7 @@ uses
   App,Commands,tokens,
   CompHook, Compiler, systems, browcol,
   WUtils,WEditor,
-  FPRedir,
+  FPRedir,FPDesk,
   FPIde,FPConst,FPVars,FPUtils,FPIntf,FPSwitch;
 
 {$ifndef NOOBJREG}
@@ -548,6 +548,8 @@ begin
   WriteSwitches(SwitchesPath);
   { leaving open browsers leads to crashes !! (PM) }
   CloseAllBrowsers;
+  if ((DesktopFileFlags and dfSymbolInformation)<>0) then
+    WriteSymbolsFile(BrowserName);
 {  MainFile:=FixFileName(FExpand(FileName));}
   If GetEXEPath<>'' then
     EXEFile:=FixFileName(GetEXEPath+NameOf(MainFile)+ExeExt)
@@ -684,6 +686,10 @@ begin
       end;
   { ^^^ we need this trick to reactivate the desktop }
   EditorModified:=false;
+  { Try to read Browser info in again if compilation failure !! }
+  if Not Assigned(Modules) and
+     ((DesktopFileFlags and dfSymbolInformation)<>0) then
+    ReadSymbolsFile(BrowserName);
 end;
 
 function NeedRecompile: boolean;
@@ -736,7 +742,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.48  2000-01-14 15:38:28  pierre
+  Revision 1.49  2000-01-25 00:26:35  pierre
+   + Browser info saving
+
+  Revision 1.48  2000/01/14 15:38:28  pierre
     + support for long filenames with spaces for compilation
     * avoid too long linker error output
 

ide/text/fpconst.pas

@@ -33,6 +33,7 @@ const
      ININame              = 'fp.ini';
      SwitchesName         = 'fp.cfg';
      DesktopName          = 'fp.dsk';
+     BrowserName          = 'fp.brw';
 
      ToolCaptureName      = '__tool__.out'; { all '$' signs replaces with '_'s }
      FilterCaptureName    = '_filter_.out';
@@ -374,7 +375,10 @@ implementation
 END.
 {
   $Log$
-  Revision 1.32  2000-01-08 18:26:20  florian
+  Revision 1.33  2000-01-25 00:26:36  pierre
+   + Browser info saving
+
+  Revision 1.32  2000/01/08 18:26:20  florian
     + added a register window, doesn't work yet
 
   Revision 1.31  2000/01/03 11:38:33  michael

ide/text/fpdesk.pas

@@ -35,6 +35,8 @@ procedure InitDesktopFile;
 function  LoadDesktop: boolean;
 function  SaveDesktop: boolean;
 procedure DoneDesktopFile;
+function  WriteSymbolsFile(const filename : string): boolean;
+function  ReadSymbolsFile(const filename : string): boolean;
 
 implementation
 
@@ -42,6 +44,7 @@ uses Dos,
      Objects,Drivers,Video,
      Views,App,HistList,BrowCol,
      WResource,WViews,WEditor,
+     WUtils,
 {$ifndef NODEBUG}
      fpdebug,
 {$endif ndef NODEBUG}
@@ -70,12 +73,15 @@ begin
   if OK then
     LoadHistory(S^);
   Dispose(S, Done);
+  if OK=false then
+    ErrorBox('Error loading history',nil);
   PopStatus;
   ReadHistory:=OK;
 end;
 
 function WriteHistory(F: PResourceFile): boolean;
 var S: PMemoryStream;
+    OK: boolean;
 begin
   PushStatus('Storing history...');
 
@@ -83,10 +89,12 @@ begin
   StoreHistory(S^);
   S^.Seek(0);
   F^.CreateResource(resHistory,rcBinary,0);
-  F^.AddResourceEntryFromStream(resHistory,langDefault,0,S^,S^.GetSize);
+  OK:=F^.AddResourceEntryFromStream(resHistory,langDefault,0,S^,S^.GetSize);
   Dispose(S, Done);
+  if OK=false then
+    ErrorBox('Error storing history',nil);
   PopStatus;
-  WriteHistory:=true;
+  WriteHistory:=OK;
 end;
 
 (*function ReadClipboard(F: PResourceFile): boolean;
@@ -134,6 +142,8 @@ begin
       else if assigned(OWC) then
         WatchesCollection:=OWC;
     end;
+  if OK=false then
+    ErrorBox('Error loading watches',nil);
   ReadWatches:=OK;
   Dispose(S, Done);
   PopStatus;
@@ -145,6 +155,7 @@ end;
 function WriteWatches(F: PResourceFile): boolean;
 var
   S : PMemoryStream;
+  OK : boolean;
 begin
 {$ifndef NODEBUG}
   if not assigned(WatchesCollection) then
@@ -158,9 +169,12 @@ begin
       S^.Put(WatchesCollection);
       S^.Seek(0);
       F^.CreateResource(resWatches,rcBinary,0);
-      WriteWatches:=F^.AddResourceEntryFromStream(resWatches,langDefault,0,S^,S^.GetSize);
+      OK:=F^.AddResourceEntryFromStream(resWatches,langDefault,0,S^,S^.GetSize);
       Dispose(S, Done);
+      if OK=false then
+        ErrorBox('Error storing watches',nil);
       PopStatus;
+      WriteWatches:=OK;
     end;
 {$endif NODEBUG}
 end;
@@ -188,6 +202,8 @@ begin
       else if assigned(OBC) then
         BreakpointsCollection:=OBC;
     end;
+  if OK=false then
+    ErrorBox('Error loading breakpoints',nil);
   ReadBreakpoints:=OK;
   Dispose(S, Done);
   PopStatus;
@@ -199,6 +215,7 @@ end;
 function WriteBreakpoints(F: PResourceFile): boolean;
 var
   S : PMemoryStream;
+  OK : boolean;
 begin
 {$ifndef NODEBUG}
   if not assigned(BreakpointsCollection) then
@@ -212,8 +229,11 @@ begin
       BreakpointsCollection^.Store(S^);
       S^.Seek(0);
       F^.CreateResource(resBreakpoints,rcBinary,0);
-      WriteBreakPoints:=F^.AddResourceEntryFromStream(resBreakpoints,langDefault,0,S^,S^.GetSize);
+      OK:=F^.AddResourceEntryFromStream(resBreakpoints,langDefault,0,S^,S^.GetSize);
       Dispose(S, Done);
+      if OK=false then
+        ErrorBox('Error storing breakpoints',nil);
+      WriteBreakPoints:=OK;
       PopStatus;
     end;
 {$endif NODEBUG}
@@ -313,56 +333,80 @@ begin
     end;
     Dispose(S, Done);
   end;
+  if OK=false then
+    ErrorBox('Error storing desktop',nil);
   PopStatus;
   WriteOpenWindows:=OK;
 end;
 
 function WriteFlags(F: PResourceFile): boolean;
+var
+    OK: boolean;
 begin
   F^.CreateResource(resDesktopFlags,rcBinary,0);
-  WriteFlags:=F^.AddResourceEntry(resDesktopFlags,langDefault,0,DesktopFileFlags,
+  OK:=F^.AddResourceEntry(resDesktopFlags,langDefault,0,DesktopFileFlags,
     SizeOf(DesktopFileFlags));
+  if OK=false then
+    ErrorBox('Error writing flags',nil);
+  WriteFlags:=OK;
 end;
 
 function ReadFlags(F: PResourceFile): boolean;
 var
   size : sw_word;
+    OK: boolean;
 begin
-  ReadFlags:=F^.ReadResourceEntry(resDesktopFlags,langDefault,DesktopFileFlags,
+  OK:=F^.ReadResourceEntry(resDesktopFlags,langDefault,DesktopFileFlags,
     size);
+  if OK=false then
+    ErrorBox('Error loading flags',nil);
+  ReadFlags:=OK;
 end;
 
 function WriteVideoMode(F: PResourceFile): boolean;
+var
+    OK: boolean;
 begin
   F^.CreateResource(resVideo,rcBinary,0);
-  WriteVideoMode:=F^.AddResourceEntry(resVideo,langDefault,0,ScreenMode,
+  OK:=F^.AddResourceEntry(resVideo,langDefault,0,ScreenMode,
     SizeOf(TVideoMode));
+  if OK=false then
+    ErrorBox('Error storing video mode',nil);
+  WriteVideoMode:=OK;
 end;
 
 function ReadVideoMode(F: PResourceFile;var NewScreenMode : TVideoMode): boolean;
 var
   size : sw_word;
-  test : boolean;
+  OK,test : boolean;
 begin
   size:=SizeOf(TVideoMode);
   test:=F^.ReadResourceEntry(resVideo,langDefault,NewScreenMode,
     size);
   if not test then
     NewScreenMode:=ScreenMode;
-  ReadVideoMode:= test and (size = SizeOf(TVideoMode));
+  OK:=test and (size = SizeOf(TVideoMode));
+  if OK=false then
+    ErrorBox('Error loading video mode',nil);
+  ReadVideoMode:=OK;
 end;
 
 function ReadSymbols(F: PResourceFile): boolean;
 var S: PMemoryStream;
     OK: boolean;
 begin
+  { if no symbols stored ... no problems }
+  if not Assigned(F^.FindResource(resSymbols)) then
+    exit;
   PushStatus('Reading symbol information...');
   New(S, Init(32*1024,4096));
   OK:=F^.ReadResourceEntryToStream(resSymbols,langDefault,S^);
   S^.Seek(0);
   if OK then
-    LoadBrowserCol(S);
+    OK:=LoadBrowserCol(S);
   Dispose(S, Done);
+  if OK=false then
+    ErrorBox('Error loading symbol information',nil);
   PopStatus;
   ReadSymbols:=OK;
 end;
@@ -378,11 +422,18 @@ begin
     PushStatus('Storing symbol information...');
 
     New(S, Init(200*1024,4096));
-    StoreBrowserCol(S);
+    OK:=Assigned(S);
-    S^.Seek(0);
+    if OK then
-    F^.CreateResource(resSymbols,rcBinary,0);
+      OK:=StoreBrowserCol(S);
-    OK:=F^.AddResourceEntryFromStream(resSymbols,langDefault,0,S^,S^.GetSize);
+    if OK then
+      begin
+        S^.Seek(0);
+        F^.CreateResource(resSymbols,rcBinary,0);
+        OK:=F^.AddResourceEntryFromStream(resSymbols,langDefault,0,S^,S^.GetSize);
+      end;
     Dispose(S, Done);
+    if OK=false then
+      ErrorBox('Error storing symbol information',nil);
     PopStatus;
   end;
   WriteSymbols:=OK;
@@ -394,30 +445,27 @@ var OK,VOK: boolean;
     VM : TVideoMode;
 begin
   PushStatus('Reading desktop file...');
-  New(F, LoadFile(DesktopPath));
+  New(F, LoadFile(GetShortName(DesktopPath)));
 
-  OK:=Assigned(F);
+  OK:=false;
 
-  if OK then
+  if Assigned(F) then
   begin
     OK:=ReadFlags(F);
-    if OK then
+    VOK:=ReadVideoMode(F,VM);
-      begin
+    if VOK and ((VM.Col<>ScreenMode.Col) or
-        VOK:=ReadVideoMode(F,VM);
+       (VM.Row<>ScreenMode.Row) or (VM.Color<>ScreenMode.Color)) then
-        if VOK and ((VM.Col<>ScreenMode.Col) or
+      Application^.SetScreenVideoMode(VM);
-           (VM.Row<>ScreenMode.Row) or (VM.Color<>ScreenMode.Color)) then
+    if ((DesktopFileFlags and dfHistoryLists)<>0) then
-          Application^.SetScreenVideoMode(VM);
-      end;
-    if {OK and} ((DesktopFileFlags and dfHistoryLists)<>0) then
       OK:=OK and ReadHistory(F);
-    if {OK and} ((DesktopFileFlags and dfWatches)<>0) then
+    if ((DesktopFileFlags and dfWatches)<>0) then
       OK:=OK and ReadWatches(F);
-    if {OK and} ((DesktopFileFlags and dfBreakpoints)<>0) then
+    if ((DesktopFileFlags and dfBreakpoints)<>0) then
       OK:=OK and ReadBreakpoints(F);
-    if {OK and} ((DesktopFileFlags and dfOpenWindows)<>0) then
+    if ((DesktopFileFlags and dfOpenWindows)<>0) then
       OK:=OK and ReadOpenWindows(F);
     { no errors if no browser info available PM }
-    if {OK and} ((DesktopFileFlags and dfSymbolInformation)<>0) then
+    if ((DesktopFileFlags and dfSymbolInformation)<>0) then
       OK:=OK and ReadSymbols(F);
     Dispose(F, Done);
   end;
@@ -430,51 +478,87 @@ function SaveDesktop: boolean;
 var OK: boolean;
     F: PResourceFile;
     TempPath: string;
-    ff: file;
 begin
   TempPath:=DirOf(DesktopPath)+DesktopTempName;
   PushStatus('Writing desktop file...');
-  New(F, CreateFile(TempPath));
+  New(F, CreateFile(GetShortName(TempPath)));
 
   if Assigned(Clipboard) then
     if (DesktopFileFlags and dfClipboardContent)<>0 then
       Clipboard^.Flags:=Clipboard^.Flags or efStoreContent
     else
       Clipboard^.Flags:=Clipboard^.Flags and not efStoreContent;
+  OK:=false;
 
-  OK:=Assigned(F);
+  if Assigned(F) then
-  {if OK then}
+    begin
-    OK:=OK and WriteFlags(F);
+      OK:=WriteFlags(F);
-  {if OK then}
+      OK:=OK and WriteVideoMode(F);
-    OK:=OK and WriteVideoMode(F);
+      if ((DesktopFileFlags and dfHistoryLists)<>0) then
-  if {OK and} ((DesktopFileFlags and dfHistoryLists)<>0) then
+        OK:=OK and WriteHistory(F);
-    OK:=OK and WriteHistory(F);
+      if ((DesktopFileFlags and dfWatches)<>0) then
-  if {OK and} ((DesktopFileFlags and dfWatches)<>0) then
+        OK:=OK and WriteWatches(F);
-    OK:=OK and WriteWatches(F);
+      if ((DesktopFileFlags and dfBreakpoints)<>0) then
-  if {OK and} ((DesktopFileFlags and dfBreakpoints)<>0) then
+        OK:=OK and WriteBreakpoints(F);
-    OK:=OK and WriteBreakpoints(F);
+      if ((DesktopFileFlags and dfOpenWindows)<>0) then
-  if {OK and} ((DesktopFileFlags and dfOpenWindows)<>0) then
+        OK:=OK and WriteOpenWindows(F);
-    OK:=OK and WriteOpenWindows(F);
+      { no errors if no browser info available PM }
-  { no errors if no browser info available PM }
+      if ((DesktopFileFlags and dfSymbolInformation)<>0) then
-  if {OK and} ((DesktopFileFlags and dfSymbolInformation)<>0) then
+        OK:=OK and (WriteSymbols(F) or not Assigned(Modules));
-    OK:=OK and (WriteSymbols(F) or not Assigned(Modules));
+      Dispose(F, Done);
-  Dispose(F, Done);
+    end;
   if OK then
-  begin
+    begin
-    if ExistsFile(DesktopPath) then
+      if ExistsFile(DesktopPath) then
-      OK:=EraseFile(DesktopPath);
+        OK:=EraseFile(DesktopPath);
-    OK:=OK and RenameFile(TempPath,DesktopPath);
+      OK:=OK and RenameFile(TempPath,DesktopPath);
-    if OK=false then
+      if OK=false then
-      ErrorBox('Failed to replace desktop file.',nil);
+        ErrorBox('Failed to replace desktop file.',nil);
-  end;
+    end;
   PopStatus;
   SaveDesktop:=OK;
 end;
 
+function  WriteSymbolsFile(const filename : string): boolean;
+var OK: boolean;
+    F: PResourceFile;
+begin
+  WriteSymbolsFile:=false;
+  If not assigned(Modules) then
+    exit;
+  New(F, CreateFile(GetShortName(FileName)));
+  OK:=Assigned(F);
+  if OK and ((DesktopFileFlags and dfSymbolInformation)<>0) then
+    OK:=OK and WriteSymbols(F);
+  if assigned(F) then
+    Dispose(F,Done);
+  WriteSymbolsFile:=OK;
+end;
+
+function  ReadSymbolsFile(const FileName : string): boolean;
+var OK: boolean;
+    F: PResourceFile;
+begin
+  ReadSymbolsFile:=false;
+  { Don't read again !! }
+  If assigned(Modules) then
+    exit;
+  New(F, LoadFile(GetShortName(FileName)));
+  OK:=Assigned(F);
+  if OK and ((DesktopFileFlags and dfSymbolInformation)<>0) then
+      OK:=OK and ReadSymbols(F);
+  if assigned(F) then
+    Dispose(F,Done);
+  ReadSymbolsFile:=OK;
+end;
+
 END.
 {
   $Log$
-  Revision 1.18  2000-01-03 11:38:33  michael
+  Revision 1.19  2000-01-25 00:26:36  pierre
+   + Browser info saving
+
+  Revision 1.18  2000/01/03 11:38:33  michael
   Changes from Gabor
 
   Revision 1.17  1999/12/20 00:30:56  pierre