celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-06 20:15:19 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

get rid of some threading stuff cuz its no longer necessary

Browse Source
This commit is contained in:
ouwou
2021-01-02 01:18:43 -05:00
parent 5cf2b7c2db
commit 2d6c4cd50d
2 changed files with 33 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
components/chatwindow.cpp
View File

@@ -3,12 +3,6 @@
#include "../abaddon.hpp"
ChatWindow::ChatWindow() {
m_set_messsages_dispatch.connect(sigc::mem_fun(*this, &ChatWindow::SetMessagesInternal));
m_new_message_dispatch.connect(sigc::mem_fun(*this, &ChatWindow::AddNewMessageInternal));
m_delete_message_dispatch.connect(sigc::mem_fun(*this, &ChatWindow::DeleteMessageInternal));
m_update_message_dispatch.connect(sigc::mem_fun(*this, &ChatWindow::UpdateMessageInternal));
m_history_dispatch.connect(sigc::mem_fun(*this, &ChatWindow::AddNewHistoryInternal));
m_main = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL));
m_list = Gtk::manage(new Gtk::ListBox);
m_scroll = Gtk::manage(new Gtk::ScrolledWindow);
@@ -95,17 +89,24 @@ Gtk::Widget *ChatWindow::GetRoot() const {
}
void ChatWindow::Clear() {
m_update_mutex.lock();
m_set_messages_queue.push(std::set<Snowflake>());
m_set_messsages_dispatch.emit();
m_update_mutex.unlock();
SetMessages(std::set<Snowflake>());
}
void ChatWindow::SetMessages(const std::set<Snowflake> &msgs) {
m_update_mutex.lock();
m_set_messages_queue.push(msgs);
m_set_messsages_dispatch.emit();
m_update_mutex.unlock();
// empty the listbox
auto children = m_list->get_children();
auto it = children.begin();
while (it != children.end()) {
delete *it;
it++;
}
m_num_rows = 0;
m_id_to_widget.clear();
for (const auto &id : msgs) {
ProcessNewMessage(id, false);
}
}
void ChatWindow::SetActiveChannel(Snowflake id) {
@@ -113,34 +114,33 @@ void ChatWindow::SetActiveChannel(Snowflake id) {
}
void ChatWindow::AddNewMessage(Snowflake id) {
m_update_mutex.lock();
m_new_message_queue.push(id);
m_new_message_dispatch.emit();
m_update_mutex.unlock();
ProcessNewMessage(id, false);
}
void ChatWindow::DeleteMessage(Snowflake id) {
m_update_mutex.lock();
m_delete_message_queue.push(id);
m_delete_message_dispatch.emit();
m_update_mutex.unlock();
auto widget = m_id_to_widget.find(id);
if (widget == m_id_to_widget.end()) return;
auto *x = dynamic_cast<ChatMessageItemContainer *>(widget->second);
if (x != nullptr)
x->UpdateAttributes();
}
void ChatWindow::UpdateMessage(Snowflake id) {
m_update_mutex.lock();
m_update_message_queue.push(id);
m_update_message_dispatch.emit();
m_update_mutex.unlock();
auto widget = m_id_to_widget.find(id);
if (widget == m_id_to_widget.end()) return;
auto *x = dynamic_cast<ChatMessageItemContainer *>(widget->second);
if (x != nullptr) {
x->UpdateContent();
x->UpdateAttributes();
}
}
void ChatWindow::AddNewHistory(const std::vector<Snowflake> &id) {
std::set<Snowflake> x;
for (const auto &s : id)
x.insert(s);
m_update_mutex.lock();
m_history_queue.push(x);
m_history_dispatch.emit();
m_update_mutex.unlock();
std::set<Snowflake> ids(id.begin(), id.end());
for (auto it = ids.rbegin(); it != ids.rend(); it++)
ProcessNewMessage(*it, true);
}
void ChatWindow::InsertChatInput(std::string text) {
@@ -281,76 +281,6 @@ void ChatWindow::ProcessNewMessage(Snowflake id, bool prepend) {
}
}
void ChatWindow::SetMessagesInternal() {
std::scoped_lock<std::mutex> guard(m_update_mutex);
const auto *msgs = &m_set_messages_queue.front();
// empty the listbox
auto children = m_list->get_children();
auto it = children.begin();
while (it != children.end()) {
delete *it;
it++;
}
m_num_rows = 0;
m_id_to_widget.clear();
for (const auto &id : *msgs) {
ProcessNewMessage(id, false);
}
m_set_messages_queue.pop();
}
void ChatWindow::AddNewMessageInternal() {
m_update_mutex.lock();
const auto id = m_new_message_queue.front();
m_new_message_queue.pop();
m_update_mutex.unlock();
ProcessNewMessage(id, false);
}
void ChatWindow::DeleteMessageInternal() {
m_update_mutex.lock();
const auto id = m_delete_message_queue.front();
m_delete_message_queue.pop();
m_update_mutex.unlock();
auto widget = m_id_to_widget.find(id);
if (widget == m_id_to_widget.end()) return;
auto *x = dynamic_cast<ChatMessageItemContainer *>(widget->second);
if (x != nullptr)
x->UpdateAttributes();
}
void ChatWindow::UpdateMessageInternal() {
m_update_mutex.lock();
const auto id = m_update_message_queue.front();
m_update_message_queue.pop();
m_update_mutex.unlock();
auto widget = m_id_to_widget.find(id);
if (widget == m_id_to_widget.end()) return;
auto *x = dynamic_cast<ChatMessageItemContainer *>(widget->second);
if (x != nullptr) {
x->UpdateContent();
x->UpdateAttributes();
}
}
void ChatWindow::AddNewHistoryInternal() {
m_update_mutex.lock();
auto msgs = m_history_queue.front();
m_history_queue.pop();
m_update_mutex.unlock();
for (auto it = msgs.rbegin(); it != msgs.rend(); it++)
ProcessNewMessage(*it, true);
}
void ChatWindow::on_scroll_edge_overshot(Gtk::PositionType pos) {
if (pos == Gtk::POS_TOP)
m_signal_action_chat_load_history.emit(m_active_channel);

20
components/chatwindow.hpp
View File

@@ -1,8 +1,6 @@
#pragma once
#include <gtkmm.h>
#include <string>
#include <mutex>
#include <queue>
#include <set>
#include "../discord/discord.hpp"
#include "chatmessage.hpp"
@@ -30,27 +28,9 @@ protected:
ChatMessageItemContainer *CreateMessageComponent(Snowflake id); // to be inserted into header's content box
void ProcessNewMessage(Snowflake id, bool prepend); // creates and adds components
void SetMessagesInternal();
void AddNewMessageInternal();
void DeleteMessageInternal();
void UpdateMessageInternal();
void AddNewHistoryInternal();
int m_num_rows = 0;
std::unordered_map<Snowflake, Gtk::Widget *> m_id_to_widget;
Glib::Dispatcher m_set_messsages_dispatch;
std::queue<std::set<Snowflake>> m_set_messages_queue;
Glib::Dispatcher m_new_message_dispatch;
std::queue<Snowflake> m_new_message_queue;
Glib::Dispatcher m_delete_message_dispatch;
std::queue<Snowflake> m_delete_message_queue;
Glib::Dispatcher m_update_message_dispatch;
std::queue<Snowflake> m_update_message_queue;
Glib::Dispatcher m_history_dispatch;
std::queue<std::set<Snowflake>> m_history_queue;
mutable std::mutex m_update_mutex;
Snowflake m_active_channel;
bool on_key_press_event(GdkEventKey *e);