zheiling/BBS-Client-TUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui: new value-forwarding method

Browse Source
This commit is contained in:
zheiling
2026-02-25 16:15:28 +02:00
parent 86c11968da
commit b10766f6e3
17 changed files with 134 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modals/ask_server_addr.c
+3 -4
View File
@@ -11,6 +11,7 @@
#include <widget.h>
#include "../connection.h"
#include "group.h"
#include "widget_core.h"
typedef struct {
button_t *element;
@@ -18,19 +19,17 @@ typedef struct {
} group_bt_t;
void asa_modal_dialogue_callback(callback_args_t *args) {
int32_t response;
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
d_args.app = NULL;
d_args.resp_data = &response;
d_args.element = app->active_widget;
input_t *in_ip = d->g_content->elements[0].element;
input_t *in_port = d->g_content->elements[1].element;
dialogue_default_callback(&d_args);
if (response > -1) {
switch (response) {
if (d_args.resp_data.code == cbrp_val) {
switch (d_args.resp_data.val.val.num) {
case 0:
get_ip_port(app->params, in_ip->value, in_port->value);
connect_to_server(app);
src/modals/login_credentials.c
+2 -4
View File
@@ -13,19 +13,17 @@ typedef struct {
} group_bt_t;
void init_login_credentials_modal_cb(callback_args_t *args) {
int32_t response;
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
d_args.app = NULL;
d_args.resp_data = &response;
d_args.element = app->active_widget;
input_t *in_name = d->g_content->elements[0].element;
input_t *in_pass = d->g_content->elements[1].element;
dialogue_default_callback(&d_args);
if (response > -1) {
switch (response) {
if (d_args.resp_data.code == cbrp_val) {
switch (d_args.resp_data.val.val.num) {
case 0:
app->params->uname = malloc(in_name->value_len + 1);
app->params->pass = malloc(in_pass->value_len + 1);
src/modals/login_option.c
+2 -4
View File
@@ -13,17 +13,15 @@ typedef struct {
} group_bt_t;
void login_modal_option_cb(callback_args_t *args) {
int32_t response;
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
d_args.app = NULL;
d_args.resp_data = &response;
d_args.element = app->active_widget;
dialogue_default_callback(&d_args);
if (response > -1) {
switch (response) {
if (d_args.resp_data.code == cbrp_val) {
switch (d_args.resp_data.val.val.num) {
case 0:
d->needs_destroy = true;
app->params->uname = malloc(sizeof "anonymous");
src/modals/notification.c
+4 -6
View File
@@ -6,21 +6,17 @@
#include <widget.h>
/* TODO: get rid of this mechanism */
typedef struct {
button_t *element;
enum w_type type;
} group_bt_t;
void init_notification_modal_cb(callback_args_t *args) {
int32_t response;
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
d_args.app = NULL;
d_args.resp_data = &response;
d_args.element = app->active_widget;
dialogue_default_callback(&d_args);
@@ -33,7 +29,8 @@ dialogue_t *init_notification_modal(app_t *app) {
return NULL;
group_el_init_t actions[] = {
{.type = w_button, .label = "OK", .is_default = 1}, {.type = w_end}};
{.type = w_button, .label = "OK", .is_default = 1, .val.num = 1},
{.type = w_end}};
init_dialogue(&(app->modal), "Notification", app->query_args->notification,
&(app->coordinates));
@@ -44,7 +41,8 @@ dialogue_t *init_notification_modal(app_t *app) {
d->w.callback = init_notification_modal_cb;
d->g_content = NULL;
d->g_action = init_group(&(d->win), &(d->w), actions, &(d->id_map), horizontal, g_action);
d->g_action = init_group(&(d->win), &(d->w), actions, &(d->id_map),
horizontal, g_action);
dialogue_init_active_id(d);
src/modals/register.c
+7 -8
View File
@@ -19,20 +19,19 @@ typedef struct {
void init_register_modal_cb(callback_args_t *args) {
char query[256];
int32_t qlen = 0;
int32_t response;
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
d_args.app = NULL;
d_args.resp_data = &response;
d_args.element = app->active_widget;
input_t *in_name = d->g_content->elements[0].element;
input_t *in_pass = d->g_content->elements[1].element;
input_t *in_pass_r = d->g_content->elements[2].element;
dialogue_default_callback(&d_args);
if (response > -1) {
switch (response) {
if (d_args.resp_data.code == cbrp_val &&
d_args.resp_data.val.type == val_num) {
switch (d_args.resp_data.val.val.num) {
case 0:
if (strcmp(in_pass->value, in_pass_r->value)) {
alert("Your passwords do not match");
@@ -93,10 +92,10 @@ dialogue_t *init_register_modal(app_t *app) {
dialogue_t *d = &(app->modal);
d->w.callback = init_register_modal_cb;
d->g_content =
init_group(&(d->win), &(d->w), content, &(d->id_map), horizontal, g_content);
d->g_action =
init_group(&(d->win), &(d->w), actions, &(d->id_map), horizontal, g_action);
d->g_content = init_group(&(d->win), &(d->w), content, &(d->id_map),
horizontal, g_content);
d->g_action = init_group(&(d->win), &(d->w), actions, &(d->id_map),
horizontal, g_action);
dialogue_init_active_id(d);
src/modals/server_message.c
+4 -6
View File
@@ -12,18 +12,16 @@ typedef struct {
} group_bt_t;
void server_message_modal_cb(callback_args_t *args) {
int32_t response;
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
d_args.app = NULL;
d_args.resp_data = &response;
d_args.element = app->active_widget;
dialogue_default_callback(&d_args);
if (response > -1) {
switch (response) {
case 0:
if (d_args.resp_data.code == cbrp_val) {
switch (d_args.resp_data.val.val.num) {
case 1:
d->needs_destroy = true;
/* TODO: macros */
free(app->query_args->server_message.text);
@@ -40,7 +38,7 @@ void *init_server_message_modal(app_t *app) {
if (app == NULL)
return NULL;
group_el_init_t children[] = {
{.type = w_button, .label = "OK", .is_default = 1}, {.type = w_end}};
{.type = w_button, .label = "OK", .is_default = 1, .val.num = 1}, {.type = w_end}};
init_dialogue(&(app->modal), "Server response",
app->query_args->server_message.text, &(app->coordinates));
src/modals/upload_dialogue.c
+20 -18
View File
@@ -1,35 +1,35 @@
#include "../file_processor.h"
#include "group.h"
#include <widget.h>
#include <ncurses.h>
#include <stdint.h>
#include <string.h>
#include <widget.h>
void upload_dialogue_modal_cb(callback_args_t *args) {
int32_t response = -1;
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
d_args.app = NULL;
d_args.resp_data = &response;
d_args.element = app->active_widget;
dialogue_default_callback(&d_args);
ui_fs_file_list_t *fui =
(ui_fs_file_list_t *)d->g_content->elements[0].element;
switch (response) {
case 0:
app->query_args->state = S_WAIT_SERVER;
d->needs_destroy = true;
break;
case 1:
file_upload_open(fui->d_path, fui->current->name, app->query_args);
d->needs_destroy = true;
app->query_args->state = S_UPLOAD_PARAMS;
break;
case -2:
d->needs_destroy = true;
app->query_args->state = WAIT_CLIENT;
if (d_args.resp_data.code == cbrp_val) {
switch (d_args.resp_data.val.val.num) {
case 0:
app->query_args->state = S_WAIT_SERVER;
d->needs_destroy = true;
break;
case 1:
file_upload_open(fui->d_path, fui->current->name, app->query_args);
d->needs_destroy = true;
app->query_args->state = S_UPLOAD_PARAMS;
break;
case -2:
d->needs_destroy = true;
app->query_args->state = WAIT_CLIENT;
}
}
}
@@ -50,8 +50,10 @@ dialogue_t *init_upload_dialogue_modal(app_t *app) {
dialogue_t *d = &(app->modal);
d->w.callback = upload_dialogue_modal_cb;
d->g_content = init_group(&(d->win), &(d->w), content, &(d->id_map), horizontal, g_content);
d->g_action = init_group(&(d->win), &(d->w), actions, &(d->id_map), horizontal, g_action);
d->g_content = init_group(&(d->win), &(d->w), content, &(d->id_map),
horizontal, g_content);
d->g_action = init_group(&(d->win), &(d->w), actions, &(d->id_map),
horizontal, g_action);
app->query_args->active_dialogue = d;
src/modals/upload_props_dialogue.c
+2 -4
View File
@@ -8,20 +8,18 @@
#include <unistd.h>
void upload_props_dialogue_modal_cb(callback_args_t *args) {
int32_t response = -1;
callback_args_t d_args;
app_t *app = args->app;
dialogue_t *d = (dialogue_t *)app->active_widget;
memcpy(&d_args, args, sizeof(callback_args_t));
d_args.app = NULL;
d_args.resp_data = &response;
d_args.element = app->active_widget;
dialogue_default_callback(&d_args);
char query[256];
int32_t query_len = 0;
input_t *desc_input = (input_t *)d->g_content->elements[0].element;
if (response > -1) {
switch (response) {
if (d_args.resp_data.code == cbrp_val) {
switch (d_args.resp_data.val.val.num) {
case 0:
query_len =
sprintf(query, "file upload \"%s\" %zu 1\n",