[EGIT] [core/efl] master 01/03: ecore-wayland: Fix issue of events not getting dispatched properly
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5d487562271f494a5d870b89fed13e3415759d85 commit 5d487562271f494a5d870b89fed13e3415759d85 Author: Chris Michael cp.mich...@samsung.com Date: Tue Jun 23 11:00:07 2015 -0400 ecore-wayland: Fix issue of events not getting dispatched properly Summary: In order for wayland events to be processed properly, we should be dispatching any pending events off of the queue First before we make the call to flush. @fix Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/lib/ecore_wayland/ecore_wl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c index f5d13ed..c9764f2 100644 --- a/src/lib/ecore_wayland/ecore_wl.c +++ b/src/lib/ecore_wayland/ecore_wl.c @@ -537,14 +537,14 @@ _ecore_wl_cb_idle_enterer(void *data) ret = wl_display_get_error(ewd-wl.display); if (ret 0) goto err; + ret = wl_display_dispatch_pending(ewd-wl.display); + if (ret 0) goto err; + ret = wl_display_flush(ewd-wl.display); if ((ret 0) (errno == EAGAIN)) ecore_main_fd_handler_active_set(ewd-fd_hdl, (ECORE_FD_READ | ECORE_FD_WRITE)); - ret = wl_display_dispatch_pending(ewd-wl.display); - if (ret 0) goto err; - return ECORE_CALLBACK_RENEW; err: --
[EGIT] [core/efl] master 01/01: eolian: new doc token lexer/parser
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c26134df7a43292e2dedee26da8aa62415528657
commit c26134df7a43292e2dedee26da8aa62415528657
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Tue Jun 23 15:28:46 2015 +0100
eolian: new doc token lexer/parser
This should allow us to more easily extend the format if desired
and overall makes the doc syntax parsing more readable and simpler.
---
src/lib/eolian/eo_lexer.c | 269 +-
1 file changed, 124 insertions(+), 145 deletions(-)
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index ac59c6d..24d7080 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -252,185 +252,164 @@ cend:
if (tok) tok-value.s =
eina_stringshare_add(eina_strbuf_string_get(ls-buff));
}
-void doc_error(Eo_Lexer *ls, const char *msg, Eolian_Documentation *doc,
Eina_Strbuf *buf)
-{
- eina_stringshare_del(doc-summary);
- eina_stringshare_del(doc-description);
- free(doc);
- eina_strbuf_free(buf);
- eo_lexer_lex_error(ls, msg, -1);
-}
+enum Doc_Tokens {
+DOC_MANGLED = -2, DOC_UNFINISHED = -1, DOC_TEXT = 0, DOC_SINCE = 1
+};
-static void
-read_doc(Eo_Lexer *ls, Eo_Token *tok, int line, int column)
+static int
+doc_lex(Eo_Lexer *ls, Eina_Bool *term, Eina_Bool allow_since)
{
- Eolian_Documentation *doc = calloc(1, sizeof(Eolian_Documentation));
- doc-base.file = ls-filename;
- doc-base.line = line;
- doc-base.column = column;
-
+ Eina_Bool contdoc = EINA_FALSE;
eina_strbuf_reset(ls-buff);
-
- skip_ws(ls);
- while (is_newline(ls-current))
- next_line_ws(ls);
-
- for (;;)
+ for (;; contdoc = EINA_TRUE) switch (ls-current)
{
-if (!ls-current)
+ /* error case */
+ case '\0':
+return DOC_UNFINISHED;
+ /* newline case: if two or more newlines are present, new paragraph
+ * if only one newline is present, append space to the text buffer
+ * when starting new paragraph, reset doc continutation
+ */
+ case '\n':
+ case '\r':
+next_line(ls);
+skip_ws(ls);
+if (!is_newline(ls-current))
{
- doc_error(ls, unfinished documentation, doc, NULL);
- return; /* unreachable, for static analysis */
+ eina_strbuf_append_char(ls-buff, ' ');
+ continue;
}
-if (is_newline(ls-current))
+while (is_newline(ls-current))
+ next_line_ws(ls);
+eina_strbuf_trim(ls-buff);
+return DOC_TEXT;
+ /* escape case: for any \X, output \X
+ * except for \\]], then output just ]]
+ */
+ case '\\':
+next_char(ls);
+if (ls-current == ']')
{
- next_line_ws(ls);
- if (is_newline(ls-current))
+ next_char(ls);
+ if (ls-current == ']')
{
- while (is_newline(ls-current))
-next_line_ws(ls);
- break;
+ next_char(ls);
+ eina_strbuf_append(ls-buff, ]]);
}
else
- eina_strbuf_append_char(ls-buff, ' ');
+ eina_strbuf_append(ls-buff, \\]);
}
else
+ eina_strbuf_append_char(ls-buff, '\\');
+continue;
+ /* terminating case */
+ case ']':
+next_char(ls);
+if (ls-current == ']')
{
- if (ls-current == ']')
- {
- next_char(ls);
- if (ls-current != ']')
-eina_strbuf_append_char(ls-buff, ']');
- else
-{
- next_char(ls);
- eina_strbuf_trim(ls-buff);
- doc-summary = eina_stringshare_add(
- eina_strbuf_string_get(ls-buff));
- tok-value.doc = doc;
- return;
-}
- }
- eina_strbuf_append_char(ls-buff, ls-current);
+ /* terminate doc */
next_char(ls);
+ *term = EINA_TRUE;
+ eina_strbuf_trim(ls-buff);
+ return DOC_TEXT;
}
- }
-
- eina_strbuf_trim(ls-buff);
- doc-summary = eina_stringshare_add(eina_strbuf_string_get(ls-buff));
-
- Eina_Strbuf *rbuf = eina_strbuf_new();
- Eina_Bool had_nl = EINA_TRUE;
-
- for (;;)
- {
-if (!ls-current)
+eina_strbuf_append_char(ls-buff, ']');
+continue;
+ /* @since case - only when starting a new paragraph */
+ case '@':
+eina_strbuf_append_char(ls-buff, '@');
+next_char(ls);
+while (ls-current isalpha(ls-current))
{
- doc_error(ls, unfinished documentation, doc, rbuf);
- return; /* unreachable, for static analysis */
+
[EGIT] [tools/expedite] master 01/01: vector: add a scaling test
yakov pushed a commit to branch master.
http://git.enlightenment.org/tools/expedite.git/commit/?id=b1931c5146f90b9b7767eaad523b460a6b67e84f
commit b1931c5146f90b9b7767eaad523b460a6b67e84f
Author: Yakov Goldberg yako...@samsung.com
Date: Tue Jun 23 17:03:49 2015 +0300
vector: add a scaling test
---
src/bin/Makefile.am | 3 +-
src/bin/tests.h | 1 +
src/bin/vg_scaled.c | 145
3 files changed, 148 insertions(+), 1 deletion(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 253400d..afe6caf 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -125,7 +125,8 @@ image_mask_10.c \
image_mask_11.c \
image_mask_12.c \
image_mask_13.c \
-vg_basic.c
+vg_basic.c \
+vg_scaled.c
# \
# image_mask_14.c \
# image_mask_15.c
diff --git a/src/bin/tests.h b/src/bin/tests.h
index 97b95c9..ed9e3ef 100644
--- a/src/bin/tests.h
+++ b/src/bin/tests.h
@@ -107,6 +107,7 @@
#include image_mask_12.c
#include image_mask_13.c
#include vg_basic.c
+#include vg_scaled.c
#if 0 // test disabled - evas having code disabled
#include image_mask_14.c
#include image_mask_15.c
diff --git a/src/bin/vg_scaled.c b/src/bin/vg_scaled.c
new file mode 100644
index 000..1e270a3
--- /dev/null
+++ b/src/bin/vg_scaled.c
@@ -0,0 +1,145 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME vg_scaled_start
+#define NAME VG Scaled
+#define ICON vector.png
+
+#ifndef PROTO
+# ifndef UI
+# include main.h
+
+/* standard var */
+static int done = 0;
+
+/* private data */
+static Eo *o_objects[OBNUM], *o_shapes[OBNUM], *o_gradient[OBNUM];
+
+static const Efl_Gfx_Gradient_Stop stops[3] = {
+ { 0, 255, 0, 0, 255 },
+ { 0.5, 0, 255, 0, 255 },
+ { 1, 0, 0, 255, 255 }
+};
+
+/* setup
+ * Creating Evas Objects, each holds a vector shape.
+ * Then start moving these Evas Objects. */
+static void _setup(void)
+{
+ unsigned int i;
+
+ for (i = 0; i OBNUM; i++)
+ {
+Efl_VG *root, *gradient, *rect;
+Eo *vector;
+double w = 70, h = 70, stroke_w = 3;
+
+vector = eo_add(EVAS_VG_CLASS, evas);
+o_objects[i] = vector;
+eo_do(vector,
+ efl_gfx_size_set(w + stroke_w * 2, h + stroke_w * 2),
+ efl_gfx_position_set(0, 0),
+ efl_gfx_visible_set(EINA_TRUE));
+
+eo_do(vector, root = evas_obj_vg_root_node_get());
+
+o_gradient[i] = gradient = eo_add(EFL_VG_GRADIENT_LINEAR_CLASS, root);
+eo_do(gradient,
+ efl_gfx_gradient_stop_set(stops, 3),
+ efl_gfx_gradient_spread_set(EFL_GFX_GRADIENT_SPREAD_REFLECT),
+ efl_gfx_gradient_linear_start_set(10, 10),
+ efl_gfx_gradient_linear_end_set(50, 50));
+
+o_shapes[i] = rect = eo_add(EFL_VG_SHAPE_CLASS, root);
+eo_do(rect,
+ efl_gfx_shape_append_rect(0 + stroke_w, 0 + stroke_w, w, h, 10,
10),
+ efl_vg_shape_fill_set(gradient),
+ efl_gfx_shape_stroke_width_set(stroke_w),
+ efl_gfx_shape_stroke_color_set(128, 0, 128, 128),
+ efl_gfx_shape_stroke_join_set(EFL_GFX_JOIN_ROUND));
+ }
+ done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+ unsigned int i;
+
+ for (i = 0; i OBNUM; i++) eo_del(o_objects[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+ int i;
+ Evas_Coord x, y, w, h, w0 = 70, h0 = 70;
+ double stroke_w = 3;
+ for (i = 0; i OBNUM; i++)
+ {
+w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 *
2);
+x = (win_w / 2) - (w / 2);
+x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+y = (win_h / 2) - (h / 2);
+y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+eo_do(o_objects[i],
+ efl_gfx_position_set(x, y),
+ efl_gfx_size_set(w + stroke_w * 2, h + stroke_w * 2),
+ efl_gfx_fill_set(0, 0, w, h)
+ );
+eo_do(o_shapes[i],
+ efl_gfx_shape_reset(),
+ efl_gfx_shape_append_rect(0 + stroke_w, 0 + stroke_w, w, h, 10,
10),
+ efl_vg_shape_fill_set(o_gradient[i]),
+ efl_gfx_shape_stroke_width_set(stroke_w),
+ efl_gfx_shape_stroke_color_set(128, 0, 128, 128),
+ efl_gfx_shape_stroke_join_set(EFL_GFX_JOIN_ROUND));
+
+ }
+ FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+ KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+ ui_func_set(_key, _loop);
+ _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
--
[EGIT] [core/efl] master 01/01: eolian: simplify doc parsing logic a bit
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0fe4d4aa37088f10b082ce36864b48620ffebdb8
commit 0fe4d4aa37088f10b082ce36864b48620ffebdb8
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Tue Jun 23 16:34:45 2015 +0100
eolian: simplify doc parsing logic a bit
---
src/lib/eolian/eo_lexer.c | 43 ---
1 file changed, 24 insertions(+), 19 deletions(-)
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index 24d7080..3a835e5 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -259,6 +259,7 @@ enum Doc_Tokens {
static int
doc_lex(Eo_Lexer *ls, Eina_Bool *term, Eina_Bool allow_since)
{
+ int tokret = -1;
Eina_Bool contdoc = EINA_FALSE;
eina_strbuf_reset(ls-buff);
for (;; contdoc = EINA_TRUE) switch (ls-current)
@@ -281,8 +282,8 @@ doc_lex(Eo_Lexer *ls, Eina_Bool *term, Eina_Bool
allow_since)
}
while (is_newline(ls-current))
next_line_ws(ls);
-eina_strbuf_trim(ls-buff);
-return DOC_TEXT;
+tokret = DOC_TEXT;
+goto exit_with_token;
/* escape case: for any \X, output \X
* except for \\]], then output just ]]
*/
@@ -308,10 +309,8 @@ doc_lex(Eo_Lexer *ls, Eina_Bool *term, Eina_Bool
allow_since)
if (ls-current == ']')
{
/* terminate doc */
- next_char(ls);
- *term = EINA_TRUE;
- eina_strbuf_trim(ls-buff);
- return DOC_TEXT;
+ tokret = DOC_TEXT;
+ goto terminated;
}
eina_strbuf_append_char(ls-buff, ']');
continue;
@@ -319,19 +318,18 @@ doc_lex(Eo_Lexer *ls, Eina_Bool *term, Eina_Bool
allow_since)
case '@':
eina_strbuf_append_char(ls-buff, '@');
next_char(ls);
+if (contdoc)
+ continue;
while (ls-current isalpha(ls-current))
{
eina_strbuf_append_char(ls-buff, ls-current);
next_char(ls);
}
-if (contdoc)
- continue;
if (!strcmp(eina_strbuf_string_get(ls-buff), @since))
{
/* since-token */
if (!allow_since)
return DOC_MANGLED;
- *term = EINA_TRUE;
eina_strbuf_reset(ls-buff);
skip_ws(ls);
while (ls-current (ls-current == '.' ||
@@ -343,16 +341,8 @@ doc_lex(Eo_Lexer *ls, Eina_Bool *term, Eina_Bool
allow_since)
}
if (!eina_strbuf_length_get(ls-buff))
return DOC_UNFINISHED;
- skip_ws(ls);
- while (is_newline(ls-current))
- next_line_ws(ls);
- if (ls-current == ']')
- next_char(ls);
- if (ls-current != ']')
- return DOC_MANGLED;
- next_char(ls);
- eina_strbuf_trim(ls-buff);
- return DOC_SINCE;
+ tokret = DOC_SINCE;
+ goto force_terminate;
}
/* default case - append character */
default:
@@ -360,6 +350,21 @@ doc_lex(Eo_Lexer *ls, Eina_Bool *term, Eina_Bool
allow_since)
next_char(ls);
continue;
}
+
+force_terminate:
+ skip_ws(ls);
+ while (is_newline(ls-current))
+ next_line_ws(ls);
+ if (ls-current == ']')
+ next_char(ls);
+ if (ls-current != ']')
+ return DOC_MANGLED;
+terminated:
+ next_char(ls);
+ *term = EINA_TRUE;
+exit_with_token:
+ eina_strbuf_trim(ls-buff);
+ return tokret;
}
void doc_error(Eo_Lexer *ls, const char *msg, Eolian_Documentation *doc,
Eina_Strbuf *buf)
--
[EGIT] [tools/enventor] master 01/01: live_edit: ... fix live edit scaling issue.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6d72ca9e4bdfefb693abc1944208fb8aaf018076
commit 6d72ca9e4bdfefb693abc1944208fb8aaf018076
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 23 21:18:25 2015 +0900
live_edit: ... fix live edit scaling issue.
---
src/bin/live_edit.c | 214 +++-
src/bin/main.c | 2 +-
src/lib/template_code.h | 3 +-
3 files changed, 124 insertions(+), 95 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 7b0848a..79c9396 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -83,6 +83,18 @@ static const ctxpopup_it_data CTXPOPUP_ITEMS[] =
static live_data *g_ld = NULL;
+static Evas_Object *
+view_obj_get(live_data *ld)
+{
+ //This is a trick! we got the actual view object from the live edit.
+ Evas_Object *o, *o2, *o3;
+ o = elm_object_part_content_get(ld-live_view, elm.swallow.content);
+ o2 = elm_object_content_get(o);
+ o3 = elm_object_part_content_get(o2, elm.swallow.content);
+
+ return o3;
+}
+
static void
info_text_update(live_data *ld)
{
@@ -113,7 +125,6 @@ info_text_update(live_data *ld)
snprintf(buf, sizeof(buf), [%d x %d], layout_w, layout_h);
evas_object_text_text_set(ld-info_text[Info_Text_Size], buf);
-
//Update Position
Evas_Coord x, y, w, h;
Evas_Coord rx, ry, rw, rh;
@@ -154,6 +165,7 @@ live_edit_symbol_set(live_data *ld)
snprintf(buf, sizeof(buf), %s_bg,
CTXPOPUP_ITEMS[ld-part_info.type].name);
Evas_Object *layout_symbol = elm_layout_add(ld-layout);
elm_layout_file_set(layout_symbol, EDJE_PATH, buf);
+ elm_object_scale_set(layout_symbol, config_view_scale_get());
elm_object_part_content_set(ld-layout, elm.swallow.symbol,
layout_symbol);
}
@@ -250,18 +262,17 @@ cp_top_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Coord y = ev-cur.canvas.y;
- //Limit to boundary
- Evas_Coord lx, ly, lw, lh;
- evas_object_geometry_get(ld-live_view, lx, ly, NULL, NULL);
- config_view_size_get(lw, lh);
+ Evas_Object *view = view_obj_get(ld);
+ Evas_Coord vx, vy, vw, vh;
+ evas_object_geometry_get(view, vx, vy, vw, vh);
Evas_Coord rel2_y;
evas_object_geometry_get(ld-ctrl_pt[Ctrl_Pt_Rel2], NULL, rel2_y,
NULL, NULL);
- if (ly y) y = ly;
+ if (vy y) y = vy;
if ((y - ld-half_ctrl_size) rel2_y) y = (rel2_y + ld-half_ctrl_size);
- ld-part_info.rel1_y = ROUNDING(((double) (y - ly) / (double) lh), 2);
+ ld-part_info.rel1_y = ROUNDING(((double) (y - vy) / (double) vh), 2);
elm_object_signal_emit(ld-align_line[Align_Line_Top], elm,state,show,
);
}
@@ -276,18 +287,17 @@ cp_bottom_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Coord y = ev-cur.canvas.y;
- //Limit to boundary
- Evas_Coord lx, ly, lw, lh;
- evas_object_geometry_get(ld-live_view, lx, ly, NULL, NULL);
- config_view_size_get(lw, lh);
+ Evas_Object *view = view_obj_get(ld);
+ Evas_Coord vx, vy, vw, vh;
+ evas_object_geometry_get(view, vx, vy, vw, vh);
Evas_Coord rel1_y;
evas_object_geometry_get(ld-ctrl_pt[Ctrl_Pt_Rel1], NULL, rel1_y,
NULL, NULL);
- if (y (ly + lh)) y = (ly + lh);
+ if (y (vy + vh)) y = (vy + vh);
if (rel1_y (y + ld-half_ctrl_size)) y = (rel1_y + ld-half_ctrl_size);
- ld-part_info.rel2_y = ROUNDING(((double) (y - ly) / (double) lh), 2);
+ ld-part_info.rel2_y = ROUNDING(((double) (y - vy) / (double) vh), 2);
elm_object_signal_emit(ld-align_line[Align_Line_Bottom], elm,state,show,
);
@@ -297,8 +307,17 @@ static void
align_line_update(live_data *ld)
{
Evas_Coord lx, ly, lw, lh;
- evas_object_geometry_get(ld-live_view, lx, ly, NULL, NULL);
- config_view_size_get(lw, lh);
+ evas_object_geometry_get(ld-live_view, lx, ly, lw, lh);
+
+ Evas_Coord vw, vh;
+ config_view_size_get(vw, vh);
+ vw *= config_view_scale_get();
+ vh *= config_view_scale_get();
+
+ lx = (lx + (lw * 0.5)) - (vw * 0.5);
+ ly = (ly + (lh * 0.5)) - (vh * 0.5);
+ lw = vw;
+ lh = vh;
int x, y;
@@ -340,21 +359,20 @@ cp_rel1_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Coord x = ev-cur.canvas.x;
Evas_Coord y = ev-cur.canvas.y;
- //Limit to boundary
- Evas_Coord lx, ly, lw, lh;
- evas_object_geometry_get(ld-live_view, lx, ly, NULL, NULL);
- config_view_size_get(lw, lh);
+ Evas_Object *view = view_obj_get(ld);
+ Evas_Coord vx, vy, vw, vh;
+ evas_object_geometry_get(view, vx, vy, vw, vh);
Evas_Coord rel2_x, rel2_y;
evas_object_geometry_get(ld-ctrl_pt[Ctrl_Pt_Rel2], rel2_x, rel2_y,
NULL, NULL);
- if (lx x) x = lx;
- if (ly y) y = ly;
+ if (vx x) x = vx;
+ if (vy y) y = vy;
if ((x - ld-half_ctrl_size) rel2_x) x = (rel2_x + ld-half_ctrl_size);
if ((y - ld-half_ctrl_size) rel2_y) y = (rel2_y + ld-half_ctrl_size);
-
[EGIT] [core/efl] master 02/03: ecore-drm: Fix issue of outputs not getting registered with the wayland registry
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c6b997eb172d10a91968c7461ecec0938c8444b5
commit c6b997eb172d10a91968c7461ecec0938c8444b5
Author: Chris Michael cp.mich...@samsung.com
Date: Tue Jun 23 11:01:22 2015 -0400
ecore-drm: Fix issue of outputs not getting registered with the wayland
registry
Summary: This fixes T2465: QT5 apps don't work. The issue here is that
when the randr code runs in E we make calls to
ecore_drm_output_enable/disable which is supposed to register the
outputs with the wayland registry. This was not happening due to the
enable/disabled checks at the top of these functions.
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/ecore_drm/ecore_drm_output.c | 4
1 file changed, 4 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_output.c
b/src/lib/ecore_drm/ecore_drm_output.c
index 892c20f..e9da98c 100644
--- a/src/lib/ecore_drm/ecore_drm_output.c
+++ b/src/lib/ecore_drm/ecore_drm_output.c
@@ -960,8 +960,6 @@ ecore_drm_output_enable(Ecore_Drm_Output *output)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(output, EINA_FALSE);
- if (output-enabled) return EINA_TRUE;
-
output-enabled = EINA_TRUE;
ecore_drm_output_dpms_set(output, DRM_MODE_DPMS_ON);
@@ -975,8 +973,6 @@ ecore_drm_output_disable(Ecore_Drm_Output *output)
{
EINA_SAFETY_ON_NULL_RETURN(output);
- if (!output-enabled) return;
-
output-enabled = EINA_FALSE;
ecore_drm_output_dpms_set(output, DRM_MODE_DPMS_OFF);
--
[EGIT] [core/efl] master 03/03: ecore-drm: Fix setting proper output subpixel value
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1d981756b9ab57344da0bce72ab317f3eae79e7c
commit 1d981756b9ab57344da0bce72ab317f3eae79e7c
Author: Chris Michael cp.mich...@samsung.com
Date: Tue Jun 23 11:10:42 2015 -0400
ecore-drm: Fix setting proper output subpixel value
Summary: This adds a minor internal function to convert
DRM_MODE_SUBPIXEL values into something that the wayland protocol
supports.
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/ecore_drm/ecore_drm_output.c | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/lib/ecore_drm/ecore_drm_output.c
b/src/lib/ecore_drm/ecore_drm_output.c
index e9da98c..b0fdeb2 100644
--- a/src/lib/ecore_drm/ecore_drm_output.c
+++ b/src/lib/ecore_drm/ecore_drm_output.c
@@ -402,6 +402,28 @@ _ecore_drm_output_backlight_shutdown(Ecore_Drm_Backlight
*backlight)
free(backlight);
}
+static int
+_ecore_drm_output_subpixel_get(int subpixel)
+{
+ switch (subpixel)
+ {
+ case DRM_MODE_SUBPIXEL_UNKNOWN:
+return 0; // WL_OUTPUT_SUBPIXEL_UNKNOWN;
+ case DRM_MODE_SUBPIXEL_NONE:
+return 1; //WL_OUTPUT_SUBPIXEL_NONE;
+ case DRM_MODE_SUBPIXEL_HORIZONTAL_RGB:
+return 2; //WL_OUTPUT_SUBPIXEL_HORIZONTAL_RGB;
+ case DRM_MODE_SUBPIXEL_HORIZONTAL_BGR:
+return 3; // WL_OUTPUT_SUBPIXEL_HORIZONTAL_BGR;
+ case DRM_MODE_SUBPIXEL_VERTICAL_RGB:
+return 4; // WL_OUTPUT_SUBPIXEL_VERTICAL_RGB;
+ case DRM_MODE_SUBPIXEL_VERTICAL_BGR:
+return 5; //WL_OUTPUT_SUBPIXEL_VERTICAL_BGR;
+ default:
+return 0; // WL_OUTPUT_SUBPIXEL_UNKNOWN;
+ }
+}
+
static Ecore_Drm_Output *
_ecore_drm_output_create(Ecore_Drm_Device *dev, drmModeRes *res,
drmModeConnector *conn, int x, int y, Eina_Bool cloned)
{
@@ -428,7 +450,7 @@ _ecore_drm_output_create(Ecore_Drm_Device *dev, drmModeRes
*res, drmModeConnecto
output-cloned = cloned;
output-phys_width = conn-mmWidth;
output-phys_height = conn-mmHeight;
- output-subpixel = conn-subpixel;
+ output-subpixel = _ecore_drm_output_subpixel_get(conn-subpixel);
output-make = eina_stringshare_add(UNKNOWN);
output-model = eina_stringshare_add(UNKNOWN);
--
[EGIT] [core/efl] master 01/01: eolian: relax doc parsing a little (no need to check if @since is allowed)
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=71a8b9d119a84dec621010e2397ad546d559b298
commit 71a8b9d119a84dec621010e2397ad546d559b298
Author: Daniel Kolesa d.kol...@osg.samsung.com
Date: Tue Jun 23 16:44:17 2015 +0100
eolian: relax doc parsing a little (no need to check if @since is allowed)
---
src/lib/eolian/eo_lexer.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index 3a835e5..5ecdd87 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -257,7 +257,7 @@ enum Doc_Tokens {
};
static int
-doc_lex(Eo_Lexer *ls, Eina_Bool *term, Eina_Bool allow_since)
+doc_lex(Eo_Lexer *ls, Eina_Bool *term)
{
int tokret = -1;
Eina_Bool contdoc = EINA_FALSE;
@@ -328,8 +328,6 @@ doc_lex(Eo_Lexer *ls, Eina_Bool *term, Eina_Bool
allow_since)
if (!strcmp(eina_strbuf_string_get(ls-buff), @since))
{
/* since-token */
- if (!allow_since)
- return DOC_MANGLED;
eina_strbuf_reset(ls-buff);
skip_ws(ls);
while (ls-current (ls-current == '.' ||
@@ -389,7 +387,7 @@ read_doc(Eo_Lexer *ls, Eo_Token *tok, int line, int column)
Eina_Bool term = EINA_FALSE;
while (!term)
{
-int read = doc_lex(ls, term, !!doc-summary);
+int read = doc_lex(ls, term);
switch (read)
{
case DOC_MANGLED:
@@ -416,6 +414,8 @@ read_doc(Eo_Lexer *ls, Eo_Token *tok, int line, int column)
if (eina_strbuf_length_get(rbuf))
doc-description = eina_stringshare_add(eina_strbuf_string_get(rbuf));
+ if (!doc-summary)
+ doc-summary = eina_stringshare_add(No description supplied.);
eina_strbuf_free(rbuf);
tok-value.doc = doc;
}
--
[EGIT] [tools/enventor] master 01/01: get prepare for v0.6.0
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=b4a80c112d35cd86356891e048fdb5adbc2e9308 commit b4a80c112d35cd86356891e048fdb5adbc2e9308 Author: ChunEon Park her...@hermet.pe.kr Date: Tue Jun 23 21:38:16 2015 +0900 get prepare for v0.6.0 --- README | 2 +- configure.ac | 2 +- data/about/ABOUT | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 4283318..8e6d693 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -[Enventor v0.5.0] +[Enventor v0.6.0] This is an EDC editor with some convenient functions. It's brand new and was only started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature, but considering it's young age, it does a lot. diff --git a/configure.ac b/configure.ac index 19dbfbd..b133177 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) -m4_define([v_min], [5]) +m4_define([v_min], [6]) m4_define([v_mic], [0]) #m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2/dev/null || echo 0) | tr -d '\n']))dnl ##-- When released, remove the dnl on the below line diff --git a/data/about/ABOUT b/data/about/ABOUT index cbfe178..d5d8246 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -1,4 +1,4 @@ -font_size=11b[Enventor v0.5.0]/b/font_size +font_size=11b[Enventor v0.6.0]/b/font_size This is an EDC editor with some convenient functions. It's band new and was only started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature, but considering it's young age, it does a lot. --
[EGIT] [core/elementary] master 01/01: config: fix the flush file path.
jaehwan pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=44dad9fabb718e2d75c2909b89e53cdf1b4e1b13
commit 44dad9fabb718e2d75c2909b89e53cdf1b4e1b13
Author: Jaehwan Kim jae.hwan@samsung.com
Date: Tue Jun 23 22:56:17 2015 +0900
config: fix the flush file path.
@fix
---
src/lib/elm_config.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index b823346..676137f 100644
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -3065,8 +3065,7 @@ elm_config_all_flush(void)
FILE *f;
char buf[PATH_MAX];
- _elm_config_user_dir_snprintf(buf, sizeof(buf), config/%s/flush,
- _elm_profile);
+ _elm_config_user_dir_snprintf(buf, sizeof(buf), config/flush);
f = fopen(buf, w+);
if (f)
{
--
[EGIT] [core/elementary] master 02/03: DnD: remove from elm_cnp code specific to elm_entry
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=42beb36d041a4b1d3a91f8eff76d5908e2f92d58
commit 42beb36d041a4b1d3a91f8eff76d5908e2f92d58
Author: Daniel Zaoui daniel.za...@samsung.com
Date: Tue Jun 23 15:57:02 2015 +0300
DnD: remove from elm_cnp code specific to elm_entry
The tag insertion has to be done only from elm_entry callback. elm_cnp
is not supposed to know what will be done with the data.
---
src/lib/elm_cnp.c | 20 ++--
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c
index 3a3bb53..f03a0de 100644
--- a/src/lib/elm_cnp.c
+++ b/src/lib/elm_cnp.c
@@ -1621,9 +1621,6 @@ found:
savedtypes.imgfile);
if (savedtypes.imgfile)
{
- char *entrytag;
- static const char *tagstring =
- item absize=240x180 href=file://%s/item;
ddata.x = savedtypes.x;
ddata.y = savedtypes.y;
ddata.action = act;
@@ -1631,25 +1628,12 @@ found:
EINA_INLIST_FOREACH_SAFE(dropable-cbs_list, itr, cbs)
{
/* If it's markup that also supports images */
- if ((cbs-types ELM_SEL_FORMAT_MARKUP)
- (cbs-types ELM_SEL_FORMAT_IMAGE))
-{
- int len;
- ddata.format = ELM_SEL_FORMAT_MARKUP;
-
- len = strlen(tagstring) + strlen(savedtypes.imgfile);
- entrytag = alloca(len + 1);
- snprintf(entrytag, len + 1, tagstring,
savedtypes.imgfile);
- ddata.data = entrytag;
- cnp_debug(Insert %s\n, (char *)ddata.data);
- if ((cbs-types dropable-last.format) cbs-dropcb)
- cbs-dropcb(cbs-dropdata, dropable-obj, ddata);
-}
- else if (cbs-types ELM_SEL_FORMAT_IMAGE)
+ if (cbs-types ELM_SEL_FORMAT_IMAGE)
{
cnp_debug(Doing image insert (%s)\n,
savedtypes.imgfile);
ddata.format = ELM_SEL_FORMAT_IMAGE;
ddata.data = (char *)savedtypes.imgfile;
+ ddata.len = strlen(ddata.data);
if ((cbs-types dropable-last.format) cbs-dropcb)
cbs-dropcb(cbs-dropdata, dropable-obj, ddata);
}
--
[EGIT] [core/efl] master 01/01: ecore-drm: Quiet down output from libinput
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e399e9df4a7c885b3e502bc3fb8ae5cb7d1d7351
commit e399e9df4a7c885b3e502bc3fb8ae5cb7d1d7351
Author: Chris Michael cp.mich...@samsung.com
Date: Tue Jun 23 13:26:44 2015 -0400
ecore-drm: Quiet down output from libinput
Summary: As libinput has matured enough now, we can reduce the noise
in outputs logs by adjusting libinput log level priority
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/ecore_drm/ecore_drm_inputs.c | 22 +-
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_inputs.c
b/src/lib/ecore_drm/ecore_drm_inputs.c
index 7429e28..75655ec 100644
--- a/src/lib/ecore_drm/ecore_drm_inputs.c
+++ b/src/lib/ecore_drm/ecore_drm_inputs.c
@@ -214,7 +214,6 @@ EAPI Eina_Bool
ecore_drm_inputs_create(Ecore_Drm_Device *dev)
{
Ecore_Drm_Input *input;
- int level, priority = LIBINPUT_LOG_PRIORITY_ERROR;
/* check for valid device */
EINA_SAFETY_ON_NULL_RETURN_VAL(dev, EINA_FALSE);
@@ -235,27 +234,8 @@ ecore_drm_inputs_create(Ecore_Drm_Device *dev)
goto err;
}
- /* get the current eina_log level */
- level = eina_log_domain_registered_level_get(_ecore_drm_log_dom);
- switch (level)
- {
- case EINA_LOG_LEVEL_DBG:
-priority = LIBINPUT_LOG_PRIORITY_DEBUG;
-break;
- case EINA_LOG_LEVEL_INFO:
-priority = LIBINPUT_LOG_PRIORITY_INFO;
-break;
- case EINA_LOG_LEVEL_CRITICAL:
- case EINA_LOG_LEVEL_ERR:
- case EINA_LOG_LEVEL_WARN:
-priority = LIBINPUT_LOG_PRIORITY_ERROR;
-break;
- default:
-break;
- }
-
/* set libinput log priority */
- libinput_log_set_priority(input-libinput, priority);
+ libinput_log_set_priority(input-libinput, LIBINPUT_LOG_PRIORITY_INFO);
/* assign udev seat */
if (libinput_udev_assign_seat(input-libinput, dev-seat) != 0)
--
[EGIT] [tools/enventor] master 01/01: menu: fix wrong grammar
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=9615d308ec47fc5293e1f9c3bd4f83b7c6855fb7 commit 9615d308ec47fc5293e1f9c3bd4f83b7c6855fb7 Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 24 14:47:27 2015 +0900 menu: fix wrong grammar --- src/bin/menu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bin/menu.c b/src/bin/menu.c index 68c1ecd..e4780a0 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -184,7 +184,7 @@ warning_open(menu_data *md, Evas_Smart_Cb yes_cb, Evas_Smart_Cb save_cb) elm_object_part_text_set(layout, elm.text.desc, Without save, you will lose last changes!); elm_object_part_text_set(layout, elm.text.question, -Will you save this changes?); +Will you save changes?); elm_object_signal_callback_add(layout, elm,state,dismiss,done, , warning_dismiss_done, md); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -213,7 +213,6 @@ warning_open(menu_data *md, Evas_Smart_Cb yes_cb, Evas_Smart_Cb save_cb) evas_object_smart_callback_add(btn, clicked, warning_no_btn_cb, md); elm_object_part_content_set(layout, elm.swallow.btn3, btn); - md-warning_layout = layout; menu_activate_request(); } --
[EGIT] [core/elementary] master 02/02: X11/CnP: remove X11 invocations from elm_entry
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a5fadcb53791f5b41cafe023080286354d5c41dd
commit a5fadcb53791f5b41cafe023080286354d5c41dd
Author: Daniel Zaoui daniel.za...@samsung.com
Date: Tue Jun 23 18:11:05 2015 +0300
X11/CnP: remove X11 invocations from elm_entry
Code specific to X11 should not be part of elm_entry and can be easily
replaced with elm_cnp APIs.
@fix T2183
---
src/lib/elm_entry.c| 155 +
src/lib/elm_widget_entry.h | 2 -
2 files changed, 29 insertions(+), 128 deletions(-)
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 1724cb6..2187a4a 100644
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1411,6 +1411,19 @@ _paste_cb(void *data,
}
static void
+_selection_clear(void *data, Elm_Sel_Type selection)
+{
+ ELM_ENTRY_DATA_GET(data, sd);
+
+ if (!sd-have_selection) return;
+ if ((selection == ELM_SEL_TYPE_CLIPBOARD) ||
+ (selection == ELM_SEL_TYPE_PRIMARY))
+ {
+elm_entry_select_none(data);
+ }
+}
+
+static void
_selection_store(Elm_Sel_Type seltype,
Evas_Object *obj)
{
@@ -1423,6 +1436,7 @@ _selection_store(Elm_Sel_Type seltype,
elm_cnp_selection_set
(obj, seltype, ELM_SEL_FORMAT_MARKUP, sel, strlen(sel));
+ elm_cnp_selection_loss_callback_set(obj, seltype, _selection_clear, obj);
if (seltype == ELM_SEL_TYPE_CLIPBOARD)
eina_stringshare_replace(sd-cut_sel, sel);
}
@@ -2055,8 +2069,11 @@ _entry_selection_start_signal_cb(void *data,
top = elm_widget_top_get(data);
if (txt top (elm_win_window_id_get(top)))
- elm_cnp_selection_set(data, ELM_SEL_TYPE_PRIMARY,
- ELM_SEL_FORMAT_MARKUP, txt, strlen(txt));
+ {
+elm_cnp_selection_set(data, ELM_SEL_TYPE_PRIMARY,
+ ELM_SEL_FORMAT_MARKUP, txt, strlen(txt));
+elm_cnp_selection_loss_callback_set(data, ELM_SEL_TYPE_PRIMARY,
_selection_clear, data);
+ }
elm_object_focus_set(data, EINA_TRUE);
}
@@ -2106,28 +2123,18 @@ _entry_selection_cleared_signal_cb(void *data,
sd-have_selection = EINA_FALSE;
evas_object_smart_callback_call(data, SIG_SELECTION_CLEARED, NULL);
- if (sd-sel_notify_handler)
+ if (sd-cut_sel)
{
-if (sd-cut_sel)
- {
- Evas_Object *top;
-
- top = elm_widget_top_get(data);
- if ((top) (elm_win_window_id_get(top)))
- elm_cnp_selection_set
- (data, ELM_SEL_TYPE_PRIMARY, ELM_SEL_FORMAT_MARKUP,
- sd-cut_sel, eina_stringshare_strlen(sd-cut_sel));
-
- ELM_SAFE_FREE(sd-cut_sel, eina_stringshare_del);
- }
-else
- {
- Evas_Object *top;
+elm_cnp_selection_set
+ (data, ELM_SEL_TYPE_PRIMARY, ELM_SEL_FORMAT_MARKUP,
+sd-cut_sel, eina_stringshare_strlen(sd-cut_sel));
+elm_cnp_selection_loss_callback_set(data, ELM_SEL_TYPE_PRIMARY,
_selection_clear, data);
- top = elm_widget_top_get(data);
- if ((top) (elm_win_window_id_get(top)))
- elm_object_cnp_selection_clear(data, ELM_SEL_TYPE_PRIMARY);
- }
+ELM_SAFE_FREE(sd-cut_sel, eina_stringshare_del);
+ }
+ else
+ {
+elm_object_cnp_selection_clear(data, ELM_SEL_TYPE_PRIMARY);
}
_hide_selection_handler(data);
}
@@ -2515,87 +2522,6 @@ _entry_mouse_triple_signal_cb(void *data,
evas_object_smart_callback_call(data, SIG_CLICKED_TRIPLE, NULL);
}
-#ifdef HAVE_ELEMENTARY_X
-static Eina_Bool
-_event_selection_notify(void *data,
-int type EINA_UNUSED,
-void *event)
-{
- Ecore_X_Event_Selection_Notify *ev = event;
-
- ELM_ENTRY_DATA_GET(data, sd);
-
- if ((!sd-selection_asked) (!sd-drag_selection_asked))
- return ECORE_CALLBACK_PASS_ON;
-
- if ((ev-selection == ECORE_X_SELECTION_CLIPBOARD) ||
- (ev-selection == ECORE_X_SELECTION_PRIMARY))
- {
-Ecore_X_Selection_Data_Text *text_data;
-
-text_data = ev-data;
-if (text_data-data.content == ECORE_X_SELECTION_CONTENT_TEXT)
- {
- if (text_data-text)
- {
- char *txt = _elm_util_text_to_mkup(text_data-text);
-
- if (txt)
-{
- elm_entry_entry_insert(data, txt);
- free(txt);
-}
- }
- }
-sd-selection_asked = EINA_FALSE;
- }
- else if (ev-selection == ECORE_X_SELECTION_XDND)
- {
-Ecore_X_Selection_Data_Text *text_data;
-
-text_data = ev-data;
-if (text_data-data.content == ECORE_X_SELECTION_CONTENT_TEXT)
- {
- if (text_data-text)
- {
- char *txt = _elm_util_text_to_mkup(text_data-text);
-
- if (txt)
[EGIT] [core/elementary] master 01/02: CnP: improve loss callback
jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=d904e9761e417ec945e0d401735f769aaa19a480 commit d904e9761e417ec945e0d401735f769aaa19a480 Author: Daniel Zaoui daniel.za...@samsung.com Date: Tue Jun 23 17:58:48 2015 +0300 CnP: improve loss callback - Reset loss cb after invocation as it is no more needed - When selection is set, previous owner loss cb is invoked only if the new owner and the previous one are different. --- src/lib/elm_cnp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c index e20fbb1..0bee00a 100644 --- a/src/lib/elm_cnp.c +++ b/src/lib/elm_cnp.c @@ -706,9 +706,10 @@ _x11_selection_clear(void *udata EINA_UNUSED, int type EINA_UNUSED, void *event) _x11_sel_obj_del2, sel); sel-widget = NULL; sel-requestwidget = NULL; + sel-loss_cb = NULL; + sel-loss_data = NULL; sel-active = EINA_FALSE; - sel-widget = NULL; ELM_SAFE_FREE(sel-selbuf, free); return ECORE_CALLBACK_PASS_ON; } @@ -1852,7 +1853,7 @@ _x11_elm_cnp_selection_set(Ecore_X_Window xwin, Evas_Object *obj, Elm_Sel_Type s return elm_object_cnp_selection_clear(obj, selection); sel = _x11_selections + selection; - if (sel-loss_cb) sel-loss_cb(sel-loss_data, selection); + if (sel-widget != obj sel-loss_cb) sel-loss_cb(sel-loss_data, selection); if (sel-widget) evas_object_event_callback_del_full(sel-widget, EVAS_CALLBACK_DEL, _x11_sel_obj_del, sel); --
[EGIT] [tools/enventor] master 01/01: auto_comp: fix crash at auto comp.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=e45efbf3816346ae06d48a84b256dd8ae90a8b98
commit e45efbf3816346ae06d48a84b256dd8ae90a8b98
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 24 14:06:32 2015 +0900
auto_comp: fix crash at auto comp.
increase stack buffer size to afford more huge size of edc text.
and handle exceptional case for lack of stack size.
---
src/lib/auto_comp.c | 21 +
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index 9bb1471..9a4701f 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -7,7 +7,7 @@
#define QUEUE_SIZE 20
#define COMPSET_PAIR_MINIMUM 1
-#define MAX_CONTEXT_STACK 20
+#define MAX_CONTEXT_STACK 40
#define MAX_KEYWORD_LENGHT 40
typedef struct lexem_s
@@ -140,8 +140,8 @@ context_lexem_thread_cb(void *data, Ecore_Thread *thread
EINA_UNUSED)
int i = 0;
if (!td-utf8) return;
- char *utf8 = td-utf8;
+ char *utf8 = td-utf8;
char *cur = utf8;
char *end = cur + cur_pos;
char stack[MAX_CONTEXT_STACK][MAX_KEYWORD_LENGHT];
@@ -195,6 +195,7 @@ context_lexem_thread_cb(void *data, Ecore_Thread *thread
EINA_UNUSED)
memset(stack[depth], 0x0, MAX_KEYWORD_LENGHT);
strncpy(stack[depth], help_ptr, context_len);
depth++;
+ if (depth == MAX_CONTEXT_STACK) break;
}
if (*cur == '.')
{
@@ -217,6 +218,7 @@ context_lexem_thread_cb(void *data, Ecore_Thread *thread
EINA_UNUSED)
memset(stack[depth], 0x0, MAX_KEYWORD_LENGHT);
strncpy(stack[depth], help_ptr, context_len);
depth++;
+ if (depth == MAX_CONTEXT_STACK) break;
dot_lex = EINA_TRUE;
}
if ((*cur == ';') dot_lex)
@@ -247,7 +249,6 @@ context_lexem_thread_cb(void *data, Ecore_Thread *thread
EINA_UNUSED)
if (!strncmp(stack[i], td-result-name,
strlen(td-result-name)))
{
nodes = td-result-nodes;
- l = NULL;
find_flag = EINA_TRUE;
break;
}
@@ -258,7 +259,6 @@ context_lexem_thread_cb(void *data, Ecore_Thread *thread
EINA_UNUSED)
return;
}
}
- return;
}
static void
@@ -267,8 +267,7 @@ context_lexem_thread_end_cb(void *data, Ecore_Thread
*thread EINA_UNUSED)
ctx_lexem_td *td = (ctx_lexem_td *)data;
td-ad-lexem_ptr = td-result ? td-result : (lexem *)td-ad-lexem_root;
- if (td-ad-cntx_lexem_thread == thread)
- td-ad-cntx_lexem_thread = NULL;
+ td-ad-cntx_lexem_thread = NULL;
if (td-list_show || (td-result td-result-dot
td-ad-dot_candidate))
candidate_list_show(td-ad);
@@ -285,8 +284,7 @@ context_lexem_thread_cancel_cb(void *data, Ecore_Thread
*thread EINA_UNUSED)
td-ad-lexem_ptr = td-result ? td-result : (lexem *)td-ad-lexem_root;
if (td-list_show || (td-result td-result-dot
td-ad-dot_candidate))
candidate_list_show(td-ad);
- if (td-ad-cntx_lexem_thread == thread)
- td-ad-cntx_lexem_thread = NULL;
+ td-ad-cntx_lexem_thread = NULL;
td-ad-dot_candidate = EINA_FALSE;
free(td-utf8);
free(td);
@@ -301,9 +299,7 @@ context_lexem_get(autocomp_data *ad, Evas_Object *entry,
Eina_Bool list_show)
ad-lexem_ptr = (lexem *)ad-lexem_root;
return;
}
-
- if (ad-cntx_lexem_thread)
- ecore_thread_cancel(ad-cntx_lexem_thread);
+ ecore_thread_cancel(ad-cntx_lexem_thread);
ctx_lexem_td *td = (ctx_lexem_td *)calloc(1, sizeof(ctx_lexem_td));
td-utf8 = elm_entry_markup_to_utf8(text);
@@ -314,7 +310,8 @@ context_lexem_get(autocomp_data *ad, Evas_Object *entry,
Eina_Bool list_show)
ad-cntx_lexem_thread = ecore_thread_run(context_lexem_thread_cb,
context_lexem_thread_end_cb,
- context_lexem_thread_cancel_cb,
td);
+ context_lexem_thread_cancel_cb,
+ td);
}
static void
--
[EGIT] [tools/enventor] master 01/01: adjust live view zoom range
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=8d51516705c580820d5ad1d2d59234b96fae9f0e commit 8d51516705c580820d5ad1d2d59234b96fae9f0e Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 24 14:35:14 2015 +0900 adjust live view zoom range 0.5 ~ 5.0 - 0.1 ~ 10.0 --- src/include/config_data.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/config_data.h b/src/include/config_data.h index dc236d6..630e773 100644 --- a/src/include/config_data.h +++ b/src/include/config_data.h @@ -1,7 +1,7 @@ #define MAX_FONT_SCALE 5.0 #define MIN_FONT_SCALE 0.5 -#define MAX_VIEW_SCALE 5.0 -#define MIN_VIEW_SCALE 0.5 +#define MAX_VIEW_SCALE 10.0 +#define MIN_VIEW_SCALE 0.1 void config_init(const char *edc_path, const char *edj_path, Eina_List *edc_img_path, Eina_List *edc_snd_path, Eina_List *edc_fnt_path, Eina_List *edc_dat_path); void config_term(void); --
[EGIT] [core/efl] master 01/01: Ecore_Con: Fix make distcheck
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=122b2426464e31fd548b7eaf60695ffa985b8522 commit 122b2426464e31fd548b7eaf60695ffa985b8522 Author: Jean-Philippe Andre jp.an...@samsung.com Date: Tue Jun 23 15:17:45 2015 +0900 Ecore_Con: Fix make distcheck --- src/Makefile_Ecore_Con.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am index d185cf8..4fedd8a 100644 --- a/src/Makefile_Ecore_Con.am +++ b/src/Makefile_Ecore_Con.am @@ -37,7 +37,9 @@ dist_installed_ecoreconmainheaders_DATA = \ lib/ecore_con/Ecore_Con.h \ lib/ecore_con/Ecore_Con_Legacy.h \ lib/ecore_con/Ecore_Con_Eo.h \ -lib/ecore_con/Ecore_Con_Eet.h +lib/ecore_con/Ecore_Con_Eet.h \ +lib/ecore_con/Ecore_Con_Eet_Legacy.h \ +lib/ecore_con/Ecore_Con_Eet_Eo.h nodist_installed_ecoreconmainheaders_DATA = \ $(ecore_con_eolian_h) --
[EGIT] [core/elementary] elementary-1.14 02/02: genlist: fix resize of items when added after elm_genlist_clear().
stefan pushed a commit to branch elementary-1.14.
http://git.enlightenment.org/core/elementary.git/commit/?id=38f427f8a78980576e1e05aa9b3c127b52e03cf3
commit 38f427f8a78980576e1e05aa9b3c127b52e03cf3
Author: Amitesh Singh amitesh...@samsung.com
Date: Mon Jun 22 19:06:21 2015 +0900
genlist: fix resize of items when added after elm_genlist_clear().
Summary:
This fixes following issue.
1. Add genlist items
2. Clear genlist by elm_genlist_clear()
3. Append items.
Genlist items are shrinked. This patch fixes that issue.
@fix
Partially resolves: T2367
Reviewers: Hermet, raster, cedric, raoulh, SanghyeonLee
Subscribers: sachin.dev, seoz
Differential Revision: https://phab.enlightenment.org/D2733
---
src/lib/elm_genlist.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 6594aa0..d351f28 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -4411,9 +4411,8 @@ _item_process_post(Elm_Genlist_Data *sd,
it-item-block-changed = 0;
if (sd-pan_changed)
{
+ evas_object_smart_changed(sd-pan_obj);
ELM_SAFE_FREE(sd-calc_job, ecore_job_del);
- _calc_job(sd-obj);
- sd-pan_changed = EINA_FALSE;
}
}
if (show_me) it-item-block-show_me = EINA_TRUE;
--
[EGIT] [website/www-content] master 01/01: add content for wiki note plugin - css and images
raster pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=298641d2b8bd1f1bd4a0430fdfd127ad4893 commit 298641d2b8bd1f1bd4a0430fdfd127ad4893 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Wed Jun 24 12:59:55 2015 +0900 add content for wiki note plugin - css and images --- media/note-classic.png | Bin 0 - 331 bytes media/note-classic.svg | 74 ++ media/note-important.png | Bin 0 - 730 bytes media/note-important.svg | 90 +++ media/note-tip.png | Bin 0 - 651 bytes media/note-tip.svg | 85 media/note-warning.png | Bin 0 - 674 bytes media/note-warning.svg | 79 + pages/wiki/syntax.txt| 46 +++- 9 files changed, 373 insertions(+), 1 deletion(-) diff --git a/media/note-classic.png b/media/note-classic.png new file mode 100644 index 000..10534b7 Binary files /dev/null and b/media/note-classic.png differ diff --git a/media/note-classic.svg b/media/note-classic.svg new file mode 100644 index 000..1a2d9bf --- /dev/null +++ b/media/note-classic.svg @@ -0,0 +1,74 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=48 + height=48 + viewBox=0 0 48 48 + id=svg2 + version=1.1 + inkscape:version=0.91 r13725 + sodipodi:docname=note-classic.svg + inkscape:export-filename=/home/raster/C/wc/media/note-classic.png + inkscape:export-xdpi=90 + inkscape:export-ydpi=90 + defs + id=defs4 / + sodipodi:namedview + id=base + pagecolor=#404040 + bordercolor=#66 + borderopacity=1.0 + inkscape:pageopacity=0 + inkscape:pageshadow=2 + inkscape:zoom=25.58 + inkscape:cx=24 + inkscape:cy=24 + inkscape:document-units=px + inkscape:current-layer=layer1 + showgrid=true + units=px + inkscape:showpageshadow=false + inkscape:window-width=1833 + inkscape:window-height=1364 + inkscape:window-x=3435 + inkscape:window-y=547 + inkscape:window-maximized=0 +inkscape:grid + type=xygrid + id=grid4136 + units=px + spacingx=1 + spacingy=1 / + /sodipodi:namedview + metadata + id=metadata7 +rdf:RDF + cc:Work + rdf:about= +dc:formatimage/svg+xml/dc:format +dc:type + rdf:resource=http://purl.org/dc/dcmitype/StillImage; / +dc:title/dc:title + /cc:Work +/rdf:RDF + /metadata + g + inkscape:label=Layer 1 + inkscape:groupmode=layer + id=layer1 + transform=translate(0,-1004.3622) +path + style=fill:#ff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1 + d=m 25,1050.3622 -2,-19 -8,0 0,-4 5,0 -1,-17 -4,0 0,-4 20,0 0,4 -4,0 -1,17 5,0 0,4 -8,0 z + id=path4138 + inkscape:connector-curvature=0 / + /g +/svg diff --git a/media/note-important.png b/media/note-important.png new file mode 100644 index 000..b41fd18 Binary files /dev/null and b/media/note-important.png differ diff --git a/media/note-important.svg b/media/note-important.svg new file mode 100644 index 000..20cc08a --- /dev/null +++ b/media/note-important.svg @@ -0,0 +1,90 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + width=48 + height=48 + viewBox=0 0 48 48 + id=svg2 + version=1.1 + inkscape:version=0.91 r13725 + sodipodi:docname=note-important.svg + inkscape:export-filename=/home/raster/C/wc/media/note-important.png + inkscape:export-xdpi=90 + inkscape:export-ydpi=90 + defs + id=defs4 / + sodipodi:namedview + id=base + pagecolor=#404040 + bordercolor=#66 + borderopacity=1.0 + inkscape:pageopacity=0 + inkscape:pageshadow=2 + inkscape:zoom=25.58 + inkscape:cx=24 + inkscape:cy=24 + inkscape:document-units=px + inkscape:current-layer=layer1 + showgrid=true + units=px + inkscape:showpageshadow=false + inkscape:window-width=1833 +
[EGIT] [website/www] master 01/01: wiki plugin - add note plugin as requested
raster pushed a commit to branch master.
http://git.enlightenment.org/website/www.git/commit/?id=09f5f33d00a76d67411a9175f3a740188e84a058
commit 09f5f33d00a76d67411a9175f3a740188e84a058
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Wed Jun 24 13:00:23 2015 +0900
wiki plugin - add note plugin as requested
---
public_html/lib/plugins/note/.gitignore| 1 +
public_html/lib/plugins/note/images/important.png | Bin 0 - 2250 bytes
public_html/lib/plugins/note/images/note.png | Bin 0 - 2520 bytes
.../lib/plugins/note/images/tb_important.png | Bin 0 - 1366 bytes
public_html/lib/plugins/note/images/tb_note.png| Bin 0 - 1461 bytes
public_html/lib/plugins/note/images/tb_tip.png | Bin 0 - 1441 bytes
public_html/lib/plugins/note/images/tb_warning.png | Bin 0 - 1870 bytes
public_html/lib/plugins/note/images/tip.png| Bin 0 - 2909 bytes
public_html/lib/plugins/note/images/warning.png| Bin 0 - 3249 bytes
public_html/lib/plugins/note/info.txt | 8 +
public_html/lib/plugins/note/script.js | 36
public_html/lib/plugins/note/style.css | 41 +
public_html/lib/plugins/note/syntax.php| 191 +
public_html/lib/tpl/e/css/modifications.css| 40 +
14 files changed, 317 insertions(+)
diff --git a/public_html/lib/plugins/note/.gitignore
b/public_html/lib/plugins/note/.gitignore
new file mode 100644
index 000..f3c7a7c
--- /dev/null
+++ b/public_html/lib/plugins/note/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/public_html/lib/plugins/note/images/important.png
b/public_html/lib/plugins/note/images/important.png
new file mode 100644
index 000..dc8c8a4
Binary files /dev/null and b/public_html/lib/plugins/note/images/important.png
differ
diff --git a/public_html/lib/plugins/note/images/note.png
b/public_html/lib/plugins/note/images/note.png
new file mode 100644
index 000..df1e0a9
Binary files /dev/null and b/public_html/lib/plugins/note/images/note.png differ
diff --git a/public_html/lib/plugins/note/images/tb_important.png
b/public_html/lib/plugins/note/images/tb_important.png
new file mode 100644
index 000..d853518
Binary files /dev/null and
b/public_html/lib/plugins/note/images/tb_important.png differ
diff --git a/public_html/lib/plugins/note/images/tb_note.png
b/public_html/lib/plugins/note/images/tb_note.png
new file mode 100644
index 000..f5c9316
Binary files /dev/null and b/public_html/lib/plugins/note/images/tb_note.png
differ
diff --git a/public_html/lib/plugins/note/images/tb_tip.png
b/public_html/lib/plugins/note/images/tb_tip.png
new file mode 100644
index 000..f127e91
Binary files /dev/null and b/public_html/lib/plugins/note/images/tb_tip.png
differ
diff --git a/public_html/lib/plugins/note/images/tb_warning.png
b/public_html/lib/plugins/note/images/tb_warning.png
new file mode 100644
index 000..892c833
Binary files /dev/null and b/public_html/lib/plugins/note/images/tb_warning.png
differ
diff --git a/public_html/lib/plugins/note/images/tip.png
b/public_html/lib/plugins/note/images/tip.png
new file mode 100644
index 000..2000f20
Binary files /dev/null and b/public_html/lib/plugins/note/images/tip.png differ
diff --git a/public_html/lib/plugins/note/images/warning.png
b/public_html/lib/plugins/note/images/warning.png
new file mode 100644
index 000..3c8a37d
Binary files /dev/null and b/public_html/lib/plugins/note/images/warning.png
differ
diff --git a/public_html/lib/plugins/note/info.txt
b/public_html/lib/plugins/note/info.txt
new file mode 100644
index 000..5226345
--- /dev/null
+++ b/public_html/lib/plugins/note/info.txt
@@ -0,0 +1,8 @@
+# General Plugin Info do not edit
+
+author Olivier Cortès / Eric Hameleers / Christopher Smith / Aurélien Bompard
+email ol...@deep-ocean.net
+date 2009-06-15
+name Note Plugin
+desc Add Note/Important/Tip/Warning Capability (DIV+CSS box)
+urlhttp://www.dokuwiki.org/plugin:note
diff --git a/public_html/lib/plugins/note/script.js
b/public_html/lib/plugins/note/script.js
new file mode 100644
index 000..c211207
--- /dev/null
+++ b/public_html/lib/plugins/note/script.js
@@ -0,0 +1,36 @@
+/* Add Note buttons to the toolbar */
+/* from http://wiki.splitbrain.org/wiki:tips:toolbarbutton */
+
+/* Disabled because this does not allow to select a text and turn it into a
note like the type:format does
+var notes_arr = new Array(); // key = insertion string , value = icon filename.
+notes_arr['note/note\\n']='tb_note.png';
+notes_arr['note tip/note\\n']='tb_tip.png';
+notes_arr['note important/note\\n']='tb_important.png';
+notes_arr['note warning/note\\n']='tb_warning.png';
+
+toolbar[toolbar.length] = {type:picker,
+ title:Notes,
+ icon:../../plugins/note/images/tb_note.png,
+ key:,
+ list: notes_arr,
+
[EGIT] [tools/enventor] master 01/01: Fix compiler warnings.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=533994772f2dcf94d41027433c75c26fdb9b09a2
commit 533994772f2dcf94d41027433c75c26fdb9b09a2
Author: Mykyta Biliavskyi m.biliavs...@samsung.com
Date: Wed Jun 24 11:27:25 2015 +
Fix compiler warnings.
Fix -Wuninitialized flag warnings.
---
src/bin/menu.c | 7 +--
src/bin/text_setting.c | 2 +-
src/lib/build.c| 4 ++--
src/lib/template.c | 4 ++--
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/bin/menu.c b/src/bin/menu.c
index ce8a7b2..caff93d 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -245,13 +245,16 @@ about_open(menu_data *md)
char buf[PATH_MAX];
snprintf(buf, sizeof(buf), %s/about/ABOUT, elm_app_data_dir_get());
+ Eina_Strbuf *strbuf = NULL;
+ Eina_Iterator *itr = NULL;
+
Eina_File *file = eina_file_open(buf, EINA_FALSE);
if (!file) goto err;
- Eina_Iterator *itr = eina_file_map_lines(file);
+ itr = eina_file_map_lines(file);
if (!itr) goto err;
- Eina_Strbuf *strbuf = eina_strbuf_new();
+ strbuf = eina_strbuf_new();
if (!strbuf) goto err;
Eina_File_Line *line;
diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c
index 09913d1..8866728 100644
--- a/src/bin/text_setting.c
+++ b/src/bin/text_setting.c
@@ -549,10 +549,10 @@ static char *
syntax_template_create(double font_scale)
{
text_setting_data *tsd = g_tsd;
+ char *syntax_template_str = NULL;
char *syntax_template_format = syntax_template_format_create();
if (!syntax_template_format) goto syntax_template_create_err;
- char *syntax_template_str = NULL;
syntax_template_str = calloc(1, sizeof(char) * SYNTAX_TEMPLATE_MAX_LEN);
if (!syntax_template_str) goto syntax_template_create_err;
diff --git a/src/lib/build.c b/src/lib/build.c
index 2ce1146..880cef9 100644
--- a/src/lib/build.c
+++ b/src/lib/build.c
@@ -77,7 +77,7 @@ build_cmd_set(build_data *bd)
Eina_Strbuf *strbuf_snd = NULL;
Eina_Strbuf *strbuf_fnt = NULL;
Eina_Strbuf *strbuf_dat = NULL;
-
+ Eina_Strbuf *strbuf = NULL;
//Image
strbuf_img = strbuf_path_get(bd, ENVENTOR_RES_IMAGE, -id );
if (!strbuf_img) goto err;
@@ -91,7 +91,7 @@ build_cmd_set(build_data *bd)
strbuf_dat = strbuf_path_get(bd, ENVENTOR_RES_DATA, -dd );
if (!strbuf_dat) goto err;
- Eina_Strbuf *strbuf = eina_strbuf_new();
+ strbuf = eina_strbuf_new();
if (!strbuf)
{
EINA_LOG_ERR(Failed to new strbuf);
diff --git a/src/lib/template.c b/src/lib/template.c
index 3999592..36f65ac 100644
--- a/src/lib/template.c
+++ b/src/lib/template.c
@@ -137,8 +137,8 @@ template_part_insert(edit_data *ed, Edje_Part_Type
part_type,
memset(p, ' ', space);
p[space] = '\0';
- int line_cnt;
- char **t;
+ int line_cnt = 0;
+ char **t = NULL;
char buf[64];
switch(part_type)
--
[EGIT] [tools/enventor] master 01/01: Autoindent: fix increase line numbers.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=c2d6bae122c0ef5a6838ab4d4bcb6a4f8fcd458e
commit c2d6bae122c0ef5a6838ab4d4bcb6a4f8fcd458e
Author: Mykyta Biliavskyi m.biliavs...@samsung.com
Date: Wed Jun 24 13:14:14 2015 +0900
Autoindent: fix increase line numbers.
Summary:
Function indent_insert_apply reutn count of inserted lines.
It is provide increse line numbers correctly.
@fix T2510
Reviewers: Hermet
Maniphest Tasks: T2510
Differential Revision: https://phab.enlightenment.org/D2745
---
src/lib/edc_editor.c | 12 ++--
src/lib/enventor_private.h | 2 +-
src/lib/indent.c | 18 --
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 6d9a9f0..44330ad 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -239,29 +239,29 @@ edit_changed_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info)
if (info-insert)
{
+int increase = 0;
if ((info-change.insert.plain_length == 1)
(info-change.insert.content[0] == ' ')) return;
if (!strcmp(info-change.insert.content, EOL))
{
- edit_line_increase(ed, 1);
+ increase++;
syntax_color = EINA_FALSE;
}
else
{
- int increase =
+ increase =
parser_line_cnt_get(ed-pd, info-change.insert.content);
- edit_line_increase(ed, increase);
}
if (ed-auto_indent)
{
-indent_insert_apply(syntax_indent_data_get(ed-sh), ed-en_edit,
+ increase = indent_insert_apply(syntax_indent_data_get(ed-sh),
ed-en_edit,
info-change.insert.content, ed-cur_line);
- int increase =
-parser_line_cnt_get(ed-pd, info-change.insert.content);
edit_line_increase(ed, increase);
}
+else
+ edit_line_increase(ed, increase);
}
else
diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h
index 7ae7a97..477a8fd 100644
--- a/src/lib/enventor_private.h
+++ b/src/lib/enventor_private.h
@@ -129,7 +129,7 @@ indent_data *syntax_indent_data_get(syntax_helper *sh);
indent_data *indent_init(Eina_Strbuf *strbuf);
void indent_term(indent_data *id);
int indent_space_get(indent_data *id, Evas_Object *entry);
-void indent_insert_apply(indent_data *id, Evas_Object *entry, const char
*insert, int cur_line);
+int indent_insert_apply(indent_data *id, Evas_Object *entry, const char
*insert, int cur_line);
Eina_Bool indent_delete_apply(indent_data *id, Evas_Object *entry, const char
*del, int cur_line);
diff --git a/src/lib/indent.c b/src/lib/indent.c
index a5ed761..3599bfc 100644
--- a/src/lib/indent.c
+++ b/src/lib/indent.c
@@ -231,10 +231,11 @@ indent_delete_apply(indent_data *id EINA_UNUSED,
Evas_Object *entry,
return EINA_FALSE;
}
-static void
+static int
indent_text_auto_format(indent_data *id EINA_UNUSED,
Evas_Object *entry, const char *insert)
{
+ int line_cnt = 0;
char *utf8 = evas_textblock_text_markup_to_utf8(NULL, insert);
int utf8_size = strlen(utf8);
@@ -276,7 +277,7 @@ indent_text_auto_format(indent_data *id EINA_UNUSED,
}
free(utf8);
- if (!code_lines) return;
+ if (!code_lines) return line_cnt;
tb_cur_pos = evas_textblock_cursor_pos_get(cur_end);
evas_textblock_cursor_pos_set(cur_start, tb_cur_pos - utf8_size);
evas_textblock_cursor_range_delete(cur_start, cur_end);
@@ -297,6 +298,7 @@ indent_text_auto_format(indent_data *id EINA_UNUSED,
memset(p, 0x0, space);
if (strstr(line, {)) space += TAB_SPACE;
eina_stringshare_del(line);
+ line_cnt++;
}
frmt_buf = eina_strbuf_string_steal(buf);
@@ -313,10 +315,10 @@ indent_text_auto_format(indent_data *id EINA_UNUSED,
eina_strbuf_free(buf);
free(frmt_buf);
evas_textblock_cursor_free(cur_start);
- return;
+ return line_cnt;
}
-void
+int
indent_insert_apply(indent_data *id, Evas_Object *entry, const char *insert,
int cur_line)
{
@@ -325,12 +327,16 @@ indent_insert_apply(indent_data *id, Evas_Object *entry,
const char *insert,
{
if (insert[0] == '}')
indent_insert_bracket_case(id, entry, cur_line);
+return 0;
}
else
{
if (!strcmp(insert, EOL))
- indent_insert_br_case(id, entry);
+ {
+indent_insert_br_case(id, entry);
+return 1;
+ }
else
- indent_text_auto_format(id, entry, insert);
+ return indent_text_auto_format(id, entry, insert);
}
}
--
[EGIT] [tools/enventor] master 01/01: template: remove new line trailiings.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=273d0c21666941e34871c17c1ec92db4689b22d8
commit 273d0c21666941e34871c17c1ec92db4689b22d8
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 24 13:17:22 2015 +0900
template: remove new line trailiings.
---
data/templates/basic.edc | 2 +-
data/templates/group.edc | 2 +-
data/templates/rotation+zoom.edc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/templates/basic.edc b/data/templates/basic.edc
index 05acebc..0967a5b 100644
--- a/data/templates/basic.edc
+++ b/data/templates/basic.edc
@@ -70,4 +70,4 @@ collections {
}
*/
}
-}
+}
\ No newline at end of file
diff --git a/data/templates/group.edc b/data/templates/group.edc
index 5721e63..36aa1d0 100644
--- a/data/templates/group.edc
+++ b/data/templates/group.edc
@@ -38,4 +38,4 @@ collections {
}
}
}
-}
+}
\ No newline at end of file
diff --git a/data/templates/rotation+zoom.edc b/data/templates/rotation+zoom.edc
index 1734881..6594fdd 100644
--- a/data/templates/rotation+zoom.edc
+++ b/data/templates/rotation+zoom.edc
@@ -39,4 +39,4 @@ collections {
}
}
}
-}
+}
\ No newline at end of file
--
[EGIT] [tools/enventor] master 02/02: menu: removed tooltips from menu buttons.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=7e31de5ce31729a32bb898b6656abcfd701a1644
commit 7e31de5ce31729a32bb898b6656abcfd701a1644
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 24 13:31:10 2015 +0900
menu: removed tooltips from menu buttons.
---
NEWS | 1 +
src/bin/menu.c | 16 +++-
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/NEWS b/NEWS
index 9cf8f5a..bd41717 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Additions:
Removes:
* Get rid of template insert feature per parts.
+ * Get rid of tooltips from menu buttons.
Improvements:
* Support more keywords in auto completion.
diff --git a/src/bin/menu.c b/src/bin/menu.c
index caff93d..19fa2d1 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -342,14 +342,12 @@ prev_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
}
static Evas_Object *
-btn_create(Evas_Object *parent, const char *label, const char *tooltip_msg,
- Evas_Smart_Cb cb, void *data)
+btn_create(Evas_Object *parent, const char *label, Evas_Smart_Cb cb, void
*data)
{
Evas_Object *btn;
btn = elm_button_add(parent);
elm_object_style_set(btn, anchor);
- elm_object_tooltip_text_set(btn, tooltip_msg);
elm_object_scale_set(btn, 1.25);
evas_object_smart_callback_add(btn, clicked, cb, data);
elm_object_text_set(btn, label);
@@ -646,28 +644,28 @@ menu_open(menu_data *md)
Evas_Object *btn;
//Button(New)
- btn = btn_create(layout, New, New File (F2), new_btn_cb, md);
+ btn = btn_create(layout, New, new_btn_cb, md);
elm_object_focus_set(btn, EINA_TRUE);
elm_object_part_content_set(layout, elm.swallow.new_btn, btn);
//Button(Save)
- btn = btn_create(layout, Save, Save File (F3), save_btn_cb, md);
+ btn = btn_create(layout, Save, save_btn_cb, md);
elm_object_part_content_set(layout, elm.swallow.save_btn, btn);
//Button(Load)
- btn = btn_create(layout, Load, Load File (F4), load_btn_cb, md);
+ btn = btn_create(layout, Load, load_btn_cb, md);
elm_object_part_content_set(layout, elm.swallow.load_btn, btn);
//Button(Setting)
- btn = btn_create(layout, Setting, Setting (F12), setting_btn_cb, md);
+ btn = btn_create(layout, Setting, setting_btn_cb, md);
elm_object_part_content_set(layout, elm.swallow.setting_btn, btn);
//Button(About)
- btn = btn_create(layout, About, About Enventor (F1), about_btn_cb, md);
+ btn = btn_create(layout, About, about_btn_cb, md);
elm_object_part_content_set(layout, elm.swallow.about_btn, btn);
//Button(Exit)
- btn = btn_create(layout, Exit, Exit Enventor, exit_btn_cb, md);
+ btn = btn_create(layout, Exit, exit_btn_cb, md);
elm_object_part_content_set(layout, elm.swallow.exit_btn, btn);
//Button(Prev)
--
[EGIT] [tools/enventor] master 01/01: revise description of live view.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=ca8c53e073bd7b223c21eb838a35289c5d35d945 commit ca8c53e073bd7b223c21eb838a35289c5d35d945 Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 24 13:37:31 2015 +0900 revise description of live view. --- src/bin/main.c| 2 +- src/bin/setting.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index 7e36af0..fb6f2e0 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -174,7 +174,7 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void *ev) live_edit_update(); char buf[256]; -snprintf(buf, sizeof(buf), View Scale: %2.2fx, scale); +snprintf(buf, sizeof(buf), Live View Scale: %2.2fx, scale); stats_info_msg_update(buf); return ECORE_CALLBACK_PASS_ON; diff --git a/src/bin/setting.c b/src/bin/setting.c index c87813b..71c02c3 100644 --- a/src/bin/setting.c +++ b/src/bin/setting.c @@ -285,7 +285,7 @@ general_layout_create(setting_data *sd, Evas_Object *parent) elm_slider_unit_format_set(slider_view, %1.2fx); elm_slider_min_max_set(slider_view, MIN_VIEW_SCALE, MAX_VIEW_SCALE); elm_slider_value_set(slider_view, (double) config_view_scale_get()); - elm_object_text_set(slider_view, View Scale ); + elm_object_text_set(slider_view, Live View Scale); evas_object_show(slider_view); elm_box_pack_end(box, slider_view); @@ -312,7 +312,7 @@ general_layout_create(setting_data *sd, Evas_Object *parent) elm_box_pack_end(box2, layout_padding3); - Evas_Object *label_view_size = label_create(layout_padding3, View Size); + Evas_Object *label_view_size = label_create(layout_padding3, Fixed Live View Size); elm_object_part_content_set(layout_padding3, elm.swallow.content, label_view_size); --
[EGIT] [apps/terminology] master 01/01: escapes: pretty-print some escapse and avoid ESC in debug logs
jpeg pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=09b4fddf84ad2d106e7f038cde35ead33af47a2f
commit 09b4fddf84ad2d106e7f038cde35ead33af47a2f
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Wed Jun 24 13:46:48 2015 +0900
escapes: pretty-print some escapse and avoid ESC in debug logs
ERR(Hello '%c', ESC) would result in Hello '\033' which means
the parent terminal (another terminology, maybe) would then try to
interpret ' as an escape char (ESC is \033 or 0x1b), and so it would
then forward more escapes to the parent.
Also, avoid printing BEL (and, well, beeping) when we are just
printing an error log.
I believe all those Unhandled escape logs should go to WRN or higher
log levels. Any thoughts, @billiob ?
See T2506 (for the test file)
---
src/bin/termptyesc.c | 78
1 file changed, 66 insertions(+), 12 deletions(-)
diff --git a/src/bin/termptyesc.c b/src/bin/termptyesc.c
index 94831c9..1d9adc4 100644
--- a/src/bin/termptyesc.c
+++ b/src/bin/termptyesc.c
@@ -25,11 +25,67 @@
#define ST 0x9c // String Terminator
#define BEL 0x07 // Bell
#define ESC 033 // Escape
+#define DEL 127
/* XXX: all handle_ functions return the number of bytes successfully read, 0
* if not enough bytes could be read
*/
+static const char *ASCII_CHARS_TABLE[] =
+{
+ NUL, // '\0'
+ SOH, // '\001'
+ STX, // '\002'
+ ETX, // '\003'
+ EOT, // '\004'
+ ENQ, // '\005'
+ ACK, // '\006'
+ BEL, // '\007'
+ BS, // '\010'
+ HT, // '\011'
+ LF, // '\012'
+ VT, // '\013'
+ FF, // '\014'
+ CR , // '\015'
+ SO, // '\016'
+ SI, // '\017'
+ DLE, // '\020'
+ DC1, // '\021'
+ DC2, // '\022'
+ DC3, // '\023'
+ DC4, // '\024'
+ NAK, // '\025'
+ SYN, // '\026'
+ ETB, // '\027'
+ CAN, // '\030'
+ EM, // '\031'
+ SUB, // '\032'
+ ESC, // '\033'
+ FS, // '\034'
+ GS, // '\035'
+ RS, // '\036'
+ US // '\037'
+};
+
+static const char *
+_safechar(unsigned int c)
+{
+ static char _str[9];
+
+ // This should avoid 'BEL' and 'ESC' in particular, which would
+ // have side effects in the parent terminal (esp. ESC).
+ if (c (sizeof(ASCII_CHARS_TABLE) / sizeof(ASCII_CHARS_TABLE[0])))
+ return ASCII_CHARS_TABLE[c];
+
+ if (c == DEL)
+ return DEL;
+
+ // The rest should be safe (?)
+ snprintf(_str, 9, %c, c);
+ _str[8] = '\0';
+ return _str;
+}
+
static int
_csi_arg_get(Eina_Unicode **ptr)
{
@@ -660,7 +716,7 @@ _handle_esc_csi(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
if (cc == ce) return 0;
*b = 0;
b = buf;
- DBG( CSI: '%c' args '%s', (int) *cc, (char *) buf);
+ DBG( CSI: '%s' args '%s', _safechar(*cc), (char *) buf);
switch (*cc)
{
case 'm': // color set
@@ -1052,7 +1108,7 @@ unhandled:
else
eina_strbuf_append_char(bf, c[i]);
}
-ERR(unhandled CSI '%c': %s, (int) *cc, eina_strbuf_string_get(bf));
+ERR(unhandled CSI '%s': %s, _safechar(*cc),
eina_strbuf_string_get(bf));
eina_strbuf_free(bf);
}
cc++;
@@ -1491,8 +1547,7 @@ _handle_esc_dcs(Termpty *ty EINA_UNUSED, const
Eina_Unicode *c, const Eina_Unico
/* Request status string */
if (len 1 buf[1] != 'q')
{
- ERR(invalid/unhandled dsc esc '$%c' (expected '$q'),
- (int) buf[1]);
+ ERR(invalid/unhandled dsc esc '$%s' (expected '$q'),
_safechar(buf[1]));
goto end;
}
if (len 4)
@@ -1513,7 +1568,7 @@ _handle_esc_dcs(Termpty *ty EINA_UNUSED, const
Eina_Unicode *c, const Eina_Unico
}
else
{
-ERR(invalid/unhandled dsc esc '$q\%c', (int) buf[3]);
+ERR(invalid/unhandled dsc esc '$q\%s',
_safechar(buf[3]));
goto end;
}
break;
@@ -1522,15 +1577,14 @@ _handle_esc_dcs(Termpty *ty EINA_UNUSED, const
Eina_Unicode *c, const Eina_Unico
case 'r': /* DECSTBM */
/* TODO: */
default:
- ERR(unhandled dsc request status string '$q%c',
- (int) buf[2]);
+ ERR(unhandled dsc request status string '$q%s',
_safechar(buf[2]));
goto end;
}
/* TODO */
break;
default:
// many others
-ERR(Unhandled DCS escape '%c', (int) buf[0]);
+ERR(Unhandled DCS escape '%s', _safechar(buf[0]));
break;
}
end:
@@ -1543,7 +1597,7 @@ _handle_esc(Termpty *ty, const Eina_Unicode *c,
Eina_Unicode *ce)
int len = ce - c;
if (len 1) return 0;
- DBG(ESC: '%c', (int) c[0]);
+ DBG(ESC: '%s', _safechar(c[0]));
switch (c[0])
{
case '[':
@@ -1664,7 +1718,7 @@ _handle_esc(Termpty *ty, const Eina_Unicode
