[EGIT] [tools/eflete] master 01/01: tab_home_import_edj: add the style list to the widget list
jaehwan pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=b006b148b5aa6ccb55bac1aeba8d83112de03b21 commit b006b148b5aa6ccb55bac1aeba8d83112de03b21 Author: Jaehwan Kim Date: Wed May 11 14:29:13 2016 +0900 tab_home_import_edj: add the style list to the widget list It can load just specific style instead of whole widget. --- src/bin/Makefile.am | 2 + src/bin/common/string_common.c | 55 --- src/bin/common/string_common.h | 3 - src/bin/common/widget_list.c| 244 src/bin/common/widget_list.h| 44 + src/bin/project_manager/group_manager.c | 33 +++- src/bin/ui/tab_home_import_edj.c| 273 +--- 7 files changed, 566 insertions(+), 88 deletions(-) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 3819702..51aa9e8 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -12,6 +12,7 @@ includesub_HEADERS = \ common/string_common.h \ common/validator.h \ common/widget_macro.h \ + common/widget_list.h \ common/win32.h \ config/config.h \ editor/banned_edje_edit_api.h \ @@ -57,6 +58,7 @@ libete_a_SOURCES = \ ../../src/bin/eflete.c \ ../../src/bin/common/string_common.c \ ../../src/bin/common/validator.c \ +../../src/bin/common/widget_list.c \ ../../src/bin/project_manager/group_manager.c \ ../../src/bin/project_manager/project_manager.c \ ../../src/bin/logger/logger.c \ diff --git a/src/bin/common/string_common.c b/src/bin/common/string_common.c index ea14527..eeaa0ae 100644 --- a/src/bin/common/string_common.c +++ b/src/bin/common/string_common.c @@ -21,6 +21,39 @@ #include #include +static const char *exception[] = +{ + "elm/map/marker/empty/", + "elm/map/marker/radio/", + "elm/map/circle/base/", + "elm/map/scale/base/", + "elm/scroller/panel/top/", + "elm/scroller/panel/bottom/", + "elm/scroller/panel/left/", + "elm/scroller/panel/right/", + "elm/index/base/vertical/", + "elm/index/item/vertical/", + "elm/index/item_odd/vertical/", + "elm/index/item/horizontal/", + "elm/index/item_odd/horizontal/", + "elm/colorselector/picker/base/", + "elm/colorselector/item/color/", + "elm/colorselector/image/colorbar_0/", + "elm/colorselector/image/colorbar_1/", + "elm/colorselector/image/colorbar_2/", + "elm/colorselector/image/colorbar_3/", + "elm/gengrid/item/default/", + "elm/entry/handler/start/", + "elm/entry/handler/end/", + "elm/entry/emoticon/wtf/", + "elm/popup/buttons1/popup/", + "elm/popup/buttons2/popup/", + "elm/popup/buttons3/popup/", + "elm/popup/content/popup/", + "elm/popup/item/popup/", + NULL +}; + int sort_cb(const void *data1, const void *data2) { @@ -59,25 +92,3 @@ string_char_replace(char *str, char src, char rep) str++; } } - -const char * -widget_name_get(const Eina_Stringshare *group_name) -{ -int len = strlen(group_name); -int i; -char str[32]; - -if (group_name[0] != 'e') return NULL; -if (group_name[1] != 'l') return NULL; -if (group_name[2] != 'm') return NULL; -if (group_name[3] != '/') return NULL; - -for (i = 4; i < len; i++) -{ -if (group_name[i] == '/') break; -str[i - 4] = group_name[i]; -} -str[i - 4] = '\0'; - -return strdup(str); -} diff --git a/src/bin/common/string_common.h b/src/bin/common/string_common.h index 47e2058..f49b20b 100644 --- a/src/bin/common/string_common.h +++ b/src/bin/common/string_common.h @@ -58,7 +58,4 @@ state_name_split(Eina_Stringshare *name, Eina_Stringshare **name_out, double *va void string_char_replace(char *str, char src, char rep); -const char * -widget_name_get(const Eina_Stringshare *group_name); - #endif /* STRING_MACRO_H */ diff --git a/src/bin/common/widget_list.c b/src/bin/common/widget_list.c new file mode 100644 index 000..de8a8e8 --- /dev/null +++ b/src/bin/common/widget_list.c @@ -0,0 +1,244 @@ +/* + * Edje Theme Editor + * Copyright (C) 2013-2016 Samsung Electronics. + * + * This file is part of Edje Theme Editor. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; If not, see www.gnu.org/licenses/lgpl.html. + */ + +#include +#include "widget_list.h" + +static const char *exception[] = +{ + "elm/map/marker/empty/", + "elm/map/marker/radio/", + "elm/map/circle/base/", + "elm/map/scale/base/", + "elm/scroller/p
[EGIT] [core/efl] master 11/16: Evas smart: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=278b16b058f14745ed21be87d072764cd13078d5 commit 278b16b058f14745ed21be87d072764cd13078d5 Author: Tom Hacohen Date: Thu May 12 11:33:59 2016 +0100 Evas smart: Fix namespacing to use . and not _. --- src/lib/edje/edje_object.eo | 2 +- src/lib/elementary/elm_pan.eo | 2 +- src/lib/evas/canvas/evas_box.eo | 2 +- src/lib/evas/canvas/evas_grid.eo | 2 +- src/lib/evas/canvas/evas_smart_clipped.eo | 5 - src/lib/evas/canvas/evas_table.eo | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo index 4ee01f9..64c4386 100644 --- a/src/lib/edje/edje_object.eo +++ b/src/lib/edje/edje_object.eo @@ -1,6 +1,6 @@ import edje_types; -class Edje.Object (Evas.Smart_Clipped, Efl.File, Efl.Container) +class Edje.Object (Evas.Smart.Clipped, Efl.File, Efl.Container) { legacy_prefix: edje_object; eo_prefix: edje_obj; diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo index 0387bd4..398de38 100644 --- a/src/lib/elementary/elm_pan.eo +++ b/src/lib/elementary/elm_pan.eo @@ -1,4 +1,4 @@ -class Elm.Pan (Evas.Smart_Clipped) +class Elm.Pan (Evas.Smart.Clipped) { eo_prefix: elm_obj_pan; data: Elm_Pan_Smart_Data; diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo index 4d678c5..56ec70c 100644 --- a/src/lib/evas/canvas/evas_box.eo +++ b/src/lib/evas/canvas/evas_box.eo @@ -4,7 +4,7 @@ type @extern Evas_Object_Box_Layout: __undefined_type; /* FIXME: Function pointe type @extern Eina_Free_Cb: __undefined_type; /* FIXME: Function pointers are not supported */ type @extern va_list: __undefined_type; /* FIXME: va_list is not supported */ -class Evas.Box (Evas.Smart_Clipped) +class Evas.Box (Evas.Smart.Clipped) { legacy_prefix: evas_object_box; eo_prefix: evas_obj_box; diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo index c140af9..77e063c 100644 --- a/src/lib/evas/canvas/evas_grid.eo +++ b/src/lib/evas/canvas/evas_grid.eo @@ -1,4 +1,4 @@ -class Evas.Grid (Evas.Smart_Clipped) +class Evas.Grid (Evas.Smart.Clipped) { legacy_prefix: evas_object_grid; eo_prefix: evas_obj_grid; diff --git a/src/lib/evas/canvas/evas_smart_clipped.eo b/src/lib/evas/canvas/evas_smart_clipped.eo index e9eb3f3..4f0b93a 100644 --- a/src/lib/evas/canvas/evas_smart_clipped.eo +++ b/src/lib/evas/canvas/evas_smart_clipped.eo @@ -1,4 +1,7 @@ -class Evas.Smart_Clipped (Evas.Object.Smart) +/* XXX: It's Evas.Smart.Clipped and not Evas.Object.Smart.Clipped because of + clashes with legacy. Not edaling with it too much because it'll be deprecated + soon anyway. */ +class Evas.Smart.Clipped (Evas.Object.Smart) { legacy_prefix: evas_object_smart_clipped; eo_prefix: evas_obj_smart_clipped; diff --git a/src/lib/evas/canvas/evas_table.eo b/src/lib/evas/canvas/evas_table.eo index 346c9c0..942e064 100644 --- a/src/lib/evas/canvas/evas_table.eo +++ b/src/lib/evas/canvas/evas_table.eo @@ -9,7 +9,7 @@ enum Evas.Object_Table.Homogeneous_Mode { item = 2 } -class Evas.Table (Evas.Smart_Clipped) +class Evas.Table (Evas.Smart.Clipped) { legacy_prefix: evas_object_table; eo_prefix: evas_obj_table; --
[EGIT] [core/efl] master 13/16: Efl text properties: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6668d77b0921a543bb92c45f3368144eabf2cb74 commit 6668d77b0921a543bb92c45f3368144eabf2cb74 Author: Tom Hacohen Date: Thu May 12 11:35:52 2016 +0100 Efl text properties: Fix namespacing to use . and not _. --- src/lib/efl/interfaces/efl_text_properties.eo | 2 +- src/lib/evas/canvas/evas_text.eo | 10 +- src/lib/evas/canvas/evas_textgrid.eo | 12 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/lib/efl/interfaces/efl_text_properties.eo b/src/lib/efl/interfaces/efl_text_properties.eo index 2a77745..110a8e2 100644 --- a/src/lib/efl/interfaces/efl_text_properties.eo +++ b/src/lib/efl/interfaces/efl_text_properties.eo @@ -1,6 +1,6 @@ type Efl_Font_Size: int; -interface Efl.Text_Properties { +interface Efl.Text.Properties { legacy_prefix: null; methods { @property font { diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo index 9c86ff3..f2c95f9 100644 --- a/src/lib/evas/canvas/evas_text.eo +++ b/src/lib/evas/canvas/evas_text.eo @@ -1,4 +1,4 @@ -class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties, Evas.Filter) +class Evas.Text (Evas.Object, Efl.Text, Efl.Text.Properties, Evas.Filter) { legacy_prefix: evas_object_text; eo_prefix: evas_obj_text; @@ -256,10 +256,10 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties, Evas.Filter) Efl.Gfx.size.set; Efl.Text.text.set; Efl.Text.text.get; - Efl.Text_Properties.font.get; - Efl.Text_Properties.font.set; - Efl.Text_Properties.font_source.get; - Efl.Text_Properties.font_source.set; + Efl.Text.Properties.font.get; + Efl.Text.Properties.font.set; + Efl.Text.Properties.font_source.get; + Efl.Text.Properties.font_source.set; Efl.Gfx.Filter.filter_program.set; Evas.Filter.filter_input_alpha; Evas.Filter.filter_input_render; diff --git a/src/lib/evas/canvas/evas_textgrid.eo b/src/lib/evas/canvas/evas_textgrid.eo index 8d30d63..577527f 100644 --- a/src/lib/evas/canvas/evas_textgrid.eo +++ b/src/lib/evas/canvas/evas_textgrid.eo @@ -20,7 +20,7 @@ enum Evas.Textgrid.Font_Style { /* XXX: Actual definition is in C. */ struct Evas.Textgrid.Cell; -class Evas.Textgrid (Evas.Object, Efl.Text_Properties) +class Evas.Textgrid (Evas.Object, Efl.Text.Properties) { legacy_prefix: evas_object_textgrid; eo_prefix: evas_obj_textgrid; @@ -73,7 +73,7 @@ class Evas.Textgrid (Evas.Object, Efl.Text_Properties) style. $width and $height can be $null. On error, they are set to 0. - See also @Efl.Text_Properties.font.set and @.supported_font_styles.set + See also @Efl.Text.Properties.font.set and @.supported_font_styles.set @since 1.7]] } @@ -199,9 +199,9 @@ class Evas.Textgrid (Evas.Object, Efl.Text_Properties) Eo.Base.constructor; Eo.Base.destructor; Eo.Base.dbg_info_get; - Efl.Text_Properties.font.get; - Efl.Text_Properties.font.set; - Efl.Text_Properties.font_source.get; - Efl.Text_Properties.font_source.set; + Efl.Text.Properties.font.get; + Efl.Text.Properties.font.set; + Efl.Text.Properties.font_source.get; + Efl.Text.Properties.font_source.set; } } --
[EGIT] [core/efl] master 16/16: Elm interface atspi editable text: Fix namespacing.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6760e05968a5f2939a484dd962ec48d44100dd0b commit 6760e05968a5f2939a484dd962ec48d44100dd0b Author: Tom Hacohen Date: Thu May 12 11:43:52 2016 +0100 Elm interface atspi editable text: Fix namespacing. --- src/Makefile_Elementary.am | 4 +-- src/lib/elementary/Makefile.am | 4 +-- src/lib/elementary/elementary_js.cc| 4 +-- src/lib/elementary/elm_atspi_bridge.c | 30 +++--- src/lib/elementary/elm_entry.c | 14 +- src/lib/elementary/elm_entry.eo| 14 +- ..._text.c => elm_interface_atspi_text_editable.c} | 4 +-- ...ext.eo => elm_interface_atspi_text_editable.eo} | 4 +-- src/lib/elementary/elm_interfaces.h| 4 +-- 9 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am index 95b8334..83dac45 100644 --- a/src/Makefile_Elementary.am +++ b/src/Makefile_Elementary.am @@ -44,7 +44,7 @@ elm_public_eolian_files = \ lib/elementary/elm_interface_atspi_accessible.eo \ lib/elementary/elm_interface_atspi_action.eo \ lib/elementary/elm_interface_atspi_component.eo \ - lib/elementary/elm_interface_atspi_editable_text.eo \ + lib/elementary/elm_interface_atspi_text_editable.eo \ lib/elementary/elm_interface_atspi_image.eo \ lib/elementary/elm_interface_atspi_selection.eo \ lib/elementary/elm_interface_atspi_text.eo \ @@ -573,7 +573,7 @@ lib_elementary_libelementary_la_SOURCES = \ lib/elementary/elm_interface_atspi_accessible.c \ lib/elementary/elm_interface_atspi_action.c \ lib/elementary/elm_interface_atspi_component.c \ - lib/elementary/elm_interface_atspi_editable_text.c \ + lib/elementary/elm_interface_atspi_text_editable.c \ lib/elementary/elm_interface_atspi_image.c \ lib/elementary/elm_interface_atspi_selection.c \ lib/elementary/elm_interface_atspi_text.c \ diff --git a/src/lib/elementary/Makefile.am b/src/lib/elementary/Makefile.am index 9138607..8372297 100644 --- a/src/lib/elementary/Makefile.am +++ b/src/lib/elementary/Makefile.am @@ -49,7 +49,7 @@ elm_eolian_files = \ elm_interface_atspi_accessible.eo \ elm_interface_atspi_action.eo \ elm_interface_atspi_component.eo \ - elm_interface_atspi_editable_text.eo \ + elm_interface_atspi_text_editable.eo \ elm_interface_atspi_image.eo \ elm_interface_atspi_selection.eo \ elm_interface_atspi_text.eo \ @@ -559,7 +559,7 @@ libelementary_la_SOURCES = \ elm_interface_atspi_accessible.c \ elm_interface_atspi_action.c \ elm_interface_atspi_component.c \ - elm_interface_atspi_editable_text.c \ + elm_interface_atspi_text_editable.c \ elm_interface_atspi_image.c \ elm_interface_atspi_selection.c \ elm_interface_atspi_text.c \ diff --git a/src/lib/elementary/elementary_js.cc b/src/lib/elementary/elementary_js.cc index 7837adc..268555a 100644 --- a/src/lib/elementary/elementary_js.cc +++ b/src/lib/elementary/elementary_js.cc @@ -42,7 +42,7 @@ EAPI void register_elm_atspi_app_object(v8::Handle global, v8::Isola EAPI void register_elm_interface_atspi_accessible(v8::Handle global, v8::Isolate* isolate); EAPI void register_elm_interface_atspi_action(v8::Handle global, v8::Isolate* isolate); EAPI void register_elm_interface_atspi_component(v8::Handle global, v8::Isolate* isolate); -EAPI void register_elm_interface_atspi_editable_text(v8::Handle global, v8::Isolate* isolate); +EAPI void register_elm_interface_atspi_text_editable(v8::Handle global, v8::Isolate* isolate); EAPI void register_elm_interface_atspi_image(v8::Handle global, v8::Isolate* isolate); EAPI void register_elm_interface_atspi_selection(v8::Handle global, v8::Isolate* isolate); EAPI void register_elm_interface_atspi_text(v8::Handle global, v8::Isolate* isolate); @@ -211,7 +211,7 @@ void init(v8::Handle exports) ::register_elm_interface_atspi_accessible(exports, v8::Isolate::GetCurrent()); ::register_elm_interface_atspi_action(exports, v8::Isolate::GetCurrent()); ::register_elm_interface_atspi_component(exports, v8::Isolate::GetCurrent()); - ::register_elm_interface_atspi_editable_text(exports, v8::Isolate::GetCurrent()); + ::register_elm_interface_atspi_text_editable(exports, v8::Isolate::GetCurrent()); ::register_elm_interface_atspi_image(exports, v8::Isolate::GetCurrent()); ::register_elm_interface_atspi_selection(exports, v8::Isolate::GetCurrent()); ::register_elm_interface_atspi_text(exports, v8::Isolate::GetCurrent()); diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index 9c78137..54ded2d 100644 --- a/src/lib/elementary/elm_atspi_bridge.
[EGIT] [core/efl] master 15/16: Elm interface fileselector: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=646839ce4bffac5f938691eb6cc5193d8ae9c281 commit 646839ce4bffac5f938691eb6cc5193d8ae9c281 Author: Tom Hacohen Date: Thu May 12 11:37:57 2016 +0100 Elm interface fileselector: Fix namespacing to use . and not _. --- src/lib/elementary/elm_fileselector.eo | 32 src/lib/elementary/elm_fileselector_button.eo| 24 +- src/lib/elementary/elm_fileselector_entry.eo | 12 - src/lib/elementary/elm_interface_fileselector.eo | 2 +- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo index 7f275bf..46bb054 100644 --- a/src/lib/elementary/elm_fileselector.eo +++ b/src/lib/elementary/elm_fileselector.eo @@ -1,4 +1,4 @@ -class Elm.Fileselector (Elm.Layout, Elm.Interface_Fileselector, +class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector, Elm.Interface.Atspi_Widget_Action, Evas.Clickable_Interface, Evas.Selectable_Interface) { @@ -41,21 +41,21 @@ class Elm.Fileselector (Elm.Layout, Elm.Interface_Fileselector, Elm.Widget.theme_apply; Elm.Widget.focus_next_manager_is; Elm.Layout.text.set; - Elm.Interface_Fileselector.selected_paths.get; - Elm.Interface_Fileselector.custom_filter_append; - Elm.Interface_Fileselector.expandable; - Elm.Interface_Fileselector.thumbnail_size; - Elm.Interface_Fileselector.selected; - Elm.Interface_Fileselector.mime_types_filter_append; - Elm.Interface_Fileselector.hidden_visible; - Elm.Interface_Fileselector.filters_clear; - Elm.Interface_Fileselector.is_save; - Elm.Interface_Fileselector.path; - Elm.Interface_Fileselector.sort_method; - Elm.Interface_Fileselector.multi_select; - Elm.Interface_Fileselector.folder_only; - Elm.Interface_Fileselector.mode; - Elm.Interface_Fileselector.current_name; + Elm.Interface.Fileselector.selected_paths.get; + Elm.Interface.Fileselector.custom_filter_append; + Elm.Interface.Fileselector.expandable; + Elm.Interface.Fileselector.thumbnail_size; + Elm.Interface.Fileselector.selected; + Elm.Interface.Fileselector.mime_types_filter_append; + Elm.Interface.Fileselector.hidden_visible; + Elm.Interface.Fileselector.filters_clear; + Elm.Interface.Fileselector.is_save; + Elm.Interface.Fileselector.path; + Elm.Interface.Fileselector.sort_method; + Elm.Interface.Fileselector.multi_select; + Elm.Interface.Fileselector.folder_only; + Elm.Interface.Fileselector.mode; + Elm.Interface.Fileselector.current_name; Elm.Interface.Atspi_Widget_Action.elm_actions.get; } events { diff --git a/src/lib/elementary/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo index c9d44b0..0769751 100644 --- a/src/lib/elementary/elm_fileselector_button.eo +++ b/src/lib/elementary/elm_fileselector_button.eo @@ -1,4 +1,4 @@ -class Elm.Fileselector_Button (Elm.Button, Elm.Interface_Fileselector) +class Elm.Fileselector_Button (Elm.Button, Elm.Interface.Fileselector) { eo_prefix: elm_obj_fileselector_button; methods { @@ -87,17 +87,17 @@ class Elm.Fileselector_Button (Elm.Button, Elm.Interface_Fileselector) Evas.Object.Smart.del; Elm.Widget.theme_apply; Elm.Button.admits_autorepeat.get; - Elm.Interface_Fileselector.selected_paths.get; - Elm.Interface_Fileselector.expandable; - Elm.Interface_Fileselector.thumbnail_size; - Elm.Interface_Fileselector.selected; - Elm.Interface_Fileselector.hidden_visible; - Elm.Interface_Fileselector.is_save; - Elm.Interface_Fileselector.path; - Elm.Interface_Fileselector.sort_method; - Elm.Interface_Fileselector.multi_select; - Elm.Interface_Fileselector.folder_only; - Elm.Interface_Fileselector.mode; + Elm.Interface.Fileselector.selected_paths.get; + Elm.Interface.Fileselector.expandable; + Elm.Interface.Fileselector.thumbnail_size; + Elm.Interface.Fileselector.selected; + Elm.Interface.Fileselector.hidden_visible; + Elm.Interface.Fileselector.is_save; + Elm.Interface.Fileselector.path; + Elm.Interface.Fileselector.sort_method; + Elm.Interface.Fileselector.multi_select; + Elm.Interface.Fileselector.folder_only; + Elm.Interface.Fileselector.mode; } events { file,chosen; diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo index 4c86436..a2b16f1 100644 --- a/src/lib/elementary/elm_fileselector_entry.eo +++ b/src/lib/elementary/elm_fileselector_entry.eo @@ -1,4 +1,4 @@ -class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface_Fileselector, +class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector, Evas.
[EGIT] [core/efl] master 09/16: Elm view: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=726f399b9c71412b2a3c1c45a422c7faa1204a6e commit 726f399b9c71412b2a3c1c45a422c7faa1204a6e Author: Tom Hacohen Date: Thu May 12 11:23:13 2016 +0100 Elm view: Fix namespacing to use . and not _. --- src/lib/elementary/elm_view_form.eo | 2 +- src/lib/elementary/elm_view_list.eo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/elm_view_form.eo b/src/lib/elementary/elm_view_form.eo index d3c37b7..2439e1b 100644 --- a/src/lib/elementary/elm_view_form.eo +++ b/src/lib/elementary/elm_view_form.eo @@ -1,4 +1,4 @@ -class Elm.View_Form (Eo.Base) +class Elm.View.Form (Eo.Base) { legacy_prefix: null; methods { diff --git a/src/lib/elementary/elm_view_list.eo b/src/lib/elementary/elm_view_list.eo index cbef664..c47f7c9 100644 --- a/src/lib/elementary/elm_view_list.eo +++ b/src/lib/elementary/elm_view_list.eo @@ -1,6 +1,6 @@ import elm_genlist_item; -class Elm.View_List (Eo.Base) +class Elm.View.List (Eo.Base) { legacy_prefix: null; methods { --
[EGIT] [core/efl] master 03/16: Efl vpath: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6f4d3b4f073ed11572f7e8e559a38bb082cd5541 commit 6f4d3b4f073ed11572f7e8e559a38bb082cd5541 Author: Tom Hacohen Date: Thu May 12 11:16:13 2016 +0100 Efl vpath: Fix namespacing to use . and not _. --- src/lib/efl/interfaces/efl_vpath.eo | 2 +- src/lib/efl/interfaces/efl_vpath_file.eo | 2 +- src/lib/efl/interfaces/efl_vpath_file_core.eo | 6 +++--- src/lib/efl/interfaces/efl_vpath_manager.eo | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/efl/interfaces/efl_vpath.eo b/src/lib/efl/interfaces/efl_vpath.eo index 3ed34cc..70e2781 100644 --- a/src/lib/efl/interfaces/efl_vpath.eo +++ b/src/lib/efl/interfaces/efl_vpath.eo @@ -26,7 +26,7 @@ interface Efl.Vpath params { path: const(char)*; [[ The input virtual file path to fetch ]] } - return: own(Efl.Vpath_File *); [[ An object representing the file ]] + return: own(Efl.Vpath.File *); [[ An object representing the file ]] } } } diff --git a/src/lib/efl/interfaces/efl_vpath_file.eo b/src/lib/efl/interfaces/efl_vpath_file.eo index 74e117a..b3dcf34 100644 --- a/src/lib/efl/interfaces/efl_vpath_file.eo +++ b/src/lib/efl/interfaces/efl_vpath_file.eo @@ -1,4 +1,4 @@ -class Efl.Vpath_File (Eo.Base) +class Efl.Vpath.File (Eo.Base) { [[ VPath File is an actual representation of a downloaded/mapped vpath file diff --git a/src/lib/efl/interfaces/efl_vpath_file_core.eo b/src/lib/efl/interfaces/efl_vpath_file_core.eo index cbe9bca..7c6eabb 100644 --- a/src/lib/efl/interfaces/efl_vpath_file_core.eo +++ b/src/lib/efl/interfaces/efl_vpath_file_core.eo @@ -1,4 +1,4 @@ -class Efl.Vpath_File.Core (Efl.Vpath_File) +class Efl.Vpath.File.Core (Efl.Vpath.File) { [[ Core EFL implementation of a Vpath File @@ -9,7 +9,7 @@ class Efl.Vpath_File.Core (Efl.Vpath_File) implements { Eo.Base.constructor; Eo.Base.destructor; - Efl.Vpath_File.do; - Efl.Vpath_File.wait; + Efl.Vpath.File.do; + Efl.Vpath.File.wait; } } diff --git a/src/lib/efl/interfaces/efl_vpath_manager.eo b/src/lib/efl/interfaces/efl_vpath_manager.eo index 2748909..c81e146 100644 --- a/src/lib/efl/interfaces/efl_vpath_manager.eo +++ b/src/lib/efl/interfaces/efl_vpath_manager.eo @@ -1,4 +1,4 @@ -class Efl.Vpath_Manager (Eo.Base) +class Efl.Vpath.Manager (Eo.Base) { [[ Vpath Manager manages multiple VPath objects that remap/download @@ -12,7 +12,7 @@ class Efl.Vpath_Manager (Eo.Base) params { path: const(char)*; [[ The input virtual file path to fetch ]] } - return: own(Efl.Vpath_File *); [[ An object representing the file ]] + return: own(Efl.Vpath.File *); [[ An object representing the file ]] } register @class { [[Register a vpath with the manager ]] --
[EGIT] [core/efl] master 14/16: Elm interface atspi: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=45d96b1c217a9d6eb6e853c629a6849e0cdb31fc commit 45d96b1c217a9d6eb6e853c629a6849e0cdb31fc Author: Tom Hacohen Date: Thu May 12 11:37:43 2016 +0100 Elm interface atspi: Fix namespacing to use . and not _. --- src/lib/elementary/elm_atspi_app_object.eo | 12 ++--- src/lib/elementary/elm_button.eo | 4 +- src/lib/elementary/elm_calendar.eo | 4 +- src/lib/elementary/elm_check.eo| 6 +-- src/lib/elementary/elm_colorselector.eo| 4 +- src/lib/elementary/elm_combobox.eo | 4 +- src/lib/elementary/elm_ctxpopup.eo | 6 +-- src/lib/elementary/elm_diskselector.eo | 4 +- src/lib/elementary/elm_entry.eo| 54 +++--- src/lib/elementary/elm_fileselector.eo | 4 +- src/lib/elementary/elm_flipselector.eo | 4 +- src/lib/elementary/elm_gengrid.eo | 26 +-- src/lib/elementary/elm_gengrid_item.eo | 4 +- src/lib/elementary/elm_genlist.eo | 24 +- src/lib/elementary/elm_genlist_item.eo | 4 +- src/lib/elementary/elm_hover.eo| 4 +- src/lib/elementary/elm_hoversel.eo | 4 +- src/lib/elementary/elm_image.eo| 6 +-- src/lib/elementary/elm_index.eo| 2 +- src/lib/elementary/elm_index_item.eo | 6 +-- .../elementary/elm_interface_atspi_accessible.eo | 12 ++--- src/lib/elementary/elm_interface_atspi_action.eo | 2 +- .../elementary/elm_interface_atspi_component.eo| 2 +- .../elm_interface_atspi_editable_text.eo | 2 +- src/lib/elementary/elm_interface_atspi_image.eo| 2 +- .../elementary/elm_interface_atspi_selection.eo| 2 +- src/lib/elementary/elm_interface_atspi_text.eo | 2 +- src/lib/elementary/elm_interface_atspi_value.eo| 2 +- .../elm_interface_atspi_widget_action.eo | 14 +++--- src/lib/elementary/elm_interface_atspi_window.eo | 2 +- src/lib/elementary/elm_list.eo | 22 - src/lib/elementary/elm_list_item.eo| 4 +- src/lib/elementary/elm_map.eo | 4 +- src/lib/elementary/elm_menu.eo | 8 ++-- src/lib/elementary/elm_menu_item.eo| 16 +++ src/lib/elementary/elm_multibuttonentry.eo | 2 +- src/lib/elementary/elm_multibuttonentry_item.eo| 6 +-- src/lib/elementary/elm_naviframe.eo| 4 +- src/lib/elementary/elm_panel.eo| 4 +- src/lib/elementary/elm_photocam.eo | 4 +- src/lib/elementary/elm_player.eo | 4 +- src/lib/elementary/elm_popup.eo| 6 +-- src/lib/elementary/elm_radio.eo| 6 +-- src/lib/elementary/elm_scroller.eo | 4 +- src/lib/elementary/elm_slider.eo | 14 +++--- src/lib/elementary/elm_slideshow.eo| 4 +- src/lib/elementary/elm_spinner.eo | 14 +++--- src/lib/elementary/elm_toolbar.eo | 24 +- src/lib/elementary/elm_toolbar_item.eo | 4 +- src/lib/elementary/elm_video.eo| 4 +- src/lib/elementary/elm_widget.eo | 14 +++--- src/lib/elementary/elm_widget_item.eo | 16 +++ src/lib/elementary/elm_win.eo | 12 ++--- 53 files changed, 214 insertions(+), 214 deletions(-) diff --git a/src/lib/elementary/elm_atspi_app_object.eo b/src/lib/elementary/elm_atspi_app_object.eo index c3658aa..c2618d5 100644 --- a/src/lib/elementary/elm_atspi_app_object.eo +++ b/src/lib/elementary/elm_atspi_app_object.eo @@ -1,12 +1,12 @@ -class Elm.Atspi.App.Object (Eo.Base, Elm.Interface_Atspi_Accessible) +class Elm.Atspi.App.Object (Eo.Base, Elm.Interface.Atspi_Accessible) { data: Elm_Atspi_App_Object_Data; implements { Eo.Base.destructor; - Elm.Interface_Atspi_Accessible.name.get; - Elm.Interface_Atspi_Accessible.description.get; - Elm.Interface_Atspi_Accessible.description.set; - Elm.Interface_Atspi_Accessible.role.get; - Elm.Interface_Atspi_Accessible.children.get; + Elm.Interface.Atspi_Accessible.name.get; + Elm.Interface.Atspi_Accessible.description.get; + Elm.Interface.Atspi_Accessible.description.set; + Elm.Interface.Atspi_Accessible.role.get; + Elm.Interface.Atspi_Accessible.children.get; } } diff --git a/src/lib/elementary/elm_button.eo b/src/lib/elementary/elm_button.eo index 7c5265b..07417b7 100644 --- a/src/lib/elementary/elm_button.eo +++ b/src/lib/elementary/elm_button.eo @@ -1,5 +1,5 @@ class Elm.Button (Elm.Layout, Evas.Clickable_Interface, - Elm.Interface_Atspi_Widget_Action) + Elm.Interface.Atspi_Widget
[EGIT] [core/efl] master 10/16: Elm win standard: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6a3bd5c5fb94ce717927b7192348b6c988355354 commit 6a3bd5c5fb94ce717927b7192348b6c988355354 Author: Tom Hacohen Date: Thu May 12 11:23:43 2016 +0100 Elm win standard: Fix namespacing to use . and not _. --- src/lib/elementary/elm_win_standard.eo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/elm_win_standard.eo b/src/lib/elementary/elm_win_standard.eo index e33aa43..36de626 100644 --- a/src/lib/elementary/elm_win_standard.eo +++ b/src/lib/elementary/elm_win_standard.eo @@ -1,4 +1,4 @@ -class Elm.Win_Standard (Elm.Win) +class Elm.Win.Standard (Elm.Win) { data: null; implements { --
[EGIT] [core/efl] master 02/16: Efl pack: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=56eee1910239564a607a958f1bdf2a744fa43f21 commit 56eee1910239564a607a958f1bdf2a744fa43f21 Author: Tom Hacohen Date: Thu May 12 11:14:03 2016 +0100 Efl pack: Fix namespacing to use . and not _. --- src/lib/edje/efl_canvas_layout_internal_box.eo | 20 +-- src/lib/edje/efl_canvas_layout_internal_table.eo | 16 - src/lib/efl/interfaces/efl_pack_grid.eo| 4 +-- src/lib/efl/interfaces/efl_pack_layout.eo | 6 ++-- src/lib/efl/interfaces/efl_pack_linear.eo | 2 +- src/lib/elementary/efl_ui_box.eo | 32 - src/lib/elementary/efl_ui_box_flow.eo | 4 +-- src/lib/elementary/efl_ui_grid.eo | 42 +++--- src/lib/elementary/efl_ui_layout_internal_box.eo | 20 +-- src/lib/elementary/efl_ui_layout_internal_table.eo | 16 - 10 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/lib/edje/efl_canvas_layout_internal_box.eo b/src/lib/edje/efl_canvas_layout_internal_box.eo index 0a5e788..c2998a3 100644 --- a/src/lib/edje/efl_canvas_layout_internal_box.eo +++ b/src/lib/edje/efl_canvas_layout_internal_box.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Layout_Internal.Box (Eo.Base, Efl.Pack_Linear) +class Efl.Canvas.Layout_Internal.Box (Eo.Base, Efl.Pack.Linear) { [[Represents a Box created as part of a layout. @@ -26,14 +26,14 @@ class Efl.Canvas.Layout_Internal.Box (Eo.Base, Efl.Pack_Linear) Efl.Pack.unpack_all; Efl.Pack.unpack; Efl.Pack.pack; - Efl.Pack_Linear.pack_begin; - Efl.Pack_Linear.pack_end; - Efl.Pack_Linear.pack_before; - Efl.Pack_Linear.pack_after; - Efl.Pack_Linear.pack_at; - Efl.Pack_Linear.pack_content_get; - Efl.Pack_Linear.pack_unpack_at; - Efl.Pack_Linear.pack_index_get; - Efl.Pack_Linear.pack_direction.get; + Efl.Pack.Linear.pack_begin; + Efl.Pack.Linear.pack_end; + Efl.Pack.Linear.pack_before; + Efl.Pack.Linear.pack_after; + Efl.Pack.Linear.pack_at; + Efl.Pack.Linear.pack_content_get; + Efl.Pack.Linear.pack_unpack_at; + Efl.Pack.Linear.pack_index_get; + Efl.Pack.Linear.pack_direction.get; } } diff --git a/src/lib/edje/efl_canvas_layout_internal_table.eo b/src/lib/edje/efl_canvas_layout_internal_table.eo index e661b51..129963c 100644 --- a/src/lib/edje/efl_canvas_layout_internal_table.eo +++ b/src/lib/edje/efl_canvas_layout_internal_table.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Layout_Internal.Table (Eo.Base, Efl.Pack_Grid) +class Efl.Canvas.Layout_Internal.Table (Eo.Base, Efl.Pack.Grid) { [[Represents a Table created as part of a layout. @@ -25,12 +25,12 @@ class Efl.Canvas.Layout_Internal.Table (Eo.Base, Efl.Pack_Grid) Efl.Pack.pack_clear; Efl.Pack.unpack_all; Efl.Pack.unpack; - Efl.Pack_Grid.pack_grid; - Efl.Pack_Grid.grid_content_get; - Efl.Pack_Grid.grid_contents_get; - Efl.Pack_Grid.grid_position.get; - Efl.Pack_Grid.grid_size.get; - Efl.Pack_Grid.grid_columns.get; - Efl.Pack_Grid.grid_rows.get; + Efl.Pack.Grid.pack_grid; + Efl.Pack.Grid.grid_content_get; + Efl.Pack.Grid.grid_contents_get; + Efl.Pack.Grid.grid_position.get; + Efl.Pack.Grid.grid_size.get; + Efl.Pack.Grid.grid_columns.get; + Efl.Pack.Grid.grid_rows.get; } } diff --git a/src/lib/efl/interfaces/efl_pack_grid.eo b/src/lib/efl/interfaces/efl_pack_grid.eo index 0e282ba..28f0bfe 100644 --- a/src/lib/efl/interfaces/efl_pack_grid.eo +++ b/src/lib/efl/interfaces/efl_pack_grid.eo @@ -1,6 +1,6 @@ import efl_gfx_types; -interface Efl.Pack_Grid (Efl.Pack_Linear) +interface Efl.Pack.Grid (Efl.Pack.Linear) { [[2D containers aligned on a grid with rows and columns]] legacy_prefix: null; @@ -72,7 +72,7 @@ interface Efl.Pack_Grid (Efl.Pack_Linear) @property grid_directions { [[Primary and secondary up/left/right/down orientations for linear apis. - Default is right and down. Overrides @Efl.Pack_Linear.pack_direction. + Default is right and down. Overrides @Efl.Pack.Linear.pack_direction. ]] set {} get {} diff --git a/src/lib/efl/interfaces/efl_pack_layout.eo b/src/lib/efl/interfaces/efl_pack_layout.eo index a20bae3..8bf3aee 100644 --- a/src/lib/efl/interfaces/efl_pack_layout.eo +++ b/src/lib/efl/interfaces/efl_pack_layout.eo @@ -1,4 +1,4 @@ -interface Efl.Pack_Layout () +interface Efl.Pack.Layout () { [[Low-level APIs for object that can lay their children out. @@ -16,8 +16,8 @@ interface Efl.Pack_Layout () get {} values { /* FIXME: engine is an Eo.Class */ -engine: const(Eo.Base)*; [[Must be an $Efl.Pack_Layout subclass.]] -data: const(void)*; [[Any data to pass along to $Efl.Pack_Layout.layout_do. +engine: const(Eo
[EGIT] [core/efl] master 12/16: Efl image: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5defd35cef7f7dce58ab4bf90e661377e47f7d1d commit 5defd35cef7f7dce58ab4bf90e661377e47f7d1d Author: Tom Hacohen Date: Thu May 12 11:35:21 2016 +0100 Efl image: Fix namespacing to use . and not _. --- src/lib/efl/interfaces/efl_image_animated.eo | 12 src/lib/efl/interfaces/efl_image_load.eo | 16 +- src/lib/elementary/elm_image.eo | 6 ++-- src/lib/emotion/emotion_object.eo| 4 +-- src/lib/evas/canvas/efl_canvas_image.eo | 44 ++-- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/lib/efl/interfaces/efl_image_animated.eo b/src/lib/efl/interfaces/efl_image_animated.eo index 0ffcc82..5404207 100644 --- a/src/lib/efl/interfaces/efl_image_animated.eo +++ b/src/lib/efl/interfaces/efl_image_animated.eo @@ -1,7 +1,7 @@ /* FIXME: invalid type from evas/emile! */ /* type @extern Evas.Animated_Loop_Hint: int; */ -enum Efl.Image_Animated.Loop_Hint { +enum Efl.Image.Animated.Loop_Hint { none = 0, [[No looping order specified.]] loop = 1, [[Standard loop: 1->2->3->1->2->3->1]] pingpong = 2[[Ping-pong bouncing loop: 1->2->3->2->1->2->3->1]] @@ -9,7 +9,7 @@ enum Efl.Image_Animated.Loop_Hint { /* FIXME: rename to Efl.Image.Animated when eo/eolian are fixed */ -interface Efl.Image_Animated () +interface Efl.Image.Animated () { legacy_prefix: null; eo_prefix: efl_image; @@ -64,18 +64,18 @@ interface Efl.Image_Animated () This returns the kind of looping the image object wants to do. - If it returns @Efl.Image_Animated.Loop_Hint.loop, you should + If it returns @Efl.Image.Animated.Loop_Hint.loop, you should display frames in a sequence like: 1->2->3->1->2->3->1... - If it returns @Efl.Image_Animated.Loop_Hint.pingpong, it is + If it returns @Efl.Image.Animated.Loop_Hint.pingpong, it is better to display frames in a sequence like: 1->2->3->2->1->2->3->1... - The default type is @Efl.Image_Animated.Loop_Hint.loop. + The default type is @Efl.Image.Animated.Loop_Hint.loop. @since 1.1 ]] -return: Efl.Image_Animated.Loop_Hint; [[Loop type of the image object.]] +return: Efl.Image.Animated.Loop_Hint; [[Loop type of the image object.]] } } @property animated_loop_count { diff --git a/src/lib/efl/interfaces/efl_image_load.eo b/src/lib/efl/interfaces/efl_image_load.eo index 4a6bd4e..6b9c71c 100644 --- a/src/lib/efl/interfaces/efl_image_load.eo +++ b/src/lib/efl/interfaces/efl_image_load.eo @@ -1,5 +1,5 @@ /* FIXME: maybe add error code for "currently running" or "pending" ? */ -enum Efl.Image_Load.Error +enum Efl.Image.Load.Error { none = 0, [[No error on load]] generic = 1,[[A non-specific error occurred]] @@ -11,18 +11,18 @@ enum Efl.Image_Load.Error } /* FIXME: state or status??? */ -enum Efl.Image_Load.State +enum Efl.Image.Load.State { none = 0, [[Not loading any image.]] loaded = 1,[[Image data is loaded, nothing is pending.]] pending = 2, [[The image has been queued for load, but actual loading may not have started yet.]] loading = 3, [[The image is currently loading.]] - error = 4, [[Image load has failed. Call @Efl.Image_Load.load_error.get to know why.]] + error = 4, [[Image load has failed. Call @Efl.Image.Load.load_error.get to know why.]] cancelled = 5 [[Image load has been cancelled.]] } /* FIXME: Efl.Image.Load */ -interface Efl.Image_Load () +interface Efl.Image.Load () { [[Common APIs for all loadable 2D images.]] legacy_prefix: null; @@ -53,7 +53,7 @@ interface Efl.Image_Load () ]] } values { -state: Efl.Image_Load.State; +state: Efl.Image.Load.State; } } @property load_size { @@ -187,9 +187,9 @@ interface Efl.Image_Load () [[Retrieves a number representing any error that occurred during the last loading of the given image object's source image. ]] -return: Efl.Image_Load.Error @warn_unused; [[ +return: Efl.Image.Load.Error @warn_unused; [[ A value giving the last error that occurred, one of - @Efl.Image_Load.Error values. @Efl.Image_Load.Error.none is + @Efl.Image.Load.Error values. @Efl.Image.Load.Error.none is returned if there was no error. ]] } @@ -197,7 +197,7 @@ interface Efl.Image_Load () } events { load,done; - load,error: Efl.Image_Load.Error; + load,error: Efl.Image.Load.Error; load,cancelled; } } diff --git a/src/lib/elementary/elm_image.eo b/src/lib/elementary/elm_i
[EGIT] [core/efl] master 08/16: Elm pans: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=227af4751bde0955c2b05e1b944b5fb5b5be53fe commit 227af4751bde0955c2b05e1b944b5fb5b5be53fe Author: Tom Hacohen Date: Thu May 12 11:22:05 2016 +0100 Elm pans: Fix namespacing to use . and not _. --- src/lib/elementary/elm_gengrid_pan.eo | 2 +- src/lib/elementary/elm_genlist_pan.eo | 2 +- src/lib/elementary/elm_map_pan.eo | 2 +- src/lib/elementary/elm_photocam_pan.eo | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/elementary/elm_gengrid_pan.eo b/src/lib/elementary/elm_gengrid_pan.eo index e67e18b..ff8d307 100644 --- a/src/lib/elementary/elm_gengrid_pan.eo +++ b/src/lib/elementary/elm_gengrid_pan.eo @@ -1,4 +1,4 @@ -class Elm.Gengrid_Pan (Elm.Pan) +class Elm.Gengrid.Pan (Elm.Pan) { eo_prefix: elm_obj_gengrid_pan; implements { diff --git a/src/lib/elementary/elm_genlist_pan.eo b/src/lib/elementary/elm_genlist_pan.eo index 1a5065b..a9e8d82 100644 --- a/src/lib/elementary/elm_genlist_pan.eo +++ b/src/lib/elementary/elm_genlist_pan.eo @@ -1,4 +1,4 @@ -class Elm.Genlist_Pan (Elm.Pan) +class Elm.Genlist.Pan (Elm.Pan) { eo_prefix: elm_obj_genlist_pan; implements { diff --git a/src/lib/elementary/elm_map_pan.eo b/src/lib/elementary/elm_map_pan.eo index d7ba9b3..be30b0f 100644 --- a/src/lib/elementary/elm_map_pan.eo +++ b/src/lib/elementary/elm_map_pan.eo @@ -1,4 +1,4 @@ -class Elm.Map_Pan (Elm.Pan) +class Elm.Map.Pan (Elm.Pan) { eo_prefix: elm_obj_map_pan; implements { diff --git a/src/lib/elementary/elm_photocam_pan.eo b/src/lib/elementary/elm_photocam_pan.eo index ef5ff22..5c74fb5 100644 --- a/src/lib/elementary/elm_photocam_pan.eo +++ b/src/lib/elementary/elm_photocam_pan.eo @@ -1,4 +1,4 @@ -class Elm.Photocam_Pan (Elm.Pan) +class Elm.Photocam.Pan (Elm.Pan) { eo_prefix: elm_obj_photocam_pan; implements { --
[EGIT] [core/efl] master 06/16: Elm atpsi: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=db5c38f93da209db04f704b8b9d46f0934f1d062 commit db5c38f93da209db04f704b8b9d46f0934f1d062 Author: Tom Hacohen Date: Thu May 12 11:19:36 2016 +0100 Elm atpsi: Fix namespacing to use . and not _. --- src/lib/elementary/elm_atspi_app_object.eo | 2 +- src/lib/elementary/elm_atspi_bridge.eo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/elm_atspi_app_object.eo b/src/lib/elementary/elm_atspi_app_object.eo index 9603f45..c3658aa 100644 --- a/src/lib/elementary/elm_atspi_app_object.eo +++ b/src/lib/elementary/elm_atspi_app_object.eo @@ -1,4 +1,4 @@ -class Elm.Atspi_App_Object (Eo.Base, Elm.Interface_Atspi_Accessible) +class Elm.Atspi.App.Object (Eo.Base, Elm.Interface_Atspi_Accessible) { data: Elm_Atspi_App_Object_Data; implements { diff --git a/src/lib/elementary/elm_atspi_bridge.eo b/src/lib/elementary/elm_atspi_bridge.eo index 4b82379..2d14a22 100644 --- a/src/lib/elementary/elm_atspi_bridge.eo +++ b/src/lib/elementary/elm_atspi_bridge.eo @@ -1,4 +1,4 @@ -class Elm.Atspi_Bridge (Eo.Base) +class Elm.Atspi.Bridge (Eo.Base) { eo_prefix: elm_obj_atspi_bridge; methods { --
[EGIT] [core/efl] master 01/16: Evas object smart: Fix namespace to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0253d91adeebdfa2c53b04e031b308c4372f9541 commit 0253d91adeebdfa2c53b04e031b308c4372f9541 Author: Tom Hacohen Date: Thu May 12 11:12:08 2016 +0100 Evas object smart: Fix namespace to use . and not _. --- src/lib/edje/edje_edit.eo | 2 +- src/lib/edje/edje_object.eo | 16 ++--- src/lib/elementary/efl_ui_box.eo| 6 ++--- src/lib/elementary/efl_ui_grid.eo | 6 ++--- src/lib/elementary/efl_ui_nstate.eo | 4 ++-- src/lib/elementary/elm_access.eo| 2 +- src/lib/elementary/elm_actionslider.eo | 2 +- src/lib/elementary/elm_bg.eo| 2 +- src/lib/elementary/elm_box.eo | 6 ++--- src/lib/elementary/elm_bubble.eo| 2 +- src/lib/elementary/elm_button.eo| 2 +- src/lib/elementary/elm_calendar.eo | 6 ++--- src/lib/elementary/elm_check.eo | 2 +- src/lib/elementary/elm_clock.eo | 4 ++-- src/lib/elementary/elm_colorselector.eo | 4 ++-- src/lib/elementary/elm_combobox.eo | 10 - src/lib/elementary/elm_conformant.eo| 4 ++-- src/lib/elementary/elm_ctxpopup.eo | 4 ++-- src/lib/elementary/elm_datetime.eo | 4 ++-- src/lib/elementary/elm_dayselector.eo | 4 ++-- src/lib/elementary/elm_diskselector.eo | 10 - src/lib/elementary/elm_entry.eo | 14 ++-- src/lib/elementary/elm_fileselector.eo | 4 ++-- src/lib/elementary/elm_fileselector_button.eo | 4 ++-- src/lib/elementary/elm_fileselector_entry.eo| 4 ++-- src/lib/elementary/elm_flip.eo | 4 ++-- src/lib/elementary/elm_flipselector.eo | 4 ++-- src/lib/elementary/elm_frame.eo | 4 ++-- src/lib/elementary/elm_gengrid.eo | 10 - src/lib/elementary/elm_gengrid_pan.eo | 6 ++--- src/lib/elementary/elm_genlist.eo | 10 - src/lib/elementary/elm_genlist_pan.eo | 8 +++ src/lib/elementary/elm_gesture_layer.eo | 4 ++-- src/lib/elementary/elm_glview.eo| 6 ++--- src/lib/elementary/elm_grid.eo | 4 ++-- src/lib/elementary/elm_hover.eo | 12 +- src/lib/elementary/elm_hoversel.eo | 8 +++ src/lib/elementary/elm_icon.eo | 4 ++-- src/lib/elementary/elm_image.eo | 20 - src/lib/elementary/elm_index.eo | 4 ++-- src/lib/elementary/elm_interface_scrollable.eo | 6 ++--- src/lib/elementary/elm_inwin.eo | 2 +- src/lib/elementary/elm_label.eo | 2 +- src/lib/elementary/elm_layout.eo| 6 ++--- src/lib/elementary/elm_list.eo | 10 - src/lib/elementary/elm_map.eo | 10 - src/lib/elementary/elm_map_pan.eo | 6 ++--- src/lib/elementary/elm_mapbuf.eo| 12 +- src/lib/elementary/elm_menu.eo | 6 ++--- src/lib/elementary/elm_multibuttonentry.eo | 4 ++-- src/lib/elementary/elm_naviframe.eo | 6 ++--- src/lib/elementary/elm_notify.eo| 12 +- src/lib/elementary/elm_pan.eo | 12 +- src/lib/elementary/elm_panel.eo | 10 - src/lib/elementary/elm_panes.eo | 2 +- src/lib/elementary/elm_photo.eo | 4 ++-- src/lib/elementary/elm_photocam.eo | 10 - src/lib/elementary/elm_photocam_pan.eo | 6 ++--- src/lib/elementary/elm_player.eo| 4 ++-- src/lib/elementary/elm_plug.eo | 2 +- src/lib/elementary/elm_popup.eo | 4 ++-- src/lib/elementary/elm_prefs.eo | 4 ++-- src/lib/elementary/elm_progressbar.eo | 4 ++-- src/lib/elementary/elm_radio.eo | 4 ++-- src/lib/elementary/elm_route.eo | 4 ++-- src/lib/elementary/elm_scroller.eo | 8 +++ src/lib/elementary/elm_segment_control.eo | 4 ++-- src/lib/elementary/elm_separator.eo | 2 +- src/lib/elementary/elm_slider.eo| 6 ++--- src/lib/elementary/elm_slideshow.eo | 4 ++-- src/lib/elementary/elm_spinner.eo | 4 ++-- src/lib/elementary/elm_table.eo | 6 ++--- src/lib/elementary/elm_thumb.eo | 8 +++ src/lib/elementary/elm_toolbar.eo | 12 +- src/lib/elementary/elm_video.eo | 4 ++-- src/lib/elementary/elm_widget.eo| 30 - src/lib/elementary/elm_win.eo | 12 +- src/lib/emotion/emoti
[EGIT] [core/efl] master 07/16: Elm items: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ef6c88435bab007c94d451375f39f015a6592541 commit ef6c88435bab007c94d451375f39f015a6592541 Author: Tom Hacohen Date: Thu May 12 11:21:36 2016 +0100 Elm items: Fix namespacing to use . and not _. --- src/lib/elementary/elm_color_item.eo| 6 ++-- src/lib/elementary/elm_colorselector.eo | 6 ++-- src/lib/elementary/elm_ctxpopup.eo | 10 +++--- src/lib/elementary/elm_ctxpopup_item.eo | 22 ++-- src/lib/elementary/elm_dayselector_item.eo | 2 +- src/lib/elementary/elm_diskselector.eo | 10 +++--- src/lib/elementary/elm_diskselector_item.eo | 14 src/lib/elementary/elm_flipselector.eo | 12 +++ src/lib/elementary/elm_flipselector_item.eo | 12 +++ src/lib/elementary/elm_gengrid.eo | 28 +++ src/lib/elementary/elm_gengrid_item.eo | 38 ++-- src/lib/elementary/elm_genlist.eo | 40 ++--- src/lib/elementary/elm_genlist_item.eo | 46 - src/lib/elementary/elm_hoversel.eo | 6 ++-- src/lib/elementary/elm_hoversel_item.eo | 18 +- src/lib/elementary/elm_index.eo | 18 +- src/lib/elementary/elm_index_item.eo| 4 +-- src/lib/elementary/elm_list.eo | 28 +++ src/lib/elementary/elm_list_item.eo | 26 +++--- src/lib/elementary/elm_menu.eo | 16 - src/lib/elementary/elm_menu_item.eo | 20 +-- src/lib/elementary/elm_multibuttonentry.eo | 28 +++ src/lib/elementary/elm_multibuttonentry_item.eo | 14 src/lib/elementary/elm_naviframe.eo | 16 - src/lib/elementary/elm_naviframe_item.eo| 14 src/lib/elementary/elm_popup.eo | 2 +- src/lib/elementary/elm_popup_item.eo| 16 - src/lib/elementary/elm_segment_control.eo | 8 ++--- src/lib/elementary/elm_segment_control_item.eo | 12 +++ src/lib/elementary/elm_slideshow.eo | 12 +++ src/lib/elementary/elm_slideshow_item.eo| 2 +- src/lib/elementary/elm_toolbar.eo | 22 ++-- src/lib/elementary/elm_toolbar_item.eo | 42 +++--- src/lib/elementary/elm_widget.eo| 22 ++-- src/lib/elementary/elm_widget_item.eo | 6 ++-- 35 files changed, 299 insertions(+), 299 deletions(-) diff --git a/src/lib/elementary/elm_color_item.eo b/src/lib/elementary/elm_color_item.eo index b918c49..0cb7b34 100644 --- a/src/lib/elementary/elm_color_item.eo +++ b/src/lib/elementary/elm_color_item.eo @@ -1,4 +1,4 @@ -class Elm.Color_Item(Elm.Widget_Item) +class Elm.Color.Item(Elm.Widget.Item) { eo_prefix: elm_obj_color_item; methods { @@ -37,7 +37,7 @@ class Elm.Color_Item(Elm.Widget_Item) implements { Eo.Base.constructor; Eo.Base.destructor; - Elm.Widget_Item.access_register; - Elm.Widget_Item.signal_emit; + Elm.Widget.Item.access_register; + Elm.Widget.Item.signal_emit; } } diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo index 87093f1..f22cdb9 100644 --- a/src/lib/elementary/elm_colorselector.eo +++ b/src/lib/elementary/elm_colorselector.eo @@ -75,7 +75,7 @@ class Elm.Colorselector (Elm.Layout, Elm.Interface_Atspi_Widget_Action, @since 1.9 ]] -return: const(list)*;[[The list of color palette items.]] +return: const(list)*;[[The list of color palette items.]] } } @property palette_selected_item { @@ -84,14 +84,14 @@ class Elm.Colorselector (Elm.Layout, Elm.Interface_Atspi_Widget_Action, @since 1.9]] -return: Elm.Widget_Item *;[[The selected item, or $null if none +return: Elm.Widget.Item *;[[The selected item, or $null if none selected.]] } } palette_color_add { [[Add a new color item to palette.]] - return: Elm.Widget_Item *;[[A new color palette Item.]] + return: Elm.Widget.Item *;[[A new color palette Item.]] params { @in r: int; [[r-value of color]] @in g: int; [[g-value of color]] diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo index f957698..710fd61 100644 --- a/src/lib/elementary/elm_ctxpopup.eo +++ b/src/lib/elementary/elm_ctxpopup.eo @@ -114,7 +114,7 @@ class Elm.Ctxpopup (Elm.Layout, Elm.Interface_Atspi_Widget_Action, Efl.Orientati @since 1.11 ]] -return: const(list)*; [[The list of items or +return: const(list)*; [[The list of items or $null on errors.]] } @@ -129,7 +129,7 @@ class Elm.Ctxpopup (Elm.L
[EGIT] [core/efl] master 04/16: Eldbus: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c587972e52b66f2c38c8412ab458f3e577ecd379 commit c587972e52b66f2c38c8412ab458f3e577ecd379 Author: Tom Hacohen Date: Thu May 12 11:17:29 2016 +0100 Eldbus: Fix namespacing to use . and not _. --- src/lib/eldbus/eldbus_model_arguments.eo | 2 +- src/lib/eldbus/eldbus_model_connection.eo | 2 +- src/lib/eldbus/eldbus_model_method.eo | 2 +- src/lib/eldbus/eldbus_model_object.eo | 2 +- src/lib/eldbus/eldbus_model_proxy.eo | 2 +- src/lib/eldbus/eldbus_model_signal.eo | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/eldbus/eldbus_model_arguments.eo b/src/lib/eldbus/eldbus_model_arguments.eo index 1cf2cf0..a5e908b 100644 --- a/src/lib/eldbus/eldbus_model_arguments.eo +++ b/src/lib/eldbus/eldbus_model_arguments.eo @@ -1,6 +1,6 @@ import eldbus_types; -class Eldbus.Model_Arguments (Eo.Base, Efl.Model) { +class Eldbus.Model.Arguments (Eo.Base, Efl.Model) { [[Eldbus model arguments class]] legacy_prefix: null; diff --git a/src/lib/eldbus/eldbus_model_connection.eo b/src/lib/eldbus/eldbus_model_connection.eo index e5b8175..5b4fc2b 100644 --- a/src/lib/eldbus/eldbus_model_connection.eo +++ b/src/lib/eldbus/eldbus_model_connection.eo @@ -1,4 +1,4 @@ -class Eldbus.Model_Connection (Eo.Base, Efl.Model) { +class Eldbus.Model.Connection (Eo.Base, Efl.Model) { [[Eldbus model connection class]] legacy_prefix: null; diff --git a/src/lib/eldbus/eldbus_model_method.eo b/src/lib/eldbus/eldbus_model_method.eo index b0829a6..3d27aa7 100644 --- a/src/lib/eldbus/eldbus_model_method.eo +++ b/src/lib/eldbus/eldbus_model_method.eo @@ -1,6 +1,6 @@ import eldbus_types; -class Eldbus.Model_Method (Eldbus.Model_Arguments) { +class Eldbus.Model.Method (Eldbus.Model.Arguments) { [[Eldbus model method class]] legacy_prefix: null; methods { diff --git a/src/lib/eldbus/eldbus_model_object.eo b/src/lib/eldbus/eldbus_model_object.eo index c0aafce..057797a 100644 --- a/src/lib/eldbus/eldbus_model_object.eo +++ b/src/lib/eldbus/eldbus_model_object.eo @@ -1,6 +1,6 @@ import eldbus_types; -class Eldbus.Model_Object (Eo.Base, Efl.Model) { +class Eldbus.Model.Object (Eo.Base, Efl.Model) { [[Eldbus model object class]] legacy_prefix: null; diff --git a/src/lib/eldbus/eldbus_model_proxy.eo b/src/lib/eldbus/eldbus_model_proxy.eo index a65e6be..5c9cd40 100644 --- a/src/lib/eldbus/eldbus_model_proxy.eo +++ b/src/lib/eldbus/eldbus_model_proxy.eo @@ -1,6 +1,6 @@ import eldbus_types; -class Eldbus.Model_Proxy (Eo.Base, Efl.Model) { +class Eldbus.Model.Proxy (Eo.Base, Efl.Model) { [[Eldbus model proxy class]] legacy_prefix: null; diff --git a/src/lib/eldbus/eldbus_model_signal.eo b/src/lib/eldbus/eldbus_model_signal.eo index 9e39060..1e1f260 100644 --- a/src/lib/eldbus/eldbus_model_signal.eo +++ b/src/lib/eldbus/eldbus_model_signal.eo @@ -1,4 +1,4 @@ -class Eldbus.Model_Signal (Eldbus.Model_Arguments) { +class Eldbus.Model.Signal (Eldbus.Model.Arguments) { [[Eldbus model signal class]] legacy_prefix: null; --
[EGIT] [core/efl] master 05/16: Elm app: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9a9eea680f3129afb067fde9be7360a6c59e9b43 commit 9a9eea680f3129afb067fde9be7360a6c59e9b43 Author: Tom Hacohen Date: Thu May 12 11:18:43 2016 +0100 Elm app: Fix namespacing to use . and not _. --- src/lib/elementary/elm_app_client.eo | 4 ++-- src/lib/elementary/elm_app_client_view.eo | 2 +- src/lib/elementary/elm_app_server.eo | 6 +++--- src/lib/elementary/elm_app_server_view.eo | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/elementary/elm_app_client.eo b/src/lib/elementary/elm_app_client.eo index 940a5aa..1e8d30c 100644 --- a/src/lib/elementary/elm_app_client.eo +++ b/src/lib/elementary/elm_app_client.eo @@ -3,7 +3,7 @@ import eina_types; type Elm_App_Client_Open_View_Cb: __undefined_type; type Elm_App_Client_Pending: __undefined_type; -class Elm.App_Client (Eo.Base) +class Elm.App.Client (Eo.Base) { legacy_prefix: null; methods { @@ -12,7 +12,7 @@ class Elm.App_Client (Eo.Base) [[Return a iterator with all views of application.]] } values { -ret: free(own(iterator *), eina_iterator_free); [[The iterator with all views, must be freed after use.]] +ret: free(own(iterator *), eina_iterator_free); [[The iterator with all views, must be freed after use.]] } } @property package { diff --git a/src/lib/elementary/elm_app_client_view.eo b/src/lib/elementary/elm_app_client_view.eo index 7bceefe..4995676 100644 --- a/src/lib/elementary/elm_app_client_view.eo +++ b/src/lib/elementary/elm_app_client_view.eo @@ -2,7 +2,7 @@ import elm_general; type Elm_App_Client_View_Cb: __undefined_type; -class Elm.App_Client_View (Eo.Base) +class Elm.App.Client.View (Eo.Base) { legacy_prefix: null; methods { diff --git a/src/lib/elementary/elm_app_server.eo b/src/lib/elementary/elm_app_server.eo index d97bbf8..f6291f0 100644 --- a/src/lib/elementary/elm_app_server.eo +++ b/src/lib/elementary/elm_app_server.eo @@ -3,7 +3,7 @@ import elm_general; type Elm_App_Server_Create_View_Cb: __undefined_type; -class Elm.App_Server (Eo.Base) +class Elm.App.Server (Eo.Base) { legacy_prefix: null; eo_prefix: elm_app_server; @@ -22,7 +22,7 @@ class Elm.App_Server (Eo.Base) [[Return a iterator with all views of application]] } values { -ret: free(own(iterator *), eina_iterator_free); [[Iterator with all views of application, you must free iterator after use]] +ret: free(own(iterator *), eina_iterator_free); [[Iterator with all views of application, you must free iterator after use]] } } @property path { @@ -77,7 +77,7 @@ class Elm.App_Server (Eo.Base) requested by create_view_cb. ]] params { -@in view: Elm.App_Server_View *; [[elm_app_server_view]] +@in view: Elm.App.Server.View *; [[elm_app_server_view]] } } title_set { diff --git a/src/lib/elementary/elm_app_server_view.eo b/src/lib/elementary/elm_app_server_view.eo index 38a0601..a21b7eb 100644 --- a/src/lib/elementary/elm_app_server_view.eo +++ b/src/lib/elementary/elm_app_server_view.eo @@ -1,6 +1,6 @@ import elm_general; -class Elm.App_Server_View (Eo.Base) +class Elm.App.Server.View (Eo.Base) { legacy_prefix: null; eo_prefix: elm_app_server_view; --
Re: [E-devel] [e-users] EFL developers days
On May 12, 2016 12:37 AM, "Sung W. Park" wrote: > > wine tasting activity sounds nice.. ;-) Indeed. -- Felipe Magno de Almeida > On Thu, May 12, 2016 at 1:50 AM, Tom Hacohen wrote: > > > It's dark inside anyway, so you wouldn't know any better. It's not > > necessarily an evening thing. > > > > The problem is that climbing is something that you need to be strong for, > > or at least have the technique, and many people don't like it (I personally > > do). The other one, the museum, is not a very good social event because you > > need to be quiet and you wander off on your own. > > > > I know it's not your thing, but another idea that just came to mind that is > > more of a Parisian themed idea: wine tasting activity, or a cooking > > activity or something of that sort. > > > > My personal favourite is bowling, but I think almost any idea is better > > than the museum (which because of the above we'll end up doing). > > > > > > On Wed, May 11, 2016 at 5:43 PM, Cedric BAIL wrote: > > > > > On Wed, May 11, 2016 at 2:46 AM, Tom Hacohen > > wrote: > > > > On 11/05/16 10:45, Tom Hacohen wrote: > > > >> On 11/05/16 08:50, Stefan Schmidt wrote: > > > >>> On 05/05/16 01:55, Cedric BAIL wrote: > > > I would like to remind everyone that EFL developers days will happen > > > later this month in Paris. If you have made your decision, it would > > be > > > good to update your vote > > > ( > > > > > https://phab.enlightenment.org/w/events/enlightenment_developer_days_2016/ > > > ). > > > > > > Also as a big part of the event is to do hacking together, don't > > > hesitate to bring your prefered device along ! > > > > > > Also as Saturday afternoon, we will try to setup some social event > > and > > > by just the actual number of expected people, it will be necessary > > to > > > book whatever we finally plan to do. So here is a vote > > > https://phab.enlightenment.org/V23 . If people have other idea than > > > climbing or visiting the Musee des Arts et Metiers, please raise > > your > > > hands now ! The vote will be closed in a week from now. > > > >>> > > > >>> So far we only have 5 votes but 22 registered attendees. :) > > > >>> > > > >>> As an additional note please let me know if you have any input for > > > >>> hacking sessions we have planned. > > > >>> I will put some slides together with topics people can work on during > > > >>> this sessions. > > > >> > > > >> Posting again with some more info + both ML this time. :) > > > >> > > > >> I'm sorry I'm only bringing it up now, but I didn't see the vote. The > > > >> subject "EFL developers day" with the generic reminder first paragraph > > > >> meant I didn't read the rest of the email and see this. Please when > > you > > > >> have a "call for action" mark the title as such, or at the very least, > > > >> have a non generic title. I'm only seeing this now because of Stefan's > > > >> email. > > > >> > > > >> In the last email we talked about ideas there were plenty more, like > > > >> paintball and kart racing. Why are they not in this vote? > > > > > > > > Or bowling. > > > > > > There isnt any painball or kart racing track that I know of inside > > > Paris or at a short distance. Bowling is another possibility, but > > > isn't it more something you do in the evening ? > > > -- > > > Cedric BAIL > > > > > > > > > > > -- > > > Mobile security can be enabling, not merely restricting. Employees who > > > bring their own devices (BYOD) to work are irked by the imposition of MDM > > > restrictions. Mobile Device Manager Plus allows you to control only the > > > apps on BYO-devices by containerizing them, leaving personal data > > > untouched! > > > https://ad.doubleclick.net/ddm/clk/304595813;131938128;j > > > ___ > > > enlightenment-devel mailing list > > > enlightenment-devel@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > > -- > > Mobile security can be enabling, not merely restricting. Employees who > > bring their own devices (BYOD) to work are irked by the imposition of MDM > > restrictions. Mobile Device Manager Plus allows you to control only the > > apps on BYO-devices by containerizing them, leaving personal data > > untouched! > > https://ad.doubleclick.net/ddm/clk/304595813;131938128;j > > ___ > > enlightenment-devel mailing list > > enlightenment-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > -- > Mobile security can be enabling, not merely restricting. Employees who > bring their own devices (BYOD) to work are irked by the imposition of MDM > restrictions.
Re: [E-devel] I've finally decided to try Eula ...
On Sun, May 8, 2016 at 10:15 AM, David Seikel wrote: > ... but how? > > Can't find any examples anywhere, or anything that is an obvious > example. There really should be an obvious example in > core/efl/src/examples. > > Well, I did find an example using Elementary on the web, but it fell > over at the first line. Not sure what you are expecting from it, but it's not production ready. It can be used for CLI scripts, but that's about it. D5 > > -- > A big old stinking pile of genius that no one wants > coz there are too many silver coated monkeys in the world. > > -- > Find and fix application performance issues faster with Applications Manager > Applications Manager provides deep performance insights into multiple tiers of > your business applications. It resolves application problems quickly and > reduces your MTTR. Get your free trial! > https://ad.doubleclick.net/ddm/clk/302982198;130105516;z > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Mobile security can be enabling, not merely restricting. Employees who bring their own devices (BYOD) to work are irked by the imposition of MDM restrictions. Mobile Device Manager Plus allows you to control only the apps on BYO-devices by containerizing them, leaving personal data untouched! https://ad.doubleclick.net/ddm/clk/304595813;131938128;j ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 10/10: Evas image orient: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b7cf001c31450e9e9ea18676bb5c498352852373 commit b7cf001c31450e9e9ea18676bb5c498352852373 Author: Tom Hacohen Date: Thu May 12 12:20:07 2016 +0100 Evas image orient: Fix namespacing to use . and not _. --- src/lib/elementary/elm_photocam.eo | 2 +- src/lib/evas/canvas/evas_types.eot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo index 2c06a01..09191fd 100644 --- a/src/lib/elementary/elm_photocam.eo +++ b/src/lib/elementary/elm_photocam.eo @@ -165,7 +165,7 @@ class Elm.Photocam (Elm.Widget, Elm.Interface_Scrollable, ]] } values { -orient: Evas.Image_Orient; [[The photocam image orientation +orient: Evas.Image.Orient; [[The photocam image orientation \@ref Evas_Image_Orient. Default is #EVAS_IMAGE_ORIENT_NONE. ]] diff --git a/src/lib/evas/canvas/evas_types.eot b/src/lib/evas/canvas/evas_types.eot index ab582ce..0c95385 100644 --- a/src/lib/evas/canvas/evas_types.eot +++ b/src/lib/evas/canvas/evas_types.eot @@ -230,7 +230,7 @@ enum Evas.Callback_Type last [[kept as last element/sentinel -- not really an event]] } -enum Evas.Image_Orient +enum Evas.Image.Orient { [[Possible orientation options for evas_object_image_orient_set(). @since 1.14]] --
[EGIT] [core/efl] master 04/10: Efl ui box: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5a93ae6b0f283310bc32a09b6c2f4481de001e6b commit 5a93ae6b0f283310bc32a09b6c2f4481de001e6b Author: Tom Hacohen Date: Thu May 12 12:07:20 2016 +0100 Efl ui box: Fix namespacing to use . and not _. --- src/lib/elementary/efl_ui_box_flow.eo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/efl_ui_box_flow.eo b/src/lib/elementary/efl_ui_box_flow.eo index cbc25d9..38dc459 100644 --- a/src/lib/elementary/efl_ui_box_flow.eo +++ b/src/lib/elementary/efl_ui_box_flow.eo @@ -1,10 +1,10 @@ -struct Efl.Ui.Box_Flow_Params { +struct Efl.Ui.Box.Flow_Params { [[Extra parameters for Box_Flow layout. Can be omitted.]] homogenous: bool; max_size: bool; } -class Efl.Ui.Box_Flow (Efl.Ui.Box, Efl.Pack.Layout) +class Efl.Ui.Box.Flow (Efl.Ui.Box, Efl.Pack.Layout) { [[A custom layout engine for @Efl.Ui.Box.]] legacy_prefix: null; --
[EGIT] [core/efl] master 07/10: Eet: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c5ea7962e9cd9e41384d1ce25cf1fa333c95ac3e commit c5ea7962e9cd9e41384d1ce25cf1fa333c95ac3e Author: Tom Hacohen Date: Thu May 12 12:16:27 2016 +0100 Eet: Fix namespacing to use . and not _. --- src/lib/ecore_con/ecore_con_eet_base.eo | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_con/ecore_con_eet_base.eo b/src/lib/ecore_con/ecore_con_eet_base.eo index 50d0eb2..d78c99f 100644 --- a/src/lib/ecore_con/ecore_con_eet_base.eo +++ b/src/lib/ecore_con/ecore_con_eet_base.eo @@ -3,7 +3,7 @@ import efl_network_server; type @extern Ecore_Con_Eet_Data_Cb: __undefined_type; /* FIXME: function pointers not supported. */ type @extern Ecore_Con_Eet_Raw_Data_Cb: __undefined_type; /* FIXME: function pointers not supported. */ -struct @extern Eet_Data_Descriptor; +struct @extern Eet.Data.Descriptor; struct Ecore.Con.Reply; class Ecore.Con.Eet.Base (Eo.Base) { @@ -60,12 +60,12 @@ class Ecore.Con.Eet.Base (Eo.Base) { } } register { - [[Function to register a \@ref Eet_Data_Descriptor to the + [[Function to register a \@ref Eet.Data.Descriptor to the ecore_con_eet object.]] legacy: ecore_con_eet; params { name: const (char) *; [[The name of the eet stream.]] -edd: Eet_Data_Descriptor *; [[The Eet_Data_Descriptor that +edd: Eet.Data.Descriptor *; [[The Eet.Data.Descriptor that is to be registered.]] } } --
[EGIT] [core/efl] master 06/10: Eo event description: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=739ccea3d97710950e49aca8566dde74370bf202 commit 739ccea3d97710950e49aca8566dde74370bf202 Author: Tom Hacohen Date: Thu May 12 12:11:48 2016 +0100 Eo event description: Fix namespacing to use . and not _. --- src/lib/elementary/elm_interface_atspi_accessible.eo | 2 +- src/lib/eo/eo_base.eo| 16 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/elementary/elm_interface_atspi_accessible.eo b/src/lib/elementary/elm_interface_atspi_accessible.eo index 1454fed..a48775c 100644 --- a/src/lib/elementary/elm_interface_atspi_accessible.eo +++ b/src/lib/elementary/elm_interface_atspi_accessible.eo @@ -343,7 +343,7 @@ mixin Elm.Interface.Atspi_Accessible () event_emit @class @protected { params { @in accessible: Elm.Interface.Atspi_Accessible *; [[Accessibility object.]] -@in event: const(Eo.Event_Description)*; [[Accessibility event type.]] +@in event: const(Eo.Event.Description)*; [[Accessibility event type.]] @in event_info: void*; [[Accessibility event details.]] } } diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo index 59025fc..ff06b8a 100644 --- a/src/lib/eo/eo_base.eo +++ b/src/lib/eo/eo_base.eo @@ -1,6 +1,6 @@ import eina_types; -struct Eo.Event_Description { +struct Eo.Event.Description { [[This struct holds the description of a specific event.]] name: const(char) *; [[name of the event.]] unfreezable: bool; [[Eina_True if the event cannot be frozen.]] @@ -11,7 +11,7 @@ struct Eo.Event_Description { struct Eo.Event { [[Parameter passed in event callbacks holding extra event parameters]] obj: Eo.Base *; [[The object the event was called on.]] - desc: const(Eo.Event_Description) *; [[The event description.]] + desc: const(Eo.Event.Description) *; [[The event description.]] info: void *; [[Extra event information passed by the event caller.]] } @@ -24,7 +24,7 @@ struct Eo.Callback_Array_Item { See also \@ref eo_event_callback_array_add. ]] -desc: const(Eo.Event_Description) *; [[The event description.]] +desc: const(Eo.Event.Description) *; [[The event description.]] func: Eo.Event_Cb; [[The callback function.]] } @@ -310,7 +310,7 @@ abstract Eo.Base () ]] return: bool; [[Return true when the callback has been successfully added.]] params { -@in desc: const(Eo.Event_Description)*; [[The description of the event to listen to]] +@in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]] @in priority: Eo.Callback_Priority; [[The priority of the callback]] @in cb: Eo.Event_Cb; [[the callback to call]] @in data: const(void)*; [[additional data to pass to the callback]] @@ -320,7 +320,7 @@ abstract Eo.Base () [[Del a callback with a specific data associated to it for an event.]] return: bool; [[Return true when the callback has been successfully removed.]] params { -@in desc: const(Eo.Event_Description)*; [[The description of the event to listen to]] +@in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]] @in func: Eo.Event_Cb; [[the callback to delete]] @in user_data: const(void)*; [[The data to compare]] } @@ -351,7 +351,7 @@ abstract Eo.Base () event_callback_call { [[Call the callbacks for an event of an object.]] params { -@in desc: const(Eo.Event_Description)*; [[The description of the event to call]] +@in desc: const(Eo.Event.Description)*; [[The description of the event to call]] @in event_info: void *; [[Extra event info to pass to the callbacks]] } return: bool; [[$true if one of the callbacks aborted the call, @@ -361,14 +361,14 @@ abstract Eo.Base () event_callback_forwarder_add { [[Add an event callback forwarder for an event and an object.]] params { -@in desc: const(Eo.Event_Description)*; [[The description of the event to listen to]] +@in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]] @in new_obj: Eo.Base *; [[The object to emit events from]] } } event_callback_forwarder_del { [[Remove an event callback forwarder for an event and an object.]] params { -@in desc: const(Eo.Event_Description)*; [[The description of the event to listen to]] +@in desc: const(Eo.Event.Description)*; [[The description of the event to listen to]] @in new_obj: Eo.Base *; [[The object to emit events from]] } } --
[EGIT] [core/efl] master 05/10: Eldbus: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=684d0059701faec13221f2a34a9d440fd31fb643 commit 684d0059701faec13221f2a34a9d440fd31fb643 Author: Tom Hacohen Date: Thu May 12 12:10:34 2016 +0100 Eldbus: Fix namespacing to use . and not _. --- src/lib/eldbus/eldbus_model_object.eo | 2 +- src/lib/eldbus/eldbus_model_proxy.eo | 2 +- src/lib/eldbus/eldbus_types.eot | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/eldbus/eldbus_model_object.eo b/src/lib/eldbus/eldbus_model_object.eo index 057797a..b269416 100644 --- a/src/lib/eldbus/eldbus_model_object.eo +++ b/src/lib/eldbus/eldbus_model_object.eo @@ -23,7 +23,7 @@ class Eldbus.Model.Object (Eo.Base, Efl.Model) { @since 1.16]] params { -@in connection: Eldbus_Connection*; [[Eldbus connection]] +@in connection: Eldbus.Connection*; [[Eldbus connection]] @in bus: const(char)*; [[DBus Name or unique-id]] @in path: const(char)*; [[DBus path]] } diff --git a/src/lib/eldbus/eldbus_model_proxy.eo b/src/lib/eldbus/eldbus_model_proxy.eo index 5c9cd40..bccd9bd 100644 --- a/src/lib/eldbus/eldbus_model_proxy.eo +++ b/src/lib/eldbus/eldbus_model_proxy.eo @@ -10,7 +10,7 @@ class Eldbus.Model.Proxy (Eo.Base, Efl.Model) { @since 1.16]] params { -@in object: Eldbus_Object *; [[Eldbus object]] +@in object: Eldbus.Object *; [[Eldbus object]] @in interface: const(Eldbus.Introspection.Interface)*; [[The introspected interface]] } } diff --git a/src/lib/eldbus/eldbus_types.eot b/src/lib/eldbus/eldbus_types.eot index 6788ac7..0ec9943 100644 --- a/src/lib/eldbus/eldbus_types.eot +++ b/src/lib/eldbus/eldbus_types.eot @@ -1,8 +1,8 @@ import eina_types; struct Eldbus.Proxy; -struct Eldbus_Connection; [[Represents a connection of one the type of connection with the DBus daemon.]] -struct Eldbus_Object; [[Represents an object path already attached with bus name or unique id]] +struct Eldbus.Connection; [[Represents a connection of one the type of connection with the DBus daemon.]] +struct Eldbus.Object; [[Represents an object path already attached with bus name or unique id]] enum Eldbus.Introspection.Argument_Direction { --
[EGIT] [core/efl] master 03/10: Efl gfx stroke: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=504cdda35156584874014201ba6cea8491a36a79 commit 504cdda35156584874014201ba6cea8491a36a79 Author: Tom Hacohen Date: Thu May 12 12:06:39 2016 +0100 Efl gfx stroke: Fix namespacing to use . and not _. --- src/lib/efl/interfaces/efl_gfx_types.eot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot b/src/lib/efl/interfaces/efl_gfx_types.eot index dedef83..d7a85d1 100644 --- a/src/lib/efl/interfaces/efl_gfx_types.eot +++ b/src/lib/efl/interfaces/efl_gfx_types.eot @@ -121,7 +121,7 @@ struct Efl.Gfx.Gradient.Stop a: int; [[The component A color of the graident stop]] } -struct Efl.Gfx.Stroke_Color +struct Efl.Gfx.Stroke.Color { [[Internal structure for @Efl.Gfx.Stroke.]] r: int; @@ -139,7 +139,7 @@ struct Efl.Gfx.Stroke scale: double; width: double; centered: double; - color: Efl.Gfx.Stroke_Color; + color: Efl.Gfx.Stroke.Color; dash: Efl.Gfx.Dash*; dash_length: uint; cap: Efl.Gfx.Cap; --
[EGIT] [core/efl] master 08/10: Elm image: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8183d6363e28a92e78a4b7feec99bd82b6207b23 commit 8183d6363e28a92e78a4b7feec99bd82b6207b23 Author: Tom Hacohen Date: Thu May 12 12:17:10 2016 +0100 Elm image: Fix namespacing to use . and not _. --- src/lib/elementary/elm_image.eo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/elm_image.eo b/src/lib/elementary/elm_image.eo index 38b9548..f7d4f9f 100644 --- a/src/lib/elementary/elm_image.eo +++ b/src/lib/elementary/elm_image.eo @@ -21,7 +21,7 @@ enum Elm.Image.Scale_Type should be equal to the corresponding dimension of the object.]] } -struct Elm.Image_Progress +struct Elm.Image.Progress { [[ Structure associated with smart callback 'download,progress'. --
[EGIT] [core/efl] master 02/10: Ecore con: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7c96c972bdaadf486fc1cc97da0e2aa560a55358 commit 7c96c972bdaadf486fc1cc97da0e2aa560a55358 Author: Tom Hacohen Date: Thu May 12 12:04:55 2016 +0100 Ecore con: Fix namespacing to use . and not _. --- src/lib/ecore_con/efl_network.eo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_con/efl_network.eo b/src/lib/ecore_con/efl_network.eo index 8e10801..f99bc3c 100644 --- a/src/lib/ecore_con/efl_network.eo +++ b/src/lib/ecore_con/efl_network.eo @@ -188,14 +188,14 @@ abstract Efl.Network (Eo.Base) { @virtual .send; } events { -data,received: Ecore_Con_Event_Data_Received; [[Data received on connection]] +data,received: Ecore.Con.Event_Data.Received; [[Data received on connection]] connection,upgraded; connection,error: const(char) *; [[Error received on connection]] } } /* FIXME: Should actually be a binbuf. */ -struct Ecore_Con_Event_Data_Received { +struct Ecore.Con.Event_Data.Received { data: void *; [[The data that got sent.]] size: int; [[The length of the data sent.]] } --
[EGIT] [core/efl] master 01/10: Ecore exe: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3d6238c04483080909112535d1cf580130b9d7b6 commit 3d6238c04483080909112535d1cf580130b9d7b6 Author: Tom Hacohen Date: Thu May 12 12:03:32 2016 +0100 Ecore exe: Fix namespacing to use . and not _. --- src/lib/ecore/ecore_exe.eo | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/ecore/ecore_exe.eo b/src/lib/ecore/ecore_exe.eo index 32952ee..d9c9c17 100644 --- a/src/lib/ecore/ecore_exe.eo +++ b/src/lib/ecore/ecore_exe.eo @@ -1,6 +1,6 @@ /* FIXME: The structures are not namespaced correctly. */ -struct Ecore.Exe_Event_Data_Line +struct Ecore.Exe.Event_Data.Line { [[A structure that stores information of lines data from a child process.]] line: char *; [[The bytes of a line of buffered data]] @@ -11,12 +11,12 @@ struct Ecore.Exe_Event_Data_Line * @struct _Ecore_Exe_Event_Data * @brief A structure that stores information of data from a child process event. */ -struct Ecore.Exe_Event_Data +struct Ecore.Exe.Event_Data { exe: Eo.Base *; [[The handle to the process. FIXME: should actually be Ecore.Exe, workaround cyclic]] data: void *; [[the raw binary data from the child process that was received]] size: int; [[the size of this data in bytes]] - lines: Ecore.Exe_Event_Data_Line *; [[an array of line data if line buffered, the last one has it's line member set to $NULL]] + lines: Ecore.Exe.Event_Data.Line *; [[an array of line data if line buffered, the last one has it's line member set to $NULL]] } enum Ecore.Exe_Flags @@ -70,8 +70,8 @@ class Ecore.Exe (Eo.Base, Efl.Control) .command; } events { -data,get: Ecore.Exe_Event_Data; [[Data received event from the child process]] -data,error: Ecore.Exe_Event_Data; [[Error received event from the child process]] +data,get: Ecore.Exe.Event_Data; [[Data received event from the child process]] +data,error: Ecore.Exe.Event_Data; [[Error received event from the child process]] } } --
[EGIT] [core/efl] master 01/01: Elm segment control item: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=345a02eac0a138b25059ad951aeb5f05d92fd7fd commit 345a02eac0a138b25059ad951aeb5f05d92fd7fd Author: Tom Hacohen Date: Thu May 12 12:22:10 2016 +0100 Elm segment control item: Fix namespacing to use . and not _. --- src/lib/elementary/elm_segment_control_item.eo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elementary/elm_segment_control_item.eo b/src/lib/elementary/elm_segment_control_item.eo index 760807e..8be8f4b 100644 --- a/src/lib/elementary/elm_segment_control_item.eo +++ b/src/lib/elementary/elm_segment_control_item.eo @@ -1,4 +1,4 @@ -class Elm.Segment_Control_Item(Elm.Widget.Item) +class Elm.Segment_Control.Item(Elm.Widget.Item) { eo_prefix: elm_obj_segment_control_item; methods { --
[EGIT] [core/efl] master 09/10: Evas smart cb: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1e61025c17e1b20551940ba5e80564ce726c051d commit 1e61025c17e1b20551940ba5e80564ce726c051d Author: Tom Hacohen Date: Thu May 12 12:17:57 2016 +0100 Evas smart cb: Fix namespacing to use . and not _. --- src/lib/evas/canvas/evas_object_smart.eo | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_smart.eo b/src/lib/evas/canvas/evas_object_smart.eo index c7357f3..0781dbe 100644 --- a/src/lib/evas/canvas/evas_object_smart.eo +++ b/src/lib/evas/canvas/evas_object_smart.eo @@ -1,7 +1,7 @@ /* XXX: Putting the next two as externs because this interface will hopefully be removed for efl 2.0, so no need to bother. */ struct @extern Evas.Smart; -struct @extern Evas.Smart_Cb_Description; +struct @extern Evas.Smart.Cb_Description; class Evas.Object.Smart (Evas.Object, Evas.Signal_Interface) { @@ -142,8 +142,8 @@ class Evas.Object.Smart (Evas.Object, Evas.Signal_Interface) return: bool; [[$true on success, $false on failure.]] params { -@in descriptions: const(Evas.Smart_Cb_Description)*; [[$null terminated array with -@Evas.Smart_Cb_Description descriptions. Array elements won't be +@in descriptions: const(Evas.Smart.Cb_Description)*; [[$null terminated array with +@Evas.Smart.Cb_Description descriptions. Array elements won't be modified at run time, but references to them and their contents will be made, so this array should be kept alive during the whole object's lifetime.]] @@ -168,12 +168,12 @@ class Evas.Object.Smart (Evas.Object, Evas.Signal_Interface) \@ref evas_smart_callbacks_descriptions_get().]] params { -@out class_descriptions: const(Evas.Smart_Cb_Description)**; [[Where to store class callbacks +@out class_descriptions: const(Evas.Smart.Cb_Description)**; [[Where to store class callbacks descriptions array, if any is known. If no descriptions are known, $null is returned.]] @out class_count: uint; [[Returns how many class callbacks descriptions are known.]] -@out instance_descriptions: const(Evas.Smart_Cb_Description)**; [[Where to store instance callbacks +@out instance_descriptions: const(Evas.Smart.Cb_Description)**; [[Where to store instance callbacks descriptions array, if any is known. If no descriptions are known, $null is returned.]] @out instance_count: uint; [[Returns how many instance callbacks @@ -200,10 +200,10 @@ class Evas.Object.Smart (Evas.Object, Evas.Signal_Interface) search have a special case for name being the same pointer as registered with Evas_Smart_Cb_Description, one can use it to avoid excessive use of strcmp().]] -@out class_description: const(Evas.Smart_Cb_Description)*; [[pointer to return class description or +@out class_description: const(Evas.Smart.Cb_Description)*; [[pointer to return class description or $null if not found. If parameter is $null, no search will be done on class descriptions.]] -@out instance_description: const(Evas.Smart_Cb_Description)*; [[pointer to return instance description.]] +@out instance_description: const(Evas.Smart.Cb_Description)*; [[pointer to return instance description.]] } } hide { --
[EGIT] [core/efl] master 01/01: Efl canvas surface: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=587560f82c463e34e64b8e0fc146eb7bfa26073e commit 587560f82c463e34e64b8e0fc146eb7bfa26073e Author: Tom Hacohen Date: Thu May 12 12:23:27 2016 +0100 Efl canvas surface: Fix namespacing to use . and not _. --- src/lib/evas/canvas/efl_canvas_surface_tbm.eo | 2 +- src/lib/evas/canvas/efl_canvas_surface_wayland.eo | 2 +- src/lib/evas/canvas/efl_canvas_surface_x11.eo | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo index 546cb21..be0e177 100644 --- a/src/lib/evas/canvas/efl_canvas_surface_tbm.eo +++ b/src/lib/evas/canvas/efl_canvas_surface_tbm.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Surface_Tbm (Efl.Canvas.Surface) +class Efl.Canvas.Surface.Tbm (Efl.Canvas.Surface) { [[Native Tizen Buffer Manager surface for Efl canvas]] diff --git a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo index 4734ef0..f06885e 100644 --- a/src/lib/evas/canvas/efl_canvas_surface_wayland.eo +++ b/src/lib/evas/canvas/efl_canvas_surface_wayland.eo @@ -1,4 +1,4 @@ -class Efl.Canvas.Surface_Wayland (Efl.Canvas.Surface) +class Efl.Canvas.Surface.Wayland (Efl.Canvas.Surface) { [[Native Wayland surface for Efl canvas]] diff --git a/src/lib/evas/canvas/efl_canvas_surface_x11.eo b/src/lib/evas/canvas/efl_canvas_surface_x11.eo index ea235a0..6a98ddd 100644 --- a/src/lib/evas/canvas/efl_canvas_surface_x11.eo +++ b/src/lib/evas/canvas/efl_canvas_surface_x11.eo @@ -5,7 +5,7 @@ struct Efl.Canvas.Surface.X11_Pixmap pixmap: ulong; [[X11 Pixmap ID.]] } -class Efl.Canvas.Surface_X11 (Efl.Canvas.Surface) +class Efl.Canvas.Surface.X11 (Efl.Canvas.Surface) { [[Native X11 surface for Efl canvas]] --
[EGIT] [core/efl] master 01/01: elua: install the docgen app
q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=13185fb88f8721d0e1dbca84bb601bd1489be1fe commit 13185fb88f8721d0e1dbca84bb601bd1489be1fe Author: Daniel Kolesa Date: Thu May 12 12:24:49 2016 +0100 elua: install the docgen app --- src/Makefile_Elua.am | 8 1 file changed, 8 insertions(+) diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am index bdf0d2d65..7b15e6e 100644 --- a/src/Makefile_Elua.am +++ b/src/Makefile_Elua.am @@ -61,6 +61,14 @@ eluaapps_DATA = \ EXTRA_DIST += $(eluaapps_DATA) +eluadocgendir = $(datadir)/elua/apps/docgen + +eluadocgen_DATA = \ + scripts/elua/apps/docgen/gendoc.lua \ + scripts/elua/apps/docgen/README.md + +EXTRA_DIST += $(eluadocgen_DATA) + eluamodulesdir = $(datadir)/elua/modules eluamodules_DATA = \ --
[EGIT] [core/efl] master 01/01: Ector cairo software: Fix namespacing to use . and not _.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=485ce14889acedeb93fa52fe2b4914a3f0a8ff63 commit 485ce14889acedeb93fa52fe2b4914a3f0a8ff63 Author: Tom Hacohen Date: Thu May 12 12:25:42 2016 +0100 Ector cairo software: Fix namespacing to use . and not _. --- src/lib/ector/cairo/ector_cairo_software_surface.eo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ector/cairo/ector_cairo_software_surface.eo b/src/lib/ector/cairo/ector_cairo_software_surface.eo index f835aa2..7ddcb0a 100644 --- a/src/lib/ector/cairo/ector_cairo_software_surface.eo +++ b/src/lib/ector/cairo/ector_cairo_software_surface.eo @@ -1,4 +1,4 @@ -class Ector.Cairo_Software.Surface (Ector.Cairo.Surface, Ector.Software.Buffer.Base) +class Ector.Cairo.Software.Surface (Ector.Cairo.Surface, Ector.Software.Buffer.Base) { [[Ector surface on a cairo software backend --
Re: [E-devel] I've finally decided to try Eula ...
On Thu, 12 May 2016 11:25:20 +0100 Daniel Kolesa wrote: > On Sun, May 8, 2016 at 10:15 AM, David Seikel > wrote: > > ... but how? > > > > Can't find any examples anywhere, or anything that is an obvious > > example. There really should be an obvious example in > > core/efl/src/examples. > > > > Well, I did find an example using Elementary on the web, but it fell > > over at the first line. > > Not sure what you are expecting from it, but it's not production > ready. It can be used for CLI scripts, but that's about it. I've been playing with Conky lately, replacing all the display bits with a Lua script running inside Conky. I then tried translating that to Edje Lua, configuring Conky to supply the values, but Edje can't run Conky itself, so parts had to be translated to C. Which led me to wonder how well Eula could handle the task. It's basically running Conky to get the various values, teaching it to output that as Lua, parsing strings, drawing graphs. Using Evas lines, rectangles, and text. Later I might replace Conky with pure EFL and shell code. I may even do a pure EFL C version. I'm benchmarking the lot against Conky doing all the work. Well, except for the measuring of Conky itself, that was better done in Lua. So only experiments, though I expect it will eventually lead to something useful. So no need to be production ready. It's what I do for fun. B-) -- A big old stinking pile of genius that no one wants coz there are too many silver coated monkeys in the world. signature.asc Description: PGP signature -- Mobile security can be enabling, not merely restricting. Employees who bring their own devices (BYOD) to work are irked by the imposition of MDM restrictions. Mobile Device Manager Plus allows you to control only the apps on BYO-devices by containerizing them, leaving personal data untouched! https://ad.doubleclick.net/ddm/clk/304595813;131938128;j___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] I've finally decided to try Eula ...
On 05/12/2016 09:03 PM, David Seikel wrote: > On Thu, 12 May 2016 11:25:20 +0100 Daniel Kolesa > wrote: > >> On Sun, May 8, 2016 at 10:15 AM, David Seikel >> wrote: >>> ... but how? >>> >>> Can't find any examples anywhere, or anything that is an obvious >>> example. There really should be an obvious example in >>> core/efl/src/examples. >>> >>> Well, I did find an example using Elementary on the web, but it fell >>> over at the first line. >> >> Not sure what you are expecting from it, but it's not production >> ready. It can be used for CLI scripts, but that's about it. > > I've been playing with Conky lately, replacing all the display bits > with a Lua script running inside Conky. I then tried translating that > to Edje Lua, configuring Conky to supply the values, but Edje can't run > Conky itself, so parts had to be translated to C. Which led me to > wonder how well Eula could handle the task. It's basically running > Conky to get the various values, teaching it to output that as Lua, > parsing strings, drawing graphs. Using Evas lines, rectangles, and > text. Later I might replace Conky with pure EFL and shell code. I may > even do a pure EFL C version. > > I'm benchmarking the lot against Conky doing all the work. Well, > except for the measuring of Conky itself, that was better done in Lua. > > So only experiments, though I expect it will eventually lead to > something useful. So no need to be production ready. It's what I do > for fun. B-) > A conky based e gadget would be awesome, for now i live with pinning it to the desktop, have fun playing. -- Simon Lees (Simotek)http://simotek.net Emergency Update Team keybase.io/simotek SUSE LinuxAdeliade Australia, UTC+9:30 GPG Fingerprint: 5B87 DB9D 88DC F606 E489 CEC5 0922 C246 02F0 014B signature.asc Description: OpenPGP digital signature -- Mobile security can be enabling, not merely restricting. Employees who bring their own devices (BYOD) to work are irked by the imposition of MDM restrictions. Mobile Device Manager Plus allows you to control only the apps on BYO-devices by containerizing them, leaving personal data untouched! https://ad.doubleclick.net/ddm/clk/304595813;131938128;j___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [e-users] EFL developers days
Le 12 mai 2016 12:52, "Felipe Magno de Almeida" a écrit : > > On May 12, 2016 12:37 AM, "Sung W. Park" wrote: > > > > wine tasting activity sounds nice.. ;-) > > Indeed. Will try to look up for a place, but 20 people is a lot for this kind of activity. Going to a wine bar is going to be easier. Cedric > -- > Felipe Magno de Almeida > > > On Thu, May 12, 2016 at 1:50 AM, Tom Hacohen wrote: > > > > > It's dark inside anyway, so you wouldn't know any better. It's not > > > necessarily an evening thing. > > > > > > The problem is that climbing is something that you need to be strong > for, > > > or at least have the technique, and many people don't like it (I > personally > > > do). The other one, the museum, is not a very good social event because > you > > > need to be quiet and you wander off on your own. > > > > > > I know it's not your thing, but another idea that just came to mind > that is > > > more of a Parisian themed idea: wine tasting activity, or a cooking > > > activity or something of that sort. > > > > > > My personal favourite is bowling, but I think almost any idea is better > > > than the museum (which because of the above we'll end up doing). > > > > > > > > > On Wed, May 11, 2016 at 5:43 PM, Cedric BAIL > wrote: > > > > > > > On Wed, May 11, 2016 at 2:46 AM, Tom Hacohen > > > wrote: > > > > > On 11/05/16 10:45, Tom Hacohen wrote: > > > > >> On 11/05/16 08:50, Stefan Schmidt wrote: > > > > >>> On 05/05/16 01:55, Cedric BAIL wrote: > > > > I would like to remind everyone that EFL developers days will > happen > > > > later this month in Paris. If you have made your decision, it > would > > > be > > > > good to update your vote > > > > ( > > > > > > > > https://phab.enlightenment.org/w/events/enlightenment_developer_days_2016/ > > > > ). > > > > > > > > Also as a big part of the event is to do hacking together, don't > > > > hesitate to bring your prefered device along ! > > > > > > > > Also as Saturday afternoon, we will try to setup some social > event > > > and > > > > by just the actual number of expected people, it will be > necessary > > > to > > > > book whatever we finally plan to do. So here is a vote > > > > https://phab.enlightenment.org/V23 . If people have other idea > than > > > > climbing or visiting the Musee des Arts et Metiers, please raise > > > your > > > > hands now ! The vote will be closed in a week from now. > > > > >>> > > > > >>> So far we only have 5 votes but 22 registered attendees. :) > > > > >>> > > > > >>> As an additional note please let me know if you have any input for > > > > >>> hacking sessions we have planned. > > > > >>> I will put some slides together with topics people can work on > during > > > > >>> this sessions. > > > > >> > > > > >> Posting again with some more info + both ML this time. :) > > > > >> > > > > >> I'm sorry I'm only bringing it up now, but I didn't see the vote. > The > > > > >> subject "EFL developers day" with the generic reminder first > paragraph > > > > >> meant I didn't read the rest of the email and see this. Please when > > > you > > > > >> have a "call for action" mark the title as such, or at the very > least, > > > > >> have a non generic title. I'm only seeing this now because of > Stefan's > > > > >> email. > > > > >> > > > > >> In the last email we talked about ideas there were plenty more, > like > > > > >> paintball and kart racing. Why are they not in this vote? > > > > > > > > > > Or bowling. > > > > > > > > There isnt any painball or kart racing track that I know of inside > > > > Paris or at a short distance. Bowling is another possibility, but > > > > isn't it more something you do in the evening ? > > > > -- > > > > Cedric BAIL > > > > > > > > > > > > > > > > -- > > > > Mobile security can be enabling, not merely restricting. Employees who > > > > bring their own devices (BYOD) to work are irked by the imposition of > MDM > > > > restrictions. Mobile Device Manager Plus allows you to control only > the > > > > apps on BYO-devices by containerizing them, leaving personal data > > > > untouched! > > > > https://ad.doubleclick.net/ddm/clk/304595813;131938128;j > > > > ___ > > > > enlightenment-devel mailing list > > > > enlightenment-devel@lists.sourceforge.net > > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > > > > > > -- > > > Mobile security can be enabling, not merely restricting. Employees who > > > bring their own devices (BYOD) to work are irked by the imposition of > MDM > > > restrictions. Mobile Device Manager Plus allows you to control only the > > > apps on BYO-devices by containerizing them, leaving personal data > > > untouched! > > > https://ad.doubleclick.net/ddm/clk/304595813;131938128;j > > >
Re: [E-devel] [e-users] EFL developers days
On Thu, May 12, 2016 at 9:41 AM, Cedric BAIL wrote: > Le 12 mai 2016 12:52, "Felipe Magno de Almeida" > a écrit : >> >> On May 12, 2016 12:37 AM, "Sung W. Park" wrote: >> > >> > wine tasting activity sounds nice.. ;-) >> >> Indeed. > > Will try to look up for a place, but 20 people is a lot for this kind of > activity. Going to a wine bar is going to be easier. Maybe it should be voted first? I don't know if most people agree. > Cedric > >> -- >> Felipe Magno de Almeida >> >> > On Thu, May 12, 2016 at 1:50 AM, Tom Hacohen wrote: >> > >> > > It's dark inside anyway, so you wouldn't know any better. It's not >> > > necessarily an evening thing. >> > > >> > > The problem is that climbing is something that you need to be strong >> for, >> > > or at least have the technique, and many people don't like it (I >> personally >> > > do). The other one, the museum, is not a very good social event > because >> you >> > > need to be quiet and you wander off on your own. >> > > >> > > I know it's not your thing, but another idea that just came to mind >> that is >> > > more of a Parisian themed idea: wine tasting activity, or a cooking >> > > activity or something of that sort. >> > > >> > > My personal favourite is bowling, but I think almost any idea is > better >> > > than the museum (which because of the above we'll end up doing). >> > > >> > > >> > > On Wed, May 11, 2016 at 5:43 PM, Cedric BAIL >> wrote: >> > > >> > > > On Wed, May 11, 2016 at 2:46 AM, Tom Hacohen >> > > wrote: >> > > > > On 11/05/16 10:45, Tom Hacohen wrote: >> > > > >> On 11/05/16 08:50, Stefan Schmidt wrote: >> > > > >>> On 05/05/16 01:55, Cedric BAIL wrote: >> > > > I would like to remind everyone that EFL developers days will >> happen >> > > > later this month in Paris. If you have made your decision, it >> would >> > > be >> > > > good to update your vote >> > > > ( >> > > > >> > > >> https://phab.enlightenment.org/w/events/enlightenment_developer_days_2016/ >> > > > ). >> > > > >> > > > Also as a big part of the event is to do hacking together, > don't >> > > > hesitate to bring your prefered device along ! >> > > > >> > > > Also as Saturday afternoon, we will try to setup some social >> event >> > > and >> > > > by just the actual number of expected people, it will be >> necessary >> > > to >> > > > book whatever we finally plan to do. So here is a vote >> > > > https://phab.enlightenment.org/V23 . If people have other idea >> than >> > > > climbing or visiting the Musee des Arts et Metiers, please > raise >> > > your >> > > > hands now ! The vote will be closed in a week from now. >> > > > >>> >> > > > >>> So far we only have 5 votes but 22 registered attendees. :) >> > > > >>> >> > > > >>> As an additional note please let me know if you have any input > for >> > > > >>> hacking sessions we have planned. >> > > > >>> I will put some slides together with topics people can work on >> during >> > > > >>> this sessions. >> > > > >> >> > > > >> Posting again with some more info + both ML this time. :) >> > > > >> >> > > > >> I'm sorry I'm only bringing it up now, but I didn't see the vote. >> The >> > > > >> subject "EFL developers day" with the generic reminder first >> paragraph >> > > > >> meant I didn't read the rest of the email and see this. Please > when >> > > you >> > > > >> have a "call for action" mark the title as such, or at the very >> least, >> > > > >> have a non generic title. I'm only seeing this now because of >> Stefan's >> > > > >> email. >> > > > >> >> > > > >> In the last email we talked about ideas there were plenty more, >> like >> > > > >> paintball and kart racing. Why are they not in this vote? >> > > > > >> > > > > Or bowling. >> > > > >> > > > There isnt any painball or kart racing track that I know of inside >> > > > Paris or at a short distance. Bowling is another possibility, but >> > > > isn't it more something you do in the evening ? >> > > > -- >> > > > Cedric BAIL >> > > > >> > > > >> > > > >> > > >> > -- >> > > > Mobile security can be enabling, not merely restricting. Employees > who >> > > > bring their own devices (BYOD) to work are irked by the imposition > of >> MDM >> > > > restrictions. Mobile Device Manager Plus allows you to control only >> the >> > > > apps on BYO-devices by containerizing them, leaving personal data >> > > > untouched! >> > > > https://ad.doubleclick.net/ddm/clk/304595813;131938128;j >> > > > ___ >> > > > enlightenment-devel mailing list >> > > > enlightenment-devel@lists.sourceforge.net >> > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > > > >> > > >> > > >> > -- >> > > Mobile security can be enabling, not merely restricting. Employees who >> > > bring their own devices (BYOD) to wo
[E-devel] Changing the object lifecycle - removal of eo_del, and allowing unref when there is a parent
Hey, This email assumes some knowledge of Eo in order to keep it short. eo_del() was introduced partially as a continuation to what was in evas, and partially as a solution to circumstances that no longer apply. In short, it is no longer necessary to have eo_del() as separate from eo_unref(). In Eo, parents have a reference to their children that they own. eo_del() at the moment unparents if there is a parent (which in turn unrefs) or just unrefs if there isn't one. That is, it is the counterpart to eo_add(). It is illegal in eo at the moment to unref() an object to the point of deletion if it still has a parent, so "eo_add(CLASS, parent); eo_unref();" is illegal. The problem with that is that you now in some cases need to understand if you want to call del() or call unref(). This distinction adds complication and doesn't add any significant safety over just allowing to unref. Therefore, I suggest we just allow unreffing the last ref (the parent one) with eo_unref() which will implicitly unparent the object as the correct legal way of deleting an object. Essentially this mean we define that the parent reference is shared with the programmer. Do you have any objections or concerns about this? It cleans up some of the handling with proxy objects, and in general it just feels more correct and will make things simpler. Somehow unrelated: while eo_del() wasn't used this way, there is a good reason why to have an eo function that is somehow equivalent to eo_del() but behaves differently (more in the way raster wants del to behave). I would call it eo_halt() though a better name may be needed. eo_halt() has nothing to do with object lifecycle. It doesn't ref or unref or doesn't do anything of that kind. All it does is "halts" the object in a class specific way. So for example, for Efl.Network, it will stop all traffic and kill the connection (but will keep the object alive), for Ui objects it will hide them, maybe unswallow them, but will keep the objects alive and etc... What do you think about the two ideas? I will probably also mention them in my talk, but I'd love to hear some feedback before so maybe I can just make the change. Thanks, Tom. -- Mobile security can be enabling, not merely restricting. Employees who bring their own devices (BYOD) to work are irked by the imposition of MDM restrictions. Mobile Device Manager Plus allows you to control only the apps on BYO-devices by containerizing them, leaving personal data untouched! https://ad.doubleclick.net/ddm/clk/304595813;131938128;j ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [e-users] EFL developers days
On 12/05/16 13:41, Cedric BAIL wrote: > Le 12 mai 2016 12:52, "Felipe Magno de Almeida" > a écrit : >> >> On May 12, 2016 12:37 AM, "Sung W. Park" wrote: >>> >>> wine tasting activity sounds nice.. ;-) >> >> Indeed. > > Will try to look up for a place, but 20 people is a lot for this kind of > activity. Going to a wine bar is going to be easier. Maybe check this, check bowling, add those two to the list, have a blitz vote. If this wins, check if possible, if so, do it, otherwise do the runner up. Worse case we can move the activity to Sunday if Saturday evening is a problem. -- Tom. > > Cedric > >> -- >> Felipe Magno de Almeida >> >>> On Thu, May 12, 2016 at 1:50 AM, Tom Hacohen wrote: >>> It's dark inside anyway, so you wouldn't know any better. It's not necessarily an evening thing. The problem is that climbing is something that you need to be strong >> for, or at least have the technique, and many people don't like it (I >> personally do). The other one, the museum, is not a very good social event > because >> you need to be quiet and you wander off on your own. I know it's not your thing, but another idea that just came to mind >> that is more of a Parisian themed idea: wine tasting activity, or a cooking activity or something of that sort. My personal favourite is bowling, but I think almost any idea is > better than the museum (which because of the above we'll end up doing). On Wed, May 11, 2016 at 5:43 PM, Cedric BAIL >> wrote: > On Wed, May 11, 2016 at 2:46 AM, Tom Hacohen wrote: >> On 11/05/16 10:45, Tom Hacohen wrote: >>> On 11/05/16 08:50, Stefan Schmidt wrote: On 05/05/16 01:55, Cedric BAIL wrote: > I would like to remind everyone that EFL developers days will >> happen > later this month in Paris. If you have made your decision, it >> would be > good to update your vote > ( > >> https://phab.enlightenment.org/w/events/enlightenment_developer_days_2016/ > ). > > Also as a big part of the event is to do hacking together, > don't > hesitate to bring your prefered device along ! > > Also as Saturday afternoon, we will try to setup some social >> event and > by just the actual number of expected people, it will be >> necessary to > book whatever we finally plan to do. So here is a vote > https://phab.enlightenment.org/V23 . If people have other idea >> than > climbing or visiting the Musee des Arts et Metiers, please > raise your > hands now ! The vote will be closed in a week from now. So far we only have 5 votes but 22 registered attendees. :) As an additional note please let me know if you have any input > for hacking sessions we have planned. I will put some slides together with topics people can work on >> during this sessions. >>> >>> Posting again with some more info + both ML this time. :) >>> >>> I'm sorry I'm only bringing it up now, but I didn't see the vote. >> The >>> subject "EFL developers day" with the generic reminder first >> paragraph >>> meant I didn't read the rest of the email and see this. Please > when you >>> have a "call for action" mark the title as such, or at the very >> least, >>> have a non generic title. I'm only seeing this now because of >> Stefan's >>> email. >>> >>> In the last email we talked about ideas there were plenty more, >> like >>> paintball and kart racing. Why are they not in this vote? >> >> Or bowling. > > There isnt any painball or kart racing track that I know of inside > Paris or at a short distance. Bowling is another possibility, but > isn't it more something you do in the evening ? > -- > Cedric BAIL > > > >> > -- > Mobile security can be enabling, not merely restricting. Employees > who > bring their own devices (BYOD) to work are irked by the imposition > of >> MDM > restrictions. Mobile Device Manager Plus allows you to control only >> the > apps on BYO-devices by containerizing them, leaving personal data > untouched! > https://ad.doubleclick.net/ddm/clk/304595813;131938128;j > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > >> > -- Mobile security can be enabling, not merely restricting. Employees who bring their own devices (BYOD) to work are irked by the imposition of >> MDM restrictions. Mobile Device Manager Plus allows you to control only > th
[EGIT] [core/efl] master 01/01: Eo abstract class: Rename to Eo.Class.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6cacef250391aea0a62cb888df90679ebb64cd53 commit 6cacef250391aea0a62cb888df90679ebb64cd53 Author: Tom Hacohen Date: Thu May 12 14:33:40 2016 +0100 Eo abstract class: Rename to Eo.Class. --- src/Makefile_Eo.am | 2 +- src/Makefile_Eo_Cxx.am | 4 ++-- src/lib/ector/ector_surface.eo | 2 +- src/lib/eo/Eo.h | 3 ++- src/lib/eo/Makefile.am | 2 +- src/lib/eo/eo.c | 4 ++-- src/lib/eo/eo_abstract_class.eo | 4 src/lib/eo/eo_class.eo | 4 src/lib/eo/eo_class_class.c | 2 +- src/tests/eo/suite/eo_test_general.c | 2 +- 10 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am index 1264b36..2626f3f 100644 --- a/src/Makefile_Eo.am +++ b/src/Makefile_Eo.am @@ -3,7 +3,7 @@ eo_eolian_files = \ lib/eo/eo_base.eo \ - lib/eo/eo_abstract_class.eo \ + lib/eo/eo_class.eo \ lib/eo/eo_interface.eo eo_eolian_c = $(eo_eolian_files:%.eo=%.eo.c) diff --git a/src/Makefile_Eo_Cxx.am b/src/Makefile_Eo_Cxx.am index a3c898d..8153058 100644 --- a/src/Makefile_Eo_Cxx.am +++ b/src/Makefile_Eo_Cxx.am @@ -4,8 +4,8 @@ generated_eo_cxx_bindings = \ lib/eo/eo_base.eo.hh \ lib/eo/eo_base.eo.impl.hh \ -lib/eo/eo_abstract_class.eo.hh \ -lib/eo/eo_abstract_class.eo.impl.hh +lib/eo/eo_class.eo.hh \ +lib/eo/eo_class.eo.impl.hh ### Library diff --git a/src/lib/ector/ector_surface.eo b/src/lib/ector/ector_surface.eo index 92eb68d..aea7357 100644 --- a/src/lib/ector/ector_surface.eo +++ b/src/lib/ector/ector_surface.eo @@ -19,7 +19,7 @@ mixin Ector.Surface (Ector.Buffer) [[Create a new renderer factory for the given type]] return: Eo.Base *; /* FIXME: Should be a more restricted type, only here for cyclic. */ params { -@in type: const(Eo.Abstract_Class) * @nonull; /* FIXME: Should probably be a more restricted type */ +@in type: const(Eo.Class) * @nonull; /* FIXME: Should probably be a more restricted type */ } } } diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 6152d4f..c46d231 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -117,6 +117,7 @@ typedef struct _Eo_Opaque Eo; * The basic class type - should be removed, just for compat. */ typedef Eo Eo_Class; +#define _EO_CLASS_EO_CLASS_TYPE /** * @var _eo_class_creation_lock @@ -935,7 +936,7 @@ EAPI Eina_Bool eo_destructed_is(const Eo *obj); * @{ */ -#include "eo_abstract_class.eo.h" +#include "eo_class.eo.h" /** * @} diff --git a/src/lib/eo/Makefile.am b/src/lib/eo/Makefile.am index c86764b..351576f 100644 --- a/src/lib/eo/Makefile.am +++ b/src/lib/eo/Makefile.am @@ -5,7 +5,7 @@ include ../../Makefile_Eolian_Subbuild_Helper.am ### Library eo_eolian_files = \ eo_base.eo \ - eo_abstract_class.eo \ + eo_class.eo \ eo_interface.eo eo_eolian_c = $(eo_eolian_files:%.eo=%.eo.c) diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index 7d707a4..bac6c3a 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -760,7 +760,7 @@ eo_class_get(const Eo *eo_id) if (_eo_is_a_class(eo_id)) { EO_CLASS_POINTER_RETURN_VAL(eo_id, _klass, NULL); -return EO_ABSTRACT_CLASS_CLASS; +return EO_CLASS_CLASS; } EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, NULL); @@ -1649,7 +1649,7 @@ eo_init(void) EINA_LOG_STATE_INIT); /* bootstrap EO_CLASS_CLASS */ - (void) EO_ABSTRACT_CLASS_CLASS; + (void) EO_CLASS_CLASS; return EINA_TRUE; } diff --git a/src/lib/eo/eo_abstract_class.eo b/src/lib/eo/eo_abstract_class.eo deleted file mode 100644 index 86b2f7f..000 --- a/src/lib/eo/eo_abstract_class.eo +++ /dev/null @@ -1,4 +0,0 @@ -abstract Eo.Abstract_Class () -{ -data: null; -} diff --git a/src/lib/eo/eo_class.eo b/src/lib/eo/eo_class.eo new file mode 100644 index 000..4e37f34 --- /dev/null +++ b/src/lib/eo/eo_class.eo @@ -0,0 +1,4 @@ +abstract Eo.Class () +{ +data: null; +} diff --git a/src/lib/eo/eo_class_class.c b/src/lib/eo/eo_class_class.c index d356755..7c5ca65 100644 --- a/src/lib/eo/eo_class_class.c +++ b/src/lib/eo/eo_class_class.c @@ -4,5 +4,5 @@ #include "Eo.h" -#include "eo_abstract_class.eo.c" +#include "eo_class.eo.c" diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c index 6578864..014546e 100644 --- a/src/tests/eo/suite/eo_test_general.c +++ b/src/tests/eo/suite/eo_test_general.c @@ -730,7 +730,7 @@ START_TEST(eo_magic_checks) fail_if(eo_class_get((Eo *) buf)); fail_if(eo_class_name_get((Eo_Class*) buf)); fail_if(eo_class_get(obj) != SIMPLE_CLASS); -fail_if(eo_class_get(SIMPLE_CLASS) != EO_ABSTRACT_CLASS_CLASS); +fail_if(eo_class_get(SIMPLE_CLASS) != EO_CLASS_CLASS); simple_a_set((Eo_Class *) b
[EGIT] [tools/eflete] master 09/11: group_navi: update the icons name accourdingly to freedesktop standart
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=87cc936497f9f2059c765e63335b63f2925fdb95 commit 87cc936497f9f2059c765e63335b63f2925fdb95 Author: Vyacheslav Reutskiy Date: Thu May 12 10:44:57 2016 +0300 group_navi: update the icons name accourdingly to freedesktop standart Change-Id: I93d65ecc6e3487daf08ec0a357cc217875e182b4 --- src/bin/ui/workspace/group_navigator.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/ui/workspace/group_navigator.c b/src/bin/ui/workspace/group_navigator.c index 860d94b..456813d 100644 --- a/src/bin/ui/workspace/group_navigator.c +++ b/src/bin/ui/workspace/group_navigator.c @@ -1914,9 +1914,9 @@ group_navigator_add(Evas_Object *parent, Group *group) evas_object_smart_callback_add(pl->btn_add, "clicked", _on_btn_plus_clicked, pl); BTN_ADD(pl->layout, pl->btn_del, "elm.swallow.btn2", "minus"); evas_object_smart_callback_add(pl->btn_del, "clicked", _on_btn_minus_clicked, pl); - BTN_ADD(pl->layout, pl->btn_down, "elm.swallow.btn1", "arrow_down"); + BTN_ADD(pl->layout, pl->btn_down, "elm.swallow.btn1", "go-down"); evas_object_smart_callback_add(pl->btn_down, "clicked", _on_btn_down_clicked, pl); - BTN_ADD(pl->layout, pl->btn_up, "elm.swallow.btn0", "arrow_up"); + BTN_ADD(pl->layout, pl->btn_up, "elm.swallow.btn0", "go-up"); evas_object_smart_callback_add(pl->btn_up, "clicked", _on_btn_up_clicked, pl); elm_object_disabled_set(pl->btn_del, true); @@ -2029,8 +2029,8 @@ group_navigator_dummy_get(void) elm_layout_theme_set(dummy_navi, "layout", "navigator", "default"); BTN_ADD(dummy_navi, btn, "elm.swallow.btn3", "plus"); BTN_ADD(dummy_navi, btn, "elm.swallow.btn2", "minus"); - BTN_ADD(dummy_navi, btn, "elm.swallow.btn1", "arrow_down"); - BTN_ADD(dummy_navi, btn, "elm.swallow.btn0", "arrow_up"); + BTN_ADD(dummy_navi, btn, "elm.swallow.btn1", "go-down"); + BTN_ADD(dummy_navi, btn, "elm.swallow.btn0", "go-up"); genlist = elm_genlist_add(dummy_navi); elm_layout_content_set(dummy_navi, NULL, genlist); --
[EGIT] [tools/eflete] master 03/11: tabs: set the group navi to new place on tabs switch
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=fd583f420efcfa653404bce0ec926ecfbeccf2be commit fd583f420efcfa653404bce0ec926ecfbeccf2be Author: Vyacheslav Reutskiy Date: Thu May 12 08:20:46 2016 +0300 tabs: set the group navi to new place on tabs switch Change-Id: I9562dd02b100833b70c6ac77f228cf5e1513f630 --- src/bin/eflete.h | 1 + src/bin/ui/main_window.c | 10 +- src/bin/ui/tabs.c| 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/bin/eflete.h b/src/bin/eflete.h index 7f3210c..ad06da6 100644 --- a/src/bin/eflete.h +++ b/src/bin/eflete.h @@ -96,6 +96,7 @@ struct _App_Data struct { Evas_Object *left; Evas_Object *right; + Evas_Object *left_ver; } panes; struct { diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c index 004f86e..14d3bd6 100644 --- a/src/bin/ui/main_window.c +++ b/src/bin/ui/main_window.c @@ -143,15 +143,15 @@ ui_main_window_add(void) /* add panes to main window */ ap.panes.left = elm_panes_add(ap.win); - evas_object_size_hint_weight_set(ap.panes.left, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(ap.panes.left, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_part_content_set(ap.win_layout, "eflete.swallow.panes", ap.panes.left); ap.panes.right = elm_panes_add(ap.win); - evas_object_size_hint_weight_set(ap.panes.right, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(ap.panes.right, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_part_content_set(ap.panes.left, "right", ap.panes.right); + ap.panes.left_ver = elm_panes_add(ap.win); + elm_panes_horizontal_set(ap.panes.left_ver, true); + elm_object_part_content_set(ap.panes.left, "left", ap.panes.left_ver); + /* apply the panes size from config */ elm_panes_content_left_size_set(ap.panes.left, config->panes.left); elm_panes_content_left_size_set(ap.panes.right, config->panes.right); @@ -159,7 +159,7 @@ ui_main_window_add(void) project_navigator = project_navigator_add(); evas_object_smart_callback_add(project_navigator, SIGNAL_GROUP_OPEN, _project_navigator_group_open, NULL); - elm_object_part_content_set(ap.panes.left, "left", project_navigator); + elm_object_part_content_set(ap.panes.left_ver, "left", project_navigator); tabs = tabs_add(); elm_object_part_content_set(ap.panes.right, "left", tabs); diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c index 901a092..f564de9 100644 --- a/src/bin/ui/tabs.c +++ b/src/bin/ui/tabs.c @@ -88,6 +88,8 @@ _content_unset(void) tabs.current_group = NULL; content = elm_layout_content_unset(tabs.layout, NULL); evas_object_hide(content); + content = elm_object_part_content_unset(ap.panes.left_ver, "right"); + evas_object_hide(content); } static void @@ -109,6 +111,7 @@ _content_set(void *data, elm_layout_content_set(tabs.layout, NULL, item->content); if (!item->group) return; +elm_object_part_content_set(ap.panes.left_ver, "right", workspace_group_navigator_get(item->content)); tabs.current_workspace = item->content; tabs.current_group = item->group; if (ap.project) --
[EGIT] [tools/eflete] master 10/11: workspace: add signal for mode change event
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=105633f63183c8203877f6753acb08e7986a984e commit 105633f63183c8203877f6753acb08e7986a984e Author: Vyacheslav Reutskiy Date: Thu May 12 11:57:08 2016 +0300 workspace: add signal for mode change event Change-Id: Id5c60878daf69000899a2ea81f8b69bee81d8db6 --- src/bin/common/signals.h | 7 +++ src/bin/ui/workspace/workspace.c | 1 + 2 files changed, 8 insertions(+) diff --git a/src/bin/common/signals.h b/src/bin/common/signals.h index 90bbe1e..c2f9553 100644 --- a/src/bin/common/signals.h +++ b/src/bin/common/signals.h @@ -491,4 +491,11 @@ typedef struct { */ #define SIGNAL_SHORTCUT_TAB_NUM "SIGNAL_SHORTCUT_TAB_NUM" +/** + * emited when workspace is changed. + * event_info - pointer to mode (Workspace_Mode *) + * + * @ingroup Window + */ +#define SIGNAL_WORKSPACE_MODE_CHANGED "SIGNAL_WORKSPACE_MODE_CHANGED" #endif /* SIGNALS_H*/ diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index eee639a..ab7b721 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -764,6 +764,7 @@ _mode_cb(void *data, break; } + evas_object_smart_callback_call(ap.win, SIGNAL_WORKSPACE_MODE_CHANGED, &wd->mode); assert (area != NULL); if (container_aspect_get(area->container) < 0) --
[EGIT] [tools/eflete] master 07/11: group_navigator: add dummy object
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=ecd555fd5b8e28717197175c26b49b1c3183df80 commit ecd555fd5b8e28717197175c26b49b1c3183df80 Author: Vyacheslav Reutskiy Date: Thu May 12 10:32:44 2016 +0300 group_navigator: add dummy object This object will be setted instead the real group navi, taked from workspace. Change-Id: I84a7b771b560df925cbf8edb5ce85dcb8c547301 --- src/bin/ui/workspace/group_navigator.c | 54 ++ src/bin/ui/workspace/group_navigator.h | 3 ++ src/bin/ui/workspace/workspace.c | 2 ++ 3 files changed, 46 insertions(+), 13 deletions(-) diff --git a/src/bin/ui/workspace/group_navigator.c b/src/bin/ui/workspace/group_navigator.c index 3e12e30..860d94b 100644 --- a/src/bin/ui/workspace/group_navigator.c +++ b/src/bin/ui/workspace/group_navigator.c @@ -29,6 +29,8 @@ #define GROUP_NAVIGATOR_DATA "group_navigator_data" +static Evas_Object *dummy_navi = NULL; + typedef struct { Group *group; @@ -95,6 +97,14 @@ static const char *program_actions[] = { static const unsigned int part_types_count = 12; +#define BTN_ADD(LAYOUT, BTN, SWALLOW, ICON_NAME) \ + BTN = elm_button_add(LAYOUT); \ + ICON_STANDARD_ADD(BTN, icon, true, ICON_NAME); \ + elm_layout_content_set(BTN, NULL, icon); \ + elm_object_style_set(BTN, "anchor"); \ + elm_object_part_content_set(LAYOUT, SWALLOW, BTN); + + static char * _resource_label_get(void *data, Evas_Object *obj __UNUSED__, @@ -1900,24 +1910,19 @@ group_navigator_add(Evas_Object *parent, Group *group) pl->group = group; -#define BTN_ADD(BTN, SWALLOW, ICON_NAME, CALLBACK) \ - pl->BTN = elm_button_add(pl->layout); \ - ICON_STANDARD_ADD(pl->BTN, icon, true, ICON_NAME); \ - elm_object_part_content_set(pl->BTN, NULL, icon); \ - evas_object_smart_callback_add(pl->BTN, "clicked", CALLBACK, pl); \ - elm_object_style_set(pl->BTN, "anchor"); \ - elm_object_part_content_set(pl->layout, SWALLOW, pl->BTN); - - BTN_ADD(btn_add, "elm.swallow.btn3", "plus", _on_btn_plus_clicked); - BTN_ADD(btn_del, "elm.swallow.btn2", "minus", _on_btn_minus_clicked); - BTN_ADD(btn_down, "elm.swallow.btn1", "arrow_down", _on_btn_down_clicked); - BTN_ADD(btn_up, "elm.swallow.btn0", "arrow_up", _on_btn_up_clicked); + BTN_ADD(pl->layout, pl->btn_add, "elm.swallow.btn3", "plus"); + evas_object_smart_callback_add(pl->btn_add, "clicked", _on_btn_plus_clicked, pl); + BTN_ADD(pl->layout, pl->btn_del, "elm.swallow.btn2", "minus"); + evas_object_smart_callback_add(pl->btn_del, "clicked", _on_btn_minus_clicked, pl); + BTN_ADD(pl->layout, pl->btn_down, "elm.swallow.btn1", "arrow_down"); + evas_object_smart_callback_add(pl->btn_down, "clicked", _on_btn_down_clicked, pl); + BTN_ADD(pl->layout, pl->btn_up, "elm.swallow.btn0", "arrow_up"); + evas_object_smart_callback_add(pl->btn_up, "clicked", _on_btn_up_clicked, pl); elm_object_disabled_set(pl->btn_del, true); elm_object_disabled_set(pl->btn_down, true); elm_object_disabled_set(pl->btn_up, true); -#undef BTN_ADD pl->itc_part = elm_genlist_item_class_new(); pl->itc_part->item_style = "part"; pl->itc_part->func.text_get = _resource_label_get; @@ -2013,6 +2018,29 @@ group_navigator_add(Evas_Object *parent, Group *group) return pl->layout; } +Evas_Object * +group_navigator_dummy_get(void) +{ + Evas_Object *btn, *genlist, *icon; + + if (dummy_navi) goto exit; + + dummy_navi = elm_layout_add(ap.win); + elm_layout_theme_set(dummy_navi, "layout", "navigator", "default"); + BTN_ADD(dummy_navi, btn, "elm.swallow.btn3", "plus"); + BTN_ADD(dummy_navi, btn, "elm.swallow.btn2", "minus"); + BTN_ADD(dummy_navi, btn, "elm.swallow.btn1", "arrow_down"); + BTN_ADD(dummy_navi, btn, "elm.swallow.btn0", "arrow_up"); + + genlist = elm_genlist_add(dummy_navi); + elm_layout_content_set(dummy_navi, NULL, genlist); + + elm_object_disabled_set(dummy_navi, true); +exit: + evas_object_show(dummy_navi); + return dummy_navi; +} + void group_navigator_part_select(Evas_Object *obj, Part *part) { diff --git a/src/bin/ui/workspace/group_navigator.h b/src/bin/ui/workspace/group_navigator.h index b03105e..a1381af 100644 --- a/src/bin/ui/workspace/group_navigator.h +++ b/src/bin/ui/workspace/group_navigator.h @@ -50,6 +50,9 @@ Evas_Object * group_navigator_add(Evas_Object *parent, Group *group); +Evas_Object * +group_navigator_dummy_get(void); + /** * @ingroup Partlist */ diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index 9b606ec..eee639a 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -1613,6 +1613,8 @@ workspace_code_changed(Evas_Object *obj) Evas_Object * workspace_group_navigator_get(Evas_Object *obj) { + if (!obj) return group_navigator_dummy_get(); + WS_DATA_GET(obj); return wd->group_navi; } --
[EGIT] [tools/eflete] master 04/11: config: delete duplicate data from config
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=5df0a91bf78cd87987840e3dd6795891e1f456d4 commit 5df0a91bf78cd87987840e3dd6795891e1f456d4 Author: Vyacheslav Reutskiy Date: Thu May 12 08:59:43 2016 +0300 config: delete duplicate data from config Change-Id: Iba535298148962ea8b73d3dee57a77dfdf75fb33 --- src/bin/config/config.c | 6 +- src/bin/config/config.h | 1 - src/bin/ui/main_window.c | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/bin/config/config.c b/src/bin/config/config.c index db2679d..3ad91af 100644 --- a/src/bin/config/config.c +++ b/src/bin/config/config.c @@ -130,7 +130,6 @@ config_init(void) EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Config, "panes.left", panes.left, EET_T_DOUBLE); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Config, "panes.right", panes.right, EET_T_DOUBLE); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Config, "panes.tabs_size", panes.tabs_size, EET_T_DOUBLE); eet_eina_stream_data_descriptor_class_set(&eddcr, sizeof(eddcr), "Recent", sizeof(Recent)); edd_recent = eet_data_descriptor_stream_new(&eddcr); @@ -359,8 +358,7 @@ _config_default_new(void) conf->window.w = 1366; conf->window.h = 768; conf->panes.left = 0.2; - conf->panes.right =1.0; - conf->panes.tabs_size =0.3; + conf->panes.right =0.3; conf->profile = strdup("default"); return conf; @@ -416,8 +414,6 @@ config_panes_sizes_data_update(void) elm_panes_content_left_size_get(ap.panes.left); config->panes.right = elm_panes_content_left_size_get(ap.panes.right); - config->panes.tabs_size = - elm_panes_content_right_size_get(ap.panes.right); return true; } diff --git a/src/bin/config/config.h b/src/bin/config/config.h index 03d65f9..147f4fe 100644 --- a/src/bin/config/config.h +++ b/src/bin/config/config.h @@ -49,7 +49,6 @@ struct _Config struct { /* take and save left panes size */ double left; /**< position of left panes */ double right; /**< position of right panes */ - double tabs_size; /**< position of tabs pane */ } panes; Eina_List *recents; /**< The list of recent projects */ const char *profile; /**< profile name */ diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c index 14d3bd6..b7121d5 100644 --- a/src/bin/ui/main_window.c +++ b/src/bin/ui/main_window.c @@ -155,7 +155,6 @@ ui_main_window_add(void) /* apply the panes size from config */ elm_panes_content_left_size_set(ap.panes.left, config->panes.left); elm_panes_content_left_size_set(ap.panes.right, config->panes.right); - elm_panes_content_right_size_set(ap.panes.right, config->panes.tabs_size); project_navigator = project_navigator_add(); evas_object_smart_callback_add(project_navigator, SIGNAL_GROUP_OPEN, _project_navigator_group_open, NULL); --
[EGIT] [tools/eflete] master 08/11: tabs: set the dummy group navi, when the real is hiden
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=60c0dc1269bbc63a525f21cdf23a9883bfe109df commit 60c0dc1269bbc63a525f21cdf23a9883bfe109df Author: Vyacheslav Reutskiy Date: Thu May 12 10:34:34 2016 +0300 tabs: set the dummy group navi, when the real is hiden Change-Id: If21e499558423d39c441acb4e548429d3c16d937 --- src/bin/ui/tabs.c | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c index 6fe3346..ccf2677 100644 --- a/src/bin/ui/tabs.c +++ b/src/bin/ui/tabs.c @@ -105,11 +105,15 @@ _content_set(void *data, elm_toolbar_item_selected_set(tabs.selected, false); tabs.selected = toolbar_item; + _content_unset(); if (item) { -_content_unset(); elm_layout_content_set(tabs.layout, NULL, item->content); -if (!item->group) return; +if (!item->group) + { + elm_object_part_content_set(ap.panes.left_ver, "right", workspace_group_navigator_get(NULL)); + return; + } elm_object_part_content_set(ap.panes.left_ver, "right", workspace_group_navigator_get(item->content)); tabs.current_workspace = item->content; @@ -130,9 +134,10 @@ _content_set(void *data, evas_object_smart_callback_call(ap.win, SIGNAL_DIFFERENT_TAB_CLICKED, NULL); } else - { + { evas_object_smart_callback_call(ap.win, SIGNAL_TAB_CHANGED, NULL); +elm_layout_content_set(ap.panes.left_ver, "right", workspace_group_navigator_get(NULL)); tabs.current_workspace = NULL; tabs.current_group = NULL; if (ap.project) @@ -1040,8 +1045,6 @@ tabs_menu_tab_open(Tabs_Menu view) { assert(tabs.layout != NULL); - _content_unset(); - switch(view) { case TAB_IMAGE_EDITOR: --
[EGIT] [tools/eflete] master 01/11: workspace: hide the group navi
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=7ff2c1076a8fcc6c1d8bbf5ae9a86cf600370997 commit 7ff2c1076a8fcc6c1d8bbf5ae9a86cf600370997 Author: Vyacheslav Reutskiy Date: Wed May 11 15:27:10 2016 +0300 workspace: hide the group navi This first step to move the group navi under project navi Implement new layout, sometime I think that way to return old layout. Change-Id: Ide90228aa833be495a5511b30342012869686562 --- data/themes/default/widgets/layouts/workspace.edc | 1 - src/bin/ui/workspace/workspace.c | 40 +++ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/data/themes/default/widgets/layouts/workspace.edc b/data/themes/default/widgets/layouts/workspace.edc index f03e134..1bce127 100644 --- a/data/themes/default/widgets/layouts/workspace.edc +++ b/data/themes/default/widgets/layouts/workspace.edc @@ -239,7 +239,6 @@ group { name: "elm/layout/workspace/toolbar"; description { state: "default" 0.0; align: 0.5 0.0; max: -1 31; -rel2.offset: -4 -1; } } part { name: "elm.swallow.toolbar"; diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index 11bc884..e04cd5b 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -68,11 +68,10 @@ typedef struct _Scroll_Area Scroll_Area; struct _Workspace_Data { - Evas_Object *panes; /* equal to all workspace, this object returned in workspace_add */ + Evas_Object *layout; /* equal to whole workspace, this object returned in workspace_add */ Evas_Object *group_navi; Evas_Object *demo_navi; struct { - Evas_Object *layout; Evas_Object *obj; struct { Evas_Object *fit; @@ -267,7 +266,7 @@ _fit_cb(void *data, { Workspace_Data *wd = data; - workspace_container_fit(wd->panes); + workspace_container_fit(wd->layout); } static void @@ -457,7 +456,7 @@ _radio_switcher_add(Workspace_Data *wd, { Evas_Object *radio; - radio = elm_radio_add(wd->panes); + radio = elm_radio_add(wd->layout); elm_object_style_set(radio, style); elm_radio_state_value_set(radio, state_value); evas_object_smart_callback_add(radio, "changed", func, wd); @@ -669,7 +668,7 @@ _scroll_area_add(Workspace_Data *wd, Scroll_Area *area, Eina_Bool scale_rel) { area->bg_preview = BG_PREVIEW_TILE; - area->layout = elm_layout_add(wd->panes); + area->layout = elm_layout_add(wd->layout); elm_layout_theme_set(area->layout, "layout", "workspace", "scroller"); _ruler_add(area->layout, &area->ruler_h, scale_rel); @@ -714,7 +713,7 @@ _mode_cb(void *data, wd->mode = mode; content = elm_object_part_content_unset(wd->panes_h, "left"); evas_object_hide(content); - content = elm_object_part_content_unset(wd->panes, "right"); + //content = elm_object_part_content_unset(wd->panes, "right"); evas_object_hide(content); if (wd->demo.content) { @@ -736,7 +735,7 @@ _mode_cb(void *data, evas_object_show(wd->normal.layout); elm_radio_value_set(wd->toolbar.bg_switcher.white, wd->normal.bg_preview); - elm_object_part_content_set(wd->panes, "right", wd->group_navi); + //elm_object_part_content_set(wd->panes, "right", wd->group_navi); evas_object_show(wd->group_navi); _zoom_controls_disabled_set(wd, false); evas_object_smart_callback_call(ap.win, SIGNAL_TAB_CHANGED, wd->group); @@ -753,7 +752,7 @@ _mode_cb(void *data, wd->demo.content = demo_add(wd->demo.scroller, wd->group); container_content_set(wd->demo.container, wd->demo.content); - elm_object_part_content_set(wd->panes, "right", wd->demo_navi); + //elm_object_part_content_set(wd->panes, "right", wd->demo_navi); evas_object_show(wd->demo_navi); demo_group_demo_update(wd->demo_navi); @@ -1000,9 +999,11 @@ workspace_add(Evas_Object *parent, Group *group) edje_object_animation_set(group->edit_object, false); wd = mem_calloc(1, sizeof(Workspace_Data)); +#if 0 wd->panes = elm_panes_add(parent); elm_panes_content_right_min_size_set(wd->panes, PANES_RIGHT_SIZE_MIN); elm_panes_content_right_size_set(wd->panes, 0); /* set the default min size */ +#endif /* if 0 */ wd->code.size = -1; wd->group = group; @@ -1010,16 +1011,15 @@ workspace_add(Evas_Object *parent, Group *group) wd->normal.rulers_visible = true; wd->demo.rulers_visible = true; - wd->toolbar.layout = elm_layout_add(wd->panes); - elm_layout_theme_set(wd->toolbar.layout, "layout", "workspace", "toolbar"); - elm_object_part_content_set(wd->panes, "left", wd->toolbar.layout); + wd->layout = elm_layout_add(parent); + elm_layout_theme_set(wd->layout, "layout", "workspace", "toolbar"); /* add toolbar */ - wd->toolbar.obj = elm_toolbar_add(wd->panes); + wd
[EGIT] [tools/eflete] master 11/11: tabs: reset the group/demo navi on mode changed
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=d676232ea7f5e3322c8453e4f58de677fe2b446c commit d676232ea7f5e3322c8453e4f58de677fe2b446c Author: Vyacheslav Reutskiy Date: Thu May 12 11:57:34 2016 +0300 tabs: reset the group/demo navi on mode changed Change-Id: Ica6f1690e1efb0bcc6a6001b9a72f7f5add55290 --- src/bin/ui/tabs.c| 15 +++ src/bin/ui/workspace/workspace.c | 2 ++ 2 files changed, 17 insertions(+) diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c index ccf2677..3a126d0 100644 --- a/src/bin/ui/tabs.c +++ b/src/bin/ui/tabs.c @@ -171,6 +171,19 @@ _content_set(void *data, } } +static void +_mode_changed(void *data __UNUSED__, + Evas_Object *obj __UNUSED__, + void *event_info __UNUSED__) +{ + Evas_Object *content; + + content = elm_layout_content_unset(ap.panes.left_ver, "right"); + evas_object_hide(content); + + elm_layout_content_set(ap.panes.left_ver, "right", workspace_group_navigator_get(tabs.current_workspace)); +} + static Tabs_Item * _find_tab(Group *group) { @@ -982,6 +995,8 @@ tabs_add(void) tabs_home_tab_add(TAB_HOME_OPEN_PROJECT); + evas_object_smart_callback_add(ap.win, SIGNAL_WORKSPACE_MODE_CHANGED, _mode_changed, NULL); + evas_object_smart_callback_add(ap.win, SIGNAL_EDITOR_SAVED, _on_save, NULL); evas_object_smart_callback_add(ap.win, SIGNAL_PROJECT_CHANGED, _on_project_changed, NULL); diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index ab7b721..0d3e963 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -1617,5 +1617,7 @@ workspace_group_navigator_get(Evas_Object *obj) if (!obj) return group_navigator_dummy_get(); WS_DATA_GET(obj); + if (MODE_DEMO == wd->mode) + return wd->demo_navi; return wd->group_navi; } --
[EGIT] [tools/eflete] master 05/11: config: save the panes position between project and group navi
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=f52171ab245749a76326013657ed1b2a02c11188 commit f52171ab245749a76326013657ed1b2a02c11188 Author: Vyacheslav Reutskiy Date: Thu May 12 09:33:04 2016 +0300 config: save the panes position between project and group navi Change-Id: Ia021026d0e45f8b7510ce36080b9386eb31232a2 --- src/bin/config/config.c | 4 src/bin/config/config.h | 1 + src/bin/ui/main_window.c | 1 + 3 files changed, 6 insertions(+) diff --git a/src/bin/config/config.c b/src/bin/config/config.c index 3ad91af..53e4645 100644 --- a/src/bin/config/config.c +++ b/src/bin/config/config.c @@ -130,6 +130,7 @@ config_init(void) EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Config, "panes.left", panes.left, EET_T_DOUBLE); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Config, "panes.right", panes.right, EET_T_DOUBLE); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, Config, "panes.left_ver", panes.left_ver, EET_T_DOUBLE); eet_eina_stream_data_descriptor_class_set(&eddcr, sizeof(eddcr), "Recent", sizeof(Recent)); edd_recent = eet_data_descriptor_stream_new(&eddcr); @@ -359,6 +360,7 @@ _config_default_new(void) conf->window.h = 768; conf->panes.left = 0.2; conf->panes.right =0.3; + conf->panes.left_ver = 0.5; conf->profile = strdup("default"); return conf; @@ -414,6 +416,8 @@ config_panes_sizes_data_update(void) elm_panes_content_left_size_get(ap.panes.left); config->panes.right = elm_panes_content_left_size_get(ap.panes.right); + config->panes.left_ver = + elm_panes_content_left_size_get(ap.panes.left_ver); return true; } diff --git a/src/bin/config/config.h b/src/bin/config/config.h index 147f4fe..89d8e87 100644 --- a/src/bin/config/config.h +++ b/src/bin/config/config.h @@ -49,6 +49,7 @@ struct _Config struct { /* take and save left panes size */ double left; /**< position of left panes */ double right; /**< position of right panes */ + double left_ver; /**< position of panes between the project and group navi */ } panes; Eina_List *recents; /**< The list of recent projects */ const char *profile; /**< profile name */ diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c index b7121d5..f8a2ff5 100644 --- a/src/bin/ui/main_window.c +++ b/src/bin/ui/main_window.c @@ -155,6 +155,7 @@ ui_main_window_add(void) /* apply the panes size from config */ elm_panes_content_left_size_set(ap.panes.left, config->panes.left); elm_panes_content_left_size_set(ap.panes.right, config->panes.right); + elm_panes_content_left_size_set(ap.panes.left_ver, config->panes.left_ver); project_navigator = project_navigator_add(); evas_object_smart_callback_add(project_navigator, SIGNAL_GROUP_OPEN, _project_navigator_group_open, NULL); --
[EGIT] [tools/eflete] master 06/11: tabs: fix typo
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=ea08d7c4bb3b6d1613ec8d962111b764c8c6ef63 commit ea08d7c4bb3b6d1613ec8d962111b764c8c6ef63 Author: Vyacheslav Reutskiy Date: Thu May 12 09:39:26 2016 +0300 tabs: fix typo Change-Id: I6e23bf762ee70b9c7330a38d024a2402e30640f2 --- src/bin/ui/tabs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c index f564de9..6fe3346 100644 --- a/src/bin/ui/tabs.c +++ b/src/bin/ui/tabs.c @@ -88,7 +88,7 @@ _content_unset(void) tabs.current_group = NULL; content = elm_layout_content_unset(tabs.layout, NULL); evas_object_hide(content); - content = elm_object_part_content_unset(ap.panes.left_ver, "right"); + content = elm_layout_content_unset(ap.panes.left_ver, "right"); evas_object_hide(content); } --
[EGIT] [tools/eflete] master 02/11: workspace: add API for get group navi
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=340e0323c0bdc53f116d49b1f5e0058b6cab44c9 commit 340e0323c0bdc53f116d49b1f5e0058b6cab44c9 Author: Vyacheslav Reutskiy Date: Thu May 12 08:10:01 2016 +0300 workspace: add API for get group navi Change-Id: I98a22c86041aff51174751a9e71ed8f7a6eb91c6 --- src/bin/ui/workspace/workspace.c | 7 +++ src/bin/ui/workspace/workspace.h | 3 +++ 2 files changed, 10 insertions(+) diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c index e04cd5b..9b606ec 100644 --- a/src/bin/ui/workspace/workspace.c +++ b/src/bin/ui/workspace/workspace.c @@ -1609,3 +1609,10 @@ workspace_code_changed(Evas_Object *obj) elm_object_part_content_set(wd->code.obj, "elm.swallow.overlay", layout); } + +Evas_Object * +workspace_group_navigator_get(Evas_Object *obj) +{ + WS_DATA_GET(obj); + return wd->group_navi; +} diff --git a/src/bin/ui/workspace/workspace.h b/src/bin/ui/workspace/workspace.h index 3390d9c..8b621e8 100644 --- a/src/bin/ui/workspace/workspace.h +++ b/src/bin/ui/workspace/workspace.h @@ -405,4 +405,7 @@ workspace_code_reload(Evas_Object *obj); void workspace_code_changed(Evas_Object *obj); +Evas_Object * +workspace_group_navigator_get(Evas_Object *obj); + #endif /* WORKSPACE_H */ --
[EGIT] [core/efl] master 01/01: eolian: mark pure virtual funcs outside of implements
q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7e94eb22b43c5b61fbdb40f109e8177cdc4eb1fc commit 7e94eb22b43c5b61fbdb40f109e8177cdc4eb1fc Author: Daniel Kolesa Date: Thu May 12 15:41:56 2016 +0100 eolian: mark pure virtual funcs outside of implements This is a better syntax and should've been like this in the first place. --- src/lib/ecore_audio/ecore_audio.eo | 11 +- src/lib/ecore_audio/ecore_audio_in.eo | 10 +- src/lib/ecore_con/efl_network.eo | 28 ++--- src/lib/ector/cairo/ector_renderer_cairo.eo| 3 +- src/lib/ector/ector_buffer.eo | 17 +-- src/lib/ector/ector_renderer.eo| 9 +- src/lib/ector/ector_surface.eo | 8 +- src/lib/ector/gl/ector_renderer_gl.eo | 3 +- src/lib/ector/software/ector_renderer_software.eo | 5 +- src/lib/elementary/elm_interface_atspi_action.eo | 19 +--- src/lib/elementary/elm_interface_atspi_image.eo| 5 +- .../elm_interface_atspi_widget_action.eo | 3 +- src/lib/elementary/elm_web.eo | 117 +++-- src/lib/elementary/elm_widget.eo | 9 +- src/lib/eolian/database_fill.c | 57 ++ src/lib/eolian/eo_lexer.h | 2 +- src/lib/eolian/eo_parser.c | 38 --- src/lib/evas/canvas/efl_canvas_surface.eo | 3 +- src/lib/evas/canvas/efl_vg.eo | 3 +- src/lib/evas/canvas/evas_canvas3d_object.eo| 12 +-- src/lib/evas/canvas/evas_filter.eo | 9 +- src/tests/eolian/data/base.eo | 5 +- src/tests/eolian/data/nmsp1_nmsp11_class2.eo | 5 +- src/tests/eolian/data/object_impl.eo | 6 +- src/tests/eolian/data/override.eo | 6 +- src/tests/eolian/data/override_ref.c | 10 +- src/tests/eolian/eolian_parsing.c | 27 - 27 files changed, 154 insertions(+), 276 deletions(-) diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo index 0c8fdfa..bafea5c 100644 --- a/src/lib/ecore_audio/ecore_audio.eo +++ b/src/lib/ecore_audio/ecore_audio.eo @@ -58,7 +58,7 @@ class Ecore.Audio (Eo.Base) volume: double; [[The volume]] } } - @property source { + @property source @virtual_pure { [[Source of the object What sources are supported depends on the actual object. @@ -78,7 +78,7 @@ class Ecore.Audio (Eo.Base) source: const(char)*; [[the source to set to (i.e. file, URL, device)]] } } - @property format { + @property format @virtual_pure { [[Format of the object.]] set { [[Set the format of the object @@ -103,7 +103,7 @@ class Ecore.Audio (Eo.Base) format: Ecore.Audio.Format; [[the format of the object]] } } - vio_set { + vio_set @virtual_pure { [[Set the virtual IO functions @since 1.8 @@ -123,10 +123,5 @@ class Ecore.Audio (Eo.Base) } implements { Eo.Base.constructor; - @virtual .source.get; - @virtual .source.set; - @virtual .format.get; - @virtual .format.set; - @virtual .vio_set; } } diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo index fd4da49..6ab3c8f 100644 --- a/src/lib/ecore_audio/ecore_audio_in.eo +++ b/src/lib/ecore_audio/ecore_audio_in.eo @@ -44,7 +44,7 @@ class Ecore.Audio.In (Ecore.Audio) channels: int; [[The number of channels]] } } - @property preloaded { + @property preloaded @virtual_pure { [[Preloaded state of the input @since 1.8 @@ -82,7 +82,7 @@ class Ecore.Audio.In (Ecore.Audio) @since 1.8 ]] - set { + set @virtual_pure { } get { } @@ -134,7 +134,7 @@ class Ecore.Audio.In (Ecore.Audio) @in len: size; [[The amount of samples to read]] } } - seek { + seek @virtual_pure { [[Seek within the input @since 1.8 @@ -153,10 +153,6 @@ class Ecore.Audio.In (Ecore.Audio) Eo.Base.constructor; Eo.Base.destructor; Ecore.Audio.vio_set; - @virtual .preloaded.get; - @virtual .preloaded.set; - @virtual .seek; - @virtual .length.set; } events { in,looped; [[Called when an input has looped.]] diff --git a/src/lib/ecore_con/efl_network.eo b/src/lib/ecore_con/efl_network.eo index f99bc3c..de62158 100644 --- a/src/lib/ecore_con/efl_network.eo +++ b/src/lib/ecore_con/efl_network.eo @@ -45,7 +45,7 @@ abstract Efl.Network (Eo.Base) { valid after deletion for the svr object. If no IP is known null is returned.
[EGIT] [core/enlightenment] master 01/01: use parent windows for x11 binding grabs
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=55c83134c17cbc60e248b64a3717490e9b8fd614 commit 55c83134c17cbc60e248b64a3717490e9b8fd614 Author: Mike Blumenkrantz Date: Thu May 12 11:23:20 2016 -0400 use parent windows for x11 binding grabs ensure that internal windows do not receive mouse events before the compositor fix T3347 --- src/bin/e_comp_x.c | 38 ++ 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index ff80e02..24e305b 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -310,20 +310,21 @@ _e_comp_x_focus_setup(E_Client *ec) static void _e_comp_x_focus_setdown(E_Client *ec) { - Ecore_X_Window win; + Ecore_X_Window win, pwin; if (!_e_comp_x_client_data_get(ec)->button_grabbed) return; if ((!e_client_focus_policy_click(ec)) || (e_config->always_click_to_raise) || (e_config->always_click_to_focus)) return; win = e_client_util_win_get(ec); - e_bindings_mouse_ungrab(E_BINDING_CONTEXT_WINDOW, win); - e_bindings_wheel_ungrab(E_BINDING_CONTEXT_WINDOW, win); + pwin = e_client_util_pwin_get(ec); + e_bindings_mouse_ungrab(E_BINDING_CONTEXT_WINDOW, pwin); + e_bindings_wheel_ungrab(E_BINDING_CONTEXT_WINDOW, pwin); ecore_x_window_button_ungrab(win, 1, 0, 1); ecore_x_window_button_ungrab(win, 2, 0, 1); ecore_x_window_button_ungrab(win, 3, 0, 1); - e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, win); - e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, win); + e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, pwin); + e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, pwin); _e_comp_x_client_data_get(ec)->button_grabbed = 0; } @@ -2328,10 +2329,7 @@ _e_comp_x_mapping_change(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_E e_comp_canvas_keys_ungrab(); EINA_LIST_FOREACH(e_comp->clients, l, ec) { -Ecore_X_Window win; - if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_X) continue; -win = e_client_util_win_get(ec); if ((!_e_comp_x_client_data_get(ec)->first_map) || (!_e_comp_x_client_data_get(ec)->reparented)) continue; if (ec->focused) { @@ -2342,8 +2340,8 @@ _e_comp_x_mapping_change(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_E { _e_comp_x_focus_setdown(ec); _e_comp_x_focus_setup(ec); - e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, win); - e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, win); + e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, e_client_util_pwin_get(ec)); + e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, e_client_util_pwin_get(ec)); } } e_comp_canvas_keys_grab(); @@ -3249,8 +3247,8 @@ _e_comp_x_hook_client_pre_frame_assign(void *d EINA_UNUSED, E_Client *ec) ecore_x_window_show(pwin); _e_comp_x_focus_init(ec); - e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, win); - e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, win); + e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, pwin); + e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, pwin); _e_comp_x_client_evas_init(ec); if (ec->netwm.ping && (!ec->ping_poller)) e_client_ping(ec); @@ -3491,8 +3489,8 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec) ec->focus_policy_override = E_FOCUS_CLICK; _e_comp_x_focus_setdown(ec); _e_comp_x_focus_setup(ec); - e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, win); - e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, win); + e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, pwin); + e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, pwin); if (!ec->netwm.state.skip_pager) { ec->netwm.state.skip_pager = 1; @@ -4709,8 +4707,8 @@ _e_comp_x_hook_client_del(void *d EINA_UNUSED, E_Client *ec) if ((!ec->already_unparented) && cd && cd->reparented) { _e_comp_x_focus_setdown(ec); -e_bindings_mouse_ungrab(E_BINDING_CONTEXT_WINDOW, win); -e_bindings_wheel_ungrab(E_BINDING_CONTEXT_WINDOW, win); +e_bindings_mouse_ungrab(E_BINDING_CONTEXT_WINDOW, pwin); +e_bindings_wheel_ungrab(E_BINDING_CONTEXT_WINDOW, pwin); if (!cd->deleted) { if (stopping) @@ -5254,8 +5252,8 @@ _e_comp_x_bindings_grab_cb(void) else { _e_comp_x_focus_setup(ec); - e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, e_client_util_win_get(ec)); - e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, e_client_util_win_get(ec)); + e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, e_client_util_pwin_get(ec)); + e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, e_client_util_pwin_get(ec));
[EGIT] [tools/enventor] master 01/01: update a usage of namingspace for evas object smart.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=96f1fc1c2815134cef8559290d2a3cf10be523df commit 96f1fc1c2815134cef8559290d2a3cf10be523df Author: Hermet Park Date: Fri May 13 00:45:48 2016 +0900 update a usage of namingspace for evas object smart. --- src/lib/enventor_object.eo | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo index 6cec032..4948b49 100644 --- a/src/lib/enventor_object.eo +++ b/src/lib/enventor_object.eo @@ -297,15 +297,15 @@ class Enventor.Object (Elm.Widget, Efl.File) { implements { class.constructor; Eo.Base.constructor; - Evas.Object_Smart.add; - Evas.Object_Smart.del; - Evas.Object_Smart.move; - Evas.Object_Smart.resize; - Evas.Object_Smart.show; - Evas.Object_Smart.hide; - Evas.Object_Smart.clip.set; - Evas.Object_Smart.clip_unset; - Evas.Object_Smart.member_add; + Evas.Object.Smart.add; + Evas.Object.Smart.del; + Evas.Object.Smart.move; + Evas.Object.Smart.resize; + Evas.Object.Smart.show; + Evas.Object.Smart.hide; + Evas.Object.Smart.clip.set; + Evas.Object.Smart.clip_unset; + Evas.Object.Smart.member_add; Efl.File.file.set; } events { --
[EGIT] [core/enlightenment] master 01/01: adjust some client eval parts to make manual placement work again
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=2854352bc8b092eb82890b88987495d91df020c1 commit 2854352bc8b092eb82890b88987495d91df020c1 Author: Mike Blumenkrantz Date: Thu May 12 12:05:59 2016 -0400 adjust some client eval parts to make manual placement work again activating the window_move action doesn't require the client to successfully be shown, and failing this check would cause the window_move action to be deleted until the next restart --- src/bin/e_client.c | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 15a32ba..966e6a8 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -1742,7 +1742,6 @@ _e_client_eval(E_Client *ec) ec->x = new_x; ec->y = new_y; ec->changes.pos = 1; - ec->placed = 1; ec->pre_cb.x = ec->x; ec->pre_cb.y = ec->y; } else if (!E_INTERSECTS(ec->x, ec->y, ec->w, ec->h, zx, zy, zw, zh)) @@ -1886,8 +1885,12 @@ _e_client_eval(E_Client *ec) } if (ec->changes.pos) { +Eina_Bool placed = ec->placed; + ec->changes.pos = 0; evas_object_move(ec->frame, ec->x, ec->y); +if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_MANUAL) + ec->placed = placed; rem_change = 1; prop |= E_CLIENT_PROPERTY_POS; } @@ -1931,30 +1934,27 @@ _e_client_eval(E_Client *ec) } evas_object_show(ec->frame); -if (evas_object_visible_get(ec->frame)) +if (ec->cur_mouse_action) { - if (ec->cur_mouse_action) - { - ec->moveinfo.down.x = ec->x; - ec->moveinfo.down.y = ec->y; - ec->moveinfo.down.w = ec->w; - ec->moveinfo.down.h = ec->h; - ec->mouse.current.mx = x; - ec->mouse.current.my = y; - ec->moveinfo.down.button = 0; - ec->moveinfo.down.mx = x; - ec->moveinfo.down.my = y; - - e_object_ref(E_OBJECT(ec->cur_mouse_action)); - ec->cur_mouse_action->func.go(E_OBJECT(ec), NULL); - if (e_config->border_raise_on_mouse_action) -evas_object_raise(ec->frame); - evas_object_focus_set(ec->frame, 1); - } - ec->changes.visible = 0; - rem_change = 1; - _e_client_event_simple(ec, E_EVENT_CLIENT_SHOW); + ec->moveinfo.down.x = ec->x; + ec->moveinfo.down.y = ec->y; + ec->moveinfo.down.w = ec->w; + ec->moveinfo.down.h = ec->h; + ec->mouse.current.mx = x; + ec->mouse.current.my = y; + ec->moveinfo.down.button = 0; + ec->moveinfo.down.mx = x; + ec->moveinfo.down.my = y; + + e_object_ref(E_OBJECT(ec->cur_mouse_action)); + ec->cur_mouse_action->func.go(E_OBJECT(ec), NULL); + if (e_config->border_raise_on_mouse_action) + evas_object_raise(ec->frame); + evas_object_focus_set(ec->frame, 1); } +ec->changes.visible = 0; +rem_change = 1; +_e_client_event_simple(ec, E_EVENT_CLIENT_SHOW); } else if ((ec->changes.visible) && (ec->new_client)) { --
[EGIT] [core/enlightenment] master 01/01: force cursor placement to obey useful zone geometry
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=189dce81f97f2eefa4891fee4d8fa5dc50a886a6 commit 189dce81f97f2eefa4891fee4d8fa5dc50a886a6 Author: Mike Blumenkrantz Date: Thu May 12 12:10:48 2016 -0400 force cursor placement to obey useful zone geometry --- src/bin/e_place.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bin/e_place.c b/src/bin/e_place.c index f553ac4..fe272e4 100644 --- a/src/bin/e_place.c +++ b/src/bin/e_place.c @@ -451,6 +451,7 @@ e_place_zone_cursor(E_Zone *zone, int x EINA_UNUSED, int y EINA_UNUSED, int w, i { int cursor_x = 0, cursor_y = 0; int zone_right, zone_bottom; + int zx, zy, zw, zh; E_OBJECT_CHECK_RETURN(zone, 0); @@ -458,14 +459,16 @@ e_place_zone_cursor(E_Zone *zone, int x EINA_UNUSED, int y EINA_UNUSED, int w, i *rx = cursor_x - (w >> 1); *ry = cursor_y - (it >> 1); + e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh); + if (*rx < zone->x) - *rx = zone->x; + *rx = zx; if (*ry < zone->y) - *ry = zone->y; + *ry = zy; - zone_right = zone->x + zone->w; - zone_bottom = zone->y + zone->h; + zone_right = zx + zw; + zone_bottom = zy + zh; if ((*rx + w) > zone_right) *rx = zone_right - w; --
[EGIT] [core/efl] master 01/01: spec/efl.spec.in: It's nicer when the spec file actually works.
mej pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=59f222bc0adc3329a94c460b906be288a86e5840 commit 59f222bc0adc3329a94c460b906be288a86e5840 Author: Michael Jennings Date: Thu May 12 10:13:42 2016 -0700 spec/efl.spec.in: It's nicer when the spec file actually works. Added support for systemd detection. Updated the file list. Build unoptimized and with debugging symbols, at least for now. And remove unnecessary *.la files from the packages. --- spec/efl.spec.in | 60 ++-- 1 file changed, 41 insertions(+), 19 deletions(-) diff --git a/spec/efl.spec.in b/spec/efl.spec.in index a349e9a..631c9ab 100644 --- a/spec/efl.spec.in +++ b/spec/efl.spec.in @@ -1,6 +1,14 @@ +%define __os_install_post /usr/lib/rpm/brp-compress +%define debug_package %{nil} %{!?_rel:%{expand:%%global _rel 0.enl%{?dist}}} %define _missing_doc_files_terminate_build 0 +%if %(systemctl --version | head -1 | cut -d' ' -f2) >= 209 +%{expand:%%global have_systemd 1} +%endif + +%{expand:%%global ac_enable_systemd --%{?have_systemd:en}%{!?have_systemd:dis}able-systemd} + Summary: Enlightenment Foundation Libraries Name: efl Version: @VERSION@ @@ -29,6 +37,10 @@ Provides: eio = %{version}-%{release} Obsoletes: eio < %{version}-%{release} Provides: ecore = %{version}-%{release} Obsoletes: ecore < %{version}-%{release} +Provides: edje = %{version}-%{release} +Obsoletes: edje < %{version}-%{release} +Provides: elementary = %{version}-%{release} +Obsoletes: elementary < %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-root %description @@ -56,6 +68,10 @@ Provides: eio-devel = %{version}-%{release} Obsoletes: eio-devel < %{version}-%{release} Provides: ecore-devel = %{version}-%{release} Obsoletes: ecore-devel < %{version}-%{release} +Provides: edje-devel = %{version}-%{release} +Obsoletes: edje-devel < %{version}-%{release} +Provides: elementary-devel = %{version}-%{release} +Obsoletes: elementary-devel < %{version}-%{release} %description devel Headers, static libraries, test programs and documentation for EFL @@ -66,14 +82,15 @@ Headers, static libraries, test programs and documentation for EFL %build -%{configure} --prefix=%{_prefix} +%{configure} --prefix=%{_prefix} %{ac_enable_systemd} CFLAGS="-O0 -ggdb3" ### use this if you have build problems -#./configure --prefix=%{_prefix} +#./configure --prefix=%{_prefix} %{ac_enable_systemd} CFLAGS="-O0 -ggdb3" %{__make} %{?_smp_mflags} %{?mflags} %install %{__make} %{?mflags_install} -j1 DESTDIR=$RPM_BUILD_ROOT install +find $RPM_BUILD_ROOT%{_prefix} -name '*.la' -print0 | xargs -0 rm -f %{find_lang} %{name} @@ -94,30 +111,35 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %doc AUTHORS README NEWS COPYING licenses/COPYING.BSD licenses/COPYING.LGPL licenses/COPYING.GPL licenses/COPYING.FTL %{_bindir}/* -%{_libdir}/*.so.* -%{_libdir}/evas/cserve2/loaders/*/linux-gnu-*/*.so -%{_libdir}/evas/modules/engines/*/linux-gnu-*/*.so -%{_libdir}/evas/modules/image_loaders/*/linux-gnu-*/*.so -%{_libdir}/evas/modules/image_savers/*/linux-gnu-*/*.so -%{_libdir}/ecore/*/*.so -%{_libdir}/ecore_evas/*/*/*/*.so -%{_libexecdir}/* +%{_libdir}/*.so* +%{_libdir}/e*/ +%{_datadir}/applications/*.desktop +%{_datadir}/dbus*/services/* +%{_datadir}/ecore*/ +%{_datadir}/edje/ +%{_datadir}/eeze/ +%{_datadir}/efreet/ +%{_datadir}/elementary/ +%{_datadir}/elua/ +%{_datadir}/embryo/ +%{_datadir}/emotion/ %{_datadir}/eo/ +%{_datadir}/ethumb*/ +%{_datadir}/evas/ +%{_datadir}/icons/* +%{_datadir}/gdb/auto-load%{_libdir}/lib*.py +%{_datadir}/mime/packages/*.xml +%if %{?have_systemd:1}0 +%{_prefix}/lib/systemd/*/*.service +%endif %files devel %defattr(-, root, root) %{_includedir}/* +%{_libdir}/cmake/* %{_libdir}/pkgconfig/* -%{_libdir}/*.a -%{_libdir}/*.la -%{_libdir}/*.so -%{_libdir}/ecore/*/*.la -%{_libdir}/ecore_evas/*/*/*/*.la -%{_libdir}/evas/cserve2/loaders/*/linux-gnu-*/*.la -%{_libdir}/evas/modules/engines/*/linux-gnu-*/*.la -%{_libdir}/evas/modules/image_loaders/*/linux-gnu-*/*.la -%{_libdir}/evas/modules/image_savers/*/linux-gnu-*/*.la %{_datadir}/embryo/ +%{_datadir}/eolian/ %{_datadir}/evas/ --
[EGIT] [core/efl] master 04/04: Make "legacy_prefix: null; " the default in eolian and adjust the efl.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b5b4ffa07cb37d42c66cc1c8e3106b45a6de5714 commit b5b4ffa07cb37d42c66cc1c8e3106b45a6de5714 Merge: 6cacef2 6bdf4af Author: Tom Hacohen Date: Thu May 12 17:25:52 2016 +0100 Make "legacy_prefix: null;" the default in eolian and adjust the efl. This breaks behaviour because it changes the legacy_prefix behaviour to be null by default. This means that by default legacy functions are not generated. This merge includes the changes to eolian and the efl. spec/efl.spec.in | 60 +++ src/lib/ecore/ecore_animator.eo| 1 + src/lib/ecore/ecore_exe.eo | 1 + src/lib/ecore/efl_loop.eo | 1 - src/lib/ecore/efl_loop_fd.eo | 1 - src/lib/ecore/efl_loop_user.eo | 1 - src/lib/ecore_audio/ecore_audio.eo | 12 +-- src/lib/ecore_audio/ecore_audio_in.eo | 11 +- src/lib/ecore_audio/ecore_audio_out.eo | 1 - src/lib/ecore_con/ecore_con_eet_base.eo| 1 - src/lib/ecore_con/ecore_con_eet_client_obj.eo | 1 - src/lib/ecore_con/ecore_con_eet_server_obj.eo | 1 - src/lib/ecore_con/efl_network.eo | 28 ++--- src/lib/ecore_con/efl_network_url.eo | 1 - .../ector/cairo/ector_cairo_software_surface.eo| 1 - src/lib/ector/cairo/ector_cairo_surface.eo | 1 - src/lib/ector/cairo/ector_renderer_cairo.eo| 4 +- .../cairo/ector_renderer_cairo_gradient_linear.eo | 1 - .../cairo/ector_renderer_cairo_gradient_radial.eo | 1 - src/lib/ector/cairo/ector_renderer_cairo_shape.eo | 1 - src/lib/ector/ector_buffer.eo | 18 +--- src/lib/ector/ector_renderer.eo| 10 +- src/lib/ector/ector_renderer_buffer.eo | 1 - src/lib/ector/ector_renderer_gradient.eo | 1 - src/lib/ector/ector_renderer_gradient_linear.eo| 1 - src/lib/ector/ector_renderer_gradient_radial.eo| 1 - src/lib/ector/ector_renderer_shape.eo | 1 - src/lib/ector/ector_surface.eo | 9 +- src/lib/ector/gl/ector_gl_buffer.eo| 1 - src/lib/ector/gl/ector_gl_buffer_base.eo | 1 - src/lib/ector/gl/ector_gl_surface.eo | 1 - src/lib/ector/gl/ector_renderer_gl.eo | 4 +- .../ector/gl/ector_renderer_gl_gradient_linear.eo | 1 - .../ector/gl/ector_renderer_gl_gradient_radial.eo | 1 - src/lib/ector/gl/ector_renderer_gl_shape.eo| 1 - src/lib/ector/software/ector_renderer_software.eo | 6 +- .../software/ector_renderer_software_buffer.eo | 1 - .../ector_renderer_software_gradient_linear.eo | 1 - .../ector_renderer_software_gradient_radial.eo | 1 - .../software/ector_renderer_software_shape.eo | 1 - src/lib/ector/software/ector_software_buffer.eo| 1 - .../ector/software/ector_software_buffer_base.eo | 1 - src/lib/ector/software/ector_software_surface.eo | 1 - src/lib/edje/edje_edit.eo | 1 + src/lib/edje/efl_canvas_layout_internal_box.eo | 1 - src/lib/edje/efl_canvas_layout_internal_table.eo | 1 - src/lib/efl/interfaces/efl_animator.eo | 1 - src/lib/efl/interfaces/efl_container.eo| 1 - src/lib/efl/interfaces/efl_control.eo | 1 - src/lib/efl/interfaces/efl_file.eo | 1 - src/lib/efl/interfaces/efl_flipable.eo | 1 - src/lib/efl/interfaces/efl_gfx.eo | 1 - src/lib/efl/interfaces/efl_gfx_buffer.eo | 1 - src/lib/efl/interfaces/efl_gfx_fill.eo | 1 - src/lib/efl/interfaces/efl_gfx_filter.eo | 1 - src/lib/efl/interfaces/efl_gfx_gradient.eo | 1 - src/lib/efl/interfaces/efl_gfx_gradient_linear.eo | 1 - src/lib/efl/interfaces/efl_gfx_gradient_radial.eo | 1 - src/lib/efl/interfaces/efl_gfx_shape.eo| 1 - src/lib/efl/interfaces/efl_gfx_stack.eo| 1 - src/lib/efl/interfaces/efl_gfx_view.eo | 1 - src/lib/efl/interfaces/efl_image.eo| 1 - src/lib/efl/interfaces/efl_image_animated.eo | 1 - src/lib/efl/interfaces/efl_image_load.eo | 1 - src/lib/efl/interfaces/efl_model.eo| 1 - src/lib/efl/interfaces/efl_orientation.eo | 1 - src/lib/efl/interfaces/efl_pack.eo | 1 - src/lib/efl/interfaces/efl_pack_grid.eo| 1 - src/lib/efl/interfaces/efl_pack_layout.eo | 1 - src/lib/efl/interfaces/efl_pack_linear.eo | 1 - src/lib/efl/interfaces/efl_player.eo | 1 - src/lib/efl/interfaces/efl_text.eo | 1 - src/lib/efl/interfaces/efl_text_properties.eo | 1 - src/lib/efl/int
[EGIT] [core/efl] master 02/04: Efl: Remove "legacy_prefix: null; " as it's now the default.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=96c4c88070fec7e514dc179574c4ac1eba9b6885 commit 96c4c88070fec7e514dc179574c4ac1eba9b6885 Author: Tom Hacohen Date: Thu May 12 16:43:29 2016 +0100 Efl: Remove "legacy_prefix: null;" as it's now the default. --- src/lib/ecore/efl_loop.eo | 1 - src/lib/ecore/efl_loop_fd.eo| 1 - src/lib/ecore/efl_loop_user.eo | 1 - src/lib/ecore_audio/ecore_audio.eo | 1 - src/lib/ecore_audio/ecore_audio_in.eo | 1 - src/lib/ecore_audio/ecore_audio_out.eo | 1 - src/lib/ecore_con/ecore_con_eet_base.eo | 1 - src/lib/ecore_con/ecore_con_eet_client_obj.eo | 1 - src/lib/ecore_con/ecore_con_eet_server_obj.eo | 1 - src/lib/ecore_con/efl_network_url.eo| 1 - src/lib/ector/cairo/ector_cairo_software_surface.eo | 1 - src/lib/ector/cairo/ector_cairo_surface.eo | 1 - src/lib/ector/cairo/ector_renderer_cairo.eo | 1 - src/lib/ector/cairo/ector_renderer_cairo_gradient_linear.eo | 1 - src/lib/ector/cairo/ector_renderer_cairo_gradient_radial.eo | 1 - src/lib/ector/cairo/ector_renderer_cairo_shape.eo | 1 - src/lib/ector/ector_buffer.eo | 1 - src/lib/ector/ector_renderer.eo | 1 - src/lib/ector/ector_renderer_buffer.eo | 1 - src/lib/ector/ector_renderer_gradient.eo| 1 - src/lib/ector/ector_renderer_gradient_linear.eo | 1 - src/lib/ector/ector_renderer_gradient_radial.eo | 1 - src/lib/ector/ector_renderer_shape.eo | 1 - src/lib/ector/ector_surface.eo | 1 - src/lib/ector/gl/ector_gl_buffer.eo | 1 - src/lib/ector/gl/ector_gl_buffer_base.eo| 1 - src/lib/ector/gl/ector_gl_surface.eo| 1 - src/lib/ector/gl/ector_renderer_gl.eo | 1 - src/lib/ector/gl/ector_renderer_gl_gradient_linear.eo | 1 - src/lib/ector/gl/ector_renderer_gl_gradient_radial.eo | 1 - src/lib/ector/gl/ector_renderer_gl_shape.eo | 1 - src/lib/ector/software/ector_renderer_software.eo | 1 - src/lib/ector/software/ector_renderer_software_buffer.eo| 1 - src/lib/ector/software/ector_renderer_software_gradient_linear.eo | 1 - src/lib/ector/software/ector_renderer_software_gradient_radial.eo | 1 - src/lib/ector/software/ector_renderer_software_shape.eo | 1 - src/lib/ector/software/ector_software_buffer.eo | 1 - src/lib/ector/software/ector_software_buffer_base.eo| 1 - src/lib/ector/software/ector_software_surface.eo| 1 - src/lib/edje/efl_canvas_layout_internal_box.eo | 1 - src/lib/edje/efl_canvas_layout_internal_table.eo| 1 - src/lib/efl/interfaces/efl_animator.eo | 1 - src/lib/efl/interfaces/efl_container.eo | 1 - src/lib/efl/interfaces/efl_control.eo | 1 - src/lib/efl/interfaces/efl_file.eo | 1 - src/lib/efl/interfaces/efl_flipable.eo | 1 - src/lib/efl/interfaces/efl_gfx.eo | 1 - src/lib/efl/interfaces/efl_gfx_buffer.eo| 1 - src/lib/efl/interfaces/efl_gfx_fill.eo | 1 - src/lib/efl/interfaces/efl_gfx_filter.eo| 1 - src/lib/efl/interfaces/efl_gfx_gradient.eo | 1 - src/lib/efl/interfaces/efl_gfx_gradient_linear.eo | 1 - src/lib/efl/interfaces/efl_gfx_gradient_radial.eo | 1 - src/lib/efl/interfaces/efl_gfx_shape.eo | 1 - src/lib/efl/interfaces/efl_gfx_stack.eo | 1 - src/lib/efl/interfaces/efl_gfx_view.eo | 1 - src/lib/efl/interfaces/efl_image.eo | 1 - src/lib/efl/interfaces/efl_image_animated.eo| 1 - src/lib/efl/interfaces/efl_image_load.eo| 1 - src/lib/efl/interfaces/ef
[EGIT] [core/efl] master 03/04: Add legacy_prefix now that the default has changed to null.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6bdf4af01695231f53948f78d7f9f4171eb271d8 commit 6bdf4af01695231f53948f78d7f9f4171eb271d8 Author: Tom Hacohen Date: Thu May 12 17:06:04 2016 +0100 Add legacy_prefix now that the default has changed to null. --- src/lib/ecore/ecore_animator.eo | 1 + src/lib/ecore/ecore_exe.eo | 1 + src/lib/edje/edje_edit.eo | 1 + src/lib/elementary/elm_access.eo| 5 +++-- src/lib/elementary/elm_actionslider.eo | 1 + src/lib/elementary/elm_atspi_app_object.eo | 1 + src/lib/elementary/elm_atspi_bridge.eo | 1 + src/lib/elementary/elm_bg.eo| 1 + src/lib/elementary/elm_box.eo | 1 + src/lib/elementary/elm_bubble.eo| 1 + src/lib/elementary/elm_button.eo| 1 + src/lib/elementary/elm_calendar.eo | 1 + src/lib/elementary/elm_check.eo | 1 + src/lib/elementary/elm_clock.eo | 1 + src/lib/elementary/elm_color_item.eo| 1 + src/lib/elementary/elm_colorselector.eo | 1 + src/lib/elementary/elm_combobox.eo | 1 + src/lib/elementary/elm_conformant.eo| 1 + src/lib/elementary/elm_ctxpopup.eo | 1 + src/lib/elementary/elm_ctxpopup_item.eo | 1 + src/lib/elementary/elm_datetime.eo | 1 + src/lib/elementary/elm_dayselector.eo | 1 + src/lib/elementary/elm_diskselector.eo | 1 + src/lib/elementary/elm_diskselector_item.eo | 1 + src/lib/elementary/elm_entry.eo | 1 + src/lib/elementary/elm_fileselector.eo | 1 + src/lib/elementary/elm_fileselector_button.eo | 1 + src/lib/elementary/elm_fileselector_entry.eo| 1 + src/lib/elementary/elm_flip.eo | 1 + src/lib/elementary/elm_flipselector.eo | 1 + src/lib/elementary/elm_flipselector_item.eo | 1 + src/lib/elementary/elm_frame.eo | 1 + src/lib/elementary/elm_gengrid.eo | 1 + src/lib/elementary/elm_gengrid_item.eo | 1 + src/lib/elementary/elm_gengrid_pan.eo | 1 + src/lib/elementary/elm_genlist.eo | 1 + src/lib/elementary/elm_genlist_item.eo | 1 + src/lib/elementary/elm_genlist_pan.eo | 1 + src/lib/elementary/elm_gesture_layer.eo | 1 + src/lib/elementary/elm_glview.eo| 1 + src/lib/elementary/elm_grid.eo | 1 + src/lib/elementary/elm_hover.eo | 1 + src/lib/elementary/elm_hoversel.eo | 1 + src/lib/elementary/elm_hoversel_item.eo | 1 + src/lib/elementary/elm_icon.eo | 1 + src/lib/elementary/elm_image.eo | 1 + src/lib/elementary/elm_index.eo | 1 + src/lib/elementary/elm_index_item.eo| 1 + src/lib/elementary/elm_inwin.eo | 1 + src/lib/elementary/elm_label.eo | 1 + src/lib/elementary/elm_layout.eo| 1 + src/lib/elementary/elm_list.eo | 1 + src/lib/elementary/elm_list_item.eo | 1 + src/lib/elementary/elm_map.eo | 1 + src/lib/elementary/elm_map_pan.eo | 1 + src/lib/elementary/elm_mapbuf.eo| 1 + src/lib/elementary/elm_menu.eo | 1 + src/lib/elementary/elm_menu_item.eo | 1 + src/lib/elementary/elm_multibuttonentry.eo | 1 + src/lib/elementary/elm_multibuttonentry_item.eo | 1 + src/lib/elementary/elm_naviframe.eo | 1 + src/lib/elementary/elm_naviframe_item.eo| 1 + src/lib/elementary/elm_notify.eo| 1 + src/lib/elementary/elm_pan.eo | 1 + src/lib/elementary/elm_panel.eo | 1 + src/lib/elementary/elm_panes.eo | 1 + src/lib/elementary/elm_photo.eo | 1 + src/lib/elementary/elm_photocam.eo | 1 + src/lib/elementary/elm_photocam_pan.eo | 1 + src/lib/elementary/elm_player.eo| 1 + src/lib/elementary/elm_plug.eo | 1 + src/lib/elementary/elm_popup.eo | 1 + src/lib/elementary/elm_popup_item.eo| 1 + src/lib/elementary/elm_prefs.eo | 1 + src/lib/elementary/elm_progressbar.eo | 1 + src/lib/elementary/elm_radio.eo | 1 + src/lib/elementary/elm_route.eo | 1 + src/lib/elementary/elm_scroller.eo | 1 + src/lib/elementary/elm_segment_control.eo | 1 + src/lib/elementary/elm_segment_control_item.eo | 1 + src/lib/elementary/elm_separator.eo | 1 + src/lib/elementary/elm_slider.eo| 1 + src/lib/elementary/elm_slideshow.eo | 1 + src/lib/elementary/elm_slideshow_item.eo| 1 + src/lib/elementary/elm_spinner.eo | 1 + src/lib
[EGIT] [core/efl] master 01/04: eolian: do not generate legacy without explicit class legacy_prefix
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1a0566452f7231854184179ef95441fe82a14ded commit 1a0566452f7231854184179ef95441fe82a14ded Author: Daniel Kolesa Date: Thu May 12 16:28:19 2016 +0100 eolian: do not generate legacy without explicit class legacy_prefix --- src/lib/eolian/database_function_api.c | 10 +++--- src/tests/eolian/data/docs.eo | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/lib/eolian/database_function_api.c b/src/lib/eolian/database_function_api.c index 31bc862..586cb75 100644 --- a/src/lib/eolian/database_function_api.c +++ b/src/lib/eolian/database_function_api.c @@ -30,13 +30,9 @@ static const char * _get_eo_prefix(const Eolian_Function *foo_id, char *buf, Eina_Bool use_legacy) { char *tmp = buf; -if (use_legacy && foo_id->klass->legacy_prefix) - { - if (!strcmp(foo_id->klass->legacy_prefix, "null")) - return NULL; - return foo_id->klass->legacy_prefix; - } -else if (!use_legacy && foo_id->klass->eo_prefix) +if (use_legacy) + return foo_id->klass->legacy_prefix; +else if (foo_id->klass->eo_prefix) return foo_id->klass->eo_prefix; strcpy(buf, foo_id->klass->full_name); eina_str_tolower(&buf); diff --git a/src/tests/eolian/data/docs.eo b/src/tests/eolian/data/docs.eo index c99c008..1f48af5 100644 --- a/src/tests/eolian/data/docs.eo +++ b/src/tests/eolian/data/docs.eo @@ -53,6 +53,7 @@ class Docs { @since 1.18 ]] +legacy_prefix: docs; methods { meth { [[Method documentation.]] --
[EGIT] [core/efl] master 01/01: Edje_Edit: more API for proxy fields like source_clip and source_visible
furrymyad pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e80d8d9a7134fdc00fc2ea791205eee5d208e175 commit e80d8d9a7134fdc00fc2ea791205eee5d208e175 Author: Vitalii Vorobiov Date: Tue May 10 17:30:03 2016 +0300 Edje_Edit: more API for proxy fields like source_clip and source_visible Setters and getters like edje_edit_state_proxy_source_clip_set edje_edit_state_proxy_source_clip_get edje_edit_state_proxy_source_visible_set edje_edit_state_proxy_source_visible_get --- src/lib/edje/Edje_Edit.h | 66 src/lib/edje/edje_edit.c | 50 2 files changed, 116 insertions(+) diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h index 9b29a88..8a6996f 100644 --- a/src/lib/edje/Edje_Edit.h +++ b/src/lib/edje/Edje_Edit.h @@ -5008,6 +5008,72 @@ EAPI Eina_Bool edje_edit_state_proxy_source_set(Evas_Object *obj, const char *pa */ EAPI Eina_Stringshare * edje_edit_state_proxy_source_get(Evas_Object *obj, const char *part, const char *state, double value); +/** Set the source clip for given PROXY part state. + * + * The source clipper is ignored or used when rendering the proxy part. + * + * @param obj Object being edited. + * @param part Part that contain state. + * @param state The name of the state. + * @param value The state value. + * @param clip Value to set if ignore or use source cliper. + * + * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise. + * @since 1.18 + */ +EAPI Eina_Bool +edje_edit_state_proxy_source_clip_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool clip); + +/** Get the source clip for given PROXY part state. + * + * The source clipper is ignored or used when rendering the proxy part. + * + * @param obj Object being edited. + * @param part Part that contain state. + * @param state The name of the state. + * @param value The state value. + * + * @return @c EINA_TRUE in case if source clipper is used, @c EINA_FALSE otherwise. + * @since 1.18 + */ +EAPI Eina_Bool +edje_edit_state_proxy_source_clip_get(Evas_Object *obj, const char *part, const char *state, double value); + +/** Set the source visibility for given PROXY part state. + * + * Defines if both the proxy and its source object will be visible or not. + * In case of false flag, the source object will not be visible at all while + * proxy will still show source object. + * + * @param obj Object being edited. + * @param part Part that contain state. + * @param state The name of the state. + * @param value The state value. + * @param visibility Value to set if source object is visible or not. + * + * @return @c EINA_TRUE in case of success, @c EINA_FALSE otherwise. + * @since 1.18 + */ +EAPI Eina_Bool +edje_edit_state_proxy_source_visible_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool visibility); + +/** Get the source visibility for given PROXY part state. + * + * Defines if both the proxy and its source object will be visible or not. + * In case of false flag, the source object will not be visible at all while + * proxy will still show source object. + * + * @param obj Object being edited. + * @param part Part that contain state. + * @param state The name of the state. + * @param value The state value. + * + * @return @c EINA_TRUE in case when source object visibility is set to true, @c EINA_FALSE otherwise. + * @since 1.18 + */ +EAPI Eina_Bool +edje_edit_state_proxy_source_visible_get(Evas_Object *obj, const char *part, const char *state, double value); + //@} /**/ /** TEXT API / diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index 38a26e0..f522758 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -8436,6 +8436,56 @@ edje_edit_state_proxy_source_get(Evas_Object *obj, const char *part, const char return eina_stringshare_add(source_name); } +EAPI Eina_Bool +edje_edit_state_proxy_source_clip_set(Evas_Object *obj, const char *part, const char *state, double value, Eina_Bool clip) +{ + GET_PD_OR_RETURN(EINA_FALSE); + if (rp->part->type != EDJE_PART_TYPE_PROXY) + return EINA_FALSE; + + Edje_Part_Description_Proxy *proxy_part = (Edje_Part_Description_Proxy *)pd; + proxy_part->proxy.source_clip = clip; + + return EINA_TRUE; +} + +EAPI Eina_Bool +edje_edit_state_proxy_source_clip_get(Evas_Object *obj, const char *part, const char *state, double value) +{ + GET_PD_OR_RETURN(EINA_FALSE); + if (rp->part->type != EDJE_PART_TYPE_PROXY) + return EINA_FALSE; + + Edje_Part_Description_Proxy *proxy_part = (Edje_Part_Description_Proxy *)pd; + + return proxy_part->proxy.source_clip; +} + +EAPI Eina_Bool +edje_edit_state_proxy_source_visible_set(Evas_Object *obj, const char *part, const char
[EGIT] [core/enlightenment] enlightenment-0.20 04/39: directly load extra wl modules during compositor init
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d525ba85895aa7883bd60d8c7138a23f74124590 commit d525ba85895aa7883bd60d8c7138a23f74124590 Author: Mike Blumenkrantz Date: Thu Apr 28 17:57:34 2016 -0400 directly load extra wl modules during compositor init speed --- src/bin/e_comp_wl.c | 15 +++ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 0bedc3d..e81bb9f 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -74,8 +74,8 @@ _e_comp_wl_focus_check(void) /*EINA_LOG_DOM_INFO(e_log_dom, format, args); */ /* } */ -static Eina_Bool -_e_comp_wl_cb_module_idle(void *data EINA_UNUSED) +static void +_e_comp_wl_modules_load(void) { const char **m, *mods[] = { @@ -84,9 +84,6 @@ _e_comp_wl_cb_module_idle(void *data EINA_UNUSED) NULL }; - /* check if we are still loading modules */ - if (e_module_loading_get()) return ECORE_CALLBACK_RENEW; - for (m = mods; *m; m++) { E_Module *mod = e_module_find(*m); @@ -97,11 +94,6 @@ _e_comp_wl_cb_module_idle(void *data EINA_UNUSED) if (mod) e_module_enable(mod); } - - /* FIXME: NB: -* Do we need to dispatch pending wl events here ?? */ - - return ECORE_CALLBACK_CANCEL; } static void @@ -2555,8 +2547,7 @@ _e_comp_wl_compositor_create(void) #endif e_comp_wl->wl.client_disp = ecore_wl2_display_connect(NULL); - /* setup module idler to load shell mmodule */ - ecore_idler_add(_e_comp_wl_cb_module_idle, cdata); + _e_comp_wl_modules_load(); if (e_comp->comp_type == E_PIXMAP_TYPE_X) { --
[EGIT] [core/enlightenment] enlightenment-0.20 29/39: also check pixmap argb state when setting comp object alpha
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=3de65edc233fde919ea18f390e4a8c13cb9ee450 commit 3de65edc233fde919ea18f390e4a8c13cb9ee450 Author: Mike Blumenkrantz Date: Wed May 11 15:32:36 2016 -0400 also check pixmap argb state when setting comp object alpha more accurate for wayland --- src/bin/e_comp_object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 3b533a6..cca66b6 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -316,7 +316,7 @@ _e_comp_object_updates_init(E_Comp_Object *cw) static void _e_comp_object_alpha_set(E_Comp_Object *cw) { - Eina_Bool alpha = cw->ec->argb; + Eina_Bool alpha = cw->ec->argb || e_pixmap_image_is_argb(cw->ec->pixmap); if (cw->blanked || cw->ns || cw->ec->shaped) alpha = EINA_TRUE; --
[EGIT] [core/enlightenment] enlightenment-0.20 05/39: further optimize window smart placement by reducing obstacle calcs
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5b2cb3ddc777d5fac540cedfc138cb189e8c6a4d commit 5b2cb3ddc777d5fac540cedfc138cb189e8c6a4d Author: Mike Blumenkrantz Date: Mon May 2 18:33:36 2016 -0400 further optimize window smart placement by reducing obstacle calcs previously the obstacle list would build from the bottom up, skipping fullscreen and maximized windows. this would lead to cases where windows would be moved to avoid windows which were fully obscured, and also cases where unnecessarily large amounts of looping would occur related to the existence of maximized windows --- src/bin/e_place.c | 25 + 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/bin/e_place.c b/src/bin/e_place.c index 85698e2..e696abf 100644 --- a/src/bin/e_place.c +++ b/src/bin/e_place.c @@ -56,22 +56,29 @@ _e_place_cb_sort_cmp(const void *v1, const void *v2) } static Eina_Bool -ignore_client(const E_Client *ec, const Eina_List *skiplist) +ignore_client_and_break(const E_Client *ec) { - if (eina_list_data_find(skiplist, ec)) return EINA_TRUE; - if (e_client_util_ignored_get(ec)) return EINA_TRUE; - if (!evas_object_visible_get(ec->frame)) return EINA_TRUE; if (ec->fullscreen) return EINA_TRUE; if (ec->maximized) { -E_Maximize max = ec->maximized & E_MAXIMIZE_TYPE; +E_Maximize max = ec->maximized & E_MAXIMIZE_DIRECTION; if (max == E_MAXIMIZE_FULLSCREEN) return EINA_TRUE; -if (max & (E_MAXIMIZE_HORIZONTAL | E_MAXIMIZE_VERTICAL)) return EINA_TRUE; +if (max == E_MAXIMIZE_BOTH) return EINA_TRUE; } return EINA_FALSE; } +static Eina_Bool +ignore_client(const E_Client *ec, const Eina_List *skiplist) +{ + if (eina_list_data_find(skiplist, ec)) return EINA_TRUE; + if (e_client_util_ignored_get(ec)) return EINA_TRUE; + if (!evas_object_visible_get(ec->frame)) return EINA_TRUE; + + return EINA_FALSE; +} + static int _e_place_coverage_client_add(Eina_List *skiplist, int ar, int x, int y, int w, int h) { @@ -80,9 +87,10 @@ _e_place_coverage_client_add(Eina_List *skiplist, int ar, int x, int y, int w, i int iw, ih; int x0, x00, yy0, y00; - E_CLIENT_FOREACH(ec) + E_CLIENT_REVERSE_FOREACH(ec) { if (ignore_client(ec, skiplist)) continue; +if (ignore_client_and_break(ec)) break; x2 = ec->x; y2 = ec->y; w2 = ec->w; h2 = ec->h; if (E_INTERSECTS(x, y, w, h, x2, y2, w2, h2)) { @@ -261,11 +269,12 @@ e_place_desk_region_smart(E_Desk *desk, Eina_List *skiplist, int x, int y, int w } } - E_CLIENT_FOREACH(ec) + E_CLIENT_REVERSE_FOREACH(ec) { int bx, by, bw, bh; if (ignore_client(ec, skiplist)) continue; +if (ignore_client_and_break(ec)) break; bx = ec->x; by = ec->y; --
[EGIT] [core/enlightenment] enlightenment-0.20 34/39: use window id for internal window pixmaps again on wayland
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=93a2233f28d662a6db4f0d264494659a98ae1f27 commit 93a2233f28d662a6db4f0d264494659a98ae1f27 Author: Mike Blumenkrantz Date: Wed May 11 15:36:45 2016 -0400 use window id for internal window pixmaps again on wayland this was breaking internal windows when more than one was open, and especially if any were open which had a parent-child relationship, by using the same id for all internal window pixmaps --- src/bin/e_comp_wl.c | 6 +- src/bin/e_win.c | 18 ++ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index cea36ed..1abbc2b 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -1427,6 +1427,7 @@ _e_comp_wl_surface_destroy(struct wl_resource *resource) if (!(ec = wl_resource_get_user_data(resource))) return; + e_pixmap_alias(ec->pixmap, E_PIXMAP_TYPE_WL, wl_resource_get_id(resource)); e_object_del(E_OBJECT(ec)); evas_object_hide(ec->frame); } @@ -2243,7 +2244,10 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec) wl_resource_destroy(cb); if (ec->comp_data->surface) - wl_resource_set_user_data(ec->comp_data->surface, NULL); + { +e_pixmap_alias(ec->pixmap, E_PIXMAP_TYPE_WL, wl_resource_get_id(ec->comp_data->surface)); +wl_resource_set_user_data(ec->comp_data->surface, NULL); + } if (ec->internal_elm_win) evas_object_hide(ec->frame); diff --git a/src/bin/e_win.c b/src/bin/e_win.c index 2e0ba14..31667eb 100644 --- a/src/bin/e_win.c +++ b/src/bin/e_win.c @@ -73,7 +73,7 @@ _e_elm_win_trap_show(void *data, Evas_Object *o) E_Client *ec; Ecore_Window win; #ifdef HAVE_WAYLAND -int64_t wl_win_id; +int64_t wl_win_id = -1; #endif E_Pixmap_Type type = E_PIXMAP_TYPE_X; @@ -96,12 +96,7 @@ _e_elm_win_trap_show(void *data, Evas_Object *o) ctx->pointer = e_pointer_window_new(win, EINA_TRUE); } -#ifdef HAVE_WAYLAND -if (type == E_PIXMAP_TYPE_WL) - ec = e_pixmap_find_client(type, wl_win_id); -else -#endif - ec = e_pixmap_find_client(type, win); +ec = e_pixmap_find_client(type, win); if (ec) ctx->client = ec; else @@ -118,13 +113,12 @@ _e_elm_win_trap_show(void *data, Evas_Object *o) title = "E"; ecore_evas_title_set(ee, title); + cp = e_pixmap_new(type, win); + EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_TRUE); #ifdef HAVE_WAYLAND - if (type == E_PIXMAP_TYPE_WL) - cp = e_pixmap_new(type, wl_win_id); - else + if (wl_win_id >= 0) + e_pixmap_alias(cp, type, wl_win_id); #endif - cp = e_pixmap_new(type, win); - EINA_SAFETY_ON_NULL_RETURN_VAL(cp, EINA_TRUE); current_win = ctx; ctx->client = e_client_new(cp, 0, 1); --
[EGIT] [core/enlightenment] enlightenment-0.20 18/39: make init fail if a dbus session connection cannot be created
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c86c239d7215494f166599a5726579532ad38acd commit c86c239d7215494f166599a5726579532ad38acd Author: Mike Blumenkrantz Date: Mon May 9 13:30:40 2016 -0400 make init fail if a dbus session connection cannot be created typically this indicates a broken session manager or someone trying to run a wayland session without using dbus-launch --- src/bin/e_main.c | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 8b738c3..8572d4b 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -633,7 +633,17 @@ main(int argc, char **argv) if (e_config->show_splash) e_init_status_set(_("Setup Message Bus")); TS("E_Msgbus Init"); - if (e_msgbus_init()) + if (!e_msgbus_init()) + { +if (!getenv("E_NO_DBUS_SESSION")) + { + e_error_message_show(_("Enlightenment cannot create a dbus session connection.\n" +"At best this will break many things, at worst it will hard lock your machine.\n" +"If you're sure you know what you're doing, export E_NO_DBUS_SESSION=1")); + _e_main_shutdown(-1); + } + } + else _e_main_shutdown_push(e_msgbus_shutdown); TS("E_Msgbus Init Done"); --
[EGIT] [core/enlightenment] enlightenment-0.20 15/39: unset DISPLAY during mixer's pulse backend startup
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=aef99290d0b6c896e478cdd57bf34ae947e85492 commit aef99290d0b6c896e478cdd57bf34ae947e85492 Author: Mike Blumenkrantz Date: Fri May 6 13:40:03 2016 -0400 unset DISPLAY during mixer's pulse backend startup fixes more xwayland deadlocks --- src/modules/Makefile_mixer.mk | 2 +- src/modules/mixer/lib/backends/pulseaudio/pulse.c | 17 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/modules/Makefile_mixer.mk b/src/modules/Makefile_mixer.mk index f5368f7..4f90cf1 100644 --- a/src/modules/Makefile_mixer.mk +++ b/src/modules/Makefile_mixer.mk @@ -25,7 +25,7 @@ src_modules_mixer_emixerdir = $(mixerpkgdir) bin_PROGRAMS += src/modules/mixer/emixer src_modules_mixer_emixer_SOURCES = src/modules/mixer/emixer.c \ $(emixerlib) -src_modules_mixer_emixer_CPPFLAGS = $(MOD_CPPFLAGS) @e_cflags@ -I$(top_srcdir)/src/modules/mixer/lib +src_modules_mixer_emixer_CPPFLAGS = $(MOD_CPPFLAGS) -I$(top_srcdir)/src/modules/mixer/lib -DEMIXER_BUILD src_modules_mixer_emixer_LDADD = $(MOD_LIBS) @PULSE_LIBS@ @ALSA_LIBS@ src_modules_mixer_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @e_cflags@ @ALSA_CFLAGS@ @PULSE_CFLAGS@ -I$(top_srcdir)/src/modules/mixer/lib diff --git a/src/modules/mixer/lib/backends/pulseaudio/pulse.c b/src/modules/mixer/lib/backends/pulseaudio/pulse.c index 8c2cf41..9660318 100644 --- a/src/modules/mixer/lib/backends/pulseaudio/pulse.c +++ b/src/modules/mixer/lib/backends/pulseaudio/pulse.c @@ -781,6 +781,16 @@ _pulse_connect(void *data) pa_proplist_sets(proplist, PA_PROP_APPLICATION_ID, "org.enlightenment.volumecontrol"); pa_proplist_sets(proplist, PA_PROP_APPLICATION_ICON_NAME, "audio-card"); +#if !defined(EMIXER_BUILD) && defined(HAVE_WAYLAND) && !defined(HAVE_WAYLAND_ONLY) + char *display; + + if (e_comp->comp_type != E_PIXMAP_TYPE_X) + { +display = getenv("DISPLAY"); +if (display) display = strdup(display); +e_env_unset("DISPLAY"); + } +#endif c->context = pa_context_new_with_proplist(&(c->api), NULL, proplist); if (!c->context) { @@ -794,6 +804,13 @@ _pulse_connect(void *data) WRN("Could not connect to pulse"); goto err; } +#if !defined(EMIXER_BUILD) && defined(HAVE_WAYLAND) && !defined(HAVE_WAYLAND_ONLY) + if (e_comp->comp_type != E_PIXMAP_TYPE_X) + { +e_env_set("DISPLAY", display); +free(display); + } +#endif pa_proplist_free(proplist); return ECORE_CALLBACK_DONE; --
[EGIT] [core/enlightenment] enlightenment-0.20 25/39: handle positioning of x11 overrides with csd accurately
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=2ddd4d9bda9906c83b0b1439cb3f46445f1c4082 commit 2ddd4d9bda9906c83b0b1439cb3f46445f1c4082 Author: Mike Blumenkrantz Date: Tue May 10 16:04:57 2016 -0400 handle positioning of x11 overrides with csd accurately when first applying the csd region to this type of window the coords must be adjusted in order to account for the shadow fix T2934, T2931 --- src/bin/e_comp_x.c | 4 1 file changed, 4 insertions(+) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 1776f82..834c472 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -4435,6 +4435,10 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec) */ e_comp_object_frame_geometry_set(ec->frame, -extents[0], -extents[1], -extents[2], -extents[3]); + if (ec->override && +(ec->x == ec->comp_data->initial_attributes.x) && +(ec->y == ec->comp_data->initial_attributes.y)) + e_comp_object_frame_xy_adjust(ec->frame, ec->x, ec->y, &ec->x, &ec->y); free(data); } cd->fetch_gtk_frame_extents = 0; --
[EGIT] [core/enlightenment] enlightenment-0.20 16/39: ensure xwayland module init does not fail due to early startup
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=de03be5131d707c396ef2919207046c9132ab1ab commit de03be5131d707c396ef2919207046c9132ab1ab Author: Mike Blumenkrantz Date: Fri May 6 13:42:20 2016 -0400 ensure xwayland module init does not fail due to early startup comp_type may not be set at the time of init --- 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 49c9ec1..3e5c895 100644 --- a/src/modules/xwayland/e_mod_main.c +++ b/src/modules/xwayland/e_mod_main.c @@ -349,7 +349,7 @@ xwl_init(E_Module *m) char disp[8]; /* make sure it's a wayland compositor */ - if (e_comp->comp_type != E_PIXMAP_TYPE_WL) return NULL; + if (e_comp->comp_type == E_PIXMAP_TYPE_X) return NULL; if (getenv("DISPLAY")) { --
[EGIT] [core/enlightenment] enlightenment-0.20 10/39: disable option for mouse to use Application theme if we are running in Wayland
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=ed349d475108a84f90205a78d6df7b7cd9d9fee3 commit ed349d475108a84f90205a78d6df7b7cd9d9fee3 Author: Chris Michael Date: Wed May 4 14:52:15 2016 -0400 disable option for mouse to use Application theme if we are running in Wayland Small patch to disable selecting Application themed mouse pointers when running in wayland as this option is currently broken when running in wayland (gives no mouse cursor at all) e_pointer calls _e_pointer_x11_setup (from _e_pointer_type_set) which only sets the cursor via ecore_x_cursor_shape_get calls... essentially you end up with no mouse cursor because e_pointer is missing codepaths to lookup system mouse cursor images when running in wayland. ref T3585 Signed-off-by: Chris Michael --- src/modules/conf_interaction/e_int_config_mouse.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/conf_interaction/e_int_config_mouse.c b/src/modules/conf_interaction/e_int_config_mouse.c index 18de2fd..fc22e07 100644 --- a/src/modules/conf_interaction/e_int_config_mouse.c +++ b/src/modules/conf_interaction/e_int_config_mouse.c @@ -163,6 +163,7 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia e_widget_on_change_hook_set(ob, _use_e_cursor_cb_change, cfdata); e_widget_framelist_object_append(of, ob); e_widget_check_widget_disable_on_unchecked_add(oc, ob); + if (!e_comp_util_has_x()) e_widget_disabled_set(ob, 1); ob = e_widget_radio_add(evas, _("Enlightenment"), 1, rg); e_widget_on_change_hook_set(ob, _use_e_cursor_cb_change, cfdata); --
[EGIT] [core/enlightenment] enlightenment-0.20 12/39: bad copy/paste in _e_place_desk_region_smart_obstacle_add()
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=44526e6ae18d5c32d6d27fcde18bb330fd7bd2ca commit 44526e6ae18d5c32d6d27fcde18bb330fd7bd2ca Author: Mike Blumenkrantz Date: Thu May 5 09:36:42 2016 -0400 bad copy/paste in _e_place_desk_region_smart_obstacle_add() CID 1354988 --- src/bin/e_place.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_place.c b/src/bin/e_place.c index e696abf..57e0d67 100644 --- a/src/bin/e_place.c +++ b/src/bin/e_place.c @@ -169,7 +169,7 @@ _e_place_desk_region_smart_obstacle_add(char *u_x, char *u_y, int **a_x, int **a if (by < zy) { bh += by; -by = zx; +by = zy; } if ((by + bh) > zy + zh) bh = zy + zh - by; if (by >= zy + zh) return; --
[EGIT] [core/enlightenment] enlightenment-0.20 17/39: flag wl surfaces as internal during create() based on pid matching
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b1e4f3d1da1533bf751cacbdc0eb1b95be1d44fa commit b1e4f3d1da1533bf751cacbdc0eb1b95be1d44fa Author: Mike Blumenkrantz Date: Fri May 6 13:52:10 2016 -0400 flag wl surfaces as internal during create() based on pid matching fix T3596 --- src/bin/e_comp_wl.c | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 533fb6f..71726ac 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -1479,15 +1479,14 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client *client, struct wl_reso ec = e_client_new(ep, 0, 0); } - if (ec) - { -if (ec->new_client) - e_comp->new_clients--; -ec->new_client = 0; -if ((!ec->client.w) && (ec->client.h)) - ec->client.w = ec->client.h = 1; -ec->comp_data->surface = res; - } + if (ec->new_client) + e_comp->new_clients--; + ec->new_client = 0; + if ((!ec->client.w) && (ec->client.h)) + ec->client.w = ec->client.h = 1; + ec->comp_data->surface = res; + ec->netwm.pid = pid; + ec->internal = pid == getpid(); /* set reference to pixmap so we can fetch it later */ DBG("\tUsing Client: %p", ec); --
[EGIT] [core/enlightenment] enlightenment-0.20 22/39: disable focus effects for windows with csd
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=eee1ee8fb05f40716a0d246b6506ce50385c266e commit eee1ee8fb05f40716a0d246b6506ce50385c266e Author: Mike Blumenkrantz Date: Tue May 10 12:35:06 2016 -0400 disable focus effects for windows with csd fix T3408 --- src/bin/e_comp_object.c | 9 + 1 file changed, 9 insertions(+) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 3a7bf34..3b533a6 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -688,6 +688,10 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw) } else e_comp_object_signal_emit(cw->smart_obj, "e,state,hidden", "e"); + if (e_comp_object_frame_allowed(cw->smart_obj)) + e_comp_object_signal_emit(cw->smart_obj, "e,state,focus,enabled", "e"); + else + e_comp_object_signal_emit(cw->smart_obj, "e,state,focus,disabled", "e"); /* breaks animation counter */ //if (cw->ec->iconic) @@ -3056,6 +3060,11 @@ e_comp_object_frame_geometry_set(Evas_Object *obj, int l, int r, int t, int b) cw->client_inset.r = r; cw->client_inset.t = t; cw->client_inset.b = b; + if (!cw->shobj) return; + if (cw->client_inset.calc) + e_comp_object_signal_emit(obj, "e,state,focus,disabled", "e"); + else + e_comp_object_signal_emit(obj, "e,state,focus,enabled", "e"); } E_API Eina_Bool --
[EGIT] [core/enlightenment] enlightenment-0.20 39/39: force cursor placement to obey useful zone geometry
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=57f7f4f5e065c426c20bbc8625a6fbeaf491bb26 commit 57f7f4f5e065c426c20bbc8625a6fbeaf491bb26 Author: Mike Blumenkrantz Date: Thu May 12 12:10:48 2016 -0400 force cursor placement to obey useful zone geometry --- src/bin/e_place.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bin/e_place.c b/src/bin/e_place.c index 57e0d67..3780c9d 100644 --- a/src/bin/e_place.c +++ b/src/bin/e_place.c @@ -435,6 +435,7 @@ e_place_zone_cursor(E_Zone *zone, int x EINA_UNUSED, int y EINA_UNUSED, int w, i { int cursor_x = 0, cursor_y = 0; int zone_right, zone_bottom; + int zx, zy, zw, zh; E_OBJECT_CHECK_RETURN(zone, 0); @@ -442,14 +443,16 @@ e_place_zone_cursor(E_Zone *zone, int x EINA_UNUSED, int y EINA_UNUSED, int w, i *rx = cursor_x - (w >> 1); *ry = cursor_y - (it >> 1); + e_zone_useful_geometry_get(zone, &zx, &zy, &zw, &zh); + if (*rx < zone->x) - *rx = zone->x; + *rx = zx; if (*ry < zone->y) - *ry = zone->y; + *ry = zy; - zone_right = zone->x + zone->w; - zone_bottom = zone->y + zone->h; + zone_right = zx + zw; + zone_bottom = zy + zh; if ((*rx + w) > zone_right) *rx = zone_right - w; --
[EGIT] [core/enlightenment] enlightenment-0.20 33/39: set E_Client->override flag for internal wins as needed
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=1629ea5c63e54a3472504d39a9cb02dec436c6d2 commit 1629ea5c63e54a3472504d39a9cb02dec436c6d2 Author: Mike Blumenkrantz Date: Wed May 11 15:35:48 2016 -0400 set E_Client->override flag for internal wins as needed --- src/bin/e_comp_wl.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 7e4596f..cea36ed 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2195,7 +2195,10 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec) * we need to set delete_request else the close buttons on the frames do * basically nothing */ if ((ec->internal) || (ec->internal_elm_win)) - ec->icccm.delete_request = EINA_TRUE; + { +ec->icccm.delete_request = EINA_TRUE; +ec->override = elm_win_override_get(e_win_evas_win_get(ecore_evas_get(ecore_event_window_match(win; + } /* set initial client data properties */ ec->comp_data->mapped = EINA_FALSE; --
[EGIT] [core/enlightenment] enlightenment-0.20 02/39: feed mouse up events to internal wins before mouse out during action exec
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=dc0ec2339e67ad717b18bd4bfd8163e1f201d827 commit dc0ec2339e67ad717b18bd4bfd8163e1f201d827 Author: Mike Blumenkrantz Date: Thu Apr 28 12:00:17 2016 -0400 feed mouse up events to internal wins before mouse out during action exec ref 609276e12df8d91d8c497f01e5b13776ea98ffcb fix T3347 --- src/bin/e_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index d05827b..6748a06 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -2877,12 +2877,12 @@ e_client_mouse_down(E_Client *ec, int button, Evas_Point *output, E_Binding_Even e = evas_object_evas_get(ec->internal_elm_win); button_mask = evas_pointer_button_down_mask_get(e); - evas_event_feed_mouse_out(e, 0, NULL); for (i = 0; i < 32; i++) { if ((button_mask & (1 << i))) evas_event_feed_mouse_up(e, i + 1, EVAS_BUTTON_NONE, 0, NULL); } + evas_event_feed_mouse_out(e, 0, NULL); } } } --
[EGIT] [core/enlightenment] enlightenment-0.20 13/39: add configure flag for xwayland binary
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a259de324e841c290eb0a8c93a6b00af7ec35ac6 commit a259de324e841c290eb0a8c93a6b00af7ec35ac6 Author: Mike Blumenkrantz Date: Fri May 6 13:37:10 2016 -0400 add configure flag for xwayland binary --- configure.ac | 4 ++-- src/modules/Makefile_xwayland.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 2259e71..d1c0a51 100644 --- a/configure.ac +++ b/configure.ac @@ -771,8 +771,8 @@ define([CHECK_MODULE_XWAYLAND], [ if test "x${have_wayland}" = "xyes"; then AC_E_CHECK_PKG(XWAYLAND, [ ecore-x >= ${efl_version} ecore-audio >= ${efl_version} ], [HAVE_XWAYLAND_DEPS=true], [HAVE_XWAYLAND_DEPS=false]) -AC_PATH_PROG([XWAYLAND_BIN], [Xwayland], [false]) -if test "x${XWAYLAND_BIN}" = "xfalse"; then +EFL_WITH_BIN([Xwayland], [Xwayland], [Xwayland]) +if test -z "x${Xwayland}" ; then HAVE_XWAYLAND_DEPS=false fi else diff --git a/src/modules/Makefile_xwayland.mk b/src/modules/Makefile_xwayland.mk index 56fd137..854a6ee 100644 --- a/src/modules/Makefile_xwayland.mk +++ b/src/modules/Makefile_xwayland.mk @@ -7,7 +7,7 @@ src_modules_xwayland_module_la_CPPFLAGS = \ $(MOD_CPPFLAGS) \ @XWAYLAND_CFLAGS@ \ @WAYLAND_CFLAGS@ \ --DXWAYLAND_BIN=\"@XWAYLAND_BIN@\" +-DXWAYLAND_BIN=\"@xwayland@\" src_modules_xwayland_module_la_LIBADD = $(MOD_LIBS) @XWAYLAND_LIBS@ @WAYLAND_LIBS@ src_modules_xwayland_module_la_LDFLAGS = $(MOD_LDFLAGS) --
[EGIT] [core/enlightenment] enlightenment-0.20 06/39: don't refocus deleted clients during wl compositor grab
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=1faf199f4536d2827b19c4ce383c9d4f50307ee1 commit 1faf199f4536d2827b19c4ce383c9d4f50307ee1 Author: Mike Blumenkrantz Date: Tue May 3 20:24:23 2016 -0400 don't refocus deleted clients during wl compositor grab --- src/bin/e_comp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 0d78bda..afdda77 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -1661,7 +1661,7 @@ e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd) e_comp->input_key_grabs += kbd; if (e_comp->comp_type == E_PIXMAP_TYPE_WL) { - if (ec) + if (ec && (!e_object_is_del(E_OBJECT(ec evas_object_focus_set(ec->frame, 1); } } --
[EGIT] [core/enlightenment] enlightenment-0.20 11/39: evry null deref
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f49979bb729392748efa54a0c1b1f3757ef04dfc commit f49979bb729392748efa54a0c1b1f3757ef04dfc Author: Mike Blumenkrantz Date: Thu May 5 09:33:55 2016 -0400 evry null deref CID 1355061 --- src/modules/everything/evry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c index d5584a3..ff7b000 100644 --- a/src/modules/everything/evry.c +++ b/src/modules/everything/evry.c @@ -207,10 +207,10 @@ evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params, Eina_Bool popup) #endif ec->netwm.state.skip_taskbar = 1; EC_CHANGED(ec); + evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_FOCUS_OUT, _evry_focus_out, win); } win->grab = 1; -evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_FOCUS_OUT, _evry_focus_out, win); } evry_history_load(); --
[EGIT] [core/enlightenment] enlightenment-0.20 24/39: only load wayland-specific modules on startup if they have been built
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c5c115c5303e4119946e6595751033e60e2ee978 commit c5c115c5303e4119946e6595751033e60e2ee978 Author: Mike Blumenkrantz Date: Tue May 10 14:18:09 2016 -0400 only load wayland-specific modules on startup if they have been built --- src/bin/e_comp_wl.c | 4 1 file changed, 4 insertions(+) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 8551305..af6494a 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -79,8 +79,12 @@ _e_comp_wl_modules_load(void) { const char **m, *mods[] = { +#ifdef USE_MODULE_WL_DESKTOP_SHELL "wl_desktop_shell", +#endif +#ifdef USE_MODULE_XWAYLAND "xwayland", +#endif NULL }; --
[EGIT] [core/enlightenment] enlightenment-0.20 20/39: do not add ignored clients to ibar menu
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=729de96672c8fa0ded0a71923b8115f8f9ad7bc0 commit 729de96672c8fa0ded0a71923b8115f8f9ad7bc0 Author: Mike Blumenkrantz Date: Mon May 9 13:56:56 2016 -0400 do not add ignored clients to ibar menu fix T3603 --- src/modules/ibar/e_mod_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 755d68d..5b5538e 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -1298,7 +1298,7 @@ _ibar_icon_menu_client_add(IBar_Icon *ic, E_Client *ec) Eina_Stringshare *txt; int w, h; - if (ec->netwm.state.skip_taskbar) return EINA_FALSE; + if (ec->netwm.state.skip_taskbar || e_client_util_ignored_get(ec)) return EINA_FALSE; o = ic->menu->o_bg; it = edje_object_add(e_comp->evas); ic->client_objs = eina_list_append(ic->client_objs, it); --
[EGIT] [core/enlightenment] enlightenment-0.20 36/39: only check pixmap argb state for non-X11 clients
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e4f3e73d7d2052b280f4d08da222a6258d9117d0 commit e4f3e73d7d2052b280f4d08da222a6258d9117d0 Author: Mike Blumenkrantz Date: Wed May 11 18:34:49 2016 -0400 only check pixmap argb state for non-X11 clients non-argb windows can have argb pixmaps. ref 6d397e313b9c402167cc3206b19a8ca60a2525ea --- src/bin/e_comp_object.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 2a8406a..611bb79 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -316,7 +316,10 @@ _e_comp_object_updates_init(E_Comp_Object *cw) static void _e_comp_object_alpha_set(E_Comp_Object *cw) { - Eina_Bool alpha = cw->ec->argb || e_pixmap_image_is_argb(cw->ec->pixmap); + Eina_Bool alpha = cw->ec->argb; + + if (!e_pixmap_is_x(cw->ec->pixmap)) + alpha |= e_pixmap_image_is_argb(cw->ec->pixmap); if (cw->blanked || cw->ns || cw->ec->shaped) alpha = EINA_TRUE; --
[EGIT] [core/enlightenment] enlightenment-0.20 03/39: ensure that the startup apps cache handler has run before trying to start apps
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a0d5d4b8391aa875b6d182344e08dc53e04cc395 commit a0d5d4b8391aa875b6d182344e08dc53e04cc395 Author: Mike Blumenkrantz Date: Thu Apr 28 17:56:59 2016 -0400 ensure that the startup apps cache handler has run before trying to start apps fixes timing issues when running startup apps --- src/bin/e_startup.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bin/e_startup.c b/src/bin/e_startup.c index c6b97fb..7b8a5dd 100644 --- a/src/bin/e_startup.c +++ b/src/bin/e_startup.c @@ -15,6 +15,7 @@ static E_Order *startup_apps = NULL; static int start_app_pos = -1; static Ecore_Event_Handler *desktop_cache_update_handler = NULL; +static Eina_Bool desktop_cache_update = EINA_FALSE; static Eina_Bool started = EINA_FALSE; /* externally accessible functions */ @@ -46,7 +47,7 @@ e_startup_mode_set(E_Startup_Mode mode) E_API void e_startup(void) { - if (desktop_cache_update_handler) + if (!desktop_cache_update) started = EINA_TRUE; else _e_startup(); @@ -116,6 +117,7 @@ _e_startup_event_cb(void *data, int ev_type EINA_UNUSED, void *ev) _e_startup_error_dialog("E: Efreet could not build cache. " "Please check your DBus setup"); } + desktop_cache_update = EINA_TRUE; E_FREE_FUNC(desktop_cache_update_handler, ecore_event_handler_del); buf = data; startup_apps = e_order_new(buf); --
[EGIT] [core/enlightenment] enlightenment-0.20 32/39: remove some cruft from _e_comp_wl_client_cb_new()
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=68f4a7b75edcdf4c1b020614eb4d4c2f47cafa9a commit 68f4a7b75edcdf4c1b020614eb4d4c2f47cafa9a Author: Mike Blumenkrantz Date: Wed May 11 15:35:01 2016 -0400 remove some cruft from _e_comp_wl_client_cb_new() --- src/bin/e_comp_wl.c | 8 1 file changed, 8 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index b026c38..7e4596f 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2175,14 +2175,6 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec) /* get window id from pixmap */ win = e_pixmap_window_get(ec->pixmap); - /* ignore fake root windows */ - if ((ec->override) && ((ec->x == -77) && (ec->y == -77))) - { -e_comp_ignore_win_add(E_PIXMAP_TYPE_WL, win); -e_object_del(E_OBJECT(ec)); -return; - } - if (!(ec->comp_data = E_NEW(E_Comp_Client_Data, 1))) { ERR("Could not allocate new client data structure"); --
[EGIT] [core/enlightenment] enlightenment-0.20 19/39: update README.wayland to include dbus-launch
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a0d6b35ae1ec144f3988ac18e151dcca0befd40c commit a0d6b35ae1ec144f3988ac18e151dcca0befd40c Author: Mike Blumenkrantz Date: Mon May 9 13:32:33 2016 -0400 update README.wayland to include dbus-launch --- README.wayland | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.wayland b/README.wayland index 7ec2ae1..1d49e7f 100644 --- a/README.wayland +++ b/README.wayland @@ -70,12 +70,12 @@ Enlightenment, when compiled with Wayland support and started from a tty, will automatically attempt to load the wl_drm output module and start a Wayland session. Simply start as usual: - ./enlightenment_start + dbus-launch enlightenment_start If you have a separate configuration profile that you would like to use, you can tell Enlightenment to use that when you start it: - ./enlightenment_start -profile + dbus-launch enlightenment_start -profile To run a wayland session inside x11, export E_WL_FORCE=x11 before starting enlightenment. --
[EGIT] [core/enlightenment] enlightenment-0.20 27/39: toggle compositor canvas focus during init
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=0d20333eb3e2da0aae1c20acfc44e7a13225a211 commit 0d20333eb3e2da0aae1c20acfc44e7a13225a211 Author: Mike Blumenkrantz Date: Wed May 11 13:33:31 2016 -0400 toggle compositor canvas focus during init this sets the toplevel focus flag in elm, allowing widgets on the compositor canvas to receive focus in wayland compositors --- src/bin/e_comp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index afdda77..78f3869 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -1156,6 +1156,8 @@ out: e_comp->elm = elm_win_fake_add(e_comp->ee); evas_object_event_callback_add(e_comp->elm, EVAS_CALLBACK_RESIZE, _e_comp_resize, NULL); elm_win_fullscreen_set(e_comp->elm, 1); + ecore_evas_focus_set(e_comp->ee, 0); + ecore_evas_focus_set(e_comp->ee, 1); evas_object_show(e_comp->elm); e_util_env_set("HYBRIS_EGLPLATFORM", NULL); E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON, _e_comp_screensaver_on, NULL); --
[EGIT] [core/enlightenment] enlightenment-0.20 21/39: ensure child windows are placed on screen
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5cd256da782d0d3b31b557c3b6caa476ee09ea4a commit 5cd256da782d0d3b31b557c3b6caa476ee09ea4a Author: Mike Blumenkrantz Date: Tue May 10 12:11:43 2016 -0400 ensure child windows are placed on screen when centering a child over its parent, checks were not made to ensure that by centering the child it had not gone offscreen --- src/bin/e_client.c | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index 6748a06..b105854 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -1758,6 +1758,7 @@ _e_client_eval(E_Client *ec) { if (ec->parent) { + Eina_Bool centered = EINA_FALSE; if (ec->parent->zone != e_zone_current_get()) { e_client_zone_set(ec, ec->parent->zone); @@ -1784,6 +1785,7 @@ _e_client_eval(E_Client *ec) { e_comp_object_util_center_on(ec->frame, ec->parent->frame); + centered = 1; } } ec->changes.pos = 1; @@ -1793,7 +1795,22 @@ _e_client_eval(E_Client *ec) { e_comp_object_util_center_on(ec->frame, ec->parent->frame); - ec->changes.pos = 1; + centered = 1; +} + if (centered) //test for offscreen +{ + if (!E_CONTAINS(ec->x, ec->y, ec->w, ec->h, zx, zy, zw, zh)) + { +if (ec->x < zx) + ec->x = ec->parent->x; +if (ec->y < zy) + ec->y = ec->parent->y; +if (ec->x + ec->w > zx + zw) + ec->x = ec->parent->x + ec->parent->w - ec->w; +if (ec->y + ec->h > zy + zh) + ec->y = ec->parent->y + ec->parent->h - ec->h; +ec->changes.pos = 1; + } } ec->placed = 1; ec->pre_cb.x = ec->x; ec->pre_cb.y = ec->y; --
[EGIT] [core/enlightenment] enlightenment-0.20 31/39: ensure int64_t is used in all cases for wl pixmap ids
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d54f51af5787b59e357a88f87ae973c15063b054 commit d54f51af5787b59e357a88f87ae973c15063b054 Author: Mike Blumenkrantz Date: Wed May 11 15:34:22 2016 -0400 ensure int64_t is used in all cases for wl pixmap ids --- src/bin/e_comp_wl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index af6494a..b026c38 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -1458,7 +1458,7 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client *client, struct wl_reso wl_client_get_credentials(client, &pid, NULL, NULL); if (pid == getpid()) //internal! - ec = e_pixmap_find_client(E_PIXMAP_TYPE_WL, (uintptr_t)id); + ec = e_pixmap_find_client(E_PIXMAP_TYPE_WL, (int64_t)id); if (ec) { if (e_object_is_del(E_OBJECT(ec))) return; @@ -2167,7 +2167,7 @@ _e_comp_wl_screenshooter_cb_bind(struct wl_client *client, void *data, uint32_t static void _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client *ec) { - uint64_t win; + int64_t win; /* make sure this is a wayland client */ if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return; --
[EGIT] [core/enlightenment] enlightenment-0.20 07/39: ensure lifetime for wl client focus timer
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d21b44b019fbaeb9eb36aecf98e254d85057f6aa commit d21b44b019fbaeb9eb36aecf98e254d85057f6aa Author: Mike Blumenkrantz Date: Tue May 3 20:24:54 2016 -0400 ensure lifetime for wl client focus timer fixes some focus-out crashing --- src/bin/e_comp_wl.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index e81bb9f..533fb6f 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -521,11 +521,12 @@ _e_comp_wl_evas_cb_focus_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *ob { E_Client *ec = data; - E_FREE_FUNC(ec->comp_data->on_focus_timer, ecore_timer_del); - /* lower client priority */ if (!e_object_is_del(data)) - _e_comp_wl_client_priority_normal(ec); + { +_e_comp_wl_client_priority_normal(ec); +E_FREE_FUNC(ec->comp_data->on_focus_timer, ecore_timer_del); + } _e_comp_wl_keyboard_leave(ec); } @@ -2232,6 +2233,7 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec) wl_signal_emit(&ec->comp_data->destroy_signal, &ec->comp_data->surface); _e_comp_wl_surface_state_finish(&ec->comp_data->pending); + E_FREE_FUNC(ec->comp_data->on_focus_timer, ecore_timer_del); /* The resource destroy callback will walk the state->frames list, * so move the list to a temporary first. --
[EGIT] [core/enlightenment] enlightenment-0.20 38/39: adjust some client eval parts to make manual placement work again
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=00e427b126f7dac821d6a46de350ee8a13af361b commit 00e427b126f7dac821d6a46de350ee8a13af361b Author: Mike Blumenkrantz Date: Thu May 12 12:05:59 2016 -0400 adjust some client eval parts to make manual placement work again activating the window_move action doesn't require the client to successfully be shown, and failing this check would cause the window_move action to be deleted until the next restart --- src/bin/e_client.c | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index b105854..6b6295e 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -1896,7 +1896,6 @@ _e_client_eval(E_Client *ec) ec->x = new_x; ec->y = new_y; ec->changes.pos = 1; - ec->placed = 1; ec->pre_cb.x = ec->x; ec->pre_cb.y = ec->y; } else if (!E_INTERSECTS(ec->x, ec->y, ec->w, ec->h, zx, zy, zw, zh)) @@ -2040,8 +2039,12 @@ _e_client_eval(E_Client *ec) } if (ec->changes.pos) { +Eina_Bool placed = ec->placed; + ec->changes.pos = 0; evas_object_move(ec->frame, ec->x, ec->y); +if (e_config->window_placement_policy == E_WINDOW_PLACEMENT_MANUAL) + ec->placed = placed; rem_change = 1; prop |= E_CLIENT_PROPERTY_POS; } @@ -2085,30 +2088,27 @@ _e_client_eval(E_Client *ec) } evas_object_show(ec->frame); -if (evas_object_visible_get(ec->frame)) +if (ec->cur_mouse_action) { - if (ec->cur_mouse_action) - { - ec->moveinfo.down.x = ec->x; - ec->moveinfo.down.y = ec->y; - ec->moveinfo.down.w = ec->w; - ec->moveinfo.down.h = ec->h; - ec->mouse.current.mx = x; - ec->mouse.current.my = y; - ec->moveinfo.down.button = 0; - ec->moveinfo.down.mx = x; - ec->moveinfo.down.my = y; - - e_object_ref(E_OBJECT(ec->cur_mouse_action)); - ec->cur_mouse_action->func.go(E_OBJECT(ec), NULL); - if (e_config->border_raise_on_mouse_action) -evas_object_raise(ec->frame); - evas_object_focus_set(ec->frame, 1); - } - ec->changes.visible = 0; - rem_change = 1; - _e_client_event_simple(ec, E_EVENT_CLIENT_SHOW); + ec->moveinfo.down.x = ec->x; + ec->moveinfo.down.y = ec->y; + ec->moveinfo.down.w = ec->w; + ec->moveinfo.down.h = ec->h; + ec->mouse.current.mx = x; + ec->mouse.current.my = y; + ec->moveinfo.down.button = 0; + ec->moveinfo.down.mx = x; + ec->moveinfo.down.my = y; + + e_object_ref(E_OBJECT(ec->cur_mouse_action)); + ec->cur_mouse_action->func.go(E_OBJECT(ec), NULL); + if (e_config->border_raise_on_mouse_action) + evas_object_raise(ec->frame); + evas_object_focus_set(ec->frame, 1); } +ec->changes.visible = 0; +rem_change = 1; +_e_client_event_simple(ec, E_EVENT_CLIENT_SHOW); } else if ((ec->changes.visible) && (ec->new_client)) { --
[EGIT] [core/enlightenment] enlightenment-0.20 14/39: clean up mixer includes
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a4a6ac053781d2bc6fdebcc5e2ceb553781d04ab commit a4a6ac053781d2bc6fdebcc5e2ceb553781d04ab Author: Mike Blumenkrantz Date: Fri May 6 13:38:09 2016 -0400 clean up mixer includes config.h needs to be included. always. --- src/modules/mixer/lib/backends/pulseaudio/pulse.c | 10 ++ src/modules/mixer/lib/emix.h | 4 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/modules/mixer/lib/backends/pulseaudio/pulse.c b/src/modules/mixer/lib/backends/pulseaudio/pulse.c index f882734..8c2cf41 100644 --- a/src/modules/mixer/lib/backends/pulseaudio/pulse.c +++ b/src/modules/mixer/lib/backends/pulseaudio/pulse.c @@ -1,9 +1,11 @@ -#include -#include -#include - +#include "e.h" #include "emix.h" +#include + +#undef ERR +#undef DBG +#undef WRN #define ERR(...) EINA_LOG_ERR(__VA_ARGS__) #define DBG(...) EINA_LOG_DBG(__VA_ARGS__) #define WRN(...) EINA_LOG_WARN(__VA_ARGS__) diff --git a/src/modules/mixer/lib/emix.h b/src/modules/mixer/lib/emix.h index 25376fe..d177220 100644 --- a/src/modules/mixer/lib/emix.h +++ b/src/modules/mixer/lib/emix.h @@ -1,6 +1,10 @@ #ifndef EMIX_H #define EMIX_H +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include --
[EGIT] [core/enlightenment] enlightenment-0.20 26/39: change efm icon entry to only toggle focus in x11 compositors (runtime)
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=5ea743800cde9f886ecf70442fc610d79bed92f3 commit 5ea743800cde9f886ecf70442fc610d79bed92f3 Author: Mike Blumenkrantz Date: Wed May 11 13:32:52 2016 -0400 change efm icon entry to only toggle focus in x11 compositors (runtime) --- src/bin/e_fm.c | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c index 08f2905..c748c47 100644 --- a/src/bin/e_fm.c +++ b/src/bin/e_fm.c @@ -10417,9 +10417,8 @@ _e_fm2_icon_entry_widget_add(E_Fm2_Icon *ic) ic->entry_widget = e_widget_entry_add(e_win_evas_win_get(e), NULL, NULL, NULL, NULL); evas_object_event_callback_add(ic->entry_widget, EVAS_CALLBACK_KEY_DOWN, _e_fm2_icon_entry_widget_cb_key_down, ic); -#ifndef HAVE_WAYLAND_ONLY - evas_event_feed_mouse_out(evas_object_evas_get(ic->obj), ecore_x_current_time_get(), NULL); -#endif + if (e_comp->comp_type == E_PIXMAP_TYPE_X) + evas_event_feed_mouse_out(evas_object_evas_get(ic->obj), 0, NULL); if (e_comp->evas == e) e_comp_grab_input(0, 1); ic->keygrab = (e_comp->evas == e); @@ -10432,9 +10431,8 @@ _e_fm2_icon_entry_widget_add(E_Fm2_Icon *ic) e_widget_entry_select_all(ic->entry_widget); ic->sd->iop_icon = ic; ic->sd->typebuf.disabled = EINA_TRUE; -#ifndef HAVE_WAYLAND_ONLY - evas_event_feed_mouse_in(e, ecore_x_current_time_get(), NULL); -#endif + if (e_comp->comp_type == E_PIXMAP_TYPE_X) + evas_event_feed_mouse_in(e, 0, NULL); return ic->entry_widget; } --
[EGIT] [core/enlightenment] enlightenment-0.20 30/39: enforce setting alpha on comp objects only after image data has been set
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=877a1c46f45ff4860a12700988ba7a3ccb72db5c commit 877a1c46f45ff4860a12700988ba7a3ccb72db5c Author: Mike Blumenkrantz Date: Wed May 11 15:33:08 2016 -0400 enforce setting alpha on comp objects only after image data has been set setting alpha can trigger a render sync, crashing if the old data is no longer valid --- src/bin/e_comp_object.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index cca66b6..2a8406a 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -3739,10 +3739,7 @@ e_comp_object_render(Evas_Object *obj) if (e_comp->comp_type == E_PIXMAP_TYPE_WL) { -Eina_Bool alpha = e_pixmap_image_is_argb(cw->ec->pixmap); - pix = e_pixmap_image_data_get(cw->ec->pixmap); -evas_object_image_alpha_set(cw->obj, alpha); ret = EINA_TRUE; goto end; } @@ -3802,9 +3799,11 @@ e_comp_object_render(Evas_Object *obj) eina_iterator_free(it); end: evas_object_image_data_set(cw->obj, cw->blanked ? NULL : pix); + _e_comp_object_alpha_set(cw); EINA_LIST_FOREACH(cw->obj_mirror, l, o) { evas_object_image_data_set(o, pix); +evas_object_image_alpha_set(o, evas_object_image_alpha_get(cw->obj)); evas_object_image_pixels_dirty_set(o, EINA_FALSE); } --
[EGIT] [core/enlightenment] enlightenment-0.20 09/39: don't revert focus to desktop fileman during compositor grab
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=16f6ef4d9c0a8e4d39ffb27997e41e7298227e91 commit 16f6ef4d9c0a8e4d39ffb27997e41e7298227e91 Author: Mike Blumenkrantz Date: Tue May 3 20:26:00 2016 -0400 don't revert focus to desktop fileman during compositor grab grabs indicate an action is already occurring and focus shouldn't be altered --- src/modules/fileman/e_fwin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index f6cf55f..9709968 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -244,6 +244,7 @@ _e_fwin_client_hook_focus_unset(void *d EINA_UNUSED, E_Client *ec) /* if there is no new focused, set focus to zone fwin */ if (e_client_focused_get() || (!e_client_util_ignored_get(e_desk_client_top_visible_get(e_desk_current_get(ec->zone) return; + if (e_comp_util_kbd_grabbed()) return; fwin = e_fwin_zone_find(ec->zone); if (fwin) evas_object_focus_set(fwin->cur_page->fm_obj, 1); --
[EGIT] [core/enlightenment] enlightenment-0.20 37/39: use parent windows for x11 binding grabs
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=90f0740d275151898446ba0fa29b132e3515a047 commit 90f0740d275151898446ba0fa29b132e3515a047 Author: Mike Blumenkrantz Date: Thu May 12 11:23:20 2016 -0400 use parent windows for x11 binding grabs ensure that internal windows do not receive mouse events before the compositor fix T3347 --- src/bin/e_comp_x.c | 38 ++ 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index dd2dea6..28ddea2 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -216,20 +216,21 @@ _e_comp_x_focus_setup(E_Client *ec) static void _e_comp_x_focus_setdown(E_Client *ec) { - Ecore_X_Window win; + Ecore_X_Window win, pwin; if (!_e_comp_x_client_data_get(ec)->button_grabbed) return; if ((!e_client_focus_policy_click(ec)) || (e_config->always_click_to_raise) || (e_config->always_click_to_focus)) return; win = e_client_util_win_get(ec); - e_bindings_mouse_ungrab(E_BINDING_CONTEXT_WINDOW, win); - e_bindings_wheel_ungrab(E_BINDING_CONTEXT_WINDOW, win); + pwin = e_client_util_pwin_get(ec); + e_bindings_mouse_ungrab(E_BINDING_CONTEXT_WINDOW, pwin); + e_bindings_wheel_ungrab(E_BINDING_CONTEXT_WINDOW, pwin); ecore_x_window_button_ungrab(win, 1, 0, 1); ecore_x_window_button_ungrab(win, 2, 0, 1); ecore_x_window_button_ungrab(win, 3, 0, 1); - e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, win); - e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, win); + e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, pwin); + e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, pwin); _e_comp_x_client_data_get(ec)->button_grabbed = 0; } @@ -2234,10 +2235,7 @@ _e_comp_x_mapping_change(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_E e_comp_canvas_keys_ungrab(); EINA_LIST_FOREACH(e_comp->clients, l, ec) { -Ecore_X_Window win; - if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_X) continue; -win = e_client_util_win_get(ec); if ((!_e_comp_x_client_data_get(ec)->first_map) || (!_e_comp_x_client_data_get(ec)->reparented)) continue; if (ec->focused) { @@ -2248,8 +2246,8 @@ _e_comp_x_mapping_change(void *data EINA_UNUSED, int type EINA_UNUSED, Ecore_X_E { _e_comp_x_focus_setdown(ec); _e_comp_x_focus_setup(ec); - e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, win); - e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, win); + e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, e_client_util_pwin_get(ec)); + e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, e_client_util_pwin_get(ec)); } } e_comp_canvas_keys_grab(); @@ -3155,8 +3153,8 @@ _e_comp_x_hook_client_pre_frame_assign(void *d EINA_UNUSED, E_Client *ec) ecore_x_window_show(pwin); _e_comp_x_focus_init(ec); - e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, win); - e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, win); + e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, pwin); + e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, pwin); _e_comp_x_client_evas_init(ec); if (ec->netwm.ping && (!ec->ping_poller)) e_client_ping(ec); @@ -3397,8 +3395,8 @@ _e_comp_x_hook_client_fetch(void *d EINA_UNUSED, E_Client *ec) ec->focus_policy_override = E_FOCUS_CLICK; _e_comp_x_focus_setdown(ec); _e_comp_x_focus_setup(ec); - e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, win); - e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, win); + e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, pwin); + e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, pwin); if (!ec->netwm.state.skip_pager) { ec->netwm.state.skip_pager = 1; @@ -4629,8 +4627,8 @@ _e_comp_x_hook_client_del(void *d EINA_UNUSED, E_Client *ec) if ((!ec->already_unparented) && cd && cd->reparented) { _e_comp_x_focus_setdown(ec); -e_bindings_mouse_ungrab(E_BINDING_CONTEXT_WINDOW, win); -e_bindings_wheel_ungrab(E_BINDING_CONTEXT_WINDOW, win); +e_bindings_mouse_ungrab(E_BINDING_CONTEXT_WINDOW, pwin); +e_bindings_wheel_ungrab(E_BINDING_CONTEXT_WINDOW, pwin); if (!cd->deleted) { if (stopping) @@ -5168,8 +5166,8 @@ _e_comp_x_bindings_grab_cb(void) else { _e_comp_x_focus_setup(ec); - e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, e_client_util_win_get(ec)); - e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, e_client_util_win_get(ec)); + e_bindings_mouse_grab(E_BINDING_CONTEXT_WINDOW, e_client_util_pwin_get(ec)); + e_bindings_wheel_grab(E_BINDING_CONTEXT_WINDOW, e_client_util_pwi
[EGIT] [core/enlightenment] enlightenment-0.20 01/39: Revert "handle recursion more effectively in e_menu_hide_all()"
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=12a1894dade4024ba1f2c1fb90b849594053b067 commit 12a1894dade4024ba1f2c1fb90b849594053b067 Author: Mike Blumenkrantz Date: Tue Apr 26 16:33:46 2016 -0400 Revert "handle recursion more effectively in e_menu_hide_all()" This reverts commit 5764bf680e6f05f6092f7546a326cec7dd68db20. this was a workaround for a behavior change in efl --- src/bin/e_menu.c | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c index f7a4036..cf686ca 100644 --- a/src/bin/e_menu.c +++ b/src/bin/e_menu.c @@ -182,10 +182,10 @@ e_menu_shutdown(void) E_API void e_menu_hide_all(void) { - while (_e_active_menus) + E_Menu *m; + + EINA_LIST_FREE(_e_active_menus, m) { -E_Menu *m; -m = eina_list_data_get(_e_active_menus); if (m->post_deactivate_cb.func) m->post_deactivate_cb.func(m->post_deactivate_cb.data, m); m->active = 0; @@ -193,7 +193,6 @@ e_menu_hide_all(void) e_comp_object_util_autoclose(NULL, NULL, NULL, NULL); _e_menu_unrealize(m); m->in_active_list = 0; -_e_active_menus = eina_list_remove_list(_e_active_menus, _e_active_menus); e_object_unref(E_OBJECT(m)); } } --
[EGIT] [core/enlightenment] enlightenment-0.20 08/39: hide evry on focus-out
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=37aa6a191c43b22d445076cee558365071e347fb commit 37aa6a191c43b22d445076cee558365071e347fb Author: Mike Blumenkrantz Date: Tue May 3 20:25:36 2016 -0400 hide evry on focus-out handles case where focus is lost due to compositor grab --- src/modules/everything/evry.c | 14 ++ 1 file changed, 14 insertions(+) diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c index 87f1d9b..d5584a3 100644 --- a/src/modules/everything/evry.c +++ b/src/modules/everything/evry.c @@ -151,6 +151,19 @@ _evry_cb_item_changed(EINA_UNUSED void *data, EINA_UNUSED int type, void *event) return ECORE_CALLBACK_PASS_ON; } +static void +_evry_focus_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + Evry_Window *win = data; + E_Client *ec; + + if (!win->grab) return; + + ec = e_win_client_get(win->ewin); + if (ec && (!e_object_is_del(E_OBJECT(ec + evry_hide(win, 0); +} + Evry_Window * evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params, Eina_Bool popup) { @@ -197,6 +210,7 @@ evry_show(E_Zone *zone, E_Zone_Edge edge, const char *params, Eina_Bool popup) } win->grab = 1; +evas_object_event_callback_add(ec->frame, EVAS_CALLBACK_FOCUS_OUT, _evry_focus_out, win); } evry_history_load(); --
[EGIT] [core/enlightenment] enlightenment-0.20 23/39: block keyboard sending for wl clients if a compositor grab is active
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=961d3177daf53f5ce97a38fdd12c3751daa25d14 commit 961d3177daf53f5ce97a38fdd12c3751daa25d14 Author: Mike Blumenkrantz Date: Tue May 10 13:00:01 2016 -0400 block keyboard sending for wl clients if a compositor grab is active fix T3599 --- src/bin/e_comp_wl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 71726ac..8551305 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -484,6 +484,7 @@ _e_comp_wl_evas_cb_focus_in(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj e_comp_wl->kbd.focused = eina_list_append(e_comp_wl->kbd.focused, res); if (!e_comp_wl->kbd.focused) return; e_comp_wl_input_keyboard_enter_send(ec); + if (e_comp_util_kbd_grabbed()) return; e_comp_wl_data_device_keyboard_focus_set(); ec->comp_data->on_focus_timer = ecore_timer_add(0.8, (Ecore_Task_Cb)_e_comp_wl_evas_cb_focus_in_timer, ec); --
[EGIT] [core/enlightenment] enlightenment-0.20 28/39: fix usage of e_object_unref in xkbswitch when managing new kbd dialog
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c5f8d9eec2883ef1cb9881a8b31e3da2d2f8 commit c5f8d9eec2883ef1cb9881a8b31e3da2d2f8 Author: Mike Blumenkrantz Date: Wed May 11 15:31:38 2016 -0400 fix usage of e_object_unref in xkbswitch when managing new kbd dialog probably harmless? --- src/modules/xkbswitch/e_mod_config.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/xkbswitch/e_mod_config.c b/src/modules/xkbswitch/e_mod_config.c index f400bc6..45dd83a 100644 --- a/src/modules/xkbswitch/e_mod_config.c +++ b/src/modules/xkbswitch/e_mod_config.c @@ -639,7 +639,7 @@ _dlg_add_cb_ok(void *data EINA_UNUSED, E_Dialog *dlg) evas_event_thaw(cfdata->evas); cfdata->dlg_add_new = NULL; - e_object_unref(E_OBJECT(dlg)); + e_object_del(E_OBJECT(dlg)); e_config_dialog_changed_set(cfdata->cfd, 1); } @@ -648,7 +648,7 @@ _dlg_add_cb_cancel(void *data EINA_UNUSED, E_Dialog *dlg) { E_Config_Dialog_Data *cfdata = dlg->data; cfdata->dlg_add_new = NULL; - e_object_unref(E_OBJECT(dlg)); + e_object_del(E_OBJECT(dlg)); } static void @@ -657,7 +657,6 @@ _dlg_add_cb_del(void *obj) E_Dialog *dlg = obj; E_Config_Dialog_Data *cfdata = dlg->data; cfdata->dlg_add_new = NULL; - e_object_unref(E_OBJECT(dlg)); } static Eina_Bool --