Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_desk.c
Log Message:
Just some formatting fixes...E style.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- e_desk.c 25 Mar 2007 22:44:59 -0000 1.65
+++ e_desk.c 25 Apr 2007 11:28:35 -0000 1.66
@@ -42,10 +42,10 @@
EAPI E_Desk *
e_desk_new(E_Zone *zone, int x, int y)
{
- E_Desk *desk;
- char name[40];
- int ok;
+ E_Desk *desk;
Evas_List *l;
+ char name[40];
+ int ok;
E_OBJECT_CHECK_RETURN(zone, NULL);
E_OBJECT_TYPE_CHECK_RETURN(zone, E_ZONE_TYPE, NULL);
@@ -57,9 +57,8 @@
desk->x = x;
desk->y = y;
-/* Get current desktop's name */
+ /* Get current desktop's name */
ok = 0;
-
for (l = e_config->desktop_names; l; l = l->next)
{
E_Config_Desktop_Name *cfname;
@@ -97,7 +96,8 @@
ev = E_NEW(E_Event_Desk_Name_Change, 1);
ev->desk = desk;
e_object_ref(E_OBJECT(desk));
- ecore_event_add(E_EVENT_DESK_NAME_CHANGE, ev,
_e_border_event_desk_name_change_free, NULL);
+ ecore_event_add(E_EVENT_DESK_NAME_CHANGE, ev,
+ _e_border_event_desk_name_change_free, NULL);
}
EAPI void
@@ -128,7 +128,8 @@
if ((cfname->container == container) && (cfname->zone == zone) &&
(cfname->desk_x == desk_x) && (cfname->desk_y == desk_y))
{
- e_config->desktop_names =
evas_list_remove_list(e_config->desktop_names, l);
+ e_config->desktop_names =
+ evas_list_remove_list(e_config->desktop_names, l);
if (cfname->name) evas_stringshare_del(cfname->name);
free(cfname);
break;
@@ -172,7 +173,8 @@
(con->num != cfname->container)) continue;
if ((cfname->zone >= 0) &&
(zone->num != cfname->zone)) continue;
- if ((cfname->desk_x != d_x) || (cfname->desk_y
!= d_y)) continue;
+ if ((cfname->desk_x != d_x) ||
+ (cfname->desk_y != d_y)) continue;
e_desk_name_set(desk,cfname->name);
ok = 1;
break;
@@ -180,7 +182,9 @@
if (!ok)
{
- snprintf(name, sizeof(name),
_(e_config->desktop_default_name), d_x, d_y);
+ snprintf(name, sizeof(name),
+ _(e_config->desktop_default_name),
+ d_x, d_y);
e_desk_name_set(desk,name);
}
}
@@ -195,9 +199,9 @@
{
E_Border_List *bl;
E_Border *bd;
+ E_Event_Desk_Show *ev;
int was_zone = 0;
int x, y, dx = 0, dy = 0;
- E_Event_Desk_Show *ev;
E_OBJECT_CHECK(desk);
E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
@@ -216,7 +220,8 @@
dx = desk->x - desk2->x;
dy = desk->y - desk2->y;
if (e_config->desk_flip_animate_mode > 0)
- _e_desk_hide_begin(desk2, e_config->desk_flip_animate_mode,
dx, dy);
+ _e_desk_hide_begin(desk2, e_config->desk_flip_animate_mode,
+ dx, dy);
break;
}
}
@@ -247,8 +252,7 @@
e_border_desk_set(bd, desk);
else
{
- if (bd->fullscreen)
- bd->want_fullscreen = 1;
+ if (bd->fullscreen) bd->want_fullscreen = 1;
e_border_hide(bd, 2);
}
}
@@ -311,7 +315,7 @@
ev->desk = desk;
e_object_ref(E_OBJECT(desk));
ecore_event_add(E_EVENT_DESK_DESKSHOW, ev,
- _e_border_event_desk_deskshow_free, NULL);
+ _e_border_event_desk_deskshow_free, NULL);
}
EAPI void
@@ -323,8 +327,7 @@
for (l = e_border_focus_stack_get(); l; l = l->next)
{
bd = l->data;
- if ((!bd->iconic) && (bd->visible) &&
- (bd->desk == desk))
+ if ((!bd->iconic) && (bd->visible) && (bd->desk == desk))
{
/* this was the window last focused in this desktop */
e_border_focus_set(bd, 1, 1);
@@ -409,13 +412,12 @@
EAPI void
e_desk_next(E_Zone *zone)
{
- int x, y;
+ int x, y;
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
- if ((zone->desk_x_count < 2) &&
- (zone->desk_y_count < 2))
+ if ((zone->desk_x_count < 2) && (zone->desk_y_count < 2))
return;
x = zone->desk_x_current;
@@ -435,13 +437,12 @@
EAPI void
e_desk_prev(E_Zone *zone)
{
- int x, y;
+ int x, y;
E_OBJECT_CHECK(zone);
E_OBJECT_TYPE_CHECK(zone, E_ZONE_TYPE);
- if ((zone->desk_x_count < 2) &&
- (zone->desk_y_count < 2))
+ if ((zone->desk_x_count < 2) && (zone->desk_y_count < 2))
return;
x = zone->desk_x_current;
@@ -498,9 +499,9 @@
static void
_e_desk_show_begin(E_Desk *desk, int mode, int dx, int dy)
{
- E_Border_List *bl;
- E_Border *bd;
- double t;
+ E_Border_List *bl;
+ E_Border *bd;
+ double t;
t = ecore_time_get();
bl = e_container_border_list_first(desk->zone->container);
@@ -576,8 +577,8 @@
static void
_e_desk_show_end(E_Desk *desk)
{
- E_Border_List *bl;
- E_Border *bd;
+ E_Border_List *bl;
+ E_Border *bd;
bl = e_container_border_list_first(desk->zone->container);
while ((bd = e_container_border_list_next(bl)))
@@ -585,13 +586,9 @@
if ((bd->desk->zone == desk->zone) && (!bd->iconic))
{
if (bd->moving)
- {
- e_border_fx_offset(bd, 0, 0);
- }
+ e_border_fx_offset(bd, 0, 0);
else if ((bd->desk == desk) && (!bd->sticky))
- {
- e_border_fx_offset(bd, 0, 0);
- }
+ e_border_fx_offset(bd, 0, 0);
}
}
e_container_border_list_free(bl);
@@ -600,10 +597,10 @@
static int
_e_desk_show_animator(void *data)
{
- E_Desk *desk;
- E_Border_List *bl;
- E_Border *bd;
- double t, dt, spd;
+ E_Desk *desk;
+ E_Border_List *bl;
+ E_Border *bd;
+ double t, dt, spd;
desk = data;
t = ecore_time_get();
@@ -642,9 +639,9 @@
static void
_e_desk_hide_begin(E_Desk *desk, int mode, int dx, int dy)
{
- E_Border_List *bl;
- E_Border *bd;
- double t;
+ E_Border_List *bl;
+ E_Border *bd;
+ double t;
t = ecore_time_get();
bl = e_container_border_list_first(desk->zone->container);
@@ -717,8 +714,8 @@
static void
_e_desk_hide_end(E_Desk *desk)
{
- E_Border_List *bl;
- E_Border *bd;
+ E_Border_List *bl;
+ E_Border *bd;
bl = e_container_border_list_first(desk->zone->container);
while ((bd = e_container_border_list_next(bl)))
@@ -726,14 +723,11 @@
if ((bd->desk->zone == desk->zone) && (!bd->iconic))
{
if (bd->moving)
- {
- e_border_fx_offset(bd, 0, 0);
- }
+ e_border_fx_offset(bd, 0, 0);
else if ((bd->desk == desk) && (!bd->sticky))
{
e_border_fx_offset(bd, 0, 0);
- if (bd->fullscreen)
- bd->want_fullscreen = 1;
+ if (bd->fullscreen) bd->want_fullscreen = 1;
e_border_hide(bd, 2);
}
}
@@ -744,10 +738,10 @@
static int
_e_desk_hide_animator(void *data)
{
- E_Desk *desk;
- E_Border_List *bl;
- E_Border *bd;
- double t, dt, spd;
+ E_Desk *desk;
+ E_Border_List *bl;
+ E_Border *bd;
+ double t, dt, spd;
desk = data;
t = ecore_time_get();
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
