UI: gets rid of char accumulator and use everywhere wchar_t
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
#include <stdint.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <ncursesw/ncurses.h>
|
||||
#include <widget.h>
|
||||
@@ -19,11 +20,15 @@ void asa_modal_dialogue_callback(w_cb_args_t *args) {
|
||||
d_args.element = app->active_widget;
|
||||
w_input_t *in_ip = d->g_content->elements[0].element;
|
||||
w_input_t *in_port = d->g_content->elements[1].element;
|
||||
char *ip_val = w_input_get_value(in_ip);
|
||||
char *port_val = w_input_get_value(in_port);
|
||||
w_dialogue_callback_default(&d_args);
|
||||
if (d_args.resp_data.code == cbrp_val) {
|
||||
switch (d_args.resp_data.val.val.num) {
|
||||
case 1:
|
||||
get_ip_port(app->params, in_ip->value, in_port->value);
|
||||
get_ip_port(app->params, ip_val, port_val);
|
||||
free(ip_val);
|
||||
free(port_val);
|
||||
if (connect_to_server(app)) {
|
||||
d->needs_destroy = true;
|
||||
app->query_args->state = S_WAIT_SERVER;
|
||||
|
||||
@@ -21,20 +21,24 @@ void init_login_credentials_modal_cb(w_cb_args_t *args) {
|
||||
d_args.element = app->active_widget;
|
||||
w_input_t *in_name = d->g_content->elements[0].element;
|
||||
w_input_t *in_pass = d->g_content->elements[1].element;
|
||||
char *name_value = w_input_get_value(in_name);
|
||||
char *pass_value = w_input_get_value(in_pass);
|
||||
w_dialogue_callback_default(&d_args);
|
||||
if (d_args.resp_data.code == cbrp_val) {
|
||||
switch (d_args.resp_data.val.val.num) {
|
||||
case 1:
|
||||
app->params->uname = malloc(in_name->value_len + 1);
|
||||
app->params->pass = malloc(in_pass->value_len + 1);
|
||||
strncpy(app->params->uname, in_name->value, in_name->value_len);
|
||||
strncpy(app->params->uname, name_value, in_name->value_len);
|
||||
app->params->uname[in_name->value_len] = 0;
|
||||
strncpy(app->params->pass, in_pass->value, in_pass->value_len);
|
||||
strncpy(app->params->pass, pass_value, in_pass->value_len);
|
||||
app->params->pass[in_pass->value_len] = 0;
|
||||
server_send_string(app->query_args, app->params->uname);
|
||||
app->query_args->state = S_WAIT_SERVER;
|
||||
d->needs_destroy = true;
|
||||
app_draw_bars(app);
|
||||
free(name_value);
|
||||
free(pass_value);
|
||||
break;
|
||||
case 2:
|
||||
app->query_args->state = S_ASK_LOGIN_TYPE;
|
||||
|
||||
+12
-6
@@ -37,6 +37,12 @@ void init_register_modal_cb(w_cb_args_t *args) {
|
||||
w_input_t *in_email = d->g_content->elements[2].element;
|
||||
w_input_t *in_pass = g_passwords->elements[0].element;
|
||||
w_input_t *in_pass_r = g_passwords->elements[1].element;
|
||||
|
||||
char *name_value = w_input_get_value(in_name);
|
||||
char *email_value = w_input_get_value(in_email);
|
||||
char *pass_value = w_input_get_value(in_pass);
|
||||
char *pass_r_value = w_input_get_value(in_pass_r);
|
||||
|
||||
if (in_name->value_len == 0) {
|
||||
w_alert("Name field is empty!");
|
||||
return;
|
||||
@@ -49,22 +55,22 @@ void init_register_modal_cb(w_cb_args_t *args) {
|
||||
w_alert("One of password's field is empty!");
|
||||
return;
|
||||
}
|
||||
if (strcmp(in_pass->value, in_pass_r->value)) {
|
||||
if (strcmp(pass_value, pass_r_value)) {
|
||||
w_alert("Your passwords do not match!");
|
||||
in_pass->value[0] = '\0';
|
||||
in_pass->w_value[0] = '\0';
|
||||
in_pass->value_len = 0;
|
||||
in_pass_r->value[0] = '\0';
|
||||
in_pass_r->w_value[0] = '\0';
|
||||
in_pass_r->value_len = 0;
|
||||
return;
|
||||
}
|
||||
app->params->uname = malloc(in_name->value_len + 1);
|
||||
app->params->pass = malloc(in_pass->value_len + 1);
|
||||
strncpy(app->params->uname, in_name->value, in_name->value_len);
|
||||
strncpy(app->params->uname, name_value, in_name->value_len);
|
||||
app->params->uname[in_name->value_len] = 0;
|
||||
strncpy(app->params->pass, in_pass->value, in_pass->value_len);
|
||||
strncpy(app->params->pass, pass_value, in_pass->value_len);
|
||||
app->params->pass[in_pass->value_len] = 0;
|
||||
server_send_string(app->query_args, "register %s %s %*s\n", app->params->uname,
|
||||
app->params->pass, (int)in_email->value_len, in_email->value
|
||||
app->params->pass, (int)in_email->value_len, email_value
|
||||
);
|
||||
app->query_args->state = S_WAIT_REGISTER_CONFIRMATION;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user