syntaxAlchemist/lib-nested
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

update dependencies

Browse source
This commit is contained in:
Michael Sippel 2021-10-01 16:29:18 +02:00
parent c68a9f785d
commit bfd27fa3fa
Signed by: senvas
GPG key ID: F96CF119C34B64A6
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
nested/src/terminal/ansi_parser.rs
View file

@ -46,7 +46,7 @@ pub fn read_ansi_from<R: Read + Unpin>(ansi_reader: &mut R, port: InnerViewPort<
loop { loop {
match ansi_reader.read(&mut buf) { match ansi_reader.read(&mut buf) {
Ok(0) => break, //Ok(0) => break,
Ok(n) => { Ok(n) => {
for byte in &buf[..n] { for byte in &buf[..n] {
statemachine.advance(&mut performer, *byte); statemachine.advance(&mut performer, *byte);
@ -119,22 +119,24 @@ impl Perform for PerfAtom {
} }
fn hook(&mut self, params: &Params, intermediates: &[u8], ignore: bool, c: char) { fn hook(&mut self, params: &Params, intermediates: &[u8], ignore: bool, c: char) {
/*
eprintln!( eprintln!(
"[hook] params={:?}, intermediates={:?}, ignore={:?}, char={:?}", "[hook] params={:?}, intermediates={:?}, ignore={:?}, char={:?}",
params, intermediates, ignore, c params, intermediates, ignore, c
); );
*/
} }
fn put(&mut self, byte: u8) { fn put(&mut self, byte: u8) {
eprintln!("[put] {:02x}", byte); //eprintln!("[put] {:02x}", byte);
} }
fn unhook(&mut self) { fn unhook(&mut self) {
eprintln!("[unhook]"); //eprintln!("[unhook]");
} }
fn osc_dispatch(&mut self, params: &[&[u8]], bell_terminated: bool) { fn osc_dispatch(&mut self, params: &[&[u8]], bell_terminated: bool) {
eprintln!("[osc_dispatch] params={:?} bell_terminated={}", params, bell_terminated); //eprintln!("[osc_dispatch] params={:?} bell_terminated={}", params, bell_terminated);
} }
fn csi_dispatch(&mut self, params: &Params, intermediates: &[u8], ignore: bool, c: char) { fn csi_dispatch(&mut self, params: &Params, intermediates: &[u8], ignore: bool, c: char) {
@ -284,10 +286,12 @@ impl Perform for PerfAtom {
} }
fn esc_dispatch(&mut self, intermediates: &[u8], ignore: bool, byte: u8) { fn esc_dispatch(&mut self, intermediates: &[u8], ignore: bool, byte: u8) {
/*
eprintln!( eprintln!(
"[esc_dispatch] intermediates={:?}, ignore={:?}, byte={:02x}", "[esc_dispatch] intermediates={:?}, ignore={:?}, byte={:02x}",
intermediates, ignore, byte intermediates, ignore, byte
); );
*/
} }
} }

2
rust-toolchain
View file

@ -5,5 +5,5 @@
# to the user in the error, instead of "error: invalid channel name '[toolchain]'". # to the user in the error, instead of "error: invalid channel name '[toolchain]'".
[toolchain] [toolchain]
channel = "nightly-2021-08-27" channel = "nightly-2021-09-29"
components = ["rust-src", "rustc-dev", "llvm-tools-preview"] components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

8
sdf_editor/src/main.rs
View file

@ -24,7 +24,7 @@ use{
}, },
nako::{ nako::{
stream::{SecondaryStream2d, PrimaryStream2d}, stream::{SecondaryStream2d, PrimaryStream2d},
glam::{Vec2, Vec3, UVec2}, glam::{Vec2, Vec3, UVec2, IVec2},
operations::{ operations::{
planar::primitives2d::Box2d, planar::primitives2d::Box2d,
volumetric::{Color, Union, Round}, volumetric::{Color, Union, Round},
@ -126,7 +126,7 @@ impl SdfTerm {
id.into(), id.into(),
LayerInfo { LayerInfo {
extent: UVec2::new(1 + self.font_height / 2, self.font_height), extent: UVec2::new(1 + self.font_height / 2, self.font_height),
location: UVec2::new(pt.x as u32 * self.font_height / 2, pt.y as u32 * self.font_height) location: IVec2::new(pt.x as i32 * self.font_height as i32 / 2, pt.y as i32 * self.font_height as i32)
}); });
self.bg_layers.insert(*pt, (false, id)); self.bg_layers.insert(*pt, (false, id));
@ -145,7 +145,7 @@ impl SdfTerm {
id.into(), id.into(),
LayerInfo { LayerInfo {
extent: UVec2::new(1 + self.font_height / 2, self.font_height), extent: UVec2::new(1 + self.font_height / 2, self.font_height),
location: UVec2::new(pt.x as u32 * self.font_height / 2, pt.y as u32 * self.font_height) location: IVec2::new(pt.x as i32 * self.font_height as i32 / 2, pt.y as i32 * self.font_height as i32)
}); });
self.fg_layers.insert(*pt, (false, id)); self.fg_layers.insert(*pt, (false, id));
@ -273,7 +273,7 @@ async fn main() {
}); });
renderer.lock().unwrap().set_layer_info(color_layer_id.into(), LayerInfo{ renderer.lock().unwrap().set_layer_info(color_layer_id.into(), LayerInfo{
extent: UVec2::new(600, 600), extent: UVec2::new(600, 600),
location: UVec2::new(200,100) location: IVec2::new(200,100)
}); });
event_loop.run(move |event, _target, control_flow|{ event_loop.run(move |event, _target, control_flow|{