mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

status_msg_t: reimplement delay usage.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2014-09-10 09:59:32 +04:00
parent 89621050e3
commit 81201b3022
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/widget/wtools.c
View File

@ -9,7 +9,7 @@
Radek Doulik, 1994, 1995
Jakub Jelinek, 1995
Andrej Borsenkow, 1995
Andrew Borodin <aborodin@vmail.ru>, 2009, 2010, 2012, 2013
Andrew Borodin <aborodin@vmail.ru>, 2009-2014
This file is part of the Midnight Commander.
@ -56,8 +56,6 @@ static WDialog *last_query_dlg;
static int sel_pos = 0;
static const guint64 status_msg_delay_threshold = G_USEC_PER_SEC / 100; /* 0.01 s */
/* --------------------------------------------------------------------------------------------- */
/*** file scope functions ************************************************************************/
/* --------------------------------------------------------------------------------------------- */
@ -573,8 +571,13 @@ void
status_msg_init (status_msg_t * sm, const char *title, double delay, status_msg_cb init_cb,
status_msg_update_cb update_cb, status_msg_cb deinit_cb)
{
guint64 start;
start = mc_timer_elapsed (mc_global.timer);
sm->dlg = dlg_create (TRUE, 0, 0, 7, min (max (40, COLS / 2), COLS), dialog_colors,
NULL, NULL, NULL, title, DLG_CENTER);
sm->start = start;
sm->delay = delay * G_USEC_PER_SEC;
sm->block = FALSE;
@ -585,11 +588,8 @@ status_msg_init (status_msg_t * sm, const char *title, double delay, status_msg_
if (sm->init != NULL)
sm->init (sm);
if (sm->delay > status_msg_delay_threshold)
sm->timer = mc_timer_new ();
else
if (mc_time_elapsed (&start, sm->delay))
{
sm->timer = NULL;
/* We will manage the dialog without any help, that's why we have to call init_dlg */
dlg_init (sm->dlg);
}
@ -611,9 +611,6 @@ status_msg_deinit (status_msg_t * sm)
if (sm->deinit != NULL)
sm->deinit (sm);
if (sm->timer != NULL)
mc_timer_destroy (sm->timer);
/* close and destroy dialog */
dlg_run_done (sm->dlg);
dlg_destroy (sm->dlg);
@ -637,24 +634,23 @@ status_msg_common_update (status_msg_t * sm)
if (sm == NULL)
return B_ENTER;
if (sm->timer != NULL)
{
if (mc_timer_elapsed (sm->timer) > sm->delay)
{
mc_timer_destroy (sm->timer); /* we not need the timer anymore */
sm->timer = NULL;
if (sm->dlg != NULL)
dlg_init (sm->dlg);
}
return B_ENTER;
}
/* This should not happen, but... */
if (sm->dlg == NULL)
return B_ENTER;
if (sm->dlg->state != DLG_ACTIVE)
{
/* dialog is not shown yet */
/* do not change sm->start */
guint64 start = sm->start;
if (mc_time_elapsed (&start, sm->delay))
dlg_init (sm->dlg);
return B_ENTER;
}
event.x = -1; /* Don't show the GPM cursor */
c = tty_get_event (&event, FALSE, sm->block);
if (c == EV_NONE)

2
lib/widget/wtools.h
View File

@ -42,8 +42,8 @@ enum
struct status_msg_t
{
WDialog *dlg; /* pointer to status message dialog */
guint64 start; /* start time in microseconds */
guint64 delay; /* delay before raise the 'dlg' in microseconds */
mc_timer_t *timer; /* timer to measure 'delay' */
gboolean block; /* how to get event using tty_get_event() */
status_msg_cb init; /* callback to init derived classes */