Merge pull request #76 from wcampbell0x2a/add-hexdump-colors

Add hexdump colors

Author: wcampbell0x2a

Diff for: src/ui/hexdump.rs

@@ -1,29 +1,57 @@
 use ratatui::{
     layout::{Constraint, Flex, Layout, Rect},
     style::{Color, Style, Stylize},
+    text::{Line, Span},
     widgets::{Block, Borders, Clear, Paragraph, Scrollbar, ScrollbarOrientation},
     Frame,
 };
 
 use crate::App;
 
-use super::{ORANGE, SCROLL_CONTROL_TEXT, YELLOW};
+use super::{BLUE, DARK_GRAY, GREEN, ORANGE, SCROLL_CONTROL_TEXT, YELLOW};
 
-fn to_hexdump_str(data: &[u8]) -> String {
-    data.chunks(16)
-        .enumerate()
-        .map(|(i, chunk)| {
-            let address = format!("{:08x}:", i * 16);
-            let hex_values =
-                chunk.iter().map(|byte| format!("{:02x}", byte)).collect::<Vec<_>>().join(" ");
-            let ascii_values = chunk
-                .iter()
-                .map(|&byte| if byte.is_ascii_graphic() { byte as char } else { '.' })
-                .collect::<String>();
-            format!("{:<10} {:48} |{}|", address, hex_values, ascii_values)
-        })
-        .collect::<Vec<_>>()
-        .join("\n")
+fn to_hexdump_str(buffer: &[u8]) -> Vec<Line> {
+    let mut lines = Vec::new();
+    for (offset, chunk) in buffer.chunks(16).enumerate() {
+        let mut hex_spans = Vec::new();
+        // bytes
+        for byte in chunk.iter() {
+            let color = color(*byte);
+            hex_spans.push(Span::styled(format!("{:02x} ", byte), Style::default().fg(color)));
+        }
+
+        // ascii
+        hex_spans.push(Span::raw("| "));
+        for byte in chunk.iter() {
+            let ascii_char = if byte.is_ascii_graphic() { *byte as char } else { '.' };
+            let color = color(*byte);
+            hex_spans.push(Span::styled(ascii_char.to_string(), Style::default().fg(color)));
+        }
+
+        let line = Line::from_iter(
+            vec![Span::raw(format!("{:08x}: ", offset * 16)), Span::raw("")]
+                .into_iter()
+                .chain(hex_spans),
+        );
+
+        lines.push(line);
+    }
+
+    lines
+}
+
+fn color(byte: u8) -> Color {
+    if byte == 0x00 {
+        DARK_GRAY
+    } else if byte.is_ascii_graphic() {
+        BLUE
+    } else if byte.is_ascii_whitespace() {
+        GREEN
+    } else if byte.is_ascii() {
+        ORANGE
+    } else {
+        YELLOW
+    }
 }
 
 fn popup_area(area: Rect, percent_x: u16) -> Rect {
@@ -49,18 +77,16 @@ pub fn draw_hexdump(app: &mut App, f: &mut Frame, hexdump: Rect, show_popup: boo
         pos = format!("(0x{:02x?})", r.0);
         let data = &r.1;
 
-        let data = to_hexdump_str(data);
-        let lines = data.lines();
-        let len = lines.count();
+        let lines = to_hexdump_str(data);
+        let len = lines.len();
 
         let max = hexdump.height;
         let skip = if len <= max as usize { 0 } else { app.hexdump_scroll };
+        let lines: Vec<Line> = lines.into_iter().skip(skip).collect();
         app.hexdump_scroll_state = app.hexdump_scroll_state.content_length(len);
+        let paragraph =
+            Paragraph::new(lines).block(block(&pos)).style(Style::default().fg(Color::White));
 
-        let lines: Vec<&str> = data.lines().skip(skip).collect();
-        let paragraph = Paragraph::new(lines.join("\n"))
-            .block(block(&pos))
-            .style(Style::default().fg(Color::White));
         f.render_widget(paragraph, hexdump);
         f.render_stateful_widget(
             Scrollbar::new(ScrollbarOrientation::VerticalRight),

Diff for: src/ui/mod.rs

@@ -23,6 +23,7 @@ const ORANGE: Color = Color::Rgb(0xff, 0x8f, 0x40);
 const YELLOW: Color = Color::Rgb(0xe6, 0xb4, 0x50);
 const GREEN: Color = Color::Rgb(0xaa, 0xd9, 0x4c);
 const RED: Color = Color::Rgb(0xff, 0x33, 0x33);
+const DARK_GRAY: Color = Color::Rgb(0x20, 0x27, 0x34);
 
 const HEAP_COLOR: Color = GREEN;
 const STACK_COLOR: Color = PURPLE;