Magpie #12
|
@ -7,6 +7,5 @@ edition = "2021"
|
||||||
canary = { path = "../.." }
|
canary = { path = "../.." }
|
||||||
glium = "0.32"
|
glium = "0.32"
|
||||||
mio = { version = "0.8", features = ["net", "os-poll"] }
|
mio = { version = "0.8", features = ["net", "os-poll"] }
|
||||||
mio-extras = "2.0"
|
|
||||||
mio-signals = "0.2"
|
mio-signals = "0.2"
|
||||||
slab = "0.4"
|
slab = "0.4"
|
||||||
|
|
|
@ -1,20 +1,24 @@
|
||||||
use super::*;
|
|
||||||
|
|
||||||
use mio::net::UnixListener;
|
|
||||||
use mio::{Events, Interest, Poll, Token};
|
|
||||||
use mio_signals::{Signal, Signals};
|
|
||||||
use slab::Slab;
|
|
||||||
use std::ops::{Deref, DerefMut};
|
use std::ops::{Deref, DerefMut};
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
use std::sync::mpsc::Sender;
|
use std::sync::mpsc::{channel, Receiver, Sender};
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use mio::net::UnixListener;
|
||||||
|
use mio::{Events, Interest, Poll, Token, Waker};
|
||||||
|
use mio_signals::{Signal, Signals};
|
||||||
|
use slab::Slab;
|
||||||
|
|
||||||
use crate::window::{WindowMessage, WindowMessageSender};
|
use crate::window::{WindowMessage, WindowMessageSender};
|
||||||
|
|
||||||
const SOCK_NAME: &str = "magpie.sock";
|
const SOCK_NAME: &str = "magpie.sock";
|
||||||
|
|
||||||
pub enum IpcMessage {}
|
pub enum IpcMessage {}
|
||||||
|
|
||||||
|
pub struct IpcMessageSender {
|
||||||
|
waker: Waker,
|
||||||
|
sender: Sender<IpcMessage>,
|
||||||
|
}
|
||||||
|
|
||||||
/// Wraps [mio::net::UnixListener] with automatic file deletion on drop.
|
/// Wraps [mio::net::UnixListener] with automatic file deletion on drop.
|
||||||
pub struct Listener {
|
pub struct Listener {
|
||||||
pub uds: UnixListener,
|
pub uds: UnixListener,
|
||||||
|
@ -47,7 +51,7 @@ impl DerefMut for Listener {
|
||||||
pub struct Client {}
|
pub struct Client {}
|
||||||
|
|
||||||
pub struct Ipc {
|
pub struct Ipc {
|
||||||
pub message_recv: MioReceiver<IpcMessage>,
|
pub message_recv: Receiver<IpcMessage>,
|
||||||
pub window_sender: WindowMessageSender,
|
pub window_sender: WindowMessageSender,
|
||||||
pub poll: Poll,
|
pub poll: Poll,
|
||||||
pub events: Events,
|
pub events: Events,
|
||||||
|
@ -61,10 +65,7 @@ pub struct Ipc {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Ipc {
|
impl Ipc {
|
||||||
pub fn new(
|
pub fn new(window_sender: WindowMessageSender) -> std::io::Result<(Self, IpcMessageSender)> {
|
||||||
message_recv: MioReceiver<IpcMessage>,
|
|
||||||
window_sender: WindowMessageSender,
|
|
||||||
) -> std::io::Result<Self> {
|
|
||||||
let sock_dir = std::env::var("XDG_RUNTIME_DIR").expect("XDG_RUNTIME_DIR not set");
|
let sock_dir = std::env::var("XDG_RUNTIME_DIR").expect("XDG_RUNTIME_DIR not set");
|
||||||
let sock_dir = Path::new(&sock_dir);
|
let sock_dir = Path::new(&sock_dir);
|
||||||
let sock_path = sock_dir.join(SOCK_NAME);
|
let sock_path = sock_dir.join(SOCK_NAME);
|
||||||
|
@ -88,7 +89,14 @@ impl Ipc {
|
||||||
registry.register(&mut listener.uds, listener_token, interest)?;
|
registry.register(&mut listener.uds, listener_token, interest)?;
|
||||||
registry.register(&mut signals, signals_token, interest)?;
|
registry.register(&mut signals, signals_token, interest)?;
|
||||||
|
|
||||||
Ok(Self {
|
let (sender, message_recv) = channel();
|
||||||
|
|
||||||
|
let sender = IpcMessageSender {
|
||||||
|
waker: Waker::new(registry, message_recv_token)?,
|
||||||
|
sender,
|
||||||
|
};
|
||||||
|
|
||||||
|
let ipc = Self {
|
||||||
message_recv,
|
message_recv,
|
||||||
window_sender,
|
window_sender,
|
||||||
poll,
|
poll,
|
||||||
|
@ -100,7 +108,9 @@ impl Ipc {
|
||||||
signals_token,
|
signals_token,
|
||||||
message_recv_token,
|
message_recv_token,
|
||||||
clients: Default::default(),
|
clients: Default::default(),
|
||||||
})
|
};
|
||||||
|
|
||||||
|
Ok((ipc, sender))
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn poll(&mut self, timeout: Option<Duration>) -> std::io::Result<()> {
|
pub fn poll(&mut self, timeout: Option<Duration>) -> std::io::Result<()> {
|
||||||
|
@ -123,6 +133,7 @@ impl Ipc {
|
||||||
let _ = self.window_sender.send_event(WindowMessage::Quit);
|
let _ = self.window_sender.send_event(WindowMessage::Quit);
|
||||||
self.quit = true;
|
self.quit = true;
|
||||||
}
|
}
|
||||||
|
} else if let Some(client) = self.clients.get_mut(event.token().0) {
|
||||||
} else {
|
} else {
|
||||||
panic!("Unrecognized event token: {:?}", event);
|
panic!("Unrecognized event token: {:?}", event);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,15 +1,13 @@
|
||||||
use glium::glutin::event_loop::EventLoopBuilder;
|
use glium::glutin::event_loop::EventLoopBuilder;
|
||||||
use mio_extras::channel::{channel as mio_channel, Receiver as MioReceiver, Sender as MioSender};
|
|
||||||
|
|
||||||
pub mod gl;
|
pub mod gl;
|
||||||
pub mod ipc;
|
pub mod ipc;
|
||||||
pub mod window;
|
pub mod window;
|
||||||
|
|
||||||
fn main() -> std::io::Result<()> {
|
fn main() -> std::io::Result<()> {
|
||||||
let (ipc_sender, ipc_recv) = mio_channel();
|
|
||||||
let event_loop = EventLoopBuilder::<window::WindowMessage>::with_user_event().build();
|
let event_loop = EventLoopBuilder::<window::WindowMessage>::with_user_event().build();
|
||||||
let window_sender = event_loop.create_proxy();
|
let window_sender = event_loop.create_proxy();
|
||||||
let ipc = ipc::Ipc::new(ipc_recv, window_sender)?;
|
let (ipc, ipc_sender) = ipc::Ipc::new(window_sender)?;
|
||||||
let _ipc_thread = std::thread::spawn(|| ipc.run());
|
let _ipc_thread = std::thread::spawn(|| ipc.run());
|
||||||
let window_store = window::WindowStore::new(ipc_sender);
|
let window_store = window::WindowStore::new(ipc_sender);
|
||||||
window_store.run(event_loop);
|
window_store.run(event_loop);
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
use super::*;
|
|
||||||
|
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use glium::backend::glutin::DisplayCreationError;
|
use glium::backend::glutin::DisplayCreationError;
|
||||||
|
@ -9,7 +7,7 @@ use glutin::event_loop::{ControlFlow, EventLoop, EventLoopProxy};
|
||||||
use glutin::window::WindowId;
|
use glutin::window::WindowId;
|
||||||
|
|
||||||
use crate::gl::Graphics;
|
use crate::gl::Graphics;
|
||||||
use crate::ipc::IpcMessage;
|
use crate::ipc::{IpcMessage, IpcMessageSender};
|
||||||
|
|
||||||
pub enum WindowMessage {
|
pub enum WindowMessage {
|
||||||
Quit,
|
Quit,
|
||||||
|
@ -34,12 +32,12 @@ impl Window {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct WindowStore {
|
pub struct WindowStore {
|
||||||
pub ipc_sender: MioSender<IpcMessage>,
|
pub ipc_sender: IpcMessageSender,
|
||||||
pub windows: HashMap<WindowId, Window>,
|
pub windows: HashMap<WindowId, Window>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl WindowStore {
|
impl WindowStore {
|
||||||
pub fn new(ipc_sender: MioSender<IpcMessage>) -> Self {
|
pub fn new(ipc_sender: IpcMessageSender) -> Self {
|
||||||
Self {
|
Self {
|
||||||
ipc_sender,
|
ipc_sender,
|
||||||
windows: Default::default(),
|
windows: Default::default(),
|
||||||
|
@ -56,7 +54,7 @@ impl WindowStore {
|
||||||
Event::MainEventsCleared => {}
|
Event::MainEventsCleared => {}
|
||||||
Event::UserEvent(event) => match event {
|
Event::UserEvent(event) => match event {
|
||||||
WindowMessage::Quit => *control_flow = ControlFlow::Exit,
|
WindowMessage::Quit => *control_flow = ControlFlow::Exit,
|
||||||
}
|
},
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue