* fixes from gabor

ide/text/fpcompil.pas

@@ -13,6 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$i globdir.inc}
 unit FPCompile;
 
 interface
@@ -21,11 +22,6 @@ interface
   then be redired (PFV) }
 { this should work now correctly because
   RedirDisableAll and RedirEnableAll function are added in fpredir (PM) }
-{$ifndef debug}
-  {$ifndef linux}
-    {$define redircompiler}
-  {$endif}
-{$endif}
 
 { $define VERBOSETXT}
 
@@ -33,7 +29,7 @@ uses
   Objects,
   Drivers,Views,Dialogs,
   WViews,
-  FPSymbol, 
+  FPSymbol,
   FPViews;
 
 type
@@ -91,6 +87,9 @@ procedure RegisterFPCompile;
 implementation
 
 uses
+{$ifdef linux}
+  Linux,
+{$endif}
   Dos,Video,
   App,Commands,
   CompHook, systems,
@@ -100,6 +99,7 @@ uses
 {$endif}
   FPIde,FPConst,FPVars,FPUtils,FPIntf,FPSwitch;
 
+{$ifndef NOOBJREG}
 const
   RCompilerMessageListBox: TStreamRec = (
      ObjType: 1211;
@@ -113,6 +113,7 @@ const
      Load:    @TCompilerMessageWindow.Load;
      Store:   @TCompilerMessageWindow.Store
   );
+{$endif}
 
 
 {*****************************************************************************
@@ -194,9 +195,11 @@ var R: TRect;
 begin
   Desktop^.GetExtent(R);
   R.A.Y:=R.B.Y-7;
-  inherited Init(R,'Compiler Messages',SearchFreeWindowNo);
+  inherited Init(R,'Compiler Messages',{SearchFreeWindowNo}wnNoNumber);
   HelpCtx:=hcMessagesWindow;
 
+  AutoNumber:=true;
+
   HSB:=StandardScrollBar(sbHorizontal+sbHandleKeyboard);
   HSB^.GrowMode:=gfGrowLoY+gfGrowHiX+gfGrowHiY;
   Insert(HSB);
@@ -551,7 +554,7 @@ begin
   Compile(FileName);
   if LinkAfter then
     begin
-       CompilationPhase:=cpLinking;                                                                                                                                                                                                                            
+       CompilationPhase:=cpLinking;
        CompilerStatusDialog^.Update;
 {$ifdef linux}
        Shell(PpasFile+source_os.scriptext);
@@ -597,15 +600,20 @@ end;
 
 procedure RegisterFPCompile;
 begin
+{$ifndef NOOBJREG}
   RegisterType(RCompilerMessageListBox);
   RegisterType(RCompilerMessageWindow);
+{$endif}
 end;
 
 
 end.
 {
   $Log$
-  Revision 1.30  1999-06-28 15:59:04  pierre
+  Revision 1.31  1999-06-28 19:32:17  peter
+    * fixes from gabor
+
+  Revision 1.30  1999/06/28 15:59:04  pierre
    * View Linking stage if external linking
 
   Revision 1.29  1999/06/28 12:39:14  pierre

ide/text/fpconst.pas

@@ -117,7 +117,7 @@ const
      cmCompilerMessages  = 234;
      cmSymbol            = 235;
      cmStack             = 236;
-     cmBreakpointList    = 237;                                                                                                                                                                                                           
+     cmBreakpointList    = 237;
 
      cmNotImplemented    = 1000;
      cmNewFromTemplate   = 1001;
@@ -331,7 +331,10 @@ implementation
 END.
 {
   $Log$
-  Revision 1.18  1999-06-25 00:38:59  pierre
+  Revision 1.19  1999-06-28 19:32:18  peter
+    * fixes from gabor
+
+  Revision 1.18  1999/06/25 00:38:59  pierre
    +cmSymbol,cmStack,cmBreakpointList
 
   Revision 1.17  1999/04/07 21:55:44  peter

ide/text/fphelp.pas

@@ -143,6 +143,7 @@ begin
     hcPrimaryFile   : S:='Define then file that is the focus of Make and Build';
     hcClearPrimary  : S:='Clear the file previously set to Primary';
     hcInformation   : S:='Show compiler messages and program information';
+    hcCompilerMessages:S:='Show compiler messages window';
 
     hcDebugMenu     : S:='Debug Program';
     hcToggleBreakpoint : S:='Toggles Breakpoint';
@@ -382,7 +383,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.15  1999-06-25 00:39:58  pierre
+  Revision 1.16  1999-06-28 19:32:19  peter
+    * fixes from gabor
+
+  Revision 1.15  1999/06/25 00:39:58  pierre
    help for cmSymbol,cmAddWatch,cmStack and cmBreakpoint list
 
   Revision 1.14  1999/04/07 21:55:46  peter

ide/text/fpide.pas

@@ -34,7 +34,7 @@ type
       function    SaveAll: boolean;
       procedure   Idle; virtual;
       procedure   Update;
-      procedure   UpdateTarget;                                                                                                                                                                                                                                
+      procedure   UpdateTarget;
       procedure   HandleEvent(var Event: TEvent); virtual;
       procedure   GetTileRect(var R: TRect); virtual;
       function    GetPalette: PPalette; virtual;
@@ -755,14 +755,17 @@ end;
 destructor TIDEApp.Done;
 begin
   inherited Done;
-  RemoveBrowsersCollection;                                                                                                                                                                                                                             
+  RemoveBrowsersCollection;
   DoneHelpSystem;
 end;
 
 END.
 {
   $Log$
-  Revision 1.29  1999-06-28 12:40:19  pierre
+  Revision 1.30  1999-06-28 19:32:20  peter
+    * fixes from gabor
+
+  Revision 1.29  1999/06/28 12:40:19  pierre
    + RemoveBrowsersCollection in TIDEApp.Done
 
   Revision 1.28  1999/06/25 00:46:33  pierre

ide/text/fpmsrch.inc

@@ -131,10 +131,13 @@ begin
   if ExecuteDialog(SymbolDialog,@S)<>cmCancel then
     OpenOneSymbolBrowser(S);
 end;
-                                                                                                                                                                                                                                                               
+
 {
   $Log$
-  Revision 1.8  1999-06-28 12:38:19  pierre
+  Revision 1.9  1999-06-28 19:32:22  peter
+    * fixes from gabor
+
+  Revision 1.8  1999/06/28 12:38:19  pierre
    * Globals(Modules)Collection tracing
 
   Revision 1.7  1999/06/25 00:34:50  pierre

ide/text/fpmwnd.inc

@@ -63,6 +63,8 @@ begin
     hcMessagesWindow:S:=PMessagesWindow(P)^.GetTitle(MaxLen);
   else S:='???? - '+PWindow(P)^.GetTitle(MaxLen);
   end;
+  if PWindow(P)^.Number<>0 then
+    S:=S+'('+IntToStr(PWindow(P)^.Number)+')';
   GetText:=copy(S,1,MaxLen);
 end;
 
@@ -153,11 +155,15 @@ end;
 
 {
   $Log$
-  Revision 1.7  1999-03-01 15:42:00  peter
+  Revision 1.8  1999-06-28 19:32:23  peter
+    * fixes from gabor
+
+  Revision 1.7  1999/03/01 15:42:00  peter
     + Added dummy entries for functions not yet implemented
     * MenuBar didn't update itself automatically on command-set changes
     * Fixed Debugging/Profiling options dialog
-    * TCodeEditor converts spaces to tabs at save only if efUseTabChars is
 set
+    * TCodeEditor converts spaces to tabs at save only if efUseTabChars is
+ set
     * efBackSpaceUnindents works correctly
     + 'Messages' window implemented
     + Added '$CAP MSG()' and '$CAP EDIT' to available tool-macros

ide/text/fptools.pas

@@ -13,6 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$I globdir.inc}
 unit FPTools;
 
 interface
@@ -150,6 +151,7 @@ uses Dos,
      WINI,WEditor,
      FPConst,FPVars,FPUtils;
 
+{$ifndef NOOBJREG}
 const
   RToolMessageListBox: TStreamRec = (
      ObjType: 1600;
@@ -163,6 +165,7 @@ const
      Load:    @TMessagesWindow.Load;
      Store:   @TMessagesWindow.Store
   );
+{$endif}
 
 type
     THotKeyDef = record
@@ -1487,14 +1490,19 @@ end;
 
 procedure RegisterFPTools;
 begin
+{$ifndef NOOBJREG}
   RegisterType(RToolMessageListBox);
   RegisterType(RMessagesWindow);
+{$endif}
 end;
 
 END.
 {
   $Log$
-  Revision 1.9  1999-05-22 13:44:32  peter
+  Revision 1.10  1999-06-28 19:32:24  peter
+    * fixes from gabor
+
+  Revision 1.9  1999/05/22 13:44:32  peter
     * fixed couple of bugs
 
   Revision 1.8  1999/04/07 21:55:54  peter

ide/text/fpusrscr.pas

@@ -104,11 +104,11 @@ implementation
 
 uses
   Dos,Video
-  {$ifdef TP}
+(*  {$ifdef TP}
     {$ifdef DPMI}
     ,WinAPI
     {$endif}
-  {$endif}
+  {$endif}*)
   {$ifdef FPC}
     {$ifdef GO32V2}
     ,Go32
@@ -234,6 +234,7 @@ var
 begin
   GetVideoMode(TM);
   SetVideoMode(VideoInfo);
+
   if VideoInfo.Mode=7 then
     VSeg:=SegB000
   else
@@ -282,7 +283,7 @@ var
 {$ifdef TP}
   P: pointer;
   Sel: longint;
-  {$I realintr.inc}
+(*  {$I realintr.inc} *)
 {$endif}
 begin
   if (MI.StateSize>0) and (MI.StateBuf<>nil) then
@@ -464,7 +465,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.3  1999-02-02 16:41:42  peter
+  Revision 1.4  1999-06-28 19:32:25  peter
+    * fixes from gabor
+
+  Revision 1.3  1999/02/02 16:41:42  peter
     + automatic .pas/.pp adding by opening of file
     * better debuggerscreen changes
 

ide/text/fpvars.pas

@@ -23,7 +23,7 @@ uses Objects,Views,App,
 
 type
     TRecentFileEntry = record
-      FileName  : string;
+      FileName  : string{$ifdef GABOR}[20]{$endif};
       LastPos   : TPoint;
     end;
 
@@ -35,17 +35,17 @@ const ClipboardWindow  : PClipboardWindow = nil;
       RecentFileCount  : integer = 0;
       OpenExts         : string[80] = '*.pas;*.pp;*.inc';
       HighlightExts    : string[80] = '*.pas;*.pp;*.inc';
-      TabsPattern      : string = 'make*;make*.*';
-      SourceDirs       : string = '';
-      PrimaryFile      : string = '';
-      PrimaryFileMain  : string = '';
-      PrimaryFileSwitches : string = '';
+      TabsPattern      : string{$ifdef GABOR}[30]{$endif} = 'make*;make*.*';
+      SourceDirs       : string{$ifdef GABOR}[30]{$endif} = '';
+      PrimaryFile      : string{$ifdef GABOR}[80]{$endif} = '';
+      PrimaryFileMain  : string{$ifdef GABOR}[80]{$endif} = '';
+      PrimaryFileSwitches : string{$ifdef GABOR}[30]{$endif} = '';
       PrimaryFilePara  : string = '';
-      GDBOutputFile    : string = 'gdb$$$.txt';
+      GDBOutputFile    : string{$ifdef GABOR}[30]{$endif} = 'gdb$$$.txt';
       IsEXECompiled    : boolean = false;
-      LinkAfter        : boolean = true; 
-      MainFile         : string = '';
-      EXEFile          : string = '';
+      LinkAfter        : boolean = true;
+      MainFile         : string{$ifdef GABOR}[80]{$endif} = '';
+      EXEFile          : string{$ifdef GABOR}[80]{$endif} = '';
       CompilationPhase : TCompPhase = cpNothing;
       ProgramInfoWindow: PProgramInfoWindow = nil;
       GDBWindow        : PGDBWindow = nil;
@@ -81,7 +81,10 @@ implementation
 END.
 {
   $Log$
-  Revision 1.16  1999-06-21 23:37:58  pierre
+  Revision 1.17  1999-06-28 19:32:27  peter
+    * fixes from gabor
+
+  Revision 1.16  1999/06/21 23:37:58  pierre
    + added LinkAfter var for post linking with -s option
 
   Revision 1.15  1999/03/23 15:11:36  peter

ide/text/fpviews.pas

@@ -54,7 +54,9 @@ type
     end;
 
     TFPWindow = object(TWindow)
+      AutoNumber: boolean;
       procedure HandleEvent(var Event: TEvent); virtual;
+      procedure SetState(AState: Word; Enable: Boolean); virtual;
     end;
 
     PFPHelpViewer = ^TFPHelpViewer;
@@ -153,8 +155,6 @@ type
     PClipboardWindow = ^TClipboardWindow;
     TClipboardWindow = object(TSourceWindow)
       constructor Init;
-      procedure   Show; virtual;
-      procedure   Hide; virtual;
       procedure   Close; virtual;
       constructor Load(var S: TStream);
       procedure   Store(var S: TStream);
@@ -811,6 +811,21 @@ begin
   inherited HandleEvent(Event);
 end;
 
+procedure TFPWindow.SetState(AState: Word; Enable: Boolean);
+begin
+  inherited SetState(AState,Enable);
+  if AutoNumber then
+    if (AState and (sfVisible+sfExposed))<>0 then
+      if GetState(sfVisible+sfExposed) then
+        begin
+          if Number=0 then
+            Number:=SearchFreeWindowNo;
+          ReDraw;
+        end
+      else
+        Number:=0;
+end;
+
 procedure TFPWindow.HandleEvent(var Event: TEvent);
 begin
   case Event.What of
@@ -1084,8 +1099,9 @@ constructor TGDBWindow.Init(var Bounds: TRect);
 var HSB,VSB: PScrollBar;
     R: TRect;
 begin
-  inherited Init(Bounds,'GDB window',SearchFreeWindowNo);
+  inherited Init(Bounds,'GDB window',0);
   Options:=Options or ofTileAble;
+  AutoNumber:=true;
   GetExtent(R); R.A.Y:=R.B.Y-1; R.Grow(-1,0); R.A.X:=14;
   New(HSB, Init(R)); HSB^.GrowMode:=gfGrowLoY+gfGrowHiX+gfGrowHiY; Insert(HSB);
   GetExtent(R); R.A.X:=R.B.X-1; R.Grow(0,-1);
@@ -1189,6 +1205,7 @@ begin
   SetTitle('Clipboard');
   HelpCtx:=hcClipboardWindow;
   Number:=wnNoNumber;
+  AutoNumber:=true;
 
   GetExtent(R); R.A.Y:=R.B.Y-1; R.Grow(-1,0); R.A.X:=14;
   New(HSB, Init(R)); HSB^.GrowMode:=gfGrowLoY+gfGrowHiX+gfGrowHiY; Insert(HSB);
@@ -1208,22 +1225,6 @@ begin
   Clipboard:=Editor;
 end;
 
-procedure TClipboardWindow.Show;
-begin
-  inherited Show;
-  if GetState(sfVisible) and (Number=0) then
-    begin
-      Number:=SearchFreeWindowNo;
-      ReDraw;
-    end;
-end;
-
-procedure TClipboardWindow.Hide;
-begin
-  inherited Hide;
-  if GetState(sfVisible)=false then Number:=0;
-end;
-
 procedure TClipboardWindow.Close;
 begin
   Hide;
@@ -2607,7 +2608,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.32  1999-06-21 23:37:08  pierre
+  Revision 1.33  1999-06-28 19:32:28  peter
+    * fixes from gabor
+
+  Revision 1.32  1999/06/21 23:37:08  pierre
    * VESASetVideoModeProc return value was not set
 
   Revision 1.31  1999/06/02 11:19:13  pierre

ide/text/globdir.inc

@@ -26,3 +26,23 @@
   {$endif}
 {$endif}
 
+{$ifdef TP}
+  {$C FIXED PRELOAD PERMANENT}
+  {
+    Without defining this I got almost always SEGMENT NOT PRESENT (exc 11)
+    on exiting the IDE, when run on under NT4.0... Strange a bit, not?
+    (Actually the fault occours in TDOSScreen.GetVideoMode() at the
+     BIOS call, but I just can't figure out why....)
+  }
+{$endif}
+
+{$ifndef debug}
+  {$ifndef linux}
+    {$define redircompiler}
+  {$endif}
+{$endif}
+
+{$ifdef GABOR}
+  {$define NOOBJREG}
+  {$define NODEBUG}
+{$endif}

ide/text/realintr.inc

@@ -39,6 +39,12 @@ type
     DPMIRegs.EBP := r.bp;
     DPMIRegs.DS := r.ds;
     DPMIRegs.ES := r.es;
+    { --- }
+    DPMIRegs.FS := 0;
+    DPMIRegs.GS := 0;
+    DPMIRegs.SS := 0;
+    DPMIRegs.SP := 0;
+    { --- }
     DPMIRegs.Flags := r.flags;
     Regs.AX := $0300;
     Regs.BL := IntNo;

ide/text/whlpview.pas

@@ -92,8 +92,8 @@ type
         ColorAreas: PColorAreaCollection;
         constructor Init(ATopic: PTopic);
         procedure   SetParams(AMargin, AWidth: integer); virtual;
-        function    GetLineCount: integer; virtual;
-        function    GetLineText(Line: integer): string; virtual;
+        function    GetLineCount: sw_integer; virtual;
+        function    GetLineText(Line: sw_integer): string; virtual;
         function    GetLinkCount: integer; virtual;
         procedure   GetLinkBounds(Index: integer; var R: TRect); virtual;
         function    GetLinkFileID(Index: integer): word; virtual;
@@ -126,8 +126,8 @@ type
         procedure   Draw; virtual;
         procedure   HandleEvent(var Event: TEvent); virtual;
         procedure   SetCurPtr(X,Y: integer); virtual;
-        function    GetLineCount: integer; virtual;
-        function    GetLineText(Line: integer): string; virtual;
+        function    GetLineCount: sw_integer; virtual;
+        function    GetLineText(Line: sw_integer): string; virtual;
         function    GetLinkCount: integer; virtual;
         procedure   GetLinkBounds(Index: integer; var R: TRect); virtual;
         function    GetLinkFileID(Index: integer): word; virtual;
@@ -475,12 +475,12 @@ begin
   end;
 end;
 
-function THelpTopic.GetLineCount: integer;
+function THelpTopic.GetLineCount: sw_integer;
 begin
   GetLineCount:=Lines^.Count;
 end;
 
-function THelpTopic.GetLineText(Line: integer): string;
+function THelpTopic.GetLineText(Line: sw_integer): string;
 var S: string;
 begin
   if Line<GetLineCount then S:=PString(Lines^.At(Line))^ else S:='';
@@ -599,14 +599,14 @@ begin
      Lookup('');
 end;
 
-function THelpViewer.GetLineCount: integer;
+function THelpViewer.GetLineCount: sw_integer;
 var Count: integer;
 begin
   if HelpTopic=nil then Count:=0 else Count:=HelpTopic^.GetLineCount;
   GetLineCount:=Count;
 end;
 
-function THelpViewer.GetLineText(Line: integer): string;
+function THelpViewer.GetLineText(Line: sw_integer): string;
 var S: string;
 begin
   if HelpTopic=nil then S:='' else S:=HelpTopic^.GetLineText(Line);
@@ -1138,7 +1138,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.8  1999-04-07 21:56:02  peter
+  Revision 1.9  1999-06-28 19:32:35  peter
+    * fixes from gabor
+
+  Revision 1.8  1999/04/07 21:56:02  peter
     + object support for browser
     * html help fixes
     * more desktop saving things

ide/text/wviews.pas

@@ -11,6 +11,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$I globdir.inc}
 unit WViews;
 
 interface
@@ -199,6 +200,7 @@ uses Mouse,
      Commands,App,MsgBox,
      WUtils;
 
+{$ifndef NOOBJREG}
 const
   RAdvancedListBox: TStreamRec = (
      ObjType: 1120;
@@ -224,6 +226,7 @@ const
      Load:    @TDlgWindow.Load;
      Store:   @TDlgWindow.Store
   );
+{$endif}
 
 const
   MessageDialog  : PCenterDialog = nil;
@@ -2059,17 +2062,22 @@ end;
 
 procedure RegistersWViews;
 begin
+{$ifndef NOOBJREG}
   RegisterType(RAdvancedListBox);
   RegisterType(RColorStaticText);
   RegisterType(RHSListBox);
   RegisterType(RDlgWindow);
+{$endif}
 end;
 
 
 END.
 {
   $Log$
-  Revision 1.8  1999-06-28 12:29:56  pierre
+  Revision 1.9  1999-06-28 19:32:37  peter
+    * fixes from gabor
+
+  Revision 1.8  1999/06/28 12:29:56  pierre
    *GetMenuItem fixed
 
   Revision 1.7  1999/06/25 00:30:34  pierre