amunits: MsgBox unit renamed to AMsgBox, conflicts with FV

git-svn-id: trunk@28566 -

.gitattributes

@@ -1107,6 +1107,7 @@ packages/amunits/src/useautoopenlib.inc svneol=native#text/plain
 packages/amunits/src/utilunits/Makefile svneol=native#text/plain
 packages/amunits/src/utilunits/Makefile.fpc svneol=native#text/plain
 packages/amunits/src/utilunits/amigautils.pas svneol=native#text/plain
+packages/amunits/src/utilunits/amsgbox.pas svneol=native#text/plain
 packages/amunits/src/utilunits/consoleio.pas svneol=native#text/plain
 packages/amunits/src/utilunits/deadkeys.pas svneol=native#text/plain
 packages/amunits/src/utilunits/doublebuffer.pas svneol=native#text/plain
@@ -1114,7 +1115,6 @@ packages/amunits/src/utilunits/easyasl.pas svneol=native#text/plain
 packages/amunits/src/utilunits/hisoft.pas svneol=native#text/plain
 packages/amunits/src/utilunits/linklist.pas svneol=native#text/plain
 packages/amunits/src/utilunits/longarray.pas svneol=native#text/plain
-packages/amunits/src/utilunits/msgbox.pas svneol=native#text/plain
 packages/amunits/src/utilunits/pastoc.pas svneol=native#text/plain
 packages/amunits/src/utilunits/pcq.pas svneol=native#text/plain
 packages/amunits/src/utilunits/systemvartags.pas svneol=native#text/plain

packages/amunits/Makefile.fpc.fpcmake

@@ -7,7 +7,7 @@ name=amunits
 version=2.7.1
 
 [target]
-units= msgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys \
+units= amsgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys \
        deadkeys consoleio pcq longarray linklist hisoft exec timerutils easyasl \
        doublebuffer intuition agraphics amigalib nonvolatile iffparse hardware  \
        expansion diskfont conunit amigados configvars keyboard bootblock icon  \

packages/amunits/fpmake.pp

@@ -33,7 +33,7 @@ begin
     P.SourcePath.Add('src/utilunits');
     P.IncludePath.Add('src');
 
-    T:=P.Targets.AddUnit('msgbox.pas');
+    T:=P.Targets.AddUnit('amsgbox.pas');
     T:=P.Targets.AddUnit('amigautils.pas');
     T:=P.Targets.AddUnit('wbargs.pas');
     T:=P.Targets.AddUnit('vartags.pas');
@@ -61,7 +61,7 @@ begin
     T:=P.Targets.AddUnit('conunit.pas');
     T:=P.Targets.AddUnit('amigados.pas');
     T:=P.Targets.AddUnit('configvars.pas');
-    T:=P.Targets.AddUnit('keyboard.pas');
+    T:=P.Targets.AddUnit('akeyboard.pas');
     T:=P.Targets.AddUnit('bootblock.pas');
     T:=P.Targets.AddUnit('icon.pas');
     T:=P.Targets.AddUnit('cd.pas');

packages/amunits/src/coreunits/agraphics.pas

@@ -2439,7 +2439,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox;
+amsgbox;
 {$endif dont_use_openlib}
 
 PROCEDURE BNDRYOFF (w: pRastPort);

packages/amunits/src/coreunits/amigaguide.pas

@@ -282,7 +282,7 @@ var
 IMPLEMENTATION
 
 {$ifndef dont_use_openlib}
-uses msgbox;
+uses amsgbox;
 {$endif dont_use_openlib}
 
 

packages/amunits/src/coreunits/asl.pas

@@ -577,7 +577,7 @@ var
 IMPLEMENTATION
 
 {$ifndef dont_use_openlib}
-uses  msgbox;
+uses amsgbox;
 {$endif dont_use_openlib}
 
 FUNCTION AllocAslRequest(reqType : ULONG; tagList : pTagItem) : POINTER;

packages/amunits/src/coreunits/bullet.pas

@@ -402,7 +402,7 @@ IMPLEMENTATION
 }
 uses
 {$ifndef dont_use_openlib}
-msgbox;
+amsgbox;
 {$endif dont_use_openlib}
 
 PROCEDURE CloseEngine(glyphEngine : pGlyphEngine);

packages/amunits/src/coreunits/colorwheel.pas

@@ -89,7 +89,7 @@ PROCEDURE ConvertRGBToHSB(rgb : pColorWheelRGB; hsb : pColorWheelHSB);
 
 IMPLEMENTATION
 
-uses msgbox;
+uses amsgbox;
 
 PROCEDURE ConvertHSBToRGB(hsb : pColorWheelHSB; rgb : pColorWheelRGB);
 BEGIN

packages/amunits/src/coreunits/commodities.pas

@@ -269,7 +269,7 @@ PROCEDURE SetFilter(filter : pCxObj; text : string);
 
 IMPLEMENTATION
 
-uses pastoc,msgbox;
+uses pastoc,amsgbox;
 
 FUNCTION ActivateCxObj(co : pCxObj; tru : LONGINT) : LONGINT;
 BEGIN

packages/amunits/src/coreunits/datatypes.pas

@@ -1317,7 +1317,7 @@ var
 IMPLEMENTATION
 
 {$ifndef dont_use_openlib}
-uses msgbox;
+uses amsgbox;
 {$endif dont_use_openlib}
 
 FUNCTION AddDTObject(win : pWindow; req : pRequester; o : pObject_; pos : LONGINT) : LONGINT;

packages/amunits/src/coreunits/diskfont.pas

@@ -169,7 +169,7 @@ IMPLEMENTATION
 }
 uses
 {$ifndef dont_use_openlib}
-msgbox;
+amsgbox;
 {$endif dont_use_openlib}
 
 FUNCTION AvailFonts(buffer : pCHAR; bufBytes : LONGINT; flags : LONGINT) : LONGINT;

packages/amunits/src/coreunits/expansion.pas

@@ -88,7 +88,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox;
+amsgbox;
 {$endif dont_use_openlib}
 
 FUNCTION AddBootNode(bootPri : LONGINT; flags : ULONG; deviceNode : pDeviceNode; configDev : pConfigDev) : BOOLEAN;

packages/amunits/src/coreunits/gadtools.pas

@@ -510,7 +510,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox;
+amsgbox;
 {$endif dont_use_openlib}
 
 function GTMENUITEM_USERDATA(menuitem : pMenuItem): pointer;

packages/amunits/src/coreunits/icon.pas

@@ -413,7 +413,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 pastoc;
 

packages/amunits/src/coreunits/iffparse.pas

@@ -297,7 +297,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox;
+amsgbox;
 {$endif dont_use_openlib}
 
 FUNCTION AllocIFF : pIFFHandle;

packages/amunits/src/coreunits/keymap.pas

@@ -121,7 +121,7 @@ PROCEDURE SetKeyMapDefault(keyMap : pKeyMap);
 
 IMPLEMENTATION
 
-uses msgbox;
+uses amsgbox;
 
 FUNCTION AskKeyMapDefault : pKeyMap;
 BEGIN

packages/amunits/src/coreunits/layers.pas

@@ -138,7 +138,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox;
+amsgbox;
 {$endif dont_use_openlib}
 
 FUNCTION BeginUpdate(l : pLayer) : LONGINT;

packages/amunits/src/coreunits/locale.pas

@@ -311,7 +311,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox;
+amsgbox;
 {$endif dont_use_openlib}
 
 PROCEDURE CloseCatalog(catalog : pCatalog);

packages/amunits/src/coreunits/lowlevel.pas

@@ -298,7 +298,7 @@ var
 IMPLEMENTATION
 
 {$ifndef dont_use_openlib}
-uses msgbox;
+uses amsgbox;
 {$endif dont_use_openlib}
 
 FUNCTION AddKBInt(const intRoutine : POINTER;const intData : POINTER) : POINTER;

packages/amunits/src/coreunits/nonvolatile.pas

@@ -108,7 +108,7 @@ var
 IMPLEMENTATION
 
 {$ifndef dont_use_openlib}
-uses msgbox;
+uses amsgbox;
 {$endif dont_use_openlib}
 
 FUNCTION DeleteNV(const appName : pCHAR;const itemName : pCHAR; killRequesters : LONGINT) : BOOLEAN;

packages/amunits/src/coreunits/realtime.pas

@@ -265,7 +265,7 @@ var
 IMPLEMENTATION
 
 {$ifndef dont_use_openlib}
-uses msgbox;
+uses amsgbox;
 {$endif dont_use_openlib}
 
 FUNCTION CreatePlayerA(const tagList : pTagItem) : pPlayer;

packages/amunits/src/coreunits/rexx.pas

@@ -520,7 +520,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 pastoc;
 

packages/amunits/src/coreunits/translator.pas

@@ -62,7 +62,7 @@ var
 IMPLEMENTATION
 
 {$ifndef dont_use_openlib}
-uses msgbox;
+uses amsgbox;
 {$endif dont_use_openlib}
 
 FUNCTION Translate(const inputString : pCHAR; inputLength : LONGINT; outputBuffer : pCHAR; bufferSize : LONGINT) : LONGINT;

packages/amunits/src/coreunits/workbench.pas

@@ -897,7 +897,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 pastoc;
 

packages/amunits/src/otherlibs/ahi.pas

@@ -549,7 +549,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray;
 

packages/amunits/src/otherlibs/ahi_sub.pas

@@ -172,7 +172,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray;
 

packages/amunits/src/otherlibs/amarquee.pas

@@ -311,7 +311,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 pastoc,tagsarray;
 

packages/amunits/src/otherlibs/cybergraphics.pas

@@ -273,7 +273,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray;
 

packages/amunits/src/otherlibs/gtlayout.pas

@@ -635,7 +635,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray;
 

packages/amunits/src/otherlibs/guigfx.pas

@@ -220,7 +220,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray,longarray;
 

packages/amunits/src/otherlibs/identify.pas

@@ -459,7 +459,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray,pastoc;
 

packages/amunits/src/otherlibs/lucyplay.pas

@@ -127,7 +127,7 @@ var
 IMPLEMENTATION
 
 {$ifndef dont_use_openlib}
-uses msgbox;
+uses amsgbox;
 {$endif dont_use_openlib}
 
 PROCEDURE lucAudioFree(smp : pLucyPlaySample);

packages/amunits/src/otherlibs/mui.pas

@@ -3598,7 +3598,7 @@ implementation
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray,longarray;
 

packages/amunits/src/otherlibs/mysticview.pas

@@ -183,7 +183,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray;
 

packages/amunits/src/otherlibs/picasso96api.pas

@@ -461,7 +461,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray;
 

packages/amunits/src/otherlibs/preferences.pas

@@ -160,7 +160,7 @@ var
 IMPLEMENTATION
 
 {$ifndef dont_use_openlib}
-uses msgbox;
+uses amsgbox;
 {$endif dont_use_openlib}
 
 FUNCTION AllocPrefsHandle(name : pCHAR) : POINTER;

packages/amunits/src/otherlibs/ptreplay.pas

@@ -107,7 +107,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 pastoc;
 

packages/amunits/src/otherlibs/render.pas

@@ -448,7 +448,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray;
 

packages/amunits/src/otherlibs/reqtools.pas

@@ -689,7 +689,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray,pastoc;
 

packages/amunits/src/otherlibs/triton.pas

@@ -792,7 +792,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray,pastoc;
 

packages/amunits/src/otherlibs/ttengine.pas

@@ -235,7 +235,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray;
 

packages/amunits/src/otherlibs/xadmaster.pas

@@ -1245,7 +1245,7 @@ IMPLEMENTATION
 
 uses
 {$ifndef dont_use_openlib}
-msgbox,
+amsgbox,
 {$endif dont_use_openlib}
 tagsarray;
 

packages/amunits/src/otherlibs/zlib.pas

@@ -80,7 +80,7 @@ var
 IMPLEMENTATION
 
 {$ifndef dont_use_openlib}
-uses msgbox;
+uses amsgbox;
 {$endif dont_use_openlib}
 
 FUNCTION GZ_Close(handle : POINTER) : LONGINT;

packages/amunits/src/utilunits/msgbox.pas → packages/amunits/src/utilunits/amsgbox.pas

@@ -27,7 +27,7 @@
     {$smartlink on}
 {$endif use_amiga_smartlink}
 
-unit MsgBox;
+unit AMsgBox;
 
 interface
 

packages/amunits/src/utilunits/tagsarray.pas

@@ -14,58 +14,98 @@
 
  **********************************************************************}
 
-{
-     History:
-
-     First version of this unit.
-     Just use this unit when you want to
-     use taglist.
-
-     09 Nov 2002
-
-     [email protected]
-}
-
 unit tagsarray;
-{$mode objfpc}
-
+{$mode objfpc}{$H+}
 
 interface
 
-uses Exec, Utility;
+uses
+  Exec, Utility;
+
+type
+  TTagsList = array of ttagitem;
+  PMyTags = ^TTagsList;
 
 
-function readintags(const args : array of const): pTagItem;
+function ReadInTags(const Args: array of const): PTagItem;
+procedure AddTags(var Taglist: TTagsList; const Args: array of const);
+function GetTagPtr(var TagList: TTagsList): PTagItem;
 
 implementation
 
-uses pastoc;
+var
+  MyTags: PMyTags;
 
+procedure AddTags(var Taglist: TTagsList; const Args: array of const);
 var
-   mytags : array [0..200] of ttagitem;
+  i: PtrInt;
+  ii: PtrInt;
+begin
+  ii := Length(TagList);
+  SetLength(TagList, Length(TagList) + (Length(args) DIV 2));
+  for i := 0 to High(args) do
+  begin
+    if (not Odd(i)) then
+    begin
+      TagList[ii].ti_tag := PtrInt(Args[i].vinteger);
+    end else
+    begin
+      case Args[i].vtype of
+        vtinteger : TagList[ii].ti_data := PtrInt(Args[i].vinteger);
+        vtboolean : TagList[ii].ti_data := PtrInt(byte(Args[i].vboolean));
+        vtpchar   : TagList[ii].ti_data := PtrInt(Args[i].vpchar);
+        vtchar    : TagList[ii].ti_data := PtrInt(Args[i].vchar);
+        vtstring  : TagList[ii].ti_data := PtrInt(PChar(string(Args[i].vstring^)));
+        vtpointer : TagList[ii].ti_data := PtrInt(Args[i].vpointer);
+      end;
+      inc(ii);
+    end;
+  end;
+end;
+
+function GetTagPtr(var TagList: TTagsList): pTagItem;
+begin
+  AddTags(TagList, [TAG_END, TAG_END]);
+  GetTagPtr := @(TagList[0]);
+end;
 
-function readintags(const args : array of const): pTagItem;
+function ReadInTags(const Args: array of const): PTagItem;
 var
-    i : longint;
-    ii : longint;
+  i: PtrInt;
+  ii: PtrInt;
 begin
-    ii := 0;
-    for i := 0 to high(args) do begin
-         if (not odd(i)) then begin
-              mytags[ii].ti_tag := longint(Args[i].vinteger);
-         end else begin
-             case Args[i].vtype of
-                  vtinteger : mytags[ii].ti_data := longint(Args[i].vinteger);
-                  vtboolean : mytags[ii].ti_data := longint(byte(Args[i].vboolean));
-                  vtpchar   : mytags[ii].ti_data := longint(Args[i].vpchar);
-                  vtchar    : mytags[ii].ti_data := longint(Args[i].vchar);
-                  vtstring  : mytags[ii].ti_data := longint(pas2c(Args[i].vstring^));
-                  vtpointer : mytags[ii].ti_data := longint(Args[i].vpointer);
-             end;
-             inc(ii);
-         end;
+  ii := 0;
+  SetLength(MyTags^, (Length(Args) div 2) + 4); // some more at the end
+  for i := 0 to High(Args) do
+  begin
+    if not Odd(i) then
+    begin
+      mytags^[ii].ti_tag := PtrInt(Args[i].vinteger);
+    end else
+    begin
+      case Args[i].vtype of
+        vtinteger: mytags^[ii].ti_data := PtrInt(Args[i].vinteger);
+        vtboolean: mytags^[ii].ti_data := PtrInt(Byte(Args[i].vboolean));
+        vtpchar: mytags^[ii].ti_data := PtrInt(Args[i].vpchar);
+        vtchar: mytags^[ii].ti_data := PtrInt(Args[i].vchar);
+        vtstring: mytags^[ii].ti_data := PtrInt(PChar(string(Args[i].vstring^)));
+        vtpointer: mytags^[ii].ti_data := PtrInt(Args[i].vpointer);
+      end;
+      Inc(ii);
     end;
-    readintags := @mytags;
+  end;
+  Inc(ii);
+  // Add additional TAG_DONE (if user forget)
+  mytags^[ii].ti_tag := TAG_DONE;
+  mytags^[ii].ti_data := 0;
+  // return the pointer
+  ReadInTags := @(MyTags^[0]);
 end;
 
+initialization
+  New(MyTags);
+  SetLength(MyTags^, 200);
+finalization
+  SetLength(MyTags^, 0);
+  Dispose(MyTags);
 end.