Compare commits
3 Commits
3bba095cdd
...
f688c681ae
Author | SHA1 | Date | |
---|---|---|---|
f688c681ae | |||
dce42b866a | |||
da19b0ac31 |
27
external/toxcore/c-toxcore/toxcore/group_chats.c
vendored
27
external/toxcore/c-toxcore/toxcore/group_chats.c
vendored
@ -170,7 +170,11 @@ static void kill_group_friend_connection(const GC_Session *c, const GC_Chat *cha
|
||||
|
||||
uint16_t gc_get_wrapped_packet_size(uint16_t length, Net_Packet_Type packet_type)
|
||||
{
|
||||
if (packet_type == NET_PACKET_GC_LOSSY) {
|
||||
assert(length <= MAX_GC_CUSTOM_LOSSY_PACKET_SIZE);
|
||||
} else {
|
||||
assert(length <= MAX_GC_PACKET_CHUNK_SIZE);
|
||||
}
|
||||
|
||||
const uint16_t min_header_size = packet_type == NET_PACKET_GC_LOSSY
|
||||
? GC_MIN_LOSSY_PAYLOAD_SIZE
|
||||
@ -215,10 +219,14 @@ GC_Connection *get_gc_connection(const GC_Chat *chat, int peer_number)
|
||||
}
|
||||
|
||||
/** Returns the amount of empty padding a packet of designated length should have. */
|
||||
static uint16_t group_packet_padding_length(uint16_t length)
|
||||
static uint16_t group_packet_padding_length(uint16_t length, uint8_t net_packet_type)
|
||||
{
|
||||
if (net_packet_type == NET_PACKET_GC_LOSSY) {
|
||||
return (MAX_GC_CUSTOM_LOSSY_PACKET_SIZE - length) % GC_MAX_PACKET_PADDING;
|
||||
} else {
|
||||
return (MAX_GC_PACKET_CHUNK_SIZE - length) % GC_MAX_PACKET_PADDING;
|
||||
}
|
||||
}
|
||||
|
||||
void gc_get_self_nick(const GC_Chat *chat, uint8_t *nick)
|
||||
{
|
||||
@ -1473,7 +1481,7 @@ int group_packet_wrap(
|
||||
uint16_t packet_size, const uint8_t *data, uint16_t length, uint64_t message_id,
|
||||
uint8_t gp_packet_type, uint8_t net_packet_type)
|
||||
{
|
||||
const uint16_t padding_len = group_packet_padding_length(length);
|
||||
const uint16_t padding_len = group_packet_padding_length(length, net_packet_type);
|
||||
const uint16_t min_packet_size = net_packet_type == NET_PACKET_GC_LOSSLESS
|
||||
? length + padding_len + CRYPTO_MAC_SIZE + 1 + ENC_PUBLIC_KEY_SIZE + CRYPTO_NONCE_SIZE + GC_MESSAGE_ID_BYTES + 1
|
||||
: length + padding_len + CRYPTO_MAC_SIZE + 1 + ENC_PUBLIC_KEY_SIZE + CRYPTO_NONCE_SIZE + 1;
|
||||
@ -1483,10 +1491,17 @@ int group_packet_wrap(
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (net_packet_type == NET_PACKET_GC_LOSSY) {
|
||||
if (length > MAX_GC_CUSTOM_LOSSY_PACKET_SIZE) {
|
||||
LOGGER_ERROR(log, "Packet payload size (%u) exceeds maximum (%u)", length, MAX_GC_CUSTOM_LOSSY_PACKET_SIZE);
|
||||
return -1;
|
||||
}
|
||||
} else {
|
||||
if (length > MAX_GC_PACKET_CHUNK_SIZE) {
|
||||
LOGGER_ERROR(log, "Packet payload size (%u) exceeds maximum (%u)", length, MAX_GC_PACKET_CHUNK_SIZE);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t *plain = (uint8_t *)malloc(packet_size);
|
||||
|
||||
@ -1551,7 +1566,7 @@ non_null()
|
||||
static bool send_lossy_group_packet(const GC_Chat *chat, const GC_Connection *gconn, const uint8_t *data,
|
||||
uint16_t length, uint8_t packet_type)
|
||||
{
|
||||
assert(length <= MAX_GC_PACKET_CHUNK_SIZE);
|
||||
assert(length <= MAX_GC_CUSTOM_LOSSY_PACKET_SIZE);
|
||||
|
||||
if (!gconn->handshaked || gconn->pending_delete) {
|
||||
return false;
|
||||
@ -6392,13 +6407,13 @@ static int handle_gc_udp_packet(void *object, const IP_Port *ipp, const uint8_t
|
||||
|
||||
if (length <= MIN_UDP_PACKET_SIZE) {
|
||||
LOGGER_WARNING(m->log, "Got UDP packet with invalid length: %u (expected %u to %u)", length,
|
||||
MIN_UDP_PACKET_SIZE, MAX_GC_PACKET_CHUNK_SIZE + MIN_UDP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE);
|
||||
MIN_UDP_PACKET_SIZE, MAX_GC_CUSTOM_LOSSY_PACKET_SIZE + MIN_UDP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (length > MAX_GC_PACKET_CHUNK_SIZE + MIN_UDP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE) {
|
||||
if (length > MAX_GC_CUSTOM_LOSSY_PACKET_SIZE + MIN_UDP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE) {
|
||||
LOGGER_WARNING(m->log, "Got UDP packet with invalid length: %u (expected %u to %u)", length,
|
||||
MIN_UDP_PACKET_SIZE, MAX_GC_PACKET_CHUNK_SIZE + MIN_UDP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE);
|
||||
MIN_UDP_PACKET_SIZE, MAX_GC_CUSTOM_LOSSY_PACKET_SIZE + MIN_UDP_PACKET_SIZE + ENC_PUBLIC_KEY_SIZE);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -32,7 +32,7 @@
|
||||
#define MAX_GC_MESSAGE_SIZE GROUP_MAX_MESSAGE_LENGTH
|
||||
#define MAX_GC_MESSAGE_RAW_SIZE (MAX_GC_MESSAGE_SIZE + GC_MESSAGE_PSEUDO_ID_SIZE)
|
||||
#define MAX_GC_CUSTOM_LOSSLESS_PACKET_SIZE 1373
|
||||
#define MAX_GC_CUSTOM_LOSSY_PACKET_SIZE MAX_GC_PACKET_CHUNK_SIZE
|
||||
#define MAX_GC_CUSTOM_LOSSY_PACKET_SIZE 1000
|
||||
#define MAX_GC_PASSWORD_SIZE 32
|
||||
#define MAX_GC_SAVED_INVITES 10
|
||||
#define MAX_GC_PEERS_DEFAULT 100
|
||||
|
2
external/toxcore/c-toxcore/toxcore/tox.h
vendored
2
external/toxcore/c-toxcore/toxcore/tox.h
vendored
@ -3310,7 +3310,7 @@ uint32_t tox_group_max_message_length(void);
|
||||
/**
|
||||
* Maximum length of a group custom lossy packet.
|
||||
*/
|
||||
#define TOX_GROUP_MAX_CUSTOM_LOSSY_PACKET_LENGTH 500
|
||||
#define TOX_GROUP_MAX_CUSTOM_LOSSY_PACKET_LENGTH 1000
|
||||
|
||||
uint32_t tox_group_max_custom_lossy_packet_length(void);
|
||||
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
#include "./file_selector.hpp"
|
||||
|
||||
#include <cstdio>
|
||||
#include <solanaceae/message3/components.hpp>
|
||||
#include <solanaceae/tox_messages/components.hpp>
|
||||
#include <solanaceae/contact/components.hpp>
|
||||
@ -545,9 +546,16 @@ void ChatGui4::renderMessageBodyFile(Message3Registry& reg, const Message3 e) {
|
||||
ImGui::TextUnformatted("down");
|
||||
if (reg.all_of<Message::Components::Transfer::BytesReceived>(e)) {
|
||||
ImGui::SameLine();
|
||||
|
||||
float fraction = float(reg.get<Message::Components::Transfer::BytesReceived>(e).total) / reg.get<Message::Components::Transfer::FileInfo>(e).total_size;
|
||||
|
||||
char overlay_buf[32];
|
||||
std::snprintf(overlay_buf, sizeof(overlay_buf), "%.1f%%", fraction * 100 + 0.01f);
|
||||
|
||||
ImGui::ProgressBar(
|
||||
float(reg.get<Message::Components::Transfer::BytesReceived>(e).total) / reg.get<Message::Components::Transfer::FileInfo>(e).total_size,
|
||||
{-FLT_MIN, TEXT_BASE_HEIGHT}
|
||||
fraction,
|
||||
{-FLT_MIN, TEXT_BASE_HEIGHT},
|
||||
overlay_buf
|
||||
);
|
||||
// TODO: numbers
|
||||
}
|
||||
@ -559,9 +567,16 @@ void ChatGui4::renderMessageBodyFile(Message3Registry& reg, const Message3 e) {
|
||||
ImGui::TextUnformatted(" up");
|
||||
if (reg.all_of<Message::Components::Transfer::BytesSent>(e)) {
|
||||
ImGui::SameLine();
|
||||
|
||||
float fraction = float(reg.get<Message::Components::Transfer::BytesSent>(e).total) / reg.get<Message::Components::Transfer::FileInfo>(e).total_size;
|
||||
|
||||
char overlay_buf[32];
|
||||
std::snprintf(overlay_buf, sizeof(overlay_buf), "%.1f%%", fraction * 100 + 0.01f);
|
||||
|
||||
ImGui::ProgressBar(
|
||||
float(reg.get<Message::Components::Transfer::BytesSent>(e).total) / reg.get<Message::Components::Transfer::FileInfo>(e).total_size,
|
||||
{-FLT_MIN, TEXT_BASE_HEIGHT}
|
||||
fraction,
|
||||
{-FLT_MIN, TEXT_BASE_HEIGHT},
|
||||
overlay_buf
|
||||
);
|
||||
// TODO: numbers
|
||||
}
|
||||
|
@ -1,9 +1,105 @@
|
||||
#include "./settings_window.hpp"
|
||||
|
||||
#include <solanaceae/util/simple_config_model.hpp>
|
||||
|
||||
#include <imgui/imgui.h>
|
||||
#include <imgui/misc/cpp/imgui_stdlib.h>
|
||||
|
||||
SettingsWindow::SettingsWindow(ConfigModelI& conf) : _conf(conf) {
|
||||
#include <tuple>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
template<typename FNCat, typename ...MapTypes>
|
||||
void iterateMultMaps(FNCat&& fn_cat, MapTypes& ...map_types) {
|
||||
// the iterators
|
||||
std::tuple its{map_types.begin()...};
|
||||
|
||||
// assuming ever maps returned .begin() has a unique type
|
||||
// TODO: use index instead
|
||||
while ( ((std::get<decltype(map_types.begin())>(its) != map_types.end()) || ...) ) {
|
||||
// figure out current module and participants
|
||||
|
||||
std::string_view current_module;
|
||||
// find current_module
|
||||
((
|
||||
current_module = (
|
||||
std::get<decltype(map_types.begin())>(its) != map_types.end() && (current_module.empty() || current_module >= std::get<decltype(map_types.begin())>(its)->first)
|
||||
) ? std::get<decltype(map_types.begin())>(its)->first : current_module
|
||||
), ...);
|
||||
|
||||
assert(!current_module.empty());
|
||||
|
||||
fn_cat(
|
||||
current_module,
|
||||
((
|
||||
std::get<decltype(map_types.begin())>(its) != map_types.end() &&
|
||||
current_module == std::get<decltype(map_types.begin())>(its)->first
|
||||
) ? std::get<decltype(map_types.begin())>(its)->second : decltype(map_types.begin()->second){})...
|
||||
);
|
||||
|
||||
// increment participanting iterators
|
||||
((
|
||||
(
|
||||
std::get<decltype(map_types.begin())>(its) != map_types.end() &&
|
||||
current_module == std::get<decltype(map_types.begin())>(its)->first
|
||||
) ? void(++std::get<decltype(map_types.begin())>(its)) : void(0)
|
||||
), ...);
|
||||
}
|
||||
}
|
||||
|
||||
//template<typename T>
|
||||
//static void renderConfigCat(SimpleConfigModel& conf, std::string_view cmodule, std::string_view ccat, const std::pair<std::optional<T>, std::map<std::string, T>>& cat_dat) {
|
||||
//if (cat_dat.first.has_value()) {
|
||||
//T tmp = cat_dat.first.value();
|
||||
////if (ImGui::Checkbox(ccat.data(), &tmp)) {
|
||||
////conf.set(cmodule, ccat, tmp);
|
||||
////}
|
||||
//} else if (!cat_dat.second.empty()) {
|
||||
//ImGui::Text("uhhh");
|
||||
//}
|
||||
//}
|
||||
static void renderConfigCat(SimpleConfigModel& conf, std::string_view cmodule, std::string_view ccat, const std::pair<std::optional<bool>, std::map<std::string, bool>>& cat_dat) {
|
||||
if (cat_dat.first.has_value()) {
|
||||
bool tmp = cat_dat.first.value();
|
||||
if (ImGui::Checkbox(ccat.data(), &tmp)) {
|
||||
conf.set(cmodule, ccat, tmp);
|
||||
}
|
||||
} else if (!cat_dat.second.empty()) {
|
||||
ImGui::Text("uhhh");
|
||||
}
|
||||
}
|
||||
static void renderConfigCat(SimpleConfigModel& conf, std::string_view cmodule, std::string_view ccat, const std::pair<std::optional<int64_t>, std::map<std::string, int64_t>>& cat_dat) {
|
||||
if (cat_dat.first.has_value()) {
|
||||
int64_t tmp = cat_dat.first.value();
|
||||
if (ImGui::InputScalar(ccat.data(), ImGuiDataType_S64, &tmp)) {
|
||||
conf.set(cmodule, ccat, tmp);
|
||||
}
|
||||
} else if (!cat_dat.second.empty()) {
|
||||
ImGui::Text("uhhh");
|
||||
}
|
||||
}
|
||||
static void renderConfigCat(SimpleConfigModel& conf, std::string_view cmodule, std::string_view ccat, const std::pair<std::optional<double>, std::map<std::string, double>>& cat_dat) {
|
||||
if (cat_dat.first.has_value()) {
|
||||
double tmp = cat_dat.first.value();
|
||||
if (ImGui::InputDouble(ccat.data(), &tmp)) {
|
||||
conf.set(cmodule, ccat, tmp);
|
||||
}
|
||||
} else if (!cat_dat.second.empty()) {
|
||||
ImGui::Text("uhhh");
|
||||
}
|
||||
}
|
||||
static void renderConfigCat(SimpleConfigModel& conf, std::string_view cmodule, std::string_view ccat, const std::pair<std::optional<std::string>, std::map<std::string, std::string>>& cat_dat) {
|
||||
if (cat_dat.first.has_value()) {
|
||||
std::string tmp = cat_dat.first.value();
|
||||
if (ImGui::InputText(ccat.data(), &tmp)) {
|
||||
conf.set(cmodule, ccat, CM_ISV{tmp});
|
||||
}
|
||||
} else if (!cat_dat.second.empty()) {
|
||||
ImGui::Text("uhhh");
|
||||
}
|
||||
}
|
||||
|
||||
SettingsWindow::SettingsWindow(SimpleConfigModel& conf) : _conf(conf) {
|
||||
}
|
||||
|
||||
void SettingsWindow::render(void) {
|
||||
@ -27,7 +123,97 @@ void SettingsWindow::render(void) {
|
||||
|
||||
if (_show_window) {
|
||||
if (ImGui::Begin("Settings", &_show_window)) {
|
||||
ImGui::Text("Settings here sldjflsadfs");
|
||||
ImGui::TextDisabled("most settings are only fetched once at program startup");
|
||||
|
||||
// ufff
|
||||
// we need to iterate 4 maps, ideally in lexicographic order
|
||||
// (pain)
|
||||
// std::maps should be ordered more or less correctly
|
||||
// (less pain)
|
||||
// its recursive
|
||||
// (pain)
|
||||
// but the code is reusable
|
||||
// (less pain)
|
||||
|
||||
iterateMultMaps(
|
||||
[this](std::string_view cmodule, const auto& ...mod_map_types) {
|
||||
if (ImGui::CollapsingHeader(cmodule.data())) {
|
||||
iterateMultMaps(
|
||||
[this, cmodule](std::string_view ccat, const auto& ...cat_map_types) {
|
||||
(renderConfigCat(_conf, cmodule, ccat, cat_map_types), ...);
|
||||
},
|
||||
mod_map_types...
|
||||
);
|
||||
}
|
||||
},
|
||||
_conf._map_bool,
|
||||
_conf._map_int,
|
||||
_conf._map_double,
|
||||
_conf._map_string
|
||||
);
|
||||
|
||||
#if 0
|
||||
auto it_b = _conf._map_bool.begin();
|
||||
auto it_i = _conf._map_int.begin();
|
||||
auto it_d = _conf._map_double.begin();
|
||||
auto it_s = _conf._map_string.begin();
|
||||
|
||||
while (
|
||||
it_b != _conf._map_bool.end() ||
|
||||
it_i != _conf._map_int.end() ||
|
||||
it_d != _conf._map_double.end() ||
|
||||
it_s != _conf._map_string.end()
|
||||
) {
|
||||
// figure out current module
|
||||
std::string_view current_module;
|
||||
bool bool_is_curr = false;
|
||||
bool int_is_curr = false;
|
||||
bool double_is_curr = false;
|
||||
bool string_is_curr = false;
|
||||
|
||||
if (it_b != _conf._map_bool.end() && (current_module.empty() || current_module >= it_b->first)) {
|
||||
//std::cerr << "SET bool\n";
|
||||
bool_is_curr = true;
|
||||
current_module = it_b->first;
|
||||
}
|
||||
if (it_i != _conf._map_int.end() && (current_module.empty() || current_module >= it_i->first)) {
|
||||
//std::cerr << "SET int\n";
|
||||
int_is_curr = true;
|
||||
current_module = it_i->first;
|
||||
}
|
||||
if (it_d != _conf._map_double.end() && (current_module.empty() || current_module >= it_d->first)) {
|
||||
//std::cerr << "SET double\n";
|
||||
double_is_curr = true;
|
||||
current_module = it_d->first;
|
||||
}
|
||||
if (it_s != _conf._map_string.end() && (current_module.empty() || current_module >= it_s->first)) {
|
||||
//std::cerr << "SET string\n";
|
||||
string_is_curr = true;
|
||||
current_module = it_s->first;
|
||||
}
|
||||
|
||||
assert(!current_module.empty());
|
||||
|
||||
//ImGui::Text("module '%s'", current_module.data());
|
||||
if (ImGui::CollapsingHeader(current_module.data())) {
|
||||
// ... do the whole 4way iterate again but on categoy
|
||||
}
|
||||
|
||||
// after the module, increment iterators pointing to current_module
|
||||
if (bool_is_curr) {
|
||||
it_b++;
|
||||
}
|
||||
if (int_is_curr) {
|
||||
it_i++;
|
||||
}
|
||||
if (double_is_curr) {
|
||||
it_d++;
|
||||
}
|
||||
if (string_is_curr) {
|
||||
it_s++;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
ImGui::End();
|
||||
}
|
||||
|
@ -1,13 +1,14 @@
|
||||
#pragma once
|
||||
|
||||
struct ConfigModelI;
|
||||
struct SimpleConfigModel;
|
||||
|
||||
class SettingsWindow {
|
||||
bool _show_window {false};
|
||||
ConfigModelI& _conf;
|
||||
// TODO: add iteration api to interface
|
||||
SimpleConfigModel& _conf;
|
||||
|
||||
public:
|
||||
SettingsWindow(ConfigModelI& conf);
|
||||
SettingsWindow(SimpleConfigModel& conf);
|
||||
|
||||
void render(void);
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user