Changeset 25 for trunk/NewView/StartupUnit.pas

Timestamp:

Aug 1, 2006, 8:51:54 PM (19 years ago)

Author:

RBRi

Message:

refactoring for cmd line parameters handling finished

File:

• trunk/NewView/StartupUnit.pas (modified) (10 diffs)

trunk/NewView/StartupUnit.pas

@@ -15 +15 @@
   ACLString,
   GlobalFilelistUnit,
-  SharedMemoryUnit;
+  SharedMemoryUnit,
+  CmdLineParameterUnit;
 
 const
   OWN_HELP_MARKER = '[NVHELP]';
 
-type
-  TWindowPosition = record
-    Left: longint;
-    Bottom: longint;
-    Width: longint;
-    Height: longint;
-  end;
-
-  TCommandLineParameters = record
-    ShowUsageFlag: boolean; // *
-    TopicParam: string; // *
-    FilenamesParam: TAString;
-    SearchText: string;
-    SearchFlag: boolean;
-    GlobalSearchText: string; // *
-    GlobalSearchFlag: boolean; // *
-    OwnerWindow: HWND;
-    HelpManagerWindow: HWND;
-    IsHelpManager: boolean;
-    WindowTitle: string;
-    Position: TWindowPosition;
-    SetPosition: boolean;
-    Language: string;
-  end;
-  // * posted to re-used windows
-
-Procedure ParseCommandLineParameters;
 
 function AccessSharedMemory: TSuballocatedSharedMemory;
@@ -67 +41 @@
 
 var
-  Parameters: TCommandLineParameters;
+  CmdLineParameters: TCmdLineParameters;
   SharedMemory: TSubAllocatedSharedMemory;
   GlobalFilelist: TGlobalFilelist;
@@ -74 +48 @@
 
 uses
-  //Forms,
-  Dos, SysUtils, PMWin,
-  ACLUtility, ACLStringUtility, ACLFileUtility, AStringUtilityUnit, ACLProfile,
+  Dos,
+  SysUtils,
+  PMWin,
+  ACLUtility,
+  ACLStringUtility,
+  ACLFileUtility,
+  AStringUtilityUnit,
+  ACLProfile,
   HelpManagerUnit;
 
@@ -251 +230 @@
 end;
 
-// Parse command line parameters newview was launched with.
-// Store them into the Parameters. variables for later processing.
-Procedure ParseCommandLineParameters;
-var
-  ParamIndex: longint;
-  Param: string;
-  ParamValue: string;
-begin
-  ProfileEvent( 'ParseCommandLineParameters started' );
-
-  Parameters.FilenamesParam := TAString.Create;
-  Parameters.TopicParam := '';
-  Parameters.ShowUsageFlag := false;
-  Parameters.GlobalSearchFlag := false;
-  Parameters.SearchFlag := false;
-  Parameters.OwnerWindow := 0;
-  Parameters.IsHelpManager := false;
-  Parameters.HelpManagerWindow := 0;
-  Parameters.WindowTitle := '';
-  Parameters.SetPosition := false;
-  Parameters.Language := '';
-
-  for ParamIndex := 1 to ParamCount do
-  begin
-    Param := ParamStr( ParamIndex );
-    if    MatchFlagParam( Param, '?' )
-       or MatchFlagParam( Param, 'H' )
-       or MatchFlagParam( Param, 'HELP' ) then
-    begin
-      Parameters.ShowUsageFlag := true
-    end
-    else if MatchValueParam( Param, 'LANG', Parameters.Language ) then
-    begin
-    end
-    else if MatchValueParam( Param, 'G', Parameters.GlobalSearchText ) then
-    begin
-      Parameters.GlobalSearchFlag := true;
-    end
-    else if MatchValueParam( Param, 'S', Parameters.SearchText ) then
-    begin
-      Parameters.SearchFlag := true;
-    end
-    else if MatchValueParam( Param, 'HM', ParamValue ) then
-    begin
-      try
-        Parameters.HelpManagerWindow := StrToInt( ParamValue );
-        Parameters.IsHelpManager := true;
-      except
-        // ignore invalid window value
-      end;
-    end
-    else if MatchValueParam( Param, 'OWNER', ParamValue ) then
-    begin
-      Parameters.OwnerWindow := StrToInt( ParamValue );
-    end
-    else if MatchValueParam( Param, 'TITLE', ParamValue ) then
-    begin
-      Parameters.WindowTitle := ParamValue;
-    end
-    else if MatchFlagParam( Param, 'PROFILE' ) then
-    begin
-      StartProfile( GetLogFilesDir + 'newview.prf' );
-    end
-    else if MatchValueParam( Param, 'POS', ParamValue ) then
-    begin
-      // set window position/size
-      if ExtractPositionSpec( ParamValue,
-                              Parameters.Position ) then
-      begin
-        Parameters.SetPosition := true;
-      end
-      else
-      begin
-        // invalid...
-        Parameters.ShowUsageFlag := true;
-      end;
-    end
-    else
-    begin
-      if Parameters.FilenamesParam.Length = 0 then
-      begin
-        // filename(s)
-        AString_ParamStr( ParamIndex, Parameters.FilenamesParam );
-      end
-      else
-      begin
-        // search (topic) parameter... append all remaining thingies
-        if Parameters.TopicParam <> '' then
-        begin
-          Parameters.TopicParam := Parameters.TopicParam + ' ';
-        end;
-        Parameters.TopicParam := Parameters.TopicParam + Param;
-      end;
-    end;
-  end;
-
-  ProfileEvent( 'Parameters parsed' );
-  ProfileEvent( '  Filenames: '
-                + Parameters.FilenamesParam.AsString );
-  ProfileEvent( '  Topic: '
-                + Parameters.TopicParam );
-
-  // params will be acted on later...
-  ProfileEvent( '...done' );
-
-end;
 
 // If another instance already has the files open
@@ -371 +244 @@
   Result := NULLHANDLE;
 
-  if Parameters.FilenamesParam.Length = 0 then
+  if length(CmdLineParameters.getFileNames) = 0 then
     // not loading files; nothing to check
     exit;
@@ -378 +251 @@
   Filenames := TStringList.Create;
 
-  AStringToList( Parameters.FilenamesParam, FileItems, '+' );
+  StringToList(cmdLineParameters.getFileNames, FileItems, '+' );
   TranslateIPFEnvironmentVars( FileItems, FileNames );
 
@@ -446 +319 @@
 function Startup: boolean;
 var
+  tmpCmdLine: String;
+  tmpSplittedCmdLine : TStringList;
+  tmpRc : Integer;
+
   ExistingWindow: HWND;
 begin
@@ -455 +332 @@
 
   // parse parameters into Parameters object
-  ParseCommandLineParameters;
+  tmpCmdLine := nativeOS2GetCmdLineParameter;
+  tmpSplittedCmdLine := TStringList.Create;
+  tmpRc := splitCmdLineParameter(tmpCmdLine, tmpSplittedCmdLine);
+
+  CmdLineParameters := TCmdLineParameters.Create;
+  CmdLineParameters.parseCmdLine(tmpSplittedCmdLine);
+
+  tmpSplittedCmdLine.Destroy;
 
   ExistingWindow := FindExistingWindow;
@@ -466 +350 @@
     // destroy global list - nobody else will
     GlobalFilelist.Destroy;
-    Parameters.FilenamesParam.Destroy;
+    // TODO rbri maybe we need the next line
+    // Parameters.FilenamesParam.Destroy;
 
     WinSetFocus( HWND_DESKTOP, ExistingWindow );
 
-    if Parameters.TopicParam <> '' then
+    if CmdLineParameters.getTopics <> '' then
     begin
       PostNewViewTextMessage( ExistingWindow,
                               NHM_SEARCH,
-                              Parameters.TopicParam );
-    end;
-
-    if Parameters.GlobalSearchFlag then
+                              CmdLineParameters.getTopics);
+    end;
+
+    if CmdLineParameters.getGlobalSearchTextFlag then
     begin
       PostNewViewTextMessage( ExistingWindow,
                               NHM_GLOBAL_SEARCH,
-                              Parameters.GlobalSearchText );
-    end;
-
-    if Parameters.ShowUsageFlag then
+                              CmdLineParameters.getGlobalSearchText );
+    end;
+
+    if CmdLineParameters.getShowUsageFlag then
     begin
       WinPostMsg( ExistingWindow,
@@ -492 +377 @@
     end;
 
-    if Parameters.IsHelpManager then
+    if CmdLineParameters.getHelpManagerFlag then
     begin
       // tell the new help manager instance to talk to the
       // other viewer
-      WinPostMsg( Parameters.HelpManagerWindow,
+      WinPostMsg( CmdLineParameters.getHelpManagerWindow,
                NHM_VIEWER_READY,
                ExistingWindow,