[EGIT] [core/efl] master 01/01: ecore_buffer: fix typos in documentation
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=08d88d805cc8a0df65071aa2e9f55d312abb0a87 commit 08d88d805cc8a0df65071aa2e9f55d312abb0a87 Author: Amitesh SinghDate: Tue Sep 29 09:26:40 2015 +0530 ecore_buffer: fix typos in documentation --- src/lib/ecore_buffer/Ecore_Buffer_Queue.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_buffer/Ecore_Buffer_Queue.h b/src/lib/ecore_buffer/Ecore_Buffer_Queue.h index 81dad17..4bc79ae 100644 --- a/src/lib/ecore_buffer/Ecore_Buffer_Queue.h +++ b/src/lib/ecore_buffer/Ecore_Buffer_Queue.h @@ -51,7 +51,7 @@ extern "C" { * @ingroup Ecore_Buffer_Queue_Group * * This group of functions is applied to an Ecore_Buffer_Provider object. - * Ecore_Buffer_Provider provides Ecore_Buffer to Ecore_Buffer_Consumer(usally + * Ecore_Buffer_Provider provides Ecore_Buffer to Ecore_Buffer_Consumer(usually * different process or thread from Ecore_Buffer_Provider). * Ecore_Buffer_Provider should creates Ecore_Buffer as a provider. */ @@ -353,7 +353,7 @@ EAPI void ecore_buffer_provider_free(Ecore_Buffer_Provider * * This function gives you drawable buffer and inform you the state of Queue. * Each return value of enumeration has meaning as below. - * @li ECORE_BUFFER_RETURN_ERROR, means error occured. + * @li ECORE_BUFFER_RETURN_ERROR, means error occurred. * @li ECORE_BUFFER_RETURN_SUCCESS, means success to dequeue, therefore ret_buf is valid. * @li ECORE_BUFFER_RETURN_EMPTY, means queue is empty, not available slot in Queue. * in other words, there is no free drawable buffer in Queue. --
[EGIT] [core/efl] master 01/01: evas: fix typos in documentation
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=83beb559e9bce4e5f3b7907fcab6ca071a13a5a6 commit 83beb559e9bce4e5f3b7907fcab6ca071a13a5a6 Author: Amitesh SinghDate: Tue Sep 29 09:14:28 2015 +0530 evas: fix typos in documentation --- src/lib/evas/Evas_Common.h | 8 src/lib/evas/Evas_Eo.h | 4 ++-- src/lib/evas/Evas_Legacy.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h index e042b18..5da6437 100644 --- a/src/lib/evas/Evas_Common.h +++ b/src/lib/evas/Evas_Common.h @@ -929,7 +929,7 @@ EAPI int evas_async_events_process(void); * @param event_info Information about the event. * @param func The callback function pointer. * - * @return EINA_FALSE if an error occured, EINA_TRUE otherwise. + * @return EINA_FALSE if an error occurred, EINA_TRUE otherwise. * * This is the way, for a routine running outside evas' main thread, * to report an asynchronous event. A callback function is informed, @@ -1225,7 +1225,7 @@ EAPI void evas_render_updates_free(Eina_List *updates); * part of the canvas @p e will automatically be deleted when the canvas * is freed. * - * @return the device node created or NULL if an error occured. + * @return the device node created or NULL if an error occurred. * * @see evas_device_del * @since 1.8 @@ -1433,7 +1433,7 @@ EAPI Evas_Device_Class evas_device_class_get(const Evas_Device *dev); * @param dev The device to modify * @param clas The sub-class to set * - * This sets the sub-class of a device whihc gives much more detailed usage + * This sets the sub-class of a device which gives much more detailed usage * within a broader category. * * @since 1.8 @@ -5414,7 +5414,7 @@ EAPI const Eina_List *evas_font_path_global_list(void) EINA_WARN_UNUSED_R /** * Reinitialize FontConfig. If FontConfig has to be reinitialized - * according to changes of system enviroments(ex. Changing font config files), it will be useful. + * according to changes of system environments(ex. Changing font config files), it will be useful. * * @ingroup Evas_Font_Path_Group * @since 1.14 diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 3460108..e581315 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -189,7 +189,7 @@ EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE; * to connect the scene with an evas image object so that the scene is rendered * on that image object. * - * Contruction of a 3D scene is process of locating desired cameras, lights and + * Construction of a 3D scene is process of locating desired cameras, lights and * meshes in the scene. Typically the scene is structured with some hierarchical * data structure. Evas 3D support n-ary tree structure for describing the * scene. Node is used to build the tree representation of the scene. Other @@ -271,7 +271,7 @@ EAPI extern const Eo_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE; * camera on a node. If one wants to locate several cameras having same * properties, instead of creating multiple cameras, just create one camera and * multiple nodes containing the camera and locate them at each desired position - * and direction. Just for convinience, use evas_canvas3d_node_position_set() to move + * and direction. Just for convenience, use evas_canvas3d_node_position_set() to move * the camera to desired position and use evas_canvas3d_node_look_at_set() to adjust * the viewing direction of the camera. */ diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 2f6fa55..cc61fbd 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -2046,7 +2046,7 @@ EAPI Efl_Gfx_Join evas_vg_shape_stroke_join_get(Eo *obj); * * Sets the join style to be used for stroking the path. * The join style will be used for joining the two line segment - * while stroking teh path. + * while stroking the path. * * @see Efl_Gfx_Join * @since 1.14 --
[EGIT] [core/enlightenment] master 01/02: do not set client window coordinates during a move until after resizing check
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5f2f1cb67b62ca39ee8ebd35b2149e07412f439d commit 5f2f1cb67b62ca39ee8ebd35b2149e07412f439d Author: Mike BlumenkrantzDate: Mon Sep 28 15:36:58 2015 -0400 do not set client window coordinates during a move until after resizing check fixes case where values would be erroneously updated when they should instead have been rejected ref T2750 --- src/bin/e_comp_object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 8c00cf8..e1d4b84 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -948,9 +948,9 @@ _e_comp_intercept_move(void *data, Evas_Object *obj, int x, int y) } return; } - cw->ec->x = x, cw->ec->y = y; /* only update during resize if triggered by resize */ if (e_client_util_resizing_get(cw->ec) && (!cw->force_move)) return; + cw->ec->x = x, cw->ec->y = y; if (cw->ec->new_client) { /* don't actually do anything until first client idler loop */ --
[EGIT] [core/efl] master 01/01: eldbus: fix typos in documentation
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4b8825bbea573c801f089e0c1091f107439f7d3e commit 4b8825bbea573c801f089e0c1091f107439f7d3e Author: Amitesh SinghDate: Mon Sep 28 21:59:34 2015 +0530 eldbus: fix typos in documentation --- src/lib/eldbus/eldbus_message.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/eldbus/eldbus_message.h b/src/lib/eldbus/eldbus_message.h index 025cad9..439ea46 100644 --- a/src/lib/eldbus/eldbus_message.h +++ b/src/lib/eldbus/eldbus_message.h @@ -149,7 +149,7 @@ EAPI Eina_Bool eldbus_message_error_get(const Eldbus_Message *msg, c * from @param msg * @param ... The pointers in which to store the message arguments * - * @return EINA_TRUE if the arguments were read succesfully and stored in the + * @return EINA_TRUE if the arguments were read successfully and stored in the * respective pointer arguments. */ EAPI Eina_Bool eldbus_message_arguments_get(const Eldbus_Message *msg, const char *signature, ...) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; @@ -163,7 +163,7 @@ EAPI Eina_Bool eldbus_message_arguments_get(const Eldbus_Message *ms * * @see eldbus_message_arguments_get() * - * @return EINA_TRUE if the arguments were read succesfully and stored in the + * @return EINA_TRUE if the arguments were read successfully and stored in the * respective pointer arguments. */ EAPI Eina_Bool eldbus_message_arguments_vget(const Eldbus_Message *msg, const char *signature, va_list ap) EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT; --
[EGIT] [core/enlightenment] master 01/01: s/EAPI/E_API/ ...again
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b9c4911374e6b2b86fbcee48539bf3eab9eacfaa commit b9c4911374e6b2b86fbcee48539bf3eab9eacfaa Author: Mike BlumenkrantzDate: Mon Sep 28 15:51:51 2015 -0400 s/EAPI/E_API/ ...again --- src/bin/e_acpi.c | 2 +- src/bin/e_comp_object.c| 2 +- src/bin/e_comp_object.h| 2 +- src/bin/e_comp_wl_input.c | 4 ++-- src/bin/e_comp_wl_input.h | 2 +- src/modules/wl_text_input/e_mod_main.c | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/bin/e_acpi.c b/src/bin/e_acpi.c index aeb2e6d..bc6b11a 100644 --- a/src/bin/e_acpi.c +++ b/src/bin/e_acpi.c @@ -192,7 +192,7 @@ e_acpi_lid_status_get(void) return E_ACPI_LID_UNKNOWN; } -EAPI Eina_Bool +E_API Eina_Bool e_acpi_lid_is_closed(void) { if (lid_is_closed == -1) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index e5a508c..5d7e421 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -3776,7 +3776,7 @@ e_comp_object_util_mirror_add(Evas_Object *obj) // -EAPI Eina_Bool +E_API Eina_Bool e_comp_object_effect_allowed_get(Evas_Object *obj) { API_ENTRY EINA_FALSE; diff --git a/src/bin/e_comp_object.h b/src/bin/e_comp_object.h index 7c9bbe0..2ed5189 100644 --- a/src/bin/e_comp_object.h +++ b/src/bin/e_comp_object.h @@ -77,7 +77,7 @@ E_API void e_comp_object_native_surface_override(Evas_Object *obj, Evas_Native_S E_API void e_comp_object_blank(Evas_Object *obj, Eina_Bool set); E_API void e_comp_object_dirty(Evas_Object *obj); E_API Eina_Bool e_comp_object_render(Evas_Object *obj); -EAPI Eina_Bool e_comp_object_effect_allowed_get(Evas_Object *obj); +E_API Eina_Bool e_comp_object_effect_allowed_get(Evas_Object *obj); E_API Eina_Bool e_comp_object_effect_set(Evas_Object *obj, const char *effect); E_API void e_comp_object_effect_params_set(Evas_Object *obj, int id, int *params, unsigned int count); E_API void e_comp_object_effect_clip(Evas_Object *obj); diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c index e457aff..932b0f8 100644 --- a/src/bin/e_comp_wl_input.c +++ b/src/bin/e_comp_wl_input.c @@ -3,7 +3,7 @@ #include "e.h" #include -EAPI int E_EVENT_TEXT_INPUT_PANEL_VISIBILITY_CHANGE = -1; +E_API int E_EVENT_TEXT_INPUT_PANEL_VISIBILITY_CHANGE = -1; static void _e_comp_wl_input_update_seat_caps(void) @@ -622,7 +622,7 @@ e_comp_wl_input_keymap_set(const char *rules, const char *model, const char *lay free((char *)names.layout); } -EAPI void +E_API void e_comp_wl_input_touch_enabled_set(Eina_Bool enabled) { /* check for valid compositor data */ diff --git a/src/bin/e_comp_wl_input.h b/src/bin/e_comp_wl_input.h index 15eef2f..b3300c8 100644 --- a/src/bin/e_comp_wl_input.h +++ b/src/bin/e_comp_wl_input.h @@ -3,7 +3,7 @@ # ifndef E_COMP_WL_INPUT_H # define E_COMP_WL_INPUT_H -EAPI extern int E_EVENT_TEXT_INPUT_PANEL_VISIBILITY_CHANGE; +E_API extern int E_EVENT_TEXT_INPUT_PANEL_VISIBILITY_CHANGE; typedef struct _E_Event_Text_Input_Panel_Visibility_Change E_Event_Text_Input_Panel_Visibility_Change; diff --git a/src/modules/wl_text_input/e_mod_main.c b/src/modules/wl_text_input/e_mod_main.c index 67d0459..a31d81a 100644 --- a/src/modules/wl_text_input/e_mod_main.c +++ b/src/modules/wl_text_input/e_mod_main.c @@ -908,9 +908,9 @@ _e_text_cb_bind_input_method(struct wl_client *client, void *data EINA_UNUSED, u _e_text_input_cb_event_client_focus_in, input_method); } -EAPI E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_Text_Input" }; +E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, "Wl_Text_Input" }; -EAPI void * +E_API void * e_modapi_init(E_Module *m) { // FIXME: create only one input method object per seat. @@ -936,7 +936,7 @@ e_modapi_init(E_Module *m) return m; } -EAPI int +E_API int e_modapi_shutdown(E_Module *m EINA_UNUSED) { E_FREE_FUNC(e_comp->wl_comp_data->seat.im.global, wl_global_destroy); --
[EGIT] [core/enlightenment] enlightenment-0.19 08/08: use client window coords for resize-moving without a frame_object
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=14ce1880cb6933eb35aa976f2369e03605bbcde3 commit 14ce1880cb6933eb35aa976f2369e03605bbcde3 Author: Mike BlumenkrantzDate: Mon Sep 28 15:38:13 2015 -0400 use client window coords for resize-moving without a frame_object improves placement of csd windows ref T2750 --- src/bin/e_comp_object.c | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 84a1d00..9212c60 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -838,7 +838,7 @@ static void _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h) { E_Comp_Object *cw = data; - int pw = 0, ph = 0, fw, fh, iw, ih, prev_w, prev_h; + int pw = 0, ph = 0, fw, fh, iw, ih, prev_w, prev_h, x, y; /* if frame_object does not exist, client_inset indicates CSD. * this means that ec->client matches cw->w/h, the opposite @@ -980,18 +980,22 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h) * which also changes the client's position */ cw->force_move = 1; + if (cw->frame_object) + x = cw->x, y = cw->y; + else + x = cw->ec->x, y = cw->ec->y; switch (cw->ec->resize_mode) { case E_POINTER_RESIZE_BL: case E_POINTER_RESIZE_L: -evas_object_move(obj, cw->x + prev_w - cw->w, cw->y); +evas_object_move(obj, x + prev_w - cw->w, y); break; case E_POINTER_RESIZE_TL: -evas_object_move(obj, cw->x + prev_w - cw->w, cw->y + prev_h - cw->h); +evas_object_move(obj, x + prev_w - cw->w, y + prev_h - cw->h); break; case E_POINTER_RESIZE_T: case E_POINTER_RESIZE_TR: -evas_object_move(obj, cw->x, cw->y + prev_h - cw->h); +evas_object_move(obj, x, y + prev_h - cw->h); break; default: break; --
[EGIT] [core/enlightenment] enlightenment-0.19 05/08: unset the requested maximize state when receiving a client unmaximize request
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=3d8c3bb614154918f403ce937579a03c97e2d99a commit 3d8c3bb614154918f403ce937579a03c97e2d99a Author: Mike BlumenkrantzDate: Mon Sep 28 14:41:44 2015 -0400 unset the requested maximize state when receiving a client unmaximize request not sure why it was always removing VERTICAL here but that's a bug --- src/bin/e_hints.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c index 3684cca..2424169 100644 --- a/src/bin/e_hints.c +++ b/src/bin/e_hints.c @@ -809,7 +809,7 @@ e_hints_window_state_update(E_Client *ec, int state, int action) { case ECORE_X_WINDOW_STATE_ACTION_REMOVE: if (ec->maximized & max[state]) -e_client_unmaximize(ec, E_MAXIMIZE_VERTICAL); +e_client_unmaximize(ec, max[state]); break; case ECORE_X_WINDOW_STATE_ACTION_ADD: --
[EGIT] [core/enlightenment] enlightenment-0.19 03/08: unset E_Client->changes.need_unmaximize after calling unmaximize
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=6709eed4c2a542f95219635ba7d98441dec45bc8 commit 6709eed4c2a542f95219635ba7d98441dec45bc8 Author: Mike BlumenkrantzDate: Mon Sep 28 14:37:57 2015 -0400 unset E_Client->changes.need_unmaximize after calling unmaximize ...just in case --- src/bin/e_client.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 3059914..a91ddd0 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -3883,6 +3883,7 @@ e_client_unmaximize(E_Client *ec, E_Maximize max) } e_remember_update(ec); evas_object_smart_callback_call(ec->frame, "unmaximize_done", NULL); + ec->changes.need_unmaximize = 0; } E_API void --
[EGIT] [core/enlightenment] master 02/02: use client window coords for resize-moving without a frame_object
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=6732398856156161d9442b60bd56f8aaec9518c8 commit 6732398856156161d9442b60bd56f8aaec9518c8 Author: Mike BlumenkrantzDate: Mon Sep 28 15:38:13 2015 -0400 use client window coords for resize-moving without a frame_object improves placement of csd windows ref T2750 --- src/bin/e_comp_object.c | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index e1d4b84..e5a508c 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -978,7 +978,7 @@ static void _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h) { E_Comp_Object *cw = data; - int pw = 0, ph = 0, fw, fh, iw, ih, prev_w, prev_h; + int pw = 0, ph = 0, fw, fh, iw, ih, prev_w, prev_h, x, y; /* if frame_object does not exist, client_inset indicates CSD. * this means that ec->client matches cw->w/h, the opposite @@ -1121,18 +1121,22 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h) * which also changes the client's position */ cw->force_move = 1; + if (cw->frame_object) + x = cw->x, y = cw->y; + else + x = cw->ec->x, y = cw->ec->y; switch (cw->ec->resize_mode) { case E_POINTER_RESIZE_BL: case E_POINTER_RESIZE_L: -evas_object_move(obj, cw->x + prev_w - cw->w, cw->y); +evas_object_move(obj, x + prev_w - cw->w, y); break; case E_POINTER_RESIZE_TL: -evas_object_move(obj, cw->x + prev_w - cw->w, cw->y + prev_h - cw->h); +evas_object_move(obj, x + prev_w - cw->w, y + prev_h - cw->h); break; case E_POINTER_RESIZE_T: case E_POINTER_RESIZE_TR: -evas_object_move(obj, cw->x, cw->y + prev_h - cw->h); +evas_object_move(obj, x, y + prev_h - cw->h); break; default: break; --
[EGIT] [core/enlightenment] enlightenment-0.19 04/08: allow client resizes on axes currently unrestricted by maximize state
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=608b38b2e7afbbcb1dcb2a150e6b0dbeaed39922 commit 608b38b2e7afbbcb1dcb2a150e6b0dbeaed39922 Author: Mike BlumenkrantzDate: Mon Sep 28 14:39:42 2015 -0400 allow client resizes on axes currently unrestricted by maximize state if this isn't explicitly blocked by config options then allowing resizes on the unmaximized axes is necessary in order to avoid accidentally queuing a full unmaximize --- src/bin/e_comp_object.c | 31 --- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 74050d0..bfbd51e 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -873,13 +873,30 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h) if ((!e_config->allow_manip) && ((cw->ec->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)) return; if ((!cw->ec->shading) && (!cw->ec->shaded)) { - cw->ec->changes.need_unmaximize = 1; - cw->ec->saved.w = iw; - cw->ec->saved.h = ih; - cw->ec->saved.x = cw->ec->client.x - cw->ec->zone->x; - cw->ec->saved.y = cw->ec->client.y - cw->ec->zone->y; - EC_CHANGED(cw->ec); - return; + Eina_Bool reject = EINA_FALSE; + if (cw->ec->maximized & E_MAXIMIZE_VERTICAL) + { + if (cw->ec->client.h != ih) +{ + cw->ec->saved.h = ih; + cw->ec->saved.y = cw->ec->client.y - cw->ec->zone->y; + reject = cw->ec->changes.need_unmaximize = 1; +} + } + if (cw->ec->maximized & E_MAXIMIZE_HORIZONTAL) + { + if (cw->ec->client.w != iw) +{ + cw->ec->saved.w = iw; + cw->ec->saved.x = cw->ec->client.x - cw->ec->zone->x; + reject = cw->ec->changes.need_unmaximize = 1; +} + } + if (reject) + { + EC_CHANGED(cw->ec); + return; + } } } if (cw->ec->new_client) --
[EGIT] [core/enlightenment] enlightenment-0.19 01/08: force adjustment of client geometry when changing csd frame size
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d103edfd6bae9ee27c9fb1e0330654bcc7f5273a commit d103edfd6bae9ee27c9fb1e0330654bcc7f5273a Author: Mike BlumenkrantzDate: Mon Sep 28 14:02:02 2015 -0400 force adjustment of client geometry when changing csd frame size fix T2750 --- src/bin/e_comp_object.c | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index cac1911..74050d0 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -2773,11 +2773,17 @@ e_comp_object_frame_geometry_set(Evas_Object *obj, int l, int r, int t, int b) cw->client_inset.r = r; cw->client_inset.t = t; cw->client_inset.b = b; - cw->client_inset.calc = 1; + cw->client_inset.calc = l || r || t || b; eina_stringshare_replace(>frame_theme, "borderless"); - if (!cw->ec->new_client) return; cw->ec->w += l + r; cw->ec->h += t + b; + if (!cw->ec->new_client) + { +cw->ec->x -= l; +cw->ec->y -= t; +cw->ec->changes.pos = cw->ec->changes.size = 1; +EC_CHANGED(cw->ec); + } } E_API Eina_Bool --
[EGIT] [core/enlightenment] enlightenment-0.19 07/08: do not set client window coordinates during a move until after resizing check
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=284d3079b74cc3b18ac4e6799f76757425e4e6f2 commit 284d3079b74cc3b18ac4e6799f76757425e4e6f2 Author: Mike BlumenkrantzDate: Mon Sep 28 15:36:58 2015 -0400 do not set client window coordinates during a move until after resizing check fixes case where values would be erroneously updated when they should instead have been rejected ref T2750 --- src/bin/e_comp_object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index bfbd51e..84a1d00 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -808,9 +808,9 @@ _e_comp_intercept_move(void *data, Evas_Object *obj, int x, int y) } return; } - cw->ec->x = x, cw->ec->y = y; /* only update during resize if triggered by resize */ if (e_client_util_resizing_get(cw->ec) && (!cw->force_move)) return; + cw->ec->x = x, cw->ec->y = y; if (cw->ec->new_client) { /* don't actually do anything until first client idler loop */ --
[EGIT] [core/efl] master 01/01: Eo: reduce memory usage across applications.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e2344b9b9ef664c8a251ef21d1afabee0b8326fd commit e2344b9b9ef664c8a251ef21d1afabee0b8326fd Author: Tom HacohenDate: Mon Sep 28 17:18:43 2015 +0100 Eo: reduce memory usage across applications. As described by Carsten in his email to edev ML titled: "[E-devel] eo stability - i think we need to postpone that" with the switch to Eo2 we significantly increased our usage of RW memory pages, and thus significantly increased our memory usage when running multiple applications. The problem was that during the migration to Eo2 the op id cache and the op description arrays were merged, causing the op description arrays to no longer be RO. This patch enables users of Eo (mainly Eolian) to declare those arrays as const (RO) again, saving that memory. There might be performance implications with this patch. I had to remove the op desc array sorting, and I used a hash table for the lookup. I think the op desc sorting doesn't really affect performance because that array is seldom accessed and is usually pretty short. The hash table is not a problem either, because it's behind the scenes, so it can be changed to a more efficient data structure if the hash table is not good enough. The hash table itself is also rarely accessed, so it's mostly about memory. Please keep an eye for any bugs, performance or excessive memory usage. I believe this should be better on all fronts. This commit *BREAKS ABI*. @fix --- src/bin/eolian/eo_generator.c | 2 +- src/lib/eo/Eo.h | 20 ++-- src/lib/eo/eo.c | 185 +++--- src/tests/eo/suite/eo_test_call_errors.c | 2 +- src/tests/eo/suite/eo_test_class_errors.c | 6 +- src/tests/eolian/data/class_simple_ref.c | 4 +- src/tests/eolian/data/override_ref.c | 4 +- 7 files changed, 83 insertions(+), 140 deletions(-) diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c index 85d3cb7..2e4f545 100644 --- a/src/bin/eolian/eo_generator.c +++ b/src/bin/eolian/eo_generator.c @@ -19,7 +19,7 @@ static Eina_Hash *_funcs_params_init = NULL; static const char tmpl_eo_ops_desc[] = "\ -static Eo_Op_Description _@#class_op_desc[] = {@#list_op\n};\n\n"; +static const Eo_Op_Description _@#class_op_desc[] = {@#list_op\n};\n\n"; static const char tmpl_events_desc[] = "\ diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index da16feb..3f551f4 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -132,6 +132,8 @@ enum _Eo_Op_Type EO_OP_TYPE_INVALID = -1, /**< Invalid op. */ EO_OP_TYPE_REGULAR = 0, /**< Regular op. */ EO_OP_TYPE_CLASS, /**< Class op - a class op. Like static in Java/C++. */ + EO_OP_TYPE_REGULAR_OVERRIDE, /**< Regular op override (previously defined) */ + EO_OP_TYPE_CLASS_OVERRIDE, /**< Class op override (previously defined) */ }; /** @@ -344,7 +346,6 @@ typedef struct _Eo_Op_Description { void *api_func; /**< The EAPI function offering this op. (The name of the func on windows) */ void *func; /**< The static function to call for the op. */ - Eo_Op op; /**< The op. */ Eo_Op_Type op_type; /**< The type of the Op. */ } Eo_Op_Description; @@ -360,7 +361,7 @@ struct _Eo_Class_Description const char *name; /**< The name of the class. */ Eo_Class_Type type; /**< The type of the class. */ struct { -Eo_Op_Description *descs; /**< The op descriptions array of size count. */ +const Eo_Op_Description *descs; /**< The op descriptions array of size count. */ size_t count; /**< Number of op descriptions. */ } ops; /**< The ops description, should be filled using #EO_CLASS_DESCRIPTION_OPS (later sorted by Eo). */ const Eo_Event_Description **events; /**< The event descriptions for this class. */ @@ -469,7 +470,7 @@ EAPI extern Eo_Hook_Call eo_hook_call_post; Eina_Bool ___is_main_loop = eina_main_loop_is(); \ static Eo_Op ___op = EO_NOOP; \ if (___op == EO_NOOP) \ - ___op = _eo_api_op_id_get(EO_FUNC_COMMON_OP_FUNC(Name), ___is_main_loop, __FILE__, __LINE__); \ + ___op = _eo_api_op_id_get(EO_FUNC_COMMON_OP_FUNC(Name)); \ if (!_eo_call_resolve(#Name, ___op, &___call, ___is_main_loop, __FILE__, __LINE__)) return DefRet; \ _Eo_##Name##_func _func_ = (_Eo_##Name##_func) ___call.func; \ @@ -522,22 +523,19 @@ EAPI extern Eo_Hook_Call eo_hook_call_post; EO_HOOK_CALL_PREPAREV(eo_hook_call_post, #Name, Arguments);\ } -// OP ID of an overriding function -#define EO_OP_OVERRIDE ((Eo_Op) -1) - #ifndef _WIN32 # define _EO_OP_API_ENTRY(a) a #else # define _EO_OP_API_ENTRY(a) #a
[EGIT] [core/enlightenment] enlightenment-0.19 02/02: reject identical calls to e_comp_object_frame_geometry_set()
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=46b1335adebc12930872e9abfc974d819a074793 commit 46b1335adebc12930872e9abfc974d819a074793 Author: Mike BlumenkrantzDate: Mon Sep 28 14:01:02 2015 -0400 reject identical calls to e_comp_object_frame_geometry_set() --- src/bin/e_comp_object.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 9212c60..b88dfb4 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -2790,6 +2790,8 @@ E_API void e_comp_object_frame_geometry_set(Evas_Object *obj, int l, int r, int t, int b) { API_ENTRY; + if ((cw->client_inset.l == l) && (cw->client_inset.r == r) && + (cw->client_inset.t == t) && (cw->client_inset.b == b)) return; cw->client_inset.l = l; cw->client_inset.r = r; cw->client_inset.t = t; --
[EGIT] [core/efl] master 01/01: eolian tests: strip trailing newlines for ref file compare
q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=17f4c45fc929d26bcbf4e3e8b10d2066d9a1341f commit 17f4c45fc929d26bcbf4e3e8b10d2066d9a1341f Author: Daniel KolesaDate: Mon Sep 28 18:50:07 2015 +0100 eolian tests: strip trailing newlines for ref file compare --- src/tests/eolian/eolian_generation.c | 4 1 file changed, 4 insertions(+) diff --git a/src/tests/eolian/eolian_generation.c b/src/tests/eolian/eolian_generation.c index 1e745e9..0976146 100644 --- a/src/tests/eolian/eolian_generation.c +++ b/src/tests/eolian/eolian_generation.c @@ -42,6 +42,8 @@ _files_compare (const char *ref_filename, const char *tmp_filename) if (fread(tmp_content, tmp_filesize, 1, tmp_file) != 1) goto end; tmp_content[tmp_filesize] = '\0'; + while (tmp_content[tmp_filesize - 1] == '\n') + tmp_content[--tmp_filesize] = '\0'; fseek(ref_file, 0, SEEK_END); long ref_filesize = ftell(ref_file); @@ -51,6 +53,8 @@ _files_compare (const char *ref_filename, const char *tmp_filename) if (fread(ref_content, ref_filesize, 1, ref_file) != 1) goto end; ref_content[ref_filesize] = '\0'; + while (ref_content[ref_filesize - 1] == '\n') + ref_content[--ref_filesize] = '\0'; if (tmp_filesize != ref_filesize) goto end; --
[EGIT] [core/enlightenment] enlightenment-0.19 01/02: efm - handle cancel of async eio if icon is freed and eio still active
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=2fcfb364800fa3f375eb4ad36175f291f51f7979 commit 2fcfb364800fa3f375eb4ad36175f291f51f7979 Author: Carsten Haitzler (Rasterman)Date: Mon Sep 28 16:29:12 2015 +0900 efm - handle cancel of async eio if icon is freed and eio still active @fix --- src/bin/e_fm.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 593744b..3f6be9f 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -4774,6 +4774,11 @@ _e_fm2_icon_free(E_Fm2_Icon *ic) { if (ic->queued) abort(); if (ic->inserted) abort(); + if (ic->eio) + { +eio_file_cancel(ic->eio); +ic->eio = NULL; + } /* free icon, object data etc. etc. */ if (ic->sd->last_placed == ic) { --
[EGIT] [core/enlightenment] enlightenment-0.19 02/02: e - efm fix. fix eio error handler that is called after eio cancel
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ba267da5be345d315e660d1a5dc786ccfea3a344 commit ba267da5be345d315e660d1a5dc786ccfea3a344 Author: Carsten Haitzler (Rasterman)Date: Mon Sep 28 16:49:53 2015 +0900 e - efm fix. fix eio error handler that is called after eio cancel so you have to have an error cb - so make it empty as even after a canel, it is called, and thus accesses an invalid icon we've freed. --- src/bin/e_fm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 3f6be9f..6e1635f 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -5176,10 +5176,8 @@ _e_fm2_cb_eio_stat(void *data, Eio_File *handler __UNUSED__, const Eina_Stat *st } static void -_e_fm2_cb_eio_err(void *data, Eio_File *handler __UNUSED__, int error __UNUSED__) +_e_fm2_cb_eio_err(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, int error EINA_UNUSED) { - E_Fm2_Icon *ic = data; - ic->eio = NULL; } static int --
[EGIT] [core/enlightenment] master 02/08: _GTK_FRAME_EXTENTS changes using a property, not a client message
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=51789af53ccb66283b8ce84031e4ce8ac28fac85 commit 51789af53ccb66283b8ce84031e4ce8ac28fac85 Author: Mike BlumenkrantzDate: Mon Sep 28 14:01:28 2015 -0400 _GTK_FRAME_EXTENTS changes using a property, not a client message --- src/bin/e_comp_x.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 98e7b2b..d795e53 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -1943,6 +1943,11 @@ _e_comp_x_property(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_W ec->e.fetch.profile = 1; EC_CHANGED(ec); } + else if (ev->atom == ATM_GTK_FRAME_EXTENTS) + { +_e_comp_x_client_data_get(ec)->fetch_gtk_frame_extents = 1; +EC_CHANGED(ec); + } return ECORE_CALLBACK_RENEW; } @@ -2131,11 +2136,6 @@ _e_comp_x_message(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Cl } } #endif - else if (ev->message_type == ATM_GTK_FRAME_EXTENTS) - { -_e_comp_x_client_data_get(ec)->fetch_gtk_frame_extents = 1; -EC_CHANGED(ec); - } else DBG("missed client message '%s' for %u", ecore_x_atom_name_get(ev->message_type), ev->win); return ECORE_CALLBACK_PASS_ON; --
[EGIT] [core/efl] master 01/01: emotion: fix typo in documentation
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4884e4164fcf24b93c21b9380fe7e9c0aa8275f6 commit 4884e4164fcf24b93c21b9380fe7e9c0aa8275f6 Author: Amitesh SinghDate: Mon Sep 28 21:54:26 2015 +0530 emotion: fix typo in documentation --- src/lib/emotion/Emotion.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/emotion/Emotion.h b/src/lib/emotion/Emotion.h index 5853b75..e2d7a7a 100644 --- a/src/lib/emotion/Emotion.h +++ b/src/lib/emotion/Emotion.h @@ -1266,7 +1266,7 @@ EAPI void emotion_object_last_position_save(Evas_Object *obj); * * @param file A stringshared filename that we want to know if Emotion can play. * - * This just actually look at the extention of the file, it doesn't check the mime-type + * This just actually look at the extension of the file, it doesn't check the mime-type * nor if the file is actually sane. So this is just an hint for your application. * * @see emotion_object_extension_may_play_get() @@ -1278,7 +1278,7 @@ EAPI Eina_Bool emotion_object_extension_may_play_fast_get(const char *file); * * @param file A filename that we want to know if Emotion can play. * - * This just actually look at the extention of the file, it doesn't check the mime-type + * This just actually look at the extension of the file, it doesn't check the mime-type * nor if the file is actually sane. So this is just an hint for your application. * * @see emotion_object_extension_may_play_fast_get() @@ -1290,7 +1290,7 @@ EAPI Eina_Bool emotion_object_extension_may_play_get(const char *file); * * @param obj The object which the query is being ran on. * - * This function is usefull when you want to get a direct access to the pixels. + * This function is useful when you want to get a direct access to the pixels. * * @see emotion_object_image_get() */ --
[EGIT] [core/efl] master 01/01: ecore_con: fix typo in documentation
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5139f1b404edb5b59fc70f0ecb86761af822e3b0 commit 5139f1b404edb5b59fc70f0ecb86761af822e3b0 Author: Amitesh SinghDate: Mon Sep 28 22:07:26 2015 +0530 ecore_con: fix typo in documentation --- src/lib/ecore_con/Ecore_Con.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h index 8cf39ec..2971221 100644 --- a/src/lib/ecore_con/Ecore_Con.h +++ b/src/lib/ecore_con/Ecore_Con.h @@ -73,7 +73,7 @@ * @defgroup Ecore_Con_Events_Group Ecore Connection Events Functions * @ingroup Ecore_Con_Group * - * The Ecore Con events can be catagorized into Server side events + * The Ecore Con events can be categorized into Server side events * and Client side events. * Server side events: * @li ECORE_CON_CLIENT_ADD: Whenever a client connection is made to an --
[EGIT] [core/enlightenment] master 04/08: remove client maximize states during unmaximize only if they are active
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f0fc7a12deab10d9058fb15b774895f7a9e292a2 commit f0fc7a12deab10d9058fb15b774895f7a9e292a2 Author: Mike BlumenkrantzDate: Mon Sep 28 14:36:59 2015 -0400 remove client maximize states during unmaximize only if they are active do not accidentally remove untested states using bad math operations --- src/bin/e_client.c | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 53c91f8..0f91ba9 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -3837,9 +3837,12 @@ e_client_unmaximize(E_Client *ec, E_Maximize max) h = ec->saved.h; vert = EINA_TRUE; y = ec->saved.y + ec->zone->y; - ec->maximized &= ~E_MAXIMIZE_VERTICAL; - ec->maximized &= ~E_MAXIMIZE_LEFT; - ec->maximized &= ~E_MAXIMIZE_RIGHT; + if ((max & E_MAXIMIZE_VERTICAL) == E_MAXIMIZE_VERTICAL) +ec->maximized &= ~E_MAXIMIZE_VERTICAL; + if ((max & E_MAXIMIZE_LEFT) == E_MAXIMIZE_LEFT) +ec->maximized &= ~E_MAXIMIZE_LEFT; + if ((max & E_MAXIMIZE_RIGHT) == E_MAXIMIZE_RIGHT) +ec->maximized &= ~E_MAXIMIZE_RIGHT; } if (max & E_MAXIMIZE_HORIZONTAL) { --
[EGIT] [core/enlightenment] master 03/08: force adjustment of client geometry when changing csd frame size
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d641c9d96392b436f589020a434d265c268419d7 commit d641c9d96392b436f589020a434d265c268419d7 Author: Mike BlumenkrantzDate: Mon Sep 28 14:02:02 2015 -0400 force adjustment of client geometry when changing csd frame size fix T2750 --- src/bin/e_comp_object.c | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 14df1a3..291e43d 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -2913,11 +2913,17 @@ e_comp_object_frame_geometry_set(Evas_Object *obj, int l, int r, int t, int b) cw->client_inset.r = r; cw->client_inset.t = t; cw->client_inset.b = b; - cw->client_inset.calc = 1; + cw->client_inset.calc = l || r || t || b; eina_stringshare_replace(>frame_theme, "borderless"); - if (!cw->ec->new_client) return; cw->ec->w += l + r; cw->ec->h += t + b; + if (!cw->ec->new_client) + { +cw->ec->x -= l; +cw->ec->y -= t; +cw->ec->changes.pos = cw->ec->changes.size = 1; +EC_CHANGED(cw->ec); + } } E_API Eina_Bool --
[EGIT] [core/enlightenment] master 05/08: unset E_Client->changes.need_unmaximize after calling unmaximize
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=64c4adeca227616b5897f99239a7cf2203508b2c commit 64c4adeca227616b5897f99239a7cf2203508b2c Author: Mike BlumenkrantzDate: Mon Sep 28 14:37:57 2015 -0400 unset E_Client->changes.need_unmaximize after calling unmaximize ...just in case --- src/bin/e_client.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 0f91ba9..91846c1 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -3879,6 +3879,7 @@ e_client_unmaximize(E_Client *ec, E_Maximize max) } e_remember_update(ec); evas_object_smart_callback_call(ec->frame, "unmaximize_done", NULL); + ec->changes.need_unmaximize = 0; } E_API void --
[EGIT] [core/enlightenment] master 01/08: reject identical calls to e_comp_object_frame_geometry_set()
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ed9cd0ea6199892af50974daf2084516d7e19016 commit ed9cd0ea6199892af50974daf2084516d7e19016 Author: Mike BlumenkrantzDate: Mon Sep 28 14:01:02 2015 -0400 reject identical calls to e_comp_object_frame_geometry_set() --- src/bin/e_comp_object.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 60033a2..14df1a3 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -2907,6 +2907,8 @@ E_API void e_comp_object_frame_geometry_set(Evas_Object *obj, int l, int r, int t, int b) { API_ENTRY; + if ((cw->client_inset.l == l) && (cw->client_inset.r == r) && + (cw->client_inset.t == t) && (cw->client_inset.b == b)) return; cw->client_inset.l = l; cw->client_inset.r = r; cw->client_inset.t = t; --
[EGIT] [core/enlightenment] master 08/08: use more accurate math to determine whether to apply a client maximize change
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9b2eb5541c8595ce3d14e59d0ae9f42ac389f7a3 commit 9b2eb5541c8595ce3d14e59d0ae9f42ac389f7a3 Author: Mike BlumenkrantzDate: Mon Sep 28 14:42:21 2015 -0400 use more accurate math to determine whether to apply a client maximize change --- src/bin/e_hints.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c index 83ce387..91de8e3 100644 --- a/src/bin/e_hints.c +++ b/src/bin/e_hints.c @@ -810,12 +810,12 @@ e_hints_window_state_update(E_Client *ec, int state, int action) switch (action) { case ECORE_X_WINDOW_STATE_ACTION_REMOVE: - if (ec->maximized & max[state]) + if ((ec->maximized & max[state]) == max[state]) e_client_unmaximize(ec, max[state]); break; case ECORE_X_WINDOW_STATE_ACTION_ADD: - if (ec->maximized & max[state]) break; + if ((ec->maximized & max[state]) == max[state]) break; ec->changes.need_maximize = 1; ec->maximized &= ~E_MAXIMIZE_TYPE; ec->maximized |= (e_config->maximize_policy & E_MAXIMIZE_TYPE) | max[state]; @@ -823,7 +823,7 @@ e_hints_window_state_update(E_Client *ec, int state, int action) break; case ECORE_X_WINDOW_STATE_ACTION_TOGGLE: - if (ec->maximized & max[state]) + if ((ec->maximized & max[state]) == max[state]) { e_client_unmaximize(ec, max[state]); break; --
[EGIT] [core/enlightenment] master 06/08: allow client resizes on axes currently unrestricted by maximize state
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=7e5eb0a96d899dedf30b99eed3a2fcdea78075aa commit 7e5eb0a96d899dedf30b99eed3a2fcdea78075aa Author: Mike BlumenkrantzDate: Mon Sep 28 14:39:42 2015 -0400 allow client resizes on axes currently unrestricted by maximize state if this isn't explicitly blocked by config options then allowing resizes on the unmaximized axes is necessary in order to avoid accidentally queuing a full unmaximize --- src/bin/e_comp_object.c | 31 --- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 291e43d..8c00cf8 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -1013,13 +1013,30 @@ _e_comp_intercept_resize(void *data, Evas_Object *obj, int w, int h) if ((!e_config->allow_manip) && ((cw->ec->maximized & E_MAXIMIZE_DIRECTION) == E_MAXIMIZE_BOTH)) return; if ((!cw->ec->shading) && (!cw->ec->shaded)) { - cw->ec->changes.need_unmaximize = 1; - cw->ec->saved.w = iw; - cw->ec->saved.h = ih; - cw->ec->saved.x = cw->ec->client.x - cw->ec->zone->x; - cw->ec->saved.y = cw->ec->client.y - cw->ec->zone->y; - EC_CHANGED(cw->ec); - return; + Eina_Bool reject = EINA_FALSE; + if (cw->ec->maximized & E_MAXIMIZE_VERTICAL) + { + if (cw->ec->client.h != ih) +{ + cw->ec->saved.h = ih; + cw->ec->saved.y = cw->ec->client.y - cw->ec->zone->y; + reject = cw->ec->changes.need_unmaximize = 1; +} + } + if (cw->ec->maximized & E_MAXIMIZE_HORIZONTAL) + { + if (cw->ec->client.w != iw) +{ + cw->ec->saved.w = iw; + cw->ec->saved.x = cw->ec->client.x - cw->ec->zone->x; + reject = cw->ec->changes.need_unmaximize = 1; +} + } + if (reject) + { + EC_CHANGED(cw->ec); + return; + } } } if (cw->ec->new_client || (!cw->ec->visible) || (!cw->effect_obj)) --
[EGIT] [core/enlightenment] master 07/08: unset the requested maximize state when receiving a client unmaximize request
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=29823dbf1bbd137615d09eae157c6e528bec commit 29823dbf1bbd137615d09eae157c6e528bec Author: Mike BlumenkrantzDate: Mon Sep 28 14:41:44 2015 -0400 unset the requested maximize state when receiving a client unmaximize request not sure why it was always removing VERTICAL here but that's a bug --- src/bin/e_hints.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c index a26a35f..83ce387 100644 --- a/src/bin/e_hints.c +++ b/src/bin/e_hints.c @@ -811,7 +811,7 @@ e_hints_window_state_update(E_Client *ec, int state, int action) { case ECORE_X_WINDOW_STATE_ACTION_REMOVE: if (ec->maximized & max[state]) -e_client_unmaximize(ec, E_MAXIMIZE_VERTICAL); +e_client_unmaximize(ec, max[state]); break; case ECORE_X_WINDOW_STATE_ACTION_ADD: --
[EGIT] [core/enlightenment] enlightenment-0.19 06/08: use more accurate math to determine whether to apply a client maximize change
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c022cc579dbd021cd68e97c9e48fd9dfba94b883 commit c022cc579dbd021cd68e97c9e48fd9dfba94b883 Author: Mike BlumenkrantzDate: Mon Sep 28 14:42:21 2015 -0400 use more accurate math to determine whether to apply a client maximize change --- src/bin/e_hints.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c index 2424169..cf69e4c 100644 --- a/src/bin/e_hints.c +++ b/src/bin/e_hints.c @@ -808,12 +808,12 @@ e_hints_window_state_update(E_Client *ec, int state, int action) switch (action) { case ECORE_X_WINDOW_STATE_ACTION_REMOVE: - if (ec->maximized & max[state]) + if ((ec->maximized & max[state]) == max[state]) e_client_unmaximize(ec, max[state]); break; case ECORE_X_WINDOW_STATE_ACTION_ADD: - if (ec->maximized & max[state]) break; + if ((ec->maximized & max[state]) == max[state]) break; ec->changes.need_maximize = 1; ec->maximized &= ~E_MAXIMIZE_TYPE; ec->maximized |= (e_config->maximize_policy & E_MAXIMIZE_TYPE) | max[state]; @@ -821,7 +821,7 @@ e_hints_window_state_update(E_Client *ec, int state, int action) break; case ECORE_X_WINDOW_STATE_ACTION_TOGGLE: - if (ec->maximized & max[state]) + if ((ec->maximized & max[state]) == max[state]) { e_client_unmaximize(ec, max[state]); break; --
[EGIT] [core/enlightenment] enlightenment-0.19 01/02: _GTK_FRAME_EXTENTS changes using a property, not a client message
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=12c42571598d54da6e7fc8ff85332c0f10608d69 commit 12c42571598d54da6e7fc8ff85332c0f10608d69 Author: Mike BlumenkrantzDate: Mon Sep 28 14:01:28 2015 -0400 _GTK_FRAME_EXTENTS changes using a property, not a client message --- src/bin/e_comp_x.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index a63c304..9a376e4 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -1920,6 +1920,11 @@ _e_comp_x_property(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_W ec->e.fetch.profile = 1; EC_CHANGED(ec); } + else if (ev->atom == ATM_GTK_FRAME_EXTENTS) + { +ec->comp_data->fetch_gtk_frame_extents = 1; +EC_CHANGED(ec); + } return ECORE_CALLBACK_RENEW; } @@ -2034,11 +2039,6 @@ _e_comp_x_message(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_Event_Cl free(p); } } - else if (ev->message_type == ATM_GTK_FRAME_EXTENTS) - { -ec->comp_data->fetch_gtk_frame_extents = 1; -EC_CHANGED(ec); - } return ECORE_CALLBACK_PASS_ON; } --
[EGIT] [core/efl] master 02/02: Eo: rename EO_HOT_EVENT_DESCRIPTION to EO_EVENT_DESCRIPTION_HOT.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f080d40df77f4442996845a75ea9cbe1b3ccc590 commit f080d40df77f4442996845a75ea9cbe1b3ccc590 Author: Tom HacohenDate: Mon Sep 28 15:11:12 2015 +0100 Eo: rename EO_HOT_EVENT_DESCRIPTION to EO_EVENT_DESCRIPTION_HOT. The old naming is inconsistent with the rest of the EFL. This fixes that. Since we are already breaking ABI (and possibly API), we should fix this too. --- src/lib/eo/Eo.h | 4 ++-- src/lib/evas/canvas/evas_callbacks.c | 16 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 48f71c8..0746bdf 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -250,14 +250,14 @@ typedef unsigned int Eo_Op; #define EO_EVENT_DESCRIPTION(name) { name, EINA_FALSE } /** - * @def EO_HOT_EVENT_DESCRIPTION(name) + * @def EO_EVENT_DESCRIPTION_HOT(name) * An helper macro to help populating #Eo_Event_Description and make * the event impossible to freeze. * @param name The name of the event. * @see Eo_Event_Description * @see EO_EVENT_DESCRIPTION */ -#define EO_HOT_EVENT_DESCRIPTION(name) { name, EINA_TRUE } +#define EO_EVENT_DESCRIPTION_HOT(name) { name, EINA_TRUE } diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index d217315..224b1e3 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -16,22 +16,22 @@ EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_AXIS_UPDATE = EO_EVENT_DESCRIPTION("Axis Update"); EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_IN = - EO_HOT_EVENT_DESCRIPTION("Canvas Focus In"); + EO_EVENT_DESCRIPTION_HOT("Canvas Focus In"); EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_OUT = - EO_HOT_EVENT_DESCRIPTION("Canvas Focus Out"); + EO_EVENT_DESCRIPTION_HOT("Canvas Focus Out"); EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE = - EO_HOT_EVENT_DESCRIPTION("Render Flush Pre"); + EO_EVENT_DESCRIPTION_HOT("Render Flush Pre"); EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST = - EO_HOT_EVENT_DESCRIPTION("Render Flush Post"); + EO_EVENT_DESCRIPTION_HOT("Render Flush Post"); EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN = - EO_HOT_EVENT_DESCRIPTION("Canvas Object Focus In"); + EO_EVENT_DESCRIPTION_HOT("Canvas Object Focus In"); EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT = - EO_HOT_EVENT_DESCRIPTION("Canvas Object Focus Out"); + EO_EVENT_DESCRIPTION_HOT("Canvas Object Focus Out"); EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_DEVICE_CHANGED = - EO_HOT_EVENT_DESCRIPTION("Device changed"); + EO_EVENT_DESCRIPTION_HOT("Device changed"); EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE = - EO_HOT_EVENT_DESCRIPTION("Canvas viewport resize"); + EO_EVENT_DESCRIPTION_HOT("Canvas viewport resize"); /** * Evas events descriptions for Eo. */ --
[EGIT] [core/efl] master 01/01: eet: fix typo in documentation
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=26eecda458de93f2a0bd5cea471861406c43225d commit 26eecda458de93f2a0bd5cea471861406c43225d Author: Amitesh SinghDate: Mon Sep 28 21:50:51 2015 +0530 eet: fix typo in documentation --- src/lib/eet/Eet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eet/Eet.h b/src/lib/eet/Eet.h index 8ffc1b8..62074fd 100644 --- a/src/lib/eet/Eet.h +++ b/src/lib/eet/Eet.h @@ -4192,7 +4192,7 @@ eet_data_descriptor_decode_cipher(Eet_Data_Descriptor *edd, * serialised chunk of data that can be decoded again by * eet_data_descriptor_decode(). This is useful for being able to transmit * data structures across sockets, pipes, IPC or shared file mechanisms, - * without having to worry about memory space, machine type, endianess etc. + * without having to worry about memory space, machine type, endianness etc. * * The parameter @p edd must point to a valid data descriptor, and * @p data_in must point to the right data structure to encode. If not, the --
[EGIT] [core/efl] master 03/04: Eo: Fix examples and benchmarks according to recent Eo changes.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a3f9b2e05140368f3c0f1f9aca63344c8582b40a commit a3f9b2e05140368f3c0f1f9aca63344c8582b40a Author: Tom HacohenDate: Mon Sep 28 16:05:08 2015 +0100 Eo: Fix examples and benchmarks according to recent Eo changes. --- src/benchmarks/eo/class_simple.c | 2 +- src/examples/eo/isa/eo_isa_interface.c| 2 +- src/examples/eo/isa/eo_isa_mixin.c| 2 +- src/examples/eo/isa/eo_isa_simple.c | 4 ++-- src/examples/eo/simple/simple_interface.c | 2 +- src/examples/eo/simple/simple_mixin.c | 2 +- src/examples/eo/simple/simple_simple.c| 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c index 2508959..5923825 100644 --- a/src/benchmarks/eo/class_simple.c +++ b/src/benchmarks/eo/class_simple.c @@ -17,7 +17,7 @@ _a_set(Eo *obj EINA_UNUSED, void *class_data, int a) EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); static Eo_Op_Description op_desc[] = { - EO_OP_FUNC(simple_a_set, _a_set, "Set property A"), + EO_OP_FUNC(simple_a_set, _a_set), }; static const Eo_Class_Description class_desc = { diff --git a/src/examples/eo/isa/eo_isa_interface.c b/src/examples/eo/isa/eo_isa_interface.c index 229f298..fd0b20e 100644 --- a/src/examples/eo/isa/eo_isa_interface.c +++ b/src/examples/eo/isa/eo_isa_interface.c @@ -10,7 +10,7 @@ EAPI EO_FUNC_BODY(interface_a_power_3_get, int, 0); static Eo_Op_Description op_desc[] = { - EO_OP_FUNC(interface_a_power_3_get, NULL, "Get the a^3"), + EO_OP_FUNC(interface_a_power_3_get, NULL), }; static const Eo_Class_Description class_desc = { diff --git a/src/examples/eo/isa/eo_isa_mixin.c b/src/examples/eo/isa/eo_isa_mixin.c index ec6dba0..ce45601 100644 --- a/src/examples/eo/isa/eo_isa_mixin.c +++ b/src/examples/eo/isa/eo_isa_mixin.c @@ -21,7 +21,7 @@ _a_square_get(Eo *obj, void *class_data EINA_UNUSED) EAPI EO_FUNC_BODY(mixin_a_square_get, int, 0); static Eo_Op_Description op_desc[] = { - EO_OP_FUNC(mixin_a_square_get, _a_square_get, "Get the value of A^2"), + EO_OP_FUNC(mixin_a_square_get, _a_square_get), }; static const Eo_Class_Description class_desc = { diff --git a/src/examples/eo/isa/eo_isa_simple.c b/src/examples/eo/isa/eo_isa_simple.c index d38bfe1..1965b06 100644 --- a/src/examples/eo/isa/eo_isa_simple.c +++ b/src/examples/eo/isa/eo_isa_simple.c @@ -40,8 +40,8 @@ EAPI EO_FUNC_BODY(simple_a_get, int, 0); EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); static Eo_Op_Description op_desc[] = { - EO_OP_FUNC(simple_a_set, _a_set, "Set property A"), - EO_OP_FUNC(simple_a_get, _a_get, "Get property A"), + EO_OP_FUNC(simple_a_set, _a_set), + EO_OP_FUNC(simple_a_get, _a_get), EO_OP_FUNC_OVERRIDE(interface_a_power_3_get, _a_power_3_get), }; diff --git a/src/examples/eo/simple/simple_interface.c b/src/examples/eo/simple/simple_interface.c index 3015f33..a30ac5f 100644 --- a/src/examples/eo/simple/simple_interface.c +++ b/src/examples/eo/simple/simple_interface.c @@ -10,7 +10,7 @@ EAPI EO_FUNC_BODY(interface_a_power_3_get, int, 0); static Eo_Op_Description op_desc[] = { - EO_OP_FUNC(interface_a_power_3_get, NULL, "Get the a^3"), + EO_OP_FUNC(interface_a_power_3_get, NULL), }; static const Eo_Class_Description class_desc = { diff --git a/src/examples/eo/simple/simple_mixin.c b/src/examples/eo/simple/simple_mixin.c index 734ca96..5831ce0 100644 --- a/src/examples/eo/simple/simple_mixin.c +++ b/src/examples/eo/simple/simple_mixin.c @@ -21,7 +21,7 @@ _a_square_get(Eo *obj, void *class_data EINA_UNUSED) EAPI EO_FUNC_BODY(mixin_a_square_get, int, 0); static Eo_Op_Description op_desc[] = { - EO_OP_FUNC(mixin_a_square_get, _a_square_get, "Get the value of A^2"), + EO_OP_FUNC(mixin_a_square_get, _a_square_get), }; static const Eo_Class_Description class_desc = { diff --git a/src/examples/eo/simple/simple_simple.c b/src/examples/eo/simple/simple_simple.c index 1cd92c9..f16bf07 100644 --- a/src/examples/eo/simple/simple_simple.c +++ b/src/examples/eo/simple/simple_simple.c @@ -40,8 +40,8 @@ EAPI EO_FUNC_BODY(simple_a_get, int, 0); EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); static Eo_Op_Description op_desc[] = { - EO_OP_FUNC(simple_a_set, _a_set, "Set property A"), - EO_OP_FUNC(simple_a_get, _a_get, "Get property A"), + EO_OP_FUNC(simple_a_set, _a_set), + EO_OP_FUNC(simple_a_get, _a_get), EO_OP_FUNC_OVERRIDE(interface_a_power_3_get, _a_power_3_get), }; --
[EGIT] [core/efl] master 02/04: Eo: Remove EO_SENTINEL.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9328524da41a7d0c7fdb1171ad755d962e282f0f commit 9328524da41a7d0c7fdb1171ad755d962e282f0f Author: Tom HacohenDate: Mon Sep 28 15:48:17 2015 +0100 Eo: Remove EO_SENTINEL. This was never really needed because we always had the count. Removing this now because we are already breaking API and ABI. --- src/benchmarks/eo/class_simple.c | 1 - src/examples/eo/isa/eo_isa_interface.c| 1 - src/examples/eo/isa/eo_isa_mixin.c| 1 - src/examples/eo/isa/eo_isa_simple.c | 1 - src/examples/eo/simple/simple_interface.c | 1 - src/examples/eo/simple/simple_mixin.c | 1 - src/examples/eo/simple/simple_simple.c| 1 - src/lib/eo/Eo.h | 6 +- src/lib/eo/eo.c | 3 ++- src/tests/eina_cxx/eina_cxx_test_ptrlist.cc | 1 - src/tests/eo/access/access_inherit.c | 1 - src/tests/eo/access/access_simple.c | 1 - src/tests/eo/composite_objects/composite_objects_comp.c | 1 - src/tests/eo/composite_objects/composite_objects_simple.c | 1 - src/tests/eo/constructors/constructors_mixin.c| 1 - src/tests/eo/constructors/constructors_simple.c | 1 - src/tests/eo/constructors/constructors_simple2.c | 1 - src/tests/eo/constructors/constructors_simple3.c | 1 - src/tests/eo/constructors/constructors_simple5.c | 1 - src/tests/eo/constructors/constructors_simple6.c | 1 - src/tests/eo/constructors/constructors_simple7.c | 1 - src/tests/eo/function_overrides/function_overrides_inherit2.c | 1 - src/tests/eo/function_overrides/function_overrides_inherit3.c | 1 - src/tests/eo/function_overrides/function_overrides_simple.c | 1 - src/tests/eo/interface/interface_interface.c | 1 - src/tests/eo/interface/interface_interface2.c | 1 - src/tests/eo/interface/interface_simple.c | 1 - src/tests/eo/mixin/mixin_inherit.c| 1 - src/tests/eo/mixin/mixin_mixin.c | 1 - src/tests/eo/mixin/mixin_mixin2.c | 1 - src/tests/eo/mixin/mixin_mixin3.c | 1 - src/tests/eo/mixin/mixin_simple.c | 1 - src/tests/eo/signals/signals_simple.c | 1 - src/tests/eo/suite/eo_test_class_behaviour_errors.c | 1 - src/tests/eo/suite/eo_test_class_errors.c | 4 src/tests/eo/suite/eo_test_class_simple.c | 1 - src/tests/eo/suite/eo_test_general.c | 3 --- src/tests/eo/suite/eo_test_threaded_calls.c | 1 - src/tests/eolian/data/override_ref.c | 3 +-- 39 files changed, 4 insertions(+), 49 deletions(-) diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c index ad5e631..2508959 100644 --- a/src/benchmarks/eo/class_simple.c +++ b/src/benchmarks/eo/class_simple.c @@ -18,7 +18,6 @@ EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a); static Eo_Op_Description op_desc[] = { EO_OP_FUNC(simple_a_set, _a_set, "Set property A"), - EO_OP_SENTINEL }; static const Eo_Class_Description class_desc = { diff --git a/src/examples/eo/isa/eo_isa_interface.c b/src/examples/eo/isa/eo_isa_interface.c index 95f0266..229f298 100644 --- a/src/examples/eo/isa/eo_isa_interface.c +++ b/src/examples/eo/isa/eo_isa_interface.c @@ -11,7 +11,6 @@ EAPI EO_FUNC_BODY(interface_a_power_3_get, int, 0); static Eo_Op_Description op_desc[] = { EO_OP_FUNC(interface_a_power_3_get, NULL, "Get the a^3"), - EO_OP_SENTINEL }; static const Eo_Class_Description class_desc = { diff --git a/src/examples/eo/isa/eo_isa_mixin.c b/src/examples/eo/isa/eo_isa_mixin.c index 601c44e..ec6dba0 100644 --- a/src/examples/eo/isa/eo_isa_mixin.c +++ b/src/examples/eo/isa/eo_isa_mixin.c @@ -22,7 +22,6 @@ EAPI EO_FUNC_BODY(mixin_a_square_get, int, 0); static Eo_Op_Description op_desc[] = { EO_OP_FUNC(mixin_a_square_get, _a_square_get, "Get the value of A^2"), - EO_OP_SENTINEL }; static const Eo_Class_Description class_desc = { diff --git a/src/examples/eo/isa/eo_isa_simple.c b/src/examples/eo/isa/eo_isa_simple.c index f5dcb3c..d38bfe1 100644 --- a/src/examples/eo/isa/eo_isa_simple.c +++ b/src/examples/eo/isa/eo_isa_simple.c @@ -43,7 +43,6 @@ static Eo_Op_Description op_desc[] = { EO_OP_FUNC(simple_a_set, _a_set, "Set property A"), EO_OP_FUNC(simple_a_get, _a_get, "Get property A"), EO_OP_FUNC_OVERRIDE(interface_a_power_3_get,
[EGIT] [core/efl] master 01/01: Eo: Fix eo function name getter on windows.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=12c39868665e8d327fff27d34a0ba78dadac0961 commit 12c39868665e8d327fff27d34a0ba78dadac0961 Author: Tom HacohenDate: Mon Sep 28 15:24:44 2015 +0100 Eo: Fix eo function name getter on windows. --- src/lib/eo/eo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index d7c3953..d703208 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -235,7 +235,7 @@ _eo_op_desc_name_get(const Eo_Op_Description *desc) fct_name = info.dli_sname; # endif #else - fct_name = api_func; /* Same on windows */ + fct_name = desc->api_func; /* Same on windows */ #endif return fct_name; } --
[EGIT] [core/efl] master 04/04: Eolian generator: remove sentinel generation
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=76bc86716e3acdbcd604b31126ab3b9649cdf543 commit 76bc86716e3acdbcd604b31126ab3b9649cdf543 Author: Daniel KolesaDate: Mon Sep 28 15:59:16 2015 +0100 Eolian generator: remove sentinel generation --- src/bin/eolian/eo_generator.c| 4 +--- src/tests/eolian/data/class_simple_ref.c | 1 - src/tests/eolian/data/override_ref.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c index 5ade88d..85d3cb7 100644 --- a/src/bin/eolian/eo_generator.c +++ b/src/bin/eolian/eo_generator.c @@ -19,9 +19,7 @@ static Eina_Hash *_funcs_params_init = NULL; static const char tmpl_eo_ops_desc[] = "\ -static Eo_Op_Description _@#class_op_desc[] = {@#list_op\n\ - EO_OP_SENTINEL\n\ -};\n\n"; +static Eo_Op_Description _@#class_op_desc[] = {@#list_op\n};\n\n"; static const char tmpl_events_desc[] = "\ diff --git a/src/tests/eolian/data/class_simple_ref.c b/src/tests/eolian/data/class_simple_ref.c index 12eda02..cd1b28a 100644 --- a/src/tests/eolian/data/class_simple_ref.c +++ b/src/tests/eolian/data/class_simple_ref.c @@ -29,7 +29,6 @@ static Eo_Op_Description _class_simple_op_desc[] = { EO_OP_FUNC(evas_obj_simple_a_set, _class_simple_a_set), EO_OP_FUNC(evas_obj_simple_a_get, _class_simple_a_get), EO_OP_FUNC(evas_obj_simple_foo, __eolian_class_simple_foo), - EO_OP_SENTINEL }; static const Eo_Class_Description _class_simple_class_desc = { diff --git a/src/tests/eolian/data/override_ref.c b/src/tests/eolian/data/override_ref.c index 5817915..2998aff 100644 --- a/src/tests/eolian/data/override_ref.c +++ b/src/tests/eolian/data/override_ref.c @@ -78,4 +78,4 @@ static const Eo_Class_Description _override_class_desc = { NULL }; -EO_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL); +EO_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL); \ No newline at end of file --
[EGIT] [core/efl] master 01/01: eio: fix typo in documentation
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=17a891e00d2c30fa1421409a3d6334a5c1e5905c commit 17a891e00d2c30fa1421409a3d6334a5c1e5905c Author: Amitesh SinghDate: Mon Sep 28 21:57:35 2015 +0530 eio: fix typo in documentation --- src/lib/eio/Eio.h | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h index 3a9a281..7b4410f 100644 --- a/src/lib/eio/Eio.h +++ b/src/lib/eio/Eio.h @@ -944,7 +944,7 @@ static inline Eina_Bool eio_file_is_lnk(const Eina_Stat *stat); * @param open_cb Callback called in the main loop when the file has been successfully opened. * @param error_cb Callback called in the main loop when the file couldn't be opened. * @param data Unmodified user data passed to callbacks - * @return Pointer to the file if successfull or NULL otherwise. + * @return Pointer to the file if successful or NULL otherwise. * */ EAPI Eio_File *eio_file_open(const char *name, Eina_Bool shared, @@ -958,7 +958,7 @@ EAPI Eio_File *eio_file_open(const char *name, Eina_Bool shared, * @param done_cb Callback called in the main loop when the file has been successfully closed. * @param error_cb Callback called in the main loop when the file couldn't be closed. * @param data Unmodified user data passed to callbacks - * @return Pointer to the file if successfull or NULL otherwise. + * @return Pointer to the file if successful or NULL otherwise. */ EAPI Eio_File *eio_file_close(Eina_File *f, Eio_Done_Cb done_cb, @@ -973,7 +973,7 @@ EAPI Eio_File *eio_file_close(Eina_File *f, * @param map_cb Callback called in the main loop when the file has been successfully mapped. * @param error_cb Callback called in the main loop when the file can't be mapped. * @param data Unmodified user data passed to callbacks - * @return Pointer to the file if successfull or NULL otherwise. + * @return Pointer to the file if successful or NULL otherwise. * * The container of the Eio_File is the Eina_File. */ @@ -994,7 +994,7 @@ EAPI Eio_File *eio_file_map_all(Eina_File *f, * @param map_cb Callback called in the main loop when the file has been successfully mapped. * @param error_cb Callback called in the main loop when the file can't be mapped. * @param data Unmodified user data passed to callbacks - * @return Pointer to the file if successfull or NULL otherwise. + * @return Pointer to the file if successful or NULL otherwise. * * The container of the Eio_File is the Eina_File. */ --
[EGIT] [core/efl] master 01/04: Eo: Clean up windows code.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=35a482141d2fb3c64aa72ef57a432387915ab653 commit 35a482141d2fb3c64aa72ef57a432387915ab653 Author: Tom HacohenDate: Mon Sep 28 15:26:51 2015 +0100 Eo: Clean up windows code. We were keeping a struct member that wasn't really needed on windows. Since we already broke ABI, we can afford to clean this up. --- src/lib/eo/Eo.h | 13 + src/lib/eo/eo.c | 10 ++ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 0746bdf..e3c5f1c 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -342,10 +342,7 @@ typedef enum _Eo_Class_Type Eo_Class_Type; typedef struct _Eo_Op_Description { - void *api_func; /**< The EAPI function offering this op. */ -#ifdef _WIN32 - const char *api_name; /**< Full name of this API entry-point. Used to work around import indirection in DLL's. */ -#endif + void *api_func; /**< The EAPI function offering this op. (The name of the func on windows) */ void *func; /**< The static function to call for the op. */ Eo_Op op; /**< The op. */ Eo_Op_Type op_type; /**< The type of the Op. */ @@ -463,10 +460,10 @@ EAPI extern Eo_Hook_Call eo_hook_call_post; if (Hook) \ Hook(___call.klass, ___call.obj, FuncName, ___call.func, __VA_ARGS__); -#ifdef _WIN32 -#define EO_FUNC_COMMON_OP_FUNC(Name) ((const void *) #Name) +#ifndef _WIN32 +# define EO_FUNC_COMMON_OP_FUNC(Name) ((const void *) Name) #else -#define EO_FUNC_COMMON_OP_FUNC(Name) ((const void *) Name) +# define EO_FUNC_COMMON_OP_FUNC(Name) ((const void *) #Name) #endif // cache OP id, get real fct and object data then do the call @@ -534,7 +531,7 @@ EAPI extern Eo_Hook_Call eo_hook_call_post; #ifndef _WIN32 # define _EO_OP_API_ENTRY(a) a #else -# define _EO_OP_API_ENTRY(a) a, #a +# define _EO_OP_API_ENTRY(a) #a #endif #define EO_OP_FUNC(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_NOOP, EO_OP_TYPE_REGULAR } diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index d703208..da38fdc 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -739,7 +739,6 @@ _eo_api_desc_get(const void *api_func, const _Eo_Class *klass, const _Eo_Class * return op_desc; } #else - const char *api_name = api_func; /* We put it here on windows. */ /* On Windows, DLL API's will be exported using the dllexport flag. * When used by another library or executable, they will be declared * using the dllimport flag. What happens really is that two symbols are @@ -749,10 +748,9 @@ _eo_api_desc_get(const void *api_func, const _Eo_Class *klass, const _Eo_Class * */ for (unsigned int i = 0; i < cur_klass->desc->ops.count; i++) { - if (api_name && !strcmp(api_name, op_descs[i].api_name)) + if (((op_descs[i].api_func != NULL) && (op_descs[i].api_func != ((void (*)())-1))) && +(api_func && !strcmp(api_func, op_descs[i].api_func))) { - if (op_descs[i].api_func == NULL || op_descs[i].api_func == ((void (*)())-1)) - break; return _descs[i]; } } @@ -856,11 +854,7 @@ _eo_class_funcs_set(_Eo_Class *klass) } else if (op_desc->op == EO_OP_OVERRIDE) { -#ifdef _WIN32 - api_desc = _eo_api_desc_get(op_desc->api_name, klass->parent, klass->extensions); -#else api_desc = _eo_api_desc_get(op_desc->api_func, klass->parent, klass->extensions); -#endif if (api_desc == NULL) { --
[EGIT] [core/enlightenment] master 01/01: efm - handle cancel of async eio if icon is freed and eio still active
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f468361817fdb5ad06de4dc294b20510001f38aa commit f468361817fdb5ad06de4dc294b20510001f38aa Author: Carsten Haitzler (Rasterman)Date: Mon Sep 28 16:29:12 2015 +0900 efm - handle cancel of async eio if icon is freed and eio still active @fix --- src/bin/e_fm.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 45f409b..8cf276b 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -4797,6 +4797,11 @@ _e_fm2_icon_free(E_Fm2_Icon *ic) { if (ic->queued) abort(); if (ic->inserted) abort(); + if (ic->eio) + { +eio_file_cancel(ic->eio); +ic->eio = NULL; + } /* free icon, object data etc. etc. */ if (ic->sd->last_placed == ic) { --
[EGIT] [core/enlightenment] master 01/01: e - efm fix. fix eio error handler that is called after eio cancel
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d0de6eb4fad9a2561ab58c91e6a4d1f5c4188db3 commit d0de6eb4fad9a2561ab58c91e6a4d1f5c4188db3 Author: Carsten Haitzler (Rasterman)Date: Mon Sep 28 16:49:53 2015 +0900 e - efm fix. fix eio error handler that is called after eio cancel so you have to have an error cb - so make it empty as even after a canel, it is called, and thus accesses an invalid icon we've freed. --- src/bin/e_fm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 8cf276b..e7661a0 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -5199,10 +5199,8 @@ _e_fm2_cb_eio_stat(void *data, Eio_File *handler EINA_UNUSED, const Eina_Stat *s } static void -_e_fm2_cb_eio_err(void *data, Eio_File *handler EINA_UNUSED, int error EINA_UNUSED) +_e_fm2_cb_eio_err(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, int error EINA_UNUSED) { - E_Fm2_Icon *ic = data; - ic->eio = NULL; } static int --
[EGIT] [core/efl] master 01/01: evas - protect against invalid obj id in legacy wrapper func
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3894c3e1e0e133078889e416c7d6f3c82a255bb9 commit 3894c3e1e0e133078889e416c7d6f3c82a255bb9 Author: Carsten Haitzler (Rasterman)Date: Mon Sep 28 15:19:32 2015 +0900 evas - protect against invalid obj id in legacy wrapper func @fix --- src/lib/evas/canvas/evas_callbacks.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 07d682a..9c8e3f4 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -303,6 +303,7 @@ evas_object_event_callback_priority_add(Evas_Object *eo_obj, Evas_Callback_Type return; MAGIC_CHECK_END(); + if (!obj) return; if (!func) return; _eo_evas_object_cb_info *cb_info = calloc(1, sizeof(*cb_info)); --
[EGIT] [core/elementary] master 01/01: genlist: refractor item focus update code
ami pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=284109bc7ea8d3a4051d8221287d28d0a6790122 commit 284109bc7ea8d3a4051d8221287d28d0a6790122 Author: Amitesh SinghDate: Mon Sep 28 13:34:02 2015 +0530 genlist: refractor item focus update code Add duplicate code into a new local function _elm_genlist_item_focus_update --- src/lib/elm_genlist.c | 59 +++ 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c index 92e4705..a0d5cd7 100644 --- a/src/lib/elm_genlist.c +++ b/src/lib/elm_genlist.c @@ -1689,6 +1689,30 @@ _access_widget_item_register(Elm_Gen_Item *it) } static void +_elm_genlist_item_focus_update(Elm_Gen_Item *it) +{ + const char *focus_raise; + Evas_Object *obj = WIDGET(it); + ELM_GENLIST_DATA_GET(obj, sd); + + if (elm_widget_focus_highlight_enabled_get(obj)) + edje_object_signal_emit(VIEW(it), SIGNAL_FOCUSED, "elm"); + + focus_raise = edje_object_data_get(VIEW(it), "focusraise"); + if ((focus_raise) && (!strcmp(focus_raise, "on"))) + { +Elm_Gen_Item *git; +Eina_List *l; + +evas_object_raise(VIEW(it)); +EINA_LIST_FOREACH(sd->group_items, l, git) + { + if (git->realized) evas_object_raise(VIEW(git)); + } + } +} + +static void _item_realize(Elm_Gen_Item *it, int in, Eina_Bool calc) @@ -1771,22 +1795,7 @@ _item_realize(Elm_Gen_Item *it, if (EO_OBJ(it) == sd->focused_item) { - const char *focus_raise; - if (elm_widget_focus_highlight_enabled_get(WIDGET(it)) || _elm_config->win_auto_focus_enable) - edje_object_signal_emit(VIEW(it), SIGNAL_FOCUSED, "elm"); - - focus_raise = edje_object_data_get(VIEW(it), "focusraise"); - if ((focus_raise) && (!strcmp(focus_raise, "on"))) - { - Elm_Gen_Item *git; - Eina_List *l; - evas_object_raise(VIEW(it)); - EINA_LIST_FOREACH(sd->group_items, l, git) -{ - if (git->realized) evas_object_raise(VIEW(git)); -} - } - + _elm_genlist_item_focus_update(it); _elm_widget_item_highlight_in_theme(WIDGET(it), EO_OBJ(it)); _elm_widget_highlight_in_theme_update(WIDGET(it)); _elm_widget_focus_highlight_start(WIDGET(it)); @@ -2617,7 +2626,6 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it) ELM_GENLIST_ITEM_DATA_GET(eo_it, it); Evas_Object *obj = WIDGET(it); ELM_GENLIST_DATA_GET(obj, sd); - const char *focus_raise; Eina_Bool tmp; if (_is_no_select(it) || @@ -2642,22 +2650,7 @@ _elm_genlist_item_focused(Elm_Object_Item *eo_it) sd->focused_item = eo_it; if (it->realized) - { -if (elm_widget_focus_highlight_enabled_get(obj)) - edje_object_signal_emit(VIEW(it), SIGNAL_FOCUSED, "elm"); - -focus_raise = edje_object_data_get(VIEW(it), "focusraise"); -if ((focus_raise) && (!strcmp(focus_raise, "on"))) - { - Elm_Gen_Item *git; - Eina_List *l; - evas_object_raise(VIEW(it)); - EINA_LIST_FOREACH(sd->group_items, l, git) - { - if (git->realized) evas_object_raise(VIEW(git)); - } - } - } + _elm_genlist_item_focus_update(it); eo_do(obj, eo_event_callback_call(ELM_GENLIST_EVENT_ITEM_FOCUSED, eo_it)); if (_elm_config->atspi_mode) elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); --
[EGIT] [core/efl] master 01/01: edje: fix typos in documentation
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=139d452efeb846f7684f93e9bd7733969d8048b7 commit 139d452efeb846f7684f93e9bd7733969d8048b7 Author: Amitesh SinghDate: Mon Sep 28 15:42:51 2015 +0530 edje: fix typos in documentation --- src/lib/edje/Edje_Common.h | 2 +- src/lib/edje/Edje_Edit.h | 56 +++--- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/lib/edje/Edje_Common.h b/src/lib/edje/Edje_Common.h index 468b163..8d03684 100644 --- a/src/lib/edje/Edje_Common.h +++ b/src/lib/edje/Edje_Common.h @@ -914,7 +914,7 @@ EAPI double edje_scale_get (void); * * In Edje it's possible to use a text part as a entry so the user is * able to make inputs of text. To do so, the text part must be set - * with a input panel taht will work as a virtual keyboard. + * with a input panel that will work as a virtual keyboard. * * Some of effects can be applied to the entered text and also plenty * actions can be performed after any input. diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h index 54f9cdc..8f7ad5f 100644 --- a/src/lib/edje/Edje_Edit.h +++ b/src/lib/edje/Edje_Edit.h @@ -277,7 +277,7 @@ EAPI Eina_Bool edje_edit_clean_save_as(Evas_Object *obj, const char* new_file_na * because this function DOES NOT generate source code for groups. * * @note With using this function all source code will be erased. And DOES NOT - * generated new code. In attempt to decompile edj file, wich was saved with + * generated new code. In attempt to decompile edj file, which was saved with * using this functions will unpacked only resources(like fonts, images, sounds). * If needed saving source code into file, please use @see edje_edit_save() or * @see edje_edit_save_all(). @@ -368,7 +368,7 @@ EAPI Eina_Bool edje_edit_group_copy(Evas_Object *obj, const char *group_name, co * references the next time is loaded. * @see edje_edit_save_all(), edje_edit_without_source_save(). * - * @attention be carefull, if you deleting group, it will delete all it's aliases also, + * @attention be careful, if you deleting group, it will delete all it's aliases also, * if you deleting alias, then it will delete alias only. * */ @@ -1255,7 +1255,7 @@ EAPI const char * edje_edit_part_source_get(Evas_Object *obj, const char *part); /** Set the source of part. * * If setting source of the part will lead to recursive reference - * (when A source to B, and B is going to be source to A because of this funciton), + * (when A source to B, and B is going to be source to A because of this function), * then it will return EINA_FALSE. * * @param obj Object being edited. @@ -2603,7 +2603,7 @@ EAPI int edje_edit_part_item_spread_w_get(Evas_Object *obj, const char *part, co /** Set the spread width value of a part's item. * - * @attention be carefull, if you set up huge number (like 10 or 100). width and height of + * @attention be careful, if you set up huge number (like 10 or 100). width and height of * spread is being multiplied and you will get huge number of objects that may "eat" * all of your processor performance at once... Or if you want, you may * get some coffee and wait until it will recalculate all of those objects :) @@ -2620,7 +2620,7 @@ EAPI Eina_Bool edje_edit_part_item_spread_w_set(Evas_Object *obj, const char *pa /** Get the spread height value of a part's item. * - * @attention be carefull, if you set up huge number (like 10 or 100). width and height of + * @attention be careful, if you set up huge number (like 10 or 100). width and height of * spread is being multiplied and you will get huge number of objects that may "eat" * all of your processor performance at once... Or if you want, you may * get some coffee and wait until it will recalculate all of those objects :) @@ -2740,7 +2740,7 @@ EAPI double edje_edit_part_item_weight_x_get(Evas_Object *obj, const char *part, * @param item The name of the item to set horizontal weight value. * @param weight_x New value of the horizontal weight. * - * @return @c EINA_TRUE If successfull, @c EINA_FALSE otherwise. + * @return @c EINA_TRUE If successful, @c EINA_FALSE otherwise. * @since 1.11 */ EAPI Eina_Bool edje_edit_part_item_weight_x_set(Evas_Object *obj, const char *part, const char *item, double weight_x); @@ -2763,7 +2763,7 @@ EAPI double edje_edit_part_item_weight_y_get(Evas_Object *obj, const char *part, * @param item The name of the item to set vertical weight value. * @param weight_y New value of the vertical weight. * - * @return @c EINA_TRUE If successfull, @c EINA_FALSE otherwise. + * @return @c EINA_TRUE If successful, @c EINA_FALSE otherwise. * @since 1.11 */ EAPI Eina_Bool edje_edit_part_item_weight_y_set(Evas_Object *obj, const char *part, const char *item, double weight_y); @@ -2779,7 +2779,7 @@ EAPI Eina_Bool
[EGIT] [core/elementary] master 01/01: fix typos in APIs doc
ami pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=57248eb13c239174792ef8782c31206c442affc5 commit 57248eb13c239174792ef8782c31206c442affc5 Author: Amitesh SinghDate: Mon Sep 28 15:06:21 2015 +0530 fix typos in APIs doc --- src/lib/elc_popup.h | 2 +- src/lib/elm_calendar.h | 2 +- src/lib/elm_config.h | 2 +- src/lib/elm_helper.h | 2 +- src/lib/elm_icon.h | 2 +- src/lib/elm_interface_atspi_accessible.h | 2 +- src/lib/elm_map_common.h | 2 +- src/lib/elm_prefs.h | 2 +- src/lib/elm_radio.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/elc_popup.h b/src/lib/elc_popup.h index b58af5a..d672db2 100644 --- a/src/lib/elc_popup.h +++ b/src/lib/elc_popup.h @@ -78,7 +78,7 @@ * @li @c "focused" - When the popup has received focus. (since 1.8) * @li @c "unfocused" - When the popup has lost focus. (since 1.8) * @li "language,changed" - the program's language changed (since 1.8) - * @li "item,focused" - When the popup item has recieved focus. (since 1.10) + * @li "item,focused" - When the popup item has received focus. (since 1.10) * @li "item,unfocused" - When the popup item has lost focus. (since 1.10) * * Styles available for Popup diff --git a/src/lib/elm_calendar.h b/src/lib/elm_calendar.h index 4f1e00e..b1a334f 100644 --- a/src/lib/elm_calendar.h +++ b/src/lib/elm_calendar.h @@ -6,7 +6,7 @@ * @image latex calendar_inheritance_tree.eps * * This is a calendar widget. It helps applications to flexibly - * display a calender with day of the week, date, year and + * display a calendar with day of the week, date, year and * month. Applications are able to set specific dates to be reported * back, when selected, in the smart callbacks of the calendar * widget. The API of this widget lets the applications perform other diff --git a/src/lib/elm_config.h b/src/lib/elm_config.h index 8719d65..350fdd3 100644 --- a/src/lib/elm_config.h +++ b/src/lib/elm_config.h @@ -1013,7 +1013,7 @@ EAPI const char *elm_config_accel_preference_get(void); * Accepted values for depth are for instance "depth", "depth16", "depth24". * Accepted values for stencil are "stencil", "stencil1", "stencil8". * For MSAA, only predefined strings are accepted: "msaa", "msaa_low", - * "msaa_mid" and "msaa_high". The selected configuration is not garanteed + * "msaa_mid" and "msaa_high". The selected configuration is not guaranteed * and is only valid in case of GL acceleration. Only the base acceleration * string will be saved (e.g. "gl" or "hw"). * diff --git a/src/lib/elm_helper.h b/src/lib/elm_helper.h index adfbb40..ec92500 100644 --- a/src/lib/elm_helper.h +++ b/src/lib/elm_helper.h @@ -41,7 +41,7 @@ typedef enum * General designed for validate inputed entry text. * * @param pattern The regex pattern - * @param signal The part of signal name, which will be emited to style + * @param signal The part of signal name, which will be emitted to style * @return The regex validator * * @see elm_validator_regexp_del() diff --git a/src/lib/elm_icon.h b/src/lib/elm_icon.h index 67ed57b..3420fbd 100644 --- a/src/lib/elm_icon.h +++ b/src/lib/elm_icon.h @@ -134,7 +134,7 @@ * @li elm_object_signal_emit() * @li elm_object_signal_callback_add() * @li elm_object_signal_callback_del() - * for emmiting and listening to signals on the object, when the + * for emitting and listening to signals on the object, when the * internal image comes from an Edje object. This behavior was added * unintentionally, though, and is @b deprecated. Expect it to be * dropped on future releases. diff --git a/src/lib/elm_interface_atspi_accessible.h b/src/lib/elm_interface_atspi_accessible.h index acd152e..7ce9d80 100644 --- a/src/lib/elm_interface_atspi_accessible.h +++ b/src/lib/elm_interface_atspi_accessible.h @@ -140,7 +140,7 @@ typedef enum _Elm_Atspi_Role Elm_Atspi_Role; /** * @enum _Elm_Atspi_State_Type - * Describes a possible states of an object visibile to AT-SPI clients. + * Describes a possible states of an object visible to AT-SPI clients. */ enum _Elm_Atspi_State_Type { diff --git a/src/lib/elm_map_common.h b/src/lib/elm_map_common.h index 41d98c5..8e08526 100644 --- a/src/lib/elm_map_common.h +++ b/src/lib/elm_map_common.h @@ -527,7 +527,7 @@ EAPI int elm_map_overlay_class_zoom_max_get(const Elm_Map_Over * * @return The list of group overlay members. * - * The group overlays are virtualy overlays. Those are shown and hidden dynamically. + * The group overlays are virtually overlays. Those are shown and hidden dynamically. * You can add callback to the class overlay. If one of the group overlays in this class * is clicked, callback will be called and return a virtual group overlays. * diff --git
[EGIT] [core/elementary] master 01/01: fix typo in elm_map_overlay_group_members_get API doc
ami pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=8f3760ec1c34b3fc24d3a78962715c066dd8837c commit 8f3760ec1c34b3fc24d3a78962715c066dd8837c Author: Amitesh SinghDate: Mon Sep 28 15:21:07 2015 +0530 fix typo in elm_map_overlay_group_members_get API doc --- src/lib/elm_map_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_map_common.h b/src/lib/elm_map_common.h index 8e08526..5de92eb 100644 --- a/src/lib/elm_map_common.h +++ b/src/lib/elm_map_common.h @@ -527,7 +527,7 @@ EAPI int elm_map_overlay_class_zoom_max_get(const Elm_Map_Over * * @return The list of group overlay members. * - * The group overlays are virtually overlays. Those are shown and hidden dynamically. + * The group overlays are virtual overlays. Those are shown and hidden dynamically. * You can add callback to the class overlay. If one of the group overlays in this class * is clicked, callback will be called and return a virtual group overlays. * --
[EGIT] [core/efl] master 01/01: edje_edit: fix typo in error message
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=27f313c2fe66d4ef4438739fdd9fee8e29760113 commit 27f313c2fe66d4ef4438739fdd9fee8e29760113 Author: Amitesh SinghDate: Mon Sep 28 15:45:44 2015 +0530 edje_edit: fix typo in error message --- src/lib/edje/edje_edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 601c4ba..4cedfee 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -12568,7 +12568,7 @@ edje_edit_clean_save_as(Evas_Object *obj, const char *new_file_name) if (ecore_file_exists(new_file_name)) { -ERR("Error. file \"%s\" allready exists", +ERR("Error. file \"%s\" already exists", new_file_name); return EINA_FALSE; } --
[EGIT] [core/efl] master 01/01: ecore: fix typos in documentation
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5f74afe4f79f660022cae07f6d113b07bfaa23a7 commit 5f74afe4f79f660022cae07f6d113b07bfaa23a7 Author: Amitesh SinghDate: Mon Sep 28 15:49:11 2015 +0530 ecore: fix typos in documentation --- src/lib/ecore/Ecore_Common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h index 07bd187..cc514bb 100644 --- a/src/lib/ecore/Ecore_Common.h +++ b/src/lib/ecore/Ecore_Common.h @@ -953,7 +953,7 @@ typedef enum _Ecore_Exe_Flags Ecore_Exe_Flags; /** * @enum _Ecore_Exe_Win32_Priority - * Defines the priority of the proccess. + * Defines the priority of the process. */ enum _Ecore_Exe_Win32_Priority { @@ -1053,7 +1053,7 @@ EAPI void ecore_exe_run_priority_set(int pri); /** * Gets the priority at which to launch processes * - * This gets ths priority of launched processes. See + * This gets the priority of launched processes. See * ecore_exe_run_priority_set() for details. This just returns the value set * by this call. * @@ -2481,7 +2481,7 @@ EAPI void ecore_app_args_set(int argc, const char **argv); * @param argc A pointer to the return value to hold argc * @param argv A pointer to the return value to hold argv * - * When called, this funciton returns the arguments for the program stored by + * When called, this function returns the arguments for the program stored by * ecore_app_args_set(). The integer pointed to by @p argc will be filled, if * the pointer is not NULL, and the string array pointer @p argv will be filled * also if the pointer is not NULL. The values they are filled with will be the --
[EGIT] [tools/edi] master 01/01: Update to efl on git
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=4358717dd9014f90c9650d87b0a959dd0d579af0 commit 4358717dd9014f90c9650d87b0a959dd0d579af0 Author: Andy WilliamsDate: Tue Sep 29 00:30:31 2015 +0100 Update to efl on git --- elm_code/src/lib/elm_code.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elm_code/src/lib/elm_code.c b/elm_code/src/lib/elm_code.c index b951d2b..2d326a7 100644 --- a/elm_code/src/lib/elm_code.c +++ b/elm_code/src/lib/elm_code.c @@ -13,9 +13,9 @@ static int _elm_code_init = 0; int _elm_code_lib_log_dom = -1; EAPI const Eo_Event_Description ELM_CODE_EVENT_LINE_LOAD_DONE = -EO_EVENT_DESCRIPTION("line,load,done", ""); +EO_EVENT_DESCRIPTION("line,load,done"); EAPI const Eo_Event_Description ELM_CODE_EVENT_FILE_LOAD_DONE = -EO_EVENT_DESCRIPTION("file,load,done", ""); +EO_EVENT_DESCRIPTION("file,load,done"); EAPI int --
[EGIT] [core/efl] master 01/01: Eo legacy events: Fix broken callback comparison
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d889da6b12e6123073edb54d766c9af1fc6db822 commit d889da6b12e6123073edb54d766c9af1fc6db822 Author: Tom HacohenDate: Tue Sep 29 00:45:34 2015 +0100 Eo legacy events: Fix broken callback comparison Commit 37f84b7e966372384e2dfe5d191a6f907a17962e introduced a few changes to the callback matching mechanism that made it so sometimes callbacks would be triggered for the wrong events. The problem was there because of the support for legacy events that forces to do string comparison instead of the usual pointer comparison. We should only do string comparison when we are certain one of the callbacks is a legacy generated one. Regression tests will follow tomorrow. Way too late here for that. Thanks to cedric for reporting. --- src/lib/eo/Eo.h | 2 ++ src/lib/eo/eo_base_class.c | 39 src/tests/eo/suite/eo_test_general.c | 4 ++-- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 3f551f4..66be6ff 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -919,6 +919,8 @@ typedef void (*eo_key_data_free_func)(void *); /** * Don't use. + * The values of the returned event structure are also internal, don't assume + * anything about them. * @internal */ EAPI const Eo_Event_Description *eo_base_legacy_only_event_description_get(const char *_event_name); diff --git a/src/lib/eo/eo_base_class.c b/src/lib/eo/eo_base_class.c index f85aa4e..f0a4030 100644 --- a/src/lib/eo/eo_base_class.c +++ b/src/lib/eo/eo_base_class.c @@ -401,11 +401,16 @@ _wref_destruct(Eo_Base_Data *pd) /* XXX: Legacy support, remove when legacy is dead. */ static Eina_Hash *_legacy_events_hash = NULL; +#define _LEGACY_EVENT_FIRST_CHAR 1 EAPI const Eo_Event_Description * eo_base_legacy_only_event_description_get(const char *_event_name) { - Eina_Stringshare *event_name = eina_stringshare_add(_event_name); + char buf[1024]; + buf[0] = _LEGACY_EVENT_FIRST_CHAR; /* Encode it's a legacy event */ + strncpy(buf + 1, _event_name, sizeof(buf) - 1); + buf[sizeof(buf) - 1] = '\0'; + Eina_Stringshare *event_name = eina_stringshare_add(buf); Eo_Event_Description *event_desc = eina_hash_find(_legacy_events_hash, event_name); if (!event_desc) { @@ -421,6 +426,26 @@ eo_base_legacy_only_event_description_get(const char *_event_name) return event_desc; } +static Eina_Bool +_legacy_event_desc_is(const Eo_Event_Description *desc) +{ + return (desc->name[0] == _LEGACY_EVENT_FIRST_CHAR); +} + +/* Also supports non legacy. */ +static const char * +_legacy_event_desc_name_get(const Eo_Event_Description *desc) +{ + if (_legacy_event_desc_is(desc)) + { +return desc->name + 1; + } + else + { +return desc->name; + } +} + static void _legacy_events_hash_free_cb(void *_desc) { @@ -641,13 +666,19 @@ _cb_desc_match(const Eo_Event_Description *a, const Eo_Event_Description *b) if (!a) return EINA_FALSE; - if (a == b) + if (_legacy_event_desc_is(a) && _legacy_event_desc_is(b)) + { +return (a->name == b->name); + } + else if (_legacy_event_desc_is(a) || _legacy_event_desc_is(b)) { -return EINA_TRUE; +const char *aname = _legacy_event_desc_name_get(a); +const char *bname = _legacy_event_desc_name_get(b); +return !strcmp(aname, bname); } else { -return !strcmp(a->name, b->name); +return (a == b); } } diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index ccd6af2..b483a80 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -125,12 +125,12 @@ START_TEST(eo_signals) { const Eo_Event_Description *a_desc = eo_base_legacy_only_event_description_get("a,changed"); fail_if(!a_desc); -ck_assert_str_eq(a_desc->name, "a,changed"); +ck_assert_str_eq(a_desc->name, "\x01" "a,changed"); fail_if(a_desc == EV_A_CHANGED); const Eo_Event_Description *bad_desc = eo_base_legacy_only_event_description_get("bad"); fail_if(!bad_desc); -ck_assert_str_eq(bad_desc->name, "bad"); +ck_assert_str_eq(bad_desc->name, "\x01" "bad"); /* Call Eo event with legacy and non-legacy callbacks. */ _eo_signals_cb_current = 0; --