X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=goptions.c;h=f7ba3038fafe1e7a9007394542f6d75160ed8278;hp=230fe3c4cc20cfcbb0d782db13e0156f3ca15358;hb=4fbcd659ecc502d19f31e86359d32cb51324a110;hpb=b6caa83661e729c8fab46998fc75447dc1a3e06c

diff --git a/goptions.c b/goptions.c
index 230fe3c4..f7ba3038 100644
--- a/goptions.c
+++ b/goptions.c
@@ -15,6 +15,7 @@ struct gopt {
 	GtkWidget *box;
 	unsigned int opt_index;
 	unsigned int opt_type;
+	gulong sig_handler;
 };
 
 struct gopt_combo {
@@ -24,6 +25,7 @@ struct gopt_combo {
 
 struct gopt_int {
 	struct gopt gopt;
+	unsigned int lastval;
 	GtkWidget *spin;
 };
 
@@ -37,6 +39,13 @@ struct gopt_str {
 	GtkWidget *entry;
 };
 
+struct gopt_str_val {
+	struct gopt gopt;
+	GtkWidget *spin;
+	GtkWidget *combo;
+	unsigned int maxindex;
+};
+
 #define GOPT_RANGE_SPIN	4
 
 struct gopt_range {
@@ -44,12 +53,57 @@ struct gopt_range {
 	GtkWidget *spins[GOPT_RANGE_SPIN];
 };
 
-static GtkWidget *widgets[FIO_MAX_OPTS];
+struct gopt_str_multi {
+	struct gopt gopt;
+	GtkWidget *checks[PARSE_MAX_VP];
+};
+
+static GtkWidget *gopt_widgets[FIO_MAX_OPTS];
+
+struct gopt_frame_widget {
+	GtkWidget *vbox[2];
+	unsigned int nr;
+};
+static struct gopt_frame_widget gopt_g_widgets[__FIO_OPT_G_NR];
+
+static GtkWidget *gopt_get_group_frame(GtkWidget *box, unsigned int groupmask)
+{
+	unsigned int mask, group;
+	struct opt_group *og;
+	GtkWidget *frame, *hbox;
+	struct gopt_frame_widget *gfw;
+
+	if (!groupmask)
+		return 0;
+
+	mask = groupmask;
+	og = opt_group_cat_from_mask(&mask);
+	if (!og)
+		return NULL;
+
+	group = ffz(~groupmask);
+	gfw = &gopt_g_widgets[group];
+	if (!gfw->vbox[0]) {
+		frame = gtk_frame_new(og->name);
+		gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 3);
+		hbox = gtk_hbox_new(FALSE, 0);
+		gtk_container_add(GTK_CONTAINER(frame), hbox);
+		gfw->vbox[0] = gtk_vbox_new(TRUE, 5);
+		gfw->vbox[1] = gtk_vbox_new(TRUE, 5);
+		gtk_box_pack_start(GTK_BOX(hbox), gfw->vbox[0], TRUE, TRUE, 5);
+		gtk_box_pack_start(GTK_BOX(hbox), gfw->vbox[1], TRUE, TRUE, 5);
+	}
+
+	hbox = gtk_hbox_new(FALSE, 3);
+	gtk_box_pack_start(GTK_BOX(gfw->vbox[gfw->nr++ & 1]), hbox, FALSE, FALSE, 5);
+	return hbox;
+}
 
 /*
  * Mark children as invisible, if needed.
  */
-static void gopt_set_children_visible(struct fio_option *parent, gboolean visible)
+static void gopt_set_children_visible(struct fio_option *parent,
+				      gboolean visible)
 {
 	struct fio_option *o;
 	int i;
@@ -61,16 +115,14 @@ static void gopt_set_children_visible(struct fio_option *parent, gboolean visibl
 	 */
 	for (i = 0; fio_options[i].name; i++) {
 		o = &fio_options[i];
-		if (!o->parent)
+		if (!o->parent || !o->hide)
 			continue;
 
 		if (strcmp(parent->name, o->parent))
 			continue;
 
-		/*
-		 * This doesn't work for either the box or the widget itself...
-		 */
-		gtk_widget_set_sensitive(widgets[i], visible);
+		if (gopt_widgets[i])
+			gtk_widget_set_sensitive(gopt_widgets[i], visible);
 	}
 }
 
@@ -86,34 +138,51 @@ static void gopt_str_changed(GtkEntry *entry, gpointer data)
 	gopt_set_children_visible(o, set);
 }
 
-static void gopt_mark_index(struct gopt *gopt, GtkWidget *widget, unsigned int idx)
+static void gopt_mark_index(struct gopt *gopt, unsigned int idx)
 {
+	assert(!gopt_widgets[idx]);
 	gopt->opt_index = idx;
-	widgets[idx] = widget;
+	gopt_widgets[idx] = gopt->box;
 }
 
-static struct gopt *gopt_new_str_store(struct fio_option *o, const char *text, unsigned int idx)
+static void gopt_str_destroy(GtkWidget *w, gpointer data)
+{
+	struct gopt_str *s = (struct gopt_str *) data;
+
+	free(s);
+	gtk_widget_destroy(w);
+}
+
+static struct gopt *gopt_new_str_store(struct fio_option *o, const char *text,
+				       unsigned int idx)
 {
 	struct gopt_str *s;
 	GtkWidget *label;
 
 	s = malloc(sizeof(*s));
+	memset(s, 0, sizeof(*s));
 
 	s->gopt.box = gtk_hbox_new(FALSE, 3);
-	label = gtk_label_new(o->name);
-	gtk_box_pack_start(GTK_BOX(s->gopt.box), label, FALSE, FALSE, 0);
+	if (!o->lname)
+		label = gtk_label_new(o->name);
+	else
+		label = gtk_label_new(o->lname);
 
 	s->entry = gtk_entry_new();
-	gopt_mark_index(&s->gopt, s->gopt.box, idx);
+	gopt_mark_index(&s->gopt, idx);
 	if (text)
 		gtk_entry_set_text(GTK_ENTRY(s->entry), text);
 	gtk_entry_set_editable(GTK_ENTRY(s->entry), 1);
-	g_signal_connect(GTK_OBJECT(s->entry), "changed", G_CALLBACK(gopt_str_changed), s);
 
 	if (o->def)
 		gtk_entry_set_text(GTK_ENTRY(s->entry), o->def);
 
+	s->gopt.sig_handler = g_signal_connect(GTK_OBJECT(s->entry), "changed", G_CALLBACK(gopt_str_changed), s);
+	g_signal_connect(GTK_OBJECT(s->entry), "destroy", G_CALLBACK(gopt_str_destroy), s);
+
 	gtk_box_pack_start(GTK_BOX(s->gopt.box), s->entry, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(s->gopt.box), label, FALSE, FALSE, 0);
+	o->gui_data = s;
 	return &s->gopt;
 }
 
@@ -125,38 +194,53 @@ static void gopt_combo_changed(GtkComboBox *box, gpointer data)
 	printf("combo %s changed\n", o->name);
 }
 
-static struct gopt_combo *__gopt_new_combo(struct fio_option *o, unsigned int idx)
+static void gopt_combo_destroy(GtkWidget *w, gpointer data)
+{
+	struct gopt_combo *c = (struct gopt_combo *) data;
+
+	free(c);
+	gtk_widget_destroy(w);
+}
+
+static struct gopt_combo *__gopt_new_combo(struct fio_option *o,
+					   unsigned int idx)
 {
 	struct gopt_combo *c;
 	GtkWidget *label;
 
 	c = malloc(sizeof(*c));
+	memset(c, 0, sizeof(*c));
 
 	c->gopt.box = gtk_hbox_new(FALSE, 3);
-	label = gtk_label_new(o->name);
-	gtk_box_pack_start(GTK_BOX(c->gopt.box), label, FALSE, FALSE, 0);
+	if (!o->lname)
+		label = gtk_label_new(o->name);
+	else
+		label = gtk_label_new(o->lname);
 
 	c->combo = gtk_combo_box_new_text();
-	gopt_mark_index(&c->gopt, c->gopt.box, idx);
-	gtk_box_pack_start(GTK_BOX(c->gopt.box), c->combo, FALSE, FALSE, 0);
+	gopt_mark_index(&c->gopt, idx);
+	g_signal_connect(GTK_OBJECT(c->combo), "destroy", G_CALLBACK(gopt_combo_destroy), c);
 
-	g_signal_connect(GTK_OBJECT(c->combo), "changed", G_CALLBACK(gopt_combo_changed), c);
+	gtk_box_pack_start(GTK_BOX(c->gopt.box), c->combo, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(c->gopt.box), label, FALSE, FALSE, 0);
 
+	o->gui_data = c;
 	return c;
 }
 
-static struct gopt *gopt_new_combo_str(struct fio_option *o, const char *text, unsigned int idx)
+static struct gopt *gopt_new_combo_str(struct fio_option *o, const char *text,
+				       unsigned int idx)
 {
-	struct gopt_combo *combo;
+	struct gopt_combo *c;
 	struct value_pair *vp;
 	int i, active = 0;
 
-	combo = __gopt_new_combo(o, idx);
+	c = __gopt_new_combo(o, idx);
 
 	i = 0;
 	vp = &o->posval[0];
 	while (vp->ival) {
-		gtk_combo_box_append_text(GTK_COMBO_BOX(combo->combo), vp->ival);
+		gtk_combo_box_append_text(GTK_COMBO_BOX(c->combo), vp->ival);
 		if (o->def && !strcmp(vp->ival, o->def))
 			active = i;
 		if (text && !strcmp(vp->ival, text))
@@ -165,42 +249,104 @@ static struct gopt *gopt_new_combo_str(struct fio_option *o, const char *text, u
 		i++;
 	}
 
-	gtk_combo_box_set_active(GTK_COMBO_BOX(combo->combo), active);
-	return &combo->gopt;
+	gtk_combo_box_set_active(GTK_COMBO_BOX(c->combo), active);
+	c->gopt.sig_handler = g_signal_connect(GTK_OBJECT(c->combo), "changed", G_CALLBACK(gopt_combo_changed), c);
+	return &c->gopt;
 }
 
-static struct gopt *gopt_new_combo_int(struct fio_option *o, unsigned int *ip, unsigned int idx)
+static struct gopt *gopt_new_combo_int(struct fio_option *o, unsigned int *ip,
+				       unsigned int idx)
 {
-	struct gopt_combo *combo;
+	struct gopt_combo *c;
 	struct value_pair *vp;
 	int i, active = 0;
 
-	combo = __gopt_new_combo(o, idx);
+	c = __gopt_new_combo(o, idx);
 
 	i = 0;
 	vp = &o->posval[0];
 	while (vp->ival) {
-		gtk_combo_box_append_text(GTK_COMBO_BOX(combo->combo), vp->ival);
+		gtk_combo_box_append_text(GTK_COMBO_BOX(c->combo), vp->ival);
 		if (ip && vp->oval == *ip)
 			active = i;
 		vp++;
 		i++;
 	}
 
-	gtk_combo_box_set_active(GTK_COMBO_BOX(combo->combo), active);
-	return &combo->gopt;
+	gtk_combo_box_set_active(GTK_COMBO_BOX(c->combo), active);
+	c->gopt.sig_handler = g_signal_connect(GTK_OBJECT(c->combo), "changed", G_CALLBACK(gopt_combo_changed), c);
+	return &c->gopt;
+}
+
+static struct gopt *gopt_new_str_multi(struct fio_option *o, unsigned int idx)
+{
+	struct gopt_str_multi *m;
+	struct value_pair *vp;
+	GtkWidget *frame, *hbox;
+	int i;
+
+	m = malloc(sizeof(*m));
+	memset(m, 0, sizeof(*m));
+	m->gopt.box = gtk_hbox_new(FALSE, 3);
+	gopt_mark_index(&m->gopt, idx);
+
+	if (!o->lname)
+		frame = gtk_frame_new(o->name);
+	else
+		frame = gtk_frame_new(o->lname);
+	gtk_box_pack_start(GTK_BOX(m->gopt.box), frame, FALSE, FALSE, 3);
+
+	hbox = gtk_hbox_new(FALSE, 3);
+	gtk_container_add(GTK_CONTAINER(frame), hbox);
+
+	i = 0;
+	vp = &o->posval[0];
+	while (vp->ival) {
+		m->checks[i] = gtk_check_button_new_with_label(vp->ival);
+		gtk_widget_set_tooltip_text(m->checks[i], vp->help);
+		gtk_box_pack_start(GTK_BOX(hbox), m->checks[i], FALSE, FALSE, 3);
+		vp++;
+	}
+
+	return &m->gopt;
 }
 
 static void gopt_int_changed(GtkSpinButton *spin, gpointer data)
 {
 	struct gopt_int *i = (struct gopt_int *) data;
 	struct fio_option *o = &fio_options[i->gopt.opt_index];
+	GtkAdjustment *adj;
+	int value, delta;
+
+	adj = gtk_spin_button_get_adjustment(spin);
+	value = gtk_adjustment_get_value(adj);
+	delta = value - i->lastval;
+	i->lastval = value;
+
+	if (o->inv_opt) {
+		struct gopt_int *i_inv = o->inv_opt->gui_data;
+		int cur_val;
+
+		assert(o->type == o->inv_opt->type);
 
-	printf("int %s changed\n", o->name);
+		cur_val = gtk_spin_button_get_value(GTK_SPIN_BUTTON(i_inv->spin));
+		cur_val -= delta;
+		g_signal_handler_block(G_OBJECT(i_inv->spin), i_inv->gopt.sig_handler);
+		gtk_spin_button_set_value(GTK_SPIN_BUTTON(i_inv->spin), cur_val);
+		g_signal_handler_unblock(G_OBJECT(i_inv->spin), i_inv->gopt.sig_handler);
+	}
 }
 
-static struct gopt_int *__gopt_new_int(struct fio_option *o, unsigned long long *p,
-				       unsigned int idx)
+static void gopt_int_destroy(GtkWidget *w, gpointer data)
+{
+	struct gopt_int *i = (struct gopt_int *) data;
+
+	free(i);
+	gtk_widget_destroy(w);
+}
+
+static struct gopt_int *__gopt_new_int(struct fio_option *o,
+				       unsigned long long *p, unsigned int idx)
 {
 	unsigned long long defval;
 	struct gopt_int *i;
@@ -208,9 +354,12 @@ static struct gopt_int *__gopt_new_int(struct fio_option *o, unsigned long long
 	GtkWidget *label;
 
 	i = malloc(sizeof(*i));
+	memset(i, 0, sizeof(*i));
 	i->gopt.box = gtk_hbox_new(FALSE, 3);
-	label = gtk_label_new(o->name);
-	gtk_box_pack_start(GTK_BOX(i->gopt.box), label, FALSE, FALSE, 0);
+	if (!o->lname)
+		label = gtk_label_new(o->name);
+	else
+		label = gtk_label_new(o->lname);
 
 	maxval = o->maxval;
 	if (!maxval)
@@ -231,18 +380,22 @@ static struct gopt_int *__gopt_new_int(struct fio_option *o, unsigned long long
 		interval = o->interval;
 
 	i->spin = gtk_spin_button_new_with_range(o->minval, maxval, interval);
-	gopt_mark_index(&i->gopt, i->gopt.box, idx);
+	gopt_mark_index(&i->gopt, idx);
 	gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(i->spin), GTK_UPDATE_IF_VALID);
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(i->spin), defval);
+	i->lastval = defval;
+	i->gopt.sig_handler = g_signal_connect(G_OBJECT(i->spin), "value-changed", G_CALLBACK(gopt_int_changed), i);
+	g_signal_connect(G_OBJECT(i->spin), "destroy", G_CALLBACK(gopt_int_destroy), i);
 
 	gtk_box_pack_start(GTK_BOX(i->gopt.box), i->spin, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(i->gopt.box), label, FALSE, FALSE, 0);
 
-	g_signal_connect(G_OBJECT(i->spin), "value-changed", G_CALLBACK(gopt_int_changed), i);
-
+	o->gui_data = i;
 	return i;
 }
 
-static struct gopt *gopt_new_int(struct fio_option *o, unsigned int *ip, unsigned int idx)
+static struct gopt *gopt_new_int(struct fio_option *o, unsigned int *ip,
+				 unsigned int idx)
 {
 	unsigned long long ullp;
 	struct gopt_int *i;
@@ -272,31 +425,60 @@ static void gopt_bool_toggled(GtkToggleButton *button, gpointer data)
 	gboolean set;
 
 	set = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(b->check));
+
+	if (o->inv_opt) {
+		struct gopt_bool *b_inv = o->inv_opt->gui_data;
+
+		assert(o->type == o->inv_opt->type);
+
+		g_signal_handler_block(G_OBJECT(b_inv->check), b_inv->gopt.sig_handler);
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(b_inv->check), !set);
+		g_signal_handler_unblock(G_OBJECT(b_inv->check), b_inv->gopt.sig_handler);
+	}
+
 	gopt_set_children_visible(o, set);
 }
 
-static struct gopt *gopt_new_bool(struct fio_option *o, unsigned int *val, unsigned int idx)
+static void gopt_bool_destroy(GtkWidget *w, gpointer data)
+{
+	struct gopt_bool *b = (struct gopt_bool *) data;
+
+	free(b);
+	gtk_widget_destroy(w);
+}
+
+static struct gopt *gopt_new_bool(struct fio_option *o, unsigned int *val,
+				  unsigned int idx)
 {
 	struct gopt_bool *b;
 	GtkWidget *label;
 	int defstate = 0;
 
 	b = malloc(sizeof(*b));
+	memset(b, 0, sizeof(*b));
 	b->gopt.box = gtk_hbox_new(FALSE, 3);
-	label = gtk_label_new(o->name);
-	gtk_box_pack_start(GTK_BOX(b->gopt.box), label, FALSE, FALSE, 0);
+	if (!o->lname)
+		label = gtk_label_new(o->name);
+	else
+		label = gtk_label_new(o->lname);
 
 	b->check = gtk_check_button_new();
-	gopt_mark_index(&b->gopt, b->gopt.box, idx);
+	gopt_mark_index(&b->gopt, idx);
 	if (val)
 		defstate = *val;
 	else if (o->def && !strcmp(o->def, "1"))
 		defstate = 1;
 
+	if (o->neg)
+		defstate = !defstate;
+
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(b->check), defstate);
-	g_signal_connect(G_OBJECT(b->check), "toggled", G_CALLBACK(gopt_bool_toggled), b);
+	b->gopt.sig_handler = g_signal_connect(G_OBJECT(b->check), "toggled", G_CALLBACK(gopt_bool_toggled), b);
+	g_signal_connect(G_OBJECT(b->check), "destroy", G_CALLBACK(gopt_bool_destroy), b);
 
 	gtk_box_pack_start(GTK_BOX(b->gopt.box), b->check, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(b->gopt.box), label, FALSE, FALSE, 0);
+	o->gui_data = b;
 	return &b->gopt;
 }
 
@@ -340,6 +522,14 @@ static void range_value_changed(GtkSpinButton *spin, gpointer data)
 	}
 }
 
+static void gopt_range_destroy(GtkWidget *w, gpointer data)
+{
+	struct gopt_range *r = (struct gopt_range *) data;
+
+	free(r);
+	gtk_widget_destroy(w);
+}
+
 static struct gopt *gopt_new_int_range(struct fio_option *o, unsigned int **ip,
 				       unsigned int idx)
 {
@@ -350,10 +540,13 @@ static struct gopt *gopt_new_int_range(struct fio_option *o, unsigned int **ip,
 	int i;
 
 	r = malloc(sizeof(*r));
+	memset(r, 0, sizeof(*r));
 	r->gopt.box = gtk_hbox_new(FALSE, 3);
-	gopt_mark_index(&r->gopt, r->gopt.box, idx);
-	label = gtk_label_new(o->name);
-	gtk_box_pack_start(GTK_BOX(r->gopt.box), label, FALSE, FALSE, 0);
+	gopt_mark_index(&r->gopt, idx);
+	if (!o->lname)
+		label = gtk_label_new(o->name);
+	else
+		label = gtk_label_new(o->lname);
 
 	maxval = o->maxval;
 	if (!maxval)
@@ -383,16 +576,105 @@ static struct gopt *gopt_new_int_range(struct fio_option *o, unsigned int **ip,
 		g_signal_connect(G_OBJECT(r->spins[i]), "value-changed", G_CALLBACK(range_value_changed), r);
 	}
 
+	gtk_box_pack_start(GTK_BOX(r->gopt.box), label, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(r->gopt.box), "destroy", G_CALLBACK(gopt_range_destroy), r);
+	o->gui_data = r;
 	return &r->gopt;
 }
 
+static void gopt_str_val_destroy(GtkWidget *w, gpointer data)
+{
+	struct gopt_str_val *g = (struct gopt_str_val *) data;
+
+	free(g);
+	gtk_widget_destroy(w);
+}
+
+static void gopt_str_val_spin_wrapped(GtkSpinButton *spin, gpointer data)
+{
+	struct gopt_str_val *g = (struct gopt_str_val *) data;
+	unsigned int val;
+	GtkAdjustment *adj;
+	gint index;
+
+	adj = gtk_spin_button_get_adjustment(spin);
+	val = gtk_adjustment_get_value(adj);
+
+	/*
+	 * Can't rely on exact value, as fast changes increment >= 1
+	 */
+	if (!val) {
+		index = gtk_combo_box_get_active(GTK_COMBO_BOX(g->combo));
+		if (index + 1 <= g->maxindex) {
+			val = 1;
+			gtk_combo_box_set_active(GTK_COMBO_BOX(g->combo), ++index);
+		} else
+			val = 1023;
+		gtk_spin_button_set_value(spin, val);
+	} else {
+		index = gtk_combo_box_get_active(GTK_COMBO_BOX(g->combo));
+		if (index) {
+			gtk_combo_box_set_active(GTK_COMBO_BOX(g->combo), --index);
+			gtk_spin_button_set_value(spin, 1023);
+		} else
+			gtk_spin_button_set_value(spin, 0);
+	}
+}
+
+static struct gopt *gopt_new_str_val(struct fio_option *o,
+				     unsigned long long *p, unsigned int idx)
+{
+	struct gopt_str_val *g;
+	const gchar *postfix[] = { "B", "KB", "MB", "GB", "PB", "TB", "" };
+	GtkWidget *label;
+	int i;
+
+	g = malloc(sizeof(*g));
+	memset(g, 0, sizeof(*g));
+	g->gopt.box = gtk_hbox_new(FALSE, 3);
+	if (!o->lname)
+		label = gtk_label_new(o->name);
+	else
+		label = gtk_label_new(o->lname);
+
+	g->spin = gtk_spin_button_new_with_range(0.0, 1023.0, 1.0);
+	gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(g->spin), GTK_UPDATE_IF_VALID);
+	gtk_spin_button_set_value(GTK_SPIN_BUTTON(g->spin), 0);
+	gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(g->spin), 1);
+	gtk_box_pack_start(GTK_BOX(g->gopt.box), g->spin, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(g->spin), "wrapped", G_CALLBACK(gopt_str_val_spin_wrapped), g);
+
+	g->combo = gtk_combo_box_new_text();
+	i = 0;
+	while (strlen(postfix[i])) {
+		gtk_combo_box_append_text(GTK_COMBO_BOX(g->combo), postfix[i]);
+		i++;
+	}
+	g->maxindex = i - 1;
+	gtk_combo_box_set_active(GTK_COMBO_BOX(g->combo), 0);
+	gtk_box_pack_start(GTK_BOX(g->gopt.box), g->combo, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(g->gopt.box), label, FALSE, FALSE, 3);
+
+	g_signal_connect(G_OBJECT(g->gopt.box), "destroy", G_CALLBACK(gopt_str_val_destroy), g);
+	o->gui_data = g;
+	return &g->gopt;
+}
+
 static void gopt_add_option(GtkWidget *hbox, struct fio_option *o,
 			    unsigned int opt_index, struct thread_options *to)
 {
 	struct gopt *go = NULL;
 
 	switch (o->type) {
-	case FIO_OPT_STR_VAL:
+	case FIO_OPT_STR_VAL: {
+		unsigned long long *ullp = NULL;
+
+		if (o->off1)
+			ullp = td_var(to, o->off1);
+
+		go = gopt_new_str_val(o, ullp, opt_index);
+		break;
+		}
 	case FIO_OPT_STR_VAL_TIME: {
 		unsigned long long *ullp = NULL;
 
@@ -422,12 +704,18 @@ static void gopt_add_option(GtkWidget *hbox, struct fio_option *o,
 		break;
 		}
 	case FIO_OPT_STR: {
-		unsigned int *ip = NULL;
+		if (o->posval[0].ival) {
+			unsigned int *ip = NULL;
 
-		if (o->off1)
-			ip = td_var(to, o->off1);
+			if (o->off1)
+				ip = td_var(to, o->off1);
+
+			go = gopt_new_combo_int(o, ip, opt_index);
+		} else {
+			/* TODO: usually ->cb, or unsigned int pointer */
+			go = gopt_new_str_store(o, NULL, opt_index);
+		}
 
-		go = gopt_new_combo_int(o, ip, opt_index);
 		break;
 		}
 	case FIO_OPT_STR_STORE: {
@@ -447,7 +735,7 @@ static void gopt_add_option(GtkWidget *hbox, struct fio_option *o,
 		break;
 		}
 	case FIO_OPT_STR_MULTI:
-		go = gopt_new_combo_str(o, NULL, opt_index);
+		go = gopt_new_str_multi(o, opt_index);
 		break;
 	case FIO_OPT_RANGE: {
 		unsigned int *ip[4] = { td_var(to, o->off1),
@@ -469,11 +757,18 @@ static void gopt_add_option(GtkWidget *hbox, struct fio_option *o,
 	}
 
 	if (go) {
+		GtkWidget *dest;
+
 		if (o->help)
 			gtk_widget_set_tooltip_text(go->box, o->help);
-	
-		gtk_box_pack_start(GTK_BOX(hbox), go->box, FALSE, FALSE, 5);
+
 		go->opt_type = o->type;
+
+		dest = gopt_get_group_frame(hbox, o->group);
+		if (!dest)
+			gtk_box_pack_start(GTK_BOX(hbox), go->box, FALSE, FALSE, 5);
+		else
+			gtk_box_pack_start(GTK_BOX(dest), go->box, FALSE, FALSE, 5);
 	}
 }
 
@@ -482,6 +777,9 @@ static void gopt_add_options(GtkWidget **vboxes, struct thread_options *to)
 	GtkWidget *hbox = NULL;
 	int i;
 
+	/*
+	 * First add all options
+	 */
 	for (i = 0; fio_options[i].name; i++) {
 		struct fio_option *o = &fio_options[i];
 		unsigned int mask = o->category;
@@ -517,8 +815,9 @@ static GtkWidget *gopt_add_group_tab(GtkWidget *notebook, struct opt_group *og)
 static void gopt_add_group_tabs(GtkWidget *notebook, GtkWidget **vbox)
 {
 	struct opt_group *og;
-	unsigned int i = 0;
+	unsigned int i;
 
+	i = 0;
 	do {
 		unsigned int mask = (1U << i);
 
@@ -533,7 +832,7 @@ static void gopt_add_group_tabs(GtkWidget *notebook, GtkWidget **vbox)
 void gopt_get_options_window(GtkWidget *window, struct thread_options *o)
 {
 	GtkWidget *dialog, *notebook;
-	GtkWidget *vboxes[__FIO_OPT_G_NR];
+	GtkWidget *vboxes[__FIO_OPT_C_NR];
 
 	dialog = gtk_dialog_new_with_buttons("Fio options",
 			GTK_WINDOW(window), GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -556,4 +855,6 @@ void gopt_get_options_window(GtkWidget *window, struct thread_options *o)
 	gtk_dialog_run(GTK_DIALOG(dialog));
 
 	gtk_widget_destroy(dialog);
+	memset(gopt_widgets, 0, sizeof(gopt_widgets));
+	memset(gopt_g_widgets, 0, sizeof(gopt_g_widgets));
 }