From: Enlightenment C. <no...@cv...> - 2006-09-20 22:21:33
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_attach.c Log Message: place tooltips correctly, the size is still too small after the first time =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_attach.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- ewl_attach.c 11 Sep 2006 04:54:31 -0000 1.30 +++ ewl_attach.c 20 Sep 2006 22:21:31 -0000 1.31 @@ -683,7 +683,11 @@ ewl_window_raise(EWL_WINDOW(ewl_attach_tooltip->win)); #endif /* XXX this should really be in it's own window */ - ewl_attach_tooltip->win = ewl_hbox_new(); + ewl_attach_tooltip->win = ewl_floater_new(); + ewl_box_orientation_set(EWL_BOX(ewl_attach_tooltip->win), + EWL_ORIENTATION_HORIZONTAL); + ewl_floater_follow_set(EWL_FLOATER(ewl_attach_tooltip->win), + EWL_WIDGET(emb)); ewl_attach_tooltip->embed = EWL_WIDGET(emb); /* @@ -755,7 +759,7 @@ ewl_widget_show(o); } - ewl_object_position_request(EWL_OBJECT(ewl_attach_tooltip->win), + ewl_floater_position_set(EWL_FLOATER(ewl_attach_tooltip->win), ewl_attach_tooltip->x, ewl_attach_tooltip->y); ewl_widget_show(ewl_attach_tooltip->win); |
From: Enlightenment C. <no...@cv...> - 2006-09-28 20:36:33
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin/tests Modified Files: ewl_layer.c Log Message: remove unneeded lines =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_layer.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ewl_layer.c 13 Jul 2006 19:43:24 -0000 1.2 +++ ewl_layer.c 28 Sep 2006 20:36:20 -0000 1.3 @@ -142,7 +142,6 @@ void *user_data __UNUSED__) { int x, y; - int width, height; int i; x = CURRENT_X(w); @@ -150,28 +149,17 @@ /* * place the first row of buttons */ - ewl_object_preferred_size_get(EWL_OBJECT(button_row1[0]), - &width, &height); - for (i = 0; i < 20; i++) { - ewl_object_place(EWL_OBJECT(button_row1[i]), - i * 5 + x, i * 5 + y, - width, height); - } - + for (i = 0; i < 20; i++) + ewl_object_position_request(EWL_OBJECT(button_row1[i]), + i * 5 + x, i * 5 + y); /* * place the second row */ - ewl_object_preferred_size_get(EWL_OBJECT(button_row2[0]), - &width, &height); - for (i = 0; i < 20; i++) { + for (i = 0; i < 20; i++) ewl_object_position_request(EWL_OBJECT(button_row2[i]), i * 5 + 40 + x, i * 5 + y); - ewl_object_size_request(EWL_OBJECT(button_row2[i]), - width, height); - } ewl_object_position_request(EWL_OBJECT(dbutton[0]), 180 + x, 0 + y); ewl_object_position_request(EWL_OBJECT(dbutton[1]), 220 + x, 20 + y); - } |
From: Enlightenment C. <no...@cv...> - 2006-09-28 22:09:32
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_entry.c Log Message: becasue "text/plain" is not UTF-8 encoded, but uses the local charset, the entry converts the dropped text now to utf8 =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_entry.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -3 -r1.67 -r1.68 --- ewl_entry.c 8 Sep 2006 20:45:48 -0000 1.67 +++ ewl_entry.c 28 Sep 2006 22:09:31 -0000 1.68 @@ -1,4 +1,6 @@ #include <Ewl.h> +#include <Ecore_Txt.h> +#include <langinfo.h> #include "ewl_debug.h" #include "ewl_macros.h" #include "ewl_private.h" @@ -35,7 +37,7 @@ int ewl_entry_init(Ewl_Entry *e) { - const char *text_types[] = { "text/plain", NULL }; + const char *text_types[] = { "UTF8_STRING", "text/plain", NULL }; Ewl_Widget *w; DENTER_FUNCTION(DLEVEL_STABLE); @@ -575,7 +577,25 @@ txt = EWL_TEXT(w); if (EWL_ENTRY(w)->editable && !DISABLED(w)) { - ewl_text_text_insert(txt, event->data, + if (!strcmp(event->type, "text/plain") + && strcmp(nl_langinfo(CODESET), "UTF-8")) { + char *text; + + text = ecore_txt_convert(nl_langinfo(CODESET), "UTF-8", + event->data); + if (text) { + ewl_text_text_insert(txt, text, + ewl_text_cursor_position_get(txt)); + } + else { + ewl_text_text_insert(txt, event->data, + ewl_text_cursor_position_get(txt)); + } + + IF_FREE(text); + } + else + ewl_text_text_insert(txt, event->data, ewl_text_cursor_position_get(txt)); } |
From: Enlightenment C. <no...@cv...> - 2006-09-30 18:41:05
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_box.c ewl_box.h ewl_cell.c ewl_cell.h ewl_check.c ewl_check.h ewl_checkbutton.c ewl_checkbutton.h ewl_combo.c ewl_container.c ewl_container.h ewl_datepicker.c ewl_datepicker.h ewl_embed.c ewl_embed.h ewl_floater.c ewl_floater.h ewl_grid.c ewl_grid.h ewl_iconbox.c ewl_iconbox.h ewl_image.c ewl_image.h ewl_imenu.c ewl_imenu.h ewl_media.c ewl_media.h ewl_menu.c ewl_menu.h ewl_menu_base.c ewl_menu_base.h ewl_menu_item.c ewl_menu_item.h ewl_overlay.c ewl_overlay.h ewl_password.c ewl_password.h ewl_progressbar.c ewl_progressbar.h ewl_radiobutton.c ewl_radiobutton.h ewl_row.c ewl_row.h ewl_scrollbar.c ewl_scrollbar.h ewl_scrollpane.c ewl_scrollpane.h ewl_seeker.c ewl_seeker.h ewl_spinner.c ewl_spinner.h ewl_table.c ewl_table.h ewl_tree.c ewl_tree.h ewl_widget.c ewl_widget.h ewl_window.c ewl_window.h Log Message: change the callbacks names to the new naming convention: ewl_WIDGET_cb_EVENT =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_box.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- ewl_box.c 26 May 2006 15:35:02 -0000 1.30 +++ ewl_box.c 30 Sep 2006 18:41:01 -0000 1.31 @@ -160,14 +160,14 @@ /* * Setup the container size change handlers. */ - ewl_container_resize_notify_set(EWL_CONTAINER(b), ewl_box_child_resize_cb); - ewl_container_show_notify_set(EWL_CONTAINER(b), ewl_box_child_show_cb); - ewl_container_hide_notify_set(EWL_CONTAINER(b), ewl_box_child_hide_cb); + ewl_container_resize_notify_set(EWL_CONTAINER(b), ewl_box_cb_child_resize); + ewl_container_show_notify_set(EWL_CONTAINER(b), ewl_box_cb_child_show); + ewl_container_hide_notify_set(EWL_CONTAINER(b), ewl_box_cb_child_hide); /* * Attach the default layout callback. */ - ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, ewl_box_configure_cb, + ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, ewl_box_cb_configure, NULL); /* @@ -240,7 +240,7 @@ c = EWL_CONTAINER(b); ecore_dlist_goto_first(c->children); while((child = ecore_dlist_next(c->children))) - ewl_box_child_show_cb(c, child); + ewl_box_cb_child_show(c, child); ewl_widget_configure(EWL_WIDGET(b)); @@ -285,23 +285,23 @@ if (h) { ewl_callback_del(EWL_WIDGET(b), EWL_CALLBACK_CONFIGURE, - ewl_box_configure_cb); + ewl_box_cb_configure); ewl_callback_append(EWL_WIDGET(b), EWL_CALLBACK_CONFIGURE, - ewl_box_configure_homogeneous_cb, NULL); + ewl_box_cb_configure_homogeneous, NULL); ewl_container_show_notify_set(EWL_CONTAINER(b), - ewl_box_child_homogeneous_show_cb); + ewl_box_cb_child_homogeneous_show); ewl_container_hide_notify_set(EWL_CONTAINER(b), - ewl_box_child_homogeneous_show_cb); + ewl_box_cb_child_homogeneous_show); } else { ewl_callback_del(EWL_WIDGET(b), EWL_CALLBACK_CONFIGURE, - ewl_box_configure_homogeneous_cb); + ewl_box_cb_configure_homogeneous); ewl_callback_append(EWL_WIDGET(b), EWL_CALLBACK_CONFIGURE, - ewl_box_configure_cb, NULL); + ewl_box_cb_configure, NULL); ewl_container_show_notify_set(EWL_CONTAINER(b), - ewl_box_child_show_cb); + ewl_box_cb_child_show); ewl_container_hide_notify_set(EWL_CONTAINER(b), - ewl_box_child_hide_cb); + ewl_box_cb_child_hide); } DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -368,7 +368,7 @@ * 4. Layout the position of all children based on the sizes accepted. */ void -ewl_box_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_box_cb_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Box *b; @@ -449,7 +449,7 @@ * @brief Configure a homegeneous box */ void -ewl_box_configure_homogeneous_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_box_cb_configure_homogeneous(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { int i, num; @@ -777,7 +777,7 @@ * @brief When a child gets added to the box update it's size. */ void -ewl_box_child_show_cb(Ewl_Container *c, Ewl_Widget *w) +ewl_box_cb_child_show(Ewl_Container *c, Ewl_Widget *w) { int space = 0; int width, height; @@ -830,7 +830,7 @@ * @brief Update the container when a widget is shown in homegeneous mode */ void -ewl_box_child_homogeneous_show_cb(Ewl_Container *c, +ewl_box_cb_child_homogeneous_show(Ewl_Container *c, Ewl_Widget *w __UNUSED__) { int numc; @@ -867,7 +867,7 @@ * @brief When a child is hidden update the container */ void -ewl_box_child_hide_cb(Ewl_Container *c, Ewl_Widget *w) +ewl_box_cb_child_hide(Ewl_Container *c, Ewl_Widget *w) { int space = 0; Ewl_Box *b = EWL_BOX(c); @@ -911,7 +911,7 @@ * @brief The container resize callback used by the box */ void -ewl_box_child_resize_cb(Ewl_Container *c, Ewl_Widget *w __UNUSED__, +ewl_box_cb_child_resize(Ewl_Container *c, Ewl_Widget *w __UNUSED__, int size, Ewl_Orientation o) { int align_size, fill_size; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_box.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ewl_box.h 26 May 2006 15:35:02 -0000 1.13 +++ ewl_box.h 30 Sep 2006 18:41:01 -0000 1.14 @@ -60,16 +60,16 @@ /* * Internally used callbacks, override at your own risk. */ -void ewl_box_child_resize_cb(Ewl_Container *c, Ewl_Widget *w, +void ewl_box_cb_child_resize(Ewl_Container *c, Ewl_Widget *w, int size, Ewl_Orientation o); -void ewl_box_child_show_cb(Ewl_Container *c, Ewl_Widget *w); -void ewl_box_child_hide_cb(Ewl_Container *c, Ewl_Widget *w); -void ewl_box_child_homogeneous_show_cb(Ewl_Container *c, +void ewl_box_cb_child_show(Ewl_Container *c, Ewl_Widget *w); +void ewl_box_cb_child_hide(Ewl_Container *c, Ewl_Widget *w); +void ewl_box_cb_child_homogeneous_show(Ewl_Container *c, Ewl_Widget *w); -void ewl_box_configure_cb(Ewl_Widget *w, void *ev_data, +void ewl_box_cb_configure(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_box_configure_homogeneous_cb(Ewl_Widget *w, void *ev_data, +void ewl_box_cb_configure_homogeneous(Ewl_Widget *w, void *ev_data, void *user_data); /** =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_cell.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ewl_cell.c 26 May 2006 15:35:02 -0000 1.11 +++ ewl_cell.c 30 Sep 2006 18:41:01 -0000 1.12 @@ -47,12 +47,12 @@ ewl_widget_appearance_set(EWL_WIDGET(cell), EWL_CELL_TYPE); ewl_widget_inherit(EWL_WIDGET(cell), EWL_CELL_TYPE); - ewl_container_show_notify_set(EWL_CONTAINER(cell), ewl_cell_child_show_cb); + ewl_container_show_notify_set(EWL_CONTAINER(cell), ewl_cell_cb_child_show); ewl_container_resize_notify_set(EWL_CONTAINER(cell), - ewl_cell_child_resize_cb); + ewl_cell_cb_child_resize); ewl_callback_append(EWL_WIDGET(cell), EWL_CALLBACK_CONFIGURE, - ewl_cell_configure_cb, NULL); + ewl_cell_cb_configure, NULL); ewl_container_callback_notify(EWL_CONTAINER(cell), EWL_CALLBACK_FOCUS_IN); ewl_container_callback_notify(EWL_CONTAINER(cell), EWL_CALLBACK_FOCUS_OUT); @@ -68,7 +68,7 @@ * @brief The configure callback for the cell widget */ void -ewl_cell_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_cell_cb_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Container *c; @@ -96,7 +96,7 @@ * @brief Update the container when a child widget is shown */ void -ewl_cell_child_show_cb(Ewl_Container *c, Ewl_Widget *w) +ewl_cell_cb_child_show(Ewl_Container *c, Ewl_Widget *w) { Ewl_Widget *child; @@ -133,7 +133,7 @@ * @brief Callback for when a child widget is resized within the container */ void -ewl_cell_child_resize_cb(Ewl_Container *c, Ewl_Widget *w, +ewl_cell_cb_child_resize(Ewl_Container *c, Ewl_Widget *w, int size __UNUSED__, Ewl_Orientation o __UNUSED__) { DENTER_FUNCTION(DLEVEL_STABLE); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_cell.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ewl_cell.h 11 May 2006 04:01:20 -0000 1.9 +++ ewl_cell.h 30 Sep 2006 18:41:01 -0000 1.10 @@ -45,9 +45,9 @@ /* * Internally used callbacks, override at your own risk. */ -void ewl_cell_configure_cb(Ewl_Widget * w, void *ev_data, void *user_data); -void ewl_cell_child_show_cb(Ewl_Container *c, Ewl_Widget *w); -void ewl_cell_child_resize_cb(Ewl_Container *c, Ewl_Widget *w, int size, +void ewl_cell_cb_configure(Ewl_Widget * w, void *ev_data, void *user_data); +void ewl_cell_cb_child_show(Ewl_Container *c, Ewl_Widget *w); +void ewl_cell_cb_child_resize(Ewl_Container *c, Ewl_Widget *w, int size, Ewl_Orientation o); /** =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_check.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- ewl_check.c 26 May 2006 15:35:02 -0000 1.10 +++ ewl_check.c 30 Sep 2006 18:41:01 -0000 1.11 @@ -54,9 +54,9 @@ ewl_object_preferred_inner_size_set(EWL_OBJECT(w), 20, 20); ewl_callback_append(w, EWL_CALLBACK_CLICKED, - ewl_check_clicked_cb, NULL); + ewl_check_cb_clicked, NULL); ewl_callback_append(w, EWL_CALLBACK_MOUSE_OUT, - ewl_check_update_check_cb, NULL); + ewl_check_cb_update_check, NULL); DRETURN_INT(TRUE, DLEVEL_STABLE); } @@ -78,7 +78,7 @@ DCHECK_TYPE("cb", cb, EWL_CHECK_TYPE); cb->checked = !!c; - ewl_check_update_check_cb(EWL_WIDGET(cb), NULL, NULL); + ewl_check_cb_update_check(EWL_WIDGET(cb), NULL, NULL); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -107,7 +107,7 @@ * @brief The clicked callback for the check widget */ void -ewl_check_clicked_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_check_cb_clicked(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Check *cb; @@ -118,7 +118,7 @@ cb = EWL_CHECK(w); cb->checked ^= 1; - ewl_check_update_check_cb(w, NULL, NULL); + ewl_check_cb_update_check(w, NULL, NULL); ewl_callback_call(w, EWL_CALLBACK_VALUE_CHANGED); DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -133,7 +133,7 @@ * @brief Callback to update the checkmark */ void -ewl_check_update_check_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_check_cb_update_check(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Check *cb; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_check.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ewl_check.h 15 Mar 2006 04:03:48 -0000 1.11 +++ ewl_check.h 30 Sep 2006 18:41:01 -0000 1.12 @@ -48,9 +48,9 @@ /* * Internally used callbacks. */ -void ewl_check_clicked_cb(Ewl_Widget *w, void *ev_data, +void ewl_check_cb_clicked(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_check_update_check_cb(Ewl_Widget *w, void *ev_data, +void ewl_check_cb_update_check(Ewl_Widget *w, void *ev_data, void *user_data); /** =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_checkbutton.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ewl_checkbutton.c 26 May 2006 15:35:02 -0000 1.12 +++ ewl_checkbutton.c 30 Sep 2006 18:41:01 -0000 1.13 @@ -54,7 +54,7 @@ ewl_object_fill_policy_set(EWL_OBJECT(w), EWL_FLAG_FILL_NONE); ewl_callback_append(w, EWL_CALLBACK_CLICKED, - ewl_checkbutton_clicked_cb, NULL); + ewl_checkbutton_cb_clicked, NULL); cb->label_position = EWL_POSITION_RIGHT; @@ -63,7 +63,7 @@ */ cb->check = ewl_check_new(); ewl_widget_internal_set(cb->check, TRUE); - ewl_callback_del(cb->check, EWL_CALLBACK_CLICKED, ewl_check_clicked_cb); + ewl_callback_del(cb->check, EWL_CALLBACK_CLICKED, ewl_check_cb_clicked); ewl_container_child_prepend(EWL_CONTAINER(cb), cb->check); ewl_widget_show(cb->check); @@ -159,7 +159,7 @@ * @brief The clicked callback for the checkbutton */ void -ewl_checkbutton_clicked_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_checkbutton_cb_clicked(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Checkbutton *cb; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_checkbutton.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ewl_checkbutton.h 15 Mar 2006 04:03:48 -0000 1.11 +++ ewl_checkbutton.h 30 Sep 2006 18:41:01 -0000 1.12 @@ -54,7 +54,7 @@ /* * Internally used callbacks, override at your own risk */ -void ewl_checkbutton_clicked_cb(Ewl_Widget *w, void *ev_data, +void ewl_checkbutton_cb_clicked(Ewl_Widget *w, void *ev_data, void *user_data); /** =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- ewl_combo.c 24 Sep 2006 20:26:50 -0000 1.31 +++ ewl_combo.c 30 Sep 2006 18:41:01 -0000 1.32 @@ -267,7 +267,7 @@ ewl_callback_append(combo->button, EWL_CALLBACK_CLICKED, ewl_combo_cb_increment_clicked, combo); - ewl_menu_base_expand_cb(EWL_WIDGET(combo->popup), ev, NULL); + ewl_menu_base_cb_expand(EWL_WIDGET(combo->popup), ev, NULL); if (!REALIZED(combo->popup->popup)) { Ewl_Embed *emb; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -3 -r1.47 -r1.48 --- ewl_container.c 21 Aug 2006 01:34:15 -0000 1.47 +++ ewl_container.c 30 Sep 2006 18:41:01 -0000 1.48 @@ -46,23 +46,23 @@ * children with necessary window and evas information. */ ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, - ewl_container_configure_cb, NULL); + ewl_container_cb_configure, NULL); ewl_callback_append(w, EWL_CALLBACK_OBSCURE, - ewl_container_obscure_cb, NULL); + ewl_container_cb_obscure, NULL); ewl_callback_append(w, EWL_CALLBACK_REVEAL, - ewl_container_reveal_cb, NULL); + ewl_container_cb_reveal, NULL); ewl_callback_append(w, EWL_CALLBACK_REALIZE, - ewl_container_reveal_cb, NULL); + ewl_container_cb_reveal, NULL); ewl_callback_append(w, EWL_CALLBACK_REALIZE, - ewl_container_realize_cb, NULL); + ewl_container_cb_realize, NULL); ewl_callback_append(w, EWL_CALLBACK_UNREALIZE, - ewl_container_unrealize_cb, NULL); + ewl_container_cb_unrealize, NULL); ewl_callback_append(w, EWL_CALLBACK_REPARENT, - ewl_container_reparent_cb, NULL); + ewl_container_cb_reparent, NULL); ewl_callback_append(w, EWL_CALLBACK_WIDGET_ENABLE, - ewl_container_enable_cb, NULL); + ewl_container_cb_enable, NULL); ewl_callback_append(w, EWL_CALLBACK_WIDGET_DISABLE, - ewl_container_disable_cb, NULL); + ewl_container_cb_disable, NULL); DRETURN_INT(TRUE, DLEVEL_STABLE); } @@ -1241,7 +1241,7 @@ * information about the container, such as the evas. */ void -ewl_container_reparent_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_container_cb_reparent(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Widget *child; @@ -1273,7 +1273,7 @@ * @brief When enabling a container, pass the signal to the children. */ void -ewl_container_enable_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_container_cb_enable(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Widget *child; @@ -1305,7 +1305,7 @@ * @brief When enabling a container, pass the signal to the children. */ void -ewl_container_disable_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_container_cb_disable(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Widget *child; @@ -1337,7 +1337,7 @@ * @brief Callback for when the container is obscured */ void -ewl_container_obscure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_container_cb_obscure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Embed *e; @@ -1382,7 +1382,7 @@ * @brief Callback for when the container is revealed */ void -ewl_container_reveal_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_container_cb_reveal(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Embed *e; @@ -1433,7 +1433,7 @@ * clip boxes. */ void -ewl_container_realize_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_container_cb_realize(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { int i = 0; @@ -1475,7 +1475,7 @@ * @brief The configure callback */ void -ewl_container_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_container_cb_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -1505,7 +1505,7 @@ * @brief Callback for when the container is unrealized */ void -ewl_container_unrealize_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_container_cb_unrealize(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Container *c; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.h,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- ewl_container.h 10 Aug 2006 08:17:16 -0000 1.23 +++ ewl_container.h 30 Sep 2006 18:41:01 -0000 1.24 @@ -161,14 +161,14 @@ /* * Internally used callbacks, override at your own risk. */ -void ewl_container_reveal_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_container_obscure_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_container_realize_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_container_configure_cb(Ewl_Widget * w, void *ev_data, void *user_data); -void ewl_container_reparent_cb(Ewl_Widget * w, void *ev_data, void *user_data); -void ewl_container_unrealize_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_container_enable_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_container_disable_cb(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_container_cb_reveal(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_container_cb_obscure(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_container_cb_realize(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_container_cb_configure(Ewl_Widget * w, void *ev_data, void *user_data); +void ewl_container_cb_reparent(Ewl_Widget * w, void *ev_data, void *user_data); +void ewl_container_cb_unrealize(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_container_cb_enable(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_container_cb_disable(Ewl_Widget *w, void *ev_data, void *user_data); /** * @} =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_datepicker.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ewl_datepicker.c 26 May 2006 15:35:02 -0000 1.13 +++ ewl_datepicker.c 30 Sep 2006 18:41:01 -0000 1.14 @@ -4,7 +4,7 @@ #include "ewl_macros.h" static void ewl_datepicker_calendar_position_set(Ewl_Datepicker *dp); -static void ewl_datepicker_dropdown_cb(Ewl_Widget *w, void *ev_data, +static void ewl_datepicker_cb_dropdown(Ewl_Widget *w, void *ev_data, void *user_data); /** @@ -63,17 +63,17 @@ dp->calendar); ewl_callback_append(EWL_WIDGET(dp->calendar), EWL_CALLBACK_VALUE_CHANGED, - ewl_datepicker_value_changed_cb, dp); + ewl_datepicker_cb_value_changed, dp); ewl_widget_show(dp->calendar); ewl_datepicker_calendar_position_set(dp); ewl_callback_prepend(EWL_WIDGET(dp), EWL_CALLBACK_DESTROY, - ewl_datepicker_destroy_cb, dp); + ewl_datepicker_cb_destroy, dp); ewl_callback_append(EWL_WIDGET(dp), EWL_CALLBACK_CONFIGURE, - ewl_datepicker_configure_cb, NULL); + ewl_datepicker_cb_configure, NULL); ewl_callback_append(EWL_WIDGET(dp), EWL_CALLBACK_MOUSE_DOWN, - ewl_datepicker_dropdown_cb, NULL); + ewl_datepicker_cb_dropdown, NULL); ewl_callback_call(EWL_WIDGET(dp->calendar), EWL_CALLBACK_VALUE_CHANGED); @@ -89,7 +89,7 @@ * @brief The destroy callback */ void -ewl_datepicker_destroy_cb(Ewl_Widget *w, void *ev __UNUSED__, +ewl_datepicker_cb_destroy(Ewl_Widget *w, void *ev __UNUSED__, void *user_data __UNUSED__) { Ewl_Datepicker *dp; @@ -114,7 +114,7 @@ * @brief The configure callback */ void -ewl_datepicker_configure_cb(Ewl_Widget *w, void *ev __UNUSED__, +ewl_datepicker_cb_configure(Ewl_Widget *w, void *ev __UNUSED__, void *user_data __UNUSED__) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -135,7 +135,7 @@ * @brief Callback for when the datepicker calendar window value changes */ void -ewl_datepicker_value_changed_cb(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__, +ewl_datepicker_cb_value_changed(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__, void *user_data) { char *date; @@ -163,7 +163,7 @@ * @brief Realize callback */ void -ewl_datepicker_realize_cb(Ewl_Widget *w, void *ev __UNUSED__, +ewl_datepicker_cb_realize(Ewl_Widget *w, void *ev __UNUSED__, void *user_data __UNUSED__) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -199,7 +199,7 @@ } static void -ewl_datepicker_dropdown_cb(Ewl_Widget *w, void *ev __UNUSED__, +ewl_datepicker_cb_dropdown(Ewl_Widget *w, void *ev __UNUSED__, void *user_data __UNUSED__) { Ewl_Datepicker *dp; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_datepicker.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ewl_datepicker.h 15 Mar 2006 04:03:48 -0000 1.8 +++ ewl_datepicker.h 30 Sep 2006 18:41:01 -0000 1.9 @@ -48,10 +48,10 @@ /* * Internally used callbacks, override at your risk */ -void ewl_datepicker_destroy_cb(Ewl_Widget *w, void *ev, void *user_data); -void ewl_datepicker_configure_cb(Ewl_Widget *w, void *ev, void *user_data); -void ewl_datepicker_value_changed_cb(Ewl_Widget *w, void *ev, void *user_data); -void ewl_datepicker_realize_cb(Ewl_Widget *w, void *ev, void *user_data); +void ewl_datepicker_cb_destroy(Ewl_Widget *w, void *ev, void *user_data); +void ewl_datepicker_cb_configure(Ewl_Widget *w, void *ev, void *user_data); +void ewl_datepicker_cb_value_changed(Ewl_Widget *w, void *ev, void *user_data); +void ewl_datepicker_cb_realize(Ewl_Widget *w, void *ev, void *user_data); /** * @} =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v retrieving revision 1.83 retrieving revision 1.84 diff -u -3 -r1.83 -r1.84 --- ewl_embed.c 29 Sep 2006 05:51:41 -0000 1.83 +++ ewl_embed.c 30 Sep 2006 18:41:01 -0000 1.84 @@ -99,17 +99,17 @@ ewl_object_toplevel_set(EWL_OBJECT(w), EWL_FLAG_PROPERTY_TOPLEVEL); ewl_callback_append(EWL_WIDGET(w), EWL_CALLBACK_REALIZE, - ewl_embed_realize_cb, NULL); + ewl_embed_cb_realize, NULL); ewl_callback_append(EWL_WIDGET(w), EWL_CALLBACK_UNREALIZE, - ewl_embed_unrealize_cb, NULL); + ewl_embed_cb_unrealize, NULL); ewl_callback_prepend(EWL_WIDGET(w), EWL_CALLBACK_DESTROY, - ewl_embed_destroy_cb, NULL); + ewl_embed_cb_destroy, NULL); ewl_callback_prepend(EWL_WIDGET(w), EWL_CALLBACK_CONFIGURE, - ewl_embed_configure_cb, NULL); + ewl_embed_cb_configure, NULL); ewl_callback_prepend(EWL_WIDGET(w), EWL_CALLBACK_FOCUS_OUT, - ewl_embed_focus_out_cb, NULL); + ewl_embed_cb_focus_out, NULL); ewl_callback_del(EWL_WIDGET(w), EWL_CALLBACK_CONFIGURE, - ewl_overlay_configure_cb); + ewl_overlay_cb_configure); ecore_list_append(ewl_embed_list, w); @@ -1641,7 +1641,7 @@ * @brief Callback for the realize event */ void -ewl_embed_realize_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_embed_cb_realize(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Embed *emb; @@ -1713,7 +1713,7 @@ * @brief Callback for the unrealize event */ void -ewl_embed_unrealize_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_embed_cb_unrealize(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Embed *emb; @@ -1747,7 +1747,7 @@ * @brief The configure callback */ void -ewl_embed_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_embed_cb_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Embed *emb; @@ -1799,7 +1799,7 @@ * @brief Callback for when the embed loses focus */ void -ewl_embed_focus_out_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_embed_cb_focus_out(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Embed *emb; @@ -1827,7 +1827,7 @@ * @return Returns no value * @brief The destroy callback */ -void ewl_embed_destroy_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +void ewl_embed_cb_destroy(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Embed *emb; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.h,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- ewl_embed.h 29 Sep 2006 05:51:41 -0000 1.28 +++ ewl_embed.h 30 Sep 2006 18:41:01 -0000 1.29 @@ -151,11 +151,11 @@ /* * Internally used callbacks, override at your own risk. */ -void ewl_embed_realize_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_embed_unrealize_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_embed_configure_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_embed_focus_out_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_embed_destroy_cb(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_embed_cb_realize(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_embed_cb_unrealize(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_embed_cb_configure(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_embed_cb_focus_out(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_embed_cb_destroy(Ewl_Widget *w, void *ev_data, void *user_data); /** * @} =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_floater.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ewl_floater.c 26 May 2006 17:25:59 -0000 1.11 +++ ewl_floater.c 30 Sep 2006 18:41:01 -0000 1.12 @@ -77,9 +77,9 @@ */ if (f->follows) { ewl_callback_del_with_data(f->follows, EWL_CALLBACK_CONFIGURE, - ewl_floater_follow_configure_cb, f); + ewl_floater_cb_follow_configure, f); ewl_callback_del_with_data(EWL_WIDGET(f->follows), EWL_CALLBACK_DESTROY, - ewl_floater_follow_destroy_cb, f); + ewl_floater_cb_follow_destroy, f); } /* @@ -88,9 +88,9 @@ */ if (p) { ewl_callback_append(p, EWL_CALLBACK_CONFIGURE, - ewl_floater_follow_configure_cb, f); + ewl_floater_cb_follow_configure, f); ewl_callback_prepend(p, EWL_CALLBACK_DESTROY, - ewl_floater_follow_destroy_cb, f); + ewl_floater_cb_follow_destroy, f); } f->follows = p; @@ -172,7 +172,7 @@ */ if (f->follows) ewl_callback_del(f->follows, EWL_CALLBACK_CONFIGURE, - ewl_floater_follow_configure_cb); + ewl_floater_cb_follow_configure); /* * Set the widget that the floater follows. @@ -194,7 +194,7 @@ * parent/window gets configured. */ void -ewl_floater_follow_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_floater_cb_follow_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data) { int align, x, y; @@ -261,7 +261,7 @@ * @brief Callback when the followed widget is destroyed */ void -ewl_floater_follow_destroy_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_floater_cb_follow_destroy(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { DENTER_FUNCTION(DLEVEL_STABLE); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_floater.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- ewl_floater.h 8 May 2006 18:31:51 -0000 1.10 +++ ewl_floater.h 30 Sep 2006 18:41:01 -0000 1.11 @@ -54,9 +54,9 @@ /* * Internally used callbacks, override at your own risk. */ -void ewl_floater_follow_configure_cb(Ewl_Widget *w, void *ev_data, +void ewl_floater_cb_follow_configure(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_floater_follow_destroy_cb(Ewl_Widget *w, void *ev_data, +void ewl_floater_cb_follow_destroy(Ewl_Widget *w, void *ev_data, void *user_data); /** =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_grid.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- ewl_grid.c 17 Aug 2006 18:33:04 -0000 1.28 +++ ewl_grid.c 30 Sep 2006 18:41:01 -0000 1.29 @@ -54,11 +54,11 @@ ewl_widget_appearance_set(EWL_WIDGET(g), EWL_GRID_TYPE); ewl_widget_inherit(EWL_WIDGET(g), EWL_GRID_TYPE); - ewl_container_add_notify_set(EWL_CONTAINER(g), ewl_grid_child_add_cb); + ewl_container_add_notify_set(EWL_CONTAINER(g), ewl_grid_cb_child_add); ewl_container_remove_notify_set(EWL_CONTAINER(g), - ewl_grid_child_remove_cb); + ewl_grid_cb_child_remove); ewl_container_resize_notify_set(EWL_CONTAINER(g), - ewl_grid_child_resize_cb); + ewl_grid_cb_child_resize); /* * the smallest size where a grid make sense @@ -74,9 +74,9 @@ * Append callbacks */ ewl_callback_append(EWL_WIDGET(g), EWL_CALLBACK_CONFIGURE, - ewl_grid_configure_cb, NULL); + ewl_grid_cb_configure, NULL); ewl_callback_prepend(EWL_WIDGET(g), EWL_CALLBACK_DESTROY, - ewl_grid_destroy_cb, NULL); + ewl_grid_cb_destroy, NULL); ewl_widget_focusable_set(EWL_WIDGET(g), FALSE); @@ -891,7 +891,7 @@ * @brief The configure callback */ void -ewl_grid_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_grid_cb_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Grid *g; @@ -977,7 +977,7 @@ * @brief The destroy callback */ void -ewl_grid_destroy_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_grid_cb_destroy(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Grid *g; @@ -1492,7 +1492,7 @@ * @brief Notify the grid that a child has been added. */ void -ewl_grid_child_add_cb(Ewl_Container *p, Ewl_Widget *c) +ewl_grid_cb_child_add(Ewl_Container *p, Ewl_Widget *c) { Ewl_Grid *g; @@ -1527,7 +1527,7 @@ * @brief The child del callback */ void -ewl_grid_child_remove_cb(Ewl_Container *c, Ewl_Widget *w, int idx __UNUSED__) +ewl_grid_cb_child_remove(Ewl_Container *c, Ewl_Widget *w, int idx __UNUSED__) { Ewl_Grid_Child *child; Ewl_Grid *g; @@ -1566,7 +1566,7 @@ * @brief Catch notification of child resizes. */ void -ewl_grid_child_resize_cb(Ewl_Container *p, Ewl_Widget *child, +ewl_grid_cb_child_resize(Ewl_Container *p, Ewl_Widget *child, int size __UNUSED__, Ewl_Orientation o __UNUSED__) { =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_grid.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- ewl_grid.h 16 Aug 2006 18:57:41 -0000 1.21 +++ ewl_grid.h 30 Sep 2006 18:41:01 -0000 1.22 @@ -134,11 +134,11 @@ /* * Internally used callbacks, override at your own risk. */ -void ewl_grid_configure_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_grid_destroy_cb(Ewl_Widget *w, void *ev_data , void *user_data); -void ewl_grid_child_add_cb(Ewl_Container *p, Ewl_Widget *c); -void ewl_grid_child_remove_cb(Ewl_Container *p, Ewl_Widget *c, int idx); -void ewl_grid_child_resize_cb(Ewl_Container *p, Ewl_Widget *child, +void ewl_grid_cb_configure(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_grid_cb_destroy(Ewl_Widget *w, void *ev_data , void *user_data); +void ewl_grid_cb_child_add(Ewl_Container *p, Ewl_Widget *c); +void ewl_grid_cb_child_remove(Ewl_Container *p, Ewl_Widget *c, int idx); +void ewl_grid_cb_child_resize(Ewl_Container *p, Ewl_Widget *child, int size, Ewl_Orientation o); /** =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_iconbox.c,v retrieving revision 1.118 retrieving revision 1.119 diff -u -3 -r1.118 -r1.119 --- ewl_iconbox.c 26 May 2006 17:25:59 -0000 1.118 +++ ewl_iconbox.c 30 Sep 2006 18:41:01 -0000 1.119 @@ -40,7 +40,7 @@ } void -ewl_iconbox_overlay_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data) +ewl_iconbox_cb_overlay_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data) { int nx, ny; @@ -251,7 +251,7 @@ ewl_container_child_append(EWL_CONTAINER(ib->ewl_iconbox_scrollpane), ib->ewl_iconbox_pane_inner); ewl_callback_prepend(EWL_WIDGET(ib->ewl_iconbox_pane_inner), EWL_CALLBACK_CONFIGURE, - ewl_iconbox_overlay_configure_cb, ib); + ewl_iconbox_cb_overlay_configure, ib); /*** Context menu **/ /*Make the menu floater */ @@ -277,7 +277,7 @@ ib->ewl_iconbox_context_menu_item = ewl_menu_item_new(); ewl_button_label_set(EWL_BUTTON(ib->ewl_iconbox_context_menu_item), "Auto-Arrange"); ewl_container_child_append(EWL_CONTAINER(ib->ewl_iconbox_view_menu), ib->ewl_iconbox_context_menu_item); - ewl_callback_append(ib->ewl_iconbox_context_menu_item, EWL_CALLBACK_MOUSE_DOWN, ewl_iconbox_arrange_cb, ib); + ewl_callback_append(ib->ewl_iconbox_context_menu_item, EWL_CALLBACK_MOUSE_DOWN, ewl_iconbox_cb_arrange, ib); ewl_widget_show(ib->ewl_iconbox_context_menu_item); ewl_widget_show(ib->ewl_iconbox_view_menu); @@ -395,15 +395,15 @@ /** Internal Callbacks */ - ewl_callback_append(ib->ewl_iconbox_pane_inner, EWL_CALLBACK_MOUSE_MOVE, ewl_iconbox_mouse_move_cb, ib); - ewl_callback_append(ib->ewl_iconbox_pane_inner, EWL_CALLBACK_MOUSE_DOWN, ewl_iconbox_pane_mouse_down_cb, ib); - ewl_callback_append(ib->ewl_iconbox_pane_inner, EWL_CALLBACK_MOUSE_UP, ewl_iconbox_mouse_up_cb, ib); - ewl_callback_append(ib->ewl_iconbox_pane_inner, EWL_CALLBACK_DND_POSITION, ewl_iconbox_dnd_position_cb, ib); - ewl_callback_append(ib->ewl_iconbox_pane_inner, EWL_CALLBACK_DND_DROP, ewl_iconbox_dnd_drop_cb, ib); + ewl_callback_append(ib->ewl_iconbox_pane_inner, EWL_CALLBACK_MOUSE_MOVE, ewl_iconbox_cb_mouse_move, ib); + ewl_callback_append(ib->ewl_iconbox_pane_inner, EWL_CALLBACK_MOUSE_DOWN, ewl_iconbox_cb_pane_mouse_down, ib); + ewl_callback_append(ib->ewl_iconbox_pane_inner, EWL_CALLBACK_MOUSE_UP, ewl_iconbox_cb_mouse_up, ib); + ewl_callback_append(ib->ewl_iconbox_pane_inner, EWL_CALLBACK_DND_POSITION, ewl_iconbox_cb_dnd_position, ib); + ewl_callback_append(ib->ewl_iconbox_pane_inner, EWL_CALLBACK_DND_DROP, ewl_iconbox_cb_dnd_drop, ib); ewl_container_callback_notify(EWL_CONTAINER(ib), EWL_CALLBACK_KEY_DOWN); - ewl_callback_append(EWL_WIDGET(ib), EWL_CALLBACK_KEY_DOWN, ewl_iconbox_key_press_cb, ib); - ewl_callback_append(EWL_WIDGET(ib), EWL_CALLBACK_CONFIGURE, ewl_iconbox_configure_cb, NULL); - ewl_callback_prepend(EWL_WIDGET(ib), EWL_CALLBACK_DESTROY, ewl_iconbox_destroy_cb, NULL); + ewl_callback_append(EWL_WIDGET(ib), EWL_CALLBACK_KEY_DOWN, ewl_iconbox_cb_key_press, ib); + ewl_callback_append(EWL_WIDGET(ib), EWL_CALLBACK_CONFIGURE, ewl_iconbox_cb_configure, NULL); + ewl_callback_prepend(EWL_WIDGET(ib), EWL_CALLBACK_DESTROY, ewl_iconbox_cb_destroy, NULL); /*Timing setup*/ ib->lasttime.tv_sec = 0; @@ -1061,16 +1061,16 @@ /* Add the callbacks for mouse */ ewl_callback_prepend(EWL_ICONBOX_ICON(ib)->image, EWL_CALLBACK_MOUSE_DOWN, - ewl_iconbox_icon_mouse_down_cb, ib); + ewl_iconbox_cb_icon_mouse_down, ib); ewl_callback_prepend(EWL_ICONBOX_ICON(ib)->image, EWL_CALLBACK_MOUSE_UP, - ewl_iconbox_icon_mouse_up_cb, ib); + ewl_iconbox_cb_icon_mouse_up, ib); /* Add a callback to the border box label, for editing purposes... */ ewl_callback_prepend(EWL_ICONBOX_ICON(ib)->w_label, EWL_CALLBACK_MOUSE_DOWN, - ewl_iconbox_icon_label_mouse_down_cb, ib); + ewl_iconbox_cb_icon_label_mouse_down, ib); ewl_callback_prepend(EWL_WIDGET(ib), EWL_CALLBACK_DESTROY, - ewl_iconbox_icon_destroy_cb, NULL); + ewl_iconbox_cb_icon_destroy, NULL); /* Add this icon to the icon list */ ecore_list_append(iconbox->ewl_iconbox_icon_list, ib); @@ -1144,7 +1144,7 @@ * @brief The drag and drop drop callback */ void -ewl_iconbox_dnd_drop_cb(Ewl_Widget *item __UNUSED__, +ewl_iconbox_cb_dnd_drop(Ewl_Widget *item __UNUSED__, void *ev_data, void *user_data) { int ibx, iby, px, py, fw, fh; @@ -1197,7 +1197,7 @@ * @brief The drag and drop position callback */ void -ewl_iconbox_dnd_position_cb(Ewl_Widget *item __UNUSED__, +ewl_iconbox_cb_dnd_position(Ewl_Widget *item __UNUSED__, void *ev_data __UNUSED__, void *user_data) { int ibx, iby, px, py, fw, fh; @@ -1241,7 +1241,7 @@ * @brief The destroy callback */ void -ewl_iconbox_destroy_cb(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) +ewl_iconbox_cb_destroy(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Iconbox *ib; @@ -1264,7 +1264,7 @@ * @return Returns no value * @brief The realize callback */ -void ewl_iconbox_icon_destroy_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +void ewl_iconbox_cb_icon_destroy(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Iconbox_Icon *icon; @@ -1290,7 +1290,7 @@ * @brief The arrange callback */ void -ewl_iconbox_arrange_cb(Ewl_Widget *w __UNUSED__, void *ev_data __UNUSED__, void *user_data) +ewl_iconbox_cb_arrange(Ewl_Widget *w __UNUSED__, void *ev_data __UNUSED__, void *user_data) { Ewl_Iconbox* ib; @@ -1313,7 +1313,7 @@ * @brief The mouse move callback */ void -ewl_iconbox_mouse_move_cb(Ewl_Widget *w __UNUSED__, void *ev_data, void *user_data) +ewl_iconbox_cb_mouse_move(Ewl_Widget *w __UNUSED__, void *ev_data, void *user_data) { Ewl_Iconbox *ib; Ewl_Event_Mouse_Move *ev; @@ -1444,7 +1444,7 @@ * @brief The pane mouse down callback */ void -ewl_iconbox_pane_mouse_down_cb(Ewl_Widget *w __UNUSED__, void *ev_data, void *user_data) +ewl_iconbox_cb_pane_mouse_down(Ewl_Widget *w __UNUSED__, void *ev_data, void *user_data) { Ewl_Iconbox *ib; Ewl_Event_Mouse_Down *ev; @@ -1508,7 +1508,7 @@ * @brief The icon mouse down callback */ void -ewl_iconbox_icon_mouse_down_cb(Ewl_Widget *w __UNUSED__, void *ev_data, void *user_data) +ewl_iconbox_cb_icon_mouse_down(Ewl_Widget *w __UNUSED__, void *ev_data, void *user_data) { int ibx, iby, px, py, sx, sy; Ewl_Iconbox_Icon *ib; @@ -1569,7 +1569,7 @@ * @brief The icon mouse up callback */ void -ewl_iconbox_icon_mouse_up_cb(Ewl_Widget *w __UNUSED__, void *ev_data , void *user_data) +ewl_iconbox_cb_icon_mouse_up(Ewl_Widget *w __UNUSED__, void *ev_data , void *user_data) { Ewl_Event_Mouse_Down *ev; Ewl_Iconbox_Icon *ib; @@ -1605,7 +1605,7 @@ * @brief The mouse up callback */ void -ewl_iconbox_mouse_up_cb(Ewl_Widget *w __UNUSED__, void *ev_data, void *user_data) +ewl_iconbox_cb_mouse_up(Ewl_Widget *w __UNUSED__, void *ev_data, void *user_data) { Ewl_Event_Mouse_Up *ev; Ewl_Iconbox *ib; @@ -1639,7 +1639,7 @@ * @brief The icon label mouse down callback */ void -ewl_iconbox_icon_label_mouse_down_cb(Ewl_Widget *w __UNUSED__, void *ev_data __UNUSED__, void *user_data) +ewl_iconbox_cb_icon_label_mouse_down(Ewl_Widget *w __UNUSED__, void *ev_data __UNUSED__, void *user_data) { Ewl_Iconbox_Icon *ib; @@ -1664,7 +1664,7 @@ * @brief The configure callback */ void -ewl_iconbox_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) +ewl_iconbox_cb_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Iconbox *ib; @@ -1726,7 +1726,7 @@ * @brief The key press callback */ void -ewl_iconbox_key_press_cb (Ewl_Widget *w __UNUSED__, void *ev_data, void *user_data) +ewl_iconbox_cb_key_press(Ewl_Widget *w __UNUSED__, void *ev_data, void *user_data) { Ewl_Event_Key_Down *event; Ewl_Iconbox *ib; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_iconbox.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- ewl_iconbox.h 20 May 2006 19:02:18 -0000 1.35 +++ ewl_iconbox.h 30 Sep 2006 18:41:01 -0000 1.36 @@ -153,19 +153,19 @@ /* * Internal callbacks */ -void ewl_iconbox_dnd_drop_cb(Ewl_Widget *item, void *ev_data, void *user_data); -void ewl_iconbox_dnd_position_cb(Ewl_Widget *item, void *ev_data, void *user_data); -void ewl_iconbox_arrange_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_iconbox_mouse_move_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_iconbox_pane_mouse_down_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_iconbox_mouse_up_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_iconbox_configure_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_iconbox_icon_mouse_up_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_iconbox_destroy_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_iconbox_icon_mouse_down_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_iconbox_icon_label_mouse_down_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_iconbox_icon_destroy_cb(Ewl_Widget *w, void *ev_data ,void *user_data ); -void ewl_iconbox_key_press_cb(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_iconbox_cb_dnd_drop(Ewl_Widget *item, void *ev_data, void *user_data); +void ewl_iconbox_cb_dnd_position(Ewl_Widget *item, void *ev_data, void *user_data); +void ewl_iconbox_cb_arrange(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_iconbox_cb_mouse_move(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_iconbox_cb_pane_mouse_down(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_iconbox_cb_mouse_up(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_iconbox_cb_configure(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_iconbox_cb_icon_mouse_up(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_iconbox_cb_destroy(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_iconbox_cb_icon_mouse_down(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_iconbox_cb_icon_label_mouse_down(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_iconbox_cb_icon_destroy(Ewl_Widget *w, void *ev_data ,void *user_data ); +void ewl_iconbox_cb_key_press(Ewl_Widget *w, void *ev_data, void *user_data); /** * @} =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- ewl_image.c 26 Sep 2006 05:09:13 -0000 1.44 +++ ewl_image.c 30 Sep 2006 18:41:01 -0000 1.45 @@ -8,12 +8,12 @@ #include <Epsilon_Request.h> static Ecore_Event_Handler *ewl_image_epsilon_handler = NULL; -static int ewl_image_thumbnail_complete_cb(void *data, int type, void *event); +static int ewl_image_thumbnail_cb_complete(void *data, int type, void *event); #endif static Ewl_Image_Type ewl_image_type_get(const char *i); -static void ewl_image_thumb_destroy_cb(Ewl_Widget *w, void *ev, void *data); +static void ewl_image_thumbnail_cb_destroy(Ewl_Widget *w, void *ev, void *data); /** * @return Returns a pointer to a new image widget on success, NULL on failure. @@ -69,19 +69,19 @@ /* * Append necessary callbacks. */ - ewl_callback_append(w, EWL_CALLBACK_REVEAL, ewl_image_reveal_cb, + ewl_callback_append(w, EWL_CALLBACK_REVEAL, ewl_image_cb_reveal, NULL); - ewl_callback_append(w, EWL_CALLBACK_OBSCURE, ewl_image_obscure_cb, + ewl_callback_append(w, EWL_CALLBACK_OBSCURE, ewl_image_cb_obscure, NULL); - ewl_callback_prepend(w, EWL_CALLBACK_DESTROY, ewl_image_destroy_cb, + ewl_callback_prepend(w, EWL_CALLBACK_DESTROY, ewl_image_cb_destroy, NULL); - ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, ewl_image_configure_cb, + ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, ewl_image_cb_configure, NULL); - ewl_callback_append(w, EWL_CALLBACK_MOUSE_DOWN, ewl_image_mouse_down_cb, + ewl_callback_append(w, EWL_CALLBACK_MOUSE_DOWN, ewl_image_cb_mouse_down, NULL); - ewl_callback_append(w, EWL_CALLBACK_MOUSE_UP, ewl_image_mouse_up_cb, + ewl_callback_append(w, EWL_CALLBACK_MOUSE_UP, ewl_image_cb_mouse_up, NULL); - ewl_callback_append(w, EWL_CALLBACK_MOUSE_MOVE, ewl_image_mouse_move_cb, + ewl_callback_append(w, EWL_CALLBACK_MOUSE_MOVE, ewl_image_cb_mouse_move, NULL); i->sw = 1.0; @@ -534,14 +534,14 @@ ewl_widget_inherit(EWL_WIDGET(image), EWL_IMAGE_THUMBNAIL_TYPE); ewl_callback_prepend(EWL_WIDGET(image), EWL_CALLBACK_DESTROY, - ewl_image_thumb_destroy_cb, NULL); + ewl_image_thumbnail_cb_destroy, NULL); #ifdef BUILD_EPSILON_SUPPORT if (!ewl_image_epsilon_handler) { epsilon_thumb_init(); ewl_image_epsilon_handler = ecore_event_handler_add(EPSILON_EVENT_DONE, - ewl_image_thumbnail_complete_cb, + ewl_image_thumbnail_cb_complete, NULL); } #endif @@ -574,7 +574,7 @@ } static void -ewl_image_thumb_destroy_cb(Ewl_Widget *w, void *ev __UNUSED__, +ewl_image_thumbnail_cb_destroy(Ewl_Widget *w, void *ev __UNUSED__, void *data __UNUSED__) { Ewl_Image_Thumbnail *thumb; @@ -596,7 +596,7 @@ #ifdef BUILD_EPSILON_SUPPORT static int -ewl_image_thumbnail_complete_cb(void *data __UNUSED__, int type __UNUSED__, +ewl_image_thumbnail_cb_complete(void *data __UNUSED__, int type __UNUSED__, void *event) { Ewl_Image_Thumbnail *thumb; @@ -629,7 +629,7 @@ * @brief The reveal callback */ void -ewl_image_reveal_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_image_cb_reveal(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Image *i; @@ -732,7 +732,7 @@ * @brief The obscure callback */ void -ewl_image_obscure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_image_cb_obscure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Image *i; @@ -763,7 +763,7 @@ * @brief The destroy callback */ void -ewl_image_destroy_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_image_cb_destroy(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Image *i; @@ -789,7 +789,7 @@ * @brief The reparent callback */ void -ewl_image_reparent_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_image_cb_reparent(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Image *i; @@ -814,7 +814,7 @@ * @brief The configure callback */ void -ewl_image_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_image_cb_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Image *i; @@ -924,7 +924,7 @@ * @brief The mouse down callback */ void -ewl_image_mouse_down_cb(Ewl_Widget *w, void *ev_data, +ewl_image_cb_mouse_down(Ewl_Widget *w, void *ev_data, void *user_data __UNUSED__) { Ewl_Image *i; @@ -957,7 +957,7 @@ * @brief The mouse up callback */ void -ewl_image_mouse_up_cb(Ewl_Widget *w, void *ev_data, +ewl_image_cb_mouse_up(Ewl_Widget *w, void *ev_data, void *user_data __UNUSED__) { Ewl_Image *i; @@ -990,7 +990,7 @@ * @brief The mouse move callback */ void -ewl_image_mouse_move_cb(Ewl_Widget *w, void *ev_data, +ewl_image_cb_mouse_move(Ewl_Widget *w, void *ev_data, void *user_data __UNUSED__) { Ewl_Image *i; =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_image.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- ewl_image.h 23 May 2006 05:13:04 -0000 1.26 +++ ewl_image.h 30 Sep 2006 18:41:01 -0000 1.27 @@ -132,13 +132,13 @@ /* * Internally used callbacks, override at your own risk. */ -void ewl_image_reveal_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_image_obscure_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_image_configure_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_image_mouse_down_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_image_mouse_up_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_image_mouse_move_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_image_destroy_cb(Ewl_Widget *w, void *ev_data, void *user_data ); +void ewl_image_cb_reveal(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_image_cb_obscure(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_image_cb_configure(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_image_cb_mouse_down(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_image_cb_mouse_up(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_image_cb_mouse_move(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_image_cb_destroy(Ewl_Widget *w, void *ev_data, void *user_data ); /** * @} =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_imenu.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ewl_imenu.c 26 May 2006 17:25:59 -0000 1.12 +++ ewl_imenu.c 30 Sep 2006 18:41:01 -0000 1.13 @@ -46,9 +46,9 @@ ewl_widget_inherit(EWL_WIDGET(menu), EWL_IMENU_TYPE); ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_FOCUS_IN, - ewl_imenu_expand_cb, NULL); + ewl_imenu_cb_expand, NULL); ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_CONFIGURE, - ewl_imenu_configure_cb, NULL); + ewl_imenu_cb_configure, NULL); /* * Create the popup menu portion of the widget. @@ -66,9 +66,9 @@ EWL_FLAG_ALIGN_LEFT | EWL_FLAG_ALIGN_TOP); ewl_callback_prepend(EWL_WIDGET(menu), EWL_CALLBACK_DESTROY, - ewl_imenu_destroy_cb, NULL); + ewl_imenu_cb_destroy, NULL); ewl_callback_prepend(menu->base.popup, EWL_CALLBACK_DESTROY, - ewl_imenu_popup_destroy_cb, menu); + ewl_imenu_cb_popup_destroy, menu); DRETURN_INT(TRUE, DLEVEL_STABLE); } @@ -82,7 +82,7 @@ * @brief The configure callback */ void -ewl_imenu_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_imenu_cb_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Imenu *menu; @@ -116,7 +116,7 @@ * @brief The expand callback */ void -ewl_imenu_expand_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_imenu_cb_expand(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Imenu *menu; @@ -146,7 +146,7 @@ * @brief The popup destroy callback */ void -ewl_imenu_popup_destroy_cb(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__, +ewl_imenu_cb_popup_destroy(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__, void *data) { Ewl_Imenu *menu; @@ -169,7 +169,7 @@ * @brief The destroy callback */ void -ewl_imenu_destroy_cb(Ewl_Widget *w, void *ev __UNUSED__, void *data __UNUSED__) +ewl_imenu_cb_destroy(Ewl_Widget *w, void *ev __UNUSED__, void *data __UNUSED__) { Ewl_Imenu *menu; @@ -180,7 +180,7 @@ menu = EWL_IMENU(w); if (menu->base.popup) ewl_callback_del(menu->base.popup, EWL_CALLBACK_DESTROY, - ewl_imenu_popup_destroy_cb); + ewl_imenu_cb_popup_destroy); DLEAVE_FUNCTION(DLEVEL_STABLE); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_imenu.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- ewl_imenu.h 25 May 2006 04:38:18 -0000 1.10 +++ ewl_imenu.h 30 Sep 2006 18:41:01 -0000 1.11 @@ -46,10 +46,10 @@ /* * Internally used callbacks, override at your own risk. */ -void ewl_imenu_configure_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_imenu_expand_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_imenu_destroy_cb(Ewl_Widget *w, void *ev, void *data); -void ewl_imenu_popup_destroy_cb(Ewl_Widget *w, void *ev, void *data); +void ewl_imenu_cb_configure(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_imenu_cb_expand(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_imenu_cb_destroy(Ewl_Widget *w, void *ev, void *data); +void ewl_imenu_cb_popup_destroy(Ewl_Widget *w, void *ev, void *data); /** * @} =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- ewl_media.c 28 May 2006 17:09:06 -0000 1.22 +++ ewl_media.c 30 Sep 2006 18:41:01 -0000 1.23 @@ -8,7 +8,7 @@ #endif static void ewl_media_size_update(Ewl_Media *m); -static void ewl_media_update_timer_cb(void *data, Evas_Object *obj, void +static void ewl_media_cb_update_timer(void *data, Evas_Object *obj, void *event_info); /** @@ -59,13 +59,13 @@ ewl_widget_appearance_set(w, EWL_MEDIA_TYPE); ewl_widget_inherit(EWL_WIDGET(w), EWL_MEDIA_TYPE); - ewl_callback_append(w, EWL_CALLBACK_REALIZE, ewl_media_realize_cb, + ewl_callback_append(w, EWL_CALLBACK_REALIZE, ewl_media_cb_realize, NULL); - ewl_callback_append(w, EWL_CALLBACK_REVEAL, ewl_media_reveal_cb, + ewl_callback_append(w, EWL_CALLBACK_REVEAL, ewl_media_cb_reveal, NULL); - ewl_callback_append(w, EWL_CALLBACK_UNREALIZE, ewl_media_unrealize_cb, + ewl_callback_append(w, EWL_CALLBACK_UNREALIZE, ewl_media_cb_unrealize, NULL); - ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, ewl_media_configure_cb, + ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, ewl_media_cb_configure, NULL); DRETURN_INT(TRUE, DLEVEL_STABLE); @@ -471,7 +471,7 @@ * @brief The realize callback */ void -ewl_media_realize_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_media_cb_realize(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Media *m; @@ -515,7 +515,7 @@ * @brief The reveal callback */ void -ewl_media_reveal_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_media_cb_reveal(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Media *m; @@ -546,7 +546,7 @@ * @brief The unrealize callback */ void -ewl_media_unrealize_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_media_cb_unrealize(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Media *m; @@ -572,7 +572,7 @@ * @brief The configure callback */ void -ewl_media_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_media_cb_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Media *m; @@ -590,7 +590,7 @@ evas_object_move(m->video, CURRENT_X(w), CURRENT_Y(w)); evas_object_resize(m->video, CURRENT_W(w), CURRENT_H(w)); evas_object_smart_callback_add(m->video, "frame_decode", - ewl_media_update_timer_cb, m); + ewl_media_cb_update_timer, m); } DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -616,7 +616,7 @@ } static void -ewl_media_update_timer_cb(void *data, +ewl_media_cb_update_timer(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ewl_media.h 28 May 2006 17:09:06 -0000 1.14 +++ ewl_media.h 30 Sep 2006 18:41:01 -0000 1.15 @@ -78,10 +78,10 @@ /* * Internally used callbacks, override at your own risk. */ -void ewl_media_realize_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_media_reveal_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_media_unrealize_cb(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_media_configure_cb(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_media_cb_realize(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_media_cb_reveal(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_media_cb_unrealize(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_media_cb_configure(Ewl_Widget *w, void *ev_data, void *user_data); /** * @} =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- ewl_menu.c 26 May 2006 17:25:59 -0000 1.32 +++ ewl_menu.c 30 Sep 2006 18:41:01 -0000 1.33 @@ -47,14 +47,14 @@ ewl_widget_inherit(EWL_WIDGET(menu), EWL_MENU_TYPE); ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_MOUSE_MOVE, - ewl_menu_expand_mouse_move_cb, NULL); + ewl_menu_cb_expand_mouse_move, NULL); ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_FOCUS_IN, - ewl_menu_expand_cb, NULL); + ewl_menu_cb_expand, NULL); ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_REALIZE, - ewl_menu_realize_cb, NULL); + ewl_menu_cb_realize, NULL); ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_CONFIGURE, - ewl_menu_configure_cb, NULL); + ewl_menu_cb_configure, NULL); menu->menubar_parent = NULL; @@ -74,15 +74,15 @@ ewl_object_alignment_set(EWL_OBJECT(menu->base.popup), EWL_FLAG_ALIGN_LEFT | EWL_FLAG_ALIGN_TOP); ewl_callback_append(menu->base.popup, EWL_CALLBACK_MOUSE_DOWN, - ewl_menu_hide_cb, menu); + ewl_menu_cb_hide, menu); ewl_callback_append(menu->base.popup, EWL_CALLBACK_MOUSE_MOVE, - ewl_menu_mouse_move_cb, menu); + ewl_menu_cb_mouse_move, menu); ewl_callback_prepend(EWL_WIDGET(menu), EWL_CALLBACK_DESTROY, - ewl_menu_destroy_cb, NULL); + ewl_menu_cb_destroy, NULL); ewl_callback_prepend(menu->base.popup, EWL_CALLBACK_DESTROY, - ewl_menu_popup_destroy_cb, menu); + ewl_menu_cb_popup_destroy, menu); DRETURN_INT(TRUE, DLEVEL_STABLE); } @@ -96,7 +96,7 @@ * @brief The realize callback */ void -ewl_menu_realize_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_menu_cb_realize(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Menu *menu; @@ -107,14 +107,14 @@ menu = EWL_MENU(w); - ewl_menu_popup_move_cb(menu->base.popup, NULL, w); + ewl_menu_cb_popup_move(menu->base.popup, NULL, w); /* * Position the popup menu relative to the menu. */ ewl_callback_append(EWL_WIDGET(EWL_WINDOW(menu->base.popup)), EWL_CALLBACK_CONFIGURE, - ewl_menu_popup_move_cb, w); + ewl_menu_cb_popup_move, w); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -128,7 +128,7 @@ * @brief The configure callback */ void -ewl_menu_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_menu_cb_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { int x, y; @@ -146,7 +146,7 @@ menu->popup_x = x + CURRENT_X(w); menu->popup_y = y + CURRENT_Y(w); - ewl_menu_popup_move_cb(menu->base.popup, NULL, w); + ewl_menu_cb_popup_move(menu->base.popup, NULL, w); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -160,7 +160,7 @@ * @brief The expand mouse move callback */ void -ewl_menu_expand_mouse_move_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_menu_cb_expand_mouse_move(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Menu *menu; @@ -206,7 +206,7 @@ * @brief The expand callback */ void -ewl_menu_expand_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_menu_cb_expand(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { Ewl_Menu *menu; @@ -233,7 +233,7 @@ * @brief The popup move callback */ void -ewl_menu_popup_move_cb(Ewl_Widget *w, void *ev_data __UNUSED__, +ewl_menu_cb_popup_move(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data) { Ewl_Widget *menu; @@ -267,7 +267,7 @@ * @brief The mouse move callback */ void -ewl_menu_mouse_move_cb(Ewl_Widget *w, void *ev_data, void *user_data) +ewl_menu_cb_mouse_... [truncated message content] |
From: Enlightenment C. <no...@cv...> - 2006-09-30 19:21:10
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_embed.c Log Message: more renamed callbacks =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -3 -r1.84 -r1.85 --- ewl_embed.c 30 Sep 2006 18:41:01 -0000 1.84 +++ ewl_embed.c 30 Sep 2006 19:21:05 -0000 1.85 @@ -7,16 +7,16 @@ static Evas_Smart *embedded_smart = NULL; static Ewl_Embed *ewl_embed_active_embed = NULL; -static void ewl_embed_smart_add_cb(Evas_Object *obj); -static void ewl_embed_smart_del_cb(Evas_Object *obj); -static void ewl_embed_smart_move_cb(Evas_Object *obj, Evas_Coord x, +static void ewl_embed_smart_cb_add(Evas_Object *obj); +static void ewl_embed_smart_cb_del(Evas_Object *obj); +static void ewl_embed_smart_cb_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y); -static void ewl_embed_smart_resize_cb(Evas_Object *obj, Evas_Coord w, +static void ewl_embed_smart_cb_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h); -static void ewl_embed_smart_show_cb(Evas_Object *obj); -static void ewl_embed_smart_hide_cb(Evas_Object *obj); -static void ewl_embed_smart_clip_set_cb(Evas_Object *obj, Evas_Object *clip); -static void ewl_embed_smart_clip_unset_cb(Evas_Object *obj); +static void ewl_embed_smart_cb_show(Evas_Object *obj); +static void ewl_embed_smart_cb_hide(Evas_Object *obj); +static void ewl_embed_smart_cb_clip_set(Evas_Object *obj, Evas_Object *clip); +static void ewl_embed_smart_cb_clip_unset(Evas_Object *obj); static void ewl_embed_tab_order_change(Ewl_Embed *e, void *(*change)(Ecore_DList *list), @@ -25,23 +25,23 @@ /* * Catch mouse events processed through the evas */ -static void ewl_embed_evas_mouse_out_cb(void *data, Evas *e, Evas_Object *obj, +static void ewl_embed_evas_cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void ewl_embed_evas_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, +static void ewl_embed_evas_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void ewl_embed_evas_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, +static void ewl_embed_evas_cb_mouse_up(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void ewl_embed_evas_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, +static void ewl_embed_evas_cb_mouse_move(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void ewl_embed_evas_mouse_wheel_cb(void *data, Evas *e, Evas_Object *obj, +static void ewl_embed_evas_cb_mouse_wheel(void *data, Evas *e, Evas_Object *obj, void *event_info); /* * Catch key events processed through the evas */ -static void ewl_embed_evas_key_down_cb(void *data, Evas *e, Evas_Object *obj, +static void ewl_embed_evas_cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void ewl_embed_evas_key_up_cb(void *data, Evas *e, Evas_Object *obj, +static void ewl_embed_evas_cb_key_up(void *data, Evas *e, Evas_Object *obj, void *event_info); /** @@ -164,16 +164,16 @@ if (!embedded_smart) { embedded_smart = evas_smart_new(name, - ewl_embed_smart_add_cb, - ewl_embed_smart_del_cb, + ewl_embed_smart_cb_add, + ewl_embed_smart_cb_del, NULL, NULL, NULL, NULL, NULL, - ewl_embed_smart_move_cb, - ewl_embed_smart_resize_cb, - ewl_embed_smart_show_cb, - ewl_embed_smart_hide_cb, + ewl_embed_smart_cb_move, + ewl_embed_smart_cb_resize, + ewl_embed_smart_cb_show, + ewl_embed_smart_cb_hide, NULL, - ewl_embed_smart_clip_set_cb, - ewl_embed_smart_clip_unset_cb, NULL); + ewl_embed_smart_cb_clip_set, + ewl_embed_smart_cb_clip_unset, NULL); } if (emb->smart) { @@ -1673,28 +1673,28 @@ */ evas_object_event_callback_add(emb->smart, EVAS_CALLBACK_MOUSE_OUT, - ewl_embed_evas_mouse_out_cb, emb); + ewl_embed_evas_cb_mouse_out, emb); evas_object_event_callback_add(emb->smart, EVAS_CALLBACK_MOUSE_DOWN, - ewl_embed_evas_mouse_down_cb, emb); + ewl_embed_evas_cb_mouse_down, emb); evas_object_event_callback_add(emb->smart, EVAS_CALLBACK_MOUSE_UP, - ewl_embed_evas_mouse_up_cb, emb); + ewl_embed_evas_cb_mouse_up, emb); evas_object_event_callback_add(emb->smart, EVAS_CALLBACK_MOUSE_MOVE, - ewl_embed_evas_mouse_move_cb, emb); + ewl_embed_evas_cb_mouse_move, emb); evas_object_event_callback_add(emb->smart, EVAS_CALLBACK_MOUSE_WHEEL, - ewl_embed_evas_mouse_wheel_cb, emb); + ewl_embed_evas_cb_mouse_wheel, emb); /* * Catch key events processed through the evas */ evas_object_event_callback_add(emb->smart, EVAS_CALLBACK_KEY_DOWN, - ewl_embed_evas_key_down_cb, emb); + ewl_embed_evas_cb_key_down, emb); evas_object_event_callback_add(emb->smart, - EVAS_CALLBACK_KEY_UP, ewl_embed_evas_key_up_cb, + EVAS_CALLBACK_KEY_UP, ewl_embed_evas_cb_key_up, emb); } @@ -1916,7 +1916,7 @@ } static void -ewl_embed_smart_add_cb(Evas_Object *obj __UNUSED__) +ewl_embed_smart_cb_add(Evas_Object *obj __UNUSED__) { DENTER_FUNCTION(DLEVEL_STABLE); @@ -1928,7 +1928,7 @@ } static void -ewl_embed_smart_del_cb(Evas_Object *obj) +ewl_embed_smart_cb_del(Evas_Object *obj) { Ewl_Embed *emb; @@ -1944,7 +1944,7 @@ } static void -ewl_embed_smart_move_cb(Evas_Object *obj, Evas_Coord x, Evas_Coord y) +ewl_embed_smart_cb_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { Ewl_Embed *emb; @@ -1959,7 +1959,7 @@ } static void -ewl_embed_smart_resize_cb(Evas_Object *obj, Evas_Coord w, Evas_Coord h) +ewl_embed_smart_cb_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h) { Ewl_Embed *emb; @@ -1973,7 +1973,7 @@ } static void -ewl_embed_smart_show_cb(Evas_Object *obj) +ewl_embed_smart_cb_show(Evas_Object *obj) { Ewl_Embed *emb; @@ -1987,7 +1987,7 @@ } static void -ewl_embed_smart_hide_cb(Evas_Object *obj) +ewl_embed_smart_cb_hide(Evas_Object *obj) { Ewl_Embed *emb; @@ -2001,7 +2001,7 @@ } static void -ewl_embed_smart_clip_set_cb(Evas_Object *obj, Evas_Object *clip) +ewl_embed_smart_cb_clip_set(Evas_Object *obj, Evas_Object *clip) { Ewl_Embed *emb; Ewl_Widget *w; @@ -2017,7 +2017,7 @@ } static void -ewl_embed_smart_clip_unset_cb(Evas_Object *obj) +ewl_embed_smart_cb_clip_unset(Evas_Object *obj) { Ewl_Embed *emb; Ewl_Widget *w; @@ -2033,7 +2033,7 @@ } static void -ewl_embed_evas_mouse_out_cb(void *data, Evas *e __UNUSED__, +ewl_embed_evas_cb_mouse_out(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Ewl_Embed *embed; @@ -2056,7 +2056,7 @@ } static void -ewl_embed_evas_mouse_down_cb(void *data, Evas *e __UNUSED__, +ewl_embed_evas_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Ewl_Embed *embed; @@ -2073,7 +2073,7 @@ } static void -ewl_embed_evas_mouse_up_cb(void *data, Evas *e __UNUSED__, +ewl_embed_evas_cb_mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Ewl_Embed *embed; @@ -2090,7 +2090,7 @@ } static void -ewl_embed_evas_mouse_move_cb(void *data, Evas *e __UNUSED__, +ewl_embed_evas_cb_mouse_move(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Ewl_Embed *embed; @@ -2107,7 +2107,7 @@ } static void -ewl_embed_evas_mouse_wheel_cb(void *data, Evas *e __UNUSED__, +ewl_embed_evas_cb_mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { @@ -2126,7 +2126,7 @@ } static void -ewl_embed_evas_key_down_cb(void *data, Evas *e __UNUSED__, +ewl_embed_evas_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Ewl_Embed *embed; @@ -2164,7 +2164,7 @@ } static void -ewl_embed_evas_key_up_cb(void *data, Evas *e __UNUSED__, +ewl_embed_evas_cb_key_up(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { Ewl_Embed *embed; |
From: Enlightenment C. <no...@cv...> - 2006-10-03 19:56:14
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_grid.c Log Message: fix segv =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_grid.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- ewl_grid.c 2 Oct 2006 05:19:01 -0000 1.30 +++ ewl_grid.c 3 Oct 2006 19:56:08 -0000 1.31 @@ -1056,6 +1056,9 @@ DCHECK_PARAM_PTR("g", g); DCHECK_TYPE("g", g, EWL_GRID_TYPE); + if (!g->map) + ewl_grid_map_recalc(g); + /* * setup the position stuff for the floating * widgets |
From: Enlightenment C. <no...@cv...> - 2006-10-06 20:00:58
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/plugins Modified Files: ewl_io_manager_text_c_plugin.c Log Message: fix escaped quotes bug =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/plugins/ewl_io_manager_text_c_plugin.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ewl_io_manager_text_c_plugin.c 4 Oct 2006 15:42:55 -0000 1.1 +++ ewl_io_manager_text_c_plugin.c 6 Oct 2006 20:00:55 -0000 1.2 @@ -194,7 +194,7 @@ else if (isdigit(*tx1)) mode = NUMBER; - else if (*tx1 == '\"') + else if (*tx1 == '\"' && !( tx1 != text && *(tx1 - 1) == '\\')) mode = STRING; else |
From: Enlightenment C. <no...@cv...> - 2006-10-10 20:40:40
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_config.c ewl_config.h Log Message: add ewl_config_color_set/get =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_config.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- ewl_config.c 8 Oct 2006 02:08:06 -0000 1.17 +++ ewl_config.c 10 Oct 2006 20:40:38 -0000 1.18 @@ -278,6 +278,69 @@ /** * @param cfg: The Ewl_Config to work with + * @param k: the key to set in the configuration database + * @param r: the red value that will be associated with the key + * @param g: the green value that will be associated with the key + * @param b: the blue value that will be associated with the key + * @param a: the alpha value that will be associated with the key + * @return Returns no value + * @brief Set the value of key to the specified color + * + * Sets the color value associated with the key @a k to @a v in the + * configuration database. + */ +void +ewl_config_color_set(Ewl_Config *cfg, const char *k, int r, int g, + int b, int a, + Ewl_State_Type state) +{ + char buf[128]; + + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("k", k); + + snprintf(buf, sizeof(buf), "%i %i %i %i", r, g, b, a); + ecore_hash_set(ewl_config_set_hash_get(cfg, state), + strdup(k), strdup(buf)); + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + +/** + * @param cfg: The Ewl_Config to work with + * @param k: the key to search + * @param r: the red value that is associated with the key + * @param g: the green value that is associated with the key + * @param b: the blue value that is associated with the key + * @param a: the alpha value that is associated with the key + * @return Returns no value + * @brief Retrieve color associated with a key + */ +void +ewl_config_color_get(Ewl_Config *cfg, const char *k, int *r, int *g, + int *b, int *a) +{ + const char *val; + int tmp_r = 0, tmp_g = 0, tmp_b = 0, tmp_a = 0; + + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("k", k); + + val = ewl_config_get(cfg, k); + if (val) + sscanf(val, "%i %i %i %i", &tmp_r, &tmp_g, &tmp_b, &tmp_a); + + if (r) *r = tmp_r; + if (g) *g = tmp_g; + if (b) *b = tmp_b; + if (a) *a = tmp_a; + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + + +/** + * @param cfg: The Ewl_Config to work with * @return Returns TRUE if the user can write to the system conf file, FALSE * otherwise * @brief Determines if the user can write the system config file =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_config.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- ewl_config.h 2 Oct 2006 05:19:24 -0000 1.18 +++ ewl_config.h 10 Oct 2006 20:40:38 -0000 1.19 @@ -48,6 +48,13 @@ Ewl_State_Type state); float ewl_config_float_get(Ewl_Config *cfg, const char *k); +void ewl_config_color_set(Ewl_Config *cfg, const char *k, + int r, int g, int b, int a, + Ewl_State_Type state); +void ewl_config_color_get(Ewl_Config *cfg, const char *k, + int *r, int *g, + int *b, int *a); + int ewl_config_can_save_system(Ewl_Config *cfg); int ewl_config_system_save(Ewl_Config *cfg); int ewl_config_user_save(Ewl_Config *cfg); |
From: Enlightenment C. <no...@cv...> - 2006-10-10 21:26:27
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_config.c Log Message: move the ewl.cfg file to PACKAGE_SYSCONF_DIR/ewl =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_config.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- ewl_config.c 10 Oct 2006 20:40:38 -0000 1.18 +++ ewl_config.c 10 Oct 2006 21:26:24 -0000 1.19 @@ -532,7 +532,7 @@ fname = ewl_config_file_name_clean(cfg); snprintf(cfg_filename, sizeof(cfg_filename), - "%s/config/%s%s.cfg", PACKAGE_DATA_DIR, + "%s/ewl/%s%s.cfg", PACKAGE_SYSCONF_DIR, (is_ewl ? "" : "apps/"), fname); FREE(fname); |
From: Enlightenment C. <no...@cv...> - 2006-10-10 21:26:56
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/config Modified Files: Makefile.am Log Message: move the ewl.cfg file to PACKAGE_SYSCONF_DIR/ewl =================================================================== RCS file: /cvs/e/e17/libs/ewl/data/config/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 30 Sep 2006 22:31:36 -0000 1.1 +++ Makefile.am 10 Oct 2006 21:26:24 -0000 1.2 @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makfile.in -configdir = $(pkgdatadir)/config/ +configdir = $(sysconfdir)/ewl config_DATA = ewl.cfg EXTRA_DIST = $(config_DATA) |
From: Enlightenment C. <no...@cv...> - 2006-10-10 21:26:59
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: configure.in Log Message: move the ewl.cfg file to PACKAGE_SYSCONF_DIR/ewl =================================================================== RCS file: /cvs/e/e17/libs/ewl/configure.in,v retrieving revision 1.82 retrieving revision 1.83 diff -u -3 -r1.82 -r1.83 --- configure.in 1 Oct 2006 07:27:11 -0000 1.82 +++ configure.in 10 Oct 2006 21:26:24 -0000 1.83 @@ -31,11 +31,13 @@ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${PACKAGE}/locale", [Locale data directory]) fi -dnl Set PACKAGE_DATA_DIR in config.h. +dnl Set PACKAGE_DATA_DIR and PACKAGE_SYSCONF_DIR in config.h. if test "x${prefix}" = "xNONE"; then AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory]) + AC_DEFINE_UNQUOTED(PACKAGE_SYSCONF_DIR, "${ac_default_prefix}/etc", [System Configuration Directory]) else AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory]) + AC_DEFINE_UNQUOTED(PACKAGE_SYSCONF_DIR, "${sysconfdir}", [System Configuration Directory]) fi dnl Set PACKAGE_LIB_DIR in config.h. |
From: Enlightenment C. <no...@cv...> - 2006-10-10 21:43:56
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: ewl-config.in Log Message: and apps have their conf file in sysconfdir/ewl/apps =================================================================== RCS file: /cvs/e/e17/libs/ewl/ewl-config.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ewl-config.in 30 Sep 2006 22:31:36 -0000 1.14 +++ ewl-config.in 10 Oct 2006 21:43:53 -0000 1.15 @@ -55,7 +55,7 @@ echo @prefix@/share/ewl/examples ;; --app-config-dir) - echo @prefix@/share/ewl/config/apps + echo @sysconfdir@/ewl/config/apps ;; *) echo "${usage}" 1>&2 |
From: Enlightenment C. <no...@cv...> - 2006-10-10 22:06:59
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_enums.h Log Message: add comments =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v retrieving revision 1.57 retrieving revision 1.58 diff -u -3 -r1.57 -r1.58 --- ewl_enums.h 10 Oct 2006 21:32:16 -0000 1.57 +++ ewl_enums.h 10 Oct 2006 22:06:56 -0000 1.58 @@ -726,11 +726,11 @@ */ enum Ewl_Rotate { - EWL_ROTATE_CW_90, - EWL_ROTATE_180, - EWL_ROTATE_CW_270, - EWL_ROTATE_CC_90, - EWL_ROTATE_CC_270 + EWL_ROTATE_CW_90, /**< 90 degree clockwise rotation */ + EWL_ROTATE_180, /**< 180 degree rotation */ + EWL_ROTATE_CW_270, /**< 270 degree clockwise rotation */ + EWL_ROTATE_CC_90, /**< 90 degree counter-clockwise rotation */ + EWL_ROTATE_CC_270 /**< 270 degree counter-clockwise rotation */ }; /** |
From: Enlightenment C. <no...@cv...> - 2006-10-16 08:54:40
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin/tests Modified Files: ewl_scrollpane.c Log Message: now you can test the scrollpane in the scrollpane test :) =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_scrollpane.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ewl_scrollpane.c 13 Jul 2006 19:43:24 -0000 1.4 +++ ewl_scrollpane.c 16 Oct 2006 08:54:33 -0000 1.5 @@ -25,7 +25,7 @@ ewl_widget_show(scrollpane); button = ewl_button_new(); - ewl_object_size_request(EWL_OBJECT(button), 500, 500); + ewl_object_minimum_size_set(EWL_OBJECT(button), 500, 500); ewl_object_padding_set(EWL_OBJECT(button), 20, 20, 20, 20); ewl_container_child_append(EWL_CONTAINER(scrollpane), button); ewl_widget_show(button); |
From: Enlightenment C. <no...@cv...> - 2006-10-18 09:54:52
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin/tests/scrollpane Modified Files: ewl_scrollpane.c Log Message: that get lost during the test changes =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/scrollpane/ewl_scrollpane.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ewl_scrollpane.c 17 Oct 2006 04:59:58 -0000 1.1 +++ ewl_scrollpane.c 18 Oct 2006 09:54:49 -0000 1.2 @@ -25,7 +25,7 @@ ewl_widget_show(scrollpane); button = ewl_button_new(); - ewl_object_size_request(EWL_OBJECT(button), 500, 500); + ewl_object_minimum_size_set(EWL_OBJECT(button), 500, 500); ewl_object_padding_set(EWL_OBJECT(button), 20, 20, 20, 20); ewl_container_child_append(EWL_CONTAINER(scrollpane), button); ewl_widget_show(button); |
From: Enlightenment C. <no...@cv...> - 2006-10-20 12:40:05
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_mvc.c Log Message: quick fix to let ewl compile again =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_mvc.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ewl_mvc.c 20 Oct 2006 04:37:34 -0000 1.8 +++ ewl_mvc.c 20 Oct 2006 12:39:58 -0000 1.9 @@ -22,8 +22,10 @@ static void ewl_mvc_selected_change_notify(Ewl_MVC *mvc); static void ewl_mvc_selected_rm_item(Ewl_MVC *mvc, Ewl_Selection *sel, int row, int column); +/* XXX This function is currently not implemented static void ewl_mvc_cb_highlight_destroy(Ewl_Widget *w, void *ev, void *data); +*/ static void ewl_mvc_cb_sel_free(void *data); /** @@ -1078,8 +1080,8 @@ h = ewl_highlight_new(); ewl_highlight_follow_set(EWL_HIGHLIGHT(h), w); ewl_container_child_append(EWL_CONTAINER(c), h); - ewl_callback_append(h, EWL_CALLBACK_DESTROY, - ewl_mvc_cb_highlight_destroy, mvc); +// ewl_callback_append(h, EWL_CALLBACK_DESTROY, +// ewl_mvc_cb_highlight_destroy, mvc); ewl_widget_show(h); if (sel->type == EWL_SELECTION_TYPE_INDEX) |
From: Enlightenment C. <no...@cv...> - 2006-11-04 16:58:37
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin/tests/combo Modified Files: ewl_combo.c Log Message: - add ewl_popup (a smart placing override window) - use ewl_popup for combo, menu and tooltip =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/combo/ewl_combo.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ewl_combo.c 26 Oct 2006 16:11:54 -0000 1.3 +++ ewl_combo.c 4 Nov 2006 16:58:05 -0000 1.4 @@ -243,8 +243,10 @@ d = ewl_mvc_data_get(EWL_MVC(w)); idx = ewl_mvc_selected_get(EWL_MVC(w)); - printf("value changed to %d (%s)\n", - idx->row, d->data[idx->row]); + /* + printf("value changed to %d %p)\n", + idx->row, d->data[idx->row]); + */ } static void |
From: Enlightenment C. <no...@cv...> - 2006-11-04 16:58:37
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/engines/x11 Modified Files: ewl_engine_x11.c Log Message: - add ewl_popup (a smart placing override window) - use ewl_popup for combo, menu and tooltip =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/engines/x11/ewl_engine_x11.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- ewl_engine_x11.c 27 Oct 2006 04:26:56 -0000 1.23 +++ ewl_engine_x11.c 4 Nov 2006 16:58:05 -0000 1.24 @@ -73,6 +73,7 @@ static void ee_window_selection_text_set(Ewl_Window *win, const char *txt); static void ee_window_geometry_set(Ewl_Window *win, int *width, int *height); static void ee_dnd_aware_set(Ewl_Embed *embed); +static void ee_desktop_size_get(Ewl_Embed *embed, int *w, int *h); static int ee_pointer_data_new(Ewl_Embed *embed, int *data, int w, int h); static void ee_pointer_free(Ewl_Embed *embed, int pointer); @@ -103,7 +104,8 @@ ee_pointer_ungrab, ee_window_selection_text_set, ee_window_geometry_set, - ee_dnd_aware_set + ee_dnd_aware_set, + ee_desktop_size_get, }; static void *pointer_funcs[EWL_ENGINE_POINTER_MAX] = @@ -707,6 +709,18 @@ DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE); ecore_x_dnd_aware_set((Ecore_X_Window)embed->evas_window, TRUE); + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + +static void +ee_desktop_size_get(Ewl_Embed *embed, int *w, int *h) +{ + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("embed", embed); + DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE); + + ecore_x_window_size_get(0, w, h); DLEAVE_FUNCTION(DLEVEL_STABLE); } |
From: Enlightenment C. <no...@cv...> - 2006-11-04 16:58:37
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes Modified Files: e17.edc Log Message: - add ewl_popup (a smart placing override window) - use ewl_popup for combo, menu and tooltip =================================================================== RCS file: /cvs/e/e17/libs/ewl/data/themes/e17.edc,v retrieving revision 1.52 retrieving revision 1.53 diff -u -3 -r1.52 -r1.53 --- e17.edc 20 Oct 2006 04:37:34 -0000 1.52 +++ e17.edc 4 Nov 2006 16:58:05 -0000 1.53 @@ -112,6 +112,7 @@ item, "/stock/save" "stock/save"; item, "/stock/stop" "stock/stop"; + item, "/combo/popup/group" "menu"; item, "/combo/decrement/group" "spinner-down"; item, "/combo/decrement/body/group" "spinnerdown"; item, "/combo/increment/group" "spinner-up"; @@ -156,7 +157,8 @@ item, "/statusbar/group" "statusbar"; - item, "/tooltip/offset" 15; + item, "/popup/voffset" 10; + item, "/popup/hoffset" 10; item, "/tooltip/delay" "1.0"; item, "/tooltip/group" "window"; |
From: Enlightenment C. <no...@cv...> - 2006-11-04 16:58:38
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin/tests/pointer Modified Files: ewl_pointer.c Log Message: - add ewl_popup (a smart placing override window) - use ewl_popup for combo, menu and tooltip =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/pointer/ewl_pointer.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ewl_pointer.c 26 Oct 2006 05:37:11 -0000 1.2 +++ ewl_pointer.c 4 Nov 2006 16:58:05 -0000 1.3 @@ -52,6 +52,7 @@ o = ewl_button_new(); ewl_container_child_append(EWL_CONTAINER(pointer_win), o); + ewl_widget_color_set(EWL_WIDGET(o), 255, 255, 255, 200); ewl_widget_show(o); cur_timer = ecore_timer_add(2.0, timer_cb_in, o); |
From: Enlightenment C. <no...@cv...> - 2006-11-04 16:58:38
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: Ewl.h Makefile.am ewl_attach.c ewl_combo.c ewl_combo.h ewl_container.c ewl_embed.c ewl_embed.h ewl_engines.c ewl_engines.h ewl_enums.h ewl_menu.c ewl_menu.h Added Files: ewl_popup.c ewl_popup.h Log Message: - add ewl_popup (a smart placing override window) - use ewl_popup for combo, menu and tooltip =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/Ewl.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- Ewl.h 20 Oct 2006 04:37:34 -0000 1.14 +++ Ewl.h 4 Nov 2006 16:58:05 -0000 1.15 @@ -292,6 +292,7 @@ #include <ewl_embed.h> #include <ewl_window.h> #include <ewl_dialog.h> +#include <ewl_popup.h> #include <ewl_filelist.h> #include <ewl_filelist_list.h> #include <ewl_filelist_icon.h> =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/Makefile.am,v retrieving revision 1.40 retrieving revision 1.41 diff -u -3 -r1.40 -r1.41 --- Makefile.am 4 Nov 2006 16:26:05 -0000 1.40 +++ Makefile.am 4 Nov 2006 16:58:05 -0000 1.41 @@ -68,6 +68,7 @@ ewl_overlay.h \ ewl_paned.h \ ewl_password.h \ + ewl_popup.h \ ewl_progressbar.h \ ewl_radiobutton.h \ ewl_range.h \ @@ -148,6 +149,7 @@ ewl_overlay.c \ ewl_paned.c \ ewl_password.c \ + ewl_popup.c \ ewl_progressbar.c \ ewl_radiobutton.c \ ewl_range.c \ =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_attach.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- ewl_attach.c 10 Oct 2006 03:36:55 -0000 1.34 +++ ewl_attach.c 4 Nov 2006 16:58:05 -0000 1.35 @@ -555,9 +555,7 @@ ewl_attach_cb_tooltip_mouse_move(Ewl_Widget *w, void *ev, void *data __UNUSED__) { Ewl_Attach *attach; - Ewl_Embed *emb; Ewl_Event_Mouse_Move *e; - int offset; char *delay_str; double delay = 1.0; @@ -578,23 +576,10 @@ ewl_attach_tooltip->attach = attach; ewl_attach_tooltip->to = w; - - offset = ewl_theme_data_int_get(w, "/tooltip/offset"); - - /* - * Position the tooltip on the side with the most available space - */ - emb = ewl_embed_widget_find(w); - if ((e->x - CURRENT_X(emb)) > (CURRENT_X(emb) + CURRENT_W(emb) - e->x)) - ewl_attach_tooltip->x = e->x - offset; - else - ewl_attach_tooltip->x = e->x + offset; - - if ((e->y - CURRENT_Y(emb)) > (CURRENT_Y(emb) + CURRENT_H(emb) - e->y)) - ewl_attach_tooltip->y = e->y - offset; - else - ewl_attach_tooltip->y = e->y + offset; - + + ewl_attach_tooltip->x = e->x; + ewl_attach_tooltip->y = e->y; + delay_str = ewl_theme_data_str_get(w, "/tooltip/delay"); if (delay_str) { @@ -658,49 +643,17 @@ if (!(ewl_attach_tooltip->win)) { - Ewl_Container *redir; -#if 0 - ewl_attach_tooltip->win = ewl_window_new(); - ewl_attach_tooltip->embed = ewl_attach_tooltip->win; - ewl_window_title_set(EWL_WINDOW(ewl_attach_tooltip->win), - "Tooltip"); - ewl_window_name_set(EWL_WINDOW(ewl_attach_tooltip->win), - "Tooltip"); - ewl_window_class_set(EWL_WINDOW(ewl_attach_tooltip->win), - "Tooltip"); - ewl_window_transient_for(EWL_WINDOW(emb), - EWL_WINDOW(ewl_attach_tooltip->win)); - ewl_window_borderless_set(EWL_WINDOW(ewl_attach_tooltip->win)); - ewl_window_raise(EWL_WINDOW(ewl_attach_tooltip->win)); -#endif - - /* XXX this should really be in its own window */ - ewl_attach_tooltip->win = ewl_floater_new(); - ewl_box_orientation_set(EWL_BOX(ewl_attach_tooltip->win), - EWL_ORIENTATION_HORIZONTAL); - ewl_floater_follow_set(EWL_FLOATER(ewl_attach_tooltip->win), - EWL_WIDGET(emb)); + ewl_attach_tooltip->win = ewl_popup_new(); + ewl_popup_type_set(EWL_POPUP(ewl_attach_tooltip->win), + EWL_POPUP_TYPE_MOUSE); + ewl_popup_follow_set(EWL_POPUP(ewl_attach_tooltip->win), + EWL_WIDGET(emb)); ewl_attach_tooltip->embed = EWL_WIDGET(emb); - - /* - * Temporarily override any redirect settings as this must go - * into the top level of the embed. - */ - redir = ewl_container_redirect_get(EWL_CONTAINER(emb)); - ewl_container_redirect_set(EWL_CONTAINER(emb), NULL); - ewl_container_child_append(EWL_CONTAINER(emb), - ewl_attach_tooltip->win); - ewl_container_redirect_set(EWL_CONTAINER(emb), redir); - - ewl_widget_layer_top_set(ewl_attach_tooltip->win, TRUE); ewl_callback_prepend(ewl_attach_tooltip->win, EWL_CALLBACK_DESTROY, ewl_attach_cb_tooltip_win_destroy, NULL); - ewl_object_fill_policy_set( - EWL_OBJECT(ewl_attach_tooltip->win), - EWL_FLAG_FILL_NONE); ewl_widget_appearance_set(ewl_attach_tooltip->win, EWL_ATTACH_TOOLTIP_TYPE); @@ -714,17 +667,9 @@ || (ewl_attach_tooltip->embed != EWL_WIDGET(emb))) { - /* remove from the old embed */ - if (ewl_attach_tooltip->embed) - { - ewl_container_child_remove( - EWL_CONTAINER(ewl_attach_tooltip->embed), - ewl_attach_tooltip->win); - } - ewl_attach_tooltip->embed = EWL_WIDGET(emb); - ewl_container_child_append(EWL_CONTAINER(emb), - ewl_attach_tooltip->win); + ewl_popup_follow_set(EWL_POPUP(ewl_attach_tooltip->win), + ewl_attach_tooltip->embed); } } ewl_widget_show(ewl_attach_tooltip->win); @@ -759,7 +704,7 @@ ewl_widget_show(o); } - ewl_floater_position_set(EWL_FLOATER(ewl_attach_tooltip->win), + ewl_popup_mouse_position_set(EWL_POPUP(ewl_attach_tooltip->win), ewl_attach_tooltip->x, ewl_attach_tooltip->y); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- ewl_combo.c 18 Oct 2006 16:28:08 -0000 1.35 +++ ewl_combo.c 4 Nov 2006 16:58:05 -0000 1.36 @@ -64,24 +64,26 @@ ewl_menu_base_init(EWL_MENU_BASE(combo->popup)); ewl_widget_internal_set(EWL_WIDGET(combo->popup), TRUE); - combo->popup->popup = ewl_floater_new(); - ewl_floater_follow_set(EWL_FLOATER(combo->popup->popup), + combo->popup->popup = ewl_popup_new(); + ewl_popup_follow_set(EWL_POPUP(combo->popup->popup), EWL_WIDGET(combo)); - ewl_widget_internal_set(combo->popup->popup, TRUE); - ewl_widget_layer_top_set(combo->popup->popup, TRUE); - ewl_widget_appearance_set(combo->popup->popup, EWL_IMENU_TYPE); - ewl_box_orientation_set(EWL_BOX(combo->popup->popup), - EWL_ORIENTATION_VERTICAL); - ewl_object_fill_policy_set(EWL_OBJECT(combo->popup->popup), - EWL_FLAG_FILL_NONE); + ewl_popup_type_set(EWL_POPUP(combo->popup->popup), + EWL_POPUP_TYPE_MENU_VERTICAL); + ewl_window_keyboard_grab_set(EWL_WINDOW(combo->popup->popup), TRUE); + ewl_window_pointer_grab_set(EWL_WINDOW(combo->popup->popup), TRUE); + ewl_widget_appearance_set(combo->popup->popup, EWL_COMBO_TYPE + "/"EWL_POPUP_TYPE); ewl_object_alignment_set(EWL_OBJECT(combo->popup->popup), EWL_FLAG_ALIGN_LEFT | EWL_FLAG_ALIGN_TOP); + ewl_callback_append(combo->popup->popup, EWL_CALLBACK_MOUSE_DOWN, + ewl_combo_cb_popup_mouse_down, combo); ewl_callback_append(EWL_WIDGET(combo), EWL_CALLBACK_CONFIGURE, ewl_combo_cb_configure, NULL); ewl_object_fill_policy_set(EWL_OBJECT(combo), EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VSHRINK); + DRETURN_INT(TRUE, DLEVEL_STABLE); } @@ -149,11 +151,12 @@ combo = EWL_COMBO(w); if (EWL_MENU_ITEM(combo->popup)->inmenu) - ewl_floater_position_set(EWL_FLOATER(combo->popup->popup), - CURRENT_W(w), 0); + ewl_popup_type_set(EWL_POPUP(combo->popup->popup), + EWL_POPUP_TYPE_MENU_HORIZONTAL); else - ewl_floater_position_set(EWL_FLOATER(combo->popup->popup), - 0, CURRENT_H(w)); + ewl_popup_type_set(EWL_POPUP(combo->popup->popup), + EWL_POPUP_TYPE_MENU_VERTICAL); + DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -192,19 +195,10 @@ /* change the button appearance and expand the menu */ ewl_widget_appearance_set(combo->button, "increment"); - ewl_callback_del(combo->button, EWL_CALLBACK_CLICKED, - ewl_combo_cb_decrement_clicked); - ewl_callback_append(combo->button, EWL_CALLBACK_CLICKED, - ewl_combo_cb_increment_clicked, combo); ewl_menu_base_cb_expand(EWL_WIDGET(combo->popup), ev, NULL); - if (!REALIZED(combo->popup->popup)) - { - Ewl_Embed *emb; - emb = ewl_embed_widget_find(EWL_WIDGET(combo)); - ewl_container_child_append(EWL_CONTAINER(emb), - combo->popup->popup); - } + ewl_window_raise(EWL_WINDOW(combo->popup->popup)); + ewl_widget_focus_send(EWL_WIDGET(combo->popup->popbox)); if (!ewl_mvc_dirty_get(EWL_MVC(combo))) DRETURN(DLEVEL_STABLE); @@ -231,27 +225,24 @@ * @internal * @param w: UNUSED * @param ev: UNUSED - * @param data: The combo widget + * @param data: The combo popup * @return Returns no value * @brief Callback for when the button to close the combo is clicked */ void -ewl_combo_cb_increment_clicked(Ewl_Widget *w __UNUSED__, +ewl_combo_cb_popup_mouse_down(Ewl_Widget *w, void *ev __UNUSED__, void *data) { - Ewl_Combo *combo; - DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("data", data); - combo = data; - ewl_widget_hide(combo->popup->popup); - - ewl_widget_appearance_set(combo->button, "decrement"); - ewl_callback_del(combo->button, EWL_CALLBACK_CLICKED, - ewl_combo_cb_increment_clicked); - ewl_callback_append(combo->button, EWL_CALLBACK_CLICKED, - ewl_combo_cb_decrement_clicked, combo); + if (w == ewl_embed_focused_widget_get(EWL_EMBED(w))) { + Ewl_Combo *combo; + + combo = EWL_COMBO(data); + ewl_widget_hide(combo->popup->popup); + ewl_widget_appearance_set(combo->button, "decrement"); + } DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -278,7 +269,6 @@ i = ewl_container_child_index_get(EWL_CONTAINER(combo->popup), w); ewl_mvc_selected_set(EWL_MVC(combo), i, -1); - ewl_combo_cb_increment_clicked(NULL, NULL, data); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -321,9 +311,10 @@ if (combo->header) { - ewl_container_child_prepend(EWL_CONTAINER(combo), combo->header); + ewl_container_child_prepend(EWL_CONTAINER(combo), + combo->header); ewl_object_fill_policy_set(EWL_OBJECT(combo->header), - EWL_FLAG_FILL_VFILL); + EWL_FLAG_FILL_FILL); ewl_widget_show(combo->header); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.h,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- ewl_combo.h 18 Oct 2006 16:28:08 -0000 1.17 +++ ewl_combo.h 4 Nov 2006 16:58:05 -0000 1.18 @@ -57,7 +57,7 @@ */ void ewl_combo_cb_configure(Ewl_Widget *w, void *ev, void *data); void ewl_combo_cb_decrement_clicked(Ewl_Widget *w, void *ev, void *data); -void ewl_combo_cb_increment_clicked(Ewl_Widget *w, void *ev, void *data); +void ewl_combo_cb_popup_mouse_down(Ewl_Widget *w, void *ev, void *data); void ewl_combo_cb_item_clicked(Ewl_Widget *w, void *ev, void *data); /** =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- ewl_container.c 3 Oct 2006 03:58:16 -0000 1.49 +++ ewl_container.c 4 Nov 2006 16:58:05 -0000 1.50 @@ -1186,7 +1186,7 @@ Ewl_Container * ewl_container_end_redirect_get(Ewl_Container *c) { - Ewl_Container *rc; + Ewl_Container *rc = NULL; DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR_RET("c", c, NULL); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v retrieving revision 1.91 retrieving revision 1.92 diff -u -3 -r1.91 -r1.92 --- ewl_embed.c 26 Oct 2006 05:37:11 -0000 1.91 +++ ewl_embed.c 4 Nov 2006 16:58:05 -0000 1.92 @@ -1649,6 +1649,26 @@ } /** + * @param e: the embed to query for window-position + * @param w: a pointer to the integer that should receive the width + * @param h: a pointer to the integer that should receive the height + * @return Returns no value. + * @brief Retrieve the size of the root window + * + * Stores the root window size into the parameters @a w and @a h. + */ +void +ewl_embed_desktop_size_get(Ewl_Embed *e, int *w, int *h) +{ + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("e", e); + DCHECK_TYPE("e", e, EWL_EMBED_TYPE); + + ewl_engine_desktop_size_get(e, w, h); + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} +/** * @param e: the embed to freeze redraws and canvas events * @return Returns no value. * @brief Freeze redraws and events on the specified embed. =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.h,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- ewl_embed.h 26 Oct 2006 05:41:07 -0000 1.32 +++ ewl_embed.h 4 Nov 2006 16:58:05 -0000 1.33 @@ -145,6 +145,7 @@ void ewl_embed_mouse_cursor_set(Ewl_Widget *w); void ewl_embed_position_get(Ewl_Embed *e, int *x, int *y); void ewl_embed_window_position_get(Ewl_Embed *e, int *x, int *y); +void ewl_embed_desktop_size_get(Ewl_Embed *e, int *w, int *y); void ewl_embed_freeze(Ewl_Embed *e); void ewl_embed_thaw(Ewl_Embed *e); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_engines.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- ewl_engines.c 27 Oct 2006 04:26:56 -0000 1.20 +++ ewl_engines.c 4 Nov 2006 16:58:05 -0000 1.21 @@ -787,6 +787,31 @@ } /** + * @param embed: the embed to work with + * @parm w: a pointer where the width of the desktop will be stored + * @parm h: a pointer where the height pf the desktop will be stored + * @return Returns no value + * @brief Sets the dnd awareness + */ +void +ewl_engine_desktop_size_get(Ewl_Embed *embed, int *w, int *h) +{ + Ewl_Engine_Cb_Window_Desktop_Size_Get desktop_size_get; + + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("embed", embed); + DCHECK_TYPE("embed", embed, EWL_EMBED_TYPE); + + desktop_size_get = ewl_engine_hook_get(EWL_EMBED(embed), + EWL_ENGINE_HOOK_TYPE_WINDOW, + EWL_ENGINE_WINDOW_DESKTOP_SIZE_GET); + if (desktop_size_get) + desktop_size_get(embed, w, h); + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + +/** * @param win: the window to work with * @return Returns no value * @brief Sets up the canvas =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_engines.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ewl_engines.h 20 Oct 2006 04:37:34 -0000 1.14 +++ ewl_engines.h 4 Nov 2006 16:58:05 -0000 1.15 @@ -39,6 +39,7 @@ EWL_ENGINE_WINDOW_GEOMETRY_GET, /**< Get the window geometry */ EWL_ENGINE_WINDOW_DND_AWARE_SET, /**< Set the window dnd aware */ + EWL_ENGINE_WINDOW_DESKTOP_SIZE_GET, /**< Get the size of the desktop */ EWL_ENGINE_WINDOW_MAX }; @@ -173,6 +174,7 @@ void ewl_engine_window_geometry_get(Ewl_Window *win, int root, int *width, int *height); void ewl_engine_embed_dnd_aware_set(Ewl_Embed *embed); +void ewl_engine_desktop_size_get(Ewl_Embed *embed, int *w, int *h); void ewl_engine_canvas_setup(Ewl_Window *win, int debug); void ewl_engine_canvas_output_set(Ewl_Embed *emb, int x, int y, @@ -227,6 +229,9 @@ geometry */ typedef void (*Ewl_Engine_Cb_Window_Dnd_Aware_Set)(Ewl_Embed *embed); /**< Set the embed dnd aware */ +typedef void (*Ewl_Engine_Cb_Window_Desktop_Size_Get)(Ewl_Embed *embed, + int *w, int *h); /**< Get the desktop + size */ typedef void (*Ewl_Engine_Cb_Canvas_Setup)(Ewl_Window *win, int debug); /**< Setup the render canvas */ typedef void (*Ewl_Engine_Cb_Canvas_Output_Set)(Ewl_Embed *emb, int x, int y, =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v retrieving revision 1.62 retrieving revision 1.63 diff -u -3 -r1.62 -r1.63 --- ewl_enums.h 18 Oct 2006 16:28:08 -0000 1.62 +++ ewl_enums.h 4 Nov 2006 16:58:05 -0000 1.63 @@ -263,6 +263,23 @@ typedef enum Ewl_Window_Flags Ewl_Window_Flags; /** + * @enum Ewl_Popup_Types + * The possible popup types + */ +enum Ewl_Popup_Type +{ + EWL_POPUP_TYPE_NONE, + EWL_POPUP_TYPE_MOUSE, + EWL_POPUP_TYPE_MENU_HORIZONTAL, + EWL_POPUP_TYPE_MENU_VERTICAL +}; + +/** + * The Ewl_Popup_Types type + */ +typedef enum Ewl_Popup_Type Ewl_Popup_Type; + +/** * @enum Ewl_Tree_Node_Flags * The available tree node states */ =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- ewl_menu.c 2 Oct 2006 05:19:24 -0000 1.34 +++ ewl_menu.c 4 Nov 2006 16:58:05 -0000 1.35 @@ -51,8 +51,6 @@ ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_FOCUS_IN, ewl_menu_cb_expand, NULL); - ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_REALIZE, - ewl_menu_cb_realize, NULL); ewl_callback_append(EWL_WIDGET(menu), EWL_CALLBACK_CONFIGURE, ewl_menu_cb_configure, NULL); @@ -61,18 +59,16 @@ /* * Create the popup menu portion of the widget. */ - menu->base.popup = ewl_window_new(); + menu->base.popup = ewl_popup_new(); ewl_window_keyboard_grab_set(EWL_WINDOW(menu->base.popup), TRUE); ewl_window_pointer_grab_set(EWL_WINDOW(menu->base.popup), TRUE); + ewl_popup_follow_set(EWL_POPUP(menu->base.popup), EWL_WIDGET(menu)); - ewl_window_override_set(EWL_WINDOW(menu->base.popup), TRUE); - ewl_window_borderless_set(EWL_WINDOW(menu->base.popup)); ewl_widget_internal_set(menu->base.popup, TRUE); ewl_widget_appearance_set(EWL_WIDGET(menu->base.popup), EWL_MENU_TYPE); - ewl_object_fill_policy_set(EWL_OBJECT(menu->base.popup), - EWL_FLAG_FILL_NONE); ewl_object_alignment_set(EWL_OBJECT(menu->base.popup), EWL_FLAG_ALIGN_LEFT | EWL_FLAG_ALIGN_TOP); + ewl_callback_append(menu->base.popup, EWL_CALLBACK_MOUSE_DOWN, ewl_menu_cb_hide, menu); @@ -93,60 +89,26 @@ * @param ev_data: UNUSED * @param user_data: UNUSED * @return Returns no value - * @brief The realize callback - */ -void -ewl_menu_cb_realize(Ewl_Widget *w, void *ev_data __UNUSED__, - void *user_data __UNUSED__) -{ - Ewl_Menu *menu; - - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); - - menu = EWL_MENU(w); - - ewl_menu_cb_popup_move(menu->base.popup, NULL, w); - - /* - * Position the popup menu relative to the menu. - */ - ewl_callback_append(EWL_WIDGET(EWL_WINDOW(menu->base.popup)), - EWL_CALLBACK_CONFIGURE, - ewl_menu_cb_popup_move, w); - - DLEAVE_FUNCTION(DLEVEL_STABLE); -} - -/** - * @internal - * @param w: The widget to work with - * @param ev_data: UNUSED - * @param user_data: UNUSED - * @return Returns no value * @brief The configure callback */ void ewl_menu_cb_configure(Ewl_Widget *w, void *ev_data __UNUSED__, void *user_data __UNUSED__) { - int x, y; Ewl_Menu *menu; - Ewl_Embed *emb; DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); menu = EWL_MENU(w); - emb = ewl_embed_widget_find(w); - - ewl_embed_window_position_get(EWL_EMBED(emb), &x, &y); - menu->popup_x = x + CURRENT_X(w); - menu->popup_y = y + CURRENT_Y(w); - - ewl_menu_cb_popup_move(menu->base.popup, NULL, w); + + if (EWL_MENU_ITEM(menu)->inmenu) + ewl_popup_type_set(EWL_POPUP(menu->base.popup), + EWL_POPUP_TYPE_MENU_HORIZONTAL); + else + ewl_popup_type_set(EWL_POPUP(menu->base.popup), + EWL_POPUP_TYPE_MENU_VERTICAL); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -230,40 +192,6 @@ * @param ev_data: UNUSED * @param user_data: UNUSED * @return Returns no value - * @brief The popup move callback - */ -void -ewl_menu_cb_popup_move(Ewl_Widget *w, void *ev_data __UNUSED__, - void *user_data) -{ - Ewl_Widget *menu; - - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("w", w); - DCHECK_PARAM_PTR("user_data", user_data); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); - - menu = EWL_WIDGET (user_data); - if (EWL_MENU_ITEM(menu)->inmenu) { - ewl_window_move(EWL_WINDOW(w), - EWL_MENU(menu)->popup_x + CURRENT_W(menu), - EWL_MENU(menu)->popup_y); - } - else { - ewl_window_move(EWL_WINDOW(w), - EWL_MENU(menu)->popup_x, - EWL_MENU(menu)->popup_y + CURRENT_H(menu)); - } - - DLEAVE_FUNCTION(DLEVEL_STABLE); -} - -/** - * @internal - * @param w: The widget to work with - * @param ev_data: UNUSED - * @param user_data: UNUSED - * @return Returns no value * @brief The mouse move callback */ void @@ -317,7 +245,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); - + if (w == ewl_embed_focused_widget_get(EWL_EMBED(w))) ewl_widget_hide(w); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- ewl_menu.h 30 Sep 2006 18:41:01 -0000 1.15 +++ ewl_menu.h 4 Nov 2006 16:58:05 -0000 1.16 @@ -38,8 +38,6 @@ struct Ewl_Menu { Ewl_Menu_Base base; /**< Inherit from Ewl_Menu_Base */ - int popup_x; /**< Popup X position */ - int popup_y; /**< Popup Y position */ Ewl_Widget *menubar_parent; /**< Parent menu bar */ }; @@ -53,7 +51,6 @@ void ewl_menu_cb_realize(Ewl_Widget *w, void *ev_data, void *user_data); void ewl_menu_cb_configure(Ewl_Widget *w, void *ev_data, void *user_data); void ewl_menu_cb_expand(Ewl_Widget *w, void *ev_data, void *user_data); -void ewl_menu_cb_popup_move(Ewl_Widget *w, void *ev_data, void *user_data); void ewl_menu_cb_hide(Ewl_Widget *w, void *ev_data, void *user_data); void ewl_menu_cb_destroy(Ewl_Widget *w, void *ev, void *data); void ewl_menu_cb_popup_destroy(Ewl_Widget *w, void *ev, void *data); |
From: Enlightenment C. <no...@cv...> - 2006-11-09 20:03:41
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_button.c Log Message: the event structure for EWL_CALLBACK_CLICKED is the same like mouse up and not down =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_button.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -3 -r1.39 -r1.40 --- ewl_button.c 7 Oct 2006 02:11:44 -0000 1.39 +++ ewl_button.c 9 Nov 2006 20:03:33 -0000 1.40 @@ -407,7 +407,7 @@ void ewl_button_cb_key_down(Ewl_Widget *w, void *ev, void *data __UNUSED__) { - Ewl_Event_Key_Down *event; + Ewl_Event_Key_Up *event; DENTER_FUNCTION(DLEVEL_STABLE); |
From: Enlightenment C. <no...@cv...> - 2006-11-16 19:13:48
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_calendar.c ewl_datepicker.c ewl_datepicker.h Log Message: - datepicker: use ewl_poup - calendar: some minor improvemnts =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_calendar.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- ewl_calendar.c 6 Sep 2006 15:16:11 -0000 1.20 +++ ewl_calendar.c 16 Nov 2006 19:13:46 -0000 1.21 @@ -77,8 +77,6 @@ vbox = ewl_vbox_new(); ewl_container_child_append(EWL_CONTAINER(ib), vbox); - ewl_object_minimum_w_set(EWL_OBJECT(vbox), 150); - ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_VSHRINK); ewl_widget_show(vbox); top_hbox = ewl_hbox_new(); @@ -87,27 +85,32 @@ prev_button = ewl_button_new(); ewl_container_child_append(EWL_CONTAINER(top_hbox), prev_button); + ewl_object_fill_policy_set(EWL_OBJECT(prev_button), EWL_FLAG_FILL_NONE); + ewl_object_alignment_set(EWL_OBJECT(prev_button), EWL_FLAG_ALIGN_LEFT); ewl_button_image_set(EWL_BUTTON(prev_button), ewl_icon_theme_icon_path_get(EWL_ICON_GO_PREVIOUS, EWL_ICON_SIZE_SMALL), EWL_ICON_GO_PREVIOUS); - ewl_object_maximum_size_set(EWL_OBJECT(prev_button), 20,10); ewl_callback_append(prev_button, EWL_CALLBACK_MOUSE_DOWN, ewl_calendar_prev_month_cb, ib); ewl_widget_show(prev_button); ib->month_label = ewl_label_new(); + ewl_object_fill_policy_set(EWL_OBJECT(ib->month_label), + EWL_FLAG_FILL_FILL); + ewl_object_alignment_set(EWL_OBJECT(ib->month_label), + EWL_FLAG_ALIGN_CENTER); ewl_container_child_append(EWL_CONTAINER(top_hbox), ib->month_label); ewl_label_text_set(EWL_LABEL(ib->month_label), "Disp"); - ewl_object_maximum_h_set(EWL_OBJECT(ib->month_label), 10); ewl_widget_show(ib->month_label); next_button = ewl_button_new(); + ewl_object_fill_policy_set(EWL_OBJECT(next_button), EWL_FLAG_FILL_NONE); + ewl_object_alignment_set(EWL_OBJECT(next_button), EWL_FLAG_ALIGN_RIGHT); ewl_container_child_append(EWL_CONTAINER(top_hbox), next_button); ewl_button_image_set(EWL_BUTTON(next_button), ewl_icon_theme_icon_path_get(EWL_ICON_GO_NEXT, EWL_ICON_SIZE_SMALL), EWL_ICON_GO_NEXT); - ewl_object_maximum_size_set(EWL_OBJECT(next_button), 20,10); ewl_callback_append(next_button, EWL_CALLBACK_MOUSE_DOWN, ewl_calendar_next_month_cb, ib); ewl_widget_show(next_button); @@ -116,7 +119,6 @@ ewl_grid_dimensions_set(EWL_GRID(ib->grid), 7, 7); ewl_container_child_append(EWL_CONTAINER(vbox), EWL_WIDGET(ib->grid)); ewl_object_fill_policy_set(EWL_OBJECT(ib->grid), EWL_FLAG_FILL_FILL); - ewl_object_minimum_h_set(EWL_OBJECT(ib->grid), 100); ewl_widget_show(ib->grid); /* Get the start time.. */ =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_datepicker.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- ewl_datepicker.c 2 Oct 2006 05:19:24 -0000 1.15 +++ ewl_datepicker.c 16 Nov 2006 19:13:46 -0000 1.16 @@ -3,7 +3,6 @@ #include "ewl_debug.h" #include "ewl_macros.h" -static void ewl_datepicker_calendar_position_set(Ewl_Datepicker *dp); static void ewl_datepicker_cb_dropdown(Ewl_Widget *w, void *ev_data, void *user_data); @@ -45,20 +44,27 @@ if (!ewl_text_init(EWL_TEXT(dp))) DRETURN_INT(FALSE, DLEVEL_STABLE); - ewl_text_text_set(EWL_TEXT(dp), "Date Test"); - - /* Init ewl setup */ ewl_widget_appearance_set(EWL_WIDGET(dp), EWL_DATEPICKER_TYPE); ewl_widget_inherit(EWL_WIDGET(dp), EWL_DATEPICKER_TYPE); + ewl_object_fill_policy_set(EWL_OBJECT(dp), EWL_FLAG_FILL_HFILL | + EWL_FLAG_FILL_NONE); - dp->calendar_window = ewl_window_new(); - ewl_object_custom_size_set(EWL_OBJECT(dp->calendar_window), 159, 170); + dp->calendar_window = ewl_popup_new(); + ewl_widget_appearance_set(dp->calendar_window, EWL_DATEPICKER_TYPE"/" + EWL_POPUP_TYPE); ewl_object_fill_policy_set(EWL_OBJECT(dp->calendar_window), - EWL_FLAG_FILL_FILL); - ewl_widget_layer_top_set(dp->calendar_window, TRUE); - ewl_window_borderless_set(EWL_WINDOW(dp->calendar_window)); + EWL_FLAG_FILL_NONE); + ewl_popup_type_set(EWL_POPUP(dp->calendar_window), + EWL_POPUP_TYPE_MENU_VERTICAL); + ewl_popup_follow_set(EWL_POPUP(dp->calendar_window), EWL_WIDGET(dp)); + ewl_window_keyboard_grab_set(EWL_WINDOW(dp->calendar_window), TRUE); + ewl_window_pointer_grab_set(EWL_WINDOW(dp->calendar_window), TRUE); + ewl_callback_append(dp->calendar_window, EWL_CALLBACK_MOUSE_DOWN, + ewl_datepicker_cb_window_mouse_down, dp); dp->calendar = ewl_calendar_new(); + ewl_object_fill_policy_set(EWL_OBJECT(dp->calendar), + EWL_FLAG_FILL_NONE); ewl_container_child_append(EWL_CONTAINER(dp->calendar_window), dp->calendar); ewl_callback_append(EWL_WIDGET(dp->calendar), @@ -66,12 +72,8 @@ ewl_datepicker_cb_value_changed, dp); ewl_widget_show(dp->calendar); - ewl_datepicker_calendar_position_set(dp); - ewl_callback_prepend(EWL_WIDGET(dp), EWL_CALLBACK_DESTROY, ewl_datepicker_cb_destroy, dp); - ewl_callback_append(EWL_WIDGET(dp), EWL_CALLBACK_CONFIGURE, - ewl_datepicker_cb_configure, NULL); ewl_callback_append(EWL_WIDGET(dp), EWL_CALLBACK_MOUSE_DOWN, ewl_datepicker_cb_dropdown, NULL); @@ -100,28 +102,6 @@ dp = EWL_DATEPICKER(w); ewl_widget_destroy(dp->calendar_window); - ewl_widget_destroy(dp->calendar); - - DLEAVE_FUNCTION(DLEVEL_STABLE); -} - -/** - * @internal - * @param w: The widget to work with - * @param ev: UNUSED - * @param user_data: UNUSED - * @return Returns no value - * @brief The configure callback - */ -void -ewl_datepicker_cb_configure(Ewl_Widget *w, void *ev __UNUSED__, - void *user_data __UNUSED__) -{ - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("w", w); - DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); - - ewl_datepicker_calendar_position_set(EWL_DATEPICKER(w)); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -156,44 +136,22 @@ /** * @internal - * @param w: The widget to work with + * @param w: the calendar window * @param ev: UNUSED - * @param user_data: UNUSED + * @param user_data: The datepicker * @return Returns no value - * @brief Realize callback + * @brief Callback to hide the calendar window */ void -ewl_datepicker_cb_realize(Ewl_Widget *w, void *ev __UNUSED__, - void *user_data __UNUSED__) +ewl_datepicker_cb_window_mouse_down(Ewl_Widget *w, void *ev __UNUSED__, + void *user_data) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); - ewl_datepicker_calendar_position_set(EWL_DATEPICKER(w)); - - DLEAVE_FUNCTION(DLEVEL_STABLE); -} - -static void -ewl_datepicker_calendar_position_set(Ewl_Datepicker *dp) -{ - int x, y; - int sx, sy; - Ewl_Embed *emb; - - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("dp", dp); - DCHECK_TYPE("dp", dp, EWL_DATEPICKER_TYPE); - - /* Get the position of the parent */ - emb = ewl_embed_widget_find(EWL_WIDGET(dp)); - if (emb) { - ewl_embed_window_position_get(EWL_EMBED(emb), &x, &y); - ewl_object_current_size_get(EWL_OBJECT(dp), &sx, &sy); - ewl_window_move(EWL_WINDOW(dp->calendar_window), x + (sx / 4), - y + sy + 3); - } + if (w == ewl_embed_focused_widget_get(EWL_EMBED(w))) + ewl_widget_hide(w); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -211,7 +169,6 @@ dp = EWL_DATEPICKER(w); ewl_widget_show(dp->calendar_window); ewl_window_raise(EWL_WINDOW(dp->calendar_window)); - ewl_datepicker_calendar_position_set(dp); DLEAVE_FUNCTION(DLEVEL_STABLE); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_datepicker.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ewl_datepicker.h 30 Sep 2006 18:41:01 -0000 1.9 +++ ewl_datepicker.h 16 Nov 2006 19:13:46 -0000 1.10 @@ -49,9 +49,9 @@ * Internally used callbacks, override at your risk */ void ewl_datepicker_cb_destroy(Ewl_Widget *w, void *ev, void *user_data); -void ewl_datepicker_cb_configure(Ewl_Widget *w, void *ev, void *user_data); void ewl_datepicker_cb_value_changed(Ewl_Widget *w, void *ev, void *user_data); -void ewl_datepicker_cb_realize(Ewl_Widget *w, void *ev, void *user_data); +void ewl_datepicker_cb_window_mouse_down(Ewl_Widget *w, void *ev, + void *user_data); /** * @} |
From: Enlightenment C. <no...@cv...> - 2006-11-16 19:14:21
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17 Modified Files: e17.edc Log Message: - datepicker: use ewl_poup - calendar: some minor improvemnts =================================================================== RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/e17.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e17.edc 16 Nov 2006 15:44:38 -0000 1.2 +++ e17.edc 16 Nov 2006 19:13:46 -0000 1.3 @@ -163,6 +163,7 @@ item, "/tooltip/group" "window"; item, "/window/group" "window"; + item, "/popup/group" "window"; item, "/shadow/group" "widget/shadow"; item, "/theme/name" "e17"; |
From: Enlightenment C. <no...@cv...> - 2006-11-18 14:45:20
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_popup.c ewl_popup.h ewl_menu.c Log Message: - stop the short flickering of the popup - place the menu on the correct position if the menubar is vertical =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_popup.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ewl_popup.c 5 Nov 2006 22:08:22 -0000 1.2 +++ ewl_popup.c 18 Nov 2006 14:45:14 -0000 1.3 @@ -61,7 +61,8 @@ ewl_callback_append(w, EWL_CALLBACK_SHOW, ewl_popup_cb_show, NULL); ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, ewl_popup_cb_show, NULL); - ewl_callback_prepend(w, EWL_CALLBACK_DESTROY, ewl_popup_cb_destroy, NULL); + ewl_callback_prepend(w, EWL_CALLBACK_DESTROY, ewl_popup_cb_destroy, + NULL); DRETURN_INT(TRUE, DLEVEL_STABLE); } @@ -117,13 +118,19 @@ if (p->follow == w) DRETURN(DLEVEL_STABLE); - if (p->follow) + if (p->follow) { ewl_callback_del_with_data(p->follow, EWL_CALLBACK_DESTROY, ewl_popup_cb_follow_destroy, p); - - if (w) + ewl_callback_del_with_data(p->follow, EWL_CALLBACK_CONFIGURE, + ewl_popup_cb_follow_configure, + p); + } + if (w) { ewl_callback_prepend(w, EWL_CALLBACK_DESTROY, ewl_popup_cb_follow_destroy, p); + ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, + ewl_popup_cb_follow_configure, p); + } p->follow = w; @@ -200,6 +207,30 @@ if (p->follow) ewl_callback_del_with_data(p->follow, EWL_CALLBACK_DESTROY, ewl_popup_cb_follow_destroy, p); + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + +/** + * @internal + * @param w: UNUSED + * @param ev_data: UNUSED + * @param user_data: the popup + * @return Returns no value + * @brief The configure callback + */ +void +ewl_popup_cb_follow_configure(Ewl_Widget *w __UNUSED__, + void *ev_data __UNUSED__, void *user_data) +{ + Ewl_Popup *p; + + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("user_data", user_data); + DCHECK_TYPE("user_data", user_data, EWL_POPUP_TYPE); + + p = EWL_POPUP(user_data); + ewl_popup_position_check(p); DLEAVE_FUNCTION(DLEVEL_STABLE); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_popup.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ewl_popup.h 5 Nov 2006 22:08:22 -0000 1.2 +++ ewl_popup.h 18 Nov 2006 14:45:14 -0000 1.3 @@ -55,6 +55,8 @@ Ewl_Orientation o); void ewl_popup_cb_child_show(Ewl_Container *c, Ewl_Widget *w); void ewl_popup_cb_follow_destroy(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_popup_cb_follow_configure(Ewl_Widget *w, void *ev_data, + void *user_data); /** * @} =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_menu.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- ewl_menu.c 4 Nov 2006 16:58:05 -0000 1.35 +++ ewl_menu.c 18 Nov 2006 14:45:14 -0000 1.36 @@ -96,14 +96,18 @@ void *user_data __UNUSED__) { Ewl_Menu *menu; + Ewl_Box *parent; DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); menu = EWL_MENU(w); + parent = EWL_BOX(menu->menubar_parent); - if (EWL_MENU_ITEM(menu)->inmenu) + if ((parent && (ewl_box_orientation_get(parent) + == EWL_ORIENTATION_VERTICAL)) + || EWL_MENU_ITEM(menu)->inmenu) ewl_popup_type_set(EWL_POPUP(menu->base.popup), EWL_POPUP_TYPE_MENU_HORIZONTAL); else |