enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

comp_object now uses eo, e_comp_object_signal* -> edje_object_signal* 

also cw->clip is gone
This commit is contained in:
Mike Blumenkrantz 2014-04-10 17:37:24 -04:00
parent c5c7b4733a
commit 47cfb31752
8 changed files with 298 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@ -9,6 +9,7 @@ SUBDIRS += po
endif
SUFFIXES =
CLEANFILES =
DISTCLEANFILES =
INSTALL_DATA_HOOKS =
@ -90,3 +91,18 @@ clean-local: doc-clean
rm -f data/themes/*.edj
install-data-hook: $(INSTALL_DATA_HOOKS)
AM_V_EOL = $(am__v_EOL_@AM_V@)
am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@)
am__v_EOL_0 = @echo " EOLIAN " $@;
SUFFIXES += .eo .eo.c .eo.h .eo.legacy.h
%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
$(AM_V_EOL)$(EOLIAN) --eo --legacy $(EOLIAN_FLAGS) --gc -o $@ $<
%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
$(AM_V_EOL)$(EOLIAN) --eo $(EOLIAN_FLAGS) --gh -o $@ $<
%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
$(AM_V_EOL)$(EOLIAN) --legacy $(EOLIAN_FLAGS) --gh -o $@ $<

2
config/Makefile.mk
View File

@ -6,7 +6,7 @@ configfilesdir = $(datadir)/enlightenment/data/config
configfiles_DATA = config/profile.cfg
SUFFIXES = .cfg
SUFFIXES += .cfg
.src.cfg:
$(MKDIR_P) $(@D)

4
configure.ac
View File

@ -601,6 +601,10 @@ AC_SUBST([e_cflags])
AC_SUBST([e_configflags])
AC_SUBST([requirements_e])
AC_PATH_PROG([EOLIAN], [eolian_gen])
EOLIAN_FLAGS=`pkg-config --variable=eolian_flags eo evas edje`
AC_SUBST(EOLIAN_FLAGS)
PKG_CHECK_EXISTS([xkeyboard-config],[
xkb_base=`$PKG_CONFIG --variable=xkb_base xkeyboard-config 2>/dev/null`
AC_DEFINE_UNQUOTED([XKB_BASE],["$xkb_base"],[Define to the base directory for X keyboard configuration data])

12
src/bin/Makefile.mk
View File

@ -1,4 +1,10 @@
DISTCLEANFILES += src/bin/e_fm_shared_types.h
DISTCLEANFILES += \
src/bin/e_comp_object.eo.c \
src/bin/e_comp_object.eo.h \
src/bin/e_fm_shared_types.h
EXTRA_DIST += \
src/bin/e_comp_object.eo
E_CPPFLAGS = \
-I$(top_builddir) \
@ -58,6 +64,7 @@ src/bin/e_comp.h \
src/bin/e_comp_canvas.h \
src/bin/e_comp_cfdata.h \
src/bin/e_comp_object.h \
src/bin/e_comp_object.eo.h \
src/bin/e_comp_x.h \
src/bin/e_config_data.h \
src/bin/e_config_dialog.h \
@ -379,6 +386,9 @@ enlightenment_src += \
src/bin/e_comp_wl.c
endif
src_bin_enlightenment_DEPENDENCIES = \
src/bin/e_comp_object.eo.c
src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@ -DNEED_X=1
src_bin_enlightenment_SOURCES = \
src/bin/e_main.c \

6
src/bin/e_client.c
View File

@ -3204,7 +3204,7 @@ e_client_focused_set(E_Client *ec)
E_FREE_FUNC(ec_unfocus->raise_timer, ecore_timer_del);
e_comp_object_signal_emit(ec_unfocus->frame, "e,state,unfocused", "e");
edje_object_signal_emit(ec_unfocus->frame, "e,state,unfocused", "e");
/* if there unfocus client is fullscreen and visible */
if ((!e_config->allow_above_fullscreen) &&
@ -3752,12 +3752,12 @@ e_client_urgent_set(E_Client *ec, Eina_Bool urgent)
_e_client_event_property(ec, E_CLIENT_PROPERTY_URGENCY);
if (urgent && (!ec->focused) && (!ec->want_focus))
{
e_comp_object_signal_emit(ec->frame, "e,state,urgent", "e");
edje_object_signal_emit(ec->frame, "e,state,urgent", "e");
ec->urgent = urgent;
}
else
{
e_comp_object_signal_emit(ec->frame, "e,state,not_urgent", "e");
edje_object_signal_emit(ec->frame, "e,state,not_urgent", "e");
ec->urgent = 0;
}
if (urgent && e_screensaver_on_get() && e_config->screensaver_wake_on_urgent)

519
src/bin/e_comp_object.c
View File

File diff suppressed because it is too large Load Diff

56
src/bin/e_comp_object.h
View File

@ -39,10 +39,10 @@ EAPI void e_comp_object_zoomap_set(Evas_Object *obj, Eina_Bool enabled);
EAPI Evas_Object *e_comp_object_client_add(E_Client *ec);
EAPI Evas_Object *e_comp_object_util_mirror_add(Evas_Object *obj);
EAPI Evas_Object *e_comp_object_util_add(Evas_Object *obj, E_Comp_Object_Type type);
EAPI void e_comp_object_frame_xy_adjust(Evas_Object *obj, int x, int y, int *ax, int *ay);
EAPI void e_comp_object_frame_xy_unadjust(Evas_Object *obj, int x, int y, int *ax, int *ay);
EAPI void e_comp_object_frame_wh_adjust(Evas_Object *obj, int w, int h, int *aw, int *ah);
EAPI void e_comp_object_frame_wh_unadjust(Evas_Object *obj, int w, int h, int *aw, int *ah);
EAPI void e_comp_object_frame_xy_adjust(Eo *obj, int x, int y, int *ax, int *ay);
EAPI void e_comp_object_frame_xy_unadjust(Eo *obj, int x, int y, int *ax, int *ay);
EAPI void e_comp_object_frame_wh_adjust(Eo *obj, int w, int h, int *aw, int *ah);
EAPI void e_comp_object_frame_wh_unadjust(Eo *obj, int w, int h, int *aw, int *ah);
EAPI E_Client *e_comp_object_client_get(Evas_Object *obj);
EAPI E_Zone *e_comp_object_util_zone_get(Evas_Object *obj);
EAPI void e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del);
@ -52,32 +52,28 @@ EAPI void e_comp_object_util_center(Evas_Object *obj);
EAPI void e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on);
EAPI void e_comp_object_util_center_pos_get(Evas_Object *obj, int *x, int *y);
EAPI void e_comp_object_util_fullscreen(Evas_Object *obj);
EAPI void e_comp_object_frame_geometry_get(Evas_Object *obj, int *l, int *r, int *t, int *b);
EAPI void e_comp_object_frame_icon_geometry_get(Evas_Object *obj, int *x, int *y, int *w, int *h);
EAPI Eina_Bool e_comp_object_frame_title_set(Evas_Object *obj, const char *name);
EAPI Eina_Bool e_comp_object_frame_exists(Evas_Object *obj);
EAPI void e_comp_object_frame_icon_update(Evas_Object *obj);
EAPI Eina_Bool e_comp_object_frame_theme_set(Evas_Object *obj, const char *name);
EAPI void e_comp_object_signal_emit(Evas_Object *obj, const char *sig, const char *src);
EAPI void e_comp_object_signal_callback_add(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data);
EAPI void e_comp_object_signal_callback_del(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb);
EAPI void e_comp_object_signal_callback_del_full(Evas_Object *obj, const char *sig, const char *src, Edje_Signal_Cb cb, const void *data);
EAPI void e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h);
EAPI void e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h);
EAPI Eina_Bool e_comp_object_damage_exists(Evas_Object *obj);
EAPI void e_comp_object_render_update_add(Evas_Object *obj);
EAPI void e_comp_object_render_update_del(Evas_Object *obj);
EAPI void e_comp_object_shape_apply(Evas_Object *obj);
EAPI void e_comp_object_redirected_set(Evas_Object *obj, Eina_Bool set);
EAPI void e_comp_object_native_surface_set(Evas_Object *obj, Eina_Bool set);
EAPI void e_comp_object_dirty(Evas_Object *obj);
EAPI Eina_Bool e_comp_object_render(Evas_Object *obj);
EAPI void e_comp_object_effect_set(Evas_Object *obj, const char *effect);
EAPI void e_comp_object_effect_params_set(Evas_Object *obj, int id, int *params, unsigned int count);
EAPI void e_comp_object_effect_clip(Evas_Object *obj);
EAPI void e_comp_object_effect_unclip(Evas_Object *obj);
EAPI void e_comp_object_effect_start(Evas_Object *obj, Edje_Signal_Cb end_cb, const void *end_data);
EAPI void e_comp_object_effect_stop(Evas_Object *obj, Edje_Signal_Cb end_cb);
EAPI void e_comp_object_frame_geometry_get(const Eo *obj, int *l, int *r, int *t, int *b);
EAPI void e_comp_object_frame_icon_geometry_get(const Eo *obj, int *x, int *y, int *w, int *h);
EAPI Eina_Bool e_comp_object_frame_title_set(Eo *obj, const char *name);
EAPI Eina_Bool e_comp_object_frame_exists(Eo *obj);
EAPI void e_comp_object_frame_icon_update(Eo *obj);
EAPI Eina_Bool e_comp_object_frame_theme_set(Eo *obj, const char *name);
EAPI void e_comp_object_input_area_set(Eo *obj, int x, int y, int w, int h);
EAPI void e_comp_object_damage(Eo *obj, int x, int y, int w, int h);
EAPI Eina_Bool e_comp_object_damage_exists(Eo *obj);
EAPI void e_comp_object_render_update_add(Eo *obj);
EAPI void e_comp_object_render_update_del(Eo *obj);
EAPI void e_comp_object_shape_apply(Eo *obj);
EAPI void e_comp_object_redirected_set(Eo *obj, Eina_Bool set);
EAPI void e_comp_object_native_surface_set(Eo *obj, Eina_Bool set);
EAPI void e_comp_object_dirty(Eo *obj);
EAPI Eina_Bool e_comp_object_render(Eo *obj);
EAPI void e_comp_object_effect_set(Eo *obj, const char *effect);
EAPI void e_comp_object_effect_params_set(Eo *obj, int id, int *params, unsigned int count);
EAPI void e_comp_object_effect_clip(Eo *obj);
EAPI void e_comp_object_effect_unclip(Eo *obj);
EAPI void e_comp_object_effect_start(Eo *obj, Edje_Signal_Cb end_cb, const void *end_data);
EAPI void e_comp_object_effect_stop(Eo *obj, Edje_Signal_Cb end_cb);
EAPI E_Comp_Object_Mover *e_comp_object_effect_mover_add(int pri, const char *sig, E_Comp_Object_Mover_Cb provider, const void *data);
EAPI void e_comp_object_effect_mover_del(E_Comp_Object_Mover *prov);

8
src/bin/e_deskmirror.c
View File

@ -319,7 +319,7 @@ _mirror_client_smart_del(Evas_Object *obj)
Mirror_Border *mb = evas_object_smart_data_get(obj);
if (mb->m->comp_object && mb->m->ec)
{
e_comp_object_signal_callback_del_full(mb->m->ec->frame, "*", "*", _mirror_client_signal_cb, mb->frame);
edje_object_signal_callback_del_full(mb->m->ec->frame, "*", "*", _mirror_client_signal_cb, mb->frame);
evas_object_smart_callback_del_full(mb->m->ec->frame, "shadow_change", _mirror_client_shadow_change, mb->frame);
}
evas_object_del(mb->frame);
@ -482,7 +482,7 @@ _mirror_client_new(Mirror *m)
_mirror_client_theme_setup(mb);
if (m->comp_object)
{
e_comp_object_signal_callback_add(mb->m->comp_object, "*", "*", _mirror_client_signal_cb, mb->frame);
edje_object_signal_callback_add(mb->m->comp_object, "*", "*", _mirror_client_signal_cb, mb->frame);
evas_object_smart_callback_add(mb->m->comp_object, "shadow_change", _mirror_client_shadow_change, mb->frame);
evas_object_event_callback_add(m->comp_object, EVAS_CALLBACK_DEL, _e_deskmirror_mirror_del_cb, m);
}
@ -778,7 +778,7 @@ e_deskmirror_mirror_list(Evas_Object *deskmirror)
static void
_mirror_copy_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
{
e_comp_object_signal_callback_del_full(data, "*", "*", _mirror_client_signal_cb, obj);
edje_object_signal_callback_del_full(data, "*", "*", _mirror_client_signal_cb, obj);
evas_object_smart_callback_del_full(data, "shadow_change", _mirror_client_shadow_change, obj);
}
@ -804,7 +804,7 @@ e_deskmirror_mirror_copy(Evas_Object *obj)
edje_object_signal_emit(o, "e,state,shadow,off", "e");
if (mb->m->comp_object)
{
e_comp_object_signal_callback_add(mb->m->comp_object, "*", "*", _mirror_client_signal_cb, o);
edje_object_signal_callback_add(mb->m->comp_object, "*", "*", _mirror_client_signal_cb, o);
evas_object_smart_callback_add(mb->m->comp_object, "shadow_change", _mirror_client_shadow_change, o);
evas_object_event_callback_add(o, EVAS_CALLBACK_DEL, _mirror_copy_del, mb->m->comp_object);
}