Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Timer: new implementation (merge finished, tests failing)

Browse Source
This commit is contained in:
o9000
2017-12-28 22:45:20 +01:00
parent 0911dcaed1
commit f64cf199e4
18 changed files with 112 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/execplugin/execplugin.c
View File

@@ -67,8 +67,7 @@ void destroy_execp(void *obj)
free_and_null(execp);
} else {
// This is a backend element
stop_timeout(execp->backend->timer);
execp->backend->timer = NULL;
stop_timer(&execp->backend->timer);
free_icon(execp->backend->icon);
free_and_null(execp->backend->buf_stdout);
@@ -192,7 +191,7 @@ void init_execp_panel(void *p)
execp->area.on_screen = TRUE;
instantiate_area_gradients(&execp->area);
execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
change_timer(&execp->backend->timer, true, 10, 0, execp_timer_callback, execp);
execp_update_post_read(execp);
}
@@ -540,10 +539,8 @@ void execp_force_update(Execp *execp)
if (execp->backend->child_pipe_stdout > 0) {
// Command currently running, nothing to do
} else {
if (execp->backend->timer)
stop_timeout(execp->backend->timer);
// Run command right away
execp->backend->timer = add_timeout(10, 0, execp_timer_callback, execp, &execp->backend->timer);
change_timer(&execp->backend->timer, true, 10, 0, execp_timer_callback, execp);
}
}
@@ -757,8 +754,7 @@ gboolean read_execp(void *obj)
close(execp->backend->child_pipe_stderr);
execp->backend->child_pipe_stderr = -1;
if (execp->backend->interval)
execp->backend->timer =
add_timeout(execp->backend->interval * 1000, 0, execp_timer_callback, execp, &execp->backend->timer);
change_timer(&execp->backend->timer, true, execp->backend->interval * 1000, 0, execp_timer_callback, execp);
}
char *ansi_clear_screen = (char*)"\x1b[2J";

2
src/execplugin/execplugin.h
View File

@@ -46,7 +46,7 @@ typedef struct ExecpBackend {
Background *bg;
// Backend state:
timeout *timer;
Timer timer;
int child_pipe_stdout;
int child_pipe_stderr;
pid_t child;