X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2FMainwindow.cxx;h=dfcdc76fdae6d22a6d93599c83c2f7b3f3e73ab4;hp=0c08892642dd760b4f5e611254e9c8c67de2467e;hb=30bd2ac7409f9d7496708b77a404fd69be291387;hpb=ccde95277ce5e3929d09aef387c2f5956592d066 diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx index 0c08892..dfcdc76 100644 --- a/src/gui/Mainwindow.cxx +++ b/src/gui/Mainwindow.cxx @@ -4,6 +4,7 @@ #include "core/Function.hxx" #include "core/BasicBlock.hxx" #include "core/InformationManager.hxx" +#include "core/events/RenameFunctionEvent.hxx" #include "widgets/ScriptingDock.hxx" #include "widgets/CFGScene.hxx" #include "widgets/FunctionWidget.hxx" @@ -24,18 +25,22 @@ Mainwindow::Mainwindow(InformationManager* mgr) : manager(mgr) , logger(log4cxx::Logger::getLogger("Mainwindow")) { openAction = new QAction(tr("&Open"), this); + loadAction = new QAction(tr("&Load"), this); saveAction = new QAction(tr("&Save"), this); exitAction = new QAction(tr("E&xit"), this); - connect(openAction, SIGNAL(triggered()), - this, SLOT(open())); - connect(saveAction, SIGNAL(triggered()), - this, SLOT(save())); - connect(exitAction, SIGNAL(triggered()), - qApp, SLOT(quit())); + connect(openAction, &QAction::triggered, + this, &Mainwindow::open); + connect(loadAction, &QAction::triggered, + this, &Mainwindow::load); + connect(saveAction, &QAction::triggered, + this, &Mainwindow::save); + connect(exitAction, &QAction::triggered, + qApp, &QApplication::quit); fileMenu = menuBar()->addMenu(tr("&File")); fileMenu->addAction(openAction); + fileMenu->addAction(loadAction); fileMenu->addAction(saveAction); fileMenu->addSeparator(); fileMenu->addAction(exitAction); @@ -44,7 +49,9 @@ Mainwindow::Mainwindow(InformationManager* mgr) scripting->setAllowedAreas(Qt::BottomDockWidgetArea); addDockWidget(Qt::BottomDockWidgetArea, scripting); - listWidget = new QListWidget(); + listWidget = new QTreeWidget(); + listWidget->setColumnCount(1); + listWidget->setDragDropMode(QAbstractItemView::InternalMove); listWidget->setContextMenuPolicy(Qt::CustomContextMenu); connect(listWidget, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showListContextMenu(const QPoint&))); @@ -57,15 +64,26 @@ Mainwindow::Mainwindow(InformationManager* mgr) addDockWidget(Qt::LeftDockWidgetArea, dockWidget); setCentralWidget(stackedWidget); - connect(listWidget, SIGNAL(currentRowChanged(int)), - this, SLOT(switchMainPlane(int))); + connect(listWidget, &QTreeWidget::currentItemChanged, + [=] (QTreeWidgetItem* current, QTreeWidgetItem*) { + switchMainPlane(current); + }); setWindowTitle(tr("FRIDA")); + QTreeWidgetItem * external = new QTreeWidgetItem(listWidget, QStringList("External Functions")); + external->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator); + external->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd))); mgr->connect_new_function_signal([&] (Function* fun) {addFunction(fun);}); - mgr->connect_new_dyn_symbol_signal([&] (const std::string& name) { - auto item = new QListWidgetItem(name.c_str(), listWidget); - item->setBackground(QBrush(QColor(0xff, 0xdd, 0xdd))); + mgr->connect_new_dyn_symbol_signal([=] (const std::string& name) { + auto item = new QTreeWidgetItem(external, QStringList(name.c_str())); + item->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd))); + }); + mgr->connect_rename_function_signal([&](RenameFunctionEvent* event) { + if (objects_list_by_address.find(event->address) == objects_list_by_address.end()) + return; + auto item = objects_list_by_address[event->address]; + if (item) item->setText(0, event->new_name.c_str()); }); setGlobalHotkeys(); } @@ -76,7 +94,7 @@ void Mainwindow::setGlobalHotkeys() { shortcut = new QShortcut(QKeySequence("r"), listWidget); connect(shortcut, &QShortcut::activated, [=]() { - QListWidgetItem * item = listWidget->currentItem(); + QTreeWidgetItem * item = listWidget->currentItem(); if (item) renameFunction(objects_list[item]->getFunction()); }); } @@ -95,19 +113,24 @@ void Mainwindow::quit() void Mainwindow::open() { QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "", tr("Binaries (*)")); - manager->reset(fileName.toStdString()); } +void Mainwindow::load() { + QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), "", + tr("Frida Archives (*.frida)")); + manager->load(fileName.toStdString()); +} + void Mainwindow::save() { QString filename = QFileDialog::getSaveFileName(this, tr("Save File"), "", tr("Frida Archives (*.frida)")); - manager->save(filename); + manager->save(filename.toStdString()); } void Mainwindow::switchMainPlaneToAddress(uint64_t address) { if (objects_list_by_address.find(address) != objects_list_by_address.end()) { LOG4CXX_DEBUG(logger, "Switching to function " << std::hex << address); - QListWidgetItem * item = objects_list_by_address[address]; + QTreeWidgetItem * item = objects_list_by_address[address]; listWidget->setCurrentItem(item); stackedWidget->setCurrentWidget(objects_list[item]); } else { @@ -116,20 +139,44 @@ void Mainwindow::switchMainPlaneToAddress(uint64_t address) { } } -void Mainwindow::switchMainPlane(int) { - stackedWidget->setCurrentWidget(objects_list[listWidget->currentItem()]); +void Mainwindow::switchMainPlane(QTreeWidgetItem* to) { + if (objects_list.end() != objects_list.find(to)) + stackedWidget->setCurrentWidget(objects_list[to]); } void Mainwindow::showListContextMenu(const QPoint& point) { - QListWidgetItem * item = listWidget->itemAt(point); + QAction * act; + QTreeWidgetItem * item = listWidget->itemAt(point); QMenu menu(this); + + act = menu.addAction("Add Function"); + connect(act, &QAction::triggered, this, &Mainwindow::requestNewFunction); + + act = menu.addAction("Add Group"); + connect(act, &QAction::triggered, this, &Mainwindow::requestNewGroup); + if (item) { - QAction * act = menu.addAction("Rename Function"); - connect(act, &QAction::triggered, [=]() {this->renameFunction(objects_list[item]->getFunction());}); - } else { - QAction * act = menu.addAction("AddFunction"); - connect(act, SIGNAL(triggered()), this, SLOT(requestNewFunction())); + if (objects_list.find(item) != objects_list.end()) { + act = menu.addAction("Rename Function"); + connect(act, &QAction::triggered, [=]() {this->renameFunction(objects_list[item]->getFunction());}); + } else { + act = menu.addAction("Rename Group"); + connect(act, &QAction::triggered, [=]() {renameGroup(item);}); + } + + + QMenu* submenu = menu.addMenu("Move to group"); + + for (QTreeWidgetItem* groupitem : group_list) { + act = submenu->addAction(groupitem->text(0)); + connect(act, &QAction::triggered, + [=] () { + listWidget->invisibleRootItem()->removeChild(item); + groupitem->addChild(item); + }); + } } + menu.exec(listWidget->mapToGlobal(point)); } @@ -143,6 +190,18 @@ void Mainwindow::requestNewFunction() { } } +void Mainwindow::requestNewGroup() { + SimpleStringDialog dialog("New Group"); + int result = dialog.exec(); + if (QDialog::Accepted == result) { + QTreeWidgetItem * external = new QTreeWidgetItem(listWidget, QStringList(dialog.result())); + external->setChildIndicatorPolicy(QTreeWidgetItem::ShowIndicator); + group_list.push_back(external); + } else { + LOG4CXX_DEBUG(logger, "requestNewGroup aborted"); + } +} + void Mainwindow::requestNewFunctionByAddress(uint64_t address) { LOG4CXX_DEBUG(logger, "requesting Function at " << std::hex << address); manager->getDisassembler()->disassembleFunctionAt(address); @@ -156,7 +215,18 @@ void Mainwindow::renameFunction(Function* function) { LOG4CXX_DEBUG(logger, "renaming Function " << function->getName() << " to " << dialog.result().toStdString()); function->setName(dialog.result().toStdString()); - objects_list_by_address[function->getStartAddress()]->setText(dialog.result()); + } else { + LOG4CXX_DEBUG(logger, "renameFunction aborted"); + } +} + +void Mainwindow::renameGroup(QTreeWidgetItem* item) { + SimpleStringDialog dialog("New name"); + int result = dialog.exec(); + if (QDialog::Accepted == result) { + LOG4CXX_DEBUG(logger, "renaming group " << item->text(0).toStdString() + << " to " << dialog.result().toStdString()); + item->setText(0, dialog.result()); } else { LOG4CXX_DEBUG(logger, "renameFunction aborted"); } @@ -181,8 +251,9 @@ void Mainwindow::addFunction(Function* fun) { start_address = b.first; } + std::map _blocks; local__add_basic_block(block, this, - manager, blocks, scene, start_address, 100); + manager, _blocks, scene, start_address, 100); QGraphicsView * view = new QGraphicsView(scene); w->addTab(view, "CFG"); @@ -194,7 +265,7 @@ void Mainwindow::addFunction(Function* fun) { w->addTab(t, "Listing"); - QListWidgetItem * item = new QListWidgetItem(fun->getName().c_str(), listWidget); + QTreeWidgetItem * item = new QTreeWidgetItem(listWidget, QStringList(fun->getName().c_str())); stackedWidget->addWidget(w); objects_list.insert(std::make_pair(item, w)); LOG4CXX_DEBUG(logger, "Adding function widget at " << std::hex