WebSVN – HelenOS – Diff – //trunk/tools/config.py

 """
 import sys
 import os
 import re
 import commands
-import snack
+import xtui
 INPUT = sys.argv[1]
 OUTPUT = 'Makefile.config'
 def read_defaults(fname, defaults):
     if (default == 'y'):
         return '*'
     return ' '
-def subchoice(screen, name, choices):
+def subchoice(screen, name, choices, default):
     "Return choice of choices"
-    maxlen = 0
+    maxkey = 0
-    for choice in choices:
+    for key, val in choices:
-        length = len(choice[0])
+        length = len(key)
-        if (length > maxlen):
+        if (length > maxkey):
-            maxlen = length
+            maxkey = length
     options = []
+    position = None
+    cnt = 0
-    for choice in choices:
+    for key, val in choices:
+        if ((default) and (key == default)):
+            position = cnt
-        options.append(" %-*s  %s " % (maxlen, choice[0], choice[1]))
+        options.append(" %-*s  %s " % (maxkey, key, val))
+        cnt += 1
-    retval = snack.ListboxChoiceWindow(screen, name, 'Choose value', options)
+    (button, value) = xtui.choice_window(screen, name, 'Choose value', options, position)
-    if (retval[0] == 'cancel'):
+    if (button == 'cancel'):
         return None
-    return choices[retval[1]][0]
+    return choices[value][0]
 def check_choices(defaults, ask_names):
     "Check whether all accessible variables have a default"
-    for row in ask_names:
+    for varname, vartype, name, choices, cond in ask_names:
-        varname = row[0]
-        cond = row[4]
         if ((cond) and (not check_condition(cond, defaults, ask_names))):
             continue
         if (not defaults.has_key(varname)):
             return False
     outf.write('#########################################\n')
     outf.write('## AUTO-GENERATED FILE, DO NOT EDIT!!! ##\n')
     outf.write('#########################################\n\n')
-    for row in ask_names:
+    for varname, vartype, name, choices, cond in ask_names:
-        varname = row[0]
-        name = row[2]
-        cond = row[4]
         if ((cond) and (not check_condition(cond, defaults, ask_names))):
             continue
         if (not defaults.has_key(varname)):
             default = ''
     if ((len(sys.argv) >= 3) and (sys.argv[2] == 'default')):
         if (check_choices(defaults, ask_names)):
             create_output(OUTPUT, defaults, ask_names)
             return 0
-    screen = snack.SnackScreen()
+    screen = xtui.screen_init()
     try:
         selname = None
         while True:
             options = []
             opt2row = {}
             position = None
             cnt = 0
-            for row in ask_names:
+            for varname, vartype, name, choices, cond in ask_names:
-                varname = row[0]
-                vartype = row[1]
-                name = row[2]
-                choices = row[3]
-                cond = row[4]
                 if ((cond) and (not check_condition(cond, defaults, ask_names))):
                     continue
                 if (varname == selname):
                         defaults[varname] = default
                     options.append(" <%s> %s " % (yes_no(default), name))
                 else:
                     raise RuntimeError("Unknown variable type: %s" % vartype)
-                opt2row[cnt] = row
+                opt2row[cnt] = (varname, vartype, name, choices)
                 cnt += 1
-            retval = snack.ListboxChoiceWindow(screen, 'HelenOS configuration', 'Choose configuration option', options, default = position)
+            (button, value) = xtui.choice_window(screen, 'HelenOS configuration', 'Choose configuration option', options, position)
-            if (retval[0] == 'cancel'):
+            if (button == 'cancel'):
                 return 'Configuration canceled'
-            row = opt2row[retval[1]]
+            if (not opt2row.has_key(value)):
-            if (row == None):
-                raise RuntimeError("Error selecting value: %s" % retval[1])
+                raise RuntimeError("Error selecting value: %s" % value)
-            selname = row[0]
+            (selname, seltype, name, choices) = opt2row[value]
+            if (not defaults.has_key(selname)):
-            seltype = row[1]
+                    default = None
-            name = row[2]
+            else:
-            choices = row[3]
+                default = defaults[selname]
-            if (retval[0] == 'ok'):
+            if (button == 'done'):
                 if (check_choices(defaults, ask_names)):
                     break
                 else:
-                    snack.ButtonChoiceWindow(screen, 'Error', 'Some options have still undefined values.', ['Ok']);
+                    xtui.error_dialog(screen, 'Error', 'Some options have still undefined values.')
                     continue
             if (seltype == 'choice'):
-                defaults[selname] = subchoice(screen, name, choices)
+                defaults[selname] = subchoice(screen, name, choices, default)
             elif ((seltype == 'y/n') or (seltype == 'n/y')):
                 if (defaults[selname] == 'y'):
                     defaults[selname] = 'n'
                 else:
                     defaults[selname] = 'y'
     finally:
-        screen.finish()
+        xtui.screen_done(screen)
     create_output(OUTPUT, defaults, ask_names)
     return 0
 if __name__ == '__main__':

Subversion Repositories HelenOS

(root)//trunk/tools/config.py – Rev 3803 → 3804