Enlightenment CVS committal
Author : xcomputerman
Project : e_modules
Module : bling
Dir : e_modules/bling
Modified Files:
compmgr.c e_mod_main.c
Log Message:
- Fix for restart bug (delayed initialization). Windows are no longer lost.
- Management of shadow sizes/offsets seems incredibly mathematically
convoluted, but hopefully it's somewhat usable now.
This makes bling somewhat safe to use on a day-to-day basis.
===================================================================
RCS file: /cvs/e/e_modules/bling/compmgr.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- compmgr.c 22 Jun 2006 11:32:16 -0000 1.2
+++ compmgr.c 24 Jun 2006 22:28:47 -0000 1.3
@@ -275,8 +275,8 @@
#define SHADOW_OFFSET_X ((-config->shadow_active_size * 7 / 5) -
config->shadow_horz_offset * config->shadow_active_size / 100) * w->shadowSize
#define SHADOW_OFFSET_Y ((-config->shadow_active_size * 7 / 5) -
config->shadow_vert_offset * config->shadow_active_size / 100) * w->shadowSize
-//#define SHADOW_OFFSET_X
(w->shadowSize * -shadowRadius * 7 / 500) - w->shadowSize *
shadowOffsetX * shadowRadius / 10000
-//#define SHADOW_OFFSET_Y
(w->shadowSize * -shadowRadius * 7 / 500) - w->shadowSize *
shadowOffsetY * shadowRadius / 10000
+//#define SHADOW_OFFSET_X
(w->shadowSize * -config->shadow_active_size * 7 / 500) -
w->shadowSize * config->shadow_horz_offset * config->shadow_active_size / 10000
+//#define SHADOW_OFFSET_Y
(w->shadowSize * -config->shadow_active_size * 7 / 500) -
w->shadowSize * config->shadow_vert_offset * config->shadow_active_size / 10000
static double
gaussian(double r, double x, double y)
@@ -707,8 +707,10 @@
w->shadow_dy = SHADOW_OFFSET_Y;
w->shadow_dy = w->shadow_dy / 100;
#endif
- w->shadow_dx = config->shadow_horz_offset;
- w->shadow_dy = config->shadow_vert_offset;
+#if 1
+ w->shadow_dx = config->shadow_horz_offset -
config->shadow_active_size - 3;
+ w->shadow_dy = config->shadow_vert_offset -
config->shadow_active_size - 3;
+#endif
if (!w->shadow)
{
double opacity = config->shadow_opacity;
@@ -1646,8 +1648,10 @@
_composite_event_window_reparent_cb(void *data, int type, void *ev)
{
Ecore_X_Event_Window_Reparent *e;
+ E_Border *bd;
e = ev;
+ bd = e_border_find_by_window(e->win);
if (e->parent == root)
composite_win_add(e->win, 0);
else
===================================================================
RCS file: /cvs/e/e_modules/bling/e_mod_main.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- e_mod_main.c 5 Jun 2006 04:42:18 -0000 1.1.1.1
+++ e_mod_main.c 24 Jun 2006 22:28:47 -0000 1.2
@@ -120,6 +120,14 @@
_config_bling_module(con, b);
}
+static int
+_bling_composite_restart(void *data)
+{
+ Bling *b = data;
+
+ composite_init(b);
+ return 0;
+}
static Bling *
_bling_init(E_Module *m)
@@ -175,9 +183,9 @@
b->config->shadow_enable = 1;
b->config->shadow_dock_enable = 1;
- b->config->shadow_active_size = 8;
+ b->config->shadow_active_size = 7;
b->config->shadow_inactive_size = 4;
- b->config->shadow_opacity = 0.75;
+ b->config->shadow_opacity = 0.85;
b->config->shadow_vert_offset = 3;
b->config->shadow_horz_offset = 3;
b->config->shadow_hide_on_move = 0;
@@ -222,7 +230,13 @@
#if 0
_bling_config_menu_new(b);
#endif
- composite_init(b);
+ if (getenv("RESTART"))
+ ecore_idle_enterer_add(_bling_composite_restart, b);
+ else if (!composite_init(b))
+ {
+ E_FREE(b);
+ return NULL;
+ }
return b;
}
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
