]> Dogcows Code - chaz/tint2/blobdiff - src/taskbar/task.c
fixed bug when active window draged to another desktop
[chaz/tint2] / src / taskbar / task.c
index 3c4e6ed3d11d13e82dc607b097f6e2094d9e8047..2e0cc93133a237ba231293fe17da38e3300a5980 100644 (file)
@@ -1,10 +1,10 @@
 /**************************************************************************
 *
 * Tint2 : task
-* 
+*
 * Copyright (C) 2007 Pål Staurland (staura@gmail.com)
 * Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
-* 
+*
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
 * as published by the Free Software Foundation.
 
 
 
-void add_task (Window win)
+Task *add_task (Window win)
 {
-   Task *new_tsk;
-   int desktop, monitor;
-
-   if (!win || window_is_hidden (win) || win == window.main_win) return;
-
-   new_tsk = malloc(sizeof(Task));
-   new_tsk->win = win;
-   new_tsk->title = 0;
-   new_tsk->icon_data = 0;
-   
-   get_icon(new_tsk);
-   get_title(new_tsk);
-   memcpy(&new_tsk->area, &g_task.area, sizeof(Area));
-   memcpy(&new_tsk->area_active, &g_task.area_active, sizeof(Area));
-   desktop = window_get_desktop (new_tsk->win);
-   monitor = window_get_monitor (new_tsk->win);
-      
-   //if (panel.mode == MULTI_MONITOR) monitor = window_get_monitor (new_tsk->win);
-   //else monitor = 0;
-   //printf("task %s : desktop %d, monitor %d\n", new_tsk->title, desktop, monitor);
-   
-   XSelectInput (server.dsp, new_tsk->win, PropertyChangeMask|StructureNotifyMask);
-   
-   if (desktop == 0xFFFFFFFF) {
-      if (new_tsk->title) XFree (new_tsk->title);
-      if (new_tsk->icon_data) XFree (new_tsk->icon_data);
-      free(new_tsk);
-      fprintf(stderr, "task on all desktop : ignored\n");
-      return;
-   }
-   
-   Taskbar *tskbar;
-   tskbar = &panel.taskbar[index(desktop, monitor)];     
-   new_tsk->area.parent = tskbar;
-   tskbar->area.list = g_slist_append(tskbar->area.list, new_tsk);
+   if (!win) return 0;
+   if (window_is_hidden(win)) return 0;
 
-   if (resize_tasks (tskbar))
-      redraw (&tskbar->area);
+   int monitor;
+
+       Task new_tsk;
+   new_tsk.win = win;
+   new_tsk.area.panel = &panel1[0];
+   new_tsk.desktop = window_get_desktop (win);
+   if (nb_panel > 1) monitor = window_get_monitor (win);
+   else monitor = 0;
+
+       // allocate only one title and one icon
+       // even with task_on_all_desktop and with task_on_all_panel
+   new_tsk.title = 0;
+   new_tsk.icon_data = 0;
+   get_title(&new_tsk);
+   get_icon(&new_tsk);
+
+   //printf("task %s : desktop %d, monitor %d\n", new_tsk->title, desktop, monitor);
+   XSelectInput (server.dsp, new_tsk.win, PropertyChangeMask|StructureNotifyMask);
+
+       Taskbar *tskbar;
+   Task *new_tsk2=0;
+       int i, j;
+       for (i=0 ; i < nb_panel ; i++) {
+               for (j=0 ; j < panel1[i].nb_desktop ; j++) {
+                       if (new_tsk.desktop != ALLDESKTOP && new_tsk.desktop != j) continue;
+                       if (nb_panel > 1 && panel1[i].monitor != monitor) continue;
+
+               tskbar = &panel1[i].taskbar[j];
+                  new_tsk2 = malloc(sizeof(Task));
+                  memcpy(&new_tsk2->area, &panel1[i].g_task.area, sizeof(Area));
+                  new_tsk2->area.parent = tskbar;
+                       new_tsk2->win = new_tsk.win;
+                       new_tsk2->desktop = new_tsk.desktop;
+                       new_tsk2->title = new_tsk.title;
+                       new_tsk2->icon_data = new_tsk.icon_data;
+                       new_tsk2->icon_width = new_tsk.icon_width;
+                       new_tsk2->icon_height = new_tsk.icon_height;
+               tskbar->area.list = g_slist_append(tskbar->area.list, new_tsk2);
+               tskbar->area.resize = 1;
+                       //printf("add_task panel %d, desktop %d, task %s\n", i, j, new_tsk2->title);
+               }
+       }
+       return new_tsk2;
 }
 
 
 void remove_task (Task *tsk)
 {
    if (!tsk) return;
-   
+
+   Window win = tsk->win;
+   int desktop = tsk->desktop;
+
+       // free title and icon just for the first task
+       // even with task_on_all_desktop and with task_on_all_panel
+       //printf("remove_task %s %d\n", tsk->title, tsk->desktop);
+       if (tsk->title)
+               free (tsk->title);
+       if (tsk->icon_data)
+               free (tsk->icon_data);
+
+       int i, j;
+   Task *tsk2;
    Taskbar *tskbar;
-   tskbar = (Taskbar*)tsk->area.parent;
-   tskbar->area.list = g_slist_remove(tskbar->area.list, tsk);
-   resize_tasks (tskbar);
-   redraw (&tskbar->area);
-
-   if (tsk->title) XFree (tsk->title);
-   if (tsk->icon_data) XFree (tsk->icon_data);
-   XFreePixmap (server.dsp, tsk->area.pmap);
-   XFreePixmap (server.dsp, tsk->area_active.pmap);
-   free(tsk);
+       for (i=0 ; i < nb_panel ; i++) {
+               for (j=0 ; j < panel1[i].nb_desktop ; j++) {
+                       if (desktop != ALLDESKTOP && desktop != j) continue;
+
+                       GSList *l0;
+                       tskbar = &panel1[i].taskbar[j];
+                       for (l0 = tskbar->area.list; l0 ; ) {
+                               tsk2 = l0->data;
+                               l0 = l0->next;
+                               if (win == tsk2->win) {
+                                       tskbar->area.list = g_slist_remove(tskbar->area.list, tsk2);
+                       tskbar->area.resize = 1;
+
+                                       if (tsk2 == task_active)
+                                               task_active = 0;
+                                       if (tsk2 == task_drag)
+                                               task_drag = 0;
+
+                                       XFreePixmap (server.dsp, tsk2->area.pix.pmap);
+                                       XFreePixmap (server.dsp, tsk2->area.pix_active.pmap);
+                                       free(tsk2);
+                               }
+                       }
+               }
+       }
+
 }
 
 
 void get_title(Task *tsk)
 {
-   if (!g_task.text) return;
-
+   Panel *panel = tsk->area.panel;
    char *title, *name;
 
-   if (tsk->title) free(tsk->title);
+   if (!panel->g_task.text) return;
 
    name = server_get_property (tsk->win, server.atom._NET_WM_VISIBLE_NAME, server.atom.UTF8_STRING, 0);
    if (!name || !strlen(name)) {
@@ -116,59 +152,97 @@ void get_title(Task *tsk)
    }
 
    // add space before title
-   title = malloc(strlen(name)+1);      
-   if (g_task.icon) strcpy(title, " ");
+   title = malloc(strlen(name)+2);
+   if (panel->g_task.icon) strcpy(title, " ");
    else title[0] = 0;
    strcat(title, name);
-   
    if (name) XFree (name);
+
+       tsk->area.redraw = 1;
+   if (tsk->title)
+      free(tsk->title);
    tsk->title = title;
 }
 
 
 void get_icon (Task *tsk)
 {
-   if (!g_task.icon) return;
-   
+   Panel *panel = tsk->area.panel;
+   if (!panel->g_task.icon) return;
+
+       if (tsk->icon_data) {
+               free (tsk->icon_data);
+               tsk->icon_data = 0;
+       }
+   tsk->area.redraw = 1;
+
    long *data;
    int num;
-
    data = server_get_property (tsk->win, server.atom._NET_WM_ICON, XA_CARDINAL, &num);
-   if (!data) return;
-
-   int w, h;
-   long *tmp_data;
-   tmp_data = get_best_icon (data, get_icon_count (data, num), num, &w, &h, g_task.icon_size1);
-
-   tsk->icon_width = w;
-   tsk->icon_height = h;
-   tsk->icon_data = malloc (w * h * sizeof (long));
-   memcpy (tsk->icon_data, tmp_data, w * h * sizeof (long));
-      
-   XFree (data);
+   if (data) {
+      // get ARGB icon
+      int w, h;
+      long *tmp_data;
+      tmp_data = get_best_icon (data, get_icon_count (data, num), num, &w, &h, panel->g_task.icon_size1);
+
+      tsk->icon_width = w;
+      tsk->icon_height = h;
+      tsk->icon_data = malloc (w * h * sizeof (long));
+      memcpy (tsk->icon_data, tmp_data, w * h * sizeof (long));
+
+      XFree (data);
+   }
+   else {
+      // get Pixmap icon
+      XWMHints *hints = XGetWMHints(server.dsp, tsk->win);
+      if (hints) {
+         if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0) {
+               // get width, height and depth for the pixmap
+                               Window root;
+                               int  icon_x, icon_y;
+                               uint border_width, bpp;
+                               uint icon_width, icon_height;
+
+                               XGetGeometry(server.dsp, hints->icon_pixmap, &root, &icon_x, &icon_y, &icon_width, &icon_height, &border_width, &bpp);
+
+                     //printf("  get_pixmap\n");
+                     Imlib_Image  img;
+                               imlib_context_set_drawable(hints->icon_pixmap);
+                               img = imlib_create_image_from_drawable(hints->icon_mask, 0, 0, icon_width, icon_height, 0);
+                               imlib_context_set_image(img);
+                               unsigned int *data = imlib_image_get_data();
+                               if (!data) {
+                                       return;
+                               }
+                               tsk->icon_width = imlib_image_get_width();
+                               tsk->icon_height = imlib_image_get_height();
+                               tsk->icon_data = malloc (tsk->icon_width * tsk->icon_height * sizeof (long));
+                               memcpy (tsk->icon_data, data, tsk->icon_width * tsk->icon_height * sizeof (long));
+                               imlib_free_image();
+                       }
+         XFree(hints);
+               }
+   }
 }
 
 
 void draw_task_icon (Task *tsk, int text_width, int active)
 {
-   if (tsk->icon_data == 0) get_icon (tsk);
    if (tsk->icon_data == 0) return;
 
-   Pixmap *pmap;
-   
-   if (active) pmap = &tsk->area_active.pmap;
-   else pmap = &tsk->area.pmap;
-   
+   Pixmap *pmap = (active == 0) ? (&tsk->area.pix.pmap) : (&tsk->area.pix_active.pmap);
+
    /* Find pos */
    int pos_x;
-   if (g_task.centered) {
-      if (g_task.text)
-         pos_x = (tsk->area.width - text_width - g_task.icon_size1) / 2;
+   Panel *panel = (Panel*)tsk->area.panel;
+   if (panel->g_task.centered) {
+      if (panel->g_task.text)
+         pos_x = (tsk->area.width - text_width - panel->g_task.icon_size1) / 2;
       else
-         pos_x = (tsk->area.width - g_task.icon_size1) / 2;
+         pos_x = (tsk->area.width - panel->g_task.icon_size1) / 2;
    }
-   else pos_x = g_task.area.paddingx + g_task.area.border.width;
-   
+   else pos_x = panel->g_task.area.paddingxlr + panel->g_task.area.pix.border.width;
+
    /* Render */
    Imlib_Image icon;
    Imlib_Color_Modifier cmod;
@@ -185,7 +259,7 @@ void draw_task_icon (Task *tsk, int text_width, int active)
          data[i] = tsk->icon_data[i];
    }
    else data = (DATA32 *) tsk->icon_data;
-            
+
    icon = imlib_create_image_using_data (tsk->icon_width, tsk->icon_height, data);
    imlib_context_set_image (icon);
    imlib_context_set_drawable (*pmap);
@@ -196,93 +270,66 @@ void draw_task_icon (Task *tsk, int text_width, int active)
    imlib_get_color_modifier_tables (red, green, blue, alpha);
 
    int i, opacity;
-   if (active) opacity = 255*g_task.font_active.alpha;
-   else opacity = 255*g_task.font.alpha;
-   for(i = 127; i < 256; i++) alpha[i] = opacity;
-       
+   opacity = (active == 0) ? (255*panel->g_task.font.alpha) : (255*panel->g_task.font_active.alpha);
+   for (i = 127; i < 256; i++) alpha[i] = opacity;
+
    imlib_set_color_modifier_tables (red, green, blue, alpha);
-   
+
    //imlib_render_image_on_drawable (pos_x, pos_y);
-   imlib_render_image_on_drawable_at_size (pos_x, g_task.icon_posy, g_task.icon_size1, g_task.icon_size1);
-   
+   imlib_render_image_on_drawable_at_size (pos_x, panel->g_task.icon_posy, panel->g_task.icon_size1, panel->g_task.icon_size1);
+
    imlib_free_color_modifier ();
    imlib_free_image ();
    if (sizeof(long) != 4) free(data);
 }
 
 
-void draw_task_title (cairo_t *c, Task *tsk, int active)
+void draw_task (void *obj, cairo_t *c, int active)
 {
+   Task *tsk = obj;
    PangoLayout *layout;
    config_color *config_text;
-   int width, height;
-   
-   if (g_task.text) {
-      /* Layout */
-      layout = pango_cairo_create_layout (c);
-      pango_layout_set_font_description (layout, g_task.font_desc);
-      pango_layout_set_text (layout, tsk->title, -1);
-
-      /* Drawing width and Cut text */
-      pango_layout_set_width (layout, ((Taskbar*)tsk->area.parent)->text_width * PANGO_SCALE);
-      pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
-
-      /* Center text */
-      if (g_task.centered) pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
-      else pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT);
-
-      pango_layout_get_pixel_size (layout, &width, &height);
-
-      if (active) config_text = &g_task.font_active;
-      else config_text = &g_task.font;
-
-      cairo_set_source_rgba (c, config_text->color[0], config_text->color[1], config_text->color[2], config_text->alpha);
-
-      pango_cairo_update_layout (c, layout);
-      cairo_move_to (c, g_task.text_posx, g_task.text_posy);
-      pango_cairo_show_layout (c, layout);
-
-      if (g_task.font_shadow) {
-         cairo_set_source_rgba (c, 0.0, 0.0, 0.0, 0.5);
-         pango_cairo_update_layout (c, layout);
-         cairo_move_to (c, g_task.text_posx + 1, g_task.text_posy + 1);
-         pango_cairo_show_layout (c, layout);
-      }
-      g_object_unref (layout);
+   int width=0, height;
+   Panel *panel = (Panel*)tsk->area.panel;
+
+   if (panel->g_task.text) {
+               /* Layout */
+               layout = pango_cairo_create_layout (c);
+               pango_layout_set_font_description (layout, panel->g_task.font_desc);
+               pango_layout_set_text (layout, tsk->title, -1);
+
+               /* Drawing width and Cut text */
+               // pango use U+22EF or U+2026
+               pango_layout_set_width (layout, ((Taskbar*)tsk->area.parent)->text_width * PANGO_SCALE);
+               pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
+
+               /* Center text */
+               if (panel->g_task.centered) pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
+               else pango_layout_set_alignment (layout, PANGO_ALIGN_LEFT);
+
+               pango_layout_get_pixel_size (layout, &width, &height);
+
+               if (active) config_text = &panel->g_task.font_active;
+               else config_text = &panel->g_task.font;
+
+               cairo_set_source_rgba (c, config_text->color[0], config_text->color[1], config_text->color[2], config_text->alpha);
+
+               pango_cairo_update_layout (c, layout);
+               cairo_move_to (c, panel->g_task.text_posx, panel->g_task.text_posy);
+               pango_cairo_show_layout (c, layout);
+
+               if (panel->g_task.font_shadow) {
+                       cairo_set_source_rgba (c, 0.0, 0.0, 0.0, 0.5);
+                       pango_cairo_update_layout (c, layout);
+                       cairo_move_to (c, panel->g_task.text_posx + 1, panel->g_task.text_posy + 1);
+                       pango_cairo_show_layout (c, layout);
+               }
+               g_object_unref (layout);
    }
 
-   if (g_task.icon) {
+   if (panel->g_task.icon) {
       // icon use same opacity as text
       draw_task_icon (tsk, width, active);
    }
 }
 
-
-int draw_foreground_task (void *obj, cairo_t *c)
-{
-   Task *tsk = obj;
-   cairo_surface_t *cs;
-   cairo_t *ca;
-   //printf("  draw_foreground_task\n");
-
-   draw_task_title (c, tsk, 0);
-
-   // draw active pmap
-   if (tsk->area_active.pmap) XFreePixmap (server.dsp, tsk->area_active.pmap);
-   tsk->area_active.pmap = server_create_pixmap (tsk->area.width, tsk->area.height);
-
-   // add layer of root pixmap
-   XCopyArea (server.dsp, server.pmap, tsk->area_active.pmap, server.gc, tsk->area.posx, tsk->area.posy, tsk->area.width, tsk->area.height, 0, 0);
-
-   cs = cairo_xlib_surface_create (server.dsp, tsk->area_active.pmap, server.visual, tsk->area.width, tsk->area.height);
-   ca = cairo_create (cs);
-
-   // redraw task
-   draw_background (&tsk->area_active, ca);
-   draw_task_title (ca, tsk, 1);
-   
-   cairo_destroy (ca);
-   cairo_surface_destroy (cs);
-   return 0;
-}
-
This page took 0.028923 seconds and 4 git commands to generate.