[EGIT] [core/efl] master 05/05: eina_ustringshare: Add description of return to resolve doxygen warning
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ccbe98ccb2d8c1dd4ec2d2fc9523b7eb299612e5 commit ccbe98ccb2d8c1dd4ec2d2fc9523b7eb299612e5 Author: Jaehyun ChoDate: Thu Oct 26 11:47:45 2017 +0900 eina_ustringshare: Add description of return to resolve doxygen warning Change-Id: I1994dbb3bf628c67c43763c8521fcfe7c5179308 --- src/lib/eina/eina_ustringshare.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/eina/eina_ustringshare.h b/src/lib/eina/eina_ustringshare.h index 6a6d7c6bad..073b74cd4b 100644 --- a/src/lib/eina/eina_ustringshare.h +++ b/src/lib/eina/eina_ustringshare.h @@ -168,6 +168,7 @@ EAPI voideina_ustringshare_del(const Eina_Unicode *str); * * @param str The shared string to know the length. It is safe to *give @c NULL, in that case @c -1 is returned. + * @return The length of a shared string. * * This function is a cheap way to known the length of a shared * string. --
[EGIT] [core/efl] master 01/05: eina_module: Add description of parameter to resolve doxygen warning
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=cb3eb09451b327907e2cd6fdec849ca6ca37e99e commit cb3eb09451b327907e2cd6fdec849ca6ca37e99e Author: Jaehyun ChoDate: Thu Oct 26 11:19:11 2017 +0900 eina_module: Add description of parameter to resolve doxygen warning Change-Id: I545b68e86976d4e2479fbf87ff5a8b38b9905c13 --- src/lib/eina/eina_module.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/eina/eina_module.h b/src/lib/eina/eina_module.h index 8a15d285a8..efdf0509ff 100644 --- a/src/lib/eina/eina_module.h +++ b/src/lib/eina/eina_module.h @@ -210,6 +210,7 @@ EAPI const char * * @brief Defines if on module load we should expose all symbol * * @param module The module to turn off/on symbol to be exposed + * @param global @c ture to turn on symbol to be exposed, @c false otherwise * @since 1.11 */ EAPI void eina_module_symbol_global_set(Eina_Module *module, Eina_Bool global) EINA_ARG_NONNULL(1); --
[EGIT] [core/efl] master 03/05: eina_str: Fix doxygen warning
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e65e8a4fba6ad6580ee8a5058bc9159140e80613 commit e65e8a4fba6ad6580ee8a5058bc9159140e80613 Author: Jaehyun ChoDate: Thu Oct 26 11:39:00 2017 +0900 eina_str: Fix doxygen warning Change-Id: I4cac2b3836f8d0fb05d76b039af66b41fca0c19f --- src/lib/eina/eina_str.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eina/eina_str.h b/src/lib/eina/eina_str.h index 1e4f94753a..8590845d97 100644 --- a/src/lib/eina/eina_str.h +++ b/src/lib/eina/eina_str.h @@ -294,7 +294,7 @@ EAPI char *eina_str_convert_len(const char *enc_from, const char *enc_ * @return The escaped string. * * Escaping is done by adding a slash "\" before any occurrence of slashes "\" - * include '\n' and '\t', spaces " ", apostrophes "'" or quotes """. This + * include "\n" and "\t", spaces " ", apostrophes "'" or quotes """. This * function returns a newly allocated escaped string on success, @c NULL on * failure. When not used anymore, the * returned value must be freed. --
[EGIT] [core/efl] master 02/05: eina_strbuf: Fix doxygen warning
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=786a7ae421a6937f899cf059dd2743db7cc9dafe commit 786a7ae421a6937f899cf059dd2743db7cc9dafe Author: Jaehyun ChoDate: Thu Oct 26 11:24:08 2017 +0900 eina_strbuf: Fix doxygen warning Change-Id: I82b15f1352f6a7925d7cde0dfb91c3d835a35dd7 --- src/lib/eina/eina_strbuf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eina/eina_strbuf.h b/src/lib/eina/eina_strbuf.h index eeea11c47f..49b83e0332 100644 --- a/src/lib/eina/eina_strbuf.h +++ b/src/lib/eina/eina_strbuf.h @@ -248,7 +248,7 @@ EAPI Eina_Bool eina_strbuf_append_slice(Eina_Strbuf *buf, const Eina_Slice slice * @return #EINA_TRUE on success, #EINA_FALSE on failure. * * This function appends @p data to @p buf. @p data must be allocated and - * different from @NULL. It is slightly faster than eina_strbuf_append() as + * different from @c NULL. It is slightly faster than eina_strbuf_append() as * it does not compute the size of @p str. If @p buf can't append it, * #EINA_FALSE is returned, otherwise #EINA_TRUE is returned. * --
[EGIT] [core/efl] master 04/05: eina_stringshare: Fix doxygen warning
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2a133ff290ff2ccc27f418b3e5a70c24297efa2d commit 2a133ff290ff2ccc27f418b3e5a70c24297efa2d Author: Jaehyun ChoDate: Thu Oct 26 11:42:07 2017 +0900 eina_stringshare: Fix doxygen warning Change-Id: Id2f9e8b16d7e1dd581b71df6842f1b467e535634 --- src/lib/eina/eina_stringshare.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eina/eina_stringshare.h b/src/lib/eina/eina_stringshare.h index c826c8aeec..8e8f76adba 100644 --- a/src/lib/eina/eina_stringshare.h +++ b/src/lib/eina/eina_stringshare.h @@ -145,7 +145,7 @@ * with eina_stringshare_add(): * * @image html eina_stringshare.png - * @image latex eina_stringshare.eps height=\textheight + * @image latex eina_stringshare.eps "" height=\textheight * * For more information, see @ref eina_stringshare_example_01_page * "this example". --
[EGIT] [core/efl] master 01/01: Revert "evas: Fix C++ compilation"
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=132876afed324e0f6edc1375f7ff0c7a7a8a21b7 commit 132876afed324e0f6edc1375f7ff0c7a7a8a21b7 Author: Jean-Philippe AndreDate: Thu Oct 26 12:26:40 2017 +0900 Revert "evas: Fix C++ compilation" @felipealmeida says this cyclic dependency is fixed! This is awesome. :) This reverts commit 60e31101a66aa78b544f39cff6ba27cdc704deef. --- src/lib/evas/canvas/efl_canvas_object.eo | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/evas/canvas/efl_canvas_object.eo b/src/lib/evas/canvas/efl_canvas_object.eo index 7f619ae271..b6626acca4 100644 --- a/src/lib/evas/canvas/efl_canvas_object.eo +++ b/src/lib/evas/canvas/efl_canvas_object.eo @@ -660,8 +660,9 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, event_animation_set { [[Set the $animation which starts when the given $event_name happens to the object.]] params { -@in event_type: ptr(const(Efl.Event.Description)); [[The event description for which the given $animation is set.]] -@in animation: Efl.Object /* FIXME: Efl.Animation */; +@in event_type: ptr(const(Efl.Event.Description)); + [[The event description for which the given $animation is set.]] +@in animation: Efl.Animation; [[The animation which starts when the given $event_name happens to the object.]] } legacy: null; @@ -672,7 +673,7 @@ abstract Efl.Canvas.Object (Efl.Object, Efl.Gfx, Efl.Gfx.Stack, Efl.Animator, @in event_type: ptr(const(Efl.Event.Description)); [[The event description for which the given $animation is set.]] } legacy: null; - return: Efl.Object /* FIXME: Efl.Animation */ @warn_unused; + return: Efl.Animation @warn_unused; } } implements { --
[EGIT] [core/efl] master 01/04: ecore_imf: Add missing documentation comments
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=81c6f93933ebd0482b1a964bbfbd74296fb0bdb2 commit 81c6f93933ebd0482b1a964bbfbd74296fb0bdb2 Author: Wonki KimDate: Thu Oct 26 11:53:17 2017 +0900 ecore_imf: Add missing documentation comments Summary: There are missing documentation comments for Ecore_Imf Input. so that this patch add the information. Reviewers: jpeg, cedric Differential Revision: https://phab.enlightenment.org/D5376 --- src/lib/ecore_imf/Ecore_IMF.h | 37 +++-- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/src/lib/ecore_imf/Ecore_IMF.h b/src/lib/ecore_imf/Ecore_IMF.h index af6cd4ecf6..9352460576 100644 --- a/src/lib/ecore_imf/Ecore_IMF.h +++ b/src/lib/ecore_imf/Ecore_IMF.h @@ -373,26 +373,41 @@ typedef enum ECORE_IMF_INPUT_HINT_MULTILINE = 1 << 2, /**< Multiline text @since 1.18 */ } Ecore_IMF_Input_Hints; -enum +/** + * @typedef Ecore_IMF_Input_Panel_Layout_Normal_Variation + * @brief Enumeration for defining the types of Ecore_IMF Input Panel layout for normal variation. + * @since 1.12 + */ +typedef enum { ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_NORMAL,/**< The plain normal layout @since 1.12 */ ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_FILENAME, /**< Filename layout. Symbols such as '/' should be disabled. @since 1.12 */ ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL_VARIATION_PERSON_NAME/**< The name of a person. @since 1.12 */ -}; +} Ecore_IMF_Input_Layout_Normal_Variation; -enum +/** + * @typedef Ecore_IMF_Input_Panel_Layout_Numberonly_Variation + * @brief Enumeration for defining the types of Ecore_IMF Input Panel layout for numberonly variation + * @since 1.18 + */ +typedef enum { ECORE_IMF_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_NORMAL,/**< The plain normal number layout @since 1.8 */ ECORE_IMF_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_SIGNED,/**< The number layout to allow a positive or negative sign at the start @since 1.8 */ ECORE_IMF_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_DECIMAL, /**< The number layout to allow decimal point to provide fractional value @since 1.8 */ ECORE_IMF_INPUT_PANEL_LAYOUT_NUMBERONLY_VARIATION_SIGNED_AND_DECIMAL /**< The number layout to allow decimal point and negative sign @since 1.8 */ -}; +} Ecore_IMF_Input_Panel_Layout_Numberonly_Variation; -enum +/** + * @typedef Ecore_IMF_Input_Panel_Layout_Password_Variation + * @brief Enumeration for defining the types of Ecore_IMF Input Panel layout for password variation + * @since 1.12 + */ +typedef enum { ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD_VARIATION_NORMAL, /**< The normal password layout @since 1.12 */ ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD_VARIATION_NUMBERONLY /**< The password layout to allow only number @since 1.12 */ -}; +} Ecore_IMF_Input_Panel_Layout_Password_Variation; /** * @typedef Ecore_IMF_BiDi_Direction @@ -406,6 +421,11 @@ typedef enum ECORE_IMF_BIDI_DIRECTION_RTL /**< The Right to Left mode @since 1.12 */ } Ecore_IMF_BiDi_Direction; +/** + * @enum _Ecore_IMF_Device_Class + * @brief Enumeration for defining the types of Ecore_IMF_Device_Class + * @since 1.14 + */ typedef enum _Ecore_IMF_Device_Class { ECORE_IMF_DEVICE_CLASS_NONE, /**< Not a device @since 1.14 */ @@ -418,6 +438,11 @@ typedef enum _Ecore_IMF_Device_Class ECORE_IMF_DEVICE_CLASS_GAMEPAD /**< A gamepad controller or joystick @since 1.14 */ } Ecore_IMF_Device_Class; /**< A general class of device @since 1.14 */ +/** + * @enum _Ecore_IMF_Device_Subclass + * @brief Enumeration for defining the types of Ecore_IMF_Device_Subclass + * @since 1.14 + */ typedef enum _Ecore_IMF_Device_Subclass { ECORE_IMF_DEVICE_SUBCLASS_NONE, /**< Not a device @since 1.14 */ --
[EGIT] [core/efl] master 03/04: eldbus-service: add parameters and return type description for doxygen
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=157daefd5bff87933b576c7f3eb473fc8824cf1d commit 157daefd5bff87933b576c7f3eb473fc8824cf1d Author: JinYong ParkDate: Thu Oct 26 11:54:04 2017 +0900 eldbus-service: add parameters and return type description for doxygen Summary: Add omitted descriptions for doxygen warning Test Plan: API Doxygen Revision Reviewers: raster, cedric, jpeg, myoungwoon, Jaehyun_Cho Differential Revision: https://phab.enlightenment.org/D5378 --- src/lib/eldbus/eldbus_service.h | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/lib/eldbus/eldbus_service.h b/src/lib/eldbus/eldbus_service.h index ba5a9a3fc8..febf67de1d 100644 --- a/src/lib/eldbus/eldbus_service.h +++ b/src/lib/eldbus/eldbus_service.h @@ -182,12 +182,16 @@ eldbus_service_interface_fallback_register2(Eldbus_Connection *conn, const char * @brief Unregister a interface. * Note: This doesn't unregister the object path if interface count reaches 0. * Use eldbus_service_object_unregister() to unregister the object. + * + * @param iface interface to unregister */ EAPI void eldbus_service_interface_unregister(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1); /** * @brief Unregister all interfaces of the object path that this interface belongs * and the object path. + * + * @param iface interface to unregister */ EAPI void eldbus_service_object_unregister(Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1); EAPI Eldbus_Connection *eldbus_service_connection_get(const Eldbus_Service_Interface *iface) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; @@ -201,6 +205,8 @@ EAPI const char *eldbus_service_object_path_get(const Eldbus_Service_Interface * * @param iface interface of the signal * @param signal_id id of signal * @param ... values that will be send on signal + * + * @return EINA_TRUE if success */ EAPI Eina_Bool eldbus_service_signal_emit(const Eldbus_Service_Interface *iface, unsigned int signal_id, ...) EINA_ARG_NONNULL(1); @@ -212,15 +218,22 @@ EAPI Eina_Bool eldbus_service_signal_emit(const Eldbus_Service_Interface *iface, * * @param iface interface of the signal * @param signal_id id of signal + * + * @return EINA_TRUE if success */ EAPI Eldbus_Message *eldbus_service_signal_new(const Eldbus_Service_Interface *iface, unsigned int signal_id) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; /** * @brief Send a signal message. * - * On success this will call eldbus_message_unref() on the @param signal_msg, + * On success this will call eldbus_message_unref() on the @p signal_msg, * which is the intended behavior in 99% of the cases. Remember to increment * the refcount if you want to keep it alive. + * + * @param iface interface of the signal + * @param signal_msg message of signal + * + * @return EINA_TRUE if success */ EAPI Eina_Bool eldbus_service_signal_send(const Eldbus_Service_Interface *iface, Eldbus_Message *signal_msg) EINA_ARG_NONNULL(1, 2); @@ -262,6 +275,8 @@ EAPI void *eldbus_service_object_data_del(Eldbus_Service_Interface *iface, const * * @param iface Interface containing the changed property * @param name Property name + * + * @return EINA_TRUE if success */ EAPI Eina_Bool eldbus_service_property_changed(const Eldbus_Service_Interface *iface, const char *name) EINA_ARG_NONNULL(1, 2); --
[EGIT] [core/efl] master 04/04: eldbus signal handler: add param, return type description for doxygen
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b7359e7ff527823eb753a1b49d62753c8d84d4ed commit b7359e7ff527823eb753a1b49d62753c8d84d4ed Author: JinYong ParkDate: Thu Oct 26 11:54:13 2017 +0900 eldbus signal handler: add param, return type description for doxygen Summary: Add omitted description to eldbus signal handler for doxygen warning Test Plan: API Doxygen Revision Reviewers: raster, cedric, jpeg, myoungwoon, Jaehyun_Cho Differential Revision: https://phab.enlightenment.org/D5379 --- src/lib/eldbus/eldbus_signal_handler.h | 22 ++ 1 file changed, 22 insertions(+) diff --git a/src/lib/eldbus/eldbus_signal_handler.h b/src/lib/eldbus/eldbus_signal_handler.h index b842bfcac9..7e6435360e 100644 --- a/src/lib/eldbus/eldbus_signal_handler.h +++ b/src/lib/eldbus/eldbus_signal_handler.h @@ -18,17 +18,25 @@ * @param member name of the signal * @param cb callback that will be called when this signal is received * @param cb_data data that will be passed to callback + * + * @return signal handler */ EAPI Eldbus_Signal_Handler *eldbus_signal_handler_add(Eldbus_Connection *conn, const char *sender, const char *path, const char *interface, const char *member, Eldbus_Signal_Cb cb, const void *cb_data) EINA_ARG_NONNULL(1, 6); /** * @brief Increase signal handler reference. + * + * @param handler signal handler + * + * @return the same signal handler, @p handler */ EAPI Eldbus_Signal_Handler *eldbus_signal_handler_ref(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1); /** * @brief Decrease signal handler reference. * If reference == 0 signal handler will be freed. + * + * @param handler signal handler */ EAPI void eldbus_signal_handler_unref(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1); @@ -36,6 +44,8 @@ EAPI void eldbus_signal_handler_unref(Eldbus_Signal_Handler *ha * @brief Decrease signal handler reference like eldbus_signal_handler_unref() * but if reference > 0 this signal handler will stop listening to signals. In other * words it will be canceled but memory will not be freed. + * + * @param handler signal handler to delete */ EAPI void eldbus_signal_handler_del(Eldbus_Signal_Handler *handler) EINA_ARG_NONNULL(1); @@ -52,6 +62,8 @@ EAPI void eldbus_signal_handler_del(Eldbus_Signal_Handler *hand * @param sh signal handler * @param ... variadic of key and value and must be ended with a NULL * + * @return EINA_TRUE if success + * * @note For more information: * http://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-routing-match-rules */ @@ -70,6 +82,8 @@ EAPI Eina_Bool eldbus_signal_handler_match_extra_set(Eldbus_Signal_H * @param sh signal handler * @param ap va_list with the keys and values, must be ended with a NULL * + * @return EINA_TRUE if success + * * @note To information: * http://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-routing-match-rules */ @@ -77,11 +91,19 @@ EAPI Eina_Bool eldbus_signal_handler_match_extra_vset(Eldbus_Signal_ /** * @brief Add a callback function to be called when signal handler will be freed. + * + * @param handler signal handler + * @param cb callback that will be called when this signal handler is freed + * @param data data that will be passed to callback */ EAPI void eldbus_signal_handler_free_cb_add(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2); /** * @brief Remove callback registered in eldbus_signal_handler_free_cb_add(). + * + * @param handler signal handler + * @param cb registered callback to remove + * @param data data that will be passed to callback */ EAPI void eldbus_signal_handler_free_cb_del(Eldbus_Signal_Handler *handler, Eldbus_Free_Cb cb, const void *data) EINA_ARG_NONNULL(1, 2); --
[EGIT] [core/efl] master 02/04: eet: Add missing documentation information
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e784afbd8806790d15a768c5e04fef935c2c2668 commit e784afbd8806790d15a768c5e04fef935c2c2668 Author: Wonki KimDate: Thu Oct 26 11:53:31 2017 +0900 eet: Add missing documentation information Summary: There is a missing comment for Eet_Colorclass. This patch append a piece of information. Reviewers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5377 --- src/lib/eet/Eet.h | 5 + 1 file changed, 5 insertions(+) diff --git a/src/lib/eet/Eet.h b/src/lib/eet/Eet.h index cf1afd9552..147249b895 100644 --- a/src/lib/eet/Eet.h +++ b/src/lib/eet/Eet.h @@ -491,6 +491,11 @@ typedef Emile_Image_Encoding Eet_Image_Encoding; #define EET_IMAGE_ETC2_RGBA EMILE_IMAGE_ETC2_RGBA #define EET_IMAGE_ETC1_ALPHA EMILE_IMAGE_ETC1_ALPHA +/** + * @enum Eet_Colorspace + * Specify colorspace for image + * @since 1.10 + */ typedef Emile_Colorspace Eet_Colorspace; #define EET_COLORSPACE_ARGB EMILE_COLORSPACE_ARGB --
[EGIT] [core/efl] master 01/01: evas textblocke: add align=end for putting a text at the opposite side of LTR/RTL
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9906cd211f805d971733f0815617256429f0304e commit 9906cd211f805d971733f0815617256429f0304e Author: Youngbok ShinDate: Thu Oct 26 11:40:44 2017 +0900 evas textblocke: add align=end for putting a text at the opposite side of LTR/RTL Summary: There is a requirement for putting text at right side for LTR and at left side for RTL. It satisfies that reqirement easily. It also add "start" keywork for "align" tag. "start" will be same with "auto". Intuitionally, developer will try "align=start" if they once saw "align=end" in elsewhere. On the other hand, it only add "END" as new enumeration value for efl interface. @feature Test Plan: N/A Reviewers: herdsman, cedric, jpeg, raster Reviewed By: raster Subscribers: woohyun Differential Revision: https://phab.enlightenment.org/D5342 --- src/lib/efl/interfaces/efl_text_format.eo | 3 ++- src/lib/evas/canvas/evas_object_textblock.c | 36 ++--- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/src/lib/efl/interfaces/efl_text_format.eo b/src/lib/efl/interfaces/efl_text_format.eo index 0ec06a91d4..5e14893f06 100644 --- a/src/lib/efl/interfaces/efl_text_format.eo +++ b/src/lib/efl/interfaces/efl_text_format.eo @@ -14,7 +14,8 @@ enum Efl.Text.Format.Horizontal_Alignment_Type { locale, [[Respects locale's langauge settings]] left,[[Text is placed at the left end of the line]] right, [[Text is placed at the right end of the line]] - center [[Text is places at the center of the line]] + center, [[Text is places at the center of the line]] + end [[Text is places at opposite side of LTR/RTL (bidirectional) settings]] } enum Efl.Text.Format.Vertical_Alignment_Type { diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 44006d2860..ea0a4ffb69 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -425,7 +425,8 @@ typedef enum _Evas_Textblock_Align_Auto { EVAS_TEXTBLOCK_ALIGN_AUTO_NONE, EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL, - EVAS_TEXTBLOCK_ALIGN_AUTO_LOCALE + EVAS_TEXTBLOCK_ALIGN_AUTO_LOCALE, + EVAS_TEXTBLOCK_ALIGN_AUTO_END } Evas_Textblock_Align_Auto; struct _Evas_Object_Textblock_Item @@ -1957,6 +1958,8 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch * @li "middle" - Alias for "center" * @li "left" - Puts the text at the left of the line * @li "right" - Puts the text at the right of the line + * @li "start" - Respects LTR/RTL settings. It is same with "auto" + * @li "end" - Puts the text at the opposite side of LTR/RTL settings * @li - A number between 0.0 and 1.0 where 0.0 represents * "left" and 1.0 represents "right" * @li % - A percentage between 0% and 100% where 0% @@ -1965,11 +1968,16 @@ _format_command(Evas_Object *eo_obj, Evas_Object_Textblock_Format *fmt, const ch * align= * @endcode */ -if (len == 4 && !strcmp(param, "auto")) +if ((len == 4 && !strcmp(param, "auto")) || +(len == 5 && !strcmp(param, "start"))) { fmt->halign_auto = EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL; } -if (len == 6 && !strcmp(param, "locale")) +else if (len == 3 && !strcmp(param, "end")) + { + fmt->halign_auto = EVAS_TEXTBLOCK_ALIGN_AUTO_END; + } +else if (len == 6 && !strcmp(param, "locale")) { fmt->halign_auto = EVAS_TEXTBLOCK_ALIGN_AUTO_LOCALE; } @@ -3537,6 +3545,20 @@ _layout_line_align_get(Ctxt *c) return 0.0; } } + else if ((c->align_auto == EVAS_TEXTBLOCK_ALIGN_AUTO_END) && c->ln) + { +if (c->ln->items && c->ln->items->text_node && + (c->ln->par->direction == EVAS_BIDI_DIRECTION_RTL)) + { + /* Align left*/ + return 0.0; + } +else + { + /* Align right */ + return 1.0; + } + } else if (c->align_auto == EVAS_TEXTBLOCK_ALIGN_AUTO_LOCALE) { if (evas_common_language_direction_get() == EVAS_BIDI_DIRECTION_RTL) @@ -15614,6 +15636,10 @@ _efl_canvas_text_efl_text_format_halign_set(Eo *obj, Efl_Canvas_Text_Data *o, Ef { _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL); } + else if (type == EFL_TEXT_HORIZONTAL_ALIGNMENT_END) + { +_FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_END); + } else if (type == EFL_TEXT_HORIZONTAL_ALIGNMENT_LOCALE) { _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_LOCALE); @@ -15645,6 +15671,10 @@
[EGIT] [core/enlightenment] master 01/01: ptr grab/ungrab for blank/unblank - log stages and work done for debug
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=32be41d50578ec983a7b4f358478afeb3c2f1e95 commit 32be41d50578ec983a7b4f358478afeb3c2f1e95 Author: Carsten Haitzler (Rasterman)Date: Thu Oct 26 10:50:37 2017 +0900 ptr grab/ungrab for blank/unblank - log stages and work done for debug looking to get more info for what is going on... --- src/bin/e_comp_x.c | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 9f19eef95..507f4d5ca 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -5075,11 +5075,13 @@ _e_comp_x_cb_ping(void *data EINA_UNUSED, int ev_type EINA_UNUSED, Ecore_X_Event static void _e_comp_pointer_grab(void) { + fprintf(stderr, "E_COMP_X: 06 create grab win and grab pointer\n"); if (_e_comp_x_suspend_grabbed) ecore_x_window_free(_e_comp_x_suspend_grabbed); _e_comp_x_suspend_grabbed = ecore_x_window_input_new(e_comp->root, 0, 0, 1, 1); ecore_x_window_show(_e_comp_x_suspend_grabbed); if (!e_grabinput_get(_e_comp_x_suspend_grabbed, 0, 0)) { +fprintf(stderr, "E_COMP_X: 07 grab failed\n"); ecore_x_window_free(_e_comp_x_suspend_grabbed); _e_comp_x_suspend_grabbed = 0; } @@ -5089,6 +5091,7 @@ static void _e_comp_pointer_ungrab(void) { if (!_e_comp_x_suspend_grabbed) return; + fprintf(stderr, "E_COMP_X: 6 really ungrab input and free window\n"); e_grabinput_release(_e_comp_x_suspend_grabbed, 0); ecore_x_window_free(_e_comp_x_suspend_grabbed); _e_comp_x_suspend_grabbed = 0; @@ -5097,6 +5100,7 @@ _e_comp_pointer_ungrab(void) static void _e_comp_cb_pointer_suspend_resume_done(void *data, Evas_Object *obj, const char *emission, const char *source) { + fprintf(stderr, "E_COMP_X: 5 cursor suspend/resume done\n"); edje_object_signal_callback_del(obj, emission, source, _e_comp_cb_pointer_suspend_resume_done); if (!data) _e_comp_pointer_ungrab(); @@ -5106,6 +5110,7 @@ EINTERN Eina_Bool _e_comp_x_screensaver_on() { const char *s; + fprintf(stderr, "E_COMP_X: 01 screensaver on\n"); if ((!e_comp->pointer) || (!e_comp->pointer->o_ptr)) return ECORE_CALLBACK_RENEW; s = edje_object_data_get(e_comp->pointer->o_ptr, "can_suspend"); @@ -5113,10 +5118,13 @@ _e_comp_x_screensaver_on() { if (!e_desklock_state_get()) { + fprintf(stderr, "E_COMP_X: 02 ungrab then grab pointer\n"); _e_comp_pointer_ungrab(); _e_comp_pointer_grab(); + fprintf(stderr, "E_COMP_X: 03 no desklock but abort pointer suspend\n"); if (!_e_comp_x_suspend_grabbed) return ECORE_CALLBACK_RENEW; } +fprintf(stderr, "E_COMP_X: 04 emit suspend signals to pointer\n"); edje_object_signal_callback_del(e_comp->pointer->o_ptr, "e,state,mouse,suspend,done", "e", _e_comp_cb_pointer_suspend_resume_done); @@ -5139,6 +5147,7 @@ _e_comp_x_screensaver_off() { const char *s; + fprintf(stderr, "E_COMP_X: 1 screensaver off\n"); _e_comp_pointer_ungrab(); if ((!e_comp->pointer) || (!e_comp->pointer->o_ptr)) return ECORE_CALLBACK_RENEW; s = edje_object_data_get(e_comp->pointer->o_ptr, "can_suspend"); @@ -5147,9 +5156,15 @@ _e_comp_x_screensaver_off() { if (!e_desklock_state_get()) { + fprintf(stderr, "E_COMP_X: 2 re-grab pointer because desklock not on\n"); _e_comp_pointer_grab(); - if (!_e_comp_x_suspend_grabbed) return ECORE_CALLBACK_RENEW; + if (!_e_comp_x_suspend_grabbed) + { + fprintf(stderr, "E_COMP_X: 3 no desklock but abort pointer unsuspend\n"); + return ECORE_CALLBACK_RENEW; + } } +fprintf(stderr, "E_COMP_X: 4 emit resume signals to pointer\n"); edje_object_signal_callback_del(e_comp->pointer->o_ptr, "e,state,mouse,suspend,done", "e", _e_comp_cb_pointer_suspend_resume_done); --
[EGIT] [core/efl] master 01/01: eina: add helper to return already known to fail future.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e474edc9f671419e433a0c52161149b89bee08c8 commit e474edc9f671419e433a0c52161149b89bee08c8 Author: Cedric BAILDate: Wed Oct 11 16:52:16 2017 -0700 eina: add helper to return already known to fail future. --- src/lib/eina/eina_promise.c | 21 + src/lib/eina/eina_promise.h | 27 +++ 2 files changed, 48 insertions(+) diff --git a/src/lib/eina/eina_promise.c b/src/lib/eina/eina_promise.c index 1fbac60f65..649b6e97b0 100644 --- a/src/lib/eina/eina_promise.c +++ b/src/lib/eina/eina_promise.c @@ -815,6 +815,27 @@ eina_future_resolved(Eina_Future_Scheduler *scheduler, Eina_Value value) } EAPI Eina_Future * +eina_future_rejected(Eina_Future_Scheduler *scheduler, Eina_Error err) +{ + Eina_Promise *p; + Eina_Future *f; + + EINA_SAFETY_ON_NULL_GOTO(scheduler, error); + + p = eina_promise_new(scheduler, _dummy_cancel, NULL); + EINA_SAFETY_ON_NULL_GOTO(p, error); + + f = eina_future_new(p); + EINA_SAFETY_ON_NULL_GOTO(f, error); + + eina_promise_reject(p, err); + return f; + + error: + return NULL; +} + +EAPI Eina_Future * eina_future_then_from_desc(Eina_Future *prev, const Eina_Future_Desc desc) { EINA_FUTURE_CHECK_GOTO(prev, err_future); diff --git a/src/lib/eina/eina_promise.h b/src/lib/eina/eina_promise.h index 323dee3288..0ffd487cea 100644 --- a/src/lib/eina/eina_promise.h +++ b/src/lib/eina/eina_promise.h @@ -786,6 +786,33 @@ EAPI Eina_Future *eina_future_new(Eina_Promise *p) EINA_ARG_NONNULL(1) EINA_WARN EAPI Eina_Future *eina_future_resolved(Eina_Future_Scheduler *scheduler, Eina_Value value) EINA_ARG_NONNULL(1); /** + * Creates a new future that is already rejected to a specified error. + * + * This function creates a new future with an already known error, + * that will be resolved and dispatched by the given @a scheduler as + * usual. + * + * This is a helper that behaves the same as eina_promise_new() + * followed by eina_future_new() and then eina_promise_rejected(). + * + * Futures can also be canceled using eina_future_cancel(), which will + * cause the whole chain to be cancelled alongside with any pending + * promise. + * + * @param scheduler The scheduler to use. + * @param err An Eina_Error value + * + * @return The future or @c NULL on error. + * + * @see eina_promise_new() + * @see eina_future_new() + * @see eina_promise_reject() + * @see eina_promise_resolve() + * @see eina_future_cancel() + */ +EAPI Eina_Future *eina_future_rejected(Eina_Future_Scheduler *scheduler, Eina_Error err); + +/** * Register an Eina_Future_Desc to be used when the future is resolve/rejected. * * With this function a callback and data is attached to the future and then --
[EGIT] [core/efl] master 01/01: eolian-cxx: Fix multiple definitions in forward declaration
felipealmeida pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f05a799daa6ec5e362a4376ee5d2b9ef011cd377 commit f05a799daa6ec5e362a4376ee5d2b9ef011cd377 Author: Felipe Magno de AlmeidaDate: Wed Oct 25 18:00:50 2017 -0200 eolian-cxx: Fix multiple definitions in forward declaration --- src/lib/eolian_cxx/grammar/class_declaration.hpp | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/lib/eolian_cxx/grammar/class_declaration.hpp b/src/lib/eolian_cxx/grammar/class_declaration.hpp index 7c9957f07d..d448c31074 100644 --- a/src/lib/eolian_cxx/grammar/class_declaration.hpp +++ b/src/lib/eolian_cxx/grammar/class_declaration.hpp @@ -21,6 +21,19 @@ struct class_declaration_generator bool generate(OutputIterator sink, attributes::klass_def const& cls, Context const& context) const { std::vector cpp_namespaces = attributes::cpp_namespaces(cls.namespaces); + + std::string guard_symbol; + + if(!as_generator(*(string << "_") << string << "_FWD_GUARD") +.generate(std::back_inserter(guard_symbol) + , std::make_tuple(cpp_namespaces, cls.cxx_name), add_upper_case_context(context))) + return false; + + if(!as_generator( "#ifndef " << guard_symbol << "\n" + << "#define " << guard_symbol << "\n") +.generate(sink, std::make_tuple(), context)) + return false; + auto open_namespace = *("namespace " << string << " { ") << "\n"; if(!as_generator(open_namespace).generate(sink, cpp_namespaces, add_lower_case_context(context))) return false; @@ -32,7 +45,7 @@ struct class_declaration_generator auto close_namespace = *(lit("} ")) << "\n"; if(!as_generator(close_namespace).generate(sink, cpp_namespaces, context)) return false; - if(type_traits) + // if(type_traits) if(!as_generator ( "namespace efl { namespace eo { template<> struct is_eolian_object< " @@ -49,6 +62,10 @@ struct class_declaration_generator , cpp_namespaces, cls.cxx_name, cpp_namespaces, cls.cxx_name ), context)) return false; + if(!as_generator("#endif\n") +.generate(sink, std::make_tuple(), context)) + return false; + return true; } --
[EGIT] [website/www-content] master 01/01: Move efl build snippets to /incl and fix links
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=1c2551455c43320e816d15574fc1c9fbdc4b5ab4 commit 1c2551455c43320e816d15574fc1c9fbdc4b5ab4 Author: Andy WilliamsDate: Wed Oct 25 21:04:22 2017 +0100 Move efl build snippets to /incl and fix links --- pages/docs/distros/debian-start.txt| 2 +- pages/docs/distros/start.txt | 10 +- pages/download.txt | 6 +++--- pages/{docs-efl-buildenv.txt => incl/efl-buildenv.txt} | 0 pages/{docs-efl-buildorder.txt => incl/efl-buildorder.txt} | 0 pages/{docs-efl-deps-git.txt => incl/efl-deps-git.txt} | 0 pages/{docs-efl-deps-src.txt => incl/efl-deps-src.txt} | 0 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pages/docs/distros/debian-start.txt b/pages/docs/distros/debian-start.txt index f3dc3e68..a602d430 100644 --- a/pages/docs/distros/debian-start.txt +++ b/pages/docs/distros/debian-start.txt @@ -9,7 +9,7 @@ To start Enlightenment, see the run-time requirements below. Install from the sources -In this part, the installation for Debian is done from sources like in the [[/docs-efl-start|Get EFL installed]] tutorial. +In this part, the installation for Debian is done from sources like in the [[/docs/distros/|Get EFL installed]] tutorial. The following part provides a script and shows how to install Enlightenment and Terminology with their dependencies on Debian. The script below can be easily adapted for Elementary. diff --git a/pages/docs/distros/start.txt b/pages/docs/distros/start.txt index 1bac30b5..8768ed36 100644 --- a/pages/docs/distros/start.txt +++ b/pages/docs/distros/start.txt @@ -11,7 +11,7 @@ Our source code is developed collaboratively in a pretty typical open source man Before you start you will want basic build tools installed such as: -{{page>docs-efl-deps-git}} +{{page>incl:efl-deps-git}} Get The Source @@ -31,17 +31,17 @@ git clone https://git.enlightenment.org/apps/rage.git Dependencies -{{page>docs-efl-deps-src}} +{{page>incl:efl-deps-src}} Build Environment -{{page>docs-efl-buildenv}} +{{page>incl:efl-buildenv}} Build Order For libraries (build these before applications), build them in order: -{{page>docs-efl-buildorder}} +{{page>incl:efl-buildorder}} Compilation @@ -82,4 +82,4 @@ instead of git clone https:// -~~DISCUSSIONS~~ \ No newline at end of file +~~DISCUSSIONS~~ diff --git a/pages/download.txt b/pages/download.txt index 059ffa00..ee922501 100644 --- a/pages/download.txt +++ b/pages/download.txt @@ -18,15 +18,15 @@ We provide original source code "tarballs" as the canonical release of what we m When compiling from source, build in this order: -{{page>docs-efl-buildorder}} +{{page>incl:efl-buildorder}} Dependencies -{{page>docs-efl-deps-src}} +{{page>incl:efl-deps-src}} Build Environment -{{page>docs-efl-buildenv}} +{{page>incl:efl-buildenv}} Compilation diff --git a/pages/docs-efl-buildenv.txt b/pages/incl/efl-buildenv.txt similarity index 100% rename from pages/docs-efl-buildenv.txt rename to pages/incl/efl-buildenv.txt diff --git a/pages/docs-efl-buildorder.txt b/pages/incl/efl-buildorder.txt similarity index 100% rename from pages/docs-efl-buildorder.txt rename to pages/incl/efl-buildorder.txt diff --git a/pages/docs-efl-deps-git.txt b/pages/incl/efl-deps-git.txt similarity index 100% rename from pages/docs-efl-deps-git.txt rename to pages/incl/efl-deps-git.txt diff --git a/pages/docs-efl-deps-src.txt b/pages/incl/efl-deps-src.txt similarity index 100% rename from pages/docs-efl-deps-src.txt rename to pages/incl/efl-deps-src.txt --
[EGIT] [core/enlightenment] master 01/01: wl-drm: Fix issue of not being able to set output mode
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5dc1c1c8ebad8b9fdad502d564b0819bf9d7bd4b commit 5dc1c1c8ebad8b9fdad502d564b0819bf9d7bd4b Author: Chris MichaelDate: Wed Oct 25 15:28:46 2017 -0400 wl-drm: Fix issue of not being able to set output mode If we pass in screen geometry here when trying to set an output mode, we can encounter "out of memory" errors from libdrm with outputs that have a high resolution. As it turns out, we should be passing 0, 0 for the x/y values when trying to set an output mode. @fix Signed-off-by: Chris Michael --- src/modules/wl_drm/e_mod_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c index e4355268e..f533f1907 100644 --- a/src/modules/wl_drm/e_mod_main.c +++ b/src/modules/wl_drm/e_mod_main.c @@ -580,8 +580,7 @@ _drm2_randr_apply(void) if (s->config.priority > top_priority) top_priority = s->config.priority; -ecore_drm2_output_mode_set(output, mode, s->config.geom.x, - s->config.geom.y); +ecore_drm2_output_mode_set(output, mode, 0, 0); /* TODO: cannot support rotations until we support planes * and we cannot support planes until Atomic support is in */ --
[EGIT] [core/enlightenment] master 01/01: Fix crash on wayland logout if xwayland hasn't started yet
derekf pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=fa1a8583564e86e729e77560fb2faa92175387d1 commit fa1a8583564e86e729e77560fb2faa92175387d1 Author: Derek ForemanDate: Wed Oct 25 14:09:12 2017 -0500 Fix crash on wayland logout if xwayland hasn't started yet If xwayland hasn't started yet then the root window id is 0, which is invalid, so we crash in e_comp_x_shutdown. --- src/modules/xwayland/e_mod_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/xwayland/e_mod_main.c b/src/modules/xwayland/e_mod_main.c index 1b6ccc841..f3826c3cd 100644 --- a/src/modules/xwayland/e_mod_main.c +++ b/src/modules/xwayland/e_mod_main.c @@ -451,7 +451,7 @@ xwl_shutdown(void) if (exs->sig_hdlr) ecore_event_handler_del(exs->sig_hdlr); free(exs); - e_comp_x_shutdown(); + if (e_comp_util_has_x()) e_comp_x_shutdown(); ecore_x_shutdown(); e_util_env_set("DISPLAY", NULL); } --
[EGIT] [website/www] master 01/01: redirect from old page specific API entry URL
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=1f987d423bddab09be3c935a76a421bfe02d34cd commit 1f987d423bddab09be3c935a76a421bfe02d34cd Author: Andy WilliamsDate: Wed Oct 25 18:22:03 2017 +0100 redirect from old page specific API entry URL --- public_html/.htaccess | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public_html/.htaccess b/public_html/.htaccess index 95815e51..70943a75 100644 --- a/public_html/.htaccess +++ b/public_html/.htaccess @@ -42,6 +42,8 @@ RewriteRule ^distros/archlinux-start /docs/distros/archlinux-start [R,L] RewriteRule ^distros/debian-start /docs/distros/debian-start [R,L] RewriteRule ^distros/fedora-start /docs/distros/fedora-start [R,L] +RewriteRule ^docs/efl/auto/reference /develop/api/ [R,L] + RewriteRule ^docs/efl/auto/(.*)$ /develop/api/$1 [R,L] RewriteRule ^api/javascript/(.*)$ /develop/legacy/api/javascript/$1 [R,L] --
[EGIT] [website/www-content] master 01/01: Wiki page docs changed with summary [] by Andrew Williams
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=6a11f6e3886e7baedb05ccae00a1a43ec3aba686 commit 6a11f6e3886e7baedb05ccae00a1a43ec3aba686 Author: Andrew WilliamsDate: Wed Oct 25 10:20:11 2017 -0700 Wiki page docs changed with summary [] by Andrew Williams --- pages/docs.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/docs.txt b/pages/docs.txt index e3182f0c..c8a32109 100755 --- a/pages/docs.txt +++ b/pages/docs.txt @@ -63,7 +63,7 @@ For now we recommend using the stable API and it's Bindings. === Beta API using EO === - * [[docs/efl/auto/reference|EFL EO API documentation (C)]] + * [[develop/api/|EFL EO API documentation (C)]] --
[EGIT] [core/efl] master 01/01: Generate docs into /develop/api/*
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a7bb770e699ca1dadb958832b2d2131a9c63216f commit a7bb770e699ca1dadb958832b2d2131a9c63216f Author: Andy WilliamsDate: Wed Oct 25 18:17:17 2017 +0100 Generate docs into /develop/api/* Also move root doc to start.txt for a better entry point --- src/scripts/elua/apps/docgen/keyref.lua | 2 +- src/scripts/elua/apps/docgen/util.lua | 6 +++--- src/scripts/elua/apps/docgen/writer.lua | 4 ++-- src/scripts/elua/apps/gendoc.lua| 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/scripts/elua/apps/docgen/keyref.lua b/src/scripts/elua/apps/docgen/keyref.lua index a28e6125b4..56311d9742 100644 --- a/src/scripts/elua/apps/docgen/keyref.lua +++ b/src/scripts/elua/apps/docgen/keyref.lua @@ -30,7 +30,7 @@ M.build = function() f:finish() local lf = writer.Writer({ "ref", lang, "keyword-link" }) lf:write_raw("/", dutil.path_join( -dutil.nspace_to_path(dutil.get_root_ns()), "auto", +dutil.nspace_to_path(dutil.get_root_ns()), "ref", lang, "key", "{FNAME}" )) lf:write_nl() diff --git a/src/scripts/elua/apps/docgen/util.lua b/src/scripts/elua/apps/docgen/util.lua index 48e375da95..65968ac3e7 100644 --- a/src/scripts/elua/apps/docgen/util.lua +++ b/src/scripts/elua/apps/docgen/util.lua @@ -23,7 +23,7 @@ M.nspace_to_path = function(ns) end M.make_page = function(path, ext) -return M.path_join(doc_root, "auto", path .. "." .. ext) +return M.path_join(doc_root, path .. "." .. ext) end M.get_root_ns = function() @@ -31,7 +31,7 @@ M.get_root_ns = function() end M.mkdir_r = function(dirn) -assert(cutil.file_mkpath(M.path_join(doc_root, "auto", dirn))) +assert(cutil.file_mkpath(M.path_join(doc_root, dirn))) end M.mkdir_p = function(path) @@ -39,7 +39,7 @@ M.mkdir_p = function(path) end M.rm_root = function() -cutil.file_rmrf(M.path_join(doc_root, "auto")) +cutil.file_rmrf(doc_root) end M.init = function(root, rns) diff --git a/src/scripts/elua/apps/docgen/writer.lua b/src/scripts/elua/apps/docgen/writer.lua index 67b6765596..4690ed7c91 100644 --- a/src/scripts/elua/apps/docgen/writer.lua +++ b/src/scripts/elua/apps/docgen/writer.lua @@ -73,7 +73,7 @@ local write_include = function(self, tp, name, flags) if type(name) == "table" then if name[#name] == true then name[#name] = nil -name = ":" .. root_nspace .. ":auto:" +name = ":" .. root_nspace .. ":" .. table.concat(name, ":") elseif name[#name] == false then name[#name] = nil @@ -272,7 +272,7 @@ writers["dokuwiki"] = util.Object:clone { if type(target) == "table" then if target[#target] == true then target[#target] = nil -target = ":" .. root_nspace .. ":auto:" +target = ":" .. root_nspace .. ":" .. table.concat(target, ":") elseif target[#target] == false then target[#target] = nil diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua index 63ad69bf36..97c9715a40 100644 --- a/src/scripts/elua/apps/gendoc.lua +++ b/src/scripts/elua/apps/gendoc.lua @@ -327,7 +327,7 @@ local build_reftable = function(f, title, ctitle, ctype, t, iscl) end local build_ref = function() -local f = writer.Writer("reference", "EFL Reference") +local f = writer.Writer("start", "EFL Reference") printgen("Generating reference...") f:write_editable({ "reference" }, "general") @@ -1601,7 +1601,7 @@ getopt.parse { set_theme(opts["graph-theme"]) end local rootns = (not opts["n"] or opts["n"] == "") -and "develop:efl" or opts["n"] +and "develop:api" or opts["n"] local dr if not opts["r"] or opts["r"] == "" then dr = "dokuwiki/data/pages" --
[EGIT] [website/www] master 01/01: final api docs location
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=6fe3f7a7fd942c44d4301edef3b9fd98ea978f65 commit 6fe3f7a7fd942c44d4301edef3b9fd98ea978f65 Author: Andy WilliamsDate: Wed Oct 25 18:06:00 2017 +0100 final api docs location --- public_html/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_html/.htaccess b/public_html/.htaccess index 961e1325..95815e51 100644 --- a/public_html/.htaccess +++ b/public_html/.htaccess @@ -42,7 +42,7 @@ RewriteRule ^distros/archlinux-start /docs/distros/archlinux-start [R,L] RewriteRule ^distros/debian-start /docs/distros/debian-start [R,L] RewriteRule ^distros/fedora-start /docs/distros/fedora-start [R,L] -RewriteRule ^docs/efl/auto/(.*)$ /develop/efl/auto/$1[R,L] +RewriteRule ^docs/efl/auto/(.*)$ /develop/api/$1 [R,L] RewriteRule ^api/javascript/(.*)$ /develop/legacy/api/javascript/$1 [R,L] RewriteRule ^api/javascript/develop/legacy/api/javascript/start [R,L] --
[EGIT] [core/efl] master 07/13: efl_wl: add function for returning the evas object for an extracted surface
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e9572a653742f0e613905e47767ae116297928d3 commit e9572a653742f0e613905e47767ae116297928d3 Author: Mike BlumenkrantzDate: Thu Oct 19 12:57:28 2017 -0400 efl_wl: add function for returning the evas object for an extracted surface @feature --- src/lib/efl_wl/Efl_Wl.h | 11 +++ src/lib/efl_wl/efl_wl.c | 12 2 files changed, 23 insertions(+) diff --git a/src/lib/efl_wl/Efl_Wl.h b/src/lib/efl_wl/Efl_Wl.h index d4385d2a59..cf3de2112e 100644 --- a/src/lib/efl_wl/Efl_Wl.h +++ b/src/lib/efl_wl/Efl_Wl.h @@ -143,6 +143,17 @@ EAPI void *efl_wl_global_add(Evas_Object *obj, const void *interface, uint32_t v * @since 1.21 */ EAPI Eina_Bool efl_wl_surface_extract(Evas_Object *surface); + +/** + * Get the Evas_Object for an extracted wl_surface resource created by an efl_wl object + * + * @note Passing anything other than a valid wl_surface resource from an efl_wl object will guarantee a crash. + * + * @param surface_resource The wl_resource for a wl_surface + * @return The Evas_Object of the surface, NULL on failure + * @since 1.21 + */ +EAPI Evas_Object *efl_wl_extracted_surface_object_find(void *surface_resource); #endif #endif diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c index 9eec04e916..7e76d2a765 100644 --- a/src/lib/efl_wl/efl_wl.c +++ b/src/lib/efl_wl/efl_wl.c @@ -5561,3 +5561,15 @@ efl_wl_surface_extract(Evas_Object *surface) evas_object_smart_member_del(surface); return EINA_TRUE; } + +Evas_Object * +efl_wl_extracted_surface_object_find(void *surface_resource) +{ + Comp_Surface *cs = wl_resource_get_user_data(surface_resource); + + EINA_SAFETY_ON_NULL_RETURN_VAL(cs, NULL); + EINA_SAFETY_ON_TRUE_RETURN_VAL(!cs->extracted, NULL); + EINA_SAFETY_ON_TRUE_RETURN_VAL(cs->dead, NULL); + + return cs->obj; +} --
[EGIT] [core/efl] master 09/13: efl_wl: do not propagate hints to main widget for child surfaces
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=42c56cc33bea10eeeb48a650a96cb8520e445ac2 commit 42c56cc33bea10eeeb48a650a96cb8520e445ac2 Author: Mike BlumenkrantzDate: Thu Oct 19 14:25:46 2017 -0400 efl_wl: do not propagate hints to main widget for child surfaces the top-most parent should be the surface from which hints are obtained @fix --- src/lib/efl_wl/efl_wl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c index de86613a9f..b5548c7f93 100644 --- a/src/lib/efl_wl/efl_wl.c +++ b/src/lib/efl_wl/efl_wl.c @@ -1181,6 +1181,7 @@ shell_surface_minmax_update(Comp_Surface *cs) if (!cs) return; if (!cs->c->minmax) return; if (cs->extracted) return; + if (cs->parent) return; evas_object_size_hint_min_get(cs->obj, , ); evas_object_size_hint_min_set(cs->c->obj, w, h); evas_object_size_hint_max_get(cs->obj, , ); @@ -1198,6 +1199,7 @@ shell_surface_aspect_update(Comp_Surface *cs) if (!cs) return; if (!cs->c->aspect) return; if (cs->extracted) return; + if (cs->parent) return; evas_object_size_hint_aspect_get(cs->obj, , , ); evas_object_size_hint_aspect_set(cs->c->obj, aspect, w, h); } --
[EGIT] [core/enlightenment] master 03/03: Clear stored root window id when shutting down X
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=930cf317d61618fe0c7178632544fab961c9d438 commit 930cf317d61618fe0c7178632544fab961c9d438 Author: Derek ForemanDate: Tue Oct 24 16:00:19 2017 -0500 Clear stored root window id when shutting down X Currently e_comp_util_has_x() will still return true after the X machinery is shut down - this can lead to crashes on logout under wayland when xwayland apps are running. Clearing the root window id resolves this. @ref T5593 --- src/bin/e_comp_x.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 8f4e9555e..9f19eef95 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -5394,6 +5394,7 @@ _e_comp_x_del(E_Comp *c) E_FREE_FUNC(unfocus_job, ecore_job_del); free(c->x_comp_data); c->x_comp_data = e_comp_x = NULL; + c->root = 0; } static void --
[EGIT] [core/enlightenment] master 02/03: add client refs for volume control sinks
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c09b2f35dd0f17e8afc3364a98ff0756392b commit c09b2f35dd0f17e8afc3364a98ff0756392b Author: Mike BlumenkrantzDate: Wed Oct 25 10:16:50 2017 -0400 add client refs for volume control sinks ref T6150 --- src/bin/e_client_volume.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/bin/e_client_volume.c b/src/bin/e_client_volume.c index e40bbeb0a..aea8fd648 100644 --- a/src/bin/e_client_volume.c +++ b/src/bin/e_client_volume.c @@ -182,6 +182,7 @@ e_client_volume_sink_del(E_Client_Volume_Sink *sink) e_comp_object_frame_volume_update(ec->frame); _e_client_volume_sink_event_simple(ec, sink, E_EVENT_CLIENT_VOLUME_SINK_DEL); +e_object_unref(E_OBJECT(ec)); } free(sink); } @@ -301,6 +302,7 @@ e_client_volume_sink_append(E_Client *ec, E_Client_Volume_Sink *sink) ec->sinks = eina_list_append(ec->sinks, sink); sink->clients = eina_list_append(sink->clients, ec); + e_object_ref(E_OBJECT(ec)); if (!ec->volume_control_enabled) { ec->volume_min = e_client_volume_sink_min_get(sink); @@ -324,6 +326,7 @@ e_client_volume_sink_remove(E_Client *ec, E_Client_Volume_Sink *sink) _e_client_volume_update(ec); _e_client_volume_sink_event_simple(ec, sink, E_EVENT_CLIENT_VOLUME_SINK_DEL); + e_object_unref(E_OBJECT(ec)); } E_API void --
[EGIT] [core/efl] master 08/13: wayland: add support for efl weight hint propagation from elm_win to efl_wl
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ed30f41de82515d130f0d861e922f9e3f45a7aaf commit ed30f41de82515d130f0d861e922f9e3f45a7aaf Author: Mike BlumenkrantzDate: Thu Oct 19 13:26:51 2017 -0400 wayland: add support for efl weight hint propagation from elm_win to efl_wl @feature --- src/lib/ecore_wl2/ecore_wl2_display.c | 2 +- src/lib/ecore_wl2/ecore_wl2_private.h | 8 src/lib/ecore_wl2/ecore_wl2_window.c | 23 +++ src/lib/efl_wl/efl_wl.c | 14 -- src/lib/elementary/efl_ui_win.c | 11 +++ src/lib/elementary/efl_ui_win.eo | 1 + src/wayland_protocol/efl-hints.xml| 5 + 7 files changed, 61 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c index 1780371524..db7f47999a 100644 --- a/src/lib/ecore_wl2/ecore_wl2_display.c +++ b/src/lib/ecore_wl2/ecore_wl2_display.c @@ -330,7 +330,7 @@ _cb_global_add(void *data, struct wl_registry *registry, unsigned int id, const { Ecore_Wl2_Window *window; -ewd->wl.efl_hints = wl_registry_bind(registry, id, _hints_interface, 1); +ewd->wl.efl_hints = wl_registry_bind(registry, id, _hints_interface, MIN(version, 2)); EINA_INLIST_FOREACH(ewd->windows, window) if (window->zxdg_toplevel && window->aspect.set) efl_hints_set_aspect(window->display->wl.efl_hints, window->zxdg_toplevel, diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h b/src/lib/ecore_wl2/ecore_wl2_private.h index e8e95b6a57..dc345bce7a 100644 --- a/src/lib/ecore_wl2/ecore_wl2_private.h +++ b/src/lib/ecore_wl2/ecore_wl2_private.h @@ -199,6 +199,12 @@ struct _Ecore_Wl2_Window Eina_Bool set : 1; } aspect; + struct + { + int w, h; + Eina_Bool set : 1; + } weight; + Eina_Inlist *subsurfs; Eina_List *supported_aux_hints; Eina_List *frame_callbacks; @@ -549,6 +555,8 @@ void _ecore_wl2_window_semi_free(Ecore_Wl2_Window *window); void _ecore_wl2_offer_unref(Ecore_Wl2_Offer *offer); Eina_Bool _ecore_wl2_display_sync_get(void); +EAPI void ecore_wl2_window_weight_set(Ecore_Wl2_Window *window, double w, double h); + EAPI extern int _ecore_wl2_event_window_www; EAPI extern int _ecore_wl2_event_window_www_drag; diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index b33e4240d0..c6cd35135a 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -358,6 +358,9 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window) if (window->aspect.set && window->display->wl.efl_hints) efl_hints_set_aspect(window->display->wl.efl_hints, window->zxdg_toplevel, window->aspect.w, window->aspect.h, window->aspect.aspect); + if (window->weight.set && window->display->wl.efl_hints) + efl_hints_set_weight(window->display->wl.efl_hints, window->zxdg_toplevel, + window->weight.w, window->weight.h); } ecore_wl2_window_commit(window, EINA_TRUE); @@ -1344,6 +1347,26 @@ ecore_wl2_window_aspect_set(Ecore_Wl2_Window *window, int w, int h, unsigned int window->zxdg_toplevel, w, h, aspect); } +EAPI void +ecore_wl2_window_weight_set(Ecore_Wl2_Window *window, double w, double h) +{ + int ww, hh; + EINA_SAFETY_ON_NULL_RETURN(window); + + ww = lround(w * 100); + hh = lround(h * 100); + + if ((window->weight.w == ww) && (window->weight.h == hh)) + return; + + window->weight.w = ww; + window->weight.h = hh; + window->weight.set = 1; + if (window->display->wl.efl_hints && window->zxdg_toplevel) + efl_hints_set_weight(window->display->wl.efl_hints, + window->zxdg_toplevel, ww, hh); +} + static void _frame_cb(void *data, struct wl_callback *callback, uint32_t timestamp) { diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c index 7e76d2a765..de86613a9f 100644 --- a/src/lib/efl_wl/efl_wl.c +++ b/src/lib/efl_wl/efl_wl.c @@ -326,6 +326,7 @@ struct Comp_Surface Eina_Bool dead : 1; Eina_Bool commit : 1; Eina_Bool extracted : 1; + Eina_Bool hint_set_weight : 1; }; struct Comp_Subsurface @@ -4997,9 +4998,18 @@ hints_set_aspect(struct wl_client *client, struct wl_resource *resource, struct shell_surface_aspect_update(cs); } +static void +hints_set_weight(struct wl_client *client, struct wl_resource *resource, struct wl_resource *surface, int w, int h) +{ + Comp_Surface *cs = wl_resource_get_user_data(surface); + cs->hint_set_weight = 1; + evas_object_size_hint_weight_set(cs->obj, w / 100., h / 100.); +} + static const struct efl_hints_interface hints_interface = { hints_set_aspect, + hints_set_weight, }; static void @@ -5496,7 +5506,7 @@ efl_wl_minmax_set(Evas_Object
[EGIT] [core/efl] master 13/13: efl-wl: send configures when extracted popups are resized
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e7faa2c82022ceb02741096abd20915cf12a544a commit e7faa2c82022ceb02741096abd20915cf12a544a Author: Mike BlumenkrantzDate: Fri Oct 20 16:03:12 2017 -0400 efl-wl: send configures when extracted popups are resized --- src/lib/efl_wl/efl_wl.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c index bc87e7f044..7f27abbd4f 100644 --- a/src/lib/efl_wl/efl_wl.c +++ b/src/lib/efl_wl/efl_wl.c @@ -5559,11 +5559,9 @@ efl_wl_surface_extract(Evas_Object *surface) EINA_SAFETY_ON_TRUE_RETURN_VAL(cs->extracted, EINA_FALSE); EINA_SAFETY_ON_TRUE_RETURN_VAL(cs->dead, EINA_FALSE); cs->extracted = 1; + evas_object_event_callback_add(cs->obj, EVAS_CALLBACK_RESIZE, extracted_changed, cs); if (!cs->shell.popup) - { -evas_object_event_callback_add(cs->obj, EVAS_CALLBACK_RESIZE, extracted_changed, cs); -evas_object_event_callback_add(cs->obj, EVAS_CALLBACK_FOCUS_OUT, extracted_unfocus, cs); - } + evas_object_event_callback_add(cs->obj, EVAS_CALLBACK_FOCUS_OUT, extracted_unfocus, cs); evas_object_event_callback_add(cs->obj, EVAS_CALLBACK_FOCUS_IN, extracted_focus, cs); evas_object_smart_member_del(surface); return EINA_TRUE; --
[EGIT] [core/efl] master 04/13: elm_tooltip: set parent window for windowed tooltips
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=10c05f76c67ce10ccf01816501f681f2a41ba84c commit 10c05f76c67ce10ccf01816501f681f2a41ba84c Author: Mike BlumenkrantzDate: Tue Oct 17 11:39:04 2017 -0400 elm_tooltip: set parent window for windowed tooltips wayland popup surfaces must have a parent in order to be visible @fix --- src/lib/elementary/els_tooltip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/els_tooltip.c b/src/lib/elementary/els_tooltip.c index 4865d7c9db..84fe835afa 100644 --- a/src/lib/elementary/els_tooltip.c +++ b/src/lib/elementary/els_tooltip.c @@ -163,7 +163,7 @@ _elm_tooltip_show(Elm_Tooltip *tt) } if (tt->free_size) { -tt->tt_win = elm_win_add(NULL, "tooltip", ELM_WIN_TOOLTIP); +tt->tt_win = elm_win_add(elm_win_get(tt->owner), "tooltip", ELM_WIN_TOOLTIP); elm_win_override_set(tt->tt_win, EINA_TRUE); tt->tt_evas = evas_object_evas_get(tt->tt_win); tt->tooltip = edje_object_add(tt->tt_evas); --
[EGIT] [core/efl] master 01/13: wayland: fix window stack implementation
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ffac7fc539f644439b35f7f360b8cad3578ecfc3 commit ffac7fc539f644439b35f7f360b8cad3578ecfc3 Author: Mike BlumenkrantzDate: Fri Aug 4 16:08:42 2017 -0400 wayland: fix window stack implementation ref T5350 --- src/lib/elementary/efl_ui_win.c| 34 +- .../engines/wayland/ecore_evas_wayland_common.c| 23 +++ 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 14e34b8313..77205592c1 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -3105,7 +3105,19 @@ _elm_ee_wlwin_get(const Ecore_Evas *ee) static void _elm_win_wlwindow_get(Efl_Ui_Win_Data *sd) { + Ecore_Wl2_Window *pwin = sd->wl.win; sd->wl.win = _elm_ee_wlwin_get(sd->ee); + if (sd->wl.win != pwin) + { +char buf[128]; +int id; + +snprintf(buf, sizeof(buf), "%u||%p", getpid(), sd->wl.win); +eina_stringshare_replace(>stack_id, buf); +id = ecore_evas_aux_hint_id_get(sd->ee, "stack_id"); +if (id >= 0) ecore_evas_aux_hint_val_set(sd->ee, id, sd->stack_id); +else ecore_evas_aux_hint_add(sd->ee, "stack_id", sd->stack_id); + } } void @@ -5037,6 +5049,7 @@ _elm_win_finalize_internal(Eo *obj, Efl_Ui_Win_Data *sd, const char *name, Elm_W { case ELM_WIN_BASIC: case ELM_WIN_DIALOG_BASIC: + case ELM_WIN_NAVIFRAME_BASIC: case ELM_WIN_SPLASH: case ELM_WIN_TOOLBAR: case ELM_WIN_UTILITY: @@ -6433,7 +6446,15 @@ _efl_ui_win_stack_master_id_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, const eina_stringshare_replace(&(sd->stack_master_id), id); #ifdef HAVE_ELEMENTARY_X if (sd->x.xwin) _elm_win_xwin_update(sd); + else #endif + { +int num = ecore_evas_aux_hint_id_get(sd->ee, "stack_master_id"); +if (num >= 0) + ecore_evas_aux_hint_val_set(sd->ee, num, id); +else + ecore_evas_aux_hint_add(sd->ee, "stack_master_id", id); + } } EOLIAN static const char * @@ -6445,8 +6466,14 @@ _efl_ui_win_stack_master_id_get(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) EOLIAN static void _efl_ui_win_stack_base_set(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd, Eina_Bool base) { + int num; if (sd->shown) return; sd->stack_base = !!base; + num = ecore_evas_aux_hint_id_get(sd->ee, "stack_base"); + if (num >= 0) + ecore_evas_aux_hint_val_set(sd->ee, num, sd->stack_base ? "1" : "0"); + else + ecore_evas_aux_hint_add(sd->ee, "stack_base", sd->stack_base ? "1" : "0"); } EOLIAN static Eina_Bool @@ -6517,8 +6544,13 @@ _efl_ui_win_stack_pop_to(Eo *obj EINA_UNUSED, Efl_Ui_Win_Data *sd) } ecore_x_ungrab(); } + else #endif - // wayland - needs to be a special compositor request + { +int num = ecore_evas_aux_hint_id_get(sd->ee, "stack_pop_to"); +if (num >= 0) ecore_evas_aux_hint_val_set(sd->ee, num, "1"); +else ecore_evas_aux_hint_add(sd->ee, "stack_pop_to", "1"); + } // win32/osx ? } diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index 1051a1b761..587d0f723c 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -617,6 +617,24 @@ _ecore_evas_wl_common_cb_window_configure_complete(void *data EINA_UNUSED, int t } static Eina_Bool +_ecore_evas_wl_common_cb_aux_message(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) +{ + Ecore_Evas *ee; + Ecore_Wl2_Event_Aux_Message *ev; + + ev = event; + ee = ecore_event_window_match(ev->win); + if (!ee) return ECORE_CALLBACK_PASS_ON; + if (ev->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON; + if (eina_streq(ev->key, "stack_del")) + { +if (ee->func.fn_delete_request) + ee->func.fn_delete_request(ee); + } + return ECORE_CALLBACK_RENEW; +} + + static Eina_Bool _ecore_evas_wl_common_cb_aux_hint_supported(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) { Ecore_Evas *ee; @@ -1229,6 +1247,9 @@ _ecore_evas_wl_common_init(void) _ecore_evas_wl_event_hdls[16] = ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_ICONIFY_STATE_CHANGE, _ecore_evas_wl_common_cb_iconify_state_change, NULL); + _ecore_evas_wl_event_hdls[15] = + ecore_event_handler_add(ECORE_WL2_EVENT_AUX_MESSAGE, + _ecore_evas_wl_common_cb_aux_message, NULL); ecore_event_evas_init(); @@ -2454,6 +2475,8 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, unsigned int parent, i wdata->win = ecore_wl2_window_new(ewd, p, x, y, w + fw,
[EGIT] [core/enlightenment] master 01/03: move x11 compositor cleanup into shutdown function
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=40be5b9d45bb1dd71cda5db5d07b45bfae01dc54 commit 40be5b9d45bb1dd71cda5db5d07b45bfae01dc54 Author: Mike BlumenkrantzDate: Tue Oct 24 15:51:02 2017 -0400 move x11 compositor cleanup into shutdown function --- src/bin/e_comp_x.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 314d6c264..8f4e9555e 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -5393,6 +5393,7 @@ _e_comp_x_del(E_Comp *c) E_FREE_FUNC(focus_job, ecore_job_del); E_FREE_FUNC(unfocus_job, ecore_job_del); free(c->x_comp_data); + c->x_comp_data = e_comp_x = NULL; } static void @@ -5640,7 +5641,6 @@ _e_comp_x_setup(Ecore_X_Window root, int w, int h) } if (!ecore_x_window_manage(root)) return EINA_FALSE; - E_OBJECT_DEL_SET(e_comp, _e_comp_x_del); e_comp_x = e_comp->x_comp_data = E_NEW(E_Comp_X_Data, 1); ecore_x_e_window_profile_supported_set(root, EINA_TRUE); e_comp->cm_selection = ecore_x_window_input_new(root, 0, 0, 1, 1); @@ -5946,6 +5946,7 @@ e_comp_x_init(void) E_API void e_comp_x_shutdown(void) { + _e_comp_x_del(e_comp); E_FREE_LIST(handlers, ecore_event_handler_del); E_FREE_FUNC(clients_win_hash, eina_hash_free); E_FREE_FUNC(damages_hash, eina_hash_free); --
[EGIT] [core/efl] master 02/13: elm_config: add offline and powersave config members
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=fd00e3de1a6c59d935726166031b7a4a017d6017 commit fd00e3de1a6c59d935726166031b7a4a017d6017 Author: Mike BlumenkrantzDate: Mon Oct 16 15:41:26 2017 -0400 elm_config: add offline and powersave config members these will be used by enlightenment in the future to notify applications of global system states @feature --- src/lib/elementary/elm_config.c | 34 ++ src/lib/elementary/elm_config.h | 40 src/lib/elementary/elm_priv.h | 2 ++ 3 files changed, 76 insertions(+) diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c index a79899c610..2227e3be37 100644 --- a/src/lib/elementary/elm_config.c +++ b/src/lib/elementary/elm_config.c @@ -506,6 +506,8 @@ _desc_init(void) ELM_CONFIG_VAL(D, T, spinner_min_max_filter_enable, T_UCHAR); ELM_CONFIG_VAL(D, T, icon_theme, T_STRING); ELM_CONFIG_VAL(D, T, entry_select_allow, T_UCHAR); + ELM_CONFIG_VAL(D, T, offline, T_UCHAR); + ELM_CONFIG_VAL(D, T, powersave, T_INT); #undef T #undef D #undef T_INT @@ -4590,6 +4592,34 @@ elm_config_web_backend_get(void) return _elm_config->web_backend; } +EAPI Eina_Bool +elm_config_offline_get(void) +{ + if (!_elm_config) return EINA_FALSE; + return _elm_config->offline; +} + +EAPI void +elm_config_offline_set(Eina_Bool set) +{ + if (!_elm_config) return; + _elm_config->offline = !!set; +} + +EAPI int +elm_config_powersave_get(void) +{ + if (!_elm_config) return EINA_FALSE; + return _elm_config->powersave; +} + +EAPI void +elm_config_powersave_set(int set) +{ + if (!_elm_config) return; + _elm_config->powersave = set; +} + void _elm_config_profile_set(const char *profile) { @@ -4891,6 +4921,8 @@ _efl_config_global_efl_config_config_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNU CONFIG_SETB(atspi_mode); CONFIG_SETD(transition_duration_factor); CONFIG_SETS(web_backend); + CONFIG_SETB(offline); + CONFIG_SETI(powersave); const size_t len = sizeof("audio_mute") - 1; if (!strncmp(name, "audio_mute", len)) @@ -5023,6 +5055,8 @@ _efl_config_global_efl_config_config_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNU CONFIG_GETB(atspi_mode); CONFIG_GETD(transition_duration_factor); CONFIG_GETS(web_backend); + CONFIG_GETB(offline); + CONFIG_GETI(powersave); const size_t len = sizeof("audio_mute") - 1; if (!strncmp(name, "audio_mute", len)) diff --git a/src/lib/elementary/elm_config.h b/src/lib/elementary/elm_config.h index 272fdf6957..0e38471bde 100644 --- a/src/lib/elementary/elm_config.h +++ b/src/lib/elementary/elm_config.h @@ -2140,6 +2140,46 @@ EAPI void elm_config_web_backend_set(const char *backend); */ EAPI const char *elm_config_web_backend_get(void); +/** + * Get whether the system is offline + * + * @return True only if the system config is set as offline + * + * @since 1.21 + * @see elm_config_offline_set() + */ +EAPI Eina_Bool elm_config_offline_get(void); + +/** + * Set whether the system is offline + * + * @param set True only if the system is offline + * + * @since 1.21 + * @see elm_config_offline_get() + */ +EAPI void elm_config_offline_set(Eina_Bool set); + +/** + * Get whether the system should be conserving power + * + * @return Values greater than 0 if power is being conserved; higher numbers indicate greater conservation + * + * @since 1.21 + * @see elm_config_powersave_set() + */ +EAPI int elm_config_powersave_get(void); + +/** + * Set whether the system should be conserving power + * + * @param set Values greater than 0 if power is being conserved; higher numbers indicate greater conservation + * + * @since 1.21 + * @see elm_config_powersave_set() + */ +EAPI void elm_config_powersave_set(int set); + /* new efl.config interface helpers in C */ diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index c07617b1f0..6097f0e0e1 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h @@ -449,6 +449,8 @@ struct _Elm_Config int gl_msaa; const char *icon_theme; unsigned char entry_select_allow; + Eina_Bool offline; + int powersave; /* Not part of the EET file */ Eina_Bool is_mirrored : 1; --
[EGIT] [core/efl] master 10/13: wayland: expand efl-hints protocol to work for all types of xdg shell surfaces
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=36bf4cbc4e23724c4010d6cbbfa75c8091c1f5f5 commit 36bf4cbc4e23724c4010d6cbbfa75c8091c1f5f5 Author: Mike BlumenkrantzDate: Fri Oct 20 13:23:12 2017 -0400 wayland: expand efl-hints protocol to work for all types of xdg shell surfaces --- src/lib/ecore_wl2/ecore_wl2_display.c | 12 +--- src/lib/ecore_wl2/ecore_wl2_window.c | 25 +++-- src/wayland_protocol/efl-hints.xml| 4 ++-- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c index db7f47999a..1a2a24ef55 100644 --- a/src/lib/ecore_wl2/ecore_wl2_display.c +++ b/src/lib/ecore_wl2/ecore_wl2_display.c @@ -332,9 +332,15 @@ _cb_global_add(void *data, struct wl_registry *registry, unsigned int id, const ewd->wl.efl_hints = wl_registry_bind(registry, id, _hints_interface, MIN(version, 2)); EINA_INLIST_FOREACH(ewd->windows, window) - if (window->zxdg_toplevel && window->aspect.set) -efl_hints_set_aspect(window->display->wl.efl_hints, window->zxdg_toplevel, - window->aspect.w, window->aspect.h, window->aspect.aspect); + { + if (!window->zxdg_surface) continue; + if (window->aspect.set) + efl_hints_set_aspect(window->display->wl.efl_hints, window->zxdg_surface, + window->aspect.w, window->aspect.h, window->aspect.aspect); + if (window->weight.set) + efl_hints_set_weight(window->display->wl.efl_hints, + window->zxdg_surface, window->weight.w, window->weight.h); + } } event: diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c index c6cd35135a..f2a2131e3a 100644 --- a/src/lib/ecore_wl2/ecore_wl2_window.c +++ b/src/lib/ecore_wl2/ecore_wl2_window.c @@ -323,6 +323,15 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window) window->zxdg_configure_ack = zxdg_surface_v6_ack_configure; window->pending.configure = EINA_TRUE; +if (window->display->wl.efl_hints) + { + if (window->aspect.set) + efl_hints_set_aspect(window->display->wl.efl_hints, window->zxdg_surface, + window->aspect.w, window->aspect.h, window->aspect.aspect); + if (window->weight.set) + efl_hints_set_weight(window->display->wl.efl_hints, window->zxdg_surface, + window->weight.w, window->weight.h); + } if (window->type == ECORE_WL2_WINDOW_TYPE_MENU) _ecore_wl2_window_zxdg_popup_create(window); @@ -355,12 +364,6 @@ _ecore_wl2_window_shell_surface_init(Ecore_Wl2_Window *window) if (window->set_config.fullscreen) zxdg_toplevel_v6_set_fullscreen(window->zxdg_toplevel, NULL); - if (window->aspect.set && window->display->wl.efl_hints) - efl_hints_set_aspect(window->display->wl.efl_hints, window->zxdg_toplevel, - window->aspect.w, window->aspect.h, window->aspect.aspect); - if (window->weight.set && window->display->wl.efl_hints) - efl_hints_set_weight(window->display->wl.efl_hints, window->zxdg_toplevel, - window->weight.w, window->weight.h); } ecore_wl2_window_commit(window, EINA_TRUE); @@ -1342,9 +1345,10 @@ ecore_wl2_window_aspect_set(Ecore_Wl2_Window *window, int w, int h, unsigned int window->aspect.h = h; window->aspect.aspect = aspect; window->aspect.set = 1; - if (window->display->wl.efl_hints && window->zxdg_toplevel) + if (!window->display->wl.efl_hints) return; + if (window->zxdg_surface) efl_hints_set_aspect(window->display->wl.efl_hints, - window->zxdg_toplevel, w, h, aspect); + window->zxdg_surface, w, h, aspect); } EAPI void @@ -1362,9 +1366,10 @@ ecore_wl2_window_weight_set(Ecore_Wl2_Window *window, double w, double h) window->weight.w = ww; window->weight.h = hh; window->weight.set = 1; - if (window->display->wl.efl_hints && window->zxdg_toplevel) + if (!window->display->wl.efl_hints) return; + if (window->zxdg_surface) efl_hints_set_weight(window->display->wl.efl_hints, - window->zxdg_toplevel, ww, hh); + window->zxdg_surface, ww, hh); } static void diff --git a/src/wayland_protocol/efl-hints.xml b/src/wayland_protocol/efl-hints.xml index 64a40a8804..9f2b775dda 100644 --- a/src/wayland_protocol/efl-hints.xml +++ b/src/wayland_protocol/efl-hints.xml @@ -9,13 +9,13 @@ - + - + --
[EGIT] [core/efl] master 12/13: efl-wl: don't randomly set min/max size hints on popup surface objects
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2b3c8d7f3feea16492b57c231d61327897ae94b3 commit 2b3c8d7f3feea16492b57c231d61327897ae94b3 Author: Mike BlumenkrantzDate: Fri Oct 20 16:02:38 2017 -0400 efl-wl: don't randomly set min/max size hints on popup surface objects this is misleading since popups don't have min/max size hints --- src/lib/efl_wl/efl_wl.c | 5 - 1 file changed, 5 deletions(-) diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c index b5548c7f93..bc87e7f044 100644 --- a/src/lib/efl_wl/efl_wl.c +++ b/src/lib/efl_wl/efl_wl.c @@ -1413,11 +1413,6 @@ comp_surface_commit_state(Comp_Surface *cs, Comp_Buffer_State *state) { evas_object_move(cs->img, x + buffer->x, y + buffer->y); evas_object_resize(cs->obj, buffer->w, buffer->h); -if (cs->shell.popup) - { - evas_object_size_hint_min_set(cs->obj, buffer->w, buffer->h); - evas_object_size_hint_max_set(cs->obj, buffer->w, buffer->h); - } } else if (cs->shell.new) shell_surface_init(cs); --
[EGIT] [core/efl] master 06/13: efl_wl: destroy extant shell surface upon surface deletion
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c7f9f2eef1fa344f6dadd09c9c3eaa7203b7ca92 commit c7f9f2eef1fa344f6dadd09c9c3eaa7203b7ca92 Author: Mike BlumenkrantzDate: Wed Oct 18 17:11:36 2017 -0400 efl_wl: destroy extant shell surface upon surface deletion avoid invalid reads later @fix --- src/lib/efl_wl/efl_wl.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c index 2bdb222501..9eec04e916 100644 --- a/src/lib/efl_wl/efl_wl.c +++ b/src/lib/efl_wl/efl_wl.c @@ -2301,6 +2301,12 @@ comp_surface_smart_del(Evas_Object *obj) } evas_object_del(cs->img); evas_object_del(cs->clip); + if (cs->shell.surface) + { +if (cs->role) + wl_resource_destroy(cs->role); +wl_resource_destroy(cs->shell.surface); + } cs->c->surfaces = eina_inlist_remove(cs->c->surfaces, EINA_INLIST_GET(cs)); cs->c->surfaces_count--; free(cs); --
[EGIT] [core/efl] master 03/13: wayland: use eina array for ecore-evas event handlers
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f375661e0b4199a06234da8ab277a876f4c7778a commit f375661e0b4199a06234da8ab277a876f4c7778a Author: Mike BlumenkrantzDate: Tue Oct 17 11:32:57 2017 -0400 wayland: use eina array for ecore-evas event handlers thx to @jpeg for reporting how dumb this was --- .../engines/wayland/ecore_evas_wayland_common.c| 69 +- 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c index 587d0f723c..f0705bd020 100644 --- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c +++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c @@ -28,7 +28,7 @@ struct _EE_Wl_Device /* local variables */ static int _ecore_evas_wl_init_count = 0; -static Ecore_Event_Handler *_ecore_evas_wl_event_hdls[17]; +static Eina_Array *_ecore_evas_wl_event_hdls; static void _ecore_evas_wayland_resize(Ecore_Evas *ee, int location); static void _ecore_evas_wl_common_rotation_set(Ecore_Evas *ee, int rotation, int resize); @@ -1189,65 +1189,83 @@ _ecore_evas_wl_common_cb_iconify_state_change(void *data EINA_UNUSED, int type E static int _ecore_evas_wl_common_init(void) { + Ecore_Event_Handler *h; LOGFN(__FILE__, __LINE__, __FUNCTION__); if (++_ecore_evas_wl_init_count != 1) return _ecore_evas_wl_init_count; - _ecore_evas_wl_event_hdls[0] = - ecore_event_handler_add(ECORE_EVENT_MOUSE_IN, + _ecore_evas_wl_event_hdls = eina_array_new(10); + h = ecore_event_handler_add(ECORE_EVENT_MOUSE_IN, _ecore_evas_wl_common_cb_mouse_in, NULL); - _ecore_evas_wl_event_hdls[1] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(ECORE_EVENT_MOUSE_OUT, _ecore_evas_wl_common_cb_mouse_out, NULL); - _ecore_evas_wl_event_hdls[2] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_FOCUS_IN, _ecore_evas_wl_common_cb_focus_in, NULL); - _ecore_evas_wl_event_hdls[3] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_FOCUS_OUT, _ecore_evas_wl_common_cb_focus_out, NULL); - _ecore_evas_wl_event_hdls[4] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_CONFIGURE, _ecore_evas_wl_common_cb_window_configure, NULL); - _ecore_evas_wl_event_hdls[5] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(_ecore_wl2_event_window_www, _ecore_evas_wl_common_cb_www, NULL); - _ecore_evas_wl_event_hdls[6] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(_ecore_wl2_event_window_www_drag, _ecore_evas_wl_common_cb_www_drag, NULL); - _ecore_evas_wl_event_hdls[7] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_DISCONNECT, _ecore_evas_wl_common_cb_disconnect, NULL); - _ecore_evas_wl_event_hdls[8] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_GLOBAL_ADDED, _ecore_evas_wl_common_cb_global_added, NULL); - _ecore_evas_wl_event_hdls[9] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_GLOBAL_REMOVED, _ecore_evas_wl_common_cb_global_removed, NULL); - _ecore_evas_wl_event_hdls[10] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_SEAT_NAME_CHANGED, _ecore_evas_wl_common_cb_seat_name_changed, NULL); - _ecore_evas_wl_event_hdls[11] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_SEAT_CAPABILITIES_CHANGED, _ecore_evas_wl_common_cb_seat_capabilities_changed, NULL); - _ecore_evas_wl_event_hdls[12] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_CONFIGURE_COMPLETE, _ecore_evas_wl_common_cb_window_configure_complete, NULL); - _ecore_evas_wl_event_hdls[13] = + eina_array_push(_ecore_evas_wl_event_hdls, h); + h = ecore_event_handler_add(ECORE_WL2_EVENT_WINDOW_ROTATE, _ecore_evas_wl_common_cb_window_rotate, NULL); - _ecore_evas_wl_event_hdls[14] = + eina_array_push(_ecore_evas_wl_event_hdls, h);
[EGIT] [core/efl] master 05/13: efl_wl: more closely follow wl spec for input regions
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6006fab98dfb67d2317fcb9c45a529da23d5e793 commit 6006fab98dfb67d2317fcb9c45a529da23d5e793 Author: Mike BlumenkrantzDate: Wed Oct 18 17:11:11 2017 -0400 efl_wl: more closely follow wl spec for input regions @fix --- src/lib/efl_wl/efl_wl.c | 8 1 file changed, 8 insertions(+) diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c index 6be0f3a340..2bdb222501 100644 --- a/src/lib/efl_wl/efl_wl.c +++ b/src/lib/efl_wl/efl_wl.c @@ -1700,6 +1700,8 @@ comp_surface_set_input_region(struct wl_client *client EINA_UNUSED, struct wl_re { Comp_Surface *cs = wl_resource_get_user_data(resource); + if (cs->cursor) return; + cs->pending.set_input = 1; eina_tiler_clear(cs->pending.input); if (region_resource) @@ -2463,6 +2465,8 @@ comp_surface_create(struct wl_client *client, struct wl_resource *resource, uint cs->opaque = tiler_new(); cs->input = tiler_new(); comp_buffer_state_alloc(>pending); + cs->pending.set_input = 1; + eina_tiler_rect_add(cs->pending.input, &(Eina_Rectangle){0, 0, 65535, 65535}); wl_resource_set_implementation(res, _surface_interface, cs, comp_surface_impl_destroy); } @@ -2869,6 +2873,8 @@ data_device_start_drag(struct wl_client *client, struct wl_resource *resource, s ics->cursor = 1; ics->drag = s; +ics->pending.set_input = 1; +eina_tiler_clear(ics->pending.input); evas_object_smart_member_del(ics->obj); evas_object_pass_events_set(ics->obj, 1); evas_object_layer_set(ics->obj, EVAS_LAYER_MAX - 1); @@ -3738,6 +3744,8 @@ seat_ptr_set_cursor(struct wl_client *client, struct wl_resource *resource, uint if (cs) { cs->cursor = 1; +cs->pending.set_input = 1; +eina_tiler_clear(cs->pending.input); evas_object_pass_events_set(cs->obj, 1); } if (s->ptr.cursor.surface) s->ptr.cursor.surface->cursor = 0; --
[EGIT] [core/efl] master 01/02: eolian: add part definition
q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a4c96ceb73ec714cd7def72979c3d3db84407357 commit a4c96ceb73ec714cd7def72979c3d3db84407357 Author: Daniel KolesaDate: Wed Oct 25 16:08:28 2017 +0200 eolian: add part definition --- src/lib/eolian/Eolian.h | 6 ++ src/lib/eolian/eolian_database.h | 7 +++ 2 files changed, 13 insertions(+) diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h index 315dbd3f53..bc8bbb48cf 100644 --- a/src/lib/eolian/Eolian.h +++ b/src/lib/eolian/Eolian.h @@ -96,6 +96,12 @@ typedef struct _Eolian_Class Eolian_Class; */ typedef struct _Eolian_Function Eolian_Function; +/* Part information + * + * @ingroup Eolian + */ +typedef struct _Eolian_Part Eolian_Part; + /* Parameter/return type. * * @ingroup Eolian diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h index 5389267a7e..c99a47451c 100644 --- a/src/lib/eolian/eolian_database.h +++ b/src/lib/eolian/eolian_database.h @@ -141,6 +141,13 @@ struct _Eolian_Function Eolian_Class *klass; }; +struct _Eolian_Part +{ + Eolian_Object base; + Eina_Stringshare *name; + Eolian_Class *klass; +}; + struct _Eolian_Function_Parameter { Eolian_Object base; --
[EGIT] [core/efl] master 02/02: eolian: make inherits_get return a list of classes, not strings
q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4f8a9b50f405bad270a6ec37cf8c064ba408f86e commit 4f8a9b50f405bad270a6ec37cf8c064ba408f86e Author: Daniel KolesaDate: Wed Oct 25 16:23:57 2017 +0200 eolian: make inherits_get return a list of classes, not strings Most of the time you need to retrieve the class from the string anyway, so remove this relic of old Eolian and gain some small performance benefits and extra convenience. Subtly breaks API but everything should be updated. --- src/bin/eolian/sources.c | 5 ++--- src/bin/eolian_cxx/eolian_cxx.cc | 4 ++-- src/bindings/luajit/eolian.lua | 2 +- src/lib/eolian/Eolian.h | 2 +- src/lib/eolian/database_class.c | 3 --- src/lib/eolian/database_validate.c | 6 +++--- src/lib/eolian/eo_parser.c | 10 -- src/lib/eolian/eolian_database.h | 2 +- src/lib/eolian_cxx/grammar/klass_def.hpp | 4 ++-- src/scripts/elua/apps/docgen/doctree.lua | 4 +--- src/scripts/elua/modules/lualian.lua | 3 +-- src/tests/eolian/eolian_parsing.c| 17 + 12 files changed, 27 insertions(+), 35 deletions(-) diff --git a/src/bin/eolian/sources.c b/src/bin/eolian/sources.c index 473342aa8a..2ba900c9bd 100644 --- a/src/bin/eolian/sources.c +++ b/src/bin/eolian/sources.c @@ -965,14 +965,13 @@ eo_gen_source_gen(const Eolian_Unit *src, /* inherits in EFL_DEFINE_CLASS */ { - const char *iname; + const Eolian_Class *icl; Eina_Iterator *itr = eolian_class_inherits_get(cl); /* no inherits, NULL parent */ if (!itr) eina_strbuf_append(buf, ", NULL"); - EINA_ITERATOR_FOREACH(itr, iname) + EINA_ITERATOR_FOREACH(itr, icl) { - const Eolian_Class *icl = eolian_class_get_by_name(src, iname); Eina_Stringshare *mname = eolian_class_c_name_get(icl); eina_strbuf_append_printf(buf, ", %s", mname); eina_stringshare_del(mname); diff --git a/src/bin/eolian_cxx/eolian_cxx.cc b/src/bin/eolian_cxx/eolian_cxx.cc index c98412aedd..34b8bbc3ab 100644 --- a/src/bin/eolian_cxx/eolian_cxx.cc +++ b/src/bin/eolian_cxx/eolian_cxx.cc @@ -114,10 +114,10 @@ generate(const Eolian_Class* klass, eolian_cxx::options_type const& opts) std::function klass_function = [&] (Eolian_Class const* klass) { - for(efl::eina::iterator inherit_iterator ( ::eolian_class_inherits_get(klass)) + for(efl::eina::iterator inherit_iterator ( ::eolian_class_inherits_get(klass)) , inherit_last; inherit_iterator != inherit_last; ++inherit_iterator) { - Eolian_Class const* inherit = ::eolian_class_get_by_name(opts.unit, &*inherit_iterator); + Eolian_Class const* inherit = &*inherit_iterator; c_headers.insert(eolian_class_file_get(inherit) + std::string(".h")); cpp_headers.insert(eolian_class_file_get(inherit) + std::string(".hh")); efl::eolian::grammar::attributes::klass_def klass{inherit, opts.unit}; diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua index 8982ef4817..b0c0f7c67e 100644 --- a/src/bindings/luajit/eolian.lua +++ b/src/bindings/luajit/eolian.lua @@ -1239,7 +1239,7 @@ M.Class = ffi.metatype("Eolian_Class", { end, inherits_get = function(self) -return iterator.String_Iterator( +return Ptr_Iterator("const Eolian_Class*", eolian.eolian_class_inherits_get(self)) end, diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h index bc8bbb48cf..b69f2c5dfa 100644 --- a/src/lib/eolian/Eolian.h +++ b/src/lib/eolian/Eolian.h @@ -709,7 +709,7 @@ EAPI Eina_Stringshare* eolian_class_event_prefix_get(const Eolian_Class *klass); EAPI Eina_Stringshare *eolian_class_data_type_get(const Eolian_Class *klass); /* - * @brief Returns an iterator to the names of inherit classes of a class + * @brief Returns an iterator to the inherited classes. * * @param[in] klass the class * @return the iterator diff --git a/src/lib/eolian/database_class.c b/src/lib/eolian/database_class.c index f3faa9b0cc..fc56325523 100644 --- a/src/lib/eolian/database_class.c +++ b/src/lib/eolian/database_class.c @@ -18,9 +18,6 @@ database_class_del(Eolian_Class *cl) if (cl->base.file) eina_stringshare_del(cl->base.file); - EINA_LIST_FREE(cl->inherits, s) - if (s) eina_stringshare_del(s); - EINA_LIST_FREE(cl->implements, impl) database_implement_del(impl); diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c index 0b1dd0e252..28ffd5fe58 100644 --- a/src/lib/eolian/database_validate.c +++ b/src/lib/eolian/database_validate.c @@ -373,7 +373,7 @@ _validate_class(Eolian_Class *cl, Eina_Hash *nhash) Eolian_Function *func;
[EGIT] [core/efl] master 01/01: genlist: Simplify some logic
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=585be9e24f10d683b955be43a31632ac7067cbd2 commit 585be9e24f10d683b955be43a31632ac7067cbd2 Author: Jean-Philippe AndreDate: Tue Oct 24 16:53:18 2017 +0900 genlist: Simplify some logic Item prev/next/first/last. If true, break, else, break. EO_OBJ(x) is safe on NULL. Add a simple macro to simplify inlist handling. Overall simplify the code. --- src/lib/elementary/elm_gen_common.h | 3 ++ src/lib/elementary/elm_genlist.c| 101 +--- 2 files changed, 28 insertions(+), 76 deletions(-) diff --git a/src/lib/elementary/elm_gen_common.h b/src/lib/elementary/elm_gen_common.h index c980819e24..3c795a2e1c 100644 --- a/src/lib/elementary/elm_gen_common.h +++ b/src/lib/elementary/elm_gen_common.h @@ -7,6 +7,9 @@ #define ELM_GEN_ITEM_FROM_INLIST(it) \ ((it) ? EINA_INLIST_CONTAINER_GET(it, Elm_Gen_Item) : NULL) +#define ELM_GEN_ITEM_PREV(_it) ((_it) ? ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(_it)->prev) : NULL) +#define ELM_GEN_ITEM_NEXT(_it) ((_it) ? ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(_it)->next) : NULL) + #define SWIPE_MOVES 12 /* common item handles for genlist/gengrid */ diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c index c03ab105c6..a0706abc2b 100644 --- a/src/lib/elementary/elm_genlist.c +++ b/src/lib/elementary/elm_genlist.c @@ -2608,7 +2608,7 @@ _item_multi_select_up(Elm_Genlist_Data *sd) if ((!_is_no_select(prev)) && (!elm_object_item_disabled_get(eo_prev)) && (!prev->hide)) break; -eo_prev = EO_OBJ(ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev)); +eo_prev = EO_OBJ(ELM_GEN_ITEM_PREV(prev)); } if (!eo_prev) return EINA_TRUE; @@ -2639,7 +2639,7 @@ _item_multi_select_down(Elm_Genlist_Data *sd) if ((!_is_no_select(next)) && (!elm_object_item_disabled_get(eo_next)) && (!next->hide)) break; -eo_next = EO_OBJ(ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next)); +eo_next = EO_OBJ(ELM_GEN_ITEM_NEXT(next)); } if (!eo_next) return EINA_TRUE; @@ -2692,7 +2692,7 @@ _item_single_select_up(Elm_Genlist_Data *sd) if ((!_is_no_select(prev)) && (!elm_object_item_disabled_get(EO_OBJ(prev))) && (!prev->hide)) break; -prev = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(prev)->prev); +prev = ELM_GEN_ITEM_PREV(prev); } if (!prev) return EINA_FALSE; @@ -2722,7 +2722,7 @@ _item_single_select_down(Elm_Genlist_Data *sd) if ((!_is_no_select(next)) && (!elm_object_item_disabled_get(EO_OBJ(next))) && (!next->hide)) break; -next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); +next = ELM_GEN_ITEM_NEXT(next); } if (!next) return EINA_FALSE; @@ -2818,7 +2818,7 @@ _item_focused_next(Evas_Object *obj, Elm_Focus_Direction dir) while ((next) && ((elm_wdg_item_disabled_get(EO_OBJ(next))) || (_is_no_select(next - if (!next->hide) next = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(next)->next); + if (!next->hide) next = ELM_GEN_ITEM_NEXT(next); } else { @@ -3327,7 +3327,7 @@ _elm_genlist_elm_widget_on_focus_update(Eo *obj, Elm_Genlist_Data *sd, Elm_Objec ELM_GENLIST_ITEM_DATA_GET(eo_it, it); if ((!_is_no_select(it)) && (!elm_object_item_disabled_get(eo_it))) break; - eo_it = EO_OBJ(ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next)); + eo_it = EO_OBJ(ELM_GEN_ITEM_NEXT(it)); } if (eo_it) @@ -3703,10 +3703,10 @@ _item_del(Elm_Gen_Item *it) sd->queue = eina_list_remove(sd->queue, it); if (sd->anchor_item == it) { -sd->anchor_item = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next); +sd->anchor_item = ELM_GEN_ITEM_NEXT(it); if (!sd->anchor_item) sd->anchor_item = -ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev); +ELM_GEN_ITEM_PREV(it); } if (sd->expanded_item == it) { @@ -6495,12 +6495,12 @@ _elm_genlist_item_sorted_insert(Eo *obj, Elm_Genlist_Data *sd, const Elm_Genlist if (EINA_INLIST_GET(it)->next) { - rel = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next); + rel = ELM_GEN_ITEM_NEXT(it); it->item->before = EINA_TRUE; } else if (EINA_INLIST_GET(it)->prev) { - rel = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev); + rel = ELM_GEN_ITEM_PREV(it); it->item->before = EINA_FALSE; } } @@ -6709,20 +6709,10 @@ _elm_genlist_first_item_get(Eo *obj EINA_UNUSED, Elm_Genlist_Data *sd) {
[EGIT] [website/www-content] master 01/01: Wiki page eo.md changed with summary [Use double backticks as per new Style Guide] by Xavi Artigas
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=4a5f067b92172807dcd2c72fe6e6b376143f292d commit 4a5f067b92172807dcd2c72fe6e6b376143f292d Author: Xavi ArtigasDate: Wed Oct 25 06:07:43 2017 -0700 Wiki page eo.md changed with summary [Use double backticks as per new Style Guide] by Xavi Artigas --- pages/contrib/docs/eo.md.txt | 134 +-- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/pages/contrib/docs/eo.md.txt b/pages/contrib/docs/eo.md.txt index 14ce562d..cf785605 100644 --- a/pages/contrib/docs/eo.md.txt +++ b/pages/contrib/docs/eo.md.txt @@ -9,54 +9,54 @@ This is the quick reference, for a full definition see [Format in EBNF](#Eolian_File_Format) * General: - * `/* comment */` or `//` are comments like in C/C++, they are used to explain the statements surrounding them. It's ignored and will never go to the generated files. - * `[[ documentation ]]` will be transformed into documentation for their associated object (variable, class, method, property, enum, type...). In C, that goes as a doxygen-style comment in the generated header file, so do not confuse it with a regular `/* comment */`. + * ``/* comment */`` or ``//`` are comments like in C/C++, they are used to explain the statements surrounding them. It's ignored and will never go to the generated files. + * ``[[ documentation ]]`` will be transformed into documentation for their associated object (variable, class, method, property, enum, type...). In C, that goes as a doxygen-style comment in the generated header file, so do not confuse it with a regular ``/* comment */``. When a comment sits alone on its own line, it refers to the text on the next line. When it sits at the end of a line, it refers to the previous text in that same line. - * Groups and blocks are defined within `{` and `}` - * Some modifiers may be used, their meaning and scope are defined per context, such as `@extern` may be used with `type`, `enum` and `struct` to denote they are already declared elsewhere (like an included header). - * Optional components are defined with `[` and `]`. + * Groups and blocks are defined within ``{`` and ``}`` + * Some modifiers may be used, their meaning and scope are defined per context, such as ``@extern`` may be used with ``type``, ``enum`` and ``struct`` to denote they are already declared elsewhere (like an included header). + * Optional components are defined with ``[`` and ``]``. * Basic Definitions: - * **Variables**: `var [@extern] name : type [= value] ;` - * **Constant**: `const name : type = value ;` - * **Enumeration**: `enum [@extern] name { field1, field2 [= value2] ... }` + * **Variables**: ``var [@extern] name : type [= value] ;`` + * **Constant**: ``const name : type = value ;`` + * **Enumeration**: ``enum [@extern] name { field1, field2 [= value2] ... }`` * Structure Definitions: - * **Opaque**: `struct [@extern] name ;` - * **Opaque with free function**: `struct @free( free_function ) name ;` - * **With fields**: `struct name { field1 : type1 , field2 : type2 ... } ;` + * **Opaque**: ``struct [@extern] name ;`` + * **Opaque with free function**: ``struct @free( free_function ) name ;`` + * **With fields**: ``struct name { field1 : type1 , field2 : type2 ... } ;`` * Type Definitions: - * **Simple**: `type [@extern] name : other ;` - * **Simple with free function**: `type @free( free_function ) name : other ;` - * **List**: `type name : list* ;` - * **Array**: `type name : array* ;` - * **Hash**: `type name : hash* ;` + * **Simple**: ``type [@extern] name : other ;`` + * **Simple with free function**: ``type @free( free_function ) name : other ;`` + * **List**: ``type name : list* ;`` + * **Array**: ``type name : array* ;`` + * **Hash**: ``type name : hash* ;`` * Object Definitions: * **Common Body** for class, abstract, interface and mixin: - - `legacy_prefix : prefix ;` - - `eo_prefix: prefix ;` - - `events { event_name_1 [@private | @protected | @beta | @hot] : type1 ; event_name_2 : type2 ; ... }` - - `methods { list_of_methods_and_properties }` -- **Methods**: `name [@protected | @const | @class | @pure_virtual] { method_body }` - * `legacy: name ;` - * `return: type [(expression)] [@warn_unused];` - * `params { [@in | @out | @inout] name1 : type1 [(expression)] [@nonull | @nullable | @optional] ; name2 : type2 , ... }` -- **Properties**: `@property name [@protected | @class | @pure_virtual ] { property_body }` - * `get [@pure_virtual] [{ return: type ; legacy: name }]` - * `set [@pure_virtual] [{ return: type ; legacy: name }]` - * `values { name1 : type1 [(expression)] [@nonull | @nullable | @optional] ; name2 : type2 , ... }` - * `keys { name1 : type1
[EGIT] [core/efl] master 01/01: eina_matrix: Fix doxygen warnings
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6c8ca79ff2dabbf905952a7a073589fa2a72eef4 commit 6c8ca79ff2dabbf905952a7a073589fa2a72eef4 Author: Jaehyun ChoDate: Wed Oct 25 21:35:27 2017 +0900 eina_matrix: Fix doxygen warnings Change-Id: I7e697bae24170422d6253f91ce089d9485bd0e64 --- src/lib/eina/eina_matrix.h | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/lib/eina/eina_matrix.h b/src/lib/eina/eina_matrix.h index 64053e2deb..feed8935ec 100644 --- a/src/lib/eina/eina_matrix.h +++ b/src/lib/eina/eina_matrix.h @@ -551,6 +551,7 @@ EAPI Eina_Bool eina_matrix3_quad_quad_map(Eina_Matrix3 *m, * * @param m The transformation matrix to create. * @param q The source quadrangle. + * @return @c EINA_TRUE if matrix could be successfully created, @c EINA_FALSE otherwise. * * Calculates a matrix @p m that can be used to transform an arbitrary * quadrangle @p q into a square. If @p q is a parallelogram, then a @@ -778,11 +779,12 @@ EAPI double eina_matrix4_determinant(const Eina_Matrix4 *m); /** * @brief Returns the determinant of the given matrix. * - * @param m The matrix. + * @param out The normalized matrix + * @param in The matrix. * @return The determinant. * - * This function returns the determinant of the matrix @p m. No check - * is done on @p m. + * This function returns the determinant of the matrix @p in. No check + * is done on @p in. * * @since 1.16 */ @@ -835,8 +837,8 @@ EAPI void eina_matrix4_identity(Eina_Matrix4 *out); * @brief Multiplies two matrix. * * @param out The resulting matrix - * @param a The first member of the multiplication - * @param b The second member of the multiplication + * @param mat_a The first member of the multiplication + * @param mat_b The second member of the multiplication * * @since 1.17 */ @@ -869,8 +871,8 @@ EAPI void eina_matrix4_copy(Eina_Matrix4 *dst, const Eina_Matrix4 *src); * @brief Multiplies two matrix with check. * * @param out The resulting matrix - * @param a The first member of the multiplication - * @param b The second member of the multiplication + * @param mat_a The first member of the multiplication + * @param mat_b The second member of the multiplication * * @since 1.17 */ --
[EGIT] [core/efl] master 01/04: elm_multibuttonentry: do not eat all the events
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f440cc4eb6edbda0a0093df785ab1bc02ee21835 commit f440cc4eb6edbda0a0093df785ab1bc02ee21835 Author: Marcel HollerbachDate: Wed Oct 25 13:57:32 2017 +0200 elm_multibuttonentry: do not eat all the events I have no idea why it was doing that, but that ends up eating all the events, not propagating them up to the parent ... If someone has a idea why it was like that, feel free to notify. --- src/lib/elementary/efl_ui_multibuttonentry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c index 0456532b63..b1abc2d00d 100644 --- a/src/lib/elementary/efl_ui_multibuttonentry.c +++ b/src/lib/elementary/efl_ui_multibuttonentry.c @@ -984,7 +984,8 @@ _efl_ui_multibuttonentry_elm_widget_widget_event(Eo *obj EINA_UNUSED, Efl_Ui_Mul // ACCESS if (_elm_config->access_mode == ELM_ACCESS_MODE_ON) return EINA_FALSE; - return EINA_TRUE; + //lets stop eating all events + return EINA_FALSE; } EOLIAN static void --
[EGIT] [core/efl] master 02/04: elm_main: make sure we dont go deeper than the widget top level
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=fa49488f3a08794bd9fbe72f2400cb19b59528e4 commit fa49488f3a08794bd9fbe72f2400cb19b59528e4 Author: Marcel HollerbachDate: Wed Oct 25 14:17:01 2017 +0200 elm_main: make sure we dont go deeper than the widget top level --- src/lib/elementary/elm_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index 81cbce4eeb..90647b30aa 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -1695,8 +1695,9 @@ _elm_widget_focus(Evas_Object *obj) new_manager = efl_ui_focus_user_manager_get(m2); /* also delay the registeration if we miss a manager half way */ - if (!new_manager) + if (!new_manager && m2 != elm_widget_top_get(obj)) { +efl_key_data_set(m, "__delayed_focus_set", obj); efl_event_callback_add(m2, EFL_UI_FOCUS_USER_EVENT_MANAGER_CHANGED, _manager_changed, obj); return; } --
[EGIT] [core/efl] master 04/04: elm_box: only allow focus to widgets of a box
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5a3ee984a1229c069c84e71a109a7d39437d5cc0 commit 5a3ee984a1229c069c84e71a109a7d39437d5cc0 Author: Marcel HollerbachDate: Wed Oct 25 14:29:31 2017 +0200 elm_box: only allow focus to widgets of a box all other should not get focus --- src/lib/elementary/elm_box.c | 9 + 1 file changed, 9 insertions(+) diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c index 07dee748ed..10ede30361 100644 --- a/src/lib/elementary/elm_box.c +++ b/src/lib/elementary/elm_box.c @@ -26,9 +26,18 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = { static void _elm_box_efl_ui_focus_composition_prepare(Eo *obj, Elm_Box_Data *pd EINA_UNUSED) { + Eina_List *n, *nn; + Elm_Widget *elem; + Elm_Widget_Smart_Data *wpd = efl_data_scope_get(obj, ELM_WIDGET_CLASS); Eina_List *order = evas_object_box_children_get(wpd->resize_obj); + EINA_LIST_FOREACH_SAFE(order, n, nn, elem) + { +if (!efl_isa(elem, ELM_WIDGET_CLASS)) + order = eina_list_remove(order, elem); + } + efl_ui_focus_composition_elements_set(obj, order); } --
[EGIT] [core/efl] master 03/04: elm_multibuttonentry: it cannot handle focus itself
bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=53fcc4bb7de3bfc9c69f6e138bc25a1f52a49744 commit 53fcc4bb7de3bfc9c69f6e138bc25a1f52a49744 Author: Marcel HollerbachDate: Wed Oct 25 14:27:52 2017 +0200 elm_multibuttonentry: it cannot handle focus itself the box in it is, so no need for can_focus == true. This fixes the basic usage, however the order is sometimes a bit screwed. Commits will follow. --- src/lib/elementary/efl_ui_multibuttonentry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/efl_ui_multibuttonentry.c b/src/lib/elementary/efl_ui_multibuttonentry.c index b1abc2d00d..4cec0b167c 100644 --- a/src/lib/elementary/efl_ui_multibuttonentry.c +++ b/src/lib/elementary/efl_ui_multibuttonentry.c @@ -1634,7 +1634,7 @@ _efl_ui_multibuttonentry_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Multibuttone (obj, "multibuttonentry", "base", elm_widget_style_get(obj))) CRI("Failed to set layout!"); - elm_widget_can_focus_set(obj, EINA_TRUE); + elm_widget_can_focus_set(obj, EINA_FALSE); priv->last_it_select = EINA_TRUE; priv->editable = EINA_TRUE; --
[EGIT] [website/www-content] master 01/01: Wiki page eo.md changed with summary [Proper formatting of titles, as per Style Guide] by Xavi Artigas
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=6b7aa38b559a75216cdd4fa7f95b85d11e302d4e commit 6b7aa38b559a75216cdd4fa7f95b85d11e302d4e Author: Xavi ArtigasDate: Wed Oct 25 05:35:16 2017 -0700 Wiki page eo.md changed with summary [Proper formatting of titles, as per Style Guide] by Xavi Artigas --- pages/contrib/docs/eo.md.txt | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pages/contrib/docs/eo.md.txt b/pages/contrib/docs/eo.md.txt index 3bbaadc7..14ce562d 100644 --- a/pages/contrib/docs/eo.md.txt +++ b/pages/contrib/docs/eo.md.txt @@ -6,7 +6,7 @@ ## Language Quick Reference ## -This is the quick reference, for a full definition see [Format in EBNF](#Eolian_file_format) +This is the quick reference, for a full definition see [Format in EBNF](#Eolian_File_Format) * General: * `/* comment */` or `//` are comments like in C/C++, they are used to explain the statements surrounding them. It's ignored and will never go to the generated files. @@ -58,9 +58,9 @@ This is the quick reference, for a full definition see [Format in EBNF](#Eolian_ * **Interfaces**: `interface name ( Base_Class1 , Base_Class2 ) { interface_body }` - `implements { class.constructor; class.destructor; }` -## Eolian file format example ## +## Eolian File Format Example ## -Before jumping to read the commented example file you may refer to the [Language Quick Reference](#Language_Quick_Reference) or check the full [Eolian file format](#Eolian_file_format). +Before jumping to read the commented example file you may refer to the [Language Quick Reference](#Language_Quick_Reference) or check the full [Eolian file format](#Eolian_File_Format). ```c /* COMMENTS ARE IMPORTANT, READ THEM. */ @@ -275,7 +275,7 @@ Before jumping to read the commented example file you may refer to the [Language } ``` -## Type context matrix ## +## Type Context Matrix ## | | Value | Named struct | Enum | Pointer | Void | | --- | -- | | -- | --- | -- | @@ -295,7 +295,7 @@ Before jumping to read the commented example file you may refer to the [Language * Keep in mind that whether const void is allowed or not depends on the outer type. When the const void is a base for a pointer it's allowed, otherwise it is not. -## Builtin types ## +## Builtin Types ## | Type| C type | Comment | | --- | -- | | @@ -335,7 +335,7 @@ Before jumping to read the commented example file you may refer to the [Language | stringshare| Eina_Stringshare * | | | generic_value | Eina_Value * | | -## Eolian file format ## +## Eolian File Format ## The description here uses the [extended BNF notation](https://www.ics.uci.edu/~pattis/ICS-33/lectures/ebnf.pdf) to describe the Eolian syntax. @@ -513,15 +513,15 @@ Thus in the following EBNF you'll see: return ::= 'return' ':' type return_suffix ``` -## Eo expressions ## +## Eo Expressions ## Eo files support expressions within certain contexts. These expressions can then be evaluated using the Eolian API. There are several types of expressions: -### Simple expressions ### +### Simple Expressions ### These include "true", "false" and "null", besides the ones below. The former two are used in boolean contexts while the latter is used for pointers of any kind. - Numerical expressions + Numerical Expressions Eolian numbers follow C syntax. They, however, don't support octal. They support type suffixes (case insensitive): `U` (unsigned int), `L` (long), `UL` (unsigned long), `LL` (long long), `ULL` (unsigned long long), `F` (float). Without suffix, the literal is either a signed integer or double depending on whether it contains a floating point. @@ -544,7 +544,7 @@ foo" A single character. Maps to builtin type **char**. Enclosed within single quotes. Can be either an arbitrary byte (represented within the Eo file, typically as UTF-8) or an escape sequence identical to the ones of strings. Cannot represent Unicode characters - it's just 1 byte. For example: `' a' `, `' \t' ` -### Unary expressions ### +### Unary Expressions ### There are 4 unary operators in Eolian, all with equal precedence level (see table below). @@ -554,7 +554,7 @@ The `!` operator is a logical "not" and its operand must qualify either as an ar The `~` operator is a bitwise "not". Its operand must qualify as an integer and its result is again an integer (of the same type). -### Binary operators ### +### Binary Operators ### The binary operators include standard arithmetic (`+`, `-`, `*`, `/`, `%`) - these act on numbers and yield a number of type identical to one of operands (subject to promotion, see below). @@ -570,7 +570,7
[EGIT] [website/www-content] master 01/01: Wiki page eo.md changed with summary [Another broken link] by Xavi Artigas
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=f01143150357cf3d6c837a05debc6feae377e0dd commit f01143150357cf3d6c837a05debc6feae377e0dd Author: Xavi ArtigasDate: Wed Oct 25 05:31:09 2017 -0700 Wiki page eo.md changed with summary [Another broken link] by Xavi Artigas --- pages/contrib/docs/eo.md.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/contrib/docs/eo.md.txt b/pages/contrib/docs/eo.md.txt index ecd3ddd7..3bbaadc7 100644 --- a/pages/contrib/docs/eo.md.txt +++ b/pages/contrib/docs/eo.md.txt @@ -6,7 +6,7 @@ ## Language Quick Reference ## -This is the quick reference, for a full definition see [Format in EBNF](#Eolian-file-format) +This is the quick reference, for a full definition see [Format in EBNF](#Eolian_file_format) * General: * `/* comment */` or `//` are comments like in C/C++, they are used to explain the statements surrounding them. It's ignored and will never go to the generated files. --
[EGIT] [website/www-content] master 01/01: Wiki page eo.md changed with summary [Broken links and syntax highlight] by Xavi Artigas
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=15e706b820467082a3829ec0f9448fad3ce33117 commit 15e706b820467082a3829ec0f9448fad3ce33117 Author: Xavi ArtigasDate: Wed Oct 25 05:28:48 2017 -0700 Wiki page eo.md changed with summary [Broken links and syntax highlight] by Xavi Artigas --- pages/contrib/docs/eo.md.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/contrib/docs/eo.md.txt b/pages/contrib/docs/eo.md.txt index b2c1faa6..ecd3ddd7 100644 --- a/pages/contrib/docs/eo.md.txt +++ b/pages/contrib/docs/eo.md.txt @@ -6,7 +6,7 @@ ## Language Quick Reference ## -This is the quick reference, for a full definition see [Format in EBNF](#eolian-file-format) +This is the quick reference, for a full definition see [Format in EBNF](#Eolian-file-format) * General: * `/* comment */` or `//` are comments like in C/C++, they are used to explain the statements surrounding them. It's ignored and will never go to the generated files. @@ -157,7 +157,7 @@ Before jumping to read the commented example file you may refer to the [Language documentation needed. Rarely used anyway.]] @out cx: Evas.Coord; - @out cy: Evas.Coord @optional; [[you can pass NULL if you'd like to ignore this value]] + @out cy: Evas.Coord @optional; [[you can pass NULL if you would like to ignore this value]] } /* Lack of return implies return void. * The (false) implies EINA_FALSE is the default return value in case an error --
[EGIT] [website/www-content] master 01/01: Wiki page start changed with summary [] by Andrew Williams
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=aec16ef204adadebfa85c65075625f744018862e commit aec16ef204adadebfa85c65075625f744018862e Author: Andrew WilliamsDate: Wed Oct 25 05:22:02 2017 -0700 Wiki page start changed with summary [] by Andrew Williams --- pages/contrib/start.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/contrib/start.txt b/pages/contrib/start.txt index f41788d2..da872f22 100644 --- a/pages/contrib/start.txt +++ b/pages/contrib/start.txt @@ -10,7 +10,7 @@ If you have free time, help is welcome in different areas: account]], have a look at the opened tasks, join [[/contact|IRC channel]] to get help on how to start coding * Writers: to help improve the documentation * Translators: to translate Enlightenment, Terminology, Edi, .. - * Designers: to help to get edje themes of all applications better or work on Enlightenment themes + * Designers: to help to get edje themes of all applications better or to work on new Enlightenment themes === Donate money === --
[EGIT] [website/www-content] master 01/01: Wiki page eo.md changed with summary [created from https://phab.enlightenment.org/w/eolian/] by Xavi Artigas
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=e5e050d820bf0e349a057e7515b45b9c896efd0a commit e5e050d820bf0e349a057e7515b45b9c896efd0a Author: Xavi ArtigasDate: Wed Oct 25 05:20:43 2017 -0700 Wiki page eo.md changed with summary [created from https://phab.enlightenment.org/w/eolian/] by Xavi Artigas --- pages/contrib/docs/eo.md.txt | 624 +++ pages/contrib/start.txt | 2 +- 2 files changed, 625 insertions(+), 1 deletion(-) diff --git a/pages/contrib/docs/eo.md.txt b/pages/contrib/docs/eo.md.txt new file mode 100644 index ..b2c1faa6 --- /dev/null +++ b/pages/contrib/docs/eo.md.txt @@ -0,0 +1,624 @@ +--- +~~Title: Eolian file format specification~~ +--- + +# Eolian File Format Specification # + +## Language Quick Reference ## + +This is the quick reference, for a full definition see [Format in EBNF](#eolian-file-format) + + * General: + * `/* comment */` or `//` are comments like in C/C++, they are used to explain the statements surrounding them. It's ignored and will never go to the generated files. + * `[[ documentation ]]` will be transformed into documentation for their associated object (variable, class, method, property, enum, type...). In C, that goes as a doxygen-style comment in the generated header file, so do not confuse it with a regular `/* comment */`. + When a comment sits alone on its own line, it refers to the text on the next line. When it sits at the end of a line, it refers to the previous text in that same line. + * Groups and blocks are defined within `{` and `}` + * Some modifiers may be used, their meaning and scope are defined per context, such as `@extern` may be used with `type`, `enum` and `struct` to denote they are already declared elsewhere (like an included header). + * Optional components are defined with `[` and `]`. + * Basic Definitions: + * **Variables**: `var [@extern] name : type [= value] ;` + * **Constant**: `const name : type = value ;` + * **Enumeration**: `enum [@extern] name { field1, field2 [= value2] ... }` + * Structure Definitions: + * **Opaque**: `struct [@extern] name ;` + * **Opaque with free function**: `struct @free( free_function ) name ;` + * **With fields**: `struct name { field1 : type1 , field2 : type2 ... } ;` + * Type Definitions: + * **Simple**: `type [@extern] name : other ;` + * **Simple with free function**: `type @free( free_function ) name : other ;` + * **List**: `type name : list* ;` + * **Array**: `type name : array* ;` + * **Hash**: `type name : hash* ;` + * Object Definitions: + * **Common Body** for class, abstract, interface and mixin: + - `legacy_prefix : prefix ;` + - `eo_prefix: prefix ;` + - `events { event_name_1 [@private | @protected | @beta | @hot] : type1 ; event_name_2 : type2 ; ... }` + - `methods { list_of_methods_and_properties }` +- **Methods**: `name [@protected | @const | @class | @pure_virtual] { method_body }` + * `legacy: name ;` + * `return: type [(expression)] [@warn_unused];` + * `params { [@in | @out | @inout] name1 : type1 [(expression)] [@nonull | @nullable | @optional] ; name2 : type2 , ... }` +- **Properties**: `@property name [@protected | @class | @pure_virtual ] { property_body }` + * `get [@pure_virtual] [{ return: type ; legacy: name }]` + * `set [@pure_virtual] [{ return: type ; legacy: name }]` + * `values { name1 : type1 [(expression)] [@nonull | @nullable | @optional] ; name2 : type2 , ... }` + * `keys { name1 : type1 [(expression)] [@nonull | @nullable | @optional] ; name2 : type2 , ... }` + * **Classes**: `class name ( Base_Class1 , Base_Class2 ) { class_body }` + - `data: private_data_type ` + - `implements { class.constructor; class.destructor; [@auto | @empty] interface_name1 ; .local_name2 , ... }` + - `constructors { method_name1 ; .local_method_name2 , ... }` + * **Abstract classes**: `abstract name ( Base_Class1 , Base_Class2 ) { abstract_body }` + - `data: private_data_type ` + - `implements { class.constructor; class.destructor; [@auto | @empty] interface_name1 ; .local_name2 , ... }` + - `constructors { method_name1 ; .local_method_name2 , ... }` + * **Mixins**: `mixin name ( Base_Class1 , Base_Class2 ) { mixin_body }` + - `data: private_data_type ` + - `implements { class.constructor; class.destructor; [@auto | @empty] interface_name1 ; .local_name2 , ... }` + * **Interfaces**: `interface name ( Base_Class1 , Base_Class2 ) { interface_body }` + - `implements { class.constructor; class.destructor; }` + +## Eolian file format example ## + +Before jumping to read the commented example file you may refer to the [Language Quick Reference](#Language_Quick_Reference) or check the full [Eolian file format](#Eolian_file_format). +
[EGIT] [website/www] master 01/02: Revert "Attempt upgrade to gitbacked plugin for ignorePath feature"
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=60a6cb96c6f4c9cff84002a60b68f61a8b63a7e6 commit 60a6cb96c6f4c9cff84002a60b68f61a8b63a7e6 Author: Andy WilliamsDate: Wed Oct 25 13:14:15 2017 +0100 Revert "Attempt upgrade to gitbacked plugin for ignorePath feature" This reverts commit b763c1067892dc83260b7431b1d5d198a347c9ea. --- .../lib/plugins/gitbacked/{README.md => README}| 7 +-- .../lib/plugins/gitbacked/action/editcommit.php| 43 - public_html/lib/plugins/gitbacked/conf/default.php | 27 ++-- .../lib/plugins/gitbacked/conf/metadata.php| 3 +- .../lib/plugins/gitbacked/lang/en/settings.php | 2 - public_html/lib/plugins/gitbacked/lib/Git.php | 71 ++ public_html/lib/plugins/gitbacked/plugin.info.txt | 6 +- 7 files changed, 59 insertions(+), 100 deletions(-) diff --git a/public_html/lib/plugins/gitbacked/README.md b/public_html/lib/plugins/gitbacked/README similarity index 89% rename from public_html/lib/plugins/gitbacked/README.md rename to public_html/lib/plugins/gitbacked/README index 9b1e9b2b..6ef56bbe 100644 --- a/public_html/lib/plugins/gitbacked/README.md +++ b/public_html/lib/plugins/gitbacked/README @@ -1,4 +1,4 @@ -# gitbacked Plugin for DokuWiki +gitbacked Plugin for DokuWiki Store/Sync pages and media files in a git repository @@ -6,14 +6,13 @@ All documentation for this plugin can be found at http://www.dokuwiki.org/plugin:gitbacked If you install this plugin manually, make sure it is installed in -`lib/plugins/gitbacked/` - if the folder is called different it +lib/plugins/gitbacked/ - if the folder is called different it will not work! Please refer to http://www.dokuwiki.org/plugins for additional info on how to install plugins in DokuWiki. -## License - + Copyright (C) Wolfgang Gassler This program is free software; you can redistribute it and/or modify diff --git a/public_html/lib/plugins/gitbacked/action/editcommit.php b/public_html/lib/plugins/gitbacked/action/editcommit.php index 311c6ef9..a888e95e 100644 --- a/public_html/lib/plugins/gitbacked/action/editcommit.php +++ b/public_html/lib/plugins/gitbacked/action/editcommit.php @@ -24,7 +24,7 @@ class action_plugin_gitbacked_editcommit extends DokuWiki_Action_Plugin { io_mkdir_p($this->temp_dir); } -public function register(Doku_Event_Handler $controller) { +public function register(Doku_Event_Handler &$controller) { $controller->register_hook('IO_WIKIPAGE_WRITE', 'AFTER', $this, 'handle_io_wikipage_write'); $controller->register_hook('MEDIA_UPLOAD_FINISH', 'AFTER', $this, 'handle_media_upload'); @@ -39,56 +39,35 @@ class action_plugin_gitbacked_editcommit extends DokuWiki_Action_Plugin { } else { $repoPath = DOKU_INC.$this->getConf('repoPath'); } -//set the path to the git binary -$gitPath = trim($this->getConf('gitPath')); -if ($gitPath !== '') { -Git::set_bin($gitPath); -} //init the repo and create a new one if it is not present io_mkdir_p($repoPath); $repo = new GitRepo($repoPath, true, true); //set git working directory (by default DokuWiki's savedir) $repoWorkDir = DOKU_INC.$this->getConf('repoWorkDir'); -Git::set_bin(Git::get_bin().' --work-tree '.escapeshellarg($repoWorkDir)); +$repo->git_path .= ' --work-tree '.escapeshellarg($repoWorkDir); $params = str_replace( array('%mail%','%user%'), array($this->getAuthorMail(),$this->getAuthor()), $this->getConf('addParams')); if ($params) { -Git::set_bin(Git::get_bin().' '.$params); +$repo->git_path .= ' '.$params; } return $repo; } - private function isIgnored($filePath) { - $ignore = false; - $ignorePaths = trim($this->getConf('ignorePaths')); - if ($ignorePaths !== '') { - $paths = explode(',',$ignorePaths); - foreach($paths as $path) { - if (strstr($filePath,$path)) { - $ignore = true; - } - } - } - return $ignore; - } - private function commitFile($filePath,$message) { - if (!$this->isIgnored($filePath)) { - $repo = $this->initRepo(); +$repo = $this->initRepo(); - //add the changed file and set the commit message - $repo->add($filePath); - $repo->commit($message); +//add the changed file and set the commit message +$repo->add($filePath); +$repo->commit($message); - //if the
[EGIT] [website/www] master 02/02: Add ignorePaths feature to gitbacked via patch until we can get upgrade working
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=459fdf601a363c102e3e63d3e38ebbf84b5a7d0d commit 459fdf601a363c102e3e63d3e38ebbf84b5a7d0d Author: Andy WilliamsDate: Wed Oct 25 13:19:19 2017 +0100 Add ignorePaths feature to gitbacked via patch until we can get upgrade working --- .../lib/plugins/gitbacked/action/editcommit.php| 32 -- public_html/lib/plugins/gitbacked/conf/default.php | 1 + .../lib/plugins/gitbacked/conf/metadata.php| 1 + .../lib/plugins/gitbacked/lang/en/settings.php | 1 + 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/public_html/lib/plugins/gitbacked/action/editcommit.php b/public_html/lib/plugins/gitbacked/action/editcommit.php index a888e95e..0094bf4e 100644 --- a/public_html/lib/plugins/gitbacked/action/editcommit.php +++ b/public_html/lib/plugins/gitbacked/action/editcommit.php @@ -56,18 +56,34 @@ class action_plugin_gitbacked_editcommit extends DokuWiki_Action_Plugin { return $repo; } + private function isIgnored($filePath) { + $ignore = false; + $ignorePaths = trim($this->getConf('ignorePaths')); + if ($ignorePaths !== '') { + $paths = explode(',',$ignorePaths); + foreach($paths as $path) { + if (strstr($filePath,$path)) { + $ignore = true; + } + } + } + return $ignore; + } + private function commitFile($filePath,$message) { -$repo = $this->initRepo(); + if (!$this->isIgnored($filePath)) { + $repo = $this->initRepo(); -//add the changed file and set the commit message -$repo->add($filePath); -$repo->commit($message); + //add the changed file and set the commit message + $repo->add($filePath); + $repo->commit($message); -//if the push after Commit option is set we push the active branch to origin -if ($this->getConf('pushAfterCommit')) { -$repo->push('origin',$repo->active_branch()); -} + //if the push after Commit option is set we push the active branch to origin + if ($this->getConf('pushAfterCommit')) { + $repo->push('origin',$repo->active_branch()); + } + } } diff --git a/public_html/lib/plugins/gitbacked/conf/default.php b/public_html/lib/plugins/gitbacked/conf/default.php index 319a31e3..b40bc6c8 100644 --- a/public_html/lib/plugins/gitbacked/conf/default.php +++ b/public_html/lib/plugins/gitbacked/conf/default.php @@ -15,6 +15,7 @@ $conf['commitMediaMsgDel']= 'Wiki media %media% deleted by %user%'; $conf['repoPath'] = $GLOBALS['conf']['savedir']; $conf['repoWorkDir'] = $GLOBALS['conf']['savedir']; $conf['addParams'] = ''; +$conf['ignorePaths'] = ''; /* plugin/gitbacked: Define a nice author (until addParams is fixed) * MUST NOT be defined in conf/local.php as $GLOBALS['USERINFO'] does not yet exist there diff --git a/public_html/lib/plugins/gitbacked/conf/metadata.php b/public_html/lib/plugins/gitbacked/conf/metadata.php index d3bce744..05f53bf3 100644 --- a/public_html/lib/plugins/gitbacked/conf/metadata.php +++ b/public_html/lib/plugins/gitbacked/conf/metadata.php @@ -15,4 +15,5 @@ $meta['commitMediaMsgDel'] = array('string'); $meta['repoPath'] = array('string'); $meta['repoWorkDir'] = array('string'); $meta['addParams'] = array('string'); +$meta['ignorePaths'] = array('string'); diff --git a/public_html/lib/plugins/gitbacked/lang/en/settings.php b/public_html/lib/plugins/gitbacked/lang/en/settings.php index c5ff0080..b5b7ce00 100644 --- a/public_html/lib/plugins/gitbacked/lang/en/settings.php +++ b/public_html/lib/plugins/gitbacked/lang/en/settings.php @@ -16,3 +16,4 @@ $lang['commitMediaMsgDel']= 'Commit message for deleted media files (%user%,%me $lang['repoPath'] = 'Path of the git repo (e.g. the savedir '.$GLOBALS['conf']['savedir'].')'; $lang['repoWorkDir'] = 'Path of the git working tree, must contain "pages" and "media" directories (e.g. the savedir '.$GLOBALS['conf']['savedir'].')'; $lang['addParams'] = 'Additional git parameters (added to the git execution command) (%user% and %mail% are replaced by the corresponding values)'; +$lang['ignorePaths'] = 'Paths/files which are ignored and not added to git (comma-separated)'; \ No newline at end of file --
[EGIT] [website/www-content] master 01/01: Wiki page start changed with summary [] by Andrew Williams
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=83f34b7d2879085bfad2dc08bf48d4fb05d256b5 commit 83f34b7d2879085bfad2dc08bf48d4fb05d256b5 Author: Andrew WilliamsDate: Wed Oct 25 05:07:45 2017 -0700 Wiki page start changed with summary [] by Andrew Williams --- pages/contrib/start.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/contrib/start.txt b/pages/contrib/start.txt index 5ce07682..5cb41e10 100644 --- a/pages/contrib/start.txt +++ b/pages/contrib/start.txt @@ -1,6 +1,6 @@ ~~Title: Contribute~~ - How to contribute to Enlightenment + How to contribute to EFL and Enlightenment === Give time === --
[EGIT] [website/www] master 01/01: Attempt upgrade to gitbacked plugin for ignorePath feature
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=b763c1067892dc83260b7431b1d5d198a347c9ea commit b763c1067892dc83260b7431b1d5d198a347c9ea Author: Andy WilliamsDate: Wed Oct 25 13:05:20 2017 +0100 Attempt upgrade to gitbacked plugin for ignorePath feature --- .../lib/plugins/gitbacked/{README => README.md}| 7 ++- .../lib/plugins/gitbacked/action/editcommit.php| 43 + public_html/lib/plugins/gitbacked/conf/default.php | 27 ++-- .../lib/plugins/gitbacked/conf/metadata.php| 3 +- .../lib/plugins/gitbacked/lang/en/settings.php | 2 + public_html/lib/plugins/gitbacked/lib/Git.php | 71 -- public_html/lib/plugins/gitbacked/plugin.info.txt | 6 +- 7 files changed, 100 insertions(+), 59 deletions(-) diff --git a/public_html/lib/plugins/gitbacked/README b/public_html/lib/plugins/gitbacked/README.md similarity index 89% rename from public_html/lib/plugins/gitbacked/README rename to public_html/lib/plugins/gitbacked/README.md index 6ef56bbe..9b1e9b2b 100644 --- a/public_html/lib/plugins/gitbacked/README +++ b/public_html/lib/plugins/gitbacked/README.md @@ -1,4 +1,4 @@ -gitbacked Plugin for DokuWiki +# gitbacked Plugin for DokuWiki Store/Sync pages and media files in a git repository @@ -6,13 +6,14 @@ All documentation for this plugin can be found at http://www.dokuwiki.org/plugin:gitbacked If you install this plugin manually, make sure it is installed in -lib/plugins/gitbacked/ - if the folder is called different it +`lib/plugins/gitbacked/` - if the folder is called different it will not work! Please refer to http://www.dokuwiki.org/plugins for additional info on how to install plugins in DokuWiki. - +## License + Copyright (C) Wolfgang Gassler This program is free software; you can redistribute it and/or modify diff --git a/public_html/lib/plugins/gitbacked/action/editcommit.php b/public_html/lib/plugins/gitbacked/action/editcommit.php index a888e95e..311c6ef9 100644 --- a/public_html/lib/plugins/gitbacked/action/editcommit.php +++ b/public_html/lib/plugins/gitbacked/action/editcommit.php @@ -24,7 +24,7 @@ class action_plugin_gitbacked_editcommit extends DokuWiki_Action_Plugin { io_mkdir_p($this->temp_dir); } -public function register(Doku_Event_Handler &$controller) { +public function register(Doku_Event_Handler $controller) { $controller->register_hook('IO_WIKIPAGE_WRITE', 'AFTER', $this, 'handle_io_wikipage_write'); $controller->register_hook('MEDIA_UPLOAD_FINISH', 'AFTER', $this, 'handle_media_upload'); @@ -39,35 +39,56 @@ class action_plugin_gitbacked_editcommit extends DokuWiki_Action_Plugin { } else { $repoPath = DOKU_INC.$this->getConf('repoPath'); } +//set the path to the git binary +$gitPath = trim($this->getConf('gitPath')); +if ($gitPath !== '') { +Git::set_bin($gitPath); +} //init the repo and create a new one if it is not present io_mkdir_p($repoPath); $repo = new GitRepo($repoPath, true, true); //set git working directory (by default DokuWiki's savedir) $repoWorkDir = DOKU_INC.$this->getConf('repoWorkDir'); -$repo->git_path .= ' --work-tree '.escapeshellarg($repoWorkDir); +Git::set_bin(Git::get_bin().' --work-tree '.escapeshellarg($repoWorkDir)); $params = str_replace( array('%mail%','%user%'), array($this->getAuthorMail(),$this->getAuthor()), $this->getConf('addParams')); if ($params) { -$repo->git_path .= ' '.$params; +Git::set_bin(Git::get_bin().' '.$params); } return $repo; } + private function isIgnored($filePath) { + $ignore = false; + $ignorePaths = trim($this->getConf('ignorePaths')); + if ($ignorePaths !== '') { + $paths = explode(',',$ignorePaths); + foreach($paths as $path) { + if (strstr($filePath,$path)) { + $ignore = true; + } + } + } + return $ignore; + } + private function commitFile($filePath,$message) { -$repo = $this->initRepo(); + if (!$this->isIgnored($filePath)) { + $repo = $this->initRepo(); -//add the changed file and set the commit message -$repo->add($filePath); -$repo->commit($message); + //add the changed file and set the commit message + $repo->add($filePath); + $repo->commit($message); -//if the push after Commit option is set we push the active branch to origin -if
[EGIT] [core/efl] master 01/01: evas/vg: Added align, viewbox and fill_mode property to the vg canvas
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=57ba3318dca35f51a5e2a89367677100bf7b9e49 commit 57ba3318dca35f51a5e2a89367677100bf7b9e49 Author: subhransu mohantyDate: Wed Oct 25 20:16:17 2017 +0900 evas/vg: Added align, viewbox and fill_mode property to the vg canvas Summary: viewbox, fill_mode and align property required to scale the vg tree that we get from the svg file or manually created depending on the vg canvas size. Reviewers: jpeg, cedric Subscribers: jenkins, cedric Differential Revision: https://phab.enlightenment.org/D5358 --- src/lib/evas/canvas/efl_canvas_vg.c | 152 ++ src/lib/evas/canvas/efl_canvas_vg.eo | 53 +++- src/lib/evas/canvas/evas_vg_private.h | 21 +++-- 3 files changed, 178 insertions(+), 48 deletions(-) diff --git a/src/lib/evas/canvas/efl_canvas_vg.c b/src/lib/evas/canvas/efl_canvas_vg.c index 55ad5d3b8d..e54875642d 100644 --- a/src/lib/evas/canvas/efl_canvas_vg.c +++ b/src/lib/evas/canvas/efl_canvas_vg.c @@ -73,6 +73,52 @@ _evas_vg_tree_changed(void *data, const Efl_Event *event EINA_UNUSED) evas_object_change(obj->object, obj); } +static void +_update_vgtree_viewport(Eo *obj, Efl_Canvas_Vg_Data *pd) +{ + double vb_w, vb_h, vp_w, vp_h, scale_w, scale_h, scale; + Eina_Size2D sz = efl_gfx_size_get(obj); + Eina_Matrix3 m; + + eina_matrix3_identity(); + + vb_w = pd->viewbox.w; + vb_h = pd->viewbox.h; + vp_w = sz.w; + vp_h = sz.h; + + scale_w = vp_w / vb_w; + scale_h = vp_h / vb_h; + + if (pd->fill_mode == EFL_CANVAS_VG_FILL_MODE_STRETCH) + { // Fill the viewport and ignore the aspect ratio +eina_matrix3_scale(, scale_w, scale_h); +eina_matrix3_translate(, -pd->viewbox.x, -pd->viewbox.y); + } + else + { +if (pd->fill_mode == EFL_CANVAS_VG_FILL_MODE_MEET) + scale = scale_w < scale_h ? scale_w : scale_h; +else // slice + scale = scale_w > scale_h ? scale_w : scale_h; +eina_matrix3_translate(, (vp_w - vb_w * scale) * pd->align_x, (vp_h - vb_h * scale) * pd->align_y); +eina_matrix3_scale(, scale, scale); +eina_matrix3_translate(, -pd->viewbox.x, -pd->viewbox.y); + } + + efl_vg_transformation_set(pd->root, ); +} + +static void +_evas_vg_resize(void *data, const Efl_Event *ev) +{ + Efl_Canvas_Vg_Data *pd = data; + + if (eina_rectangle_is_empty(>viewbox.rect)) + return; + _update_vgtree_viewport(ev->object, pd); +} + /* the actual api call to add a vector graphic object */ EAPI Evas_Object * evas_object_vg_add(Evas *e) @@ -84,13 +130,13 @@ evas_object_vg_add(Evas *e) return efl_add(MY_CLASS, e, efl_canvas_object_legacy_ctor(efl_added)); } -Efl_VG * +EOLIAN static Efl_VG * _efl_canvas_vg_root_node_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd) { return pd->vg_tree; } -void +EOLIAN static void _efl_canvas_vg_root_node_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, Efl_VG *root_node) { // if the same root is already set @@ -102,19 +148,84 @@ _efl_canvas_vg_root_node_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, Efl_VG efl_parent_set(pd->vg_tree, NULL); pd->vg_tree = root_node; - + if (pd->vg_tree) { // set the parent so that vg canvas can render it. efl_parent_set(pd->vg_tree, pd->root); } - + // force a redraw pd->changed = EINA_TRUE; - + evas_object_change(obj, efl_data_scope_get(obj, EFL_CANVAS_OBJECT_CLASS)); } +EOLIAN static void +_efl_canvas_vg_fill_mode_set(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd, Efl_Canvas_Vg_Fill_Mode fill_mode) +{ + pd->fill_mode = fill_mode; +} + +EOLIAN static Efl_Canvas_Vg_Fill_Mode +_efl_canvas_vg_fill_mode_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd) +{ + return pd->fill_mode; +} + +EOLIAN static void +_efl_canvas_vg_viewbox_set(Eo *obj, Efl_Canvas_Vg_Data *pd, Eina_Rect viewbox) +{ + // viewbox should be a valid rectangle + if (eina_rectangle_is_empty()) + { +// reset the old viewbox if any +if (!eina_rectangle_is_empty(>viewbox.rect)) + { + Eina_Matrix3 m; + + pd->viewbox = EINA_RECT_EMPTY(); + eina_matrix3_identity(); + efl_vg_transformation_set(pd->root, ); + // un register the resize callback + efl_event_callback_del(obj, EFL_GFX_EVENT_RESIZE, _evas_vg_resize, pd); + } +return; + } + // register for resize callback if not done yet + if (eina_rectangle_is_empty(>viewbox.rect)) + efl_event_callback_add(obj, EFL_GFX_EVENT_RESIZE, _evas_vg_resize, pd); + + pd->viewbox = viewbox; + _update_vgtree_viewport(obj, pd); +} + +EOLIAN static Eina_Rect +_efl_canvas_vg_viewbox_get(Eo *obj EINA_UNUSED, Efl_Canvas_Vg_Data *pd) +{ + return pd->viewbox; +} + +EOLIAN static void
[EGIT] [core/efl] master 01/01: eolian: enable duplicate validation but only warn for now
q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c46f9bec2d15f23c09caf932164f2b00ee5c0903 commit c46f9bec2d15f23c09caf932164f2b00ee5c0903 Author: Daniel KolesaDate: Wed Oct 25 13:03:20 2017 +0200 eolian: enable duplicate validation but only warn for now Use the EOLIAN_WARN_FUNC_DUPLICATES environment variable to enable those warnings. --- src/lib/eolian/database_validate.c | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c index 6635e7501a..0b1dd0e252 100644 --- a/src/lib/eolian/database_validate.c +++ b/src/lib/eolian/database_validate.c @@ -297,7 +297,8 @@ _validate_function(Eolian_Function *func, Eina_Hash *nhash) "function '%s' redefined (originally at %s:%d:%d)", func->name, ofunc->base.file, ofunc->base.line, ofunc->base.column); -return _obj_error(>base, buf); +if (getenv("EOLIAN_WARN_FUNC_DUPLICATES")) + _obj_error(>base, buf); } if (func->get_ret_type && !_validate_type(func->get_ret_type)) @@ -333,6 +334,10 @@ _validate_function(Eolian_Function *func, Eina_Hash *nhash) if (!_validate_doc(func->set_return_doc)) return EINA_FALSE; + /* just for now, when dups become errors there will be no need to check */ + if (!ofunc) + eina_hash_add(nhash, func->name, func); + return _validate(>base); } --
[EGIT] [website/www-content] master 01/01: Ignore pages in the playground
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=c102a712de3a3b7e11ed09430b3a3ff0748b6e3c commit c102a712de3a3b7e11ed09430b3a3ff0748b6e3c Author: Andy WilliamsDate: Wed Oct 25 12:01:18 2017 +0100 Ignore pages in the playground --- .gitignore | 3 + pages/playground/playground.md.txt | 113 - 2 files changed, 3 insertions(+), 113 deletions(-) diff --git a/.gitignore b/.gitignore index 83a3390f..7c1ebdad 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ *swp *swo Session.vim + +pages/playground/ + diff --git a/pages/playground/playground.md.txt b/pages/playground/playground.md.txt deleted file mode 100644 index 2f2f7326.. --- a/pages/playground/playground.md.txt +++ /dev/null @@ -1,113 +0,0 @@ -~~Title: Playing~~ - -# title of the first subsection # - -Is this [a link](#title_2) ? - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -scroolling down. - -## title 2 ## - -Text of the second subsection. - -Want to [go up](#title_of_the_first_subsection) --
[EGIT] [website/www-content] master 01/01: Wiki page playground.md changed with summary [] by Andrew Williams
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=2688ddef8092cb99c50e0a0cfc31ecc7f024912a commit 2688ddef8092cb99c50e0a0cfc31ecc7f024912a Author: Andrew WilliamsDate: Wed Oct 25 03:43:18 2017 -0700 Wiki page playground.md changed with summary [] by Andrew Williams --- pages/playground/playground.md.txt | 4 1 file changed, 4 insertions(+) diff --git a/pages/playground/playground.md.txt b/pages/playground/playground.md.txt index 918bcb6f..2f2f7326 100644 --- a/pages/playground/playground.md.txt +++ b/pages/playground/playground.md.txt @@ -1,3 +1,7 @@ +--- +~~Title: Playing~~ +--- + # title of the first subsection # Is this [a link](#title_2) ? --
[EGIT] [website/www-content] master 01/01: Wiki page playground.md changed with summary [] by Andrew Williams
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=a87c8fa1c9d67b497ffc1ad91d8dde2fe8bbabbb commit a87c8fa1c9d67b497ffc1ad91d8dde2fe8bbabbb Author: Andrew WilliamsDate: Wed Oct 25 03:42:19 2017 -0700 Wiki page playground.md changed with summary [] by Andrew Williams --- pages/playground/playground.md.txt | 4 1 file changed, 4 deletions(-) diff --git a/pages/playground/playground.md.txt b/pages/playground/playground.md.txt index 2f2f7326..918bcb6f 100644 --- a/pages/playground/playground.md.txt +++ b/pages/playground/playground.md.txt @@ -1,7 +1,3 @@ -~~Title: Playing~~ - # title of the first subsection # Is this [a link](#title_2) ? --
[EGIT] [website/www] master 01/02: Update to latest markdown plugin
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=cb5e7a34145f3e78765638e8d20e55c9e7d517bd commit cb5e7a34145f3e78765638e8d20e55c9e7d517bd Author: Andy WilliamsDate: Wed Oct 25 11:34:20 2017 +0100 Update to latest markdown plugin --- public_html/lib/plugins/markdownextra/action.php | 10 +- .../lib/meltdown-tweaks/meltdown-tweaks.css| 12 +- .../lib/meltdown-tweaks/meltdown-tweaks.js | 14 +- .../plugins/markdownextra/lib/meltdown/README.md | 131 +- .../markdownextra/lib/meltdown/css/meltdown.css| 340 +++-- .../lib/meltdown/fonts/meltdown.dev.svg|0 .../markdownextra/lib/meltdown/fonts/meltdown.eot | Bin .../markdownextra/lib/meltdown/fonts/meltdown.svg |0 .../markdownextra/lib/meltdown/fonts/meltdown.ttf | Bin .../markdownextra/lib/meltdown/fonts/meltdown.woff | Bin .../lib/meltdown/js/jquery.meltdown.js | 1371 ++-- .../meltdown/js/lib/element_resize_detection.js| 81 ++ .../lib/meltdown/js/lib/js-markdown-extra.js |0 13 files changed, 1451 insertions(+), 508 deletions(-) diff --git a/public_html/lib/plugins/markdownextra/action.php b/public_html/lib/plugins/markdownextra/action.php index 28a8d20c..3e84a548 100644 --- a/public_html/lib/plugins/markdownextra/action.php +++ b/public_html/lib/plugins/markdownextra/action.php @@ -63,11 +63,11 @@ class action_plugin_markdownextra extends DokuWiki_Action_Plugin { $event->data['script'][] = array( 'type'=> 'text/javascript', '_data' => '', -'src' => $meltdownBase.'js/jquery.meltdown.js'); +'src' => $meltdownBase.'js/lib/js-markdown-extra.js'); $event->data['script'][] = array( 'type'=> 'text/javascript', '_data' => '', -'src' => $meltdownBase.'js/lib/js-markdown-extra.js'); +'src' => $meltdownBase.'js/lib/element_resize_detection.js'); $event->data['script'][] = array( 'type'=> 'text/javascript', '_data' => '', @@ -75,7 +75,11 @@ class action_plugin_markdownextra extends DokuWiki_Action_Plugin { $event->data['script'][] = array( 'type'=> 'text/javascript', '_data' => '', +'src' => $meltdownBase.'js/jquery.meltdown.js'); + $event->data['script'][] = array( +'type'=> 'text/javascript', +'_data' => '', 'src' => $meltdownTweaksBase.'meltdown-tweaks.js'); } } -} \ No newline at end of file +} diff --git a/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.css b/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.css index 95989956..795c7cb2 100644 --- a/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.css +++ b/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.css @@ -21,4 +21,14 @@ /* For CSS3 browsers: allow user to resize the preview: */ .meltdown_preview { resize: vertical; } /* Cosmetic fixes due to editor and preview being reversed: */ -.meltdown_wrap textarea { margin-bottom: 5px !important; } +.meltdown_wrap { + width: 100% !important; +} + +.meltdown_wrap textarea { + padding: 0; +} + +.meltdown_bar, .meltdown_bar .meltdown_control span { + box-sizing: content-box; +} diff --git a/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.js b/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.js index aba910fc..f81ecc85 100644 --- a/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.js +++ b/public_html/lib/plugins/markdownextra/lib/meltdown-tweaks/meltdown-tweaks.js @@ -1,18 +1,12 @@ jQuery(document).ready(function($) { - // Disabling default DukuWiki toolbar (but allow users to renable it if needed): - $("#tool__bar").addClass("markdownextra_disabledtools").append($(" ", { - id: "markdownextra_tool__bar_overlay", - "class": "markdownextra_disabledtools_overlay", - text: "[ Activate DukuWiki toolbar ]", - click: function() { - $(this).fadeOut(200); - }})); + // Disabling default DukuWiki toolbar + $("#tool__bar").hide(); // Activate Meltdown on the textarea: $("#wiki__text").meltdown(); - + // Put preview after the editor: $(".meltdown_wrap").append($(".meltdown_preview-wrap")); // Open the preview (There is no init option for this...): $(".meltdown_control-preview").click(); -}); \ No newline at end of file +}); diff --git
[EGIT] [core/efl] master 02/02: eina_log: add parameter description on "eina_log_level_check"'s annotation
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=61f4a5e033b67ea36a6403e4bd605f73e2b3bfe8 commit 61f4a5e033b67ea36a6403e4bd605f73e2b3bfe8 Author: JinYong ParkDate: Wed Oct 25 19:09:56 2017 +0900 eina_log: add parameter description on "eina_log_level_check"'s annotation Summary: In eina_log_level_check's annotation, parameter description is missing, so warning is occurred on doxygen Test Plan: API Doxygen Revision Reviewers: raster, cedric, jpeg, myoungwoon, Jaehyun_Cho Differential Revision: https://phab.enlightenment.org/D5375 --- src/lib/eina/eina_log.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/eina/eina_log.h b/src/lib/eina/eina_log.h index dbb130543b..a78056e12e 100644 --- a/src/lib/eina/eina_log.h +++ b/src/lib/eina/eina_log.h @@ -533,6 +533,8 @@ EAPI int eina_log_level_get(void) EINA_WARN_UNUSED_RESULT; /** * @brief Determines if a given @p level should be logged. * + * @param level The log level to check + * * @return #EINA_TRUE if the @p level should be logged, else #EINA_FALSE. * * @see eina_log_level_set() --
[EGIT] [core/efl] master 01/02: eina_file: fix space location in annotation
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a205d9f60af1492f962d28da0f88a9b0289b4ff9 commit a205d9f60af1492f962d28da0f88a9b0289b4ff9 Author: JinYong ParkDate: Wed Oct 25 19:09:45 2017 +0900 eina_file: fix space location in annotation Summary: Space character is located in wrong position, so it occur doxygen warning Test Plan: API Doxygen Revision Reviewers: raster, cedric, jpeg, myoungwoon, Jaehyun_Cho Differential Revision: https://phab.enlightenment.org/D5374 --- src/lib/eina/eina_file.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eina/eina_file.h b/src/lib/eina/eina_file.h index 3a0b3dcfb4..9fd08a434e 100644 --- a/src/lib/eina/eina_file.h +++ b/src/lib/eina/eina_file.h @@ -662,7 +662,7 @@ EAPI void eina_file_map_free(Eina_File *file, void *map); * @param[in] rule The rule to apply to the mapped memory * @param[in] map Memory that was mapped inside of which the memory range is * @param[in] offset The offset in bytes from the start of the map address - * @param [in]length The length in bytes of the memory region to populate + * @param[in] length The length in bytes of the memory region to populate * * @since 1.8 */ --
[EGIT] [website/www-content] master 01/01: Wiki page playground.md changed with summary [] by Xavi Artigas
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=c8302d213168ca299c47c15d9793e6d727ba55df commit c8302d213168ca299c47c15d9793e6d727ba55df Author: Xavi ArtigasDate: Wed Oct 25 02:31:09 2017 -0700 Wiki page playground.md changed with summary [] by Xavi Artigas --- pages/playground/playground.md.txt | 104 - 1 file changed, 103 insertions(+), 1 deletion(-) diff --git a/pages/playground/playground.md.txt b/pages/playground/playground.md.txt index 58a79cdb..2f2f7326 100644 --- a/pages/playground/playground.md.txt +++ b/pages/playground/playground.md.txt @@ -2,10 +2,112 @@ ~~Title: Playing~~ --- -# title1 # +# title of the first subsection # Is this [a link](#title_2) ? +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + +scroolling down. + ## title 2 ## Text of the second subsection. + +Want to [go up](#title_of_the_first_subsection) --
[EGIT] [website/www-content] master 01/01: Wiki page playground.md changed with summary [created] by Xavi Artigas
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=80c1354e4abc25a419816e2f36610d3c6b7f08f0 commit 80c1354e4abc25a419816e2f36610d3c6b7f08f0 Author: Xavi ArtigasDate: Wed Oct 25 02:29:08 2017 -0700 Wiki page playground.md changed with summary [created] by Xavi Artigas --- pages/playground/playground.md.txt | 11 +++ 1 file changed, 11 insertions(+) diff --git a/pages/playground/playground.md.txt b/pages/playground/playground.md.txt new file mode 100644 index ..58a79cdb --- /dev/null +++ b/pages/playground/playground.md.txt @@ -0,0 +1,11 @@ +--- +~~Title: Playing~~ +--- + +# title1 # + +Is this [a link](#title_2) ? + +## title 2 ## + +Text of the second subsection. --
[EGIT] [core/efl] master 02/02: efl_ui_calendar: create new efl_ui_calendar
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9442f4687cd2eaa202c41254c12f553c463386f5 commit 9442f4687cd2eaa202c41254c12f553c463386f5 Author: WooHyun JungDate: Wed Oct 25 16:42:39 2017 +0900 efl_ui_calendar: create new efl_ui_calendar Summary: This calendar widget will support basic functionality of calendar. I've separated this widget from elm_calendar since elm_calendar had lots of unuseful things inside. Reviewers: jpeg, singh.amitesh, cedric, CHAN, Jaehyun_Cho Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5346 --- config/default/base.src.in | 95 ++ config/mobile/base.src.in| 95 ++ config/standard/base.src.in | 95 ++ po/POTFILES.in |1 + src/Makefile_Elementary.am |5 + src/bin/elementary/test.c|2 + src/bin/elementary/test_calendar.c | 56 ++ src/lib/elementary/Elementary.h |1 + src/lib/elementary/efl_ui_calendar.c | 1214 ++ src/lib/elementary/efl_ui_calendar.eo| 149 src/lib/elementary/efl_ui_calendar.h | 57 ++ src/lib/elementary/efl_ui_calendar_common.h | 21 + src/lib/elementary/efl_ui_calendar_private.h | 65 ++ 13 files changed, 1856 insertions(+) diff --git a/config/default/base.src.in b/config/default/base.src.in index 510e5a0f13..10d7d0e6a5 100644 --- a/config/default/base.src.in +++ b/config/default/base.src.in @@ -749,6 +749,101 @@ group "Elm_Config" struct { } } group "Elm_Config_Bindings_Widget" struct { +value "name" string: "Efl.Ui.Calendar"; +group "key_bindings" list { + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "Prior"; + value "action" string: "move"; + value "params" string: "prior"; + } + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "KP_Prior"; + value "action" string: "move"; + value "params" string: "prior"; + } + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "Next"; + value "action" string: "move"; + value "params" string: "next"; + } + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "KP_Next"; + value "action" string: "move"; + value "params" string: "next"; + } + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "Left"; + value "action" string: "move"; + value "params" string: "left"; + } + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "KP_Left"; + value "action" string: "move"; + value "params" string: "left"; + } + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "Right"; + value "action" string: "move"; + value "params" string: "right"; + } + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "KP_Right"; + value "action" string: "move"; + value "params" string: "right"; + } + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "Up"; + value "action" string: "move"; + value "params" string: "up"; + } + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "KP_Up"; + value "action" string: "move"; + value "params" string: "up"; + } + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "Down"; + value "action" string: "move"; + value "params" string: "down"; + } + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "KP_Down"; + value "action" string: "move"; + value "params" string: "down"; + } + group "Elm_Config_Binding_Key" struct { + value "context" int: 0; + value "key" string: "Return"; + value "action" string: "activate"; + value "params" string: ""; + } +
[EGIT] [core/efl] master 01/01: efl_ui_clock: changed property name from value to time
woohyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c1094da0f40ae59addf83d448308d9a1080e4392 commit c1094da0f40ae59addf83d448308d9a1080e4392 Author: WooHyun JungDate: Wed Oct 25 16:44:25 2017 +0900 efl_ui_clock: changed property name from value to time --- src/bin/elementary/test_ui_clock.c | 2 +- src/lib/elementary/efl_ui_clock.c| 12 ++-- src/lib/elementary/efl_ui_clock.eo | 6 +++--- src/lib/elementary/efl_ui_clock.h| 2 +- src/lib/elementary/elm_datetime.c| 12 ++-- .../elementary/clock_input_ctxpopup/clock_input_ctxpopup.c | 12 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c index b911f9ca58..ad401c3bc9 100644 --- a/src/bin/elementary/test_ui_clock.c +++ b/src/bin/elementary/test_ui_clock.c @@ -32,7 +32,7 @@ _bt_clicked(void *data EINA_UNUSED, const Efl_Event *ev) efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE); efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE); efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE); - efl_ui_clock_value_set(dt1, new_time); + efl_ui_clock_time_set(dt1, new_time); elm_object_disabled_set(dt1, EINA_TRUE); elm_object_disabled_set(ev->object, EINA_TRUE); diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c index bfa4d45987..bd11bc8d60 100644 --- a/src/lib/elementary/efl_ui_clock.c +++ b/src/lib/elementary/efl_ui_clock.c @@ -1043,13 +1043,13 @@ _efl_ui_clock_field_limit_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Type } EOLIAN static Efl_Time -_efl_ui_clock_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd) +_efl_ui_clock_time_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd) { return sd->curr_time; } EOLIAN static void -_efl_ui_clock_value_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time newtime) +_efl_ui_clock_time_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time newtime) { if (_date_cmp(>curr_time, )) return; sd->curr_time = newtime; @@ -1064,13 +1064,13 @@ _efl_ui_clock_value_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time newtime) } EOLIAN static Efl_Time -_efl_ui_clock_value_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd) +_efl_ui_clock_time_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd) { return sd->min_limit; } EOLIAN static void -_efl_ui_clock_value_min_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time mintime) +_efl_ui_clock_time_min_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time mintime) { struct tm old_time; @@ -1089,13 +1089,13 @@ _efl_ui_clock_value_min_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time mintime) } EOLIAN static Efl_Time -_efl_ui_clock_value_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd) +_efl_ui_clock_time_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd) { return sd->max_limit; } EOLIAN static void -_efl_ui_clock_value_max_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time maxtime) +_efl_ui_clock_time_max_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time maxtime) { struct tm old_time; diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo index 3bb315d25f..0594bacc35 100644 --- a/src/lib/elementary/efl_ui_clock.eo +++ b/src/lib/elementary/efl_ui_clock.eo @@ -115,7 +115,7 @@ class Efl.Ui.Clock (Efl.Ui.Layout) value: bool; [[$true to set edit mode, $false otherwise]] } } - @property value_min { + @property time_min { [[The lower boundary of a field. Year: years since 1900. Negative value represents year below 1900 @@ -135,7 +135,7 @@ class Efl.Ui.Clock (Efl.Ui.Layout) mintime: Efl.Time; [[Time structure containing the minimum time value.]] } } - @property value_max { + @property time_max { [[The upper boundary of a field. Year: years since 1900. Negative value represents year below 1900 @@ -155,7 +155,7 @@ class Efl.Ui.Clock (Efl.Ui.Layout) maxtime: Efl.Time; [[Time structure containing the maximum time value.]] } } - @property value { + @property time { [[The current value of a clock object. Year: years since 1900. Negative value represents year below 1900 diff --git a/src/lib/elementary/efl_ui_clock.h b/src/lib/elementary/efl_ui_clock.h index 4607d39af6..b882cd77a5 100644 --- a/src/lib/elementary/efl_ui_clock.h +++ b/src/lib/elementary/efl_ui_clock.h @@ -145,7 +145,7 @@ * * __ __ * | || | - * | Clock |<<<--efl_ui_clock_value_set()---| | + * | Clock
[EGIT] [core/efl] master 01/01: Efl.Ui.Slider: call format_free_cb() when object destroys
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=944c4dee1b74b7b5bff30cb99d34d7fa7e1c28f0 commit 944c4dee1b74b7b5bff30cb99d34d7fa7e1c28f0 Author: Amitesh SinghDate: Wed Oct 25 16:30:02 2017 +0900 Efl.Ui.Slider: call format_free_cb() when object destroys fix mistake done in previous patch 8661fe234c7e68b --- src/lib/elementary/efl_ui_slider.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c index e7a4f4c389..6b543a861e 100644 --- a/src/lib/elementary/efl_ui_slider.c +++ b/src/lib/elementary/efl_ui_slider.c @@ -238,7 +238,6 @@ _units_set(Evas_Object *obj) elm_layout_signal_emit(obj, "elm,state,units,hidden", "elm"); sd->units_show = EINA_FALSE; } -if (sd->format_free_cb) sd->format_free_cb(sd->format_cb_data); } else if (sd->units) { @@ -1203,6 +1202,7 @@ _efl_ui_slider_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Slider_Data *sd) evas_object_del(sd->popup); evas_object_del(sd->popup2); + if (sd->format_free_cb) sd->format_free_cb(sd->format_cb_data); efl_ui_format_cb_set(obj, NULL, NULL, NULL); eina_strbuf_free(sd->format_strbuf); --
[EGIT] [core/efl] master 01/01: efl_animation: Remove duration_only_set and total_duration_set methods
jaehyun pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9d1fad8dc163684a74c31f552ba6b1b603273c49 commit 9d1fad8dc163684a74c31f552ba6b1b603273c49 Author: Jaehyun ChoDate: Wed Oct 25 14:54:41 2017 +0900 efl_animation: Remove duration_only_set and total_duration_set methods Remove unnecessary methods, duration_only_set and total_duration_set. --- src/lib/evas/Evas_Internal.h | 3 -- src/lib/evas/canvas/efl_animation.c| 25 ++-- src/lib/evas/canvas/efl_animation.eo | 8 -- src/lib/evas/canvas/efl_animation_alpha.c | 3 -- src/lib/evas/canvas/efl_animation_group.c | 10 ++- src/lib/evas/canvas/efl_animation_group_parallel.c | 19 - .../evas/canvas/efl_animation_group_sequential.c | 17 --- src/lib/evas/canvas/efl_animation_object.c | 33 -- src/lib/evas/canvas/efl_animation_object_group.c | 12 ++-- .../canvas/efl_animation_object_group_parallel.c | 16 --- .../canvas/efl_animation_object_group_sequential.c | 16 --- src/lib/evas/canvas/efl_animation_object_private.h | 1 - src/lib/evas/canvas/efl_animation_private.h| 1 - src/lib/evas/canvas/efl_animation_rotate.c | 3 -- src/lib/evas/canvas/efl_animation_scale.c | 3 -- src/lib/evas/canvas/efl_animation_translate.c | 3 -- 16 files changed, 13 insertions(+), 160 deletions(-) diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h index 0ce1d847ba..f2fa838863 100644 --- a/src/lib/evas/Evas_Internal.h +++ b/src/lib/evas/Evas_Internal.h @@ -93,9 +93,6 @@ EOAPI Eina_Bool efl_animation_object_final_state_keep_get(const Eo *obj); EOAPI void efl_animation_object_duration_set(Eo *obj, double duration); EOAPI double efl_animation_object_duration_get(const Eo *obj); -EOAPI void efl_animation_object_duration_only_set(Eo *obj, double duration); - -EOAPI void efl_animation_object_total_duration_set(Eo *obj, double total_duration); EOAPI double efl_animation_object_total_duration_get(const Eo *obj); EOAPI void efl_animation_object_start_delay_set(Eo *obj, double delay_time); diff --git a/src/lib/evas/canvas/efl_animation.c b/src/lib/evas/canvas/efl_animation.c index 99b8907012..c5c461e0b1 100644 --- a/src/lib/evas/canvas/efl_animation.c +++ b/src/lib/evas/canvas/efl_animation.c @@ -27,12 +27,10 @@ _efl_animation_target_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd) } EOLIAN static void -_efl_animation_duration_set(Eo *eo_obj, +_efl_animation_duration_set(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd, double duration) { - efl_animation_total_duration_set(eo_obj, duration); - pd->duration = duration; } @@ -42,27 +40,11 @@ _efl_animation_duration_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd) return pd->duration; } -EOLIAN static void -_efl_animation_duration_only_set(Eo *eo_obj EINA_UNUSED, - Efl_Animation_Data *pd, - double duration) -{ - pd->duration = duration; -} - -EOLIAN static void -_efl_animation_total_duration_set(Eo *eo_obj EINA_UNUSED, - Efl_Animation_Data *pd, - double total_duration) -{ - pd->total_duration = total_duration; -} - EOLIAN static double _efl_animation_total_duration_get(Eo *eo_obj EINA_UNUSED, Efl_Animation_Data *pd) { - return pd->total_duration; + return pd->duration; } EOLIAN static void @@ -97,9 +79,6 @@ _efl_animation_object_create(Eo *eo_obj, Efl_Animation_Data *pd EINA_UNUSED) double duration = efl_animation_duration_get(eo_obj); efl_animation_object_duration_set(anim_obj, duration); - double total_duration = efl_animation_total_duration_get(eo_obj); - efl_animation_object_total_duration_set(anim_obj, total_duration); - int repeat_count = efl_animation_repeat_count_get(eo_obj); efl_animation_object_repeat_count_set(anim_obj, repeat_count); diff --git a/src/lib/evas/canvas/efl_animation.eo b/src/lib/evas/canvas/efl_animation.eo index 617a109f67..9b5ca30eb7 100644 --- a/src/lib/evas/canvas/efl_animation.eo +++ b/src/lib/evas/canvas/efl_animation.eo @@ -32,15 +32,7 @@ class Efl.Animation (Efl.Object) duration: double; [[Duration value.]] } } - duration_only_set @protected { - [[Set duration only without setting total duration.]] - params { -@in duration: double; [[Duration value.]] - } - } @property total_duration { - set @protected { - } get { } values { diff --git a/src/lib/evas/canvas/efl_animation_alpha.c b/src/lib/evas/canvas/efl_animation_alpha.c index 8b14a37162..d077120881 100644 ---