Enlightenment CVS committal
Author : xcomputerman
Project : e_modules
Module : bling
Dir : e_modules/bling
Modified Files:
compmgr.c e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
- Fix segv
- Some config dialog fixes (config still doesn't save).
===================================================================
RCS file: /cvs/e/e_modules/bling/compmgr.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- compmgr.c 25 Jun 2006 03:10:17 -0000 1.5
+++ compmgr.c 25 Jun 2006 05:56:34 -0000 1.6
@@ -238,9 +238,9 @@
f->step = (f->cur < finish) ? step : -step;
f->start_time = ecore_time_get();
if (f->cur < finish)
- f->interval = (1/config->fx_fade_in_speed *
ecore_animator_frametime_get());
+ f->interval = (1/config->fx_fade_in_step *
ecore_animator_frametime_get());
else
- f->interval = (1/config->fx_fade_out_speed *
ecore_animator_frametime_get());
+ f->interval = (1/config->fx_fade_out_step *
ecore_animator_frametime_get());
f->callback = callback;
f->gone = gone;
w->opacity = f->cur * OPAQUE;
@@ -1122,7 +1122,7 @@
if (fade && config->fx_fade_enable)
composite_fade_set(w, 0, get_opacity_percent(w, 1.0),
- config->fx_fade_in_speed, 0, False, True, True);
+ config->fx_fade_in_step, 0, False, True, True);
}
static void
@@ -1191,7 +1191,7 @@
#if HAS_NAME_WINDOW_PIXMAP
if (w->pixmap && fade && config->fx_fade_enable)
composite_fade_set(w, w->opacity * 1.0 / OPAQUE, 0.0,
- config->fx_fade_out_speed, unmap_callback, False, False, True);
+ config->fx_fade_out_step, unmap_callback, False, False, True);
else
#endif
composite_win_finish_unmap(w);
@@ -1496,7 +1496,7 @@
#if HAS_NAME_WINDOW_PIXMAP
if (w && w->pixmap && fade && config->fx_fade_enable)
composite_fade_set(w, w->opacity * 1.0 / OPAQUE, 0.0,
- config->fx_fade_out_speed, _composite_destroy_cb, gone, False,
+ config->fx_fade_out_step, _composite_destroy_cb, gone, False,
True);
else
#endif
@@ -1838,6 +1838,7 @@
if (e->atom == ECORE_X_ATOM_NET_WM_WINDOW_SHADE)
{
Win *w = composite_win_find(e->win);
+ if (!w) return 1;
unsigned int tmp = composite_shade_prop_get(w);
if (tmp)
@@ -1860,6 +1861,7 @@
|| e->atom == ECORE_X_ATOM_NET_WM_WINDOW_SHADOW)
{
Win *w = composite_win_find(e->win);
+ if (!w) return 1;
unsigned int oldShadowSize = w->shadowSize;
unsigned int tmp;
@@ -1873,7 +1875,7 @@
if (b->config->fx_fade_opacity_enable)
{
composite_fade_set(w, w->opacity * 1.0 / OPAQUE, (tmp * 1.0) /
OPAQUE,
- b->config->fx_fade_out_speed, 0, False, True, False);
+ b->config->fx_fade_out_step, 0, False, True, False);
return 1;
}
else
@@ -1962,7 +1964,7 @@
clipChanged = True;
if (b->config->fx_fade_in_enable)
composite_fade_set(w, 0, get_opacity_percent(w, 1.0),
- b->config->fx_fade_in_speed, 0, False, True, True);
+ b->config->fx_fade_in_step, 0, False, True, True);
w->usable = True;
}
}
===================================================================
RCS file: /cvs/e/e_modules/bling/e_mod_config.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- e_mod_config.c 5 Jun 2006 04:42:18 -0000 1.1.1.1
+++ e_mod_config.c 25 Jun 2006 05:56:34 -0000 1.2
@@ -13,9 +13,8 @@
int fade_enable;
int fade_opacity;
- double fade_frame_rate;
- double fade_in_speed;
- double fade_out_speed;
+ double fade_in_step;
+ double fade_out_step;
};
/* Protos */
@@ -43,7 +42,7 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
- cfd = e_config_dialog_new(con, D_("Bling Configuration"), NULL, 0, v, b);
+ cfd = e_config_dialog_new(con, _("Bling Configuration"), NULL, 0, v, b);
b->config_dialog = cfd;
}
@@ -71,9 +70,8 @@
cfdata->fade_enable = b->config->fx_fade_enable;
cfdata->fade_opacity = b->config->fx_fade_opacity_enable;
- cfdata->fade_frame_rate = 1.0/b->config->fx_fade_delta;
- cfdata->fade_in_speed = b->config->fx_fade_in_speed * 100.0;
- cfdata->fade_out_speed = b->config->fx_fade_out_speed * 100.0;
+ cfdata->fade_in_step = b->config->fx_fade_in_step * 100.0;
+ cfdata->fade_out_step = b->config->fx_fade_out_step * 100.0;
}
static void
@@ -92,13 +90,14 @@
Evas_Object *o, *of, *ob;
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, D_("Composite Settings"), 0);
- ob = e_widget_check_add(evas, D_("Enable Drop Shadows"),
(&(cfdata->shadow_enable)));
+ of = e_widget_framelist_add(evas, _("Composite Settings"), 0);
+ ob = e_widget_check_add(evas, _("Enable Drop Shadows"),
(&(cfdata->shadow_enable)));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, D_("Enable Windows In/Out"),
(&(cfdata->fade_enable)));
+ ob = e_widget_check_add(evas, _("Enable Windows In/Out"),
(&(cfdata->fade_enable)));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, D_("Fade On Opacity Changes"),
(&(cfdata->fade_opacity)));
+ ob = e_widget_check_add(evas, _("Fade On Opacity Changes"),
(&(cfdata->fade_opacity)));
e_widget_framelist_object_append(of, ob);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@@ -125,69 +124,56 @@
int i = 0;
o = e_widget_list_add(evas, 0, 0);
- of = e_widget_framelist_add(evas, D_("Drop Shadow Settings"), 0);
- ob = e_widget_check_add(evas, D_("Enable Drop Shadows"),
(&(cfdata->shadow_enable)));
+ of = e_widget_framelist_add(evas, _("Drop Shadow Settings"), 0);
+ ob = e_widget_check_add(evas, _("Enable Drop Shadows"),
(&(cfdata->shadow_enable)));
e_widget_framelist_object_append(of, ob);
ot = e_widget_table_add(evas, 0);
- ob = e_widget_label_add(evas, D_("Shadow Size"));
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 1, 0);
- i++;
+ ob = e_widget_label_add(evas, _("Shadow Size"));
+ e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0);
ob = e_widget_slider_add(evas, 1, 0, _("%d pixels"), 1, 40, 1, 0, NULL,
&(cfdata->shadow_size), 150);
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 1, 0, 1, 0);
+ e_widget_slider_value_double_set(ob, cfdata->shadow_size);
+ e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0);
i++;
- ob = e_widget_label_add(evas, D_("Shadow Opacity"));
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 1, 0);
- i++;
+ ob = e_widget_label_add(evas, _("Shadow Opacity"));
+ e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0);
ob = e_widget_slider_add(evas, 1, 0, _("%1.00f\%"), 0, 1, 0.05, 0,
&(cfdata->shadow_opacity), NULL, 150);
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 1, 0, 1, 0);
+ e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0);
i++;
- ob = e_widget_label_add(evas, D_("Horizontal Offset"));
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 1, 0);
- i++;
+ ob = e_widget_label_add(evas, _("Horizontal Offset"));
+ e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0);
ob = e_widget_slider_add(evas, 1, 0, _("%d pixels"), 1, 40, 1, 0, NULL,
&(cfdata->shadow_horz_offset), 150);
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 1, 0, 1, 0);
+ e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0);
i++;
- ob = e_widget_label_add(evas, D_("Vertical Offset"));
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 1, 0);
- i++;
+ ob = e_widget_label_add(evas, _("Vertical Offset"));
+ e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0);
ob = e_widget_slider_add(evas, 1, 0, _("%d pixels"), 1, 40, 1, 0, NULL,
&(cfdata->shadow_vert_offset), 150);
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 1, 0, 1, 0);
+ e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0);
e_widget_framelist_object_append(of, ot);
e_widget_list_object_append(o, of, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, D_("Fade Settings"), 0);
- ob = e_widget_check_add(evas, D_("Fade Windows In/Out"),
(&(cfdata->fade_enable)));
+ of = e_widget_framelist_add(evas, _("Fade Settings"), 0);
+ ob = e_widget_check_add(evas, _("Fade Windows In/Out"),
(&(cfdata->fade_enable)));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, D_("Fade On Opacity Changes"),
(&(cfdata->fade_opacity)));
+ ob = e_widget_check_add(evas, _("Fade On Opacity Changes"),
(&(cfdata->fade_opacity)));
e_widget_framelist_object_append(of, ob);
ot = e_widget_table_add(evas, 0);
- i = 0;
- ob = e_widget_label_add(evas, D_("Fader Frame Rate"));
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 1, 0);
- i++;
- ob = e_widget_slider_add(evas, 1, 0, _("%1.00f\% fps"), 1.0, 60.0, 5.0, 0,
&(cfdata->fade_frame_rate), NULL, 150);
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_label_add(evas, _("Fade In Speed"));
+ e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0);
+ ob = e_widget_slider_add(evas, 1, 0, _("%d"), 1.0, 100.0, 1, 0,
&(cfdata->fade_in_step), NULL, 150);
+ e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0);
i++;
- ob = e_widget_label_add(evas, D_("Fade In Speed"));
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 1, 0);
- i++;
- ob = e_widget_slider_add(evas, 1, 0, _("%d"), 1.0, 100.0, 1, 0,
&(cfdata->fade_in_speed), NULL, 150);
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 1, 0, 1, 0);
- i++;
-
- ob = e_widget_label_add(evas, D_("Fade Out Speed"));
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 1, 0);
- i++;
- ob = e_widget_slider_add(evas, 1, 0, _("%d"), 1.0, 100.0, 1, 0,
&(cfdata->fade_out_speed), NULL, 150);
- e_widget_table_object_append(ot, ob, 0, i, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_label_add(evas, _("Fade Out Speed"));
+ e_widget_table_object_append(ot, ob, 0, i, 1, 1, 0, 0, 0, 0);
+ ob = e_widget_slider_add(evas, 1, 0, _("%d"), 1.0, 100.0, 1, 0,
&(cfdata->fade_out_step), NULL, 150);
+ e_widget_table_object_append(ot, ob, 1, i, 1, 1, 0, 0, 1, 0);
e_widget_framelist_object_append(of, ot);
e_widget_list_object_append(o, of, 1, 1, 0.5);
@@ -209,9 +195,8 @@
b->config->fx_fade_enable = cfdata->fade_enable;
b->config->fx_fade_opacity_enable = cfdata->fade_opacity;
- b->config->fx_fade_delta = 1.0/cfdata->fade_frame_rate;
- b->config->fx_fade_in_speed = cfdata->fade_in_speed/100.0;
- b->config->fx_fade_out_speed = cfdata->fade_out_speed/100.0;
+ b->config->fx_fade_in_step = cfdata->fade_in_step/100.0;
+ b->config->fx_fade_out_step = cfdata->fade_out_step/100.0;
/* reload comp manager! */
return 1;
===================================================================
RCS file: /cvs/e/e_modules/bling/e_mod_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.c 25 Jun 2006 02:03:07 -0000 1.3
+++ e_mod_main.c 25 Jun 2006 05:56:34 -0000 1.4
@@ -57,7 +57,7 @@
b = m->data;
if (b)
- e_config_domain_save("module.flame", b->conf_edd, b->config);
+ e_config_domain_save("module.bling", b->conf_edd, b->config);
return 1;
}
@@ -163,9 +163,8 @@
E_CONFIG_VAL(D, T, fx_fade_enable, UCHAR);
E_CONFIG_VAL(D, T, fx_fade_opacity_enable, UCHAR);
- E_CONFIG_VAL(D, T, fx_fade_delta, DOUBLE);
- E_CONFIG_VAL(D, T, fx_fade_in_speed, DOUBLE);
- E_CONFIG_VAL(D, T, fx_fade_out_speed, DOUBLE);
+ E_CONFIG_VAL(D, T, fx_fade_in_step, DOUBLE);
+ E_CONFIG_VAL(D, T, fx_fade_out_step, DOUBLE);
b->config = e_config_domain_load("module.bling", b->conf_edd);
if (!b->config)
@@ -192,9 +191,8 @@
b->config->fx_fade_enable = 1;
b->config->fx_fade_opacity_enable = 1;
- b->config->fx_fade_delta = 1.0/30.0;
- b->config->fx_fade_in_speed = 0.075;
- b->config->fx_fade_out_speed = 0.100;
+ b->config->fx_fade_in_step = 0.075;
+ b->config->fx_fade_out_step = 0.100;
}
#if 0
@@ -223,9 +221,8 @@
E_CONFIG_LIMIT(b->config->fx_fade_enable, 0, 1);
E_CONFIG_LIMIT(b->config->fx_fade_opacity_enable, 0, 1);
#endif
- E_CONFIG_LIMIT(b->config->fx_fade_delta, 0.0, 1.0);
- E_CONFIG_LIMIT(b->config->fx_fade_in_speed, 0.0, 1.0);
- E_CONFIG_LIMIT(b->config->fx_fade_out_speed, 0.0, 1.0);
+ E_CONFIG_LIMIT(b->config->fx_fade_in_step, 0.0, 1.0);
+ E_CONFIG_LIMIT(b->config->fx_fade_out_step, 0.0, 1.0);
#if 0
_bling_config_menu_new(b);
===================================================================
RCS file: /cvs/e/e_modules/bling/e_mod_main.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- e_mod_main.h 5 Jun 2006 04:42:13 -0000 1.1.1.1
+++ e_mod_main.h 25 Jun 2006 05:56:34 -0000 1.2
@@ -33,8 +33,8 @@
unsigned char fx_fade_enable; /* Fade windows */
unsigned char fx_fade_opacity_enable;/* Fade between opacity changes */
double fx_fade_delta;
- double fx_fade_in_speed;
- double fx_fade_out_speed;
+ double fx_fade_in_step;
+ double fx_fade_out_step;
};
struct _Bling
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
