feat: in-game overlay connect and reconnect, smaller ui pieces

Author: jacobtread

src/overlay/mod.rs

@@ -6,6 +6,7 @@ use pocket_relay_client_shared::{
     api::{lookup_server, LookupData},
     ctx::ClientContext,
     reqwest::Client,
+    servers::{has_server_tasks, stop_server_tasks},
 };
 use tokio::{runtime::Runtime, task::AbortHandle};
 
@@ -19,6 +20,8 @@ pub struct OverlayRenderLoop {
 
     initial_startup_screen: InitialStartupScreen,
 
+    connection_state: Arc<Mutex<ConnectionState>>,
+
     /// Http client for sending requests
     http_client: Client,
 
@@ -33,8 +36,8 @@ impl OverlayRenderLoop {
                 remember_url: config.is_some(),
                 target_url: config.map(|value| value.connection_url).unwrap_or_default(),
                 connect_task: None,
-                connection_state: Default::default(),
             },
+            connection_state: Default::default(),
             http_client,
             runtime,
         }
@@ -45,15 +48,30 @@ impl ImguiRenderLoop for OverlayRenderLoop {
     fn render(&mut self, ui: &mut imgui::Ui) {
         match self.screen {
             OverlayScreen::InitialStartup => render_startup_screen(self, ui),
-            OverlayScreen::Game => {}
+            OverlayScreen::Game => {
+                let io = ui.io();
+
+                if io.key_ctrl && io.key_shift && io.keys_down[imgui::Key::P as usize] {
+                    self.screen = OverlayScreen::GameOverlay;
+                }
+            }
+            OverlayScreen::GameOverlay => {
+                let io = ui.io();
+
+                if io.keys_down[imgui::Key::Escape as usize] {
+                    self.screen = OverlayScreen::Game;
+                }
+
+                render_game_overlay(self, ui)
+            }
         }
     }
 
     fn message_filter(&self, io: &imgui::Io) -> MessageFilter {
         let mut filter = MessageFilter::empty();
 
         match &self.screen {
-            OverlayScreen::InitialStartup => {
+            OverlayScreen::InitialStartup | OverlayScreen::GameOverlay => {
                 if io.want_capture_mouse {
                     filter |= MessageFilter::InputMouse;
                     filter |= MessageFilter::InputKeyboard;
@@ -77,6 +95,9 @@ pub enum OverlayScreen {
 
     /// User is playing the game, don't show anything
     Game,
+
+    /// User has opened the game overlay manually
+    GameOverlay,
 }
 
 pub struct InitialStartupScreen {
@@ -89,8 +110,6 @@ pub struct InitialStartupScreen {
 
     /// Background task for connecting
     connect_task: Option<AbortHandle>,
-
-    connection_state: Arc<Mutex<ConnectionState>>,
 }
 
 #[derive(Default)]
@@ -118,6 +137,38 @@ fn overlay_window(ui: &mut imgui::Ui, display_size: [f32; 2]) {
         .build(|| {});
 }
 
+pub fn render_game_overlay(parent: &mut OverlayRenderLoop, ui: &mut imgui::Ui) {
+    let display_size = ui.io().display_size;
+    overlay_window(ui, display_size);
+
+    ui.window("Pocket Relay")
+        .resizable(false)
+        .size([450.0, 350.0], imgui::Condition::Always)
+        .build(|| {
+            let is_connected;
+            let allowed_connect;
+
+            {
+                let state = &*parent.connection_state.lock();
+                allowed_connect = !matches!(state, ConnectionState::Connecting);
+                is_connected = matches!(state, ConnectionState::Connected(_));
+                status_text(ui, state);
+            }
+
+            if is_connected {
+                let disconnect_pressed = ui.button("Disconnect");
+                if disconnect_pressed {
+                    on_click_disconnect(parent);
+                }
+            } else {
+                let connect_pressed = connect_button(ui, allowed_connect);
+                if connect_pressed {
+                    on_click_connect(parent);
+                }
+            }
+        });
+}
+
 pub fn render_startup_screen(parent: &mut OverlayRenderLoop, ui: &mut imgui::Ui) {
     let display_size = ui.io().display_size;
 
@@ -130,7 +181,7 @@ pub fn render_startup_screen(parent: &mut OverlayRenderLoop, ui: &mut imgui::Ui)
     ];
 
     let window = ui
-        .window("Pocket Relay")
+        .window("Pocket Relay Introduction")
         .no_decoration()
         .title_bar(false)
         .movable(false)
@@ -154,53 +205,15 @@ pub fn render_startup_screen(parent: &mut OverlayRenderLoop, ui: &mut imgui::Ui)
 
         ui.text_wrapped("If you don't want to connect to a Pocket Relay server press 'Cancel'");
 
-        let mut allowed_connect = true;
+        let allowed_connect;
 
         {
-            let state = &*parent.initial_startup_screen.connection_state.lock();
-            match state {
-                ConnectionState::Initial => {}
-                ConnectionState::Connecting => {
-                    allowed_connect = false;
-                    ui.text("Connecting...")
-                }
-                ConnectionState::Connected(data) => {
-                    ui.text("Connected:");
-                    ui.same_line();
-                    ui.text_wrapped(data.url.as_str());
-                    ui.same_line();
-                    ui.text_wrapped(" version ");
-                    ui.same_line();
-                    ui.text_wrapped(data.version.to_string());
-                }
-                ConnectionState::Error(error) => {
-                    ui.text_wrapped("Failed to connect");
-                    ui.same_line();
-                    ui.text_wrapped(error);
-                }
-            }
+            let state = &*parent.connection_state.lock();
+            allowed_connect = !matches!(state, ConnectionState::Connecting);
+            status_text(ui, state);
         };
 
-        let connect_pressed = {
-            let (button_color, button_hovered_color, button_active_color) = if allowed_connect {
-                (
-                    [0.2, 0.5, 1.0, 1.0],
-                    [0.3, 0.6, 1.0, 1.0],
-                    [0.1, 0.4, 0.9, 1.0],
-                )
-            } else {
-                (
-                    [0.3, 0.3, 0.3, 1.0],
-                    [0.3, 0.3, 0.3, 1.0],
-                    [0.3, 0.3, 0.3, 1.0],
-                )
-            };
-
-            let _bc = ui.push_style_color(StyleColor::Button, button_color);
-            let _bhc = ui.push_style_color(StyleColor::ButtonHovered, button_hovered_color);
-            let _bac = ui.push_style_color(StyleColor::ButtonActive, button_active_color);
-            ui.button("Connect")
-        };
+        let connect_pressed = connect_button(ui, allowed_connect);
 
         ui.same_line();
 
@@ -216,6 +229,50 @@ pub fn render_startup_screen(parent: &mut OverlayRenderLoop, ui: &mut imgui::Ui)
     }
 }
 
+const DISABLED_BUTTON_COLOR: [f32; 4] = [0.3, 0.3, 0.3, 1.0];
+
+fn status_text(ui: &imgui::Ui, state: &ConnectionState) {
+    match state {
+        ConnectionState::Initial => ui.text("Not connected."),
+        ConnectionState::Connecting => ui.text("Connecting..."),
+        ConnectionState::Connected(data) => {
+            ui.text("Connected:");
+            ui.same_line();
+            ui.text_wrapped(data.url.as_str());
+            ui.same_line();
+            ui.text_wrapped(" version ");
+            ui.same_line();
+            ui.text_wrapped(data.version.to_string());
+        }
+        ConnectionState::Error(error) => {
+            ui.text_wrapped("Failed to connect");
+            ui.same_line();
+            ui.text_wrapped(error);
+        }
+    }
+}
+
+fn connect_button(ui: &imgui::Ui, allowed_connect: bool) -> bool {
+    let (button_color, button_hovered_color, button_active_color) = if allowed_connect {
+        (
+            [0.2, 0.5, 1.0, 1.0],
+            [0.3, 0.6, 1.0, 1.0],
+            [0.1, 0.4, 0.9, 1.0],
+        )
+    } else {
+        (
+            DISABLED_BUTTON_COLOR,
+            DISABLED_BUTTON_COLOR,
+            DISABLED_BUTTON_COLOR,
+        )
+    };
+
+    let _bc = ui.push_style_color(StyleColor::Button, button_color);
+    let _bhc = ui.push_style_color(StyleColor::ButtonHovered, button_hovered_color);
+    let _bac = ui.push_style_color(StyleColor::ButtonActive, button_active_color);
+    ui.button("Connect")
+}
+
 fn on_click_cancel(parent: &mut OverlayRenderLoop) {
     parent.screen = OverlayScreen::Game;
 }
@@ -226,7 +283,7 @@ fn on_click_connect(parent: &mut OverlayRenderLoop) {
         abort_handle.abort();
     }
 
-    let state = parent.initial_startup_screen.connection_state.clone();
+    let state = parent.connection_state.clone();
     let url = parent.initial_startup_screen.target_url.clone();
     let http_client = parent.http_client.clone();
     let remember = parent.initial_startup_screen.remember_url;
@@ -274,4 +331,18 @@ fn on_click_connect(parent: &mut OverlayRenderLoop) {
     parent.initial_startup_screen.connect_task = Some(abort_handle);
 }
 
+fn on_click_disconnect(parent: &mut OverlayRenderLoop) {
+    // Abort existing task
+    if let Some(abort_handle) = parent.initial_startup_screen.connect_task.take() {
+        abort_handle.abort();
+    }
+
+    // Handle disconnecting
+    if has_server_tasks() {
+        stop_server_tasks();
+    }
+
+    *parent.connection_state.lock() = ConnectionState::Initial;
+}
+
 pub struct GameScreen;