[EGIT] [core/efl] master 01/02: Evas.Image: Simplify logic (trivial change)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=225b33451b1d659e87233028cc17e2f48e74e797
commit 225b33451b1d659e87233028cc17e2f48e74e797
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Thu Jul 2 15:41:06 2015 +0900
Evas.Image: Simplify logic (trivial change)
---
src/lib/evas/canvas/evas_object_image.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index b0d1c05..aee6260 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1535,15 +1535,15 @@ _evas_image_alpha_set(Eo *eo_obj, Evas_Image_Data *o,
Eina_Bool has_alpha)
o-preloading = EINA_FALSE;
ENFN-image_data_preload_cancel(ENDT, o-engine_data, eo_obj);
}
- if (((has_alpha) (o-cur-has_alpha)) ||
- ((!has_alpha) (!o-cur-has_alpha)))
+
+ has_alpha = !!has_alpha;
+ if (has_alpha == o-cur-has_alpha)
return;
- if (o-cur-has_alpha != has_alpha)
- {
-EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
- state_write-has_alpha = has_alpha;
-EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
- }
+
+ EINA_COW_IMAGE_STATE_WRITE_BEGIN(o, state_write)
+ state_write-has_alpha = has_alpha;
+ EINA_COW_IMAGE_STATE_WRITE_END(o, state_write);
+
if (o-engine_data)
{
int stride = 0;
--
[EGIT] [core/elementary] master 01/01: toolbar: item object change from edje object to layout.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=260e09ea5adaffeef40286f424a8a5ca25e9077e
commit 260e09ea5adaffeef40286f424a8a5ca25e9077e
Author: woochan lee wc0917@samsung.com
Date: Thu Jul 2 20:00:57 2015 +0900
toolbar: item object change from edje object to layout.
Summary:
Its for support elm_object_item_ APIs for toolbar item.
Its the pre work for toolbar item content set some layout to toolbar item
layout automatically.
(without implement item_content_set with part name.)
I abandoned for check the other side of this change. but its not has
problem so i reclaim this commit
and put on another commit for this. https://phab.enlightenment.org/D2777
Test Plan: To all of the action on elementary toolbar test sample.
Reviewers: cedric, Hermet
Reviewed By: cedric
Differential Revision: https://phab.enlightenment.org/D2768
---
src/lib/elm_toolbar.c | 152 +-
1 file changed, 76 insertions(+), 76 deletions(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index b0079d7..5b78ed8 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -156,7 +156,7 @@ _item_unselect(Elm_Toolbar_Item_Data *item)
item-selected = EINA_FALSE;
sd-selected_item = NULL;
- edje_object_signal_emit(VIEW(item), elm,state,unselected, elm);
+ elm_layout_signal_emit(VIEW(item), elm,state,unselected, elm);
if (item-icon)
elm_widget_signal_emit(item-icon, elm,state,unselected, elm);
eo_do(WIDGET(item),
eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED,
EO_OBJ(item)));
@@ -231,7 +231,7 @@ _item_mirrored_set(Evas_Object *obj EINA_UNUSED,
Elm_Toolbar_Item_Data *it,
Eina_Bool mirrored)
{
- edje_object_mirrored_set(VIEW(it), mirrored);
+ elm_widget_mirrored_set(VIEW(it), mirrored);
if (it-o_menu) elm_widget_mirrored_set(it-o_menu, mirrored);
}
@@ -266,13 +266,13 @@ _items_size_fit(Evas_Object *obj, Evas_Coord *bl,
Evas_Coord view)
{
if (!it-separator !it-object)
elm_coords_finger_size_adjust(1, mw, 1, mh);
- edje_object_size_min_restricted_calc(VIEW(it), mw, mh, mw, mh);
+
edje_object_size_min_restricted_calc(elm_layout_edje_get(VIEW(it)), mw, mh,
mw, mh);
}
else if (!more)
{
more = EINA_TRUE;
elm_coords_finger_size_adjust(1, mw, 1, mh);
- edje_object_size_min_restricted_calc(sd-VIEW(more_item), mw,
mh, mw, mh);
+
edje_object_size_min_restricted_calc(elm_layout_edje_get(sd-VIEW(more_item)),
mw, mh, mw, mh);
}
if (mw != -1 || mh != -1)
@@ -624,12 +624,12 @@ _elm_toolbar_item_focused(Elm_Object_Item *eo_it)
if (elm_widget_focus_highlight_enabled_get(obj))
{
-edje_object_signal_emit
+elm_layout_signal_emit
(VIEW(it), elm,state,focused, elm);
}
- edje_object_signal_emit
+ elm_layout_signal_emit
(VIEW(it), elm,highlight,on, elm);
- focus_raise = edje_object_data_get(VIEW(it), focusraise);
+ focus_raise = elm_layout_data_get(VIEW(it), focusraise);
if ((focus_raise) (!strcmp(focus_raise, on)))
evas_object_raise(VIEW(it));
eo_do(obj, eo_event_callback_call
@@ -653,10 +653,10 @@ _elm_toolbar_item_unfocused(Elm_Object_Item *eo_it)
if (elm_widget_focus_highlight_enabled_get(obj))
{
ELM_TOOLBAR_ITEM_DATA_GET(sd-focused_item, focus_it);
-edje_object_signal_emit
+elm_layout_signal_emit
(VIEW(focus_it), elm,state,unfocused, elm);
}
- edje_object_signal_emit
+ elm_layout_signal_emit
(VIEW(it), elm,highlight,off, elm);
sd-focused_item = NULL;
eo_do(obj, eo_event_callback_call
@@ -978,7 +978,7 @@ _resizing_eval_item(Elm_Toolbar_Item_Data *it)
evas_object_geometry_get(obj, x, y, NULL, h);
evas_object_move(sd-more, x, y + h);
//calculate the size of item
- edje_object_size_min_restricted_calc(VIEW(it), mw, mh, mw, mh);
+ edje_object_size_min_restricted_calc(elm_layout_edje_get(VIEW(it)), mw,
mh, mw, mh);
if (!it-separator !it-object)
elm_coords_finger_size_adjust(1, mw, 1, mh);
evas_object_size_hint_min_set(VIEW(it), mw, mh);
@@ -1005,7 +1005,7 @@ _elm_toolbar_item_elm_widget_item_disable(Eo *eo_toolbar,
Elm_Toolbar_Item_Data
else
emission = elm,state,enabled;
- edje_object_signal_emit(VIEW(toolbar_it), emission, elm);
+ elm_layout_signal_emit(VIEW(toolbar_it), emission, elm);
if (toolbar_it-icon)
elm_widget_signal_emit(toolbar_it-icon, emission, elm);
@@ -1116,7 +1116,7 @@ _item_select(Elm_Toolbar_Item_Data *it)
{
if (it-in_box != sd-bx)
{
-edje_object_signal_emit
+
[EGIT] [core/elementary] master 01/01: toolbar: content_set function called when user content set to toolbar item.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8dc5c98240a3e82050b4a90c9595ed22f5832201
commit 8dc5c98240a3e82050b4a90c9595ed22f5832201
Author: woochan lee wc0917@samsung.com
Date: Thu Jul 2 20:07:48 2015 +0900
toolbar: content_set function called when user content set to toolbar item.
Summary:
If User want to content set something to item area. there is no way to
except elm customizing.
So i added this feature and make the toolbar item object to layout before.
Now user can content set something on item area only call
elm_object_item_part_content_set API.
Test Plan:
Make some swallow part on toolbar edc.
and content set some layout to that swallow part to using
elm_object_item_part_content_set
Reviewers: cedric, Hermet
Subscribers: SanghyeonLee, eagleeye, id213sin
Differential Revision: https://phab.enlightenment.org/D2777
---
src/lib/elm_toolbar.c | 15 +--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 5b78ed8..cbff114 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1577,7 +1577,11 @@ _elm_toolbar_item_elm_widget_item_part_content_set(Eo
*eo_item EINA_UNUSED, Elm_
ELM_TOOLBAR_DATA_GET(obj, sd);
- if (part strcmp(part, object)) return;
+ if (part strcmp(part, object) strcmp(part, elm.swallow.object))
+ {
+eo_do(VIEW(item), elm_obj_container_content_set(part, content));
+return;
+ }
if (item-object == content) return;
evas_object_del(item-object);
@@ -1594,7 +1598,14 @@ EOLIAN static Evas_Object *
_elm_toolbar_item_elm_widget_item_part_content_get(Eo *eo_it EINA_UNUSED,
Elm_Toolbar_Item_Data *it,
const char *part)
{
- if (part strcmp(part, object)) return NULL;
+ Evas_Object *content;
+
+ if (part strcmp(part, object) strcmp(part, elm.swallow.object))
+ {
+eo_do(VIEW(it), content = elm_obj_container_content_get(part));
+if (content) return content;
+else return NULL;
+ }
return it-object;
}
--
[EGIT] [tools/enventor] master 01/01: edc_parser: remove the generated code '0.0' at the end of state.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=8678084b8f30382cf2b26edfdb477db4121da32b
commit 8678084b8f30382cf2b26edfdb477db4121da32b
Author: ChunEon Park her...@hermet.pe.kr
Date: Thu Jul 2 21:42:18 2015 +0900
edc_parser: remove the generated code '0.0' at the end of state.
0.0 is generally unused but annoying to users.
---
src/lib/edc_parser.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index bc9691a..07efbf2 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -8,7 +8,6 @@
const char ATTR_PREPEND_COLON[] = :;
const char ATTR_PREPEND_NONE[] = ;
const char ATTR_APPEND_SEMICOLON[] = ;;
-const char ATTR_APPEND_STATE_VAL[] = 0.0;;
typedef struct parser_attr_s
{
@@ -837,7 +836,7 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread
EINA_UNUSED)
attr.keyword = eina_stringshare_add(STATE_SET);
attr.value.type = ATTR_VALUE_STATE;
attr.value.prepend_str = ATTR_PREPEND_NONE;
- attr.value.append_str = ATTR_APPEND_STATE_VAL;
+ attr.value.append_str = ATTR_APPEND_SEMICOLON;
attr.value.program = EINA_TRUE;
eina_inarray_push(td-attrs, attr);
@@ -845,7 +844,7 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread
EINA_UNUSED)
attr.keyword = eina_stringshare_add(inherit);
attr.value.type = ATTR_VALUE_STATE;
attr.value.prepend_str = ATTR_PREPEND_COLON;
- attr.value.append_str = ATTR_APPEND_STATE_VAL;
+ attr.value.append_str = ATTR_APPEND_SEMICOLON;
eina_inarray_push(td-attrs, attr);
//Type: Image
--
[EGIT] [tools/eflete] annotated tag v0.5.0-beta created (now 5b6a5b1)
This is an automated email from the git hooks/post-receive script. rimmed pushed a change to annotated tag v0.5.0-beta in repository tools/eflete. at 5b6a5b1 (tag) tagging 14fb5eb2ee585e449bf4eab617f03b20b8f445b4 (commit) replaces 0.5.0-alpha tagged by Vyacheslav Reutskiy on Thu Jul 2 16:14:07 2015 +0300 - Log - v0.5.0-beta Andrii Kroitor (26): ewe_tabs: fix content theme problems because of missing parent replace mem_malloc with mem_calloc were it is not performance-critical project_manager: fix Ecore_Job constructor warning live_view: fix bg and scale selection panel style project_manager: use ecore_thread_main_loop_begin for save project_manager: fix random segfaults properties: internal save on combobox changes live_view: fix swallowed objects not being deleted animator: fix checks in live veiw properties live_view: fix properties scroller project_manager: add missing eina_thread_mainloop_end project_manager: fix new image saving image_editor: fix missing image with id 0 project_manager: fix random segfault after saving new project UTC: fix timeouts in sound_editor tests history: fix return value on successful undo UTC: remove incorrect test UTC: history_redo - comment out elm_shutdown UTC: remove functional test from state_dialog UTC: fix state_list report image_editor: comment out image_usage icons UTC: remove commmented out incorrect tests image_editor: fix preview button: fix min size image_editor: update layout button: fix scripts Gerrit User (63): Merge ewe_tabs: fix content theme problems because of missing parent into develop Merge Editors: default layout fix into develop Merge project_manager: fix Ecore_Job constructor warning into develop Merge live_view: fix bg and scale selection panel style into develop Merge Live View Property: fix hidden text of first added Swallow/Text part into develop Merge Styles: fix genlist item styles: default, group_index into develop Merge Live view: no sense to reset liveview on groupedit resize event into develop Merge Styles: use only existing genlist item styles into develop Merge Styles: padding in the genlist default item style for tree mode into develop Merge Styles: add to default genlist item style swallow elm.swallow.penult into develop Merge Styles: add default genlist item style for tree mode into develop Merge Widget list: use only default styles for genlist items into develop Merge Style manager: use default style for genlist item into develop Merge Styles: delete unused genlist item style level5 into develop Merge Styles: delete unused genlist item style tree/container into develop Merge Styles: update the program_after genlist item style into develop Merge Property: use default style for tween list into develop Merge Styles: delete unused style genlist style tween into develop Merge Styles: add style message for genlist item into develop Merge Signal list: use the style message for genlist into develop Merge Styles: delete unused genlist item style signals into develop Merge Styles: delete temporary genlist item style default1 into develop Merge Styles: delete unused genlist styles usage_list and dark into develop Merge properties: internal save on combobox changes into develop Merge Image_editor: fix del logic by clicked apply button into develop Merge Style: style for main layout of colorselector into develop Merge Widget list: use the anchor button style for add/del part items button into develop Merge Widget list: use standard icon 'plus', 'minus' into develop Merge project_manager: add missing eina_thread_mainloop_end into develop Merge project_manager: fix new image saving into develop Merge image_editor: fix missing image with id 0 into develop Merge Styles: move the part backgrounds from resource to theme into develop Merge Groupedit: use parts bg from theme into develop Merge Groupedit: use part utem background from theme into develop Merge Groupedit: use spacer bg from theme into develop Merge UTC: remove incorrect test into develop Merge UTC: history_redo - comment out elm_shutdown into develop Merge UTC: remove functional test from state_dialog into develop Merge changes I73d4c42d,I00ed76d9,I64db9853,I7ca5ce29,I589cb508, ... into develop Merge UTC: fix state_list report into develop Merge Colorselector Manager: set names for colorselectors into develop Merge Styles: minor changes of Colorclass Manager (size of preview and preview font) into develop Merge Property: don't use th 'simple' button style into develop
[EGIT] [tools/eflete] master 01/01: Merge branch 'devs/rimmed/develop'
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=14fb5eb2ee585e449bf4eab617f03b20b8f445b4 commit 14fb5eb2ee585e449bf4eab617f03b20b8f445b4 Merge: eb3c755 3530f9a Author: Vyacheslav Reutskiy v.reuts...@samsung.com Date: Thu Jul 2 16:07:41 2015 +0300 Merge branch 'devs/rimmed/develop' NEWS | 37 +- README |4 +- configure.ac |3 +- data/Makefile.am | 10 - data/layouts/edje/colorclass_editor.edc| 80 - data/layouts/eflete.edc|1 - data/macros.edc| 13 + data/resources/images/bg_demo.png | Bin 136 - 0 bytes data/resources/images/border_part.png | Bin 198 - 0 bytes data/resources/images/eye_close.png| Bin 4330 - 0 bytes data/resources/images/eye_open.png | Bin 4406 - 0 bytes data/resources/images/gallery-bg.png | Bin 193 - 0 bytes data/resources/images/icon-add.png | Bin 157 - 0 bytes data/resources/images/icon-back.png| Bin 191 - 0 bytes data/resources/images/icon-notification.png| Bin 586 - 0 bytes data/resources/images/icon-remove.png | Bin 143 - 0 bytes data/resources/images/icon-search.png | Bin 695 - 0 bytes data/resources/images/icon-slidedown.png | Bin 150 - 0 bytes data/resources/images/icon-slideup.png | Bin 154 - 0 bytes data/resources/images/icon_next.png| Bin 3232 - 0 bytes data/resources/images/icon_pause.png | Bin 2168 - 0 bytes data/resources/images/icon_play.png| Bin 2134 - 0 bytes data/resources/images/icon_prev.png| Bin 3212 - 0 bytes data/resources/images/mw_button_close.png | Bin 452 - 0 bytes data/resources/images/mw_button_info.png | Bin 844 - 0 bytes data/resources/images/no_image_warning.png | Bin 2206 - 0 bytes data/resources/images/section-item-bg.png | Bin 118 - 0 bytes data/resources/images/sound.png| Bin 11307 - 0 bytes data/resources/resources.edc | 88 - data/themes/default/default.edc|2 + .../default}/images/animator_arrow_left.png| Bin .../default}/images/animator_arrow_right.png | Bin .../default/images/attention.png} | Bin 2893 - 3670 bytes data/themes/default/images/bevel_in.png| Bin 0 - 107 bytes .../default/images/bg_box.png} | Bin data/themes/default/images/bg_demo.png | Bin 0 - 115 bytes .../default/images/bg_group.png} | Bin .../default/images/bg_part_item.png} | Bin .../default/images/bg_proxy.png} | Bin .../default/images/bg_spacer.png} | Bin .../default/images/bg_swallow.png} | Bin .../default/images/bg_table.png} | Bin .../default/images/border_2.png} | Bin data/themes/default/images/color-background-3.png | Bin 0 - 287 bytes data/themes/default/images/color-sight.png | Bin 0 - 525 bytes data/themes/default/images/color_focus.png | Bin 0 - 783 bytes .../default/images/icon-alias_link.png}| Bin .../default}/images/icon-box.png | Bin .../default}/images/icon-external.png | Bin .../default}/images/icon-group.png | Bin .../default}/images/icon-image.png | Bin .../default}/images/icon-proxy.png | Bin .../default}/images/icon-rectangle.png | Bin .../default}/images/icon-separate.png | Bin .../default}/images/icon-spacer.png| Bin .../default}/images/icon-swallow.png | Bin .../default}/images/icon-table.png | Bin .../default}/images/icon-text.png | Bin .../default}/images/icon-textblock.png | Bin .../default}/images/icon_align.png | Bin data/themes/default/images/icon_arrow_down.png | Bin 352 - 403 bytes data/themes/default/images/icon_arrow_left.png | Bin 422 - 416 bytes data/themes/default/images/icon_arrow_right.png| Bin 398 - 401 bytes data/themes/default/images/icon_arrow_up.png | Bin 307 - 396 bytes .../default}/images/icon_end-point.png | Bin data/themes/default/images/icon_minus.png | Bin 180 - 194 bytes .../default}/images/icon_offset.png| Bin data/themes/default/images/icon_plus.png | Bin 243 - 271 bytes .../default}/images/icon_start-point.png | Bin data/themes/default/images/inset_shadow.png| Bin 0 - 247 bytes
[EGIT] [core/elementary] master 01/01: actionslider: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d97a09e83a5e96ef8c8fa7fc366a2ee68a28f74d
commit d97a09e83a5e96ef8c8fa7fc366a2ee68a28f74d
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Thu Jul 2 14:54:07 2015 +0100
actionslider: convert docs
---
src/lib/elm_actionslider.eo | 58 +
1 file changed, 17 insertions(+), 41 deletions(-)
diff --git a/src/lib/elm_actionslider.eo b/src/lib/elm_actionslider.eo
index 33f98dc..a041d91 100644
--- a/src/lib/elm_actionslider.eo
+++ b/src/lib/elm_actionslider.eo
@@ -4,73 +4,49 @@ class Elm.Actionslider (Elm.Layout, Evas.Selectable_Interface)
methods {
@property indicator_pos {
set {
-/*@
-Set actionslider indicator position.
-
-@ingroup Actionslider */
+[[Set actionslider indicator position.]]
}
get {
-/*@
-Get actionslider indicator position.
-
-@return The position of the indicator.
-
-@ingroup Actionslider */
+[[Get actionslider indicator position.]]
}
values {
-pos: Elm_Actionslider_Pos; /*@ The position of the indicator. */
+pos: Elm_Actionslider_Pos; [[The position of the indicator.]]
}
}
@property magnet_pos {
set {
-/*@
-Set actionslider magnet position. To make multiple positions
magnets @c or
-them together (e.g. #ELM_ACTIONSLIDER_LEFT |
#ELM_ACTIONSLIDER_RIGHT)
+[[Set actionslider magnet position.
-@ingroup Actionslider */
+ To make multiple positions magnets OR them together (e.g.
+ ELM_ACTIONSLIDER_LEFT | #ELM_ACTIONSLIDER_RIGHT)
+]]
}
get {
-/*@
-Get actionslider magnet position.
-
-@return The positions with magnet property.
-
-@ingroup Actionslider */
+[[Get actionslider magnet position.]]
}
values {
-pos: Elm_Actionslider_Pos; /*@ Bit mask indicating the magnet
positions. */
+pos: Elm_Actionslider_Pos; [[Bit mask indicating the magnet
positions.]]
}
}
@property enabled_pos {
set {
-/*@
-Set actionslider enabled position. To set multiple positions as
enabled @c or
-them together(e.g.: #ELM_ACTIONSLIDER_LEFT |
#ELM_ACTIONSLIDER_RIGHT).
+[[Set actionslider enabled position. To set multiple positions as
+ enabled OR them together(e.g.
+ #ELM_ACTIONSLIDER_LEFT | #ELM_ACTIONSLIDER_RIGHT).
-@note All the positions are enabled by default.
-
-@ingroup Actionslider */
+ Note: All the positions are enabled by default.
+]]
}
get {
-/*@
-Get actionslider enabled position.
-
-@return The enabled positions.
-
-@ingroup Actionslider */
+[[Get actionslider enabled position.]]
}
values {
-pos: Elm_Actionslider_Pos; /*@ Bit mask indicating the enabled
positions. */
+pos: Elm_Actionslider_Pos; [[Bit mask indicating the enabled
positions.]]
}
}
@property selected_label {
get {
-/*@
-Get actionslider selected label.
-
-@return The selected label
-
-@ingroup Actionslider */
+[[Get actionslider selected label.]]
return: const(char)*;
}
}
--
[EGIT] [core/elementary] master 01/01: fileselector: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=c276485560df3e2b6f22392de4eca7e652aefd52
commit c276485560df3e2b6f22392de4eca7e652aefd52
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Thu Jul 2 14:31:07 2015 +0100
fileselector: convert docs
---
src/lib/elm_fileselector.eo | 31 ---
1 file changed, 12 insertions(+), 19 deletions(-)
diff --git a/src/lib/elm_fileselector.eo b/src/lib/elm_fileselector.eo
index 616a9cd..d1dd2e0 100644
--- a/src/lib/elm_fileselector.eo
+++ b/src/lib/elm_fileselector.eo
@@ -5,32 +5,25 @@ class Elm.Fileselector (Elm.Layout,
Elm_Interface_Fileselector,
methods {
@property buttons_ok_cancel {
set {
-/*@
-Enable/disable the ok and cancel buttons on a given file
-selector widget
+[[Enable/disable the ok and cancel buttons on a given file
+ selector widget
-@note A file selector without those buttons will never emit the
-@c done smart event, and is only usable if one is just hooking
-to the other two events.
+ Note: A file selector without those buttons will never emit the
+ done smart event, and is only usable if one is just hooking
+ to the other two events.
-@see elm_fileselector_buttons_ok_cancel_get()
-
-@ingroup Fileselector */
+ See also @elm_fileselector_buttons_ok_cancel_get.
+]]
}
get {
-/*@
-Get whether the ok and cancel buttons on a given file
-selector widget are being shown.
-
-@return @c EINA_TRUE if they are being shown, @c EINA_FALSE
-otherwise (and on errors)
-
-@see elm_fileselector_buttons_ok_cancel_set() for more details
+[[Get whether the ok and cancel buttons on a given file
+ selector widget are being shown.
-@ingroup Fileselector */
+ See also @elm_fileselector_buttons_ok_cancel_set for more
details.
+]]
}
values {
-visible: bool; /*@ @c EINA_TRUE to show buttons, @c EINA_FALSE to
hide. */
+visible: bool; [[true to show buttons, false to hide.]]
}
}
}
--
[EGIT] [core/elementary] master 01/01: notify: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=26db090fbb376032431e40e76f45097784b0610b
commit 26db090fbb376032431e40e76f45097784b0610b
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Thu Jul 2 14:47:56 2015 +0100
notify: convert docs
---
src/lib/elm_notify.eo | 80 +--
1 file changed, 33 insertions(+), 47 deletions(-)
diff --git a/src/lib/elm_notify.eo b/src/lib/elm_notify.eo
index a3766c3..23b21ec 100644
--- a/src/lib/elm_notify.eo
+++ b/src/lib/elm_notify.eo
@@ -4,82 +4,68 @@ class Elm.Notify (Elm.Container)
methods {
@property align {
set {
-/*@
-@brief Set the alignment of the notify object
+[[Set the alignment of the notify object
-Sets the alignment in which the notify will appear in its parent.
+ Sets the alignment in which the notify will appear in its parent.
-@note To fill the notify box in the parent area, please pass the
-#ELM_NOTIFY_ALIGN_FILL to @p horizontal, @p vertical.
+ Note: To fill the notify box in the parent area, please pass the
+ ELM_NOTIFY_ALIGN_FILL to horizontal and vertical.
-@since 1.8
-@ingroup Notify */
+ @since 1.8
+]]
}
get {
-/*@
-@brief Get the alignment of the notify object
-@see elm_notify_align_set()
+[[Get the alignment of the notify object
-@since 1.8
-@ingroup Notify */
+ @since 1.8
+]]
}
values {
-horizontal: double; /*@ The horizontal alignment of the
notification */
-vertical: double; /*@ The vertical alignment of the notification */
+horizontal: double; [[The horizontal alignment of the
notification]]
+vertical: double; [[The vertical alignment of the notification]]
}
}
@property allow_events {
set {
-/*@
-@brief Sets whether events should be passed to by a click outside
-its area.
+[[Sets whether events should be passed to by a click outside
+ its area.
-When true if the user clicks outside the window the events will be
caught
-by the others widgets, else the events are blocked.
+ When true if the user clicks outside the window the events will
+ be caught by the others widgets, else the events are blocked.
-@note The default value is EINA_TRUE.
-
-@ingroup Notify */
+ Note: The default value is true.
+]]
}
get {
-/*@
-@brief Return true if events are allowed below the notify object
-@see elm_notify_allow_events_set()
-
-@ingroup Notify */
+[[Return true if events are allowed below the notify object.]]
}
values {
-allow: bool; /*@ EINA_TRUE If events are allowed, otherwise not */
+allow: bool; [[true if events are allowed, otherwise false]]
}
}
@property timeout {
set {
-/*@
-@brief Set the time interval after which the notify window is
going to be
-hidden.
+[[Set the time interval after which the notify window is going to
+ be hidden.
-This function sets a timeout and starts the timer controlling when
the
-notify is hidden. Since calling evas_object_show() on a notify
restarts
-the timer controlling when the notify is hidden, setting this
before the
-notify is shown will in effect mean starting the timer when the
notify is
-shown.
+ This function sets a timeout and starts the timer controlling
+ when the notify is hidden. Since calling evas_object_show() on
+ a notify restarts the timer controlling when the notify is
+ hidden, setting this before the notify is shown will in effect
+ mean starting the timer when the notify is shown.
-@note Set a value = 0.0 to disable a running timer.
+ Note: Set a value = 0.0 to disable a running timer.
-@note If the value 0.0 and the notify is previously visible, the
-timer will be started with this value, canceling any running timer.
-
-@ingroup Notify */
+ Note: If the value 0.0 and the notify is previously visible,
+ the timer will be started with this value, canceling any running
+ timer.
+]]
}
get {
-/*@
-@brief Return the timeout value (in seconds)
-@see elm_notify_timeout_set()
-
-@ingroup Notify */
+
[EGIT] [core/elementary] master 01/01: fileselector_button: convert docs
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=95b74a2dfefe2a405a7965a35e5e85d38938150c
commit 95b74a2dfefe2a405a7965a35e5e85d38938150c
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Thu Jul 2 15:16:36 2015 +0100
fileselector_button: convert docs
---
src/lib/elm_fileselector_button.eo | 103 -
1 file changed, 44 insertions(+), 59 deletions(-)
diff --git a/src/lib/elm_fileselector_button.eo
b/src/lib/elm_fileselector_button.eo
index 49ff20c..a253008 100644
--- a/src/lib/elm_fileselector_button.eo
+++ b/src/lib/elm_fileselector_button.eo
@@ -4,95 +4,80 @@ class Elm.Fileselector_Button (Elm.Button,
Elm_Interface_Fileselector)
methods {
@property inwin_mode {
set {
-/*@
-Set whether a given file selector button widget's internal file
-selector will raise an Elementary inner window, instead of a
-dedicated Elementary window. By default, it depends on the current
-profile.
-
-@see elm_win_inwin_add() for more information on inner windows
-@see elm_fileselector_button_inwin_mode_get()
-
-@ingroup File_Selector_Button */
+[[Set whether a given file selector button widget's internal file
+ selector will raise an Elementary inner window, instead of a
+ dedicated Elementary window. By default, it depends on the
+ current profile.
+
+ See @elm_win_inwin_add for more information on inner windows.
+ See also @elm_fileselector_button_inwin_mode_get.
+]]
}
get {
-/*@
-Get whether a given file selector button widget's internal file
-selector will raise an Elementary inner window, instead of a
-dedicated Elementary window.
-
-@return @c EINA_TRUE if will use an inner window, @c EINA_TRUE
-if it will use a dedicated window
+[[Get whether a given file selector button widget's internal file
+ selector will raise an Elementary inner window, instead of a
+ dedicated Elementary window.
-@see elm_fileselector_button_inwin_mode_set() for more details
-
-@ingroup File_Selector_Button */
+ See also @elm_fileselector_button_inwin_mode_set for more
details.
+]]
}
values {
-value: bool; /*@ @c EINA_TRUE to make it use an inner window, @c
-EINA_FALSE to make it use a dedicated window */
+value: bool; [[true to make it use an inner window, false to make
+ it use a dedicated window]]
}
}
@property window_size {
set {
-/*@
-Set the size of a given file selector button widget's window,
-holding the file selector itself.
-
-@note it will only take any effect if the file selector button
-widget is @b not under inwin mode. The default size for the
-window (when applicable) is 400x400 pixels.
+[[Set the size of a given file selector button widget's window,
+ holding the file selector itself.
-@see elm_fileselector_button_window_size_get()
+ Note: it will only take any effect if the file selector button
+ widget is not under inwin mode. The default size for the
+ window (when applicable) is 400x400 pixels.
-@ingroup File_Selector_Button */
+ See also @elm_fileselector_button_window_size_get.
+]]
}
get {
-/*@
-Get the size of a given file selector button widget's window,
-holding the file selector itself.
+[[Get the size of a given file selector button widget's window,
+ holding the file selector itself.
-@note Use @c NULL pointers on the size values you're not
-interested in: they'll be ignored by the function.
+ Note: Use null pointers on the size values you're not
+ interested in: they'll be ignored by the function.
-@see elm_fileselector_button_window_size_set(), for more details
-
-@ingroup File_Selector_Button */
+ See also @elm_fileselector_button_window_size_set for more
+ details.
+]]
}
values {
-width: Evas.Coord; /*@ The window's width */
-height: Evas.Coord; /*@ The window's height */
+width: Evas.Coord; [[The window's width]]
+height: Evas.Coord; [[The window's height]]
}
}
@property window_title {
set {
-/*@
-Set the title for a given file selector button widget's window
-
-This will change the popup window's title, when
[EGIT] [core/enlightenment] master 02/02: only apply xwl client deletion to xwl clients in x11 compositor
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=6323d0fb516f611b5cce22e976269ff222762f28
commit 6323d0fb516f611b5cce22e976269ff222762f28
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Thu Jul 2 16:49:19 2015 -0400
only apply xwl client deletion to xwl clients in x11 compositor
---
src/bin/e_comp_x.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 5b4d400..7998eca 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -4390,12 +4390,15 @@ _e_comp_x_hook_client_del(void *d EINA_UNUSED, E_Client
*ec)
if (cd)
E_FREE_FUNC(cd-first_draw_delay, ecore_timer_del);
#ifdef HAVE_WAYLAND
- if (e_pixmap_is_x(ec-pixmap))
- e_comp_wl_client_xwayland_setup(ec, NULL, NULL);
- else
+ if (e_comp-comp_type == E_PIXMAP_TYPE_WL)
{
-free(cd);
-e_pixmap_free(_e_comp_x_client_pixmap_get(ec));
+if (e_pixmap_is_x(ec-pixmap))
+ e_comp_wl_client_xwayland_setup(ec, NULL, NULL);
+else
+ {
+ free(cd);
+ e_pixmap_free(_e_comp_x_client_pixmap_get(ec));
+ }
}
#endif
if (post_clients)
--
[EGIT] [core/enlightenment] master 01/02: bump required efl version
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=2d4869602fe3acdd34408dd185d7b8c1c2df2b53 commit 2d4869602fe3acdd34408dd185d7b8c1c2df2b53 Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Thu Jul 2 16:49:06 2015 -0400 bump required efl version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5306315..0b94bb9 100644 --- a/configure.ac +++ b/configure.ac @@ -91,7 +91,7 @@ extern char **environ; AC_DEFINE(HAVE_ENVIRON, 1, [Have environ var]) ]) -efl_version=1.13.0 +efl_version=1.14.99 AC_SUBST(efl_version) AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h]) --
[EGIT] [core/enlightenment] master 01/01: set title/name/class on wl-x11 output canvas window
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d4674aefb7ac77c0b1a54e37caa2b9c7380e82e8 commit d4674aefb7ac77c0b1a54e37caa2b9c7380e82e8 Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Thu Jul 2 16:52:11 2015 -0400 set title/name/class on wl-x11 output canvas window --- src/modules/wl_x11/e_mod_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/wl_x11/e_mod_main.c b/src/modules/wl_x11/e_mod_main.c index 9c2b899..75c379f 100644 --- a/src/modules/wl_x11/e_mod_main.c +++ b/src/modules/wl_x11/e_mod_main.c @@ -74,6 +74,8 @@ e_modapi_init(E_Module *m) return NULL; } ecore_evas_callback_delete_request_set(e_comp-ee, _cb_delete_request); + ecore_evas_title_set(e_comp-ee, Enlightenment: WL-X11); + ecore_evas_name_class_set(e_comp-ee, E, compositor); ecore_evas_screen_geometry_get(e_comp-ee, NULL, NULL, w, h); --
[EGIT] [website/www-content] master 01/01: Wiki page start changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=b562d6d4f6bcb35b884de7dfee2d7ba01c6c5446
commit b562d6d4f6bcb35b884de7dfee2d7ba01c6c5446
Author: Raster ras...@rasterman.com
Date: Thu Jul 2 19:34:54 2015 -0700
Wiki page start changed with summary [] by Raster
---
pages/start.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/start.txt b/pages/start.txt
index fc3fec6..800b2d2 100644
--- a/pages/start.txt
+++ b/pages/start.txt
@@ -1,7 +1,7 @@
~~Title: Enlightenment Main~~
+{{pagestart-shortcuts}}
{{pagestart-event}}
-
{{pagestart-release}}
{{ :e-logo-title.png?nolink150 |}}
--
[EGIT] [website/www-content] master 01/01: add shortcut svg's
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=e1f8d0848078ea23f84d80ec0cb352b0eac4a3e2 commit e1f8d0848078ea23f84d80ec0cb352b0eac4a3e2 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Jul 3 14:12:22 2015 +0900 add shortcut svg's --- media/scut-facebook.svg | 81 media/scut-flattr.svg | 162 media/scut-gplus.svg| 109 media/scut-paypal.svg | 92 +++ media/scut-twitter.svg | 70 + media/scut-youtube.svg | 81 6 files changed, 595 insertions(+) diff --git a/media/scut-facebook.svg b/media/scut-facebook.svg new file mode 100644 index 000..6ec6438 --- /dev/null +++ b/media/scut-facebook.svg @@ -0,0 +1,81 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=32 + height=32 + viewBox=0 0 32 32 + id=svg2 + version=1.1 + inkscape:version=0.91 r13725 + sodipodi:docname=scut-facebook.svg + defs + id=defs4 / + sodipodi:namedview + id=base + pagecolor=#303030 + bordercolor=#66 + borderopacity=1.0 + inkscape:pageopacity=0 + inkscape:pageshadow=2 + inkscape:zoom=32.71875 + inkscape:cx=16 + inkscape:cy=16 + inkscape:document-units=px + inkscape:current-layer=layer1 + showgrid=true + units=px + inkscape:window-width=1616 + inkscape:window-height=1408 + inkscape:window-x=2138 + inkscape:window-y=204 + inkscape:window-maximized=0 + inkscape:snap-smooth-nodes=true + inkscape:object-nodes=true + inkscape:object-paths=true + inkscape:snap-intersection-paths=true +inkscape:grid + type=xygrid + id=grid4155 + units=px + spacingx=1 + spacingy=1 / + /sodipodi:namedview + metadata + id=metadata7 +rdf:RDF + cc:Work + rdf:about= +dc:formatimage/svg+xml/dc:format +dc:type + rdf:resource=http://purl.org/dc/dcmitype/StillImage; / +dc:title/dc:title + /cc:Work +/rdf:RDF + /metadata + g + inkscape:label=Layer 1 + inkscape:groupmode=layer + id=layer1 + transform=translate(0,-1020.3622) +path + style=fill:#4862a3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1 + d=m 4,1026.3622 c 0,-1 1,-2 2,-2 l 20,0 c 1,0 2,1 2,2 l 0,20 c 0,1 -1,2 -2,2 l -20,0 c -1,0 -2,-1 -2,-2 z + id=path4284 + inkscape:connector-curvature=0 + sodipodi:nodetypes=c / +path + style=fill:#ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1 + d=m 17,1048.3622 0,-10 -3,0 0,-3 3,0 0,-4 c 0,-2 1,-3 3,-3 l 4,0 0,3 -2,0 c -2,0 -2,0 -2,2 l 0,2 3,0 0,3 -3,0 0,10 z + id=path4286 + inkscape:connector-curvature=0 + sodipodi:nodetypes=c / + /g +/svg diff --git a/media/scut-flattr.svg b/media/scut-flattr.svg new file mode 100644 index 000..6d07e07 --- /dev/null +++ b/media/scut-flattr.svg @@ -0,0 +1,162 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:xlink=http://www.w3.org/1999/xlink; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=119 + height=32 + viewBox=0 0 119 32 + id=svg2 + version=1.1 + inkscape:version=0.91 r13725 + sodipodi:docname=scut-flattr.svg + defs + id=defs4 +linearGradient + inkscape:collect=always + id=linearGradient4511 + stop + style=stop-color:#fcc022;stop-opacity:1 + offset=0 + id=stop4513 / + stop + style=stop-color:#db6b27;stop-opacity:1 + offset=1 + id=stop4515 / +/linearGradient +linearGradient + inkscape:collect=always + id=linearGradient4503 + stop + style=stop-color:#b1b43e;stop-opacity:1 + offset=0 + id=stop4505 / + stop + style=stop-color:#7fa92c;stop-opacity:1 + offset=1 + id=stop4507 / +/linearGradient +
[EGIT] [website/www-content] master 01/01: Wiki page start-shortcuts changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=51d79d65956f6edf2a0dd44ae12829b3113df720
commit 51d79d65956f6edf2a0dd44ae12829b3113df720
Author: Raster ras...@rasterman.com
Date: Thu Jul 2 22:23:20 2015 -0700
Wiki page start-shortcuts changed with summary [] by Raster
---
pages/start-shortcuts.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/pages/start-shortcuts.txt b/pages/start-shortcuts.txt
index fed4ceb..cac5fcf 100644
--- a/pages/start-shortcuts.txt
+++ b/pages/start-shortcuts.txt
@@ -2,5 +2,6 @@
[[http://plus.google.com/118426816251488376359|{{:scut-gplus.svg|G+}}]]
[[http://www.facebook.com/enlightenment.org|{{:scut-facebook.svg|Facebook}}]]
[[http://www.youtube.com/channel/UCs9Xcw4TwJ1_A8QI8PxCNNA|{{:scut-youtube.svg|YouTube}}]]
+-
[[http://flattr.com/thing/418692/Enlightenment|{{:scut-flattr.svg|Flattr}}]]
[[https://www.paypal.com/webscr?cmd=_s-xclickhosted_button_id=A5U75JR3FFWFC|{{:scut-paypal.svg|PayPal}}]]
\ No newline at end of file
--
[EGIT] [website/www-content] master 01/03: Wiki page start-shortcuts changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master.
http://git.enlightenment.org/website/www-content.git/commit/?id=f18b3f829a2beafeeaf3c51be88be04bf0d11420
commit f18b3f829a2beafeeaf3c51be88be04bf0d11420
Author: Raster ras...@rasterman.com
Date: Thu Jul 2 22:13:01 2015 -0700
Wiki page start-shortcuts changed with summary [] by Raster
---
pages/start-shortcuts.txt | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pages/start-shortcuts.txt b/pages/start-shortcuts.txt
index 1c76bd6..059ea2e 100644
--- a/pages/start-shortcuts.txt
+++ b/pages/start-shortcuts.txt
@@ -1,6 +1,6 @@
-[[http://twitter.com/_Enlightenment_|{{:scut-twitter.png|Twitter}}]]
-[[http://plus.google.com/118426816251488376359|{{:scut-gplus.png|G+}}]]
-[[http://www.facebook.com/enlightenment.org|{{:scut-facebook.png|Facebook}}]]
-[[http://www.youtube.com/channel/UCs9Xcw4TwJ1_A8QI8PxCNNA|{{:scut-youtube.png|YouTube}}]]
-[[http://flattr.com/thing/418692/Enlightenment|{{:scut-flatter.png|Flattr}}]]
-[[https://www.paypal.com/webscr?cmd=_s-xclickhosted_button_id=A5U75JR3FFWFC|{{:scut-paypal.png|PayPal}}]]
\ No newline at end of file
+[[http://twitter.com/_Enlightenment_|{{:scut-twitter.svg|Twitter}}]]
+[[http://plus.google.com/118426816251488376359|{{:scut-gplus.svg|G+}}]]
+[[http://www.facebook.com/enlightenment.org|{{:scut-facebook.svg|Facebook}}]]
+[[http://www.youtube.com/channel/UCs9Xcw4TwJ1_A8QI8PxCNNA|{{:scut-youtube.svg|YouTube}}]]
+[[http://flattr.com/thing/418692/Enlightenment|{{:scut-flatter.svg|Flattr}}]]
+[[https://www.paypal.com/webscr?cmd=_s-xclickhosted_button_id=A5U75JR3FFWFC|{{:scut-paypal.svg|PayPal}}]]
\ No newline at end of file
--
[EGIT] [core/efl] master 01/01: eina: don't return NULL silently when creating new tilers
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=46f546c43ea808b3f58f6aa11f174e1cf148a355
commit 46f546c43ea808b3f58f6aa11f174e1cf148a355
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Thu Jul 2 14:18:06 2015 -0400
eina: don't return NULL silently when creating new tilers
---
src/lib/eina/eina_tiler.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lib/eina/eina_tiler.c b/src/lib/eina/eina_tiler.c
index 32833e9..47de92d 100644
--- a/src/lib/eina/eina_tiler.c
+++ b/src/lib/eina/eina_tiler.c
@@ -1140,8 +1140,7 @@ EAPI Eina_Tiler *eina_tiler_new(int w, int h)
{
Eina_Tiler *t;
- if ((w = 0) || (h = 0))
- return NULL;
+ EINA_SAFETY_ON_TRUE_RETURN_VAL((w = 0) || (h = 0), NULL);
t = calloc(1, sizeof(Eina_Tiler));
t-last.add.w = -1;
--
[EGIT] [core/enlightenment] master 01/08: clean up xwayland lock/socket init code
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=fa3c3b0e22057796ac5ea612bf31a22a04ea7af5
commit fa3c3b0e22057796ac5ea612bf31a22a04ea7af5
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Thu Jul 2 13:55:42 2015 -0400
clean up xwayland lock/socket init code
---
src/modules/xwayland/e_mod_main.c | 105 --
1 file changed, 55 insertions(+), 50 deletions(-)
diff --git a/src/modules/xwayland/e_mod_main.c
b/src/modules/xwayland/e_mod_main.c
index bd15fd7..c5b982d 100644
--- a/src/modules/xwayland/e_mod_main.c
+++ b/src/modules/xwayland/e_mod_main.c
@@ -28,31 +28,32 @@ struct _E_XWayland_Server
static E_XWayland_Server *exs;
/* local functions */
-static Eina_Bool
-_lock_create(char *lock)
+static int
+_lock_create(int lock)
{
char pid[16], *end;
int fd, size;
pid_t opid;
- fd = open(lock, (O_WRONLY | O_CLOEXEC | O_CREAT | O_EXCL), 0444);
+ /* assemble lock file name */
+ snprintf(exs-lock, sizeof(exs-lock), /tmp/.X%d-lock, lock);
+
+ fd = open(exs-lock, (O_WRONLY | O_CLOEXEC | O_CREAT | O_EXCL), 0444);
if ((fd 0) (errno == EEXIST))
{
-fd = open(lock, (O_CLOEXEC | O_RDONLY));
+fd = open(exs-lock, (O_CLOEXEC | O_RDONLY));
if ((fd 0) || (read(fd, pid, 11) != 11))
{
ERR(Could not read XWayland lock file: %m);
if (fd = 0) close(fd);
- errno = EEXIST;
- return EINA_FALSE;
+ return EEXIST;
}
opid = strtol(pid, end, 0);
if ((end != (pid + 10)))
{
if (fd = 0) close(fd);
- errno = EEXIST;
- return EINA_FALSE;
+ return EEXIST;
}
if ((kill(opid, 0) 0) (errno == ESRCH))
@@ -60,35 +61,31 @@ _lock_create(char *lock)
/* close stale lock file */
if (fd = 0) close(fd);
- if (unlink(lock))
- errno = EEXIST;
- else
- errno = EAGAIN;
-
- return EINA_FALSE;
+ if (unlink(exs-lock))
+ return EEXIST;
+ return EAGAIN;
}
close(fd);
-errno = EEXIST;
-return EINA_FALSE;
+return EEXIST;
}
else if (fd 0)
{
ERR(Could not create XWayland lock file: %m);
-return EINA_FALSE;
+return 0;
}
/* use the pid of the wayland compositor */
size = snprintf(pid, sizeof(pid), %10d\n, getpid());
if (write(fd, pid, size) != size)
{
-unlink(lock);
+unlink(exs-lock);
close(fd);
-return EINA_FALSE;
+return 0;
}
close(fd);
- return EINA_TRUE;
+ return 1;
}
static int
@@ -269,6 +266,28 @@ _cb_signal_event(void *data EINA_UNUSED, int type
EINA_UNUSED, void *event)
return ECORE_CALLBACK_CANCEL;
}
+static Eina_Bool
+setup_lock(void)
+{
+ do
+ {
+/* try to create the xserver lock file */
+switch (_lock_create(exs-disp))
+ {
+ case EEXIST:
+ exs-disp++;
+ case EAGAIN:
+ continue;
+ case 0:
+ free(exs);
+ return EINA_FALSE;
+ default:
+ return EINA_TRUE;
+ }
+ } while (1);
+ return EINA_FALSE;
+}
+
/* module functions */
E_API E_Module_Api e_modapi = { E_MODULE_API_VERSION, XWayland };
@@ -292,44 +311,30 @@ e_modapi_init(E_Module *m)
/* default display to zero */
exs-disp = 0;
-lock:
- /* assemble lock file name */
- snprintf(exs-lock, sizeof(exs-lock), /tmp/.X%d-lock, exs-disp);
-
- /* try to create the xserver lock file */
- if (!_lock_create(exs-lock))
+ do
{
-if (errno == EAGAIN)
- goto lock;
-else if (errno == EEXIST)
+if (!setup_lock()) return NULL;
+
+/* try to bind abstract socket */
+exs-abs_fd = _abstract_socket_bind(exs-disp);
+if ((exs-abs_fd 0) (errno == EADDRINUSE))
{
exs-disp++;
- goto lock;
+ unlink(exs-lock);
+ continue;
}
-else
+
+/* try to bind unix socket */
+exs-unx_fd = _unix_socket_bind(exs-disp);
+if (exs-unx_fd 0)
{
+ unlink(exs-lock);
+ close(exs-abs_fd);
free(exs);
return NULL;
}
- }
-
- /* try to bind abstract socket */
- exs-abs_fd = _abstract_socket_bind(exs-disp);
- if ((exs-abs_fd 0) (errno == EADDRINUSE))
- {
-exs-disp++;
-unlink(exs-lock);
-goto lock;
- }
-
- /* try to bind unix socket */
- if ((exs-unx_fd = _unix_socket_bind(exs-disp)) 0)
- {
-unlink(exs-lock);
-close(exs-abs_fd);
-free(exs);
-return NULL;
- }
+break;
+ } while (1);
/* assemble x11
[EGIT] [core/enlightenment] master 03/08: reject xwayland module from saved module loading
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=6fa4e93d192382525fc9b8f20ce22583ec9bc5ae
commit 6fa4e93d192382525fc9b8f20ce22583ec9bc5ae
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Thu Jul 2 14:26:28 2015 -0400
reject xwayland module from saved module loading
---
src/bin/e_module.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 04b307c..0fe391a 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -241,6 +241,7 @@ e_module_all_load(void)
if ((!em) || (!em-name)) continue;
if ((!e_util_strcmp(em-name, comp)) || (!e_util_strcmp(em-name,
conf_comp)) ||
+(eina_streq(em-name, xwayland)) ||
(!strncmp(em-name, wl_, 3)) //block wl_* modules from being
saved
)
{
--
[EGIT] [core/enlightenment] master 02/08: set initial surface attrs for internal wl clients
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=0a5e00488d72b3381daf20f1c230fc016d95bf9c
commit 0a5e00488d72b3381daf20f1c230fc016d95bf9c
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Thu Jul 2 14:26:02 2015 -0400
set initial surface attrs for internal wl clients
---
src/bin/e_comp_wl.c | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 2ee7510..fcfcaa8 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1477,14 +1477,17 @@ _e_comp_wl_compositor_cb_surface_create(struct
wl_client *client, struct wl_reso
}
DBG(\tUsing Pixmap: %p, ep);
-if ((ec = e_client_new(ep, 0, 0)))
- {
- ec-new_client = 0;
- e_comp-new_clients--;
- ec-client.w = ec-client.h = 1;
- ec-ignored = 1;
- ec-comp_data-surface = res;
- }
+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-ignored = 1;
+ec-comp_data-surface = res;
}
/* set reference to pixmap so we can fetch it later */
--
[EGIT] [core/enlightenment] master 06/08: return NULL when a client's xwayland pixmap is unreachable
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1716f1a6fa38da24367f0bf21f54fe5ad0099662
commit 1716f1a6fa38da24367f0bf21f54fe5ad0099662
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Thu Jul 2 14:57:01 2015 -0400
return NULL when a client's xwayland pixmap is unreachable
---
src/bin/e_comp_wl.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index f094c8e..e662634 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -316,7 +316,7 @@ e_comp_wl_client_xwayland_data(const E_Client *ec)
static inline E_Pixmap *
e_comp_wl_client_xwayland_pixmap(const E_Client *ec)
{
- return ((E_Comp_Wl_Client_Data*)ec-comp_data)-xwayland_pixmap;
+ return ec-comp_data ?
((E_Comp_Wl_Client_Data*)ec-comp_data)-xwayland_pixmap : NULL;
}
static inline void
--
[EGIT] [core/enlightenment] master 01/01: Init some vars to NULL in compositor create
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=528d8b31fc91a7fae3a77ec02e06013ae6ed0695
commit 528d8b31fc91a7fae3a77ec02e06013ae6ed0695
Author: Derek Foreman der...@osg.samsung.com
Date: Thu Jul 2 17:54:40 2015 -0400
Init some vars to NULL in compositor create
Summary: In some cases these end up uninitialized and we crash.
Reviewers: zmike
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2788
---
src/bin/e_comp_wl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 6e9a14c..950586a 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2497,7 +2497,7 @@ _e_comp_wl_compositor_create(void)
Ecore_X_Window root = 0;
int len = 0;
unsigned char *dat;
-char *rules, *model, *layout;
+char *rules = NULL, *model = NULL, *layout = NULL;
if ((ekbd = e_xkb_layout_get()))
{
--
[EGIT] [core/enlightenment] master 01/01: wizard: Prevent crash
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=fd9780f7162a087b1eaa895284100eba534f90ac commit fd9780f7162a087b1eaa895284100eba534f90ac Author: Derek Foreman der...@osg.samsung.com Date: Thu Jul 2 18:11:27 2015 -0400 wizard: Prevent crash Summary: If we get here when curpage is NULL, we'll crash later, so we should test for it. Reviewers: zmike Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2789 --- src/modules/wizard/e_wizard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c index b817da3..0a9c052 100644 --- a/src/modules/wizard/e_wizard.c +++ b/src/modules/wizard/e_wizard.c @@ -397,7 +397,7 @@ _e_wizard_cb_desktops_update(void *data EINA_UNUSED, int ev_type EINA_UNUSED, vo if ((e) (e-error)) xdg_error = EINA_TRUE; got_desktops = EINA_TRUE; - if (_e_wizard_check_xdg()) + if (curpage _e_wizard_check_xdg()) _e_wizard_next_xdg(); return ECORE_CALLBACK_PASS_ON; } --
[EGIT] [core/enlightenment] enlightenment-0.19 01/01: wizard: Prevent crash
discomfitor pushed a commit to branch enlightenment-0.19. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c9958e8e039c9b1b5e815a26d120867317a26a5c commit c9958e8e039c9b1b5e815a26d120867317a26a5c Author: Derek Foreman der...@osg.samsung.com Date: Thu Jul 2 18:11:27 2015 -0400 wizard: Prevent crash Summary: If we get here when curpage is NULL, we'll crash later, so we should test for it. Reviewers: zmike Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D2789 --- src/modules/wizard/e_wizard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/wizard/e_wizard.c b/src/modules/wizard/e_wizard.c index 4a666e9..9e93581 100644 --- a/src/modules/wizard/e_wizard.c +++ b/src/modules/wizard/e_wizard.c @@ -401,7 +401,7 @@ _e_wizard_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void if ((e) (e-error)) xdg_error = EINA_TRUE; got_desktops = EINA_TRUE; - if (_e_wizard_check_xdg()) + if (curpage _e_wizard_check_xdg()) _e_wizard_next_xdg(); return ECORE_CALLBACK_PASS_ON; } --
