* fixes for linux GDB tty command (merged)

ide/text/fpdebug.pas

@@ -600,9 +600,13 @@ begin
 {$endif win32}
 {$ifdef linux}
   { Run the debuggee in another tty }
-  Command('set tty '+DebuggeeTTY);
-  NoSwitch:=DebuggeeTTY<>'';
-{$endif win32}
+  if DebuggeeTTY <> '' then
+    begin
+      Command('tty '+DebuggeeTTY);
+      NoSwitch:= true;
+    end
+  else NoSwitch := false;
+{$endif linux}
   { Switch to user screen to get correct handles }
   UserScreen;
   inherited Run;
@@ -896,7 +900,11 @@ begin
   Inc(RunCount);
   if NoSwitch then
     begin
+{$ifdef linux}
+      PushStatus(msg_runninginanotherwindow+DebuggeeTTY);
+{$else not linux}
       PushStatus(msg_runninginanotherwindow);
+{$endif linux}
     end
   else
     begin
@@ -3346,7 +3354,10 @@ end.
 
 {
   $Log$
-  Revision 1.2  2000-08-22 09:41:39  pierre
+  Revision 1.3  2000-10-06 22:58:59  pierre
+   * fixes for linux GDB tty command (merged)
+
+  Revision 1.2  2000/08/22 09:41:39  pierre
    * first big merge from fixes branch
 
   Revision 1.1.2.1  2000/07/18 05:50:22  michael

ide/text/fpini.pas

@@ -1,5 +1,9 @@
 {
+<<<<<<< fpini.pas
     $Id$
+=======
+    $Id$
+>>>>>>> 1.1.2.3
     This file is part of the Free Pascal Integrated Development Environment
     Copyright (c) 1998 by Berczi Gabor
 
@@ -56,6 +60,7 @@ const
 (*  ieOpenFile         = 'OpenFile';
   ieOpenFileCount    = 'OpenFileCount'; *)
   ieRunParameters    = 'Parameters';
+  ieDebuggeeRedir    = 'DebugRedirection';
   iePrimaryFile      = 'PrimaryFile';
   ieCompileMode      = 'CompileMode';
   iePalette          = 'Palette';
@@ -312,6 +317,7 @@ begin
     be overruled with the parameter loading }
   SetPrimaryFile(INIFile^.GetEntry(secCompile,iePrimaryFile,PrimaryFile));
   SetRunParameters(INIFile^.GetEntry(secRun,ieRunParameters,GetRunParameters));
+  DebuggeeTTY := INIFile^.GetEntry(secRun,ieDebuggeeRedir,DebuggeeTTY);
   { Compile }
   S:=INIFile^.GetEntry(secCompile,ieCompileMode,'');
   for ts:=low(TSwitchMode) to high(TSwitchMode) do
@@ -489,6 +495,8 @@ begin
 *)
   { Run }
   INIFile^.SetEntry(secRun,ieRunParameters,GetRunParameters);
+  If DebuggeeTTY<>'' then
+    INIFile^.SetEntry(secRun,ieDebuggeeRedir,DebuggeeTTY);
   { Compile }
   INIFile^.SetEntry(secCompile,iePrimaryFile,PrimaryFile);
   INIFile^.SetEntry(secCompile,ieCompileMode,SwitchesModeStr[SwitchesMode]);
@@ -570,7 +578,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.2  2000-08-22 09:41:39  pierre
+  Revision 1.3  2000-10-06 22:58:59  pierre
+   * fixes for linux GDB tty command (merged)
+
+  Revision 1.2  2000/08/22 09:41:39  pierre
    * first big merge from fixes branch
 
   Revision 1.1.2.2  2000/08/16 18:46:14  peter

ide/text/fpstre.inc

@@ -378,6 +378,7 @@ const
       label_editor_autoclosingbrackets = 'Aut~o~-closing brackets';
       label_editor_keeptrailingspaces = '~K~eep trailing spaces';
       label_editor_codecomplete = 'Co~d~eComplete enabled';
+      label_editor_folds = 'E~n~able folds';
       label_editor_editoroptions = '~E~ditor options';
       label_editor_tabsize = '~T~ab size';
       label_editor_highlightextensions = '~H~ighlight extensions';
@@ -479,9 +480,9 @@ const
       label_debugger_debuginfo = 'Debugging information';
       label_debugger_profileswitches = 'Profiling Switches';
       label_debugger_compilerargs = '~A~dditional compiler args';
-      label_debugger_useanotherconsole = 'Use ~A~nother console';
+      label_debugger_useanotherconsole = '~U~se another console';
       label_debugger_redirection = 'Debuggee ~R~edirection';
-      label_debugger_useanothertty = 'Use ~A~nother tty for Debuggee';
+      label_debugger_useanothertty = '~U~se Another tty for Debuggee';
 
       dialog_helpfiles = 'Install Help Files';
       label_helpfiles_helpfiles = '~H~elp files';
@@ -558,6 +559,7 @@ const
       msg_errorprocessingfilteredoutput = 'Error processing filtered output.';
       msg_errorexecutingfilter = 'Error executing filter %s';
       msg_errorexecutingtool = 'Error executing tool %s';
+      msg_errorexecutingshell = 'Error cannot run shell';
       msg_filterexecutionsuccessfulexitcodeis = 'Filter execution successful. Exit code = %d';
       msg_toolexecutionsuccessfulexitcodeis = 'Tool execution successful. Exit code = %d';
 
@@ -979,7 +981,10 @@ const
 
 {
   $Log$
-  Revision 1.2  2000-08-22 09:41:40  pierre
+  Revision 1.3  2000-10-06 22:58:59  pierre
+   * fixes for linux GDB tty command (merged)
+
+  Revision 1.2  2000/08/22 09:41:40  pierre
    * first big merge from fixes branch
 
   Revision 1.1.2.3  2000/08/16 18:46:14  peter