wip

Cargo.toml

@@ -8,10 +8,7 @@ edition = "2018"
 crate_type = "bin"
 
 [dependencies]
-clipboard = "^0.5.0"
 dirs = "^3.0.1"
-glium = "^0.27.0"
-imgui = "^0.5.0"
-imgui-glium-renderer = "^0.5.0"
-imgui-winit-support = "^0.5.0"
+iced = "^0.1.1"
 rodio = "^0.11.0"
+env_logger = "^0.8.1"

src/main.rs

@@ -1,17 +1,80 @@
 #![windows_subsystem = "windows"]
 
+use iced::{Settings, Application, Element, executor, Length, Container, Column, Scrollable, Slider};
 use rodio::{Sink, Source};
 use std::env::args;
 use std::fs::File;
 use std::io::BufReader;
 use std::path::PathBuf;
 use std::process::Command;
-use imgui::*;
-
-mod support;
 
 const SPACING: i32 = 16;
-//
+
+struct Sound {
+    name: String,
+    path: String, // bytes instead?
+    sink: Sink,
+    volume: f32,
+}
+
+/// todo: maybe add a play/pause state or global volume? saved presets?
+struct State {
+    sounds: Vec<Sound>
+}
+
+enum Lull {
+    Loading,
+    Loaded(State),
+}
+
+impl Application for Lull {
+    type Executor = executor::Default;
+    type Message = Message;
+    type Flags = ();
+
+    fn new(_flags: Self::Flags) -> (Self, Command) {
+        (
+            Lull {sounds: Vec::new()},
+            Command::none(),
+        )
+    }
+
+    fn title(&self) -> String {
+        String::from("lull")
+    }
+
+    fn update(&mut self, message: Self::Message) -> Command {
+        match self {
+            self::Loading => {},
+            self::Loaded => {},
+        }
+
+        Command::none()
+    }
+
+    fn view(&mut self) -> Element<'_, Self::Message> {
+        unimplemented!()
+    }
+}
+
+fn get_data_dir() -> PathBuf {
+    let mut data_dir = dirs::data_dir().expect("Couldn't find user data directory");
+
+    data_dir.push("ruin/lull");
+
+    if !data_dir.exists() {
+        std::fs::create_dir_all(&data_dir).expect("Couldn't create lull data directory");
+    }
+
+    data_dir
+}
+
+pub fn main() -> iced::Result {
+    env_logger::init();
+
+    Lull::run(Settings::default())
+}
+
 // fn error_popup(message: &str) {
 //     let popup = gtk::Window::new(gtk::WindowType::Toplevel);
 //     popup.set_title("error");
@@ -35,18 +98,6 @@ const SPACING: i32 = 16;
 //     });
 // }
 
-fn get_data_dir() -> PathBuf {
-    let mut data_dir = dirs::data_dir().expect("Couldn't find user data directory");
-
-    data_dir.push("ruin/lull");
-
-    if !data_dir.exists() {
-        std::fs::create_dir_all(&data_dir).expect("Couldn't create lull data directory");
-    }
-
-    data_dir
-}
-//
 // fn build_ui(application: &gtk::Application) {
 //     let window = gtk::ApplicationWindow::new(application);
 //
@@ -145,23 +196,3 @@ fn get_data_dir() -> PathBuf {
 //
 //     window.show_all();
 // }
-
-fn main() {
-    let system = support::init(file!());
-
-    system.main_loop(move |_, ui| {
-        Window::new(im_str!("Hello world"))
-            .size([300.0, 100.0], Condition::FirstUseEver)
-            .build(&ui, || {
-                ui.text(im_str!("Hello world!"));
-                ui.text(im_str!("こんにちは世界！"));
-                ui.text(im_str!("This...is...imgui-rs!"));
-                ui.separator();
-                let mouse_pos = ui.io().mouse_pos;
-                ui.text(format!(
-                    "Mouse Position: ({:.1},{:.1})",
-                    mouse_pos[0], mouse_pos[1]
-                ));
-            });
-    });
-}

src/support/clipboard.rs

@@ -1,19 +0,0 @@
-use clipboard::{ClipboardContext, ClipboardProvider};
-use imgui::{ClipboardBackend, ImStr, ImString};
-
-pub struct ClipboardSupport(ClipboardContext);
-
-pub fn init() -> Option<ClipboardSupport> {
-    ClipboardContext::new()
-        .ok()
-        .map(|ctx| ClipboardSupport(ctx))
-}
-
-impl ClipboardBackend for ClipboardSupport {
-    fn get(&mut self) -> Option<ImString> {
-        self.0.get_contents().ok().map(|text| text.into())
-    }
-    fn set(&mut self, text: &ImStr) {
-        let _ = self.0.set_contents(text.to_str().to_owned());
-    }
-}

src/support/mod.rs

@@ -1,140 +0,0 @@
-use glium::glutin;
-use glium::glutin::event::{Event, WindowEvent};
-use glium::glutin::event_loop::{ControlFlow, EventLoop};
-use glium::glutin::window::WindowBuilder;
-use glium::{Display, Surface};
-use imgui::{Context, FontConfig, FontGlyphRanges, FontSource, Ui};
-use imgui_glium_renderer::Renderer;
-use imgui_winit_support::{HiDpiMode, WinitPlatform};
-use std::time::Instant;
-
-mod clipboard;
-
-pub struct System {
-    pub event_loop: EventLoop<()>,
-    pub display: glium::Display,
-    pub imgui: Context,
-    pub platform: WinitPlatform,
-    pub renderer: Renderer,
-    pub font_size: f32,
-}
-
-pub fn init(title: &str) -> System {
-    let title = match title.rfind('/') {
-        Some(idx) => title.split_at(idx + 1).1,
-        None => title,
-    };
-    let event_loop = EventLoop::new();
-    let context = glutin::ContextBuilder::new().with_vsync(true);
-    let builder = WindowBuilder::new()
-        .with_title(title.to_owned())
-        .with_inner_size(glutin::dpi::LogicalSize::new(1024f64, 768f64));
-    let display =
-        Display::new(builder, context, &event_loop).expect("Failed to initialize display");
-
-    let mut imgui = Context::create();
-    imgui.set_ini_filename(None);
-
-    if let Some(backend) = clipboard::init() {
-        imgui.set_clipboard_backend(Box::new(backend));
-    } else {
-        eprintln!("Failed to initialize clipboard");
-    }
-
-    let mut platform = WinitPlatform::init(&mut imgui);
-    {
-        let gl_window = display.gl_window();
-        let window = gl_window.window();
-        platform.attach_window(imgui.io_mut(), &window, HiDpiMode::Rounded);
-    }
-
-    let hidpi_factor = platform.hidpi_factor();
-    let font_size = (13.0 * hidpi_factor) as f32;
-    imgui.fonts().add_font(&[
-        FontSource::DefaultFontData {
-            config: Some(FontConfig {
-                size_pixels: font_size,
-                ..FontConfig::default()
-            }),
-        },
-        FontSource::TtfData {
-            data: include_bytes!("helsinki.ttf"),
-            size_pixels: font_size,
-            config: Some(FontConfig {
-                rasterizer_multiply: 1.75,
-                glyph_ranges: FontGlyphRanges::japanese(),
-                ..FontConfig::default()
-            }),
-        },
-    ]);
-
-    imgui.io_mut().font_global_scale = (1.0 / hidpi_factor) as f32;
-
-    let renderer = Renderer::init(&mut imgui, &display)
-        .expect("Failed to initialize renderer");
-
-    System {
-        event_loop,
-        display,
-        imgui,
-        platform,
-        renderer,
-        font_size,
-    }
-}
-
-impl System {
-    pub fn main_loop<F: FnMut(&mut bool, &mut Ui) + 'static>(self, mut run_ui: F) {
-        let System {
-            event_loop,
-            display,
-            mut imgui,
-            mut platform,
-            mut renderer,
-            ..
-        } = self;
-        let mut last_frame = Instant::now();
-
-        event_loop.run(move |event, _, control_flow| match event {
-            Event::NewEvents(_) => {
-                let now = Instant::now();
-                imgui.io_mut().update_delta_time(now - last_frame);
-                last_frame = now;
-            }
-            Event::MainEventsCleared => {
-                let gl_window = display.gl_window();
-                platform
-                    .prepare_frame(imgui.io_mut(), &gl_window.window())
-                    .expect("Failed to prepare frame");
-                gl_window.window().request_redraw();
-            }
-            Event::RedrawRequested(_) => {
-                let mut ui = imgui.frame();
-
-                let mut run = true;
-                run_ui(&mut run, &mut ui);
-                if !run {
-                    *control_flow = ControlFlow::Exit;
-                }
-
-                let gl_window = display.gl_window();
-                let mut target = display.draw();
-                target.clear_color_srgb(1.0, 1.0, 1.0, 1.0);
-                platform.prepare_render(&ui, gl_window.window());
-                let draw_data = ui.render();
-                renderer
-                    .render(&mut target, draw_data)
-                    .expect("Rendering failed");
-                target.finish().expect("Failed to swap buffers");
-            }
-            Event::WindowEvent {
-                event: WindowEvent::CloseRequested,
-                ..
-            } => *control_flow = ControlFlow::Exit,
-            event => {
-                let gl_window = display.gl_window();
-                platform.handle_event(imgui.io_mut(), gl_window.window(), &event);
-            }
-        })
-    }
-}