styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only create edge windows which have bindings 

Previously all windows always existed, and edge bindings showed/hided
windows as needed. And e_zone_flip_win_disable/ e_zone_flip_win_restore
f**k'ed this up.

Will fix bug #483 soon.

SVN revision: 45366
This commit is contained in:
Sebastian Dransfeld 2010-01-20 21:30:17 +00:00
parent 5109c0f8ea
commit f098d9df85
7 changed files with 352 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/e_bindings.c
View File

@ -425,7 +425,7 @@ e_bindings_edge_add(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier
if (params) bind->params = eina_stringshare_add(params);
edge_bindings = eina_list_append(edge_bindings, bind);
e_util_zone_edge_toggle(edge, 1);
e_zone_edge_new(edge);
}
EAPI E_Binding_Edge *
@ -474,7 +474,7 @@ e_bindings_edge_del(E_Binding_Context ctxt, E_Zone_Edge edge, E_Binding_Modifier
}
if (!ref_count)
e_util_zone_edge_toggle(edge, 0);
e_zone_edge_free(edge);
}
EAPI E_Action *

8
src/bin/e_border.c
View File

@ -3081,7 +3081,7 @@ e_border_act_move_begin(E_Border *bd, Ecore_Event_Mouse_Button *ev)
if (!_e_border_move_begin(bd))
return;
e_zone_flip_win_disable();
e_zone_edge_disable();
bd->moving = 1;
_e_border_pointer_move_begin(bd);
if (ev)
@ -3101,7 +3101,7 @@ e_border_act_move_end(E_Border *bd, Ecore_Event_Mouse_Button *ev)
if (!bd->moving) return;
bd->moving = 0;
_e_border_pointer_move_end(bd);
e_zone_flip_win_restore();
e_zone_edge_enable();
_e_border_move_end(bd);
e_zone_flip_coords_handle(bd->zone, -1, -1);
}
@ -3516,7 +3516,7 @@ e_border_signal_move_begin(E_Border *bd, const char *sig, const char *src)
if (!_e_border_move_begin(bd)) return;
bd->moving = 1;
_e_border_pointer_move_begin(bd);
e_zone_flip_win_disable();
e_zone_edge_disable();
_e_border_moveinfo_gather(bd, sig);
}
@ -3528,7 +3528,7 @@ e_border_signal_move_end(E_Border *bd, const char *sig, const char *src)
if (!bd->moving) return;
bd->moving = 0;
_e_border_pointer_move_end(bd);
e_zone_flip_win_restore();
e_zone_edge_enable();
_e_border_move_end(bd);
e_zone_flip_coords_handle(bd->zone, -1, -1);
}

1
src/bin/e_main.c
View File

@ -787,6 +787,7 @@ main(int argc, char **argv)
}
}
efreet_icon_extension_add(".edj");
efreet_icon_extension_add(".svg");
TS("efreet paths done");
e_init_status_set(_("Setup System Controls"));

99
src/bin/e_utils.c
View File

@ -1126,105 +1126,6 @@ e_util_win_auto_resize_fill(E_Win *win)
}
}
EAPI void
e_util_zone_edge_toggle(E_Zone_Edge edge, Eina_Bool show)
{
Eina_List *l, *ll, *lll;
E_Manager *man;
E_Container *con;
E_Zone *zone;
/* Update all zones to show the edge */
EINA_LIST_FOREACH(e_manager_list(), l, man)
{
EINA_LIST_FOREACH(man->containers, ll, con)
{
EINA_LIST_FOREACH(con->zones, lll, zone)
{
switch(edge)
{
case E_ZONE_EDGE_NONE:
/* noop */
break;
case E_ZONE_EDGE_LEFT:
if (show)
ecore_x_window_show(zone->edge.left);
else
ecore_x_window_hide(zone->edge.left);
break;
case E_ZONE_EDGE_TOP:
if (show)
ecore_x_window_show(zone->edge.top);
else
ecore_x_window_hide(zone->edge.top);
break;
case E_ZONE_EDGE_RIGHT:
if (show)
ecore_x_window_show(zone->edge.right);
else
ecore_x_window_hide(zone->edge.right);
break;
case E_ZONE_EDGE_BOTTOM:
if (show)
ecore_x_window_show(zone->edge.bottom);
else
ecore_x_window_hide(zone->edge.bottom);
break;
case E_ZONE_EDGE_TOP_LEFT:
if (show)
{
ecore_x_window_show(zone->corner.top_left);
ecore_x_window_show(zone->corner.left_top);
}
else
{
ecore_x_window_hide(zone->corner.top_left);
ecore_x_window_hide(zone->corner.left_top);
}
break;
case E_ZONE_EDGE_TOP_RIGHT:
if (show)
{
ecore_x_window_show(zone->corner.top_right);
ecore_x_window_show(zone->corner.right_top);
}
else
{
ecore_x_window_hide(zone->corner.top_right);
ecore_x_window_hide(zone->corner.right_top);
}
break;
case E_ZONE_EDGE_BOTTOM_RIGHT:
if (show)
{
ecore_x_window_show(zone->corner.bottom_right);
ecore_x_window_show(zone->corner.right_bottom);
}
else
{
ecore_x_window_hide(zone->corner.bottom_right);
ecore_x_window_hide(zone->corner.right_bottom);
}
break;
case E_ZONE_EDGE_BOTTOM_LEFT:
if (show)
{
ecore_x_window_show(zone->corner.bottom_left);
ecore_x_window_show(zone->corner.left_bottom);
}
else
{
ecore_x_window_hide(zone->corner.bottom_left);
ecore_x_window_hide(zone->corner.left_bottom);
}
break;
}
}
}
}
}
/**
* Creates a new dialog to query image import settings, report results.
*

2
src/bin/e_utils.h
View File

@ -71,8 +71,6 @@ EAPI int e_util_dir_check(const char *dir);
EAPI void e_util_defer_object_del(E_Object *obj);
EAPI const char *e_util_winid_str_get(Ecore_X_Window win);
EAPI void e_util_win_auto_resize_fill(E_Win *win);
EAPI void e_util_zone_edge_toggle(E_Zone_Edge edge, Eina_Bool show);
EAPI E_Dialog *e_util_image_import_settings_new(const char *path, void (*cb)(void *data, const char *path, Eina_Bool ok, Eina_Bool external, int quality, E_Image_Import_Mode mode), const void *data);
EAPI E_Util_Image_Import_Handle *e_util_image_import(const char *image_path, const char *edje_path, const char *edje_group, Eina_Bool external, int quality, E_Image_Import_Mode mode, void (*cb)(void *data, Eina_Bool ok, const char *image_path, const char *edje_path), const void *data);

487
src/bin/e_zone.c
View File

@ -66,7 +66,6 @@ e_zone_new(E_Container *con, int num, int id, int x, int y, int w, int h)
char name[40];
Evas_Object *o;
E_Event_Zone_Add *ev;
int cw, ch;
zone = E_OBJECT_ALLOC(E_Zone, E_ZONE_TYPE, _e_zone_free);
if (!zone) return NULL;
@ -81,42 +80,6 @@ e_zone_new(E_Container *con, int num, int id, int x, int y, int w, int h)
zone->id = id;
e_zone_useful_geometry_dirty(zone);
cw = w * E_ZONE_CORNER_RATIO;
ch = h * E_ZONE_CORNER_RATIO;
zone->corner.left_bottom = ecore_x_window_input_new(con->win,
zone->x, zone->y + zone->h - ch, 1, ch);
zone->edge.left = ecore_x_window_input_new(con->win,
zone->x, zone->y + ch, 1, zone->h - 2 * ch);
zone->corner.left_top = ecore_x_window_input_new(con->win,
zone->x, zone->y, 1, ch);
zone->corner.top_left = ecore_x_window_input_new(con->win,
zone->x + 1, zone->y, cw, 1);
zone->edge.top = ecore_x_window_input_new(con->win,
zone->x + 1 + cw, zone->y, zone->w - 2 * cw - 2, 1);
zone->corner.top_right = ecore_x_window_input_new(con->win,
zone->x + zone->w - cw - 2, zone->y, cw, 1);
zone->corner.right_top = ecore_x_window_input_new(con->win,
zone->x + zone->w - 1, zone->y, 1, ch);
zone->edge.right = ecore_x_window_input_new(con->win,
zone->x + zone->w - 1, zone->y + ch, 1, zone->h - 2 * ch);
zone->corner.right_bottom = ecore_x_window_input_new(con->win,
zone->x + zone->w - 1, zone->y + zone->h - ch, 1, ch);
zone->corner.bottom_right = ecore_x_window_input_new(con->win,
zone->x + 1, zone->y + zone->h - 1, cw, 1);
zone->edge.bottom = ecore_x_window_input_new(con->win,
zone->x + 1 + cw, zone->y + zone->h - 1, zone->w - 2 - 2 * cw, 1);
zone->corner.bottom_left = ecore_x_window_input_new(con->win,
zone->x + zone->w - cw - 2, zone->y + zone->h - 1, cw, 1);
if(e_config->fullscreen_flip)
e_zone_edge_win_layer_set(zone, 250);
else
e_zone_edge_win_layer_set(zone, 200);
zone->handlers =
eina_list_append(zone->handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN,
@ -235,33 +198,45 @@ e_zone_move(E_Zone *zone, int x, int y)
cw = zone->w * E_ZONE_CORNER_RATIO;
ch = zone->h * E_ZONE_CORNER_RATIO;
ecore_x_window_move_resize(zone->corner.left_bottom,
zone->x, zone->y + zone->h - ch, 1, ch);
ecore_x_window_move_resize(zone->edge.left,
zone->x, zone->y + ch, 1, zone->h - 2 * ch);
ecore_x_window_move_resize(zone->corner.left_top,
zone->x, zone->y, 1, ch);
if (zone->corner.left_bottom)
ecore_x_window_move_resize(zone->corner.left_bottom,
zone->x, zone->y + zone->h - ch, 1, ch);
if (zone->edge.left)
ecore_x_window_move_resize(zone->edge.left,
zone->x, zone->y + ch, 1, zone->h - 2 * ch);
if (zone->corner.left_top)
ecore_x_window_move_resize(zone->corner.left_top,
zone->x, zone->y, 1, ch);
ecore_x_window_move_resize(zone->corner.top_left,
zone->x + 1, zone->y, cw, 1);
ecore_x_window_move_resize(zone->edge.top,
zone->x + 1 + cw, zone->y, zone->w - 2 * cw - 2, 1);
ecore_x_window_move_resize(zone->corner.top_right,
zone->x + zone->w - cw - 2, zone->y, cw, 1);
if (zone->corner.top_left)
ecore_x_window_move_resize(zone->corner.top_left,
zone->x + 1, zone->y, cw, 1);
if (zone->edge.top)
ecore_x_window_move_resize(zone->edge.top,
zone->x + 1 + cw, zone->y, zone->w - 2 * cw - 2, 1);
if (zone->corner.top_right)
ecore_x_window_move_resize(zone->corner.top_right,
zone->x + zone->w - cw - 2, zone->y, cw, 1);
ecore_x_window_move_resize(zone->corner.right_top,
zone->x + zone->w - 1, zone->y, 1, ch);
ecore_x_window_move_resize(zone->edge.right,
zone->x + zone->w - 1, zone->y + ch, 1, zone->h - 2 * ch);
ecore_x_window_move_resize(zone->corner.right_bottom,
zone->x + zone->w - 1, zone->y + zone->h - ch, 1, ch);
if (zone->corner.right_top)
ecore_x_window_move_resize(zone->corner.right_top,
zone->x + zone->w - 1, zone->y, 1, ch);
if (zone->edge.right)
ecore_x_window_move_resize(zone->edge.right,
zone->x + zone->w - 1, zone->y + ch, 1, zone->h - 2 * ch);
if (zone->corner.right_bottom)
ecore_x_window_move_resize(zone->corner.right_bottom,
zone->x + zone->w - 1, zone->y + zone->h - ch, 1, ch);
ecore_x_window_move_resize(zone->corner.bottom_right,
zone->x + 1, zone->y + zone->h - 1, cw, 1);
ecore_x_window_move_resize(zone->edge.bottom,
zone->x + 1 + cw, zone->y + zone->h - 1, zone->w - 2 - 2 * cw, 1);
ecore_x_window_move_resize(zone->corner.bottom_left,
zone->x + zone->w - cw - 2, zone->y + zone->h - 1, cw, 1);
if (zone->corner.bottom_right)
ecore_x_window_move_resize(zone->corner.bottom_right,
zone->x + 1, zone->y + zone->h - 1, cw, 1);
if (zone->edge.bottom)
ecore_x_window_move_resize(zone->edge.bottom,
zone->x + 1 + cw, zone->y + zone->h - 1, zone->w - 2 - 2 * cw, 1);
if (zone->corner.bottom_left)
ecore_x_window_move_resize(zone->corner.bottom_left,
zone->x + zone->w - cw - 2, zone->y + zone->h - 1, cw, 1);
e_zone_bg_reconfigure(zone);
}
@ -292,33 +267,45 @@ e_zone_resize(E_Zone *zone, int w, int h)
cw = zone->w * E_ZONE_CORNER_RATIO;
ch = zone->h * E_ZONE_CORNER_RATIO;
ecore_x_window_move_resize(zone->corner.left_bottom,
zone->x, zone->y + zone->h - ch, 1, ch);
ecore_x_window_move_resize(zone->edge.left,
zone->x, zone->y + ch, 1, zone->h - 2 * ch);
ecore_x_window_move_resize(zone->corner.left_top,
zone->x, zone->y, 1, ch);
if (zone->corner.left_bottom)
ecore_x_window_move_resize(zone->corner.left_bottom,
zone->x, zone->y + zone->h - ch, 1, ch);
if (zone->edge.left)
ecore_x_window_move_resize(zone->edge.left,
zone->x, zone->y + ch, 1, zone->h - 2 * ch);
if (zone->corner.left_top)
ecore_x_window_move_resize(zone->corner.left_top,
zone->x, zone->y, 1, ch);
ecore_x_window_move_resize(zone->corner.top_left,
zone->x + 1, zone->y, cw, 1);
ecore_x_window_move_resize(zone->edge.top,
zone->x + 1 + cw, zone->y, zone->w - 2 * cw - 2, 1);
ecore_x_window_move_resize(zone->corner.top_right,
zone->x + zone->w - cw - 2, zone->y, cw, 1);
if (zone->corner.top_left)
ecore_x_window_move_resize(zone->corner.top_left,
zone->x + 1, zone->y, cw, 1);
if (zone->edge.top)
ecore_x_window_move_resize(zone->edge.top,
zone->x + 1 + cw, zone->y, zone->w - 2 * cw - 2, 1);
if (zone->corner.top_right)
ecore_x_window_move_resize(zone->corner.top_right,
zone->x + zone->w - cw - 2, zone->y, cw, 1);
ecore_x_window_move_resize(zone->corner.right_top,
zone->x + zone->w - 1, zone->y, 1, ch);
ecore_x_window_move_resize(zone->edge.right,
zone->x + zone->w - 1, zone->y + ch, 1, zone->h - 2 * ch);
ecore_x_window_move_resize(zone->corner.right_bottom,
zone->x + zone->w - 1, zone->y + zone->h - ch, 1, ch);
if (zone->corner.right_top)
ecore_x_window_move_resize(zone->corner.right_top,
zone->x + zone->w - 1, zone->y, 1, ch);
if (zone->edge.right)
ecore_x_window_move_resize(zone->edge.right,
zone->x + zone->w - 1, zone->y + ch, 1, zone->h - 2 * ch);
if (zone->corner.right_bottom)
ecore_x_window_move_resize(zone->corner.right_bottom,
zone->x + zone->w - 1, zone->y + zone->h - ch, 1, ch);
ecore_x_window_move_resize(zone->corner.bottom_right,
zone->x + 1, zone->y + zone->h - 1, cw, 1);
ecore_x_window_move_resize(zone->edge.bottom,
zone->x + 1 + cw, zone->y + zone->h - 1, zone->w - 2 - 2 * cw, 1);
ecore_x_window_move_resize(zone->corner.bottom_left,
zone->x + zone->w - cw - 2, zone->y + zone->h - 1, cw, 1);
if (zone->corner.bottom_right)
ecore_x_window_move_resize(zone->corner.bottom_right,
zone->x + 1, zone->y + zone->h - 1, cw, 1);
if (zone->edge.bottom)
ecore_x_window_move_resize(zone->edge.bottom,
zone->x + 1 + cw, zone->y + zone->h - 1, zone->w - 2 - 2 * cw, 1);
if (zone->corner.bottom_left)
ecore_x_window_move_resize(zone->corner.bottom_left,
zone->x + zone->w - cw - 2, zone->y + zone->h - 1, cw, 1);
e_zone_bg_reconfigure(zone);
}
@ -359,32 +346,44 @@ e_zone_move_resize(E_Zone *zone, int x, int y, int w, int h)
cw = zone->w * E_ZONE_CORNER_RATIO;
ch = zone->h * E_ZONE_CORNER_RATIO;
ecore_x_window_move_resize(zone->corner.left_bottom,
zone->x, zone->y + zone->h - ch, 1, ch);
ecore_x_window_move_resize(zone->edge.left,
zone->x, zone->y + ch, 1, zone->h - 2 * ch);
ecore_x_window_move_resize(zone->corner.left_top,
zone->x, zone->y, 1, ch);
if (zone->corner.left_bottom)
ecore_x_window_move_resize(zone->corner.left_bottom,
zone->x, zone->y + zone->h - ch, 1, ch);
if (zone->edge.left)
ecore_x_window_move_resize(zone->edge.left,
zone->x, zone->y + ch, 1, zone->h - 2 * ch);
if (zone->corner.left_top)
ecore_x_window_move_resize(zone->corner.left_top,
zone->x, zone->y, 1, ch);
ecore_x_window_move_resize(zone->corner.top_left,
zone->x + 1, zone->y, cw, 1);
ecore_x_window_move_resize(zone->edge.top,
zone->x + 1 + cw, zone->y, zone->w - 2 * cw - 2, 1);
ecore_x_window_move_resize(zone->corner.top_right,
zone->x + zone->w - cw - 2, zone->y, cw, 1);
if (zone->corner.top_left)
ecore_x_window_move_resize(zone->corner.top_left,
zone->x + 1, zone->y, cw, 1);
if (zone->edge.top)
ecore_x_window_move_resize(zone->edge.top,
zone->x + 1 + cw, zone->y, zone->w - 2 * cw - 2, 1);
if (zone->corner.top_right)
ecore_x_window_move_resize(zone->corner.top_right,
zone->x + zone->w - cw - 2, zone->y, cw, 1);
ecore_x_window_move_resize(zone->corner.right_top,
zone->x + zone->w - 1, zone->y, 1, ch);
ecore_x_window_move_resize(zone->edge.right,
zone->x + zone->w - 1, zone->y + ch, 1, zone->h - 2 * ch);
ecore_x_window_move_resize(zone->corner.right_bottom,
zone->x + zone->w - 1, zone->y + zone->h - ch, 1, ch);
if (zone->corner.right_top)
ecore_x_window_move_resize(zone->corner.right_top,
zone->x + zone->w - 1, zone->y, 1, ch);
if (zone->edge.right)
ecore_x_window_move_resize(zone->edge.right,
zone->x + zone->w - 1, zone->y + ch, 1, zone->h - 2 * ch);
if (zone->corner.right_bottom)
ecore_x_window_move_resize(zone->corner.right_bottom,
zone->x + zone->w - 1, zone->y + zone->h - ch, 1, ch);
ecore_x_window_move_resize(zone->corner.bottom_right,
zone->x + 1, zone->y + zone->h - 1, cw, 1);
ecore_x_window_move_resize(zone->edge.bottom,
zone->x + 1 + cw, zone->y + zone->h - 1, zone->w - 2 - 2 * cw, 1);
ecore_x_window_move_resize(zone->corner.bottom_left,
if (zone->corner.bottom_right)
ecore_x_window_move_resize(zone->corner.bottom_right,
zone->x + 1, zone->y + zone->h - 1, cw, 1);
if (zone->edge.bottom)
ecore_x_window_move_resize(zone->edge.bottom,
zone->x + 1 + cw, zone->y + zone->h - 1, zone->w - 2 - 2 * cw, 1);
if (zone->corner.bottom_left)
ecore_x_window_move_resize(zone->corner.bottom_left,
zone->x + zone->w - cw - 2, zone->y + zone->h - 1, cw, 1);
e_zone_bg_reconfigure(zone);
@ -758,7 +757,7 @@ e_zone_desk_linear_flip_to(E_Zone *zone, int x)
}
EAPI void
e_zone_flip_win_disable(void)
e_zone_edge_enable(void)
{
Eina_List *l, *ll, *lll;
E_Manager *man;
@ -771,25 +770,25 @@ e_zone_flip_win_disable(void)
{
EINA_LIST_FOREACH(con->zones, lll, zone)
{
ecore_x_window_hide(zone->edge.left);
ecore_x_window_hide(zone->edge.right);
ecore_x_window_hide(zone->edge.top);
ecore_x_window_hide(zone->edge.bottom);
ecore_x_window_hide(zone->corner.left_bottom);
ecore_x_window_hide(zone->corner.left_top);
ecore_x_window_hide(zone->corner.top_left);
ecore_x_window_hide(zone->corner.top_right);
ecore_x_window_hide(zone->corner.right_top);
ecore_x_window_hide(zone->corner.right_bottom);
ecore_x_window_hide(zone->corner.bottom_right);
ecore_x_window_hide(zone->corner.bottom_left);
if (zone->edge.left) ecore_x_window_show(zone->edge.left);
if (zone->edge.right) ecore_x_window_show(zone->edge.right);
if (zone->edge.top) ecore_x_window_show(zone->edge.top);
if (zone->edge.bottom) ecore_x_window_show(zone->edge.bottom);
if (zone->corner.left_top) ecore_x_window_show(zone->corner.left_top);
if (zone->corner.top_left) ecore_x_window_show(zone->corner.top_left);
if (zone->corner.top_right) ecore_x_window_show(zone->corner.top_right);
if (zone->corner.right_top) ecore_x_window_show(zone->corner.right_top);
if (zone->corner.right_bottom) ecore_x_window_show(zone->corner.right_bottom);
if (zone->corner.bottom_right) ecore_x_window_show(zone->corner.bottom_right);
if (zone->corner.bottom_left) ecore_x_window_show(zone->corner.bottom_left);
if (zone->corner.left_bottom) ecore_x_window_show(zone->corner.left_bottom);
}
}
}
}
EAPI void
e_zone_flip_win_restore(void)
e_zone_edge_disable(void)
{
Eina_List *l, *ll, *lll;
E_Manager *man;
@ -802,18 +801,214 @@ e_zone_flip_win_restore(void)
{
EINA_LIST_FOREACH(con->zones, lll, zone)
{
ecore_x_window_show(zone->edge.left);
ecore_x_window_show(zone->edge.right);
ecore_x_window_show(zone->edge.top);
ecore_x_window_show(zone->edge.bottom);
ecore_x_window_show(zone->corner.left_bottom);
ecore_x_window_show(zone->corner.left_top);
ecore_x_window_show(zone->corner.top_left);
ecore_x_window_show(zone->corner.top_right);
ecore_x_window_show(zone->corner.right_top);
ecore_x_window_show(zone->corner.right_bottom);
ecore_x_window_show(zone->corner.bottom_right);
ecore_x_window_show(zone->corner.bottom_left);
if (zone->edge.left) ecore_x_window_hide(zone->edge.left);
if (zone->edge.right) ecore_x_window_hide(zone->edge.right);
if (zone->edge.top) ecore_x_window_hide(zone->edge.top);
if (zone->edge.bottom) ecore_x_window_hide(zone->edge.bottom);
if (zone->corner.left_top) ecore_x_window_hide(zone->corner.left_top);
if (zone->corner.top_left) ecore_x_window_hide(zone->corner.top_left);
if (zone->corner.top_right) ecore_x_window_hide(zone->corner.top_right);
if (zone->corner.right_top) ecore_x_window_hide(zone->corner.right_top);
if (zone->corner.right_bottom) ecore_x_window_hide(zone->corner.right_bottom);
if (zone->corner.bottom_right) ecore_x_window_hide(zone->corner.bottom_right);
if (zone->corner.bottom_left) ecore_x_window_hide(zone->corner.bottom_left);
if (zone->corner.left_bottom) ecore_x_window_hide(zone->corner.left_bottom);
}
}
}
}
EAPI void
e_zone_edge_new(E_Zone_Edge edge)
{
Eina_List *l, *ll, *lll;
E_Manager *man;
E_Container *con;
E_Zone *zone;
int cw, ch;
EINA_LIST_FOREACH(e_manager_list(), l, man)
{
EINA_LIST_FOREACH(man->containers, ll, con)
{
EINA_LIST_FOREACH(con->zones, lll, zone)
{
cw = zone->w * E_ZONE_CORNER_RATIO;
ch = zone->h * E_ZONE_CORNER_RATIO;
switch (edge)
{
case E_ZONE_EDGE_NONE:
/* noop */
break;
case E_ZONE_EDGE_LEFT:
if (!zone->edge.left)
{
zone->edge.left = ecore_x_window_input_new(con->win,
zone->x, zone->y + ch, 1,
zone->h - 2 * ch);
ecore_x_window_show(zone->edge.left);
}
break;
case E_ZONE_EDGE_RIGHT:
if (!zone->edge.right)
{
zone->edge.right = ecore_x_window_input_new(con->win,
zone->x + zone->w - 1,
zone->y + ch, 1, zone->h - 2 * ch);
ecore_x_window_show(zone->edge.right);
}
break;
case E_ZONE_EDGE_TOP:
if (!zone->edge.top)
{
zone->edge.top = ecore_x_window_input_new(con->win,
zone->x + 1 + cw, zone->y,
zone->w - 2 * cw - 2, 1);
ecore_x_window_show(zone->edge.top);
}
break;
case E_ZONE_EDGE_BOTTOM:
if (!zone->edge.bottom)
{
zone->edge.bottom = ecore_x_window_input_new(con->win,
zone->x + 1 + cw, zone->y + zone->h - 1,
zone->w - 2 - 2 * cw, 1);
ecore_x_window_show(zone->edge.bottom);
}
break;
case E_ZONE_EDGE_TOP_LEFT:
if (!zone->corner.left_top)
{
zone->corner.left_top = ecore_x_window_input_new(con->win,
zone->x, zone->y, 1, ch);
ecore_x_window_show(zone->corner.left_top);
}
if (!zone->corner.top_left)
{
zone->corner.top_left = ecore_x_window_input_new(con->win,
zone->x + 1, zone->y, cw, 1);
ecore_x_window_show(zone->corner.top_left);
}
break;
case E_ZONE_EDGE_TOP_RIGHT:
if (!zone->corner.top_right)
{
zone->corner.top_right = ecore_x_window_input_new(con->win,
zone->x + zone->w - cw - 2,
zone->y, cw, 1);
ecore_x_window_show(zone->corner.top_right);
}
if (!zone->corner.right_top)
{
zone->corner.right_top = ecore_x_window_input_new(con->win,
zone->x + zone->w - 1,
zone->y, 1, ch);
ecore_x_window_show(zone->corner.right_top);
}
break;
case E_ZONE_EDGE_BOTTOM_RIGHT:
if (!zone->corner.right_bottom)
{
zone->corner.right_bottom = ecore_x_window_input_new(con->win,
zone->x + zone->w - 1,
zone->y + zone->h - ch, 1, ch);
ecore_x_window_show(zone->corner.right_bottom);
}
if (!zone->corner.bottom_right)
{
zone->corner.bottom_right = ecore_x_window_input_new(con->win,
zone->x + 1,
zone->y + zone->h - 1, cw, 1);
ecore_x_window_show(zone->corner.bottom_right);
}
break;
case E_ZONE_EDGE_BOTTOM_LEFT:
if (!zone->corner.bottom_left)
{
zone->corner.bottom_left = ecore_x_window_input_new(con->win,
zone->x + zone->w - cw - 2,
zone->y + zone->h - 1, cw, 1);
ecore_x_window_show(zone->corner.bottom_left);
}
if (!zone->corner.left_bottom)
{
zone->corner.left_bottom = ecore_x_window_input_new(con->win,
zone->x, zone->y + zone->h - ch,
1, ch);
ecore_x_window_show(zone->corner.left_bottom);
}
break;
}
if (e_config->fullscreen_flip)
e_zone_edge_win_layer_set(zone, 250);
else
e_zone_edge_win_layer_set(zone, 200);
}
}
}
}
EAPI void
e_zone_edge_free(E_Zone_Edge edge)
{
Eina_List *l, *ll, *lll;
E_Manager *man;
E_Container *con;
E_Zone *zone;
EINA_LIST_FOREACH(e_manager_list(), l, man)
{
EINA_LIST_FOREACH(man->containers, ll, con)
{
EINA_LIST_FOREACH(con->zones, lll, zone)
{
switch (edge)
{
case E_ZONE_EDGE_NONE:
/* noop */
break;
case E_ZONE_EDGE_LEFT:
if (zone->edge.left) ecore_x_window_free(zone->edge.left);
zone->edge.left = 0;
break;
case E_ZONE_EDGE_RIGHT:
if (zone->edge.right) ecore_x_window_free(zone->edge.right);
zone->edge.right = 0;
break;
case E_ZONE_EDGE_TOP:
if (zone->edge.top) ecore_x_window_free(zone->edge.top);
zone->edge.top = 0;
break;
case E_ZONE_EDGE_BOTTOM:
if (zone->edge.bottom) ecore_x_window_free(zone->edge.bottom);
zone->edge.bottom = 0;
break;
case E_ZONE_EDGE_TOP_LEFT:
if (zone->corner.left_top) ecore_x_window_free(zone->corner.left_top);
if (zone->corner.top_left) ecore_x_window_free(zone->corner.top_left);
zone->corner.left_top = 0;
zone->corner.top_left = 0;
break;
case E_ZONE_EDGE_TOP_RIGHT:
if (zone->corner.top_right) ecore_x_window_free(zone->corner.top_right);
if (zone->corner.right_top) ecore_x_window_free(zone->corner.right_top);
zone->corner.top_right = 0;
zone->corner.right_top = 0;
break;
case E_ZONE_EDGE_BOTTOM_RIGHT:
if (zone->corner.right_bottom) ecore_x_window_free(zone->corner.right_bottom);
if (zone->corner.bottom_right) ecore_x_window_free(zone->corner.bottom_right);
zone->corner.right_bottom = 0;
zone->corner.bottom_right = 0;
break;
case E_ZONE_EDGE_BOTTOM_LEFT:
if (zone->corner.bottom_left) ecore_x_window_free(zone->corner.bottom_left);
if (zone->corner.left_bottom) ecore_x_window_free(zone->corner.left_bottom);
zone->corner.bottom_left = 0;
zone->corner.left_bottom = 0;
break;
}
}
}
}
@ -822,19 +1017,19 @@ e_zone_flip_win_restore(void)
EAPI void
e_zone_edge_win_layer_set(E_Zone *zone, int layer)
{
e_container_window_raise(zone->container, zone->corner.left_bottom, layer);
e_container_window_raise(zone->container, zone->corner.left_top, layer);
e_container_window_raise(zone->container, zone->corner.top_left, layer);
e_container_window_raise(zone->container, zone->corner.top_right, layer);
e_container_window_raise(zone->container, zone->corner.right_top, layer);
e_container_window_raise(zone->container, zone->corner.right_bottom, layer);
e_container_window_raise(zone->container, zone->corner.bottom_right, layer);
e_container_window_raise(zone->container, zone->corner.bottom_left, layer);
if (zone->corner.left_bottom) e_container_window_raise(zone->container, zone->corner.left_bottom, layer);
if (zone->corner.left_top) e_container_window_raise(zone->container, zone->corner.left_top, layer);
if (zone->corner.top_left) e_container_window_raise(zone->container, zone->corner.top_left, layer);
if (zone->corner.top_right) e_container_window_raise(zone->container, zone->corner.top_right, layer);
if (zone->corner.right_top) e_container_window_raise(zone->container, zone->corner.right_top, layer);
if (zone->corner.right_bottom) e_container_window_raise(zone->container, zone->corner.right_bottom, layer);
if (zone->corner.bottom_right) e_container_window_raise(zone->container, zone->corner.bottom_right, layer);
if (zone->corner.bottom_left) e_container_window_raise(zone->container, zone->corner.bottom_left, layer);
e_container_window_raise(zone->container, zone->edge.left, layer);
e_container_window_raise(zone->container, zone->edge.right, layer);
e_container_window_raise(zone->container, zone->edge.top, layer);
e_container_window_raise(zone->container, zone->edge.bottom, layer);
if (zone->edge.left) e_container_window_raise(zone->container, zone->edge.left, layer);
if (zone->edge.right) e_container_window_raise(zone->container, zone->edge.right, layer);
if (zone->edge.top) e_container_window_raise(zone->container, zone->edge.top, layer);
if (zone->edge.bottom) e_container_window_raise(zone->container, zone->edge.bottom, layer);
}
static void

6
src/bin/e_zone.h
View File

@ -141,8 +141,10 @@ EAPI void e_zone_desk_flip_by(E_Zone *zone, int dx, int dy);
EAPI void e_zone_desk_flip_to(E_Zone *zone, int x, int y);
EAPI void e_zone_desk_linear_flip_by(E_Zone *zone, int dx);
EAPI void e_zone_desk_linear_flip_to(E_Zone *zone, int x);
EAPI void e_zone_flip_win_disable(void);
EAPI void e_zone_flip_win_restore(void);
EAPI void e_zone_edge_new(E_Zone_Edge edge);
EAPI void e_zone_edge_free(E_Zone_Edge edge);
EAPI void e_zone_edge_enable(void);
EAPI void e_zone_edge_disable(void);
EAPI void e_zone_edge_win_layer_set(E_Zone *zone, int layer);
EAPI void e_zone_useful_geometry_dirty(E_Zone *zone);