From: Enlightenment C. <no...@cv...> - 2006-05-22 19:13:09
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_window.c ewl_embed.c Log Message: fix the placement of the embed content =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- ewl_window.c 21 May 2006 03:51:41 -0000 1.43 +++ ewl_window.c 22 May 2006 19:11:37 -0000 1.44 @@ -1002,7 +1002,6 @@ void *user_data __UNUSED__) { Ewl_Window *win; - Ewl_Object *child; int width, height; DENTER_FUNCTION(DLEVEL_STABLE); @@ -1067,43 +1066,7 @@ 0, 0); /* aspect */ } #endif - - /* - * Configure each of the child widgets. - */ - ecore_dlist_goto_first(EWL_CONTAINER(w)->children); - while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children))) { - int x, y; - int size; - - /* - * Try to give the child the full size of the window from it's - * base position. The object will constrict it based on the - * fill policy. Don't add the TOP and LEFT insets since - * they've already been accounted for. - */ - x = ewl_object_current_x_get(EWL_OBJECT(child)); - y = ewl_object_current_y_get(EWL_OBJECT(child)); - - if (x < CURRENT_X(w)) { - x = CURRENT_X(w); - size = ewl_object_preferred_w_get(EWL_OBJECT(child)); - if (size > PREFERRED_W(w)) - ewl_object_preferred_inner_w_set(EWL_OBJECT(w), - size); - } - if (y < CURRENT_Y(w)) { - y = CURRENT_Y(w); - size = ewl_object_preferred_h_get(EWL_OBJECT(child)); - if (size > PREFERRED_H(w)) - ewl_object_preferred_inner_h_set(EWL_OBJECT(w), - size); - } - - ewl_object_place(child, x, y, CURRENT_W(w) - (x - CURRENT_X(w)), - CURRENT_H(w) - (y - CURRENT_Y(w))); - } - + DLEAVE_FUNCTION(DLEVEL_STABLE); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -3 -r1.57 -r1.58 --- ewl_embed.c 21 May 2006 03:51:41 -0000 1.57 +++ ewl_embed.c 22 May 2006 19:11:37 -0000 1.58 @@ -1597,6 +1597,7 @@ void *user_data __UNUSED__) { Ewl_Embed *emb; + Ewl_Object *child; DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); @@ -1608,6 +1609,42 @@ (Evas_Coord)(CURRENT_Y(w))); evas_object_resize(emb->ev_clip, (Evas_Coord)(CURRENT_W(w)), (Evas_Coord)(CURRENT_H(w))); + } + + /* + * Configure each of the child widgets. + */ + ecore_dlist_goto_first(EWL_CONTAINER(w)->children); + while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children))) { + int x, y; + int size; + + /* + * Try to give the child the full size of the window from it's + * base position. The object will constrict it based on the + * fill policy. Don't add the TOP and LEFT insets since + * they've already been accounted for. + */ + x = ewl_object_current_x_get(EWL_OBJECT(child)); + y = ewl_object_current_y_get(EWL_OBJECT(child)); + + if (x < CURRENT_X(w)) { + x = CURRENT_X(w); + size = ewl_object_preferred_w_get(EWL_OBJECT(child)); + if (size > PREFERRED_W(w)) + ewl_object_preferred_inner_w_set(EWL_OBJECT(w), + size); + } + if (y < CURRENT_Y(w)) { + y = CURRENT_Y(w); + size = ewl_object_preferred_h_get(EWL_OBJECT(child)); + if (size > PREFERRED_H(w)) + ewl_object_preferred_inner_h_set(EWL_OBJECT(w), + size); + } + + ewl_object_place(child, x, y, CURRENT_W(w) - (x - CURRENT_X(w)), + CURRENT_H(w) - (y - CURRENT_Y(w))); } DLEAVE_FUNCTION(DLEVEL_STABLE); |
From: Enlightenment C. <no...@cv...> - 2006-05-25 18:28:55
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin Modified Files: ewl_simple_test.c Log Message: add to ewl_widget_state_set() an argument showing if the state is persistent or transient =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/bin/ewl_simple_test.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- ewl_simple_test.c 8 Feb 2006 04:48:10 -0000 1.10 +++ ewl_simple_test.c 25 May 2006 18:27:18 -0000 1.11 @@ -189,7 +189,7 @@ void *user_data) { Ewl_Widget *logo = user_data; - ewl_widget_state_set(logo, "start_tour"); + ewl_widget_state_set(logo, "start_tour", EWL_STATE_PERSISTENT); } static void |
From: Enlightenment C. <no...@cv...> - 2006-05-25 18:29:28
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_check.c ewl_entry.c ewl_enums.h ewl_filelist.c ewl_notebook.c ewl_paned.c ewl_tree.c ewl_widget.c ewl_widget.h Log Message: add to ewl_widget_state_set() an argument showing if the state is persistent or transient =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_check.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ewl_check.c 10 Mar 2006 04:06:43 -0000 1.8 +++ ewl_check.c 25 May 2006 18:27:18 -0000 1.9 @@ -128,9 +128,9 @@ cb = EWL_CHECK(w); if (cb->checked) - ewl_widget_state_set(w, "checked"); + ewl_widget_state_set(w, "checked", EWL_STATE_PERSISTENT); else - ewl_widget_state_set(w, "default"); + ewl_widget_state_set(w, "default", EWL_STATE_PERSISTENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_entry.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -3 -r1.53 -r1.54 --- ewl_entry.c 11 May 2006 04:01:20 -0000 1.53 +++ ewl_entry.c 25 May 2006 18:27:18 -0000 1.54 @@ -159,7 +159,8 @@ if (ewl_object_state_has(EWL_OBJECT(e), EWL_FLAG_STATE_FOCUSED)) ewl_widget_show(e->cursor); - ewl_widget_state_set(EWL_WIDGET(e), "editable"); + ewl_widget_state_set(EWL_WIDGET(e), "editable", + EWL_STATE_PERSISTENT); } else { @@ -169,7 +170,8 @@ if (ewl_object_state_has(EWL_OBJECT(e), EWL_FLAG_STATE_FOCUSED)) ewl_widget_hide(e->cursor); - ewl_widget_state_set(EWL_WIDGET(e), "noteditable"); + ewl_widget_state_set(EWL_WIDGET(e), "noteditable", + EWL_STATE_PERSISTENT); } DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -314,7 +316,8 @@ e = EWL_ENTRY(w); /* reset the cursor blink */ - ewl_widget_state_set(EWL_WIDGET(e->cursor), "noblink"); + ewl_widget_state_set(EWL_WIDGET(e->cursor), "noblink", + EWL_STATE_PERSISTENT); if (!strcmp(event->keyname, "Left")) ewl_entry_cursor_move_left(e); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v retrieving revision 1.44 retrieving revision 1.45 diff -u -3 -r1.44 -r1.45 --- ewl_enums.h 12 May 2006 01:24:39 -0000 1.44 +++ ewl_enums.h 25 May 2006 18:27:18 -0000 1.45 @@ -358,6 +358,20 @@ typedef enum Ewl_Key_Modifiers Ewl_Key_Modifiers; /** + * @enum Ewl_State_Type + * The state type + */ +enum Ewl_State_Type { + EWL_STATE_TRANSIENT, + EWL_STATE_PERSISTENT +}; + +/** + * The Ewl_State_Type type + */ +typedef enum Ewl_State_Type Ewl_State_Type; + +/** * @enum Ewl_Stock_Type * The different stock types */ =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_filelist.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- ewl_filelist.c 24 May 2006 02:55:15 -0000 1.15 +++ ewl_filelist.c 25 May 2006 18:27:18 -0000 1.16 @@ -532,7 +532,7 @@ ecore_list_goto_first(fl->selected); while ((item = ecore_list_next(fl->selected))) - ewl_widget_state_set(item, signal); + ewl_widget_state_set(item, signal, EWL_STATE_PERSISTENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -777,7 +777,8 @@ ecore_list_clear(fl->selected); if (select_state) - ewl_widget_state_set(w, select_state); + ewl_widget_state_set(w, select_state, + EWL_STATE_PERSISTENT); ecore_list_append(fl->selected, w); ewl_filelist_selected_files_change_notify(fl); @@ -809,7 +810,9 @@ fl->select.last = w; } - if (select_state) ewl_widget_state_set(w, select_state); + if (select_state) + ewl_widget_state_set(w, select_state, + EWL_STATE_PERSISTENT); ecore_list_append(fl->selected, w); ewl_filelist_selected_files_change_notify(fl); @@ -825,13 +828,15 @@ if (item) { if (unselect_state) - ewl_widget_state_set(w, unselect_state); + ewl_widget_state_set(w, unselect_state, + EWL_STATE_PERSISTENT); ecore_list_remove(fl->selected); } else { if (select_state) - ewl_widget_state_set(w, select_state); + ewl_widget_state_set(w, select_state, + EWL_STATE_PERSISTENT); ecore_list_append(fl->selected, w); } } @@ -904,7 +909,8 @@ fl->select.last, cur_idx, clicked); /* make sure the last selected is removed */ - ewl_widget_state_set(fl->select.last, unselect_signal); + ewl_widget_state_set(fl->select.last, unselect_signal, + EWL_STATE_PERSISTENT); ecore_list_goto(fl->selected, fl->select.last); ecore_list_remove(fl->selected); @@ -965,7 +971,7 @@ if (add) { - ewl_widget_state_set(cur, signal); + ewl_widget_state_set(cur, signal, EWL_STATE_PERSISTENT); ecore_list_append(fl->selected, cur); } else @@ -975,7 +981,8 @@ { ecore_list_goto(fl->selected, cur); ecore_list_remove(fl->selected); - ewl_widget_state_set(cur, signal); + ewl_widget_state_set(cur, signal, + EWL_STATE_PERSISTENT); } } } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_notebook.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- ewl_notebook.c 3 Mar 2006 06:19:00 -0000 1.14 +++ ewl_notebook.c 25 May 2006 18:27:18 -0000 1.15 @@ -259,7 +259,7 @@ Ewl_Widget *w; t = ewl_attach_notebook_data_get(n->cur_page); - if (t) ewl_widget_state_set(t, "default"); + if (t) ewl_widget_state_set(t, "default", EWL_STATE_PERSISTENT); /* make sure we set n->cur_page null first or the hide * callback won't let us hide */ @@ -272,7 +272,7 @@ ewl_widget_show(n->cur_page); t = ewl_attach_notebook_data_get(n->cur_page); - if (t) ewl_widget_state_set(t, "selected"); + if (t) ewl_widget_state_set(t, "selected", EWL_STATE_PERSISTENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -391,7 +391,7 @@ /* if this is the current page set it's tab to selected */ if (n->cur_page == page) - ewl_widget_state_set(t, "selected"); + ewl_widget_state_set(t, "selected", EWL_STATE_PERSISTENT); ewl_container_child_append(EWL_CONTAINER(t), tab); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_paned.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- ewl_paned.c 24 May 2006 02:55:15 -0000 1.30 +++ ewl_paned.c 25 May 2006 18:27:18 -0000 1.31 @@ -700,7 +700,7 @@ ewl_callback_append(w, EWL_CALLBACK_MOUSE_MOVE, ewl_paned_grabber_cb_mouse_move, NULL); - ewl_widget_state_set(w, "selected"); + ewl_widget_state_set(w, "selected", EWL_STATE_PERSISTENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -715,7 +715,7 @@ ewl_callback_del(w, EWL_CALLBACK_MOUSE_MOVE, ewl_paned_grabber_cb_mouse_move); - ewl_widget_state_set(w, "default"); + ewl_widget_state_set(w, "default", EWL_STATE_PERSISTENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- ewl_tree.c 11 May 2006 04:01:20 -0000 1.35 +++ ewl_tree.c 25 May 2006 18:27:18 -0000 1.36 @@ -609,7 +609,7 @@ DCHECK_TYPE("tree", tree, EWL_TREE_TYPE); while ((w = ecore_list_remove_first(tree->selected))) - ewl_widget_state_set(w, "tree-deselect"); + ewl_widget_state_set(w, "tree-deselect", EWL_STATE_PERSISTENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -673,10 +673,10 @@ DCHECK_TYPE("row", row, EWL_WIDGET_TYPE); if (ewl_tree_row_pos & 1) { - ewl_widget_state_set(row, "odd"); + ewl_widget_state_set(row, "odd", EWL_STATE_PERSISTENT); } else { - ewl_widget_state_set(row, "even"); + ewl_widget_state_set(row, "even", EWL_STATE_PERSISTENT); } ewl_tree_row_pos++; @@ -966,7 +966,8 @@ node->expanded = EWL_TREE_NODE_COLLAPSED; - ewl_widget_state_set(EWL_WIDGET(node), "collapsed"); + ewl_widget_state_set(EWL_WIDGET(node), "collapsed", + EWL_STATE_PERSISTENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -1016,7 +1017,8 @@ ecore_list_destroy(tmp); - ewl_widget_state_set(EWL_WIDGET(node), "expanded"); + ewl_widget_state_set(EWL_WIDGET(node), "expanded", + EWL_STATE_PERSISTENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -1257,7 +1259,7 @@ if (tree->mode != EWL_TREE_MODE_NONE) { if (ecore_list_goto(tree->selected, w) == NULL) ecore_list_append(tree->selected, w); - ewl_widget_state_set(w, "tree-selected"); + ewl_widget_state_set(w, "tree-selected", EWL_STATE_PERSISTENT); } DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -1279,7 +1281,8 @@ if (ecore_list_goto(tree->selected, w)) { ecore_list_remove(tree->selected); - ewl_widget_state_set(w, "tree-deselected"); + ewl_widget_state_set(w, "tree-deselected", + EWL_STATE_PERSISTENT); } DLEAVE_FUNCTION(DLEVEL_STABLE); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v retrieving revision 1.80 retrieving revision 1.81 diff -u -3 -r1.80 -r1.81 --- ewl_widget.c 25 May 2006 17:56:08 -0000 1.80 +++ ewl_widget.c 25 May 2006 18:27:18 -0000 1.81 @@ -699,6 +699,7 @@ /** * @param w: the widget to update the appearance * @param state: the new state of the widget + * @param flag: the flag for the state e.g. EWL_STATE_TRANSIENT * @return Returns no value. * @brief Update the appearance of the widget to a state * @@ -706,7 +707,7 @@ * the state parameter. */ void -ewl_widget_state_set(Ewl_Widget *w, const char *state) +ewl_widget_state_set(Ewl_Widget *w, const char *state, Ewl_State_Type flag) { DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("w", w); @@ -717,7 +718,8 @@ * Intentionally lose a reference to the ecore string to keep a * reference cached for later re-use. */ - w->bit_state = ecore_string_instance((char *)state); + if (flag == EWL_STATE_PERSISTENT) + w->bit_state = ecore_string_instance((char *)state); if (w->theme_object) { if (ewl_config.theme.print_signals) @@ -2219,12 +2221,15 @@ /* * Set the state of the theme object */ - if (w->bit_state) - ewl_widget_state_set(w, (char *)w->bit_state); + if (w->bit_state) { + ewl_widget_state_set(w, (char *)w->bit_state, + EWL_STATE_PERSISTENT); + } if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED)) - ewl_widget_state_set(w, "disabled"); + ewl_widget_state_set(w, "disabled", + EWL_STATE_PERSISTENT); /* * Apply any text overrides @@ -2616,7 +2621,7 @@ DCHECK_PARAM_PTR("w", w); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); - ewl_widget_state_set(w, "default"); + ewl_widget_state_set(w, "default", EWL_STATE_PERSISTENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -2629,7 +2634,7 @@ DCHECK_PARAM_PTR("w", w); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); - ewl_widget_state_set(w, "disabled"); + ewl_widget_state_set(w, "disabled", EWL_STATE_PERSISTENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -2645,7 +2650,7 @@ if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED)) DRETURN(DLEVEL_STABLE); - ewl_widget_state_set(w, "focus,in"); + ewl_widget_state_set(w, "focus,in", EWL_STATE_TRANSIENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -2661,7 +2666,7 @@ if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED)) DRETURN(DLEVEL_STABLE); - ewl_widget_state_set(w, "focus,out"); + ewl_widget_state_set(w, "focus,out", EWL_STATE_TRANSIENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -2677,7 +2682,7 @@ if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED)) DRETURN(DLEVEL_STABLE); - ewl_widget_state_set(w, "mouse,in"); + ewl_widget_state_set(w, "mouse,in", EWL_STATE_TRANSIENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -2693,7 +2698,7 @@ if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_DISABLED)) DRETURN(DLEVEL_STABLE); - ewl_widget_state_set(w, "mouse,out"); + ewl_widget_state_set(w, "mouse,out", EWL_STATE_TRANSIENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -2713,7 +2718,7 @@ DRETURN(DLEVEL_STABLE); snprintf(state, 14, "mouse,down,%i", e->button); - ewl_widget_state_set(w, state); + ewl_widget_state_set(w, state, EWL_STATE_TRANSIENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -2733,12 +2738,12 @@ DRETURN(DLEVEL_STABLE); snprintf(state, 14, "mouse,up,%i", e->button); - ewl_widget_state_set(w, state); + ewl_widget_state_set(w, state, EWL_STATE_TRANSIENT); if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_MOUSE_IN)) { int x, y; - ewl_widget_state_set(w, "mouse,in"); + ewl_widget_state_set(w, "mouse,in", EWL_STATE_TRANSIENT); x = e->x - (CURRENT_X(w) - INSET_LEFT(w)); y = e->y - (CURRENT_Y(w) - INSET_TOP(w)); if ((x > 0) && (x < CURRENT_W(w) + INSET_HORIZONTAL(w)) && @@ -2751,7 +2756,7 @@ e->x, e->y, e->modifiers); } } else - ewl_widget_state_set(w, "mouse,out"); + ewl_widget_state_set(w, "mouse,out", EWL_STATE_TRANSIENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -2764,7 +2769,7 @@ DCHECK_PARAM_PTR("w", w); DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); - ewl_widget_state_set(w, "mouse,move"); + ewl_widget_state_set(w, "mouse,move", EWL_STATE_TRANSIENT); DLEAVE_FUNCTION(DLEVEL_STABLE); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.h,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- ewl_widget.h 21 May 2006 03:51:41 -0000 1.42 +++ ewl_widget.h 25 May 2006 18:27:18 -0000 1.43 @@ -170,7 +170,8 @@ void *ewl_widget_data_del(Ewl_Widget * w, void *k); void *ewl_widget_data_get(Ewl_Widget * w, void *k); -void ewl_widget_state_set(Ewl_Widget * w, const char *state); +void ewl_widget_state_set(Ewl_Widget * w, const char *state, + Ewl_State_Type flag); void ewl_widget_appearance_set(Ewl_Widget * w, char *appearance); char *ewl_widget_appearance_get(Ewl_Widget * w); |
From: Enlightenment C. <no...@cv...> - 2006-05-28 17:10:50
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_media.c ewl_media.h Log Message: make the video in ewl_media visible again =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- ewl_media.c 28 May 2006 02:39:56 -0000 1.21 +++ ewl_media.c 28 May 2006 17:09:06 -0000 1.22 @@ -61,6 +61,8 @@ ewl_callback_append(w, EWL_CALLBACK_REALIZE, ewl_media_realize_cb, NULL); + ewl_callback_append(w, EWL_CALLBACK_REVEAL, ewl_media_reveal_cb, + NULL); ewl_callback_append(w, EWL_CALLBACK_UNREALIZE, ewl_media_unrealize_cb, NULL); ewl_callback_append(w, EWL_CALLBACK_CONFIGURE, ewl_media_configure_cb, @@ -496,17 +498,41 @@ ewl_media_size_update(m); } #endif - - evas_object_smart_member_add(m->video, w->smart_object); - if (w->fx_clip_box) { - evas_object_clip_set(m->video, w->fx_clip_box); - evas_object_stack_below(m->video, w->fx_clip_box); - } - /* * Now set the media and display it. */ evas_object_show(m->video); + + 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 reveal callback + */ +void +ewl_media_reveal_cb(Ewl_Widget *w, void *ev_data __UNUSED__, + void *user_data __UNUSED__) +{ + Ewl_Media *m; + + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("w", w); + DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + + m = EWL_MEDIA(w); + + if (m->video) { + evas_object_smart_member_add(m->video, w->smart_object); + if (w->fx_clip_box) { + evas_object_clip_set(m->video, w->fx_clip_box); + evas_object_stack_above(m->video, w->fx_clip_box); + } + } DLEAVE_FUNCTION(DLEVEL_STABLE); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_media.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- ewl_media.h 20 Apr 2006 02:58:01 -0000 1.13 +++ ewl_media.h 28 May 2006 17:09:06 -0000 1.14 @@ -79,6 +79,7 @@ * 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); |
From: Enlightenment C. <no...@cv...> - 2006-05-31 20:15:52
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin Modified Files: ewl_embed_test.c Log Message: disable the open button when the glass pane is open disable the close button when the glass pane is closed =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/bin/ewl_embed_test.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ewl_embed_test.c 27 May 2006 17:00:59 -0000 1.9 +++ ewl_embed_test.c 31 May 2006 20:14:04 -0000 1.10 @@ -20,14 +20,18 @@ Ewl_Widget *text, *entry; void -_open(Ewl_Widget *w __UNUSED__, void *e __UNUSED__, void *d __UNUSED__) +_open(Ewl_Widget *w , void *e __UNUSED__, void *d) { + ewl_widget_disable(w); + ewl_widget_enable(EWL_WIDGET(d)); edje_object_signal_emit(edje, "open", "open"); } void -_close(Ewl_Widget *w __UNUSED__, void *e __UNUSED__, void *d __UNUSED__) +_close(Ewl_Widget *w, void *e __UNUSED__, void *d) { + ewl_widget_disable(w); + ewl_widget_enable(EWL_WIDGET(d)); edje_object_signal_emit(edje, "close", "close"); } @@ -66,6 +70,7 @@ main(int argc, char **argv) { Ewl_Widget *wg, *c, *vbox; + Ewl_Widget *button[2]; Ewl_Widget *emb; Evas_Object *eo; Evas_Coord x, y, w, h; @@ -157,7 +162,6 @@ ewl_widget_show(entry); wg = ewl_button_new(); - //ewl_button_stock_type_set(EWL_BUTTON(wg), EWL_STOCK_OK); ewl_button_label_set(EWL_BUTTON(wg), "append"); ewl_object_fill_policy_set(EWL_OBJECT(wg), EWL_FLAG_FILL_SHRINK); ewl_container_child_append(EWL_CONTAINER(c), wg); @@ -178,18 +182,23 @@ ewl_button_label_set(EWL_BUTTON(wg), "open"); ewl_widget_show(wg); ewl_container_child_append(EWL_CONTAINER(c), wg); - ewl_callback_append(wg, EWL_CALLBACK_CLICKED, _open, NULL); + button[0] = wg; wg = ewl_button_new(); ewl_button_label_set(EWL_BUTTON(wg), "close"); ewl_widget_show(wg); ewl_container_child_append(EWL_CONTAINER(c), wg); - ewl_callback_append(wg, EWL_CALLBACK_CLICKED, _close, NULL); ewl_widget_show(emb); + button[1] = wg; + + ewl_callback_append(button[0], EWL_CALLBACK_CLICKED, _open, button[1]); + ewl_callback_append(button[1], EWL_CALLBACK_CLICKED, _close, button[0]); edje_object_signal_emit(edje, "open", "open"); - ewl_main(); + ewl_widget_disable(button[0]); + ewl_main(); + return 0; } |
From: Enlightenment C. <no...@cv...> - 2006-05-31 20:36:33
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: TODO Log Message: TODO =================================================================== RCS file: /cvs/e/e17/libs/ewl/TODO,v retrieving revision 1.100 retrieving revision 1.101 diff -u -3 -r1.100 -r1.101 --- TODO 28 May 2006 18:59:42 -0000 1.100 +++ TODO 31 May 2006 20:34:37 -0000 1.101 @@ -58,6 +58,8 @@ - The column view of the filepicker needs to blank out the preview when you have multiple files selected. +- The focus doesn't change after a focused widget is disabled. + - Ewl_Seeker:: Add value labels and hash marks. - Ewl_Spectrum:: may need to optimize this to only redraw if we have a resize, or a |
From: Enlightenment C. <no...@cv...> - 2006-05-31 21:02:44
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes Modified Files: ewl_embed_test.edc Log Message: formating =================================================================== RCS file: /cvs/e/e17/libs/ewl/data/themes/ewl_embed_test.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ewl_embed_test.edc 27 May 2006 16:56:11 -0000 1.1 +++ ewl_embed_test.edc 31 May 2006 21:00:56 -0000 1.2 @@ -4,148 +4,143 @@ image: "e17_menu_bg.png" LOSSY 95; } -collections { - group { - name, "main"; - parts { +collections { + group { + name: "main"; + parts { part { - name, "bg"; + name: "bg"; description { - state, "default" 0.0; + state: "default" 0.0; image { normal: "e17_menu_bg.png"; } } } - part { - name: "glass_box"; + part { + name: "glass_box"; type: RECT; - description { - state, "default" 0.0; - rel1.offset: 10 10; - rel2.offset: -10 -10; - color, 0 0 0 0; - } - } - + description { + state: "default" 0.0; + rel1.offset: 10 10; + rel2.offset: -10 -10; + color: 0 0 0 0; + } + } + part { name: "swallow"; type: SWALLOW; description { state: "default" 0.0; rel1.offset: 30 30; - rel1.to: "glass_box"; + rel1.to: "glass_box"; rel2.offset: -30 -30; - rel2.to: "glass_box"; + rel2.to: "glass_box"; } } - + part { - name, "glass_left"; + name: "glass_left"; repeat_events: 1; - mouse_events: 1; + mouse_events: 1; description { - state, "default" 0.0; + state: "default" 0.0; rel1 { - relative, 0.0 0.0; - to, "glass_box"; + relative: 0.0 0.0; + to: "glass_box"; } rel2 { - relative, 0.5 1.0; - to: "glass_box"; + relative: 0.5 1.0; + to: "glass_box"; } image { normal: "e17_gadman_overlay_left.png"; + border: 15 0 15 15; } - image.border, 15 0 15 15; } description { - state, "open" 0.0; + state: "open" 0.0; rel1 { - relative, -0.5 0.0; - to, "glass_box"; + relative: -0.5 0.0; + to: "glass_box"; } rel2 { - relative, 0.0 1.0; - to, "glass_box"; + relative: 0.0 1.0; + to: "glass_box"; } image { normal: "e17_gadman_overlay_left.png"; + border: 15 0 15 15; } - - image.border, 15 0 15 15; } } part { - name, "glass_right"; + name: "glass_right"; repeat_events: 1; - + description { - state, "default" 0.0; + state: "default" 0.0; rel1 { - relative, 0.5 0.0; - to, "glass_box"; + relative: 0.5 0.0; + to: "glass_box"; } rel2 { - relative, 1.0 1.0; - to, "glass_box"; + relative: 1.0 1.0; + to: "glass_box"; } image { normal: "e17_gadman_overlay_right.png"; + border: 0 15 15 15; } - - image.border, 0 15 15 15; - } description { - state, "open" 0.0; + state: "open" 0.0; rel1 { - relative, 1.0 0.0; - to, "glass_box"; - } + relative: 1.0 0.0; + to: "glass_box"; + } rel2 { - relative, 2.0 1.0; - to, "glass_box"; + relative: 2.0 1.0; + to: "glass_box"; } image { normal: "e17_gadman_overlay_right.png"; + border: 0 15 15 15; } - - image.border, 0 15 15 15; } } - } programs { program { - name, "open_prog"; - signal, "open"; - source, "open"; + name: "open_prog"; + signal: "open"; + source: "open"; action: STATE_SET "open" 0.0; target: "glass_left"; target: "glass_right"; transition: SINUSOIDAL 1.5; } program { - name, "close_prog"; - signal, "close"; - source, "close"; + name: "close_prog"; + signal: "close"; + source: "close"; action: STATE_SET "default" 0.0; target: "glass_left"; target: "glass_right"; transition: SINUSOIDAL 1.5; } - } } } + |
From: Enlightenment C. <no...@cv...> - 2006-06-01 22:36:46
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_freebox.c Log Message: fix the "growing" issue =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_freebox.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ewl_freebox.c 26 May 2006 17:25:59 -0000 1.11 +++ ewl_freebox.c 1 Jun 2006 22:34:57 -0000 1.12 @@ -340,7 +340,7 @@ Ewl_Container *c; Ewl_Widget *child; int max_pos, largest_size = 0, cur_pos = 0, cur_align; - int base_pos, pad = 0, *x, *y; + int base_pos, start_pos, pad = 0, *x, *y; int *stable_dir, *grow_dir, child_h, child_w; void (*pref_inner)(Ewl_Object *obj, int size); @@ -385,7 +385,7 @@ base_pos = current_pos(EWL_OBJECT(fb)); max_pos = base_pos + current_size(EWL_OBJECT(fb)); - cur_pos = current_anchor(EWL_OBJECT(fb)); + start_pos = cur_pos = current_anchor(EWL_OBJECT(fb)); cur_align = base_pos; c = EWL_CONTAINER(fb); @@ -410,7 +410,7 @@ ewl_object_place(EWL_OBJECT(child), *x, *y, child_w, child_h); cur_align += *stable_dir + pad; } - pref_inner(EWL_OBJECT(fb), cur_pos + largest_size + pad); + pref_inner(EWL_OBJECT(fb), cur_pos - start_pos + largest_size + pad); DLEAVE_FUNCTION(DLEVEL_STABLE); } |
From: Enlightenment C. <no...@cv...> - 2006-06-02 21:58:39
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_embed.c ewl_embed.h Log Message: change key event handling of the embed add mouse wheel support to the embed =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -3 -r1.68 -r1.69 --- ewl_embed.c 28 May 2006 00:50:28 -0000 1.68 +++ ewl_embed.c 2 Jun 2006 21:56:50 -0000 1.69 @@ -44,8 +44,6 @@ static void ewl_embed_evas_key_up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info); -static void strupper(char *str); - /** * @return Returns a new embed on success, or NULL on failure. * @brief Allocate and initialize a new embed @@ -307,7 +305,8 @@ * @brief Sends the event for a key press into an embed. */ void -ewl_embed_key_down_feed(Ewl_Embed *embed, char *keyname, unsigned int mods) +ewl_embed_key_down_feed(Ewl_Embed *embed, const char *keyname, + unsigned int mods) { Ewl_Widget *temp; Ewl_Event_Key_Down ev; @@ -383,7 +382,8 @@ * @brief Sends the event for a key release into an embed. */ void -ewl_embed_key_up_feed(Ewl_Embed *embed, char *keyname, unsigned int mods) +ewl_embed_key_up_feed(Ewl_Embed *embed, const char *keyname, + unsigned int mods) { Ewl_Widget *temp; Ewl_Event_Key_Up ev; @@ -1942,12 +1942,21 @@ } static void -ewl_embed_evas_mouse_wheel_cb(void *data __UNUSED__, Evas *e __UNUSED__, +ewl_embed_evas_mouse_wheel_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, - void *event_info __UNUSED__) + void *event_info) { + Ewl_Embed *embed; + Evas_Event_Mouse_Wheel *ev; + DENTER_FUNCTION(DLEVEL_STABLE); + ev = event_info; + embed = data; + + ewl_embed_mouse_wheel_feed(embed, ev->canvas.x, ev->canvas.y, ev->z, + ev->direction, ewl_ev_modifiers_get()); + DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -1958,13 +1967,12 @@ Ewl_Embed *embed; Evas_Event_Key_Down *ev; unsigned int key_modifiers = 0; - char *keyname; DENTER_FUNCTION(DLEVEL_STABLE); ev = event_info; - keyname = strdup(ev->keyname); embed = data; + if (evas_key_modifier_is_set(ev->modifiers, "Shift")) key_modifiers |= EWL_KEY_MODIFIER_SHIFT; else if (evas_key_modifier_is_set(ev->modifiers, "Alt")) @@ -1979,24 +1987,13 @@ key_modifiers |= EWL_KEY_MODIFIER_WIN; ewl_ev_modifiers_set(key_modifiers); - - /* fixup the space char */ - if (!strncmp(keyname, "space", 5)) { - free(keyname); - keyname = strdup(" "); - - /* fixup the return char */ - } else if (!strncmp(keyname, "Return", 6)) { - free(keyname); - keyname = strdup("\n"); - - /* fixup upper case chars */ - } else if ((key_modifiers & EWL_KEY_MODIFIER_SHIFT) - && (strlen(keyname) == 1)) - strupper(keyname); - - ewl_embed_key_down_feed(embed, keyname, ewl_ev_modifiers_get()); - free(keyname); + + if (!ev->string || iscntrl(*ev->string)) + ewl_embed_key_down_feed(embed, ev->keyname, + ewl_ev_modifiers_get()); + else + ewl_embed_key_down_feed(embed, ev->string, + ewl_ev_modifiers_get()); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -2008,7 +2005,6 @@ Ewl_Embed *embed; Evas_Event_Key_Down *ev = event_info; unsigned int key_modifiers = 0; - char *keyname = strdup(ev->keyname); DENTER_FUNCTION(DLEVEL_STABLE); @@ -2029,39 +2025,12 @@ ewl_ev_modifiers_set(key_modifiers); - /* fixup the space char */ - if (!strncmp(keyname, "space", 5)) { - free(keyname); - keyname = strdup(" "); - - /* fixup the return char */ - } else if (!strncmp(keyname, "Return", 6)) { - free(keyname); - keyname = strdup("\n"); - - /* fixup upper case chars */ - } else if ((key_modifiers & EWL_KEY_MODIFIER_SHIFT) - && (strlen(keyname) == 1)) - strupper(keyname); - - ewl_embed_key_up_feed(embed, keyname, ewl_ev_modifiers_get()); - free(keyname); - - DLEAVE_FUNCTION(DLEVEL_STABLE); -} - -/* - * Uppercase the given string - */ -static void -strupper(char *str) -{ - DENTER_FUNCTION(DLEVEL_STABLE); - DCHECK_PARAM_PTR("str", str); - - char *i; - for(i = str; *i != '\0'; i++) - *i = toupper(*i); + if (!ev->string || iscntrl(*ev->string)) + ewl_embed_key_up_feed(embed, ev->keyname, + ewl_ev_modifiers_get()); + else + ewl_embed_key_up_feed(embed, ev->string, + ewl_ev_modifiers_get()); DLEAVE_FUNCTION(DLEVEL_STABLE); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.h,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- ewl_embed.h 21 May 2006 03:51:41 -0000 1.18 +++ ewl_embed.h 2 Jun 2006 21:56:51 -0000 1.19 @@ -87,9 +87,9 @@ void ewl_embed_active_set(Ewl_Embed *embed, unsigned int act); Ewl_Embed *ewl_embed_active_embed_get(void); -void ewl_embed_key_down_feed(Ewl_Embed *embed, char *keyname, +void ewl_embed_key_down_feed(Ewl_Embed *embed, const char *keyname, unsigned int modifiers); -void ewl_embed_key_up_feed(Ewl_Embed *embed, char *keyname, +void ewl_embed_key_up_feed(Ewl_Embed *embed, const char *keyname, unsigned int modifiers); void ewl_embed_mouse_down_feed(Ewl_Embed *embed, int b, int clicks, int x, int y, unsigned int modifiers); |
From: Enlightenment C. <no...@cv...> - 2006-06-03 16:20:04
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_seeker.c ewl_seeker.h Log Message: add key support to the seekers =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_seeker.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- ewl_seeker.c 26 May 2006 19:01:56 -0000 1.17 +++ ewl_seeker.c 3 Jun 2006 16:18:11 -0000 1.18 @@ -131,6 +131,8 @@ ewl_seeker_mouse_up_cb, NULL); ewl_callback_append(w, EWL_CALLBACK_MOUSE_MOVE, ewl_seeker_mouse_move_cb, NULL); + ewl_callback_append(w, EWL_CALLBACK_KEY_DOWN, + ewl_seeker_key_down_cb, NULL); /* * Append a callback for catching mouse movements on the button and @@ -739,6 +741,64 @@ s->timer = NULL; s->start_time = 0; s->dragstart = 0; + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + +/** + * @internal + * @param w: The widget to work with + * @param ev_data: The Ewl_Event_Key_Down data + * @param user_data: UNUSED + * @return Returns no value + * @brief The key down callback + */ +void +ewl_seeker_key_down_cb(Ewl_Widget *w, void *ev_data, + void *user_data __UNUSED__) +{ + Ewl_Seeker *s; + Ewl_Event_Key_Down *ev; + double start, end; + + void (*increase)(Ewl_Seeker *s); + void (*decrease)(Ewl_Seeker *s); + + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("w", w); + DCHECK_PARAM_PTR("ev_data", ev_data); + DCHECK_TYPE("w", w, EWL_WIDGET_TYPE); + + ev = ev_data; + s = EWL_SEEKER(w); + + if (!s->invert) { + increase = ewl_seeker_increase; + decrease = ewl_seeker_decrease; + start = 0.0; + end = s->range; + } + else { + increase = ewl_seeker_decrease; + decrease = ewl_seeker_increase; + start = s->range; + end = 0.0; + } + + if (!strcmp(ev->keyname, "Home")) + ewl_seeker_value_set(s, start); + else if (!strcmp(ev->keyname, "End")) + ewl_seeker_value_set(s, end); + else if (!strcmp(ev->keyname, "Left") + || !strcmp(ev->keyname, "KP_Left") + || !strcmp(ev->keyname, "Up") + || !strcmp(ev->keyname, "KP_Up")) + decrease(s); + else if (!strcmp(ev->keyname, "Right") + || !strcmp(ev->keyname, "KP_Right") + || !strcmp(ev->keyname, "Down") + || !strcmp(ev->keyname, "KP_Down")) + increase(s); DLEAVE_FUNCTION(DLEVEL_STABLE); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_seeker.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- ewl_seeker.h 26 May 2006 19:58:00 -0000 1.11 +++ ewl_seeker.h 3 Jun 2006 16:18:11 -0000 1.12 @@ -90,6 +90,7 @@ void ewl_seeker_mouse_move_cb(Ewl_Widget *w, void *ev_data, void *user_data); void ewl_seeker_mouse_down_cb(Ewl_Widget *w, void *ev_data, void *user_data); void ewl_seeker_mouse_up_cb(Ewl_Widget *w, void *ev_data, void *user_data); +void ewl_seeker_key_down_cb(Ewl_Widget *w, void *ev_data, void *user_data); void ewl_seeker_child_show_cb(Ewl_Container *p, Ewl_Widget * w); /** |
From: Enlightenment C. <no...@cv...> - 2006-06-06 01:58:59
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_enums.h ewl_window.c ewl_window.h Log Message: add ewl_window_dialog_set/get =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- ewl_enums.h 5 Jun 2006 04:12:30 -0000 1.46 +++ ewl_enums.h 5 Jun 2006 05:05:31 -0000 1.47 @@ -257,7 +257,8 @@ EWL_WINDOW_GRAB_POINTER = 0x4, /**< Window grabs pointer */ EWL_WINDOW_GRAB_KEYBOARD = 0x8, /**< Window grabs keyboard */ EWL_WINDOW_OVERRIDE = 0x10, /**< Window override setting */ - EWL_WINDOW_FULLSCREEN = 0x20 /**< Window is fullscreen */ + EWL_WINDOW_FULLSCREEN = 0x20, /**< Window is fullscreen */ + EWL_WINDOW_DIALOG = 0x40 /**< Window has no max and min buttons */ }; /** =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- ewl_window.c 5 Jun 2006 04:12:30 -0000 1.46 +++ ewl_window.c 5 Jun 2006 05:05:31 -0000 1.47 @@ -283,6 +283,62 @@ } /** + * @param win: the window + * @param override: TRUE or FALSE to indicate dialog state. + * @return Returns no value. + * @brief Changes the dialog state on the specified window. + * + * A dialog window has not a iconify and/or maximize button. + */ +void +ewl_window_dialog_set(Ewl_Window *win, int dialog) +{ + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR("win", win); + DCHECK_TYPE("win", win, EWL_WINDOW_TYPE); + + /* do nothing if already set */ + if (dialog == ewl_window_dialog_get(win)) + DRETURN(DLEVEL_STABLE); + + if (dialog) + win->flags |= EWL_WINDOW_DIALOG; + else + win->flags &= ~EWL_WINDOW_DIALOG; + +#ifdef ENABLE_EWL_SOFTWARE_X11 + if (REALIZED(win) && strstr(win->render, "x11")) { + if (dialog) + ecore_x_netwm_window_type_set( + (Ecore_X_Window)win->window, + ECORE_X_WINDOW_TYPE_DIALOG); + else + ecore_x_netwm_window_type_set( + (Ecore_X_Window)win->window, + ECORE_X_WINDOW_TYPE_NORMAL); +#endif + } + + DLEAVE_FUNCTION(DLEVEL_STABLE); +} + +/** + * @param win: window to retrieve dialog state + * @return Returns TRUE if window is an dialog window, FALSE otherwise. + * @brief Retrieves the current dialog state on a window. + */ +int +ewl_window_dialog_get(Ewl_Window *win) +{ + DENTER_FUNCTION(DLEVEL_STABLE); + DCHECK_PARAM_PTR_RET("win", win, FALSE); + DCHECK_TYPE_RET("win", win, EWL_WINDOW_TYPE, FALSE); + + DRETURN_INT((!!(win->flags & EWL_WINDOW_DIALOG)), DLEVEL_STABLE); +} + + +/** * @param win: The window to work with * @param fullscreen: The fullscreen setting to use * @return Returns no value @@ -744,6 +800,12 @@ if (window->flags & EWL_WINDOW_BORDERLESS) ecore_x_mwm_borderless_set(xwin, 1); + if (window->flags & EWL_WINDOW_DIALOG) + ecore_x_netwm_window_type_set(xwin, + ECORE_X_WINDOW_TYPE_DIALOG); + else + ecore_x_netwm_window_type_set(xwin, + ECORE_X_WINDOW_TYPE_NORMAL); if (window->flags & EWL_WINDOW_FULLSCREEN) { =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- ewl_window.h 5 Jun 2006 04:12:30 -0000 1.16 +++ ewl_window.h 5 Jun 2006 05:05:31 -0000 1.17 @@ -66,6 +66,8 @@ void ewl_window_class_set(Ewl_Window *win, const char *classname); char *ewl_window_class_get(Ewl_Window *win); void ewl_window_borderless_set(Ewl_Window *win); +void ewl_window_dialog_set(Ewl_Window *win, int dialog); +int ewl_window_dialog_get(Ewl_Window *win); void ewl_window_fullscreen_set(Ewl_Window *win, unsigned int fullscreen); unsigned int ewl_window_fullscreen_get(Ewl_Window *win); |
From: Enlightenment C. <no...@cv...> - 2006-06-06 02:32:49
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_window.c Log Message: fix warning =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -3 -r1.47 -r1.48 --- ewl_window.c 5 Jun 2006 05:05:31 -0000 1.47 +++ ewl_window.c 5 Jun 2006 05:16:20 -0000 1.48 @@ -363,7 +363,7 @@ #ifdef ENABLE_EWL_SOFTWARE_X11 if (REALIZED(win) && strstr(win->render, "x11")) { ecore_x_netwm_state_request_send((Ecore_X_Window)win->window, - NULL, ECORE_X_WINDOW_STATE_FULLSCREEN, + 0, ECORE_X_WINDOW_STATE_FULLSCREEN, ECORE_X_WINDOW_STATE_UNKNOWN, TRUE); } #endif |
From: Enlightenment C. <no...@cv...> - 2006-06-06 02:51:38
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_window.c Log Message: oops, make it compile again =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- ewl_window.c 5 Jun 2006 06:16:30 -0000 1.49 +++ ewl_window.c 5 Jun 2006 07:28:42 -0000 1.50 @@ -316,8 +316,8 @@ ecore_x_netwm_window_type_set( (Ecore_X_Window)win->window, ECORE_X_WINDOW_TYPE_NORMAL); -#endif } +#endif DLEAVE_FUNCTION(DLEVEL_STABLE); } |
From: Enlightenment C. <no...@cv...> - 2006-06-07 07:26:48
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_window.c Log Message: fix transient windows =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -3 -r1.51 -r1.52 --- ewl_window.c 5 Jun 2006 20:12:21 -0000 1.51 +++ ewl_window.c 7 Jun 2006 07:24:52 -0000 1.52 @@ -481,9 +481,9 @@ win->transient = forwin; - if (forwin && REALIZED(win)) { + if (forwin && win->window) { #ifdef ENABLE_EWL_SOFTWARE_X11 - if (REALIZED(forwin)) + if (forwin->window) ecore_x_icccm_transient_for_set((Ecore_X_Window)win->window, (Ecore_X_Window)forwin->window); else @@ -492,7 +492,7 @@ ewl_window_realize_transient_cb, win); } - else if (REALIZED(win)) { + else if (win->window) { ecore_x_icccm_transient_for_unset((Ecore_X_Window)win->window); #endif } |
From: Enlightenment C. <no...@cv...> - 2006-06-10 01:02:44
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_entry.c Log Message: add support for non-ASCII characters note that ewl_text isn't capable to support this correctly, so don't wonder if the cursor behaves strange or something like that =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_entry.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- ewl_entry.c 27 May 2006 17:09:00 -0000 1.56 +++ ewl_entry.c 10 Jun 2006 01:00:45 -0000 1.57 @@ -3,10 +3,6 @@ #include "ewl_macros.h" #include "ewl_private.h" -static void ewl_entry_keymap_set(void); - -static Ecore_Hash *shiftmap = NULL, *keymap = NULL; - /** * @return Returns a new Ewl_Widget on success or NULL on failure * @brief Create and return a new Ewl_Entry widget @@ -18,9 +14,6 @@ DENTER_FUNCTION(DLEVEL_STABLE); - if (!keymap) - ewl_entry_keymap_set(); - w = NEW(Ewl_Entry, 1); if (!w) { @@ -392,27 +385,11 @@ } else if (event->keyname) { - char *tmp = NULL, *v; + char *tmp = NULL; ewl_entry_selection_clear(e); - if (event->modifiers & EWL_KEY_MODIFIER_SHIFT) - { - v = ecore_hash_get(shiftmap, event->keyname); - if (v) - tmp = strdup(v); - else if (strlen(event->keyname) == 1) - { - if (event->keyname[0] > 0x60) - event->keyname[0] -= 0x20; - - tmp = strdup(event->keyname); - } - } - else if (strlen(event->keyname) != 1) - { - v = ecore_hash_get(keymap, event->keyname); - if (v) tmp = strdup(v); - } + if (strlen(event->keyname) != 1 && *event->keyname < 0) + tmp = strdup(event->keyname); else tmp = strdup(event->keyname); @@ -674,50 +651,6 @@ DCHECK_TYPE("e", e, EWL_ENTRY_TYPE); ewl_text_text_delete(EWL_TEXT(e), 1); - - DLEAVE_FUNCTION(DLEVEL_STABLE); -} - -static void -ewl_entry_keymap_set(void) -{ - int i; - - DENTER_FUNCTION(DLEVEL_STABLE); - - static const char *tmp_shiftmap[] = { - "grave", "~", "1", "!", "2", "@", - "3", "#", "4", "$", "5", "%", - "6", "^", "7", "&", "8", "*", - "9", "(", "0", ")", - "minus", "_", "equal", "+", - "bracketleft", "{", "bracketright", "}", - "backslash", "|", "semicolon", ":", "apostrophe", "\"", - "comma", "<", "period", ">", "slash", "?", - NULL, NULL - }; - - static const char *tmp_keymap[] = { - "grave", "`", "minus", "-", "equal", "=", - "bracketleft", "[", "bracketright", "]", - "backslash", "\\", "semicolon", ";", - "apostrophe", "'", "comma", ",", - "period", ".", "slash", "/", - NULL, NULL - }; - - shiftmap = ecore_hash_new(ecore_str_hash, ecore_str_compare); - keymap = ecore_hash_new(ecore_str_hash, ecore_str_compare); - if (!shiftmap) DRETURN(DLEVEL_STABLE); - if (!keymap) DRETURN(DLEVEL_STABLE); - - for (i = 0; tmp_shiftmap[i]; i += 2) - ecore_hash_set(shiftmap, (char *)tmp_shiftmap[i], - (char *)tmp_shiftmap[i + 1]); - - for (i = 0; tmp_keymap[i]; i += 2) - ecore_hash_set(keymap, (char *)tmp_keymap[i], - (char *)tmp_keymap[i + 1]); DLEAVE_FUNCTION(DLEVEL_STABLE); } |
From: Enlightenment C. <no...@cv...> - 2006-06-10 01:54:42
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_entry.c Log Message: improve the previous patch of the entryO =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_entry.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -3 -r1.57 -r1.58 --- ewl_entry.c 10 Jun 2006 01:00:45 -0000 1.57 +++ ewl_entry.c 10 Jun 2006 01:52:41 -0000 1.58 @@ -345,7 +345,10 @@ ewl_widget_state_set(EWL_WIDGET(e->cursor), "noblink", EWL_STATE_PERSISTENT); - if (!strcmp(event->keyname, "Left")) + if (!event->keyname) { + DRETURN(DLEVEL_STABLE); + } + else if (!strcmp(event->keyname, "Left")) ewl_entry_cursor_move_left(e); else if (!strcmp(event->keyname, "Right")) @@ -383,23 +386,16 @@ ewl_entry_cursor_position_get(EWL_ENTRY_CURSOR(e->cursor))); } } - else if (event->keyname) + else { - char *tmp = NULL; - + size_t len; + + len = strlen(event->keyname); ewl_entry_selection_clear(e); - if (strlen(event->keyname) != 1 && *event->keyname < 0) - tmp = strdup(event->keyname); - else - tmp = strdup(event->keyname); - - if (tmp) - { - ewl_text_text_insert(EWL_TEXT(e), tmp, + if (len == 1 || (len != 1 && *event->keyname < 0)) + ewl_text_text_insert(EWL_TEXT(e), event->keyname, ewl_entry_cursor_position_get( EWL_ENTRY_CURSOR(e->cursor))); - free(tmp); - } } DLEAVE_FUNCTION(DLEVEL_STABLE); |
From: Enlightenment C. <no...@cv...> - 2006-06-10 16:54:07
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_text.c ewl_entry.c ewl_text.h Log Message: improve the utf-8 support of the entry =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v retrieving revision 1.104 retrieving revision 1.105 diff -u -3 -r1.104 -r1.105 --- ewl_text.c 26 May 2006 19:58:00 -0000 1.104 +++ ewl_text.c 10 Jun 2006 16:52:06 -0000 1.105 @@ -2974,6 +2974,43 @@ DLEAVE_FUNCTION(DLEVEL_STABLE); } +unsigned int +ewl_text_utf_char_position_next(const char *text, unsigned int pos) +{ + const unsigned char *t; + + t = text; + + if (!text) { + DRETURN_INT(0, DLEVEL_STABLE); + } + + do { + pos++; + } + while (t[pos] >= 0x80 && t[pos] <= 0xbf); + + DRETURN_INT(pos, DLEVEL_STABLE); +} + +unsigned int +ewl_text_utf_char_position_prev(const char *text, unsigned int pos) +{ + const unsigned char *t; + + t = text; + + if (!text) + DRETURN_INT(0, DLEVEL_STABLE); + + do { + pos--; + } + while (t[pos] >= 0x80 && t[pos] <= 0xbf && pos > 0); + + DRETURN_INT(pos, DLEVEL_STABLE); +} + /* * Trigger stuff */ =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_entry.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -3 -r1.59 -r1.60 --- ewl_entry.c 10 Jun 2006 04:06:53 -0000 1.59 +++ ewl_entry.c 10 Jun 2006 16:52:06 -0000 1.60 @@ -539,7 +539,9 @@ if (pos == 0) DRETURN(DLEVEL_STABLE); - ewl_entry_cursor_position_set(EWL_ENTRY_CURSOR(e->cursor), pos - 1); + pos = ewl_text_utf_char_position_prev(EWL_TEXT(e)->text, pos); + + ewl_entry_cursor_position_set(EWL_ENTRY_CURSOR(e->cursor), pos); ewl_widget_configure(EWL_WIDGET(e)); DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -565,7 +567,8 @@ if (pos == ewl_text_length_get(EWL_TEXT(e))) DRETURN(DLEVEL_STABLE); - ewl_entry_cursor_position_set(EWL_ENTRY_CURSOR(e->cursor), pos + 1); + pos = ewl_text_utf_char_position_next(EWL_TEXT(e)->text, pos); + ewl_entry_cursor_position_set(EWL_ENTRY_CURSOR(e->cursor), pos); ewl_widget_configure(EWL_WIDGET(e)); DLEAVE_FUNCTION(DLEVEL_STABLE); @@ -621,13 +624,16 @@ void ewl_entry_delete_left(Ewl_Entry *e) { + int pos1, pos2; + DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("e", e); DCHECK_TYPE("e", e, EWL_ENTRY_TYPE); - ewl_entry_cursor_position_set(EWL_ENTRY_CURSOR(e->cursor), - ewl_entry_cursor_position_get(EWL_ENTRY_CURSOR(e->cursor)) - 1); - ewl_text_text_delete(EWL_TEXT(e), 1); + pos1 = ewl_entry_cursor_position_get(EWL_ENTRY_CURSOR(e->cursor)); + pos2 = ewl_text_utf_char_position_prev(EWL_TEXT(e)->text, pos1); + ewl_entry_cursor_position_set(EWL_ENTRY_CURSOR(e->cursor), pos2); + ewl_text_text_delete(EWL_TEXT(e), pos1 - pos2); DLEAVE_FUNCTION(DLEVEL_STABLE); } @@ -640,11 +646,15 @@ void ewl_entry_delete_right(Ewl_Entry *e) { + int pos1, pos2; + DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR("e", e); DCHECK_TYPE("e", e, EWL_ENTRY_TYPE); - ewl_text_text_delete(EWL_TEXT(e), 1); + pos1 = ewl_entry_cursor_position_get(EWL_ENTRY_CURSOR(e->cursor)); + pos2 = ewl_text_utf_char_position_next(EWL_TEXT(e)->text, pos1); + ewl_text_text_delete(EWL_TEXT(e), pos2 - pos1); DLEAVE_FUNCTION(DLEVEL_STABLE); } =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- ewl_text.h 8 May 2006 18:31:51 -0000 1.37 +++ ewl_text.h 10 Jun 2006 16:52:06 -0000 1.38 @@ -241,6 +241,9 @@ unsigned int *b, unsigned int *a, unsigned int idx); +unsigned int ewl_text_utf_char_position_next(const char *text, unsigned int pos); +unsigned int ewl_text_utf_char_position_prev(const char *text, unsigned int pos); + /** * Inherits from Ewl_Widget and extends to provide a trigger for the text * widget |
From: Enlightenment C. <no...@cv...> - 2006-06-11 12:51:21
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_text.c Log Message: utf-8 should now work in the entry =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_text.c,v retrieving revision 1.105 retrieving revision 1.106 diff -u -3 -r1.105 -r1.106 --- ewl_text.c 10 Jun 2006 16:52:06 -0000 1.105 +++ ewl_text.c 11 Jun 2006 12:49:10 -0000 1.106 @@ -237,7 +237,7 @@ if (idx >= t->length) { - idx = t->length - 1; + idx = ewl_text_utf_char_position_prev(t->text, t->length); shifting = 1; } |
From: Enlightenment C. <no...@cv...> - 2006-06-19 19:55:22
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_window.c ewl_embed.c Log Message: fix ewl_embed move issue =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -3 -r1.55 -r1.56 --- ewl_window.c 10 Jun 2006 00:35:06 -0000 1.55 +++ ewl_window.c 20 Jun 2006 00:55:17 -0000 1.56 @@ -72,8 +72,6 @@ * Override the default configure callbacks since the window * has special needs for placement. */ - ewl_callback_del(EWL_WIDGET(w), EWL_CALLBACK_CONFIGURE, - ewl_overlay_configure_cb); ewl_callback_prepend(EWL_WIDGET(w), EWL_CALLBACK_CONFIGURE, ewl_window_configure_cb, NULL); =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -3 -r1.69 -r1.70 --- ewl_embed.c 2 Jun 2006 21:56:50 -0000 1.69 +++ ewl_embed.c 20 Jun 2006 00:55:17 -0000 1.70 @@ -101,6 +101,8 @@ ewl_embed_configure_cb, NULL); ewl_callback_prepend(EWL_WIDGET(w), EWL_CALLBACK_FOCUS_OUT, ewl_embed_focus_out_cb, NULL); + ewl_callback_del(EWL_WIDGET(w), EWL_CALLBACK_CONFIGURE, + ewl_overlay_configure_cb); ecore_list_append(ewl_embed_list, w); @@ -1629,36 +1631,21 @@ */ ecore_dlist_goto_first(EWL_CONTAINER(w)->children); while ((child = ecore_dlist_next(EWL_CONTAINER(w)->children))) { - int x, y; int size; - /* - * Try to give the child the full size of the window from it's - * base position. The object will constrict it based on the - * fill policy. Don't add the TOP and LEFT insets since - * they've already been accounted for. - */ - x = ewl_object_current_x_get(EWL_OBJECT(child)); - y = ewl_object_current_y_get(EWL_OBJECT(child)); - if (x < CURRENT_X(w)) { - x = CURRENT_X(w); - size = ewl_object_preferred_w_get(EWL_OBJECT(child)); - if (size > PREFERRED_W(w)) - ewl_object_preferred_inner_w_set(EWL_OBJECT(w), - size); - } - - if (y < CURRENT_Y(w)) { - y = CURRENT_Y(w); - size = ewl_object_preferred_h_get(EWL_OBJECT(child)); - if (size > PREFERRED_H(w)) - ewl_object_preferred_inner_h_set(EWL_OBJECT(w), - size); - } + size = ewl_object_preferred_w_get(EWL_OBJECT(child)); + if (size > PREFERRED_W(w)) + ewl_object_preferred_inner_w_set(EWL_OBJECT(w), + size); + + size = ewl_object_preferred_h_get(EWL_OBJECT(child)); + if (size > PREFERRED_H(w)) + ewl_object_preferred_inner_h_set(EWL_OBJECT(w), + size); - ewl_object_place(child, x, y, CURRENT_W(w) - (x - CURRENT_X(w)), - CURRENT_H(w) - (y - CURRENT_Y(w))); + ewl_object_place(child, CURRENT_X(w), CURRENT_Y(w), + CURRENT_W(w), CURRENT_H(w)); } DLEAVE_FUNCTION(DLEVEL_STABLE); |
From: Enlightenment C. <no...@cv...> - 2006-06-21 19:25:50
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin Modified Files: ewl_embed_test.c Log Message: use two embeds =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/bin/ewl_embed_test.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ewl_embed_test.c 9 Jun 2006 17:54:06 -0000 1.12 +++ ewl_embed_test.c 22 Jun 2006 00:25:44 -0000 1.13 @@ -173,14 +173,28 @@ ewl_callback_append(wg, EWL_CALLBACK_CLICKED, insert, NULL); ewl_widget_show(wg); - wg = ewl_separator_new(); - ewl_container_child_append(EWL_CONTAINER(vbox), wg); - ewl_widget_show(wg); - + /* + * Setup the second ewl embed + */ + emb = ewl_embed_new(); + ewl_object_fill_policy_set(EWL_OBJECT(emb), EWL_FLAG_FILL_ALL); + eo = ewl_embed_evas_set(EWL_EMBED(emb), evas, + (void *) ecore_evas_software_x11_window_get(ee)); + ewl_widget_show(emb); + + /* + * swallow it into the edje + */ + edje_object_part_geometry_get(edje, "swallow2", &x, &y, &w, &h); + evas_object_move(eo, x, y); + evas_object_resize(eo, w, h); + edje_object_part_swallow(edje, "swallow2", eo); + evas_object_show(eo); + c = ewl_hbox_new(); ewl_object_fill_policy_set(EWL_OBJECT(c), EWL_FLAG_FILL_NONE | EWL_FLAG_FILL_HFILL); - ewl_container_child_append(EWL_CONTAINER(vbox), c); + ewl_container_child_append(EWL_CONTAINER(emb), c); ewl_widget_show(c); wg = ewl_button_new(); @@ -198,8 +212,7 @@ ewl_callback_append(button[0], EWL_CALLBACK_CLICKED, open, button[1]); ewl_callback_append(button[1], EWL_CALLBACK_CLICKED, close, button[0]); - edje_object_signal_emit(edje, "open", "open"); - ewl_widget_disable(button[0]); + ewl_widget_disable(button[1]); ewl_main(); |
From: Enlightenment C. <no...@cv...> - 2006-06-21 19:25:50
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes Modified Files: ewl_embed_test.edc Log Message: use two embeds =================================================================== RCS file: /cvs/e/e17/libs/ewl/data/themes/ewl_embed_test.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ewl_embed_test.edc 31 May 2006 21:00:56 -0000 1.2 +++ ewl_embed_test.edc 22 Jun 2006 00:25:44 -0000 1.3 @@ -18,16 +18,16 @@ } } } - part { + part { name: "glass_box"; type: RECT; description { state: "default" 0.0; rel1.offset: 10 10; - rel2.offset: -10 -10; + rel2.offset: -10 -60; color: 0 0 0 0; } - } + } part { name: "swallow"; @@ -43,8 +43,8 @@ part { name: "glass_left"; - repeat_events: 1; - mouse_events: 1; + //repeat_events: 1; + //mouse_events: 1; description { state: "default" 0.0; @@ -87,7 +87,7 @@ part { name: "glass_right"; - repeat_events: 1; + //repeat_events: 1; description { state: "default" 0.0; @@ -118,6 +118,19 @@ normal: "e17_gadman_overlay_right.png"; border: 0 15 15 15; } + } + } + part { + name: "swallow2"; + type: SWALLOW; + description { + state: "default" 0.0; + rel1.relative: 0.0 1.0; + rel1.offset: 30 10; + rel1.to: "glass_box"; + rel2.relative: 1.0 1.0; + rel2.offset: -40 -10; + rel2.to: "bg"; } } } |
From: Enlightenment C. <no...@cv...> - 2006-06-23 14:57:38
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin/tests Modified Files: Makefile.am Added Files: ewl_layer.c Log Message: add the layer test =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/Makefile.am,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- Makefile.am 10 Jun 2006 00:35:06 -0000 1.29 +++ Makefile.am 23 Jun 2006 19:57:33 -0000 1.30 @@ -25,7 +25,7 @@ ewl_tree.la ewl_table.la ewl_notebook.la \ ewl_scrollpane.la ewl_spinner.la ewl_progressbar.la \ ewl_theme.la ewl_media.la ewl_menu.la ewl_imenu.la \ - ewl_widget.la fullscreen.la modal.la + ewl_widget.la fullscreen.la modal.la ewl_layer.la ewl_border_la_SOURCES = ewl_border.c ewl_border_la_LIBADD = $(top_builddir)/src/lib/libewl.la @@ -314,6 +314,14 @@ -L$(top_builddir)/src/lib/.libs modal_la_DEPENDENCIES = +ewl_layer_la_SOURCES = ewl_layer.c +ewl_layer_la_LIBADD = $(top_builddir)/src/lib/libewl.la +ewl_layer_la_LDFLAGS = -module -avoid-version \ + -L$(top_builddir)/src/lib \ + -L$(top_builddir)/src/lib/.libs +ewl_layer_la_DEPENDENCIES = + + FILES = $(ewl_border_la_SOURCES) $(ewl_box_la_SOURCES) \ $(ewl_button_la_SOURCES) $(ewl_colordialog_la_SOURCES) \ $(ewl_datepicker_la_SOURCES) $(ewl_freebox_la_SOURCES) \ @@ -334,7 +342,7 @@ $(ewl_media_la_SOURCES) $(ewl_menu_la_SOURCES) \ $(ewl_imenu_la_SOURCES) $(ewl_widget_la_SOURCES) \ $(ewl_image_thumbnail_la_SOURCES) $(fullscreen_la_SOURCES) \ - $(modal_la_SOURCES) + $(modal_la_SOURCES) $(ewl_layer_la_SOURCES) EXTRA_DIST = $(FILES) |
From: Enlightenment C. <no...@cv...> - 2006-06-28 14:02:42
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17/bits Modified Files: progressbar-groups.edc Log Message: improve the look of the progressbar, thanks to Andrew Sevcsik =================================================================== RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/bits/progressbar-groups.edc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- progressbar-groups.edc 11 Mar 2005 15:35:02 -0000 1.1 +++ progressbar-groups.edc 28 Jun 2006 19:02:38 -0000 1.2 @@ -23,7 +23,7 @@ offset, -1 -1; } image { - normal, "e17_titlebar_outline.png"; + normal, "entry.png"; border, 8 8 8 8; } } @@ -41,20 +41,19 @@ mouse_events, 0; description { + min, 1 16; state, "default" 0.0; - rel1 { - relative, 0.0 0.0; - offset, 0 0; - } - rel2 { - relative, 1.0 1.0; - offset, -1 -1; - } image { - normal, "e17_titlebar.png"; - border, 2 2 2 2; + normal, "e17_button_sm.png"; + border, 8 8 8 8; } } + description { + state, "disabled" 0.0; + inherit, "default" 0.0; + visible, 0; + } + } } } |
From: Enlightenment C. <no...@cv...> - 2006-07-02 19:37:48
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_entry.c Log Message: Don't insert a char when CTRL is pressed =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_entry.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -3 -r1.60 -r1.61 --- ewl_entry.c 10 Jun 2006 16:52:06 -0000 1.60 +++ ewl_entry.c 3 Jul 2006 00:37:43 -0000 1.61 @@ -386,7 +386,7 @@ ewl_entry_cursor_position_get(EWL_ENTRY_CURSOR(e->cursor))); } } - else + else if (!(event->modifiers & EWL_KEY_MODIFIER_CTRL)) { ewl_entry_selection_clear(e); |
From: Enlightenment C. <no...@cv...> - 2006-07-02 19:56:54
|
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin/tests Modified Files: ewl_text_editor.c Log Message: you can now test utf character support when you hit CTRL-a =================================================================== RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_text_editor.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ewl_text_editor.c 22 May 2006 18:09:00 -0000 1.3 +++ ewl_text_editor.c 3 Jul 2006 00:56:53 -0000 1.4 @@ -2,6 +2,7 @@ #include "ewl_test_private.h" #include <stdio.h> #include <stdlib.h> +#include <string.h> typedef struct { @@ -47,6 +48,7 @@ static void ete_cb_set(Ewl_Widget *w, void *ev, void *data); static void ete_cb_load(Ewl_Widget *w, void *ev, void *data); static void ete_cb_clear(Ewl_Widget *w, void *ev, void *data); +static void ete_cb_key_down(Ewl_Widget *w, void *ev, void *data); void test_info(Ewl_Test *test) @@ -139,6 +141,7 @@ ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VFILL); + ewl_callback_append(o, EWL_CALLBACK_KEY_DOWN, ete_cb_key_down, NULL); ewl_widget_show(o); hbox = ewl_hbox_new(); @@ -377,4 +380,27 @@ ewl_text_clear(EWL_TEXT(entry)); } +static void +ete_cb_key_down(Ewl_Widget *w, void *ev, void *data __UNUSED__) +{ + Ewl_Event_Key_Down *e; + + e = ev; + + /* + * insert an utf-8 character when you hit CTRL-a + */ + if (e && (e->modifiers & EWL_KEY_MODIFIER_CTRL) + && !strcmp(e->keyname, "a")) { + Ewl_Embed * emb; + unsigned char buf[3]; + + emb = ewl_embed_widget_find(w); + buf[0] = 0xC3; + buf[1] = 0xA4; + buf[2] = 0; + + ewl_embed_key_down_feed(emb, (char *)buf, 0); + } +} |