Clean up, add font options.

firstfault · firstfault · commit 0924b4f90856 · 2024-04-24T12:48:20.000-08:00
diff --git a/README.md b/README.md
@@ -1,8 +1,7 @@
 # Trinity 
 Trinity is a powerful lightning-fast software reverse engineering suite for the Java bytecode architecture handling highly obfuscated binaries with ease.
 
-[![Download](https://img.shields.io/badge/Download%20Latest-green.svg)](https://github.com/firstfault/Trinity/releases)
-[![Apache License 2.0](https://img.shields.io/badge/License-Apache%20License%202.0-yellow.svg)](https://choosealicense.com/licenses/apache-2.0/)
+[![Download](https://img.shields.io/badge/Download-green.svg)](https://github.com/firstfault/Trinity/releases)
 
 ![Screenshot](screenshots/trinity.png)
 
diff --git a/src/main/java/me/f1nal/trinity/Main.java b/src/main/java/me/f1nal/trinity/Main.java
@@ -24,7 +24,7 @@
 import java.util.concurrent.TimeUnit;
 
 public class Main {
-    public static final String VERSION = "0.0.1-alpha0";
+    public static final String VERSION = "0.0.1-alpha1";
 
     /**
      * Manages the graphical user interface (GUI) elements and interactions.
diff --git a/src/main/java/me/f1nal/trinity/appdata/PreferencesFile.java b/src/main/java/me/f1nal/trinity/appdata/PreferencesFile.java
@@ -2,6 +2,7 @@
 
 import me.f1nal.trinity.Main;
 import me.f1nal.trinity.appdata.keybindings.KeyBindingData;
+import me.f1nal.trinity.decompiler.output.DecompilerFontEnum;
 import me.f1nal.trinity.decompiler.output.number.NumberDisplayTypeEnum;
 import me.f1nal.trinity.events.EventRefreshDecompilerText;
 import me.f1nal.trinity.gui.windows.impl.xref.SearchMaxDisplay;
@@ -15,6 +16,7 @@
 import java.util.Set;
 
 public class PreferencesFile extends AppDataFile {
+    private DecompilerFontEnum decompilerFontEnum = DecompilerFontEnum.JETBRAINS_MONO;
     private NumberDisplayTypeEnum defaultNumberDisplayType = NumberDisplayTypeEnum.DECIMAL;
     private SearchMaxDisplay searchMaxDisplay = SearchMaxDisplay.MAX_200;
     private boolean decompilerHideComments = false;
@@ -86,6 +88,14 @@ public SearchMaxDisplay getSearchMaxDisplay() {
         return searchMaxDisplay;
     }
 
+    public void setDecompilerFontEnum(DecompilerFontEnum decompilerFontEnum) {
+        this.decompilerFontEnum = decompilerFontEnum;
+    }
+
+    public DecompilerFontEnum getDecompilerFontEnum() {
+        return decompilerFontEnum;
+    }
+
     public void setDecompilerHideComments(boolean decompilerHideComments) {
         this.decompilerHideComments = decompilerHideComments;
         Main.getEventBus().post(new EventRefreshDecompilerText(dc -> true));
diff --git a/src/main/java/me/f1nal/trinity/decompiler/output/DecompilerComponentInitializer.java b/src/main/java/me/f1nal/trinity/decompiler/output/DecompilerComponentInitializer.java
@@ -300,7 +300,7 @@ public void visitVariable(VariableOutputMember variableMember) {
             final String varType = variableMember.getType() == null ? "unknown var type!" : variableMember.getType();
             final boolean stackVariable = varIndex >= VarExprent.STACK_BASE;
             text.text(CodeColorScheme.DISABLED, (stackVariable ? "Stack Variable" : variable == null ? "#" + varIndex : variable.getName()));
-            text.text(CodeColorScheme.TEXT, String.format(" (%s) ", (stackVariable ? varIndex - VarExprent.STACK_BASE : varIndex)));
+            text.text(CodeColorScheme.TEXT, String.format(" (%s) ", (stackVariable ? "-" + (varIndex - VarExprent.STACK_BASE) : varIndex)));
             text.text(CodeColorScheme.CLASS_REF, varType);
 
             return text.get();
diff --git a/src/main/java/me/f1nal/trinity/decompiler/output/DecompilerFontEnum.java b/src/main/java/me/f1nal/trinity/decompiler/output/DecompilerFontEnum.java
@@ -0,0 +1,31 @@
+package me.f1nal.trinity.decompiler.output;
+
+import imgui.ImFont;
+import me.f1nal.trinity.util.INameable;
+
+public enum DecompilerFontEnum implements INameable {
+    JETBRAINS_MONO("JetBrains Mono"),
+    ZED_MONO("Zed Mono"),
+    INTER("Inter"),
+    ;
+
+    private final String name;
+    private ImFont font;
+
+    DecompilerFontEnum(String name) {
+        this.name = name;
+    }
+
+    public void setFont(ImFont font) {
+        this.font = font;
+    }
+
+    public ImFont getFont() {
+        return font;
+    }
+
+    @Override
+    public String getName() {
+        return this.name;
+    }
+}
diff --git a/src/main/java/me/f1nal/trinity/gui/viewport/FontManager.java b/src/main/java/me/f1nal/trinity/gui/viewport/FontManager.java
@@ -4,6 +4,7 @@
 import imgui.*;
 import imgui.gl3.ImGuiImplGl3;
 import me.f1nal.trinity.Main;
+import me.f1nal.trinity.decompiler.output.DecompilerFontEnum;
 import me.f1nal.trinity.gui.components.FontAwesomeIcons;
 
 import java.io.IOException;
@@ -37,7 +38,7 @@ public float getGlobalScale() {
     private void buildFonts(final float size) {
         ImGuiIO io = ImGui.getIO();
 
-        io.getFonts().addFontFromMemoryTTF(loadFromResources("fonts/inter-regular.ttf"), size);
+        DecompilerFontEnum.INTER.setFont(io.getFonts().addFontFromMemoryTTF(loadFromResources("fonts/inter-regular.ttf"), size));
 
         final ImFontConfig fontConfig = new ImFontConfig();
         fontConfig.setMergeMode(true);
@@ -49,6 +50,8 @@ private void buildFonts(final float size) {
         final short[] glyphRanges = rangesBuilder.buildRanges();
 
         io.getFonts().addFontFromMemoryTTF(loadFromResources("fonts/fa-solid-900.ttf"), size, fontConfig, glyphRanges);
+        DecompilerFontEnum.JETBRAINS_MONO.setFont(io.getFonts().addFontFromMemoryTTF(loadFromResources("fonts/JetBrainsMonoNL-Regular.ttf"), size + 1.F));
+        DecompilerFontEnum.ZED_MONO.setFont(io.getFonts().addFontFromMemoryTTF(loadFromResources("fonts/zed-mono-regular.ttf"), size + 1.F));
         this.currentFontSize = size;
     }
 
diff --git a/src/main/java/me/f1nal/trinity/gui/windows/impl/PreferencesFrame.java b/src/main/java/me/f1nal/trinity/gui/windows/impl/PreferencesFrame.java
@@ -3,15 +3,15 @@
 import imgui.ImGui;
 import imgui.flag.ImGuiDataType;
 import imgui.flag.ImGuiSliderFlags;
+import imgui.flag.ImGuiWindowFlags;
 import imgui.type.ImFloat;
 import me.f1nal.trinity.Main;
 import me.f1nal.trinity.Trinity;
 import me.f1nal.trinity.appdata.PreferencesFile;
+import me.f1nal.trinity.decompiler.output.DecompilerFontEnum;
 import me.f1nal.trinity.decompiler.output.number.NumberDisplayTypeEnum;
-import me.f1nal.trinity.events.EventRefreshDecompilerText;
 import me.f1nal.trinity.gui.components.ComponentId;
 import me.f1nal.trinity.gui.components.general.EnumComboBox;
-import me.f1nal.trinity.gui.windows.api.ClosableWindow;
 import me.f1nal.trinity.gui.windows.api.StaticWindow;
 import me.f1nal.trinity.gui.windows.impl.xref.SearchMaxDisplay;
 import me.f1nal.trinity.keybindings.Bindable;
@@ -21,15 +21,18 @@
 
 public class PreferencesFrame extends StaticWindow {
     private final String id = ComponentId.getId(this.getClass());
+    private final EnumComboBox<DecompilerFontEnum> decompilerFont;
     private final EnumComboBox<NumberDisplayTypeEnum> numberDisplayTypeComboBox;
     private final EnumComboBox<SearchMaxDisplay> searchMaxDisplayComboBox;
     private final PreferencesFile preferencesFile;
     private Bindable editingBind;
 
     public PreferencesFrame(Trinity trinity) {
-        super("Preferences", 500, 310, trinity);
+        super("Preferences", 450, 250, trinity);
         this.preferencesFile = Main.getPreferences();
-        this.numberDisplayTypeComboBox = new EnumComboBox<>("Default Number Display Type", NumberDisplayTypeEnum.values(), preferencesFile.getDefaultNumberDisplayType());
+        this.windowFlags |= ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoDocking;
+        this.decompilerFont = new EnumComboBox<>("Decompiler Font", DecompilerFontEnum.values(), preferencesFile.getDecompilerFontEnum());
+        this.numberDisplayTypeComboBox = new EnumComboBox<>("Number Display Type", NumberDisplayTypeEnum.values(), preferencesFile.getDefaultNumberDisplayType());
         this.searchMaxDisplayComboBox = new EnumComboBox<>("Search Element Limit", SearchMaxDisplay.values(), preferencesFile.getSearchMaxDisplay());
     }
 
@@ -70,6 +73,7 @@ protected void renderFrame() {
             }
 
             if (ImGui.beginTabItem("Decompiler")) {
+                this.preferencesFile.setDecompilerFontEnum(this.decompilerFont.draw());
                 this.preferencesFile.setDefaultNumberDisplayType(this.numberDisplayTypeComboBox.draw());
 
                 if (ImGui.checkbox("Hide comments", preferencesFile.isDecompilerHideComments())) {
@@ -88,7 +92,7 @@ protected void renderFrame() {
                 ImGui.endTabItem();
             }
 
-            if (ImGui.beginTabItem("Keybindings")) {
+            if (false&&ImGui.beginTabItem("Keybindings")) {
                 for (Bindable bindable : Main.getKeyBindManager().getBindables()) {
                     ImGui.text(bindable.getDisplayName());
                     ImGui.sameLine();
diff --git a/src/main/java/me/f1nal/trinity/gui/windows/impl/assembler/args/NumberArgument.java b/src/main/java/me/f1nal/trinity/gui/windows/impl/assembler/args/NumberArgument.java
@@ -8,10 +8,25 @@ public class NumberArgument extends InstructionOperand {
 
     public NumberArgument(Number number) {
         this.number = number;
-        this.getDetailsText().add(new ColoredString(number + getPrefix(number), CodeColorScheme.NUMBER));
+        this.getDetailsText().add(new ColoredString(formatNumber(number), CodeColorScheme.NUMBER));
     }
 
-    public static String getPrefix(Number number) {
+    private static String formatNumber(Number number) {
+        final String suffix = getSuffix(number);
+        String text = String.valueOf(number);
+
+        if (!suffix.isEmpty()) {
+            if (text.endsWith(".0")) {
+                text = text.substring(text.length() - 1);
+            } else if (!(number instanceof Long) && !text.contains(".")) {
+                text += ".";
+            }
+        }
+
+        return text + suffix;
+    }
+
+    public static String getSuffix(Number number) {
         if (number instanceof Float) {
             return "F";
         }
diff --git a/src/main/java/me/f1nal/trinity/gui/windows/impl/constant/search/ConstantSearchTypeNumber.java b/src/main/java/me/f1nal/trinity/gui/windows/impl/constant/search/ConstantSearchTypeNumber.java
@@ -172,7 +172,7 @@ protected String convertConstantToText(Number value) {
             if (value.intValue() != this.value.get()) {
                 return null;
             }
-            return value.intValue() + NumberArgument.getPrefix(value);
+            return value.intValue() + NumberArgument.getSuffix(value);
         }
     }
 }
diff --git a/src/main/java/me/f1nal/trinity/gui/windows/impl/constant/search/ConstantSearchTypeString.java b/src/main/java/me/f1nal/trinity/gui/windows/impl/constant/search/ConstantSearchTypeString.java
@@ -35,12 +35,16 @@ public boolean draw() {
         ImGui.sameLine();
         GuiUtil.smallCheckbox("Exact", this.exact);
         GuiUtil.tooltip("If set, the string must exactly match the input instead of containing it.");
-        return !this.searchTerm.get().isEmpty();
+        return true;
     }
 
     private SearchTermMatchable createMatchable() {
         String inputSearch = this.searchTerm.get();
 
+        if (inputSearch.isEmpty()) {
+            return searchTerm -> true;
+        }
+
         // Exact Search
         if (this.exact.get()) {
             if (this.caseInsensitive.get()) return searchTerm -> searchTerm.equalsIgnoreCase(inputSearch);
diff --git a/src/main/java/me/f1nal/trinity/gui/windows/impl/entryviewer/impl/decompiler/DecompilerGhostTextRenderer.java b/src/main/java/me/f1nal/trinity/gui/windows/impl/entryviewer/impl/decompiler/DecompilerGhostTextRenderer.java
@@ -6,6 +6,8 @@
 import imgui.flag.ImGuiMouseCursor;
 import me.f1nal.trinity.Main;
 import me.f1nal.trinity.Trinity;
+import me.f1nal.trinity.decompiler.output.DecompilerFontEnum;
+import me.f1nal.trinity.decompiler.util.TextBuffer;
 import me.f1nal.trinity.execution.Input;
 import me.f1nal.trinity.execution.MethodInput;
 import me.f1nal.trinity.execution.hierarchy.MethodHierarchy;
@@ -19,7 +21,7 @@ public class DecompilerGhostTextRenderer implements Runnable {
     private final List<String> text = new ArrayList<>(2);
     private final Trinity trinity;
     private final Input<?> input;
-    private float addX = 0.F;
+    private final String indent;
 
     public DecompilerGhostTextRenderer(Trinity trinity, Input<?> input) {
         this.trinity = trinity;
@@ -29,8 +31,7 @@ public DecompilerGhostTextRenderer(Trinity trinity, Input<?> input) {
         this.text.add(xrefsCount == 0 ? "no usages" : (xrefsCount + " usage" + (xrefsCount == 1 ? "" : "s")));
 
         if (input instanceof MethodInput) {
-            addX += 10.F;
-
+            this.indent = new TextBuffer().appendIndent(1).toString();
             if (false) {
                 MethodHierarchy methodHierarchy = ((MethodInput) input).getMethodHierarchy();
                 if (methodHierarchy != null) {
@@ -40,20 +41,25 @@ public DecompilerGhostTextRenderer(Trinity trinity, Input<?> input) {
                     }
                 }
             }
+        } else {
+            this.indent = "";
         }
     }
 
     @Override
     public void run() {
+        float cursorPosX = ImGui.getCursorPosX();
+
         for (int i = 0, size = text.size(); i < size; i++) {
             String line = text.get(i);
-            ImGui.text("");
+
+            ImGui.text(this.indent);
             ImGui.sameLine(0.F, 0.F);
 
             float fontSize = Math.max(Main.getDisplayManager().getFontManager().getFontSize() - 1.F, 12.F);
             float globalScale = fontSize / 14;
-            ImVec2 rectMin = ImGui.getItemRectMin().plus(addX * globalScale, 0.F);
-            ImFont font = ImGui.getFont();
+            ImVec2 rectMin = new ImVec2(ImGui.getItemRectMaxX(), ImGui.getItemRectMinY());
+            ImFont font = DecompilerFontEnum.INTER.getFont();
             ImVec2 textSize = font.calcTextSizeA(fontSize, Float.MAX_VALUE, -1.F, line);
             ImVec2 mousePos = ImGui.getMousePos();
             boolean hovered = ImGui.isWindowHovered() && mousePos.x >= rectMin.x && mousePos.y >= rectMin.y && mousePos.x <= rectMin.x + textSize.x && mousePos.y <= rectMin.y + textSize.y;
@@ -67,5 +73,7 @@ public void run() {
             }
             ImGui.setCursorPosY(ImGui.getCursorPosY() + ((14.F + (i == size - 1 ? 0.F : 1.F)) * globalScale));
         }
+
+        ImGui.setCursorPosX(cursorPosX);
     }
 }
diff --git a/src/main/java/me/f1nal/trinity/gui/windows/impl/entryviewer/impl/decompiler/DecompilerWindow.java b/src/main/java/me/f1nal/trinity/gui/windows/impl/entryviewer/impl/decompiler/DecompilerWindow.java
@@ -144,7 +144,9 @@ private void drawDecompileTab() {
                 decompiledClass.resetLines();
                 this.resetLines = false;
             }
+            ImGui.pushFont(Main.getPreferences().getDecompilerFontEnum().getFont());
             this.drawDecompiledOutput(decompiledClass);
+            ImGui.popFont();
         }
 
         ImGui.endChild();
diff --git a/src/main/resources/fonts/JetBrainsMonoNL-Regular.ttf b/src/main/resources/fonts/JetBrainsMonoNL-Regular.ttf
diff --git a/src/main/resources/fonts/zed-mono-regular.ttf b/src/main/resources/fonts/zed-mono-regular.ttf

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ protected String convertConstantToText(Number value) {`
`172`	`172`	`if (value.intValue() != this.value.get()) {`
`173`	`173`	`return null;`
`174`	`174`	`}`
`175`		`- return value.intValue() + NumberArgument.getPrefix(value);`
	`175`	`+ return value.intValue() + NumberArgument.getSuffix(value);`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`	`}`