summaryrefslogtreecommitdiff
path: root/Applications
diff options
context:
space:
mode:
Diffstat (limited to 'Applications')
-rw-r--r--Applications/IRCClient/IRCAppWindow.cpp35
-rw-r--r--Applications/IRCClient/IRCAppWindow.h3
-rw-r--r--Applications/IRCClient/IRCChannel.cpp2
-rw-r--r--Applications/IRCClient/IRCChannel.h5
-rw-r--r--Applications/IRCClient/IRCClient.cpp13
-rw-r--r--Applications/IRCClient/IRCClient.h7
-rw-r--r--Applications/IRCClient/IRCQuery.cpp2
-rw-r--r--Applications/IRCClient/IRCQuery.h5
-rw-r--r--Applications/IRCClient/IRCWindow.cpp5
-rw-r--r--Applications/IRCClient/IRCWindow.h11
10 files changed, 40 insertions, 48 deletions
diff --git a/Applications/IRCClient/IRCAppWindow.cpp b/Applications/IRCClient/IRCAppWindow.cpp
index e8306763d5..0a4e12bda5 100644
--- a/Applications/IRCClient/IRCAppWindow.cpp
+++ b/Applications/IRCClient/IRCAppWindow.cpp
@@ -17,10 +17,11 @@ IRCAppWindow::IRCAppWindow()
{
set_title(String::format("IRC Client: %s@%s:%d", m_client.nickname().characters(), m_client.hostname().characters(), m_client.port()));
set_rect(200, 200, 600, 400);
- setup_client();
setup_actions();
setup_menus();
setup_widgets();
+
+ setup_client();
}
IRCAppWindow::~IRCAppWindow()
@@ -29,20 +30,12 @@ IRCAppWindow::~IRCAppWindow()
void IRCAppWindow::setup_client()
{
- m_client.on_connect = [this] {
- m_client.join_channel("#test");
- };
-
- m_client.on_channel_message = [this] (const String& channel_name) {
- ensure_window(IRCWindow::Channel, channel_name);
+ m_client.aid_create_window = [this] (void* owner, IRCWindow::Type type, const String& name) -> IRCWindow* {
+ return &create_window(owner, type, name);
};
- m_client.on_join = [this] (const String& channel_name) {
- ensure_window(IRCWindow::Channel, channel_name);
- };
-
- m_client.on_query_message = [this] (const String& name) {
- ensure_window(IRCWindow::Query, name);
+ m_client.on_connect = [this] {
+ m_client.join_channel("#test");
};
m_client.connect();
@@ -129,20 +122,10 @@ void IRCAppWindow::setup_widgets()
m_container = new GStackWidget(horizontal_container);
- create_subwindow(IRCWindow::Server, "Server");
-}
-
-IRCWindow& IRCAppWindow::create_subwindow(IRCWindow::Type type, const String& name)
-{
- return *new IRCWindow(m_client, type, name, m_container);
+ create_window(&m_client, IRCWindow::Server, "Server");
}
-IRCWindow& IRCAppWindow::ensure_window(IRCWindow::Type type, const String& name)
+IRCWindow& IRCAppWindow::create_window(void* owner, IRCWindow::Type type, const String& name)
{
- for (int i = 0; i < m_client.window_count(); ++i) {
- auto& window = m_client.window_at(i);
- if (window.name() == name)
- return window;
- }
- return create_subwindow(type, name);
+ return *new IRCWindow(m_client, owner, type, name, m_container);
}
diff --git a/Applications/IRCClient/IRCAppWindow.h b/Applications/IRCClient/IRCAppWindow.h
index e882203203..aa97f95e7c 100644
--- a/Applications/IRCClient/IRCAppWindow.h
+++ b/Applications/IRCClient/IRCAppWindow.h
@@ -19,8 +19,7 @@ private:
void setup_menus();
void setup_widgets();
- IRCWindow& create_subwindow(IRCWindow::Type, const String& name);
- IRCWindow& ensure_window(IRCWindow::Type, const String& name);
+ IRCWindow& create_window(void* owner, IRCWindow::Type, const String& name);
IRCClient m_client;
diff --git a/Applications/IRCClient/IRCChannel.cpp b/Applications/IRCClient/IRCChannel.cpp
index a96ae54404..4e2d68d444 100644
--- a/Applications/IRCClient/IRCChannel.cpp
+++ b/Applications/IRCClient/IRCChannel.cpp
@@ -10,6 +10,8 @@ IRCChannel::IRCChannel(IRCClient& client, const String& name)
, m_log(IRCLogBuffer::create())
{
m_member_model = new IRCChannelMemberListModel(*this);
+ m_window = m_client.aid_create_window(this, IRCWindow::Channel, m_name);
+ m_window->set_log_buffer(*m_log);
}
IRCChannel::~IRCChannel()
diff --git a/Applications/IRCClient/IRCChannel.h b/Applications/IRCClient/IRCChannel.h
index 6e5e846dc3..bb14292eda 100644
--- a/Applications/IRCClient/IRCChannel.h
+++ b/Applications/IRCClient/IRCChannel.h
@@ -9,6 +9,7 @@
class IRCClient;
class IRCChannelMemberListModel;
+class IRCWindow;
class IRCChannel : public Retainable<IRCChannel> {
public:
@@ -38,6 +39,9 @@ public:
int member_count() const { return m_members.size(); }
String member_at(int i) { return m_members[i].name; }
+ IRCWindow& window() { return *m_window; }
+ const IRCWindow& window() const { return *m_window; }
+
private:
IRCChannel(IRCClient&, const String&);
@@ -52,4 +56,5 @@ private:
Retained<IRCLogBuffer> m_log;
IRCChannelMemberListModel* m_member_model { nullptr };
+ IRCWindow* m_window { nullptr };
};
diff --git a/Applications/IRCClient/IRCClient.cpp b/Applications/IRCClient/IRCClient.cpp
index 03d152efaf..d8b6f63b76 100644
--- a/Applications/IRCClient/IRCClient.cpp
+++ b/Applications/IRCClient/IRCClient.cpp
@@ -306,15 +306,11 @@ void IRCClient::handle_privmsg(const Message& msg)
auto it = m_channels.find(target);
if (it != m_channels.end()) {
(*it).value->add_message(sender_prefix, sender_nick, msg.arguments[1]);
- if (on_channel_message)
- on_channel_message(target);
return;
}
}
auto& query = ensure_query(sender_nick);
query.add_message(sender_prefix, sender_nick, msg.arguments[1]);
- if (on_query_message)
- on_query_message(sender_nick);
}
IRCQuery& IRCClient::ensure_query(const String& name)
@@ -353,8 +349,6 @@ void IRCClient::handle_join(const Message& msg)
return;
auto& channel_name = msg.arguments[0];
ensure_channel(channel_name);
- if (on_join)
- on_join(channel_name);
}
void IRCClient::handle_namreply(const Message& msg)
@@ -389,13 +383,6 @@ void IRCClient::register_subwindow(IRCWindow& subwindow)
if (subwindow.type() == IRCWindow::Server) {
m_server_subwindow = &subwindow;
subwindow.set_log_buffer(*m_log);
- } else if (subwindow.type() == IRCWindow::Channel) {
- auto it = m_channels.find(subwindow.name());
- ASSERT(it != m_channels.end());
- auto& channel = *(*it).value;
- subwindow.set_log_buffer(channel.log());
- } else if (subwindow.type() == IRCWindow::Query) {
- subwindow.set_log_buffer(ensure_query(subwindow.name()).log());
}
m_windows.append(&subwindow);
m_client_window_list_model->update();
diff --git a/Applications/IRCClient/IRCClient.h b/Applications/IRCClient/IRCClient.h
index 44f4c85bcd..87a3935387 100644
--- a/Applications/IRCClient/IRCClient.h
+++ b/Applications/IRCClient/IRCClient.h
@@ -5,10 +5,10 @@
#include <AK/CircularQueue.h>
#include <AK/Function.h>
#include "IRCLogBuffer.h"
+#include "IRCWindow.h"
class IRCChannel;
class IRCQuery;
-class IRCWindow;
class IRCWindowListModel;
class GNotifier;
@@ -32,11 +32,10 @@ public:
Function<void()> on_connect;
Function<void()> on_disconnect;
- Function<void(const String& channel)> on_channel_message;
- Function<void(const String& name)> on_query_message;
- Function<void(const String& channel)> on_join;
Function<void()> on_server_message;
+ Function<IRCWindow*(void*, IRCWindow::Type, const String&)> aid_create_window;
+
void register_subwindow(IRCWindow&);
void unregister_subwindow(IRCWindow&);
diff --git a/Applications/IRCClient/IRCQuery.cpp b/Applications/IRCClient/IRCQuery.cpp
index 53e180464e..4a539fa42b 100644
--- a/Applications/IRCClient/IRCQuery.cpp
+++ b/Applications/IRCClient/IRCQuery.cpp
@@ -8,6 +8,8 @@ IRCQuery::IRCQuery(IRCClient& client, const String& name)
, m_name(name)
, m_log(IRCLogBuffer::create())
{
+ m_window = m_client.aid_create_window(this, IRCWindow::Query, m_name);
+ m_window->set_log_buffer(*m_log);
}
IRCQuery::~IRCQuery()
diff --git a/Applications/IRCClient/IRCQuery.h b/Applications/IRCClient/IRCQuery.h
index 55da4273ec..7e73364536 100644
--- a/Applications/IRCClient/IRCQuery.h
+++ b/Applications/IRCClient/IRCQuery.h
@@ -8,6 +8,7 @@
#include "IRCLogBuffer.h"
class IRCClient;
+class IRCWindow;
class IRCQuery : public Retainable<IRCQuery> {
public:
@@ -24,11 +25,15 @@ public:
void say(const String&);
+ IRCWindow& window() { return *m_window; }
+ const IRCWindow& window() const { return *m_window; }
+
private:
IRCQuery(IRCClient&, const String& name);
IRCClient& m_client;
String m_name;
+ IRCWindow* m_window { nullptr };
Retained<IRCLogBuffer> m_log;
};
diff --git a/Applications/IRCClient/IRCWindow.cpp b/Applications/IRCClient/IRCWindow.cpp
index f1e3c843a2..e4540986b8 100644
--- a/Applications/IRCClient/IRCWindow.cpp
+++ b/Applications/IRCClient/IRCWindow.cpp
@@ -8,9 +8,10 @@
#include <LibGUI/GTextEditor.h>
#include <LibGUI/GTextBox.h>
-IRCWindow::IRCWindow(IRCClient& client, Type type, const String& name, GWidget* parent)
+IRCWindow::IRCWindow(IRCClient& client, void* owner, Type type, const String& name, GWidget* parent)
: GWidget(parent)
, m_client(client)
+ , m_owner(owner)
, m_type(type)
, m_name(name)
{
@@ -31,7 +32,7 @@ IRCWindow::IRCWindow(IRCClient& client, Type type, const String& name, GWidget*
member_view->set_size_policy(SizePolicy::Fixed, SizePolicy::Fill);
member_view->set_preferred_size({ 100, 0 });
member_view->set_alternating_row_colors(false);
- member_view->set_model(OwnPtr<IRCChannelMemberListModel>(m_client.ensure_channel(m_name).member_model()));
+ member_view->set_model(OwnPtr<IRCChannelMemberListModel>(channel().member_model()));
}
m_text_editor = new GTextEditor(GTextEditor::SingleLine, this);
diff --git a/Applications/IRCClient/IRCWindow.h b/Applications/IRCClient/IRCWindow.h
index 79e98ae756..b727048e6b 100644
--- a/Applications/IRCClient/IRCWindow.h
+++ b/Applications/IRCClient/IRCWindow.h
@@ -2,7 +2,9 @@
#include <LibGUI/GWidget.h>
+class IRCChannel;
class IRCClient;
+class IRCQuery;
class IRCLogBuffer;
class GTableView;
class GTextEditor;
@@ -15,7 +17,7 @@ public:
Query,
};
- explicit IRCWindow(IRCClient&, Type, const String& name, GWidget* parent);
+ IRCWindow(IRCClient&, void* owner, Type, const String& name, GWidget* parent);
virtual ~IRCWindow() override;
String name() const { return m_name; }
@@ -25,8 +27,15 @@ public:
void set_log_buffer(const IRCLogBuffer&);
+ IRCChannel& channel() { return *(IRCChannel*)m_owner; }
+ const IRCChannel& channel() const { return *(const IRCChannel*)m_owner; }
+
+ IRCQuery& query() { return *(IRCQuery*)m_owner; }
+ const IRCQuery& query() const { return *(const IRCQuery*)m_owner; }
+
private:
IRCClient& m_client;
+ void* m_owner { nullptr };
Type m_type;
String m_name;
GTableView* m_table_view { nullptr };
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 17:35:13 +0000