remove flickering on systray

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 5c93aaaf2e1ab3bd4adb7f3a6c96c02494212ad7..94ec86ce6eb9c24e92346085d47f94b6aceb2527 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -50,8 +50,9 @@ void init ()
 {
        // Set signal handler
    signal(SIGUSR1, signal_handler);
-   signal(SIGINT, signal_handler);
-   signal(SIGTERM, signal_handler);
+       signal(SIGINT, signal_handler);
+       signal(SIGTERM, signal_handler);
+       signal(SIGHUP, signal_handler);
 
    // set global data
    memset(&server, 0, sizeof(Server_global));
@@ -92,6 +93,7 @@ void cleanup()
    if (time2_font_desc) pango_font_description_free(time2_font_desc);
    if (time1_format) g_free(time1_format);
    if (time2_format) g_free(time2_format);
+#ifdef ENABLE_BATTERY
    if (bat1_font_desc) pango_font_description_free(bat1_font_desc);
    if (bat2_font_desc) pango_font_description_free(bat2_font_desc);
        if (battery_low_cmd) g_free(battery_low_cmd);
@@ -99,6 +101,7 @@ void cleanup()
        if (path_energy_full) g_free(path_energy_full);
        if (path_current_now) g_free(path_current_now);
        if (path_status) g_free(path_status);
+#endif
        if (clock_lclick_command) g_free(clock_lclick_command);
        if (clock_rclick_command) g_free(clock_rclick_command);
 
@@ -356,7 +359,6 @@ void event_property_notify (XEvent *e)
                        for (i=0 ; i < nb_panel ; i++) {
                                set_panel_background(&panel1[i]);
                        }
-                       refresh_systray();
          panel_refresh = 1;
       }
    }
@@ -388,6 +390,7 @@ void event_property_notify (XEvent *e)
       else if (at == server.atom._NET_WM_STATE) {
          if (window_is_urgent (win)) {
                                task_urgent = tsk;
+                               tick_urgent = 0;
                                time_precision = 1;
                        }
                }
@@ -508,16 +511,21 @@ void event_timer()
 
        // urgent task
        if (task_urgent) {
-               task_urgent->area.is_active = !task_urgent->area.is_active;
-               task_urgent->area.redraw = 1;
+               if (tick_urgent < max_tick_urgent) {
+                       task_urgent->area.is_active = !task_urgent->area.is_active;
+                       task_urgent->area.redraw = 1;
+                       tick_urgent++;
+               }
        }
 
        // update battery
+#ifdef ENABLE_BATTERY
        if (panel1[0].battery.area.on_screen) {
-               update_battery(&battery_state);
+               update_battery();
                for (i=0 ; i < nb_panel ; i++)
                        panel1[i].battery.area.resize = 1;
        }
+#endif
 
        // update clock
    if (time1_format) {
@@ -543,8 +551,16 @@ int main (int argc, char *argv[])
 load_config:
    i = 0;
        init_config();
-   if (c != -1)
+   if (c != -1) {
       i = config_read_file (optarg);
+          c = getopt (argc, argv, "j:");
+          if (c != -1) {
+                       // usage: tint2 [-c] <config_file> -j <jpeg_file> for internal use
+          printf("jpeg file %s\n", optarg);
+             cleanup();
+          exit(0);
+               }
+       }
    if (!i)
       i = config_read ();
    if (!i) {
@@ -626,6 +642,7 @@ load_config:
             goto load_config;
                        case SIGINT:
                        case SIGTERM:
+                       case SIGHUP:
                           cleanup ();
                           return 0;
       }
@@ -633,6 +650,10 @@ load_config:
       if (panel_refresh) {
                        panel_refresh = 0;
 
+                       if (refresh_systray) {
+                               panel = (Panel*)systray.area.panel;
+                               XSetWindowBackgroundPixmap (server.dsp, panel->main_win, None);
+                       }
                        for (i=0 ; i < nb_panel ; i++) {
                                panel = &panel1[i];
 
@@ -643,6 +664,15 @@ load_config:
                           XCopyArea(server.dsp, panel->temp_pmap, panel->main_win, server.gc, 0, 0, panel->area.width, panel->area.height, 0, 0);
                        }
                        XFlush (server.dsp);
+
+                       if (refresh_systray) {
+                               refresh_systray = 0;
+                               panel = (Panel*)systray.area.panel;
+                               // tint2 doen't draw systray icons. it just redraw background.
+                               XSetWindowBackgroundPixmap (server.dsp, panel->main_win, panel->temp_pmap);
+                               // force icon's refresh
+                               refresh_systray_icon();
+                       }
                }
    }
 }