Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_tlist.c
Log Message:
Fix horrid formatting.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_tlist.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_widget_tlist.c 6 Feb 2008 21:02:34 -0000 1.6
+++ e_widget_tlist.c 6 Feb 2008 21:18:41 -0000 1.7
@@ -10,37 +10,37 @@
typedef struct _E_Widget_Callback E_Widget_Callback;
struct _E_Widget_Data
{
- Evas_Object *o_widget, *o_scrollframe, *o_tlist;
- Evas_List *callbacks;
- char **value;
+ Evas_Object *o_widget, *o_scrollframe, *o_tlist;
+ Evas_List *callbacks;
+ char **value;
};
struct _E_Widget_Callback
{
- void (*func) (void *data);
- void *data;
- char *value;
+ void (*func) (void *data);
+ void *data;
+ char *value;
};
-static void _e_widget_tlist_append(Evas_Object * obj, const char
*label,
- void (*func) (void *data),
- void *data, const char *val,
- int markup);
-static void _e_wid_del_hook(Evas_Object * obj);
-static void _e_wid_focus_hook(Evas_Object * obj);
-static void _e_wid_cb_scrollframe_resize(void *data, Evas * e,
- Evas_Object * obj,
- void *event_info);
-static void _e_wid_cb_item_sel(void *data, void *data2);
-static void _e_wid_cb_item_hilight(void *data, void *data2);
-static void _e_wid_focus_steal(void *data, Evas * e, Evas_Object * obj,
- void *event_info);
+static void _e_widget_tlist_append(Evas_Object *obj, const char *label,
+ void (*func) (void *data),
+ void *data, const char *val,
+ int markup);
+static void _e_wid_del_hook(Evas_Object *obj);
+static void _e_wid_focus_hook(Evas_Object *obj);
+static void _e_wid_cb_scrollframe_resize(void *data, Evas *e,
+ Evas_Object *obj,
+ void *event_info);
+static void _e_wid_cb_item_sel(void *data, void *data2);
+static void _e_wid_cb_item_hilight(void *data, void *data2);
+static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj,
+ void *event_info);
/* externally accessible functions */
-EAPI Evas_Object *
-e_widget_tlist_add(Evas * evas, char **value)
+EAPI Evas_Object *
+e_widget_tlist_add(Evas *evas, char **value)
{
- Evas_Object *obj, *o;
- E_Widget_Data *wd;
+ Evas_Object *obj, *o;
+ E_Widget_Data *wd;
obj = e_widget_add(evas);
@@ -73,14 +73,14 @@
}
EAPI void
-e_widget_tlist_append(Evas_Object * obj, const char *label,
+e_widget_tlist_append(Evas_Object *obj, const char *label,
void (*func) (void *data), void *data, const char *val)
{
_e_widget_tlist_append(obj, label, func, data, val, 0);
}
EAPI void
-e_widget_tlist_markup_append(Evas_Object * obj, const char *label,
+e_widget_tlist_markup_append(Evas_Object *obj, const char *label,
void (*func) (void *data), void *data,
const char *val)
{
@@ -88,112 +88,111 @@
}
EAPI void
-e_widget_tlist_selected_set(Evas_Object * obj, int n)
+e_widget_tlist_selected_set(Evas_Object *obj, int n)
{
- E_Widget_Data *wd;
+ E_Widget_Data *wd;
wd = e_widget_data_get(obj);
e_tlist_selected_set(wd->o_tlist, n);
}
EAPI int
-e_widget_tlist_selected_get(Evas_Object * obj)
+e_widget_tlist_selected_get(Evas_Object *obj)
{
- E_Widget_Data *wd;
+ E_Widget_Data *wd;
wd = e_widget_data_get(obj);
return e_tlist_selected_get(wd->o_tlist);
}
-EAPI const char *
-e_widget_tlist_selected_label_get(Evas_Object * obj)
+EAPI const char *
+e_widget_tlist_selected_label_get(Evas_Object *obj)
{
- E_Widget_Data *wd;
+ E_Widget_Data *wd;
wd = e_widget_data_get(obj);
return e_tlist_selected_label_get(wd->o_tlist);
}
EAPI void
-e_widget_tlist_selector_set(Evas_Object * obj, int selector)
+e_widget_tlist_selector_set(Evas_Object *obj, int selector)
{
- E_Widget_Data *wd;
+ E_Widget_Data *wd;
wd = e_widget_data_get(obj);
e_tlist_selector_set(wd->o_tlist, selector);
}
EAPI void
-e_widget_tlist_go(Evas_Object * obj)
+e_widget_tlist_go(Evas_Object *obj)
{
- E_Widget_Data *wd;
+ E_Widget_Data *wd;
wd = e_widget_data_get(obj);
wd->o_widget = obj;
}
EAPI void
-e_widget_tlist_remove_num(Evas_Object * obj, int n)
+e_widget_tlist_remove_num(Evas_Object *obj, int n)
{
- E_Widget_Data *wd;
+ E_Widget_Data *wd;
wd = e_widget_data_get(obj);
e_tlist_remove_num(wd->o_tlist, n);
}
EAPI void
-e_widget_tlist_remove_label(Evas_Object * obj, const char *label)
+e_widget_tlist_remove_label(Evas_Object *obj, const char *label)
{
- E_Widget_Data *wd;
+ E_Widget_Data *wd;
wd = e_widget_data_get(obj);
e_tlist_remove_label(wd->o_tlist, label);
}
EAPI int
-e_widget_tlist_count(Evas_Object * obj)
+e_widget_tlist_count(Evas_Object *obj)
{
- E_Widget_Data *wd;
+ E_Widget_Data *wd;
wd = e_widget_data_get(obj);
return e_tlist_count(wd->o_tlist);
}
static void
-_e_widget_tlist_append(Evas_Object * obj, const char *label,
+_e_widget_tlist_append(Evas_Object *obj, const char *label,
void (*func) (void *data), void *data, const char *val,
int markup)
{
- E_Widget_Data *wd;
- Evas_Coord mw, mh, vw, vh, w, h;
- E_Widget_Callback *wcb;
+ E_Widget_Data *wd;
+ Evas_Coord mw, mh, vw, vh, w, h;
+ E_Widget_Callback *wcb;
wd = e_widget_data_get(obj);
wcb = E_NEW(E_Widget_Callback, 1);
wcb->func = func;
wcb->data = data;
- if (val)
- wcb->value = strdup(val);
+ if (val) wcb->value = strdup(val);
wd->callbacks = evas_list_append(wd->callbacks, wcb);
if (markup)
- e_tlist_markup_append(wd->o_tlist, label, _e_wid_cb_item_sel,
- _e_wid_cb_item_hilight, wd, wcb);
+ e_tlist_markup_append(wd->o_tlist, label, _e_wid_cb_item_sel,
+ _e_wid_cb_item_hilight, wd, wcb);
else
- e_tlist_append(wd->o_tlist, label, _e_wid_cb_item_sel,
- _e_wid_cb_item_hilight, wd, wcb);
+ e_tlist_append(wd->o_tlist, label, _e_wid_cb_item_sel,
+ _e_wid_cb_item_hilight, wd, wcb);
e_tlist_min_size_get(wd->o_tlist, &mw, &mh);
evas_object_resize(wd->o_tlist, mw, mh);
e_scrollframe_child_viewport_size_get(wd->o_scrollframe, &vw, &vh);
evas_object_geometry_get(wd->o_scrollframe, NULL, NULL, &w, &h);
if (mw > vw)
{
- Evas_Coord wmw, wmh;
+ Evas_Coord wmw, wmh;
e_widget_min_size_get(obj, &wmw, &wmh);
e_widget_min_size_set(obj, mw + (w - vw), wmh);
}
else if (mw < vw)
- evas_object_resize(wd->o_tlist, vw, mh);
+ evas_object_resize(wd->o_tlist, vw, mh);
}
EAPI void
@@ -206,9 +205,9 @@
}
static void
-_e_wid_del_hook(Evas_Object * obj)
+_e_wid_del_hook(Evas_Object *obj)
{
- E_Widget_Data *wd;
+ E_Widget_Data *wd;
wd = e_widget_data_get(obj);
while (wd->callbacks)
@@ -216,8 +215,7 @@
E_Widget_Callback *wcb;
wcb = wd->callbacks->data;
- if (wcb->value)
- free(wcb->value);
+ if (wcb->value) free(wcb->value);
free(wcb);
wd->callbacks = evas_list_remove_list(wd->callbacks, wd->callbacks);
}
@@ -225,9 +223,9 @@
}
static void
-_e_wid_focus_hook(Evas_Object * obj)
+_e_wid_focus_hook(Evas_Object *obj)
{
- E_Widget_Data *wd;
+ E_Widget_Data *wd;
wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj))
@@ -245,27 +243,26 @@
}
static void
-_e_wid_cb_scrollframe_resize(void *data, Evas * e, Evas_Object * obj,
+_e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj,
void *event_info)
{
- Evas_Coord mw, mh, vw, vh, w, h;
+ Evas_Coord mw, mh, vw, vh, w, h;
e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
e_tlist_min_size_get(data, &mw, &mh);
evas_object_geometry_get(data, NULL, NULL, &w, &h);
if (vw >= mw)
{
- if (w != vw)
- evas_object_resize(data, vw, h);
+ if (w != vw) evas_object_resize(data, vw, h);
}
}
static void
_e_wid_cb_item_sel(void *data, void *data2)
{
- E_Widget_Data *wd;
- Evas_Coord x, y, w, h;
- E_Widget_Callback *wcb;
+ E_Widget_Data *wd;
+ Evas_Coord x, y, w, h;
+ E_Widget_Callback *wcb;
wd = data;
wcb = data2;
@@ -277,23 +274,22 @@
if (wd->value)
{
if (*(wd->value))
- free(*(wd->value));
+ free(*(wd->value));
if (wcb->value)
- *(wd->value) = strdup(wcb->value);
+ *(wd->value) = strdup(wcb->value);
else
- *(wd->value) = NULL;
+ *(wd->value) = NULL;
}
- if (wcb->func)
- wcb->func(wcb->data);
+ if (wcb->func) wcb->func(wcb->data);
}
}
static void
_e_wid_cb_item_hilight(void *data, void *data2)
{
- E_Widget_Data *wd;
- Evas_Coord x, y, w, h;
- E_Widget_Callback *wcb;
+ E_Widget_Data *wd;
+ Evas_Coord x, y, w, h;
+ E_Widget_Callback *wcb;
wd = data;
wcb = data2;
@@ -302,7 +298,7 @@
}
static void
-_e_wid_focus_steal(void *data, Evas * e, Evas_Object * obj, void *event_info)
+_e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
e_widget_focus_steal(data);
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
