colin/abaddon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shitty MESSAGE_CREATE handling

Browse Source
This commit is contained in:
ouwou
2020-08-21 00:42:46 -04:00
parent a201d5905a
commit 6f11aa4dae
9 changed files with 110 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
components/chatwindow.cpp
View File

@@ -1,8 +1,10 @@
#include "chatwindow.hpp"
#include "../abaddon.hpp"
#include <map>
ChatWindow::ChatWindow() {
m_update_dispatcher.connect(sigc::mem_fun(*this, &ChatWindow::SetMessagesInternal));
m_message_set_dispatch.connect(sigc::mem_fun(*this, &ChatWindow::SetMessagesInternal));
m_new_message_dispatch.connect(sigc::mem_fun(*this, &ChatWindow::AddNewMessageInternal));
m_main = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
m_listbox = Gtk::manage(new Gtk::ListBox);
@@ -11,6 +13,8 @@ ChatWindow::ChatWindow() {
m_input = Gtk::manage(new Gtk::TextView);
m_entry_scroll = Gtk::manage(new Gtk::ScrolledWindow);
m_input->signal_key_press_event().connect(sigc::mem_fun(*this, &ChatWindow::on_key_press_event), false);
m_main->set_hexpand(true);
m_main->set_vexpand(true);
m_main->show();
@@ -51,6 +55,10 @@ ChatWindow::ChatWindow() {
m_main->add(*m_entry_scroll);
}
void ChatWindow::SetAbaddon(Abaddon* ptr) {
m_abaddon = ptr;
}
Gtk::Widget *ChatWindow::GetRoot() const {
return m_main;
}
@@ -120,10 +128,33 @@ Gtk::ListBoxRow *ChatWindow::CreateChatEntryComponent(const MessageData *data) {
return nullptr;
}
bool ChatWindow::on_key_press_event(GdkEventKey *e) {
if (e->keyval == GDK_KEY_Return) {
auto buffer = m_input->get_buffer();
if (e->state & GDK_SHIFT_MASK)
return false;
auto text = buffer->get_text();
buffer->set_text("");
return true;
}
return false;
}
void ChatWindow::SetMessages(std::unordered_set<const MessageData *> msgs) {
std::scoped_lock<std::mutex> guard(m_update_mutex);
m_update_queue.push(msgs);
m_update_dispatcher.emit();
m_message_set_queue.push(msgs);
m_message_set_dispatch.emit();
}
void ChatWindow::AddNewMessage(Snowflake id) {
std::scoped_lock<std::mutex> guard(m_update_mutex);
m_new_message_queue.push(id);
m_new_message_dispatch.emit();
}
void ChatWindow::ScrollToBottom() {
@@ -131,6 +162,20 @@ void ChatWindow::ScrollToBottom() {
x->set_value(x->get_upper());
}
void ChatWindow::AddNewMessageInternal() {
Snowflake id;
{
std::scoped_lock<std::mutex> guard(m_update_mutex);
id = m_new_message_queue.front();
m_new_message_queue.pop();
}
auto data = m_abaddon->GetDiscordClient().GetMessage(id);
auto *row = CreateChatEntryComponent(data);
if (row != nullptr)
m_listbox->add(*row);
}
void ChatWindow::SetMessagesInternal() {
auto children = m_listbox->get_children();
auto it = children.begin();
@@ -143,7 +188,7 @@ void ChatWindow::SetMessagesInternal() {
std::unordered_set<const MessageData *> *msgs;
{
std::scoped_lock<std::mutex> guard(m_update_mutex);
msgs = &m_update_queue.front();
msgs = &m_message_set_queue.front();
}
// sort
@@ -159,6 +204,6 @@ void ChatWindow::SetMessagesInternal() {
{
std::scoped_lock<std::mutex> guard(m_update_mutex);
m_update_queue.pop();
m_message_set_queue.pop();
}
}