improved frame flashing code, can start and stop it on command
This commit is contained in:
parent
169e64da2c
commit
bd70fff6f9
2 changed files with 16 additions and 12 deletions
|
@ -785,7 +785,6 @@ void frame_frame_gravity(ObFrame *self, int *x, int *y)
|
||||||
static void flash_done(gpointer data)
|
static void flash_done(gpointer data)
|
||||||
{
|
{
|
||||||
ObFrame *self = data;
|
ObFrame *self = data;
|
||||||
self->flashing = FALSE;
|
|
||||||
|
|
||||||
if (self->focused != self->flash_on)
|
if (self->focused != self->flash_on)
|
||||||
frame_adjust_focus(self, self->focused);
|
frame_adjust_focus(self, self->focused);
|
||||||
|
@ -795,21 +794,20 @@ static gboolean flash_timeout(gpointer data)
|
||||||
{
|
{
|
||||||
ObFrame *self = data;
|
ObFrame *self = data;
|
||||||
GTimeVal now;
|
GTimeVal now;
|
||||||
gboolean focused;
|
|
||||||
|
|
||||||
g_message("flash");
|
|
||||||
|
|
||||||
g_get_current_time(&now);
|
g_get_current_time(&now);
|
||||||
if (now.tv_sec > self->flash_end.tv_sec ||
|
if (now.tv_sec > self->flash_end.tv_sec ||
|
||||||
(now.tv_sec == self->flash_end.tv_sec &&
|
(now.tv_sec == self->flash_end.tv_sec &&
|
||||||
now.tv_usec >= self->flash_end.tv_usec)) {
|
now.tv_usec >= self->flash_end.tv_usec))
|
||||||
g_message("done flashing");
|
self->flashing = FALSE;
|
||||||
|
|
||||||
|
if (!self->flashing)
|
||||||
return FALSE; /* we are done */
|
return FALSE; /* we are done */
|
||||||
}
|
|
||||||
|
|
||||||
self->flash_on = !self->flash_on;
|
self->flash_on = !self->flash_on;
|
||||||
g_message("on %d", self->flash_on);
|
|
||||||
{
|
{
|
||||||
|
gboolean focused;
|
||||||
|
|
||||||
focused = self->focused; /* save the focused flag */
|
focused = self->focused; /* save the focused flag */
|
||||||
frame_adjust_focus(self, self->flash_on);
|
frame_adjust_focus(self, self->flash_on);
|
||||||
self->focused = focused;
|
self->focused = focused;
|
||||||
|
@ -818,18 +816,23 @@ static gboolean flash_timeout(gpointer data)
|
||||||
return TRUE; /* go again */
|
return TRUE; /* go again */
|
||||||
}
|
}
|
||||||
|
|
||||||
void frame_flash(ObFrame *self)
|
void frame_flash_start(ObFrame *self)
|
||||||
{
|
{
|
||||||
self->flash_on = self->focused;
|
self->flash_on = self->focused;
|
||||||
|
|
||||||
if (!self->flashing)
|
if (!self->flashing)
|
||||||
ob_main_loop_timeout_add(ob_main_loop,
|
ob_main_loop_timeout_add(ob_main_loop,
|
||||||
G_USEC_PER_SEC / 2,
|
G_USEC_PER_SEC * 0.75,
|
||||||
flash_timeout,
|
flash_timeout,
|
||||||
self,
|
self,
|
||||||
flash_done);
|
flash_done);
|
||||||
g_get_current_time(&self->flash_end);
|
g_get_current_time(&self->flash_end);
|
||||||
g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 4);
|
g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5);
|
||||||
|
|
||||||
self->flashing = TRUE;
|
self->flashing = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void frame_flash_stop(ObFrame *self)
|
||||||
|
{
|
||||||
|
self->flashing = FALSE;
|
||||||
|
}
|
||||||
|
|
|
@ -149,6 +149,7 @@ void frame_client_gravity(ObFrame *self, int *x, int *y);
|
||||||
*/
|
*/
|
||||||
void frame_frame_gravity(ObFrame *self, int *x, int *y);
|
void frame_frame_gravity(ObFrame *self, int *x, int *y);
|
||||||
|
|
||||||
void frame_flash(ObFrame *self);
|
void frame_flash_start(ObFrame *self);
|
||||||
|
void frame_flash_stop(ObFrame *self);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue