Changeset 3377 in MondoRescue for branches/3.2/mondo/src/common/newt-specific.c

Timestamp:

May 6, 2015, 1:10:17 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Rename mr_parted2fdisk to mr-parted2fdisk for consistency with all other new mr-* commands
• Adds functions mr_center_string and mr_popup_and_get_string with dynamic allocation to solve a memory allocation issue reported on the ML
• Fix mr_boot_type to detect correctly a UEFI based system

File:

• branches/3.2/mondo/src/common/newt-specific.c (modified) (1 diff)

branches/3.2/mondo/src/common/newt-specific.c

@@ -717 +717 @@
         }
     }
+
+/**
+ * Ask the user to enter a value.
+ * @param title The title of the dialog box.
+ * @param b The blurb (e.g. what you want the user to enter).
+ * @param input The string to initialize the user's answer with.
+ * @return value needs to be freed up by caller
+ */
+char *mr_popup_and_get_string(char *title, char *b, char *input) {
+
+    /*@ newt ************************************************************ */
+    newtComponent myForm;
+    newtComponent b_1;
+    newtComponent b_2;
+    newtComponent b_res;
+    newtComponent text;
+    newtComponent type_here;
+
+    char *entry_value = NULL;
+    char *blurb = NULL;
+    char *out = NULL;
+
+    assert_string_is_neither_NULL_nor_zerolength(title);
+    assert(b != NULL);
+
+    if (g_text_mode) {
+        printf("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ", title, b);
+        mr_getline(out, stdin);
+        if (out[strlen(out) - 1] == '\n')
+            out[strlen(out) - 1] = '\0';
+        return(out);
+    }
+
+    assert(input != NULL);
+    text = newtTextboxReflowed(2, 1, b, 48, 5, 5, 0);
+    type_here = newtEntry(2, newtTextboxGetNumLines(text) + 2, input, 50, (void *) &entry_value, NEWT_FLAG_RETURNEXIT);
+    b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, "  OK  ");
+    b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, "Cancel");
+    newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, text, type_here, b_1, b_2, NULL);
+    blurb = mr_center_string(b, 80);
+    newtPushHelpLine(blurb);
+    b_res = newtRunForm(myForm);
+
+    newtPopHelpLine();
+    newtFormDestroy(myForm);
+    newtPopWindow();
+    mr_free(blurb);
+
+    if (b_res != b_2) {
+        out = entry_value;
+    }
+    return(out);
+}
 
 /**