aboutsummaryrefslogtreecommitdiff
path: root/src/hci/tui
diff options
context:
space:
mode:
Diffstat (limited to 'src/hci/tui')
-rw-r--r--src/hci/tui/login_ui.c2
-rw-r--r--src/hci/tui/settings_ui.c6
-rw-r--r--src/hci/tui/widget_ui.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/hci/tui/login_ui.c b/src/hci/tui/login_ui.c
index b76afb9..9c51488 100644
--- a/src/hci/tui/login_ui.c
+++ b/src/hci/tui/login_ui.c
@@ -67,7 +67,7 @@ int login_ui ( void ) {
/* Construct user interface */
memset ( &widgets, 0, sizeof ( widgets ) );
- init_widgets ( &widgets.widgets, NULL );
+ init_widgets ( &widgets.widgets );
init_label ( &widgets.username_label, USERNAME_LABEL_ROW, WIDGET_COL,
WIDGET_WIDTH, "Username" );
init_label ( &widgets.password_label, PASSWORD_LABEL_ROW, WIDGET_COL,
diff --git a/src/hci/tui/settings_ui.c b/src/hci/tui/settings_ui.c
index 53bf24d..045d978 100644
--- a/src/hci/tui/settings_ui.c
+++ b/src/hci/tui/settings_ui.c
@@ -253,7 +253,7 @@ static void draw_setting_row ( struct settings_ui *ui ) {
static int edit_setting ( struct settings_ui *ui, int key ) {
assert ( ui->row.setting.name != NULL );
ui->row.editing = 1;
- return edit_widget ( &ui->widgets, &ui->row.editbox.widget, key );
+ return edit_widget ( &ui->row.editbox.widget, key );
}
/**
@@ -457,7 +457,7 @@ static int main_loop ( struct settings *settings ) {
/* Print initial screen content */
color_set ( CPAIR_NORMAL, NULL );
memset ( &ui, 0, sizeof ( ui ) );
- init_widgets ( &ui.widgets, NULL );
+ init_widgets ( &ui.widgets );
select_settings ( &ui, settings );
while ( 1 ) {
@@ -481,7 +481,7 @@ static int main_loop ( struct settings *settings ) {
assert ( ui.row.setting.name != NULL );
/* Redraw edit box */
- draw_widget ( &ui.widgets, &ui.row.editbox.widget );
+ draw_widget ( &ui.row.editbox.widget );
/* Process keypress */
key = edit_setting ( &ui, getkey ( 0 ) );
diff --git a/src/hci/tui/widget_ui.c b/src/hci/tui/widget_ui.c
index 5079eef..961545c 100644
--- a/src/hci/tui/widget_ui.c
+++ b/src/hci/tui/widget_ui.c
@@ -68,7 +68,7 @@ static int widget_ui_loop ( struct widgets *widgets ) {
/* Draw all widgets */
list_for_each_entry ( widget, &widgets->list, list )
- draw_widget ( widgets, widget );
+ draw_widget ( widget );
/* Count editable widgets */
count = 0;
@@ -85,10 +85,10 @@ static int widget_ui_loop ( struct widgets *widgets ) {
return -ENOENT;
/* Redraw current widget */
- draw_widget ( widgets, widget );
+ draw_widget ( widget );
/* Process keypress */
- key = edit_widget ( widgets, widget, getkey ( 0 ) );
+ key = edit_widget ( widget, getkey ( 0 ) );
switch ( key ) {
case KEY_UP:
if ( current > 0 )