Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        E.h ecore-e16.c ecore-e16.h ewins.c ewmh.c iconify.c icons.c 
        icons.h warp.c 


Log Message:
Handle _NET_WM_ICON.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.455
retrieving revision 1.456
diff -u -3 -r1.455 -r1.456
--- E.h 14 Jun 2005 22:52:24 -0000      1.455
+++ E.h 30 Jun 2005 11:52:01 -0000      1.456
@@ -741,8 +741,6 @@
    PmapMask            mini_pmm;
    int                 mini_w, mini_h;
    Snapshot           *snap;
-   Imlib_Image        *icon_image[3];
-   int                 icon_type;
    int                 head;
    struct
    {
@@ -779,6 +777,7 @@
    {
       char               *wm_name;
       char               *wm_icon_name;
+      unsigned int       *wm_icon, wm_icon_len;
       unsigned int        opacity;
    } ewmh;
    int                 shape_x, shape_y, shape_w, shape_h;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecore-e16.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- ecore-e16.c 12 Jun 2005 08:03:19 -0000      1.13
+++ ecore-e16.c 30 Jun 2005 11:52:02 -0000      1.14
@@ -151,7 +151,7 @@
                          &bytes_after, &prop_ret) != Success)
       return -1;
 
-   if (type_ret == None)
+   if (type_ret == None || num_ret == 0)
      {
        num = 0;
      }
@@ -173,6 +173,54 @@
    return num;
 }
 
+/*
+ * Get CARD32 (array) property of any length
+ *
+ * If the property was successfully fetched the number of items stored in
+ * val is returned, otherwise -1 is returned.
+ * Note: Return value 0 means that the property exists but has no elements.
+ */
+int
+ecore_x_window_prop_card32_list_get(Ecore_X_Window win, Ecore_X_Atom atom,
+                                   unsigned int **plst)
+{
+   unsigned char      *prop_ret;
+   Atom                type_ret;
+   unsigned long       bytes_after, num_ret;
+   int                 format_ret;
+   unsigned int        i, *val;
+   int                 num;
+
+   prop_ret = NULL;
+   if (XGetWindowProperty(_ecore_x_disp, win, atom, 0, 0x7fffffff, False,
+                         XA_CARDINAL, &type_ret, &format_ret, &num_ret,
+                         &bytes_after, &prop_ret) != Success)
+      return -1;
+
+   if (type_ret == None || num_ret == 0)
+     {
+       num = 0;
+       *plst = NULL;
+     }
+   else if (prop_ret && type_ret == XA_CARDINAL && format_ret == 32)
+     {
+       val = malloc(num_ret * sizeof(unsigned int));
+       for (i = 0; i < num_ret; i++)
+          val[i] = ((unsigned long *)prop_ret)[i];
+       num = num_ret;
+       *plst = val;
+     }
+   else
+     {
+       num = -1;
+       *plst = NULL;
+     }
+   if (prop_ret)
+      XFree(prop_ret);
+
+   return num;
+}
+
 #endif /* USE_ECORE_X */
 
 /*
@@ -782,11 +830,12 @@
 Ecore_X_Atom        ECORE_X_ATOM_NET_WM_STRUT;
 Ecore_X_Atom        ECORE_X_ATOM_NET_FRAME_EXTENTS;
 
+Ecore_X_Atom        ECORE_X_ATOM_NET_WM_ICON;
+
 #if 0                          /* Not used */
 Ecore_X_Atom        ECORE_X_ATOM_NET_WM_ALLOWED_ACTIONS;
 Ecore_X_Atom        ECORE_X_ATOM_NET_WM_STRUT_PARTIAL;
 Ecore_X_Atom        ECORE_X_ATOM_NET_WM_ICON_GEOMETRY;
-Ecore_X_Atom        ECORE_X_ATOM_NET_WM_ICON;
 Ecore_X_Atom        ECORE_X_ATOM_NET_WM_PID;
 Ecore_X_Atom        ECORE_X_ATOM_NET_WM_HANDLED_ICONS;
 Ecore_X_Atom        ECORE_X_ATOM_NET_WM_USER_TIME;
@@ -880,11 +929,12 @@
    ECORE_X_ATOM_NET_WM_STRUT = _ATOM_GET("_NET_WM_STRUT");
    ECORE_X_ATOM_NET_FRAME_EXTENTS = _ATOM_GET("_NET_FRAME_EXTENTS");
 
+   ECORE_X_ATOM_NET_WM_ICON = _ATOM_GET("_NET_WM_ICON");
+
 #if 0                          /* Not used */
    ECORE_X_ATOM_NET_WM_ALLOWED_ACTIONS = _ATOM_GET("_NET_WM_ALLOWED_ACTIONS");
    ECORE_X_ATOM_NET_WM_STRUT_PARTIAL = _ATOM_GET("_NET_WM_STRUT_PARTIAL");
    ECORE_X_ATOM_NET_WM_ICON_GEOMETRY = _ATOM_GET("_NET_WM_ICON_GEOMETRY");
-   ECORE_X_ATOM_NET_WM_ICON = _ATOM_GET("_NET_WM_ICON");
    ECORE_X_ATOM_NET_WM_PID = _ATOM_GET("_NET_WM_PID");
    ECORE_X_ATOM_NET_WM_HANDLED_ICONS = _ATOM_GET("_NET_WM_HANDLED_ICONS");
    ECORE_X_ATOM_NET_WM_USER_TIME = _ATOM_GET("_NET_WM_USER_TIME");
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecore-e16.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ecore-e16.h 12 Jun 2005 08:03:19 -0000      1.9
+++ ecore-e16.h 30 Jun 2005 11:52:02 -0000      1.10
@@ -63,6 +63,9 @@
                                                   Ecore_X_Atom atom,
                                                   unsigned int *val,
                                                   unsigned int len);
+int                 ecore_x_window_prop_card32_list_get(Ecore_X_Window win,
+                                                       Ecore_X_Atom atom,
+                                                       unsigned int **plst);
 
 void                ecore_x_window_prop_string_set(Ecore_X_Window win,
                                                   Ecore_X_Atom atom,
@@ -160,11 +163,12 @@
 extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT;
 extern Ecore_X_Atom ECORE_X_ATOM_NET_FRAME_EXTENTS;
 
+extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON;
+
 #if 0                          /* Not used */
 extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ALLOWED_ACTIONS;
 extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_STRUT_PARTIAL;
 extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON_GEOMETRY;
-extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_ICON;
 extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_PID;
 extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_HANDLED_ICONS;
 extern Ecore_X_Atom ECORE_X_ATOM_NET_WM_USER_TIME;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewins.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- ewins.c     17 Jun 2005 23:16:37 -0000      1.76
+++ ewins.c     30 Jun 2005 11:52:02 -0000      1.77
@@ -227,6 +227,8 @@
 
    if (ewin->icccm.wm_name)
       Efree(ewin->icccm.wm_name);
+   if (ewin->icccm.wm_icon_name)
+      Efree(ewin->icccm.wm_icon_name);
    if (ewin->icccm.wm_res_class)
       Efree(ewin->icccm.wm_res_class);
    if (ewin->icccm.wm_res_name)
@@ -242,9 +244,9 @@
       Efree(ewin->ewmh.wm_name);
    if (ewin->ewmh.wm_icon_name)
       Efree(ewin->ewmh.wm_icon_name);
+   if (ewin->ewmh.wm_icon)
+      Efree(ewin->ewmh.wm_icon);
 #endif
-   if (ewin->icccm.wm_icon_name)
-      Efree(ewin->icccm.wm_icon_name);
    if (EoGetWin(ewin))
       EDestroyWindow(EoGetWin(ewin));
    if (ewin->bits)
@@ -252,7 +254,6 @@
    if (ewin->session_id)
       Efree(ewin->session_id);
    FreePmapMask(&ewin->mini_pmm);
-   EwinIconImageFree(ewin);
    GroupsEwinRemove(ewin);
    Efree(ewin);
 }
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- ewmh.c      12 Jun 2005 13:09:11 -0000      1.73
+++ ewmh.c      30 Jun 2005 11:52:02 -0000      1.74
@@ -588,6 +588,51 @@
 }
 
 static void
+EWMH_GetWindowIcons(EWin * ewin)
+{
+   unsigned int       *val;
+   int                 i, num;
+
+   if (ewin->ewmh.wm_icon)
+     {
+       Efree(ewin->ewmh.wm_icon);
+       ewin->ewmh.wm_icon = NULL;
+     }
+
+   num = ecore_x_window_prop_card32_list_get(ewin->client.win,
+                                            ECORE_X_ATOM_NET_WM_ICON, &val);
+   ewin->ewmh.wm_icon_len = num;
+   if (num <= 0)
+      return;
+
+   if (num < (int)(2 + val[0] * val[1]))
+     {
+       Eprintf
+          ("*** EWMH_GetWindowIcons Icon data/size mismatch (ignoring): %s: 
N=%d WxH=%dx%d\n",
+           EwinGetName(ewin), num, val[0], val[1]);
+       Efree(val);
+       return;
+     }
+
+   for (i = 0; i < num - 1;)
+     {
+#if 0
+       Eprintf("App %s: Icon %d-%4d - %dx%d\n",
+               EwinGetName(ewin), num, i, val[i], val[i + 1]);
+#endif
+       i += 2 + val[i] * val[i + 1];
+     }
+   if (i != num)
+      Eprintf
+        ("*** EWMH_GetWindowIcons Icon data/size mismatch: %s: %d!=%d\n",
+         EwinGetName(ewin), i, num);
+
+   ewin->ewmh.wm_icon = val;
+
+   EwinChange(ewin, EWIN_CHANGE_ICON_PMAP);
+}
+
+static void
 EWMH_GetWindowMisc(EWin * ewin)
 {
    int                 num;
@@ -651,7 +696,7 @@
    EWMH_GetWindowDesktop(ewin);
    EWMH_GetWindowState(ewin);
    EWMH_GetWindowType(ewin);
-/*  EWMH_GetWindowIcons(ewin);  TBD */
+   EWMH_GetWindowIcons(ewin);
    EWMH_GetWindowStrut(ewin);
 }
 
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iconify.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -3 -r1.158 -r1.159
--- iconify.c   13 Jun 2005 16:23:28 -0000      1.158
+++ iconify.c   30 Jun 2005 11:52:02 -0000      1.159
@@ -30,6 +30,7 @@
 
 static void         IconboxesConfigSave(void);
 static Iconbox     *SelectIconboxForEwin(EWin * ewin);
+static void         IconboxObjEwinDel(Iconbox * ib, EWin * ewin);
 
 /* Systray stuff */
 typedef struct
@@ -52,6 +53,7 @@
    } u;
    int                 xo, yo, wo, ho; /* Outer */
    int                 xi, yi, wi, hi; /* Inner */
+   Imlib_Image        *im;
 } IboxOject;
 
 struct _iconbox
@@ -416,6 +418,7 @@
          case IB_TYPE_ICONBOX:
             if (!exiting)
                EwinDeIconify(ib->objs[i].u.ewin);
+            IconboxObjEwinDel(ib, ib->objs[i].u.ewin);
             break;
          case IB_TYPE_SYSTRAY:
             IconboxObjSwinFree(ib, ib->objs[i].u.swin);
@@ -607,7 +610,7 @@
    ib->objs = Erealloc(ib->objs, sizeof(IboxOject) * ib->num_objs);
    ib->objs[ib->num_objs - 1].u.obj = obj;
 
-   return 0;                   /* Success */
+   return ib->num_objs - 1;    /* Success */
 }
 
 static int
@@ -643,15 +646,31 @@
 static void
 IconboxObjEwinAdd(Iconbox * ib, EWin * ewin)
 {
-   if (IconboxObjectAdd(ib, ewin) == 0)
-      IconboxRedraw(ib);
+   int                 i;
+
+   i = IconboxObjectAdd(ib, ewin);
+   if (i < 0)
+      return;
+
+   ib->objs[i].im = EwinIconImageGet(ewin, ib->iconsize, ib->icon_mode);
+   IconboxRedraw(ib);
 }
 
 static void
 IconboxObjEwinDel(Iconbox * ib, EWin * ewin)
 {
-   if (IconboxObjectDel(ib, ewin) == 0)
-      IconboxRedraw(ib);
+   int                 i;
+
+   i = IconboxObjEwinFind(ib, ewin);
+   if (i < 0)
+      return;
+
+   if (ib->objs[i].im)
+     {
+       imlib_context_set_image(ib->objs[i].im);
+       imlib_free_image();
+     }
+   IconboxObjectDel(ib, ewin);
 }
 
 static void
@@ -665,7 +684,6 @@
    if (!ib)
       return;
 
-   EwinIconImageGet(ewin, ib->iconsize, ib->icon_mode, 1);
    IconboxObjEwinAdd(ib, ewin);
 
    if (ib->animate && !ewin->st.showingdesk)
@@ -689,6 +707,7 @@
        IB_Animate(0, ewin, ib->ewin);
      }
    IconboxObjEwinDel(ib, ewin);
+   IconboxRedraw(ib);
 }
 
 static void
@@ -697,8 +716,11 @@
    Iconbox            *ib;
 
    ib = SelectIconboxForEwin(ewin);
-   if (ib)
-      IconboxObjEwinDel(ib, ewin);
+   if (!ib)
+      return;
+
+   IconboxObjEwinDel(ib, ewin);
+   IconboxRedraw(ib);
 }
 
 static Iconbox    **
@@ -776,13 +798,22 @@
 static void
 IconboxUpdateEwinIcon(Iconbox * ib, EWin * ewin, int icon_mode)
 {
+   int                 i;
+
    if (ib->icon_mode != icon_mode)
       return;
 
-   if (IconboxObjEwinFind(ib, ewin) < 0)
+   i = IconboxObjEwinFind(ib, ewin);
+   if (i < 0)
       return;
 
-   EwinIconImageGet(ewin, ib->iconsize, icon_mode, 1);
+   if (ib->objs[i].im)
+     {
+       imlib_context_set_image(ib->objs[i].im);
+       imlib_free_image();
+     }
+   ib->objs[i].im = EwinIconImageGet(ewin, ib->iconsize, icon_mode);
+
    IconboxRedraw(ib);
 }
 
@@ -883,14 +914,9 @@
        /* Inner size */
        if (ib->type == IB_TYPE_ICONBOX)
          {
-            EWin               *ewin;
-            Imlib_Image        *im;
-
-            ewin = ibo->u.ewin;
-            im = EwinIconImageGet(ewin, ib->iconsize, ib->icon_mode, 0);
             wi = hi = 8;
-            if (im)
-               IconboxFindIconSize(im, &wi, &hi, ib->iconsize);
+            if (ibo->im)
+               IconboxFindIconSize(ibo->im, &wi, &hi, ib->iconsize);
          }
        else
          {
@@ -1649,21 +1675,15 @@
 
        if (ib->type == IB_TYPE_ICONBOX)
          {
-            EWin               *ewin;
-            Imlib_Image        *ii;
-
-            ewin = ib->objs[i].u.ewin;
-
-            ii = EwinIconImageGet(ewin, ib->iconsize, ib->icon_mode, 0);
-            if (ii)
+            if (ibo->im)
               {
-                 imlib_context_set_image(ii);
+                 imlib_context_set_image(ibo->im);
                  ww = imlib_image_get_width();
                  hh = imlib_image_get_height();
                  imlib_context_set_image(im);
                  imlib_context_set_anti_alias(1);
                  imlib_context_set_blend(1);
-                 imlib_blend_image_onto_image(ii, 1, 0, 0, ww, hh,
+                 imlib_blend_image_onto_image(ibo->im, 1, 0, 0, ww, hh,
                                               ibo->xi, ibo->yi, ibo->wi,
                                               ibo->hi);
                  imlib_context_set_blend(0);
@@ -1672,9 +1692,9 @@
          }
        else
          {
-            if (ib->objs[i].u.swin->mapped)
+            if (ibo->u.swin->mapped)
               {
-                 EMoveResizeWindow(ib->objs[i].u.swin->win,
+                 EMoveResizeWindow(ibo->u.swin->win,
                                    ibo->xi, ibo->yi, ibo->wi, ibo->hi);
               }
          }
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icons.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- icons.c     25 May 2005 21:47:24 -0000      1.2
+++ icons.c     30 Jun 2005 11:52:03 -0000      1.3
@@ -24,6 +24,45 @@
 #include "E.h"
 #include "icons.h"
 
+static int
+NetwmIconFindBestSize(unsigned int *val, unsigned int len, int size)
+{
+   unsigned int        i, j, sj, sbest, sz;
+   int                 k = -1;
+
+   sz = (unsigned int)size;
+   sj = sbest = 0;
+   for (i = 0; i < len;)
+     {
+       j = i;
+       i += 2 + val[i] * val[i + 1];
+       if (i > len)
+          break;
+       /* Valid */
+       sj = val[j];
+       if (sj == sz)
+         {
+            k = j;
+            break;             /* First exact match */
+         }
+       /* FIXME - Size selection is not correct */
+       if (sj < sz)
+         {
+            if (sj <= sbest)
+               continue;
+         }
+       else
+         {
+            if (sbest && sj >= sbest)
+               continue;
+         }
+       k = j;
+       sbest = sj;
+     }
+
+   return k;
+}
+
 static Imlib_Image *
 IB_SnapEWin(EWin * ewin, int size)
 {
@@ -95,7 +134,7 @@
 }
 
 static Imlib_Image *
-IB_GetAppIcon(EWin * ewin)
+IB_GetAppIcon(EWin * ewin, int size)
 {
    /* Get the applications icon pixmap/mask */
    int                 x, y;
@@ -103,6 +142,23 @@
    Window              rt;
    Imlib_Image         im;
 
+   if (ewin->ewmh.wm_icon)
+     {
+       x = NetwmIconFindBestSize(ewin->ewmh.wm_icon, ewin->ewmh.wm_icon_len,
+                                 size);
+       if (x >= 0)
+         {
+            im = imlib_create_image_using_copied_data(ewin->ewmh.wm_icon[x],
+                                                      ewin->ewmh.wm_icon[x +
+                                                                         1],
+                                                      ewin->ewmh.wm_icon + x +
+                                                      2);
+            imlib_context_set_image(im);
+            imlib_image_set_has_alpha(1);
+            return im;
+         }
+     }
+
    if (!ewin->client.icon_pmap)
       return NULL;
 
@@ -152,7 +208,7 @@
 };
 
 Imlib_Image        *
-EwinIconImageGet(EWin * ewin, int size, int mode, int update)
+EwinIconImageGet(EWin * ewin, int size, int mode)
 {
    Imlib_Image        *im = NULL;
    int                 i, type;
@@ -166,17 +222,6 @@
        if (type >= N_TYPES)
           continue;
 
-       im = ewin->icon_image[type];
-       if (im)
-         {
-            if (!update)
-               return im;
-
-            imlib_context_set_image(im);
-            imlib_free_image();
-            im = NULL;
-         }
-
        switch (type)
          {
          default:
@@ -187,7 +232,7 @@
             break;
 
          case EWIN_ICON_TYPE_APP:
-            im = IB_GetAppIcon(ewin);
+            im = IB_GetAppIcon(ewin, size);
             break;
 
          case EWIN_ICON_TYPE_IMG:
@@ -199,22 +244,5 @@
      }
 
  done:
-   if (im)
-      ewin->icon_image[type] = im;
    return im;
 }
-
-void
-EwinIconImageFree(EWin * ewin)
-{
-   unsigned int        i;
-
-   for (i = 0; i < sizeof(ewin->icon_image) / sizeof(Imlib_Image *); i++)
-     {
-       if (!ewin->icon_image[i])
-          continue;
-       imlib_context_set_image(ewin->icon_image[i]);
-       imlib_free_image_and_decache();
-       ewin->icon_image[i] = NULL;
-     }
-}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icons.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- icons.h     25 May 2005 21:42:59 -0000      1.1
+++ icons.h     30 Jun 2005 11:52:03 -0000      1.2
@@ -30,6 +30,4 @@
    EWIN_ICON_TYPE_NONE,
 } ewin_icon_e;
 
-Imlib_Image        *EwinIconImageGet(EWin * ewin, int size, int mode,
-                                    int update);
-void                EwinIconImageFree(EWin * ewin);
+Imlib_Image        *EwinIconImageGet(EWin * ewin, int size, int mode);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/warp.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- warp.c      25 May 2005 21:42:59 -0000      1.65
+++ warp.c      30 Jun 2005 11:52:03 -0000      1.66
@@ -186,7 +186,7 @@
                           tw, th, 0, 0);
 
                  im = EwinIconImageGet(wl->ewin, icon_size,
-                                       Conf.warplist.icon_mode, 1);
+                                       Conf.warplist.icon_mode);
                  if (!im)
                     continue;
 
@@ -196,6 +196,7 @@
                  imlib_render_image_on_drawable_at_size(ic->padding.left +
                                                         ICON_PAD, ICON_PAD,
                                                         icon_size, icon_size);
+                 imlib_free_image();
                  imlib_context_set_blend(0);
               }
             else




-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to