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_zone.c
Log Message:
edge flip now is configurable
:)tho not via ipc yet
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_config.c 10 May 2005 19:35:11 -0000 1.42
+++ e_config.c 12 May 2005 06:53:15 -0000 1.43
@@ -112,6 +112,9 @@
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, 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);
@@ -169,6 +172,8 @@
e_config->zone_desks_x_count = 4;
e_config->zone_desks_y_count = 1;
e_config->use_virtual_roots = 0;
+ e_config->use_edge_flip = 1;
+ e_config->edge_flip_timeout = 0.25;
e_config->evas_engine_default = E_EVAS_ENGINE_SOFTWARE_X11;
e_config->evas_engine_container = E_EVAS_ENGINE_DEFAULT;
e_config->evas_engine_init = E_EVAS_ENGINE_DEFAULT;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_config.h 10 May 2005 19:35:12 -0000 1.20
+++ e_config.h 12 May 2005 06:53:16 -0000 1.21
@@ -46,7 +46,7 @@
* defaults for e to work - started at 100 when we introduced this config
* versioning feature
*/
-#define E_CONFIG_FILE_VERSION 101
+#define E_CONFIG_FILE_VERSION 102
#define E_EVAS_ENGINE_DEFAULT 0
#define E_EVAS_ENGINE_SOFTWARE_X11 1
@@ -68,6 +68,8 @@
int zone_desks_x_count;
int zone_desks_y_count;
int use_virtual_roots;
+ int use_edge_flip;
+ double edge_flip_timeout;
int evas_engine_default;
int evas_engine_container;
int evas_engine_init;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_zone.c 10 May 2005 10:57:08 -0000 1.48
+++ e_zone.c 12 May 2005 06:53:16 -0000 1.49
@@ -57,10 +57,10 @@
zone->h = h;
zone->num = num;
- zone->flip.top = ecore_x_window_input_new(con->win, 1, 0, w - 2, 1);
- zone->flip.right = ecore_x_window_input_new(con->win, w - 1, 1, 1, h - 2);
- zone->flip.bottom = ecore_x_window_input_new(con->win, 1, h - 1, w - 2, 1);
- zone->flip.left = ecore_x_window_input_new(con->win, 0, 1, 1, h - 2);
+ zone->flip.left = ecore_x_window_input_new(con->win, zone->x, zone->y, 1,
zone->h);
+ zone->flip.right = ecore_x_window_input_new(con->win, zone->x + zone->w -
1, zone->y, 1, zone->h);
+ zone->flip.top = ecore_x_window_input_new(con->win, zone->x + 1, zone->y,
zone->w - 2, 1);
+ zone->flip.bottom = ecore_x_window_input_new(con->win, zone->x + 1, zone->y
+ zone->h - 1, zone->w - 2, 1);
zone->handlers = evas_list_append(zone->handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN,
@@ -151,6 +151,10 @@
evas_object_move(zone->bg_object, x, y);
evas_object_move(zone->bg_event_object, x, y);
evas_object_move(zone->bg_clip_object, x, y);
+ ecore_x_window_move_resize(zone->flip.left, zone->x, zone->y, 1, zone->h);
+ ecore_x_window_move_resize(zone->flip.right, zone->x + zone->w - 1,
zone->y, 1, zone->h);
+ ecore_x_window_move_resize(zone->flip.top, zone->x + 1, zone->y, zone->w -
2, 1);
+ ecore_x_window_move_resize(zone->flip.bottom, zone->x + 1, zone->y +
zone->h - 1, zone->w - 2, 1);
}
void
@@ -166,10 +170,10 @@
evas_object_resize(zone->bg_event_object, w, h);
evas_object_resize(zone->bg_clip_object, w, h);
- ecore_x_window_move_resize(zone->flip.top, 1, 0, w - 2, 1);
- ecore_x_window_move_resize(zone->flip.right, w - 1, 1, 1, h - 2);
- ecore_x_window_move_resize(zone->flip.bottom, 1, h - 1, w - 2, 1);
- ecore_x_window_move_resize(zone->flip.left, 0, 1, 1, h - 2);
+ ecore_x_window_move_resize(zone->flip.left, zone->x, zone->y, 1, zone->h);
+ ecore_x_window_move_resize(zone->flip.right, zone->x + zone->w - 1,
zone->y, 1, zone->h);
+ ecore_x_window_move_resize(zone->flip.top, zone->x + 1, zone->y, zone->w -
2, 1);
+ ecore_x_window_move_resize(zone->flip.bottom, zone->x + 1, zone->y +
zone->h - 1, zone->w - 2, 1);
}
void
@@ -253,7 +257,7 @@
/* top */
if (zone->flip.timer)
ecore_timer_del(zone->flip.timer);
- zone->flip.timer = ecore_timer_add(0.5, _e_zone_cb_timer, zone);
+ zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout,
_e_zone_cb_timer, zone);
zone->flip.direction = E_DIRECTION_UP;
}
else if ((x == (zone->w - 1)) && E_ZONE_FLIP_RIGHT(zone))
@@ -261,7 +265,7 @@
/* right */
if (zone->flip.timer)
ecore_timer_del(zone->flip.timer);
- zone->flip.timer = ecore_timer_add(0.5, _e_zone_cb_timer, zone);
+ zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout,
_e_zone_cb_timer, zone);
zone->flip.direction = E_DIRECTION_RIGHT;
}
else if ((y == (zone->h - 1)) && E_ZONE_FLIP_DOWN(zone))
@@ -269,7 +273,7 @@
/* bottom */
if (zone->flip.timer)
ecore_timer_del(zone->flip.timer);
- zone->flip.timer = ecore_timer_add(0.5, _e_zone_cb_timer, zone);
+ zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout,
_e_zone_cb_timer, zone);
zone->flip.direction = E_DIRECTION_DOWN;
}
else if ((x == 0) && E_ZONE_FLIP_LEFT(zone))
@@ -277,7 +281,7 @@
/* left */
if (zone->flip.timer)
ecore_timer_del(zone->flip.timer);
- zone->flip.timer = ecore_timer_add(0.5, _e_zone_cb_timer, zone);
+ zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout,
_e_zone_cb_timer, zone);
zone->flip.direction = E_DIRECTION_LEFT;
}
else
@@ -610,28 +614,28 @@
{
if (zone->flip.timer)
ecore_timer_del(zone->flip.timer);
- zone->flip.timer = ecore_timer_add(0.5, _e_zone_cb_timer, zone);
+ zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout,
_e_zone_cb_timer, zone);
zone->flip.direction = E_DIRECTION_UP;
}
else if (ev->win == zone->flip.right)
{
if (zone->flip.timer)
ecore_timer_del(zone->flip.timer);
- zone->flip.timer = ecore_timer_add(0.5, _e_zone_cb_timer, zone);
+ zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout,
_e_zone_cb_timer, zone);
zone->flip.direction = E_DIRECTION_RIGHT;
}
else if (ev->win == zone->flip.bottom)
{
if (zone->flip.timer)
ecore_timer_del(zone->flip.timer);
- zone->flip.timer = ecore_timer_add(0.5, _e_zone_cb_timer, zone);
+ zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout,
_e_zone_cb_timer, zone);
zone->flip.direction = E_DIRECTION_DOWN;
}
else if (ev->win == zone->flip.left)
{
if (zone->flip.timer)
ecore_timer_del(zone->flip.timer);
- zone->flip.timer = ecore_timer_add(0.5, _e_zone_cb_timer, zone);
+ zone->flip.timer = ecore_timer_add(e_config->edge_flip_timeout,
_e_zone_cb_timer, zone);
zone->flip.direction = E_DIRECTION_LEFT;
}
return 1;
@@ -738,36 +742,49 @@
static void
_e_zone_update_flip(E_Zone *zone)
{
-
- if (E_ZONE_FLIP_UP(zone))
- {
- ecore_x_window_show(zone->flip.top);
- e_container_window_raise(zone->container, zone->flip.top, 999);
- }
- else
- ecore_x_window_hide(zone->flip.top);
-
- if (E_ZONE_FLIP_RIGHT(zone))
- {
- ecore_x_window_show(zone->flip.right);
- e_container_window_raise(zone->container, zone->flip.right, 999);
- }
- else
- ecore_x_window_hide(zone->flip.right);
-
- if (E_ZONE_FLIP_DOWN(zone))
+
+ if ((e_config->use_edge_flip) &&
+ /* if we have more than 1 zone - disable */
+ (evas_list_count(zone->container->zones) == 1))
{
- ecore_x_window_show(zone->flip.bottom);
- e_container_window_raise(zone->container, zone->flip.bottom, 999);
+ if (E_ZONE_FLIP_LEFT(zone))
+ {
+ ecore_x_window_show(zone->flip.left);
+ e_container_window_raise(zone->container, zone->flip.left, 999);
+ }
+ else
+ ecore_x_window_hide(zone->flip.left);
+
+ if (E_ZONE_FLIP_RIGHT(zone))
+ {
+ ecore_x_window_show(zone->flip.right);
+ e_container_window_raise(zone->container, zone->flip.right, 999);
+ }
+ else
+ ecore_x_window_hide(zone->flip.right);
+
+ if (E_ZONE_FLIP_UP(zone))
+ {
+ ecore_x_window_show(zone->flip.top);
+ e_container_window_raise(zone->container, zone->flip.top, 999);
+ }
+ else
+ ecore_x_window_hide(zone->flip.top);
+
+ if (E_ZONE_FLIP_DOWN(zone))
+ {
+ ecore_x_window_show(zone->flip.bottom);
+ e_container_window_raise(zone->container, zone->flip.bottom, 999);
+ }
+ else
+ ecore_x_window_hide(zone->flip.bottom);
+
}
else
- ecore_x_window_hide(zone->flip.bottom);
-
- if (E_ZONE_FLIP_LEFT(zone))
{
- ecore_x_window_show(zone->flip.left);
- e_container_window_raise(zone->container, zone->flip.left, 999);
+ ecore_x_window_hide(zone->flip.left);
+ ecore_x_window_hide(zone->flip.right);
+ ecore_x_window_hide(zone->flip.top);
+ ecore_x_window_hide(zone->flip.bottom);
}
- else
- ecore_x_window_hide(zone->flip.left);
}
-------------------------------------------------------
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
