Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        ecompmgr.c 


Log Message:
Enable using named pixmap (debug option for now).
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ecompmgr.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ecompmgr.c  6 Feb 2005 11:50:19 -0000       1.8
+++ ecompmgr.c  6 Feb 2005 12:54:09 -0000       1.9
@@ -153,6 +153,7 @@
 {
    char                enable;
    char                resize_fix_enable;
+   char                use_name_pixmap;
    int                 mode;
    int                 shadow;
    int                 shadow_radius;
@@ -168,7 +169,7 @@
    char               *args;
    char                active;
 #if HAS_NAME_WINDOW_PIXMAP
-   char                have_name_pixmap;
+   char                use_pixmap;
 #endif
    EObj               *eo_first;
    EObj               *eo_last;
@@ -1146,7 +1147,7 @@
    if (w->a.class == InputOnly)
       return;
 
-#if xHAS_NAME_WINDOW_PIXMAP    /* Hmmm.. */
+#if HAS_NAME_WINDOW_PIXMAP
    if (w->pixmap != None)
      {
        XFreePixmap(disp, w->pixmap);
@@ -1157,7 +1158,7 @@
             w->picture = None;
          }
      }
-   if (Mode_compmgr.have_name_pixmap)
+   if (Mode_compmgr.use_pixmap)
       w->pixmap = XCompositeNameWindowPixmap(disp, eo->win);
 #endif
 
@@ -2066,7 +2067,8 @@
        goto done;
      }
 #if HAS_NAME_WINDOW_PIXMAP
-   Mode_compmgr.have_name_pixmap = (major > 0 || minor >= 2);
+   Mode_compmgr.use_pixmap =
+      (major > 0 || minor >= 2) && Conf_compmgr.use_name_pixmap;
 #endif
 
    if (Conf_compmgr.mode == ECM_MODE_OFF)
@@ -2183,6 +2185,7 @@
    CFG_ITEM_INT(Conf_compmgr, shadow, 0),
    CFG_ITEM_INT(Conf_compmgr, shadow_radius, 12),
    CFG_ITEM_BOOL(Conf_compmgr, resize_fix_enable, 0),
+   CFG_ITEM_BOOL(Conf_compmgr, use_name_pixmap, 0),
 };
 #define N_CFG_ITEMS (sizeof(CompMgrCfgItems)/sizeof(CfgItem))
 




-------------------------------------------------------
This SF.Net email is sponsored by: IntelliVIEW -- Interactive Reporting
Tool for open source databases. Create drag-&-drop reports. Save time
by over 75%! Publish reports on the web. Export to DOC, XLS, RTF, etc.
Download a FREE copy at http://www.intelliview.com/go/osdn_nl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to