X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ui%2Fncurses%2Fnc-widgets.c;h=f82192939dd968d1dfd4ce2f889cbb382b1d6d8b;hb=a240e296ac2ecf8934f71cb23946fc77101cdfd6;hp=bd78927781f2c6dc830dd514bd5d97a9128b5c1f;hpb=5171b1c54fc57b6f1963e2482cfc07587296100d;p=petitboot

diff --git a/ui/ncurses/nc-widgets.c b/ui/ncurses/nc-widgets.c
index bd78927..f821929 100644
--- a/ui/ncurses/nc-widgets.c
+++ b/ui/ncurses/nc-widgets.c
@@ -689,19 +689,26 @@ static void widget_focus_change(struct nc_widget *widget, FIELD *field,
 bool widgetset_process_key(struct nc_widgetset *set, int key)
 {
 	struct nc_widget *widget;
-	FIELD *field;
+	FIELD *field, *tmp;
 	int req = 0;
+	bool tab;
 
 	field = current_field(set->form);
 	assert(field);
 
+	tab = false;
+
 	/* handle field change events */
 	switch (key) {
 	case KEY_BTAB:
+		tab = true;
+		/* fall through */
 	case KEY_UP:
 		req = REQ_PREV_FIELD;
 		break;
 	case '\t':
+		tab = true;
+		/* fall through */
 	case KEY_DOWN:
 		req = REQ_NEXT_FIELD;
 		break;
@@ -717,8 +724,18 @@ bool widgetset_process_key(struct nc_widgetset *set, int key)
 	if (req) {
 		widget_focus_change(widget, field, false);
 		form_driver(set->form, req);
-		form_driver(set->form, REQ_END_FIELD);
+
+		/* if we're doing a tabbed-field-change, skip until we
+		 * see the next widget */
+		tmp = field;
 		field = current_field(set->form);
+
+		for (; tab && tmp != field && field_userptr(field) == widget;) {
+			form_driver(set->form, req);
+			field = current_field(set->form);
+		}
+
+		form_driver(set->form, REQ_END_FIELD);
 		widget = field_userptr(field);
 		widget_focus_change(widget, field, true);
 		if (widget->field_focus)
@@ -860,6 +877,10 @@ void widget_move(struct nc_widget *widget, int y, int x)
 
 	widget->x = x;
 	widget->y = y;
+
+	if (x + widget->width > COLS)
+		pb_debug("%s: Widget at %d,%d runs over pad! (%d)", __func__,
+		       y, x, x + widget->width);
 }
 
 int widget_height(struct nc_widget *widget)