work

src/bin/client/main.rs

@@ -11,10 +11,7 @@ use openworm::{
     net::{ClientMsg, ServerMsg, install_crypto_provider},
     rsc::DataDir,
 };
-use winit::{
-    event::{ElementState, MouseButton, WindowEvent},
-    window::WindowAttributes,
-};
+use winit::event::{ElementState, MouseButton, WindowEvent};
 
 mod account;
 mod debug;
@@ -28,7 +25,9 @@ fn main() {
     DefaultApp::<Client>::run();
 }
 
+#[derive(DefaultUiState)]
 pub struct Client {
+    ui_state: DefaultUiState,
     dir: DataDir,
     data: ClientData,
     state: ClientState,
@@ -37,6 +36,8 @@ pub struct Client {
     proxy: Proxy<ClientEvent>,
 }
 
+pub type Rsc = DefaultRsc<Client>;
+
 pub enum ClientEvent {
     Connect { send: NetSender },
     ServerMsg(ServerMsg),
@@ -46,14 +47,14 @@ pub enum ClientEvent {
 impl DefaultAppState for Client {
     type Event = ClientEvent;
 
-    fn window_attrs() -> WindowAttributes {
-        WindowAttributes::default().with_title("OPENWORM")
-    }
-
-    fn new(ui: &mut Ui, _state: &UiState, proxy: Proxy<Self::Event>) -> Self {
+    fn new(
+        ui_state: DefaultUiState,
+        rsc: &mut DefaultRsc<Self>,
+        proxy: Proxy<Self::Event>,
+    ) -> Self {
         let dir = DataDir::default();
-        let notif = WidgetPtr::default().add(ui);
-        let main_ui = WidgetPtr::default().add(ui);
+        let notif = WidgetPtr::default().add(rsc);
+        let main_ui = WidgetPtr::default().add(rsc);
         let bg = (
             image(include_bytes!("./assets/fuit.jpg")),
             rect(Color::BLACK.alpha((0.8 * 255.0) as u8)),
@@ -62,25 +63,26 @@ impl DefaultAppState for Client {
 
         (
             bg,
-            main_ui.clone(),
-            notif.clone().pad(Padding::top(10)).align(Align::TOP_CENTER),
+            main_ui,
+            notif.pad(Padding::top(10)).align(Align::TOP_CENTER),
         )
             .stack()
-            .set_root(ui);
+            .set_root(rsc);
 
-        let mut s = Self {
+        main_view(rsc).set_ptr(main_ui, rsc);
+
+        Self {
+            ui_state,
             data: dir.load(CLIENT_DATA),
             state: Default::default(),
             dir,
-            main_ui: main_ui.clone(),
+            main_ui,
             notif,
             proxy,
-        };
-        start_ui(&mut s, ui).set_ptr(&s.main_ui, ui);
-        s
+        }
     }
 
-    fn event(&mut self, event: ClientEvent, ui: &mut Ui, _state: &UiState) {
+    fn event(&mut self, event: Self::Event, rsc: &mut DefaultRsc<Self>) {
         match event {
             ClientEvent::Connect { send } => {
                 let ClientState::Connect(connect) = self.state.take() else {
@@ -98,20 +100,20 @@ impl DefaultAppState for Client {
             ClientEvent::ServerMsg(msg) => match msg {
                 ServerMsg::SendMsg(msg) => {
                     if let ClientState::LoggedIn(state) = &mut self.state
-                        && let Some(msg_area) = &state.channel
+                        && let Some(msg_area) = state.channel
                     {
-                        let msg = msg_widget(&msg.user, &msg.content).add(ui);
-                        msg_area.get_mut().children.push(msg);
+                        let msg = msg_widget(&msg.user, &msg.content).add_strong(rsc);
+                        rsc.ui[msg_area].children.push(msg);
                     }
                 }
                 ServerMsg::LoadMsgs(msgs) => {
                     if let ClientState::LoggedIn(state) = &mut self.state
-                        && let Some(msg_area) = &state.channel
+                        && let Some(msg_area) = state.channel
                     {
                         for msg in msgs {
                             state.msgs.push(msg.clone());
-                            let msg = msg_widget(&msg.user, &msg.content).add(ui);
-                            msg_area.get_mut().children.push(msg);
+                            let msg = msg_widget(&msg.user, &msg.content).add_strong(rsc);
+                            rsc.ui[msg_area].children.push(msg);
                         }
                     }
                 }
@@ -126,32 +128,32 @@ impl DefaultAppState for Client {
                         msgs: Vec::new(),
                         username,
                     });
-                    main_view(self, ui).set_ptr(&self.main_ui, ui);
+                    main_view(rsc).set_ptr(self.main_ui, rsc);
                 }
                 ServerMsg::Error(error) => {
                     let msg = format!("{error:?}");
-                    self.notif.get_mut().inner = Some(werror(ui, &msg));
+                    rsc.ui[self.notif].inner = Some(werror(&msg, rsc));
                 }
             },
             ClientEvent::Err(msg) => {
-                self.notif.get_mut().inner = Some(werror(ui, &msg));
+                rsc.ui[self.notif].inner = Some(werror(&msg, rsc));
             }
         }
     }
 
-    fn exit(&mut self, _ui: &mut Ui, _state: &UiState) {
+    fn exit(&mut self, _: &mut DefaultRsc<Self>) {
         self.state.exit();
         self.dir.save(CLIENT_DATA, &self.data);
     }
 
-    fn window_event(&mut self, event: WindowEvent, ui: &mut Ui, state: &UiState) {
+    fn window_event(&mut self, event: WindowEvent, rsc: &mut DefaultRsc<Self>) {
         if let WindowEvent::MouseInput {
             state: ElementState::Pressed,
             button: MouseButton::Middle,
             ..
         } = event
         {
-            debug::debug(self, ui, state);
+            self.debug(rsc);
         }
     }
 }