chlorospingus/chloroway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exit on esc up

Browse Source
This commit is contained in:
Chlorospingus
2025-05-13 13:53:02 -07:00
parent 1efb3f661b
commit a1aa3bc2eb
4 changed files with 76 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/wayland/seat.rs
View File

@@ -75,6 +75,9 @@ impl WlClient {
if let Some(keymap) = &*self.keymap.lock().unwrap() {
if let Some(keysym) = keymap.get(&(key + 8)) {
if keysym == "ESC" && state == 0 {
self.exit();
}
println!("Received key:\n\t{} {}", keysym, if state == 0 {'↑'} else {'↓'});
} else {
eprintln!("Unrecognized key!");

2
src/wayland/shm.rs
View File

@@ -9,7 +9,7 @@ pub struct ShmPool {
}
impl ShmPool {
pub fn new(width: usize, height: usize, id: u32) -> std::io::Result<ShmPool> {
pub fn new(width: usize, height: usize) -> std::io::Result<ShmPool> {
let size = width * height * 4;
let shm_path: *const i8 = b"/chlorostart\0".as_ptr() as *const i8;

81
src/wayland/wl_client.rs
View File

@@ -1,6 +1,12 @@
use std::{collections::HashMap, env::var, error::Error, fmt::Debug, io::IoSliceMut, os::unix::net::{AncillaryData, SocketAncillary, UnixStream}, sync::{atomic::{AtomicU32, Ordering}, Arc, Mutex}, thread::{self}, u32};
use std::{collections::HashMap, env::var, error::Error, fmt::Debug, io::{IoSliceMut, Write}, os::unix::net::{AncillaryData, SocketAncillary, UnixStream}, sync::{atomic::{AtomicU32, Ordering}, mpsc, Arc, Mutex}, thread::{self}, time::Duration, u32};
use crate::wayland::shm;
use crate::wayland::{shm, vec_utils::WlMessage};
#[derive(PartialEq)]
pub enum ThreadMessage {
Exit,
}
use ThreadMessage::*;
struct WlHeader {
object: u32,
@@ -10,11 +16,12 @@ struct WlHeader {
pub struct WlClient {
pub socket: Mutex<UnixStream>,
pub sender: mpsc::Sender<ThreadMessage>,
pub current_id: AtomicU32,
pub registry_id: AtomicU32,
pub shm_id: AtomicU32,
pub shmpool_id: AtomicU32,
pub shm_pool: Mutex<Option<shm::ShmPool>>,
pub shm_pool: Mutex<shm::ShmPool>,
pub buffer_id: AtomicU32,
pub compositor_id: AtomicU32,
pub surface_id: AtomicU32,
@@ -34,14 +41,18 @@ impl WlClient {
var("XDG_RUNTIME_DIR")?,
var("WAYLAND_DISPLAY")?
))?;
sock.set_nonblocking(true)?;
let mut wl_client = Arc::new(WlClient {
let (sender, receiver) = mpsc::channel::<ThreadMessage>();
let mut arc_wl_client = Arc::new(WlClient {
socket: Mutex::new(sock),
sender,
current_id: AtomicU32::from(1),
registry_id: AtomicU32::from(0),
shm_id: AtomicU32::from(0),
shmpool_id: AtomicU32::from(0),
shm_pool: Mutex::new(None),
shm_pool: Mutex::new(shm::ShmPool::new(800, 800)?),
buffer_id: AtomicU32::from(0),
compositor_id: AtomicU32::from(0),
surface_id: AtomicU32::from(0),
@@ -52,23 +63,34 @@ impl WlClient {
keyboard_id: AtomicU32::from(0),
keymap: Mutex::new(None),
keymap_fd: Mutex::new(None),
});
});
arc_wl_client.wl_display_get_registry();
let mut wl_client2 = wl_client.clone();
wl_client.wl_display_get_registry();
let wl_client = arc_wl_client.clone();
let readloop = thread::spawn(move || {
loop {
wl_client2.read_event();
wl_client.read_event();
}
});
readloop.join();
let wl_client = arc_wl_client.clone();
let recvloop = thread::spawn(move || {
'recv: loop {
match receiver.recv().unwrap() {
Exit => {
thread::sleep(Duration::from_secs(1));
break 'recv;
}
}
}
});
recvloop.join();
Ok(())
}
pub fn read_event(&self) -> Result<(), Box<dyn Error>> {
pub fn read_event(self: &Arc<Self>) -> Result<(), Box<dyn Error>> {
// TODO: Don't realloc header and event
// FIXME: Using fd like this is unreliable because fd could be before or after
@@ -76,7 +98,7 @@ impl WlClient {
let mut fd = 0;
let mut header = vec![0u8; 8];
let mut socket = self.socket.lock().unwrap();
let socket = self.socket.lock().unwrap();
let mut ancillary_buf = [0; 128];
let mut ancillary = SocketAncillary::new(&mut ancillary_buf);
@@ -116,7 +138,7 @@ impl WlClient {
if header.object == self.registry_id.load(Ordering::Relaxed) && header.opcode == 0 { // wl_registry::global
self.wl_registry_global(&event)?;
}
else if header.object == self.registry_id.load(Ordering::Relaxed) && header.opcode == 0 { // wl_display::error
else if header.object == 1 && header.opcode == 0 { // wl_display::error
WlClient::wl_display_error(&event);
}
else if header.object == self.shm_id.load(Ordering::Relaxed) && header.opcode == 0 { // wl_shm::format
@@ -144,7 +166,10 @@ impl WlClient {
self.wl_keyboard_keymap(&event, fd);
}
else if header.object == self.keyboard_id.load(Ordering::Relaxed) && header.opcode == 3 { // wl_keyboard::key
self.wl_keyboard_key(&event);
let wl_client = self.clone();
thread::spawn(move || {
wl_client.wl_keyboard_key(&event);
});
}
else {
println!(
@@ -157,6 +182,32 @@ impl WlClient {
Ok(())
}
pub fn destroy_object(&self, id: &AtomicU32, opcode: u16) {
let object = id.load(Ordering::Relaxed);
if object == 0 {
return;
}
const REQ_SIZE: u16 = 8;
let mut request = vec![0; REQ_SIZE as usize];
let mut offset = 0;
request.write_u32(&object, &mut offset);
request.write_u16(&opcode, &mut offset);
request.write_u16(&REQ_SIZE, &mut offset);
self.socket.lock().unwrap().write(&request);
self.shmpool_id.store(0, Ordering::Relaxed);
}
pub fn exit(&self) {
println!("Exiting!");
self.destroy_object(&self.buffer_id, 0);
self.destroy_object(&self.surface_id, 0);
self.destroy_object(&self.layer_surface_id, 7);
self.sender.send(ThreadMessage::Exit);
}
}
impl Debug for WlClient {

13
src/wayland/wl_shm.rs
View File

@@ -12,13 +12,12 @@ impl WlClient {
pub fn wl_shm_create_pool(&self, width: usize, height: usize) -> Result<(), Box<dyn Error>> {
let mut shm_pool = self.shm_pool.lock().unwrap();
let current_id = self.current_id.fetch_add(1, Ordering::Relaxed) + 1;
*shm_pool = Some(shm::ShmPool::new(width, height, current_id)?);
self.shmpool_id.store(current_id, Ordering::Relaxed);
shm_pool.as_mut().unwrap().write(&vec![0xffff0000; width * height], 0);
shm_pool.as_mut().unwrap().rectangle(50, 50, 50, 50, 0xff00ff00);
shm_pool.as_mut().unwrap().circle(300, 300, 200, 0xff0000ff);
shm_pool.as_mut().unwrap().rounded_rectangle(450, 400, 60, 40, 16, 0xffffff00);
shm_pool.write(&vec![0xffff0000; width * height], 0);
shm_pool.rectangle(50, 50, 50, 50, 0xff00ff00);
shm_pool.circle(300, 300, 200, 0xff0000ff);
shm_pool.rounded_rectangle(450, 400, 60, 40, 16, 0xffffff00);
let object = self.shm_id.load(Ordering::Relaxed);
if object == 0 {
@@ -27,8 +26,8 @@ impl WlClient {
const OPCODE: u16 = 0;
const REQ_SIZE: u16 = 16;
let id = self.shmpool_id.load(Ordering::Relaxed);
let fds = [shm_pool.as_ref().unwrap().fd];
let shm_size = shm_pool.as_ref().unwrap().size;
let fds = [shm_pool.fd];
let shm_size = shm_pool.size;
let mut request = vec![0u8; REQ_SIZE as usize];
let mut offset: usize = 0;