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

Formatting. 

SVN revision: 20863
This commit is contained in:
David Walter Seikel 2006-03-01 05:41:57 +00:00
parent e79eebef3a
commit cdb6190625
6 changed files with 548 additions and 406 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/bin/e_apps_error.c
View File

@ -12,11 +12,25 @@ struct _E_Config_Dialog_Data
/* 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_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
@ -32,16 +46,20 @@ e_app_error_dialog(E_Container *con, E_App_Autopsy *app)
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)
_e_app_error_dialog_fill_data(E_App_Autopsy * app,
E_Config_Dialog_Data * cfdata)
{
char buf[4096];
@ -61,34 +79,40 @@ _e_app_error_dialog_fill_data(E_App_Autopsy *app, E_Config_Dialog_Data *cfdata)
if ((app->del.signalled) && (!cfdata->signal))
{
if (app->del.exit_signal == SIGINT)
snprintf(buf, sizeof(buf), _("%s was interrupted by an Interrupt Signal"),
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);
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"),
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"),
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"),
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);
else if (app->del.exit_signal == SIGTERM)
snprintf(buf, sizeof(buf), _("%s was interrupted by a Termination Singal"),
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);
else
snprintf(buf, sizeof(buf), _("%s was interrupted by the signal number %i"),
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
@ -127,7 +151,8 @@ _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)
_e_app_error_dialog_free_data(E_Config_Dialog * cfd,
E_Config_Dialog_Data * cfdata)
{
E_App_Autopsy *app;
@ -153,7 +178,8 @@ _e_app_error_dialog_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *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;
@ -162,12 +188,14 @@ _e_app_error_dialog_resize(void *data, Evas *e, Evas_Object *obj, void *event_in
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;
@ -200,7 +228,8 @@ _e_app_error_dialog_scrolltext_create(Evas *evas, char *title, Ecore_Exe_Event_D
}
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;
@ -218,7 +247,9 @@ _e_app_error_dialog_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Con
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,14 +258,17 @@ _e_app_error_dialog_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Con
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;
@ -271,7 +305,9 @@ _e_app_error_dialog_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_
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". */
}
@ -287,7 +323,9 @@ _e_app_error_dialog_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_
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,7 +339,9 @@ _e_app_error_dialog_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_
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;
@ -322,19 +362,22 @@ _e_app_error_dialog_save_cb(void *data, void *data2)
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;
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);
snprintf(buffer, sizeof(buffer), "Error Signal Information:\n\t%s\n\n",
cfdata->signal);
fwrite(buffer, sizeof(char), strlen(buffer), f);
}
@ -362,7 +405,8 @@ _e_app_error_dialog_save_cb(void *data, void *data2)
}
else
{
snprintf(buffer, sizeof(buffer), "Output Data:\n\tThere was no output\n\n");
snprintf(buffer, sizeof(buffer),
"Output Data:\n\tThere was no output\n\n");
fwrite(buffer, sizeof(char), strlen(buffer), f);
}
@ -392,7 +436,8 @@ _e_app_error_dialog_save_cb(void *data, void *data2)
}
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);
}

158
src/bin/e_tlist.c
View File

@ -35,18 +35,31 @@ struct _E_Smart_Item
};
/* 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_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_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_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);
@ -63,13 +76,19 @@ 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)
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);
}
@ -80,22 +99,30 @@ 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;
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);
}
}
}
@ -104,7 +131,9 @@ EAPI int
e_tlist_selected_get(Evas_Object * obj)
{
API_ENTRY return -1;
if (!sd->items) return -1;
if (!sd->items)
return -1;
return sd->selected;
}
@ -114,7 +143,9 @@ e_tlist_selected_label_get(Evas_Object *obj)
E_Smart_Item *si;
API_ENTRY return NULL;
if (!sd->items) return NULL;
if (!sd->items)
return NULL;
si = evas_list_nth(sd->items, sd->selected);
if (si)
{
@ -132,9 +163,12 @@ e_tlist_selected_data_get(Evas_Object *obj)
E_Smart_Item *si;
API_ENTRY return NULL;
if (!sd->items) 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;
}
@ -144,18 +178,23 @@ e_tlist_selected_data2_get(Evas_Object *obj)
E_Smart_Item *si;
API_ENTRY return NULL;
if (!sd->items) 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;
si = evas_list_nth(sd->items, sd->selected);
if (si)
{
@ -169,6 +208,7 @@ EAPI void
e_tlist_min_size_get(Evas_Object * obj, Evas_Coord * w, Evas_Coord * h)
{
API_ENTRY return;
e_box_min_size_get(sd->box_obj, w, h);
}
@ -176,6 +216,7 @@ EAPI void
e_tlist_selector_set(Evas_Object * obj, int selector)
{
API_ENTRY return;
sd->selector = selector;
}
@ -183,6 +224,7 @@ EAPI int
e_tlist_selector_get(Evas_Object * obj)
{
API_ENTRY return 0;
return sd->selector;
}
@ -192,7 +234,9 @@ e_tlist_remove_num(Evas_Object *obj, int n)
E_Smart_Item *si;
API_ENTRY return;
if (!sd->items) return;
if (!sd->items)
return;
si = evas_list_nth(sd->items, n);
if (si)
{
@ -210,16 +254,21 @@ e_tlist_remove_label(Evas_Object *obj, char *label)
int i;
API_ENTRY return;
if (!sd->items) return;
if (!label) return;
if (!sd->items)
return;
if (!label)
return;
for (i = 0, l = sd->items; l; l = l->next, i++)
{
si = l->data;
if (si)
{
char *t;
if (si->markup)
t = strdup(edje_object_part_text_get(si->base_obj, "labelblock"));
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))
@ -238,18 +287,22 @@ EAPI int
e_tlist_count(Evas_Object * obj)
{
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;
si = E_NEW(E_Smart_Item, 1);
si->sd = sd;
si->markup = markup;
@ -273,21 +326,23 @@ _e_tlist_append(Evas_Object *obj, char *label, void (*func) (void *data, void *d
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 */
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)
_e_smart_event_mouse_down(void *data, Evas * e, Evas_Object * obj,
void *event_info)
{
Evas_Event_Mouse_Down *ev;
E_Smart_Item *si;
@ -307,7 +362,8 @@ _e_smart_event_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_inf
}
static void
_e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
_e_smart_event_mouse_up(void *data, Evas * e, Evas_Object * obj,
void *event_info)
{
Evas_Event_Mouse_Up *ev;
E_Smart_Item *si;
@ -319,13 +375,15 @@ _e_smart_event_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info)
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;
@ -346,15 +404,15 @@ _e_smart_event_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
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;
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);
}
}
}
@ -372,7 +430,8 @@ _e_smart_add(Evas_Object *obj)
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;
@ -388,7 +447,8 @@ _e_smart_add(Evas_Object *obj)
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);
}
@ -413,7 +473,8 @@ static void
_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);
@ -423,7 +484,8 @@ static void
_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);
@ -469,7 +531,8 @@ _e_smart_clip_unset(Evas_Object *obj)
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,
@ -479,8 +542,5 @@ _e_smart_init(void)
_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);
}

22
src/bin/e_tlist.h
View File

@ -7,15 +7,29 @@
#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_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_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);

60
src/bin/e_widget_tlist.c
View File

@ -21,13 +21,18 @@ struct _E_Widget_Callback
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_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_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_wid_focus_steal(void *data, Evas * e, Evas_Object * obj,
void *event_info);
/* externally accessible functions */
EAPI Evas_Object *
@ -50,11 +55,13 @@ e_widget_tlist_add(Evas *evas, char **value)
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);
@ -65,13 +72,15 @@ 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)
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);
}
@ -148,9 +157,10 @@ e_widget_tlist_count(Evas_Object *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_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;
@ -160,12 +170,15 @@ _e_widget_tlist_append(Evas_Object *obj, char *label, void (*func) (void *data),
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);
@ -179,8 +192,6 @@ _e_widget_tlist_append(Evas_Object *obj, char *label, void (*func) (void *data),
}
}
static void
_e_wid_del_hook(Evas_Object * obj)
{
@ -192,7 +203,8 @@ _e_wid_del_hook(Evas_Object *obj)
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);
}
@ -207,18 +219,21 @@ _e_wid_focus_hook(Evas_Object *obj)
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;
@ -227,7 +242,8 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_
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);
}
}
@ -247,13 +263,15 @@ _e_wid_cb_item_sel(void *data, void *data2)
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);
else
*(wd->value) = NULL;
}
if (wcb->func) wcb->func(wcb->data);
if (wcb->func)
wcb->func(wcb->data);
}
}

11
src/bin/e_widget_tlist.h
View File

@ -7,10 +7,15 @@
#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_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_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);