Update upstream crankstart

src/system.rs

@@ -4,8 +4,10 @@ use {
 };
 
 use crankstart_sys::ctypes::c_int;
+use core::mem;
+
 pub use crankstart_sys::PDButtons;
-use crankstart_sys::{PDDateTime, PDLanguage, PDPeripherals};
+use crankstart_sys::{PDDateTime, PDLanguage, PDPeripherals, PDMenuItem};
 
 static mut SYSTEM: System = System(ptr::null_mut());
 
@@ -34,6 +36,70 @@ impl System {
         pd_func_caller!((*self.0).setUpdateCallback, f, ptr::null_mut())
     }
 
+    pub fn add_menu_item(&self, title: &str, f: crankstart_sys::PDMenuItemCallbackFunction) -> Result<MenuItem, Error> {
+        let c_title = CString::new(title).map_err(Error::msg)?;
+        let item = pd_func_caller!(
+            (*self.0).addMenuItem, 
+            c_title.as_ptr(), 
+            f, 
+            ptr::null_mut()
+        )?;
+        Ok(MenuItem(item))
+    }
+
+    pub fn add_checkmark_menu_item(&self, title: &str, initially_checked: bool, f: crankstart_sys::PDMenuItemCallbackFunction) -> Result<MenuItem, Error> {
+        let c_title = CString::new(title).map_err(Error::msg)?;
+        let item = pd_func_caller!(
+            (*self.0).addCheckmarkMenuItem, 
+            c_title.as_ptr(), 
+            if initially_checked { 1 } else { 0 },
+            f, 
+            ptr::null_mut()
+        )?;
+        Ok(MenuItem(item))
+    }
+
+    pub fn add_options_menu_item(&self, title: &str, options: Vec<&str>, f: crankstart_sys::PDMenuItemCallbackFunction) -> Result<MenuItem, Error> {
+        let c_title = CString::new(title).map_err(Error::msg)?;
+
+        let mut c_options = Vec::with_capacity(options.len());
+        for option in options {
+            let c_option = CString::new(option).map_err(Error::msg)?;
+            let c_option_ptr = c_option.as_ptr();
+            // Here, we need to forget our values or they won't live long enough
+            // for Playdate OS to use them
+            mem::forget(c_option);
+            c_options.push(
+                c_option_ptr
+            )
+        }
+
+        let opt_ptr = c_options.as_mut_ptr();
+        let opt_len = c_options.len();
+        let opt_len_i32: i32 = opt_len.try_into().map_err(Error::msg)?;
+
+        let item = pd_func_caller!(
+            (*self.0).addOptionsMenuItem, 
+            c_title.as_ptr(),
+            opt_ptr,
+            opt_len_i32,
+            f,
+            ptr::null_mut()
+        )?;
+
+        // After the call, we manually drop our forgotten values so as to not
+        // leak memory.
+        for c_option in c_options {
+            mem::drop(c_option);
+        }
+
+        Ok(MenuItem(item))
+    }
+
+    pub fn remove_all_menu_items (&self) -> Result<(), Error> {
+        pd_func_caller!((*self.0).removeAllMenuItems)
+    }
+
     pub fn get_button_state(&self) -> Result<(PDButtons, PDButtons, PDButtons), Error> {
         let mut current: PDButtons = PDButtons(0);
         let mut pushed: PDButtons = PDButtons(0);
@@ -180,3 +246,47 @@ impl System {
         pd_func_caller!((*self.0).getLanguage)
     }
 }
+
+#[derive(Clone, Debug)]
+pub struct MenuItem(*mut crankstart_sys::PDMenuItem);
+
+impl MenuItem {
+    pub fn remove (&self) -> Result<(), Error> {
+        let system = System::get();
+        pd_func_caller!((*system.0).removeMenuItem, self.0)
+    }
+
+    pub fn get_title (&self) -> Result<String, Error> {
+        let system = System::get();
+        let c_title = pd_func_caller!((*system.0).getMenuItemTitle, self.0)?;
+        let title = unsafe {
+            CStr::from_ptr(c_title).to_string_lossy().into_owned()
+        };
+        Ok(title)
+    }
+
+    pub fn set_title (&self, new_title: &str) -> Result<(), Error> {
+        let system = System::get();
+        let c_title = CString::new(new_title).map_err(Error::msg)?;
+        pd_func_caller!((*system.0).setMenuItemTitle, self.0, c_title.as_ptr())
+    }
+
+    pub fn get_value (&self) -> Result<i32, Error> {
+        let system = System::get();
+        pd_func_caller!((*system.0).getMenuItemValue, self.0)
+    }
+
+    pub fn set_value (&self, new_value: i32) -> Result<(), Error> {
+        let system = System::get();
+        pd_func_caller!((*system.0).setMenuItemValue, self.0, new_value)
+    }
+
+    // For checkmark menu items
+    pub fn get_checked (&self) -> Result<bool, Error> {
+        Ok(self.get_value()? == 1)
+    }
+
+    pub fn set_checked (&self, new_value: bool) -> Result<(), Error> {
+        self.set_value(if new_value { 1 } else { 0 })
+    }
+}