[EGIT] [apps/ephoto] master 01/02: Ephoto: Add new files to install edje.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=a74197b4a210ee6d574a47bea47ee64cb4206f9c
commit a74197b4a210ee6d574a47bea47ee64cb4206f9c
Author: Stephen Houston smhousto...@gmail.com
Date: Mon Feb 2 13:54:18 2015 -0600
Ephoto: Add new files to install edje.
---
data/themes/Makefile.am | 16 ++
data/themes/crop.edc| 144
2 files changed, 160 insertions(+)
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
new file mode 100644
index 000..642ef7c
--- /dev/null
+++ b/data/themes/Makefile.am
@@ -0,0 +1,16 @@
+MAINTAINERCLEANFILES = Makefile.in Makefile
+
+EDJE_CC = @edje_cc@
+
+filesdir = $(datadir)/$(PACKAGE)/themes
+files_DATA = crop.edj
+
+EXTRA_DIST = crop.edc
+
+crop.edj: Makefile $(EXTRA_DIST)
+ $(EDJE_CC) \
+ $(top_srcdir)/data/themes/crop.edc \
+ $(top_builddir)/data/themes/crop.edj
+
+clean-local:
+ rm -f *.edj
diff --git a/data/themes/crop.edc b/data/themes/crop.edc
new file mode 100644
index 000..dc68409
--- /dev/null
+++ b/data/themes/crop.edc
@@ -0,0 +1,144 @@
+collections {
+group { name: image_cropper;
+ parts {
+ part { name: background;
+ type: RECT;
+ description { state: default 0.0;
+color: 255 255 255 0;
+ }
+ }
+ part { name: clipper;
+ type: RECT;
+ description { state: default 0.0;
+color: 0 0 0 0;
+ }
+ description { state: show 0.0;
+color: 255 255 255 255;
+ }
+ }
+ part { name: ephoto.swallow.image;
+ type: SWALLOW;
+ scale: 1;
+ mouse_events: 0;
+ clip_to: clipper;
+ description { state: default 0.0;
+ }
+ }
+ part { name: shader_top;
+ type: RECT;
+ scale: 1;
+ mouse_events: 0;
+ clip_to: clipper;
+ description { state: default 0.0;
+color: 0 0 0 200;
+rel1.to: clipper;
+rel1.relative: 0.0 0.0;
+rel2.to: cropper;
+rel2.relative: 1.0 0.0;
+ }
+ }
+ part { name: shader_left;
+ type: RECT;
+ scale: 1;
+ mouse_events: 0;
+ clip_to: clipper;
+ description { state: default 0.0;
+color: 0 0 0 200;
+rel1.to: shader_top;
+rel1.relative: 0.0 1.0;
+rel2.to: cropper;
+rel2.relative: 0.0 1.0;
+ }
+ }
+ part { name: shader_bottom;
+ type: RECT;
+ scale: 1;
+ mouse_events: 0;
+ clip_to: clipper;
+ description { state: default 0.0;
+color: 0 0 0 200;
+rel1.to: shader_left;
+rel1.relative: 0.0 1.0;
+rel2.to: clipper;
+rel2.relative: 1.0 1.0;
+ }
+ }
+ part { name: shader_right;
+ type: RECT;
+ scale: 1;
+ mouse_events: 0;
+ clip_to: clipper;
+ description { state: default 0.0;
+color: 0 0 0 200;
+rel1.to: shader_top;
+rel1.relative: 1.0 0.0;
+rel2.to: shader_bottom;
+rel2.relative: 1.0 0.0;
+ }
+ }
+ part { name: cropper;
+ type: RECT;
+ scale: 1;
+ mouse_events: 0;
+ clip_to: clipper;
+ description { state: default 0.0;
+color: 255 255 255 0;
+rel1.to: rel1_dragable;
+rel2.to: rel2_dragable;
+ }
+ }
+ part { name: rel1_dragable;
+ type: RECT;
+ scale: 1;
+ mouse_events: 1;
+ clip_to: clipper;
+ description { state: default 0.0;
+color: 0 0 0 255;
+min: 16 16;
+max: 16 16;
+ }
+ dragable {
+confine: ephoto.swallow.image;
+x: 1 1 0;
+y: 1 1 0;
+ }
+ }
+ part { name: rel2_dragable;
+ type: RECT;
+ scale: 1;
+ mouse_events: 1;
+ clip_to: clipper;
+ description { state: default 0.0;
+color: 0 0 0 255;
+min: 16 16;
+max: 16 16;
+ }
+ dragable {
+confine: ephoto.swallow.image;
+x: 1 1 0;
+y: 1 1 0;
+ }
+ }
+ }
+ programs {
+ program { name: on_load_init;
+ signal: load;
+ source: ;
+ after: on_load_show;
+ script {
+set_drag(PART:rel1_dragable, 0.2, 0.2);
+set_drag(PART:rel2_dragable, 0.8, 0.8);
+ }
+ }
+ program { name: on_load_show;
+ action: STATE_SET show 0.0;
+ target: clipper;
+ transition: DECELERATE 0.25;
+ after: emit_drag_signal;
+ }
+ program { name: emit_drag_signal;
+ action: SIGNAL_EMIT drag rel2_dragable;
+ }
+ }
+}
+
--
[EGIT] [apps/ephoto] master 02/02: Ephoto: Add cropping: Warning: Very experimental at this point.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=06aea55c17ad960afeba1c0bfa8fcc07f3a887e5
commit 06aea55c17ad960afeba1c0bfa8fcc07f3a887e5
Author: Stephen Houston smhousto...@gmail.com
Date: Mon Feb 2 13:54:45 2015 -0600
Ephoto: Add cropping: Warning: Very experimental at this point.
---
configure.ac| 1 +
data/Makefile.am| 2 +-
src/bin/ephoto_single_browser.c | 236 +++-
3 files changed, 235 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index cb23d5a..d061b09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,6 +72,7 @@ AC_OUTPUT([
Makefile
data/Makefile
data/desktop/Makefile
+data/themes/Makefile
src/Makefile
src/bin/Makefile
$po_makefile_in
diff --git a/data/Makefile.am b/data/Makefile.am
index d4cb353..a9369e6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,2 +1,2 @@
MAINTAINERCLEANFILES = Makefile.in Makefile
-SUBDIRS = desktop
+SUBDIRS = desktop themes
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index d92078f..98509ed 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -144,7 +144,7 @@ _viewer_add(Evas_Object *parent, const char *path)
elm_image_file_set(v-image, path, group);
err = evas_object_image_load_error_get(elm_image_object_get(v-image));
if (err != EVAS_LOAD_ERROR_NONE) goto load_error;
- elm_image_object_size_get(v-image, w, h);
+ evas_object_image_size_get(elm_image_object_get(v-image), w, h);
elm_drop_target_add(v-image, ELM_SEL_FORMAT_IMAGE, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL);
evas_object_size_hint_min_set(v-image, w, h);
evas_object_size_hint_max_set(v-image, w, h);
@@ -674,6 +674,212 @@ _last_entry(Ephoto_Single_Browser *sb)
ephoto_single_browser_entry_set(sb-main, entry);
}
+static void _apply_crop(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+{
+ Evas_Object *win = data;
+ Evas_Object *layout = evas_object_data_get(win, layout);
+ Evas_Object *image = evas_object_data_get(layout, image);
+ Evas_Object *edje = elm_layout_edje_get(layout);
+ Evas_Object *image_object = elm_image_object_get(image);
+ Evas_Object *crop;
+ Ephoto_Single_Browser *sb = evas_object_data_get(win, single_browser);
+ Ephoto_Viewer *v = evas_object_data_get(sb-viewer, viewer);
+ const char *path, *key, *type;;
+ char tmp_path[PATH_MAX];
+ int x, y, w, h, cx, cy, cw, ch, iw, ih, sw, sh;
+ int nx, ny, nw, nh, i, j, tmpx, tmpy, ind, index;
+ double scalex, scaley, scalew, scaleh;
+ unsigned int *idata, *idata_new;
+
+ elm_image_file_get(image, path, key);
+ crop = evas_object_image_add(evas_object_evas_get(win));
+ evas_object_image_file_set(crop, path, key);
+
+ evas_object_geometry_get(layout, x, y, w, h);
+ edje_object_part_geometry_get(edje, cropper, cx, cy, cw, ch);
+ evas_object_image_size_get(crop, iw, ih);
+
+ idata = evas_object_image_data_get(crop, EINA_FALSE);
+
+ scalex = (double)cx/(double)w;
+ scaley = (double)cy/(double)h;
+ scalew = (double)cw/(double)w;
+ scaleh = (double)ch/(double)h;
+
+ nx = iw*scalex;
+ ny = ih*scaley;
+ nw = iw*scalew;
+ nh = ih*scaleh;
+
+ index = 0;
+ idata_new = malloc(sizeof(unsigned int)*nw*nh);
+
+ for (i = 0; i nh; i++)
+ {
+tmpy = (i+ny)*iw;
+for (j = 0; j nw; j++)
+ {
+ tmpx = j+nx;
+ ind = tmpy+tmpx;
+ idata_new[index] = idata[ind];
+ index++;
+ }
+ }
+ evas_object_image_size_set(crop, nw, nh);
+ evas_object_image_data_set(crop, idata_new);
+ evas_object_image_data_update_add(crop, 0, 0, nw, nh);
+
+ type = strrchr(sb-entry-basename, '.');
+ snprintf(tmp_path, PATH_MAX, %s/.config/ephoto/tmp%s, getenv(HOME),
type);
+ if (ecore_file_exists(tmp_path))
+ ecore_file_unlink(tmp_path);
+ evas_object_image_save(crop, tmp_path, NULL, NULL);
+
+ elm_image_file_set(v-image, tmp_path, NULL);
+ evas_object_geometry_get(sb-table, 0, 0, sw, sh);
+ if (nw sw nh sh)
+ _zoom_set(sb, 1.0);
+ else
+ _zoom_fit(sb);
+ evas_object_del(win);
+}
+
+static void _cancel_crop(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+{
+ Evas_Object *win = data;
+
+ evas_object_del(win);
+}
+
+static void _image_resize(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
Evas_Object *obj, void *event_info EINA_UNUSED)
+{
+ Evas_Object *image = data;
+ int sx, sy, sw, sh, iw, ih, diffw, diffh;
+
+ evas_object_geometry_get(obj, sx, sy, sw, sh);
+ evas_object_image_size_get(elm_image_object_get(image), iw, ih);
+ if (iw sw ih sh)
+ {
+diffw = sw - iw;
+diffh = sh - ih;
+diffw /= 2;
+diffh /= 2;
+evas_object_resize(obj, iw, ih);
+evas_object_move(obj, sx+diffw, sy+diffh);
+ }
+ else
+ {
[E-devel] E is completely broken in git
Hey, I'm too tired to investigate it further, already spent some time on it. Mike: you recent pixmap changes seem to have completely broken E for me. It segs, hangs, doesn't draw in some cases, or in general, a complete mess. I know Daniel Kolesa had issues with not being able to open e dialogs, maybe it's related. I'm not sure it's actually your pixmap commits, but all of the segfaults were in places related to pixmaps. I currently reverted back to 619afde7e58b11f342d4f31e814221671296b1e5 which works, and master from now didn't. I had some limited success with a version from Thursday, but was also mostly broken. -- Tom. -- Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/edi] master 12/15: Wait until the filtering is done to put everything in git
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=1056320432b4982cbfa6d7caf06c48d1156db586
commit 1056320432b4982cbfa6d7caf06c48d1156db586
Author: Andy Williams a...@andywilliams.me
Date: Mon Feb 2 23:01:23 2015 +
Wait until the filtering is done to put everything in git
---
src/lib/edi_create.c | 53 +++-
src/lib/edi_create.h | 2 ++
2 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/src/lib/edi_create.c b/src/lib/edi_create.c
index d404b6c..3ba1be4 100644
--- a/src/lib/edi_create.c
+++ b/src/lib/edi_create.c
@@ -65,6 +65,7 @@ _edi_create_filter_file(Edi_Create *create, const char *path)
const char *template;
int length;
+ create-filters++;
// TODO speed this up - pre-cache this filter!
template = sed -i
\s|\\${edi_name}|%s|g;s|\\${Edi_Name}|%s|g;s|\\${EDI_NAME}|%s|g;s|\\${Edi_User}|%s|ig;s|\\${Edi_Email}|%s|g;s|\\${Edi_Url}|$%s|g;s|\\${Edi_Year}|%d|g\
%s;
length = strlen(template) + (strlen(create-name) * 3) +
strlen(create-user) + strlen(create-email) + strlen(create-url) +
strlen(path) + 4 - 16 + 1;
@@ -86,7 +87,8 @@ _edi_create_filter_file(Edi_Create *create, const char *path)
free((void *) path);
}
-static void _edi_create_free_data()
+static void
+_edi_create_free_data()
{
Edi_Create *create;
@@ -102,6 +104,12 @@ static void _edi_create_free_data()
free(create);
}
+static void
+_edi_create_done_cb(void *data EINA_UNUSED, Eio_File *file EINA_UNUSED)
+{
+ // we're using the filter processes to determine when we're done
+}
+
static Eina_Bool
_edi_create_project_done(void *data, int type EINA_UNUSED, void *event
EINA_UNUSED)
{
@@ -116,6 +124,28 @@ _edi_create_project_done(void *data, int type EINA_UNUSED,
void *event EINA_UNUS
return ECORE_CALLBACK_DONE; // or ECORE_CALLBACK_PASS_ON
}
+static Eina_Bool
+_edi_create_filter_file_done(void *data, int type EINA_UNUSED, void *event
EINA_UNUSED)
+{
+ Edi_Create *create;
+ Ecore_Event_Handler *handler;
+
+ create = (Edi_Create *)data;
+
+ if (--create-filters 0)
+ return ECORE_CALLBACK_PASS_ON;
+
+ ecore_event_handler_del(create-handler);
+
+ handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_edi_create_project_done, data);
+ create-handler = handler;
+
+ chdir(create-path);
+ ecore_exe_run(git init git add ., data);
+
+ return ECORE_CALLBACK_PASS_ON;
+}
+
static void
_edi_create_move_done_cb(void *data, Eio_File *file EINA_UNUSED)
{
@@ -162,22 +192,6 @@ _edi_create_notify_cb(void *d, Eio_File *handler
EINA_UNUSED, const Eio_Progress
}
static void
-_edi_create_done_cb(void *d, Eio_File *file EINA_UNUSED)
-{
- Edi_Create *data;
- Ecore_Event_Handler *handler;
-
- data = (Edi_Create *) d;
-
- handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_edi_create_project_done, data);
- data-handler = handler;
-
- chdir(data-path);
- ecore_exe_run(git init git add ., data);
-}
-
-
-static void
_edi_create_error_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED,
int error)
{
@@ -191,6 +205,7 @@ edi_create_efl_project(const char *parentdir, const char
*name, const char *url,
{
char source[PATH_MAX], dest[PATH_MAX];
Edi_Create *data;
+ Ecore_Event_Handler *handler;
snprintf(source, sizeof(source), %s/skeleton/eflproject,
elm_app_data_dir_get());
snprintf(dest, sizeof(dest), %s/%s, parentdir, name);
@@ -207,6 +222,10 @@ edi_create_efl_project(const char *parentdir, const char
*name, const char *url,
data-callback = func;
_edi_create_data = data;
+ data-filters = 0;
+ handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_edi_create_filter_file_done, data);
+ data-handler = handler;
+
eio_dir_copy(source, dest, NULL, _edi_create_notify_cb, _edi_create_done_cb,
_edi_create_error_cb, data);
}
diff --git a/src/lib/edi_create.h b/src/lib/edi_create.h
index 7800451..2ec2ef4 100644
--- a/src/lib/edi_create.h
+++ b/src/lib/edi_create.h
@@ -21,6 +21,8 @@ typedef struct _Edi_Create
Edi_Create_Cb callback;
Ecore_Event_Handler *handler;
+
+ int filters;
} Edi_Create;
/**
--
[EGIT] [tools/edi] master 07/15: Merge branch 'remove_project_button'
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=dffb7f4dcc4085d24c9da1258799c396a6c44212 commit dffb7f4dcc4085d24c9da1258799c396a6c44212 Merge: 7bb6bca 7aa36c6 Author: Kelly Wilson wils...@cpsc.ucalgary.ca Date: Mon Feb 2 07:14:27 2015 -0700 Merge branch 'remove_project_button' Add a 'remove from project' icon to the welcome windows 'Recent Projects' list. src/bin/welcome/edi_welcome.c | 37 ++--- 1 file changed, 34 insertions(+), 3 deletions(-) --
[EGIT] [tools/edi] master 04/15: Edi_welcome.c: Ability to delete project
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=7aa36c64714f178426cece9eb230d5370c1ff874
commit 7aa36c64714f178426cece9eb230d5370c1ff874
Author: Kelly Wilson wils...@cpsc.ucalgary.ca
Date: Sun Feb 1 15:15:14 2015 -0700
Edi_welcome.c: Ability to delete project
Added the ability to delete a project on the welcome screen via an 'x'
beside the project name in the 'Recent Projects' list.
---
src/bin/welcome/edi_welcome.c | 37 ++---
1 file changed, 34 insertions(+), 3 deletions(-)
diff --git a/src/bin/welcome/edi_welcome.c b/src/bin/welcome/edi_welcome.c
index 43be047..a98629d 100644
--- a/src/bin/welcome/edi_welcome.c
+++ b/src/bin/welcome/edi_welcome.c
@@ -20,6 +20,7 @@ static Evas_Object *_create_inputs[5];
static Evas_Object *_edi_create_button, *_edi_open_button;
static const char *_edi_message_path;
+Eina_Bool _edi_list_item_x_clicked = EINA_FALSE;
static void _edi_welcome_add_recent_projects(Evas_Object *);
@@ -269,13 +270,34 @@ static void
_project_list_clicked(void *data, Evas_Object *li EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- _edi_welcome_project_open((const char *)data, EINA_FALSE);
+ if (_edi_list_item_x_clicked == EINA_TRUE)
+ {
+fprintf(stderr, %s\n, (const char *)data);
+
+_edi_config_project_remove((const char *)data);
+evas_object_del(_edi_welcome_list);
+_edi_welcome_add_recent_projects(_edi_project_box);
+evas_object_del(data);
+
+_edi_list_item_x_clicked = EINA_FALSE;
+ }
+ else
+ _edi_welcome_project_open((const char *)data, EINA_FALSE);
+}
+
+static void
+_edi_x_in_list_clicked(void *data EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ _edi_list_item_x_clicked = EINA_TRUE;
+ return;
}
static void
_edi_welcome_add_recent_projects(Evas_Object *box)
{
- Evas_Object *list, *label;
+ Evas_Object *list, *label, *ic, *icon_button;
Eina_List *listitem;
Edi_Config_Project *project;
char *display, *format;
@@ -293,16 +315,25 @@ _edi_welcome_add_recent_projects(Evas_Object *box)
display = malloc(sizeof(char) * displen);
snprintf(display, displen, format, project-path);
+// Add a 'close' icon that can be clicked to remove a project directory
+icon_button = elm_button_add(box);
+ic = elm_icon_add(icon_button);
+elm_icon_order_lookup_set(ic, ELM_ICON_LOOKUP_THEME_FDO);
+elm_icon_standard_set(ic, close);
+elm_image_resizable_set(ic, EINA_FALSE, EINA_FALSE);
+evas_object_smart_callback_priority_add(ic, clicked,
EVAS_CALLBACK_PRIORITY_BEFORE, _edi_x_in_list_clicked, box);
+
label = elm_label_add(box);
elm_object_text_set(label, display);
evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(label);
-elm_list_item_append(list, project-name, NULL, label,
_project_list_clicked, project-path);
+elm_list_item_append(list, project-name, ic, label,
_project_list_clicked, project-path);
free(display);
}
+
elm_box_pack_end(box, list);
evas_object_show(list);
}
--
[EGIT] [tools/edi] master 10/15: A working skeleton processor built into EDI, no scripts needed
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=4edcc6ba160cc1c1271d78f21688a0d6ac95c2d2
commit 4edcc6ba160cc1c1271d78f21688a0d6ac95c2d2
Author: Andy Williams a...@andywilliams.me
Date: Mon Feb 2 22:07:02 2015 +
A working skeleton processor built into EDI, no scripts needed
---
data/extra/Makefile.am | 1 -
data/extra/skeleton/eflproject/AUTHORS | 3 +-
.../eflproject/data/desktop/${edi_name}.desktop.in | 2 +-
.../extra/skeleton/eflproject/doc/${edi_name}.1.in | 4 +-
.../eflproject/packaging/pkgbuild/PKGBUILD | 4 +-
.../eflproject/packaging/slackware/slack-desc | 6 +-
.../skeleton/eflproject/src/bin/${edi_name}_main.c | 6 +-
.../src/lib/{${EDI_NAME}.h = ${Edi_Name}.h} | 22 +--
.../skeleton/eflproject/src/lib/${edi_name}.c | 4 +-
data/extra/skeleton/eflproject/src/lib/Makefile.am | 6 +-
.../eflproject/src/tests/test_${edi_name}.c| 6 +-
src/bin/edi_build_main.c | 7 +-
src/bin/welcome/edi_welcome.c | 38 +++-
src/lib/Edi.h | 1 +
src/lib/edi_create.c | 202 ++---
src/lib/edi_create.h | 7 +-
16 files changed, 257 insertions(+), 62 deletions(-)
diff --git a/data/extra/Makefile.am b/data/extra/Makefile.am
index 0032b03..f7932b2 100644
--- a/data/extra/Makefile.am
+++ b/data/extra/Makefile.am
@@ -9,5 +9,4 @@ install-data-hook:
uninstall-local:
rm -rf $(skeletondir)/skeleton
-
EXTRA_DIST = $(skeleton_DATA)
diff --git a/data/extra/skeleton/eflproject/AUTHORS
b/data/extra/skeleton/eflproject/AUTHORS
index c51bc99..60436d3 100644
--- a/data/extra/skeleton/eflproject/AUTHORS
+++ b/data/extra/skeleton/eflproject/AUTHORS
@@ -1,2 +1 @@
-${EDI_USER} ${EDI_EMAIL}
-
+${Edi_User} ${Edi_Email}
diff --git a/data/extra/skeleton/eflproject/data/desktop/${edi_name}.desktop.in
b/data/extra/skeleton/eflproject/data/desktop/${edi_name}.desktop.in
index e005207..a87b6d7 100644
--- a/data/extra/skeleton/eflproject/data/desktop/${edi_name}.desktop.in
+++ b/data/extra/skeleton/eflproject/data/desktop/${edi_name}.desktop.in
@@ -5,7 +5,7 @@ Type=Application
Name=@PACKAGE_NAME@
Name[fr]=@PACKAGE_NAME@
GenericName=Efl Application Skeletion
-Comment=Efl Application ${EDI_NAME}
+Comment=Efl Application ${Edi_Name}
Icon=@PACKAGE_NAME@
TryExec=@PACKAGE_NAME@
Exec=@PACKAGE_NAME@
diff --git a/data/extra/skeleton/eflproject/doc/${edi_name}.1.in
b/data/extra/skeleton/eflproject/doc/${edi_name}.1.in
index d7cafa9..0e3e367 100644
--- a/data/extra/skeleton/eflproject/doc/${edi_name}.1.in
+++ b/data/extra/skeleton/eflproject/doc/${edi_name}.1.in
@@ -9,7 +9,7 @@ ${edi_name} \- a demo application
.SH DESCRIPTION
-${EDI_NAME} is a demo application to show how to integrate EFL and autotools
into a
+${Edi_Name} is a demo application to show how to integrate EFL and autotools
into a
cross platform build. You should be able to generate an executable easily for
all
target supported by EFL with this ${edi_name}.
@@ -47,4 +47,4 @@ http://enlightenment.org
.SH AUTHORS
-${EDI_USER} ${EDI_EMAIL} and various contributors.
+${Edi_User} ${Edi_Email} and various contributors.
diff --git a/data/extra/skeleton/eflproject/packaging/pkgbuild/PKGBUILD
b/data/extra/skeleton/eflproject/packaging/pkgbuild/PKGBUILD
index ddcc9ab..4183aca 100644
--- a/data/extra/skeleton/eflproject/packaging/pkgbuild/PKGBUILD
+++ b/data/extra/skeleton/eflproject/packaging/pkgbuild/PKGBUILD
@@ -4,7 +4,7 @@ pkgver=1.8.99.8967.a1cfce6
pkgrel=1
pkgdesc=Enlightenment toolkit ${edi_name} - GIT development snapshot
arch=('i686' 'x86_64' 'arm')
-url=http://${EDI_WWW};
+url=http://${Edi_Url};
license=('WTFPL')
makedepends=('doxygen' 'imagemagick' 'git')
depends=('elementary-git')
@@ -49,7 +49,7 @@ package_${edi_name}-git() {
}
package_${edi_name}_doc-git() {
- pkgdesc=Documentation for ${EDI_NAME}
+ pkgdesc=Documentation for ${Edi_Name}
arch=('any')
unset depends optdepends
diff --git a/data/extra/skeleton/eflproject/packaging/slackware/slack-desc
b/data/extra/skeleton/eflproject/packaging/slackware/slack-desc
index f5aef32..96d1280 100644
--- a/data/extra/skeleton/eflproject/packaging/slackware/slack-desc
+++ b/data/extra/skeleton/eflproject/packaging/slackware/slack-desc
@@ -8,12 +8,12 @@
|-handy-ruler--|
${edi_name}: ${edi_name}
${edi_name}:
-${edi_name}: ${EDI_NAME} is an example of application written using the
Enlightenment
+${edi_name}: ${Edi_Name} is an example of application written using the
Enlightenment
${edi_name}: Foundation Libraries.
${edi_name}:
${edi_name}: It requires elementary.
${edi_name}:
-${edi_name}: ${edi_name} was written by ${EDI_USER} ${EDI_EMAIL}
-${edi_name}: website: http://${EDI_WWW}/
+${edi_name}:
[EGIT] [tools/edi] master 14/15: Use FDO icons for the toolbar.
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=9ab111c3cd602a7700ebcc35710c8c4665ee6113 commit 9ab111c3cd602a7700ebcc35710c8c4665ee6113 Author: Andy Williams a...@andywilliams.me Date: Mon Feb 2 23:15:07 2015 + Use FDO icons for the toolbar. We can switch to the elementary theme set when it's more complete --- src/bin/edi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c index 80346df..9b88e01 100644 --- a/src/bin/edi_main.c +++ b/src/bin/edi_main.c @@ -652,6 +652,7 @@ edi_toolbar_setup(Evas_Object *win) elm_toolbar_shrink_mode_set(tb, ELM_TOOLBAR_SHRINK_SCROLL); elm_toolbar_select_mode_set(tb, ELM_OBJECT_SELECT_MODE_NONE); elm_toolbar_align_set(tb, 0.0); + elm_toolbar_icon_order_lookup_set(tb, ELM_ICON_LOOKUP_FDO_THEME); elm_object_focus_allow_set(tb, EINA_FALSE); evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, 0.0); --
[EGIT] [tools/edi] master 03/15: Edi_editor.c: Fix segfault
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=22cfc584d696e0439c90d52ebbeff07c4b0426a1 commit 22cfc584d696e0439c90d52ebbeff07c4b0426a1 Author: Kelly Wilson wils...@cpsc.ucalgary.ca Date: Sun Feb 1 09:09:25 2015 -0700 Edi_editor.c: Fix segfault Fix a segfault when opening a file in a new window and then pressing a key without any other interaction. Simply check if item is null and return without action if it is. --- src/bin/editor/edi_editor.c | 4 1 file changed, 4 insertions(+) diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c index 51cf60a..613c610 100644 --- a/src/bin/editor/edi_editor.c +++ b/src/bin/editor/edi_editor.c @@ -172,6 +172,10 @@ _smart_cb_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED, shift = evas_key_modifier_is_set(ev-modifiers, Shift); item = edi_mainview_item_current_get(); + + if (!item) + return; + content = elm_object_item_content_get(item-view); editor = (Edi_Editor *)evas_object_data_get(content, editor); --
[EGIT] [tools/edi] master 06/15: Merge branch 'open_file_new_win'
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=7bb6bca74c8e3cb86bef0ce308f5813514380e06 commit 7bb6bca74c8e3cb86bef0ce308f5813514380e06 Merge: 4b81c21 22cfc58 Author: Kelly Wilson wils...@cpsc.ucalgary.ca Date: Sun Feb 1 16:30:29 2015 -0700 Merge branch 'open_file_new_win' Fix a segfault when opening a file in a new window and pressing a key immediately. src/bin/editor/edi_editor.c | 4 1 file changed, 4 insertions(+) --
[EGIT] [tools/edi] master 09/15: Merge branch 'hy_mixup'
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=ebcca9d1480bbaa5a6917c0c1abe6786824348df commit ebcca9d1480bbaa5a6917c0c1abe6786824348df Merge: dffb7f4 ddfaa27 Author: Kelly Wilson wils...@cpsc.ucalgary.ca Date: Mon Feb 2 13:32:27 2015 -0700 Merge branch 'hy_mixup' Fix an incorrect comment src/bin/editor/edi_editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[EGIT] [tools/edi] master 08/15: Comment fix
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=ddfaa2798e43b4f6ec616e8f07f4704fee73989e
commit ddfaa2798e43b4f6ec616e8f07f4704fee73989e
Author: Kelly Wilson wils...@cpsc.ucalgary.ca
Date: Mon Feb 2 13:30:56 2015 -0700
Comment fix
Fix a small mixup with a comment for horizontal scrolling
---
src/bin/editor/edi_editor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index 825e16b..8c3a12f 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -249,7 +249,7 @@ _scroll_cb(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSE
elm_scroller_region_get(editor-lines, NULL, NULL, NULL, h);
elm_scroller_region_show(editor-lines, 0, y, 10, h);
- // Don't update highlighting on y scroll, only h
+ // Don't update highlighting on h scroll, only y
if (_edi_global_y != y)
{
_update_highlight(editor);
--
[EGIT] [tools/edi] master 15/15: Merge in a new skeleton implentation.
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=e50ed5fb81c702cac76421fe1751843d9264ccca
commit e50ed5fb81c702cac76421fe1751843d9264ccca
Merge: 9ab111c 99e0def
Author: Andy Williams a...@andywilliams.me
Date: Mon Feb 2 23:15:14 2015 +
Merge in a new skeleton implentation.
No longer rely on a shell script to set up project templates.
Addition of year variable means that the code seems up to date.
TODO | 3 -
data/extra/Makefile.am | 4 +-
data/extra/skeleton.tar.gz | Bin 588571 - 0 bytes
data/extra/skeleton/eflproject/.gitignore | 63 ++
data/extra/skeleton/eflproject/AUTHORS | 1 +
data/extra/skeleton/eflproject/COPYING | 674 +
data/extra/skeleton/eflproject/ChangeLog | 0
data/extra/skeleton/eflproject/GPLv2.txt | 344 +++
data/extra/skeleton/eflproject/INSTALL | 370 +++
data/extra/skeleton/eflproject/Makefile.am | 93 +++
.../skeleton/eflproject/Makefile_Edje_Helper.am| 9 +
data/extra/skeleton/eflproject/NEWS| 0
data/extra/skeleton/eflproject/README | 0
data/extra/skeleton/eflproject/TODO| 0
data/extra/skeleton/eflproject/autogen.sh | 15 +
data/extra/skeleton/eflproject/configure.ac| 98 +++
data/extra/skeleton/eflproject/data/Makefile.am| 3 +
.../eflproject/data/desktop/${edi_name}.desktop.in | 12 +
.../eflproject/data/desktop/${edi_name}.png| Bin 0 - 82822 bytes
.../skeleton/eflproject/data/desktop/Makefile.am | 9 +
.../skeleton/eflproject/data/themes/Makefile.am| 4 +
.../eflproject/data/themes/default/Makefile.am | 22 +
.../eflproject/data/themes/default/default.edc | 21 +
.../data/themes/default/images/enlightenment.png | Bin 0 - 2046 bytes
.../eflproject/data/themes/default/sounds/bell.wav | Bin 0 - 242396 bytes
data/extra/skeleton/eflproject/description | 1 +
.../extra/skeleton/eflproject/doc/${edi_name}.1.in | 50 ++
data/extra/skeleton/eflproject/doc/Makefile.am | 38 ++
data/extra/skeleton/eflproject/m4/efl.m4 | 123
data/extra/skeleton/eflproject/m4/efl_attribute.m4 | 56 ++
data/extra/skeleton/eflproject/m4/efl_binary.m4| 79 +++
.../skeleton/eflproject/m4/efl_compiler_flag.m4| 57 ++
data/extra/skeleton/eflproject/m4/efl_doxygen.m4 | 98 +++
data/extra/skeleton/eflproject/m4/efl_path_max.m4 | 36 ++
data/extra/skeleton/eflproject/m4/efl_tests.m4 | 65 ++
.../skeleton/eflproject/packaging/Makefile.am | 4 +
.../eflproject/packaging/pkgbuild/Makefile.am | 3 +
.../eflproject/packaging/pkgbuild/PKGBUILD | 60 ++
.../packaging/slackware/${edi_name}.SlackBuild | 106
.../eflproject/packaging/slackware/Makefile.am | 4 +
.../eflproject/packaging/slackware/doinst.sh | 1 +
.../eflproject/packaging/slackware/slack-desc | 19 +
.../eflproject/packaging/slackware/slack-required | 5 +
data/extra/skeleton/eflproject/po/Makevars | 41 ++
data/extra/skeleton/eflproject/po/POTFILES.in | 2 +
data/extra/skeleton/eflproject/src/Makefile.am | 4 +
.../skeleton/eflproject/src/bin/${edi_name}_main.c | 118
.../eflproject/src/bin/${edi_name}_private.h | 6 +
data/extra/skeleton/eflproject/src/bin/Makefile.am | 19 +
data/extra/skeleton/eflproject/src/bin/gettext.h | 280 +
.../skeleton/eflproject/src/lib/${Edi_Name}.h | 111
.../skeleton/eflproject/src/lib/${edi_name}.c | 64 ++
.../eflproject/src/lib/${edi_name}_private.h | 27 +
data/extra/skeleton/eflproject/src/lib/Makefile.am | 18 +
.../skeleton/eflproject/src/tests/Makefile.am | 17 +
.../eflproject/src/tests/test_${edi_name}.c| 124
src/bin/edi_build_main.c | 7 +-
src/bin/welcome/edi_welcome.c | 38 +-
src/lib/Edi.h | 1 +
src/lib/edi_create.c | 217 ++-
src/lib/edi_create.h | 9 +-
61 files changed, 3621 insertions(+), 32 deletions(-)
--
[EGIT] [tools/edi] master 13/15: Update TODO with latest work
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=99e0def2f01cfbf47670ecb989d959df2767a644 commit 99e0def2f01cfbf47670ecb989d959df2767a644 Author: Andy Williams a...@andywilliams.me Date: Mon Feb 2 23:07:11 2015 + Update TODO with latest work --- TODO | 3 --- 1 file changed, 3 deletions(-) diff --git a/TODO b/TODO index bcbbe52..f212bc1 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,6 @@ This project is in heavy development, we are currenty working towards the Code aware editor phase, the following work is still to be done: -* Tidy test panel output - summarise run and click to show test -* Better skeleton template generation (including year) - * Redo changes that have been undone * Add a menu for easier access to some features * Search / replace in project / directory --
[EGIT] [tools/edi] master 02/15: Fix horizontal scroll highlighting
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=a64ea17e6869660071284100c9416aaffd1504e7
commit a64ea17e6869660071284100c9416aaffd1504e7
Author: Kelly Wilson wils...@cpsc.ucalgary.ca
Date: Sat Jan 31 12:24:25 2015 -0700
Fix horizontal scroll highlighting
This small change just bypasses highlighting if there is a y scroll.
Vertical scrolling still updates the highlighting.
---
AUTHORS | 2 +-
src/bin/editor/edi_editor.c | 9 +++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 24b3576..3a81e9a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
ajwillia.ms (Andy Williams) a...@andywilliams.me
-wilsonk(Kelly Wilson) wils...@cpsc.ucalgary.ca
+wilsonk (Kelly Wilson) wils...@cpsc.ucalgary.ca
With sections from Ecrire by Tom Hacohen t...@stosb.com
Clang syntax higlighting from cedric and TAsn in the edi PROTO project
diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index 51cf60a..f397486 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -239,13 +239,18 @@ _scroll_cb(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSE
{
Edi_Editor *editor = data;
Evas_Coord y, h;
+ static Evas_Coord _edi_global_y;
-// TODO ignore y scrolls - just return;
elm_scroller_region_get(editor-entry, NULL, y, NULL, NULL);
elm_scroller_region_get(editor-lines, NULL, NULL, NULL, h);
elm_scroller_region_show(editor-lines, 0, y, 10, h);
- _update_highlight(editor);
+ // Don't update highlighting on y scroll, only h
+ if (_edi_global_y != y)
+ {
+_update_highlight(editor);
+ _edi_global_y = y;
+ }
}
static void
--
[EGIT] [core/enlightenment] master 02/02: Revert ref/free client pixmaps during hide animations
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=256378577cfb34d762104bd1858ab07daa3de229
commit 256378577cfb34d762104bd1858ab07daa3de229
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Feb 2 17:40:11 2015 -0500
Revert ref/free client pixmaps during hide animations
This reverts commit bbb04ecb32736cc2ed781b1ac29dd7fbcf7dcb42.
also fixed by deferred resource releasing
---
src/bin/e_comp_object.c | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 7944df0..4b78de8 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -631,24 +631,20 @@ static void
_e_comp_object_done_defer(void *data, Evas_Object *obj EINA_UNUSED, const char
*emission, const char *source EINA_UNUSED)
{
E_Comp_Object *cw = data;
- Eina_Bool hiding;
//INF(DONE DEFER %p: %dx%d - %s, cw-ec, cw-w, cw-h, emission);
/* visible clients which have never been sized are a bug */
if ((!cw-ec-new_client) (!cw-ec-changes.size) ((cw-w 0) ||
(cw-h 0)) (!strcmp(emission, e,action,show,done)))
CRI(ACK!);
- hiding = !strcmp(emission, e,action,hide,done);
if (cw-animating)
{
cw-animating--;
cw-comp-animating--;
-if (hiding)
- e_pixmap_free(cw-ec-pixmap);
/* remove ref from animation start, account for possibility of
deletion from unref */
if (!e_object_unref(E_OBJECT(cw-ec))) return;
}
/* hide only after animation finishes to guarantee a full run of the
animation */
- if (cw-defer_hide hiding)
+ if (cw-defer_hide (!strcmp(emission, e,action,hide,done)))
evas_object_hide(cw-smart_obj);
else if (!cw-animating)
e_comp_shape_queue(cw-comp);
@@ -1279,7 +1275,6 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
cw-comp-animating++;
cw-animating++;
e_object_ref(E_OBJECT(cw-ec));
- e_pixmap_ref(cw-ec-pixmap);
}
cw-defer_hide = !!cw-animating;
if (!cw-animating)
--
[EGIT] [core/enlightenment] master 01/02: make wl clients use post render canvas cb to clear buffers
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=bc59464f99931ccede6e3739e3f6b062580e08ae
commit bc59464f99931ccede6e3739e3f6b062580e08ae
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Feb 2 16:45:18 2015 -0500
make wl clients use post render canvas cb to clear buffers
---
src/bin/e_comp_wl.c | 6 +-
src/bin/e_pixmap.c | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 88e7e4c..bfc838c 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2580,7 +2580,11 @@ e_comp_wl_surface_commit(E_Client *ec)
e_pixmap_dirty(ep);
/* refresh pixmap */
- e_pixmap_refresh(ep);
+ if (e_pixmap_refresh(ep))
+ {
+e_comp-post_updates = eina_list_append(e_comp-post_updates, ec);
+e_object_ref(E_OBJECT(ec));
+ }
/* check for any pending attachments */
if (ec-comp_data-pending.new_attach)
diff --git a/src/bin/e_pixmap.c b/src/bin/e_pixmap.c
index 9382b58..fec0564 100644
--- a/src/bin/e_pixmap.c
+++ b/src/bin/e_pixmap.c
@@ -464,10 +464,9 @@ e_pixmap_refresh(E_Pixmap *cp)
if (success)
{
/* if (cp-resource) _e_pixmap_resource_free(cp-resource);
*/
- e_pixmap_image_clear(cp, EINA_TRUE);
+ e_pixmap_image_clear(cp, EINA_FALSE);
cp-resource = res;
_e_pixmap_update_wl(cp);
- e_pixmap_image_clear(cp, EINA_FALSE);
}
else
{
@@ -683,6 +682,7 @@ e_pixmap_image_clear(E_Pixmap *cp, Eina_Bool cache)
{
cp-resource_cache =
eina_list_append(cp-resource_cache, cp-resource);
+ cp-resource = NULL;
}
}
#endif
--
[EGIT] [core/efl] master 01/01: evas/examples: just change file name.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8ee679cb6e47a134b8fa300a81fc64c7d647aa99
commit 8ee679cb6e47a134b8fa300a81fc64c7d647aa99
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Feb 3 10:50:03 2015 +0900
evas/examples: just change file name.
---
src/examples/evas/{primitives.c = evas-3d-primitives.c} | 0
src/examples/evas/evas-3d-shadows.c | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/examples/evas/primitives.c
b/src/examples/evas/evas-3d-primitives.c
similarity index 100%
rename from src/examples/evas/primitives.c
rename to src/examples/evas/evas-3d-primitives.c
diff --git a/src/examples/evas/evas-3d-shadows.c
b/src/examples/evas/evas-3d-shadows.c
index b0247fc..b66da8f 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -14,7 +14,7 @@
#include Ecore.h
#include Ecore_Evas.h
#include math.h
-#include primitives.c
+#include evas-3d-primitives.c
#define WIDTH 1024
#define HEIGHT 1024
--
[EGIT] [tools/edi] master 01/01: Correctly lookup icon paths - @fix T2044.
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=e622acf735c569a695501acc44d59a21048bd207 commit e622acf735c569a695501acc44d59a21048bd207 Author: Andy Williams a...@andywilliams.me Date: Mon Feb 2 23:52:04 2015 + Correctly lookup icon paths - @fix T2044. Set up elm with the appropriate compile option variables. --- elm_code/bin/Makefile.am | 3 +++ elm_code/bin/elm_code_test_main.c | 4 src/bin/Makefile.am | 2 ++ src/bin/edi_main.c| 4 4 files changed, 13 insertions(+) diff --git a/elm_code/bin/Makefile.am b/elm_code/bin/Makefile.am index b081d5f..0e6d5ba 100644 --- a/elm_code/bin/Makefile.am +++ b/elm_code/bin/Makefile.am @@ -3,6 +3,9 @@ MAINTAINERCLEANFILES = Makefile.in bin_PROGRAMS = elm_code_test AM_CPPFLAGS = \ +-DPACKAGE_BIN_DIR=\$(bindir)\ \ +-DPACKAGE_LIB_DIR=\$(libdir)\ \ +-DPACKAGE_DATA_DIR=\$(datadir)/$(PACKAGE)\ \ -I$(top_srcdir)/elm_code/lib/ \ -DLOCALEDIR=\$(datadir)/locale\ \ -DEFL_BETA_API_SUPPORT \ diff --git a/elm_code/bin/elm_code_test_main.c b/elm_code/bin/elm_code_test_main.c index 2897c3c..6888459 100644 --- a/elm_code/bin/elm_code_test_main.c +++ b/elm_code/bin/elm_code_test_main.c @@ -166,6 +166,10 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED) goto end; } + /* tell elm about our app so it can figure out where to get files */ + elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); + elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR); + elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); elm_app_info_set(elm_main, elm_code_test, images/elm_code.png); if (!(win = elm_code_test_win_setup())) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 0a5bf9b..aa95283 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects bin_PROGRAMS = edi edi_build AM_CPPFLAGS = \ +-DPACKAGE_BIN_DIR=\$(bindir)\ \ +-DPACKAGE_LIB_DIR=\$(libdir)\ \ -DPACKAGE_DATA_DIR=\$(datadir)/$(PACKAGE)\ \ -DLOCALEDIR=\$(datadir)/locale\ \ -I$(top_srcdir)/src/bin/ \ diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c index 9b88e01..a89750b 100644 --- a/src/bin/edi_main.c +++ b/src/bin/edi_main.c @@ -859,6 +859,10 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED) project_path = argv[args]; } + /* tell elm about our app so it can figure out where to get files */ + elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); + elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR); + elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); elm_app_info_set(elm_main, edi, images/edi.png); if (!project_path) --
[EGIT] [core/efl] master 01/01: [Evas: Evas_3D] Improve shadows example.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=77d6f8aa17ac02deb160590156b92615be6fc6d4
commit 77d6f8aa17ac02deb160590156b92615be6fc6d4
Author: Dmytro Dadyka d.dad...@samsung.com
Date: Tue Feb 3 10:44:44 2015 +0900
[Evas: Evas_3D] Improve shadows example.
Reviewers: cedric, raster, Hermet
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D1891
---
src/examples/evas/evas-3d-shadows.c | 419 +++-
src/examples/evas/primitives.c | 292 +
2 files changed, 518 insertions(+), 193 deletions(-)
diff --git a/src/examples/evas/evas-3d-shadows.c
b/src/examples/evas/evas-3d-shadows.c
index 1d44d3b..b0247fc 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -6,7 +6,6 @@
* Compile with gcc -o evas-3d-shadows evas-3d-shadows.c `pkg-config --libs
--cflags efl evas ecore ecore-evas eo` -lm
*/
-
#define EFL_EO_API_SUPPORT
#define EFL_BETA_API_SUPPORT
@@ -15,36 +14,52 @@
#include Ecore.h
#include Ecore_Evas.h
#include math.h
+#include primitives.c
#define WIDTH 1024
#define HEIGHT 1024
+#define BG_COLOR 0.2, 0.2, 0.2
+#define AMBIENT_LIGHT 0.2, 0.2, 0.2
+#define DIFFUSE_LIGHT 1.0, 1.0, 1.0
+#define SPECULAR_LIGHT 1.0, 1.0, 1.0
+
Ecore_Evas *ecore_evas = NULL;
Evas *evas = NULL;
Eo *background = NULL;
Eo *image = NULL;
-Eo *scene = NULL;
-Eo *root_node = NULL;
-Eo *camera_node = NULL;
-Eo *light_node = NULL;
-Eo *camera = NULL;
-Eo *mesh_node = NULL;
-Eo *mesh_node1 = NULL;
-Eo *mesh = NULL;
-Eo *mesh1 = NULL;
-Eo *material = NULL;
-Eo *material1 = NULL;
-Eo *texture = NULL;
-Eo *light = NULL;
-Ecore_Animator *anim = NULL;
+typedef struct _Body_3D
+{
+ Eo *material;
+ Eo *mesh;
+ Eo *node;
+} Body_3D;
+
+typedef struct _Scene_Data
+{
+ Eo *scene;
+ Eo *root_node;
+ Eo *camera_node;
+ Eo *camera;
+ Eo *light_node;
+ Eo *light;
+
+ Body_3D sphere;
+ Body_3D cube;
+ Body_3D square;
+ Body_3D cylinder;
+ Body_3D model;
+ Body_3D cone;
+} Scene_Data;
static Eina_Bool
_animate_scene(void *data)
{
static int frame = 0;
+ Body_3D *body = (Body_3D *)data;
- eo_do((Evas_3D_Node *)data, evas_3d_node_mesh_frame_set(mesh, frame));
+ eo_do(body-node, evas_3d_node_mesh_frame_set(body-mesh, frame));
frame += 32;
@@ -69,218 +84,235 @@ _on_canvas_resize(Ecore_Evas *ee)
eo_do(image, evas_obj_size_set(w, h));
}
-static double pi = 3.14159265359;
-typedef struct _vec3
+static void
+_body_material_set(Body_3D *body, float r, float g, float b)
{
-float x;
-float y;
-float z;
-} vec3;
+ body-material = eo_add(EVAS_3D_MATERIAL_CLASS, evas);
-typedef struct _vec4
-{
-float x;
-float y;
-float z;
-float w;
-} vec4;
+ eo_do(body-material,
+ evas_3d_material_enable_set(EVAS_3D_MATERIAL_AMBIENT, EINA_TRUE),
+ evas_3d_material_enable_set(EVAS_3D_MATERIAL_DIFFUSE, EINA_TRUE),
+ evas_3d_material_enable_set(EVAS_3D_MATERIAL_SPECULAR, EINA_TRUE),
-static void
-_set_ball(Eo *ball_mesh, double r, double x, double y, double z, int p,
Evas_3D_Material *ball_material)
-{
- int vcount, icount, vccount, i, j;
- double dtheta, dfi, sinth, costh, fi, theta, sinfi, cosfi;
- unsigned short *indices, *index;
-
- icount = p * p * 6;
- vccount = p + 1;
- vcount = vccount * vccount;
-
- dtheta = pi / p;
- dfi = 2 * pi / p;
-
- vec3 *vertices = malloc(sizeof(vec3) * vcount);
- vec3 *normals = malloc(sizeof(vec3) * vcount);
-
- for (j = 0; j vccount; j++)
- {
-theta = j * dtheta;
-sinth = sin(theta);
-costh = cos(theta);
-for (i = 0; i vccount; i++)
- {
- fi = i * dfi;
- sinfi = sin(fi);
- cosfi = cos(fi);
- vertices[i + j * vccount].x = r * sinth * cosfi + x;
- vertices[i + j * vccount].y = r * sinth * sinfi + y;
- vertices[i + j * vccount].z = r * costh + z;
-
- normals[i + j * vccount].x = sinth * cosfi;
- normals[i + j * vccount].y = sinth * sinfi;
- normals[i + j * vccount].z = costh;
- }
- }
-
- indices = malloc(sizeof(short) * icount);
- index = indices[0];
-
- for(j = 0; j p; j++)
- for(i = 0; i p; i++)
- {
- *index++ = (unsigned short)(i + vccount * j);
- *index++ = i + vccount * (j + 1);
- *index++ = i + 1 + vccount * (j + 1);
-
- *index++ = i + vccount * j;
- *index++ = i + 1 + vccount * j;
- *index++ = i + vccount * (j + 1) + 1;
- }
-
- eo_do(ball_mesh, evas_3d_mesh_vertex_count_set(vcount),
-evas_3d_mesh_frame_add(0);
-evas_3d_mesh_frame_vertex_data_copy_set(0, EVAS_3D_VERTEX_POSITION,
- sizeof(vec3),
[EGIT] [apps/ephoto] master 01/01: Ephoto: Make sure to change info label on crop.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=813805118c24aff36d1e37872b19be867605153b
commit 813805118c24aff36d1e37872b19be867605153b
Author: Stephen Houston smhousto...@gmail.com
Date: Mon Feb 2 15:48:52 2015 -0600
Ephoto: Make sure to change info label on crop.
---
src/bin/ephoto_single_browser.c | 71 +
1 file changed, 43 insertions(+), 28 deletions(-)
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index 98509ed..929279a 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -461,6 +461,39 @@ _last_entry_find(Ephoto_Single_Browser *sb)
return eina_list_last_data_get(sb-ephoto-entries);
}
+static const char *
+_ephoto_get_file_size(const char *path)
+{
+ char isize[PATH_MAX];
+ Eina_File *f = eina_file_open(path, EINA_FALSE);
+ size_t size = eina_file_size_get(f);
+ eina_file_close(f);
+ double dsize = (double)size;
+ if (dsize 1024.0) snprintf(isize, sizeof(isize), %'.0f bytes, dsize);
+ else
+ {
+dsize /= 1024.0;
+if (dsize 1024) snprintf(isize, sizeof(isize), %'.0f KB, dsize);
+else
+ {
+ dsize /= 1024.0;
+ if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f MB,
dsize);
+ else
+ {
+ dsize /= 1024.0;
+ if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f GB,
dsize);
+ else
+{
+ dsize /= 1024.0;
+ snprintf(isize, sizeof(isize), %'.1f TB, dsize);
+}
+ }
+ }
+ }
+ return strdup(isize);
+}
+
+
static void
_ephoto_single_browser_recalc(Ephoto_Single_Browser *sb)
{
@@ -486,40 +519,15 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb)
if (sb-viewer)
{
char image_info[PATH_MAX];
- char isize[PATH_MAX];
Evas_Coord w, h;
Evas_Object *botbox;
Ephoto_Viewer *v = evas_object_data_get(sb-viewer, viewer);
- Eina_File *f = eina_file_open(sb-entry-path, EINA_FALSE);
- size_t size = eina_file_size_get(f);
- eina_file_close(f);
- double dsize = (double)size;
- if (dsize 1024.0) snprintf(isize, sizeof(isize), %'.0f bytes,
dsize);
- else
- {
- dsize /= 1024.0;
- if (dsize 1024) snprintf(isize, sizeof(isize), %'.0f KB,
dsize);
- else
-{
- dsize /= 1024.0;
- if (dsize 1024) snprintf(isize, sizeof(isize), %'.1f
MB, dsize);
- else
- {
-dsize /= 1024.0;
-if (dsize 1024) snprintf(isize, sizeof(isize),
%'.1f GB, dsize);
-else
- {
- dsize /= 1024.0;
- snprintf(isize, sizeof(isize), %'.1f TB,
dsize);
- }
- }
-}
- }
evas_object_image_size_get(elm_image_object_get(v-image), w,
h);
snprintf(image_info, PATH_MAX,
bType:/b %sbResolution:/b %dx%d
bFile Size: /b%s,
- efreet_mime_type_get(sb-entry-path), w, h, isize);
+ efreet_mime_type_get(sb-entry-path), w, h,
+ _ephoto_get_file_size(sb-entry-path));
elm_table_pack(sb-table, sb-viewer, 0, 1, 4, 1);
evas_object_show(sb-viewer);
@@ -685,7 +693,7 @@ static void _apply_crop(void *data, Evas_Object *obj
EINA_UNUSED, void *event_in
Ephoto_Single_Browser *sb = evas_object_data_get(win, single_browser);
Ephoto_Viewer *v = evas_object_data_get(sb-viewer, viewer);
const char *path, *key, *type;;
- char tmp_path[PATH_MAX];
+ char tmp_path[PATH_MAX], info[PATH_MAX];
int x, y, w, h, cx, cy, cw, ch, iw, ih, sw, sh;
int nx, ny, nw, nh, i, j, tmpx, tmpy, ind, index;
double scalex, scaley, scalew, scaleh;
@@ -737,10 +745,17 @@ static void _apply_crop(void *data, Evas_Object *obj
EINA_UNUSED, void *event_in
elm_image_file_set(v-image, tmp_path, NULL);
evas_object_geometry_get(sb-table, 0, 0, sw, sh);
+
+ snprintf(info, PATH_MAX,
+bType:/b %sbResolutions/b: %dx%d
bSize/b: %s,
+efreet_mime_type_get(tmp_path), nw, nh,
_ephoto_get_file_size(tmp_path));
+ elm_object_text_set(sb-infolabel, info);
+
if (nw sw nh sh)
_zoom_set(sb, 1.0);
else
_zoom_fit(sb);
+
evas_object_del(win);
}
--
[EGIT] [core/efl] master 01/01: Revert eina: eina_file - fix invalid read of size 1 in valgrind
herdsman pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7cbf22212f0c3292dbd1919f4cdd15802e9b9d84 commit 7cbf22212f0c3292dbd1919f4cdd15802e9b9d84 Author: Daniel Hirt daniel.h...@samsung.com Date: Mon Feb 2 14:10:04 2015 +0200 Revert eina: eina_file - fix invalid read of size 1 in valgrind This reverts commit f52f5628916f44a6b8ce1fdd3b9cc40f6c997eda. This is reverted because it breaks eina_file_path_sanitize when using /../ in paths, for example: eina_file_path_sanitize(/home/../mydir/myfile) returns: /mydir/myfili What invalid read size does this fix? Why was no test case specified? Anyway, this change affects too much code to leave it in like this. --- src/lib/eina/eina_file_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c index 6a573da..3e5b615 100644 --- a/src/lib/eina/eina_file_common.c +++ b/src/lib/eina/eina_file_common.c @@ -88,7 +88,7 @@ _eina_file_escape(char *path, size_t len) char tmp; len -= p + 3 - q; - memmove(q, p + 3, len - (q - result) - 1); + memmove(q, p + 3, len - (q - result)); result[len] = '\0'; p = q; --
[EGIT] [core/efl] master 01/01: edje: edje_entry - remove dead code
woohyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=105132825694766e15186339f80f52dfe96d396c
commit 105132825694766e15186339f80f52dfe96d396c
Author: WooHyun Jung wh0705.j...@samsung.com
Date: Mon Feb 2 19:12:42 2015 +0900
edje: edje_entry - remove dead code
---
src/lib/edje/edje_entry.c | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index ac7c8c7..5b73afe 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -3587,12 +3587,7 @@ _edje_entry_cursor_up(Edje_Real_Part *rp, Edje_Cursor
cur)
return EINA_FALSE;
evas_textblock_cursor_char_geometry_get(c, cx, cy, cw, ch);
if (!evas_textblock_cursor_char_coord_set(c, cx, ly + (lh / 2)))
- {
-if (cx (lx + (lw / 2)))
- evas_textblock_cursor_line_char_last(c);
-else
- evas_textblock_cursor_line_char_last(c);
- }
+ evas_textblock_cursor_line_char_last(c);
_sel_update(en-ed, c, rp-object, rp-typedata.text-entry_data);
_edje_entry_imf_cursor_info_set(en);
--
[EGIT] [tools/enventor] master 01/01: common: Move Enventor.h to common header file of application.
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=4fd5b2f1323884449c5e05c42944b51b3833a889
commit 4fd5b2f1323884449c5e05c42944b51b3833a889
Author: Jaehyun Cho jae_hyun@samsung.com
Date: Mon Feb 2 20:05:50 2015 +0900
common: Move Enventor.h to common header file of application.
Move Enventor.h to common.h to let application files include
Enventor.h and Elementary.h easily by including only common.h.
---
src/bin/base_gui.c| 1 -
src/bin/config_data.c | 1 -
src/bin/console.c | 1 -
src/bin/file_mgr.c| 3 ---
src/bin/globals.c | 1 -
src/bin/goto.c| 3 ---
src/bin/live_edit.c | 3 ---
src/bin/main.c| 3 ---
src/bin/menu.c| 3 ---
src/bin/newfile.c | 3 ---
src/bin/panes.c | 1 -
src/bin/search.c | 3 ---
src/bin/setting.c | 1 -
src/bin/statusbar.c | 1 -
src/bin/tools.c | 3 ---
src/include/common.h | 3 +++
16 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 3ed37a6..f7dc4f6 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -1,4 +1,3 @@
-#include Elementary.h
#include common.h
typedef struct base_s
diff --git a/src/bin/config_data.c b/src/bin/config_data.c
index ef6956e..75f2edb 100644
--- a/src/bin/config_data.c
+++ b/src/bin/config_data.c
@@ -1,4 +1,3 @@
-#include Elementary.h
#include common.h
typedef struct config_s
diff --git a/src/bin/console.c b/src/bin/console.c
index ee606e5..4d98a2c 100644
--- a/src/bin/console.c
+++ b/src/bin/console.c
@@ -1,4 +1,3 @@
-#include Elementary.h
#include common.h
void
diff --git a/src/bin/file_mgr.c b/src/bin/file_mgr.c
index fe3e261..435a583 100644
--- a/src/bin/file_mgr.c
+++ b/src/bin/file_mgr.c
@@ -2,10 +2,7 @@
#include config.h
#endif
-#define ENVENTOR_BETA_API_SUPPORT 1
-
#include Eio.h
-#include Enventor.h
#include common.h
typedef struct file_mgr_s {
diff --git a/src/bin/globals.c b/src/bin/globals.c
index 0c37495..6253fe3 100644
--- a/src/bin/globals.c
+++ b/src/bin/globals.c
@@ -1,4 +1,3 @@
-#include Elementary.h
#include common.h
const char *DEFAULT_EDC_PATH_FORMAT = /tmp/enventor_%d.edc;
diff --git a/src/bin/goto.c b/src/bin/goto.c
index 0c2f724..e5e6d69 100644
--- a/src/bin/goto.c
+++ b/src/bin/goto.c
@@ -2,9 +2,6 @@
#include config.h
#endif
-#define ENVENTOR_BETA_API_SUPPORT 1
-
-#include Enventor.h
#include common.h
typedef struct goto_s
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 1e76935..1aa2b40 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -2,10 +2,7 @@
#include config.h
#endif
-#define ENVENTOR_BETA_API_SUPPORT 1
-
#include Elementary_Cursor.h
-#include Enventor.h
#include common.h
typedef struct menu_data_s
diff --git a/src/bin/main.c b/src/bin/main.c
index 9c7117e..1b68e55 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -2,10 +2,7 @@
#include config.h
#endif
-#define ENVENTOR_BETA_API_SUPPORT 1
-
#include Eio.h
-#include Enventor.h
#include common.h
typedef struct app_s
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 365b1c5..3cc3f43 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -2,9 +2,6 @@
#include config.h
#endif
-#define ENVENTOR_BETA_API_SUPPORT 1
-
-#include Enventor.h
#include common.h
struct menu_s
diff --git a/src/bin/newfile.c b/src/bin/newfile.c
index e59b93d..c084db3 100644
--- a/src/bin/newfile.c
+++ b/src/bin/newfile.c
@@ -2,9 +2,6 @@
#include config.h
#endif
-#define ENVENTOR_BETA_API_SUPPORT 1
-
-#include Enventor.h
#include common.h
typedef struct new_data_s {
diff --git a/src/bin/panes.c b/src/bin/panes.c
index c7945fb..f17c062 100644
--- a/src/bin/panes.c
+++ b/src/bin/panes.c
@@ -1,4 +1,3 @@
-#include Elementary.h
#include common.h
static const double TRANSIT_TIME = 0.25;
diff --git a/src/bin/search.c b/src/bin/search.c
index 5a5ddfd..2f0d691 100644
--- a/src/bin/search.c
+++ b/src/bin/search.c
@@ -2,9 +2,6 @@
#include config.h
#endif
-#define ENVENTOR_BETA_API_SUPPORT 1
-
-#include Enventor.h
#include common.h
typedef struct search_s
diff --git a/src/bin/setting.c b/src/bin/setting.c
index f04a226..3ef0339 100644
--- a/src/bin/setting.c
+++ b/src/bin/setting.c
@@ -1,4 +1,3 @@
-#include Elementary.h
#include common.h
struct setting_s
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index 1af9a91..f90f797 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -1,4 +1,3 @@
-#include Elementary.h
#include common.h
typedef struct statusbar_s
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 966143b..3d122b2 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -2,9 +2,6 @@
#include config.h
#endif
-#define ENVENTOR_BETA_API_SUPPORT 1
-
-#include Enventor.h
#include common.h
static void
diff --git a/src/include/common.h b/src/include/common.h
index 85f8795..7b80a0a 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -10,6 +10,9 @@ typedef struct
[EGIT] [tools/enventor] master 01/01: syntax_color: Add an enum value ENVENTOR_SYNTAX_COLOR_LAST
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=9d6726799f50132246ceb0548cfe46ec73a3dd54
commit 9d6726799f50132246ceb0548cfe46ec73a3dd54
Author: Jaehyun Cho jae_hyun@samsung.com
Date: Mon Feb 2 19:53:13 2015 +0900
syntax_color: Add an enum value ENVENTOR_SYNTAX_COLOR_LAST
Add an enum value ENVENTOR_SYNTAX_COLOR_LAST to help to indicate the last
enum value of the syntax color.
---
src/lib/Enventor_Legacy.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/Enventor_Legacy.h b/src/lib/Enventor_Legacy.h
index ed8400b..bd7743e 100644
--- a/src/lib/Enventor_Legacy.h
+++ b/src/lib/Enventor_Legacy.h
@@ -51,7 +51,8 @@ typedef enum {
ENVENTOR_SYNTAX_COLOR_SUB_KEYWORD,
ENVENTOR_SYNTAX_COLOR_CONSTANT,
ENVENTOR_SYNTAX_COLOR_SCRIPT_FUNC,
- ENVENTOR_SYNTAX_COLOR_SCRIPT_KEYWORD
+ ENVENTOR_SYNTAX_COLOR_SCRIPT_KEYWORD,
+ ENVENTOR_SYNTAX_COLOR_LAST
} Enventor_Syntax_Color_Type;
EAPI int enventor_init(int argc, char **argv);
--
[EGIT] [enlightenment/modules/desksanity] master 01/01: fix input regions on shaded clients after desk flip
discomfitor pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/desksanity.git/commit/?id=3165448d4c88384be220eed9664843361056f08c commit 3165448d4c88384be220eed9664843361056f08c Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Mon Feb 2 21:40:31 2015 -0500 fix input regions on shaded clients after desk flip --- src/desksanity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/desksanity.c b/src/desksanity.c index 165caa4..00f3e80 100644 --- a/src/desksanity.c +++ b/src/desksanity.c @@ -85,7 +85,7 @@ _ds_show(E_Desk *desk, int dx, int dy) e_comp_object_effect_unclip(ec-frame); e_comp_object_effect_set(ec-frame, NULL); /* comp unignore the client */ -e_client_comp_hidden_set(ec, EINA_FALSE); +e_client_comp_hidden_set(ec, ec-shaded); ec-hidden = 0; evas_object_show(ec-frame); } --
[EGIT] [tools/enventor] master 01/01: Revert setting: Add the Text Editor mode in setting.
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=e1991b63ff8fe6cee45e07e7287f4c832551bbad
commit e1991b63ff8fe6cee45e07e7287f4c832551bbad
Author: Jaehyun Cho jae_hyun@samsung.com
Date: Tue Feb 3 13:46:43 2015 +0900
Revert setting: Add the Text Editor mode in setting.
This reverts commit 799fd32e13b5cf3e313badb73572821d22974064.
The previous commit(config: Add config_syntax_color_set()/get()
functions.)
is not applied correctly.
---
data/color/Makefile.am | 3 +-
data/color/syntax_template.dat | 1 -
data/themes/default/layout_setting.edc | 278 ---
src/bin/Makefile.am| 1 -
src/bin/config_data.c | 36 ++
src/bin/main.c | 56 +++
src/bin/setting.c | 293 ++-
src/bin/text_setting.c | 853 -
src/include/Makefile.am| 1 -
src/include/config_data.h | 2 +
src/include/text_setting.h | 35 --
11 files changed, 329 insertions(+), 1230 deletions(-)
diff --git a/data/color/Makefile.am b/data/color/Makefile.am
index d1d438a..aa8f3d3 100644
--- a/data/color/Makefile.am
+++ b/data/color/Makefile.am
@@ -7,8 +7,7 @@ color.src
filesdir = $(datadir)/$(PACKAGE)/color
files_DATA = \
-color.eet \
-syntax_template.dat
+color.eet
%.eet: %.src
$(EET_EET) -e \
diff --git a/data/color/syntax_template.dat b/data/color/syntax_template.dat
deleted file mode 100644
index d5ec66a..000
--- a/data/color/syntax_template.dat
+++ /dev/null
@@ -1 +0,0 @@
- font_size=%dcolor=#%s//comment/colorbr/ color=#%s#define
RECT_COLOR/color 0 136 170 255br/ color=#%spart/color
color=#%s{/color color=#%sname/colorcolor=#%s:/color
color=#%squot;rectquot;/colorcolor=#%s;/colorbr/
color=#%stype/colorcolor=#%s:/color
color=#%sRECT/colorcolor=#%s;/colorbr/
color=#%sdescription/color color=#%s{/color
color=#%sstate/colorcolor=#%s:/color color=#%squot;defaultquot;
[...]
diff --git a/data/themes/default/layout_setting.edc
b/data/themes/default/layout_setting.edc
index 44e1ba9..4081bb9 100644
--- a/data/themes/default/layout_setting.edc
+++ b/data/themes/default/layout_setting.edc
@@ -28,8 +28,8 @@ group { name: setting_layout;
scale: 1;
clip_to: clipper;
description {
-min: 600 380;
-max: 600 380;
+min: 600 350;
+max: 600 350;
fixed: 1 1;
image.normal: frame_bg.png;
image.border: 10 10 10 10;
@@ -104,143 +104,11 @@ group { name: setting_layout;
color: COL_HI;
}
}
- part { name: elm.swallow.tabbar;
- type: SWALLOW;
- scale: 1;
- clip_to: clipper;
- description { state: default 0.0;
-min: 0 25;
-max: -1 25;
-align: 0.5 0.0;
-fixed: 0 1;
-rel1 {to: title_frame; relative: 0.0 1.0; offset: 0 5;}
-rel2.to: title_frame;
- }
- }
- part { name: elm.swallow.content;
- type: SWALLOW;
- scale: 1;
- clip_to: clipper;
- description { state: default 0.0;
-rel1 {
- to: elm.swallow.tabbar;
- relative: 0.0 1.0;
-}
-rel2 {
- to_x: base_frame;
- to_y: elm.swallow.reset_btn;
- relative: 1.0 0.0;
- offset: -1 -11;
-}
- }
- }
- part { name: elm.swallow.apply_btn;
- type: SWALLOW;
- scale: 1;
- description {
-align: 1 0.5;
-min: 50 25;
-fixed: 1 1;
-rel1.to: elm.swallow.reset_btn;
-rel1.relative: 0 0;
-rel2.to: elm.swallow.reset_btn;
-rel2.relative: 0 1;
- }
- }
- part { name: elm.swallow.reset_btn;
- type: SWALLOW;
- scale: 1;
- description {
-align: 0.5 1;
-min: 50 25;
-fixed: 1 1;
-rel1.to: base_frame;
-rel1.relative: 0.5 1;
-rel2.to: base_frame;
-rel2.relative: 0.5 1;
- }
- }
- part { name: elm.swallow.cancel_btn;
- type: SWALLOW;
- scale: 1;
- description {
-align: 0 0.5;
-min: 50 25;
-fixed: 1 1;
-rel1.to: elm.swallow.reset_btn;
-rel1.relative: 1 0;
-rel2.to: elm.swallow.reset_btn;
-rel2.relative: 1 1;
- }
- }
- part { name: event_blocker;
- type: RECT;
- description { state: default 0.0;
-color: 0 0 0 0;
-visible: 1;
- }
- description { state: hide 0.0;
-inherit: default 0.0;
-visible: 0;
- }
- }
- part { name:
[E-devel] terminology selection + fill broken
hey billiob! latest commit: e94051dd86fde0eb13993c32a99cb463b8a5b724 breaks 2 things. 1. double-click to select a word is broken. the right end of the selection is stuck at the point where the cursor is, not the right end of the word. try it. at least that is what i see. either way double-click to select a word is now broken. ;( 2. what used to be black whitespace bg is now empty chars (so i see terminology bg). this breaks jed output pretty badly. see... working: http://www.enlightenment.org/ss/e-54d05f357a3391.24747752.png not working: http://www.enlightenment.org/ss/e-54d05f672a4df7.83729511.png more... if i revert your changes to termpty_cellrow_get() this fixes both problems. so i just committed this. it at least restores the above behavior without reverting all of the patch. please take a look and see! :) -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/01: terminology - fix double click selection and jed display
raster pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=6268dc32e49a599ebd000d7300715c0d832c0734
commit 6268dc32e49a599ebd000d7300715c0d832c0734
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Tue Feb 3 14:45:23 2015 +0900
terminology - fix double click selection and jed display
this fixes breaks introduced by
e94051dd86fde0eb13993c32a99cb463b8a5b724 (the previous commit).
latest commit: e94051dd86fde0eb13993c32a99cb463b8a5b724
breaks 2 things.
1. double-click to select a word is broken. the right end of the
selection is
stuck at the point where the cursor is, not the right end of the word. try
it.
at least that is what i see. either way double-click to select a word is now
broken. ;(
2. what used to be black whitespace bg is now empty chars (so i see
terminology bg). this breaks jed output pretty badly.
see...
working:
http://www.enlightenment.org/ss/e-54d05f357a3391.24747752.png
not working:
http://www.enlightenment.org/ss/e-54d05f672a4df7.83729511.png
---
src/bin/termpty.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bin/termpty.c b/src/bin/termpty.c
index 63d2c7b..5a6a95d 100644
--- a/src/bin/termpty.c
+++ b/src/bin/termpty.c
@@ -631,11 +631,10 @@ termpty_cellrow_get(Termpty *ty, int y, int *wret)
if (y = 0)
{
-Termcell *cells;
if (y = ty-h) return NULL;
-cells = (TERMPTY_SCREEN(ty, 0, y));
-*wret = termpty_line_length(cells, ty-w);
-return cells;
+*wret = ty-w;
+/* fprintf(stderr, getting: %i (%i, %i)\n, y, ty-circular_offset,
ty-h); */
+return (TERMPTY_SCREEN(ty, 0, y));
}
if ((y -ty-backmax) || !ty-back) return NULL;
tssrc = (ty-back[(ty-backmax + ty-backpos + y) % ty-backmax]);
--
[EGIT] [core/elementary] master 01/01: multibuttonentry: Delete duplicate running code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=17a63524c08b6fc400b16cbb0acd8a32fe7e7bba
commit 17a63524c08b6fc400b16cbb0acd8a32fe7e7bba
Author: woochan lee wc0917@samsung.com
Date: Tue Feb 3 11:38:21 2015 +0900
multibuttonentry: Delete duplicate running code.
Summary:
When layout clicked, elm_widget_on_focus() called with entry_focus_in()
callback.
The view update and focus set to entry already call in those callbacks,
so i deleted duplicate code and it also make focus issue when user click the
entry to add item.
@fix
Test Plan:
Run elementary_test.
1. excute multibuttonentry.
2. click the entry area.
3. see the elm_widget_on_focus called twice.
(layout callback function called view update - elm_box_unpack called in
view update -
entry lose focus - on_focus_callback call again)
Reviewers: Hermet, seoz, Jaehyun_Cho, JackDanielZ
Differential Revision: https://phab.enlightenment.org/D1902
---
src/lib/elc_multibuttonentry.c | 14 ++
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 51d1d74..d53f44b 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -881,21 +881,11 @@ _elm_multibuttonentry_elm_layout_sizing_eval(Eo *obj,
Elm_Multibuttonentry_Data
}
static void
-_mouse_clicked_signal_cb(void *data,
+_mouse_clicked_signal_cb(void *data EINA_UNUSED,
Evas_Object *obj,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
- Elm_Multibuttonentry_Data *sd = data;
-
- _view_update(sd);
-
- if (elm_widget_focus_get(obj) sd-editable)
- {
-elm_entry_input_panel_show(sd-entry);
-elm_object_focus_set(sd-entry, EINA_TRUE);
- }
-
evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
}
@@ -1071,7 +1061,7 @@ _callbacks_register(Evas_Object *obj)
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
elm_layout_signal_callback_add
- (obj, mouse,clicked,1, *, _mouse_clicked_signal_cb, sd);
+ (obj, mouse,clicked,1, *, _mouse_clicked_signal_cb, NULL);
evas_object_event_callback_add
(wd-resize_obj, EVAS_CALLBACK_KEY_DOWN,
--
[EGIT] [tools/enventor] master 01/01: config: Add config_syntax_color_set()/get() functions.
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=2289ad6c0327a58ae872e2fee07478d1fa4fd0a2
commit 2289ad6c0327a58ae872e2fee07478d1fa4fd0a2
Author: Jaehyun Cho jae_hyun@samsung.com
Date: Tue Feb 3 12:00:32 2015 +0900
config: Add config_syntax_color_set()/get() functions.
Summary: Add config_syntax_color_set()/get() functions to save and load
user syntax color list.
Reviewers: Hermet
Differential Revision: https://phab.enlightenment.org/D1915
---
src/bin/config_data.c | 36 ++
src/bin/main.c| 56 +++
src/include/config_data.h | 2 ++
3 files changed, 94 insertions(+)
diff --git a/src/bin/config_data.c b/src/bin/config_data.c
index 75f2edb..27dd93d 100644
--- a/src/bin/config_data.c
+++ b/src/bin/config_data.c
@@ -14,6 +14,8 @@ typedef struct config_s
Eina_Strbuf *edc_fnt_path_buf; //pre-stored font paths for edc compile.
Eina_Strbuf *edc_dat_path_buf; //pre-stored data paths for edc compile.
+ Eina_List *syntax_color_list;
+
float font_scale;
double view_scale;
double console_size;
@@ -36,6 +38,7 @@ typedef struct config_s
static config_data *g_cd = NULL;
static Eet_Data_Descriptor *edd_base = NULL;
+static Eet_Data_Descriptor *edd_color = NULL;
static void
config_edj_path_update(config_data *cd)
@@ -186,6 +189,13 @@ config_load(void)
else cd-edc_dat_path_buf =
config_paths_buf_set(cd-edc_dat_path_list, -dd );
+ if (!cd-syntax_color_list)
+ {
+Enventor_Syntax_Color_Type color_type = ENVENTOR_SYNTAX_COLOR_STRING;
+for (; color_type ENVENTOR_SYNTAX_COLOR_LAST; color_type++)
+ cd-syntax_color_list = eina_list_append(cd-syntax_color_list,
NULL);
+ }
+
return cd;
}
@@ -205,6 +215,8 @@ eddc_init(void)
edc_fnt_path_list, edc_fnt_path_list);
EET_DATA_DESCRIPTOR_ADD_LIST_STRING(edd_base, config_data,
edc_dat_path_list, edc_dat_path_list);
+ EET_DATA_DESCRIPTOR_ADD_LIST_STRING(edd_base, config_data,
+ syntax_color_list, syntax_color_list);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, font_scale,
font_scale,
EET_T_FLOAT);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, view_scale,
@@ -279,6 +291,8 @@ config_term(void)
EINA_LIST_FREE(cd-edc_fnt_path_list, str) eina_stringshare_del(str);
EINA_LIST_FREE(cd-edc_dat_path_list, str) eina_stringshare_del(str);
+ EINA_LIST_FREE(cd-syntax_color_list, str) eina_stringshare_del(str);
+
if (cd-edc_img_path_buf) eina_strbuf_free(cd-edc_img_path_buf);
if (cd-edc_snd_path_buf) eina_strbuf_free(cd-edc_snd_path_buf);
if (cd-edc_fnt_path_buf) eina_strbuf_free(cd-edc_fnt_path_buf);
@@ -537,6 +551,28 @@ config_edj_path_get(void)
return cd-edj_path;
}
+void
+config_syntax_color_set(Enventor_Syntax_Color_Type color_type,
+const char *val)
+{
+ config_data *cd = g_cd;
+ Eina_List *target_list;
+
+ target_list = eina_list_nth_list(cd-syntax_color_list, color_type);
+ if (!target_list) return;
+
+ eina_stringshare_del(eina_list_data_get(target_list));
+ if (val)
+ eina_list_data_set(target_list, eina_stringshare_add(val));
+}
+
+const char *
+config_syntax_color_get(Enventor_Syntax_Color_Type color_type)
+{
+ config_data *cd = g_cd;
+ return (const char *) eina_list_nth(cd-syntax_color_list, color_type);
+}
+
Eina_Bool
config_linenumber_get(void)
{
diff --git a/src/bin/main.c b/src/bin/main.c
index 1b68e55..82b8a37 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -110,6 +110,56 @@ template_insert_patch(app_data *ad, const char *key)
}
static void
+syntax_color_update(Evas_Object *enventor)
+{
+ const char *config_color;
+ const char *enventor_color;
+ Eina_Bool color_changed = EINA_FALSE;
+ Enventor_Syntax_Color_Type color_type;
+
+ color_type = ENVENTOR_SYNTAX_COLOR_STRING;
+ for (; color_type ENVENTOR_SYNTAX_COLOR_LAST; color_type++)
+ {
+config_color = config_syntax_color_get(color_type);
+if (config_color)
+ {
+ enventor_color = enventor_object_syntax_color_get(enventor,
+ color_type);
+ if (strcmp(config_color, enventor_color))
+ {
+ enventor_object_syntax_color_set(enventor, color_type,
+ config_color);
+ color_changed = EINA_TRUE;
+ }
+ }
+ }
+
+ if (color_changed)
+ enventor_object_syntax_color_full_apply(enventor, EINA_TRUE);
+}
+
+static void
+syntax_color_init(Evas_Object *enventor)
+{
+ const char *config_color;
+ const char *enventor_color;
+ Eina_Bool color_changed = EINA_FALSE;
+
[EGIT] [tools/enventor] master 01/01: config: Add config_syntax_color_set()/get() functions.
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=899551a20c7d3ae66d661b989ec6c279f7251a9c
commit 899551a20c7d3ae66d661b989ec6c279f7251a9c
Author: Jaehyun Cho jae_hyun@samsung.com
Date: Tue Feb 3 15:21:01 2015 +0900
config: Add config_syntax_color_set()/get() functions.
Add config_syntax_color_set()/get() functions to save and load
---
src/bin/config_data.c | 36 ++
src/bin/main.c| 56 +++
src/include/config_data.h | 2 ++
3 files changed, 94 insertions(+)
diff --git a/src/bin/config_data.c b/src/bin/config_data.c
index 75f2edb..27dd93d 100644
--- a/src/bin/config_data.c
+++ b/src/bin/config_data.c
@@ -14,6 +14,8 @@ typedef struct config_s
Eina_Strbuf *edc_fnt_path_buf; //pre-stored font paths for edc compile.
Eina_Strbuf *edc_dat_path_buf; //pre-stored data paths for edc compile.
+ Eina_List *syntax_color_list;
+
float font_scale;
double view_scale;
double console_size;
@@ -36,6 +38,7 @@ typedef struct config_s
static config_data *g_cd = NULL;
static Eet_Data_Descriptor *edd_base = NULL;
+static Eet_Data_Descriptor *edd_color = NULL;
static void
config_edj_path_update(config_data *cd)
@@ -186,6 +189,13 @@ config_load(void)
else cd-edc_dat_path_buf =
config_paths_buf_set(cd-edc_dat_path_list, -dd );
+ if (!cd-syntax_color_list)
+ {
+Enventor_Syntax_Color_Type color_type = ENVENTOR_SYNTAX_COLOR_STRING;
+for (; color_type ENVENTOR_SYNTAX_COLOR_LAST; color_type++)
+ cd-syntax_color_list = eina_list_append(cd-syntax_color_list,
NULL);
+ }
+
return cd;
}
@@ -205,6 +215,8 @@ eddc_init(void)
edc_fnt_path_list, edc_fnt_path_list);
EET_DATA_DESCRIPTOR_ADD_LIST_STRING(edd_base, config_data,
edc_dat_path_list, edc_dat_path_list);
+ EET_DATA_DESCRIPTOR_ADD_LIST_STRING(edd_base, config_data,
+ syntax_color_list, syntax_color_list);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, font_scale,
font_scale,
EET_T_FLOAT);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, view_scale,
@@ -279,6 +291,8 @@ config_term(void)
EINA_LIST_FREE(cd-edc_fnt_path_list, str) eina_stringshare_del(str);
EINA_LIST_FREE(cd-edc_dat_path_list, str) eina_stringshare_del(str);
+ EINA_LIST_FREE(cd-syntax_color_list, str) eina_stringshare_del(str);
+
if (cd-edc_img_path_buf) eina_strbuf_free(cd-edc_img_path_buf);
if (cd-edc_snd_path_buf) eina_strbuf_free(cd-edc_snd_path_buf);
if (cd-edc_fnt_path_buf) eina_strbuf_free(cd-edc_fnt_path_buf);
@@ -537,6 +551,28 @@ config_edj_path_get(void)
return cd-edj_path;
}
+void
+config_syntax_color_set(Enventor_Syntax_Color_Type color_type,
+const char *val)
+{
+ config_data *cd = g_cd;
+ Eina_List *target_list;
+
+ target_list = eina_list_nth_list(cd-syntax_color_list, color_type);
+ if (!target_list) return;
+
+ eina_stringshare_del(eina_list_data_get(target_list));
+ if (val)
+ eina_list_data_set(target_list, eina_stringshare_add(val));
+}
+
+const char *
+config_syntax_color_get(Enventor_Syntax_Color_Type color_type)
+{
+ config_data *cd = g_cd;
+ return (const char *) eina_list_nth(cd-syntax_color_list, color_type);
+}
+
Eina_Bool
config_linenumber_get(void)
{
diff --git a/src/bin/main.c b/src/bin/main.c
index 1b68e55..82b8a37 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -110,6 +110,56 @@ template_insert_patch(app_data *ad, const char *key)
}
static void
+syntax_color_update(Evas_Object *enventor)
+{
+ const char *config_color;
+ const char *enventor_color;
+ Eina_Bool color_changed = EINA_FALSE;
+ Enventor_Syntax_Color_Type color_type;
+
+ color_type = ENVENTOR_SYNTAX_COLOR_STRING;
+ for (; color_type ENVENTOR_SYNTAX_COLOR_LAST; color_type++)
+ {
+config_color = config_syntax_color_get(color_type);
+if (config_color)
+ {
+ enventor_color = enventor_object_syntax_color_get(enventor,
+ color_type);
+ if (strcmp(config_color, enventor_color))
+ {
+ enventor_object_syntax_color_set(enventor, color_type,
+ config_color);
+ color_changed = EINA_TRUE;
+ }
+ }
+ }
+
+ if (color_changed)
+ enventor_object_syntax_color_full_apply(enventor, EINA_TRUE);
+}
+
+static void
+syntax_color_init(Evas_Object *enventor)
+{
+ const char *config_color;
+ const char *enventor_color;
+ Eina_Bool color_changed = EINA_FALSE;
+ Enventor_Syntax_Color_Type color_type;
+
+ color_type = ENVENTOR_SYNTAX_COLOR_STRING;
+ for (; color_type ENVENTOR_SYNTAX_COLOR_LAST;
[EGIT] [tools/enventor] master 01/01: setting: Add the Text Editor mode in setting.
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=83abef91d2f6b835dc0a36010c01dd8bdff48a70
commit 83abef91d2f6b835dc0a36010c01dd8bdff48a70
Author: Jaehyun Cho jae_hyun@samsung.com
Date: Tue Feb 3 15:44:12 2015 +0900
setting: Add the Text Editor mode in setting.
Add the Text Editor mode in setting by adding text_setting.c.
text_setting.c covers the syntax coloring and the syntax font scaling.
---
data/color/Makefile.am | 3 +-
data/color/syntax_template.dat | 1 +
data/themes/default/layout_setting.edc | 278 +++
src/bin/Makefile.am| 1 +
src/bin/setting.c | 293 +--
src/bin/text_setting.c | 853 +
src/include/Makefile.am| 1 +
src/include/text_setting.h | 35 ++
8 files changed, 1230 insertions(+), 235 deletions(-)
diff --git a/data/color/Makefile.am b/data/color/Makefile.am
index aa8f3d3..d1d438a 100644
--- a/data/color/Makefile.am
+++ b/data/color/Makefile.am
@@ -7,7 +7,8 @@ color.src
filesdir = $(datadir)/$(PACKAGE)/color
files_DATA = \
-color.eet
+color.eet \
+syntax_template.dat
%.eet: %.src
$(EET_EET) -e \
diff --git a/data/color/syntax_template.dat b/data/color/syntax_template.dat
new file mode 100644
index 000..d5ec66a
--- /dev/null
+++ b/data/color/syntax_template.dat
@@ -0,0 +1 @@
+ font_size=%dcolor=#%s//comment/colorbr/ color=#%s#define
RECT_COLOR/color 0 136 170 255br/ color=#%spart/color
color=#%s{/color color=#%sname/colorcolor=#%s:/color
color=#%squot;rectquot;/colorcolor=#%s;/colorbr/
color=#%stype/colorcolor=#%s:/color
color=#%sRECT/colorcolor=#%s;/colorbr/
color=#%sdescription/color color=#%s{/color
color=#%sstate/colorcolor=#%s:/color color=#%squot;defaultquot;
[...]
diff --git a/data/themes/default/layout_setting.edc
b/data/themes/default/layout_setting.edc
index 4081bb9..44e1ba9 100644
--- a/data/themes/default/layout_setting.edc
+++ b/data/themes/default/layout_setting.edc
@@ -28,8 +28,8 @@ group { name: setting_layout;
scale: 1;
clip_to: clipper;
description {
-min: 600 350;
-max: 600 350;
+min: 600 380;
+max: 600 380;
fixed: 1 1;
image.normal: frame_bg.png;
image.border: 10 10 10 10;
@@ -104,11 +104,143 @@ group { name: setting_layout;
color: COL_HI;
}
}
+ part { name: elm.swallow.tabbar;
+ type: SWALLOW;
+ scale: 1;
+ clip_to: clipper;
+ description { state: default 0.0;
+min: 0 25;
+max: -1 25;
+align: 0.5 0.0;
+fixed: 0 1;
+rel1 {to: title_frame; relative: 0.0 1.0; offset: 0 5;}
+rel2.to: title_frame;
+ }
+ }
+ part { name: elm.swallow.content;
+ type: SWALLOW;
+ scale: 1;
+ clip_to: clipper;
+ description { state: default 0.0;
+rel1 {
+ to: elm.swallow.tabbar;
+ relative: 0.0 1.0;
+}
+rel2 {
+ to_x: base_frame;
+ to_y: elm.swallow.reset_btn;
+ relative: 1.0 0.0;
+ offset: -1 -11;
+}
+ }
+ }
+ part { name: elm.swallow.apply_btn;
+ type: SWALLOW;
+ scale: 1;
+ description {
+align: 1 0.5;
+min: 50 25;
+fixed: 1 1;
+rel1.to: elm.swallow.reset_btn;
+rel1.relative: 0 0;
+rel2.to: elm.swallow.reset_btn;
+rel2.relative: 0 1;
+ }
+ }
+ part { name: elm.swallow.reset_btn;
+ type: SWALLOW;
+ scale: 1;
+ description {
+align: 0.5 1;
+min: 50 25;
+fixed: 1 1;
+rel1.to: base_frame;
+rel1.relative: 0.5 1;
+rel2.to: base_frame;
+rel2.relative: 0.5 1;
+ }
+ }
+ part { name: elm.swallow.cancel_btn;
+ type: SWALLOW;
+ scale: 1;
+ description {
+align: 0 0.5;
+min: 50 25;
+fixed: 1 1;
+rel1.to: elm.swallow.reset_btn;
+rel1.relative: 1 0;
+rel2.to: elm.swallow.reset_btn;
+rel2.relative: 1 1;
+ }
+ }
+ part { name: event_blocker;
+ type: RECT;
+ description { state: default 0.0;
+color: 0 0 0 0;
+visible: 1;
+ }
+ description { state: hide 0.0;
+inherit: default 0.0;
+visible: 0;
+ }
+ }
+ part { name: over_img;
+ type: IMAGE;
+ scale: 1;
+ clip_to: clipper;
+ mouse_events: 0;
+ description {
+rel1 { to: base_frame_img; relative: 0 0; }
+
[EGIT] [core/efl] master 01/01: evas callback: Fix typo in documentation of evas_object_event_callback_del_full
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0f32ab49cec1728d707506d4582f972fca19f7f8 commit 0f32ab49cec1728d707506d4582f972fca19f7f8 Author: Amitesh Singh amitesh...@samsung.com Date: Tue Feb 3 11:02:20 2015 +0900 evas callback: Fix typo in documentation of evas_object_event_callback_del_full Reviewers: cedric, seoz Subscribers: cedric, seoz Differential Revision: https://phab.enlightenment.org/D1904 --- src/lib/evas/Evas_Legacy.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h index 0a10fce..ca746f8 100644 --- a/src/lib/evas/Evas_Legacy.h +++ b/src/lib/evas/Evas_Legacy.h @@ -834,7 +834,7 @@ EAPI void *evas_object_event_callback_del(Evas_Object *obj, Evas_Callback_Ty * object. In errors, @c NULL will be returned. * * @note For deletion of Evas object events callbacks filtering by - * just type and function pointer, user + * just type and function pointer, use * evas_object_event_callback_del(). * * Example: --
[EGIT] [core/efl] master 01/01: Evas masking: Check only the variable we want to set
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5afa07bf6ca88871fa620ef07e268618ecf86c0f
commit 5afa07bf6ca88871fa620ef07e268618ecf86c0f
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Tue Jan 27 15:02:27 2015 +0900
Evas masking: Check only the variable we want to set
This is a left-over from a previous fix a few weeks ago.
The point of this if is just to avoid writing the COW value
if not needed.
For reference:
commit f876cf31f8d6fd48f7602bd593c24c1a07138d8f
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Tue Dec 23 18:57:45 2014 +0900
Evas masking: Fix invalid geometry after mask redraw
---
src/lib/evas/canvas/evas_render.c | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/lib/evas/canvas/evas_render.c
b/src/lib/evas/canvas/evas_render.c
index cdb25c5..e4e9f3a 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -302,11 +302,7 @@ _evas_mask_redraw_set(Evas_Public_Data *e EINA_UNUSED,
Evas_Object_Protected_Data *clippee;
Eina_List *l;
- if (!(obj-mask-redraw
- obj-mask-x == obj-cur-geometry.x
- obj-mask-y == obj-cur-geometry.y
- obj-mask-w == obj-cur-geometry.w
- obj-mask-h == obj-cur-geometry.h))
+ if (!(obj-mask-redraw))
{
EINA_COW_WRITE_BEGIN(evas_object_mask_cow, obj-mask,
Evas_Object_Mask_Data, mask)
--
[E-devel] terminology selection + fill broken
hey billiob! latest commit: e94051dd86fde0eb13993c32a99cb463b8a5b724 breaks 2 things. 1. double-click to select a word is broken. the right end of the selection is stuck at the point where the cursor is, not the right end of the word. try it. at least that is what i see. either way double-click to select a word is now broken. ;( 2. what used to be black whitespace bg is now empty chars (so i see terminology bg). this breaks jed output pretty badly. see... working: http://www.enlightenment.org/ss/e-54d05f357a3391.24747752.png not working: http://www.enlightenment.org/ss/e-54d05f672a4df7.83729511.png -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Dive into the World of Parallel Programming. The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: list/genlist/gengrid/toolbar: set focus/unfocus on item when focus is actually set on widget.
seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a3e0ebf41f2723b5516cce760d46592940bab53b
commit a3e0ebf41f2723b5516cce760d46592940bab53b
Author: Amitesh Singh amitesh...@samsung.com
Date: Tue Feb 3 15:47:32 2015 +0900
list/genlist/gengrid/toolbar: set focus/unfocus on item when focus is
actually set on widget.
Summary: @Fix
Reviewers: raster, Hermet, seoz
Reviewed By: seoz
Subscribers: seoz
Differential Revision: https://phab.enlightenment.org/D1918
---
src/lib/elm_gengrid.c | 9 -
src/lib/elm_genlist.c | 9 -
src/lib/elm_list.c| 6 ++
src/lib/elm_toolbar.c | 6 ++
4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 9f951f7..f6506f5 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -3411,6 +3411,9 @@ _elm_gengrid_item_elm_widget_item_focus_set(Eo *eo_it,
Elm_Gen_Item *it, Eina_Bo
if (!elm_object_focus_get(obj))
elm_object_focus_set(obj, EINA_TRUE);
+if (!elm_widget_focus_get(obj))
+ return;
+
if (eo_it != sd-focused_item)
{
if (sd-focused_item)
@@ -3423,7 +3426,11 @@ _elm_gengrid_item_elm_widget_item_focus_set(Eo *eo_it,
Elm_Gen_Item *it, Eina_Bo
}
}
else
- _elm_gengrid_item_unfocused(eo_it);
+ {
+if (!elm_widget_focus_get(obj))
+ return;
+_elm_gengrid_item_unfocused(eo_it);
+ }
}
EOLIAN static Eina_Bool
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index e242f82..13cb1ed 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -5711,6 +5711,9 @@ _elm_genlist_item_elm_widget_item_focus_set(Eo *eo_it,
Elm_Gen_Item *it, Eina_Bo
if (!elm_object_focus_get(obj))
elm_object_focus_set(obj, EINA_TRUE);
+if (!elm_widget_focus_get(obj))
+ return;
+
if (eo_it != sd-focused_item)
{
if (sd-focused_item)
@@ -5723,7 +5726,11 @@ _elm_genlist_item_elm_widget_item_focus_set(Eo *eo_it,
Elm_Gen_Item *it, Eina_Bo
}
}
else
- _elm_genlist_item_unfocused(eo_it);
+ {
+if (!elm_widget_focus_get(obj))
+ return;
+_elm_genlist_item_unfocused(eo_it);
+ }
}
EOLIAN static Eina_Bool
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index f9b405e..709e00e 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -2121,6 +2121,10 @@ _elm_list_item_elm_widget_item_focus_set(Eo *eo_it,
Elm_List_Item_Data *it, Eina
sd-last_focused_item = eo_it;
if (!elm_object_focus_get(obj))
elm_object_focus_set(obj, EINA_TRUE);
+
+if (!elm_widget_focus_get(obj))
+ return;
+
if (eo_it != sd-focused_item)
{
if (sd-focused_item)
@@ -2130,6 +2134,8 @@ _elm_list_item_elm_widget_item_focus_set(Eo *eo_it,
Elm_List_Item_Data *it, Eina
}
else
{
+if (!elm_widget_focus_get(obj))
+ return;
if (eo_it)
_elm_list_item_unfocused(eo_it);
}
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 94320d3..6508193 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -827,6 +827,10 @@ _elm_toolbar_item_elm_widget_item_focus_set(Eo *eo_it,
Elm_Toolbar_Item_Data *it
sd-last_focused_item = eo_it;
if (!elm_object_focus_get(obj))
elm_object_focus_set(obj, EINA_TRUE);
+
+if (!elm_widget_focus_get(obj))
+ return;
+
if (eo_it != sd-focused_item)
{
if (sd-focused_item)
@@ -836,6 +840,8 @@ _elm_toolbar_item_elm_widget_item_focus_set(Eo *eo_it,
Elm_Toolbar_Item_Data *it
}
else
{
+if (!elm_widget_focus_get(obj))
+ return;
if (eo_it)
_elm_toolbar_item_unfocused(eo_it);
}
--
[EGIT] [core/efl] master 02/02: ecore-drm: Trap for failure to dup stdin
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=37d21a4729aec7044bce08640616d34faa60f940
commit 37d21a4729aec7044bce08640616d34faa60f940
Author: Chris Michael cp.mich...@samsung.com
Date: Mon Feb 2 11:59:27 2015 -0500
ecore-drm: Trap for failure to dup stdin
Summary: If we fail to duplicate stdin, we should write out an error
and exit appropriately.
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/ecore_drm/ecore_drm_tty.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/lib/ecore_drm/ecore_drm_tty.c
b/src/lib/ecore_drm/ecore_drm_tty.c
index f88d9f1..f9ea64c 100644
--- a/src/lib/ecore_drm/ecore_drm_tty.c
+++ b/src/lib/ecore_drm/ecore_drm_tty.c
@@ -152,7 +152,14 @@ ecore_drm_tty_open(Ecore_Drm_Device *dev, const char *name)
if ((env = getenv(ECORE_DRM_TTY)))
snprintf(tty, sizeof(tty), %s, env);
else
- dev-tty.fd = dup(STDIN_FILENO);
+ {
+ dev-tty.fd = dup(STDIN_FILENO);
+ if (dev-tty.fd 0)
+ {
+ ERR(Could not dup stdin: %m);
+ return EINA_FALSE;
+ }
+ }
}
else
snprintf(tty, sizeof(tty), %s, name);
--
[EGIT] [core/efl] master 01/02: ecore-drm: Fix formatting
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=559b7d7ee6f5282ddc694b3fc9c5227df8303056 commit 559b7d7ee6f5282ddc694b3fc9c5227df8303056 Author: Chris Michael cp.mich...@samsung.com Date: Mon Feb 2 11:46:50 2015 -0500 ecore-drm: Fix formatting NB: No functional changes, just formatting Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/lib/ecore_drm/ecore_drm_logind.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_drm/ecore_drm_logind.c b/src/lib/ecore_drm/ecore_drm_logind.c index 7e7fa89..d4db3b9 100644 --- a/src/lib/ecore_drm/ecore_drm_logind.c +++ b/src/lib/ecore_drm/ecore_drm_logind.c @@ -76,7 +76,7 @@ _ecore_drm_logind_vt_setup(Ecore_Drm_Device *dev) } vtmode.mode = VT_PROCESS; - vtmode.waitv =0 ; + vtmode.waitv = 0; vtmode.relsig = SIGUSR1; vtmode.acqsig = SIGUSR2; --
[EGIT] [core/enlightenment] master 01/02: ref/free client pixmaps during hide animations
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=bbb04ecb32736cc2ed781b1ac29dd7fbcf7dcb42
commit bbb04ecb32736cc2ed781b1ac29dd7fbcf7dcb42
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Feb 2 13:38:48 2015 -0500
ref/free client pixmaps during hide animations
replaces wl client crashing with a garbage frame
---
src/bin/e_comp_object.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 4b78de8..7944df0 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -631,20 +631,24 @@ static void
_e_comp_object_done_defer(void *data, Evas_Object *obj EINA_UNUSED, const char
*emission, const char *source EINA_UNUSED)
{
E_Comp_Object *cw = data;
+ Eina_Bool hiding;
//INF(DONE DEFER %p: %dx%d - %s, cw-ec, cw-w, cw-h, emission);
/* visible clients which have never been sized are a bug */
if ((!cw-ec-new_client) (!cw-ec-changes.size) ((cw-w 0) ||
(cw-h 0)) (!strcmp(emission, e,action,show,done)))
CRI(ACK!);
+ hiding = !strcmp(emission, e,action,hide,done);
if (cw-animating)
{
cw-animating--;
cw-comp-animating--;
+if (hiding)
+ e_pixmap_free(cw-ec-pixmap);
/* remove ref from animation start, account for possibility of
deletion from unref */
if (!e_object_unref(E_OBJECT(cw-ec))) return;
}
/* hide only after animation finishes to guarantee a full run of the
animation */
- if (cw-defer_hide (!strcmp(emission, e,action,hide,done)))
+ if (cw-defer_hide hiding)
evas_object_hide(cw-smart_obj);
else if (!cw-animating)
e_comp_shape_queue(cw-comp);
@@ -1275,6 +1279,7 @@ _e_comp_intercept_hide(void *data, Evas_Object *obj)
cw-comp-animating++;
cw-animating++;
e_object_ref(E_OBJECT(cw-ec));
+ e_pixmap_ref(cw-ec-pixmap);
}
cw-defer_hide = !!cw-animating;
if (!cw-animating)
--
[EGIT] [core/enlightenment] master 02/02: hide wl clients on surface delete
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=66e4c59764a705a3bebffee6c7f0ddd53a0a0530 commit 66e4c59764a705a3bebffee6c7f0ddd53a0a0530 Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Mon Feb 2 13:39:32 2015 -0500 hide wl clients on surface delete surface callbacks may not trigger xdg/shell unmap callbacks before this is called, so this ensures a hide animation --- src/bin/e_comp_wl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 24c7c9e..88e7e4c 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -1147,6 +1147,7 @@ _e_comp_wl_surface_destroy(struct wl_resource *resource) if (!ec) return; + evas_object_hide(ec-frame); e_object_del(E_OBJECT(ec)); } --
[EGIT] [core/enlightenment] master 01/01: cleanup keymap properly on shutdown(fixes E restart issue).
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1e77df57a850ecfe93b0bbfe5231d37228c013fc
commit 1e77df57a850ecfe93b0bbfe5231d37228c013fc
Author: Chris Michael cp.mich...@samsung.com
Date: Mon Feb 2 12:00:38 2015 -0500
cleanup keymap properly on shutdown(fixes E restart issue).
nb: this also adds checking for setting of fd flags when we get the
keymap fd.
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/bin/e_comp_wl_input.c | 28 ++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index 1fb3eb6..6d13772 100644
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -202,7 +202,17 @@ _e_comp_wl_input_keymap_fd_get(off_t size)
if ((fd = mkstemp(tmp)) 0) return -1;
flags = fcntl(fd, F_GETFD);
- fcntl(fd, F_SETFD, (flags | FD_CLOEXEC));
+ if (flags 0)
+ {
+close(fd);
+return -1;
+ }
+
+ if (fcntl(fd, F_SETFD, (flags | FD_CLOEXEC)) == -1)
+ {
+close(fd);
+return -1;
+ }
if (ftruncate(fd, size) 0)
{
@@ -310,6 +320,8 @@ e_comp_wl_input_init(E_Comp_Data *cdata)
/* set default seat name */
if (!cdata-seat.name) cdata-seat.name = default;
+ cdata-xkb.fd = -1;
+
/* create the global resource for input seat */
cdata-seat.global =
wl_global_create(cdata-wl.disp, wl_seat_interface, 4,
@@ -328,7 +340,6 @@ e_comp_wl_input_init(E_Comp_Data *cdata)
EINTERN void
e_comp_wl_input_shutdown(E_Comp_Data *cdata)
{
- /* Eina_List *l; */
struct wl_resource *res;
/* check for valid compositor data */
@@ -353,6 +364,19 @@ e_comp_wl_input_shutdown(E_Comp_Data *cdata)
/* destroy cdata-kbd.keys array */
wl_array_release(cdata-kbd.keys);
+ /* unreference any existing keymap */
+ if (cdata-xkb.keymap) xkb_map_unref(cdata-xkb.keymap);
+
+ /* unmap any existing keyboard area */
+ if (cdata-xkb.area) munmap(cdata-xkb.area, cdata-xkb.size);
+ if (cdata-xkb.fd = 0) close(cdata-xkb.fd);
+
+ /* unreference any existing keyboard state */
+ if (cdata-xkb.state) xkb_state_unref(cdata-xkb.state);
+
+ /* unreference any existing context */
+ if (cdata-xkb.context) xkb_context_unref(cdata-xkb.context);
+
/* destroy the global seat resource */
if (cdata-seat.global) wl_global_destroy(cdata-seat.global);
cdata-seat.global = NULL;
--
[EGIT] [core/enlightenment] master 01/01: clean up comp object to not use deprecated comp functions
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=44229f20bd0ce7a26ef784220eb89942324d3508
commit 44229f20bd0ce7a26ef784220eb89942324d3508
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Feb 2 12:11:51 2015 -0500
clean up comp object to not use deprecated comp functions
---
src/bin/e_comp_object.c | 107 +++-
1 file changed, 42 insertions(+), 65 deletions(-)
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 6b4df5a..4b78de8 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -2184,13 +2184,11 @@ _e_comp_object_util_del(void *data EINA_UNUSED, Evas *e
EINA_UNUSED, Evas_Object
if (comp_object)
{
Evas_Object *o;
-E_Comp *comp;
o = edje_object_part_swallow_get(obj, e.swallow.content);
evas_object_del(o);
-comp = e_comp_util_evas_object_comp_get(obj);
-e_comp_render_queue(comp);
-e_comp_shape_queue(comp);
+e_comp_render_queue(e_comp);
+e_comp_shape_queue(e_comp);
}
l = evas_object_data_get(obj, comp_object-to_del);
E_FREE_LIST(l, evas_object_del);
@@ -2203,7 +2201,7 @@ _e_comp_object_util_restack(void *data EINA_UNUSED, Evas
*e EINA_UNUSED, Evas_Ob
(!evas_object_data_get(obj, comp_override)))
{
evas_object_data_set(obj, comp_override, (void*)1);
-e_comp_override_add(e_comp_util_evas_object_comp_get(obj));
+e_comp_override_add(e_comp);
}
}
@@ -2224,7 +,7 @@ _e_comp_object_util_show(void *data EINA_UNUSED,
Evas_Object *obj)
return;
}
else
- e_comp_shape_queue(e_comp_util_evas_object_comp_get(obj));
+ e_comp_shape_queue(e_comp);
evas_object_show(obj);
if (ref)
@@ -2237,7 +2235,7 @@ _e_comp_object_util_show(void *data EINA_UNUSED,
Evas_Object *obj)
if (e_comp_util_object_is_above_nocomp(obj))
{
evas_object_data_set(obj, comp_override, (void*)1);
-e_comp_override_add(e_comp_util_evas_object_comp_get(obj));
+e_comp_override_add(e_comp);
}
}
@@ -2256,7 +2254,7 @@ _e_comp_object_util_hide(void *data EINA_UNUSED,
Evas_Object *obj)
evas_object_data_set(obj, comp_hiding, (void*)1);
if (evas_object_data_del(obj, comp_override))
- e_comp_override_timed_pop(e_comp_util_evas_object_comp_get(obj));
+ e_comp_override_timed_pop(e_comp);
}
static void
@@ -2267,7 +2265,7 @@ _e_comp_object_util_done_defer(void *data, Evas_Object
*obj, const char *emissio
if (!evas_object_data_del(obj, comp_hiding)) return;
evas_object_intercept_hide_callback_del(obj, _e_comp_object_util_hide);
evas_object_hide(obj);
-e_comp_shape_queue(e_comp_util_evas_object_comp_get(obj));
+e_comp_shape_queue(e_comp);
evas_object_intercept_hide_callback_add(obj, _e_comp_object_util_hide,
data);
}
else
@@ -2288,14 +2286,13 @@ _e_comp_object_util_moveresize(void *data, Evas *e
EINA_UNUSED, Evas_Object *obj
}
if (evas_object_visible_get(obj))
- e_comp_shape_queue(e_comp_util_evas_object_comp_get(obj));
+ e_comp_shape_queue(e_comp);
}
EAPI Evas_Object *
e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type)
{
Evas_Object *o, *z = NULL;
- E_Comp *c;
const char *name;
Eina_List *l, *list = NULL;
E_Comp_Config *conf = e_comp_config_get();
@@ -2328,8 +2325,7 @@ e_comp_object_util_add(Evas_Object *obj,
E_Comp_Object_Type type)
}
name = evas_object_name_get(obj);
vis = evas_object_visible_get(obj);
- c = e_comp_util_evas_object_comp_get(obj);
- o = edje_object_add(c-evas);
+ o = edje_object_add(e_comp-evas);
evas_object_data_set(o, comp_object, (void*)1);
if (name (!skip))
skip = (!strncmp(name, noshadow, 8));
@@ -2398,7 +2394,7 @@ e_comp_object_util_add(Evas_Object *obj,
E_Comp_Object_Type type)
if (list)
{
-z = e_zoomap_add(c-evas);
+z = e_zoomap_add(e_comp-evas);
e_zoomap_child_edje_solid_setup(z);
e_zoomap_smooth_set(z, conf-smooth_windows);
e_zoomap_child_set(z, obj);
@@ -2573,21 +2569,11 @@ e_comp_object_util_zone_get(Evas_Object *obj)
else
{
int x, y;
-E_Comp *c;
if (e_win_client_get(obj))
return e_win_client_get(obj)-zone;
-c = e_comp_util_evas_object_comp_get(obj);
-if (c)
- {
- evas_object_geometry_get(obj, x, y, NULL, NULL);
- zone = e_comp_zone_xy_get(c, x, y);
- }
-else
- {
- evas_object_geometry_get(obj, x, y, NULL, NULL);
- zone = e_comp_zone_xy_get(NULL, x, y);
- }
+evas_object_geometry_get(obj, x, y, NULL, NULL);
+zone = e_comp_zone_xy_get(e_comp, x, y);
}
return zone;
}
@@ -2636,11 +2622,8 @@ e_comp_object_util_fullscreen(Evas_Object *obj)
[EGIT] [core/enlightenment] master 01/02: don't create wl clients as re_manage
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=8d5ab29625e374d12e7823dec89ecd009e3e1719
commit 8d5ab29625e374d12e7823dec89ecd009e3e1719
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Feb 2 12:41:18 2015 -0500
don't create wl clients as re_manage
---
src/bin/e_comp_wl.c | 2 +-
src/modules/wl_desktop_shell/e_mod_main.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 4a54d85..24c7c9e 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1917,7 +1917,7 @@ _e_comp_wl_subcompositor_cb_subsurface_get(struct
wl_client *client EINA_UNUSED,
if (!ec)
{
/* no client exists for this pixmap yet */
-if (!(ec = e_client_new(e_util_comp_current_get(), ep, 1, 0)))
+if (!(ec = e_client_new(NULL, ep, 0, 0)))
{
ERR(Failed to create new client);
wl_resource_post_no_memory(resource);
diff --git a/src/modules/wl_desktop_shell/e_mod_main.c
b/src/modules/wl_desktop_shell/e_mod_main.c
index 5ea062d..2de403a 100644
--- a/src/modules/wl_desktop_shell/e_mod_main.c
+++ b/src/modules/wl_desktop_shell/e_mod_main.c
@@ -567,7 +567,7 @@ _e_shell_cb_shell_surface_get(struct wl_client *client,
struct wl_resource *reso
if (!ec)
{
/* no client found. not internal window. maybe external client app ? */
-if (!(ec = e_client_new(e_util_comp_current_get(), ep, 1, 0)))
+if (!(ec = e_client_new(NULL, ep, 0, 0)))
{
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
@@ -1144,7 +1144,7 @@ _e_xdg_shell_cb_surface_get(struct wl_client *client,
struct wl_resource *resour
if (!ec)
{
/* no client found. not internal window. maybe external client app ? */
-if (!(ec = e_client_new(e_util_comp_current_get(), ep, 1, 0)))
+if (!(ec = e_client_new(NULL, ep, 0, 0)))
{
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
@@ -1246,7 +1246,7 @@ _e_xdg_shell_cb_popup_get(struct wl_client *client,
struct wl_resource *resource
if (!ec)
{
/* no client found. create one */
-if (!(ec = e_client_new(e_util_comp_current_get(), ep, 1, 1)))
+if (!(ec = e_client_new(NULL, ep, 0, 1)))
{
wl_resource_post_error(surface_resource,
WL_DISPLAY_ERROR_INVALID_OBJECT,
--
[EGIT] [core/enlightenment] master 02/02: make comp param in e_client_new unused
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=1f608490c86428d9f88c371aa88df798234423e4
commit 1f608490c86428d9f88c371aa88df798234423e4
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Mon Feb 2 12:42:43 2015 -0500
make comp param in e_client_new unused
---
src/bin/e_client.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index b44bb3b..1835510 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -2385,7 +2385,7 @@ e_client_shutdown(void)
}
EAPI E_Client *
-e_client_new(E_Comp *c, E_Pixmap *cp, int first_map, int internal)
+e_client_new(E_Comp *c EINA_UNUSED, E_Pixmap *cp, int first_map, int internal)
{
E_Client *ec;
@@ -2403,7 +2403,7 @@ e_client_new(E_Comp *c, E_Pixmap *cp, int first_map, int
internal)
ec-w = 1;
ec-h = 1;
ec-internal = internal;
- ec-comp = c;
+ ec-comp = e_comp;
ec-pixmap = cp;
e_pixmap_client_set(cp, ec);
@@ -2438,7 +2438,7 @@ e_client_new(E_Comp *c, E_Pixmap *cp, int first_map, int
internal)
if (ec-override)
_e_client_zone_update(ec);
else
- e_client_desk_set(ec, e_desk_current_get(e_zone_current_get(c)));
+ e_client_desk_set(ec, e_desk_current_get(e_zone_current_get(e_comp)));
ec-icccm.title = NULL;
ec-icccm.name = NULL;
@@ -2484,7 +2484,7 @@ e_client_new(E_Comp *c, E_Pixmap *cp, int first_map, int
internal)
EC_CHANGED(ec);
- c-clients = eina_list_append(c-clients, ec);
+ e_comp-clients = eina_list_append(e_comp-clients, ec);
eina_hash_add(clients_hash, ec-pixmap, ec);
_e_client_event_simple(ec, E_EVENT_CLIENT_ADD);
--
[EGIT] [core/enlightenment] master 01/01: reset keyboard modifiers when client is deleted
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b9f4b257d713b52c5702b115bf3972f12c865cdc commit b9f4b257d713b52c5702b115bf3972f12c865cdc Author: Chris Michael cp.mich...@samsung.com Date: Mon Feb 2 12:27:06 2015 -0500 reset keyboard modifiers when client is deleted Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/bin/e_comp_wl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 4a54d85..ba5c41d 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2065,6 +2065,8 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec) /* win = e_pixmap_window_get(ec-pixmap); */ /* eina_hash_del_by_key(clients_win_hash, win); */ + e_comp_wl_input_keyboard_modifiers_update(e_comp-wl_comp_data); + if ((!ec-already_unparented) (ec-comp_data-reparented)) _e_comp_wl_focus_down_set(ec); --
[EGIT] [core/enlightenment] master 01/01: Revert reset keyboard modifiers when client is deleted
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b02439c14df4548eea4a1ef3aaef7203968412be commit b02439c14df4548eea4a1ef3aaef7203968412be Author: Chris Michael cp.mich...@samsung.com Date: Mon Feb 2 12:31:09 2015 -0500 Revert reset keyboard modifiers when client is deleted This reverts commit b9f4b257d713b52c5702b115bf3972f12c865cdc. Revert this quick fix as apparently it did not actually fix the problem. --- src/bin/e_comp_wl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index ba5c41d..4a54d85 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -2065,8 +2065,6 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec) /* win = e_pixmap_window_get(ec-pixmap); */ /* eina_hash_del_by_key(clients_win_hash, win); */ - e_comp_wl_input_keyboard_modifiers_update(e_comp-wl_comp_data); - if ((!ec-already_unparented) (ec-comp_data-reparented)) _e_comp_wl_focus_down_set(ec); --
[EGIT] [tools/enventor] master 01/01: setting: Add the Text Editor mode in setting.
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=799fd32e13b5cf3e313badb73572821d22974064
commit 799fd32e13b5cf3e313badb73572821d22974064
Author: Jaehyun Cho jae_hyun@samsung.com
Date: Tue Feb 3 13:42:12 2015 +0900
setting: Add the Text Editor mode in setting.
Add the Text Editor mode in setting by adding text_setting.c.
text_setting.c covers the syntax coloring and the syntax font scaling.
---
data/color/Makefile.am | 3 +-
data/color/syntax_template.dat | 1 +
data/themes/default/layout_setting.edc | 278 +++
src/bin/Makefile.am| 1 +
src/bin/config_data.c | 36 --
src/bin/main.c | 56 ---
src/bin/setting.c | 293 +--
src/bin/text_setting.c | 853 +
src/include/Makefile.am| 1 +
src/include/config_data.h | 2 -
src/include/text_setting.h | 35 ++
11 files changed, 1230 insertions(+), 329 deletions(-)
diff --git a/data/color/Makefile.am b/data/color/Makefile.am
index aa8f3d3..d1d438a 100644
--- a/data/color/Makefile.am
+++ b/data/color/Makefile.am
@@ -7,7 +7,8 @@ color.src
filesdir = $(datadir)/$(PACKAGE)/color
files_DATA = \
-color.eet
+color.eet \
+syntax_template.dat
%.eet: %.src
$(EET_EET) -e \
diff --git a/data/color/syntax_template.dat b/data/color/syntax_template.dat
new file mode 100644
index 000..d5ec66a
--- /dev/null
+++ b/data/color/syntax_template.dat
@@ -0,0 +1 @@
+ font_size=%dcolor=#%s//comment/colorbr/ color=#%s#define
RECT_COLOR/color 0 136 170 255br/ color=#%spart/color
color=#%s{/color color=#%sname/colorcolor=#%s:/color
color=#%squot;rectquot;/colorcolor=#%s;/colorbr/
color=#%stype/colorcolor=#%s:/color
color=#%sRECT/colorcolor=#%s;/colorbr/
color=#%sdescription/color color=#%s{/color
color=#%sstate/colorcolor=#%s:/color color=#%squot;defaultquot;
[...]
diff --git a/data/themes/default/layout_setting.edc
b/data/themes/default/layout_setting.edc
index 4081bb9..44e1ba9 100644
--- a/data/themes/default/layout_setting.edc
+++ b/data/themes/default/layout_setting.edc
@@ -28,8 +28,8 @@ group { name: setting_layout;
scale: 1;
clip_to: clipper;
description {
-min: 600 350;
-max: 600 350;
+min: 600 380;
+max: 600 380;
fixed: 1 1;
image.normal: frame_bg.png;
image.border: 10 10 10 10;
@@ -104,11 +104,143 @@ group { name: setting_layout;
color: COL_HI;
}
}
+ part { name: elm.swallow.tabbar;
+ type: SWALLOW;
+ scale: 1;
+ clip_to: clipper;
+ description { state: default 0.0;
+min: 0 25;
+max: -1 25;
+align: 0.5 0.0;
+fixed: 0 1;
+rel1 {to: title_frame; relative: 0.0 1.0; offset: 0 5;}
+rel2.to: title_frame;
+ }
+ }
+ part { name: elm.swallow.content;
+ type: SWALLOW;
+ scale: 1;
+ clip_to: clipper;
+ description { state: default 0.0;
+rel1 {
+ to: elm.swallow.tabbar;
+ relative: 0.0 1.0;
+}
+rel2 {
+ to_x: base_frame;
+ to_y: elm.swallow.reset_btn;
+ relative: 1.0 0.0;
+ offset: -1 -11;
+}
+ }
+ }
+ part { name: elm.swallow.apply_btn;
+ type: SWALLOW;
+ scale: 1;
+ description {
+align: 1 0.5;
+min: 50 25;
+fixed: 1 1;
+rel1.to: elm.swallow.reset_btn;
+rel1.relative: 0 0;
+rel2.to: elm.swallow.reset_btn;
+rel2.relative: 0 1;
+ }
+ }
+ part { name: elm.swallow.reset_btn;
+ type: SWALLOW;
+ scale: 1;
+ description {
+align: 0.5 1;
+min: 50 25;
+fixed: 1 1;
+rel1.to: base_frame;
+rel1.relative: 0.5 1;
+rel2.to: base_frame;
+rel2.relative: 0.5 1;
+ }
+ }
+ part { name: elm.swallow.cancel_btn;
+ type: SWALLOW;
+ scale: 1;
+ description {
+align: 0 0.5;
+min: 50 25;
+fixed: 1 1;
+rel1.to: elm.swallow.reset_btn;
+rel1.relative: 1 0;
+rel2.to: elm.swallow.reset_btn;
+rel2.relative: 1 1;
+ }
+ }
+ part { name: event_blocker;
+ type: RECT;
+ description { state: default 0.0;
+color: 0 0 0 0;
+visible: 1;
+ }
+ description { state: hide 0.0;
+inherit: default 0.0;
+visible: 0;
+ }
+ }
+ part { name: over_img;
+ type: IMAGE;
+ scale: 1;
[EGIT] [website/www] master 01/01: release: update enventor download link to 0.4.2 version
hermet pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=0641adc0ad6acb8f613b787199009168ba66ec56 commit 0641adc0ad6acb8f613b787199009168ba66ec56 Author: ChunEon Park chuneon.p...@samsung.com Date: Mon Feb 2 16:58:39 2015 +0900 release: update enventor download link to 0.4.2 version --- 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 66da58c..fbfcaaf 100644 --- a/public_html/p/download/en-body +++ b/public_html/p/download/en-body @@ -111,10 +111,10 @@ ?php frame2();? ?php frame1(width=100%);? - div class=mainpbEnventor/b em0.4.1/em/pp + div class=mainpbEnventor/b em0.4.2/em/pp Dynamic EDC editor to write your layout fast and easy. /pp align=right?php blinkdl(i/dl.png, DOWNLOAD, - http://download.enlightenment.org/rel/apps/enventor/enventor-0.4.1.tar.gz; + http://download.enlightenment.org/rel/apps/enventor/enventor-0.4.2.tar.gz; );?/p/div ?php frame2();? --
