stjet/ming-wm
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

v1.0.3: mostly malvim improvements

Browse Source 
malvim: search, d$, %. fix w and m in mono font. apply some clippy lint suggestions
This commit is contained in:
stjet
2025-04-17 00:53:31 +00:00
parent 11af21ee6d
commit d32b82a2bb
19 changed files with 233 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/bin/file_explorer.rs
View File

@@ -61,8 +61,7 @@ impl WindowLike for FileExplorer {
WindowMessageResponse::JustRedraw
},
WindowMessage::KeyPress(key_press) => {
self.state = State::List;
if key_press.is_enter() {
if key_press.is_enter() && self.state == State::List {
if self.current_dir_contents.len() > 0 {
let selected_entry = &self.current_dir_contents[self.position];
if !selected_entry.is_file {
@@ -75,6 +74,7 @@ impl WindowLike for FileExplorer {
}
WindowMessageResponse::DoNothing
} else if key_press.key == 'j' || key_press.is_down_arrow() || key_press.key == 'k' || key_press.is_up_arrow() {
self.state = State::List;
if key_press.key == 'j' || key_press.is_down_arrow() {
//down
if self.position == self.current_dir_contents.len() - 1 {
@@ -103,12 +103,21 @@ impl WindowLike for FileExplorer {
};
WindowMessageResponse::JustRedraw
} else if key_press.key == 'i' {
self.state = State::Info;
let selected_entry = &self.current_dir_contents[self.position];
self.metadata = Some(metadata(&selected_entry.path).unwrap());
if self.state == State::Info {
self.state = State::List;
} else {
self.state = State::Info;
let selected_entry = &self.current_dir_contents[self.position];
self.metadata = Some(metadata(&selected_entry.path).unwrap());
}
WindowMessageResponse::JustRedraw
} else {
WindowMessageResponse::DoNothing
if self.state == State::Info {
self.state = State::List;
WindowMessageResponse::JustRedraw
} else {
WindowMessageResponse::DoNothing
}
}
},
_ => WindowMessageResponse::DoNothing,

4
src/bin/main.rs
View File

@@ -116,10 +116,10 @@ fn init(framebuffer: Framebuffer, framebuffer_info: FramebufferInfo) {
let mut y: Option<usize> = None;
for line in reader.lines() {
let line = line.unwrap();
if line.contains(&"ABS_X), value ") || line.contains(&"ABS_Y), value ") {
if line.contains("ABS_X), value ") || line.contains("ABS_Y), value ") {
let value: Vec<_> = line.split("), value ").collect();
let value = value[value.len() - 1].parse::<usize>().unwrap();
if line.contains(&"ABS_X") {
if line.contains("ABS_X") {
x = Some(value);
} else {
y = Some(value);

156
src/bin/malvim.rs
View File

@@ -2,6 +2,7 @@ use std::vec::Vec;
use std::vec;
use std::fmt;
use std::path::PathBuf;
use std::collections::HashMap;
use std::fs::{ read_to_string, write };
use ming_wm_lib::messages::{ WindowMessage, WindowMessageResponse, WindowManagerRequest, ShortcutType };
@@ -10,7 +11,7 @@ use ming_wm_lib::framebuffer_types::Dimensions;
use ming_wm_lib::window_manager_types::{ DrawInstructions, WindowLike, WindowLikeType };
use ming_wm_lib::utils::{ calc_actual_lines, calc_new_cursor_pos, Substring };
use ming_wm_lib::dirs::home;
use ming_wm_lib::utils::path_autocomplete;
use ming_wm_lib::utils::{ get_rest_of_split, path_autocomplete };
use ming_wm_lib::ipc::listen;
const MONO_WIDTH: u8 = 10;
@@ -175,18 +176,23 @@ impl WindowLike for Malvim {
}
let new_length = current_file.content[current_file.line_pos].chars().count();
current_file.cursor_pos = calc_new_cursor_pos(current_file.cursor_pos, new_length);
} else if key_press.key == 'w' {
} else if key_press.key == 'w' || key_press.key == '$' {
let line = &current_file.content[current_file.line_pos];
let line_len = line.chars().count();
if line_len > 0 && current_file.cursor_pos < line_len {
//offset until space or eol
let mut line_chars = line.chars().skip(current_file.cursor_pos).peekable();
let current_char = line_chars.peek().unwrap().clone();
let offset = line_chars.position(|c| if current_char == ' ' {
c != ' '
//deref is Copy
let current_char = *line_chars.peek().unwrap();
let offset = if key_press.key == 'w' {
line_chars.position(|c| if current_char == ' ' {
c != ' '
} else {
c == ' '
}).unwrap_or(line_len - current_file.cursor_pos)
} else {
c == ' '
}).unwrap_or(line_len - current_file.cursor_pos);
line_chars.count()
};
current_file.content[current_file.line_pos] = line.remove(current_file.cursor_pos, offset);
let new_length = current_file.content[current_file.line_pos].chars().count();
current_file.cursor_pos = calc_new_cursor_pos(current_file.cursor_pos, new_length);
@@ -240,6 +246,8 @@ impl WindowLike for Malvim {
if current_length == 1 {
current_file.cursor_pos = 0;
}
} else {
changed = false;
}
} else if key_press.key == 'h' || key_press.is_left_arrow() {
current_file.cursor_pos = current_file.cursor_pos.checked_sub(self.maybe_num.unwrap_or(1)).unwrap_or(0);
@@ -295,7 +303,88 @@ impl WindowLike for Malvim {
} else if key_press.key == 'F' {
self.state = State::BackFind;
changed = false;
} else if key_press.key.is_digit(10) {
} else if key_press.key == '%' {
let current_l = &current_file.content[current_file.line_pos];
if current_file.cursor_pos < current_l.len() {
let current_c = current_l.chars().nth(current_file.cursor_pos).unwrap();
let pairs = HashMap::from([
('(', (')', true)),
(')', ('(', false)),
('[', (']', true)),
(']', ('[', false)),
('"', ('"', true)), //could be either, really
('{', ('}', true)),
('}', ('{', false)),
('<', ('>', true)),
('>', ('<', false)),
//
]);
if let Some((corres, forwards)) = pairs.get(&current_c) {
let mut count = 0;
let content_len = current_file.content.len();
let lines: Vec<&String> = if *forwards {
current_file.content.iter().skip(current_file.line_pos).collect()
} else {
current_file.content.iter().rev().skip(content_len - current_file.line_pos - 1).collect()
};
let end = if *forwards {
content_len - current_file.line_pos
} else {
current_file.line_pos + 1
};
'outer: for i in 0..end {
let line = if i == 0 {
let l = lines[i];
let l_len = l.len();
if *forwards {
if current_file.cursor_pos + 1 < l_len {
l.substring(current_file.cursor_pos + 1, l_len)
} else {
""
}
} else {
&l.substring(0, current_file.cursor_pos).chars().rev().collect::<String>()
}
} else {
if *forwards {
lines[i]
} else {
&lines[i].chars().rev().collect::<String>()
}
};
for (c_i, c) in line.chars().enumerate() {
if c == current_c {
count += 1;
} else if &c == corres {
if count == 0 {
if *forwards {
current_file.line_pos += i;
} else {
current_file.line_pos -= i;
};
current_file.cursor_pos = if i == 0 {
if *forwards {
current_file.cursor_pos + c_i + 1
} else {
current_file.cursor_pos - c_i - 1
}
} else {
if *forwards {
c_i
} else {
line.chars().count() - c_i - 1
}
};
break 'outer;
}
count -= 1;
}
}
}
}
}
changed = false;
} else if key_press.key.is_ascii_digit() {
self.maybe_num = Some(self.maybe_num.unwrap_or(0) * 10 + key_press.key.to_digit(10).unwrap() as usize);
numbered = true;
changed = false;
@@ -401,7 +490,7 @@ impl WindowLike for Malvim {
let mut used_width = 0;
for file_index in 0..self.files.len() {
let file_info = &self.files[file_index];
let future_used_width = used_width + 4 + (file_info.name.len() + if file_info.changed { 2 } else { 0 }) * MONO_WIDTH as usize;
let future_used_width = used_width + 4 + (file_info.name.len() + if file_info.changed { 2 } else { 0 }) * MONO_WIDTH as usize + 15;
//just cut off when too many file tabs open to fit
if future_used_width > self.dimensions[0] {
break;
@@ -455,12 +544,11 @@ impl WindowLike for Malvim {
//bottom blue band stuff
//write mode
instructions.push(DrawInstructions::Text([0, self.dimensions[1] - BAND_HEIGHT * 2 + 2], vec!["nimbus-romono".to_string()], self.mode.to_string(), theme_info.top_text, theme_info.top, Some(0), Some(MONO_WIDTH)));
let file_status;
if self.files.len() > 0 {
file_status = self.files[self.current_file_index].name.clone();
let file_status = if self.files.len() > 0 {
self.files[self.current_file_index].name.clone()
} else {
file_status = "No file open".to_string();
}
"No file open".to_string()
};
instructions.push(DrawInstructions::Text([self.dimensions[0] - file_status.len() * (MONO_WIDTH as usize), self.dimensions[1] - BAND_HEIGHT * 2 + 2], vec!["nimbus-romono".to_string()], file_status, theme_info.top_text, theme_info.top, Some(0), Some(MONO_WIDTH)));
//write command or bottom message
if self.mode == Mode::Command {
@@ -593,12 +681,40 @@ impl Malvim {
} else if first.starts_with("/") {
let current_file = &mut self.files[self.current_file_index];
if current_file.content.len() > 0 {
let found_line_no = current_file.content.iter().skip(current_file.line_pos + 1).position(|line| {
line.contains(&first[1..])
});
if let Some(found_line_no) = found_line_no {
current_file.line_pos = found_line_no + current_file.line_pos + 1;
current_file.cursor_pos = 0;
let p1 = if arg == "" {
String::new()
} else {
" ".to_string() + arg
};
let rest = get_rest_of_split(&mut parts, Some(" "));
let rest = if rest == "" {
String::new()
} else {
" ".to_string() + &rest
};
let query = first[1..].to_string() + &p1 + &rest;
let mut lines = current_file.content.iter().skip(current_file.line_pos);
for i in 0..(current_file.content.len() - current_file.line_pos) {
let line = if i == 0 {
let l = lines.next().unwrap();
let l_len = l.len();
if (current_file.cursor_pos + 1) < l_len {
l.substring(current_file.cursor_pos + 1, l_len)
} else {
""
}
} else {
lines.next().unwrap()
};
if let Some(found_index) = line.to_string().find_substring(&query) {
current_file.line_pos += i;
current_file.cursor_pos = if i == 0 {
current_file.cursor_pos + found_index + 1
} else {
found_index
};
break;
}
}
}
} else if first == "x" || first == "w" || first == "write" || first == "q" || first == "quit" {

6
src/bin/minesweeper.rs
View File

@@ -65,15 +65,15 @@ impl WindowLike for Minesweeper {
self.first_char = '\0';
WindowMessageResponse::DoNothing
} else if self.first_char == '\0' {
if HEX_CHARS.iter().find(|c| c == &&key_press.key).is_some() {
if HEX_CHARS.iter().any(|c| c == &key_press.key) {
self.first_char = key_press.key;
}
WindowMessageResponse::DoNothing
} else if HEX_CHARS.iter().find(|c| c == &&key_press.key).is_some() {
} else if HEX_CHARS.iter().any(|c| c == &key_press.key) {
let u = hex_to_u8(self.first_char, key_press.key) as usize;
let y = u / 16;
let x = u % 16;
if HEX_CHARS.iter().find(|c| c == &&key_press.key).is_some() {
if HEX_CHARS.iter().any(|c| c == &key_press.key) {
if self.state == State::BeforePlaying {
loop {
self.new_tiles();

2
src/bin/terminal.rs
View File

@@ -131,7 +131,7 @@ impl WindowLike for Terminal {
self.prev();
} else if key_press.is_down_arrow() {
self.next();
} else {
} else if key_press.is_regular() {
self.current_input += &key_press.key.to_string();
}
self.calc_actual_lines();

7
src/essential/start_menu.rs
View File

@@ -115,13 +115,11 @@ impl WindowLike for StartMenu {
];
let max_per_page = CATEGORIES.len();
let current_focus = self.get_focus_index().unwrap();
let mut index = 0;
for component in &self.components {
for (index, component) in self.components.iter().enumerate() {
//supports multiple pages of window options per category
if (index >= max_per_page && current_focus >= max_per_page) || (index < max_per_page && current_focus < max_per_page) {
instructions.extend(component.draw(theme_info));
}
index += 1;
}
instructions
}
@@ -194,8 +192,7 @@ impl StartMenu {
pub fn add_category_components(&mut self) {
self.current_focus = "About".to_string();
self.components = Vec::new();
for c in 0..CATEGORIES.len() {
let name = CATEGORIES[c];
for (c, name) in CATEGORIES.iter().enumerate() {
self.components.push(Box::new(HighlightButton::new(
name.to_string(), [42, self.y_each * c + 1], [self.dimensions[0] - 42 - 1, self.y_each], name.to_string(), StartMenuMessage::CategoryClick(name), StartMenuMessage::ChangeAcknowledge, c == 0
)));

2
src/framebuffer.rs
View File

@@ -89,7 +89,7 @@ impl FramebufferWriter {
}
}
self.rotate_buffer = Some(output_array);
&self.rotate_buffer.as_ref().unwrap()
self.rotate_buffer.as_ref().unwrap()
}
pub fn save_buffer(&mut self) {

8
src/window_manager.rs
View File

@@ -95,7 +95,7 @@ impl WindowManager {
pub fn add_window_like(&mut self, mut window_like: Box<dyn WindowLike>, top_left: Point, dimensions: Option<Dimensions>) {
let subtype = window_like.subtype();
let dimensions = dimensions.unwrap_or(window_like.ideal_dimensions(self.dimensions));
self.id_count = self.id_count + 1;
self.id_count += 1;
let id = self.id_count;
window_like.handle_message(WindowMessage::Init(dimensions));
let dimensions = if subtype == WindowLikeType::Window { [dimensions[0], dimensions[1] + WINDOW_TOP_HEIGHT] } else { dimensions };
@@ -154,7 +154,7 @@ impl WindowManager {
file.read_to_string(&mut contents).unwrap();
let lines: Vec<&str> = contents.split("\n").collect();
if lines.len() > self.current_workspace.into() {
self.theme = Themes::from_str(lines[self.current_workspace as usize]).unwrap_or(Default::default());
self.theme = Themes::from_str(lines[self.current_workspace as usize]).unwrap_or_default();
}
}
}
@@ -667,8 +667,7 @@ impl WindowManager {
});
//these are needed to decide when to snapshot
let max_index = if redraw_ids.len() > 0 { redraw_ids.len() } else { maybe_length } - 1;
let mut w_index = 0;
for window_info in redraw_windows {
for (w_index, window_info) in redraw_windows.enumerate() {
let window_dimensions = if window_info.fullscreen {
[self.dimensions[0], self.dimensions[1] - TASKBAR_HEIGHT - INDICATOR_HEIGHT]
} else {
@@ -746,7 +745,6 @@ impl WindowManager {
}
}
self.writer.borrow_mut().draw_buffer(window_info.top_left, window_dimensions[1], window_dimensions[0] * bytes_per_pixel, &window_writer.get_buffer());
w_index += 1;
}
//could probably figure out a way to do borrow() when self.rotate is false but does it matter?
let mut writer_borrow = self.writer.borrow_mut();