Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h ecompmgr.c ecompmgr.h eobj.c eobj.h ewins.c mod-misc.c
settings.c snaps.c windowmatch.c
Log Message:
Add configuration of default opacities.
===================================================================
RCS file: /cvs/e/e16/e/src/E.h,v
retrieving revision 1.602
retrieving revision 1.603
diff -u -3 -r1.602 -r1.603
--- E.h 27 Jan 2008 18:37:18 -0000 1.602
+++ E.h 10 Feb 2008 20:21:52 -0000 1.603
@@ -337,6 +337,8 @@
int movres;
int menus;
int tooltips;
+ int focused;
+ int unfocused;
} opacity;
struct
{
===================================================================
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -3 -r1.167 -r1.168
--- ecompmgr.c 27 Jan 2008 18:38:53 -0000 1.167
+++ ecompmgr.c 10 Feb 2008 20:21:53 -0000 1.168
@@ -2596,6 +2596,9 @@
cfg->enable = Conf_compmgr.enable;
cfg->shadow = Conf_compmgr.shadows.mode;
cfg->fading = Conf_compmgr.fading.enable;
+ cfg->opacity_focused = Conf.opacity.focused;
+ cfg->opacity_unfocused = Conf.opacity.unfocused;
+ cfg->opacity_override = Conf_compmgr.override_redirect.opacity;
cfg->fade_speed = 100 - (Conf_compmgr.fading.time / 10);
}
@@ -2637,6 +2640,12 @@
Conf_compmgr.fading.enable = cfg->fading;
Conf_compmgr.fading.time = (100 - cfg->fade_speed) * 10;
+
+ Conf.opacity.focused = cfg->opacity_focused;
+ Conf.opacity.unfocused = cfg->opacity_unfocused;
+ Conf_compmgr.override_redirect.opacity = cfg->opacity_override;
+
+ EobjsOpacityUpdate(Conf_compmgr.override_redirect.opacity);
autosave();
}
===================================================================
RCS file: /cvs/e/e16/e/src/ecompmgr.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- ecompmgr.h 7 Feb 2007 01:51:18 -0000 1.33
+++ ecompmgr.h 10 Feb 2008 20:21:53 -0000 1.34
@@ -34,6 +34,9 @@
int shadow;
char fading;
int fade_speed;
+ int opacity_focused;
+ int opacity_unfocused;
+ int opacity_override;
} cfg_composite;
int ECompMgrIsActive(void);
===================================================================
RCS file: /cvs/e/e16/e/src/eobj.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -3 -r1.96 -r1.97
--- eobj.c 11 Jul 2007 08:44:12 -0000 1.96
+++ eobj.c 10 Feb 2008 20:21:53 -0000 1.97
@@ -670,3 +670,29 @@
#endif
ESync();
}
+
+#if USE_COMPOSITE
+void
+EobjsOpacityUpdate(int op_or)
+{
+ EObj *eo, *const *lst;
+ int i, num;
+
+ lst = EobjListStackGet(&num);
+ for (i = 0; i < num; i++)
+ {
+ eo = lst[i];
+ switch (eo->type)
+ {
+ default:
+ break;
+ case EOBJ_TYPE_EWIN:
+ EwinUpdateOpacity((EWin *) eo);
+ break;
+ case EOBJ_TYPE_EXT:
+ EobjChangeOpacity(eo, OpacityFromPercent(op_or));
+ break;
+ }
+ }
+}
+#endif
===================================================================
RCS file: /cvs/e/e16/e/src/eobj.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- eobj.h 27 Jan 2008 18:38:53 -0000 1.45
+++ eobj.h 10 Feb 2008 20:21:53 -0000 1.46
@@ -185,6 +185,8 @@
void EobjSlideSizeTo(EObj * eo, int fx, int fy, int tx, int ty,
int fw, int fh, int tw, int th, int speed);
+void EobjsOpacityUpdate(int op_or);
+
/* stacking.c */
void EobjListStackAdd(EObj * eo, int ontop);
void EobjListStackDel(EObj * eo);
===================================================================
RCS file: /cvs/e/e16/e/src/ewins.c,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -3 -r1.216 -r1.217
--- ewins.c 3 Feb 2008 17:08:38 -0000 1.216
+++ ewins.c 10 Feb 2008 20:21:53 -0000 1.217
@@ -339,9 +339,7 @@
if (ewin->state.shaded)
EwinInstantShade(ewin, 1);
- if (ewin->ewmh.opacity == 0)
- ewin->ewmh.opacity = 0xffffffff;
- EoChangeOpacity(ewin, ewin->ewmh.opacity);
+ EwinUpdateOpacity(ewin);
HintsSetWindowState(ewin);
HintsSetWindowOpacity(ewin);
@@ -1892,6 +1890,12 @@
opacity = ewin->props.focused_opacity;
if (opacity == 0)
opacity = ewin->ewmh.opacity;
+ if (opacity == 0)
+ opacity = ewin->state.active ?
+ OpacityFromPercent(Conf.opacity.focused) :
+ OpacityFromPercent(Conf.opacity.unfocused);
+ if (opacity == 0)
+ opacity = 0xffffffff; /* Fallback */
EoChangeOpacity(ewin, opacity);
}
===================================================================
RCS file: /cvs/e/e16/e/src/mod-misc.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- mod-misc.c 27 Jan 2008 18:37:19 -0000 1.63
+++ mod-misc.c 10 Feb 2008 20:21:53 -0000 1.64
@@ -162,6 +162,8 @@
CFG_ITEM_INT(Conf, opacity.menus, 85),
CFG_ITEM_INT(Conf, opacity.movres, 60),
CFG_ITEM_INT(Conf, opacity.tooltips, 80),
+ CFG_ITEM_INT(Conf, opacity.focused, 100),
+ CFG_ITEM_INT(Conf, opacity.unfocused, 100),
CFG_ITEM_BOOL(Conf, place.manual, 0),
CFG_ITEM_BOOL(Conf, place.manual_mouse_pointer, 0),
===================================================================
RCS file: /cvs/e/e16/e/src/settings.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -3 -r1.170 -r1.171
--- settings.c 22 Sep 2007 08:55:16 -0000 1.170
+++ settings.c 10 Feb 2008 20:21:53 -0000 1.171
@@ -606,6 +606,17 @@
DialogItemSetText(di, _("Enable Fading"));
DialogItemCheckButtonSetPtr(di, &Cfg_composite.fading);
+ di = DialogAddItem(table, DITEM_TEXT);
+ DialogItemSetFill(di, 0, 0);
+ DialogItemSetAlign(di, 0, 512);
+ DialogItemSetText(di, _("Fading Speed:"));
+
+ di = DialogAddItem(table, DITEM_SLIDER);
+ DialogItemSliderSetBounds(di, 0, 100);
+ DialogItemSliderSetUnits(di, 5);
+ DialogItemSliderSetJump(di, 5);
+ DialogItemSliderSetValPtr(di, &Cfg_composite.fade_speed);
+
di = DialogAddItem(table, DITEM_SEPARATOR);
DialogItemSetColSpan(di, 2);
@@ -634,16 +645,41 @@
DialogItemRadioButtonGroupSetVal(di, 2);
DialogItemRadioButtonGroupSetValPtr(radio, &Cfg_composite.shadow);
+ di = DialogAddItem(table, DITEM_SEPARATOR);
+ DialogItemSetColSpan(di, 2);
+
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetFill(di, 0, 0);
DialogItemSetAlign(di, 0, 512);
- DialogItemSetText(di, _("Fading Speed:"));
+ DialogItemSetText(di, _("Default focused window opacity:"));
di = DialogAddItem(table, DITEM_SLIDER);
DialogItemSliderSetBounds(di, 0, 100);
DialogItemSliderSetUnits(di, 5);
DialogItemSliderSetJump(di, 5);
- DialogItemSliderSetValPtr(di, &Cfg_composite.fade_speed);
+ DialogItemSliderSetValPtr(di, &Cfg_composite.opacity_focused);
+
+ di = DialogAddItem(table, DITEM_TEXT);
+ DialogItemSetFill(di, 0, 0);
+ DialogItemSetAlign(di, 0, 512);
+ DialogItemSetText(di, _("Default unfocused window opacity:"));
+
+ di = DialogAddItem(table, DITEM_SLIDER);
+ DialogItemSliderSetBounds(di, 0, 100);
+ DialogItemSliderSetUnits(di, 5);
+ DialogItemSliderSetJump(di, 5);
+ DialogItemSliderSetValPtr(di, &Cfg_composite.opacity_unfocused);
+
+ di = DialogAddItem(table, DITEM_TEXT);
+ DialogItemSetFill(di, 0, 0);
+ DialogItemSetAlign(di, 0, 512);
+ DialogItemSetText(di, _("Default pop-up window opacity:"));
+
+ di = DialogAddItem(table, DITEM_SLIDER);
+ DialogItemSliderSetBounds(di, 0, 100);
+ DialogItemSliderSetUnits(di, 5);
+ DialogItemSliderSetJump(di, 5);
+ DialogItemSliderSetValPtr(di, &Cfg_composite.opacity_override);
}
const DialogDef DlgComposite = {
===================================================================
RCS file: /cvs/e/e16/e/src/snaps.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -3 -r1.134 -r1.135
--- snaps.c 3 Feb 2008 17:03:23 -0000 1.134
+++ snaps.c 10 Feb 2008 20:21:53 -0000 1.135
@@ -1506,7 +1506,7 @@
#if USE_COMPOSITE
if (use_flags & SNAP_USE_OPACITY)
{
- sn->opacity = OpacityFix(sn->opacity, 100);
+ sn->opacity = OpacityFix(sn->opacity, 0);
sn->focused_opacity = OpacityFix(sn->focused_opacity, 0);
ewin->ewmh.opacity = OpacityFromPercent(sn->opacity);
ewin->props.focused_opacity = OpacityFromPercent(sn->focused_opacity);
===================================================================
RCS file: /cvs/e/e16/e/src/windowmatch.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- windowmatch.c 27 Jul 2007 16:59:50 -0000 1.64
+++ windowmatch.c 10 Feb 2008 20:21:53 -0000 1.65
@@ -715,7 +715,7 @@
case EWIN_OP_OPACITY:
a = atoi(args);
- ewin->ewmh.opacity = OpacityFromPercent(OpacityFix(a, 100));
+ ewin->ewmh.opacity = OpacityFromPercent(OpacityFix(a, 0));
break;
case EWIN_OP_FOCUSED_OPACITY:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
