*add* multiple tasks can be urgent now

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index 3696911387bbff9813b4dbb796905f8c70c47cf5..192fa36d01f139a8c03db3441f3cc58852b91bbb 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -49,21 +49,27 @@ void signal_handler(int sig)
 
 void init (int argc, char *argv[])
 {
-       int c;
+       int i;
 
        // read options
-       while ((c = getopt(argc , argv, "c:j:v")) != -1) {
-               switch (c) {
-                       case 'c':
-                       config_path = strdup (optarg);
-                       break;
-                       case 'j':
-                       thumbnail_path = strdup (optarg);
-                       break;
-                       case 'v':
-                       printf("tint2 version 0.7-svn\n");
+       for (i = 1; i < argc; ++i) {
+               if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))       {
+                       printf("Usage: tint2 [-c] <config_file>\n");
+                       exit(0);
+               }
+               if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version"))    {
+                       printf("tint2 version 0.7.svn\n");
                        exit(0);
-                       break;
+               }
+               if (!strcmp(argv[i], "-c"))     {
+                       i++;
+                       if (i < argc)
+                               config_path = strdup(argv[i]);
+               }
+               if (!strcmp(argv[i], "-s"))     {
+                       i++;
+                       if (i < argc)
+                               snapshot_path = strdup(argv[i]);
                }
        }
 
@@ -91,7 +97,7 @@ void init (int argc, char *argv[])
        server.visual = DefaultVisual (server.dsp, server.screen);
        server.desktop = server_get_current_desktop ();
        XGCValues  gcv;
-       server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv) ;
+       server.gc = XCreateGC (server.dsp, server.root_win, (unsigned long)0, &gcv);
 
        XSetErrorHandler ((XErrorHandler) server_catch_error);
 
@@ -105,7 +111,6 @@ void init (int argc, char *argv[])
        setlocale (LC_ALL, "");
 
        // load default icon
-       int i;
        char *path;
        const gchar * const *data_dirs;
        data_dirs = g_get_system_data_dirs ();
@@ -138,7 +143,7 @@ void cleanup()
                imlib_free_image();
        }
        if (config_path) g_free(config_path);
-       if (thumbnail_path) g_free(thumbnail_path);
+       if (snapshot_path) g_free(snapshot_path);
 
        if (server.monitor) free(server.monitor);
        XFreeGC(server.dsp, server.gc);
@@ -146,6 +151,25 @@ void cleanup()
 }
 
 
+void get_snapshot(const char *path)
+{
+       Panel *panel = &panel1[0];
+
+       if (panel->temp_pmap) XFreePixmap(server.dsp, panel->temp_pmap);
+       panel->temp_pmap = XCreatePixmap(server.dsp, server.root_win, panel->area.width, panel->area.height, server.depth);
+
+       refresh(&panel->area);
+
+       Imlib_Image img = NULL;
+       imlib_context_set_drawable(panel->temp_pmap);
+       img = imlib_create_image_from_drawable(0, 0, 0, panel->area.width, panel->area.height, 0);
+
+       imlib_context_set_image(img);
+       imlib_save_image(path);
+       imlib_free_image();
+}
+
+
 Taskbar *click_taskbar (Panel *panel, int x, int y)
 {
        Taskbar *tskbar;
@@ -241,8 +265,10 @@ void window_action (Task *tsk, int action)
                        XIconifyWindow (server.dsp, tsk->win, server.screen);
                        break;
                case TOGGLE_ICONIFY:
-                       if (tsk == task_active) XIconifyWindow (server.dsp, tsk->win, server.screen);
-                       else set_active (tsk->win);
+                       if (task_active && tsk->win == task_active->win)
+                               XIconifyWindow (server.dsp, tsk->win, server.screen);
+                       else
+                               set_active (tsk->win);
                        break;
                case SHADE:
                        window_toggle_shade (tsk->win);
@@ -454,10 +480,20 @@ void event_property_notify (XEvent *e)
        else {
                tsk = task_get_task (win);
                if (!tsk) {
-                       if ( at != server.atom._NET_WM_STATE)
-                               return;
-                       else if ( !(tsk = add_task(win)) )
+                       if (at != server.atom._NET_WM_STATE)
                                return;
+                       else {
+                               // xfce4 sends _NET_WM_STATE after minimized to tray, so we need to check if window is mapped
+                               // if it is mapped and not set as skip_taskbar, we must add it to our task list
+                               XWindowAttributes wa;
+                               XGetWindowAttributes(server.dsp, win, &wa);
+                               if (wa.map_state == IsViewable && !window_is_skip_taskbar(win)) {
+                                       if ( (tsk = add_task(win)) )
+                                               panel_refresh = 1;
+                                       else
+                                               return;
+                               }
+                       }
                }
                //printf("atom root_win = %s, %s\n", XGetAtomName(server.dsp, at), tsk->title);
 
@@ -483,9 +519,7 @@ void event_property_notify (XEvent *e)
                // Demand attention
                else if (at == server.atom._NET_WM_STATE) {
                        if (window_is_urgent (win)) {
-                               task_urgent = tsk;
-                               tick_urgent = 0;
-                               time_precision = 1;
+                               add_urgent(tsk);
                        }
                        if (window_is_skip_taskbar(win)) {
                                remove_task( tsk );
@@ -556,9 +590,7 @@ void event_property_notify (XEvent *e)
                else if (at == server.atom.WM_HINTS) {
                        XWMHints* wmhints = XGetWMHints(server.dsp, win);
                        if (wmhints && wmhints->flags & XUrgencyHint) {
-                               task_urgent = tsk;
-                               tick_urgent = 0;
-                               time_precision = 1;
+                               add_urgent(tsk);
                        }
                        XFree(wmhints);
                }
@@ -638,12 +670,15 @@ void event_timer()
        time_clock.tv_sec -= time_clock.tv_sec % time_precision;
 
        // urgent task
-       if (task_urgent) {
-               if (tick_urgent < max_tick_urgent) {
-                       task_urgent->area.is_active = !task_urgent->area.is_active;
-                       task_urgent->area.redraw = 1;
-                       tick_urgent++;
+       GSList* urgent_task = urgent_list;
+       while (urgent_task) {
+               Task_urgent* t = urgent_task->data;
+               if ( t->tick < max_tick_urgent) {
+                       t->tsk->area.is_active = !t->tsk->area.is_active;
+                       t->tsk->area.redraw = 1;
+                       t->tick++;
                }
+               urgent_task = urgent_task->next;
        }
 
        // update battery
@@ -718,9 +753,8 @@ int main (int argc, char *argv[])
        }
        init_panel();
        cleanup_config();
-       if (thumbnail_path) {
-               // usage: tint2 -j <file> for internal use
-               printf("file %s\n", thumbnail_path);
+       if (snapshot_path) {
+               get_snapshot(snapshot_path);
                cleanup();
                exit(0);
        }