rowan/wmenu-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: allow handler to be set after construction

Browse source
This commit is contained in:
Rowan 2025-01-27 03:20:13 -06:00
parent f5214e476c
commit 261959edae
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/lib.rs
View file

@ -1,14 +1,13 @@
use gag::BufferRedirect; use gag::BufferRedirect;
use std::{ use std::{
error::Error, error::Error,
ffi::{c_char, CString}, ffi::{c_char, CStr, CString},
io::Read, io::Read,
str::Utf8Error,
}; };
use wmenu_sys::bindings; use wmenu_sys::bindings;
type Callback = fn(menu: &mut Menu, text: &str) -> bool;
unsafe extern "C" fn print_item(menu: *mut bindings::menu, text: *mut i8, exit: bool) { unsafe extern "C" fn print_item(menu: *mut bindings::menu, text: *mut i8, exit: bool) {
wmenu_sys::bindings::puts(text); wmenu_sys::bindings::puts(text);
wmenu_sys::bindings::fflush(bindings::stdout); wmenu_sys::bindings::fflush(bindings::stdout);
@ -18,10 +17,16 @@ unsafe extern "C" fn print_item(menu: *mut bindings::menu, text: *mut i8, exit:
} }
} }
type ItemHandler = unsafe extern "C" fn(menu: *mut bindings::menu, text: *mut i8, exit: bool);
fn to_c_char(text: &str) -> *mut c_char { fn to_c_char(text: &str) -> *mut c_char {
return CString::new(text).unwrap().into_raw(); return CString::new(text).unwrap().into_raw();
} }
fn from_c_string(text: *mut c_char) -> Result<&'static str, Utf8Error> {
unsafe { CStr::from_ptr(text).to_str() }
}
enum Output { enum Output {
Stdout(String), Stdout(String),
Stderr(String), Stderr(String),
@ -72,19 +77,32 @@ impl std::fmt::Display for MenuError {
impl Error for MenuError {} impl Error for MenuError {}
trait Handle {
fn handle_item(&self, menu: Menu, text: &str) -> bool;
}
pub struct Menu { pub struct Menu {
ctx: *mut bindings::menu, menu: *mut bindings::menu,
} }
impl Menu { impl Menu {
pub fn new(callback: Callback) -> Menu { pub fn new() -> Menu {
Self { Self {
ctx: unsafe { bindings::menu_create(Some(callback)) }, menu: unsafe { bindings::menu_create(None) },
} }
} }
pub fn from_menu(menu: *mut bindings::menu) -> Self {
Self { menu }
}
fn into_inner(&mut self) -> &mut bindings::menu { fn into_inner(&mut self) -> &mut bindings::menu {
unsafe { &mut *self.ctx } unsafe { &mut *self.menu }
}
pub fn handler(&mut self, handler: ItemHandler) -> &mut Self {
self.into_inner().callback = Some(handler);
self
} }
pub fn bottom(&mut self, value: bool) -> &mut Self { pub fn bottom(&mut self, value: bool) -> &mut Self {
@ -169,7 +187,7 @@ impl Menu {
pub fn add_item(&mut self, item: &str) -> &mut Self { pub fn add_item(&mut self, item: &str) -> &mut Self {
unsafe { unsafe {
bindings::menu_add_item(self.ctx, to_c_char(item)); bindings::menu_add_item(self.menu, to_c_char(item));
} }
self self
@ -187,7 +205,7 @@ impl Menu {
let output = OutputCapture::capture().unwrap(); let output = OutputCapture::capture().unwrap();
unsafe { unsafe {
match (bindings::menu_run(self.ctx), output.get_output()) { match (bindings::menu_run(self.menu), output.get_output()) {
(0, Ok(Output::Stdout(value))) => Ok(value.trim_end().to_string()), (0, Ok(Output::Stdout(value))) => Ok(value.trim_end().to_string()),
(n, Ok(Output::Stdout(value) | Output::Stderr(value))) => { (n, Ok(Output::Stdout(value) | Output::Stderr(value))) => {
Err(MenuError::new(n, value)) Err(MenuError::new(n, value))
@ -201,7 +219,7 @@ impl Menu {
impl Drop for Menu { impl Drop for Menu {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
bindings::menu_destroy(self.ctx); bindings::menu_destroy(self.menu);
} }
} }
} }
@ -214,7 +232,7 @@ mod tests {
fn awawa() { fn awawa() {
let items = ["roewrn", "sybil", "vex"]; let items = ["roewrn", "sybil", "vex"];
let mut menu = Menu::new(); let mut menu = Menu::new(print_item);
let menu = menu let menu = menu
.font("monospace 12") .font("monospace 12")
.height(32) .height(32)