enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

E codingstyle 

SVN revision: 16899
This commit is contained in:
sebastid 2005-09-24 02:49:55 +00:00 committed by sebastid
parent 755a36e40a
commit 0c9265219a
2 changed files with 68 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_actions.c
View File

@ -1131,7 +1131,7 @@ ACT_FN_GO(exit)
e_dialog_icon_set(dia, "enlightenment/exit", 64); e_dialog_icon_set(dia, "enlightenment/exit", 64);
e_dialog_button_add(dia, _("Yes"), NULL, _e_actions_cb_exit_dialog_ok, NULL); e_dialog_button_add(dia, _("Yes"), NULL, _e_actions_cb_exit_dialog_ok, NULL);
e_dialog_button_add(dia, _("No"), NULL, NULL, NULL); e_dialog_button_add(dia, _("No"), NULL, NULL, NULL);
e_dialog_button_focus (dia, 1); e_dialog_button_focus(dia, 1);
e_win_centered_set(dia->win, 1); e_win_centered_set(dia->win, 1);
e_dialog_show(dia); e_dialog_show(dia);
} }

131
src/bin/e_dialog.c
View File

@ -19,7 +19,7 @@ struct _E_Dialog_Button
static void _e_dialog_free(E_Dialog *dia); static void _e_dialog_free(E_Dialog *dia);
static void _e_dialog_cb_button_clicked(void *data, Evas_Object *obj, const char *emission, const char *source); static void _e_dialog_cb_button_clicked(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _e_dialog_cb_delete(E_Win *win); static void _e_dialog_cb_delete(E_Win *win);
static int _e_dialog_key_down_cb (void *data, int type, void *event); static int _e_dialog_key_down_cb(void *data, int type, void *event);
/* local subsystem globals */ /* local subsystem globals */
@ -75,7 +75,7 @@ e_dialog_new(E_Container *con)
evas_object_show(o); evas_object_show(o);
dia->focused = NULL; dia->focused = NULL;
dia->key_down_handler = ecore_event_handler_add (ECORE_X_EVENT_KEY_DOWN, _e_dialog_key_down_cb, dia); dia->key_down_handler = ecore_event_handler_add(ECORE_X_EVENT_KEY_DOWN, _e_dialog_key_down_cb, dia);
return dia; return dia;
} }
@ -127,23 +127,22 @@ e_dialog_button_focus(E_Dialog *dia, int button)
{ {
E_Dialog_Button *db = NULL; E_Dialog_Button *db = NULL;
db = evas_list_nth (dia->buttons, button); db = evas_list_nth(dia->buttons, button);
if (!db)
return 0;
if (!db) return 0;
if (dia->focused) if (dia->focused)
{ {
E_Dialog_Button *focused; E_Dialog_Button *focused;
focused = dia->focused->data; focused = dia->focused->data;
if (focused) if (focused)
edje_object_signal_emit(focused->obj, "unfocus", ""); edje_object_signal_emit(focused->obj, "unfocus", "");
} }
dia->focused = evas_list_nth_list(dia->buttons, button); dia->focused = evas_list_nth_list(dia->buttons, button);
edje_object_signal_emit(db->obj, "focus", ""); edje_object_signal_emit(db->obj, "focus", "");
return 1; return 1;
} }
@ -216,7 +215,7 @@ _e_dialog_free(E_Dialog *dia)
if (dia->icon_object) evas_object_del(dia->icon_object); if (dia->icon_object) evas_object_del(dia->icon_object);
if (dia->box_object) evas_object_del(dia->box_object); if (dia->box_object) evas_object_del(dia->box_object);
if (dia->bg_object) evas_object_del(dia->bg_object); if (dia->bg_object) evas_object_del(dia->bg_object);
ecore_event_handler_del (dia->key_down_handler); ecore_event_handler_del(dia->key_down_handler);
e_object_del(E_OBJECT(dia->win)); e_object_del(E_OBJECT(dia->win));
free(dia); free(dia);
} }
@ -235,58 +234,62 @@ _e_dialog_cb_button_clicked(void *data, Evas_Object *obj, const char *emission,
/* TODO: Implement shift-tab and left arrow */ /* TODO: Implement shift-tab and left arrow */
static int static int
_e_dialog_key_down_cb (void *data, int type, void *event) _e_dialog_key_down_cb(void *data, int type, void *event)
{ {
Ecore_X_Event_Key_Down *ev = event; Ecore_X_Event_Key_Down *ev;
E_Dialog *dia = data; E_Dialog *dia;
ev = event;
dia = data;
if (!strcmp(ev->keyname, "Tab") || !strcmp(ev->keyname, "Right")) if (!strcmp(ev->keyname, "Tab") || !strcmp(ev->keyname, "Right"))
{ {
if (dia->focused && dia->buttons) if (dia->focused && dia->buttons)
{ {
if (dia->focused->next) if (dia->focused->next)
{ {
E_Dialog_Button *db; E_Dialog_Button *db;
db = dia->focused->data; db = dia->focused->data;
edje_object_signal_emit(db->obj, "unfocus", ""); edje_object_signal_emit(db->obj, "unfocus", "");
dia->focused = dia->focused->next; dia->focused = dia->focused->next;
db = dia->focused->data; db = dia->focused->data;
edje_object_signal_emit(db->obj, "focus", ""); edje_object_signal_emit(db->obj, "focus", "");
}
} else { else
{
E_Dialog_Button *db; E_Dialog_Button *db;
db = dia->focused->data; db = dia->focused->data;
edje_object_signal_emit(db->obj, "unfocus", ""); edje_object_signal_emit(db->obj, "unfocus", "");
dia->focused = dia->buttons; dia->focused = dia->buttons;
db = evas_list_data (dia->focused); db = evas_list_data(dia->focused);
edje_object_signal_emit(db->obj, "focus", ""); edje_object_signal_emit(db->obj, "focus", "");
} }
} else { }
else
E_Dialog_Button *db; {
E_Dialog_Button *db;
dia->focused = dia->buttons;
dia->focused = dia->buttons;
db = dia->focused->data;
edje_object_signal_emit(db->obj, "focus", ""); db = dia->focused->data;
} edje_object_signal_emit(db->obj, "focus", "");
return 1; }
} return 1;
}
if ((!strcmp(ev->keyname, "Enter") || !strcmp(ev->keyname, "Return") || if ((!strcmp(ev->keyname, "Enter") || !strcmp(ev->keyname, "Return") ||
!strcmp(ev->keyname, "Space")) && dia->focused) !strcmp(ev->keyname, "Space")) && dia->focused)
{ {
E_Dialog_Button *db; E_Dialog_Button *db;
db = evas_list_data (dia->focused); db = evas_list_data(dia->focused);
edje_object_signal_emit(db->obj, "click", ""); edje_object_signal_emit(db->obj, "click", "");
} }
return 1; return 1;
} }