Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        E.h backgrounds.c cmclass.c config.c iclass.c 


Log Message:
Disable colormodifier stuff (non-functional).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -3 -r1.405 -r1.406
--- E.h 15 Apr 2005 21:07:39 -0000      1.405
+++ E.h 15 Apr 2005 23:59:56 -0000      1.406
@@ -60,6 +60,8 @@
 
 #include <Imlib2.h>
 
+#define ENABLE_COLOR_MODIFIERS 0       /* Not functional */
+
 #define ENABLE_TRANSPARENCY 1
 #define ENABLE_THEME_TRANSPARENCY 1
 
@@ -393,6 +395,7 @@
 }
 VirtRoot;
 
+#if ENABLE_COLOR_MODIFIERS
 typedef struct _modcurve
 {
    int                 num;
@@ -409,6 +412,7 @@
    unsigned int        ref_count;
 }
 ColorModifierClass;
+#endif
 
 typedef struct _imagestate
 {
@@ -421,7 +425,9 @@
    int                 pixmapfillstyle;
    XColor              bg, hi, lo, hihi, lolo;
    int                 bevelstyle;
+#if ENABLE_COLOR_MODIFIERS
    ColorModifierClass *colmod;
+#endif
 }
 ImageState;
 
@@ -439,7 +445,9 @@
    char               *name;
    ImageStateArray     norm, active, sticky, sticky_active;
    Imlib_Border        padding;
+#if ENABLE_COLOR_MODIFIERS
    ColorModifierClass *colmod;
+#endif
    unsigned int        ref_count;
 }
 ImageClass;
@@ -1318,6 +1326,7 @@
                                      Window WindowToEmbed);
 
 /* cmclass.c */
+#if ENABLE_COLOR_MODIFIERS
 void                CreateCurve(ModCurve * c);
 void                FreeModCurve(ModCurve * c);
 void                FreeCMClass(ColorModifierClass * cm);
@@ -1332,6 +1341,7 @@
                                  int bnum, unsigned char *bpx,
                                  unsigned char *bpy);
 int                 ColorModifierConfigLoad(FILE * fs);
+#endif
 
 /* comms.c */
 void                CommsInit(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/backgrounds.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- backgrounds.c       30 Mar 2005 22:51:01 -0000      1.23
+++ backgrounds.c       15 Apr 2005 23:59:58 -0000      1.24
@@ -43,7 +43,9 @@
    char                bg_tile;
    BgPart              bg;
    BgPart              top;
+#if ENABLE_COLOR_MODIFIERS
    ColorModifierClass *cmclass;
+#endif
    char                keepim;
    unsigned int        ref_count;
 };
@@ -298,7 +300,9 @@
    bg->top.xperc = txperc;
    bg->top.yperc = typerc;
 
+#if ENABLE_COLOR_MODIFIERS
    bg->cmclass = NULL;
+#endif
    bg->keepim = 0;
    bg->ref_count = 0;
 
@@ -394,12 +398,14 @@
    return updated;
 }
 
+#if ENABLE_COLOR_MODIFIERS
 static void
 BackgroundSetColorMofifier(Background * bg, ColorModifierClass * cm)
 {
    cm->ref_count++;
    bg->cmclass = cm;
 }
+#endif
 
 static void
 BgFindImageSize(BgPart * bgp, int rw, int rh, int *pw, int *ph)
@@ -480,7 +486,10 @@
        unsigned int        w, h, x, y;
        char                hasbg, hasfg;
        Pixmap              pmap, mask;
+
+#if ENABLE_COLOR_MODIFIERS
        ColorModifierClass *cm;
+#endif
 
        if (bg->bg.file && !bg->bg.im)
          {
@@ -496,6 +505,7 @@
             bg->top.im = ELoadImage(bg->top.real_file);
          }
 
+#if ENABLE_COLOR_MODIFIERS
        cm = bg->cmclass;
        if (cm)
           cm->ref_count--;
@@ -528,6 +538,7 @@
               }
 #endif
          }
+#endif
 
        hasbg = hasfg = 0;
        if (bg->top.im)
@@ -893,9 +904,12 @@
    char               *bg2 = 0;
    char               *name = 0;
    char                ignore = 0;
-   ColorModifierClass *cm = NULL;
    int                 fields;
 
+#if ENABLE_COLOR_MODIFIERS
+   ColorModifierClass *cm = NULL;
+#endif
+
    ESetColor(&xclr, 0, 0, 0);
 
    while (GetLine(s, sizeof(s), fs))
@@ -965,8 +979,10 @@
                            bg = BackgroundCreate(name, &xclr, bg1, i1, i2, i3,
                                                  i4, i5, i6, bg2, j1, j2, j3,
                                                  j4, j5);
+#if ENABLE_COLOR_MODIFIERS
                            if (cm)
                               BackgroundSetColorMofifier(bg, cm);
+#endif
                         }
                    }
               }
@@ -974,7 +990,9 @@
 
          case CONFIG_COLORMOD:
          case ICLASS_COLORMOD:
+#if ENABLE_COLOR_MODIFIERS
             cm = FindItem(s2, 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
+#endif
             break;
 
          case CONFIG_CLASSNAME:
@@ -1176,10 +1194,12 @@
                     bglist[i]->top.xperc, bglist[i]->top.yperc);
          }
 
+#if ENABLE_COLOR_MODIFIERS
        if (bglist[i]->cmclass)
          {
             fprintf(fs, "370 %s\n", bglist[i]->cmclass->name);
          }
+#endif
 
        for (j = 0; j < (DesksGetNumber()); j++)
          {
@@ -2668,7 +2688,7 @@
    autosave();
 }
 
-#if 0                          /* I doubt this is used */
+#if ENABLE_COLOR_MODIFIERS
 static void
 IPC_BackgroundColormodifierSet(const char *params, Client * c __UNUSED__)
 {
@@ -2745,7 +2765,7 @@
    {
     IPC_BackgroundUse, "use_bg", NULL, "Deprecated - do not use", NULL}
    ,
-#if 0                          /* I doubt this is used */
+#if ENABLE_COLOR_MODIFIERS
    {IPC_BackgroundColormodifierSet, "set_bg_colmod", NULL, "TBD", NULL}
    ,
    {IPC_BackgroundColormodifierGet, "get_bg_colmod", NULL, "TBD", NULL}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/cmclass.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- cmclass.c   19 Mar 2005 16:39:59 -0000      1.17
+++ cmclass.c   15 Apr 2005 23:59:59 -0000      1.18
@@ -23,6 +23,8 @@
 #include "E.h"
 #include "conf.h"
 
+#if ENABLE_COLOR_MODIFIERS
+
 void
 CreateCurve(ModCurve * c)
 {
@@ -669,3 +671,5 @@
 #define N_IPC_FUNCS (sizeof(CmClassIpcArray)/sizeof(IpcItem))
 
 #endif
+
+#endif /* ENABLE_COLOR_MODIFIERS */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -3 -r1.131 -r1.132
--- config.c    19 Mar 2005 16:39:59 -0000      1.131
+++ config.c    15 Apr 2005 23:59:59 -0000      1.132
@@ -352,7 +352,7 @@
                          ConfigAlertLoad(_("Window match"));
                       break;
                    case CONFIG_COLORMOD:
-#if 0                          /* FIXME - ? */
+#if ENABLE_COLOR_MODIFIERS
                       Config_ColorModifier(fs);
 #endif
                       break;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/iclass.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- iclass.c    20 Mar 2005 15:58:51 -0000      1.58
+++ iclass.c    15 Apr 2005 23:59:59 -0000      1.59
@@ -110,7 +110,9 @@
    ESetColor(&(is->hihi), 255, 255, 255);
    ESetColor(&(is->lolo), 64, 64, 64);
    is->bevelstyle = BEVEL_NONE;
+#if ENABLE_COLOR_MODIFIERS
    is->colmod = NULL;
+#endif
 
    return is;
 }
@@ -128,11 +130,14 @@
        imlib_free_image();
        i->im = NULL;
      }
+
    if (i->border)
       Efree(i->border);
 
+#if ENABLE_COLOR_MODIFIERS
    if (i->colmod)
       i->colmod->ref_count--;
+#endif
 }
 
 static void
@@ -219,7 +224,9 @@
    ic->padding.right = 0;
    ic->padding.top = 0;
    ic->padding.bottom = 0;
+#if ENABLE_COLOR_MODIFIERS
    ic->colmod = NULL;
+#endif
    ic->ref_count = 0;
 
    return ic;
@@ -247,8 +254,10 @@
    FreeImageStateArray(&(ic->sticky));
    FreeImageStateArray(&(ic->sticky_active));
 
+#if ENABLE_COLOR_MODIFIERS
    if (ic->colmod)
       ic->colmod->ref_count--;
+#endif
 }
 
 ImageClass         *
@@ -272,16 +281,20 @@
    if (ic->which) ImagestatePopulate(ic->which); \
    else ic->which = ic->fallback;
 
+#if ENABLE_COLOR_MODIFIERS
 #define ISTATE_SET_CM(which, fallback) \
    if (!ic->which->colmod) { \
       ic->which->colmod = fallback; \
       if (fallback) fallback->ref_count++; \
      }
+#endif
 
 static void
 ImageclassPopulate(ImageClass * ic)
 {
+#if ENABLE_COLOR_MODIFIERS
    ColorModifierClass *cm;
+#endif
 
    if (!ic)
       return;
@@ -309,6 +322,7 @@
    ISTATE_SET_STATE(sticky_active.clicked, sticky_active.normal);
    ISTATE_SET_STATE(sticky_active.disabled, sticky_active.normal);
 
+#if ENABLE_COLOR_MODIFIERS
    if (!ic->colmod)
      {
        cm = (ColorModifierClass *) FindItem("ICLASS", 0, LIST_FINDBY_NAME,
@@ -358,6 +372,7 @@
    ISTATE_SET_CM(sticky_active.hilited, cm);
    ISTATE_SET_CM(sticky_active.clicked, cm);
    ISTATE_SET_CM(sticky_active.disabled, cm);
+#endif
 }
 
 int
@@ -367,12 +382,15 @@
    char                s[FILEPATH_LEN_MAX];
    char                s2[FILEPATH_LEN_MAX];
    int                 i1;
-   ImageClass         *ic = 0;
-   ImageState         *ICToRead = 0;
-   ColorModifierClass *cm = 0;
+   ImageClass         *ic = NULL;
+   ImageState         *ICToRead = NULL;
    int                 fields;
    int                 l, r, t, b;
 
+#if ENABLE_COLOR_MODIFIERS
+   ColorModifierClass *cm = NULL;
+#endif
+
    while (GetLine(s, sizeof(s), fs))
      {
        s2[0] = 0;
@@ -429,11 +447,14 @@
                ic->sticky = ICToInherit->sticky;
                ic->sticky_active = ICToInherit->sticky_active;
                ic->padding = ICToInherit->padding;
+#if ENABLE_COLOR_MODIFIERS
                ic->colmod = ICToInherit->colmod;
+#endif
             }
             break;
          case CONFIG_COLORMOD:
          case ICLASS_COLORMOD:
+#if ENABLE_COLOR_MODIFIERS
             cm = FindItem(s2, 0, LIST_FINDBY_NAME, LIST_TYPE_COLORMODIFIER);
             if (cm)
               {
@@ -447,6 +468,7 @@
                    }
                  cm->ref_count++;
               }
+#endif
             break;
          case ICLASS_PADDING:
             {




-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to