nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move terminal color reset code to the same line (issue #545)

Browse source
This commit is contained in:
o9000 2016-01-24 20:08:52 +01:00
parent 5966b198b6
commit ec7e9e18ad
3 changed files with 41 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/battery/linux.c
View file

@ -235,7 +235,7 @@ static void add_battery(const char *entryname)
fprintf(stdout, "found battery \"%s\"\n", bat->name); fprintf(stdout, "found battery \"%s\"\n", bat->name);
} else { } else {
g_free(bat); g_free(bat);
fprintf(stderr, RED "failed to initialize battery \"%s\"\n" RESET, entryname); fprintf(stderr, RED "failed to initialize battery \"%s\"" RESET "\n", entryname);
} }
} }
@ -249,7 +249,7 @@ static void add_mains(const char *entryname)
fprintf(stdout, "found mains \"%s\"\n", ac->name); fprintf(stdout, "found mains \"%s\"\n", ac->name);
} else { } else {
g_free(ac); g_free(ac);
fprintf(stderr, RED "failed to initialize mains \"%s\"\n" RESET, entryname); fprintf(stderr, RED "failed to initialize mains \"%s\"" RESET "\n", entryname);
} }
} }

62
src/systray/systraybar.c
View file

@ -156,7 +156,7 @@ gboolean resize_systray(void *obj)
count++; count++;
} }
if (systray_profile) if (systray_profile)
fprintf(stderr, BLUE "%s:%d number of icons = %d\n" RESET, __FUNCTION__, __LINE__, count); fprintf(stderr, BLUE "%s:%d number of icons = %d" RESET "\n", __FUNCTION__, __LINE__, count);
if (panel_horizontal) { if (panel_horizontal) {
int height = sysbar->area.height - 2 * sysbar->area.bg->border.width - 2 * sysbar->area.paddingy; int height = sysbar->area.height - 2 * sysbar->area.bg->border.width - 2 * sysbar->area.paddingy;
@ -190,7 +190,7 @@ gboolean resize_systray(void *obj)
void draw_systray(void *obj, cairo_t *c) void draw_systray(void *obj, cairo_t *c)
{ {
if (systray_profile) if (systray_profile)
fprintf(stderr, BLUE "[%f] %s:%d\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__); fprintf(stderr, BLUE "[%f] %s:%d" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
if (systray_composited) { if (systray_composited) {
if (render_background) if (render_background)
XFreePixmap(server.display, render_background); XFreePixmap(server.display, render_background);
@ -276,7 +276,7 @@ void on_change_systray(void *obj)
unsigned int width, height, depth; unsigned int width, height, depth;
Window root; Window root;
if (!XGetGeometry(server.display, traywin->parent, &root, &xpos, &ypos, &width, &height, &border_width, &depth)) { if (!XGetGeometry(server.display, traywin->parent, &root, &xpos, &ypos, &width, &height, &border_width, &depth)) {
fprintf(stderr, RED "Couldn't get geometry of window!\n" RESET); fprintf(stderr, RED "Couldn't get geometry of window!" RESET "\n");
} }
if (width != traywin->width || height != traywin->height || xpos != traywin->x || ypos != traywin->y) { if (width != traywin->width || height != traywin->height || xpos != traywin->x || ypos != traywin->y) {
if (systray_profile) if (systray_profile)
@ -345,7 +345,7 @@ void start_net()
pid += prop[0]; pid += prop[0];
fprintf(stderr, " pid=%d", pid); fprintf(stderr, " pid=%d", pid);
} }
fprintf(stderr, "\n" RESET); fprintf(stderr, RESET "\n");
return; return;
} }
@ -402,11 +402,11 @@ void start_net()
XSetSelectionOwner(server.display, server.atom._NET_SYSTEM_TRAY_SCREEN, net_sel_win, CurrentTime); XSetSelectionOwner(server.display, server.atom._NET_SYSTEM_TRAY_SCREEN, net_sel_win, CurrentTime);
if (XGetSelectionOwner(server.display, server.atom._NET_SYSTEM_TRAY_SCREEN) != net_sel_win) { if (XGetSelectionOwner(server.display, server.atom._NET_SYSTEM_TRAY_SCREEN) != net_sel_win) {
stop_net(); stop_net();
fprintf(stderr, RED "tint2 : can't get systray manager\n" RESET); fprintf(stderr, RED "tint2 : can't get systray manager" RESET "\n");
return; return;
} }
fprintf(stderr, GREEN "tint2 : systray started\n" RESET); fprintf(stderr, GREEN "tint2 : systray started" RESET "\n");
if (systray_profile) if (systray_profile)
fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__); fprintf(stderr, "[%f] %s:%d\n", profiling_get_time(), __FUNCTION__, __LINE__);
XClientMessageEvent ev; XClientMessageEvent ev;
@ -445,7 +445,7 @@ void net_message(XClientMessageEvent *e)
if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA) if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA)
fprintf(stderr, "message from dockapp: %s\n", e->data.b); fprintf(stderr, "message from dockapp: %s\n", e->data.b);
else else
fprintf(stderr, RED "SYSTEM_TRAY : unknown message type\n" RESET); fprintf(stderr, RED "SYSTEM_TRAY : unknown message type" RESET "\n");
break; break;
} }
} }
@ -473,10 +473,10 @@ gboolean error;
int window_error_handler(Display *d, XErrorEvent *e) int window_error_handler(Display *d, XErrorEvent *e)
{ {
if (systray_profile) if (systray_profile)
fprintf(stderr, RED "[%f] %s:%d\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__); fprintf(stderr, RED "[%f] %s:%d" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
error = TRUE; error = TRUE;
if (e->error_code != BadWindow) { if (e->error_code != BadWindow) {
fprintf(stderr, RED "systray: error code %d\n" RESET, e->error_code); fprintf(stderr, RED "systray: error code %d" RESET "\n", e->error_code);
} }
return 0; return 0;
} }
@ -643,7 +643,7 @@ gboolean add_icon(Window win)
num_empty_same_pid++; num_empty_same_pid++;
fprintf(stderr, fprintf(stderr,
RED RED
"Removing tray icon %lu (%s) from misbehaving application with pid=%d (too many icons)\n" RESET, "Removing tray icon %lu (%s) from misbehaving application with pid=%d (too many icons)" RESET "\n",
((TrayWindow *)l->data)->win, ((TrayWindow *)l->data)->win,
((TrayWindow *)l->data)->name, ((TrayWindow *)l->data)->name,
pid); pid);
@ -666,7 +666,7 @@ gboolean add_icon(Window win)
XSetWindowAttributes set_attr; XSetWindowAttributes set_attr;
Visual *visual = server.visual; Visual *visual = server.visual;
fprintf(stderr, fprintf(stderr,
GREEN "add_icon: %lu (%s), pid %d, %d, visual %p, colormap %lu, depth %d, width %d, height %d\n" RESET, GREEN "add_icon: %lu (%s), pid %d, %d, visual %p, colormap %lu, depth %d, width %d, height %d" RESET "\n",
win, win,
name, name,
pid, pid,
@ -745,7 +745,7 @@ gboolean add_icon(Window win)
// Resize and redraw the systray // Resize and redraw the systray
if (systray_profile) if (systray_profile)
fprintf(stderr, BLUE "[%f] %s:%d trigger resize & redraw\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__); fprintf(stderr, BLUE "[%f] %s:%d trigger resize & redraw" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
systray.area.resize_needed = TRUE; systray.area.resize_needed = TRUE;
schedule_redraw(&systray.area); schedule_redraw(&systray.area);
panel->area.resize_needed = TRUE; panel->area.resize_needed = TRUE;
@ -808,7 +808,7 @@ gboolean reparent_icon(TrayWindow *traywin)
XSetErrorHandler(old); XSetErrorHandler(old);
if (error != FALSE) { if (error != FALSE) {
fprintf(stderr, fprintf(stderr,
RED "systray %d: cannot embed icon for window %lu (%s) parent %lu pid %d\n" RESET, RED "systray %d: cannot embed icon for window %lu (%s) parent %lu pid %d" RESET "\n",
__LINE__, __LINE__,
traywin->win, traywin->win,
traywin->name, traywin->name,
@ -887,7 +887,7 @@ gboolean embed_icon(TrayWindow *traywin)
// We could defer this for later (if we set PropertyChangeMask in XSelectInput we get notified) // We could defer this for later (if we set PropertyChangeMask in XSelectInput we get notified)
// but // but
// for some reason it breaks transparency for Qt icons. So we don't. // for some reason it breaks transparency for Qt icons. So we don't.
// fprintf(stderr, RED "tint2: window refused embedding\n" RESET); // fprintf(stderr, RED "tint2: window refused embedding" RESET "\n");
// remove_icon(traywin); // remove_icon(traywin);
// XFree(data); // XFree(data);
// return FALSE; // return FALSE;
@ -896,7 +896,7 @@ gboolean embed_icon(TrayWindow *traywin)
XFree(data); XFree(data);
} }
} else { } else {
fprintf(stderr, RED "tint2 : xembed error\n" RESET); fprintf(stderr, RED "tint2 : xembed error" RESET "\n");
remove_icon(traywin); remove_icon(traywin);
return FALSE; return FALSE;
} }
@ -932,7 +932,7 @@ gboolean embed_icon(TrayWindow *traywin)
XSetErrorHandler(old); XSetErrorHandler(old);
if (error != FALSE) { if (error != FALSE) {
fprintf(stderr, fprintf(stderr,
RED "systray %d: cannot embed icon for window %lu (%s) parent %lu pid %d\n" RESET, RED "systray %d: cannot embed icon for window %lu (%s) parent %lu pid %d" RESET "\n",
__LINE__, __LINE__,
traywin->win, traywin->win,
traywin->name, traywin->name,
@ -972,7 +972,7 @@ void remove_icon(TrayWindow *traywin)
// remove from our list // remove from our list
systray.list_icons = g_slist_remove(systray.list_icons, traywin); systray.list_icons = g_slist_remove(systray.list_icons, traywin);
fprintf(stderr, YELLOW "remove_icon: %lu (%s)\n" RESET, traywin->win, traywin->name); fprintf(stderr, YELLOW "remove_icon: %lu (%s)" RESET "\n", traywin->win, traywin->name);
XSelectInput(server.display, traywin->win, NoEventMask); XSelectInput(server.display, traywin->win, NoEventMask);
if (traywin->damage) if (traywin->damage)
@ -1010,7 +1010,7 @@ void remove_icon(TrayWindow *traywin)
// Resize and redraw the systray // Resize and redraw the systray
if (systray_profile) if (systray_profile)
fprintf(stderr, BLUE "[%f] %s:%d trigger resize & redraw\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__); fprintf(stderr, BLUE "[%f] %s:%d trigger resize & redraw" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
systray.area.resize_needed = TRUE; systray.area.resize_needed = TRUE;
schedule_redraw(&systray.area); schedule_redraw(&systray.area);
panel->area.resize_needed = TRUE; panel->area.resize_needed = TRUE;
@ -1111,7 +1111,7 @@ void systray_reconfigure_event(TrayWindow *traywin, XEvent *e)
if (traywin->bad_size_counter == max_bad_resize_events) { if (traywin->bad_size_counter == max_bad_resize_events) {
traywin->bad_size_counter++; traywin->bad_size_counter++;
fprintf(stderr, fprintf(stderr,
RED "Detected resize loop for tray icon %lu (%s), throttling resize events\n" RESET, RED "Detected resize loop for tray icon %lu (%s), throttling resize events" RESET "\n",
traywin->win, traywin->win,
traywin->name); traywin->name);
} }
@ -1131,7 +1131,7 @@ void systray_reconfigure_event(TrayWindow *traywin, XEvent *e)
// Resize and redraw the systray // Resize and redraw the systray
if (systray_profile) if (systray_profile)
fprintf(stderr, BLUE "[%f] %s:%d trigger resize & redraw\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__); fprintf(stderr, BLUE "[%f] %s:%d trigger resize & redraw" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
panel_refresh = TRUE; panel_refresh = TRUE;
refresh_systray = 1; refresh_systray = 1;
} }
@ -1196,7 +1196,7 @@ void systray_resize_request_event(TrayWindow *traywin, XEvent *e)
if (traywin->bad_size_counter == max_bad_resize_events) { if (traywin->bad_size_counter == max_bad_resize_events) {
traywin->bad_size_counter++; traywin->bad_size_counter++;
fprintf(stderr, fprintf(stderr,
RED "Detected resize loop for tray icon %lu (%s), throttling resize events\n" RESET, RED "Detected resize loop for tray icon %lu (%s), throttling resize events" RESET "\n",
traywin->win, traywin->win,
traywin->name); traywin->name);
} }
@ -1216,7 +1216,7 @@ void systray_resize_request_event(TrayWindow *traywin, XEvent *e)
// Resize and redraw the systray // Resize and redraw the systray
if (systray_profile) if (systray_profile)
fprintf(stderr, BLUE "[%f] %s:%d trigger resize & redraw\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__); fprintf(stderr, BLUE "[%f] %s:%d trigger resize & redraw" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
panel_refresh = TRUE; panel_refresh = TRUE;
refresh_systray = 1; refresh_systray = 1;
} }
@ -1278,7 +1278,7 @@ void systray_render_icon_composited(void *t)
add_timeout(min_refresh_period, 0, systray_render_icon_composited, traywin, &traywin->render_timeout); add_timeout(min_refresh_period, 0, systray_render_icon_composited, traywin, &traywin->render_timeout);
if (systray_profile) if (systray_profile)
fprintf(stderr, fprintf(stderr,
YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering\n" RESET, YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
profiling_get_time(), profiling_get_time(),
__FUNCTION__, __FUNCTION__,
__LINE__, __LINE__,
@ -1298,7 +1298,7 @@ void systray_render_icon_composited(void *t)
add_timeout(min_refresh_period, 0, systray_render_icon_composited, traywin, &traywin->render_timeout); add_timeout(min_refresh_period, 0, systray_render_icon_composited, traywin, &traywin->render_timeout);
if (systray_profile) if (systray_profile)
fprintf(stderr, fprintf(stderr,
YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering\n" RESET, YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
profiling_get_time(), profiling_get_time(),
__FUNCTION__, __FUNCTION__,
__LINE__, __LINE__,
@ -1330,7 +1330,7 @@ void systray_render_icon_composited(void *t)
} else if (traywin->depth == 32) { } else if (traywin->depth == 32) {
f = XRenderFindStandardFormat(server.display, PictStandardARGB32); f = XRenderFindStandardFormat(server.display, PictStandardARGB32);
} else { } else {
fprintf(stderr, RED "Strange tray icon found with depth: %d\n" RESET, traywin->depth); fprintf(stderr, RED "Strange tray icon found with depth: %d" RESET "\n", traywin->depth);
XFreePixmap(server.display, tmp_pmap); XFreePixmap(server.display, tmp_pmap);
return; return;
} }
@ -1434,7 +1434,7 @@ void systray_render_icon_composited(void *t)
// Resize and redraw the systray // Resize and redraw the systray
if (systray_profile) if (systray_profile)
fprintf(stderr, fprintf(stderr,
BLUE "[%f] %s:%d trigger resize & redraw\n" RESET, BLUE "[%f] %s:%d trigger resize & redraw" RESET "\n",
profiling_get_time(), profiling_get_time(),
__FUNCTION__, __FUNCTION__,
__LINE__); __LINE__);
@ -1459,7 +1459,7 @@ void systray_render_icon_composited(void *t)
on_error: on_error:
fprintf(stderr, fprintf(stderr,
RED "systray %d: rendering error for icon %lu (%s) pid %d\n" RESET, RED "systray %d: rendering error for icon %lu (%s) pid %d" RESET "\n",
__LINE__, __LINE__,
traywin->win, traywin->win,
traywin->name, traywin->name,
@ -1469,7 +1469,7 @@ on_error:
on_systray_error: on_systray_error:
fprintf(stderr, fprintf(stderr,
RED "systray %d: rendering error for icon %lu (%s) pid %d. " RED "systray %d: rendering error for icon %lu (%s) pid %d. "
"Disabling compositing and restarting systray...\n" RESET, "Disabling compositing and restarting systray..." RESET "\n",
__LINE__, __LINE__,
traywin->win, traywin->win,
traywin->name, traywin->name,
@ -1494,7 +1494,7 @@ void systray_render_icon(void *t)
if (!traywin->reparented || !traywin->embedded) { if (!traywin->reparented || !traywin->embedded) {
if (systray_profile) if (systray_profile)
fprintf(stderr, fprintf(stderr,
YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering\n" RESET, YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
profiling_get_time(), profiling_get_time(),
__FUNCTION__, __FUNCTION__,
__LINE__, __LINE__,
@ -1532,7 +1532,7 @@ void systray_render_icon(void *t)
systray_render_icon_from_image(traywin); systray_render_icon_from_image(traywin);
if (systray_profile) if (systray_profile)
fprintf(stderr, fprintf(stderr,
YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering\n" RESET, YELLOW "[%f] %s:%d win = %lu (%s) delaying rendering" RESET "\n",
profiling_get_time(), profiling_get_time(),
__FUNCTION__, __FUNCTION__,
__LINE__, __LINE__,
@ -1568,7 +1568,7 @@ void systray_render_icon(void *t)
void refresh_systray_icons() void refresh_systray_icons()
{ {
if (systray_profile) if (systray_profile)
fprintf(stderr, BLUE "[%f] %s:%d\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__); fprintf(stderr, BLUE "[%f] %s:%d" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
TrayWindow *traywin; TrayWindow *traywin;
GSList *l; GSList *l;
for (l = systray.list_icons; l; l = l->next) { for (l = systray.list_icons; l; l = l->next) {

17
src/tint.c
View file

@ -191,7 +191,7 @@ const char *get_home_dir()
void dump_backtrace(int log_fd) void dump_backtrace(int log_fd)
{ {
log_string(log_fd, YELLOW "\nBacktrace:\n"); log_string(log_fd, "\n" YELLOW "Backtrace:" RESET "\n");
#ifdef ENABLE_LIBUNWIND #ifdef ENABLE_LIBUNWIND
unw_cursor_t cursor; unw_cursor_t cursor;
@ -226,7 +226,6 @@ void dump_backtrace(int log_fd)
#endif #endif
#endif #endif
#endif #endif
log_string(log_fd, RESET);
} }
// sleep() returns early when signals arrive. This function does not. // sleep() returns early when signals arrive. This function does not.
@ -251,7 +250,7 @@ void handle_crash(const char *reason)
log_string(log_fd, reason); log_string(log_fd, reason);
log_string(log_fd, RESET "\n"); log_string(log_fd, RESET "\n");
dump_backtrace(log_fd); dump_backtrace(log_fd);
log_string(log_fd, RED "Please create a bug report with this log output.\n" RESET); log_string(log_fd, RED "Please create a bug report with this log output." RESET "\n");
close(log_fd); close(log_fd);
} }
@ -1161,7 +1160,7 @@ void event_configure_notify(XEvent *e)
// change in root window (xrandr) // change in root window (xrandr)
if (win == server.root_win) { if (win == server.root_win) {
fprintf(stderr, YELLOW "%s %d: triggering tint2 restart due to configuration change in the root window\n" RESET, __FILE__, __LINE__); fprintf(stderr, YELLOW "%s %d: triggering tint2 restart due to configuration change in the root window" RESET "\n", __FILE__, __LINE__);
signal_pending = SIGUSR1; signal_pending = SIGUSR1;
return; return;
} }
@ -1477,7 +1476,7 @@ start:
while (1) { while (1) {
if (panel_refresh) { if (panel_refresh) {
if (systray_profile) if (systray_profile)
fprintf(stderr, BLUE "[%f] %s:%d redrawing panel\n" RESET, profiling_get_time(), __FUNCTION__, __LINE__); fprintf(stderr, BLUE "[%f] %s:%d redrawing panel" RESET "\n", profiling_get_time(), __FUNCTION__, __LINE__);
panel_refresh = FALSE; panel_refresh = FALSE;
for (int i = 0; i < num_panels; i++) { for (int i = 0; i < num_panels; i++) {
@ -1704,7 +1703,7 @@ start:
case DestroyNotify: case DestroyNotify:
if (e.xany.window == server.composite_manager) { if (e.xany.window == server.composite_manager) {
// Stop real_transparency // Stop real_transparency
fprintf(stderr, YELLOW "%s %d: triggering tint2 restart due to compositor shutdown\n" RESET, __FILE__, __LINE__); fprintf(stderr, YELLOW "%s %d: triggering tint2 restart due to compositor shutdown" RESET "\n", __FILE__, __LINE__);
signal_pending = SIGUSR1; signal_pending = SIGUSR1;
break; break;
} }
@ -1723,11 +1722,11 @@ start:
if (ev->data.l[1] == server.atom._NET_WM_CM_S0) { if (ev->data.l[1] == server.atom._NET_WM_CM_S0) {
if (ev->data.l[2] == None) { if (ev->data.l[2] == None) {
// Stop real_transparency // Stop real_transparency
fprintf(stderr, YELLOW "%s %d: triggering tint2 restart due to change in transparency\n" RESET, __FILE__, __LINE__); fprintf(stderr, YELLOW "%s %d: triggering tint2 restart due to change in transparency" RESET "\n", __FILE__, __LINE__);
signal_pending = SIGUSR1; signal_pending = SIGUSR1;
} else { } else {
// Start real_transparency // Start real_transparency
fprintf(stderr, YELLOW "%s %d: triggering tint2 restart due to change in transparency\n" RESET, __FILE__, __LINE__); fprintf(stderr, YELLOW "%s %d: triggering tint2 restart due to change in transparency" RESET "\n", __FILE__, __LINE__);
signal_pending = SIGUSR1; signal_pending = SIGUSR1;
} }
} }
@ -1881,7 +1880,7 @@ start:
if (signal_pending) { if (signal_pending) {
cleanup(); cleanup();
if (signal_pending == SIGUSR1) { if (signal_pending == SIGUSR1) {
fprintf(stderr, YELLOW "%s %d: restarting tint2...\n" RESET, __FILE__, __LINE__); fprintf(stderr, YELLOW "%s %d: restarting tint2..." RESET "\n", __FILE__, __LINE__);
// restart tint2 // restart tint2
// SIGUSR1 used when : user's signal, composite manager stop/start or xrandr // SIGUSR1 used when : user's signal, composite manager stop/start or xrandr
goto start; goto start;