Fix native UI input and remove deprecated fuel

Author: gajop

libs_sb/s11n

@@ -8,6 +8,7 @@ use super::ui::{ChonsoleController, UiKeyOutcome};
 use crate::sbc::command_system::model::{Model, ModelFactory};
 use crate::sbc::keys::KeyMods;
 use crate::sbc::port_flags::{self, PortImpl};
+use crate::sbc::states::trace::rml_y_from_callback;
 
 inventory::submit! { ModelFactory { make: |iface| Box::new(ChonsoleManager::new(iface)) } }
 
@@ -186,23 +187,23 @@ impl ChonsoleManager {
             return Ok(false);
         }
         let _ = (dx, dy, button);
-        let y = self.rml_y(y);
+        let y = rml_y_from_callback(&self.interface, y);
         self.ui.mouse_move(&self.interface, x, y)
     }
 
     pub fn mouse_press(&mut self, x: i32, y: i32, button: i32) -> Result<bool, Error> {
         if !self.enabled {
             return Ok(false);
         }
-        let y = self.rml_y(y);
+        let y = rml_y_from_callback(&self.interface, y);
         self.ui.mouse_press(&self.interface, x, y, button)
     }
 
     pub fn mouse_release(&mut self, x: i32, y: i32, button: i32) -> Result<(), Error> {
         if !self.enabled {
             return Ok(());
         }
-        let y = self.rml_y(y);
+        let y = rml_y_from_callback(&self.interface, y);
         self.ui.mouse_release(&self.interface, x, y, button)
     }
 
@@ -213,15 +214,6 @@ impl ChonsoleManager {
         self.ui.mouse_wheel(&self.interface, up, value)
     }
 
-    /// Mouse callbacks report the engine's bottom-origin y; the view hit tests
-    /// against RmlUi's top-origin layout.
-    fn rml_y(&self, y: i32) -> i32 {
-        match self.interface.display().get_view_geometry() {
-            Ok(geometry) => geometry.viewSizeY - 1 - y,
-            Err(_) => y,
-        }
-    }
-
     fn persist_history_change(&self, previous_history: &[String]) {
         let Some(store) = &self.history_store else {
             return;

native/src/sbc/chonsole/model.rs

@@ -49,6 +49,10 @@ impl ChonsoleView {
     }
 
     pub(super) fn update(&mut self, interface: &NativeInterfaceRef) -> Result<(), Error> {
+        // Re-enable text input if a reload reset SDL's global state.
+        if self.visible && self.rml.has_document() {
+            let _ = interface.unsynced_ctrl().sdlstart_text_input();
+        }
         self.rml.update(interface)?;
         if self.suggestion_events_dirty {
             self.rml.bind_suggestion_events(

native/src/sbc/chonsole/ui/view.rs

@@ -9,6 +9,7 @@ use spring_native::{
 };
 
 use crate::sbc::rml::{self, element_by_id};
+use crate::sbc::states::trace::rml_y_from_mouse;
 
 use crate::sbc::chonsole::framework::{ChonsoleLine, ChonsoleLineKind, TextInput};
 const UI_CONTEXT: &str = "sbc_native_chonsole";
@@ -190,13 +191,16 @@ impl ChonsoleRml {
         };
         let rml = interface.rml_ui();
         if visible {
+            // RmlUi text input requires SDL text input to be enabled.
+            let _ = interface.unsynced_ctrl().sdlstart_text_input();
             rml.document_show(document, spring_native::RmlDocumentShowOptions::default())?;
             if let Some(context) = self.context {
                 // Keep the engine/editor cursor stable over console controls.
                 let _ = rml.context_enable_mouse_cursor(context, false);
                 let _ = rml.context_pull_document_to_front(context, document);
             }
         } else {
+            let _ = interface.unsynced_ctrl().sdlstop_text_input();
             rml.document_hide(document)?;
             self.mouse_captured = false;
             if let Some(context) = self.context {
@@ -429,7 +433,7 @@ impl ChonsoleRml {
         // shared panel input layer does.
         let mouse = interface.input().get_mouse_state()?;
         let x = mouse.x as i32;
-        let y = mouse.y as i32;
+        let y = rml_y_from_mouse(interface, mouse.y) as i32;
         self.mouse_position = Some((x, y));
         let rml = interface.rml_ui();
         if !rml.element_is_point_within_element(suggestions, x as f32, y as f32)? {

native/src/sbc/chonsole/ui/view_rml.rs

@@ -3,10 +3,8 @@
 use serde::Deserialize;
 use serde_json::json;
 
-use spring_native::prelude::NativeInterfaceRef;
-
 use crate::sbc::sbc::SBC;
-use crate::sbc::states::trace::{flip_screen_y, trace_editor_ground, trace_ground};
+use crate::sbc::states::trace::{trace_editor_ground_from_control, trace_ground_from_control};
 
 use super::super::{ControlError, Handled, Reply};
 
@@ -189,8 +187,7 @@ pub(crate) fn zoom(sbc: &mut SBC, params: Zoom) -> Handled {
                 "camera.zoom screen coordinates must be finite",
             ));
         }
-        trace_ground(interface, screen[0], engine_screen_y(interface, screen[1]))
-            .map(|hit| [hit.x, hit.y, hit.z])
+        trace_ground_from_control(interface, screen[0], screen[1]).map(|hit| [hit.x, hit.y, hit.z])
     } else {
         None
     };
@@ -220,9 +217,8 @@ pub(crate) fn zoom(sbc: &mut SBC, params: Zoom) -> Handled {
         // point beneath the cursor. Re-trace after scaling and apply the
         // horizontal ground delta in the controller, where the engine owns the
         // camera projection and terrain height.
-        if let Some(current) =
-            trace_ground(interface, screen[0], engine_screen_y(interface, screen[1]))
-                .map(|hit| [hit.x, hit.y, hit.z])
+        if let Some(current) = trace_ground_from_control(interface, screen[0], screen[1])
+            .map(|hit| [hit.x, hit.y, hit.z])
         {
             let mut state = camera
                 .get_camera_state(false)
@@ -247,20 +243,11 @@ pub(crate) fn trace(sbc: &mut SBC, params: Trace) -> Handled {
         ));
     }
     let interface = sbc.interface();
-    let trace = trace_editor_ground(interface, x, engine_screen_y(interface, y))
+    let trace = trace_editor_ground_from_control(interface, x, y)
         .map_err(|err| ControlError::failed(format!("trace_screen_ray: {err:?}")))?;
     Ok(Reply::now(json!({
         "hit_type": trace.hit_type,
         "hit_id": trace.hit_id,
         "position": [trace.position.x, trace.position.y, trace.position.z],
     })))
 }
-
-/// Control clients address the window the way a screenshot does: top-origin.
-/// The engine's screen space is bottom-origin, so convert on the way in.
-fn engine_screen_y(interface: &NativeInterfaceRef, y: f32) -> f32 {
-    match interface.display().get_view_geometry() {
-        Ok(geometry) => flip_screen_y(geometry.viewSizeY as f32, y),
-        Err(_) => y,
-    }
-}

native/src/sbc/control/api/camera.rs

@@ -6,7 +6,7 @@ use spring_native::prelude::NativeInterfaceRef;
 
 use crate::sbc::devconsole::metrics::SystemMetrics;
 use crate::sbc::objects::SelectionManager;
-use crate::sbc::states::{cursor, trace_ground};
+use crate::sbc::states::trace::trace_ground_at_mouse;
 
 pub(super) struct StatusPresenter {
     last_metrics_refresh: Option<Instant>,
@@ -87,8 +87,7 @@ impl StatusPresenter {
 }
 
 fn status_position(interface: &NativeInterfaceRef, selection: &SelectionManager) -> String {
-    let ground = cursor(interface)
-        .and_then(|mouse| trace_ground(interface, mouse.x, mouse.y))
+    let ground = trace_ground_at_mouse(interface)
         .map(|hit| format!("X: {:.0}, Y: {:.0}, Z: {:.0}", hit.x, hit.y, hit.z))
         .unwrap_or_else(|| "Off-screen".to_string());
     match selection.count() {

native/src/sbc/devconsole/status.rs

@@ -7,7 +7,7 @@ use crate::sbc::objects::model::field_descriptor::{
     FieldRange, FieldValueType, ObjectFieldDescriptor,
 };
 use crate::sbc::objects::model::object_data::{
-    Armored, HarvestStorage, RuleValue, UnitCommand, UnitFuel, UnitResources, UnitStates,
+    Armored, HarvestStorage, RuleValue, UnitCommand, UnitResources, UnitStates,
 };
 
 use super::super::commands::{read_commands, write_commands};
@@ -199,28 +199,6 @@ impl TypedField<UnitModel> for Neutral {
 }
 inventory::submit! { FieldEntry::of::<Neutral>() }
 
-struct Fuel;
-impl TypedField<UnitModel> for Fuel {
-    type Value = UnitFuel;
-    const DESCRIPTOR: ObjectFieldDescriptor = ObjectFieldDescriptor {
-        name: "fuel",
-        value_type: FieldValueType::Object("UnitFuel"),
-        range: Some(FieldRange::at_least(0.0)),
-        description: "Current and maximum fuel.",
-    };
-    fn get(s: &UnitModel, id: i32) -> Option<UnitFuel> {
-        let fuel = s.interface.units_info().get_unit_fuel(id).ok()?;
-        Some(UnitFuel {
-            fuel: fuel.fuel,
-            max_fuel: fuel.maxFuel,
-        })
-    }
-    fn set(s: &mut UnitModel, _id: i32, _fuel: &UnitFuel) {
-        let _ = s.interface.synced_ctrl().unit().set_unit_fuel();
-    }
-}
-inventory::submit! { FieldEntry::of::<Fuel>() }
-
 struct MoveCtrl;
 impl TypedField<UnitModel> for MoveCtrl {
     type Value = bool;

native/src/sbc/objects/model/unit_s11n/fields/runtime.rs

@@ -11,7 +11,7 @@ use crate::sbc::objects::{AddObjectCommand, ObjectKind, ObjectManager, RemoveObj
 use crate::sbc::render::ModelShader;
 use crate::sbc::states::state::{EditorState, StateContext, Transition};
 use crate::sbc::states::trace::{
-    cursor, trace_ground_at_mouse, trace_ground_with_water, GroundHit,
+    cursor, trace_ground_at_mouse, trace_ground_with_water_from_callback, GroundHit,
 };
 
 mod brush;
@@ -299,7 +299,7 @@ impl EditorState for AddObjectState {
         if button != LEFT && !(button == RIGHT && self.config.brush) {
             return false;
         }
-        let Some(hit) = trace_ground_with_water(ctx.interface, x as f32, y as f32) else {
+        let Some(hit) = trace_ground_with_water_from_callback(ctx.interface, x, y) else {
             return true;
         };
         if button == RIGHT {

native/src/sbc/objects/states/add_object.rs

@@ -174,10 +174,10 @@ impl ColorPicker {
         };
 
         // Engine mouse coordinates are bottom-origin; RmlUi rects are not.
-        let Ok(geom) = interface.display().get_view_geometry() else {
-            return false;
-        };
-        let (mx, my) = (mouse.x, geom.viewSizeY as f32 - mouse.y);
+        let (mx, my) = (
+            mouse.x,
+            crate::sbc::states::trace::rml_y_from_mouse(interface, mouse.y),
+        );
 
         let id = match self.grab {
             Grab::Sv => "color-map",

native/src/sbc/panels/controls/color_picker.rs

@@ -11,7 +11,7 @@ use spring_native::{
     RmlDataTextRows, RmlDataVariable, RmlPixels, RmlTextRow,
 };
 
-use crate::sbc::states::trace::flip_screen_y;
+use crate::sbc::states::trace::rml_y_from_mouse;
 
 /// Pick radius in pixels around the cursor, as Lua uses.
 const PICK_RADIUS: f32 = 16.0;
@@ -48,9 +48,6 @@ impl CursorTip {
         let Ok(mouse) = interface.input().get_mouse_state() else {
             return Ok(());
         };
-        let Ok(geometry) = interface.display().get_view_geometry() else {
-            return Ok(());
-        };
         // Nothing while a button is down (a drag is in progress) or over the UI.
         let hit = if mouse.left || mouse.right || over_panel {
             None
@@ -82,7 +79,7 @@ impl CursorTip {
         }
         bindings.left.set(RmlPixels(mouse.x + OFFSET_X as f32))?;
         bindings.top.set(RmlPixels(
-            flip_screen_y(geometry.viewSizeY as f32, mouse.y) + OFFSET_Y as f32,
+            rml_y_from_mouse(interface, mouse.y) + OFFSET_Y as f32,
         ))?;
         bindings.hidden.set(false)?;
         Ok(())
@@ -219,7 +216,7 @@ fn describe_feature(interface: &NativeInterfaceRef, feature_id: i32) -> Option<H
 #[cfg(test)]
 mod tests {
     use super::pick_rectangle;
-    use crate::sbc::states::trace::flip_screen_y;
+    use crate::sbc::states::trace::top_to_engine_y;
 
     #[test]
     fn object_pick_keeps_the_mouse_bottom_origin_y() {
@@ -228,7 +225,7 @@ mod tests {
 
     #[test]
     fn only_rml_positioning_flips_bottom_origin_mouse_y() {
-        assert_eq!(flip_screen_y(1_000.0, 100.0), 899.0);
-        assert_eq!(flip_screen_y(1_000.0, 899.0), 100.0);
+        assert_eq!(top_to_engine_y(1_000.0, 100.0), 899.0);
+        assert_eq!(top_to_engine_y(1_000.0, 899.0), 100.0);
     }
 }