* fixed non working mouse after tools call

  * better handling of source/target info
  * more info in about dialog
  * better info in compiler status dialiog

ide/fp.pas

@@ -75,7 +75,9 @@ uses
   FPDebug,FPRegs,
 {$endif}
   FPTemplt,FPRedir,FPDesk,
-  FPCodTmp,FPCodCmp;
+  FPCodTmp,FPCodCmp,
+
+  systems;
 
 
 {$ifdef fpc}
@@ -340,6 +342,9 @@ BEGIN
   InitCodeTemplates;
   InitCodeComplete;
 
+  { init target information etc. }
+  InitSystems;
+
   IDEApp.Init;
   CheckINIFile;
   ReadSwitches(SwitchesPath);
@@ -496,7 +501,13 @@ BEGIN
 END.
 {
   $Log$
-  Revision 1.25  2004-11-08 20:28:25  peter
+  Revision 1.26  2004-11-14 21:45:28  florian
+    * fixed non working mouse after tools call
+    * better handling of source/target info
+    * more info in about dialog
+    * better info in compiler status dialiog
+
+  Revision 1.25  2004/11/08 20:28:25  peter
     * Breakpoints are now deleted when removed from source, disabling is
       still possible from the breakpoint list
     * COMPILER_1_0, FVISION, GABOR defines removed, only support new

ide/fpcompil.pas

@@ -484,7 +484,7 @@ end;
 constructor TCompilerStatusDialog.Init;
 var R: TRect;
 begin
-  R.Assign(0,0,50,11);
+  R.Assign(0,0,56,11);
   ClearFormatParams; AddFormatParamStr(KillTilde(SwitchesModeName[SwitchesMode]));
   inherited Init(R, FormatStrF(dialog_compilingwithmode, FormatParams));
   GetExtent(R); R.B.Y:=11;
@@ -566,15 +566,17 @@ begin
   AddFormatParamStr(StatusS);
   AddFormatParamStr(KillTilde(TargetSwitches^.ItemName(TargetSwitches^.GetCurrSel)));
   AddFormatParamInt(Status.CurrentLine);
-  AddFormatParamInt(MemAvail div 1024);
   AddFormatParamInt(Status.CompiledLines);
+  AddFormatParamInt((Heapsize-MemAvail) div 1024);
+  AddFormatParamInt(Heapsize div 1024);
   AddFormatParamInt(Status.ErrorCount);
   ST^.SetText(
    FormatStrF(
     'Main file: %s'#13+
     '%s'+#13#13+
-    'Target: %12s    '+     'Line number: %7d'+#13+
-    'Free memory: %6dK    '+'Total lines: %7d'+#13+
+    'Target: %s'#13+
+    'Line number: %6d     '+'Total lines:      %6d'+#13+
+    'Used memory: %6dK    '+'Allocated memory: %6dK'#13+
     'Total errors: %5d',
    FormatParams)
   );
@@ -1232,7 +1234,13 @@ end;
 end.
 {
   $Log$
-  Revision 1.29  2004-11-08 20:28:26  peter
+  Revision 1.30  2004-11-14 21:45:28  florian
+    * fixed non working mouse after tools call
+    * better handling of source/target info
+    * more info in about dialog
+    * better info in compiler status dialiog
+
+  Revision 1.29  2004/11/08 20:28:26  peter
     * Breakpoints are now deleted when removed from source, disabling is
       still possible from the breakpoint list
     * COMPILER_1_0, FVISION, GABOR defines removed, only support new

ide/fpide.pas

@@ -612,7 +612,7 @@ begin
     begin
       CtrlCCatched:=true;
 {$ifdef DEBUG}
-      Writeln(stderr,'One CtrlC caught');
+      Writeln(stderr,'One Ctrl-C caught');
 {$endif DEBUG}
     end
   else
@@ -1240,7 +1240,13 @@ end;
 END.
 {
   $Log$
-  Revision 1.31  2004-11-08 21:55:09  peter
+  Revision 1.32  2004-11-14 21:45:28  florian
+    * fixed non working mouse after tools call
+    * better handling of source/target info
+    * more info in about dialog
+    * better info in compiler status dialiog
+
+  Revision 1.31  2004/11/08 21:55:09  peter
     * fixed run directory
     * Open dialog starts in dir of last editted file
 

ide/fpredir.pas

@@ -519,8 +519,8 @@ end;
 
   {............................................................................}
 
-  procedure RestoreRedirIn;
 
+  procedure RestoreRedirIn;
   begin
     If not RedirChangedIn then Exit;
 {$ifndef FPC}
@@ -679,6 +679,10 @@ end;
 {............................................................................}
 
 function ExecuteRedir (Const ProgName, ComLine, RedirStdIn, RedirStdOut, RedirStdErr : String) : boolean;
+{$ifdef win32}
+var
+  mode : word;
+{$endif win32}
 Begin
   RedirErrorOut:=0; RedirErrorIn:=0; RedirErrorError:=0;
   ExecuteResult:=0;
@@ -696,6 +700,12 @@ Begin
   ExecuteRedir:=(IOStatus=0) and (RedirErrorOut=0) and
                 (RedirErrorIn=0) and (RedirErrorError=0) and
                 (ExecuteResult=0);
+{$ifdef win32}
+  // reenable mouse events
+  GetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), @mode);
+  mode:=mode or ENABLE_MOUSE_INPUT;
+  SetConsoleMode(GetStdHandle(cardinal(Std_Input_Handle)), mode);
+{$endif win32}
 End;
 
 {............................................................................}
@@ -980,7 +990,13 @@ finalization
 End.
 {
   $Log$
-  Revision 1.9  2004-11-06 19:56:14  armin
+  Revision 1.10  2004-11-14 21:45:28  florian
+    * fixed non working mouse after tools call
+    * better handling of source/target info
+    * more info in about dialog
+    * better info in compiler status dialiog
+
+  Revision 1.9  2004/11/06 19:56:14  armin
   * support target netware
 
   Revision 1.8  2004/09/21 14:55:45  armin

ide/fpstre.inc

@@ -823,7 +823,8 @@ const
       opt_includedirectories = '~I~nclude directories';
       opt_librarydirectories = '~L~ibrary directories';
       opt_objectdirectories = '~O~bject directories';
-      opt_exeppudirectories = '~E~XE & PPU directories';
+      opt_exeppudirectories = '~E~XE output directory';
+      opt_ppuoutputdirectory = '~P~PU output directory';
       opt_cross_tools_directory = '~C~ross tools directory';
       { Library options }
       opt_librariesdefault = '~T~arget default';
@@ -1056,7 +1057,13 @@ const
 
 {
   $Log$
-  Revision 1.20  2004-11-08 20:28:26  peter
+  Revision 1.21  2004-11-14 21:45:28  florian
+    * fixed non working mouse after tools call
+    * better handling of source/target info
+    * more info in about dialog
+    * better info in compiler status dialiog
+
+  Revision 1.20  2004/11/08 20:28:26  peter
     * Breakpoints are now deleted when removed from source, disabling is
       still possible from the breakpoint list
     * COMPILER_1_0, FVISION, GABOR defines removed, only support new

ide/fpswitch.pas

@@ -1021,6 +1021,7 @@ begin
      AddStringItem(opt_librarydirectories,'l',idNone,true,true);
      AddStringItem(opt_objectdirectories,'o',idNone,true,true);
      AddStringItem(opt_exeppudirectories,'E',idNone,true,true);
+     AddStringItem(opt_ppuoutputdirectory,'U',idNone,true,true);
      AddStringItem(opt_cross_tools_directory,'D',idNone,true,true);
    end;
 
@@ -1281,7 +1282,13 @@ end;
 end.
 {
   $Log$
-  Revision 1.18  2004-11-03 12:05:54  florian
+  Revision 1.19  2004-11-14 21:45:29  florian
+    * fixed non working mouse after tools call
+    * better handling of source/target info
+    * more info in about dialog
+    * better info in compiler status dialiog
+
+  Revision 1.18  2004/11/03 12:05:54  florian
     + supported targets are now read dynamically from the included compiler
 
   Revision 1.17  2004/09/14 20:46:13  hajny

ide/fpviews.pas

@@ -500,7 +500,7 @@ implementation
 uses
   Video,Strings,Keyboard,Validate,
   globtype,Tokens,Version,
-  cpubase,
+  systems,cpubase,
   {$if defined(I386) or defined(x64_86)}
      rax86,
   {$endif}
@@ -4022,38 +4022,14 @@ begin
   C^.Insert(NewStr(S));
 end;
 begin
-  OSStr:='';
-{$ifdef go32v2}
-  OSStr:='Dos';
-{$endif}
-{$ifdef tp}
-  OSStr:='Dos';
-{$endif}
-{$ifdef linux}
-  OSStr:='Linux';
-{$endif}
-{$ifdef win32}
-  OSStr:='Win32';
-{$endif}
-{$ifdef os2}
-  OSStr:='OS/2';
-{$endif}
-{$ifdef FreeBSD}
-  OSStr:='FreeBSD';
-{$endif}
-{$ifdef NetBSD}
-  OSStr:='NetBSD';
-{$endif}
-{$ifdef OpenBSD}
-  OSStr:='OpenBSD';
-{$endif}
-
-  R.Assign(0,0,38,14{$ifdef NODEBUG}-1{$endif});
+  R.Assign(0,0,58,14{$ifdef NODEBUG}-1{$endif});
   inherited Init(R, dialog_about);
   HelpCtx:=hcAbout;
   GetExtent(R); R.Grow(-3,-2);
   R2.Copy(R); R2.B.Y:=R2.A.Y+1;
-  Insert(New(PStaticText, Init(R2, ^C'FreePascal IDE for '+OSStr)));
+  Insert(New(PStaticText, Init(R2, ^C'FreePascal IDE for '+source_info.name)));
+  R2.Move(0,1);
+  Insert(New(PStaticText, Init(R2, ^C'Target CPU: '+target_cpu_string)));
   R2.Move(0,1);
   Insert(New(PStaticText, Init(R2, ^C'Version '+VersionStr+' '+{$i %date%})));
   R2.Move(0,1);
@@ -4463,7 +4439,13 @@ end;
 END.
 {
   $Log$
-  Revision 1.49  2004-11-11 15:20:52  florian
+  Revision 1.50  2004-11-14 21:45:29  florian
+    * fixed non working mouse after tools call
+    * better handling of source/target info
+    * more info in about dialog
+    * better info in compiler status dialiog
+
+  Revision 1.49  2004/11/11 15:20:52  florian
     * applied Peter's patch from yesterday
 
   Revision 1.48  2004/11/08 21:55:09  peter