Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
ecompmgr.c
Log Message:
Better configuration.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/Attic/ecompmgr.c,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -3 -r1.1.2.15 -r1.1.2.16
--- ecompmgr.c 27 Dec 2004 20:30:34 -0000 1.1.2.15
+++ ecompmgr.c 28 Dec 2004 12:17:15 -0000 1.1.2.16
@@ -151,10 +151,11 @@
static struct
{
+ char enable;
+ char resize_fix_enable;
int mode;
int shadow;
int shadow_radius;
- char resize_fix_enable;
} Conf_compmgr;
#define ECM_MODE_OFF 0
@@ -1757,7 +1758,7 @@
XRenderPictFormat *pictfmt;
XRenderPictureAttributes pa;
- if (Conf_compmgr.mode == ECM_MODE_OFF || Mode_compmgr.active)
+ if (!Conf_compmgr.enable || Mode_compmgr.active)
return;
Mode_compmgr.active = 1;
@@ -1829,15 +1830,16 @@
void
ECompMgrConfigGet(cfg_composite * cfg)
{
- cfg->enable = Mode_compmgr.active;
+ cfg->enable = Conf_compmgr.enable;
cfg->shadow = Conf_compmgr.shadow;
}
void
ECompMgrConfigSet(const cfg_composite * cfg)
{
- if (cfg->enable != Mode_compmgr.active)
+ if (cfg->enable != Conf_compmgr.enable)
{
+ Conf_compmgr.enable = cfg->enable;
Conf_compmgr.shadow = cfg->shadow;
if (cfg->enable)
ECompMgrStart();
@@ -1849,7 +1851,7 @@
if (cfg->shadow != Conf_compmgr.shadow)
{
Conf_compmgr.shadow = cfg->shadow;
- if (Mode_compmgr.active)
+ if (Conf_compmgr.enable)
{
ECompMgrShadowsInit(Conf_compmgr.shadow, 1);
ECompMgrDamageAll();
@@ -1986,13 +1988,16 @@
{
int events, errors, major, minor;
- if (!XDamageQueryExtension(disp, &events, &errors))
+ if (!XCompositeQueryExtension(disp, &events, &errors) ||
+ !XDamageQueryExtension(disp, &events, &errors) ||
+ !XFixesQueryExtension(disp, &events, &errors) ||
+ !XRenderQueryExtension(disp, &events, &errors))
{
Conf_compmgr.mode = ECM_MODE_OFF;
goto done;
}
- if (!XDamageQueryExtension(disp, &major, &minor))
+ if (!XDamageQueryVersion(disp, &major, &minor))
{
Conf_compmgr.mode = ECM_MODE_OFF;
goto done;
@@ -2022,7 +2027,10 @@
}
done:
- D1printf("ECompMgrInit: mode=%d\n", Conf_compmgr.mode);
+ if (Conf_compmgr.mode == ECM_MODE_OFF)
+ Conf_compmgr.enable = 0;
+ D1printf("ECompMgrInit: enable=%d mode=%d\n", Conf_compmgr.enable,
+ Conf_compmgr.mode);
}
static void
@@ -2035,12 +2043,7 @@
{
case ESIGNAL_INIT:
ECompMgrInit();
- if (Conf_compmgr.mode == ECM_MODE_OFF)
- break;
ECompMgrStart();
-#if 0
- EventCallbackRegister(VRoot.win, 0, ECompMgrHandleRootEvent, NULL);
-#endif
break;
case ESIGNAL_BACKGROUND_CHANGE:
@@ -2109,7 +2112,8 @@
#define N_IPC_FUNCS (sizeof(CompMgrIpcArray)/sizeof(IpcItem))
static const CfgItem CompMgrCfgItems[] = {
- CFG_ITEM_INT(Conf_compmgr, mode, 0),
+ CFG_ITEM_BOOL(Conf_compmgr, enable, 0),
+ CFG_ITEM_INT(Conf_compmgr, mode, 1),
CFG_ITEM_INT(Conf_compmgr, shadow, 0),
CFG_ITEM_INT(Conf_compmgr, shadow_radius, 12),
CFG_ITEM_BOOL(Conf_compmgr, resize_fix_enable, 0),
-------------------------------------------------------
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://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
