Change python checkbox API return type and fix Rust API binding

Author: spoonmilk

python/interaction.py

@@ -501,10 +501,10 @@ def _fill_core_struct(self, value):
 		value.prompt = self._prompt
 
 	def _fill_core_result(self, value):
-		value.intResult = self._result
+		value.intResult = self._result.int()
 
 	def _get_result(self, value):
-		self._result = value.intResult
+		self._result = value.intResult != 0
 
 	@property
 	def prompt(self):
@@ -1423,14 +1423,14 @@ def get_checkbox_input(prompt: str, title: str):
 	``get_checkbox_input`` prompts the user for a checkbox input
 	:param prompt: String to prompt with
 	:param title: Title of the window when executed in the UI
-	:rtype: int indicating the state of the checkbox
+	:rtype: bool indicating the state of the checkbox
 	"""
 	value = ctypes.c_bool()
 	if not core.BNGetCheckboxInput(value, prompt, title):
 		return None
 	result = value.value
 	assert result is not None
-	return result
+	return result != 0
 
 def get_form_input(fields, title):
 	"""

rust/src/interaction/form.rs

@@ -114,7 +114,6 @@ pub enum FormInputField {
     },
     Checkbox {
         prompt: String,
-        default: Option<bool>,
         value: bool,
     }
 }
@@ -193,7 +192,6 @@ impl FormInputField {
             },
             BNFormInputFieldType::CheckboxFormField => Self::Checkbox {
                 prompt,
-                default: value.hasDefault.then_some(value.intResult != 0),
                 value: value.intResult != 0,
             },
         }
@@ -337,7 +335,7 @@ impl FormInputField {
             FormInputField::OpenFileName { default, .. } => Some(default.is_some()),
             FormInputField::SaveFileName { default, .. } => Some(default.is_some()),
             FormInputField::DirectoryName { default, .. } => Some(default.is_some()),
-            FormInputField::Checkbox { default, .. } => Some(default.is_some()),
+            FormInputField::Checkbox { value, .. } => Some(*value),
         }
     }
 

rust/src/interaction/handler.rs

@@ -27,7 +27,7 @@ pub fn register_interaction_handler<R: InteractionHandler>(custom: R) {
         getOpenFileNameInput: Some(cb_get_open_file_name_input::<R>),
         getSaveFileNameInput: Some(cb_get_save_file_name_input::<R>),
         getDirectoryNameInput: Some(cb_get_directory_name_input::<R>),
-        getCheckboxInput: None,
+        getCheckboxInput: Some(cb_get_checkbox_input::<R>),
         getFormInput: Some(cb_get_form_input::<R>),
         showMessageBox: Some(cb_show_message_box::<R>),
         openUrl: Some(cb_open_url::<R>),
@@ -247,7 +247,7 @@ pub trait InteractionHandler: Sync + Send + 'static {
             .and_then(|f| f.try_value_string())
     }
 
-    fn get_choicebox_input(
+    fn get_checkbox_input(
         &mut self,
         prompt: &str,
         title: &str,
@@ -256,7 +256,6 @@ pub trait InteractionHandler: Sync + Send + 'static {
         form.add_field(FormInputField::Checkbox {
             prompt: prompt.to_string(),
             value: false,
-            default: None,
         });
         if !self.get_form_input(&mut form) {
             return None;
@@ -561,6 +560,25 @@ unsafe extern "C" fn cb_get_directory_name_input<R: InteractionHandler>(
     }
 }
 
+unsafe extern "C" fn cb_get_checkbox_input<R: InteractionHandler>(
+    ctxt: *mut c_void,
+    result_ffi: *mut i64,
+    prompt: *const c_char,
+    title: *const c_char,
+) -> bool {
+    let ctxt = ctxt as *mut R;
+    let prompt = raw_to_string(prompt).unwrap();
+    let title = raw_to_string(title).unwrap();
+    let result = (*ctxt).get_checkbox_input(&prompt, &title);
+    if let Some(result) = result {
+        unsafe { *result_ffi = result };
+        true
+    } else {
+        unsafe { *result_ffi = 0 };
+        false
+    }
+}
+
 unsafe extern "C" fn cb_get_form_input<R: InteractionHandler>(
     ctxt: *mut c_void,
     fields: *mut BNFormInputField,