[EGIT] [enlightenment/modules/forecasts] master 01/02: fix image object leak on shutdown
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=e78afd68698aadf5fd46ddc7bf66a5525c1cb017
commit e78afd68698aadf5fd46ddc7bf66a5525c1cb017
Author: discomfitor
Date: Wed Jan 1 16:16:24 2014 -0500
fix image object leak on shutdown
---
src/e_mod_main.c | 12
1 file changed, 12 insertions(+)
diff --git a/src/e_mod_main.c b/src/e_mod_main.c
index 6a39a23..dd27405 100644
--- a/src/e_mod_main.c
+++ b/src/e_mod_main.c
@@ -514,6 +514,18 @@ _forecasts_new(Evas *evas)
static void
_forecasts_free(Forecasts *w)
{
+ char name[60];
+ int i;
+
+ for (i = 0; i < FORECASTS; i++)
+ {
+Evas_Object *swallow;
+
+snprintf(name, sizeof(name), "e.swallow.day%d.icon", i);
+swallow = edje_object_part_swallow_get(w->forecasts_obj, name);
+if (swallow)
+ evas_object_del(swallow);
+ }
evas_object_del(w->forecasts_obj);
evas_object_del(w->icon_obj);
free(w);
--
[EGIT] [enlightenment/modules/forecasts] master 02/02: gitignore update
discomfitor pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/forecasts.git/commit/?id=1fa721b474ea6e8b9d2b2a1f2b72868600afc848 commit 1fa721b474ea6e8b9d2b2a1f2b72868600afc848 Author: discomfitor Date: Wed Jan 1 16:18:19 2014 -0500 gitignore update --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7f4e3a6..a91aea0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ Makefile Makefile.in aclocal.m4 autom4te.cache/ +compile config.guess config.h config.h.in --
[EGIT] [themes/darkness] master 01/01: greatly improve slider appearance
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/themes/darkness.git/commit/?id=f935cf4fb3da23382ae2fe4d5d40e3a9ec0f8778
commit f935cf4fb3da23382ae2fe4d5d40e3a9ec0f8778
Author: discomfitor
Date: Wed Jan 1 02:34:01 2014 -0500
greatly improve slider appearance
---
elm/widgets/slider.edc | 103 +++--
1 file changed, 40 insertions(+), 63 deletions(-)
diff --git a/elm/widgets/slider.edc b/elm/widgets/slider.edc
index 8c10fec..f35336e 100644
--- a/elm/widgets/slider.edc
+++ b/elm/widgets/slider.edc
@@ -69,7 +69,7 @@ group { name: "elm/slider/hidden/limit";
group { name: "elm/slider/horizontal/default";
alias: "elm/slider/horizontal/disabled";
images {
- image: "slider_bar.png" COMP;
+ image: "scroll_border_h.png" COMP;
image: "frame_label_under.png" COMP;
}
parts {
@@ -78,13 +78,14 @@ group { name: "elm/slider/hidden/limit";
description { state: "default" 0.0;
max: 9 6;
min: 0 6;
- rel1 { to: "bg";
- offset: 1 0;
+ rel1 { to: "elm.swallow.bar";
+ offset: -1 -1;
}
- rel2 { to: "bg";
- offset: -2 -1;
+ rel2 { to: "elm.swallow.bar";
+ offset: 2 2;
}
- image.normal: "slider_bar.png";
+ image.normal: "scroll_border_h.png";
+ image.border: 4 4 1 1;
fill.smooth: 0;
}
}
@@ -93,11 +94,12 @@ group { name: "elm/slider/hidden/limit";
mouse_events: 0;
description { state: "default" 0.0;
fixed: 1 1;
- rel1.to: "base";
- rel2 {
- to_y: "base";
- to_x: "elm.dragable.slider";
- }
+ rel1.to_x: "elm.swallow.bar";
+ rel1.to_y: "base";
+ rel1.offset: 0 1;
+ rel2.to_x: "elm.dragable.slider";
+ rel2.to_y: "base";
+ rel2.offset: -1 -2;
color: DARKNESS_BUTTON_BLUE 200;
}
description { state: "inverted" 0.0;
@@ -113,17 +115,6 @@ group { name: "elm/slider/hidden/limit";
visible: 0;
}
}
- part { name: "bg";
-type: RECT;
-mouse_events: 0;
-scale: 1;
-description { state: "default" 0.0;
- visible: 0;
- rel1.to: "elm.swallow.bar";
- rel2.to: "elm.swallow.bar";
- color: 0 0 0 0;
-}
- }
part { name: "elm.swallow.bar";
type: SWALLOW;
scale: 1;
@@ -137,7 +128,7 @@ group { name: "elm/slider/hidden/limit";
offset: 8 0;
}
rel2 {
- to_x: "elm.units";
+ to_x: "limits";
relative: 0.0 1.0;
offset: -10 -1;
}
@@ -194,11 +185,6 @@ group { name: "elm/slider/hidden/limit";
rel1.offset: 0 4;
rel2.offset: 0 -5;
}
-description { state: "disabled" 0.0;
- inherit: "default" 0.0;
- color: 255 128 128 128;
- visible: 0;
-}
description { state: "disabled_visible" 0.0;
inherit: "default" 0.0;
color: DARKNESS_TEXT_DISABLED 128;
@@ -328,19 +314,19 @@ group { name: "elm/slider/hidden/limit";
dragable {
x: 1 1 0;
y: 0 0 0;
- confine: "bg";
+ confine: "elm.swallow.bar";
}
description { state: "default" 0.0;
min: 0 24;
max: 0 24;
fixed: 1 1;
rel1 {
- relative: 0.5 0.0;
- to_x: "bg";
+ relative: 0.5 0.5;
+ to: "elm.swallow.bar";
}
rel2 {
- relative: 0.5 1.0;
- to_x: "bg";
+ relative: 0.5 0.5;
+ to: "elm.swallow.bar";
}
color: DARKNESS_BUTTON_BLUE 100;
}
@@ -491,7 +477,7 @@ group { name: "elm/slider/hidden/limit";
group { name: "elm/slider/vertical/default";
[EGIT] [themes/darkness] master 02/02: fix scroller appearance to not be as shitty and match e theme better
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/themes/darkness.git/commit/?id=641cc77b317e6caff9f9d7c6c5d8831d5e315474
commit 641cc77b317e6caff9f9d7c6c5d8831d5e315474
Author: discomfitor
Date: Sun Dec 29 19:39:23 2013 -0500
fix scroller appearance to not be as shitty and match e theme better
---
elm/darkness-desktop.edc | 165 +++--
elm/images/ibar_bg_v.png | Bin 0 -> 183 bytes
elm/images/scroll_border_h.png | Bin 0 -> 130 bytes
elm/images/scroll_border_v.png | Bin 0 -> 130 bytes
4 files changed, 94 insertions(+), 71 deletions(-)
diff --git a/elm/darkness-desktop.edc b/elm/darkness-desktop.edc
index f88258e..e1a7709 100644
--- a/elm/darkness-desktop.edc
+++ b/elm/darkness-desktop.edc
@@ -12,6 +12,8 @@ externals.external: "elm";
image: "scrollbar_button_down1.png" COMP; \
image: "scrollbar_button_right1.png" COMP; \
image: "scrollbar_button_left1.png" COMP; \
+image: "scroll_border_v.png" COMP; \
+image: "scroll_border_h.png" COMP; \
} \
script { \
public sbvis_v, sbvis_h; \
@@ -64,6 +66,27 @@ externals.external: "elm";
} \
} \
} \
+part { \
+ name: "sb_vbar_runner"; \
+ clip_to: "sb_vbar_clip"; \
+ mouse_events: 0; \
+ description { \
+ state: "default" 0.0; \
+ rel1 { \
+ to: "sb_vbar_a1"; \
+ } \
+ rel2 { \
+ to: "sb_vbar_a2"; \
+ } \
+ image { \
+ normal: "scroll_border_v.png"; \
+ border: 1 1 4 4; \
+ } \
+ fill { \
+ smooth: 0; \
+ } \
+ } \
+} \
part { name: "sb_vbar_p1"; \
type: RECT; \
mouse_events: 1; \
@@ -285,6 +308,27 @@ externals.external: "elm";
} \
} \
} \
+part { \
+ name: "sb_hbar_runner"; \
+ clip_to: "sb_hbar_clip"; \
+ mouse_events: 0; \
+ description { \
+ state: "default" 0.0; \
+ rel1 { \
+ to: "sb_hbar_a1"; \
+ } \
+ rel2 { \
+ to: "sb_hbar_a2"; \
+ } \
+ image { \
+ normal: "scroll_border_h.png"; \
+ border: 4 4 1 1; \
+ } \
+ fill { \
+ smooth: 0; \
+ } \
+ } \
+} \
part { name: "sb_hbar_over1"; \
clip_to: "sb_hbar_clip"; \
mouse_events: 0; \
@@ -650,7 +694,6 @@ collections {
group { name: "elm/scroller/base/default";
alias: "elm/list/base/default";
alias: "elm/genlist/base/default";
-alias: "elm/carousel/base/default";
alias: "elm/gengrid/base/default";
data {
@@ -658,18 +701,23 @@ collections {
}
images {
-image: "shelf_inset.png" COMP;
image: "entry_over.png" COMP;
+image: "ibar_bg_v.png" COMP;
}
parts {
part { name: "bg";
-type: RECT;
mouse_events: 0;
description { state: "default" 0.0;
-rel1.offset: 1 1;
+rel1.offset: -1 -1;
rel2.offset: -2 -2;
-color: 255 255 255 0;
+image {
+ normal: "ibar_bg_v.png";
+ border: 7 7 7 7;
+}
+fill {
+ smooth : 0;
+}
}
}
part { name: "clipper";
@@ -692,17 +740,6 @@ collections {
}
}
}
-part { name: "conf_over";
-mouse_events: 0;
-description { state: "default" 0.0;
-image {
-normal: "shelf_inset.png";
-border: 7 7 7 7;
-middle: 0;
-}
-fill.smooth: 0;
-}
-
[EGIT] [themes/darkness] master 01/02: remove stupid lines from scrollbars
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/themes/darkness.git/commit/?id=6078299b8d6560a167bb95cc3aa8c2fd821c8930
commit 6078299b8d6560a167bb95cc3aa8c2fd821c8930
Author: discomfitor
Date: Sun Dec 29 19:14:22 2013 -0500
remove stupid lines from scrollbars
---
elm/darkness-desktop.edc | 52 --
elm/images/sb_runnerh.png | Bin 160 -> 0 bytes
elm/images/sb_runnerv.png | Bin 166 -> 0 bytes
3 files changed, 52 deletions(-)
diff --git a/elm/darkness-desktop.edc b/elm/darkness-desktop.edc
index 2772876..f88258e 100644
--- a/elm/darkness-desktop.edc
+++ b/elm/darkness-desktop.edc
@@ -8,8 +8,6 @@ externals.external: "elm";
image: "scrollbar_hdrag1.png" COMP; \
image: "scrollbar_vdrag_thumb.png" COMP; \
image: "scrollbar_hdrag_thumb.png" COMP; \
-image: "sb_runnerh.png" COMP; \
-image: "sb_runnerv.png" COMP; \
image: "scrollbar_button_up1.png" COMP; \
image: "scrollbar_button_down1.png" COMP; \
image: "scrollbar_button_right1.png" COMP; \
@@ -66,31 +64,6 @@ externals.external: "elm";
} \
} \
} \
-part { name: "sb_vbar_runner"; \
-mouse_events: 0; \
-clip_to: "sb_vbar_clip"; \
-description { state: "default" 0.0; \
-min: 3 0; \
-max: 3 9; \
-fixed: 1 1; \
-align: 1.0 0.5; \
-rel1 { \
-to: "sb_vbar"; \
-relative: 0.5 0.0; \
-offset: 0 2; \
-} \
-rel2 { \
-to: "sb_vbar"; \
-relative: 0.5 1.0; \
-offset: 0 -2; \
-} \
-image { \
-normal: "sb_runnerv.png"; \
-border: 0 0 4 4; \
-} \
-fill.smooth: 0; \
-} \
-} \
part { name: "sb_vbar_p1"; \
type: RECT; \
mouse_events: 1; \
@@ -277,31 +250,6 @@ externals.external: "elm";
} \
} \
} \
-part { name: "sb_hbar_runner"; \
-mouse_events: 0; \
-clip_to: "sb_hbar_clip"; \
-description { state: "default" 0.0; \
-min: 0 3; \
-max: 9 3; \
-fixed: 1 1; \
-align: 0.5 0.5; \
-rel1 { \
-to: "sb_hbar"; \
-relative: 0.0 0.5; \
-offset: 2 0; \
-} \
-rel2 { \
-to: "sb_hbar"; \
-relative: 1.0 0.5; \
-offset: -2 0; \
-} \
-image { \
-normal: "sb_runnerh.png"; \
-border: 4 4 0 0; \
-} \
-fill.smooth: 0; \
-} \
-} \
part { name: "elm.dragable.hbar"; \
type: RECT; \
mouse_events: 1; \
diff --git a/elm/images/sb_runnerh.png b/elm/images/sb_runnerh.png
deleted file mode 100644
index a483ce8..000
Binary files a/elm/images/sb_runnerh.png and /dev/null differ
diff --git a/elm/images/sb_runnerv.png b/elm/images/sb_runnerv.png
deleted file mode 100644
index cb2da6f..000
Binary files a/elm/images/sb_runnerv.png and /dev/null differ
--
[EGIT] [themes/darkness] master 01/03: pretty sure -1.0 isn't helping here
discomfitor pushed a commit to branch master. http://git.enlightenment.org/themes/darkness.git/commit/?id=9a7820225328574e21a17e86255100d267a2dd77 commit 9a7820225328574e21a17e86255100d267a2dd77 Author: discomfitor Date: Thu Dec 26 16:16:02 2013 -0500 pretty sure -1.0 isn't helping here --- elm/macros/genlist.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/elm/macros/genlist.h b/elm/macros/genlist.h index dc1eea1..aaf415a 100644 --- a/elm/macros/genlist.h +++ b/elm/macros/genlist.h @@ -132,8 +132,8 @@ #define GENLIST_PART_TEXT(REL) \ GENLIST_PART_TEXT_BASE(REL, \ style: "Label"; \ - min: 1 1; \ - align: -1.0 0.5;, \ + min: 0 1; \ + align: 0.0 0.5;, \ color: 224 224 224 255; \ color3: 0 0 0 64; \ ) --
[EGIT] [themes/darkness] master 02/03: normal Label shouldn't be specifying wrap
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/themes/darkness.git/commit/?id=6506f47dadb6157740db03767bc4d6819aba43c5
commit 6506f47dadb6157740db03767bc4d6819aba43c5
Author: discomfitor
Date: Thu Dec 26 16:16:17 2013 -0500
normal Label shouldn't be specifying wrap
---
elm/macros/style.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/elm/macros/style.h b/elm/macros/style.h
index ad9dd67..c2b643d 100644
--- a/elm/macros/style.h
+++ b/elm/macros/style.h
@@ -1,7 +1,7 @@
#define STYLE(style_class, fn, fb, fi, fbi, fm, size, normal_style, title,
subtitle, hilight, description) \
style { \
name: style_class; \
- base: "font="fn" font_size="size" text_class="style_class" align=left
wrap=word "normal_style; \
+ base: "font="fn" font_size="size" text_class="style_class" align=left
"normal_style; \
tag: "br" "\n"; \
tag: "ps" "ps"; \
tag: "tab" "\t"; \
--
[EGIT] [themes/darkness] master 03/03: switch to Label style for genlist text
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/themes/darkness.git/commit/?id=cc94472206525af8aef33529c21b80c0b448fbb0
commit cc94472206525af8aef33529c21b80c0b448fbb0
Author: discomfitor
Date: Thu Dec 26 16:16:51 2013 -0500
switch to Label style for genlist text
---
elm/widgets/genlist.edc | 32
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/elm/widgets/genlist.edc b/elm/widgets/genlist.edc
index 2dad07a..00845a7 100644
--- a/elm/widgets/genlist.edc
+++ b/elm/widgets/genlist.edc
@@ -129,7 +129,7 @@
rel1 {
to_x: "elm.swallow.icon";
relative: 1.0 0.0;
- offset: 0 4;
+ offset: 3 4;
}
rel2 {
offset: -1 -5;
@@ -246,7 +246,7 @@
min: 0 1;
// min: 1 1;
align: 0.0 0.0;
- text_class: "Label-char";
+ text_class: "Label";
}
}
description { state: "selected" 0.0;
@@ -284,7 +284,7 @@
min: 0 1;
// min: 1 1;
align: 0.0 0.0;
- text_class: "Label-char";
+ text_class: "Label";
}
}
description { state: "selected" 0.0;
@@ -304,7 +304,7 @@
offset: -5 -5;
}
align: 0.0 0.0;
- text.text_class: "Label-char";
+ text.text_class: "Label";
)
FOCUS_GLOW(0.0, 0.0, 0, 0, "base", 1.0, 1.0, 3, -1, "base")
GENLIST_PART_DISCLIP("base")
@@ -347,7 +347,7 @@
relative: 0.0 1.0;
offset: -1 -5;
}
- text.text_class: "Label-char";
+ text.text_class: "Label";
)
FOCUS_GLOW(0.0, 0.0, 0, 0, "base", 1.0, 1.0, 3, -1, "base")
GENLIST_PART_DISCLIP("base")
@@ -386,7 +386,7 @@
rel2 {
offset: -1 -5;
}
- text.text_class: "Label-char";
+ text.text_class: "Label";
)
FOCUS_GLOW(0.0, 0.0, 0, 0, "base", 1.0, 1.0, 3, -1, "base")
GENLIST_PART_DISCLIP("base")
@@ -478,7 +478,7 @@
relative: 0.0 1.0;
offset: -1 -5;
}
- text.text_class: "Label-char";
+ text.text_class: "Label";
)
FOCUS_GLOW(0.0, 0.0, 0, 0, "base", 1.0, 1.0, 3, -1, "base")
GENLIST_PART_DISCLIP("base")
@@ -671,9 +671,9 @@
relative: 0.0 0.5;
offset: -1 -5;
}
- text.text_class: "Label-char";
+ text.text_class: "Label";
)
- GENLIST_PART_TEXT_SUB(0, "Label-char")
+ GENLIST_PART_TEXT_SUB(0, "Label")
FOCUS_GLOW(0.0, 0.0, 0, 0, "base", 1.0, 1.0, 3, -1, "base")
GENLIST_PART_DISCLIP("base")
}
@@ -767,9 +767,9 @@
relative: 0.0 0.5;
offset: -1 -5;
}
- text.text_class: "Label-char";
+ text.text_class: "Label";
)
- GENLIST_PART_TEXT_SUB(0, "Label-char")
+ GENLIST_PART_TEXT_SUB(0, "Label")
FOCUS_GLOW(0.0, 0.0, 0, 0, "base", 1.0, 1.0, 3, -1, "base")
GENLIST_PART_DISCLIP("base")
}
@@ -908,7 +908,7 @@
size: 8;
min: 0 1;
align: 0.0 0.5;
- text_class: "Label-char";
+ text_class: "Label";
}
}
description { state: "selected" 0.0;
@@ -972,7 +972,7 @@
color: 255 255 255 255;
color3: 0 0 0 0;
text {
- text_class: "Label-char";
+ text_class: "Label";
min: 1 1;
align: 1.0 0.5;
}
@@ -1010,7 +1010,7 @@
color: 255 255 255 255;
color3: 0 0 0 0;
text {
- text_class: "Label-char";
+ text_class: "Label";
min: 1 1;
align: 0.0 0.5;
text: ".";
@@ -1054,7 +1054,7 @@
size: 8;
min: 0 1;
align: 0.0 0.5;
- text_class: "Label-char";
+ text_class: "Label";
}
}
description { state: "selected" 0.0;
@@ -1134,7 +1134,7 @@
size: 8;
min: 0 1;
align: 0.0 0.5;
- text_class: "Label-char";
+ text_class: "Label";
}
}
description { state: "selected" 0.0;
--
[EGIT] [themes/darkness] master 01/01: add one_icon genlist styles
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/themes/darkness.git/commit/?id=e08a06f73b1557f8fdb54490d6cab0c7c68d18a0
commit e08a06f73b1557f8fdb54490d6cab0c7c68d18a0
Author: discomfitor
Date: Thu Dec 26 15:53:08 2013 -0500
add one_icon genlist styles
---
elm/macros/genlist.h| 2 +
elm/widgets/genlist.edc | 119
2 files changed, 121 insertions(+)
diff --git a/elm/macros/genlist.h b/elm/macros/genlist.h
index a4c096c..dc1eea1 100644
--- a/elm/macros/genlist.h
+++ b/elm/macros/genlist.h
@@ -74,6 +74,7 @@
state: "default" 0.0; \
fixed: 1 0; \
align: 0.0 0.5; \
+ aspect: 1 1; \
rel1 { \
to_x: "elm.swallow.pad"; \
relative: 1.0 0.0; \
@@ -81,6 +82,7 @@
} \
rel2 { \
to_x: "elm.swallow.pad"; \
+ relative: 1 1; \
offset: -1 -5; \
} \
} \
diff --git a/elm/widgets/genlist.edc b/elm/widgets/genlist.edc
index 0b5ff99..2dad07a 100644
--- a/elm/widgets/genlist.edc
+++ b/elm/widgets/genlist.edc
@@ -81,6 +81,86 @@
}
}
}
+ group { name: "elm/genlist/item/one_icon/default";
+ alias: "elm/genlist/item_odd/one_icon/default";
+ data.item: "stacking" "above";
+ data.item: "selectraise" "on";
+ data.item: "texts" "elm.text";
+ data.item: "contents" "elm.swallow.icon";
+ data.item: "treesize" "20";
+ images {
+ image: "slider_button.png" COMP;
+ image: "frame_label_over.png" COMP;
+ image: "menu_item_highlight.png" COMP;
+ image: "ilist_1.png" COMP;
+ image: "ilist_item_shadow.png" COMP;
+ }
+ parts {
+ LIST_PART_EVENT
+ part { name: "reorder_bg";
+mouse_events: 0;
+description { state: "default" 0.0;
+ visible: 0;
+ color: 255 255 255 0;
+ rel1 {
+ relative: 0.0 0.0;
+ offset: -7 -7;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ offset: 9 9;
+ }
+ image {
+ normal: "frame_label_over.png";
+ border: 6 6 6 6;
+ }
+}
+description { state: "enabled" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ color: 255 255 255 255;
+}
+ }
+ LIST_PART_BASE
+ GENLIST_PART_FG
+ GENLIST_PART_SWALLOW_PAD
+ GENLIST_PART_SWALLOW_ICON_REL_PAD
+ GENLIST_PART_TEXT(
+ rel1 {
+ to_x: "elm.swallow.icon";
+ relative: 1.0 0.0;
+ offset: 0 4;
+ }
+ rel2 {
+ offset: -1 -5;
+ }
+ )
+ FOCUS_GLOW(0.0, 0.0, 0, 0, "base", 1.0, 1.0, 3, -1, "base")
+ GENLIST_PART_DISCLIP("base")
+ }
+ GENLIST_PROGRAMS("base",
+target: "fg1";
+target: "elm.text";
+ )
+ programs {
+program {
+ name:"go_reorder_disabled";
+ signal: "elm,state,reorder,disabled";
+ source: "elm";
+ action: STATE_SET "default" 0.0;
+ target: "reorder_bg";
+ transition: DECELERATE 0.5;
+}
+program {
+ name:"go_reorder_enabled";
+ signal: "elm,state,reorder,enabled";
+ source: "elm";
+ action: STATE_SET "enabled" 0.0;
+ target: "reorder_bg";
+ transition: DECELERATE 0.5;
+}
+ }
+ }
group { name: "elm/genlist/item/group_index/default";
data.item: "stacking" "above";
data.item: "selectraise" "on";
@@ -277,6 +357,45 @@
target: "elm.text";
)
}
+ group { name: "elm/genlist/item_compress/one_icon/default";
+ alias: "elm/genlist/item_compress_odd/one_icon/default";
+ data.item: "stacking" "above";
+ data.item: "selectraise" "on";
+ data.item: "texts" "elm.text";
+ data.item: "contents" "elm.swallow.icon";
+ data.item: "treesize" "20";
+// data.item: "states" "";
+
[EGIT] [website/www] master 01/01: E18.1 release
discomfitor pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=832d3ba70bfe5133bf914fb1782bffb956a80ee2 commit 832d3ba70bfe5133bf914fb1782bffb956a80ee2 Author: discomfitor Date: Tue Dec 24 20:21:37 2013 -0500 E18.1 release --- public_html/p/download/en-body | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public_html/p/download/en-body b/public_html/p/download/en-body index 8dee2a1..b3a8d70 100644 --- a/public_html/p/download/en-body +++ b/public_html/p/download/en-body @@ -114,10 +114,10 @@ - Enlightenment 0.18.0 + Enlightenment 0.18.1 The Compositing Window Manager and Desktop Shell. http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.18.0.tar.gz"; + "http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.18.1.tar.gz"; );?> --
[EGIT] [website/www] master 01/01: E18.0 release
discomfitor pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=665e2a2784f906a8cbecb48a02b5484e1bdaa3da commit 665e2a2784f906a8cbecb48a02b5484e1bdaa3da Author: discomfitor Date: Sat Dec 21 16:53:56 2013 -0500 E18.0 release --- public_html/p/download/en-body | 6 +++--- public_html/p/index/en-body| 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public_html/p/download/en-body b/public_html/p/download/en-body index aaa2cfc..60d8051 100644 --- a/public_html/p/download/en-body +++ b/public_html/p/download/en-body @@ -114,10 +114,10 @@ - Enlightenment 0.17.5 - The Window Manager and Desktop Shell. Enlightenment 0.18.0 + The Compositing Window Manager and Desktop Shell. http://download.enlightenment.org/releases/enlightenment-0.17.5.tar.gz"; + "http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.18.0.tar.gz"; );?> diff --git a/public_html/p/index/en-body b/public_html/p/index/en-body index cf92094..8baede5 100644 --- a/public_html/p/index/en-body +++ b/public_html/p/index/en-body @@ -47,7 +47,7 @@ - EFL 1.8 is out! + EFL 1.8 and E18 are out! --
[EGIT] [legacy/eldbus] master 01/01: bugfix: eldbus code generator struct members named "proxy" should not be passed to eina_value_free.
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/legacy/eldbus.git/commit/?id=e44455bb28d9454d3a05352b5e0c1db4161fcfb2
commit e44455bb28d9454d3a05352b5e0c1db4161fcfb2
Author: discomfitor
Date: Sun Dec 15 00:09:18 2013 -0500
bugfix: eldbus code generator struct members named "proxy" should not be
passed to eina_value_free.
---
src/codegen/source_client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/codegen/source_client.c b/src/codegen/source_client.c
index b4961bc..d21bc77 100644
--- a/src/codegen/source_client.c
+++ b/src/codegen/source_client.c
@@ -348,7 +348,7 @@ jump_simple_stuff:
eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *user_data
EINA_UNUSED, void *func_data)\n{\n", sig->free_function);
eina_strbuf_append_printf(c_code, " %s *s_data = func_data;\n",
sig->struct_name);
if (sig->complex)
- eina_strbuf_append(c_code, " eina_value_free(s_data->proxy);\n");
+ eina_strbuf_append(c_code, " eina_value_free(s_data->value);\n");
else
eina_strbuf_append(c_code, eina_strbuf_string_get(string_free));
eina_strbuf_append_printf(c_code, " free(s_data);\n");
--
[EGIT] [legacy/eldbus] master 03/03: bugfix: make eldbus generated code not crash on every single generated event
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/legacy/eldbus.git/commit/?id=1a1c6445cc580872ff8c4b4eccbd5d3816b70059
commit 1a1c6445cc580872ff8c4b4eccbd5d3816b70059
Author: discomfitor
Date: Sat Dec 14 19:56:19 2013 -0500
bugfix: make eldbus generated code not crash on every single generated event
---
src/codegen/source_client.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/codegen/source_client.c b/src/codegen/source_client.c
index f86c62c..b4961bc 100644
--- a/src/codegen/source_client.c
+++ b/src/codegen/source_client.c
@@ -345,8 +345,8 @@ jump_simple_stuff:
eina_strbuf_append_printf(h, "} %s;\n", sig->struct_name);
//free function
- eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *user_data, void
*func_data)\n{\n", sig->free_function);
- eina_strbuf_append_printf(c_code, " %s *s_data = user_data;\n",
sig->struct_name);
+ eina_strbuf_append_printf(c_code, "\nstatic void\n%s(void *user_data
EINA_UNUSED, void *func_data)\n{\n", sig->free_function);
+ eina_strbuf_append_printf(c_code, " %s *s_data = func_data;\n",
sig->struct_name);
if (sig->complex)
eina_strbuf_append(c_code, " eina_value_free(s_data->proxy);\n");
else
--
[EGIT] [admin/devs] master 01/01: info updates
discomfitor pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=508e34b5d8b9b6bc2199b7a3d03b51c4efa5bb49 commit 508e34b5d8b9b6bc2199b7a3d03b51c4efa5bb49 Author: discomfitor Date: Wed Nov 27 12:11:15 2013 -0500 info updates --- developers/discomfitor/info.txt | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/developers/discomfitor/info.txt b/developers/discomfitor/info.txt index d6b8c27..287eb42 100644 --- a/developers/discomfitor/info.txt +++ b/developers/discomfitor/info.txt @@ -2,8 +2,8 @@ Login: discomfitor IRC Nick: discomfitor/zmike Cloak: developer/discomfitor Name: Mike Blumenkrantz -Location: Staines, UK +Location: CT, USA E-Mail:michael.blumenkra...@gmail.com -Managing: eeze, e_ukit, esskyuehl, azy, ecore_con, ecore_con_ssl, ecore_con_ares, darkness, shotgun, email, efm backend, 23oz -Contributing: e_dbus, gentoo ebuilds, e device backends, elm, notification module -Platform: Gentoo, ubuntu (Linux) +Managing: enlightenment +Contributing: efl +Platform: Gentoo, Fedora --
[EGIT] [admin/devs] master 01/01: I guess I'm rusty at the ol' committeroo whackjob
discomfitor pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=2952b0c9429edda89302b850c45822b3668738d2 commit 2952b0c9429edda89302b850c45822b3668738d2 Author: discomfitor Date: Tue Nov 19 02:00:57 2013 -0500 I guess I'm rusty at the ol' committeroo whackjob --- developers/discomfitor/id_rsa_pimpleton.pub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developers/discomfitor/id_rsa_pimpleton.pub b/developers/discomfitor/id_rsa_pimpleton.pub index ff7f7f8..ffc4880 100644 --- a/developers/discomfitor/id_rsa_pimpleton.pub +++ b/developers/discomfitor/id_rsa_pimpleton.pub @@ -1 +1 @@ -ssh-rsa B3NzaC1yc2EBIwAAAQEAwwK9L7tEdLdMTx/yosSLWaK0V+MeuEirhk0OkLd6McVGJVxHyunABkE25EOhgVZGILmczyNiqEMt8ISFHE0xJuPUVJbKIG5eW5gZsV6ks4EKTSuAP4u/ty5pQhYfJcL3Dz1Ml7zL3nkhGdBiphQTq2YXJibhx6kRXd+D07TY/mDQ3NEZ7bmaHGxOeM2bZGO1TsKxLDIRTH7dHSHBdDz+4KavQU4ObbKZbYKN1OL1UfoiNDFCysznpjpFeag+inTzymWsTsSEXZZnRZd0alNsweeSPXRAu1p15rtuwwLtwgyBbB8B06bipIOOm+wiKWsv5ruDooUk27NPLfb0/3np+Q== r...@darc.ath.cx +ssh-rsa B3NzaC1yc2EDAQABAAABAQCwurc5Kh5wzel5oeazUuxigpjDR2LmC86AxCSlyE3K4LfN7kZAe/thUYWar1Ha5pgGwdOiG4Jw3yxGa0Y8z2sTshl0coNyXKlW6550x2rrS0aMsMvlVaLtE7c/fUcoLimDBOJ1tzkgU5GWqm67EcrVFLQ/OWgT3NeMBr/3RJHTbC4AF/BI67xr0vQxEugxzVegybEPu5hNLhC2K3adPiXhnHV5Xf6GV8F+59Dylw7RBMfPwOzGAEmgeqh8gKtE3bpmOQlTIHZEMekbAWoyWhkgzWzkihc60eBwfWWXJ0uDoBhuWkXEf4gL7+MoTnLHPFE9PHx15bdyo8tyT5MF2s2f zmike@Sir.Pimpleton --
[EGIT] [admin/devs] master 01/01: new pimpleton key
discomfitor pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=a25a295d81bb3529085a59124cee7ac76e6facec commit a25a295d81bb3529085a59124cee7ac76e6facec Author: discomfitor Date: Tue Nov 19 01:59:27 2013 -0500 new pimpleton key --- developers/discomfitor/id_rsa_pimpleton.pub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developers/discomfitor/id_rsa_pimpleton.pub b/developers/discomfitor/id_rsa_pimpleton.pub index a304496..ff7f7f8 100644 --- a/developers/discomfitor/id_rsa_pimpleton.pub +++ b/developers/discomfitor/id_rsa_pimpleton.pub @@ -1 +1 @@ -ssh-rsa B3NzaC1yc2EDAQABAAABAQDZmMaQ44tAsOskXHBnYfxGFlll+a9kiwpForfvHnxN++2grGPGTVJ/+NiVzMTddLld+Lt/8WptOX2MXXN1CbcHkwPSrI8GWP7tTzXaRqr3wUYM8EKcrA4U3dyLIa2uuFMetY0ISyVY4MjuogU7gnTwv1/V9x+SY2Y+4+H0k0VFjlwKq8eK+cq/iL503VaEysFXhtQlpwt0ZNvfrRJx8kCgb3rexTtBQQbrm3x4A3vfwmDfdfAVT1JQpQ1ysg94GRK04JvRs/cekhj/pioF9Qpjc0F3LfbmRKuVVjeF2oC92m0PfYyzr7WGJF6bgywgAAI7bgKKbeysDSWa0N/HJDFt zmike@Sir.Pimpleton +ssh-rsa B3NzaC1yc2EBIwAAAQEAwwK9L7tEdLdMTx/yosSLWaK0V+MeuEirhk0OkLd6McVGJVxHyunABkE25EOhgVZGILmczyNiqEMt8ISFHE0xJuPUVJbKIG5eW5gZsV6ks4EKTSuAP4u/ty5pQhYfJcL3Dz1Ml7zL3nkhGdBiphQTq2YXJibhx6kRXd+D07TY/mDQ3NEZ7bmaHGxOeM2bZGO1TsKxLDIRTH7dHSHBdDz+4KavQU4ObbKZbYKN1OL1UfoiNDFCysznpjpFeag+inTzymWsTsSEXZZnRZd0alNsweeSPXRAu1p15rtuwwLtwgyBbB8B06bipIOOm+wiKWsv5ruDooUk27NPLfb0/3np+Q== r...@darc.ath.cx --
[EGIT] [admin/devs] master 02/02: add sir pimpleton
discomfitor pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=736d0b405ba82d906ae2dcc876a653e66c16366d commit 736d0b405ba82d906ae2dcc876a653e66c16366d Author: discomfitor Date: Tue Nov 19 01:42:20 2013 -0500 add sir pimpleton --- developers/discomfitor/id_rsa_pimpleton.pub | 1 + 1 file changed, 1 insertion(+) diff --git a/developers/discomfitor/id_rsa_pimpleton.pub b/developers/discomfitor/id_rsa_pimpleton.pub new file mode 100644 index 000..a304496 --- /dev/null +++ b/developers/discomfitor/id_rsa_pimpleton.pub @@ -0,0 +1 @@ +ssh-rsa B3NzaC1yc2EDAQABAAABAQDZmMaQ44tAsOskXHBnYfxGFlll+a9kiwpForfvHnxN++2grGPGTVJ/+NiVzMTddLld+Lt/8WptOX2MXXN1CbcHkwPSrI8GWP7tTzXaRqr3wUYM8EKcrA4U3dyLIa2uuFMetY0ISyVY4MjuogU7gnTwv1/V9x+SY2Y+4+H0k0VFjlwKq8eK+cq/iL503VaEysFXhtQlpwt0ZNvfrRJx8kCgb3rexTtBQQbrm3x4A3vfwmDfdfAVT1JQpQ1ysg94GRK04JvRs/cekhj/pioF9Qpjc0F3LfbmRKuVVjeF2oC92m0PfYyzr7WGJF6bgywgAAI7bgKKbeysDSWa0N/HJDFt zmike@Sir.Pimpleton --
[EGIT] [admin/devs] master 01/02: remove old work keys
discomfitor pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=8a80cf11d3af24df46a5601e88493c401349f6ec commit 8a80cf11d3af24df46a5601e88493c401349f6ec Author: discomfitor Date: Tue Nov 19 01:38:08 2013 -0500 remove old work keys --- developers/discomfitor/id_rsa_work.pub| 1 - developers/discomfitor/id_rsa_worktop.pub | 1 - 2 files changed, 2 deletions(-) diff --git a/developers/discomfitor/id_rsa_work.pub b/developers/discomfitor/id_rsa_work.pub deleted file mode 100644 index 747c44e..000 --- a/developers/discomfitor/id_rsa_work.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa B3NzaC1yc2EDAQABAAABAQDFGcdsnYxTN3Jyhs7KZ/sx+Mc2TyrRHmTJjDi4Wj1ZqvklbsHcrQmqCdFYpcq5fpQc/pnE0iuqpSGUWq6TOBC1MMV9f242cAyU4onY4psFkFYdc66ouzTaeWdX4mzJU3qU/uU0ysGGSdBfg9MjN8DWLyGkLETP3rn1LvsCIhnmtbTnXDP4tfT0p2tvGSBjD/P2olXgWNmvapytpC5ddR86hmiBUVTnGZxegIBr3Ztw+EpzadCWS94n7FRRtPJOIxl713XW3PNFmLhMz/s4cbm+B4hMoYggaT55k0UCzmiBDQ/WUSLhHWbX84sJxu7KKOIVQxz4O50t4M3qY8mgV+pH m.blumenk...@samsung.com diff --git a/developers/discomfitor/id_rsa_worktop.pub b/developers/discomfitor/id_rsa_worktop.pub deleted file mode 100644 index b6e7af1..000 --- a/developers/discomfitor/id_rsa_worktop.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa B3NzaC1yc2EDAQABAAABAQDdLloDdHl2R+mpaCA3ZMuYbFkBbliq4awD80a+8tSh7sm90QhqO/gXCswlxi5VqNO1zjmOSvDS8bM7kYK25mMJsUyd8517/D4eVpgMhFZXTIXHz/Cwd7bfORjGcUZDfOiuAuWDKU25BBaszUiRc8kDWXKVT3zbWjeDmeRjYGguWzT0wUUUNKbCoonP2bzsxpOolwTOZyBQg33ddXMiqZIRi0MqNd/Zilsp/jXTw+FQqFh9XLXYaKHniYvU6KtyVJpngUycUkPAyMkj+T7pczoxfNa0kRUm7FYs8zW0pHq0rnMZvaxna7amMBVh9nrFolrBiZN5RkTZpijPUDSIwPUd zmike@localhost.localdomain --
[EGIT] [core/enlightenment] master 02/02: unfocus focused+disabled widget always, not just when focus jump fails
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b67381916e60ebc12d29a10f9a5cfebaa341169c
commit b67381916e60ebc12d29a10f9a5cfebaa341169c
Author: discomfitor
Date: Sat Oct 26 09:53:15 2013 +0100
unfocus focused+disabled widget always, not just when focus jump fails
pretty sure this doesn't affect anything in e18, but it does break things
in a really hard to reproduce setting involving clicking/disabling/focusing
widgets simultaneously
---
src/bin/e_widget.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_widget.c b/src/bin/e_widget.c
index eab7e69..ee8cc68 100644
--- a/src/bin/e_widget.c
+++ b/src/bin/e_widget.c
@@ -460,7 +460,8 @@ e_widget_disabled_set(Evas_Object *obj, int disabled)
if (!o) break;
parent = o;
}
-if (!e_widget_focus_jump(parent, 1))
+e_widget_focus_jump(parent, 1);
+if (sd->focused)
{
sd->focused = 0;
if (sd->focus_func) sd->focus_func(obj);
--
[EGIT] [core/enlightenment] master 01/02: sanitize widget disabled_set flag, only jump focus when disabling focused widget
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b11305652d6cf66588ccb390da0354a1e800dbcf
commit b11305652d6cf66588ccb390da0354a1e800dbcf
Author: discomfitor
Date: Sat Oct 26 09:52:43 2013 +0100
sanitize widget disabled_set flag, only jump focus when disabling focused
widget
---
src/bin/e_widget.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_widget.c b/src/bin/e_widget.c
index 565207c..eab7e69 100644
--- a/src/bin/e_widget.c
+++ b/src/bin/e_widget.c
@@ -447,9 +447,9 @@ EAPI void
e_widget_disabled_set(Evas_Object *obj, int disabled)
{
API_ENTRY return;
- if (sd->disabled == disabled) return;
- sd->disabled = disabled;
- if (sd->focused)
+ if (sd->disabled == !!disabled) return;
+ sd->disabled = !!disabled;
+ if (sd->focused && sd->disabled)
{
Evas_Object *o = NULL, *parent = NULL;
--
[EGIT] [core/efl] master 01/01: fix ecore evas pointer warping
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0b8d4e4bce05d7b8f68645b54f1fed1eae123242 commit 0b8d4e4bce05d7b8f68645b54f1fed1eae123242 Author: discomfitor Date: Fri Oct 25 17:14:43 2013 +0100 fix ecore evas pointer warping --- src/lib/ecore_evas/ecore_evas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c index ac2becb..771e7dc 100644 --- a/src/lib/ecore_evas/ecore_evas.c +++ b/src/lib/ecore_evas/ecore_evas.c @@ -2387,8 +2387,8 @@ ecore_evas_pointer_warp(const Ecore_Evas *ee, Evas_Coord x, Evas_Coord y) return EINA_FALSE; } - if (ee->func.fn_pointer_warp) - return ee->func.fn_pointer_warp(ee, x, y); + if (ee->engine.func->fn_pointer_warp) + return ee->engine.func->fn_pointer_warp(ee, x, y); return EINA_FALSE; } --
[EGIT] [tools/clouseau] master 01/01: fix crash from connection errors where address is NULL (don't ask)
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/tools/clouseau.git/commit/?id=4a9c23648a93b06c8570fca155daed51b16cda89
commit 4a9c23648a93b06c8570fca155daed51b16cda89
Author: discomfitor
Date: Sun Oct 20 16:52:22 2013 +0100
fix crash from connection errors where address is NULL (don't ask)
---
src/bin/clouseau_client.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/clouseau_client.c b/src/bin/clouseau_client.c
index 66c90bf..ade7e3c 100644
--- a/src/bin/clouseau_client.c
+++ b/src/bin/clouseau_client.c
@@ -108,7 +108,7 @@ _titlebar_string_set(Gui_Elements *g, Eina_Bool online)
{
if (online)
{
-char *str = malloc(strlen(CLIENT_NAME) + strlen(g->address) + 32);
+char *str = malloc(strlen(CLIENT_NAME) + (g->address ?
strlen(g->address) : 0) + 32);
sprintf(str, "%s - %s", CLIENT_NAME, g->address);
elm_win_title_set(g->win, str);
free(str);
--
[EGIT] [apps/terminology] master 01/01: improve previous smart queue commit by deleting existing animator
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=82f4d3546a78a8f0280ac912816e86f6b2c77404
commit 82f4d3546a78a8f0280ac912816e86f6b2c77404
Author: discomfitor
Date: Sun Oct 20 15:31:19 2013 +0100
improve previous smart queue commit by deleting existing animator
this completely fixes annoying issues where mousing out of the terminal
fails to de-linkify text
moderately reviewed by: billiob
---
src/bin/termio.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/bin/termio.c b/src/bin/termio.c
index f27a1dd..cc234d3 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -4485,7 +4485,12 @@ termio_mouseover_suspend_pushpop(Evas_Object *obj, int
dir)
if (!sd) return;
sd->link.suspend += dir;
if (sd->link.suspend < 0) sd->link.suspend = 0;
- if (!sd->link.suspend)
+ if (sd->link.suspend)
+ {
+if (sd->anim) ecore_animator_del(sd->anim);
+sd->anim = NULL;
+ }
+ else
_smart_update_queue(obj, sd);
}
--
[EGIT] [core/enlightenment] master 01/01: use livethumb instead of preview for tw popups to make transparency look less horrendous
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=481258b07b012e04008ae446644afc360d68dc50
commit 481258b07b012e04008ae446644afc360d68dc50
Author: discomfitor
Date: Sun Oct 20 13:40:41 2013 +0100
use livethumb instead of preview for tw popups to make transparency look
less horrendous
---
src/modules/teamwork/e_mod_tw.c | 25 -
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c
index 7081e5a..3dad87b 100644
--- a/src/modules/teamwork/e_mod_tw.c
+++ b/src/modules/teamwork/e_mod_tw.c
@@ -800,8 +800,7 @@ tw_show_helper(Evas_Object *o, int w, int h)
ph = tw_mod->pop->zone->h;
pw = lround((double)(ph * w) / ((double)h));
}
- e_widget_preview_size_set(o, pw, ph);
- e_widget_preview_vsize_set(o, pw, ph);
+ e_livethumb_vsize_set(o, pw, ph);
e_popup_layer_set(tw_mod->pop, E_COMP_CANVAS_LAYER_POPUP, 0);
if ((!tw_win) && (last_coords.x == last_coords.y) && (last_coords.x == -1))
@@ -892,7 +891,7 @@ tw_video_opened_cb(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
if (ih < 1) ih = 1;
h = (w * ih) / iw;
- e_widget_preview_extern_object_set(data, obj);
+ e_livethumb_thumb_set(data, obj);
tw_show_helper(data, w, h);
e_popup_object_add(tw_mod->pop, obj);
e_object_data_set(E_OBJECT(tw_mod->pop),
eina_stringshare_add(emotion_object_file_get(obj)));
@@ -912,7 +911,7 @@ tw_show_video(Evas_Object *prev, const char *uri)
{
Evas_Object *o;
- o = emotion_object_add(e_widget_preview_evas_get(prev));
+ o = emotion_object_add(e_livethumb_evas_get(prev));
#if (EMOTION_VERSION_MAJOR > 1) || (EMOTION_VERSION_MINOR >= 8)
emotion_object_init(o, "vlc");
#else
@@ -954,7 +953,7 @@ tw_video_thread_done_cb(void *data, Ecore_Thread *eth)
close(tw_tmpfd);
tw_tmpfd = -1;
i->tmpfile = eina_stringshare_ref(tw_tmpfile);
- prev = e_widget_preview_add(e_util_comp_current_get()->evas, 50, 50);
+ prev = e_livethumb_add(e_util_comp_current_get()->evas);
tw_show_video(prev, tw_tmpfile);
download_media_cleanup();
}
@@ -1037,7 +1036,7 @@ tw_show(Media *i)
}
eina_stringshare_del(tw_tmpfile);
tw_tmpfile = eina_stringshare_ref(i->tmpfile);
- prev = e_widget_preview_add(e_util_comp_current_get()->evas, 50,
50);
+ prev = e_livethumb_add(e_util_comp_current_get()->evas);
tw_show_video(prev, tw_tmpfile);
return;
}
@@ -1072,14 +1071,14 @@ tw_show(Media *i)
else
#endif
{
-prev = e_widget_preview_add(e_util_comp_current_get()->evas, 50, 50);
-o = evas_object_image_filled_add(e_widget_preview_evas_get(prev));
+prev = e_livethumb_add(e_util_comp_current_get()->evas);
+o = evas_object_image_filled_add(e_livethumb_evas_get(prev));
evas_object_image_memfile_set(o,
(void*)eina_binbuf_string_get(i->buf), eina_binbuf_length_get(i->buf), NULL,
NULL);
evas_object_image_size_get(o, &w, &h);
-ic = e_icon_add(e_widget_preview_evas_get(prev));
+ic = e_icon_add(e_livethumb_evas_get(prev));
e_icon_image_object_set(ic, o);
}
- e_widget_preview_extern_object_set(prev, ic);
+ e_livethumb_thumb_set(prev, ic);
tw_show_helper(prev, w, h);
e_object_data_set(E_OBJECT(tw_mod->pop), eina_stringshare_ref(i->addr));
e_popup_object_add(tw_mod->pop, ic);
@@ -1112,7 +,7 @@ tw_show_local_file(const char *uri)
{
if (!evas_object_image_extension_can_load_get(uri)) return;
}
- prev = e_widget_preview_add(e_util_comp_current_get()->evas, 50, 50);
+ prev = e_livethumb_add(e_util_comp_current_get()->evas);
#ifdef HAVE_EMOTION
if (video)
{
@@ -1122,12 +1121,12 @@ tw_show_local_file(const char *uri)
else
#endif
{
-o = e_icon_add(e_widget_preview_evas_get(prev));
+o = e_icon_add(e_livethumb_evas_get(prev));
e_icon_file_set(o, uri);
e_icon_preload_set(o, 1);
e_icon_size_get(o, &w, &h);
}
- e_widget_preview_extern_object_set(prev, o);
+ e_livethumb_thumb_set(prev, o);
tw_show_helper(prev, w, h);
e_popup_object_add(tw_mod->pop, o);
e_object_data_set(E_OBJECT(tw_mod->pop), eina_stringshare_add(uri));
--
[EGIT] [apps/terminology] master 01/01: only queue smart updates from termio_mouseover_suspend_pushpop when link.suspend is 0
discomfitor pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=2ad1d55e594abf5976a2ee5ed3cf953e477017f3 commit 2ad1d55e594abf5976a2ee5ed3cf953e477017f3 Author: discomfitor Date: Sun Oct 20 08:15:24 2013 +0100 only queue smart updates from termio_mouseover_suspend_pushpop when link.suspend is 0 almost reviewed-by: billiob --- src/bin/termio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/termio.c b/src/bin/termio.c index acecdc1..f27a1dd 100644 --- a/src/bin/termio.c +++ b/src/bin/termio.c @@ -4485,7 +4485,8 @@ termio_mouseover_suspend_pushpop(Evas_Object *obj, int dir) if (!sd) return; sd->link.suspend += dir; if (sd->link.suspend < 0) sd->link.suspend = 0; - _smart_update_queue(obj, sd); + if (!sd->link.suspend) + _smart_update_queue(obj, sd); } void --
[EGIT] [core/enlightenment] master 01/02: get root window BEFORE using it to restore randr config :/
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=2eeb5fe129fbeaa0f5e01d745cf9bddc2414f2aa
commit 2eeb5fe129fbeaa0f5e01d745cf9bddc2414f2aa
Author: discomfitor
Date: Thu Oct 17 08:35:14 2013 +0100
get root window BEFORE using it to restore randr config :/
---
src/bin/e_randr.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_randr.c b/src/bin/e_randr.c
index 725046e..5cec7de 100644
--- a/src/bin/e_randr.c
+++ b/src/bin/e_randr.c
@@ -381,6 +381,9 @@ _e_randr_config_restore(void)
* any randr event updates until we are done */
ecore_x_grab();
+ /* get the root window */
+ root = ecore_x_window_root_first_get();
+
/* get existing primary output */
/* primary = ecore_x_randr_primary_output_get(root); */
@@ -391,9 +394,6 @@ _e_randr_config_restore(void)
_e_randr_config_screen_size_calculate(&sw, &sh);
printf("\tCalculated Screen Size: %d %d\n", sw, sh);
- /* get the root window */
- root = ecore_x_window_root_first_get();
-
/* get a list of crtcs from X */
if ((crtcs = ecore_x_randr_crtcs_get(root, &ncrtcs)))
{
--
[EGIT] [core/enlightenment] master 02/02: don't try applying randr settings when there's no outputs, this doesn't do anything
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d5675fd7058608ecc9267601d21fbf1dd5475295 commit d5675fd7058608ecc9267601d21fbf1dd5475295 Author: discomfitor Date: Thu Oct 17 08:35:27 2013 +0100 don't try applying randr settings when there's no outputs, this doesn't do anything --- src/bin/e_randr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_randr.c b/src/bin/e_randr.c index 5cec7de..99653d8 100644 --- a/src/bin/e_randr.c +++ b/src/bin/e_randr.c @@ -495,6 +495,7 @@ _e_randr_config_restore(void) /* append to the list of valid outputs */ valid = eina_list_append(valid, output_cfg); } + if (!valid) continue; count = eina_list_count(valid); --
[EGIT] [core/efl] master 01/01: cosmetic/logic move evas_sync call into same if block when applying alpha settings that might be deferred
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=73bd605b7ff84a2fdac1326ea29fd98e88597acd commit 73bd605b7ff84a2fdac1326ea29fd98e88597acd Author: discomfitor Date: Wed Oct 16 17:57:07 2013 +0100 cosmetic/logic move evas_sync call into same if block when applying alpha settings that might be deferred --- src/modules/ecore_evas/engines/x/ecore_evas_x.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c index 69e0709..7140ca6 100644 --- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c +++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c @@ -2290,9 +2290,8 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha) ee->delayed.alpha_changed = EINA_TRUE; return; } + evas_sync(ee->evas); } -if (ee->in_async_render) -evas_sync(ee->evas); _alpha_do(ee, alpha); } else if (!strcmp(ee->driver, "opengl_x11")) --
[EGIT] [core/efl] master 01/01: evas smart callback deletion no longer crashes when called during object deletion
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9c83f344200a6823cde0ecb3c744e31addc562b4 commit 9c83f344200a6823cde0ecb3c744e31addc562b4 Author: discomfitor Date: Wed Oct 16 17:12:50 2013 +0100 evas smart callback deletion no longer crashes when called during object deletion --- src/lib/evas/canvas/evas_object_smart.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c index dc3ae11..cfdae7f 100644 --- a/src/lib/evas/canvas/evas_object_smart.c +++ b/src/lib/evas/canvas/evas_object_smart.c @@ -889,8 +889,9 @@ evas_object_smart_callback_del_full(Evas_Object *eo_obj, const char *event, Evas MAGIC_CHECK(eo_obj, Evas_Object, MAGIC_OBJ); return NULL; MAGIC_CHECK_END(); - o = eo_data_scope_get(eo_obj, MY_CLASS); if (!event) return NULL; + o = eo_data_scope_get(eo_obj, MY_CLASS); + if (!o) return NULL; const _Evas_Event_Description *event_desc = eina_hash_find(signals_hash_table, event); if (!event_desc) return NULL; --
[EGIT] [core/enlightenment] master 01/01: fix basic click focus settings apply
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9226b89c4184043367fc4547c089bb9961a02f9d commit 9226b89c4184043367fc4547c089bb9961a02f9d Author: discomfitor Date: Thu Oct 10 06:48:13 2013 +0100 fix basic click focus settings apply forgot to update them after removing focus-raise --- src/modules/conf_window_manipulation/e_int_config_focus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/conf_window_manipulation/e_int_config_focus.c b/src/modules/conf_window_manipulation/e_int_config_focus.c index 0a07209..97b6bda 100644 --- a/src/modules/conf_window_manipulation/e_int_config_focus.c +++ b/src/modules/conf_window_manipulation/e_int_config_focus.c @@ -118,8 +118,8 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata) e_config->focus_setting = E_FOCUS_NEW_WINDOW; e_config->pass_click_on = 1; e_config->window_activehint_policy = 2; -e_config->always_click_to_raise = 0; -e_config->always_click_to_focus = 0; +e_config->always_click_to_raise = 1; +e_config->always_click_to_focus = 1; e_config->focus_last_focused_per_desktop = 1; e_config->focus_revert_on_hide_or_close = 1; e_config->pointer_slide = 0; --
[EGIT] [core/efl] master 01/01: also unbreak ecore-wl header with previous reverts...
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=80bcfac650e286971b9267aca33430908427b6e5 commit 80bcfac650e286971b9267aca33430908427b6e5 Author: discomfitor Date: Sat Oct 5 16:38:55 2013 +0100 also unbreak ecore-wl header with previous reverts... --- src/lib/ecore_wayland/Ecore_Wayland.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h index 3588341..05ceb00 100644 --- a/src/lib/ecore_wayland/Ecore_Wayland.h +++ b/src/lib/ecore_wayland/Ecore_Wayland.h @@ -12,7 +12,6 @@ # include # include # include -# include # ifdef EAPI # undef EAPI --
[EGIT] [core/efl] master 01/03: Revert "adding wayland subsurfaces protocol file."
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=06a5ba211899c7aec148c6f459bfb33d632d9444
commit 06a5ba211899c7aec148c6f459bfb33d632d9444
Author: discomfitor
Date: Sat Oct 5 16:22:15 2013 +0100
Revert "adding wayland subsurfaces protocol file."
This reverts commit ad27efcb397f3dc8da670180784991f876841e01.
---
configure.ac | 8 -
data/ecore/ecore_wayland/protocol/subsurface.xml | 244 ---
src/Makefile_Ecore_Wayland.am| 17 --
src/lib/ecore_wayland/.gitignore | 2 -
4 files changed, 271 deletions(-)
diff --git a/configure.ac b/configure.ac
index f616e0d..77972b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1007,14 +1007,6 @@ AC_ARG_ENABLE([wayland],
if test "${want_wayland}" = "yes"; then
EFL_PKG_CHECK_STRICT([wayland-client])
-dnl This is a problem. unless you somehow have this macro defined
-dnl magically... you cant do dev on efl. configure is totally broken.
-dnl you end up with something like:
-dnl
-dnl ./configure: line 25508: syntax error near unexpected token
`'$(top_srcdir)/data/ecore/ecore_wayland/protocol''
-dnl ./configure: line 25508:
`WAYLAND_SCANNER_RULES('$(top_srcdir)/data/ecore/ecore_wayland/protocol')'
-
-dnl
WAYLAND_SCANNER_RULES(['$(top_srcdir)/data/ecore/ecore_wayland/protocol'])
fi
# Fb
diff --git a/data/ecore/ecore_wayland/protocol/subsurface.xml
b/data/ecore/ecore_wayland/protocol/subsurface.xml
deleted file mode 100644
index 9e4a658..000
--- a/data/ecore/ecore_wayland/protocol/subsurface.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-
-
-
-
-Copyright © 2012-2013 Collabora, Ltd.
-
-Permission to use, copy, modify, distribute, and sell this
-software and its documentation for any purpose is hereby granted
-without fee, provided that the above copyright notice appear in
-all copies and that both that copyright notice and this permission
-notice appear in supporting documentation, and that the name of
-the copyright holders not be used in advertising or publicity
-pertaining to distribution of the software without specific,
-written prior permission. The copyright holders make no
-representations about the suitability of this software for any
-purpose. It is provided "as is" without express or implied
-warranty.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-THIS SOFTWARE.
-
-
-
-
- The global interface exposing sub-surface compositing capabilities.
- A wl_surface, that has sub-surfaces associated, is called the
- parent surface. Sub-surfaces can be arbitrarily nested and create
- a tree of sub-surfaces.
-
- The root surface in a tree of sub-surfaces is the main
- surface. The main surface cannot be a sub-surface, because
- sub-surfaces must always have a parent.
-
- A main surface with its sub-surfaces forms a (compound) window.
- For window management purposes, this set of wl_surface objects is
- to be considered as a single window, and it should also behave as
- such.
-
- The aim of sub-surfaces is to offload some of the compositing work
- within a window from clients to the compositor. A prime example is
- a video player with decorations and video in separate wl_surface
- objects. This should allow the compositor to pass YUV video buffer
- processing to dedicated overlay hardware when possible.
-
-
-
-
- Informs the server that the client will not be using this
- protocol object anymore. This does not affect any other
- objects, wl_subsurface objects included.
-
-
-
-
-
-
-
-
-
- Create a sub-surface interface for the given surface, and
- associate it with the given parent surface. This turns a
- plain wl_surface into a sub-surface.
-
- The to-be sub-surface must not already have a dedicated
- purpose, like any shell surface type, cursor image, drag icon,
- or sub-surface. Otherwise a protocol error is raised.
-
-
-
-
-
-
-
-
-
-
- An additional interface to a wl_surface object, which has been
- made a sub-surface. A sub-surface has one parent surface. A
- sub-surface's size and position are not limited to that of the parent.
- Particularly, a sub-surface is not automatically clipped to its
-
[EGIT] [core/efl] master 03/03: Revert "ecore/wayland: Add subsurface handling APIs."
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8f493ab6c5975b5346bbd6ee502e9888e4255b8a commit 8f493ab6c5975b5346bbd6ee502e9888e4255b8a Author: discomfitor Date: Sat Oct 5 16:26:24 2013 +0100 Revert "ecore/wayland: Add subsurface handling APIs." This reverts commit 65b960f4a60442edcd66082ccc1828b80a49885c. Conflicts: src/lib/ecore_wayland/ecore_wl.c --- src/Makefile_Ecore_Wayland.am| 1 - src/lib/ecore_wayland/Ecore_Wayland.h| 92 +-- src/lib/ecore_wayland/ecore_wl.c | 1 - src/lib/ecore_wayland/ecore_wl_private.h | 2 - src/lib/ecore_wayland/ecore_wl_subsurf.c | 191 --- src/lib/ecore_wayland/ecore_wl_window.c | 2 - 6 files changed, 1 insertion(+), 288 deletions(-) diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am index 41d2a6f..aaf08f5 100644 --- a/src/Makefile_Ecore_Wayland.am +++ b/src/Makefile_Ecore_Wayland.am @@ -14,7 +14,6 @@ lib/ecore_wayland/ecore_wl_dnd.c \ lib/ecore_wayland/ecore_wl_input.c \ lib/ecore_wayland/ecore_wl_output.c \ lib/ecore_wayland/ecore_wl_window.c \ -lib/ecore_wayland/ecore_wl_subsurf.c \ lib/ecore_wayland/ecore_wl_private.h lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ECORE_WAYLAND_CFLAGS@ diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h index 6f50ba1..3588341 100644 --- a/src/lib/ecore_wayland/Ecore_Wayland.h +++ b/src/lib/ecore_wayland/Ecore_Wayland.h @@ -12,6 +12,7 @@ # include # include # include +# include # ifdef EAPI # undef EAPI @@ -35,7 +36,6 @@ typedef struct _Ecore_Wl_Display Ecore_Wl_Display; typedef struct _Ecore_Wl_Output Ecore_Wl_Output; typedef struct _Ecore_Wl_Input Ecore_Wl_Input; typedef struct _Ecore_Wl_Global Ecore_Wl_Global; /** @since 1.7.6 */ -typedef struct _Ecore_Wl_Subsurf Ecore_Wl_Subsurf; /** @since 1.8 */ # ifndef _ECORE_WAYLAND_WINDOW_PREDEF typedef struct _Ecore_Wl_Window Ecore_Wl_Window; @@ -252,8 +252,6 @@ struct _Ecore_Wl_Window /* FIXME: Ideally we should record the cursor name for this window * so we can compare and avoid unnecessary cursor set calls to wayland */ - Ecore_Wl_Subsurf *subsurfs; - void *data; }; @@ -384,7 +382,6 @@ struct _Ecore_Wl_Event_Interfaces_Bound * @li @ref Ecore_Wl_Window_Group * @li @ref Ecore_Wl_Input_Group * @li @ref Ecore_Wl_Dnd_Group - * @li @ref Ecore_Wl_Subsurf */ EAPI extern int ECORE_WL_EVENT_MOUSE_IN; @@ -868,93 +865,6 @@ EAPI struct wl_array *ecore_wl_dnd_drag_types_get(Ecore_Wl_Input *input); EAPI void ecore_wl_server_mode_set(Eina_Bool on); -/** - * @defgroup Ecore_Wl_Subsurf Functions to manipulate subsurfaces. - * @ingroup Ecore_Wl_Group - * - * Functions to manipulate wayland subsurfaces, using Ecore_Wl_Subsurf. - * - * This API is intended to expose Wayland subsurface functionality, although it - * should not be necessary for most applications to use it, as soon as we have - * means to make Evas automatically switch Evas images to use subsurfaces. - * - * It can/should be used, for instance, when subsurfaces are needed to be not - * in sync with the main window surface. - */ - -/** - * Create and return a new subsurface. - * - * Create a new surface (and subsurface interface), with the parent surface - * being the one associated with the given @param win. - * - * The @param win must be visible, otherwise there will be no surface created - * for it yet. - * - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI Ecore_Wl_Subsurf *ecore_wl_subsurf_create(Ecore_Wl_Window *win); - -/** - * Destroy the given subsurface, as well as the surface associated with it. - * - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI void ecore_wl_subsurf_del(Ecore_Wl_Subsurf *ess); - -/** - * Return the wl_surface associated with this subsurface. - * - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI struct wl_surface *ecore_wl_subsurf_surface_get(Ecore_Wl_Subsurf *ess); - -/** - * Set the position of this subsurface, relative to its parent surface. - * - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI void ecore_wl_subsurf_position_set(Ecore_Wl_Subsurf *ess, int x, int y); - -/** - * Get the position of this subsurface, relative to its parent surface. - * - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI void ecore_wl_subsurf_position_get(Ecore_Wl_Subsurf *ess, int *x, int *y); - -/** - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI void ecore_wl_subsurf_place_above(Ecore_Wl_Subsurf *ess, struct wl_surface *surface); - -/** - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI void ecore_wl_subsurf_place_below(Ecore_Wl_Subsurf *ess, struct wl_surface *surface); - -/** - * @ingroup Ecore_Wl_Subsurf - * @since 1.8 - */ -EAPI void ecore_wl_subsurf_sync_set(Ecore_Wl_Subsurf *ess, Eina_Bool val); - -/** - * Set an opaque region for the given subsurface. -
[EGIT] [core/efl] master 02/03: Revert "ecore/wayland: Add and initialize subcompositor inside Ecore_Wayland."
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f66eceed10bc7101eda31594a06af82777be53da
commit f66eceed10bc7101eda31594a06af82777be53da
Author: discomfitor
Date: Sat Oct 5 16:23:38 2013 +0100
Revert "ecore/wayland: Add and initialize subcompositor inside
Ecore_Wayland."
This reverts commit 7994b62c6be0368a2b4dcd038de5f25556cb6842.
---
src/lib/ecore_wayland/Ecore_Wayland.h | 1 -
src/lib/ecore_wayland/ecore_wl.c | 7 ---
2 files changed, 8 deletions(-)
diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h
b/src/lib/ecore_wayland/Ecore_Wayland.h
index 30545b7..6f50ba1 100644
--- a/src/lib/ecore_wayland/Ecore_Wayland.h
+++ b/src/lib/ecore_wayland/Ecore_Wayland.h
@@ -102,7 +102,6 @@ struct _Ecore_Wl_Display
struct wl_display *display;
struct wl_registry *registry;
struct wl_compositor *compositor;
-struct wl_subcompositor *subcompositor;
struct wl_shell *shell;
struct wl_shell *desktop_shell;
struct wl_shm *shm;
diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index ee614e0..d2565b8 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -398,8 +398,6 @@ _ecore_wl_shutdown(Eina_Bool close)
wl_data_device_manager_destroy(_ecore_wl_disp->wl.data_device_manager);
if (_ecore_wl_disp->wl.compositor)
wl_compositor_destroy(_ecore_wl_disp->wl.compositor);
-if (_ecore_wl_disp->wl.subcompositor)
- wl_subcompositor_destroy(_ecore_wl_disp->wl.subcompositor);
if (_ecore_wl_disp->wl.display)
{
wl_registry_destroy(_ecore_wl_disp->wl.registry);
@@ -518,11 +516,6 @@ _ecore_wl_cb_handle_global(void *data, struct wl_registry
*registry, unsigned in
ewd->wl.compositor =
wl_registry_bind(registry, id, &wl_compositor_interface, 3);
}
- else if (!strcmp(interface, "wl_subcompositor"))
- {
-ewd->wl.subcompositor =
- wl_registry_bind(registry, id, &wl_subcompositor_interface, 1);
- }
else if (!strcmp(interface, "wl_output"))
_ecore_wl_output_add(ewd, id);
else if (!strcmp(interface, "wl_seat"))
--
[EGIT] [core/enlightenment] master 03/03: use more accurate heuristics when calculating ConfigureRequest move coords:
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=8b596394d6d33c0c4d85c07a990194b456e7329d
commit 8b596394d6d33c0c4d85c07a990194b456e7329d
Author: discomfitor
Date: Thu Sep 26 19:11:33 2013 +0100
use more accurate heuristics when calculating ConfigureRequest move coords:
1) invalidate moves resulting from stupid clients trying to re-set their
current position (SUP WINE. YEAH, I'M TALKIN TO YOU, BUDDY. WHY YOU GOTTA BE
MESSIN WITH MY WINDOW COORDS?)
2) clamp coords when screen limit policy is set to prevent clients from
being outside the screen at all
3) all things are allowed, nothing is prohibited
---
src/bin/e_border.c | 24
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index c148b62..1f80a3c 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -5196,13 +5196,29 @@ _e_border_cb_window_configure_request(void *data
__UNUSED__,
e_zone_useful_geometry_get(bd->zone, &zx, &zy, &zw, &zh);
if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X)
{
- x = e->x;
- if (x - bd->client_inset.l >= zx) x -= bd->client_inset.l;
+ /* ignore moves (usually from wine clients)
+ * which would cause the window to jump
+ * by the size of the frame
+ */
+ if (bd->x + bd->client_inset.l == e->x)
+ x = bd->x;
+ else if (e_config->screen_limits == E_SCREEN_LIMITS_WITHIN)
+ x = E_CLAMP(e->x, zx, zx + zw - bd->w);
+ else
+ x = e->x;
}
if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y)
{
- y = e->y;
- if (y - bd->client_inset.t >= zy) y -= bd->client_inset.t;
+ /* ignore moves (usually from wine clients)
+ * which would cause the window to jump
+ * by the size of the frame
+ */
+ if (bd->y + bd->client_inset.t == e->y)
+ y = bd->y;
+ else if (e_config->screen_limits == E_SCREEN_LIMITS_WITHIN)
+ y = E_CLAMP(e->y, zy, zy + zh - bd->h);
+ else
+ y = e->y;
}
if ((e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W) ||
(e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H))
--
[EGIT] [core/enlightenment] master 01/03: never apply window placement policy on ConfigureRequest
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=6b41a6dba9e877e5298c813f3730985997cc8aed
commit 6b41a6dba9e877e5298c813f3730985997cc8aed
Author: discomfitor
Date: Thu Sep 26 18:16:32 2013 +0100
never apply window placement policy on ConfigureRequest
geometry_auto_move is an option which should only be applied to "new"
clients. we were erroneously applying it during client move/resize requests,
which likely was causing unintended behavior. if this becomes an issue, the
correct solution is to create (groan) another option to enforce window
placement policy either [at all times] or [for client geometry requests]
---
src/bin/e_border.c | 32
1 file changed, 4 insertions(+), 28 deletions(-)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 5f6ceb3..c148b62 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -5163,26 +5163,6 @@ _e_border_cb_window_reparent(void *data __UNUSED__,
return ECORE_CALLBACK_PASS_ON;
}
-static void
-_e_border_xy_place_helper(E_Border *bd, int *x, int *y)
-{
- Eina_List *skiplist;
-
- if ((e_config->window_placement_policy != E_WINDOW_PLACEMENT_SMART) &&
- (e_config->window_placement_policy != E_WINDOW_PLACEMENT_ANTIGADGET))
- return;
- skiplist = eina_list_append(NULL, bd);
- if (bd->desk)
- e_place_desk_region_smart(bd->desk, skiplist,
- bd->x, bd->y, bd->w, bd->h,
- x, y);
- else
- e_place_zone_region_smart(bd->zone, skiplist,
- bd->x, bd->y, bd->w, bd->h,
- x, y);
- eina_list_free(skiplist);
-}
-
static Eina_Bool
_e_border_cb_window_configure_request(void *data __UNUSED__,
int ev_type __UNUSED__,
@@ -5224,7 +5204,6 @@ _e_border_cb_window_configure_request(void *data
__UNUSED__,
y = e->y;
if (y - bd->client_inset.t >= zy) y -= bd->client_inset.t;
}
-_e_border_xy_place_helper(bd, &x, &y);
if ((e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W) ||
(e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H))
{
@@ -5370,15 +5349,12 @@ _e_border_cb_window_configure_request(void *data
__UNUSED__,
}
}
e_border_resize(bd, w, h);
-
- if (e_config->geometry_auto_move == 1)
- {
-int new_x = bd->x, new_y = bd->y;
-_e_border_xy_place_helper(bd, &new_x, &new_y);
-e_border_move(bd, new_x, new_y);
- }
}
}
+/* note: we USED to forcibly apply a window placement policy here
+ * this is WRONG. the geometry_auto_move option is ONLY for
+ * new clients, in which case we will autocorrect the positioning
anyway.
+ */
}
}
if (!bd->lock_client_stacking)
--
[EGIT] [core/enlightenment] master 02/03: ignore netwm activate messages during startup to avoid annoying desk flips
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f5aa2779b1ad787c0388db4d3117e3f5f31ea677 commit f5aa2779b1ad787c0388db4d3117e3f5f31ea677 Author: discomfitor Date: Thu Sep 26 18:42:40 2013 +0100 ignore netwm activate messages during startup to avoid annoying desk flips --- src/bin/e_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c index d8a762a..7dca2be 100644 --- a/src/bin/e_manager.c +++ b/src/bin/e_manager.c @@ -832,7 +832,7 @@ _e_manager_cb_client_message(void *data __UNUSED__, int ev_type __UNUSED__, void break; default: -if (!bd->focused) e_border_activate(bd, EINA_TRUE); +if ((!starting) && (!bd->focused)) e_border_activate(bd, EINA_TRUE); else e_border_raise(bd); } --
[EGIT] [core/enlightenment] master 01/01: rrrrr use right client inset offsets for calculating ConfigureRequests
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=041b148631f8e55c6cc39bbbc10232d9ba7eb35f
commit 041b148631f8e55c6cc39bbbc10232d9ba7eb35f
Author: discomfitor
Date: Fri Sep 20 22:21:28 2013 +0100
r use right client inset offsets for calculating ConfigureRequests
T288
---
src/bin/e_border.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index b97361c..eaa512e 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -5191,9 +5191,9 @@ _e_border_cb_window_configure_request(void *data
__UNUSED__,
x = bd->x;
y = bd->y;
if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X)
- x = e->x - e_border_inset_width_get(bd);
+ x = e->x - bd->client_inset.l;
if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y)
- y = e->y - e_border_inset_height_get(bd);
+ y = e->y - bd->client_inset.t;
if ((e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W) ||
(e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H))
{
--
[EGIT] [core/enlightenment] master 02/02: reorder some backlight setting to make instant changes actually instant
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=648a748cac959d03ef67344fb5b12af59d8db535
commit 648a748cac959d03ef67344fb5b12af59d8db535
Author: discomfitor
Date: Fri Sep 20 17:18:36 2013 +0100
reorder some backlight setting to make instant changes actually instant
backlight fading on logout is no longer permanent
---
src/bin/e_backlight.c | 20
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/bin/e_backlight.c b/src/bin/e_backlight.c
index b9c1b23..4dfb894 100644
--- a/src/bin/e_backlight.c
+++ b/src/bin/e_backlight.c
@@ -211,26 +211,22 @@ e_backlight_level_set(E_Zone *zone, double val, double
tim)
val = 1.0;
if ((val == bl_val) && (!bl_anim)) return;
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
+ ecore_event_add(E_EVENT_BACKLIGHT_CHANGE, NULL, NULL, NULL);
bl_now = bl_val;
bl_val = val;
+ if (fabs(tim) < DBL_EPSILON)
+ {
+_e_backlight_set(zone, val);
+return;
+ }
// if (e_config->backlight.mode != E_BACKLIGHT_MODE_NORMAL) return;
if (e_config->backlight.mode == E_BACKLIGHT_MODE_NORMAL)
tim = 0.5;
else
if (tim < 0.0)
tim = e_config->backlight.transition;
- ecore_event_add(E_EVENT_BACKLIGHT_CHANGE, NULL, NULL, NULL);
- if (tim == 0.0)
- {
-if (bl_anim)
- {
- ecore_animator_del(bl_anim);
- bl_anim = NULL;
- }
-_e_backlight_set(zone, val);
-return;
- }
- if (bl_anim) ecore_animator_del(bl_anim);
+
+ E_FREE_FUNC(bl_anim, ecore_animator_del);
bl_anim = ecore_animator_timeline_add(tim, _bl_anim, zone);
bl_animval = bl_now;
}
--
[EGIT] [core/enlightenment] master 01/01: don't fade backlight instantly at all times
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=e23879f08f0c59c06f79555fc2110af9dc880f40
commit e23879f08f0c59c06f79555fc2110af9dc880f40
Author: discomfitor
Date: Fri Sep 20 17:52:39 2013 +0100
don't fade backlight instantly at all times
---
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 87ad15b..d1f2898 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -3490,7 +3490,7 @@ _e_comp_screens_eval(E_Comp *c)
{
if (e_backlight_mode_get(cz->zone) !=
E_BACKLIGHT_MODE_NORMAL)
e_backlight_mode_set(cz->zone, E_BACKLIGHT_MODE_NORMAL);
- e_backlight_level_set(cz->zone, e_config->backlight.normal,
0.0);
+ e_backlight_level_set(cz->zone, e_config->backlight.normal,
-1.0);
}
}
if (cz->zone) cz->zone->comp_zone = NULL;
--
[EGIT] [core/enlightenment] master 01/01: factor in client_inset when calculating ConfigureRequest xy coords
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=2e1864879da7dfe910c45fc1346f1349a0d11358
commit 2e1864879da7dfe910c45fc1346f1349a0d11358
Author: discomfitor
Date: Fri Sep 20 17:02:25 2013 +0100
factor in client_inset when calculating ConfigureRequest xy coords
T288
---
src/bin/e_border.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index 30cf4d9..b97361c 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -5191,9 +5191,9 @@ _e_border_cb_window_configure_request(void *data
__UNUSED__,
x = bd->x;
y = bd->y;
if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_X)
- x = e->x;
+ x = e->x - e_border_inset_width_get(bd);
if (e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_Y)
- y = e->y;
+ y = e->y - e_border_inset_height_get(bd);
if ((e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_W) ||
(e->value_mask & ECORE_X_WINDOW_CONFIGURE_MASK_H))
{
--
[EGIT] [core/enlightenment] master 01/02: move backlight shutdown after comp shutdown since we do backlight fading in comp
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=4697be012d82e784bf26f0544bf7a6b577d59f83
commit 4697be012d82e784bf26f0544bf7a6b577d59f83
Author: discomfitor
Date: Fri Sep 20 17:17:49 2013 +0100
move backlight shutdown after comp shutdown since we do backlight fading in
comp
---
src/bin/e_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index b8a91f5..f1aa38b 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -726,7 +726,6 @@ main(int argc, char **argv)
_e_main_shutdown(-1);
}
TS("E_Backlight Init Done");
- _e_main_shutdown_push(e_backlight_shutdown);
if (e_config->show_splash)
e_init_status_set(_("Setup Screensaver"));
@@ -1762,6 +1761,7 @@ _e_main_screens_shutdown(void)
e_focus_shutdown();
e_exehist_shutdown();
e_menu_shutdown();
+ e_backlight_shutdown();
// ecore_evas closes evas - deletes objs - deletes fm widgets which tries to
// ipc to slave to stop monitoring - but ipc has been shut down. dont shut
// down.
--
[EGIT] [core/enlightenment] master 01/01: fix always-on focus glow for default/fast comp group
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=8e62acdd59be76afd1c28820d933e74e57be9af4
commit 8e62acdd59be76afd1c28820d933e74e57be9af4
Author: discomfitor
Date: Fri Sep 20 17:39:01 2013 +0100
fix always-on focus glow for default/fast comp group
---
data/themes/edc/comp.edc | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/data/themes/edc/comp.edc b/data/themes/edc/comp.edc
index 3c4c7f6..8b60d67 100644
--- a/data/themes/edc/comp.edc
+++ b/data/themes/edc/comp.edc
@@ -540,15 +540,17 @@ group { name: "e/comp/border/default/fast";
}
program {
name: "focus_on";
+ signal: "e,state,focus,on"; source: "e";
+ action: STATE_SET "focused" 0.0;
transition: SINUSOIDAL 0.1;
target: "glow";
+ target: "focus-clipper";
after: "focus2";
}
- program {
- name: "focus_on2";
- signal: "e,state,focus,on"; source: "e";
- action: STATE_SET "focused" 0.0;
- target: "focus-clipper";
+ program { name: "focus2";
+ action: STATE_SET "default" 0.0;
+ transition: SINUSOIDAL 0.1;
+ target: "glow";
}
program {
name: "focus_off";
--
[EGIT] [core/enlightenment] enlightenment-0.17 01/02: add changelog from previous commit
discomfitor pushed a commit to branch enlightenment-0.17. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b8f50a95f73f06aa11d809a0bddb8647bf23b698 commit b8f50a95f73f06aa11d809a0bddb8647bf23b698 Author: discomfitor Date: Fri Sep 20 15:59:42 2013 +0100 add changelog from previous commit --- ChangeLog | 4 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 8a255af..8cbee4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-09-19 Mike Blumenkrantz + +* Fix bug where new files could not be created repeatedly + 2013-08-02 Deon Thomas (PrinceAMD) * fixed stall on startup because xinerama started before randr (backports). --
[EGIT] [core/enlightenment] enlightenment-0.17 02/02: bugfix: check mouse location when clicking menu items, only activate menu if mouse is inside menu when clicking
discomfitor pushed a commit to branch enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=77b2c5a7f4d13bc9b6811f81e85b0c7af32d722f
commit 77b2c5a7f4d13bc9b6811f81e85b0c7af32d722f
Author: discomfitor
Date: Fri Sep 20 16:00:27 2013 +0100
bugfix: check mouse location when clicking menu items, only activate menu
if mouse is inside menu when clicking
T164
---
ChangeLog| 4
src/bin/e_menu.c | 11 ++-
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 8cbee4a..a0a9571 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-20 Mike Blumenkrantz
+
+* Check mouse location when clicking menus, only activate items when
clicking in the menu
+
2013-09-19 Mike Blumenkrantz
* Fix bug where new files could not be created repeatedly
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index acae3a3..3556bed 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -2969,7 +2969,16 @@ _e_menu_cb_mouse_up(void *data __UNUSED__, int type
__UNUSED__, void *event)
*/
}
else
- ret = _e_menu_active_call();
+ {
+E_Menu *m = _e_menu_active_get();
+
+if (m && E_INSIDE(ev->root.x, ev->root.y,
+ m->zone->x + m->cur.x,
+ m->zone->y + m->cur.y,
+ m->zone->x + m->cur.x + m->cur.w,
+ m->zone->y + m->cur.y + m->cur.h))
+ ret = _e_menu_active_call();
+ }
_e_menu_activate_maybe_drag = 0;
_e_menu_activate_dragging = 0;
if (ret == 1)
--
[EGIT] [core/enlightenment] master 01/01: force autoscroll on ibar when allowing random apps to dock
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=3694ec8a4ca65325de2ffec3270aed4a5df44151 commit 3694ec8a4ca65325de2ffec3270aed4a5df44151 Author: discomfitor Date: Fri Sep 20 15:35:01 2013 +0100 force autoscroll on ibar when allowing random apps to dock T379 --- src/modules/ibar/e_mod_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index 526d75b..95cc406 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -223,6 +223,7 @@ _gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style) b = _ibar_new(gc->evas, inst); gcc = e_gadcon_client_new(gc, name, id, style, b->o_outerbox); e_gadcon_client_min_size_set(gcc, 16, 16); + e_gadcon_client_autoscroll_toggle_disabled_set(gcc, !ci->dont_add_nonorder); gcc->data = inst; inst->gcc = gcc; --
[EGIT] [core/enlightenment] master 01/01: when clicking an ibar icon for a non-order icon that has only one window, activate the window
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=f7e8dee23c1d3ad50f604ff0039dfd1631f66030
commit f7e8dee23c1d3ad50f604ff0039dfd1631f66030
Author: discomfitor
Date: Fri Sep 20 15:08:06 2013 +0100
when clicking an ibar icon for a non-order icon that has only one window,
activate the window
T375
---
src/modules/ibar/e_mod_main.c | 21 -
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 8424fbb..526d75b 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -1393,7 +1393,26 @@ _ibar_icon_go(IBar_Icon *ic, Eina_Bool keep_going)
{
if (ic->not_in_order)
{
-ecore_job_add((Ecore_Cb)_ibar_cb_icon_menu_cb, ic);
+Eina_List *l, *ll;
+E_Exec_Instance *exe;
+E_Border *bd, *bdlast = NULL;
+unsigned int count = 0;
+
+EINA_LIST_FOREACH(ic->exes, l, exe)
+ {
+ EINA_LIST_FOREACH(exe->borders, ll, bd)
+ {
+ count++;
+ if (count > 1)
+{
+ ecore_job_add((Ecore_Cb)_ibar_cb_icon_menu_cb, ic);
+ return;
+}
+ bdlast = bd;
+ }
+ }
+if (bdlast)
+ e_border_activate(bdlast, 1);
return;
}
if (ic->app->type == EFREET_DESKTOP_TYPE_APPLICATION)
--
[EGIT] [core/enlightenment] enlightenment-0.17 01/01: bugfix: efm now allows repeated creation of new files from menus
tasn pushed a commit to branch enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5c809b6f98d330899d8f468fcafd56a96b950135
commit 5c809b6f98d330899d8f468fcafd56a96b950135
Author: discomfitor
Date: Thu Sep 19 16:29:55 2013 +0100
bugfix: efm now allows repeated creation of new files from menus
---
src/bin/e_fm.c | 41 +
1 file changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 329bb9e..15732f9 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -83,6 +83,7 @@ struct _E_Fm2_Smart_Data
{
Ecore_Thread *thread;
const char *filename;
+ Eina_Bool done : 1;
} new_file;
E_Fm2_Icon *last_selected;
@@ -4867,6 +4868,19 @@ _e_fm2_icon_realize(E_Fm2_Icon *ic)
if (ic->info.removable)
_e_fm2_icon_removable_update(ic);
+ if (ic->sd->new_file.thread && (!ic->sd->new_file.filename))
+ {
+/* we got the file through the scanner :/ */
+const char *file =
ecore_thread_global_data_find("efm_pending_filename");
+
+if (!e_util_strcmp(ic->info.file, file))
+ {
+ _e_fm2_file_rename(ic, NULL, NULL);
+ ic->sd->new_file.done = 1;
+ }
+if (file)
+ ecore_thread_global_data_del("efm_pending_filename");
+ }
if (ic->sd->new_file.filename)
{
if (ic->info.file == ic->sd->new_file.filename)
@@ -9500,10 +9514,13 @@ _e_fm2_new_dir_notify(void *data, Ecore_Thread *eth
__UNUSED__, char *filename)
{
E_Fm2_Smart_Data *sd = data;
- if (filename)
- sd->new_file.filename =
eina_stringshare_add(ecore_file_file_get(filename));
- else
- e_util_dialog_internal(_("Error"), _("Could not create a directory!"));
+ if (!sd->new_file.done)
+ {
+if (filename)
+ sd->new_file.filename =
eina_stringshare_add(ecore_file_file_get(filename));
+else
+ e_util_dialog_internal(_("Error"), _("Could not create a
directory!"));
+ }
free(filename);
}
@@ -9512,10 +9529,13 @@ _e_fm2_new_file_notify(void *data, Ecore_Thread *eth
__UNUSED__, char *filename)
{
E_Fm2_Smart_Data *sd = data;
- if (filename)
- sd->new_file.filename =
eina_stringshare_add(ecore_file_file_get(filename));
- else
- e_util_dialog_internal(_("Error"), _("Could not create a file!"));
+ if (!sd->new_file.done)
+ {
+if (filename)
+ sd->new_file.filename =
eina_stringshare_add(ecore_file_file_get(filename));
+else
+ e_util_dialog_internal(_("Error"), _("Could not create a file!"));
+ }
free(filename);
}
@@ -9535,6 +9555,7 @@ _e_fm2_new_thread_helper(Ecore_Thread *eth, Eina_Bool dir)
{
if (dir && ecore_file_mkdir(buf))
{
+ ecore_thread_global_data_set("efm_pending_filename", strdup(buf),
free);
ecore_thread_feedback(eth, strdup(buf));
return;
}
@@ -9544,6 +9565,7 @@ _e_fm2_new_thread_helper(Ecore_Thread *eth, Eina_Bool dir)
if (fd)
{
close(fd);
+ ecore_thread_global_data_set("efm_pending_filename",
strdup(buf), free);
ecore_thread_feedback(eth, strdup(buf));
return;
}
@@ -9560,6 +9582,8 @@ _e_fm2_new_thread_helper(Ecore_Thread *eth, Eina_Bool dir)
{
if (dir && ecore_file_mkdir(buf))
{
+
+ ecore_thread_global_data_set("efm_pending_filename",
strdup(buf), free);
ecore_thread_feedback(eth, strdup(buf));
return;
}
@@ -9569,6 +9593,7 @@ _e_fm2_new_thread_helper(Ecore_Thread *eth, Eina_Bool dir)
if (fd)
{
close(fd);
+ ecore_thread_global_data_set("efm_pending_filename",
strdup(buf), free);
ecore_thread_feedback(eth, strdup(buf));
return;
}
--
[EGIT] [core/enlightenment] master 01/01: don't show comp win animation during a forced hide
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=bb1f5f9fdb1556e22855bcc8cfeedc75aa116085
commit bb1f5f9fdb1556e22855bcc8cfeedc75aa116085
Author: discomfitor
Date: Thu Sep 19 22:16:18 2013 +0100
don't show comp win animation during a forced hide
fixes unwanted fade in when desk flip animations are disabled
---
src/bin/e_comp.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index c4a3ffd..87ad15b 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -2736,9 +2736,10 @@ _e_comp_win_hide(E_Comp_Win *cw)
return;
}
cw->defer_hide = 0;
- cw->force = 0;
_e_comp_child_hide(cw);
- edje_object_signal_emit(cw->shobj, "e,state,visible,off", "e");
+ if (!cw->force)
+ edje_object_signal_emit(cw->shobj, "e,state,visible,off", "e");
+ cw->force = 0;
if (cw->update_timeout)
{
--
[EGIT] [core/enlightenment] origin/enlightenment-0.17 02/02: Revert "s/edbus/eldbus/g"
discomfitor pushed a commit to branch origin/enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=30a622e720f88359c41065b648d81778f4769efc
commit 30a622e720f88359c41065b648d81778f4769efc
Author: discomfitor
Date: Thu Sep 19 19:51:33 2013 +0100
Revert "s/edbus/eldbus/g"
This reverts commit 173918dfb579bdd339d436fc816bfac973031a3d.
---
configure.ac | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index c262240..5153e32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -347,7 +347,7 @@ test "x${device_backend}" = "xeeze" ||
AC_DEFINE_UNQUOTED([HAVE_HAL],[1],[enable
DBUS_MOUNT_CONFIG=1
dbus_mount="dbus-1"
-hal_mount="ehal >= $efl_version, eldbus >= $efl_version"
+hal_mount="ehal >= $efl_version, edbus >= $efl_version"
udisks_mount="eukit >= $efl_version"
AC_ARG_ENABLE([mount-hal],
AS_HELP_STRING([--enable-mount-hal],[enable hal mounting support
@<:@default=enabled@:>@]),
@@ -485,7 +485,7 @@ ecore-file >= $efl_version \
ecore-ipc >= $efl_version \
eet >= $efl_version \
efreet >= $efl_version \
-eldbus >= $efl_version \
+edbus >= $efl_version \
eina >= $efl_version"
efm_requires="$efm_requires $eeze_mount $dbus_mount $hal_mount $udisks_mount"
@@ -497,7 +497,7 @@ PKG_CHECK_MODULES(E_FM_CMDLINE, [
eina >= ${efl_version}
ecore >= ${efl_version}
ecore-file >= ${efl_version}
- eldbus >= ${efl_version}
+ edbus >= ${efl_version}
dbus-1
])
@@ -555,7 +555,7 @@ PKG_CHECK_MODULES(E, [
efreet-trash >= ${efl_version}
eina >= ${efl_version}
dbus-1
- eldbus >= ${efl_version}
+ edbus >= ${efl_version}
eio >= ${efl_version}
$hal_mount
$eeze_mount
@@ -577,7 +577,7 @@ efreet-mime >= ${efl_version} \
efreet-trash >= ${efl_version} \
eina >= ${efl_version} \
dbus-1 \
-eldbus >= ${efl_version} \
+edbus >= ${efl_version} \
eio >= ${efl_version} \
$hal_mount \
$udisks_mount \
@@ -729,7 +729,7 @@ AC_ARG_ENABLE([enotify],
AC_CACHE_VAL([e_cv_want_enotify], [e_cv_want_enotify=yes])
)
if test "x$e_cv_want_enotify" != "xno" ; then
- AC_E_CHECK_PKG(ENOTIFY, [ eldbus >= $efl_version enotify >= $efl_version ],
+ AC_E_CHECK_PKG(ENOTIFY, [ edbus >= $efl_version enotify >= $efl_version ],
[
AC_DEFINE_UNQUOTED([HAVE_ENOTIFY], [1], [enable enotify])
],
@@ -815,7 +815,7 @@ AM_CONDITIONAL(HAVE_ECONNMAN, false)
AM_CONDITIONAL(HAVE_DUMMY, false)
define([CHECK_MODULE_CONNMAN],
[
- AC_E_CHECK_PKG(ECONNMAN, [ eldbus >= $efl_version ], [], [CONNMAN=false])
+ AC_E_CHECK_PKG(ECONNMAN, [ edbus >= $efl_version ], [], [CONNMAN=false])
dnl AC_E_CHECK_PKG(DUMMY, [ connman >= 1.0 ], [], [CONNMAN=false])
])
AC_SUBST(ECONNMAN_CFLAGS)
--
[EGIT] [core/enlightenment] master 02/06: improvement: clicking filemanager during rename cancels rename
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=9aea17a978b9e63ab5755a4323e431c2a0fb0aa6
commit 9aea17a978b9e63ab5755a4323e431c2a0fb0aa6
Author: discomfitor
Date: Thu Sep 19 16:54:24 2013 +0100
improvement: clicking filemanager during rename cancels rename
---
ChangeLog | 1 +
NEWS | 1 +
src/bin/e_fm.c | 2 ++
3 files changed, 4 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index f5f6c90..8343a48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2013-09-19 Mike Blumenkrantz
* Fix bug where new files could not be created repeatedly
+* Clicking in the filemanager when renaming cancels the rename
2013-08-30 Mike Blumenkrantz
diff --git a/NEWS b/NEWS
index 0a26fe4..a2606a1 100644
--- a/NEWS
+++ b/NEWS
@@ -149,6 +149,7 @@ Improvements:
* added check changed to shelf config dialog
* udisks2 support
* Navigate menu item now opens $HOME
+* Clicking in the filemanager when renaming cancels the rename
Fixes:
* IBar menu didn't allow to configure different icon sources, show
contents menu even on empty IBar.
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 8544402..2a2c2db 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -8041,6 +8041,8 @@ _e_fm2_cb_mouse_down(void *data, Evas *e __UNUSED__,
Evas_Object *obj __UNUSED__
sd = data;
ev = event_info;
_e_fm2_typebuf_hide(sd->obj);
+ if (sd->iop_icon)
+ _e_fm2_icon_entry_widget_del(sd->iop_icon);
if (ev->button == 1)
{
Eina_List *l;
--
[EGIT] [core/enlightenment] master 01/06: bugfix: efm now allows repeated creation of new files from menus
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=3fb3b3520b0b0070d22196f2800962e89c457c97
commit 3fb3b3520b0b0070d22196f2800962e89c457c97
Author: discomfitor
Date: Thu Sep 19 16:29:55 2013 +0100
bugfix: efm now allows repeated creation of new files from menus
---
ChangeLog | 4
NEWS | 1 +
src/bin/e_fm.c | 40
3 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 96b2025..f5f6c90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-09-19 Mike Blumenkrantz
+
+* Fix bug where new files could not be created repeatedly
+
2013-08-30 Mike Blumenkrantz
* Navigate menu item now opens $HOME
diff --git a/NEWS b/NEWS
index 7dd6639..0a26fe4 100644
--- a/NEWS
+++ b/NEWS
@@ -229,3 +229,4 @@ Fixes:
* fixed crash when multiple windows shared a remember
* fixed bug where double clicking filemanager windows would not correctly
autosize
* fixed bug where setting min size on a gadget would not be passed to
desktop gadgets
+* fixed bug where new files could not be created repeatedly
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 67bce15..8544402 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -84,6 +84,7 @@ struct _E_Fm2_Smart_Data
{
Ecore_Thread *thread;
const char *filename;
+ Eina_Bool done : 1;
} new_file;
E_Fm2_Icon *last_selected;
@@ -4892,6 +4893,19 @@ _e_fm2_icon_realize(E_Fm2_Icon *ic)
if (ic->info.removable)
_e_fm2_icon_removable_update(ic);
+ if (ic->sd->new_file.thread && (!ic->sd->new_file.filename))
+ {
+/* we got the file through the scanner :/ */
+const char *file =
ecore_thread_global_data_find("efm_pending_filename");
+
+if (!e_util_strcmp(ic->info.file, file))
+ {
+ _e_fm2_file_rename(ic, NULL, NULL);
+ ic->sd->new_file.done = 1;
+ }
+if (file)
+ ecore_thread_global_data_del("efm_pending_filename");
+ }
if (ic->sd->new_file.filename)
{
if (ic->info.file == ic->sd->new_file.filename)
@@ -9658,10 +9672,13 @@ _e_fm2_new_dir_notify(void *data, Ecore_Thread *eth
__UNUSED__, char *filename)
{
E_Fm2_Smart_Data *sd = data;
- if (filename)
- sd->new_file.filename =
eina_stringshare_add(ecore_file_file_get(filename));
- else
- e_util_dialog_internal(_("Error"), _("Could not create a directory!"));
+ if (!sd->new_file.done)
+ {
+if (filename)
+ sd->new_file.filename =
eina_stringshare_add(ecore_file_file_get(filename));
+else
+ e_util_dialog_internal(_("Error"), _("Could not create a
directory!"));
+ }
free(filename);
}
@@ -9670,10 +9687,13 @@ _e_fm2_new_file_notify(void *data, Ecore_Thread *eth
__UNUSED__, char *filename)
{
E_Fm2_Smart_Data *sd = data;
- if (filename)
- sd->new_file.filename =
eina_stringshare_add(ecore_file_file_get(filename));
- else
- e_util_dialog_internal(_("Error"), _("Could not create a file!"));
+ if (!sd->new_file.done)
+ {
+if (filename)
+ sd->new_file.filename =
eina_stringshare_add(ecore_file_file_get(filename));
+else
+ e_util_dialog_internal(_("Error"), _("Could not create a file!"));
+ }
free(filename);
}
@@ -9696,6 +9716,7 @@ _e_fm2_new_thread_helper(Ecore_Thread *eth, Eina_Bool dir)
{
if (ecore_file_mkdir(buf))
{
+ ecore_thread_global_data_set("efm_pending_filename",
strdup(buf), free);
ecore_thread_feedback(eth, strdup(buf));
return;
}
@@ -9714,6 +9735,7 @@ _e_fm2_new_thread_helper(Ecore_Thread *eth, Eina_Bool dir)
perror("write");
}
close(fd);
+ ecore_thread_global_data_set("efm_pending_filename",
strdup(buf), free);
ecore_thread_feedback(eth, strdup(buf));
return;
}
@@ -9732,6 +9754,7 @@ _e_fm2_new_thread_helper(Ecore_Thread *eth, Eina_Bool dir)
{
if (ecore_file_mkdir(buf))
{
+ ecore_thread_global_data_set("efm_pending_filename",
strdup(buf), free);
ecore_thread_feedback(eth, strdup(buf));
return;
}
@@ -9750,6 +9773,7 @@ _e_fm2_new_thread_helper(Ecore_Thread *eth, Eina_Bool dir)
perror("write");
}
close(fd);
+ ecore_thread_global_data_set("efm_pending_filename",
strdup(buf), free);
ecore_thread_feedback(eth, strdup(buf));
return;
}
--
[EGIT] [core/enlightenment] master 03/06: block ibar client adds for .desktops without icons
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b75f10b68b5344f13239caf7dfadbe19d24c3860 commit b75f10b68b5344f13239caf7dfadbe19d24c3860 Author: discomfitor Date: Thu Sep 19 17:26:13 2013 +0100 block ibar client adds for .desktops without icons T388 probably --- src/modules/ibar/e_mod_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c index cd6a4d8..8424fbb 100644 --- a/src/modules/ibar/e_mod_main.c +++ b/src/modules/ibar/e_mod_main.c @@ -2290,6 +2290,7 @@ _ibar_cb_exec_new_client(void *d EINA_UNUSED, int t EINA_UNUSED, E_Exec_Instance Eina_Bool skip; if (!exe->desktop) return ECORE_CALLBACK_RENEW; //can't do anything here :( + if (!exe->desktop->icon) return ECORE_CALLBACK_RENEW; bd = eina_list_last_data_get(exe->borders); //only care about last (new) one skip = bd->client.netwm.state.skip_taskbar; EINA_LIST_FOREACH(ibars, l, b) @@ -2325,6 +2326,7 @@ _ibar_cb_exec_new(void *d EINA_UNUSED, int t EINA_UNUSED, E_Exec_Instance *exe) Eina_Bool skip = EINA_TRUE; if (!exe->desktop) return ECORE_CALLBACK_RENEW; //can't do anything here :( + if (!exe->desktop->icon) return ECORE_CALLBACK_RENEW; EINA_LIST_FOREACH(exe->borders, l, bd) if (!bd->client.netwm.state.skip_taskbar) skip = EINA_FALSE; --
[EGIT] [core/enlightenment] master 05/06: block signal binds on deleted borders
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a59b134e49461fa65a111890ac7248e5da81f4c0 commit a59b134e49461fa65a111890ac7248e5da81f4c0 Author: discomfitor Date: Thu Sep 19 19:47:42 2013 +0100 block signal binds on deleted borders probably fixes pointer getting stuck on move/resize from internal windows --- src/bin/e_border.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/e_border.c b/src/bin/e_border.c index 8a082fe..30cf4d9 100644 --- a/src/bin/e_border.c +++ b/src/bin/e_border.c @@ -6365,7 +6365,7 @@ _e_border_cb_signal_bind(void *data, E_Border *bd; bd = data; - if (e_dnd_active()) return; + if (e_dnd_active() || e_object_is_del(E_OBJECT(bd))) return; e_bindings_signal_handle(E_BINDING_CONTEXT_WINDOW, E_OBJECT(bd), emission, source); } --
[EGIT] [core/enlightenment] master 06/06: unused warn--
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=373c32a83f8c0caaefad5bcb045eea57bef8706a
commit 373c32a83f8c0caaefad5bcb045eea57bef8706a
Author: discomfitor
Date: Thu Sep 19 20:09:15 2013 +0100
unused warn--
---
src/bin/e_manager.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c
index b561279..d8a762a 100644
--- a/src/bin/e_manager.c
+++ b/src/bin/e_manager.c
@@ -527,7 +527,7 @@ _e_manager_free(E_Manager *man)
}
static Eina_Bool
-_e_manager_cb_window_show_request(void *data, int ev_type __UNUSED__, void *ev)
+_e_manager_cb_window_show_request(void *data EINA_UNUSED, int ev_type
__UNUSED__, void *ev)
{
E_Manager *man;
Ecore_X_Event_Window_Show_Request *e;
--
[EGIT] [core/enlightenment] master 04/06: make button focus effect slightly more muted
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=d297f09585a241b42ee65621d1e3a2bb046c7a0e
commit d297f09585a241b42ee65621d1e3a2bb046c7a0e
Author: discomfitor
Date: Thu Sep 19 17:38:22 2013 +0100
make button focus effect slightly more muted
---
data/themes/edc/button.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/themes/edc/button.edc b/data/themes/edc/button.edc
index 5933892..662451c 100644
--- a/data/themes/edc/button.edc
+++ b/data/themes/edc/button.edc
@@ -140,7 +140,7 @@
}
description { state: "focused" 0.0;
inherit: "default" 0.0;
-color: 255 255 255 255;
+color: 255 255 255 150;
visible: 1;
}
}
--
[EGIT] [core/enlightenment] origin/enlightenment-0.17 01/02: bugfix: efm now allows repeated creation of new files from menus
discomfitor pushed a commit to branch origin/enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=7c1bad8acd68a0e981090c289435e5a6ff3f4c42
commit 7c1bad8acd68a0e981090c289435e5a6ff3f4c42
Author: discomfitor
Date: Thu Sep 19 16:29:55 2013 +0100
bugfix: efm now allows repeated creation of new files from menus
---
src/bin/e_fm.c | 41 +
1 file changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 329bb9e..15732f9 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -83,6 +83,7 @@ struct _E_Fm2_Smart_Data
{
Ecore_Thread *thread;
const char *filename;
+ Eina_Bool done : 1;
} new_file;
E_Fm2_Icon *last_selected;
@@ -4867,6 +4868,19 @@ _e_fm2_icon_realize(E_Fm2_Icon *ic)
if (ic->info.removable)
_e_fm2_icon_removable_update(ic);
+ if (ic->sd->new_file.thread && (!ic->sd->new_file.filename))
+ {
+/* we got the file through the scanner :/ */
+const char *file =
ecore_thread_global_data_find("efm_pending_filename");
+
+if (!e_util_strcmp(ic->info.file, file))
+ {
+ _e_fm2_file_rename(ic, NULL, NULL);
+ ic->sd->new_file.done = 1;
+ }
+if (file)
+ ecore_thread_global_data_del("efm_pending_filename");
+ }
if (ic->sd->new_file.filename)
{
if (ic->info.file == ic->sd->new_file.filename)
@@ -9500,10 +9514,13 @@ _e_fm2_new_dir_notify(void *data, Ecore_Thread *eth
__UNUSED__, char *filename)
{
E_Fm2_Smart_Data *sd = data;
- if (filename)
- sd->new_file.filename =
eina_stringshare_add(ecore_file_file_get(filename));
- else
- e_util_dialog_internal(_("Error"), _("Could not create a directory!"));
+ if (!sd->new_file.done)
+ {
+if (filename)
+ sd->new_file.filename =
eina_stringshare_add(ecore_file_file_get(filename));
+else
+ e_util_dialog_internal(_("Error"), _("Could not create a
directory!"));
+ }
free(filename);
}
@@ -9512,10 +9529,13 @@ _e_fm2_new_file_notify(void *data, Ecore_Thread *eth
__UNUSED__, char *filename)
{
E_Fm2_Smart_Data *sd = data;
- if (filename)
- sd->new_file.filename =
eina_stringshare_add(ecore_file_file_get(filename));
- else
- e_util_dialog_internal(_("Error"), _("Could not create a file!"));
+ if (!sd->new_file.done)
+ {
+if (filename)
+ sd->new_file.filename =
eina_stringshare_add(ecore_file_file_get(filename));
+else
+ e_util_dialog_internal(_("Error"), _("Could not create a file!"));
+ }
free(filename);
}
@@ -9535,6 +9555,7 @@ _e_fm2_new_thread_helper(Ecore_Thread *eth, Eina_Bool dir)
{
if (dir && ecore_file_mkdir(buf))
{
+ ecore_thread_global_data_set("efm_pending_filename", strdup(buf),
free);
ecore_thread_feedback(eth, strdup(buf));
return;
}
@@ -9544,6 +9565,7 @@ _e_fm2_new_thread_helper(Ecore_Thread *eth, Eina_Bool dir)
if (fd)
{
close(fd);
+ ecore_thread_global_data_set("efm_pending_filename",
strdup(buf), free);
ecore_thread_feedback(eth, strdup(buf));
return;
}
@@ -9560,6 +9582,8 @@ _e_fm2_new_thread_helper(Ecore_Thread *eth, Eina_Bool dir)
{
if (dir && ecore_file_mkdir(buf))
{
+
+ ecore_thread_global_data_set("efm_pending_filename",
strdup(buf), free);
ecore_thread_feedback(eth, strdup(buf));
return;
}
@@ -9569,6 +9593,7 @@ _e_fm2_new_thread_helper(Ecore_Thread *eth, Eina_Bool dir)
if (fd)
{
close(fd);
+ ecore_thread_global_data_set("efm_pending_filename",
strdup(buf), free);
ecore_thread_feedback(eth, strdup(buf));
return;
}
--
[EGIT] [core/enlightenment] origin/enlightenment-0.17 01/01: s/edbus/eldbus/g
discomfitor pushed a commit to branch origin/enlightenment-0.17.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=173918dfb579bdd339d436fc816bfac973031a3d
commit 173918dfb579bdd339d436fc816bfac973031a3d
Author: discomfitor
Date: Thu Sep 19 16:35:20 2013 +0100
s/edbus/eldbus/g
edbus no longer exists
---
configure.ac | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5153e32..c262240 100644
--- a/configure.ac
+++ b/configure.ac
@@ -347,7 +347,7 @@ test "x${device_backend}" = "xeeze" ||
AC_DEFINE_UNQUOTED([HAVE_HAL],[1],[enable
DBUS_MOUNT_CONFIG=1
dbus_mount="dbus-1"
-hal_mount="ehal >= $efl_version, edbus >= $efl_version"
+hal_mount="ehal >= $efl_version, eldbus >= $efl_version"
udisks_mount="eukit >= $efl_version"
AC_ARG_ENABLE([mount-hal],
AS_HELP_STRING([--enable-mount-hal],[enable hal mounting support
@<:@default=enabled@:>@]),
@@ -485,7 +485,7 @@ ecore-file >= $efl_version \
ecore-ipc >= $efl_version \
eet >= $efl_version \
efreet >= $efl_version \
-edbus >= $efl_version \
+eldbus >= $efl_version \
eina >= $efl_version"
efm_requires="$efm_requires $eeze_mount $dbus_mount $hal_mount $udisks_mount"
@@ -497,7 +497,7 @@ PKG_CHECK_MODULES(E_FM_CMDLINE, [
eina >= ${efl_version}
ecore >= ${efl_version}
ecore-file >= ${efl_version}
- edbus >= ${efl_version}
+ eldbus >= ${efl_version}
dbus-1
])
@@ -555,7 +555,7 @@ PKG_CHECK_MODULES(E, [
efreet-trash >= ${efl_version}
eina >= ${efl_version}
dbus-1
- edbus >= ${efl_version}
+ eldbus >= ${efl_version}
eio >= ${efl_version}
$hal_mount
$eeze_mount
@@ -577,7 +577,7 @@ efreet-mime >= ${efl_version} \
efreet-trash >= ${efl_version} \
eina >= ${efl_version} \
dbus-1 \
-edbus >= ${efl_version} \
+eldbus >= ${efl_version} \
eio >= ${efl_version} \
$hal_mount \
$udisks_mount \
@@ -729,7 +729,7 @@ AC_ARG_ENABLE([enotify],
AC_CACHE_VAL([e_cv_want_enotify], [e_cv_want_enotify=yes])
)
if test "x$e_cv_want_enotify" != "xno" ; then
- AC_E_CHECK_PKG(ENOTIFY, [ edbus >= $efl_version enotify >= $efl_version ],
+ AC_E_CHECK_PKG(ENOTIFY, [ eldbus >= $efl_version enotify >= $efl_version ],
[
AC_DEFINE_UNQUOTED([HAVE_ENOTIFY], [1], [enable enotify])
],
@@ -815,7 +815,7 @@ AM_CONDITIONAL(HAVE_ECONNMAN, false)
AM_CONDITIONAL(HAVE_DUMMY, false)
define([CHECK_MODULE_CONNMAN],
[
- AC_E_CHECK_PKG(ECONNMAN, [ edbus >= $efl_version ], [], [CONNMAN=false])
+ AC_E_CHECK_PKG(ECONNMAN, [ eldbus >= $efl_version ], [], [CONNMAN=false])
dnl AC_E_CHECK_PKG(DUMMY, [ connman >= 1.0 ], [], [CONNMAN=false])
])
AC_SUBST(ECONNMAN_CFLAGS)
--
