Macintosh-SW/EMILE
1
0
Fork 0
mirror of https://github.com/vivier/EMILE.git synced 2024-12-30 17:29:43 +00:00
Code Issues Projects Releases Wiki Activity

Add timeout to scrolllist

Browse Source
This commit is contained in:
Laurent Vivier 2007-08-22 18:59:03 +00:00
parent 8436dcdd4a
commit b38e307214
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libui/libui.h
View File

@ -34,4 +34,4 @@ extern void emile_window(emile_window_t *win);
extern emile_progressbar_t* emile_progressbar_create(emile_window_t *win, int max);
extern void emile_progressbar_value(emile_progressbar_t* bar, int value);
extern void emile_progressbar_delete(emile_progressbar_t* bar);
extern int emile_scrolllist(emile_window_t *win, emile_list_t *list);
extern int emile_scrolllist(emile_window_t *win, emile_list_t *list, int timeout);

5
libui/scrolllist.c
View File

@ -38,7 +38,7 @@ static int display_list(emile_window_t *win, emile_list_t *list, int base)
return list->current;
}
int emile_scrolllist(emile_window_t *win, emile_list_t *list)
int emile_scrolllist(emile_window_t *win, emile_list_t *list, int timeout)
{
char c;
int base = 0;
@ -47,6 +47,9 @@ int emile_scrolllist(emile_window_t *win, emile_list_t *list)
emile_window(win);
display_list(win, list, base);
if (timeout && !console_keypressed(timeout * 60))
return '\r';
while(1)
{
c = console_getchar();

24
second/config.c
View File

@ -24,7 +24,8 @@
#define MAX_KERNELS 20
#define MAX_KERNEL_PARAMS 5
#define COMMAND_LINE_LENGTH 256
#define COMMAND_LINE_LENGTH 256
#define DEFAULT_TIMEOUT 5
static char *read_line(char *s)
{
@ -281,6 +282,7 @@ int read_config(emile_l2_header_t* info,
};
int i;
int choice;
int timeout;
#if defined(USE_CLI) && defined(__LINUX__)
emile_window_t win = { 7, 4, 8, 72 };
emile_list_t list;
@ -306,6 +308,14 @@ int read_config(emile_l2_header_t* info,
printf("User forces gestalt ID to %ld\n", machine_id);
}
choice = 0;
if (get_property(configuration, "default", property) == 0)
choice = strtol(property, NULL, 0);
timeout = DEFAULT_TIMEOUT;
if (get_property(configuration, "timeout", property) == 0)
timeout = strtol(property, NULL, 0);
for (index = 0; index < MAX_KERNELS; index++)
{
int prop;
@ -347,9 +357,10 @@ int read_config(emile_l2_header_t* info,
break;
}
}
if (choice > index)
choice = index;
#if defined(USE_CLI) && defined(__LINUX__)
choice = 0;
state = 0;
while(state != -1)
@ -359,9 +370,10 @@ int read_config(emile_l2_header_t* info,
case 0: /* select entry */
list.item = title;
list.nb = index + 1;
list.current = 0;
res = emile_scrolllist(&win, &list);
list.current = choice;
res = emile_scrolllist(&win, &list, timeout);
choice = list.current;
timeout = 0;
switch(res)
{
case '\r':
@ -379,7 +391,7 @@ int read_config(emile_l2_header_t* info,
case 1: /* select parameter */
list.item = properties[choice];
list.nb = prop_nb[choice];
res = emile_scrolllist(&win, &list);
res = emile_scrolllist(&win, &list, 0);
switch(res)
{
case 'd':
@ -429,8 +441,6 @@ int read_config(emile_l2_header_t* info,
break;
}
}
#else
choice = 0; /* No interface */
#endif
*kernel_path = NULL;