X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftint.c;h=7388035bdb41169907abf8d2b1e12fd495fac2ef;hb=6ffe31fcfefd9299dda5627762653c0b252c66e6;hp=f88b57fd7f3cb7fb1e549d25fbca40f205ae45d2;hpb=e050df33d29de6f7890b7111f6ea871aa5247743;p=chaz%2Ftint2 diff --git a/src/tint.c b/src/tint.c index f88b57f..7388035 100644 --- a/src/tint.c +++ b/src/tint.c @@ -59,7 +59,9 @@ void init (int argc, char *argv[]) default_timeout(); default_systray(); memset(&server, 0, sizeof(Server_global)); +#ifdef ENABLE_BATTERY default_battery(); +#endif default_clock(); default_taskbar(); default_tooltip(); @@ -128,6 +130,8 @@ void init_X11() XSelectInput (server.dsp, server.root_win, PropertyChangeMask|StructureNotifyMask); setlocale (LC_ALL, ""); + // config file use '.' as decimal separator + setlocale(LC_NUMERIC, "POSIX"); // load default icon gchar *path; @@ -151,7 +155,6 @@ void cleanup() { cleanup_timeout(); cleanup_systray(); - stop_net(); cleanup_panel(); cleanup_tooltip(); cleanup_clock(); @@ -839,8 +842,8 @@ start: case UnmapNotify: case DestroyNotify: if (e.xany.window == server.composite_manager) { - // TODO: Stop real_transparency - //signal_pending = SIGUSR2; + // Stop real_transparency + signal_pending = SIGUSR1; break; } if (e.xany.window == g_tooltip.window || !systray.area.on_screen) @@ -857,13 +860,11 @@ start: ev = &e.xclient; if (ev->data.l[1] == server.atom._NET_WM_CM_S0) { if (ev->data.l[2] == None) - // TODO: Stop real_transparency - //signal_pending = SIGUSR2; - ; + // Stop real_transparency + signal_pending = SIGUSR1; else - // TODO: Start real_transparency - //signal_pending = SIGUSR2; - ; + // Start real_transparency + signal_pending = SIGUSR1; } if (!systray.area.on_screen) break; if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) { @@ -900,7 +901,7 @@ start: if (signal_pending == SIGUSR1) { // restart tint2 // SIGUSR1 used when : user's signal, composite manager stop/start or xrandr - FD_CLR (x11_fd, &fdset); + FD_CLR (x11_fd, &fdset); // not sure if needed goto start; } else {