From d5cec0fc9744d705233d2beeca697684283f4b82 Mon Sep 17 00:00:00 2001
From: micio <micio@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 4 Feb 2012 08:53:54 +0000
Subject: [PATCH] ide/Debuggers/Gdb_MI2 : some cosmetics on interface

git-svn-id: svn://ultimatepp.org/upp/trunk@4535 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Debuggers/Gdb_MI2.cpp       | 57 +++++++++++++++++++++++---
 uppsrc/ide/Debuggers/Gdb_MI2.h         |  3 ++
 uppsrc/ide/Debuggers/PrettyPrinters.py | 21 ++++++++++
 3 files changed, 76 insertions(+), 5 deletions(-)

diff --git a/uppsrc/ide/Debuggers/Gdb_MI2.cpp b/uppsrc/ide/Debuggers/Gdb_MI2.cpp
index 0b2139c6a..773e20b01 100644
--- a/uppsrc/ide/Debuggers/Gdb_MI2.cpp
+++ b/uppsrc/ide/Debuggers/Gdb_MI2.cpp
@@ -35,6 +35,9 @@ bool Gdb_MI2::SetBreakpoint(const String& filename, int line, const String& bp)
 	// gets all breakpoints
 	MIValue bps = GetBreakpoints();
 	
+	// line should start from 1...
+	line++;
+	
 	// check wether we've got already a breakpoint here
 	// and remove it
 	MIValue brk = bps.FindBreakpoint(file, line);
@@ -185,11 +188,10 @@ Gdb_MI2::Gdb_MI2()
 	Add(tab.SizePos());
 	tab.Add(watches.SizePos(), t_("Watches"));
 	tab.Add(locals.SizePos(), t_("Locals"));
+	tab.Add(autos.SizePos(), "Autos");
 	tab.Add(explorerPane.SizePos(), t_("Explorer"));
 	
-//	tab.Add(autos.SizePos(), "Autos");
-
-	Add(frame.HSizePos(200, 0).TopPos(2, EditField::GetStdHeight()));
+	Add(frame.HSizePos(FindTabsRight() + 10, 0).TopPos(2, EditField::GetStdHeight()));
 	frame.Ctrl::Add(dlock.SizePos());
 	dlock = "  Running..";
 	dlock.SetFrame(BlackFrame());
@@ -222,6 +224,42 @@ Gdb_MI2::~Gdb_MI2()
 //											PRIVATE FUNCTIONS
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
+// find free space at right of tabs (we should probably add something to TabCtrl for that..)
+int Gdb_MI2::FindTabsRight(void)
+{
+	if(!tab.GetCount())
+		return 0;
+	
+	int lastTab = tab.GetCount() - 1;
+	int i1 = 0, i2 = 10000;
+	
+	// bisect up it finds a point on last tab...
+	int iTab = -1;
+	int i;
+	while(iTab != lastTab)
+	{
+		i = (i1 + i2) / 2;
+		iTab = tab.GetTab(Point(i, 0));
+		if(iTab < 0)
+			i2 = i;
+		else
+			i1 = i;
+	}
+	
+	// now scan for righ tab edge
+	i1 = i; i2 = i + 10000;
+	while(abs(i1 - i2) > 2)
+	{
+		i = (i1 + i2) / 2;
+		iTab = tab.GetTab(Point(i, 0));
+		if(iTab == -1)
+			i2 = i;
+		else
+			i1 = i;
+	}
+	return i;
+}
+
 // lock/unlock debugger controls
 void Gdb_MI2::Lock()
 {
@@ -1058,6 +1096,8 @@ void Gdb_MI2::doExplore(String const &expr, String var, bool isChild, bool appen
 		{
 			MIValue child = childs[i];
 			String exp = child["exp"];
+			if(isdigit(exp[0]))
+				exp = '[' + exp + ']';
 			
 			// handle pseudo children...
 			while(exp == "public" || exp == "private" || exp == "protected")
@@ -1100,7 +1140,7 @@ void Gdb_MI2::onExploreExpr(ArrayCtrl *what)
 	doExplore(expr, "", false, true);
 	
 	// activate explorer tab
-	tab.Set(2);
+	tab.Set(3);
 }
 
 void Gdb_MI2::onExplorerChild()
@@ -1112,7 +1152,14 @@ void Gdb_MI2::onExplorerChild()
 	if(--line < explorerChildVars.GetCount())
 	{
 		String var = explorerChildVars[line];
-		String expr = explorerParentExpr + MICmd("var-info-expression \"" + var + "\"")["exp"];
+		String varExp = var;
+		String expr = MICmd("var-info-expression \"" + var + "\"")["exp"];
+		if(expr[0] != '[' && expr[0] != '.')
+			if(isdigit(expr[0]))
+				expr = '[' + expr + ']';
+			else
+				expr = '.' + expr;
+		expr = explorerParentExpr + expr;
 		doExplore(expr, var, true, true);
 	}
 }
diff --git a/uppsrc/ide/Debuggers/Gdb_MI2.h b/uppsrc/ide/Debuggers/Gdb_MI2.h
index 1c76e9983..e51e838e4 100644
--- a/uppsrc/ide/Debuggers/Gdb_MI2.h
+++ b/uppsrc/ide/Debuggers/Gdb_MI2.h
@@ -55,6 +55,9 @@ class Gdb_MI2 : public Debugger, public ParentCtrl
 		Vector<Label *> reglbl;
 		void AddReg(const char *reg, Label *lbl) { regname.Add(reg); reglbl.Add(lbl); }
 
+		// find free space at right of tabs (we should probably add something to TabCtrl for that..)
+		int FindTabsRight(void);
+
 		// running flags -- setup by ReadGdb function when async input is catched
 		bool started;
 		bool stopped;
diff --git a/uppsrc/ide/Debuggers/PrettyPrinters.py b/uppsrc/ide/Debuggers/PrettyPrinters.py
index 239e91937..2a07d0f35 100644
--- a/uppsrc/ide/Debuggers/PrettyPrinters.py
+++ b/uppsrc/ide/Debuggers/PrettyPrinters.py
@@ -136,6 +136,27 @@ class UppArrayPrinter(object):
 	def display_hint(self):
 		return 'array'
 
+# Upp::Value printer
+class UppValuePrinter(object):
+
+	def __init__(self, val):
+		self.typeid ={
+			0:'void',
+			1:'int',
+			2:'double',
+			3:'Upp::String',
+			4:'Upp::Date',
+			5:'Upp::Time',
+			6:'ERROR',
+			7:'Upp::Value',
+			8:'Upp::WString',
+			9:'Upp::ValueArray',
+			10:'int64',
+			11:'bool',
+			12:'Upp::ValueMap'
+		}
+		self.val = val
+
 def UppLookupFunction(val):
 	typeStr = str(val.type)