[EGIT] [tools/enventor] master 01/01: main: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6b6f4b19c18966a718e1e95d68f60531e07e9a18
commit 6b6f4b19c18966a718e1e95d68f60531e07e9a18
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Jul 3 23:01:22 2015 +0900
main: code refactoring.
don't keep temporary variable.
---
src/bin/main.c | 41 ++---
1 file changed, 14 insertions(+), 27 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index abe0786..0997efe 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -9,7 +9,6 @@
typedef struct app_s
{
Evas_Object *enventor;
- Eina_Bool template_new : 1;
Eina_Bool on_saving : 1;
Eina_Bool lazy_save : 1;
} app_data;
@@ -222,11 +221,11 @@ tools_set(Evas_Object *enventor)
return tools;
}
-static Eina_Bool
+static void
args_dispatch(int argc, char **argv, char *edc_path, char *edj_path,
Eina_List **img_path, Eina_List **snd_path,
Eina_List **fnt_path, Eina_List **dat_path,
- Eina_Bool *template_new)
+ Eina_Bool *default_edc, Eina_Bool *template)
{
Eina_List *id = NULL;
@@ -236,7 +235,6 @@ args_dispatch(int argc, char **argv, char *edc_path, char
*edj_path,
Eina_Bool quit = EINA_FALSE;
Eina_Bool help = EINA_FALSE;
- Eina_Bool default_edc = EINA_TRUE;
//No arguments. set defaults
if (argc == 1) goto defaults;
@@ -268,7 +266,7 @@ args_dispatch(int argc, char **argv, char *edc_path, char
*edj_path,
};
Ecore_Getopt_Value values[] = {
- ECORE_GETOPT_VALUE_BOOL(*template_new),
+ ECORE_GETOPT_VALUE_BOOL(*template),
ECORE_GETOPT_VALUE_LIST(id),
ECORE_GETOPT_VALUE_LIST(sd),
ECORE_GETOPT_VALUE_LIST(fd),
@@ -287,7 +285,7 @@ args_dispatch(int argc, char **argv, char *edc_path, char
*edj_path,
if (strstr(argv[i], .edc))
{
sprintf(edc_path, %s, argv[i]);
- default_edc = EINA_FALSE;
+ *default_edc = EINA_FALSE;
}
else if (strstr(argv[i], .edj))
{
@@ -304,7 +302,7 @@ args_dispatch(int argc, char **argv, char *edc_path, char
*edj_path,
}
defaults:
- if (default_edc)
+ if (*default_edc)
{
Eina_Tmpstr *tmp_path;
eina_file_mkstemp(DEFAULT_EDC_FORMAT, tmp_path);
@@ -341,12 +339,11 @@ defaults:
ecore_getopt_list_free(fd);
ecore_getopt_list_free(sd);
ecore_getopt_list_free(dd);
-
- return default_edc;
}
-static Eina_Bool
-config_data_set(app_data *ad, int argc, char **argv)
+static void
+config_data_set(app_data *ad, int argc, char **argv, Eina_Bool *default_edc,
+Eina_Bool *template)
{
char edc_path[PATH_MAX] = { 0, };
char edj_path[PATH_MAX] = { 0, };
@@ -354,16 +351,11 @@ config_data_set(app_data *ad, int argc, char **argv)
Eina_List *snd_path = NULL;
Eina_List *fnt_path = NULL;
Eina_List *dat_path = NULL;
- Eina_Bool template_new = EINA_FALSE;
- Eina_Bool default_edc = args_dispatch(argc, argv, edc_path, edj_path,
- img_path, snd_path, fnt_path,
- dat_path, template_new);
+ args_dispatch(argc, argv, edc_path, edj_path, img_path, snd_path,
+ fnt_path, dat_path, default_edc, template);
config_init(edc_path, edj_path, img_path, snd_path, fnt_path, dat_path);
config_update_cb_set(config_update_cb, ad);
- ad-template_new = template_new;
-
- return default_edc;
}
static void
@@ -836,13 +828,6 @@ statusbar_set()
}
static void
-template_show(app_data *ad)
-{
- if (ad-template_new)
- menu_edc_new(EINA_TRUE);
-}
-
-static void
live_edit_set(Evas_Object *enventor, Evas_Object *tools)
{
Evas_Object *trigger = tools_live_edit_get(tools);
@@ -859,7 +844,9 @@ init(app_data *ad, int argc, char **argv)
enventor_init(argc, argv);
- Eina_Bool default_edc = config_data_set(ad, argc, argv);
+ Eina_Bool template = EINA_FALSE;
+ Eina_Bool default_edc = EINA_TRUE;
+ config_data_set(ad, argc, argv, default_edc, template);
newfile_default_set(default_edc);
base_gui_init();
statusbar_set();
@@ -875,7 +862,7 @@ init(app_data *ad, int argc, char **argv)
menu_init(ad-enventor);
- template_show(ad);
+ if (template) menu_edc_new(EINA_TRUE);
//Initialize syntax color.
syntax_color_init(ad-enventor);
--
[EGIT] [core/efl] master 01/01: eolian: allow trailing comma on last enum item (just like C)
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e9a09047681b1c36f447d22ee11b68439aa0c84d
commit e9a09047681b1c36f447d22ee11b68439aa0c84d
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Fri Jul 3 15:19:12 2015 +0100
eolian: allow trailing comma on last enum item (just like C)
---
src/lib/eolian/eo_parser.c| 2 +-
src/tests/eolian/data/enum.eo | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index e074f3e..bb23240 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -616,7 +616,7 @@ parse_enum(Eo_Lexer *ls, const char *name, Eina_Bool
is_extern,
if (want_next)
eo_lexer_get(ls);
FILL_DOC(ls, fdef, doc);
-if (!want_next)
+if (!want_next || ls-t.token == '}')
break;
}
check_match(ls, '}', '{', bline, bcolumn);
diff --git a/src/tests/eolian/data/enum.eo b/src/tests/eolian/data/enum.eo
index 3901943..dc410e4 100644
--- a/src/tests/eolian/data/enum.eo
+++ b/src/tests/eolian/data/enum.eo
@@ -13,7 +13,7 @@ enum Bar {
enum Baz {
flag1 = 1 0,
flag2 = 1 1,
-flag3 = 1 2
+flag3 = 1 2, // testing trailing comma on last item
}
enum Name.Spaced {
--
[EGIT] [core/elementary] master 01/01: check: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=b075d8be69462f617aa91f1bb13558de65070883
commit b075d8be69462f617aa91f1bb13558de65070883
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Fri Jul 3 15:58:59 2015 +0100
check: convert docs
---
src/lib/elm_check.eo | 42 +-
1 file changed, 17 insertions(+), 25 deletions(-)
diff --git a/src/lib/elm_check.eo b/src/lib/elm_check.eo
index 062cb61..b9dedd6 100644
--- a/src/lib/elm_check.eo
+++ b/src/lib/elm_check.eo
@@ -4,43 +4,35 @@ class Elm.Check (Elm.Layout,
Elm_Interface_Atspi_Widget_Action)
methods {
@property state {
set {
-/*@
-@brief Set the on/off state of the check object
+[[Set the on/off state of the check object
-This sets the state of the check. If set with
elm_check_state_pointer_set()
-the state of that variable is also changed. Calling this @b
doesn't cause
-the changed signal to be emitted.
-
-@ingroup Check */
+ This sets the state of the check. If set with
+ @elm_check_state_pointer_set, the state of that variable is also
+ changed. Calling this doesn't cause the changed signal to
+ be emitted.
+]]
}
get {
-/*@
-@brief Get the state of the check object
-
-@return The boolean state
-
-@ingroup Check */
+[[Get the state of the check object]]
}
values {
-state: bool; /*@ The state to use (1 == on, 0 == off) */
+state: bool; [[The state to use (1 == on, 0 == off)]]
}
}
@property state_pointer {
set {
-/*@
-@brief Set a convenience pointer to a boolean to change
-
-This sets a pointer to a boolean, that, in addition to the check
objects
-state will also be modified directly. To stop setting the object
pointed
-to simply use NULL as the @p statep parameter. If @p statep is not
NULL,
-then when this is called, the check objects state will also be
modified to
-reflect the value of the boolean @p statep points to, just like
calling
-elm_check_state_set().
+[[Set a convenience pointer to a boolean to change
-@ingroup Check */
+ This sets a pointer to a boolean, that, in addition to the check
+ objects state will also be modified directly. To stop setting the
+ object pointed to simply use null as the statep parameter.
+ If statep is not null, then when this is called, the check
+ objects state will also be modified to reflect the value of the
+ boolean statep points to, just like calling
@elm_check_state_set.
+]]
}
values {
-statep: bool * @nullable; /*@ Pointer to the boolean to modify */
+statep: bool * @nullable; [[Pointer to the boolean to modify]]
}
}
}
--
[EGIT] [tools/enventor] master 01/01: newfile: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=8ef03ee90c8e0ea69272f502b6e4c4aca8d7f281
commit 8ef03ee90c8e0ea69272f502b6e4c4aca8d7f281
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Jul 3 22:38:18 2015 +0900
newfile: code refactoring.
return function as soon as possible.
---
src/bin/newfile.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/bin/newfile.c b/src/bin/newfile.c
index d3e7e09..9108c2f 100644
--- a/src/bin/newfile.c
+++ b/src/bin/newfile.c
@@ -64,15 +64,15 @@ newfile_set(Evas_Object *enventor, Eina_Bool template_new)
void
newfile_default_set(Eina_Bool default_edc)
{
+ if (!default_edc) return;
+
Eina_Bool success = EINA_TRUE;
char buf[PATH_MAX];
+
snprintf(buf, sizeof(buf), %s/templates/basic.edc,
elm_app_data_dir_get());
- if (default_edc)
- {
-success = eina_file_copy(buf,config_edc_path_get(),
- EINA_FILE_COPY_DATA, NULL, NULL);
- }
+ success = eina_file_copy(buf,config_edc_path_get(),
+EINA_FILE_COPY_DATA, NULL, NULL);
if (!success)
{
EINA_LOG_ERR(Cannot find file! \%s\, buf);
--
[EGIT] [core/elementary] master 01/01: route: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=9f6b0b941d0bc1bc713163d2b337ab9afe089a9c
commit 9f6b0b941d0bc1bc713163d2b337ab9afe089a9c
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Fri Jul 3 15:54:14 2015 +0100
route: convert docs
---
src/lib/elm_route.eo | 30 +-
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/lib/elm_route.eo b/src/lib/elm_route.eo
index 048bffb..2aa7562 100644
--- a/src/lib/elm_route.eo
+++ b/src/lib/elm_route.eo
@@ -4,7 +4,7 @@ class Elm.Route (Elm.Widget)
methods {
@property emap {
set {
-/*@ No description supplied by the EAPI. */
+[[No description supplied by the EAPI.]]
}
values {
emap: void *;
@@ -12,32 +12,28 @@ class Elm.Route (Elm.Widget)
}
@property longitude_min_max {
get {
-/*@
-Get the minimum and maximum values along the longitude.
+[[Get the minimum and maximum values along the longitude.
-@note If only one value is needed, the other pointer can be passed
-as @c NULL.
-
-@ingroup Route */
+ Note: If only one value is needed, the other pointer can be
+ passed as null.
+]]
}
values {
-min: double; /*@ Pointer to store the minimum value. */
-max: double; /*@ Pointer to store the maximum value. */
+min: double; [[Pointer to store the minimum value.]]
+max: double; [[Pointer to store the maximum value.]]
}
}
@property latitude_min_max {
get {
-/*@
-Get the minimum and maximum values along the latitude.
-
-@note If only one value is needed, the other pointer can be passed
-as @c NULL.
+[[Get the minimum and maximum values along the latitude.
-@ingroup Route */
+ Note: If only one value is needed, the other pointer can be
+ passed as null.
+]]
}
values {
-min: double; /*@ Pointer to store the minimum value. */
-max: double; /*@ Pointer to store the maximum value. */
+min: double; [[Pointer to store the minimum value.]]
+max: double; [[Pointer to store the maximum value.]]
}
}
}
--
[EGIT] [core/elementary] master 01/01: separator: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=86198c512254a29447a158d4e644767b7420c774
commit 86198c512254a29447a158d4e644767b7420c774
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Fri Jul 3 15:55:11 2015 +0100
separator: convert docs
---
src/lib/elm_separator.eo | 16 +++-
1 file changed, 3 insertions(+), 13 deletions(-)
diff --git a/src/lib/elm_separator.eo b/src/lib/elm_separator.eo
index 8bb752e..9ce35cf 100644
--- a/src/lib/elm_separator.eo
+++ b/src/lib/elm_separator.eo
@@ -4,23 +4,13 @@ class Elm.Separator (Elm.Layout)
methods {
@property horizontal {
set {
-/*@
-@brief Set the horizontal mode of a separator object
-
-@ingroup Separator */
+[[Set the horizontal mode of a separator object]]
}
get {
-/*@
-@brief Get the horizontal mode of a separator object
-
-@return If true, the separator is horizontal
-
-@see elm_separator_horizontal_set()
-
-@ingroup Separator */
+[[Get the horizontal mode of a separator object]]
}
values {
-horizontal: bool; /*@ If true, the separator is horizontal */
+horizontal: bool; [[If true, the separator is horizontal]]
}
}
}
--
[EGIT] [core/efl] master 01/01: eolian: add support for monospace highlights in docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2e8fc41613083f9cb8a3b34d4d1f5345b08a0289
commit 2e8fc41613083f9cb8a3b34d4d1f5345b08a0289
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Fri Jul 3 16:13:59 2015 +0100
eolian: add support for monospace highlights in docs
---
src/bin/eolian/docs_generator.c| 10 +-
src/tests/eolian/data/struct.eo| 1 +
src/tests/eolian/data/struct_ref.c | 4 ++--
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/bin/eolian/docs_generator.c b/src/bin/eolian/docs_generator.c
index 41b506d..5d872d3 100644
--- a/src/bin/eolian/docs_generator.c
+++ b/src/bin/eolian/docs_generator.c
@@ -34,7 +34,7 @@ _append_section(const char *desc, int ind, int curl,
Eina_Strbuf *buf,
if (*desc == '\\')
{
desc++;
- if (*desc != '@')
+ if ((*desc != '@') (*desc != '$'))
eina_strbuf_append_char(wbuf, '\\');
eina_strbuf_append_char(wbuf, *desc++);
}
@@ -46,6 +46,14 @@ _append_section(const char *desc, int ind, int curl,
Eina_Strbuf *buf,
else
eina_strbuf_append_char(wbuf, '@');
}
+else if (*desc == '$')
+ {
+ desc++;
+ if (isalpha(*desc))
+ eina_strbuf_append(wbuf, @c );
+ else
+ eina_strbuf_append_char(wbuf, '@');
+ }
while (*desc !isspace(*desc))
eina_strbuf_append_char(wbuf, *desc++);
int limit = DOC_LIMIT(ind);
diff --git a/src/tests/eolian/data/struct.eo b/src/tests/eolian/data/struct.eo
index 6b33952..c59c516 100644
--- a/src/tests/eolian/data/struct.eo
+++ b/src/tests/eolian/data/struct.eo
@@ -17,6 +17,7 @@ struct @extern Not.Generated {
class Struct {
methods {
foo {
+ [[Foo docs. This is $monospace.]]
params {
idx: int;
}
diff --git a/src/tests/eolian/data/struct_ref.c
b/src/tests/eolian/data/struct_ref.c
index 455d60a..85e8b5b 100644
--- a/src/tests/eolian/data/struct_ref.c
+++ b/src/tests/eolian/data/struct_ref.c
@@ -31,9 +31,9 @@ typedef struct _Opaque Opaque;
EAPI const Eo_Class *struct_class_get(void) EINA_CONST;
/**
- * No description supplied.
+ * @brief Foo docs. This is @c monospace.
*
- * @param[in] idx No description supplied.
+ * @param[in] idx
*/
EOAPI char * struct_foo(int idx);
--
[EGIT] [core/elementary] master 01/01: radio: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6a2b02ebd111bab54d8dbe776e18ff86b5e0959b
commit 6a2b02ebd111bab54d8dbe776e18ff86b5e0959b
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Fri Jul 3 15:52:29 2015 +0100
radio: convert docs
---
src/lib/elm_radio.eo | 91
1 file changed, 35 insertions(+), 56 deletions(-)
diff --git a/src/lib/elm_radio.eo b/src/lib/elm_radio.eo
index 786c17a..686072b 100644
--- a/src/lib/elm_radio.eo
+++ b/src/lib/elm_radio.eo
@@ -4,93 +4,72 @@ class Elm.Radio (Elm.Layout,
Elm_Interface_Atspi_Widget_Action)
methods {
@property state_value {
set {
-/*@
-@brief Set the integer value that this radio object represents
+[[Set the integer value that this radio object represents
-This sets the value of the radio.
-
-@ingroup Radio */
+ This sets the value of the radio.
+]]
}
get {
-/*@
-@brief Get the integer value that this radio object represents
-
-@return The value used if this radio object is selected
-
-This gets the value of the radio.
-@see elm_radio_value_set()
+[[Get the integer value that this radio object represents
-@ingroup Radio */
+ This gets the value of the radio.
+]]
}
values {
-value: int; /*@ The value to use if this radio object is selected
*/
+value: int; [[The value to use if this radio object is selected]]
}
}
@property value {
set {
-/*@
-@brief Set the value of the radio group.
+[[Set the value of the radio group.
-This sets the value of the radio group and will also set the value
if
-pointed to, to the value supplied, but will not call any callbacks.
-
-@ingroup Radio */
+ This sets the value of the radio group and will also set the
+ value if pointed to, to the value supplied, but will not call
+ any callbacks.
+]]
}
get {
-/*@
-@brief Get the value of the radio group
-
-@return The integer state
-
-@ingroup Radio */
+[[Get the value of the radio group]]
}
values {
-value: int; /*@ The value to use for the group */
+value: int; [[The value to use for the group]]
}
}
@property value_pointer {
set {
-/*@
-@brief Set a convenience pointer to a integer to change when radio
group
-value changes.
-
-This sets a pointer to a integer, that, in addition to the radio
objects
-state will also be modified directly. To stop setting the object
pointed
-to simply use NULL as the @p valuep argument. If valuep is not
NULL, then
-when this is called, the radio objects state will also be modified
to
-reflect the value of the integer valuep points to, just like
calling
-elm_radio_value_set().
-
-@ingroup Radio */
+[[Set a convenience pointer to a integer to change when radio group
+ value changes.
+
+ This sets a pointer to a integer, that, in addition to the radio
+ objects state will also be modified directly. To stop setting the
+ object pointed to simply use NULL as the valuep argument. If
+ valuep is not NULL, then when this is called, the radio objects
+ state will also be modified to reflect the value of the integer
+ valuep points to, just like calling elm_radio_value_set().
+]]
}
values {
-valuep: int * @nullable; /*@ Pointer to the integer to modify */
+valuep: int * @nullable; [[Pointer to the integer to modify]]
}
}
@property selected_object {
get {
-/*@
-@brief Get the selected radio object.
-
-@return The selected radio object
-
-@ingroup Radio */
-return: Evas.Object *;
+[[Get the selected radio object.]]
+return: Evas.Object *; [[The selected radio object]]
}
}
group_add {
- /*@
- @brief Add this radio to a group of other radio objects
-
- Radio objects work in groups. Each member should have a different
integer
- value assigned. In order to have them work as a group, they need to
know
- about each other. This adds the given radio object to the group of
which
- the group object indicated is a member.
+ [[Add this radio to a group of other radio objects
- @ingroup
[EGIT] [core/elementary] master 01/01: scroller: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=027737d9e37d5c218b28611a828ffaab9a64f858
commit 027737d9e37d5c218b28611a828ffaab9a64f858
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Fri Jul 3 15:12:48 2015 +0100
scroller: convert docs
---
src/lib/elm_scroller.eo | 58 ++---
1 file changed, 21 insertions(+), 37 deletions(-)
diff --git a/src/lib/elm_scroller.eo b/src/lib/elm_scroller.eo
index d4441de..87ebe87 100644
--- a/src/lib/elm_scroller.eo
+++ b/src/lib/elm_scroller.eo
@@ -43,34 +43,26 @@ class Elm.Scroller (Elm.Layout, Elm_Interface_Scrollable,
methods {
@property propagate_events {
set {
-/*@
-@brief Set event propagation on a scroller
+[[Set event propagation on a scroller
-This enables or disables event propagation from the scroller
-content to the scroller and its parent. By default event
-propagation is @b enabled.
-
-@ingroup Scroller */
+ This enables or disables event propagation from the scroller
+ content to the scroller and its parent. By default event
+ propagation is enabled.
+]]
}
get {
-/*@
-@brief Get event propagation for a scroller
-
-@return The propagation state
-
-This gets the event propagation for a scroller.
-
-@see elm_scroller_propagate_events_set()
+[[Get event propagation for a scroller
-@ingroup Scroller */
+ This gets the event propagation for a scroller.
+]]
}
values {
-propagation: bool; /*@ If propagation is enabled or not */
+propagation: bool; [[The propagation state]]
}
}
@property custom_widget_base_theme {
set {
-/*@ Set custom theme elements for the scroller */
+[[Set custom theme elements for the scroller]]
}
values {
klass: const(char)*;
@@ -78,33 +70,25 @@ class Elm.Scroller (Elm.Layout, Elm_Interface_Scrollable,
}
}
page_scroll_limit_set @const {
- /*@
- @brief Set the maximum of the movable page at a flicking.
+ [[Set the maximum of the movable page at a flicking.
- The value of maximum movable page should be more than 1.
+ The value of maximum movable page should be more than 1.
- @see elm_scroller_page_scroll_limit_get()
-
- @since 1.8
-
- @ingroup Scroller */
+ @since 1.8
+ ]]
params {
-@in page_limit_h: int; /*@ The maximum of the movable horizontal
page */
-@in page_limit_v: int; /*@ The maximum of the movable vertical
page */
+@in page_limit_h: int; [[The maximum of the movable horizontal
page]]
+@in page_limit_v: int; [[The maximum of the movable vertical page]]
}
}
page_scroll_limit_get @const {
- /*@
- @brief Get the maximum of the movable page at a flicking.
-
- @see elm_scroller_page_scroll_limit_set()
-
- @since 1.8
+ [[Get the maximum of the movable page at a flicking.
- @ingroup Scroller */
+ @since 1.8
+ ]]
params {
-@in page_limit_h: int *; /*@ The maximum of the movable horizontal
page */
-@in page_limit_v: int *; /*@ The maximum of the movable vertical
page */
+@in page_limit_h: int *; [[The maximum of the movable horizontal
page]]
+@in page_limit_v: int *; [[The maximum of the movable vertical
page]]
}
}
}
--
[EGIT] [core/efl] master 06/08: Ecore_File: improve comment of ecore_file_mkdir()
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a46adde19da4a7e1b2d0b4b59b874689b73783c0 commit a46adde19da4a7e1b2d0b4b59b874689b73783c0 Author: Vincent Torri vincent.to...@gmail.com Date: Fri Jul 3 09:34:46 2015 +0200 Ecore_File: improve comment of ecore_file_mkdir() --- src/lib/ecore_file/ecore_file.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_file/ecore_file.c b/src/lib/ecore_file/ecore_file.c index 7a4a16c..d9ee50f 100644 --- a/src/lib/ecore_file/ecore_file.c +++ b/src/lib/ecore_file/ecore_file.c @@ -206,9 +206,10 @@ static mode_t default_mode = S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S * @param dir The name of the directory to create * @return @c EINA_TRUE on successful creation, @c EINA_FALSE otherwise. * - * This function creates the directory @p dir with the mode S_IRUSR | - * S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH. On - * success, it returns @c EINA_TRUE, @c EINA_FALSE otherwise. + * This function creates the directory @p dir, with the mode S_IRUSR | + * S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH on UNIX + * (mode is unsued on Windows). On success, it returns @c EINA_TRUE, + * @c EINA_FALSE otherwise. */ EAPI Eina_Bool ecore_file_mkdir(const char *dir) --
[EGIT] [core/efl] master 02/08: Edje_Player: disable code unused on Windows.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e494c225f7fc1b2819be92611b62834aee6e70e6
commit e494c225f7fc1b2819be92611b62834aee6e70e6
Author: Vincent Torri vincent.to...@gmail.com
Date: Thu Jul 2 14:50:15 2015 +0200
Edje_Player: disable code unused on Windows.
---
src/bin/edje/edje_player.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/bin/edje/edje_player.c b/src/bin/edje/edje_player.c
index 7daf48a..b3dc672 100644
--- a/src/bin/edje/edje_player.c
+++ b/src/bin/edje/edje_player.c
@@ -501,6 +501,7 @@ struct slave_cmd
{NULL, NULL}
};
+#ifndef _WIN32
static Eina_Bool
_slave_mode(void *data, Ecore_Fd_Handler *fd_handler)
{
@@ -570,6 +571,7 @@ _slave_mode(void *data, Ecore_Fd_Handler *fd_handler)
return ECORE_CALLBACK_RENEW;
}
+#endif
static void
_print_signal(void *data EINA_UNUSED, Evas_Object *o EINA_UNUSED, const char
*emission, const char *source)
--
[EGIT] [core/efl] master 08/08: Ecore_File: use ecore_file_mkdir()
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=315e1f5a2bc2dd9e1a721681a08ab56d0a0c7e24
commit 315e1f5a2bc2dd9e1a721681a08ab56d0a0c7e24
Author: Vincent Torri vincent.to...@gmail.com
Date: Fri Jul 3 10:11:01 2015 +0200
Ecore_File: use ecore_file_mkdir()
---
src/lib/ecore_file/ecore_file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ecore_file/ecore_file.c b/src/lib/ecore_file/ecore_file.c
index db0a1e6..7dba323 100644
--- a/src/lib/ecore_file/ecore_file.c
+++ b/src/lib/ecore_file/ecore_file.c
@@ -319,7 +319,7 @@ ecore_file_mksubdirs(const char *base, const char **subdirs)
if (errno == ENOENT)
{
#ifndef HAVE_ATFILE_SOURCE
- if (mkdir(buf, default_mode) == 0)
+ if (ecore_file_mkdir(buf))
#else
if (mkdirat(fd, *subdirs, default_mode) == 0)
#endif
--
[EGIT] [core/efl] master 03/08: Efl debug daemon: Fix Warning on Windows.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9846976847c7a3a515ee67c1c178e6fb53707ddd commit 9846976847c7a3a515ee67c1c178e6fb53707ddd Author: Vincent Torri vincent.to...@gmail.com Date: Thu Jul 2 22:24:44 2015 +0200 Efl debug daemon: Fix Warning on Windows. According to the Open Group, pid_t is signed integer and can not be larger than a long --- src/bin/efl/efl_debugd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/efl/efl_debugd.c b/src/bin/efl/efl_debugd.c index a46d423..a1025fb 100644 --- a/src/bin/efl/efl_debugd.c +++ b/src/bin/efl/efl_debugd.c @@ -127,8 +127,8 @@ _do(Client *c, char *op, unsigned char *d, int size) send_cli(c2-client, EVON, NULL, 0); c2-evlog_fetch_timer = ecore_timer_add(0.2, _cb_evlog, c2); - snprintf(buf, sizeof(buf), %s/efl_debug_evlog-%i.log, - getenv(HOME), c2-pid); + snprintf(buf, sizeof(buf), %s/efl_debug_evlog-%ld.log, + getenv(HOME), (long)c2-pid); c2-evlog_file = fopen(buf, w); } } --
[EGIT] [tools/enventor] master 01/01: syntax_color: apply string syntax color prior to others.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=d2e3c6dc6bff1b3b11e697ad49fcde7e0891cf91
commit d2e3c6dc6bff1b3b11e697ad49fcde7e0891cf91
Author: ChunEon Park her...@hermet.pe.kr
Date: Sat Jul 4 01:08:01 2015 +0900
syntax_color: apply string syntax color prior to others.
even if the comments are inside of the qutoes,
the comments syntax color should not be applied.
---
src/lib/syntax_color.c | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/lib/syntax_color.c b/src/lib/syntax_color.c
index bd432cd..ac0f47e 100644
--- a/src/lib/syntax_color.c
+++ b/src/lib/syntax_color.c
@@ -860,6 +860,20 @@ color_apply(color_data *cd, const char *src, int length,
char *from, char *to)
}
}
+//escape string: ~
+ret = string_apply(strbuf, cur, prev, cd-col_string, inside_string);
+if (ret == 1)
+ {
+ inside_string = !inside_string;
+ continue;
+ }
+
+if (inside_string || inside_comment)
+ {
+ cur++;
+ continue;
+ }
+
//handle comment: /* ~ */
ret = comment_apply(strbuf, src, length, cur, prev, cd-col_comment,
inside_comment);
@@ -875,20 +889,6 @@ color_apply(color_data *cd, const char *src, int length,
char *from, char *to)
else if (ret == -1) goto finished;
}
-//escape string: ~
-ret = string_apply(strbuf, cur, prev, cd-col_string, inside_string);
-if (ret == 1)
- {
- inside_string = !inside_string;
- continue;
- }
-
-if (inside_string || inside_comment)
- {
- cur++;
- continue;
- }
-
//handle comment: preprocessors, #
ret = macro_apply(strbuf, src, length, cur, prev, cd-col_macro,
cd);
if (ret == 1) continue;
--
[EGIT] [core/enlightenment] master 01/01: wizard: Prevent crash
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=8e91f32978bf2ccf5d15a6952eb5ae2a6e932509
commit 8e91f32978bf2ccf5d15a6952eb5ae2a6e932509
Author: Derek Foreman der...@osg.samsung.com
Date: Fri Jul 3 11:55:40 2015 -0400
wizard: Prevent crash
Summary: If we get here when curpage is NULL, we'll crash later, so we
should test for it.
Reviewers: zmike
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2793
---
src/modules/wizard/e_wizard.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index 0a9c052..9a9d072 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -406,7 +406,7 @@ static Eina_Bool
_e_wizard_cb_icons_update(void *data EINA_UNUSED, int ev_type EINA_UNUSED,
void *ev EINA_UNUSED)
{
got_icons = EINA_TRUE;
- if (_e_wizard_check_xdg())
+ if (curpage _e_wizard_check_xdg())
_e_wizard_next_xdg();
return ECORE_CALLBACK_PASS_ON;
}
--
[EGIT] [core/enlightenment] enlightenment-0.19 01/01: wizard: Prevent crash
discomfitor pushed a commit to branch enlightenment-0.19.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=01ef4980d721aba0e918bc613bf7d00c0b0ace76
commit 01ef4980d721aba0e918bc613bf7d00c0b0ace76
Author: Derek Foreman der...@osg.samsung.com
Date: Fri Jul 3 11:55:40 2015 -0400
wizard: Prevent crash
Summary: If we get here when curpage is NULL, we'll crash later, so we
should test for it.
Reviewers: zmike
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2793
---
src/modules/wizard/e_wizard.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c
index 9e93581..b56b52a 100644
--- a/src/modules/wizard/e_wizard.c
+++ b/src/modules/wizard/e_wizard.c
@@ -410,7 +410,7 @@ static Eina_Bool
_e_wizard_cb_icons_update(void *data __UNUSED__, int ev_type __UNUSED__, void
*ev __UNUSED__)
{
got_icons = EINA_TRUE;
- if (_e_wizard_check_xdg())
+ if (curpage _e_wizard_check_xdg())
_e_wizard_next_xdg();
return ECORE_CALLBACK_PASS_ON;
}
--
[EGIT] [core/efl] master 02/02: edje: add Convex Hull logic
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e40c223181ec6b46437796809f6c2a7595bfc9bd
commit e40c223181ec6b46437796809f6c2a7595bfc9bd
Author: perepelits.m perepelit...@samsung.com
Date: Sat Jul 4 02:39:08 2015 +0200
edje: add Convex Hull logic
Summary: This is an algorithm which calcuates a convex hull of some mesh,
in fact it returns vertex, index, normal and color datas, though the new mesh
could be build just as for AABB
Reviewers: raster, Hermet, cedric
Subscribers: cedric, artem.popov
Differential Revision: https://phab.enlightenment.org/D2585
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/lib/evas/include/evas_3d_utils.h | 681 +++
1 file changed, 681 insertions(+)
diff --git a/src/lib/evas/include/evas_3d_utils.h
b/src/lib/evas/include/evas_3d_utils.h
index 828348d..bd6aaa6 100644
--- a/src/lib/evas/include/evas_3d_utils.h
+++ b/src/lib/evas/include/evas_3d_utils.h
@@ -7,6 +7,10 @@
#define DEGREE_TO_RADIAN(x) (((x) * M_PI) / 180.0)
#define EVAS_MATRIX_IS_IDENTITY 0x0001
+#define MIN_DIFF 0.001
+
+#define FLT_COMPARISON(a, b)\
+ (fabs(a - b) FLT_EPSILON)
typedef struct _Evas_Color Evas_Color;
typedef struct _Evas_Vec2 Evas_Vec2;
@@ -345,6 +349,15 @@ evas_vec3_distance_square_get(const Evas_Vec3 *a, const
Evas_Vec3 *b)
return evas_vec3_length_square_get(v);
}
+static inline Evas_Real
+evas_vec3_angle_get(const Evas_Vec3 *a, const Evas_Vec3 *b)
+{
+ Evas_Real angle;
+
+ angle = evas_vec3_dot_product(a, b) / (evas_vec3_length_get(a) *
evas_vec3_length_get(b));
+ return angle;
+}
+
static inline void
evas_vec3_normalize(Evas_Vec3 *out, const Evas_Vec3 *v)
{
@@ -571,6 +584,25 @@ evas_vec4_transform(Evas_Vec4 *out, const Evas_Vec4 *v,
const Evas_Mat4 *m)
}
static inline void
+evas_vec4_plain_by_points(Evas_Vec4 *out, const Evas_Vec3 *a, const Evas_Vec3
*b, const Evas_Vec3 *c)
+{
+ out-x = (b-y - a-y) * (c-z - a-z) - (b-z - a-z) * (c-y - a-y);
+ out-y = -(b-x - a-x) * (c-z - a-z) + (b-z - a-z) * (c-x - a-x);
+ out-z = (b-x - a-x) * (c-y - a-y) - (b-y - a-y) * (c-x - a-x);
+ out-w = (-a-x) * ((b-y - a-y)*(c-z - a-z) - (b-z - a-z) * (c-y -
a-y)) -
+(-a-y) * ((b-x - a-x) * (c-z - a-z) - (b-z - a-z) * (c-x -
a-x)) +
+(-a-z) * ((b-x - a-x) * (c-y - a-y) - (b-y - a-y) * (c-x -
a-x));
+}
+
+static inline Evas_Real
+evas_vec4_angle_plains(Evas_Vec4 *a, Evas_Vec4 *b)
+{
+ return (Evas_Real) ((a-x * b-x) + (a-y * b-y) + (a-z * b-z)) /
((sqrt((a-x * a-x) +
+ (a-y * a-y) + (a-z * a-z))) * (sqrt((b-x * b-x) +
(b-y * b-y) +
+ (b-z * b-z;
+}
+
+static inline void
evas_vec3_homogeneous_position_set(Evas_Vec3 *out, const Evas_Vec4 *v)
{
/* Assume v is a positional vector. (v-w != 0.0) */
@@ -590,6 +622,95 @@ evas_vec3_homogeneous_direction_set(Evas_Vec3 *out, const
Evas_Vec4 *v)
out-z = v-z;
}
+static inline Eina_Bool
+evas_vec3_if_equivalent(Evas_Vec3 *a, const Evas_Vec3 *b)
+{
+ /* Assume v is a directional vector. (v-w == 0.0) */
+ return ((a-x == b-x) (a-y == b-y) (a-z == b-z));
+}
+
+static inline void
+evas_triangle3_set(Evas_Triangle3 *v, Evas_Vec3 *a, Evas_Vec3 *b, Evas_Vec3 *c)
+{
+ evas_vec3_copy(v-p0, a);
+ evas_vec3_copy(v-p1, b);
+ evas_vec3_copy(v-p2, c);
+}
+
+static inline Eina_Bool
+evas_triangle3_is_line(Evas_Triangle3 *v)
+{
+ if (evas_vec3_if_equivalent(v-p0, v-p1) ||
+ evas_vec3_if_equivalent(v-p0, v-p2) ||
+ evas_vec3_if_equivalent(v-p1, v-p2))
+ return EINA_TRUE;
+
+ return EINA_FALSE;
+}
+
+static inline Eina_Bool
+convex_hull_triangle3_if_not_first_edje(Evas_Triangle3 *v, Evas_Vec3 *a,
Evas_Vec3 *b)
+{
+ if (((v-p1.x == a-x) (v-p1.y == a-y) (v-p1.z == a-z))
+ ((v-p2.x == b-x) (v-p2.y == b-y) (v-p2.z == b-z)))
+ return EINA_TRUE;
+ else if (((v-p2.x == a-x) (v-p2.y == a-y) (v-p2.z == a-z))
+((v-p1.x == b-x) (v-p1.y == b-y) (v-p1.z == b-z)))
+ return EINA_TRUE;
+
+ return EINA_FALSE;
+}
+
+static inline Eina_Bool
+convex_hull_triangle3_if_first_edje(Evas_Triangle3 *v, Evas_Vec3 *a, Evas_Vec3
*b)
+{
+ if ((!FLT_COMPARISON(v-p0.x, a-x) !FLT_COMPARISON(v-p0.y, a-y)
+!FLT_COMPARISON(v-p0.z, a-z)) (!FLT_COMPARISON(v-p1.x, b-x)
+!FLT_COMPARISON(v-p1.y, b-y) !FLT_COMPARISON(v-p1.z, b-z)))
+ return EINA_TRUE;
+ else if ((!FLT_COMPARISON(v-p1.x, a-x) !FLT_COMPARISON(v-p1.y, a-y)
+ !FLT_COMPARISON(v-p1.z, a-z)) (!FLT_COMPARISON(v-p0.x,
b-x)
+ !FLT_COMPARISON(v-p0.y, b-y) !FLT_COMPARISON(v-p0.z, b-z)))
+ return EINA_TRUE;
+
+ return EINA_FALSE;
+}
+
+static inline Eina_Bool
+convex_hull_triangle3_if_first_point(Evas_Triangle3 *v, Evas_Vec3 *a)
+{
+ return ((v-p0.x == a-x) (v-p0.y == a-y) (v-p0.z == a-z));
+}
+
+static inline Eina_Bool
[EGIT] [core/efl] master 01/02: eina: fix failure of eina_quaternion_test.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=68d9c3d6f0595179199afbe37f07a3f2be5d6df4
commit 68d9c3d6f0595179199afbe37f07a3f2be5d6df4
Author: Vivek Ellur vivek.el...@samsung.com
Date: Sat Jul 4 02:30:40 2015 +0200
eina: fix failure of eina_quaternion_test.
Summary:
eina_test_quaternion_norm was failing. so fixed it.
Signed-off-by: Vivek Ellur vivek.el...@samsung.com
Reviewers: cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2781
Signed-off-by: Cedric BAIL ced...@osg.samsung.com
---
src/tests/eina/eina_test_quaternion.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/tests/eina/eina_test_quaternion.c
b/src/tests/eina/eina_test_quaternion.c
index 9ca60d4..9759355 100644
--- a/src/tests/eina/eina_test_quaternion.c
+++ b/src/tests/eina/eina_test_quaternion.c
@@ -59,10 +59,11 @@ eina_matrix3_cmp(const Eina_Matrix3 *a, const Eina_Matrix3
*b)
START_TEST(eina_test_quaternion_norm)
{
static const Eina_Quaternion q = { 1, 3, 4, 5 };
+ double result = eina_quaternion_norm(q);
eina_init();
- fail_if(!FLOAT_CMP(eina_quaternion_norm(q), sqrt(51)));
+ fail_if(!FLOAT_CMP(result, sqrt(51)));
eina_shutdown();
}
--
[EGIT] [website/www] master 01/01: add svg mini www logo
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=e97af286639d6eb3a80e13e3ad7eafd27fc9f833
commit e97af286639d6eb3a80e13e3ad7eafd27fc9f833
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Fri Jul 3 15:05:17 2015 +0900
add svg mini www logo
---
public_html/lib/tpl/e/css/modifications.css | 2 +-
public_html/lib/tpl/e/images/logo.svg | 201
2 files changed, 202 insertions(+), 1 deletion(-)
diff --git a/public_html/lib/tpl/e/css/modifications.css
b/public_html/lib/tpl/e/css/modifications.css
index 66329ad..5bb8f41 100644
--- a/public_html/lib/tpl/e/css/modifications.css
+++ b/public_html/lib/tpl/e/css/modifications.css
@@ -103,7 +103,7 @@ h1, h2, h3, h4, h5, h6,
.navbar-header {
width: 40px;
height: 40px;
- background: url(/lib/tpl/e/images/logo.png);
+ background: url(/lib/tpl/e/images/logo.svg);
margin-top: 6px;
}
diff --git a/public_html/lib/tpl/e/images/logo.svg
b/public_html/lib/tpl/e/images/logo.svg
new file mode 100644
index 000..85e4efb
--- /dev/null
+++ b/public_html/lib/tpl/e/images/logo.svg
@@ -0,0 +1,201 @@
+?xml version=1.0 encoding=UTF-8 standalone=no?
+!-- Created with Sodipodi (http://www.sodipodi.com/;) --
+
+svg
+ xmlns:dc=http://purl.org/dc/elements/1.1/;
+ xmlns:cc=http://creativecommons.org/ns#;
+ xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#;
+ xmlns:svg=http://www.w3.org/2000/svg;
+ xmlns=http://www.w3.org/2000/svg;
+ xmlns:xlink=http://www.w3.org/1999/xlink;
+ xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
+ xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape;
+ id=svg559
+ sodipodi:version=0.33
+ width=40
+ height=40
+ sodipodi:docname=logo.svg
+ version=1.1
+ inkscape:version=0.91 r13725
+ metadata
+ id=metadata31
+rdf:RDF
+ cc:Work
+ rdf:about=
+dc:formatimage/svg+xml/dc:format
+dc:type
+ rdf:resource=http://purl.org/dc/dcmitype/StillImage; /
+dc:title/dc:title
+ /cc:Work
+/rdf:RDF
+ /metadata
+ defs
+ id=defs561
+linearGradient
+ id=linearGradient564
+ stop
+ style=stop-color:#000;stop-opacity:1;
+ offset=0
+ id=stop565 /
+ stop
+ style=stop-color:#fff;stop-opacity:1;
+ offset=1
+ id=stop566 /
+/linearGradient
+linearGradient
+ xlink:href=#linearGradient564
+ id=linearGradient567 /
+radialGradient
+ xlink:href=#linearGradient564
+ id=radialGradient568
+ cx=0.5
+ cy=0.5
+ r=0.5
+ fx=0.5
+ fy=0.5 /
+radialGradient
+ xlink:href=#linearGradient564
+ id=radialGradient620 /
+ /defs
+ sodipodi:namedview
+ id=base
+ snaptogrid=true
+ showgrid=true
+ gridtolerance=5.00px
+ snaptoguides=false
+ bordercolor=#00
+ borderopacity=0.32941176
+ pagecolor=#303030
+ inkscape:pageopacity=0
+ inkscape:zoom=39.075
+ inkscape:cx=20
+ inkscape:cy=20
+ inkscape:window-width=2148
+ inkscape:window-height=1699
+ inkscape:window-x=2235
+ inkscape:window-y=197
+ inkscape:window-maximized=0
+ inkscape:current-layer=svg559
+ inkscape:snap-bbox=true
+ inkscape:bbox-nodes=true
+ units=px /
+ g
+ id=g600
+ style=fill:#ff;fill-opacity:1;stroke:none;stroke-opacity:1
+ transform=matrix(0.06118251,0,0,0.06118251,-3.4131531,-10.56717)
+path
+
style=font-size:12px;fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-opacity:1
+ d=m 253.0964,451.5499 298.0828,199.0175 c 12.3337,-12.8429
12.3337,-12.8429 20.2182,-24.6206 67.0184,-100.1107 43.7081,-243.6352
-62.1011,-314.0059 -106.1899,-71.5505 -247.7678,-38.4091 -315.2532,61.7845
-64.5802,97.0834 -49.1298,239.61 62.3976,315.1319 97.5272,64.4282
188.9762,36.1043 245.0135,5.0054 L 473.477,645.883 C 413.0772,677.728
342.3128,681.5232 287.7821,644.4234 203.9245,588.8802 187.4273,479.7646
239.093,403.3519 c 50.833,-76.6977 156.0308,-100.0815 239.2262,-45.138 8 [...]
+ id=path582
+ sodipodi:nodetypes=
+ inkscape:connector-curvature=0 /
+path
+
style=fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1
+ d=m 381.9484,173.6221 c -4.4291,44.2913 -10.6299,72.6377
-28.3464,79.7244 17.7165,-1.7717 19.4882,-1.7717 28.3464,-1.7717 8.8583,0
10.63,0 28.3465,1.7717 -17.7165,-7.0867 -23.9173,-35.4331 -28.3465,-79.7244 z
+ id=path578
+ sodipodi:nodetypes=c
+ inkscape:connector-curvature=0 /
+path
+
style=font-size:12px;fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-opacity:1
+ d=m 314.5494,180.6657 c 4.8241,44.2501 4.618,73.266 -11.2504,83.8626
16.9673,-5.3964 18.7008,-5.7627 27.3676,-7.5942 8.6669,-1.8315
[EGIT] [website/www-content] master 01/01: Wiki page contact changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=4bac63aad5a6c6f3e88187a05b4da02ee7b20ce7
commit 4bac63aad5a6c6f3e88187a05b4da02ee7b20ce7
Author: Raster ras...@rasterman.com
Date: Thu Jul 2 23:14:46 2015 -0700
Wiki page contact changed with summary [] by Raster
---
pages/contact.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pages/contact.txt b/pages/contact.txt
index 55452fb..916340e 100644
--- a/pages/contact.txt
+++ b/pages/contact.txt
@@ -1,4 +1,7 @@
~~Title: Contact Us~~
+
+{{pagestart-shortcuts}}
+
Community and Developer Behavior Guidelines
//We are a community. Some are core developers who have been around for well
over a decade, others are newer contributors, or are just users or fans, but
regardless, it forms some kind of community. For this community to function
we need to adhere to a set of guidelines to ensure it functions effectively
and doesn't push new people away, or drive existing members away. This here
is a set of rough guidelines for those with commit access (developers) and
those without (general users or c [...]
--
[EGIT] [website/www-content] master 01/03: Wiki page start changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=d83e84bf26be72b35a0ac0a5086a8b510bf9c88c
commit d83e84bf26be72b35a0ac0a5086a8b510bf9c88c
Author: Raster ras...@rasterman.com
Date: Thu Jul 2 23:11:01 2015 -0700
Wiki page start changed with summary [] by Raster
---
pages/start.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/start.txt b/pages/start.txt
index 800b2d2..3e83f26 100644
--- a/pages/start.txt
+++ b/pages/start.txt
@@ -4,7 +4,7 @@
{{pagestart-event}}
{{pagestart-release}}
-{{ :e-logo-title.png?nolink150 |}}
+{{ :e-logo-title.svg?nolink |}}
Window Manager
--
[EGIT] [website/www-content] master 01/01: Wiki page download changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=a7ed95cd58a94d71ae767e18c4124bbc1ba3de2b
commit a7ed95cd58a94d71ae767e18c4124bbc1ba3de2b
Author: Raster ras...@rasterman.com
Date: Thu Jul 2 23:14:37 2015 -0700
Wiki page download changed with summary [] by Raster
---
pages/download.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pages/download.txt b/pages/download.txt
index 94c95bb..9a60775 100644
--- a/pages/download.txt
+++ b/pages/download.txt
@@ -1,4 +1,7 @@
~~Title: Download~~
+
+{{pagestart-shortcuts}}
+
Download
We place all of our releases here:
--
[EGIT] [core/efl] master 01/01: Interfaces: fix event name
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2216ed6c85c62e85334b0481887b4caf70b23c33
commit 2216ed6c85c62e85334b0481887b4caf70b23c33
Author: Daniel Zaoui daniel.za...@yahoo.com
Date: Fri Jul 3 10:35:25 2015 +0300
Interfaces: fix event name
zoom,change is the name used in efl and elementary, not zoom,changed
@fix
---
src/lib/evas/canvas/evas_zoomable_interface.eo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_zoomable_interface.eo
b/src/lib/evas/canvas/evas_zoomable_interface.eo
index 43de299..ed667c0 100644
--- a/src/lib/evas/canvas/evas_zoomable_interface.eo
+++ b/src/lib/evas/canvas/evas_zoomable_interface.eo
@@ -3,6 +3,6 @@ interface Evas.Zoomable_Interface (Evas.Signal_Interface)
events {
zoom,start;
zoom,stop;
- zoom,changed;
+ zoom,change;
}
}
--
[EGIT] [website/www-content] master 03/03: Wiki page about changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=7c288d382d9067bfce33e3df226e9210aa4fc342
commit 7c288d382d9067bfce33e3df226e9210aa4fc342
Author: Raster ras...@rasterman.com
Date: Thu Jul 2 23:14:20 2015 -0700
Wiki page about changed with summary [] by Raster
---
pages/about.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pages/about.txt b/pages/about.txt
index f1f20f2..4243bfe 100644
--- a/pages/about.txt
+++ b/pages/about.txt
@@ -1,5 +1,7 @@
~~Title: About~~
+{{pagestart-shortcuts}}
+
More than a Window Manager
Long ago Enlightenment was just a project to make a Window Manager for
--
[EGIT] [website/www-content] master 02/03: Merge branch 'master' of git+ssh://git.enlightenment.org/website/www-content
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=18d569ff3da6c1bba3b76c295ec44569d0315101 commit 18d569ff3da6c1bba3b76c295ec44569d0315101 Merge: d83e84b 270ec6f Author: Raster ras...@rasterman.com Date: Thu Jul 2 23:11:07 2015 -0700 Merge branch 'master' of git+ssh://git.enlightenment.org/website/www-content media/e-logo-title.png | Bin 61122 - 9072 bytes media/e-logo-title.svg | 22 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) --
[EGIT] [website/www-content] master 01/01: Wiki page start-shortcuts changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=2acd2f92ea788f19234c1384a44f4c84ef8cdd9e
commit 2acd2f92ea788f19234c1384a44f4c84ef8cdd9e
Author: Raster ras...@rasterman.com
Date: Thu Jul 2 23:20:54 2015 -0700
Wiki page start-shortcuts changed with summary [] by Raster
---
pages/start-shortcuts.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/start-shortcuts.txt b/pages/start-shortcuts.txt
index 224899a..96e1c90 100644
--- a/pages/start-shortcuts.txt
+++ b/pages/start-shortcuts.txt
@@ -2,6 +2,6 @@
[[http://plus.google.com/118426816251488376359|{{:scut-gplus.svg|G+}}]]
[[http://www.facebook.com/enlightenment.org|{{:scut-facebook.svg|Facebook}}]]
[[http://www.youtube.com/channel/UCs9Xcw4TwJ1_A8QI8PxCNNA|{{:scut-youtube.svg|YouTube}}]]
-{{:scut-pad.svg}}
+{{:scut-pad.svg?nolink}}
[[http://flattr.com/thing/418692/Enlightenment|{{:scut-flattr.svg|Flattr}}]]
[[https://www.paypal.com/webscr?cmd=_s-xclickhosted_button_id=A5U75JR3FFWFC|{{:scut-paypal.svg|PayPal}}]]
\ No newline at end of file
--
[EGIT] [website/www-content] master 01/01: Wiki page start-shortcuts changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=cbb4e74e0de7555c138e476a28eb449a865ec70f
commit cbb4e74e0de7555c138e476a28eb449a865ec70f
Author: Raster ras...@rasterman.com
Date: Thu Jul 2 22:58:24 2015 -0700
Wiki page start-shortcuts changed with summary [] by Raster
---
pages/start-shortcuts.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/start-shortcuts.txt b/pages/start-shortcuts.txt
index cac5fcf..224899a 100644
--- a/pages/start-shortcuts.txt
+++ b/pages/start-shortcuts.txt
@@ -2,6 +2,6 @@
[[http://plus.google.com/118426816251488376359|{{:scut-gplus.svg|G+}}]]
[[http://www.facebook.com/enlightenment.org|{{:scut-facebook.svg|Facebook}}]]
[[http://www.youtube.com/channel/UCs9Xcw4TwJ1_A8QI8PxCNNA|{{:scut-youtube.svg|YouTube}}]]
--
+{{:scut-pad.svg}}
[[http://flattr.com/thing/418692/Enlightenment|{{:scut-flattr.svg|Flattr}}]]
[[https://www.paypal.com/webscr?cmd=_s-xclickhosted_button_id=A5U75JR3FFWFC|{{:scut-paypal.svg|PayPal}}]]
\ No newline at end of file
--
[EGIT] [website/www-content] master 01/01: e logo - make svg right size
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=270ec6f6d7ae5e5bbee02a7269b9435d8683871b commit 270ec6f6d7ae5e5bbee02a7269b9435d8683871b Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Jul 3 15:10:35 2015 +0900 e logo - make svg right size --- media/e-logo-title.png | Bin 61122 - 9072 bytes media/e-logo-title.svg | 22 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/media/e-logo-title.png b/media/e-logo-title.png index ca748be..f977408 100644 Binary files a/media/e-logo-title.png and b/media/e-logo-title.png differ diff --git a/media/e-logo-title.svg b/media/e-logo-title.svg index 755c404..04658e4 100644 --- a/media/e-logo-title.svg +++ b/media/e-logo-title.svg @@ -12,8 +12,8 @@ xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; id=svg559 sodipodi:version=0.33 - width=482 - height=652 + width=200 + height=200 sodipodi:docname=e-logo-title.svg version=1.1 inkscape:version=0.91 r13725 @@ -67,14 +67,14 @@ borderopacity=0.32941176 pagecolor=#303030 inkscape:pageopacity=0 - inkscape:zoom=3.0076687 - inkscape:cx=241 - inkscape:cy=326 - inkscape:window-width=3840 - inkscape:window-height=2097 - inkscape:window-x=1920 - inkscape:window-y=0 - inkscape:window-maximized=1 + inkscape:zoom=6.015 + inkscape:cx=100 + inkscape:cy=100 + inkscape:window-width=1772 + inkscape:window-height=1357 + inkscape:window-x=2322 + inkscape:window-y=638 + inkscape:window-maximized=0 inkscape:current-layer=svg559 inkscape:snap-bbox=true inkscape:bbox-nodes=true @@ -82,7 +82,7 @@ g id=g600 style=fill:#ff;fill-opacity:1;stroke:none;stroke-opacity:1 - transform=translate(-141.7323,-173.59046) + transform=matrix(0.30604808,0,0,0.30604808,-17.117621,-52.903547) path style=font-size:12px;fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-opacity:1 d=m 253.0964,451.5499 298.0828,199.0175 c 12.3337,-12.8429 12.3337,-12.8429 20.2182,-24.6206 67.0184,-100.1107 43.7081,-243.6352 -62.1011,-314.0059 -106.1899,-71.5505 -247.7678,-38.4091 -315.2532,61.7845 -64.5802,97.0834 -49.1298,239.61 62.3976,315.1319 97.5272,64.4282 188.9762,36.1043 245.0135,5.0054 L 473.477,645.883 C 413.0772,677.728 342.3128,681.5232 287.7821,644.4234 203.9245,588.8802 187.4273,479.7646 239.093,403.3519 c 50.833,-76.6977 156.0308,-100.0815 239.2262,-45.138 8 [...] --
[EGIT] [core/elementary] master 01/01: Entry: Add chunked append in case of _elm_entry_entry_append
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=28e6878f7cce36efae1438b5e032eb9c0878016a
commit 28e6878f7cce36efae1438b5e032eb9c0878016a
Author: Vaibhav Gupta g.vaibh...@samsung.com
Date: Fri Jul 3 11:08:23 2015 +0100
Entry: Add chunked append in case of _elm_entry_entry_append
Summary:
Summary
Fixed FIXME: Add chunked appending here (like in entry_set)
@fix
Signed-off-by: Vaibhav Gupta g.vaibh...@samsung.com
Reviewers: raster, Hermet, herdsman, singh.amitesh, tasn
Subscribers: thiepha, sachin.dev, singh.amitesh
Differential Revision: https://phab.enlightenment.org/D2732
---
src/lib/elm_entry.c | 92 +
1 file changed, 51 insertions(+), 41 deletions(-)
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 9334604..e436157 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -2857,6 +2857,53 @@ _elm_entry_elm_container_content_unset(Eo *obj,
Elm_Entry_Data *_pd EINA_UNUSED,
return ret;
}
+static void
+_entry_text_append(Evas_Object* obj, const char* entry)
+{
+ int len = 0;
+ if (!entry) return;
+
+ ELM_ENTRY_DATA_GET(obj, sd);
+ len = strlen(entry);
+
+ if (sd-append_text_left)
+ {
+char *tmpbuf;
+
+tmpbuf = realloc(sd-append_text_left, sd-append_text_len + len + 1);
+if (!tmpbuf)
+ {
+ /* Do something */
+ return;
+ }
+sd-append_text_left = tmpbuf;
+memcpy(sd-append_text_left + sd-append_text_len, entry, len + 1);
+sd-append_text_len += len;
+ }
+ else
+ {
+if (len ELM_ENTRY_CHUNK_SIZE)
+ {
+ sd-append_text_left = (char *)malloc(len + 1);
+ }
+
+if (sd-append_text_left)
+ {
+ memcpy(sd-append_text_left, entry, len + 1);
+ sd-append_text_position = 0;
+ sd-append_text_len = len;
+ sd-append_text_idler = ecore_idler_add(_text_append_idler, obj);
+ }
+else
+ {
+ /* For the case of text set, append will have similar behaviour
+ * as entry text is cleared first */
+ edje_object_part_text_append(sd-entry_edje, elm.text, entry);
+ evas_object_smart_callback_call(obj, SIG_TEXT_SET_DONE, NULL);
+ }
+ }
+}
+
EOLIAN static Eina_Bool
_elm_entry_elm_layout_text_set(Eo *obj, Elm_Entry_Data *sd, const char *part,
const char *entry)
{
@@ -2891,27 +2938,10 @@ _elm_entry_elm_layout_text_set(Eo *obj, Elm_Entry_Data
*sd, const char *part, co
free(sd-append_text_left);
sd-append_text_left = NULL;
}
- /* Split to ~ ELM_ENTRY_CHUNK_SIZE chunks */
- if (len ELM_ENTRY_CHUNK_SIZE)
- {
-sd-append_text_left = (char *)malloc(len + 1);
- }
- /* If we decided to use the idler */
- if (sd-append_text_left)
- {
-/* Need to clear the entry first */
-edje_object_part_text_set(sd-entry_edje, elm.text, );
-memcpy(sd-append_text_left, entry, len + 1);
-sd-append_text_position = 0;
-sd-append_text_len = len;
-sd-append_text_idler = ecore_idler_add(_text_append_idler, obj);
- }
- else
- {
-edje_object_part_text_set(sd-entry_edje, elm.text, entry);
-evas_object_smart_callback_call(obj, SIG_TEXT_SET_DONE, NULL);
- }
+ /* Need to clear the entry first */
+ edje_object_part_text_set(sd-entry_edje, elm.text, );
+ _entry_text_append(obj, entry);
if (len 0)
_elm_entry_guide_update(obj, EINA_TRUE);
@@ -3818,27 +3848,7 @@ _elm_entry_entry_append(Eo *obj EINA_UNUSED,
Elm_Entry_Data *sd, const char *ent
if (!entry) entry = ;
sd-changed = EINA_TRUE;
-
- len = strlen(entry);
- if (sd-append_text_left)
- {
-char *tmpbuf;
-
-tmpbuf = realloc(sd-append_text_left, sd-append_text_len + len + 1);
-if (!tmpbuf)
- {
- /* Do something */
- return;
- }
-sd-append_text_left = tmpbuf;
-memcpy(sd-append_text_left + sd-append_text_len, entry, len + 1);
-sd-append_text_len += len;
- }
- else
- {
-/* FIXME: Add chunked appending here (like in entry_set) */
-edje_object_part_text_append(sd-entry_edje, elm.text, entry);
- }
+ _entry_text_append(obj, entry);
}
EOLIAN static Eina_Bool
--
[EGIT] [core/elementary] master 01/01: entry: Remove unused variable.
ami pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=68d40551231b11c5851d96ab18c757fc9ec76dab
commit 68d40551231b11c5851d96ab18c757fc9ec76dab
Author: Amitesh Singh amitesh...@samsung.com
Date: Fri Jul 3 15:57:39 2015 +0530
entry: Remove unused variable.
---
src/lib/elm_entry.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index e436157..52d8070 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -3843,8 +3843,6 @@ elm_entry_entry_get(const Evas_Object *obj)
EOLIAN static void
_elm_entry_entry_append(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd, const char
*entry)
{
- int len = 0;
-
if (!entry) entry = ;
sd-changed = EINA_TRUE;
--
[EGIT] [tools/enventor] master 01/01: fix to avoid popup of file modified
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=1cc52fee5727d37398e3ed9d12e28f92f58fb0a2
commit 1cc52fee5727d37398e3ed9d12e28f92f58fb0a2
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Jul 3 19:58:20 2015 +0900
fix to avoid popup of file modified
if the file is modified continously,
it couldn't catch that the file is modified by self or not.
we do avoid this by delaying the notifying event for 3 secs.
---
src/lib/enventor_smart.c | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 486a8f8..aeab6b1 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -25,6 +25,7 @@ typedef struct _Enventor_Object_Data
edit_data *ed;
Eio_Monitor *edc_monitor;
Eina_Stringshare *group_name;
+ Ecore_Timer *file_modified_timer;
Eina_Bool dummy_swallow : 1;
@@ -50,6 +51,18 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
/*/
/* Internal method implementation*/
/*/
+
+static Eina_Bool
+file_modified_timer(void *data)
+{
+ Enventor_EDC_Modified modified;
+ Enventor_Object_Data *pd = data;
+ modified.self_changed = EINA_FALSE;
+ evas_object_smart_callback_call(pd-obj, SIG_EDC_MODIFIED, modified);
+ pd-file_modified_timer = NULL;
+ return ECORE_CALLBACK_CANCEL;
+}
+
static Eina_Bool
file_modified_cb(void *data, int type EINA_UNUSED, void *event)
{
@@ -60,8 +73,10 @@ file_modified_cb(void *data, int type EINA_UNUSED, void
*event)
if (ev-monitor != pd-edc_monitor) return ECORE_CALLBACK_PASS_ON;
if (!edit_saved_get(pd-ed))
{
-modified.self_changed = EINA_FALSE;
-evas_object_smart_callback_call(pd-obj, SIG_EDC_MODIFIED, modified);
+/* Don't notify info right soon,
+ if the source changing can be happened continously. */
+if (pd-file_modified_timer) ecore_timer_del(pd-file_modified_timer);
+pd-file_modified_timer = ecore_timer_add(3, file_modified_timer, pd);
return ECORE_CALLBACK_DONE;
}
if (!edit_changed_get(pd-ed)) return ECORE_CALLBACK_DONE;
@@ -167,6 +182,7 @@ _enventor_object_evas_object_smart_del(Evas_Object *obj
EINA_UNUSED,
{
EINA_REFCOUNT_UNREF(pd)
{
+ecore_timer_del(pd-file_modified_timer);
eio_monitor_del(pd-edc_monitor);
eina_stringshare_del(pd-group_name);
edit_term(pd-ed);
--
