shadowcat/openworm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WORKING BASIC MSG SERVER

Browse Source
This commit is contained in:
Shadow Cat
2025-11-17 01:44:22 -05:00
parent 8a9e766633
commit 46a566ebd0
8 changed files with 265 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/app.rs
View File

@@ -62,7 +62,7 @@ impl ApplicationHandler<ClientEvent> for App {
impl AppHandle {
pub fn send(&self, event: ClientEvent) {
self.proxy.send_event(event).unwrap();
self.proxy.send_event(event).unwrap_or_else(|_| panic!());
self.window.request_redraw();
}
}

34
src/client/mod.rs
View File

@@ -6,8 +6,8 @@ use render::Renderer;
use winit::{event::WindowEvent, event_loop::ActiveEventLoop};
use crate::{
client::ui::{Submit, main_view},
net::client::NetSender,
client::ui::{Submit, main_view, msg_widget},
net::{ClientMsg, ServerMsg, client::NetSender},
};
mod app;
@@ -17,9 +17,9 @@ mod ui;
pub use app::AppHandle;
#[derive(Debug)]
pub enum ClientEvent {
Connect(NetSender),
Connect { send: NetSender, username: String },
ServerMsg(ServerMsg),
}
pub struct Client {
@@ -27,6 +27,8 @@ pub struct Client {
input: Input,
ui: Ui,
focus: Option<WidgetId<TextEdit>>,
channel: Option<WidgetId<Span>>,
username: String,
clipboard: Clipboard,
}
@@ -40,16 +42,36 @@ impl Client {
renderer,
input: Input::default(),
ui,
channel: None,
focus: None,
username: "<unknown>".to_string(),
clipboard: Clipboard::new().unwrap(),
}
}
pub fn event(&mut self, event: ClientEvent, _: &ActiveEventLoop) {
match event {
ClientEvent::Connect(send) => {
main_view(&mut self.ui, send).set_root(&mut self.ui);
ClientEvent::Connect { send, username } => {
self.username = username;
send.send(ClientMsg::RequestMsgs);
main_view(self, send).set_root(&mut self.ui);
}
ClientEvent::ServerMsg(msg) => match msg {
ServerMsg::SendMsg(msg) => {
if let Some(msg_area) = &self.channel {
let msg = msg_widget(msg).add(&mut self.ui);
self.ui[msg_area].children.push(msg.any());
}
}
ServerMsg::LoadMsgs(msgs) => {
if let Some(msg_area) = &self.channel {
for msg in msgs {
let msg = msg_widget(msg).add(&mut self.ui);
self.ui[msg_area].children.push(msg.any());
}
}
}
},
}
}

51
src/client/ui.rs
View File

@@ -4,8 +4,8 @@ use len_fns::*;
use crate::{
client::{Client, app::AppHandle},
net::{
ClientMsg,
client::{NetSender, connect},
ClientMsg, Msg,
client::{ConnectInfo, NetSender, connect},
},
};
@@ -22,17 +22,20 @@ pub fn ui(handle: AppHandle) -> Ui {
ui
}
pub fn main_view(ui: &mut Ui, network: NetSender) -> WidgetId<AnyWidget> {
let msg_panel = msg_panel(ui, network);
pub fn main_view(client: &mut Client, network: NetSender) -> WidgetId<AnyWidget> {
let msg_panel = msg_panel(client, network);
let side_bar = rect(Color::BLACK.brighter(0.05)).width(80);
(side_bar, msg_panel).span(Dir::RIGHT).add(ui).any()
(side_bar, msg_panel)
.span(Dir::RIGHT)
.add(&mut client.ui)
.any()
}
fn login_screen(ui: &mut Ui, handle: AppHandle) -> WidgetId<AnyWidget> {
let mut field = |name| text(name).editable().size(20).add(ui);
let ip = field("ip");
// let username = field("username");
let ip = field("localhost:16839");
let username = field("username");
// let password = field("password");
let fbx = |field: WidgetId<TextEdit>| {
@@ -44,19 +47,21 @@ fn login_screen(ui: &mut Ui, handle: AppHandle) -> WidgetId<AnyWidget> {
};
let ip_ = ip.clone();
let username_ = username.clone();
let color = Color::GREEN;
let submit = rect(color)
.radius(15)
.id_on(CursorSense::click(), move |id, client: &mut Client, _| {
client.ui[id].color = color.darker(0.3);
let ip = client.ui[&ip_].content();
connect(handle.clone(), ip);
let username = client.ui[&username_].content();
connect(handle.clone(), ConnectInfo { ip, username });
})
.height(40);
(
text("login").size(30),
fbx(ip),
// fbx(username),
fbx(username),
// fbx(password),
submit,
)
@@ -70,8 +75,8 @@ fn login_screen(ui: &mut Ui, handle: AppHandle) -> WidgetId<AnyWidget> {
.any()
}
fn msg_widget(content: String) -> impl WidgetLike<FnTag> {
let content = text(content)
pub fn msg_widget(msg: Msg) -> impl WidgetLike<FnTag> {
let content = text(msg.content)
.editable()
.size(20)
.text_align(Align::Left)
@@ -80,7 +85,7 @@ fn msg_widget(content: String) -> impl WidgetLike<FnTag> {
client.ui.text(id).select(ctx.cursor, ctx.size);
client.focus = Some(id.clone());
});
let header = text("some user").size(20);
let header = text(msg.user).size(20);
(
image(include_bytes!("./assets/sungals.png"))
.sized((70, 70))
@@ -100,14 +105,12 @@ pub fn focus(id: WidgetId<TextEdit>) -> impl Fn(&mut Client, CursorData) {
}
}
pub fn msg_panel(ui: &mut Ui, network: NetSender) -> impl WidgetFn<Stack> + use<> {
pub fn msg_panel(client: &mut Client, network: NetSender) -> impl WidgetFn<Stack> + use<> {
let Client { ui, channel, .. } = client;
let msg_area = Span::empty(Dir::DOWN).gap(15).add(ui);
*channel = Some(msg_area.clone());
let send_text = text("some stuff idk")
.editable()
.size(20)
.text_align(Align::Left)
.add(ui);
let send_text = text("").editable().size(20).text_align(Align::Left).add(ui);
(
msg_area
@@ -120,12 +123,12 @@ pub fn msg_panel(ui: &mut Ui, network: NetSender) -> impl WidgetFn<Stack> + use<
.clone()
.id_on(Submit, move |id, client: &mut Client, _| {
let content = client.ui.text(id).take();
network
.send(ClientMsg::SendMsg {
content: content.clone(),
})
.unwrap();
let msg = msg_widget(content).add(&mut client.ui);
let msg = Msg {
content: content.clone(),
user: client.username.clone(),
};
network.send(ClientMsg::SendMsg(msg.clone()));
let msg = msg_widget(msg).add(&mut client.ui);
client.ui[&msg_area].children.push(msg.any());
})
.pad(15)