From c95e8639cfb4e9fe37a079334420df9cc5bcf522 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Fri, 4 Nov 2016 15:20:32 +0100
Subject: [PATCH] #97, call stack list, also select frame in GDB

---
 src/ce_gdb.lfm | 21 ++++++++++++++-
 src/ce_gdb.pas | 70 +++++++++++++++++++-------------------------------
 2 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/src/ce_gdb.lfm b/src/ce_gdb.lfm
index 8e97cd51..63a7d3c5 100644
--- a/src/ce_gdb.lfm
+++ b/src/ce_gdb.lfm
@@ -159,8 +159,27 @@ inherited CEGdbWidget: TCEGdbWidget
           Top = 0
           Width = 513
           Align = alClient
-          Columns = <>
+          Columns = <          
+            item
+              AutoSize = True
+              Caption = 'function'
+              Width = 62
+            end          
+            item
+              AutoSize = True
+              Caption = 'address'
+              Width = 59
+            end          
+            item
+              AutoSize = True
+              Caption = 'filename'
+              Width = 371
+            end>
+          GridLines = True
+          ReadOnly = True
           TabOrder = 0
+          ViewStyle = vsReport
+          OnDblClick = lstCallStackDblClick
         end
       end
       object Splitter3: TSplitter[3]
diff --git a/src/ce_gdb.pas b/src/ce_gdb.pas
index 2466fcce..8f26ed85 100644
--- a/src/ce_gdb.pas
+++ b/src/ce_gdb.pas
@@ -223,7 +223,6 @@ type
   TStackItems = class
   strict private
     fItems: TCollection;
-    procedure listDblClick(sender: TObject);
   public
     constructor create;
     destructor destroy; override;
@@ -265,7 +264,7 @@ type
     property item[index: integer]: TPersistentBreakPoint read getItem; default;
   end;
 
-  // Makes a category for shortcuts in the option editor.
+  // Makes a category for the shortcuts in the option editor.
   TCEDebugShortcuts = class(TPersistent)
   private
     fStart, fStop, fPause, fContinue, fStep, fStepOver, fStack, fRegs,
@@ -378,6 +377,7 @@ type
     procedure btnStopClick(Sender: TObject);
     procedure btnWatchClick(Sender: TObject);
     procedure Edit1KeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
+    procedure lstCallStackDblClick(Sender: TObject);
     procedure mnuReadWClick(Sender: TObject);
     procedure mnuReadWriteWClick(Sender: TObject);
     procedure mnuSelProjClick(Sender: TObject);
@@ -767,23 +767,6 @@ var
   sitm: TStackItem;
 begin
   list.Clear;
-  list.ReadOnly:=true;
-  list.GridLines:=true;
-  list.ViewStyle:= TViewStyle.vsReport;
-  if list.ColumnCount <> 3 then
-  begin
-    list.Columns.Clear;
-    list.Columns.Add;
-    list.Columns.Add;
-    list.Columns.Add;
-  end;
-  list.Column[0].Caption:= 'function';
-  list.Column[1].Caption:= 'address';
-  list.Column[2].Caption:= 'filename';
-  list.Column[0].AutoSize:= true;
-  list.Column[1].AutoSize:= true;
-  list.Column[2].AutoSize:= true;
-  list.OnDblClick:= @listDblClick;
   for i:= 0 to fItems.Count-1 do
   begin
     litm := list.Items.Add;
@@ -799,28 +782,6 @@ begin
   end;
 end;
 
-procedure TStackItems.listDblClick(sender: TObject);
-var
-  lst: TListView;
-  itm: TStackItem;
-  nme: string;
-  doc: TCESynMemo;
-begin
-  if (sender.isNil) or not (sender is TListView) then
-    exit;
-  lst := TListView(sender);
-  if lst.Selected.isNil or lst.Selected.Data.isNil then
-    exit;
-  itm := TStackItem(lst.Selected.Data);
-  nme := itm.filename;
-  if not nme.fileExists then
-    exit;
-  getMultiDocHandler.openDocument(nme);
-  doc := getMultiDocHandler.findDocument(nme);
-  if doc.isNotNil then
-    doc.CaretY:= itm.line;
-end;
-
 procedure TStackItems.addItem(addr: PtrUint; fname, nme: string; lne: integer);
 begin
   TStackItem(fItems.Add).setProperties(addr, fname, nme, lne);
@@ -1833,8 +1794,6 @@ begin
       gdbCommand('continue', @gdboutJsonize);
     end
 
-    // *stopped,reason="watchpoint-trigger",wpt={number="10",exp="h"},value={old="0",new="1"},frame={addr="0x000000000049fb7c",func="D main",args=[{name="args",value="..."}],file="/home/basile/Dev/dproj/Resource.d/src/resource.d",fullname="/home/basile/Dev/dproj/Resource.d/src/resource.d",line="47"},thread-id="1",stopped-threads="all",core="1"
-
     else if reason = 'signal-received' then
     begin
       signame := 'unknown signal';
@@ -1890,7 +1849,7 @@ begin
     end
 
     else if (reason = 'exited-normally') or (reason = 'exited-signalled')
-    or (reason = 'exited')
+      or (reason = 'exited')
     then
     begin
       readOutput;
@@ -2203,6 +2162,29 @@ begin
     sendCustomCommand;
 end;
 
+procedure TCEGdbWidget.lstCallStackDblClick(Sender: TObject);
+var
+  itm: TStackItem;
+  nme: string;
+  doc: TCESynMemo;
+begin
+  if lstCallStack.Selected.isNil or lstCallStack.Selected.Data.isNil then
+    exit;
+  itm := TStackItem(lstCallStack.Selected.Data);
+  nme := itm.filename;
+  if not nme.fileExists then
+    exit;
+  fDocHandler.openDocument(nme);
+  doc := fDocHandler.findDocument(nme);
+  if doc.isNotNil then
+    doc.CaretY:= itm.line;
+  gdbCommand('-stack-select-frame ' + intToStr(lstCallStack.ItemIndex));
+  if fOptions.autoGetVariables then
+    infoVariables;
+  if fOptions.autoGetRegisters then
+    infoRegs;
+end;
+
 procedure TCEGdbWidget.mnuReadWClick(Sender: TObject);
 begin
   fAddWatchPointKind := wpkRead;