X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-widgets.c;h=15cec80f3594ae3600f2cecf891db28d4532901e;hp=50909ab6c4af459261cb681995ff4bfe35f1ee35;hb=454f924bbcda7904c4348ef45c3d0d293768a48c;hpb=96f9b8cd29dae248838d4221f3cb1c38e3aa1396

diff --git a/ui/ncurses/nc-widgets.c b/ui/ncurses/nc-widgets.c
index 50909ab..15cec80 100644
--- a/ui/ncurses/nc-widgets.c
+++ b/ui/ncurses/nc-widgets.c
@@ -337,6 +337,14 @@ static bool textbox_process_key(
 	case KEY_DC:
 		form_driver(form, REQ_DEL_CHAR);
 		break;
+	case '\t':
+	case KEY_BTAB:
+	case KEY_UP:
+	case KEY_DOWN:
+	case KEY_PPAGE:
+	case KEY_NPAGE:
+		/* Don't catch navigational keys */
+		return false;
 	default:
 		form_driver(form, key);
 		break;
@@ -466,6 +474,7 @@ static void subset_delete_active(struct nc_widget_subset *subset, int idx)
 	struct nc_widget *widget;
 	size_t rem;
 	int i, val;
+	uint32_t opts;
 
 	/* Shift field focus to nearest active option or next visible field */
 	if (subset->n_active > 1) {
@@ -477,8 +486,11 @@ static void subset_delete_active(struct nc_widget_subset *subset, int idx)
 	} else {
 		for (i = 0; i < set->n_fields; i++)
 			if (field_visible(set->fields[i])) {
-				set->cur_field = set->fields[i];
-				break;
+				opts = field_opts(set->fields[i]);
+				if ((opts & O_ACTIVE) == O_ACTIVE) {
+					set->cur_field = set->fields[i];
+					break;
+				}
 			}
 	}
 
@@ -1106,6 +1118,12 @@ bool widgetset_process_key(struct nc_widgetset *set, int key)
 	field = current_field(set->form);
 	assert(field);
 
+	widget = field_userptr(field);
+
+	if (widget->process_key)
+		if (widget->process_key(widget, set->form, key))
+			return true;
+
 	tab = false;
 
 	/* handle field change events */
@@ -1114,14 +1132,12 @@ bool widgetset_process_key(struct nc_widgetset *set, int key)
 		tab = true;
 		/* fall through */
 	case KEY_UP:
-	case KEY_LEFT:
 		req = REQ_SPREV_FIELD;
 		break;
 	case '\t':
 		tab = true;
 		/* fall through */
 	case KEY_DOWN:
-	case KEY_RIGHT:
 		req = REQ_SNEXT_FIELD;
 		break;
 	case KEY_PPAGE:
@@ -1130,9 +1146,14 @@ bool widgetset_process_key(struct nc_widgetset *set, int key)
 	case KEY_NPAGE:
 		req = REQ_SLAST_FIELD;
 		break;
+	case KEY_LEFT:
+		req = REQ_LEFT_FIELD;
+		break;
+	case KEY_RIGHT:
+		req = REQ_RIGHT_FIELD;
+		break;
 	}
 
-	widget = field_userptr(field);
 	if (req) {
 		widget_focus_change(widget, field, false);
 		form_driver(set->form, req);
@@ -1157,10 +1178,7 @@ bool widgetset_process_key(struct nc_widgetset *set, int key)
 		return true;
 	}
 
-	if (!widget->process_key)
-		return false;
-
-	return widget->process_key(widget, set->form, key);
+	return false;
 }
 
 static int widgetset_destructor(void *ptr)