Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_config.h e_menu.c
Log Message:
mark items to be broken out to ipc
fix menu fast mosue mvoe detection again
todo
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- e_config.c 12 May 2005 08:24:01 -0000 1.45
+++ e_config.c 12 May 2005 09:28:58 -0000 1.46
@@ -99,10 +99,11 @@
#undef D
#define T E_Config
#define D _e_config_edd
- E_CONFIG_VAL(D, T, config_version, INT);
- E_CONFIG_VAL(D, T, desktop_default_background, STR);
+ /**/ /* == already configurable via ipc */
+ E_CONFIG_VAL(D, T, config_version, INT); /**/
+ E_CONFIG_VAL(D, T, desktop_default_background, STR); /**/
E_CONFIG_VAL(D, T, menus_scroll_speed, DOUBLE);
- E_CONFIG_VAL(D, T, menus_fast_mouse_move_thresthold, DOUBLE);
+ E_CONFIG_VAL(D, T, menus_fast_mouse_move_threshhold, DOUBLE);
E_CONFIG_VAL(D, T, menus_click_drag_timeout, DOUBLE);
E_CONFIG_VAL(D, T, border_shade_animate, INT);
E_CONFIG_VAL(D, T, border_shade_transition, INT);
@@ -110,18 +111,18 @@
E_CONFIG_VAL(D, T, framerate, DOUBLE);
E_CONFIG_VAL(D, T, image_cache, INT);
E_CONFIG_VAL(D, T, font_cache, INT);
- E_CONFIG_VAL(D, T, zone_desks_x_count, INT);
- E_CONFIG_VAL(D, T, zone_desks_y_count, INT);
- E_CONFIG_VAL(D, T, use_virtual_roots, INT);
- E_CONFIG_VAL(D, T, use_edge_flip, INT);
+ E_CONFIG_VAL(D, T, zone_desks_x_count, INT); /**/
+ E_CONFIG_VAL(D, T, zone_desks_y_count, INT); /**/
+ E_CONFIG_VAL(D, T, use_virtual_roots, INT); /* should not make this a
config option (for now) */
+ E_CONFIG_VAL(D, T, use_edge_flip, INT);
E_CONFIG_VAL(D, T, edge_flip_timeout, DOUBLE);
- E_CONFIG_VAL(D, T, language, STR);
- E_CONFIG_LIST(D, T, modules, _e_config_module_edd);
- E_CONFIG_LIST(D, T, font_fallbacks, _e_config_font_fallback_edd);
- E_CONFIG_LIST(D, T, font_defaults, _e_config_font_default_edd);
- E_CONFIG_LIST(D, T, themes, _e_config_theme_edd);
- E_CONFIG_LIST(D, T, mouse_bindings, _e_config_bindings_mouse_edd);
- E_CONFIG_LIST(D, T, key_bindings, _e_config_bindings_key_edd);
+ E_CONFIG_VAL(D, T, language, STR); /**/
+ E_CONFIG_LIST(D, T, modules, _e_config_module_edd); /**/
+ E_CONFIG_LIST(D, T, font_fallbacks, _e_config_font_fallback_edd); /**/
+ E_CONFIG_LIST(D, T, font_defaults, _e_config_font_default_edd); /**/
+ E_CONFIG_LIST(D, T, themes, _e_config_theme_edd); /**/
+ E_CONFIG_LIST(D, T, mouse_bindings, _e_config_bindings_mouse_edd); /**/
+ E_CONFIG_LIST(D, T, key_bindings, _e_config_bindings_key_edd); /**/
e_config = e_config_domain_load("e", _e_config_edd);
if (e_config)
@@ -131,26 +132,26 @@
/* your config is too old - need new defaults */
_e_config_free();
ecore_timer_add(1.0, _e_config_cb_timer,
- "Configuration data needed upgrading. Your old
configuration\n"
- "has been wiped and a new set of defaults
initialized. This\n"
- "will happen regularly during development, so
don't report a\n"
- "bug. This simply means Enlightenment needs new
confiugration\n"
- "data by default for usable functionality that
your old\n"
- "configuration simply lacks. This new set of
defaults will fix\n"
- "that by adding it in. You can re-configure things
now to your\n"
- "liking. Sorry for the hiccup in your
configuration.\n");
+ _("Configuration data needed upgrading. Your old
configuration\n"
+ "has been wiped and a new set of defaults
initialized. This\n"
+ "will happen regularly during development, so
don't report a\n"
+ "bug. This simply means Enlightenment needs new
confiugration\n"
+ "data by default for usable functionality that
your old\n"
+ "configuration simply lacks. This new set of
defaults will fix\n"
+ "that by adding it in. You can re-configure
things now to your\n"
+ "liking. Sorry for the hiccup in your
configuration.\n"));
}
else if (e_config->config_version > E_CONFIG_FILE_VERSION)
{
/* your config is too new - what the fuck??? */
_e_config_free();
ecore_timer_add(1.0, _e_config_cb_timer,
- "Your configuration is NEWER than Enlightenment.
This is very\n"
- "strange. This should not happen unless you
downgraded\n"
- "Enlightenment or copied the configuration from a
place where\n"
- "a newer version of Enlightenment was running.
This is bad and\n"
- "as a precaution your confiugration has been now
restored to\n"
- "defaults. Sorry for the inconvenience.\n");
+ _("Your configuration is NEWER than Enlightenment.
This is very\n"
+ "strange. This should not happen unless you
downgraded\n"
+ "Enlightenment or copied the configuration from
a place where\n"
+ "a newer version of Enlightenment was running.
This is bad and\n"
+ "as a precaution your confiugration has been now
restored to\n"
+ "defaults. Sorry for the inconvenience.\n"));
}
}
@@ -161,7 +162,7 @@
e_config->config_version = E_CONFIG_FILE_VERSION;
e_config->desktop_default_background =
strdup(PACKAGE_DATA_DIR"/data/themes/default.edj");
e_config->menus_scroll_speed = 1000.0;
- e_config->menus_fast_mouse_move_thresthold = 300.0;
+ e_config->menus_fast_mouse_move_threshhold = 300.0;
e_config->menus_click_drag_timeout = DEF_MENUCLICK;
e_config->border_shade_animate = 1;
e_config->border_shade_transition = E_TRANSITION_DECELERATE;
@@ -641,7 +642,7 @@
// e_config->evas_engine_container = E_EVAS_ENGINE_GL_X11;
E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 20000.0);
- E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_thresthold, 1.0, 2000.0);
+ E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0);
E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0);
E_CONFIG_LIMIT(e_config->border_shade_animate, 0, 1);
E_CONFIG_LIMIT(e_config->border_shade_transition, 0, 3);
@@ -869,6 +870,6 @@
_e_config_cb_timer(void *data)
{
e_error_dialog_show(_("Configuration Upgraded"),
- _(data));
+ data);
return 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_config.h 12 May 2005 06:53:16 -0000 1.21
+++ e_config.h 12 May 2005 09:28:58 -0000 1.22
@@ -46,7 +46,7 @@
* defaults for e to work - started at 100 when we introduced this config
* versioning feature
*/
-#define E_CONFIG_FILE_VERSION 102
+#define E_CONFIG_FILE_VERSION 103
#define E_EVAS_ENGINE_DEFAULT 0
#define E_EVAS_ENGINE_SOFTWARE_X11 1
@@ -57,7 +57,7 @@
int config_version;
char *desktop_default_background;
double menus_scroll_speed;
- double menus_fast_mouse_move_thresthold;
+ double menus_fast_mouse_move_threshhold;
double menus_click_drag_timeout;
int border_shade_animate;
int border_shade_transition;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_menu.c 7 May 2005 13:50:38 -0000 1.28
+++ e_menu.c 12 May 2005 09:28:58 -0000 1.29
@@ -2076,7 +2076,7 @@
ev = event;
if (ev->win != _e_menu_win) return 1;
- fast_move_threshold = e_config->menus_fast_mouse_move_thresthold;
+ fast_move_threshold = e_config->menus_fast_mouse_move_threshhold;
dx = ev->x - _e_menu_x;
dy = ev->y - _e_menu_y;
d = (dx * dx) + (dy * dy);
@@ -2084,6 +2084,8 @@
dt = dt * dt;
if ((dt > 0.0) && ((d / dt) >= (fast_move_threshold * fast_move_threshold)))
is_fast = 1;
+// printf("d=%i dt=%3.9f fast_move_threshold=%3.3f ---> FAST=%i\n",
+// d, dt, fast_move_threshold, is_fast);
for (l = _e_active_menus; l; l = l->next)
{
tmp = evas_list_append(tmp, l->data);
@@ -2098,7 +2100,7 @@
{
if (is_fast)
m->fast_mouse = 1;
- else
+ else if (dt > 0.0)
{
m->fast_mouse = 0;
if (m->pending_new_submenu)
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
