kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into devs/hermet/lottie

This commit is contained in:
Hermet Park 2019-05-20 18:56:49 +09:00
parent 0d063171c6 1692ff3890
commit 463e3a73fd
277 changed files with 4007 additions and 1233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/ci-make-check.sh
View File

@ -23,7 +23,7 @@ if [ "$BUILDSYSTEM" = "ninja" ] ; then
# https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be
if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then
for tries in $(seq 1 ${NUM_TRIES}); do for tries in $(seq 1 ${NUM_TRIES}); do
(docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -C build --wrapper dbus-launch ) && break (docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break
docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
false false

3
data/elementary/themes/default.edc
View File

@ -1,3 +1,5 @@
efl_version: 1 22;
#include "macros.edc" #include "macros.edc"
externals.external: "elm"; externals.external: "elm";
@ -165,6 +167,7 @@ collections {
#include "edc/O/icons.edc" #include "edc/O/icons.edc"
// New efl ui themes // New efl ui themes
#include "edc/efl/macros.edc"
#include "edc/efl/bg.edc" #include "edc/efl/bg.edc"
#include "edc/efl/button.edc" #include "edc/efl/button.edc"
#include "edc/efl/calendar.edc" #include "edc/efl/calendar.edc"

7
data/elementary/themes/edc/efl/button.edc
View File

@ -296,9 +296,9 @@ group { name: "efl/button";
} }
} }
programs { programs {
EFL_UI_CLICKABLE_PART_BIND("event")
program { program {
signal: "mouse,down,1"; source: "event"; signal: "mouse,down,1"; source: "event";
action: SIGNAL_EMIT "efl,action,press" "efl";
after: "button_click_anim"; after: "button_click_anim";
} }
program { name: "button_click_anim"; program { name: "button_click_anim";
@ -310,7 +310,6 @@ group { name: "efl/button";
} }
program { name: "button_unclick"; program { name: "button_unclick";
signal: "mouse,up,1"; source: "event"; signal: "mouse,up,1"; source: "event";
action: SIGNAL_EMIT "efl,action,unpress" "efl";
after: "button_unclick_anim"; after: "button_unclick_anim";
} }
program { name: "button_unclick_anim"; program { name: "button_unclick_anim";
@ -331,10 +330,6 @@ group { name: "efl/button";
in: 0.5 0.0; in: 0.5 0.0;
target: "base"; target: "base";
} }
program {
signal: "mouse,clicked,1"; source: "event";
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { name: "button_text_visible"; program { name: "button_text_visible";
signal: "efl,state,text,set"; source: "efl"; signal: "efl,state,text,set"; source: "efl";
script { script {

5
data/elementary/themes/edc/efl/frame.edc
View File

@ -131,10 +131,7 @@ group { name: "efl/frame";
transition: DECELERATE 0.3; transition: DECELERATE 0.3;
after: "signal"; after: "signal";
} }
program { EFL_UI_CLICKABLE_PART_BIND("event")
signal: "mouse,up,1"; source: "event";
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { program {
signal: "efl,action,toggle"; source: "efl"; signal: "efl,action,toggle"; source: "efl";
script { script {

24
data/elementary/themes/edc/efl/macros.edc Normal file
View File

@ -0,0 +1,24 @@
/**
* A macro for defining the programms that are needed to redirect the mouse events of a part to the implementation of Efl.Ui.Clickable.
*
* The Widget using this has to call the method bind_to_theme of Efl.Ui.Clickable_Util in order to redirect the here called signals to real events that can be used in code.
* The resulting events on the widget will be from the Efl.Ui.Clickable class.
*/
#define EFL_UI_CLICKABLE_PART_BIND(PART) \
program { \
signal: "mouse,down,1"; source: PART; \
action: SIGNAL_EMIT "efl,action,press" "efl"; \
} \
program { \
signal: "mouse,down,1,*"; source: PART; \
action: SIGNAL_EMIT "efl,action,press" "efl"; \
} \
program { \
signal: "mouse,up,1"; source: PART; \
action: SIGNAL_EMIT "efl,action,unpress" "efl"; \
} \
program { \
signal: "mouse,pressed,out"; source: PART; \
action: SIGNAL_EMIT "efl,action,mouse_out" "efl"; \
}

54
data/elementary/themes/edc/efl/panes.edc
View File

@ -5,8 +5,6 @@
efl,panes,unfixed: Used for elm_panes_fixed_set() efl,panes,unfixed: Used for elm_panes_fixed_set()
[SIGNAL EMIT] [SIGNAL EMIT]
efl,action,click: Used for "clicked" smart callback.
efl,action,click,double: Used for "clicked,double" smart callback.
efl,action,press: Used for "press" smart callback. efl,action,press: Used for "press" smart callback.
efl,action,unpress: Used for "unpress" smart callback. efl,action,unpress: Used for "unpress" smart callback.
*/ */
@ -131,18 +129,7 @@ group { name: "efl/panes/vertical";
} }
} }
programs { programs {
program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback EFL_UI_CLICKABLE_PART_BIND("bar")
action: SIGNAL_EMIT "efl,action,press" "efl";
}
program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
action: SIGNAL_EMIT "efl,action,unpress" "efl";
}
program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
action: SIGNAL_EMIT "efl,action,click,double" "efl";
}
program { // for elm_panes_fixed_set() program { // for elm_panes_fixed_set()
signal: "efl,panes,fixed"; source: "efl"; signal: "efl,panes,fixed"; source: "efl";
action: STATE_SET "disabled" 0.0; action: STATE_SET "disabled" 0.0;
@ -272,18 +259,7 @@ group { name: "efl/panes/horizontal";
} }
} }
programs { programs {
program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback EFL_UI_CLICKABLE_PART_BIND("bar")
action: SIGNAL_EMIT "efl,action,press" "efl";
}
program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
action: SIGNAL_EMIT "efl,action,unpress" "efl";
}
program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
action: SIGNAL_EMIT "efl,action,click,double" "efl";
}
program { // for elm_panes_fixed_set() program { // for elm_panes_fixed_set()
signal: "efl,panes,fixed"; source: "efl"; signal: "efl,panes,fixed"; source: "efl";
action: STATE_SET "disabled" 0.0; action: STATE_SET "disabled" 0.0;
@ -472,18 +448,7 @@ group { name: "efl/panes/vertical:flush";
} }
} }
programs { programs {
program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback EFL_UI_CLICKABLE_PART_BIND("bar")
action: SIGNAL_EMIT "efl,action,press" "efl";
}
program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
action: SIGNAL_EMIT "efl,action,unpress" "efl";
}
program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
action: SIGNAL_EMIT "efl,action,click,double" "efl";
}
program { // for elm_panes_fixed_set() program { // for elm_panes_fixed_set()
signal: "efl,panes,fixed"; source: "efl"; signal: "efl,panes,fixed"; source: "efl";
action: STATE_SET "disabled" 0.0; action: STATE_SET "disabled" 0.0;
@ -728,18 +693,7 @@ group { name: "efl/panes/horizontal:flush";
target: "glow2a"; target: "glow2a";
target: "glow2b"; target: "glow2b";
} }
program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback EFL_UI_CLICKABLE_PART_BIND("bar")
action: SIGNAL_EMIT "efl,action,press" "efl";
}
program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback
action: SIGNAL_EMIT "efl,action,unpress" "efl";
}
program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback
action: SIGNAL_EMIT "efl,action,click" "efl";
}
program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback
action: SIGNAL_EMIT "efl,action,click,double" "efl";
}
program { // for elm_panes_fixed_set() program { // for elm_panes_fixed_set()
signal: "efl,panes,fixed"; source: "efl"; signal: "efl,panes,fixed"; source: "efl";
action: STATE_SET "disabled" 0.0; action: STATE_SET "disabled" 0.0;

12
data/elementary/themes/edc/efl/popup.edc
View File

@ -15,6 +15,11 @@ group { "efl/popup";
image.normal: "rounded_square.png"; image.normal: "rounded_square.png";
} }
} }
swallow { "efl.background";
desc { "default";
rel.to: "bg";
}
}
swallow { "efl.content"; swallow { "efl.content";
desc { "default"; desc { "default";
rel.to: "base"; rel.to: "base";
@ -34,7 +39,12 @@ group { "efl/alert_popup";
min: 100 100; min: 100 100;
image.border: 15 15 15 15; image.border: 15 15 15 15;
image.normal: "rounded_square.png"; image.normal: "rounded_square.png";
} }
}
swallow { "efl.background";
desc { "default";
rel.to: "bg";
}
} }
spacer { "base"; spacer { "base";
desc { "default"; desc { "default";

2
doc/docfx/setup.sh
View File

@ -36,7 +36,7 @@ fi
# Clone whole Content site # Clone whole Content site
# #
rm -rf www-content rm -rf www-content
git clone --depth 1 git+ssh://git@git.enlightenment.org/website/www-content.git www-content git clone --depth 1 https://git@git.enlightenment.org/website/www-content.git www-content
# #
# Copy all pages related to C# (those inside a folder called 'csharp') to the articles folder # Copy all pages related to C# (those inside a folder called 'csharp') to the articles folder

2
meson.build
View File

@ -1,6 +1,6 @@
project('efl', ['c','cpp'], project('efl', ['c','cpp'],
version: '1.22.99', version: '1.22.99',
default_options : ['buildtype=release', 'cpp_std=c++11'], default_options : ['buildtype=plain', 'cpp_std=c++11'],
meson_version : '>=0.47' meson_version : '>=0.47'
) )

2
src/Makefile_Cxx.am
View File

@ -379,6 +379,7 @@ check_LIBRARIES = tests/elementary_cxx/libcxx_compile_test.a
tests_elementary_cxx_libcxx_compile_test_a_SOURCES = tests/elementary_cxx/cxx_compile_test.cc tests_elementary_cxx_libcxx_compile_test_a_SOURCES = tests/elementary_cxx/cxx_compile_test.cc
tests_elementary_cxx_libcxx_compile_test_a_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ tests_elementary_cxx_libcxx_compile_test_a_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_builddir)/src/lib/evas/canvas/ \ -I$(top_builddir)/src/lib/evas/canvas/ \
-I$(top_builddir)/src/lib/evas/gesture/ \
-I$(top_builddir)/src/lib/efl/interfaces/ \ -I$(top_builddir)/src/lib/efl/interfaces/ \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elementary_cxx\" \ -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elementary_cxx\" \
-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elementary_cxx\" \ -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elementary_cxx\" \
@ -396,6 +397,7 @@ tests/elementary_cxx/$(TESTS_ELM_CXX_OBJNAME)cxx_dummy_compile_test-cxx_dummy_co
tests_elementary_cxx_cxx_dummy_compile_test_SOURCES = tests/elementary_cxx/cxx_dummy_compile_test.cc tests_elementary_cxx_cxx_dummy_compile_test_SOURCES = tests/elementary_cxx/cxx_dummy_compile_test.cc
tests_elementary_cxx_cxx_dummy_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ tests_elementary_cxx_cxx_dummy_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-I$(top_builddir)/src/lib/evas/canvas/ \ -I$(top_builddir)/src/lib/evas/canvas/ \
-I$(top_builddir)/src/lib/evas/gesture/ \
-I$(top_builddir)/src/lib/efl/interfaces/ \ -I$(top_builddir)/src/lib/efl/interfaces/ \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elementary_cxx\" \ -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/elementary_cxx\" \
-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elementary_cxx\" \ -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/elementary_cxx\" \

1
src/Makefile_Efl.am
View File

@ -7,7 +7,6 @@ efl_eolian_legacy_files = \
lib/efl/interfaces/efl_gfx_frame_controller.eo \ lib/efl/interfaces/efl_gfx_frame_controller.eo \
lib/efl/interfaces/efl_input_device.eo \ lib/efl/interfaces/efl_input_device.eo \
lib/efl/interfaces/efl_ui_draggable.eo \ lib/efl/interfaces/efl_ui_draggable.eo \
lib/efl/interfaces/efl_ui_clickable.eo \
lib/efl/interfaces/efl_ui_scrollable.eo \ lib/efl/interfaces/efl_ui_scrollable.eo \
lib/efl/interfaces/efl_ui_scrollable_interactive.eo \ lib/efl/interfaces/efl_ui_scrollable_interactive.eo \
lib/efl/interfaces/efl_ui_scrollbar.eo \ lib/efl/interfaces/efl_ui_scrollbar.eo \

1
src/Makefile_Efl_Mono.am
View File

@ -130,7 +130,6 @@ include Makefile_Eolian_Mono_Helper.am
### Efl C Sharp Binding ### Efl C Sharp Binding
evas_eolian_blacklisted_files = \ evas_eolian_blacklisted_files = \
lib/evas/canvas/efl_canvas_text.eo.cs \
lib/evas/canvas/efl_canvas_scene3d.eo.cs \ lib/evas/canvas/efl_canvas_scene3d.eo.cs \
lib/evas/canvas/evas_canvas3d_camera.eo.cs \ lib/evas/canvas/evas_canvas3d_camera.eo.cs \
lib/evas/canvas/evas_canvas3d_light.eo.cs \ lib/evas/canvas/evas_canvas3d_light.eo.cs \

4
src/Makefile_Elementary.am
View File

@ -133,6 +133,8 @@ elm_public_eolian_files = \
lib/elementary/efl_ui_caching_factory.eo \ lib/elementary/efl_ui_caching_factory.eo \
lib/elementary/efl_ui_widget_factory.eo \ lib/elementary/efl_ui_widget_factory.eo \
lib/elementary/efl_ui_relative_layout.eo \ lib/elementary/efl_ui_relative_layout.eo \
lib/elementary/efl_ui_clickable.eo \
lib/elementary/efl_ui_clickable_util.eo \
$(NULL) $(NULL)
# More public files -- FIXME # More public files -- FIXME
@ -1218,6 +1220,8 @@ lib_elementary_libelementary_la_SOURCES = \
lib/elementary/efl_ui_exact_model.c \ lib/elementary/efl_ui_exact_model.c \
lib/elementary/efl_ui_average_model.c \ lib/elementary/efl_ui_average_model.c \
lib/elementary/efl_ui_relative_layout.c \ lib/elementary/efl_ui_relative_layout.c \
lib/elementary/efl_ui_clickable.c \
lib/elementary/efl_ui_clickable_util.c \
$(NULL) $(NULL)

2
src/Makefile_Eolian.am
View File

@ -158,7 +158,7 @@ tests/eolian/data/typedef_ref.h \
tests/eolian/data/typedef_ref_stub.h \ tests/eolian/data/typedef_ref_stub.h \
tests/eolian/data/struct_ref.h \ tests/eolian/data/struct_ref.h \
tests/eolian/data/struct_ref_stub.h \ tests/eolian/data/struct_ref_stub.h \
tests/eolian/data/owning.eo.c \ tests/eolian/data/owning_ref.c \
tests/eolian/data/class_simple_ref.c \ tests/eolian/data/class_simple_ref.c \
tests/eolian/data/override_ref.c \ tests/eolian/data/override_ref.c \
tests/eolian/data/class_simple_ref_eo.h \ tests/eolian/data/class_simple_ref_eo.h \

40
src/Makefile_Evas.am
View File

@ -59,16 +59,25 @@ evas_gesture_eolian_pub_files = \
lib/evas/gesture/efl_canvas_gesture.eo \ lib/evas/gesture/efl_canvas_gesture.eo \
lib/evas/gesture/efl_canvas_gesture_tap.eo \ lib/evas/gesture/efl_canvas_gesture_tap.eo \
lib/evas/gesture/efl_canvas_gesture_long_tap.eo \ lib/evas/gesture/efl_canvas_gesture_long_tap.eo \
lib/evas/gesture/efl_canvas_gesture_double_tap.eo \
lib/evas/gesture/efl_canvas_gesture_triple_tap.eo \
lib/evas/gesture/efl_canvas_gesture_momentum.eo \
lib/evas/gesture/efl_canvas_gesture_flick.eo \
lib/evas/gesture/efl_canvas_gesture_zoom.eo \
lib/evas/gesture/efl_canvas_gesture_recognizer.eo \ lib/evas/gesture/efl_canvas_gesture_recognizer.eo \
lib/evas/gesture/efl_canvas_gesture_recognizer_tap.eo \
lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo \
lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.eo \
lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.eo \
lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.eo \
lib/evas/gesture/efl_canvas_gesture_recognizer_flick.eo \
lib/evas/gesture/efl_canvas_gesture_recognizer_zoom.eo \
lib/evas/gesture/efl_canvas_gesture_manager.eo \ lib/evas/gesture/efl_canvas_gesture_manager.eo \
lib/evas/gesture/efl_gesture_events.eo \
$(NULL) $(NULL)
evas_canvas_eolian_priv_files = \ evas_canvas_eolian_priv_files = \
lib/evas/include/evas_ector_buffer.eo lib/evas/include/evas_ector_buffer.eo
evas_gesture_eolian_priv_files = \
lib/evas/gesture/efl_canvas_gesture_recognizer_tap.eo \
lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.eo
evas_canvas_eolian_type_files = \ evas_canvas_eolian_type_files = \
lib/evas/canvas/evas_canvas3d_types.eot \ lib/evas/canvas/evas_canvas3d_types.eot \
@ -80,9 +89,6 @@ evas_gesture_eolian_type_files = \
evas_canvas_eolian_priv_c = $(evas_canvas_eolian_priv_files:%.eo=%.eo.c) evas_canvas_eolian_priv_c = $(evas_canvas_eolian_priv_files:%.eo=%.eo.c)
evas_canvas_eolian_priv_h = $(evas_canvas_eolian_priv_files:%.eo=%.eo.h) evas_canvas_eolian_priv_h = $(evas_canvas_eolian_priv_files:%.eo=%.eo.h)
evas_gesture_eolian_priv_c = $(evas_gesture_eolian_priv_files:%.eo=%.eo.c)
evas_gesture_eolian_priv_h = $(evas_gesture_eolian_priv_files:%.eo=%.eo.h)
evas_canvas_eolian_pub_c = $(evas_canvas_eolian_pub_files:%.eo=%.eo.c) evas_canvas_eolian_pub_c = $(evas_canvas_eolian_pub_files:%.eo=%.eo.c)
evas_canvas_eolian_pub_h = $(evas_canvas_eolian_pub_files:%.eo=%.eo.h) \ evas_canvas_eolian_pub_h = $(evas_canvas_eolian_pub_files:%.eo=%.eo.h) \
$(evas_canvas_eolian_type_files:%.eot=%.eot.h) $(evas_canvas_eolian_type_files:%.eot=%.eot.h)
@ -97,13 +103,15 @@ evas_eolian_files = $(evas_canvas_eolian_pub_files) \
$(evas_gesture_eolian_type_files) $(evas_gesture_eolian_type_files)
evas_eolian_internal_files = $(evas_canvas_eolian_priv_files) \ evas_eolian_internal_files = $(evas_canvas_eolian_priv_files) \
$(evas_gesture_eolian_priv_files) $(evas_eolian_legacy_files)
evas_eolian_c = $(evas_canvas_eolian_pub_c) $(evas_canvas_eolian_priv_c) \ evas_eolian_c = $(evas_canvas_eolian_pub_c) $(evas_canvas_eolian_priv_c) \
$(evas_gesture_eolian_pub_c) $(evas_gesture_eolian_priv_c) $(evas_gesture_eolian_pub_c) \
$(evas_eolian_legacy_c)
evas_eolian_h = $(evas_canvas_eolian_pub_h) $(evas_canvas_eolian_priv_h) \ evas_eolian_h = $(evas_canvas_eolian_pub_h) $(evas_canvas_eolian_priv_h) \
$(evas_gesture_eolian_pub_h) $(evas_gesture_eolian_priv_h) $(evas_gesture_eolian_pub_h) \
$(evas_eolian_legacy_h)
BUILT_SOURCES += \ BUILT_SOURCES += \
$(evas_eolian_c) \ $(evas_eolian_c) \
@ -319,9 +327,19 @@ lib/evas/gesture/efl_canvas_gesture_touch.c \
lib/evas/gesture/efl_canvas_gesture.c \ lib/evas/gesture/efl_canvas_gesture.c \
lib/evas/gesture/efl_canvas_gesture_tap.c \ lib/evas/gesture/efl_canvas_gesture_tap.c \
lib/evas/gesture/efl_canvas_gesture_long_tap.c \ lib/evas/gesture/efl_canvas_gesture_long_tap.c \
lib/evas/gesture/efl_canvas_gesture_double_tap.c \
lib/evas/gesture/efl_canvas_gesture_triple_tap.c \
lib/evas/gesture/efl_canvas_gesture_momentum.c \
lib/evas/gesture/efl_canvas_gesture_flick.c \
lib/evas/gesture/efl_canvas_gesture_zoom.c \
lib/evas/gesture/efl_canvas_gesture_recognizer.c \ lib/evas/gesture/efl_canvas_gesture_recognizer.c \
lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c \ lib/evas/gesture/efl_canvas_gesture_recognizer_tap.c \
lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c \ lib/evas/gesture/efl_canvas_gesture_recognizer_long_tap.c \
lib/evas/gesture/efl_canvas_gesture_recognizer_double_tap.c \
lib/evas/gesture/efl_canvas_gesture_recognizer_triple_tap.c \
lib/evas/gesture/efl_canvas_gesture_recognizer_momentum.c \
lib/evas/gesture/efl_canvas_gesture_recognizer_flick.c \
lib/evas/gesture/efl_canvas_gesture_recognizer_zoom.c \
lib/evas/gesture/efl_canvas_gesture_manager.c \ lib/evas/gesture/efl_canvas_gesture_manager.c \
lib/evas/common/region.c \ lib/evas/common/region.c \
lib/evas/common/region.h \ lib/evas/common/region.h \

2
src/Makefile_Evil.am
View File

@ -11,8 +11,6 @@ lib/evil/evil_dlfcn.h \
lib/evil/evil_fcntl.h \ lib/evil/evil_fcntl.h \
lib/evil/evil_langinfo.h \ lib/evil/evil_langinfo.h \
lib/evil/evil_locale.h \ lib/evil/evil_locale.h \
lib/evil/evil_macro.h \
lib/evil/evil_macro_pop.h \
lib/evil/evil_macro_wrapper.h \ lib/evil/evil_macro_wrapper.h \
lib/evil/evil_main.h \ lib/evil/evil_main.h \
lib/evil/evil_stdio.h \ lib/evil/evil_stdio.h \

1
src/benchmarks/eina/meson.build
View File

@ -38,5 +38,4 @@ eina_bench = executable('eina_bench',
benchmark('eina_bench', eina_bench, benchmark('eina_bench', eina_bench,
args : 'libcity.la', args : 'libcity.la',
timeout : 20*60
) )

1
src/benchmarks/elementary/meson.build
View File

@ -5,5 +5,4 @@ focus_widget_tree_bench = executable('focus_widget_tree_bench',
benchmark('focus_widget_tree', focus_widget_tree_bench, benchmark('focus_widget_tree', focus_widget_tree_bench,
args: ['5'], args: ['5'],
timeout : 5*60
) )

4
src/bin/ecore_con/efl_net_proxy_helper.c
View File

@ -10,10 +10,6 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "Eina.h" #include "Eina.h"
#ifdef ERR #ifdef ERR

4
src/bin/ecore_evas/ecore_evas_convert.c
View File

@ -2,10 +2,6 @@
#include <config.h> #include <config.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#include <Eina.h> #include <Eina.h>
#include <Evas.h> #include <Evas.h>
#include <Ecore.h> #include <Ecore.h>

4
src/bin/eet/eet_main.c
View File

@ -7,10 +7,6 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#ifdef _WIN32
# include <Evil.h>
#endif /* ifdef _WIN32 */
#include <Eet.h> #include <Eet.h>
static int _eet_main_log_dom = -1; static int _eet_main_log_dom = -1;

3
src/bin/efl/efl_debugd.c
View File

@ -25,6 +25,9 @@
#include <fcntl.h> #include <fcntl.h>
#include "eina_debug_private.h" #include "eina_debug_private.h"
#ifdef _WIN32
# include <evil_private.h> /* mkdir */
#endif
#include <Eina.h> #include <Eina.h>
#include <Ecore.h> #include <Ecore.h>
#include <Ecore_Con.h> #include <Ecore_Con.h>

281
src/bin/elementary/test_gesture_framework.c
View File

@ -175,25 +175,19 @@ _color_and_icon_set(infra_data *infra, char *name, int n, int max,
static void static void
finger_tap_start(void *data , Efl_Canvas_Gesture *tap) finger_tap_start(void *data , Efl_Canvas_Gesture *tap)
{ {
Eina_Vector2 pos = efl_gesture_hotspot_get(tap); Eina_Position2D pos = efl_gesture_hotspot_get(tap);
_color_and_icon_set(data, TAP_NAME, 1, MAX_TAP, START_COLOR); _color_and_icon_set(data, TAP_NAME, 1, MAX_TAP, START_COLOR);
printf("Tap Gesture started x,y=<%f,%f> \n", pos.x, pos.y); printf("Tap Gesture started x,y=<%d,%d> \n", pos.x, pos.y);
}
static void
finger_tap_update(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
{
_color_and_icon_set(data, TAP_NAME, 1, MAX_TAP, UPDATE_COLOR);
} }
static void static void
finger_tap_end(void *data , Efl_Canvas_Gesture *tap) finger_tap_end(void *data , Efl_Canvas_Gesture *tap)
{ {
Eina_Vector2 pos = efl_gesture_hotspot_get(tap); Eina_Position2D pos = efl_gesture_hotspot_get(tap);
_color_and_icon_set(data, TAP_NAME, 1, MAX_TAP, END_COLOR); _color_and_icon_set(data, TAP_NAME, 1, MAX_TAP, END_COLOR);
printf("Tap Gesture ended x,y=<%f,%f> \n", pos.x, pos.y); printf("Tap Gesture ended x,y=<%d,%d> \n", pos.x, pos.y);
} }
static void static void
@ -203,13 +197,148 @@ finger_tap_abort(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
printf("Tap Aborted\n"); printf("Tap Aborted\n");
} }
static void
finger_flick_start(void *data , Efl_Canvas_Gesture *tap)
{
Eina_Position2D pos = efl_gesture_hotspot_get(tap);
_color_and_icon_set(data, FLICK_NAME, 1, MAX_TAP, START_COLOR);
printf("Flick Gesture started x,y=<%d,%d> \n", pos.x, pos.y);
}
static void
finger_flick_end(void *data , Efl_Canvas_Gesture *tap)
{
Eina_Position2D pos = efl_gesture_hotspot_get(tap);
double angle = efl_gesture_flick_angle_get(tap);
_color_and_icon_set(data, FLICK_NAME, 1, MAX_TAP, END_COLOR);
printf("Flick Gesture ended x,y=<%d,%d> angle=<%f>\n", pos.x, pos.y, angle);
}
static void
finger_flick_abort(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
{
_color_and_icon_set(data, FLICK_NAME, 1, MAX_TAP, ABORT_COLOR);
printf("Flick Aborted\n");
}
static void
finger_momentum_start(void *data , Efl_Canvas_Gesture *tap)
{
Eina_Position2D pos = efl_gesture_hotspot_get(tap);
unsigned int t = efl_gesture_timestamp_get(tap);
_color_and_icon_set(data, MOMENTUM_NAME, 1, MAX_TAP, START_COLOR);
printf("Momentum Gesture started x,y=<%d,%d> time=<%d>\n", pos.x, pos.y, t);
}
static void
finger_momentum_update(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
{
Eina_Position2D pos = efl_gesture_hotspot_get(tap);
Eina_Vector2 m = efl_gesture_momentum_get(tap);
unsigned int t = efl_gesture_timestamp_get(tap);
_color_and_icon_set(data, MOMENTUM_NAME, 1, MAX_TAP, UPDATE_COLOR);
printf("Momentum Gesture updated x,y=<%d,%d> momentum=<%f %f> time=<%d>\n",
pos.x, pos.y, m.x, m.y, t);
}
static void
finger_momentum_end(void *data , Efl_Canvas_Gesture *tap)
{
Eina_Position2D pos = efl_gesture_hotspot_get(tap);
Eina_Vector2 m = efl_gesture_momentum_get(tap);
unsigned int t = efl_gesture_timestamp_get(tap);
_color_and_icon_set(data, MOMENTUM_NAME, 1, MAX_TAP, END_COLOR);
printf("Momentum Gesture ended x,y=<%d,%d> momentum=<%f %f> time=<%d>\n",
pos.x, pos.y, m.x, m.y, t);
}
static void
finger_momentum_abort(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
{
_color_and_icon_set(data, MOMENTUM_NAME, 1, MAX_TAP, ABORT_COLOR);
printf("Momentum Aborted\n");
}
static void
finger_triple_tap_start(void *data , Efl_Canvas_Gesture *tap)
{
Eina_Position2D pos = efl_gesture_hotspot_get(tap);
_color_and_icon_set(data, TRIPLE_TAP_NAME, 1, MAX_TAP, START_COLOR);
printf("Triple Tap Gesture started x,y=<%d,%d> \n", pos.x, pos.y);
}
static void
finger_triple_tap_update(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
{
Eina_Position2D pos = efl_gesture_hotspot_get(tap);
_color_and_icon_set(data, TRIPLE_TAP_NAME, 1, MAX_TAP, UPDATE_COLOR);
printf("Triple Tap Gesture updated x,y=<%d,%d> \n", pos.x, pos.y);
}
static void
finger_triple_tap_end(void *data , Efl_Canvas_Gesture *tap)
{
Eina_Position2D pos = efl_gesture_hotspot_get(tap);
_color_and_icon_set(data, TRIPLE_TAP_NAME, 1, MAX_TAP, END_COLOR);
printf("Triple Tap Gesture ended x,y=<%d,%d> \n", pos.x, pos.y);
}
static void
finger_triple_tap_abort(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
{
_color_and_icon_set(data, TRIPLE_TAP_NAME, 1, MAX_TAP, ABORT_COLOR);
printf("Triple Tap Aborted\n");
}
static void
finger_double_tap_start(void *data , Efl_Canvas_Gesture *tap)
{
Eina_Position2D pos = efl_gesture_hotspot_get(tap);
_color_and_icon_set(data, DOUBLE_TAP_NAME, 1, MAX_TAP, START_COLOR);
printf("Double Tap Gesture started x,y=<%d,%d> \n", pos.x, pos.y);
}
static void
finger_double_tap_update(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
{
Eina_Position2D pos = efl_gesture_hotspot_get(tap);
_color_and_icon_set(data, DOUBLE_TAP_NAME, 1, MAX_TAP, UPDATE_COLOR);
printf("Double Tap Gesture updated x,y=<%d,%d> \n", pos.x, pos.y);
}
static void
finger_double_tap_end(void *data , Efl_Canvas_Gesture *tap)
{
Eina_Position2D pos = efl_gesture_hotspot_get(tap);
_color_and_icon_set(data, DOUBLE_TAP_NAME, 1, MAX_TAP, END_COLOR);
printf("Double Tap Gesture ended x,y=<%d,%d> \n", pos.x, pos.y);
}
static void
finger_double_tap_abort(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
{
_color_and_icon_set(data, DOUBLE_TAP_NAME, 1, MAX_TAP, ABORT_COLOR);
printf("Double Tap Aborted\n");
}
static void static void
finger_long_tap_start(void *data , Efl_Canvas_Gesture *tap) finger_long_tap_start(void *data , Efl_Canvas_Gesture *tap)
{ {
Eina_Vector2 pos = efl_gesture_hotspot_get(tap); Eina_Position2D pos = efl_gesture_hotspot_get(tap);
_color_and_icon_set(data, LONG_TAP_NAME, 1, MAX_TAP, START_COLOR); _color_and_icon_set(data, LONG_TAP_NAME, 1, MAX_TAP, START_COLOR);
printf("Long Tap Gesture started x,y=<%f,%f> \n", pos.x, pos.y); printf("Long Tap Gesture started x,y=<%d,%d> \n", pos.x, pos.y);
} }
static void static void
@ -222,10 +351,10 @@ finger_long_tap_update(void *data , Efl_Canvas_Gesture *tap EINA_UNUSED)
static void static void
finger_long_tap_end(void *data , Efl_Canvas_Gesture *tap) finger_long_tap_end(void *data , Efl_Canvas_Gesture *tap)
{ {
Eina_Vector2 pos = efl_gesture_hotspot_get(tap); Eina_Position2D pos = efl_gesture_hotspot_get(tap);
_color_and_icon_set(data, LONG_TAP_NAME, 1, MAX_TAP, END_COLOR); _color_and_icon_set(data, LONG_TAP_NAME, 1, MAX_TAP, END_COLOR);
printf("Long Tap Gesture ended x,y=<%f,%f> \n",pos.x, pos.y); printf("Long Tap Gesture ended x,y=<%d,%d> \n",pos.x, pos.y);
} }
static void static void
@ -244,9 +373,6 @@ tap_gesture_cb(void *data , const Efl_Event *ev)
case EFL_GESTURE_STARTED: case EFL_GESTURE_STARTED:
finger_tap_start(data, g); finger_tap_start(data, g);
break; break;
case EFL_GESTURE_UPDATED:
finger_tap_update(data, g);
break;
case EFL_GESTURE_CANCELED: case EFL_GESTURE_CANCELED:
finger_tap_abort(data, g); finger_tap_abort(data, g);
break; break;
@ -258,6 +384,95 @@ tap_gesture_cb(void *data , const Efl_Event *ev)
} }
} }
static void
flick_gesture_cb(void *data , const Efl_Event *ev)
{
Efl_Canvas_Gesture *g = ev->info;
switch(efl_gesture_state_get(g))
{
case EFL_GESTURE_STARTED:
finger_flick_start(data, g);
break;
case EFL_GESTURE_CANCELED:
finger_flick_abort(data, g);
break;
case EFL_GESTURE_FINISHED:
finger_flick_end(data, g);
break;
default:
break;
}
}
static void
momentum_gesture_cb(void *data , const Efl_Event *ev)
{
Efl_Canvas_Gesture *g = ev->info;
switch(efl_gesture_state_get(g))
{
case EFL_GESTURE_STARTED:
finger_momentum_start(data, g);
break;
case EFL_GESTURE_UPDATED:
finger_momentum_update(data, g);
break;
case EFL_GESTURE_CANCELED:
finger_momentum_abort(data, g);
break;
case EFL_GESTURE_FINISHED:
finger_momentum_end(data, g);
break;
default:
break;
}
}
static void
triple_tap_gesture_cb(void *data , const Efl_Event *ev)
{
Efl_Canvas_Gesture *g = ev->info;
switch(efl_gesture_state_get(g))
{
case EFL_GESTURE_STARTED:
finger_triple_tap_start(data, g);
break;
case EFL_GESTURE_UPDATED:
finger_triple_tap_update(data, g);
break;
case EFL_GESTURE_CANCELED:
finger_triple_tap_abort(data, g);
break;
case EFL_GESTURE_FINISHED:
finger_triple_tap_end(data, g);
break;
default:
break;
}
}
static void
double_tap_gesture_cb(void *data , const Efl_Event *ev)
{
Efl_Canvas_Gesture *g = ev->info;
switch(efl_gesture_state_get(g))
{
case EFL_GESTURE_STARTED:
finger_double_tap_start(data, g);
break;
case EFL_GESTURE_UPDATED:
finger_double_tap_update(data, g);
break;
case EFL_GESTURE_CANCELED:
finger_double_tap_abort(data, g);
break;
case EFL_GESTURE_FINISHED:
finger_double_tap_end(data, g);
break;
default:
break;
}
}
static void static void
long_tap_gesture_cb(void *data , const Efl_Event *ev) long_tap_gesture_cb(void *data , const Efl_Event *ev)
{ {
@ -313,12 +528,23 @@ create_gesture_box(Evas_Object *win, icon_properties *icons,
return bx; return bx;
} }
void
_tb_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
int w,h;
evas_object_geometry_get(obj, NULL, NULL, &w, &h);
evas_object_resize(data, w, h);
evas_object_color_set(data, 0, 0, 0, 0);
evas_object_show(data);
}
void void
test_gesture_framework(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, test_gesture_framework(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED) void *event_info EINA_UNUSED)
{ {
Evas_Object *win, *tb, *lb, *bx; Evas_Object *win, *tb, *lb, *bx;
Evas_Object *r; /* Gesture layer transparent object */ Evas_Object *r, *target; /* Gesture layer transparent object */
infra_data *infra = _infra_data_alloc(); infra_data *infra = _infra_data_alloc();
@ -336,6 +562,9 @@ test_gesture_framework(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
evas_object_show(tb); evas_object_show(tb);
evas_object_show(bx); evas_object_show(bx);
target = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _tb_resize, target);
/* Box of Tap icon and label */ /* Box of Tap icon and label */
bx = create_gesture_box(win, infra->icons, 0, TAP_NAME, "Tap"); bx = create_gesture_box(win, infra->icons, 0, TAP_NAME, "Tap");
elm_table_pack(tb, bx, 0, 0, 1, 1); elm_table_pack(tb, bx, 0, 0, 1, 1);
@ -458,15 +687,13 @@ test_gesture_framework(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
evas_object_show(lb); evas_object_show(lb);
/* END - Building icons table */ /* END - Building icons table */
r = evas_object_rectangle_add(evas_object_evas_get(win)); // LISTEN FOR GESTURES
evas_object_move(r, 250, 300); efl_event_callback_add(target, EFL_EVENT_GESTURE_TAP, tap_gesture_cb, infra);
evas_object_color_set(r, 0, 0, 255, 255); efl_event_callback_add(target, EFL_EVENT_GESTURE_LONG_TAP, long_tap_gesture_cb, infra);
evas_object_resize(r, 70, 70); efl_event_callback_add(target, EFL_EVENT_GESTURE_DOUBLE_TAP, double_tap_gesture_cb, infra);
evas_object_show(r); efl_event_callback_add(target, EFL_EVENT_GESTURE_TRIPLE_TAP, triple_tap_gesture_cb, infra);
efl_event_callback_add(target, EFL_EVENT_GESTURE_MOMENTUM, momentum_gesture_cb, infra);
// LISTEN FOR TAP GESTURE efl_event_callback_add(target, EFL_EVENT_GESTURE_FLICK, flick_gesture_cb, infra);
efl_event_callback_add(r, EFL_EVENT_GESTURE_TAP, tap_gesture_cb, infra);
efl_event_callback_add(r, EFL_EVENT_GESTURE_LONG_TAP, long_tap_gesture_cb, infra);
/* Update color state 20 times a second */ /* Update color state 20 times a second */
infra->colortimer = ecore_timer_add(0.05, _icon_color_set_cb, infra->icons); infra->colortimer = ecore_timer_add(0.05, _icon_color_set_cb, infra->icons);

2
src/bin/eolian/docs.c
View File

@ -68,7 +68,7 @@ _generate_ref(const Eolian_State *state, const char *refn, Eina_Strbuf *wbuf)
eina_stringshare_del(bname); eina_stringshare_del(bname);
goto noref; goto noref;
} }
Eina_Stringshare *str = eolian_typedecl_enum_field_c_name_get(efl); Eina_Stringshare *str = eolian_typedecl_enum_field_c_constant_get(efl);
eina_strbuf_append(wbuf, str); eina_strbuf_append(wbuf, str);
eina_stringshare_del(bname); eina_stringshare_del(bname);
return; return;

4
src/bin/eolian/headers.c
View File

@ -205,7 +205,7 @@ eo_gen_header_gen(const Eolian_State *state, const Eolian_Class *cl,
} }
} }
Eina_Stringshare *mname = eolian_class_c_name_get(cl); Eina_Stringshare *mname = eolian_class_c_macro_get(cl);
Eina_Stringshare *gname = eolian_class_c_get_function_name_get(cl); Eina_Stringshare *gname = eolian_class_c_get_function_name_get(cl);
eina_strbuf_append_printf(buf, "#define %s %s()\n\n", mname, gname); eina_strbuf_append_printf(buf, "#define %s %s()\n\n", mname, gname);
eina_stringshare_del(mname); eina_stringshare_del(mname);
@ -248,7 +248,7 @@ events:
itr = eolian_class_events_get(cl); itr = eolian_class_events_get(cl);
EINA_ITERATOR_FOREACH(itr, ev) EINA_ITERATOR_FOREACH(itr, ev)
{ {
Eina_Stringshare *evn = eolian_event_c_name_get(ev); Eina_Stringshare *evn = eolian_event_c_macro_get(ev);
Eolian_Object_Scope evs = eolian_event_scope_get(ev); Eolian_Object_Scope evs = eolian_event_scope_get(ev);
if (evs == EOLIAN_SCOPE_PRIVATE) if (evs == EOLIAN_SCOPE_PRIVATE)

8
src/bin/eolian/sources.c
View File

@ -1054,7 +1054,7 @@ eo_gen_source_gen(const Eolian_Class *cl, Eina_Strbuf *buf)
Eolian_Event *ev; Eolian_Event *ev;
EINA_ITERATOR_FOREACH(itr, ev) EINA_ITERATOR_FOREACH(itr, ev)
{ {
Eina_Stringshare *evn = eolian_event_c_name_get(ev); Eina_Stringshare *evn = eolian_event_c_macro_get(ev);
eina_strbuf_append(buf, "EWAPI const Efl_Event_Description _"); eina_strbuf_append(buf, "EWAPI const Efl_Event_Description _");
eina_strbuf_append(buf, evn); eina_strbuf_append(buf, evn);
eina_strbuf_append(buf, " =\n EFL_EVENT_DESCRIPTION"); eina_strbuf_append(buf, " =\n EFL_EVENT_DESCRIPTION");
@ -1163,14 +1163,14 @@ eo_gen_source_gen(const Eolian_Class *cl, Eina_Strbuf *buf)
eina_strbuf_append(buf, ", NULL"); eina_strbuf_append(buf, ", NULL");
else else
{ {
Eina_Stringshare *mname = eolian_class_c_name_get(icl); Eina_Stringshare *mname = eolian_class_c_macro_get(icl);
eina_strbuf_append_printf(buf, ", %s", mname); eina_strbuf_append_printf(buf, ", %s", mname);
eina_stringshare_del(mname); eina_stringshare_del(mname);
} }
Eina_Iterator *itr = eolian_class_extensions_get(cl); Eina_Iterator *itr = eolian_class_extensions_get(cl);
EINA_ITERATOR_FOREACH(itr, icl) EINA_ITERATOR_FOREACH(itr, icl)
{ {
Eina_Stringshare *mname = eolian_class_c_name_get(icl); Eina_Stringshare *mname = eolian_class_c_macro_get(icl);
eina_strbuf_append_printf(buf, ", %s", mname); eina_strbuf_append_printf(buf, ", %s", mname);
eina_stringshare_del(mname); eina_stringshare_del(mname);
} }
@ -1342,7 +1342,7 @@ _gen_proto(const Eolian_Class *cl, const Eolian_Function *fid,
if (!strcmp(efname + strlen(efname) - sizeof("destructor") + 1, "destructor")) if (!strcmp(efname + strlen(efname) - sizeof("destructor") + 1, "destructor"))
{ {
Eina_Stringshare *fcn = eolian_function_full_c_name_get(fid, ftype); Eina_Stringshare *fcn = eolian_function_full_c_name_get(fid, ftype);
Eina_Stringshare *mname = eolian_class_c_name_get(cl); Eina_Stringshare *mname = eolian_class_c_macro_get(cl);
eina_strbuf_append(buf, " "); eina_strbuf_append(buf, " ");
eina_strbuf_append(buf, fcn); eina_strbuf_append(buf, fcn);
eina_stringshare_del(fcn); eina_stringshare_del(fcn);

2
src/bin/eolian/types.c
View File

@ -81,7 +81,7 @@ _type_generate(const Eolian_State *state, const Eolian_Typedecl *tp,
const Eolian_Expression *vale = const Eolian_Expression *vale =
eolian_typedecl_enum_field_value_get(memb, EINA_FALSE); eolian_typedecl_enum_field_value_get(memb, EINA_FALSE);
Eina_Stringshare *membn = Eina_Stringshare *membn =
eolian_typedecl_enum_field_c_name_get(memb); eolian_typedecl_enum_field_c_constant_get(memb);
if (!vale) if (!vale)
eina_strbuf_append_printf(buf, " %s", membn); eina_strbuf_append_printf(buf, " %s", membn);
else else

4
src/bin/eolian_js/main.cc
View File

@ -1041,7 +1041,7 @@ int main(int argc, char** argv)
{ {
auto tp = eolian_event_type_get(&*first); auto tp = eolian_event_type_get(&*first);
ss << " {\n"; ss << " {\n";
ss << " static efl::eo::js::event_information ev_info{&constructor_from_eo, " << eolian_event_c_name_get(&*first); ss << " static efl::eo::js::event_information ev_info{&constructor_from_eo, " << eolian_event_c_macro_get(&*first);
ss << ", &efl::eo::js::event_callback<"; ss << ", &efl::eo::js::event_callback<";
ss << (tp ? _eolian_type_cpp_type_named_get(tp, class_name, need_name_getter) : "void"); ss << (tp ? _eolian_type_cpp_type_named_get(tp, class_name, need_name_getter) : "void");
ss << ">, \"" << type_class_name(tp) << "\"};\n"; ss << ">, \"" << type_class_name(tp) << "\"};\n";
@ -1174,7 +1174,7 @@ int main(int argc, char** argv)
, ef_end; ef != ef_end; ++ef) , ef_end; ef != ef_end; ++ef)
{ {
auto field_name = ::eolian_typedecl_enum_field_name_get(&*ef); auto field_name = ::eolian_typedecl_enum_field_name_get(&*ef);
auto field_c_name = ::eolian_typedecl_enum_field_c_name_get(&*ef); auto field_c_name = ::eolian_typedecl_enum_field_c_constant_get(&*ef);
if (!field_name || !field_c_name) if (!field_name || !field_c_name)
{ {
EINA_CXX_DOM_LOG_ERR(eolian::js::domain) << "Could not get enum field name"; EINA_CXX_DOM_LOG_ERR(eolian::js::domain) << "Could not get enum field name";

41
src/bin/eolian_mono/eolian/mono/events.hh
View File

@ -45,11 +45,44 @@ struct unpack_event_args_visitor
eina::optional<std::string> name; eina::optional<std::string> name;
std::function<std::string()> function; std::function<std::string()> function;
} }
/// Sizes taken from https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/sizeof
const match_table [] = const match_table [] =
{ {
{"bool", [&arg] { return arg + " != IntPtr.Zero"; }} {"bool", [&arg] { return "Marshal.ReadByte(" + arg + ") != 0"; }}
, {"int", [&arg] { return arg + ".ToInt32()"; }}
, {"uint", [&arg] { return "(uint)" + arg + ".ToInt32()";}} , {"ubyte", [&arg] { return "Marshal.ReadByte(" + arg + ")"; }}
, {"byte", [&arg] { return "(sbyte) Marshal.ReadByte(" + arg + ")"; }}
, {"char", [&arg] { return "(char) Marshal.ReadByte(" + arg + ")"; }}
, {"short", [&arg] { return "Marshal.ReadInt16(" + arg + ")"; }}
, {"ushort", [&arg] { return "(ushort) Marshal.ReadInt16(" + arg + ")"; }}
, {"int", [&arg] { return "Marshal.ReadInt32(" + arg + ")"; }}
, {"uint", [&arg] { return "(uint) Marshal.ReadInt32(" + arg + ")"; }}
, {"long", [&arg] { return "Marshal.ReadInt64(" + arg + ")"; }}
, {"ulong", [&arg] { return "(ulong) Marshal.ReadInt64(" + arg + ")"; }}
, {"llong", [&arg] { return "(long) Marshal.ReadInt64(" + arg + ")"; }}
, {"ullong", [&arg] { return "(ulong) Marshal.ReadInt64(" + arg + ")"; }}
, {"int8", [&arg] { return "(sbyte)Marshal.ReadByte(" + arg + ")"; }}
, {"uint8", [&arg] { return "Marshal.ReadByte(" + arg + ")"; }}
, {"int16", [&arg] { return "Marshal.ReadInt16(" + arg + ")"; }}
, {"uint16", [&arg] { return "(ushort)Marshal.ReadInt16(" + arg + ")"; }}
, {"int32", [&arg] { return "Marshal.ReadInt32(" + arg + ")"; }}
, {"uint32", [&arg] { return "(uint) Marshal.ReadInt32(" + arg + ")"; }}
// We don't support int128 as csharp has no similar datatype.
, {"int64", [&arg] { return "Marshal.ReadInt64(" + arg + ")"; }}
, {"uint64", [&arg] { return "(ulong) Marshal.ReadInt64(" + arg + ")"; }}
, {"float", [&arg] { return "Eina.PrimitiveConversion.PointerToManaged<float>(" + arg + ")"; }}
, {"double", [&arg] { return "Eina.PrimitiveConversion.PointerToManaged<double>(" + arg + ")"; }}
, {"string", [&arg] { return "Eina.StringConversion.NativeUtf8ToManagedString(" + arg + ")"; }} , {"string", [&arg] { return "Eina.StringConversion.NativeUtf8ToManagedString(" + arg + ")"; }}
, {"stringshare", [&arg] { return "Eina.StringConversion.NativeUtf8ToManagedString(" + arg + ")"; }} , {"stringshare", [&arg] { return "Eina.StringConversion.NativeUtf8ToManagedString(" + arg + ")"; }}
, {"Eina.Error", [&arg] { return "(Eina.Error)Marshal.PtrToStructure(" + arg + ", typeof(Eina.Error))"; }} , {"Eina.Error", [&arg] { return "(Eina.Error)Marshal.PtrToStructure(" + arg + ", typeof(Eina.Error))"; }}
@ -304,7 +337,7 @@ struct event_definition_generator
auto sub_context = change_indentation(indent.inc().inc(), context); auto sub_context = change_indentation(indent.inc().inc(), context);
if (!as_generator(scope_tab(6) << wrapper_args_type << " args = new " << wrapper_args_type << "();\n" if (!as_generator(wrapper_args_type << " args = new " << wrapper_args_type << "();\n"
<< scope_tab(6) << "args.arg = ").generate(arg_initializer_sink, attributes::unused, context)) << scope_tab(6) << "args.arg = ").generate(arg_initializer_sink, attributes::unused, context))
return false; return false;
if (!(*etype).original_type.visit(unpack_event_args_visitor<decltype(arg_initializer_sink), decltype(sub_context)>{arg_initializer_sink, &sub_context, *etype})) if (!(*etype).original_type.visit(unpack_event_args_visitor<decltype(arg_initializer_sink), decltype(sub_context)>{arg_initializer_sink, &sub_context, *etype}))

25
src/bindings/luajit/eolian.lua
View File

@ -301,6 +301,7 @@ ffi.cdef [[
int eolian_object_line_get(const Eolian_Object *obj); int eolian_object_line_get(const Eolian_Object *obj);
int eolian_object_column_get(const Eolian_Object *obj); int eolian_object_column_get(const Eolian_Object *obj);
const char *eolian_object_name_get(const Eolian_Object *obj); const char *eolian_object_name_get(const Eolian_Object *obj);
const char *eolian_object_c_name_get(const Eolian_Object *obj);
const char *eolian_object_short_name_get(const Eolian_Object *obj); const char *eolian_object_short_name_get(const Eolian_Object *obj);
Eina_Iterator *eolian_object_namespaces_get(const Eolian_Object *obj); Eina_Iterator *eolian_object_namespaces_get(const Eolian_Object *obj);
Eina_Bool eolian_object_is_beta(const Eolian_Object *obj); Eina_Bool eolian_object_is_beta(const Eolian_Object *obj);
@ -400,7 +401,7 @@ ffi.cdef [[
Eina_Bool eolian_event_is_hot(const Eolian_Event *event); Eina_Bool eolian_event_is_hot(const Eolian_Event *event);
Eina_Bool eolian_event_is_restart(const Eolian_Event *event); Eina_Bool eolian_event_is_restart(const Eolian_Event *event);
Eina_Iterator *eolian_class_parts_get(const Eolian_Class *klass); Eina_Iterator *eolian_class_parts_get(const Eolian_Class *klass);
const char *eolian_event_c_name_get(const Eolian_Event *event); const char *eolian_event_c_macro_get(const Eolian_Event *event);
const Eolian_Class *eolian_part_class_get(const Eolian_Part *part); const Eolian_Class *eolian_part_class_get(const Eolian_Part *part);
const Eolian_Documentation *eolian_part_documentation_get(const Eolian_Part *part); const Eolian_Documentation *eolian_part_documentation_get(const Eolian_Part *part);
const Eolian_Event *eolian_class_event_by_name_get(const Eolian_Class *klass, const char *event_name); const Eolian_Event *eolian_class_event_by_name_get(const Eolian_Class *klass, const char *event_name);
@ -409,7 +410,7 @@ ffi.cdef [[
const char *eolian_class_c_get_function_name_get(const Eolian_Class *klass); const char *eolian_class_c_get_function_name_get(const Eolian_Class *klass);
Eolian_Type_Type eolian_type_type_get(const Eolian_Type *tp); Eolian_Type_Type eolian_type_type_get(const Eolian_Type *tp);
Eolian_Type_Builtin_Type eolian_type_builtin_type_get(const Eolian_Type *tp); Eolian_Type_Builtin_Type eolian_type_builtin_type_get(const Eolian_Type *tp);
const char *eolian_class_c_name_get(const Eolian_Class *klass); const char *eolian_class_c_macro_get(const Eolian_Class *klass);
const char *eolian_class_c_data_type_get(const Eolian_Class *klass); const char *eolian_class_c_data_type_get(const Eolian_Class *klass);
Eolian_Typedecl_Type eolian_typedecl_type_get(const Eolian_Typedecl *tp); Eolian_Typedecl_Type eolian_typedecl_type_get(const Eolian_Typedecl *tp);
Eina_Iterator *eolian_typedecl_struct_fields_get(const Eolian_Typedecl *tp); Eina_Iterator *eolian_typedecl_struct_fields_get(const Eolian_Typedecl *tp);
@ -418,7 +419,7 @@ ffi.cdef [[
const Eolian_Type *eolian_typedecl_struct_field_type_get(const Eolian_Struct_Type_Field *fl); const Eolian_Type *eolian_typedecl_struct_field_type_get(const Eolian_Struct_Type_Field *fl);
Eina_Iterator *eolian_typedecl_enum_fields_get(const Eolian_Typedecl *tp); Eina_Iterator *eolian_typedecl_enum_fields_get(const Eolian_Typedecl *tp);
const Eolian_Enum_Type_Field *eolian_typedecl_enum_field_get(const Eolian_Typedecl *tp, const char *field); const Eolian_Enum_Type_Field *eolian_typedecl_enum_field_get(const Eolian_Typedecl *tp, const char *field);
const char *eolian_typedecl_enum_field_c_name_get(const Eolian_Enum_Type_Field *fl); const char *eolian_typedecl_enum_field_c_constant_get(const Eolian_Enum_Type_Field *fl);
const Eolian_Documentation *eolian_typedecl_enum_field_documentation_get(const Eolian_Enum_Type_Field *fl); const Eolian_Documentation *eolian_typedecl_enum_field_documentation_get(const Eolian_Enum_Type_Field *fl);
const Eolian_Expression *eolian_typedecl_enum_field_value_get(const Eolian_Enum_Type_Field *fl, Eina_Bool force); const Eolian_Expression *eolian_typedecl_enum_field_value_get(const Eolian_Enum_Type_Field *fl, Eina_Bool force);
@ -587,6 +588,14 @@ local object_idx, wrap_object = gen_wrap {
return ffi.string(v) return ffi.string(v)
end, end,
c_name_get = function(self)
local v = eolian.eolian_object_c_name_get(cast_obj(self))
if v == nil then
return nil
end
return ffi.string(v)
end,
short_name_get = function(self) short_name_get = function(self)
local v = eolian.eolian_object_short_name_get(cast_obj(self)) local v = eolian.eolian_object_short_name_get(cast_obj(self))
if v == nil then if v == nil then
@ -970,7 +979,7 @@ ffi.metatype("Eolian_Struct_Type_Field", {
ffi.metatype("Eolian_Enum_Type_Field", { ffi.metatype("Eolian_Enum_Type_Field", {
__index = wrap_object { __index = wrap_object {
c_name_get = function(self) c_name_get = function(self)
local v = eolian.eolian_typedecl_enum_field_c_name_get(self) local v = eolian.eolian_typedecl_enum_field_c_constant_get(self)
if v == nil then return nil end if v == nil then return nil end
return ffi_stringshare(v) return ffi_stringshare(v)
end, end,
@ -1366,8 +1375,8 @@ ffi.metatype("Eolian_Event", {
return tonumber(eolian.eolian_event_scope_get(self)) return tonumber(eolian.eolian_event_scope_get(self))
end, end,
c_name_get = function(self) c_macro_get = function(self)
local v = eolian.eolian_event_c_name_get(self) local v = eolian.eolian_event_c_macro_get(self)
if v == nil then return nil end if v == nil then return nil end
return ffi_stringshare(v) return ffi_stringshare(v)
end, end,
@ -1510,8 +1519,8 @@ M.Class = ffi.metatype("Eolian_Class", {
return ffi_stringshare(v) return ffi_stringshare(v)
end, end,
c_name_get = function(self) c_macro_get = function(self)
local v = eolian.eolian_class_c_name_get(self) local v = eolian.eolian_class_c_macro_get(self)
if v == nil then return nil end if v == nil then return nil end
return ffi_stringshare(v) return ffi_stringshare(v)
end, end,

3
src/bindings/mono/efl_mono/efl_all.cs
View File

@ -23,7 +23,6 @@ static class UnsafeNativeMethods
private static Efl.Eo.FunctionWrapper<init_func_delegate> _evas_init; private static Efl.Eo.FunctionWrapper<init_func_delegate> _evas_init;
[DllImport(efl.Libs.Evas)] public static extern void evas_shutdown(); [DllImport(efl.Libs.Evas)] public static extern void evas_shutdown();
[DllImport(efl.Libs.Elementary)] public static extern int elm_init(int argc, IntPtr argv); [DllImport(efl.Libs.Elementary)] public static extern int elm_init(int argc, IntPtr argv);
[DllImport(efl.Libs.Elementary)] public static extern void elm_policy_set(int policy, int policy_detail);
[DllImport(efl.Libs.Elementary)] public static extern void elm_shutdown(); [DllImport(efl.Libs.Elementary)] public static extern void elm_shutdown();
[DllImport(efl.Libs.Elementary)] public static extern void elm_run(); [DllImport(efl.Libs.Elementary)] public static extern void elm_run();
[DllImport(efl.Libs.Elementary)] public static extern void elm_exit(); [DllImport(efl.Libs.Elementary)] public static extern void elm_exit();
@ -117,7 +116,7 @@ public static class Config
#endif #endif
elm_init(0, IntPtr.Zero); elm_init(0, IntPtr.Zero);
elm_policy_set((int)Elm.Policy.Quit, (int)Elm.PolicyQuit.LastWindowHidden); Efl.Ui.Win.ExitOnAllWindowsClosed = new Eina.Value(0);
} }
public static void Shutdown() public static void Shutdown()

2
src/bindings/mono/efl_mono/efl_csharp_application.cs
View File

@ -61,7 +61,7 @@ public abstract class Application
#endif #endif
elm_init(0, IntPtr.Zero); elm_init(0, IntPtr.Zero);
elm_policy_set((int)Elm.Policy.Quit, (int)Elm.PolicyQuit.LastWindowHidden); Efl.Ui.Win.ExitOnAllWindowsClosed = new Eina.Value(0);
} }
initComponent = component; initComponent = component;

1
src/bindings/mono/meson.build
View File

@ -42,7 +42,6 @@ mono_sublibs = [
blacklisted_files = [ blacklisted_files = [
'efl_class.eo', 'efl_class.eo',
'efl_canvas_text.eo',
'efl_canvas_scene3d.eo', 'efl_canvas_scene3d.eo',
'evas_canvas3d_camera.eo', 'evas_canvas3d_camera.eo',
'evas_canvas3d_light.eo', 'evas_canvas3d_light.eo',

8
src/examples/elementary/button_cxx_example_01.cc
View File

@ -156,7 +156,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
} }
cmid.hint_align_set(ax, ay); cmid.hint_align_set(ax, ay);
}, std::placeholders::_1); }, std::placeholders::_1);
efl::eolian::event_add(efl::ui::Clickable::repeated_event, up, btn_cursors_move); efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, up, btn_cursors_move);
auto btn_cursors_release = std::bind( auto btn_cursors_release = std::bind(
[wmid] () [wmid] ()
@ -185,7 +185,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
left.hint_fill_set(false, true); left.hint_fill_set(false, true);
left.hint_align_set(0.0, 0.5); left.hint_align_set(0.0, 0.5);
box_inferior.pack_end(left); box_inferior.pack_end(left);
efl::eolian::event_add(efl::ui::Clickable::repeated_event, left, btn_cursors_move); efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, left, btn_cursors_move);
efl::eolian::event_add(efl::ui::Clickable::unpressed_event, left, btn_cursors_release); efl::eolian::event_add(efl::ui::Clickable::unpressed_event, left, btn_cursors_release);
efl::ui::Image icon_left(instantiate, win); efl::ui::Image icon_left(instantiate, win);
@ -205,7 +205,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
right.hint_fill_set(false, true); right.hint_fill_set(false, true);
right.hint_align_set(0.0, 0.5); right.hint_align_set(0.0, 0.5);
box_inferior.pack_end(right); box_inferior.pack_end(right);
efl::eolian::event_add(efl::ui::Clickable::repeated_event, right, btn_cursors_move); efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, right, btn_cursors_move);
efl::eolian::event_add(efl::ui::Clickable::unpressed_event, right, btn_cursors_release); efl::eolian::event_add(efl::ui::Clickable::unpressed_event, right, btn_cursors_release);
efl::ui::Image icon_right(instantiate, win); efl::ui::Image icon_right(instantiate, win);
@ -219,7 +219,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
down.hint_fill_set(true, false); down.hint_fill_set(true, false);
down.hint_align_set(0.5, 0.0); down.hint_align_set(0.5, 0.0);
box.pack_end(down); box.pack_end(down);
efl::eolian::event_add(efl::ui::Clickable::repeated_event, down, btn_cursors_move); efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, down, btn_cursors_move);
efl::eolian::event_add(efl::ui::Clickable::unpressed_event, down, btn_cursors_release); efl::eolian::event_add(efl::ui::Clickable::unpressed_event, down, btn_cursors_release);
efl::ui::Image icon_down(instantiate, win); efl::ui::Image icon_down(instantiate, win);

2
src/lib/ecore/ecore.c
View File

@ -24,7 +24,7 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
# include <Evil.h> # include <evil_private.h> /* evil_init/shutdown */
#endif #endif
#include <Eina.h> #include <Eina.h>
#include <Efl.h> #include <Efl.h>

1
src/lib/ecore/ecore_anim.c
View File

@ -18,6 +18,7 @@
#ifdef _WIN32 #ifdef _WIN32
# include <winsock2.h> # include <winsock2.h>
# include <evil_private.h> /* pipe */
# define pipe_write(fd, buffer, size) send((fd), (char *)(buffer), size, 0) # define pipe_write(fd, buffer, size) send((fd), (char *)(buffer), size, 0)
# define pipe_read(fd, buffer, size) recv((fd), (char *)(buffer), size, 0) # define pipe_read(fd, buffer, size) recv((fd), (char *)(buffer), size, 0)

4
src/lib/ecore/ecore_app.c
View File

@ -5,10 +5,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"

2
src/lib/ecore/ecore_exe_win32.c
View File

@ -7,6 +7,8 @@
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
#include <process.h> #include <process.h>
#include <evil_private.h> /* evil_last_error_get */
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"

3
src/lib/ecore/ecore_main.c
View File

@ -44,9 +44,8 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
# include <Evil.h> # include <evil_private.h> /* evil_last_error_get */
#endif #endif
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"

5
src/lib/ecore/ecore_pipe.c
View File

@ -26,10 +26,6 @@
# endif # endif
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#ifdef HAVE_ESCAPE #ifdef HAVE_ESCAPE
# include <Escape.h> # include <Escape.h>
#endif #endif
@ -51,6 +47,7 @@
#ifdef _WIN32 #ifdef _WIN32
# include <winsock2.h> # include <winsock2.h>
# include <evil_private.h> /* pipe fcntl */
# define pipe_write(fd, buffer, size) send((fd), (char *)(buffer), size, 0) # define pipe_write(fd, buffer, size) send((fd), (char *)(buffer), size, 0)
# define pipe_read(fd, buffer, size) recv((fd), (char *)(buffer), size, 0) # define pipe_read(fd, buffer, size) recv((fd), (char *)(buffer), size, 0)
# define pipe_close(fd) closesocket(fd) # define pipe_close(fd) closesocket(fd)

4
src/lib/ecore/ecore_thread.c
View File

@ -8,10 +8,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"

4
src/lib/ecore/ecore_time.c
View File

@ -7,10 +7,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/time.h> #include <sys/time.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
# include <mach/mach_time.h> # include <mach/mach_time.h>
#endif #endif

3
src/lib/ecore/efl_core_proc_env.c
View File

@ -2,6 +2,9 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef _WIN32
# include <evil_private.h> /* setenv unsetenv */
#endif
#include <Ecore.h> #include <Ecore.h>
#ifdef HAVE_CRT_EXTERNS_H #ifdef HAVE_CRT_EXTERNS_H
# include <crt_externs.h> # include <crt_externs.h>

3
src/lib/ecore/efl_thread.c
View File

@ -6,6 +6,9 @@
#define EFL_IO_WRITER_PROTECTED 1 #define EFL_IO_WRITER_PROTECTED 1
#define EFL_IO_CLOSER_PROTECTED 1 #define EFL_IO_CLOSER_PROTECTED 1
#ifdef _WIN32
# include <evil_private.h> /* pipe fcntl */
#endif
#include <Ecore.h> #include <Ecore.h>
#include "ecore_private.h" #include "ecore_private.h"

2
src/lib/ecore_con/ecore_con.c
View File

@ -40,7 +40,7 @@
#ifdef _WIN32 #ifdef _WIN32
# include <ws2tcpip.h> # include <ws2tcpip.h>
# include <Evil.h> # include <evil_private.h> /* evil_init|shutdown */
#endif #endif
#include "Ecore.h" #include "Ecore.h"

4
src/lib/ecore_con/ecore_con_legacy.c
View File

@ -10,10 +10,6 @@
# include <sys/socket.h> # include <sys/socket.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#define EFL_NET_SOCKET_SSL_PROTECTED #define EFL_NET_SOCKET_SSL_PROTECTED
#include "Ecore.h" #include "Ecore.h"

1
src/lib/ecore_con/ecore_con_local_win32.c
View File

@ -4,7 +4,6 @@
#include <process.h> #include <process.h>
#include <Evil.h>
#include <Ecore.h> #include <Ecore.h>
#include "Ecore_Con.h" #include "Ecore_Con.h"

4
src/lib/ecore_con/ecore_con_proxy_helper.c
View File

@ -10,10 +10,6 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "Ecore.h" #include "Ecore.h"
#include "ecore_private.h" #include "ecore_private.h"
#include "Ecore_Con.h" #include "Ecore_Con.h"

1
src/lib/ecore_con/ecore_con_socks.c
View File

@ -36,7 +36,6 @@
#ifdef _WIN32 #ifdef _WIN32
# include <ws2tcpip.h> # include <ws2tcpip.h>
# include <Evil.h>
#endif #endif
#include "Ecore.h" #include "Ecore.h"

3
src/lib/ecore_con/efl_net_dialer_ssl.c
View File

@ -24,9 +24,6 @@
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> # include <arpa/inet.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#define MY_CLASS EFL_NET_DIALER_SSL_CLASS #define MY_CLASS EFL_NET_DIALER_SSL_CLASS

3
src/lib/ecore_con/efl_net_dialer_tcp.c
View File

@ -24,9 +24,6 @@
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> # include <arpa/inet.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#define MY_CLASS EFL_NET_DIALER_TCP_CLASS #define MY_CLASS EFL_NET_DIALER_TCP_CLASS

3
src/lib/ecore_con/efl_net_dialer_udp.c
View File

@ -25,9 +25,6 @@
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> # include <arpa/inet.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#define MY_CLASS EFL_NET_DIALER_UDP_CLASS #define MY_CLASS EFL_NET_DIALER_UDP_CLASS

4
src/lib/ecore_con/efl_net_ip_address.c
View File

@ -8,10 +8,6 @@
# include <arpa/inet.h> # include <arpa/inet.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#include "Ecore.h" #include "Ecore.h"
#include "Ecore_Con.h" #include "Ecore_Con.h"
#include "ecore_con_private.h" #include "ecore_con_private.h"

3
src/lib/ecore_con/efl_net_server_fd.c
View File

@ -13,9 +13,6 @@
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h> # include <sys/socket.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#ifdef HAVE_SYSTEMD #ifdef HAVE_SYSTEMD
# include <systemd/sd-daemon.h> # include <systemd/sd-daemon.h>

3
src/lib/ecore_con/efl_net_server_ip.c
View File

@ -22,9 +22,6 @@
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> # include <arpa/inet.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#define MY_CLASS EFL_NET_SERVER_IP_CLASS #define MY_CLASS EFL_NET_SERVER_IP_CLASS

3
src/lib/ecore_con/efl_net_server_tcp.c
View File

@ -23,9 +23,6 @@
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> # include <arpa/inet.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#define MY_CLASS EFL_NET_SERVER_TCP_CLASS #define MY_CLASS EFL_NET_SERVER_TCP_CLASS

3
src/lib/ecore_con/efl_net_server_udp.c
View File

@ -25,9 +25,6 @@
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> # include <arpa/inet.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#define MY_CLASS EFL_NET_SERVER_UDP_CLASS #define MY_CLASS EFL_NET_SERVER_UDP_CLASS

3
src/lib/ecore_con/efl_net_server_udp_client.c
View File

@ -15,9 +15,6 @@
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h> # include <sys/socket.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#define MY_CLASS EFL_NET_SERVER_UDP_CLIENT_CLASS #define MY_CLASS EFL_NET_SERVER_UDP_CLIENT_CLASS

3
src/lib/ecore_con/efl_net_socket_fd.c
View File

@ -20,9 +20,6 @@
#ifdef HAVE_SYS_SOCKET_H #ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h> # include <sys/socket.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#define MY_CLASS EFL_NET_SOCKET_FD_CLASS #define MY_CLASS EFL_NET_SOCKET_FD_CLASS

3
src/lib/ecore_con/efl_net_socket_tcp.c
View File

@ -29,9 +29,6 @@
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> # include <arpa/inet.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#define MY_CLASS EFL_NET_SOCKET_TCP_CLASS #define MY_CLASS EFL_NET_SOCKET_TCP_CLASS

3
src/lib/ecore_con/efl_net_socket_udp.c
View File

@ -29,9 +29,6 @@
#ifdef HAVE_ARPA_INET_H #ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h> # include <arpa/inet.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#define MY_CLASS EFL_NET_SOCKET_UDP_CLASS #define MY_CLASS EFL_NET_SOCKET_UDP_CLASS

2
src/lib/ecore_con/efl_net_ssl_conn-openssl.c
View File

@ -18,7 +18,7 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
# include <Evil.h> # include <evil_private.h> /* dlsym */
#endif #endif
#ifdef HAVE_ESCAPE #ifdef HAVE_ESCAPE

16
src/lib/ecore_drm2/ecore_drm2_device.c
View File

@ -266,7 +266,7 @@ _drm2_atomic_state_crtc_fill(Ecore_Drm2_Crtc_State *cstate, int fd)
{ {
cstate->active.id = prop->prop_id; cstate->active.id = prop->prop_id;
cstate->active.value = oprops->prop_values[i]; cstate->active.value = oprops->prop_values[i];
DBG("\t\t\tValue: %lu", cstate->active.value); DBG("\t\t\tValue: %lu", (long)cstate->active.value);
} }
else if (!strcmp(prop->name, "BACKGROUND_COLOR")) else if (!strcmp(prop->name, "BACKGROUND_COLOR"))
{ {
@ -307,13 +307,13 @@ _drm2_atomic_state_conn_fill(Ecore_Drm2_Connector_State *cstate, int fd)
{ {
cstate->crtc.id = prop->prop_id; cstate->crtc.id = prop->prop_id;
cstate->crtc.value = oprops->prop_values[i]; cstate->crtc.value = oprops->prop_values[i];
DBG("\t\t\tValue: %lu", cstate->crtc.value); DBG("\t\t\tValue: %lu", (long)cstate->crtc.value);
} }
else if (!strcmp(prop->name, "DPMS")) else if (!strcmp(prop->name, "DPMS"))
{ {
cstate->dpms.id = prop->prop_id; cstate->dpms.id = prop->prop_id;
cstate->dpms.value = oprops->prop_values[i]; cstate->dpms.value = oprops->prop_values[i];
DBG("\t\t\tValue: %lu", cstate->dpms.value); DBG("\t\t\tValue: %lu", (long)cstate->dpms.value);
} }
else if (!strcmp(prop->name, "EDID")) else if (!strcmp(prop->name, "EDID"))
{ {
@ -348,13 +348,13 @@ _drm2_atomic_state_conn_fill(Ecore_Drm2_Connector_State *cstate, int fd)
{ {
cstate->aspect.id = prop->prop_id; cstate->aspect.id = prop->prop_id;
cstate->aspect.value = oprops->prop_values[i]; cstate->aspect.value = oprops->prop_values[i];
DBG("\t\t\tValue: %lu", cstate->aspect.value); DBG("\t\t\tValue: %lu", (long)cstate->aspect.value);
} }
else if (!strcmp(prop->name, "scaling mode")) else if (!strcmp(prop->name, "scaling mode"))
{ {
cstate->scaling.id = prop->prop_id; cstate->scaling.id = prop->prop_id;
cstate->scaling.value = oprops->prop_values[i]; cstate->scaling.value = oprops->prop_values[i];
DBG("\t\t\tValue: %lu", cstate->scaling.value); DBG("\t\t\tValue: %lu", (long)cstate->scaling.value);
} }
cont: cont:
@ -392,13 +392,13 @@ _drm2_atomic_state_plane_fill(Ecore_Drm2_Plane_State *pstate, int fd)
{ {
pstate->cid.id = prop->prop_id; pstate->cid.id = prop->prop_id;
pstate->cid.value = oprops->prop_values[i]; pstate->cid.value = oprops->prop_values[i];
DBG("\t\t\tValue: %lu", pstate->cid.value); DBG("\t\t\tValue: %lu", (long)pstate->cid.value);
} }
else if (!strcmp(prop->name, "FB_ID")) else if (!strcmp(prop->name, "FB_ID"))
{ {
pstate->fid.id = prop->prop_id; pstate->fid.id = prop->prop_id;
pstate->fid.value = oprops->prop_values[i]; pstate->fid.value = oprops->prop_values[i];
DBG("\t\t\tValue: %lu", pstate->fid.value); DBG("\t\t\tValue: %lu", (long)pstate->fid.value);
} }
else if (!strcmp(prop->name, "CRTC_X")) else if (!strcmp(prop->name, "CRTC_X"))
{ {
@ -456,7 +456,7 @@ _drm2_atomic_state_plane_fill(Ecore_Drm2_Plane_State *pstate, int fd)
DBG("\t\t\tCursor Plane"); DBG("\t\t\tCursor Plane");
break; break;
default: default:
DBG("\t\t\tValue: %lu", pstate->type.value); DBG("\t\t\tValue: %lu", (long)pstate->type.value);
break; break;
} }
} }

79
src/lib/ector/software/ector_software_rasterizer.c
View File

@ -150,16 +150,11 @@ _blend_mask_add(int count, const SW_FT_Span *spans, void *user_data)
while (count--) while (count--)
{ {
memset(ttarget, 0x00, sizeof(uint32_t) * spans->len);
uint32_t *mtarget = mbuffer + ((mask->generic->w * spans->y) + spans->x); uint32_t *mtarget = mbuffer + ((mask->generic->w * spans->y) + spans->x);
memset(ttarget, 0x00, sizeof(uint32_t) * spans->len);
comp_func(ttarget, spans->len, color, spans->coverage); comp_func(ttarget, spans->len, color, spans->coverage);
for (int i = 0; i < spans->len; i++) for (int i = 0; i < spans->len; i++)
{ mtarget[i] = draw_mul_256(0xFF - (ttarget[i]>>24), mtarget[i]) + ttarget[i];
double adst = A_VAL(&mtarget[i]) == 0 ? 0 : (double)(A_VAL(&mtarget[i])) / (double)255;
double asrc = A_VAL(&ttarget[i]) == 0 ? 0 : (double)(A_VAL(&ttarget[i])) / (double)255;
uint32_t aout = (int)(((adst * (1 - asrc)) + asrc) * 255);
mtarget[i] = (aout<<24) + (0x00FFFFFF & mtarget[i]);
}
++spans; ++spans;
} }
} }
@ -172,26 +167,20 @@ _blend_mask_sub(int count, const SW_FT_Span *spans, void *user_data)
uint32_t color = DRAW_MUL4_SYM(sd->color, sd->mul_col); uint32_t color = DRAW_MUL4_SYM(sd->color, sd->mul_col);
RGBA_Comp_Func_Solid comp_func = efl_draw_func_solid_span_get(sd->op, color); RGBA_Comp_Func_Solid comp_func = efl_draw_func_solid_span_get(sd->op, color);
uint32_t *mtarget = mask->pixels.u32; uint32_t *mbuffer = mask->pixels.u32;
int tsize = sd->raster_buffer->generic->w * sd->raster_buffer->generic->h; int tsize = sd->raster_buffer->generic->w;
uint32_t *tbuffer = alloca(sizeof(uint32_t) * tsize); uint32_t *ttarget = alloca(sizeof(uint32_t) * tsize);
memset(tbuffer, 0x00, sizeof(uint32_t) * tsize);
while (count--) while (count--)
{ {
uint32_t *ttarget = tbuffer + ((mask->generic->w * spans->y) + spans->x); uint32_t *mtarget = mbuffer + ((mask->generic->w * spans->y) + spans->x);
memset(ttarget, 0x00, sizeof(uint32_t) * spans->len);
comp_func(ttarget, spans->len, color, spans->coverage); comp_func(ttarget, spans->len, color, spans->coverage);
for (int i = 0; i < spans->len; i++)
mtarget[i] = draw_mul_256(0xFF - (ttarget[i]>>24), mtarget[i]);
++spans; ++spans;
} }
for(int i = 0; i < tsize; i++)
{
double adst = A_VAL(&mtarget[i]) == 0 ? 0 : (double)(A_VAL(&mtarget[i])) / (double)255;
double asrc = A_VAL(&tbuffer[i]) == 0 ? 0 : (double)(A_VAL(&tbuffer[i])) / (double)255;
uint32_t aout = (int)((adst * (1 - asrc)) * 255);
mtarget[i] = (aout<<24) + (0x00FFFFFF & mtarget[i]);
}
} }
@ -203,25 +192,32 @@ _blend_mask_ins(int count, const SW_FT_Span *spans, void *user_data)
uint32_t color = DRAW_MUL4_SYM(sd->color, sd->mul_col); uint32_t color = DRAW_MUL4_SYM(sd->color, sd->mul_col);
RGBA_Comp_Func_Solid comp_func = efl_draw_func_solid_span_get(sd->op, color); RGBA_Comp_Func_Solid comp_func = efl_draw_func_solid_span_get(sd->op, color);
uint32_t *mtarget = mask->pixels.u32; uint32_t *mbuffer = mask->pixels.u32;
int tsize = sd->raster_buffer->generic->w * sd->raster_buffer->generic->h; int tsize = sd->raster_buffer->generic->w;
uint32_t *tbuffer = alloca(sizeof(uint32_t) * tsize); uint32_t *ttarget = alloca(sizeof(uint32_t) * tsize);
memset(tbuffer, 0x00, sizeof(uint32_t) * tsize);
while (count--) for(unsigned int y = 0; y < mask->generic->h; y++)
{ {
uint32_t *ttarget = tbuffer + ((mask->generic->w * spans->y) + spans->x); for(unsigned int x = 0; x < mask->generic->w; x++)
comp_func(ttarget, spans->len, color, spans->coverage); {
++spans; if (x == (unsigned int)spans->x && x + spans->len <= mask->generic->w &&
} y == (unsigned int)spans->y && count > 0)
{
for(int i = 0; i < tsize; i++) memset(ttarget, 0x00, sizeof(uint32_t) * spans->len);
{ uint32_t *mtarget = mbuffer + ((mask->generic->w * spans->y) + spans->x);
double adst = A_VAL(&mtarget[i]) == 0 ? 0 : (double)(A_VAL(&mtarget[i])) / (double)255; comp_func(ttarget, spans->len, color, spans->coverage);
double asrc = A_VAL(&tbuffer[i]) == 0 ? 0 : (double)(A_VAL(&tbuffer[i])) / (double)255; for (int c = 0; c < spans->len; c++)
uint32_t aout = (int)((adst * asrc) * 255); mtarget[c] = draw_mul_256(ttarget[c]>>24, mtarget[c]);
mtarget[i] = (aout<<24) + (0x00FFFFFF & mtarget[i]); x += spans->len - 1;
++spans;
--count;
}
else
{
mbuffer[x + (mask->generic->w * y)] = (0x00FFFFFF & mbuffer[x + (mask->generic->w * y)]);
}
}
} }
} }
@ -245,12 +241,7 @@ _blend_mask_diff(int count, const SW_FT_Span *spans, void *user_data)
uint32_t *mtarget = mbuffer + ((mask->generic->w * spans->y) + spans->x); uint32_t *mtarget = mbuffer + ((mask->generic->w * spans->y) + spans->x);
comp_func(ttarget, spans->len, color, spans->coverage); comp_func(ttarget, spans->len, color, spans->coverage);
for (int i = 0; i < spans->len; i++) for (int i = 0; i < spans->len; i++)
{ mtarget[i] = draw_mul_256(0xFF - (mtarget[i]>>24), ttarget[i]) + draw_mul_256(0xFF - (ttarget[i]>>24), mtarget[i]);
double adst = A_VAL(&mtarget[i]) == 0 ? 0 : (double)(A_VAL(&mtarget[i])) / (double)255;
double asrc = A_VAL(&ttarget[i]) == 0 ? 0 : (double)(A_VAL(&ttarget[i])) / (double)255;
uint32_t aout = (int)((((1 - adst) * asrc) + ((1 - asrc) * adst)) * 255);
mtarget[i] = (aout<<24) + (0x00FFFFFF & mtarget[i]);
}
++spans; ++spans;
} }
} }
@ -648,10 +639,6 @@ _adjust_span_fill_methods(Span_Data *spdata)
spdata->unclipped_blend = NULL; spdata->unclipped_blend = NULL;
} }
//FIXME: Mask and mask case is not use clipping.
if (spdata->mask_op >= EFL_CANVAS_VG_NODE_BLEND_TYPE_MASK_ADD)
spdata->clip.enabled = EINA_FALSE;
// Clipping Function // Clipping Function
if (spdata->clip.enabled) if (spdata->clip.enabled)
{ {

4
src/lib/eet/eet_node.c
View File

@ -5,10 +5,6 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#ifdef _WIN32
# include <Evil.h>
#endif /* ifdef _WIN32 */
#include <Eina.h> #include <Eina.h>
#include "Eet.h" #include "Eet.h"

1
src/lib/efl/Efl.h
View File

@ -104,7 +104,6 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
#include "interfaces/efl_ui_range_interactive.eo.h" #include "interfaces/efl_ui_range_interactive.eo.h"
#include "interfaces/efl_ui_autorepeat.eo.h" #include "interfaces/efl_ui_autorepeat.eo.h"
#include "interfaces/efl_ui_draggable.eo.h" #include "interfaces/efl_ui_draggable.eo.h"
#include "interfaces/efl_ui_clickable.eo.h"
#include "interfaces/efl_ui_scrollable.eo.h" #include "interfaces/efl_ui_scrollable.eo.h"
#include "interfaces/efl_ui_scrollbar.eo.h" #include "interfaces/efl_ui_scrollbar.eo.h"
#include "interfaces/efl_ui_scrollable_interactive.eo.h" #include "interfaces/efl_ui_scrollable_interactive.eo.h"

1
src/lib/efl/interfaces/efl_interfaces_main.c
View File

@ -72,7 +72,6 @@
#include "interfaces/efl_ui_factory_bind.eo.c" #include "interfaces/efl_ui_factory_bind.eo.c"
#include "interfaces/efl_ui_draggable.eo.c" #include "interfaces/efl_ui_draggable.eo.c"
#include "interfaces/efl_ui_clickable.eo.c"
#include "interfaces/efl_ui_scrollable.eo.c" #include "interfaces/efl_ui_scrollable.eo.c"
#include "interfaces/efl_ui_scrollable_interactive.eo.c" #include "interfaces/efl_ui_scrollable_interactive.eo.c"
#include "interfaces/efl_ui_scrollbar.eo.c" #include "interfaces/efl_ui_scrollbar.eo.c"

3
src/lib/efl/interfaces/efl_ui_autorepeat.eo
View File

@ -45,4 +45,7 @@ interface @beta Efl.Ui.Autorepeat {
} }
} }
} }
events {
repeated: void; [[Called when a repeated event is emitted]]
}
} }

19
src/lib/efl/interfaces/efl_ui_clickable.eo
View File

@ -1,19 +0,0 @@
interface @beta Efl.Ui.Clickable
{
[[Efl UI clickable interface]]
event_prefix: efl_ui;
events {
/* FIXME: Explain what are the objects passed through the event_infos */
clicked: void; [[Called when object is clicked]]
clicked,double: void; [[Called when object receives a double click]]
clicked,triple: void; [[Called when object receives a triple click]]
clicked,right: Efl.Object; [[Called when object receives a right click]]
/* FIXME: Might be NULL */
pressed: Efl.Object; [[Called when the object is pressed]]
/* FIXME: Might be NULL */
unpressed: Efl.Object; [[Called when the object is no longer pressed]]
/* FIXME: Might be NULL */
longpressed: Efl.Object; [[Called when the object receives a long press]]
repeated: void; [[Called when the object receives repeated presses/clicks]]
}
}

1
src/lib/efl/interfaces/meson.build
View File

@ -8,7 +8,6 @@ pub_legacy_eo_files = [
'efl_gfx_frame_controller.eo', 'efl_gfx_frame_controller.eo',
'efl_input_device.eo', 'efl_input_device.eo',
'efl_ui_draggable.eo', 'efl_ui_draggable.eo',
'efl_ui_clickable.eo',
'efl_ui_scrollable.eo', 'efl_ui_scrollable.eo',
'efl_ui_scrollable_interactive.eo', 'efl_ui_scrollable_interactive.eo',
'efl_ui_scrollbar.eo', 'efl_ui_scrollbar.eo',

4
src/lib/eina/Eina.h
View File

@ -202,10 +202,6 @@
* make it safer, log errors, manage memory more efficiently and more. * make it safer, log errors, manage memory more efficiently and more.
*/ */
#ifdef _WIN32
# include <Evil.h>
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

4
src/lib/eina/eina_benchmark.c
View File

@ -24,10 +24,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"
#include "eina_alloca.h" #include "eina_alloca.h"

4
src/lib/eina/eina_binbuf.c
View File

@ -5,10 +5,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_private.h" #include "eina_private.h"
#include "eina_strbuf_common.h" #include "eina_strbuf_common.h"
#include "eina_binbuf.h" #include "eina_binbuf.h"

4
src/lib/eina/eina_convert.c
View File

@ -31,10 +31,6 @@
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"
#include "eina_log.h" #include "eina_log.h"

2
src/lib/eina/eina_debug.c
View File

@ -56,7 +56,7 @@
#ifdef _WIN32 #ifdef _WIN32
# include <ws2tcpip.h> # include <ws2tcpip.h>
# include <Evil.h> # include <evil_private.h> /* fcntl */
#endif #endif
#include "eina_alloca.h" #include "eina_alloca.h"

2
src/lib/eina/eina_debug_bt.c
View File

@ -22,7 +22,7 @@
#ifdef HAVE_DLADDR #ifdef HAVE_DLADDR
# ifdef _WIN32 # ifdef _WIN32
# include <Evil.h> # include <evil_private.h> /* dladdr */
# else # else
# include <dlfcn.h> # include <dlfcn.h>
# endif # endif

2
src/lib/eina/eina_debug_bt_file.c
View File

@ -22,7 +22,7 @@
#include <unistd.h> #include <unistd.h>
#ifdef _WIN32 #ifdef _WIN32
#include <Evil.h> #include <evil_private.h> /* realpath */
#endif #endif
#include "eina_debug_private.h" #include "eina_debug_private.h"

4
src/lib/eina/eina_evlog.c
View File

@ -29,10 +29,6 @@
#include "eina_evlog.h" #include "eina_evlog.h"
#include "eina_debug.h" #include "eina_debug.h"
#ifdef _WIN32
# include <Evil.h>
#endif
#if defined(__APPLE__) && defined(__MACH__) #if defined(__APPLE__) && defined(__MACH__)
# include <mach/mach_time.h> # include <mach/mach_time.h>
#endif #endif

2
src/lib/eina/eina_file_common.c
View File

@ -28,7 +28,7 @@
#include <errno.h> #include <errno.h>
#ifdef _WIN32 #ifdef _WIN32
# include <Evil.h> # include <evil_private.h> /* windows.h fcntl mkstemps mkdtemp */
#endif #endif
#define COPY_BLOCKSIZE (4 * 1024 * 1024) #define COPY_BLOCKSIZE (4 * 1024 * 1024)

6
src/lib/eina/eina_file_win32.c
View File

@ -23,11 +23,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#define WIN32_LEAN_AND_MEAN #include <evil_private.h>
#include <windows.h>
#undef WIN32_LEAN_AND_MEAN
#include <Evil.h>
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"

3
src/lib/eina/eina_inline_slice.x
View File

@ -20,9 +20,6 @@
#define _EINA_INLINE_SLICE_H #define _EINA_INLINE_SLICE_H
#include <string.h> #include <string.h>
#ifdef _WIN32
# include <Evil.h>
#endif
static inline Eina_Slice static inline Eina_Slice
eina_rw_slice_slice_get(const Eina_Rw_Slice rw_slice) eina_rw_slice_slice_get(const Eina_Rw_Slice rw_slice)

4
src/lib/eina/eina_list.c
View File

@ -62,10 +62,6 @@
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"
#include "eina_log.h" #include "eina_log.h"

2
src/lib/eina/eina_log.c
View File

@ -34,7 +34,7 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
# include <Evil.h> # include <windows.h>
#endif #endif
#ifdef HAVE_EXECINFO_H #ifdef HAVE_EXECINFO_H

4
src/lib/eina/eina_magic.c
View File

@ -23,10 +23,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"
#include "eina_log.h" #include "eina_log.h"

4
src/lib/eina/eina_main.c
View File

@ -40,10 +40,6 @@
#include <mcheck.h> #include <mcheck.h>
#endif #endif
#ifdef _WIN32
#include "Evil.h"
#endif
#include "eina_lock.h" #include "eina_lock.h"
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"

4
src/lib/eina/eina_matrixsparse.c
View File

@ -33,10 +33,6 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"
#include "eina_log.h" #include "eina_log.h"

2
src/lib/eina/eina_module.c
View File

@ -32,7 +32,7 @@
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
# include <Evil.h> # include <evil_private.h>
#endif #endif
#ifdef HAVE_ESCAPE #ifdef HAVE_ESCAPE

2
src/lib/eina/eina_prefix.c
View File

@ -43,7 +43,7 @@
#ifdef _WIN32 #ifdef _WIN32
# include <direct.h> /* getcwd */ # include <direct.h> /* getcwd */
# include <Evil.h> # include <evil_private.h> /* path_is_absolute realpath dladdr */
#endif #endif
#ifdef HAVE_ESCAPE #ifdef HAVE_ESCAPE

4
src/lib/eina/eina_private.h
View File

@ -25,10 +25,6 @@
#include <xlocale.h> #include <xlocale.h>
#endif #endif
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_magic.h" #include "eina_magic.h"
#include "eina_iterator.h" #include "eina_iterator.h"
#include "eina_accessor.h" #include "eina_accessor.h"

4
src/lib/eina/eina_quadtree.c
View File

@ -30,10 +30,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_quadtree.h" #include "eina_quadtree.h"
#include "eina_magic.h" #include "eina_magic.h"
#include "eina_mempool.h" #include "eina_mempool.h"

4
src/lib/eina/eina_rectangle.c
View File

@ -23,10 +23,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"
#include "eina_magic.h" #include "eina_magic.h"

4
src/lib/eina/eina_share_common.c
View File

@ -63,10 +63,6 @@
#include <string.h> #include <string.h>
#include <stddef.h> #include <stddef.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"
#include "eina_hash.h" #include "eina_hash.h"

4
src/lib/eina/eina_simple_xml_parser.c
View File

@ -26,10 +26,6 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"
#include "eina_alloca.h" #include "eina_alloca.h"

4
src/lib/eina/eina_strbuf.c
View File

@ -6,10 +6,6 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_private.h" #include "eina_private.h"
#include "eina_str.h" #include "eina_str.h"
#include "eina_strbuf_common.h" #include "eina_strbuf_common.h"

4
src/lib/eina/eina_strbuf_common.c
View File

@ -6,10 +6,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_private.h" #include "eina_private.h"
#include "eina_str.h" #include "eina_str.h"
#include "eina_magic.h" #include "eina_magic.h"

4
src/lib/eina/eina_stringshare.c
View File

@ -30,10 +30,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"
#include "eina_alloca.h" #include "eina_alloca.h"

4
src/lib/eina/eina_tmpstr.c
View File

@ -26,10 +26,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"
#include "eina_log.h" #include "eina_log.h"

4
src/lib/eina/eina_ustrbuf.c
View File

@ -2,10 +2,6 @@
# include "config.h" # include "config.h"
#endif #endif
#ifdef _WIN32
#include "Evil.h"
#endif
#include "eina_strbuf_common.h" #include "eina_strbuf_common.h"
#include "eina_unicode.h" #include "eina_unicode.h"
#include "eina_ustrbuf.h" #include "eina_ustrbuf.h"

4
src/lib/eina/eina_value.c
View File

@ -24,10 +24,6 @@
#include <inttypes.h> /* PRId64 and PRIu64 */ #include <inttypes.h> /* PRId64 and PRIu64 */
#include <sys/time.h> /* struct timeval */ #include <sys/time.h> /* struct timeval */
#ifdef _WIN32
# include <Evil.h>
#endif
#include "eina_config.h" #include "eina_config.h"
#include "eina_private.h" #include "eina_private.h"
#include "eina_alloca.h" #include "eina_alloca.h"

2
src/lib/eina/eina_value_util.c
View File

@ -23,7 +23,7 @@
#include <time.h> #include <time.h>
#ifdef _WIN32 #ifdef _WIN32
# include <Evil.h> # include <evil_private.h> /* strptime */
#endif #endif
#include "eina_safety_checks.h" #include "eina_safety_checks.h"

Some files were not shown because too many files have changed in this diff Show More