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/widget/button.h
-1
View File
@@ -1,7 +1,6 @@
#ifndef BUTTON_H
#define BUTTON_H
#include "../main.h"
#include <widget_core.h>
#include <stdint.h>
src/widget/dialogue.c
+13 -12
View File
@@ -62,30 +62,28 @@ void dialogue_default_callback(callback_args_t *args) {
dialogue_t *d = (void *)args->element;
int32_t key = *((int32_t *)args->data);
callback_args_t new_args;
new_args.active_el = d->active_el;
int32_t *resp_value = (int32_t *)args->resp_data;
memcpy(&new_args, args, sizeof(callback_args_t));
new_args.active_id = d->active_el->id;
new_args.active_el = d->active_el;
int32_t diff;
d->needs_update = true;
input_t *input;
widget_t *widget;
switch (key) {
case '\t':
incr_active_id(d);
*resp_value = -1;
args->resp_data.code = cbrc_none;
break;
case '\33': /* Esc key */
*resp_value = -2;
args->resp_data.code = cbrp_val;
args->resp_data.val.val.num = -2;
break;
case KEY_RIGHT:
incr_active_id(d);
*resp_value = -1;
args->resp_data.code = cbrc_none;
break;
case KEY_LEFT:
decr_active_id(d);
*resp_value = -1;
args->resp_data.code = cbrc_none;
break;
case '\n':
widget = (widget_t *)d->active_el->element;
@@ -97,16 +95,19 @@ void dialogue_default_callback(callback_args_t *args) {
if (d->active_el->g_type == g_action) {
new_args.element = d->g_action;
group_default_callback(&new_args);
mempcpy(&(args->resp_data), &(new_args.resp_data), sizeof(new_args.resp_data));
} else if (d->g_action != NULL) {
for (int i = 0; i < d->g_action->count; i++) {
if (d->g_action->elements[i].is_default) {
*resp_value = i;
args->resp_data.code = cbrp_val;
args->resp_data.val.val.num = i;
return;
}
}
} else {
/* TODO: temp solution, improve */
*resp_value = d->active_el->id - d->g_content->first_id;
args->resp_data.code = cbrp_val;
args->resp_data.val.val.num = d->active_el->idx;
return;
}
break;
@@ -167,7 +168,7 @@ void dialogue_init_active_id(dialogue_t *dialogue) {
widget_type = dialogue->g_content->elements[i].type;
if (widget_type == w_button || widget_type == w_input ||
widget_type == w_fs_file_list) { /* Add here new types */
dialogue->active_el = &(dialogue->g_content->elements[i]);
dialogue->active_el = dialogue->g_content->elements + i;
return;
}
}
@@ -177,7 +178,7 @@ void dialogue_init_active_id(dialogue_t *dialogue) {
widget_type = dialogue->g_action->elements[i].type;
if (widget_type == w_button || widget_type == w_input ||
widget_type == w_fs_file_list) {
dialogue->active_el = &(dialogue->g_action->elements[i]);
dialogue->active_el = dialogue->g_action->elements + i;
return;
}
}
src/widget/fs_file_list.c
+1 -1
View File
@@ -133,7 +133,7 @@ void fs_file_list_cb(callback_args_t *args) {
}
break;
case '\n':
select_item(fui, (int32_t *) args->resp_data);
select_item(fui, (int32_t *) args->resp_data.val.val.num);
break;
}
}
src/widget/group.c
+10 -12
View File
@@ -12,26 +12,19 @@
#include <sys/types.h>
#include <utils.h>
/* make response -1 */
#define MAKE_RESPONSE_M1(args, resp_data, response) \
if (args->resp_data != NULL) { \
*response = -1; \
}
/* TODO: adapt to a new indexation method */
void group_default_callback(callback_args_t *args) {
group_t *g = (group_t *)args->element;
int32_t key = *((int32_t *)args->data);
int32_t *response = (int32_t *)args->resp_data;
int64_t response = args->resp_data.val.val.num;
input_t *input;
widget_t *widget;
group_el_t *element_ptr = args->active_el;
int32_t element_idx = element_ptr->id - g->first_id; ;
u_int32_t start_pos = 0;
callback_args_t new_args;
switch (key) {
case '\n': /* Enter */
*response = element_idx;
args->resp_data.code = cbrp_val;
mempcpy(&(args->resp_data.val), &(element_ptr->val), sizeof(struct val_t));
break;
case KEY_BACKSPACE:
case KEY_DL:
@@ -47,7 +40,7 @@ void group_default_callback(callback_args_t *args) {
}
}
}
MAKE_RESPONSE_M1(args, resp_data, response);
args->resp_data.code = cbrc_none;
break;
default:
if (element_ptr->type == w_input) {
@@ -64,6 +57,7 @@ void group_default_callback(callback_args_t *args) {
}
}
} else {
/* callback case */
widget = (widget_t *)element_ptr->element;
if (widget->callback != NULL) {
memccpy(&new_args, args, 1, sizeof(callback_args_t));
@@ -72,7 +66,7 @@ void group_default_callback(callback_args_t *args) {
break;
}
}
MAKE_RESPONSE_M1(args, resp_data, response);
args->resp_data.code = cbrc_none;
break;
}
}
@@ -104,6 +98,8 @@ group_t *init_group(WINDOW **win, widget_t *w_parent, group_el_init_t *children,
elements[i].type = children[i].type;
elements[i].is_default = children[i].is_default;
elements[i].g_type = g_type;
elements[i].idx = i;
elements[i].val.type = val_nul;
}
/* init child elements */
@@ -112,6 +108,8 @@ group_t *init_group(WINDOW **win, widget_t *w_parent, group_el_init_t *children,
switch (elements[i].type) {
case w_button:
elements[i].element = init_button(win, &(group->w), children[i].label);
elements[i].val.type = val_num;
elements[i].val.val.num = children[i].val.num;
w = &(((button_t *)elements[i].element)->w);
break;
case w_box:
src/widget/group.h
+3 -15
View File
@@ -5,21 +5,6 @@
#include <utils.h>
#include <widget_core.h>
enum g_type { g_content, g_action };
enum g_direction {
horizontal,
vertical,
};
typedef struct {
uint32_t id;
void *element;
enum w_type type;
enum g_type g_type;
bool is_default;
} group_el_t;
typedef struct group_el_init_t {
enum w_type type;
bool is_default;
@@ -27,6 +12,9 @@ typedef struct group_el_init_t {
char label[DIALOGUE_TITLE];
uint32_t length;
enum g_direction direction;
union {
int64_t num;
} val;
struct group_el_init_t *children;
} group_el_init_t;
src/widget/input.h
+5 -5
View File
@@ -8,11 +8,11 @@
typedef struct {
widget_t w;
char value[INPUT_TEXT];
uint32_t cur_pos; /* is relative to the end of a string */
uint32_t value_len;
uint32_t max_len;
uint32_t is_disabled : 1;
uint32_t is_hidden : 1;
int64_t cur_pos; /* is relative to the end of a string */
int64_t value_len;
int64_t max_len;
bool is_disabled;
bool is_hidden;
} input_t;
input_t *init_input(WINDOW **win, widget_t *w_parent, char *label,