X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FFunctionWidget.cxx;h=c9c28d169a2c36bacb4d904c12de6f0e29ac6b49;hp=20d586df6eff9aff69d1921fcd4334c8af937520;hb=c1d5c719f82283739029be03d20bbf04406ff4d6;hpb=ae7b9847b80153121fbc1f87e4fdc1dd0e94f4cc

diff --git a/src/gui/widgets/FunctionWidget.cxx b/src/gui/widgets/FunctionWidget.cxx
index 20d586d..c9c28d1 100644
--- a/src/gui/widgets/FunctionWidget.cxx
+++ b/src/gui/widgets/FunctionWidget.cxx
@@ -18,41 +18,45 @@ namespace {
 FunctionWidget::FunctionWidget(Function* function, Mainwindow* mainwindow)
 	: function(function)
 	, mainwindow(mainwindow)
-	, logger(log4cxx::Logger::getLogger("Mainwindow")) {
+	, layouted(false)
+	, logger(log4cxx::Logger::getLogger("gui.Mainwindow")) {
 
-	// CFG
-	CFGScene * scene = new CFGScene;
-	InformationManager* manager = function->getManager();
-
-	BasicBlock * block = manager->getBasicBlock(function->getStartAddress());
-	LOG4CXX_DEBUG(logger, "Building widget for functionction " << function->getName());
-	for (auto i : function->blocks()) {
-		LOG4CXX_DEBUG(logger, "Functionction contains Block " << i.second->getName());
-	}
-
-	uint64_t start_address(std::numeric_limits<uint64_t>::max());
-	for (auto b : function->blocks()) {
-		if (b.first < start_address)
-			start_address = b.first;
-	}
+}
 
-	std::map<uint64_t, BasicBlockWidget*> _blocks;
-	local__add_basic_block(block, mainwindow,
-	                       manager, _blocks, scene, start_address, 100);
+void FunctionWidget::showEvent(QShowEvent* event) {
+	if (!layouted) {
+		CFGScene * scene = new CFGScene;
+		InformationManager* manager = function->getManager();
 
-	QGraphicsView * view = new QGraphicsView(scene);
-	addTab(view, "CFG");
+		BasicBlock * block = manager->getBasicBlock(function->getStartAddress());
+		LOG4CXX_DEBUG(logger, "Building widget for functionction " << function->getName());
+		for (auto i : function->blocks()) {
+			LOG4CXX_DEBUG(logger, "Functionction contains Block " << i.second->getName());
+		}
 
-	// Listing
-	QTableWidget * t = new QTableWidget();
-	t->setColumnCount(3);
-	t->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
+		uint64_t start_address(std::numeric_limits<uint64_t>::max());
+		for (auto b : function->blocks()) {
+			if (b.first < start_address)
+				start_address = b.first;
+		}
 
-	addTab(t, "Listing");
-}
+		std::map<uint64_t, BasicBlockWidget*> _blocks;
+		local__add_basic_block(block, mainwindow,
+		                       manager, _blocks, scene, 3*start_address, 100);
 
+		QGraphicsView * view = new QGraphicsView(scene);
+		view->setDragMode(QGraphicsView::ScrollHandDrag);
+		addTab(view, "CFG");
 
+		// Listing
+		QTableWidget * t = new QTableWidget();
+		t->setColumnCount(3);
+		t->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
 
+		addTab(t, "Listing");
+		layouted = true;
+	}
+}
 
 namespace {
 	BasicBlockWidget *
@@ -62,6 +66,7 @@ namespace {
 	                       CFGScene * scene, uint64_t starty, uint64_t startx) {
 
 		decltype(known_blocks.begin()) old;
+		if (!block) return NULL;
 		if ((old = known_blocks.find(block->getStartAddress())) != known_blocks.end())
 			return old->second;
 
@@ -75,19 +80,7 @@ namespace {
 
 		scene->addItem(widget);
 		widget->setFlag(QGraphicsItem::ItemIsMovable, true);
-		widget->moveBy(100*startx, block->getStartAddress() - starty);
-
-		manager->getDisassembler()
-			->printEachInstruction(block->getStartAddress(),
-			                       block->getEndAddress(),
-			                       [&](uint8_t* bytes,
-			                           size_t byte_count,
-			                           const std::string& line,
-			                           const std::string& ref) {
-				                       widget->addItem(bytes, byte_count,
-				                                       line.c_str() + 1, // remove \t
-				                                       ref.c_str());
-			                       });
+		widget->moveBy(100*startx, 3*block->getStartAddress() - starty);
 
 		BasicBlockWidget *tmp, *nextl(NULL), *nextr(NULL);
 		BasicBlock * tmpblock;