fixed issue 46 and 59 : urgent task

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index f54bebe6ee9c5d4e411dbfa4f664ed2cd3ea8c7d..ee6a8480b84eba192ec7ec629a74dcc2fdf2cf91 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -86,13 +86,21 @@ void init ()
 
 void cleanup()
 {
-       cleanup_systray();
        cleanup_panel();
 
    if (time1_font_desc) pango_font_description_free(time1_font_desc);
    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);
+   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);
+       if (path_energy_now) g_free(path_energy_now);
+       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);
+       if (clock_lclick_command) g_free(clock_lclick_command);
+       if (clock_rclick_command) g_free(clock_rclick_command);
 
    if (server.monitor) free(server.monitor);
    XFreeGC(server.dsp, server.gc);
@@ -137,7 +145,7 @@ void event_button_press (XEvent *e)
    GSList *l0;
    Taskbar *tskbar;
    int x = e->xbutton.x;
-   int y = e->xbutton.y;
+   //int y = e->xbutton.y; // unused
    for (l0 = panel->area.list; l0 ; l0 = l0->next) {
       tskbar = l0->data;
       if (!tskbar->area.on_screen) continue;
@@ -169,7 +177,7 @@ void event_button_release (XEvent *e)
 
    int action = TOGGLE_ICONIFY;
    int x = e->xbutton.x;
-   int y = e->xbutton.y;
+   //int y = e->xbutton.y; // unused
    switch (e->xbutton.button) {
       case 2:
          action = mouse_middle;
@@ -188,12 +196,17 @@ void event_button_release (XEvent *e)
    // search taskbar
    Taskbar *tskbar;
    GSList *l0;
-   for (l0 = panel->area.list; l0 ; l0 = l0->next) {
-      tskbar = l0->data;
-      if (!tskbar->area.on_screen) continue;
-      if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
-         goto suite;
-   }
+       Clock clk = panel->clock;
+       if (clk.area.on_screen && x >= clk.area.posx && x <= (clk.area.posx + clk.area.width))
+               clock_action(e->xbutton.button);
+       else {
+               for (l0 = panel->area.list; l0 ; l0 = l0->next) {
+                       tskbar = l0->data;
+                       if (!tskbar->area.on_screen) continue;
+                       if (x >= tskbar->area.posx && x <= (tskbar->area.posx + tskbar->area.width))
+                               goto suite;
+               }
+       }
 
    // TODO: check better solution to keep window below
    XLowerWindow (server.dsp, panel->main_win);
@@ -289,6 +302,10 @@ void event_property_notify (XEvent *e)
                        }
          Window w1 = window_get_active ();
          Task *t = task_get_task(w1);
+                       if (task_urgent == t) {
+                               init_precision();
+                               task_urgent = 0;
+                       }
          if (!t) {
             Window w2;
             if (XGetTransientForHint(server.dsp, w1, &w2) != 0)
@@ -345,9 +362,8 @@ void event_property_notify (XEvent *e)
                // Demand attention
       else if (at == server.atom._NET_WM_STATE) {
          if (window_is_urgent (win)) {
-                               printf("  event_property_notify _NET_WM_STATE_DEMANDS_ATTENTION\n");
-                       }
-                       else {
+                               task_urgent = tsk;
+                               time_precision = 1;
                        }
                }
       else if (at == server.atom.WM_STATE) {
@@ -460,22 +476,33 @@ void event_configure_notify (Window win)
 void event_timer()
 {
    struct timeval stv;
-
-   if (!time1_format) return;
+       int i;
 
    if (gettimeofday(&stv, 0)) return;
 
    if (abs(stv.tv_sec - time_clock.tv_sec) < time_precision) return;
 
-   // update clock
-   time_clock.tv_sec = stv.tv_sec;
-   time_clock.tv_sec -= time_clock.tv_sec % time_precision;
+       // urgent task
+       if (task_urgent) {
+               task_urgent->area.is_active = !task_urgent->area.is_active;
+               task_urgent->area.redraw = 1;
+       }
+
+       // update battery
+       if (panel1[0].battery.area.on_screen) {
+               update_battery(&battery_state);
+               for (i=0 ; i < nb_panel ; i++)
+                       panel1[i].battery.area.resize = 1;
+       }
 
-       int i;
-       for (i=0 ; i < nb_panel ; i++) {
-          panel1[i].clock.area.resize = 1;
+       // update clock
+   if (time1_format) {
+               time_clock.tv_sec = stv.tv_sec;
+               time_clock.tv_sec -= time_clock.tv_sec % time_precision;
+               for (i=0 ; i < nb_panel ; i++)
+               panel1[i].clock.area.resize = 1;
        }
-   panel_refresh = 1;
+       panel_refresh = 1;
 }
 
 
@@ -549,6 +576,7 @@ load_config:
 
                                        case UnmapNotify:
                                        case DestroyNotify:
+                                               if (!systray.area.on_screen) break;
                                                for (it = systray.list_icons; it; it = g_slist_next(it)) {
                                                        if (((TrayWindow*)it->data)->id == e.xany.window) {
                                                                remove_icon((TrayWindow*)it->data);
@@ -558,6 +586,7 @@ load_config:
                                        break;
 
                                        case ClientMessage:
+                                               if (!systray.area.on_screen) break;
                                                //printf("ClientMessage\n");
                                                if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
                                                        net_message(&e.xclient);