stjet/koxinga
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wikipedia working, and many other improvements

Browse Source
This commit is contained in:
stjet
2025-03-07 06:51:44 +00:00
parent f31dd48a87
commit a2b0eeb510
10 changed files with 261 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

221
src/main.rs
View File

@@ -17,11 +17,27 @@ use crate::xml::{ parse, Node, OutputType };
const LINE_HEIGHT: usize = 18;
fn get_base_url(url: &str) -> String {
let mut base_url = String::new();
let mut slash = 0;
for c in url.chars() {
if c == '/' {
slash += 1;
if slash == 3 {
break;
}
}
base_url += &c.to_string();
}
base_url
}
#[derive(Default, PartialEq)]
enum Mode {
#[default]
Normal,
Url,
Link,
}
impl fmt::Display for Mode {
@@ -29,6 +45,7 @@ impl fmt::Display for Mode {
fmt.write_str(match self {
Mode::Normal => "NORMAL",
Mode::Url => "URL",
Mode::Link => "LINK",
})?;
Ok(())
}
@@ -38,9 +55,14 @@ impl fmt::Display for Mode {
struct KoxingaBrowser {
dimensions: Dimensions,
mode: Mode,
max_lines: usize,
top_line_no: usize,
url: Option<String>,
url_input: String,
link_input: String,
links: Vec<String>,
top_level_nodes: Vec<Box<Node>>,
page: Vec<(usize, usize, String, bool)>, //x, y, text, link colour or not
}
impl WindowLike for KoxingaBrowser {
@@ -52,21 +74,37 @@ impl WindowLike for KoxingaBrowser {
},
WindowMessage::ChangeDimensions(dimensions) => {
self.dimensions = dimensions;
self.calc_page();
WindowMessageResponse::JustRedraw
},
WindowMessage::KeyPress(key_press) => {
match self.mode {
Mode::Normal => {
let max_lines_screen = (self.dimensions[1] - 4) / LINE_HEIGHT - 1;
if key_press.key == 'u' {
self.mode = Mode::Url;
WindowMessageResponse::JustRedraw
} else if key_press.key == 'l' && self.url.is_some() {
self.mode = Mode::Link;
self.calc_page();
WindowMessageResponse::JustRedraw
} else if key_press.key == 'k' {
if self.top_line_no > 0 {
self.top_line_no -= 1;
}
WindowMessageResponse::JustRedraw
} else if key_press.key == 'j' {
self.top_line_no += 1;
if self.top_line_no < self.max_lines - max_lines_screen {
self.top_line_no += 1;
WindowMessageResponse::JustRedraw
} else {
WindowMessageResponse::DoNothing
}
} else if key_press.key == '0' {
self.top_line_no = 0;
WindowMessageResponse::JustRedraw
} else if key_press.key == 'G' {
self.top_line_no = self.max_lines - max_lines_screen;
WindowMessageResponse::JustRedraw
} else {
WindowMessageResponse::DoNothing
@@ -75,8 +113,10 @@ impl WindowLike for KoxingaBrowser {
Mode::Url => {
if key_press.key == '𐘂' { //the enter key
if let Some(text) = get(&self.url_input) {
self.url = Some(self.url_input.clone());
self.top_line_no = 0;
self.top_level_nodes = parse(&text);
self.calc_page();
self.mode = Mode::Normal;
}
} else if key_press.key == '𐘃' { //escape key
@@ -92,6 +132,48 @@ impl WindowLike for KoxingaBrowser {
}
WindowMessageResponse::JustRedraw
},
Mode::Link => {
if key_press.key == '𐘂' && self.link_input.len() > 0 { //the enter key
let link_index = self.link_input.parse::<usize>().unwrap();
let url = self.url.as_ref().unwrap();
if link_index < self.links.len() {
let mut link = self.links[link_index].clone();
if link.chars().count() >= 2 {
//remove the quotes
link = link.substring(1, link.len() - 1).to_string();
}
if link.starts_with("/") {
link = get_base_url(&url) + &link;
} else if !link.starts_with("http://") && !link.starts_with("https://") {
link = url.clone() + if url.ends_with("/") { "" } else { "/" } + &link;
}
if let Some(text) = get(&link) {
self.url = Some(link.to_string());
self.url_input = link.to_string();
self.top_line_no = 0;
self.top_level_nodes = parse(&text);
self.mode = Mode::Normal;
self.calc_page();
}
self.link_input = String::new();
}
self.mode = Mode::Normal;
WindowMessageResponse::JustRedraw
} else if key_press.key == '𐘃' { //escape key'
self.link_input = String::new();
self.mode = Mode::Normal;
self.calc_page();
WindowMessageResponse::JustRedraw
} else if key_press.key == '𐘁' { //backspace
self.link_input = self.link_input.remove_last();
WindowMessageResponse::JustRedraw
} else if key_press.key.is_ascii_digit() && self.link_input.len() < 10 {
self.link_input += &key_press.key.to_string();
WindowMessageResponse::JustRedraw
} else {
WindowMessageResponse::DoNothing
}
},
}
},
_ => WindowMessageResponse::DoNothing,
@@ -100,64 +182,19 @@ impl WindowLike for KoxingaBrowser {
fn draw(&self, theme_info: &ThemeInfo) -> Vec<DrawInstructions> {
let mut instructions = Vec::new();
let mut outputs = Vec::new();
if self.top_level_nodes.len() > 0 {
let html_index = self.top_level_nodes.iter().position(|n| n.tag_name == "html");
if let Some(html_index) = html_index {
for n in &self.top_level_nodes[html_index].children {
if n.tag_name == "body" {
outputs = n.to_output();
}
}
let max_lines_screen = (self.dimensions[1] - 4) / LINE_HEIGHT - 1;
for p in &self.page {
let line_no = (p.1 - 2) / LINE_HEIGHT;
if line_no >= self.top_line_no && line_no < self.top_line_no + max_lines_screen {
instructions.push(DrawInstructions::Text([p.0, p.1 - LINE_HEIGHT * self.top_line_no], vec!["nimbus-roman".to_string()], p.2.clone(), if p.3 { theme_info.top_text } else { theme_info.text }, theme_info.background, Some(1), Some(12)));
}
}
let mut y = 2;
let mut x = 2;
let mut colour = theme_info.text;
for o in outputs {
//each char is width of 13
match o {
OutputType::Text(s) => {
//leading and trailing whitespace is probably a mistake
let s = s.trim();
let mut line = String::new();
let mut start_x = x;
for c in s.chars() {
if x + 14 > self.dimensions[0] {
//full line, add draw instruction
let line_no = (y - 2) / LINE_HEIGHT;
if line_no >= self.top_line_no {
instructions.push(DrawInstructions::Text([start_x, y - LINE_HEIGHT * self.top_line_no], vec!["nimbus-roman".to_string()], line, colour, theme_info.background, Some(1), Some(14)));
}
line = String::new();
x = 2;
start_x = x;
y += LINE_HEIGHT;
}
line += &c.to_string();
x += 14;
}
let line_no = (y - 2) / LINE_HEIGHT;
if line.len() > 0 && line_no >= self.top_line_no {
instructions.push(DrawInstructions::Text([start_x, y - LINE_HEIGHT * self.top_line_no], vec!["nimbus-roman".to_string()], line, colour, theme_info.background, Some(1), Some(14)));
}
},
OutputType::Newline => {
x = 2;
y += LINE_HEIGHT;
},
OutputType::StartLink(_) => {
colour = theme_info.top_text;
},
OutputType::EndLink => {
colour = theme_info.text;
},
};
}
//mode
let mut bottom_text = self.mode.to_string() + ": ";
if self.mode == Mode::Url {
bottom_text += &self.url_input;
} else if self.mode == Mode::Link {
bottom_text += &self.link_input;
}
instructions.push(DrawInstructions::Text([0, self.dimensions[1] - LINE_HEIGHT], vec!["nimbus-roman".to_string()], bottom_text, theme_info.text, theme_info.background, Some(1), Some(12)));
instructions
@@ -184,6 +221,84 @@ impl KoxingaBrowser {
pub fn new() -> Self {
Default::default()
}
pub fn calc_page(&mut self) {
self.page = Vec::new();
self.links = Vec::new();
let mut outputs = Vec::new();
if self.top_level_nodes.len() > 0 {
let html_index = self.top_level_nodes.iter().position(|n| n.tag_name == "html");
if let Some(html_index) = html_index {
for n in &self.top_level_nodes[html_index].children {
if n.tag_name == "body" {
outputs = n.to_output();
}
}
}
}
let mut y = 2;
let mut x = 2;
let mut colour = false;
let mut link_counter = 0;
for o in outputs {
//each char is width of 13
let os = if let OutputType::Text(ref s) = o {
let s = if s.starts_with(" ") {
" ".to_string()
} else {
"".to_string()
} + s.trim() + if s.ends_with(" ") {
" "
} else {
""
};
Some(s)
} else if let OutputType::StartLink(link) = &o {
colour = true;
if self.mode == Mode::Link {
self.links.push(link.to_string());
let s = link_counter.to_string() + ":";
link_counter += 1;
if self.mode == Mode::Link {
Some(s)
} else {
None
}
} else {
None
}
} else {
None
};
if let Some(s) = os {
//leading and trailing whitespace is probably a mistake
let mut line = String::new();
let mut start_x = x;
for c in s.chars() {
if x + 14 > self.dimensions[0] {
//full line, add draw instruction
self.page.push((start_x, y, line, colour));
line = String::new();
x = 2;
start_x = x;
y += LINE_HEIGHT;
}
line += &c.to_string();
x += 13;
}
if line.len() > 0 {
self.page.push((start_x, y, line, colour));
}
}
if o == OutputType::Newline {
x = 2;
y += LINE_HEIGHT;
} else if o == OutputType::EndLink {
colour = false;
}
}
self.max_lines = (y - 2) / LINE_HEIGHT;
}
}
pub fn main() {