1
1

Renamed current_dlg variable to top_dlg.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Этот коммит содержится в:
Andrew Borodin 2010-04-18 14:26:28 +04:00
родитель 74651f2e9f
Коммит 95e4424e92
5 изменённых файлов: 10 добавлений и 10 удалений

Просмотреть файл

@ -171,7 +171,7 @@ do_background (struct FileOpContext *ctx, char *info)
from_parent_fd = back_comm[0];
we_are_background = 1;
current_dlg = NULL;
top_dlg = NULL;
/* Make stdin/stdout/stderr point somewhere */
close (0);

Просмотреть файл

@ -52,7 +52,7 @@ int alarm_colors[4];
/* Primitive way to check if the the current dialog is our dialog */
/* This is needed by async routines like load_prompt */
GList *current_dlg = NULL;
GList *top_dlg = NULL;
/* A hook list for idle events */
Hook *idle_hook = NULL;
@ -367,7 +367,7 @@ add_widget (Dlg_head * h, void *w)
void
do_refresh (void)
{
GList *d = current_dlg;
GList *d = top_dlg;
if (fast_refresh)
{
@ -886,7 +886,7 @@ init_dlg (Dlg_head * h)
h->modal = TRUE;
/* add dialog to the stack */
current_dlg = g_list_prepend (current_dlg, h);
top_dlg = g_list_prepend (top_dlg, h);
/* Initialize dialog manager and widgets */
h->callback (h, NULL, DLG_INIT, 0, NULL);
@ -968,7 +968,7 @@ dlg_run_done (Dlg_head * h)
if (h->current != NULL)
h->callback (h, (Widget *) h->current->data, DLG_END, 0, NULL);
current_dlg = g_list_remove (current_dlg, h);
top_dlg = g_list_remove (top_dlg, h);
}
/* Standard run dialog routine

Просмотреть файл

@ -244,7 +244,7 @@ void common_dialog_repaint (struct Dlg_head *h);
#define widget_move(w, _y, _x) tty_gotoyx (((Widget *)(w))->y + _y, ((Widget *)(w))->x + _x)
#define dlg_move(h, _y, _x) tty_gotoyx (((Dlg_head *)(h))->y + _y, ((Dlg_head *)(h))->x + _x)
extern GList *current_dlg;
extern GList *top_dlg;
/* A hook list for idle events */
extern Hook *idle_hook;

Просмотреть файл

@ -779,7 +779,7 @@ change_screen_size (void)
#endif
/* Inform all running dialogs */
g_list_foreach (current_dlg, (GFunc) dlg_resize_cb, NULL);
g_list_foreach (top_dlg, (GFunc) dlg_resize_cb, NULL);
/* Now, force the redraw */
repaint_screen ();

Просмотреть файл

@ -326,8 +326,8 @@ stop_dialogs (void)
{
midnight_dlg->state = DLG_CLOSED;
if ((current_dlg != NULL) && (current_dlg->data != NULL))
((Dlg_head *) current_dlg->data)->state = DLG_CLOSED;
if ((top_dlg != NULL) && (top_dlg->data != NULL))
((Dlg_head *) top_dlg->data)->state = DLG_CLOSED;
}
static int
@ -572,7 +572,7 @@ load_prompt (int fd, void *unused)
return 0;
/* Don't actually change the prompt if it's invisible */
if (((Dlg_head *) current_dlg->data == midnight_dlg) && command_prompt)
if (((Dlg_head *) top_dlg->data == midnight_dlg) && command_prompt)
{
char *tmp_prompt;
int prompt_len;