imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-30 05:05:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

ux: Disassemble asynchronously

Browse Source
This commit is contained in:
WerWolv
2021-02-22 11:56:33 +01:00
parent 490c7e8fec
commit 0e2add204b
5 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/views/view_disassembler.cpp
View File

@@ -4,6 +4,9 @@
#include <hex/helpers/utils.hpp>
#include <cstring>
#include <thread>
#include <imgui_imhex_extensions.h>
using namespace std::literals::string_literals;
@@ -11,7 +14,7 @@ namespace hex {
ViewDisassembler::ViewDisassembler() : View("hex.view.disassembler.name"_lang) {
View::subscribeEvent(Events::DataChanged, [this](auto){
this->m_shouldInvalidate = true;
this->disassemble();
});
View::subscribeEvent(Events::RegionSelected, [this](auto userData) {
@@ -29,10 +32,11 @@ namespace hex {
View::unsubscribeEvent(Events::RegionSelected);
}
void ViewDisassembler::drawContent() {
if (this->m_shouldInvalidate) {
this->m_disassembly.clear();
void ViewDisassembler::disassemble() {
this->m_disassembly.clear();
this->m_disassembling = true;
std::thread([this] {
csh capstoneHandle;
cs_insn *instructions = nullptr;
@@ -89,9 +93,12 @@ namespace hex {
cs_close(&capstoneHandle);
}
this->m_shouldInvalidate = false;
}
this->m_disassembling = false;
}).detach();
}
void ViewDisassembler::drawContent() {
if (ImGui::Begin("hex.view.disassembler.name"_lang, &this->getWindowOpenState(), ImGuiWindowFlags_NoCollapse)) {
@@ -235,9 +242,16 @@ namespace hex {
}
ImGui::EndChild();
ImGui::SetCursorPosX((ImGui::GetContentRegionAvail().x - 300) / 2);
if (ImGui::Button("hex.view.disassembler.disassemble"_lang, ImVec2(300, 20)))
this->m_shouldInvalidate = true;
ImGui::Disabled([this] {
if (ImGui::Button("hex.view.disassembler.disassemble"_lang))
this->disassemble();
}, this->m_disassembling);
if (this->m_disassembling) {
ImGui::SameLine();
ImGui::Text("hex.view.disassembler.disassembling"_lang, "|/-\\"[u8(ImGui::GetTime() * 20) % 4]);
}
ImGui::NewLine();
ImGui::TextUnformatted("hex.view.disassembler.disassembly.title"_lang);

12
source/views/view_pattern.cpp
View File

@@ -258,16 +258,16 @@ namespace hex {
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(ImColor(0x20, 0x85, 0x20)));
ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1);
if (ImGui::ArrowButton("compile", ImGuiDir_Right))
if (ImGui::ArrowButton("evaluate", ImGuiDir_Right))
this->parsePattern(this->m_textEditor.GetText().data());
ImGui::PopStyleVar();
ImGui::PopStyleColor();
}, this->m_compilerRunning);
}, this->m_evaluatorRunning);
ImGui::SameLine();
if (this->m_compilerRunning)
ImGui::Text("hex.view.pattern.compiling"_lang, "|/-\\"[u8(ImGui::GetTime() * 20) % 4]);
if (this->m_evaluatorRunning)
ImGui::Text("hex.view.pattern.evaluating"_lang, "|/-\\"[u8(ImGui::GetTime() * 20) % 4]);
else
ImGui::Checkbox("hex.view.pattern.auto"_lang, &this->m_runAutomatically);
@@ -344,7 +344,7 @@ namespace hex {
}
void ViewPattern::parsePattern(char *buffer) {
this->m_compilerRunning = true;
this->m_evaluatorRunning = true;
this->clearPatternData();
this->m_textEditor.SetErrorMarkers({ });
@@ -366,7 +366,7 @@ namespace hex {
View::doLater([]{ View::postEvent(Events::PatternChanged); });
}
this->m_compilerRunning = false;
this->m_evaluatorRunning = false;
}).detach();
}