Skip to content

Update deps and some other changes #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbrewster merged 9 commits into from
Jan 14, 2020
Merged

Update deps and some other changes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
30160c8
Replace Delete with Backspace
rofrol Jan 14, 2020
dd7b516
Change from LWin to LControl for quit and save
rofrol Jan 14, 2020
37d215c
Delete works
rofrol Jan 14, 2020
f107f2a
Do nothing when Tab is pressed
rofrol Jan 14, 2020
43cf510
wip
rofrol Jan 14, 2020
e60b15b
Compiles but the window is just black background
rofrol Jan 14, 2020
100edb2
Remove dbg
rofrol Jan 14, 2020
8236848
Remove mut from size
rofrol Jan 14, 2020
7ad1e16
Update size
rofrol Jan 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ edition = "2018"
syntect = "3.3"
wgpu = "0.4.0"
wgpu_glyph = "0.6.0"
winit = "0.20.0-alpha5" # TODO: Update once out of alpha
winit = "0.20.0"
72 changes: 42 additions & 30 deletions src/buffer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ struct Location {

impl Location {
fn new() -> Location {
Location {
row: 0,
col: 0,
}
Location { row: 0, col: 0 }
}
}

Expand All @@ -51,7 +48,9 @@ impl Span {
}

fn get_char_indices_for_line(&self, line: usize, line_length: usize) -> Option<(usize, usize)> {
if !self.contains_line(line) { return None; }
if !self.contains_line(line) {
return None;
}

// 4 Cases:
// Start/End line
Expand All @@ -60,9 +59,9 @@ impl Span {
// End line

if self.start.row == self.end.row {
Some((self.start.col, self.end.col))
Some((self.start.col, self.end.col))
} else if self.start.row == line {
Some((self.start.col, line_length))
Some((self.start.col, line_length))
} else if self.end.row == line {
Some((0, self.end.col))
} else {
Expand All @@ -86,7 +85,7 @@ impl Cursor {
selection_start: None,
}
}

fn set_row(&mut self, row: usize) {
self.location.row = row;
}
Expand Down Expand Up @@ -122,7 +121,7 @@ pub struct Buffer {
scroll: f32,
cursor: Cursor,
dragging: bool,
size: PhysicalSize,
size: PhysicalSize<u32>,
path: PathBuf,
// TODO: Move those to editor?
syntax_set: SyntaxSet,
Expand Down Expand Up @@ -163,7 +162,7 @@ fn generate_highlight_info(
}

impl Buffer {
pub fn new(size: PhysicalSize, file_name: String) -> Buffer {
pub fn new(size: PhysicalSize<u32>, file_name: String) -> Buffer {
let path = Path::new(&file_name);
let file = std::fs::read_to_string(path).expect("Failed to read file.");
// TODO: Not sure if just splitting '\n' is right here.
Expand Down Expand Up @@ -194,7 +193,7 @@ impl Buffer {
std::fs::write(&self.path, self.lines.join("\n")).expect("Failed to save file.");
}

pub fn update_size(&mut self, size: PhysicalSize) {
pub fn update_size(&mut self, size: PhysicalSize<u32>) {
self.size = size;
}

Expand Down Expand Up @@ -224,7 +223,7 @@ impl Buffer {
&mut self,
button: MouseButton,
state: ElementState,
position: PhysicalPosition,
position: PhysicalPosition<i32>,
) {
if button == MouseButton::Left {
if state == ElementState::Pressed {
Expand All @@ -239,7 +238,7 @@ impl Buffer {
}
}

pub fn handle_mouse_move(&mut self, position: PhysicalPosition) {
pub fn handle_mouse_move(&mut self, position: PhysicalPosition<i32>) {
if self.dragging {
if self.cursor.selection_start.is_none() {
self.cursor.selection_start = Some(self.cursor.location);
Expand All @@ -250,14 +249,14 @@ impl Buffer {
}
}

fn hit_test(&self, position: PhysicalPosition) -> Location {
fn hit_test(&self, position: PhysicalPosition<i32>) -> Location {
let x_pad = 10.0;
let digit_count = self.lines.len().to_string().chars().count();
let gutter_offset = x_pad + 30.0 + digit_count as f32 * (SCALE / 2.0);

let abs_position = PhysicalPosition::new(
(position.x - gutter_offset as f64).max(0.0),
position.y + self.scroll as f64,
(position.x as f32 - gutter_offset).max(0.0),
position.y as f32 + self.scroll,
);

let line = (abs_position.y / 40.0).floor() as usize;
Expand All @@ -281,16 +280,28 @@ impl Buffer {
self.cursor.set_row(self.cursor.location.row + 1);
self.lines.insert(self.cursor.location.row, new_line);
self.cursor.set_col_with_affinity(0);
} else if input == 127 as char {
// this is Backspace
} else if input == '\u{8}' {
if self.cursor.location.col > 0 {
self.lines[self.cursor.location.row].remove(self.cursor.location.col - 1);
self.cursor.set_col_with_affinity(self.cursor.location.col - 1);
self.cursor
.set_col_with_affinity(self.cursor.location.col - 1);
} else if self.cursor.location.row > 0 {
let remaining = self.lines.remove(self.cursor.location.row);
self.cursor.set_row(self.cursor.location.row - 1);
self.cursor.set_col_with_affinity(self.lines[self.cursor.location.row].len());
self.cursor
.set_col_with_affinity(self.lines[self.cursor.location.row].len());
self.lines[self.cursor.location.row].push_str(&remaining);
}
// this is Delete
} else if input == '\u{7f}' {
if self.lines[self.cursor.location.row].len() > self.cursor.location.col {
self.lines[self.cursor.location.row].remove(self.cursor.location.col);
}
} else if input == '\t' {
// Do nothing, unless we consider how to display tab,
// because now cursor should be moved to right one character when deleting
// Also, now when there is \t in the file, it will not be displayed correctly
} else {
self.lines[self.cursor.location.row].insert(self.cursor.location.col, input);
self.cursor.set_col(self.cursor.location.col + 1);
Expand Down Expand Up @@ -325,9 +336,7 @@ impl Buffer {
let row = (self.cursor.location.row as isize - 1)
.max(0)
.min(self.lines.len() as isize) as usize;
let col = self.lines[row]
.len()
.min(self.cursor.col_affinity);
let col = self.lines[row].len().min(self.cursor.col_affinity);
self.cursor.set_row(row);
self.cursor.set_col(col);
}
Expand All @@ -336,9 +345,7 @@ impl Buffer {
let row = (self.cursor.location.row as isize + 1)
.max(0)
.min(self.lines.len() as isize - 1) as usize;
let col = self.lines[row]
.len()
.min(self.cursor.col_affinity);
let col = self.lines[row].len().min(self.cursor.col_affinity);
self.cursor.set_row(row);
self.cursor.set_col(col);
}
Expand All @@ -347,10 +354,12 @@ impl Buffer {
if self.cursor.location.col == 0 {
if self.cursor.location.row > 0 {
self.cursor.set_row(self.cursor.location.row - 1);
self.cursor.set_col_with_affinity(self.lines[self.cursor.location.row].len());
self.cursor
.set_col_with_affinity(self.lines[self.cursor.location.row].len());
}
} else {
self.cursor.set_col_with_affinity(self.cursor.location.col - 1);
self.cursor
.set_col_with_affinity(self.cursor.location.col - 1);
}
}
VirtualKeyCode::Right => {
Expand All @@ -361,7 +370,8 @@ impl Buffer {
self.cursor.set_col_with_affinity(0);
}
} else {
self.cursor.set_col_with_affinity(self.cursor.location.col + 1);
self.cursor
.set_col_with_affinity(self.cursor.location.col + 1);
}
}
_ => {}
Expand All @@ -371,7 +381,7 @@ impl Buffer {

pub fn draw(
&self,
size: PhysicalSize,
size: PhysicalSize<u32>,
glyph_brush: &mut GlyphBrush<()>,
rect_brush: &mut RectangleBrush,
) {
Expand Down Expand Up @@ -411,7 +421,9 @@ impl Buffer {
let mut line_no_color = [0.4, 0.4, 0.4, 1.0];

// Paint selection boxes
if let Some((start, end)) = selection_span.and_then(|span| span.get_char_indices_for_line(index, line.len())) {
if let Some((start, end)) =
selection_span.and_then(|span| span.get_char_indices_for_line(index, line.len()))
{
// TODO: Gah, we should not do this. We should do a single layout pass and add some
// methods that lets us query glyph locations.
let layout = glyph_brush.fonts().first().unwrap().layout(
Expand Down
12 changes: 6 additions & 6 deletions src/editor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ use winit::{
pub struct Editor {
buffers: Vec<Buffer>,
active_buffer: usize,
size: PhysicalSize,
size: PhysicalSize<u32>,
}

impl Editor {
pub fn new(size: PhysicalSize, file_name: String) -> Editor {
pub fn new(size: PhysicalSize<u32>, file_name: String) -> Editor {
Editor {
buffers: vec![Buffer::new(size, file_name)],
active_buffer: 0,
Expand All @@ -25,7 +25,7 @@ impl Editor {
self.buffers[self.active_buffer].save();
}

pub fn update_size(&mut self, size: PhysicalSize) {
pub fn update_size(&mut self, size: PhysicalSize<u32>) {
self.size = size;
for buffer in &mut self.buffers {
buffer.update_size(size);
Expand All @@ -44,18 +44,18 @@ impl Editor {
&mut self,
button: MouseButton,
state: ElementState,
position: PhysicalPosition,
position: PhysicalPosition<i32>,
) {
self.buffers[self.active_buffer].handle_mouse_input(button, state, position);
}

pub fn handle_mouse_move(&mut self, position: PhysicalPosition) {
pub fn handle_mouse_move(&mut self, position: PhysicalPosition<i32>) {
self.buffers[self.active_buffer].handle_mouse_move(position);
}

pub fn draw(
&self,
size: PhysicalSize,
size: PhysicalSize<u32>,
glyph_brush: &mut GlyphBrush<()>,
rect_brush: &mut RectangleBrush,
) {
Expand Down
Loading