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

Formatting/Whitespace fixes. 

SVN revision: 35015
This commit is contained in:
Christopher Michael 2008-07-07 01:03:33 +00:00
parent dee8316081
commit 3594a34f0d
1 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/bin/e_desk.c
View File

@ -13,7 +13,6 @@ static void _e_border_event_desk_show_free(void *data, void *ev);
static void _e_border_event_desk_before_show_free(void *data, void *ev);
static void _e_border_event_desk_deskshow_free(void *data, void *ev);
static void _e_border_event_desk_name_change_free(void *data, void *ev);
static void _e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy);
static void _e_desk_show_end(E_Desk *desk);
static int _e_desk_show_animator(void *data);
@ -49,10 +48,10 @@ e_desk_new(E_Zone *zone, int x, int y)
Evas_List *l;
char name[40];
int ok;
E_OBJECT_CHECK_RETURN(zone, NULL);
E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, NULL);
desk = E_OBJECT_ALLOC(E_Desk, E_DESK_TYPE, _e_desk_free);
if (!desk) return NULL;
@ -71,7 +70,8 @@ e_desk_new(E_Zone *zone, int x, int y)
(zone->container->num != cfname->container)) continue;
if ((cfname->zone >= 0) &&
(zone->num != cfname->zone)) continue;
if ((cfname->desk_x != desk->x) || (cfname->desk_y != desk->y)) continue;
if ((cfname->desk_x != desk->x) || (cfname->desk_y != desk->y))
continue;
desk->name = evas_stringshare_add(cfname->name);
ok = 1;
break;
@ -82,7 +82,7 @@ e_desk_new(E_Zone *zone, int x, int y)
snprintf(name, sizeof(name), _(e_config->desktop_default_name), x, y);
desk->name = evas_stringshare_add(name);
}
return desk;
}
@ -107,7 +107,7 @@ EAPI void
e_desk_name_add(int container, int zone, int desk_x, int desk_y, const char *name)
{
E_Config_Desktop_Name *cfname;
e_desk_name_del(container, zone, desk_x, desk_y);
cfname = E_NEW(E_Config_Desktop_Name, 1);
cfname->container = container;
@ -121,12 +121,12 @@ e_desk_name_add(int container, int zone, int desk_x, int desk_y, const char *nam
EAPI void
e_desk_name_del(int container, int zone, int desk_x, int desk_y)
{
Evas_List *l;
Evas_List *l = NULL;
for (l = e_config->desktop_names; l; l = l->next)
{
E_Config_Desktop_Name *cfname;
cfname = l->data;
if ((cfname->container == container) && (cfname->zone == zone) &&
(cfname->desk_x == desk_x) && (cfname->desk_y == desk_y))
@ -150,7 +150,7 @@ e_desk_name_update(void)
E_Desk *desk;
int d_x, d_y, ok;
char name[40];
for (m = e_manager_list(); m; m = m->next)
{
man = m->data;
@ -200,13 +200,12 @@ e_desk_name_update(void)
EAPI void
e_desk_show(E_Desk *desk)
{
E_Border_List *bl;
E_Border *bd;
E_Border_List *bl;
E_Border *bd;
E_Event_Desk_Show *ev;
E_Event_Desk_Before_Show *eev;
Evas_List *l;
int was_zone = 0;
int x, y, dx = 0, dy = 0;
int was_zone = 0, x, y, dx = 0, dy = 0;
E_OBJECT_CHECK(desk);
E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
@ -215,7 +214,8 @@ e_desk_show(E_Desk *desk)
eev = E_NEW(E_Event_Desk_Before_Show, 1);
eev->desk = e_desk_current_get(desk->zone);
e_object_ref(E_OBJECT(eev->desk));
ecore_event_add(E_EVENT_DESK_BEFORE_SHOW, eev, _e_border_event_desk_before_show_free, NULL);
ecore_event_add(E_EVENT_DESK_BEFORE_SHOW, eev,
_e_border_event_desk_before_show_free, NULL);
ecore_x_window_shadow_tree_flush();
for (x = 0; x < desk->zone->desk_x_count; x++)
@ -237,7 +237,7 @@ e_desk_show(E_Desk *desk)
}
}
}
desk->zone->desk_x_current = desk->x;
desk->zone->desk_y_current = desk->y;
desk->visible = 1;
@ -251,15 +251,11 @@ e_desk_show(E_Desk *desk)
if ((bd->desk->zone == desk->zone) && (!bd->iconic))
{
if ((bd->desk == desk) || (bd->sticky))
{
e_border_show(bd);
}
e_border_show(bd);
else if (bd->moving)
e_border_desk_set(bd, desk);
else
{
e_border_hide(bd, 2);
}
e_border_hide(bd, 2);
}
}
e_container_border_list_free(bl);
@ -267,15 +263,15 @@ e_desk_show(E_Desk *desk)
if (e_config->desk_flip_animate_mode > 0)
_e_desk_show_begin(desk, e_config->desk_flip_animate_mode, dx, dy);
if (e_config->focus_last_focused_per_desktop)
e_desk_last_focused_focus(desk);
if (was_zone)
e_bg_zone_update(desk->zone, E_BG_TRANSITION_DESK);
else
e_bg_zone_update(desk->zone, E_BG_TRANSITION_START);
ev = E_NEW(E_Event_Desk_Show, 1);
ev->desk = desk;
e_object_ref(E_OBJECT(desk));
@ -295,7 +291,7 @@ e_desk_show(E_Desk *desk)
cf_es = es->cfg;
if (!cf_es) continue;
zone = e_zone_current_get(e_container_current_get(e_manager_current_get()));
zone = e_util_zone_current_get(e_manager_current_get());
if (cf_es->zone != zone->num) continue;
for (ll = es->cfg->desk_list; ll; ll = ll->next)
@ -306,7 +302,7 @@ e_desk_show(E_Desk *desk)
if (!sd) continue;
if ((desk->x == sd->x) && (desk->y == sd->y))
{
show_shelf=1;
show_shelf = 1;
break;
}
}
@ -362,9 +358,9 @@ e_desk_deskshow(E_Zone *zone)
EAPI void
e_desk_last_focused_focus(E_Desk *desk)
{
Evas_List *l;
Evas_List *l = NULL;
E_Border *bd;
for (l = e_border_focus_stack_get(); l; l = l->next)
{
bd = l->data;
@ -406,6 +402,7 @@ e_desk_current_get(E_Zone *zone)
{
E_OBJECT_CHECK_RETURN(zone, NULL);
E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, NULL);
return e_desk_at_xy_get(zone, zone->desk_x_current, zone->desk_y_current);
}
@ -419,7 +416,7 @@ e_desk_at_xy_get(E_Zone *zone, int x, int y)
return NULL;
else if ((x < 0) || (y < 0))
return NULL;
return zone->desks[x + (y * zone->desk_x_count)];
}
@ -457,13 +454,13 @@ e_desk_next(E_Zone *zone)
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
if ((zone->desk_x_count < 2) && (zone->desk_y_count < 2))
return;
x = zone->desk_x_current;
y = zone->desk_y_current;
x++;
if (x >= zone->desk_x_count)
{
@ -471,7 +468,7 @@ e_desk_next(E_Zone *zone)
y++;
if (y >= zone->desk_y_count) y = 0;
}
e_desk_show(e_desk_at_xy_get(zone, x, y));
}
@ -527,7 +524,6 @@ _e_border_event_desk_before_show_free(void *data, void *event)
free(ev);
}
static void
_e_border_event_desk_deskshow_free(void *data, void *event)
{
@ -581,10 +577,10 @@ _e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy)
{
int mx, my, bx, by;
double fx, fy, ang, rad, len, lmax;
mx = bd->zone->x + (bd->zone->w / 2);
my = bd->zone->y + (bd->zone->h / 2);
bx = bd->x + (bd->w / 2) - mx;
by = bd->y + (bd->h / 2) - my;
if (bx == 0) bx = 1;
@ -645,10 +641,10 @@ _e_desk_show_end(E_Desk *desk)
static int
_e_desk_show_animator(void *data)
{
E_Desk *desk;
E_Desk *desk;
E_Border_List *bl;
E_Border *bd;
double t, dt, spd;
E_Border *bd;
double t, dt, spd;
desk = data;
t = ecore_time_get();
@ -715,10 +711,10 @@ _e_desk_hide_begin(E_Desk *desk, int mode, int dx, int dy)
{
int mx, my, bx, by;
double fx, fy, ang, rad, len, lmax;
mx = bd->zone->x + (bd->zone->w / 2);
my = bd->zone->y + (bd->zone->h / 2);
bx = bd->x + (bd->w / 2) - mx;
by = bd->y + (bd->h / 2) - my;
if (bx == 0) bx = 1;
@ -758,7 +754,7 @@ static void
_e_desk_hide_end(E_Desk *desk)
{
E_Border_List *bl;
E_Border *bd;
E_Border *bd;
bl = e_container_border_list_first(desk->zone->container);
while ((bd = e_container_border_list_next(bl)))
@ -781,10 +777,10 @@ _e_desk_hide_end(E_Desk *desk)
static int
_e_desk_hide_animator(void *data)
{
E_Desk *desk;
E_Desk *desk;
E_Border_List *bl;
E_Border *bd;
double t, dt, spd;
E_Border *bd;
double t, dt, spd;
desk = data;
t = ecore_time_get();