goptions: enable combo box hiding

[fio.git] / goptions.c

diff --git a/goptions.c b/goptions.c
index f1148bf44884578948db36adf6fc26d31b9a882e..ab6c815a843e882ee5ee2cf5e6a0e31e11259b02 100644 (file)
--- a/goptions.c
+++ b/goptions.c
@@ -108,6 +108,9 @@ static void gopt_set_children_visible(struct fio_option *parent,
        struct fio_option *o;
        int i;
 
+       if (parent->hide_on_set)
+               visible = !visible;
+
        /*
         * This isn't super fast, but it should not be an issue. If it is, we
         * can speed it up by caching the lookup at least. Or we can do it
@@ -173,12 +176,13 @@ static struct gopt *gopt_new_str_store(struct fio_option *o, const char *text,
        if (text)
                gtk_entry_set_text(GTK_ENTRY(s->entry), text);
        gtk_entry_set_editable(GTK_ENTRY(s->entry), 1);
-       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);
 
        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;
@@ -189,8 +193,10 @@ static void gopt_combo_changed(GtkComboBox *box, gpointer data)
 {
        struct gopt_combo *c = (struct gopt_combo *) data;
        struct fio_option *o = &fio_options[c->gopt.opt_index];
+       unsigned int index;
 
-       printf("combo %s changed\n", o->name);
+       index = gtk_combo_box_get_active(GTK_COMBO_BOX(c->combo));
+       gopt_set_children_visible(o, index);
 }
 
 static void gopt_combo_destroy(GtkWidget *w, gpointer data)
@@ -218,7 +224,6 @@ static struct gopt_combo *__gopt_new_combo(struct fio_option *o,
 
        c->combo = gtk_combo_box_new_text();
        gopt_mark_index(&c->gopt, idx);
-       c->gopt.sig_handler = g_signal_connect(GTK_OBJECT(c->combo), "changed", G_CALLBACK(gopt_combo_changed), c);
        g_signal_connect(GTK_OBJECT(c->combo), "destroy", G_CALLBACK(gopt_combo_destroy), c);
 
        gtk_box_pack_start(GTK_BOX(c->gopt.box), c->combo, FALSE, FALSE, 0);
@@ -231,16 +236,16 @@ static struct gopt_combo *__gopt_new_combo(struct fio_option *o,
 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))
@@ -249,31 +254,33 @@ static struct gopt *gopt_new_combo_str(struct fio_option *o, const char *text,
                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)
 {
-       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)