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

Timer: rename timeout -> timer

Browse Source
This commit is contained in:
o9000
2017-12-29 13:10:47 +01:00
parent c064ec70ed
commit e5380f8e29
10 changed files with 67 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/systray/systraybar.c
View File

@@ -730,8 +730,8 @@ gboolean add_icon(Window win)
traywin->pid = pid;
traywin->name = name;
traywin->chrono = chrono;
INIT_TIMER(traywin->render_timeout);
INIT_TIMER(traywin->resize_timeout);
INIT_TIMER(traywin->render_timer);
INIT_TIMER(traywin->resize_timer);
chrono++;
show(&systray.area);
@@ -942,8 +942,8 @@ void remove_icon(TrayWindow *traywin)
XDestroyWindow(server.display, traywin->parent);
XSync(server.display, False);
XSetErrorHandler(old);
destroy_timer(&traywin->render_timeout);
destroy_timer(&traywin->resize_timeout);
destroy_timer(&traywin->render_timer);
destroy_timer(&traywin->resize_timer);
free(traywin->name);
if (traywin->image) {
imlib_context_set_image(traywin->image);
@@ -1057,8 +1057,8 @@ void systray_reconfigure_event(TrayWindow *traywin, XEvent *e)
if (traywin->bad_size_counter < min_bad_resize_events) {
systray_resize_icon(traywin);
} else {
if (!traywin->resize_timeout.enabled_)
change_timer(&traywin->resize_timeout, true, fast_resize_period, 0, systray_resize_icon, traywin);
if (!traywin->resize_timer.enabled_)
change_timer(&traywin->resize_timer, true, fast_resize_period, 0, systray_resize_icon, traywin);
}
} else {
if (traywin->bad_size_counter == max_bad_resize_events) {
@@ -1072,13 +1072,13 @@ void systray_reconfigure_event(TrayWindow *traywin, XEvent *e)
// FIXME Normally we should force the icon to resize fill_color to the size we resized it to when we
// embedded it.
// However this triggers a resize loop in new versions of GTK, which we must avoid.
if (!traywin->resize_timeout.enabled_)
change_timer(&traywin->resize_timeout, true, slow_resize_period, 0, systray_resize_icon, traywin);
if (!traywin->resize_timer.enabled_)
change_timer(&traywin->resize_timer, true, slow_resize_period, 0, systray_resize_icon, traywin);
return;
}
} else {
// Correct size
stop_timer(&traywin->resize_timeout);
stop_timer(&traywin->resize_timer);
}
// Resize and redraw the systray
@@ -1135,8 +1135,8 @@ void systray_resize_request_event(TrayWindow *traywin, XEvent *e)
if (traywin->bad_size_counter < min_bad_resize_events) {
systray_resize_icon(traywin);
} else {
if (!traywin->resize_timeout.enabled_)
change_timer(&traywin->resize_timeout, true, fast_resize_period, 0, systray_resize_icon, traywin);
if (!traywin->resize_timer.enabled_)
change_timer(&traywin->resize_timer, true, fast_resize_period, 0, systray_resize_icon, traywin);
}
} else {
if (traywin->bad_size_counter == max_bad_resize_events) {
@@ -1149,13 +1149,13 @@ void systray_resize_request_event(TrayWindow *traywin, XEvent *e)
// Delayed resize
// FIXME Normally we should force the icon to resize to the size we resized it to when we embedded it.
// However this triggers a resize loop in some versions of GTK, which we must avoid.
if (!traywin->resize_timeout.enabled_)
change_timer(&traywin->resize_timeout, true, slow_resize_period, 0, systray_resize_icon, traywin);
if (!traywin->resize_timer.enabled_)
change_timer(&traywin->resize_timer, true, slow_resize_period, 0, systray_resize_icon, traywin);
return;
}
} else {
// Correct size
stop_timer(&traywin->resize_timeout);
stop_timer(&traywin->resize_timer);
}
// Resize and redraw the systray
@@ -1222,7 +1222,7 @@ void systray_render_icon_composited(void *t)
if (compare_timespecs(&earliest_render, &now) > 0) {
traywin->num_fast_renders++;
if (traywin->num_fast_renders > max_fast_refreshes) {
change_timer(&traywin->render_timeout, true, min_refresh_period, 0, systray_render_icon_composited, traywin);
change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon_composited, traywin);
if (systray_profile)
fprintf(stderr,
YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
@@ -1241,7 +1241,7 @@ void systray_render_icon_composited(void *t)
if (traywin->width == 0 || traywin->height == 0) {
// reschedule rendering since the geometry information has not yet been processed (can happen on slow cpu)
change_timer(&traywin->render_timeout, true, min_refresh_period, 0, systray_render_icon_composited, traywin);
change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon_composited, traywin);
if (systray_profile)
fprintf(stderr,
YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
@@ -1253,9 +1253,7 @@ void systray_render_icon_composited(void *t)
return;
}
if (traywin->render_timeout.enabled_) {
stop_timer(&traywin->render_timeout);
}
stop_timer(&traywin->render_timer);
// good systray icons support 32 bit depth, but some icons are still 24 bit.
// We create a heuristic mask for these icons, i.e. we get the rgb value in the top left corner, and
@@ -1418,8 +1416,7 @@ void systray_render_icon(void *t)
// __LINE__,
// traywin->win,
// traywin->name);
stop_timer(&traywin->render_timeout);
change_timer(&traywin->render_timeout, true, min_refresh_period, 0, systray_render_icon, traywin);
change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon, traywin);
return;
}
@@ -1442,17 +1439,13 @@ void systray_render_icon(void *t)
unsigned int width, height, depth;
Window root;
if (!XGetGeometry(server.display, traywin->win, &root, &xpos, &ypos, &width, &height, &border_width, &depth)) {
stop_timer(&traywin->render_timeout);
if (!traywin->render_timeout.enabled_)
change_timer(&traywin->render_timeout, true, min_refresh_period, 0, systray_render_icon, traywin);
change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon, traywin);
systray_render_icon_from_image(traywin);
XSetErrorHandler(old);
return;
} else {
if (xpos != 0 || ypos != 0 || width != traywin->width || height != traywin->height) {
stop_timer(&traywin->render_timeout);
if (!traywin->render_timeout.enabled_)
change_timer(&traywin->render_timeout, true, min_refresh_period, 0, systray_render_icon, traywin);
change_timer(&traywin->render_timer, true, min_refresh_period, 0, systray_render_icon, traywin);
systray_render_icon_from_image(traywin);
if (systray_profile)
fprintf(stderr,