From 028c80b2b01a4b69d04f8e74573542d4c2e0516a Mon Sep 17 00:00:00 2001 From: Enrico Lumetti Date: Wed, 4 Nov 2020 20:52:05 +0100 Subject: [PATCH 01/11] [WIP] CanvasElement trait (currently panicking --- src/main.rs | 111 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 89 insertions(+), 22 deletions(-) diff --git a/src/main.rs b/src/main.rs index c394f48..d042e4b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,37 +14,107 @@ //! An example of a custom drawing widget. +use std::rc::Rc; use druid::im::{vector, Vector}; use druid::kurbo::BezPath; -use druid::piet::{FontFamily, ImageFormat, InterpolationMode}; use druid::widget::prelude::*; use druid::{ - Affine, AppLauncher, ArcStr, Color, Data, Event, FontDescriptor, LocalizedString, Point, Rect, TextLayout, - WindowDesc, + AppLauncher, Color, Data, Event, LocalizedString, Rect, WindowDesc, }; -#[derive(Clone, Data)] -struct CanvasData { - drawn_paths: Vector, - is_drawing: bool, +mod stiletto { + use druid::widget::prelude::*; + pub trait CanvasElement { //: CanvasElementData { + /// returns the axis-aligned bounding box + fn bounding_box(&self) -> druid::Rect; + + fn draw(&self, ctx: &mut druid::PaintCtx); + + fn get_path(&mut self) -> Option<&mut CanvasPath> { + None + } + } + + //pub trait CanvasElementData { + // fn clone_box(&self) -> Box; + // fn same_box(&self, other: &Box) -> bool; + //} + + //impl CanvasElementData for T + //where + // T: 'static + CanvasElement + druid::Data + //{ + // fn clone_box(&self) -> Box { + // Box::new(self.clone()) + // } + + // fn same_box(&self, other: &Box) -> bool { + // self.same(other) + // } + //} + + //impl druid::Data for Box { + // fn same(&self, other: &Self) -> bool { + // return self.same(other); + // } + //} + + //impl Clone for Box { + // fn clone(&self) -> Self { + // self.clone_box() + // } + //} + + #[derive(Clone, druid::Data)] + pub struct CanvasPath { + pub kurbo_path: druid::kurbo::BezPath, + } + + impl CanvasElement for CanvasPath { + fn bounding_box(&self) -> druid::Rect { + use druid::kurbo::Shape; + return self.kurbo_path.bounding_box(); + } + + fn get_path(&mut self) -> Option<&mut CanvasPath> { + Some(self) + } + + fn draw(&self, ctx: &mut druid::PaintCtx) { + let stroke_color = druid::Color::rgb8(0, 128, 0); + ctx.stroke(&self.kurbo_path, &stroke_color, 2.0); + } + } + + } struct CanvasWidget; +#[derive(Clone, Data)] +struct CanvasData { + elements: Vector>, + is_drawing: bool, +} + impl Widget for CanvasWidget { - fn event(&mut self, _ctx: &mut EventCtx, event: &Event, data: &mut CanvasData, _env: &Env) { + fn event<'a>(&mut self, _ctx: &mut EventCtx, event: &Event, data: &'a mut CanvasData, _env: &Env) { match event { Event::MouseDown(mouse_event) => { if mouse_event.pointer_type == druid::PointerType::Stylus { data.is_drawing = true; - let mut new_path = BezPath::new(); - new_path.move_to((mouse_event.pos.x, mouse_event.pos.y)); - data.drawn_paths.push_back(new_path); + let mut kurbo_path = BezPath::new(); + kurbo_path.move_to((mouse_event.pos.x, mouse_event.pos.y)); + let new_path = Rc::new(stiletto::CanvasPath{kurbo_path}); + data.elements.push_back(new_path); } }, Event::MouseMove(mouse_event) => { if data.is_drawing && mouse_event.pointer_type == druid::PointerType::Stylus { - data.drawn_paths.back_mut().unwrap().line_to((mouse_event.pos.x, mouse_event.pos.y)); + let ptr: &'a mut dyn stiletto::CanvasElement = Rc::get_mut(data.elements.back_mut().unwrap()).unwrap(); + let last_canvas_path: &'a mut stiletto::CanvasPath = ptr.get_path().unwrap(); + + last_canvas_path.kurbo_path.line_to((mouse_event.pos.x, mouse_event.pos.y)); } }, Event::MouseUp(_) => { @@ -67,7 +137,7 @@ impl Widget for CanvasWidget { } fn update(&mut self, ctx: &mut UpdateCtx, _old_data: &CanvasData, _data: &CanvasData, _env: &Env) { - ctx.request_paint(); + ctx.request_paint_rect(Rect::new(0., 0., 200., 200.)); } fn layout( @@ -97,23 +167,20 @@ impl Widget for CanvasWidget { let size = ctx.size(); let rect = size.to_rect(); ctx.fill(rect, &Color::WHITE); - // Note: ctx also has a `clear` method, but that clears the whole context, // and we only want to clear this widget's area. - - let stroke_color = Color::rgb8(0, 128, 0); - for path in &data.drawn_paths { - ctx.stroke(path, &stroke_color, 2.0); + for element in &data.elements { + element.draw(ctx); } } } pub fn main() { - let window = WindowDesc::new(|| CanvasWidget {}).title( - LocalizedString::new("custom-widget-demo-window-title").with_placeholder("Fancy Colors"), - ); + let window = WindowDesc::new(|| CanvasWidget {}) + //.window_size((1024.0, 1400.0)) + .title(LocalizedString::new("custom-widget-demo-window-title").with_placeholder("Fancy Colors")); let canvas_data = CanvasData { - drawn_paths: vector![], + elements: vector![], is_drawing: false, }; AppLauncher::with_window(window) From 95c83db203b60918273be429f6b05493f6310076 Mon Sep 17 00:00:00 2001 From: Francesco Magliocca Date: Wed, 4 Nov 2020 22:30:56 +0100 Subject: [PATCH 02/11] Lower minimum required versions of gtk glib and gdk, in order to accomodate older distros --- Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ee4798f..69b976d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,12 +17,12 @@ im = { version = "*" } [dependencies.gtk] version = "0.9.2" -features = ["v3_24"] +features = ["v3_22"] [dependencies.gio] version = "" -features = ["v2_60"] +features = ["v2_56"] [dependencies.gdk] version = "" -features = ["v3_24"] +features = ["v3_22"] From 8d335c6938e519588d6df3727a9b5ab3f5b37433 Mon Sep 17 00:00:00 2001 From: Francesco Magliocca Date: Wed, 4 Nov 2020 22:31:21 +0100 Subject: [PATCH 03/11] Temporarily remove check on pointer type, we accept all possible pointers now! --- src/main.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main.rs b/src/main.rs index d042e4b..d7b3964 100644 --- a/src/main.rs +++ b/src/main.rs @@ -99,9 +99,10 @@ struct CanvasData { impl Widget for CanvasWidget { fn event<'a>(&mut self, _ctx: &mut EventCtx, event: &Event, data: &'a mut CanvasData, _env: &Env) { + match event { Event::MouseDown(mouse_event) => { - if mouse_event.pointer_type == druid::PointerType::Stylus { + if true /*&& mouse_event.pointer_type == druid::PointerType::Stylus || mouse_event.pointer_type == druid::PointerType::Mouse*/ { data.is_drawing = true; let mut kurbo_path = BezPath::new(); kurbo_path.move_to((mouse_event.pos.x, mouse_event.pos.y)); @@ -110,7 +111,7 @@ impl Widget for CanvasWidget { } }, Event::MouseMove(mouse_event) => { - if data.is_drawing && mouse_event.pointer_type == druid::PointerType::Stylus { + if data.is_drawing /*&& (mouse_event.pointer_type == druid::PointerType::Stylus || mouse_event.pointer_type == druid::PointerType::Mouse)*/ { let ptr: &'a mut dyn stiletto::CanvasElement = Rc::get_mut(data.elements.back_mut().unwrap()).unwrap(); let last_canvas_path: &'a mut stiletto::CanvasPath = ptr.get_path().unwrap(); From 3287117d89f083aca30672dac6282eae2559e049 Mon Sep 17 00:00:00 2001 From: Enrico Lumetti Date: Sun, 8 Nov 2020 10:36:26 +0100 Subject: [PATCH 04/11] Add LICENSE --- AUTHORS | 2 ++ LICENSE | 0 src/bin/libinput_capture.rs | 3 ++- src/main.rs | 24 ++++++++++++------------ 4 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 AUTHORS create mode 100644 LICENSE diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..24a96cc --- /dev/null +++ b/AUTHORS @@ -0,0 +1,2 @@ +Enrico Lumetti +Francesco Magliocca diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e69de29 diff --git a/src/bin/libinput_capture.rs b/src/bin/libinput_capture.rs index f931e52..5130d1f 100644 --- a/src/bin/libinput_capture.rs +++ b/src/bin/libinput_capture.rs @@ -1,6 +1,7 @@ use input::{Libinput, LibinputInterface}; use input::event::Event; use input::event::tablet_tool::{TabletToolEvent, TabletToolEventTrait}; +use std::time; use std::ffi::CString; use std::path::Path; use std::os::unix::io::{RawFd}; @@ -43,7 +44,7 @@ fn main() { while let Some(event) = libinput_ctx.next() { if let Event::Tablet(tablet_evt) = event { if let TabletToolEvent::Axis(axis_evt) = tablet_evt { - if true { //axis_evt.pressure() > 1e-3 { + if axis_evt.pressure() > 1e-3 { let pressure = axis_evt.pressure(); let x_t = axis_evt.x_transformed(1080); let y_t = axis_evt.y_transformed(1920); diff --git a/src/main.rs b/src/main.rs index d7b3964..2d6b9ef 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,18 +1,18 @@ -// Copyright 2019 The Druid Authors. +// Stiletto +// Copyright (C) 2020 Stiletto Authors // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. // -// http://www.apache.org/licenses/LICENSE-2.0 +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -//! An example of a custom drawing widget. +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . use std::rc::Rc; use druid::im::{vector, Vector}; From 49f5cd7e4df1a00b641d9febbb5872d9b1b14205 Mon Sep 17 00:00:00 2001 From: Enrico Lumetti Date: Sun, 8 Nov 2020 10:48:28 +0100 Subject: [PATCH 05/11] Cargo fmt + update lock + remove test binaries --- Cargo.lock | 32 +------- Cargo.toml | 1 - src/bin/gtk_capture.rs | 158 ------------------------------------ src/bin/libinput_capture.rs | 67 --------------- src/main.rs | 85 +++++++++++-------- 5 files changed, 52 insertions(+), 291 deletions(-) delete mode 100644 src/bin/gtk_capture.rs delete mode 100644 src/bin/libinput_capture.rs diff --git a/Cargo.lock b/Cargo.lock index 36e5a6f..25b4deb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -772,25 +772,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "input" -version = "0.5.0" -source = "git+https://github.com/Smithay/input.rs#2b2f372101cbb165f5f92e8d6b05ca1be9e4fefe" -dependencies = [ - "bitflags", - "input-sys", - "libc", - "udev 0.4.0", -] - -[[package]] -name = "input-sys" -version = "1.15.0" -source = "git+https://github.com/Smithay/input.rs#2b2f372101cbb165f5f92e8d6b05ca1be9e4fefe" -dependencies = [ - "libc", -] - [[package]] name = "instant" version = "0.1.7" @@ -1360,9 +1341,8 @@ dependencies = [ "gio", "gtk", "im", - "input", "libc", - "udev 0.2.0", + "udev", ] [[package]] @@ -1507,16 +1487,6 @@ dependencies = [ "libudev-sys", ] -[[package]] -name = "udev" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24953d50a3bce0f5f5a9a2766567072dc9af8096f8c40ea81815da651066bc9f" -dependencies = [ - "libc", - "libudev-sys", -] - [[package]] name = "unic-bidi" version = "0.9.0" diff --git a/Cargo.toml b/Cargo.toml index 69b976d..79e1dd8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,6 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -input = { git = "https://github.com/Smithay/input.rs" } udev = "0.2" libc = "0.2" errno = "0.2" diff --git a/src/bin/gtk_capture.rs b/src/bin/gtk_capture.rs deleted file mode 100644 index efab0f4..0000000 --- a/src/bin/gtk_capture.rs +++ /dev/null @@ -1,158 +0,0 @@ -use std::vec::Vec; -use std::cell::RefCell; -use std::rc::Rc; -use gtk::prelude::*; -use gio::prelude::*; - -use gtk::{Application, ApplicationWindow, DrawingArea, Box, Button, CheckButton, HeaderBar}; - -struct AppState { - draw_lines: bool, - do_draw: bool, - point_buffer: Vec<(f64, f64)>, -} - -fn main() { - let application = Application::new( - Some("team.acqua.enrico.styluscapture"), - Default::default(), - ).expect("failed to initialize GTK application"); - - - application.connect_activate(|app| { - let app_state = Rc::new(RefCell::new(AppState{ - draw_lines: false, - do_draw: false, - point_buffer: Vec::new(), - })); - - let drawing_area = DrawingArea::new(); - let state_clone_1 = Rc::clone(&app_state); - drawing_area.set_size_request(100, 100); - drawing_area.connect_draw(move |widget, cr| { - let style_context = widget.get_style_context(); - let wa = widget.get_allocation(); - - gtk::render_background( - &style_context, - &cr, - wa.x as f64, - wa.y as f64, - wa.width as f64, - wa.height as f64 - ); - - let state = state_clone_1.borrow(); - - if state.point_buffer.len() > 0 { - cr.set_source_rgb(1.0, 0.0, 0.0); - if state.draw_lines { - let (x, y) = state.point_buffer[0]; - cr.move_to(x - wa.x as f64, y - wa.y as f64); - - for pt in &state.point_buffer[1..] { - cr.line_to(pt.0 - wa.x as f64, pt.1 - wa.y as f64); - } - cr.set_line_width(3.); - cr.stroke(); - } else { - for pt in &state.point_buffer[1..] { - use std::f64::consts::PI; - cr.arc(pt.0 - wa.x as f64, pt.1 - wa.y as f64, 3., 0., 2. * PI); - cr.fill(); - } - } - - } - - gtk::Inhibit(false) - }); - - let save_button = Button::from_icon_name(Some("document-save-symbolic"), gtk::IconSize::Menu); - let clear_button = Button::from_icon_name(Some("edit-clear-all-symbolic"), gtk::IconSize::Menu); - let check_button = CheckButton::with_label("Join Points"); - - let header = HeaderBar::new(); - header.pack_start(&save_button); - header.pack_start(&clear_button); - header.pack_start(&check_button); - - let w_box = Box::new(gtk::Orientation::Vertical, 10); - w_box.pack_start(&header, false, false, 0); - w_box.pack_end(&drawing_area, true, true, 0); - - let window = Rc::new(ApplicationWindow::new(app)); - window.set_title("Stylus Capture"); - window.set_default_size(500, 500); - - let state_clone_3 = Rc::clone(&app_state); - let win_clone = Rc::clone(&window); - clear_button.connect_clicked(move |_| { - state_clone_3.borrow_mut().point_buffer.clear(); - win_clone.queue_draw(); - }); - - let state_clone_4 = Rc::clone(&app_state); - save_button.connect_clicked(move |_| { - let writer = csv::Writer::from_path("acquired_data.csv"); - if let Ok(mut wrt) = writer { - wrt.write_record(&["x", "y"]).expect("write error"); - for pt in &state_clone_4.borrow().point_buffer { - wrt.write_record(&[pt.0.to_string(), pt.1.to_string()]).expect("write error"); - } - wrt.flush().unwrap(); - } - }); - - let state_clone_3 = Rc::clone(&app_state); - let win_clone_2 = Rc::clone(&window); - check_button.connect_clicked(move |_| { - let mut borrow = state_clone_3.borrow_mut(); - borrow.draw_lines = ! borrow.draw_lines; - win_clone_2.queue_draw(); - }); - - let state_clone_2 = Rc::clone(&app_state); - window.connect_event(move |widget, event| { - let mut capture_event = false; - if event.get_device_tool() - .map(|tool| tool.get_tool_type() == gdk::DeviceToolType::Pen) == Some(true) { - match event.get_event_type() { - gdk::EventType::ProximityOut => { - std::println!("pen out of proximity"); - }, - gdk::EventType::ProximityIn => { - std::println!("pen in proximity"); - }, - gdk::EventType::MotionNotify => { - let mut state = state_clone_2.borrow_mut(); - if state.do_draw { - state.point_buffer.push(event.get_coords().unwrap()); - widget.queue_draw(); - } - }, - gdk::EventType::ButtonPress | gdk::EventType::ButtonRelease => { - std::println!("evt: {:#?}, tool: {:#?}", event, event.get_device_tool()); - - state_clone_2.borrow_mut().do_draw = event.get_event_type() == gdk::EventType::ButtonPress; - capture_event = true; - }, - _ => { - std::println!("{:#?}", event); - } - } - } - std::println!("{:#?}\n", event.get_device_tool().map(|tool| tool.get_tool_type())); - gtk::Inhibit(capture_event) - //std::println!("{:#?}",event.get_event_type()); - //std::println!("{:#?}", event.get_source_device().and_then(|d| d.get_property_tool()).map(|t| t.get_tool_type())); - //std::println!("{:#?}", event.get_device().and_then(|d| d.get_property_tool()).map(|t| t.get_tool_type())); - }); - - - window.add(&w_box); - window.show_all(); - }); - - application.run(&[]); -} diff --git a/src/bin/libinput_capture.rs b/src/bin/libinput_capture.rs deleted file mode 100644 index 5130d1f..0000000 --- a/src/bin/libinput_capture.rs +++ /dev/null @@ -1,67 +0,0 @@ -use input::{Libinput, LibinputInterface}; -use input::event::Event; -use input::event::tablet_tool::{TabletToolEvent, TabletToolEventTrait}; -use std::time; -use std::ffi::CString; -use std::path::Path; -use std::os::unix::io::{RawFd}; - -struct SimpleLibinputInterface; - - -impl LibinputInterface for SimpleLibinputInterface { - fn open_restricted(&mut self, path: &Path, flags: i32) -> Result { - let c_path = path.to_str() - .map(|s| CString::new(s).unwrap()) - .unwrap(); - - let fd = unsafe { - libc::open64(c_path.as_ptr(), flags) - }; - - if fd < 0 { - let err: i32 = errno::errno().into(); - std::println!("{:?}, flags({}), fd({})", path, flags, fd); - Err(-err) - } else { - Ok(fd) - } - } - fn close_restricted(&mut self, fd: RawFd) { - unsafe { libc::close(fd); } - } -} - -fn main() { - let libinput_interface = SimpleLibinputInterface{}; - let mut libinput_ctx = Libinput::new_with_udev(libinput_interface); - - libinput_ctx.udev_assign_seat("seat0").unwrap(); - - let mut csv_writer = csv::Writer::from_path("acquired_data.csv").unwrap(); - csv_writer.write_record(&["x", "y", "pressure", "time_usec"]).expect("write error"); - loop { - while let Some(event) = libinput_ctx.next() { - if let Event::Tablet(tablet_evt) = event { - if let TabletToolEvent::Axis(axis_evt) = tablet_evt { - if axis_evt.pressure() > 1e-3 { - let pressure = axis_evt.pressure(); - let x_t = axis_evt.x_transformed(1080); - let y_t = axis_evt.y_transformed(1920); - let time_usec = axis_evt.time_usec(); - std::println!( - "(x, y) = ({}, {})\npressure = {}\n(tilt_x, tilt_y) = ({}, {})\n", - x_t, - y_t, - pressure, - axis_evt.tilt_x(), - axis_evt.tilt_y()); - csv_writer.write_record(&[x_t.to_string(), y_t.to_string(), pressure.to_string(), time_usec.to_string()]).expect("write error"); - csv_writer.flush().expect("write error"); - } - } - } - } - libinput_ctx.dispatch().unwrap(); - } -} diff --git a/src/main.rs b/src/main.rs index 2d6b9ef..e5b9aab 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,17 +14,16 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -use std::rc::Rc; use druid::im::{vector, Vector}; use druid::kurbo::BezPath; use druid::widget::prelude::*; -use druid::{ - AppLauncher, Color, Data, Event, LocalizedString, Rect, WindowDesc, -}; +use druid::{AppLauncher, Color, Data, Event, LocalizedString, Rect, WindowDesc}; +use std::rc::Rc; mod stiletto { use druid::widget::prelude::*; - pub trait CanvasElement { //: CanvasElementData { + pub trait CanvasElement { + //: CanvasElementData { /// returns the axis-aligned bounding box fn bounding_box(&self) -> druid::Rect; @@ -85,8 +84,6 @@ mod stiletto { ctx.stroke(&self.kurbo_path, &stroke_color, 2.0); } } - - } struct CanvasWidget; @@ -98,33 +95,44 @@ struct CanvasData { } impl Widget for CanvasWidget { - fn event<'a>(&mut self, _ctx: &mut EventCtx, event: &Event, data: &'a mut CanvasData, _env: &Env) { - + fn event<'a>( + &mut self, + _ctx: &mut EventCtx, + event: &Event, + data: &'a mut CanvasData, + _env: &Env, + ) { match event { - Event::MouseDown(mouse_event) => { - if true /*&& mouse_event.pointer_type == druid::PointerType::Stylus || mouse_event.pointer_type == druid::PointerType::Mouse*/ { - data.is_drawing = true; - let mut kurbo_path = BezPath::new(); - kurbo_path.move_to((mouse_event.pos.x, mouse_event.pos.y)); - let new_path = Rc::new(stiletto::CanvasPath{kurbo_path}); - data.elements.push_back(new_path); - } - }, - Event::MouseMove(mouse_event) => { - if data.is_drawing /*&& (mouse_event.pointer_type == druid::PointerType::Stylus || mouse_event.pointer_type == druid::PointerType::Mouse)*/ { - let ptr: &'a mut dyn stiletto::CanvasElement = Rc::get_mut(data.elements.back_mut().unwrap()).unwrap(); - let last_canvas_path: &'a mut stiletto::CanvasPath = ptr.get_path().unwrap(); - - last_canvas_path.kurbo_path.line_to((mouse_event.pos.x, mouse_event.pos.y)); - } - }, - Event::MouseUp(_) => { - if data.is_drawing { - data.is_drawing = false; - } - }, - _ => {} + Event::MouseDown(mouse_event) => { + if true + /*&& mouse_event.pointer_type == druid::PointerType::Stylus || mouse_event.pointer_type == druid::PointerType::Mouse*/ + { + data.is_drawing = true; + let mut kurbo_path = BezPath::new(); + kurbo_path.move_to((mouse_event.pos.x, mouse_event.pos.y)); + let new_path = Rc::new(stiletto::CanvasPath { kurbo_path }); + data.elements.push_back(new_path); + } + } + Event::MouseMove(mouse_event) => { + if data.is_drawing + /*&& (mouse_event.pointer_type == druid::PointerType::Stylus || mouse_event.pointer_type == druid::PointerType::Mouse)*/ + { + let ptr: &'a mut dyn stiletto::CanvasElement = + Rc::get_mut(data.elements.back_mut().unwrap()).unwrap(); + let last_canvas_path: &'a mut stiletto::CanvasPath = ptr.get_path().unwrap(); + last_canvas_path + .kurbo_path + .line_to((mouse_event.pos.x, mouse_event.pos.y)); + } + } + Event::MouseUp(_) => { + if data.is_drawing { + data.is_drawing = false; + } + } + _ => {} } } @@ -137,7 +145,13 @@ impl Widget for CanvasWidget { ) { } - fn update(&mut self, ctx: &mut UpdateCtx, _old_data: &CanvasData, _data: &CanvasData, _env: &Env) { + fn update( + &mut self, + ctx: &mut UpdateCtx, + _old_data: &CanvasData, + _data: &CanvasData, + _env: &Env, + ) { ctx.request_paint_rect(Rect::new(0., 0., 200., 200.)); } @@ -179,7 +193,10 @@ impl Widget for CanvasWidget { pub fn main() { let window = WindowDesc::new(|| CanvasWidget {}) //.window_size((1024.0, 1400.0)) - .title(LocalizedString::new("custom-widget-demo-window-title").with_placeholder("Fancy Colors")); + .title( + LocalizedString::new("custom-widget-demo-window-title") + .with_placeholder("Fancy Colors"), + ); let canvas_data = CanvasData { elements: vector![], is_drawing: false, From 0b486563f8b2a0a2739a742b7d3702ae8deec30f Mon Sep 17 00:00:00 2001 From: Enrico Lumetti Date: Sun, 8 Nov 2020 11:47:26 +0100 Subject: [PATCH 06/11] Almost working, but not quite --- src/main.rs | 97 +++++++++++++++++++++++++++++------------------------ 1 file changed, 53 insertions(+), 44 deletions(-) diff --git a/src/main.rs b/src/main.rs index e5b9aab..f65cfff 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,47 +22,50 @@ use std::rc::Rc; mod stiletto { use druid::widget::prelude::*; - pub trait CanvasElement { + pub trait CanvasElement: CanvasElementData { //: CanvasElementData { /// returns the axis-aligned bounding box fn bounding_box(&self) -> druid::Rect; fn draw(&self, ctx: &mut druid::PaintCtx); - fn get_path(&mut self) -> Option<&mut CanvasPath> { + fn get_path(&self) -> Option<&CanvasPath> { + None + } + + fn get_path_mut(&mut self) -> Option<&mut CanvasPath> { None } } - //pub trait CanvasElementData { - // fn clone_box(&self) -> Box; - // fn same_box(&self, other: &Box) -> bool; - //} + pub trait CanvasElementData { + fn clone_box(&self) -> Box; + } - //impl CanvasElementData for T - //where - // T: 'static + CanvasElement + druid::Data - //{ - // fn clone_box(&self) -> Box { - // Box::new(self.clone()) - // } + impl CanvasElementData for T + where + T: 'static + CanvasElement + druid::Data + { + fn clone_box(&self) -> Box { + Box::new(self.clone()) + } + } + impl Clone for Box { + fn clone(&self) -> Self { + self.clone_box() + } + } - // fn same_box(&self, other: &Box) -> bool { - // self.same(other) - // } - //} - - //impl druid::Data for Box { - // fn same(&self, other: &Self) -> bool { - // return self.same(other); - // } - //} - - //impl Clone for Box { - // fn clone(&self) -> Self { - // self.clone_box() - // } - //} + impl druid::Data for Box { + fn same(&self, other: &Self) -> bool { + if let (Some(p1), Some(p2)) = (self.get_path(), other.get_path()) + { + p1.same(p2) + } else { + false + } + } + } #[derive(Clone, druid::Data)] pub struct CanvasPath { @@ -72,17 +75,21 @@ mod stiletto { impl CanvasElement for CanvasPath { fn bounding_box(&self) -> druid::Rect { use druid::kurbo::Shape; - return self.kurbo_path.bounding_box(); - } - - fn get_path(&mut self) -> Option<&mut CanvasPath> { - Some(self) + self.kurbo_path.bounding_box() } fn draw(&self, ctx: &mut druid::PaintCtx) { let stroke_color = druid::Color::rgb8(0, 128, 0); ctx.stroke(&self.kurbo_path, &stroke_color, 2.0); } + + fn get_path(&self) -> Option<&CanvasPath> { + None + } + + fn get_path_mut(&mut self) -> Option<&mut CanvasPath> { + Some(self) + } } } @@ -90,16 +97,17 @@ struct CanvasWidget; #[derive(Clone, Data)] struct CanvasData { - elements: Vector>, + current_element: Option>, + elements: Vector>>, is_drawing: bool, } impl Widget for CanvasWidget { - fn event<'a>( + fn event( &mut self, _ctx: &mut EventCtx, event: &Event, - data: &'a mut CanvasData, + data: &mut CanvasData, _env: &Env, ) { match event { @@ -110,26 +118,26 @@ impl Widget for CanvasWidget { data.is_drawing = true; let mut kurbo_path = BezPath::new(); kurbo_path.move_to((mouse_event.pos.x, mouse_event.pos.y)); - let new_path = Rc::new(stiletto::CanvasPath { kurbo_path }); - data.elements.push_back(new_path); + data.current_element = Some(Box::new(stiletto::CanvasPath { kurbo_path } )); } } Event::MouseMove(mouse_event) => { if data.is_drawing /*&& (mouse_event.pointer_type == druid::PointerType::Stylus || mouse_event.pointer_type == druid::PointerType::Mouse)*/ { - let ptr: &'a mut dyn stiletto::CanvasElement = - Rc::get_mut(data.elements.back_mut().unwrap()).unwrap(); - let last_canvas_path: &'a mut stiletto::CanvasPath = ptr.get_path().unwrap(); + let current_path = data.current_element.as_mut().unwrap().get_path_mut().unwrap(); - last_canvas_path + current_path .kurbo_path .line_to((mouse_event.pos.x, mouse_event.pos.y)); } } Event::MouseUp(_) => { if data.is_drawing { - data.is_drawing = false; + if let Some(b) = data.current_element.as_mut() { + data.elements.push_back(Rc::new(b)); + data.is_drawing = false; + } } } _ => {} @@ -198,6 +206,7 @@ pub fn main() { .with_placeholder("Fancy Colors"), ); let canvas_data = CanvasData { + current_element: None, elements: vector![], is_drawing: false, }; From 3686f51e2c53e1d8e8886b545606c11b149daf19 Mon Sep 17 00:00:00 2001 From: Enrico Lumetti Date: Sun, 8 Nov 2020 13:00:29 +0100 Subject: [PATCH 07/11] Working again --- src/main.rs | 157 +++++++++++++++++++++------------------------------- 1 file changed, 63 insertions(+), 94 deletions(-) diff --git a/src/main.rs b/src/main.rs index f65cfff..2e9faf7 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,125 +17,82 @@ use druid::im::{vector, Vector}; use druid::kurbo::BezPath; use druid::widget::prelude::*; -use druid::{AppLauncher, Color, Data, Event, LocalizedString, Rect, WindowDesc}; -use std::rc::Rc; +use druid::{AppLauncher, Color, Data, Event, LocalizedString, WindowDesc}; mod stiletto { use druid::widget::prelude::*; - pub trait CanvasElement: CanvasElementData { - //: CanvasElementData { - /// returns the axis-aligned bounding box - fn bounding_box(&self) -> druid::Rect; - - fn draw(&self, ctx: &mut druid::PaintCtx); - - fn get_path(&self) -> Option<&CanvasPath> { - None - } - - fn get_path_mut(&mut self) -> Option<&mut CanvasPath> { - None - } - } - - pub trait CanvasElementData { - fn clone_box(&self) -> Box; - } - - impl CanvasElementData for T - where - T: 'static + CanvasElement + druid::Data - { - fn clone_box(&self) -> Box { - Box::new(self.clone()) - } - } - impl Clone for Box { - fn clone(&self) -> Self { - self.clone_box() - } - } - - impl druid::Data for Box { - fn same(&self, other: &Self) -> bool { - if let (Some(p1), Some(p2)) = (self.get_path(), other.get_path()) - { - p1.same(p2) - } else { - false - } - } - } #[derive(Clone, druid::Data)] - pub struct CanvasPath { + pub struct Path { pub kurbo_path: druid::kurbo::BezPath, } - impl CanvasElement for CanvasPath { - fn bounding_box(&self) -> druid::Rect { - use druid::kurbo::Shape; - self.kurbo_path.bounding_box() + #[derive(Clone, druid::Data)] + pub enum CanvasElement { + Path(Path), + } + + impl CanvasElement { + pub fn bounding_box(&self) -> druid::Rect { + match self { + CanvasElement::Path(p) => { + use druid::kurbo::Shape; + p.kurbo_path.bounding_box() + } + } + } + pub fn draw(&self, ctx: &mut druid::PaintCtx) { + match self { + CanvasElement::Path(p) => { + let stroke_color = druid::Color::rgb8(0, 128, 0); + ctx.stroke(&p.kurbo_path, &stroke_color, 2.0); + } + } } - fn draw(&self, ctx: &mut druid::PaintCtx) { - let stroke_color = druid::Color::rgb8(0, 128, 0); - ctx.stroke(&self.kurbo_path, &stroke_color, 2.0); - } - - fn get_path(&self) -> Option<&CanvasPath> { - None - } - - fn get_path_mut(&mut self) -> Option<&mut CanvasPath> { - Some(self) + pub fn get_path_mut(&mut self) -> Option<&mut Path> { + match self { + CanvasElement::Path(p) => Some(p), + } } } } struct CanvasWidget; +use stiletto::CanvasElement; + #[derive(Clone, Data)] struct CanvasData { - current_element: Option>, - elements: Vector>>, + current_element: Option, + elements: Vector, is_drawing: bool, } impl Widget for CanvasWidget { - fn event( - &mut self, - _ctx: &mut EventCtx, - event: &Event, - data: &mut CanvasData, - _env: &Env, - ) { + fn event(&mut self, _ctx: &mut EventCtx, event: &Event, data: &mut CanvasData, _env: &Env) { match event { Event::MouseDown(mouse_event) => { - if true - /*&& mouse_event.pointer_type == druid::PointerType::Stylus || mouse_event.pointer_type == druid::PointerType::Mouse*/ - { - data.is_drawing = true; - let mut kurbo_path = BezPath::new(); - kurbo_path.move_to((mouse_event.pos.x, mouse_event.pos.y)); - data.current_element = Some(Box::new(stiletto::CanvasPath { kurbo_path } )); - } + data.is_drawing = true; + let mut kurbo_path = BezPath::new(); + kurbo_path.move_to((mouse_event.pos.x, mouse_event.pos.y)); + data.current_element = Some(CanvasElement::Path(stiletto::Path { kurbo_path })); } Event::MouseMove(mouse_event) => { - if data.is_drawing - /*&& (mouse_event.pointer_type == druid::PointerType::Stylus || mouse_event.pointer_type == druid::PointerType::Mouse)*/ - { - let current_path = data.current_element.as_mut().unwrap().get_path_mut().unwrap(); - - current_path - .kurbo_path - .line_to((mouse_event.pos.x, mouse_event.pos.y)); + if data.is_drawing { + if let Some(current_element) = data.current_element.as_mut() { + current_element + .get_path_mut() + .unwrap() + .kurbo_path + .line_to((mouse_event.pos.x, mouse_event.pos.y)); + } } } Event::MouseUp(_) => { if data.is_drawing { - if let Some(b) = data.current_element.as_mut() { - data.elements.push_back(Rc::new(b)); + if let Some(current_element) = data.current_element.take() { + data.elements.push_back(current_element); data.is_drawing = false; } } @@ -156,11 +113,21 @@ impl Widget for CanvasWidget { fn update( &mut self, ctx: &mut UpdateCtx, - _old_data: &CanvasData, - _data: &CanvasData, + old_data: &CanvasData, + data: &CanvasData, _env: &Env, ) { - ctx.request_paint_rect(Rect::new(0., 0., 200., 200.)); + // the current_element is moved to the elements array, no need to repaint + if old_data.is_drawing && !data.is_drawing { + return; + } + if data.is_drawing { + data.current_element.as_ref().map(|e| { + ctx.request_paint_rect(e.bounding_box()); + }); + } else { + ctx.request_paint(); + } } fn layout( @@ -195,6 +162,9 @@ impl Widget for CanvasWidget { for element in &data.elements { element.draw(ctx); } + if let Some(element) = &data.current_element { + element.draw(ctx); + } } } @@ -202,8 +172,7 @@ pub fn main() { let window = WindowDesc::new(|| CanvasWidget {}) //.window_size((1024.0, 1400.0)) .title( - LocalizedString::new("custom-widget-demo-window-title") - .with_placeholder("Fancy Colors"), + LocalizedString::new("custom-widget-demo-window-title").with_placeholder("Stiletto"), ); let canvas_data = CanvasData { current_element: None, From 01b7f569f92c987b6c9d967672df3808c3ed87f5 Mon Sep 17 00:00:00 2001 From: Enrico Lumetti Date: Sun, 8 Nov 2020 14:29:09 +0100 Subject: [PATCH 08/11] Change CanvasElement::Path to CanvasElement::Freehand, is_drawing as method --- src/main.rs | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main.rs b/src/main.rs index 2e9faf7..20e2238 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,13 +29,13 @@ mod stiletto { #[derive(Clone, druid::Data)] pub enum CanvasElement { - Path(Path), + Freehand(Path), } impl CanvasElement { pub fn bounding_box(&self) -> druid::Rect { match self { - CanvasElement::Path(p) => { + CanvasElement::Freehand(p) => { use druid::kurbo::Shape; p.kurbo_path.bounding_box() } @@ -43,7 +43,7 @@ mod stiletto { } pub fn draw(&self, ctx: &mut druid::PaintCtx) { match self { - CanvasElement::Path(p) => { + CanvasElement::Freehand(p) => { let stroke_color = druid::Color::rgb8(0, 128, 0); ctx.stroke(&p.kurbo_path, &stroke_color, 2.0); } @@ -52,7 +52,7 @@ mod stiletto { pub fn get_path_mut(&mut self) -> Option<&mut Path> { match self { - CanvasElement::Path(p) => Some(p), + CanvasElement::Freehand(p) => Some(p), } } } @@ -66,20 +66,24 @@ use stiletto::CanvasElement; struct CanvasData { current_element: Option, elements: Vector, - is_drawing: bool, +} + +impl CanvasData { + fn is_drawing(&self) -> bool { + self.current_element.is_some() + } } impl Widget for CanvasWidget { fn event(&mut self, _ctx: &mut EventCtx, event: &Event, data: &mut CanvasData, _env: &Env) { match event { Event::MouseDown(mouse_event) => { - data.is_drawing = true; let mut kurbo_path = BezPath::new(); kurbo_path.move_to((mouse_event.pos.x, mouse_event.pos.y)); - data.current_element = Some(CanvasElement::Path(stiletto::Path { kurbo_path })); + data.current_element = Some(CanvasElement::Freehand(stiletto::Path { kurbo_path })); } Event::MouseMove(mouse_event) => { - if data.is_drawing { + if data.is_drawing() { if let Some(current_element) = data.current_element.as_mut() { current_element .get_path_mut() @@ -90,10 +94,9 @@ impl Widget for CanvasWidget { } } Event::MouseUp(_) => { - if data.is_drawing { + if data.is_drawing() { if let Some(current_element) = data.current_element.take() { data.elements.push_back(current_element); - data.is_drawing = false; } } } @@ -118,10 +121,10 @@ impl Widget for CanvasWidget { _env: &Env, ) { // the current_element is moved to the elements array, no need to repaint - if old_data.is_drawing && !data.is_drawing { + if old_data.is_drawing() && !data.is_drawing() { return; } - if data.is_drawing { + if data.is_drawing() { data.current_element.as_ref().map(|e| { ctx.request_paint_rect(e.bounding_box()); }); @@ -170,14 +173,13 @@ impl Widget for CanvasWidget { pub fn main() { let window = WindowDesc::new(|| CanvasWidget {}) - //.window_size((1024.0, 1400.0)) + .window_size((1024.0, 1400.0)) .title( LocalizedString::new("custom-widget-demo-window-title").with_placeholder("Stiletto"), ); let canvas_data = CanvasData { current_element: None, elements: vector![], - is_drawing: false, }; AppLauncher::with_window(window) .use_simple_logger() From 2ef210b7ad76079fb09b05d9c448970e9482032c Mon Sep 17 00:00:00 2001 From: Enrico Lumetti Date: Sun, 8 Nov 2020 14:31:20 +0100 Subject: [PATCH 09/11] Add LICENSE (ops) --- LICENSE | 661 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 661 insertions(+) diff --git a/LICENSE b/LICENSE index e69de29..be3f7b2 100644 --- a/LICENSE +++ b/LICENSE @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. From 19ce3657fa4b7f29dc0e949fa4742dfa7155817a Mon Sep 17 00:00:00 2001 From: Enrico Lumetti Date: Sun, 8 Nov 2020 14:48:30 +0100 Subject: [PATCH 10/11] Account for stroke thickness in bounding box --- src/main.rs | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main.rs b/src/main.rs index 20e2238..0e87c24 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,30 +29,33 @@ mod stiletto { #[derive(Clone, druid::Data)] pub enum CanvasElement { - Freehand(Path), + Freehand { + path: Path, + thickness: f64 + } } impl CanvasElement { pub fn bounding_box(&self) -> druid::Rect { match self { - CanvasElement::Freehand(p) => { + CanvasElement::Freehand{ path, thickness } => { use druid::kurbo::Shape; - p.kurbo_path.bounding_box() + path.kurbo_path.bounding_box().inflate(*thickness, *thickness) } } } pub fn draw(&self, ctx: &mut druid::PaintCtx) { match self { - CanvasElement::Freehand(p) => { + CanvasElement::Freehand{ path, thickness } => { let stroke_color = druid::Color::rgb8(0, 128, 0); - ctx.stroke(&p.kurbo_path, &stroke_color, 2.0); + ctx.stroke(&path.kurbo_path, &stroke_color, *thickness); } } } pub fn get_path_mut(&mut self) -> Option<&mut Path> { match self { - CanvasElement::Freehand(p) => Some(p), + CanvasElement::Freehand{ path, .. } => Some(path), } } } @@ -80,7 +83,10 @@ impl Widget for CanvasWidget { Event::MouseDown(mouse_event) => { let mut kurbo_path = BezPath::new(); kurbo_path.move_to((mouse_event.pos.x, mouse_event.pos.y)); - data.current_element = Some(CanvasElement::Freehand(stiletto::Path { kurbo_path })); + data.current_element = Some(CanvasElement::Freehand{ + path: stiletto::Path { kurbo_path }, + thickness: 2.0, + }); } Event::MouseMove(mouse_event) => { if data.is_drawing() { @@ -125,9 +131,9 @@ impl Widget for CanvasWidget { return; } if data.is_drawing() { - data.current_element.as_ref().map(|e| { + if let Some(e) = data.current_element.as_ref() { ctx.request_paint_rect(e.bounding_box()); - }); + } } else { ctx.request_paint(); } From 79157b9f8fb8e9f332fee5962f983d6297c321d8 Mon Sep 17 00:00:00 2001 From: Enrico Lumetti Date: Sun, 8 Nov 2020 15:41:28 +0100 Subject: [PATCH 11/11] Add minimal layout, separate stiletto library --- src/lib.rs | 38 +++++++++++++++++++++++++++++++ src/main.rs | 65 +++++++++++++++++------------------------------------ 2 files changed, 58 insertions(+), 45 deletions(-) create mode 100644 src/lib.rs diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..1ecbea8 --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,38 @@ +#[derive(Clone, druid::Data)] +pub struct Path { + pub kurbo_path: druid::kurbo::BezPath, +} + +#[derive(Clone, druid::Data)] +pub enum CanvasElement { + Freehand { + path: Path, + thickness: f64, + } +} + +impl CanvasElement { + pub fn bounding_box(&self) -> druid::Rect { + match self { + CanvasElement::Freehand{ path, thickness } => { + use druid::kurbo::Shape; + path.kurbo_path.bounding_box().inflate(*thickness, *thickness) + } + } + } + pub fn draw(&self, ctx: &mut druid::PaintCtx) { + match self { + CanvasElement::Freehand{ path, thickness } => { + use druid::RenderContext; + let stroke_color = druid::Color::rgb8(0, 128, 0); + ctx.stroke(&path.kurbo_path, &stroke_color, *thickness); + } + } + } + + pub fn get_path_mut(&mut self) -> Option<&mut Path> { + match self { + CanvasElement::Freehand{ path, .. } => Some(path), + } + } +} diff --git a/src/main.rs b/src/main.rs index 0e87c24..8fc3d97 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,50 +19,6 @@ use druid::kurbo::BezPath; use druid::widget::prelude::*; use druid::{AppLauncher, Color, Data, Event, LocalizedString, WindowDesc}; -mod stiletto { - use druid::widget::prelude::*; - - #[derive(Clone, druid::Data)] - pub struct Path { - pub kurbo_path: druid::kurbo::BezPath, - } - - #[derive(Clone, druid::Data)] - pub enum CanvasElement { - Freehand { - path: Path, - thickness: f64 - } - } - - impl CanvasElement { - pub fn bounding_box(&self) -> druid::Rect { - match self { - CanvasElement::Freehand{ path, thickness } => { - use druid::kurbo::Shape; - path.kurbo_path.bounding_box().inflate(*thickness, *thickness) - } - } - } - pub fn draw(&self, ctx: &mut druid::PaintCtx) { - match self { - CanvasElement::Freehand{ path, thickness } => { - let stroke_color = druid::Color::rgb8(0, 128, 0); - ctx.stroke(&path.kurbo_path, &stroke_color, *thickness); - } - } - } - - pub fn get_path_mut(&mut self) -> Option<&mut Path> { - match self { - CanvasElement::Freehand{ path, .. } => Some(path), - } - } - } -} - -struct CanvasWidget; - use stiletto::CanvasElement; #[derive(Clone, Data)] @@ -77,6 +33,8 @@ impl CanvasData { } } +struct CanvasWidget; + impl Widget for CanvasWidget { fn event(&mut self, _ctx: &mut EventCtx, event: &Event, data: &mut CanvasData, _env: &Env) { match event { @@ -177,8 +135,25 @@ impl Widget for CanvasWidget { } } +fn build_ui() -> impl Widget { + use druid::widget::{Align, Button, Flex, CrossAxisAlignment, SizedBox}; + let toolbar = Flex::row() + .cross_axis_alignment(CrossAxisAlignment::Center) + .with_spacer(30.0) + .with_child( + Button::new("Undo")) + .with_child( + Button::new("Redo")); + + Flex::column() + .cross_axis_alignment(CrossAxisAlignment::Center) + .must_fill_main_axis(true) + .with_child(SizedBox::new(Align::left(toolbar)).height(50.0)) + .with_flex_child(CanvasWidget {}, 1.0) +} + pub fn main() { - let window = WindowDesc::new(|| CanvasWidget {}) + let window = WindowDesc::new(build_ui) .window_size((1024.0, 1400.0)) .title( LocalizedString::new("custom-widget-demo-window-title").with_placeholder("Stiletto"),