Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps_error.c e_apps_error.h e_tlist.c e_tlist.h
e_widget_tlist.c e_widget_tlist.h
Log Message:
Formatting.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps_error.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_apps_error.c 18 Feb 2006 12:14:41 -0000 1.13
+++ e_apps_error.c 1 Mar 2006 05:41:57 -0000 1.14
@@ -5,49 +5,67 @@
struct _E_Config_Dialog_Data
{
- char *label;
- char *exit;
- char *signal;
+ char *label;
+ char *exit;
+ char *signal;
};
/* Protos */
-static void * _e_app_error_dialog_create_data(E_Config_Dialog *cfd);
-static void _e_app_error_dialog_free_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
-static Evas_Object *_e_app_error_dialog_basic_create_widgets(E_Config_Dialog
*cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
-static Evas_Object
*_e_app_error_dialog_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
-static void _e_app_error_dialog_resize(void *data, Evas *e,
Evas_Object *obj, void *event_info);
-static Evas_Object *_e_app_error_dialog_scrolltext_create(Evas *evas, char
*title, Ecore_Exe_Event_Data_Line *lines);
+static void *_e_app_error_dialog_create_data(E_Config_Dialog * cfd);
+static void _e_app_error_dialog_free_data(E_Config_Dialog * cfd,
+ E_Config_Dialog_Data *
+ cfdata);
+static Evas_Object *_e_app_error_dialog_basic_create_widgets(E_Config_Dialog *
+ cfd, Evas * evas,
+
E_Config_Dialog_Data
+ * cfdata);
+static Evas_Object *_e_app_error_dialog_advanced_create_widgets(E_Config_Dialog
+ * cfd,
+ Evas * evas,
+
E_Config_Dialog_Data
+ * cfdata);
+static void _e_app_error_dialog_resize(void *data, Evas * e,
+ Evas_Object * obj,
+ void *event_info);
+static Evas_Object *_e_app_error_dialog_scrolltext_create(Evas * evas,
+ char *title,
+
Ecore_Exe_Event_Data_Line
+ * lines);
static void _e_app_error_dialog_save_cb(void *data, void *data2);
-EAPI void
-e_app_error_dialog(E_Container *con, E_App_Autopsy *app)
+EAPI void
+e_app_error_dialog(E_Container * con, E_App_Autopsy * app)
{
- E_Config_Dialog *cfd;
+ E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
- v = E_NEW(E_Config_Dialog_View, 1); /* This gets freed by e_config_dialog.
*/
+ v = E_NEW(E_Config_Dialog_View, 1); /* This gets freed by e_config_dialog.
*/
if (v)
{
/* Dialog Methods */
v->create_cfdata = _e_app_error_dialog_create_data;
v->free_cfdata = _e_app_error_dialog_free_data;
v->basic.create_widgets = _e_app_error_dialog_basic_create_widgets;
- v->advanced.create_widgets =
_e_app_error_dialog_advanced_create_widgets;
+ v->advanced.create_widgets =
+ _e_app_error_dialog_advanced_create_widgets;
/* Create The Dialog */
- cfd = e_config_dialog_new(con, _("Application Execution Error"), NULL,
0, v, app);
+ cfd =
+ e_config_dialog_new(con, _("Application Execution Error"), NULL, 0,
+ v, app);
app->error_dialog = cfd;
}
}
-static void
-_e_app_error_dialog_fill_data(E_App_Autopsy *app, E_Config_Dialog_Data *cfdata)
+static void
+_e_app_error_dialog_fill_data(E_App_Autopsy * app,
+ E_Config_Dialog_Data * cfdata)
{
- char buf[4096];
+ char buf[4096];
if (!cfdata->label)
{
- snprintf(buf, sizeof(buf), _("%s stopped running unexpectedly."),
+ snprintf(buf, sizeof(buf), _("%s stopped running unexpectedly."),
app->app->name);
cfdata->label = strdup(buf);
}
@@ -61,35 +79,41 @@
if ((app->del.signalled) && (!cfdata->signal))
{
if (app->del.exit_signal == SIGINT)
- snprintf(buf, sizeof(buf), _("%s was interrupted by an Interrupt
Signal"),
- app->app->exe);
+ snprintf(buf, sizeof(buf),
+ _("%s was interrupted by an Interrupt Signal"),
+ app->app->exe);
else if (app->del.exit_signal == SIGQUIT)
- snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Signal"),
- app->app->exe);
+ snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Signal"),
+ app->app->exe);
else if (app->del.exit_signal == SIGABRT)
- snprintf(buf, sizeof(buf), _("%s was interrupted by an Abort Signal"),
- app->app->exe);
+ snprintf(buf, sizeof(buf),
+ _("%s was interrupted by an Abort Signal"), app->app->exe);
else if (app->del.exit_signal == SIGFPE)
- snprintf(buf, sizeof(buf), _("%s was interrupted by a Floating Point
Error"),
- app->app->exe);
+ snprintf(buf, sizeof(buf),
+ _("%s was interrupted by a Floating Point Error"),
+ app->app->exe);
else if (app->del.exit_signal == SIGKILL)
- snprintf(buf, sizeof(buf), _("%s was interrupted by an
Uninterruptable Kill Signal"),
- app->app->exe);
+ snprintf(buf, sizeof(buf),
+ _("%s was interrupted by an Uninterruptable Kill Signal"),
+ app->app->exe);
else if (app->del.exit_signal == SIGSEGV)
- snprintf(buf, sizeof(buf), _("%s was interrupted by a Segmentation
Fault"),
- app->app->exe);
+ snprintf(buf, sizeof(buf),
+ _("%s was interrupted by a Segmentation Fault"),
+ app->app->exe);
else if (app->del.exit_signal == SIGPIPE)
- snprintf(buf, sizeof(buf), _("%s was interrupted by a Broken Pipe"),
- app->app->exe);
+ snprintf(buf, sizeof(buf), _("%s was interrupted by a Broken Pipe"),
+ app->app->exe);
else if (app->del.exit_signal == SIGTERM)
- snprintf(buf, sizeof(buf), _("%s was interrupted by a Termination
Singal"),
- app->app->exe);
+ snprintf(buf, sizeof(buf),
+ _("%s was interrupted by a Termination Singal"),
+ app->app->exe);
else if (app->del.exit_signal == SIGBUS)
- snprintf(buf, sizeof(buf), _("%s was interrupted by a Bus Error"),
- app->app->exe);
+ snprintf(buf, sizeof(buf), _("%s was interrupted by a Bus Error"),
+ app->app->exe);
else
- snprintf(buf, sizeof(buf), _("%s was interrupted by the signal number
%i"),
- app->app->exe, app->del.exit_signal);
+ snprintf(buf, sizeof(buf),
+ _("%s was interrupted by the signal number %i"),
+ app->app->exe, app->del.exit_signal);
cfdata->signal = strdup(buf);
/* FIXME: Add sigchld_info stuff
* app->del.data
@@ -114,65 +138,69 @@
}
}
-static void *
-_e_app_error_dialog_create_data(E_Config_Dialog *cfd)
+static void *
+_e_app_error_dialog_create_data(E_Config_Dialog * cfd)
{
E_Config_Dialog_Data *cfdata;
- E_App_Autopsy *app;
-
+ E_App_Autopsy *app;
+
app = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
_e_app_error_dialog_fill_data(app, cfdata);
return cfdata;
}
-static void
-_e_app_error_dialog_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata)
+static void
+_e_app_error_dialog_free_data(E_Config_Dialog * cfd,
+ E_Config_Dialog_Data * cfdata)
{
- E_App_Autopsy *app;
+ E_App_Autopsy *app;
app = cfd->data;
- if(app)
+ if (app)
{
app->error_dialog = NULL;
if (app->error)
- ecore_exe_event_data_free(app->error);
+ ecore_exe_event_data_free(app->error);
if (app->read)
- ecore_exe_event_data_free(app->read);
+ ecore_exe_event_data_free(app->read);
free(app);
}
if (cfdata->signal)
- free(cfdata->signal);
+ free(cfdata->signal);
if (cfdata->exit)
- free(cfdata->exit);
+ free(cfdata->exit);
if (cfdata->label)
- free(cfdata->label);
+ free(cfdata->label);
free(cfdata);
}
static void
-_e_app_error_dialog_resize(void *data, Evas *e, Evas_Object *obj, void
*event_info)
+_e_app_error_dialog_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_widget_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 Evas_Object *
-_e_app_error_dialog_scrolltext_create(Evas *evas, char *title,
Ecore_Exe_Event_Data_Line *lines)
+_e_app_error_dialog_scrolltext_create(Evas * evas, char *title,
+ Ecore_Exe_Event_Data_Line * lines)
{
- int i;
- Evas_Object *obj, *os;
- char *text;
- int tlen;
+ int i;
+ Evas_Object *obj, *os;
+ char *text;
+ int tlen;
os = e_widget_framelist_add(evas, _(title), 0);
@@ -180,7 +208,7 @@
tlen = 0;
for (i = 0; lines[i].line != NULL; i++)
- tlen += lines[i].size + 1;
+ tlen += lines[i].size + 1;
text = alloca(tlen + 1);
if (text)
{
@@ -200,11 +228,12 @@
}
static Evas_Object *
-_e_app_error_dialog_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
+_e_app_error_dialog_basic_create_widgets(E_Config_Dialog * cfd, Evas * evas,
+ E_Config_Dialog_Data * cfdata)
{
- int error_length = 0;
- Evas_Object *o, *ob, *os;
- E_App_Autopsy *app;
+ int error_length = 0;
+ Evas_Object *o, *ob, *os;
+ E_App_Autopsy *app;
app = cfd->data;
_e_app_error_dialog_fill_data(app, cfdata);
@@ -215,10 +244,12 @@
e_widget_list_object_append(o, ob, 1, 1, 0.5);
if (app->error)
- error_length = app->error->size;
+ error_length = app->error->size;
if (error_length)
{
- os = _e_app_error_dialog_scrolltext_create(evas, _("Error Logs"),
app->error->lines);
+ os =
+ _e_app_error_dialog_scrolltext_create(evas, _("Error Logs"),
+ app->error->lines);
e_widget_list_object_append(o, os, 1, 1, 0.5);
}
else
@@ -227,20 +258,23 @@
e_widget_list_object_append(o, ob, 1, 1, 0.5);
}
- ob = e_widget_button_add(evas, _("Save This Message"), "enlightenment/run",
_e_app_error_dialog_save_cb, app, cfdata);
+ ob =
+ e_widget_button_add(evas, _("Save This Message"), "enlightenment/run",
+ _e_app_error_dialog_save_cb, app, cfdata);
e_widget_list_object_append(o, ob, 0, 0, 0.5);
return o;
}
static Evas_Object *
-_e_app_error_dialog_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
+_e_app_error_dialog_advanced_create_widgets(E_Config_Dialog * cfd, Evas * evas,
+ E_Config_Dialog_Data * cfdata)
{
- int read_length = 0;
- int error_length = 0;
- Evas_Object *o, *of, *ob, *ot;
- E_App_Autopsy *app;
-
+ int read_length = 0;
+ int error_length = 0;
+ Evas_Object *o, *of, *ob, *ot;
+ E_App_Autopsy *app;
+
app = cfd->data;
_e_app_error_dialog_fill_data(app, cfdata);
@@ -267,11 +301,13 @@
}
if (app->read)
- read_length = app->read->size;
+ read_length = app->read->size;
if (read_length)
{
- of = _e_app_error_dialog_scrolltext_create(evas, _("Output Data"),
app->read->lines);
+ of =
+ _e_app_error_dialog_scrolltext_create(evas, _("Output Data"),
+ app->read->lines);
/* FIXME: Add stdout "start". */
/* FIXME: Add stdout "end". */
}
@@ -282,12 +318,14 @@
e_widget_framelist_object_append(of, ob);
}
e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
-
+
if (app->error)
- error_length = app->error->size;
+ error_length = app->error->size;
if (error_length)
{
- of = _e_app_error_dialog_scrolltext_create(evas, _("Error Logs"),
app->error->lines);
+ of =
+ _e_app_error_dialog_scrolltext_create(evas, _("Error Logs"),
+ app->error->lines);
/* FIXME: Add stderr "start". */
/* FIXME: Add stderr "end". */
}
@@ -301,51 +339,56 @@
e_widget_list_object_append(o, ot, 1, 1, 0.5);
- ob = e_widget_button_add(evas, _("Save This Message"), "enlightenment/run",
_e_app_error_dialog_save_cb, app, cfdata);
+ ob =
+ e_widget_button_add(evas, _("Save This Message"), "enlightenment/run",
+ _e_app_error_dialog_save_cb, app, cfdata);
e_widget_list_object_append(o, ob, 0, 0, 0.5);
-
+
return o;
}
-static void
+static void
_e_app_error_dialog_save_cb(void *data, void *data2)
{
- E_App_Autopsy *app;
+ E_App_Autopsy *app;
E_Config_Dialog_Data *cfdata;
- FILE *f;
- char *text;
- char buf[1024];
- char buffer[4096];
- int read_length = 0;
- int i, tlen;
-
+ FILE *f;
+ char *text;
+ char buf[1024];
+ char buffer[4096];
+ int read_length = 0;
+ int i, tlen;
+
app = data;
cfdata = data2;
-
- snprintf(buf, sizeof(buf), "%s/%s.log", e_user_homedir_get(),
app->app->name);
+
+ snprintf(buf, sizeof(buf), "%s/%s.log", e_user_homedir_get(),
+ app->app->name);
f = fopen(buf, "w");
if (!f)
- return;
+ return;
if (cfdata->exit)
{
- snprintf(buffer, sizeof(buffer), "Error Information:\n\t%s\n\n",
cfdata->exit);
+ snprintf(buffer, sizeof(buffer), "Error Information:\n\t%s\n\n",
+ cfdata->exit);
fwrite(buffer, sizeof(char), strlen(buffer), f);
}
if (cfdata->signal)
{
- snprintf(buffer, sizeof(buffer), "Error Signal Information:\n\t%s\n\n",
cfdata->signal);
- fwrite(buffer, sizeof(char), strlen(buffer), f);
+ snprintf(buffer, sizeof(buffer), "Error Signal Information:\n\t%s\n\n",
+ cfdata->signal);
+ fwrite(buffer, sizeof(char), strlen(buffer), f);
}
if (app->read)
- read_length = app->read->size;
+ read_length = app->read->size;
if (read_length)
{
tlen = 0;
for (i = 0; app->read->lines[i].line != NULL; i++)
- tlen += app->read->lines[i].size + 1;
+ tlen += app->read->lines[i].size + 1;
text = alloca(tlen + 1);
if (text)
{
@@ -362,20 +405,21 @@
}
else
{
- snprintf(buffer, sizeof(buffer), "Output Data:\n\tThere was no
output\n\n");
- fwrite(buffer, sizeof(char), strlen(buffer), f);
+ snprintf(buffer, sizeof(buffer),
+ "Output Data:\n\tThere was no output\n\n");
+ fwrite(buffer, sizeof(char), strlen(buffer), f);
}
-
+
/* Reusing this var */
read_length = 0;
if (app->error)
- read_length = app->error->size;
+ read_length = app->error->size;
if (read_length)
{
tlen = 0;
for (i = 0; app->error->lines[i].line != NULL; i++)
- tlen += app->error->lines[i].size + 1;
+ tlen += app->error->lines[i].size + 1;
text = alloca(tlen + 1);
if (text)
{
@@ -390,11 +434,12 @@
fwrite(buffer, sizeof(char), strlen(buffer), f);
}
}
- else
+ else
{
- snprintf(buffer, sizeof(buffer), "Error Logs:\n\tThere was no error
message\n");
+ snprintf(buffer, sizeof(buffer),
+ "Error Logs:\n\tThere was no error message\n");
fwrite(buffer, sizeof(char), strlen(buffer), f);
}
-
+
fclose(f);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps_error.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_apps_error.h 26 Jan 2006 07:38:06 -0000 1.1
+++ e_apps_error.h 1 Mar 2006 05:41:57 -0000 1.2
@@ -7,7 +7,7 @@
#ifndef E_APPS_ERROR_H
#define E_APPS_ERROR_H
-EAPI void e_app_error_dialog (E_Container *con,
E_App_Autopsy *app);
+EAPI void e_app_error_dialog(E_Container * con, E_App_Autopsy * app);
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_tlist.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_tlist.c 27 Jan 2006 05:09:22 -0000 1.2
+++ e_tlist.c 1 Mar 2006 05:41:57 -0000 1.3
@@ -13,149 +13,188 @@
typedef struct _E_Smart_Item E_Smart_Item;
struct _E_Smart_Data
-{
- Evas_Coord x, y, w, h;
-
- Evas_Object *smart_obj;
- Evas_Object *box_obj;
- Evas_List *items;
- int selected;
- unsigned char selector : 1;
+{
+ Evas_Coord x, y, w, h;
+
+ Evas_Object *smart_obj;
+ Evas_Object *box_obj;
+ Evas_List *items;
+ int selected;
+ unsigned char selector:1;
};
struct _E_Smart_Item
{
- E_Smart_Data *sd;
- Evas_Object *base_obj;
- void (*func) (void *data, void *data2);
- void (*func_hilight) (void *data, void *data2);
- void *data;
- void *data2;
- unsigned char markup : 1;
+ E_Smart_Data *sd;
+ Evas_Object *base_obj;
+ void (*func) (void *data, void *data2);
+ void (*func_hilight) (void *data, void *data2);
+ void *data;
+ void *data2;
+ unsigned char markup:1;
};
/* local subsystem functions */
-static void _e_tlist_append(Evas_Object *obj, char *label, void (*func) (void
*data, void *data2), void (*func_hilight) (void *data, void *data2), void
*data, void *data2, int markup);
-static void _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void _e_smart_reconfigure(E_Smart_Data *sd);
-static void _e_smart_add(Evas_Object *obj);
-static void _e_smart_del(Evas_Object *obj);
-static void _e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
-static void _e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
-static void _e_smart_show(Evas_Object *obj);
-static void _e_smart_hide(Evas_Object *obj);
-static void _e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a);
-static void _e_smart_clip_set(Evas_Object *obj, Evas_Object * clip);
-static void _e_smart_clip_unset(Evas_Object *obj);
-static void _e_smart_init(void);
+static void _e_tlist_append(Evas_Object * obj, char *label,
+ void (*func) (void *data, void *data2),
+ void (*func_hilight) (void *data,
+ void *data2),
+ void *data, void *data2, int markup);
+static void _e_smart_event_mouse_down(void *data, Evas * e,
+ Evas_Object * obj,
+ void *event_info);
+static void _e_smart_event_mouse_up(void *data, Evas * e,
+ Evas_Object * obj,
+ void *event_info);
+static void _e_smart_event_key_down(void *data, Evas * e,
+ Evas_Object * obj,
+ void *event_info);
+static void _e_smart_reconfigure(E_Smart_Data * sd);
+static void _e_smart_add(Evas_Object * obj);
+static void _e_smart_del(Evas_Object * obj);
+static void _e_smart_move(Evas_Object * obj, Evas_Coord x,
+ Evas_Coord y);
+static void _e_smart_resize(Evas_Object * obj, Evas_Coord w,
+ Evas_Coord h);
+static void _e_smart_show(Evas_Object * obj);
+static void _e_smart_hide(Evas_Object * obj);
+static void _e_smart_color_set(Evas_Object * obj, int r, int g, int b,
+ int a);
+static void _e_smart_clip_set(Evas_Object * obj, Evas_Object * clip);
+static void _e_smart_clip_unset(Evas_Object * obj);
+static void _e_smart_init(void);
/* local subsystem globals */
-static Evas_Smart *_e_smart = NULL;
+static Evas_Smart *_e_smart = NULL;
/* externally accessible functions */
-EAPI Evas_Object *
-e_tlist_add(Evas *evas)
+EAPI Evas_Object *
+e_tlist_add(Evas * evas)
{
_e_smart_init();
return evas_object_smart_add(evas, _e_smart);
}
EAPI void
-e_tlist_append(Evas_Object *obj, char *label, void (*func) (void *data, void
*data2), void (*func_hilight) (void *data, void *data2), void *data, void
*data2)
+e_tlist_append(Evas_Object * obj, char *label,
+ void (*func) (void *data, void *data2),
+ void (*func_hilight) (void *data, void *data2), void *data,
+ void *data2)
{
_e_tlist_append(obj, label, func, func_hilight, data, data2, 0);
}
EAPI void
-e_tlist_markup_append(Evas_Object *obj, char *label, void (*func) (void *data,
void *data2), void (*func_hilight) (void *data, void *data2), void *data, void
*data2)
+e_tlist_markup_append(Evas_Object * obj, char *label,
+ void (*func) (void *data, void *data2),
+ void (*func_hilight) (void *data, void *data2),
+ void *data, void *data2)
{
_e_tlist_append(obj, label, func, func_hilight, data, data2, 1);
}
EAPI void
-e_tlist_selected_set(Evas_Object *obj, int n)
+e_tlist_selected_set(Evas_Object * obj, int n)
{
- E_Smart_Item *si;
-
- API_ENTRY return;
- if (!sd->items) return;
- if (n >= evas_list_count(sd->items)) n = evas_list_count(sd->items) - 1;
- else if (n < 0) n = 0;
- if (sd->selected == n) return;
+ E_Smart_Item *si;
+
+ API_ENTRY return;
+
+ if (!sd->items)
+ return;
+ if (n >= evas_list_count(sd->items))
+ n = evas_list_count(sd->items) - 1;
+ else if (n < 0)
+ n = 0;
+ if (sd->selected == n)
+ return;
si = evas_list_nth(sd->items, sd->selected);
- if (si) edje_object_signal_emit(si->base_obj, "passive", "");
+ if (si)
+ edje_object_signal_emit(si->base_obj, "passive", "");
sd->selected = n;
si = evas_list_nth(sd->items, sd->selected);
if (si)
{
evas_object_raise(si->base_obj);
edje_object_signal_emit(si->base_obj, "active", "");
- if (si->func_hilight) si->func_hilight(si->data, si->data2);
+ if (si->func_hilight)
+ si->func_hilight(si->data, si->data2);
if (!sd->selector)
{
- if (si->func) si->func(si->data, si->data2);
+ if (si->func)
+ si->func(si->data, si->data2);
}
}
}
EAPI int
-e_tlist_selected_get(Evas_Object *obj)
+e_tlist_selected_get(Evas_Object * obj)
{
- API_ENTRY return -1;
- if (!sd->items) return -1;
+ API_ENTRY return -1;
+
+ if (!sd->items)
+ return -1;
return sd->selected;
}
-EAPI const char *
-e_tlist_selected_label_get(Evas_Object *obj)
+EAPI const char *
+e_tlist_selected_label_get(Evas_Object * obj)
{
- E_Smart_Item *si;
-
- API_ENTRY return NULL;
- if (!sd->items) return NULL;
+ E_Smart_Item *si;
+
+ API_ENTRY return NULL;
+
+ if (!sd->items)
+ return NULL;
si = evas_list_nth(sd->items, sd->selected);
if (si)
- {
- if (si->markup)
- return edje_object_part_text_get(si->base_obj, "labelblock");
- else
- return edje_object_part_text_get(si->base_obj, "label");
- }
+ {
+ if (si->markup)
+ return edje_object_part_text_get(si->base_obj, "labelblock");
+ else
+ return edje_object_part_text_get(si->base_obj, "label");
+ }
return NULL;
}
-EAPI void *
-e_tlist_selected_data_get(Evas_Object *obj)
+EAPI void *
+e_tlist_selected_data_get(Evas_Object * obj)
{
- E_Smart_Item *si;
-
- API_ENTRY return NULL;
- if (!sd->items) return NULL;
+ E_Smart_Item *si;
+
+ API_ENTRY return NULL;
+
+ if (!sd->items)
+ return NULL;
si = evas_list_nth(sd->items, sd->selected);
- if (si) return si->data;
+ if (si)
+ return si->data;
return NULL;
}
-EAPI void *
-e_tlist_selected_data2_get(Evas_Object *obj)
+EAPI void *
+e_tlist_selected_data2_get(Evas_Object * obj)
{
- E_Smart_Item *si;
-
- API_ENTRY return NULL;
- if (!sd->items) return NULL;
+ E_Smart_Item *si;
+
+ API_ENTRY return NULL;
+
+ if (!sd->items)
+ return NULL;
si = evas_list_nth(sd->items, sd->selected);
- if (si) return si->data2;
+ if (si)
+ return si->data2;
return NULL;
}
EAPI void
-e_tlist_selected_geometry_get(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y,
Evas_Coord *w, Evas_Coord *h)
+e_tlist_selected_geometry_get(Evas_Object * obj, Evas_Coord * x, Evas_Coord *
y,
+ Evas_Coord * w, Evas_Coord * h)
{
- E_Smart_Item *si;
-
- API_ENTRY return;
+ E_Smart_Item *si;
+
+ API_ENTRY return;
+
si = evas_list_nth(sd->items, sd->selected);
if (si)
{
@@ -166,63 +205,73 @@
}
EAPI void
-e_tlist_min_size_get(Evas_Object *obj, Evas_Coord *w, Evas_Coord *h)
+e_tlist_min_size_get(Evas_Object * obj, Evas_Coord * w, Evas_Coord * h)
{
- API_ENTRY return;
+ API_ENTRY return;
+
e_box_min_size_get(sd->box_obj, w, h);
}
EAPI void
-e_tlist_selector_set(Evas_Object *obj, int selector)
+e_tlist_selector_set(Evas_Object * obj, int selector)
{
- API_ENTRY return;
+ API_ENTRY return;
+
sd->selector = selector;
}
EAPI int
-e_tlist_selector_get(Evas_Object *obj)
+e_tlist_selector_get(Evas_Object * obj)
{
- API_ENTRY return 0;
+ API_ENTRY return 0;
+
return sd->selector;
}
EAPI void
-e_tlist_remove_num(Evas_Object *obj, int n)
+e_tlist_remove_num(Evas_Object * obj, int n)
{
- E_Smart_Item *si;
-
- API_ENTRY return;
- if (!sd->items) return;
+ E_Smart_Item *si;
+
+ API_ENTRY return;
+
+ if (!sd->items)
+ return;
si = evas_list_nth(sd->items, n);
- if (si)
- {
- sd->items = evas_list_remove(sd->items, si);
- evas_object_del(si->base_obj);
- free(si);
- }
+ if (si)
+ {
+ sd->items = evas_list_remove(sd->items, si);
+ evas_object_del(si->base_obj);
+ free(si);
+ }
}
EAPI void
-e_tlist_remove_label(Evas_Object *obj, char *label)
+e_tlist_remove_label(Evas_Object * obj, char *label)
{
- E_Smart_Item *si;
- Evas_List *l;
- int i;
-
- API_ENTRY return;
- if (!sd->items) return;
- if (!label) return;
- for (i = 0, l = sd->items; l; l = l->next, i++)
+ E_Smart_Item *si;
+ Evas_List *l;
+ int i;
+
+ API_ENTRY return;
+
+ if (!sd->items)
+ return;
+ if (!label)
+ return;
+ for (i = 0, l = sd->items; l; l = l->next, i++)
{
si = l->data;
- if (si)
+ if (si)
{
- char *t;
- if (si->markup)
- t = strdup(edje_object_part_text_get(si->base_obj,
"labelblock"));
+ char *t;
+
+ if (si->markup)
+ t = strdup(edje_object_part_text_get
+ (si->base_obj, "labelblock"));
else
- t = strdup(edje_object_part_text_get(si->base_obj, "label"));
- if (!strcmp(t, label))
+ t = strdup(edje_object_part_text_get(si->base_obj, "label"));
+ if (!strcmp(t, label))
{
evas_object_del(si->base_obj);
sd->items = evas_list_remove(sd->items, si);
@@ -235,21 +284,25 @@
}
EAPI int
-e_tlist_count(Evas_Object *obj)
+e_tlist_count(Evas_Object * obj)
{
- API_ENTRY return 0;
+ API_ENTRY return 0;
+
return evas_list_count(sd->items);
}
-
/* local subsystem functions */
static void
-_e_tlist_append(Evas_Object *obj, char *label, void (*func) (void *data, void
*data2), void (*func_hilight) (void *data, void *data2), void *data, void
*data2, int markup)
+_e_tlist_append(Evas_Object * obj, char *label,
+ void (*func) (void *data, void *data2),
+ void (*func_hilight) (void *data, void *data2), void *data,
+ void *data2, int markup)
{
- E_Smart_Item *si;
- Evas_Coord mw = 0, mh = 0;
-
- API_ENTRY return;
+ E_Smart_Item *si;
+ Evas_Coord mw = 0, mh = 0;
+
+ API_ENTRY return;
+
si = E_NEW(E_Smart_Item, 1);
si->sd = sd;
si->markup = markup;
@@ -258,42 +311,44 @@
/* FIXME: Use a color class or something to avoid duplicating the theme
with only the background piccie being different. */
if (evas_list_count(sd->items) & 0x1)
e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
- "widgets/tlist_odd");
+ "widgets/tlist_odd");
else
e_theme_edje_object_set(si->base_obj, "base/theme/widgets",
- "widgets/tlist");
+ "widgets/tlist");
if (si->markup)
edje_object_part_text_set(si->base_obj, "labelblock", label);
else
edje_object_part_text_set(si->base_obj, "label", label);
- si->func = func;
+ si->func = func;
si->func_hilight = func_hilight;
si->data = data;
si->data2 = data2;
sd->items = evas_list_append(sd->items, si);
edje_object_size_min_calc(si->base_obj, &mw, &mh);
e_box_pack_end(sd->box_obj, si->base_obj);
- e_box_pack_options_set(si->base_obj,
- 1, 1, /* fill */
- 1, 1, /* expand */
- 0.5, 0.5, /* align */
- mw, mh, /* min */
- 99999, 99999 /* max */
- );
+ e_box_pack_options_set(si->base_obj, 1, 1, /* fill */
+ 1, 1, /* expand */
+ 0.5, 0.5, /* align */
+ mw, mh, /* min */
+ 99999, 99999 /* max */
+ );
evas_object_lower(si->base_obj);
- evas_object_event_callback_add(si->base_obj, EVAS_CALLBACK_MOUSE_DOWN,
_e_smart_event_mouse_down, si);
- evas_object_event_callback_add(si->base_obj, EVAS_CALLBACK_MOUSE_UP,
_e_smart_event_mouse_up, si);
+ evas_object_event_callback_add(si->base_obj, EVAS_CALLBACK_MOUSE_DOWN,
+ _e_smart_event_mouse_down, si);
+ evas_object_event_callback_add(si->base_obj, EVAS_CALLBACK_MOUSE_UP,
+ _e_smart_event_mouse_up, si);
evas_object_show(si->base_obj);
}
-static void
-_e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
+static void
+_e_smart_event_mouse_down(void *data, Evas * e, Evas_Object * obj,
+ void *event_info)
{
Evas_Event_Mouse_Down *ev;
- E_Smart_Item *si;
- Evas_List *l;
- int i;
-
+ E_Smart_Item *si;
+ Evas_List *l;
+ int i;
+
si = data;
ev = event_info;
for (i = 0, l = si->sd->items; l; l = l->next, i++)
@@ -306,12 +361,13 @@
}
}
-static void
-_e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void
*event_info)
+static void
+_e_smart_event_mouse_up(void *data, Evas * e, Evas_Object * obj,
+ void *event_info)
{
Evas_Event_Mouse_Up *ev;
- E_Smart_Item *si;
-
+ E_Smart_Item *si;
+
si = data;
ev = event_info;
if (si->sd->selector)
@@ -319,86 +375,90 @@
si = evas_list_nth(si->sd->items, si->sd->selected);
if (si)
{
- if (si->func) si->func(si->data, si->data2);
+ if (si->func)
+ si->func(si->data, si->data2);
}
}
}
static void
-_e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
+_e_smart_event_key_down(void *data, Evas * e, Evas_Object * obj,
+ void *event_info)
{
Evas_Event_Key_Down *ev;
- E_Smart_Data *sd;
-
+ E_Smart_Data *sd;
+
sd = data;
ev = event_info;
if (!strcmp(ev->keyname, "Up"))
{
- int n;
-
+ int n;
+
n = e_tlist_selected_get(sd->smart_obj);
e_tlist_selected_set(sd->smart_obj, n - 1);
}
else if (!strcmp(ev->keyname, "Down"))
{
- int n;
-
+ int n;
+
n = e_tlist_selected_get(sd->smart_obj);
e_tlist_selected_set(sd->smart_obj, n + 1);
}
- else if ((!strcmp(ev->keyname, "Return")) ||
- (!strcmp(ev->keyname, "space")))
+ else if ((!strcmp(ev->keyname, "Return")) || (!strcmp(ev->keyname,
"space")))
{
- E_Smart_Item *si;
+ E_Smart_Item *si;
si = evas_list_nth(sd->items, sd->selected);
if (si)
{
- if (si->func) si->func(si->data, si->data2);
+ if (si->func)
+ si->func(si->data, si->data2);
}
}
}
static void
-_e_smart_reconfigure(E_Smart_Data *sd)
+_e_smart_reconfigure(E_Smart_Data * sd)
{
evas_object_move(sd->box_obj, sd->x, sd->y);
evas_object_resize(sd->box_obj, sd->w, sd->h);
}
static void
-_e_smart_add(Evas_Object *obj)
+_e_smart_add(Evas_Object * obj)
{
- E_Smart_Data *sd;
-
+ E_Smart_Data *sd;
+
sd = calloc(1, sizeof(E_Smart_Data));
- if (!sd) return;
+ if (!sd)
+ return;
evas_object_smart_data_set(obj, sd);
-
+
sd->smart_obj = obj;
sd->x = 0;
sd->y = 0;
sd->w = 0;
sd->h = 0;
-
+
sd->selected = -1;
-
+
sd->box_obj = e_box_add(evas_object_evas_get(obj));
e_box_align_set(sd->box_obj, 0.0, 0.0);
e_box_homogenous_set(sd->box_obj, 0);
evas_object_smart_member_add(sd->box_obj, obj);
-
- evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN,
_e_smart_event_key_down, sd);
+
+ evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN,
+ _e_smart_event_key_down, sd);
evas_object_propagate_events_set(obj, 0);
}
static void
-_e_smart_del(Evas_Object *obj)
+_e_smart_del(Evas_Object * obj)
{
INTERNAL_ENTRY;
while (sd->items)
{
- E_Smart_Item *si;
+ E_Smart_Item *si;
si = sd->items->data;
sd->items = evas_list_remove_list(sd->items, sd->items);
@@ -410,77 +470,77 @@
}
static void
-_e_smart_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y)
+_e_smart_move(Evas_Object * obj, Evas_Coord x, Evas_Coord y)
{
INTERNAL_ENTRY;
- if ((sd->x == x) && (sd->y == y)) return;
+ if ((sd->x == x) && (sd->y == y))
+ return;
sd->x = x;
sd->y = y;
_e_smart_reconfigure(sd);
}
static void
-_e_smart_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h)
+_e_smart_resize(Evas_Object * obj, Evas_Coord w, Evas_Coord h)
{
INTERNAL_ENTRY;
- if ((sd->w == w) && (sd->h == h)) return;
+ if ((sd->w == w) && (sd->h == h))
+ return;
sd->w = w;
sd->h = h;
_e_smart_reconfigure(sd);
}
static void
-_e_smart_show(Evas_Object *obj)
+_e_smart_show(Evas_Object * obj)
{
INTERNAL_ENTRY;
evas_object_show(sd->box_obj);
}
static void
-_e_smart_hide(Evas_Object *obj)
+_e_smart_hide(Evas_Object * obj)
{
INTERNAL_ENTRY;
evas_object_hide(sd->box_obj);
}
static void
-_e_smart_color_set(Evas_Object *obj, int r, int g, int b, int a)
+_e_smart_color_set(Evas_Object * obj, int r, int g, int b, int a)
{
INTERNAL_ENTRY;
evas_object_color_set(sd->box_obj, r, g, b, a);
}
static void
-_e_smart_clip_set(Evas_Object *obj, Evas_Object * clip)
+_e_smart_clip_set(Evas_Object * obj, Evas_Object * clip)
{
INTERNAL_ENTRY;
evas_object_clip_set(sd->box_obj, clip);
}
static void
-_e_smart_clip_unset(Evas_Object *obj)
+_e_smart_clip_unset(Evas_Object * obj)
{
INTERNAL_ENTRY;
evas_object_clip_unset(sd->box_obj);
-}
+}
/* never need to touch this */
static void
_e_smart_init(void)
{
- if (_e_smart) return;
+ if (_e_smart)
+ return;
_e_smart = evas_smart_new(SMART_NAME,
_e_smart_add,
- _e_smart_del,
+ _e_smart_del,
NULL, NULL, NULL, NULL, NULL,
_e_smart_move,
_e_smart_resize,
_e_smart_show,
_e_smart_hide,
_e_smart_color_set,
- _e_smart_clip_set,
- _e_smart_clip_unset,
- NULL);
+ _e_smart_clip_set, _e_smart_clip_unset, NULL);
}
-
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_tlist.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_tlist.h 23 Jan 2006 18:33:20 -0000 1.1
+++ e_tlist.h 1 Mar 2006 05:41:57 -0000 1.2
@@ -6,21 +6,35 @@
#ifndef E_TLIST_H
#define E_TLIST_H
-EAPI Evas_Object *e_tlist_add (Evas *evas);
-EAPI void e_tlist_append (Evas_Object *obj, char
*label, void (*func) (void *data, void *data2), void (*func_hilight) (void
*data, void *data2), void *data, void *data2);
-EAPI void e_tlist_markup_append (Evas_Object *obj, char
*label, void (*func) (void *data, void *data2), void (*func_hilight) (void
*data, void *data2), void *data, void *data2);
-EAPI void e_tlist_selected_set (Evas_Object *obj, int n);
-EAPI int e_tlist_selected_get (Evas_Object *obj);
-EAPI const char *e_tlist_selected_label_get (Evas_Object *obj);
-EAPI void *e_tlist_selected_data_get (Evas_Object *obj);
-EAPI void *e_tlist_selected_data2_get (Evas_Object *obj);
-EAPI void e_tlist_selected_geometry_get (Evas_Object *obj, Evas_Coord
*x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-EAPI void e_tlist_min_size_get (Evas_Object *obj, Evas_Coord
*w, Evas_Coord *h);
-EAPI void e_tlist_selector_set (Evas_Object *obj, int
selector);
-EAPI int e_tlist_selector_get (Evas_Object *obj);
-EAPI void e_tlist_remove_num (Evas_Object *obj, int n);
-EAPI void e_tlist_remove_label (Evas_Object *obj, char
*label);
-EAPI int e_tlist_count (Evas_Object *obj);
+EAPI Evas_Object *e_tlist_add(Evas * evas);
+EAPI void e_tlist_append(Evas_Object * obj, char *label,
+ void (*func) (void *data, void *data2),
+ void (*func_hilight) (void *data,
+ void *data2),
+ void *data, void *data2);
+EAPI void e_tlist_markup_append(Evas_Object * obj, char *label,
+ void (*func) (void *data,
+ void *data2),
+ void (*func_hilight) (void *data,
+ void *data2),
+ void *data, void *data2);
+EAPI void e_tlist_selected_set(Evas_Object * obj, int n);
+EAPI int e_tlist_selected_get(Evas_Object * obj);
+EAPI const char *e_tlist_selected_label_get(Evas_Object * obj);
+EAPI void *e_tlist_selected_data_get(Evas_Object * obj);
+EAPI void *e_tlist_selected_data2_get(Evas_Object * obj);
+EAPI void e_tlist_selected_geometry_get(Evas_Object * obj,
+ Evas_Coord * x,
+ Evas_Coord * y,
+ Evas_Coord * w,
+ Evas_Coord * h);
+EAPI void e_tlist_min_size_get(Evas_Object * obj, Evas_Coord * w,
+ Evas_Coord * h);
+EAPI void e_tlist_selector_set(Evas_Object * obj, int selector);
+EAPI int e_tlist_selector_get(Evas_Object * obj);
+EAPI void e_tlist_remove_num(Evas_Object * obj, int n);
+EAPI void e_tlist_remove_label(Evas_Object * obj, char *label);
+EAPI int e_tlist_count(Evas_Object * obj);
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_tlist.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_widget_tlist.c 23 Jan 2006 18:33:20 -0000 1.1
+++ e_widget_tlist.c 1 Mar 2006 05:41:57 -0000 1.2
@@ -10,189 +10,201 @@
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, char *label, void (*func)
(void *data), void *data, 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, char *label,
+ void (*func) (void *data),
+ void *data, 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);
-
+
e_widget_del_hook_set(obj, _e_wid_del_hook);
e_widget_focus_hook_set(obj, _e_wid_focus_hook);
wd = calloc(1, sizeof(E_Widget_Data));
e_widget_data_set(obj, wd);
wd->value = value;
-
+
o = e_scrollframe_add(evas);
wd->o_scrollframe = o;
evas_object_show(o);
e_widget_sub_object_add(obj, o);
e_widget_resize_object_set(obj, o);
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_e_wid_focus_steal, obj);
-
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
+ _e_wid_focus_steal, obj);
+
o = e_tlist_add(evas);
wd->o_tlist = o;
- evas_object_event_callback_add(wd->o_scrollframe, EVAS_CALLBACK_RESIZE,
_e_wid_cb_scrollframe_resize, o);
+ evas_object_event_callback_add(wd->o_scrollframe, EVAS_CALLBACK_RESIZE,
+ _e_wid_cb_scrollframe_resize, o);
e_scrollframe_child_set(wd->o_scrollframe, o);
e_widget_sub_object_add(obj, o);
evas_object_show(o);
-
+
evas_object_resize(obj, 32, 32);
e_widget_min_size_set(obj, 32, 32);
return obj;
}
EAPI void
-e_widget_tlist_append(Evas_Object *obj, char *label, void (*func) (void
*data), void *data, char *val)
+e_widget_tlist_append(Evas_Object * obj, char *label, void (*func) (void
*data),
+ void *data, char *val)
{
_e_widget_tlist_append(obj, label, func, data, val, 0);
}
EAPI void
-e_widget_tlist_markup_append(Evas_Object *obj, char *label, void (*func) (void
*data), void *data, char *val)
+e_widget_tlist_markup_append(Evas_Object * obj, char *label,
+ void (*func) (void *data), void *data, char *val)
{
_e_widget_tlist_append(obj, label, func, data, val, 1);
}
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, char *label)
+e_widget_tlist_remove_label(Evas_Object * obj, 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, char *label, void (*func) (void
*data), void *data, char *val, int markup)
-{
- E_Widget_Data *wd;
- Evas_Coord mw, mh, vw, vh, w, h;
- E_Widget_Callback *wcb;
-
+_e_widget_tlist_append(Evas_Object * obj, char *label,
+ void (*func) (void *data), void *data, char *val,
+ int markup)
+{
+ 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);
}
}
-
-
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)
{
- E_Widget_Callback *wcb;
-
+ 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);
}
@@ -200,44 +212,48 @@
}
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))
{
-
edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe),
"focus_in", "");
+ edje_object_signal_emit(e_scrollframe_edje_object_get
+ (wd->o_scrollframe), "focus_in", "");
evas_object_focus_set(wd->o_tlist, 1);
}
else
{
-
edje_object_signal_emit(e_scrollframe_edje_object_get(wd->o_scrollframe),
"focus_out", "");
+ edje_object_signal_emit(e_scrollframe_edje_object_get
+ (wd->o_scrollframe), "focus_out", "");
evas_object_focus_set(wd->o_tlist, 0);
}
}
static void
-_e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void
*event_info)
+_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;
e_tlist_selected_geometry_get(wd->o_tlist, &x, &y, &w, &h);
@@ -247,23 +263,25 @@
e_widget_change(wd->o_widget);
if (wd->value)
{
- if (*(wd->value)) free(*(wd->value));
+ if (*(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;
e_tlist_selected_geometry_get(wd->o_tlist, &x, &y, &w, &h);
@@ -271,7 +289,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);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_tlist.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_widget_tlist.h 23 Jan 2006 18:33:20 -0000 1.1
+++ e_widget_tlist.h 1 Mar 2006 05:41:57 -0000 1.2
@@ -6,17 +6,22 @@
#ifndef E_WIDGET_TLIST_H
#define E_WIDGET_TLIST_H
-EAPI Evas_Object *e_widget_tlist_add(Evas *evas, char **value);
-EAPI void e_widget_tlist_append(Evas_Object *obj, char *label, void (*func)
(void *data), void *data, char *val);
-EAPI void e_widget_tlist_markup_append(Evas_Object *obj, char *label, void
(*func) (void *data), void *data, char *val);
-EAPI void e_widget_tlist_selected_set(Evas_Object *obj, int n);
-EAPI void e_widget_tlist_selector_set(Evas_Object *obj, int selector);
-EAPI void e_widget_tlist_go(Evas_Object *obj);
-EAPI int e_widget_tlist_selected_get(Evas_Object *obj);
-EAPI const char *e_widget_tlist_selected_label_get(Evas_Object *obj);
-EAPI void e_widget_tlist_remove_num(Evas_Object *obj, int n);
-EAPI void e_widget_tlist_remove_label(Evas_Object *obj, char *label);
-EAPI int e_widget_tlist_count(Evas_Object *obj);
+EAPI Evas_Object *e_widget_tlist_add(Evas * evas, char **value);
+EAPI void e_widget_tlist_append(Evas_Object * obj, char *label,
+ void (*func) (void *data), void *data,
+ char *val);
+EAPI void e_widget_tlist_markup_append(Evas_Object * obj, char
*label,
+ void (*func) (void *data),
+ void *data, char *val);
+EAPI void e_widget_tlist_selected_set(Evas_Object * obj, int n);
+EAPI void e_widget_tlist_selector_set(Evas_Object * obj,
+ int selector);
+EAPI void e_widget_tlist_go(Evas_Object * obj);
+EAPI int e_widget_tlist_selected_get(Evas_Object * obj);
+EAPI const char *e_widget_tlist_selected_label_get(Evas_Object * obj);
+EAPI void e_widget_tlist_remove_num(Evas_Object * obj, int n);
+EAPI void e_widget_tlist_remove_label(Evas_Object * obj, char
*label);
+EAPI int e_widget_tlist_count(Evas_Object * obj);
#endif
#endif
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
