From 2b52dc9c5898e904f3670826535a01c7b4cee589 Mon Sep 17 00:00:00 2001 From: Jeonghyun Yun Date: Thu, 8 Mar 2012 20:38:36 +0900 Subject: [PATCH] src/lib conflict fixed --- configure.ac | 50 +-- src/lib/Elementary.h.in | 1 - src/lib/Makefile.am | 1 - src/lib/elc_fileselector_entry.c | 36 -- src/lib/elm_config.c | 81 ---- src/lib/elm_config.h | 383 ----------------- src/lib/elm_main.c | 907 --------------------------------------- src/lib/elm_password.h | 61 --- src/lib/elm_widget.c | 201 --------- src/lib/elm_win.c | 239 ----------- src/lib/elm_win.h | 129 ------ src/modules/Makefile.am | 5 - 12 files changed, 1 insertion(+), 2093 deletions(-) delete mode 100644 src/lib/elm_password.h diff --git a/configure.ac b/configure.ac index f696322..46d311b 100755 --- a/configure.ac +++ b/configure.ac @@ -124,11 +124,7 @@ ELM_WINCE_DEF="#undef" have_windows="no" have_dlopen="no" case "$host_os" in -<<<<<<< HEAD mingw32ce* | cegcc*) -======= - mingw32ce*) ->>>>>>> remotes/origin/upstream PKG_CHECK_MODULES([EVIL], [evil]) AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed.]) lt_enable_auto_import="-Wl,--enable-auto-import" @@ -184,19 +180,12 @@ dnl managed by evil have_socket="yes" ;; esac -<<<<<<< HEAD -AC_CHECK_FUNCS(strcasestr, AC_DEFINE(HAVE_STRCASESTR)) -======= ->>>>>>> remotes/origin/upstream AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"]) AM_CONDITIONAL([BUILD_MODULES], [test "x$have_dlopen" = "xyes"]) m4_ifdef([v_mic], [ -<<<<<<< HEAD -======= EFL_COMPILER_FLAG([-Wshadow]) ->>>>>>> remotes/origin/upstream EFL_COMPILER_FLAG([-Wall]) EFL_COMPILER_FLAG([-W]) ]) @@ -316,32 +305,6 @@ if test "x$want_elementary_x" = "xyes" -a "x$have_elementary_x" = "xno"; then AC_MSG_ERROR([ecore-x support requested, but not found by pkg-config.]) fi -<<<<<<< HEAD -have_conformant_autoscroll="no" -want_conformant_autoscroll="yes" -AC_ARG_ENABLE([ecore-x], - [AC_HELP_STRING([--disable-ecore-x], [disable ecore-x support. @<:@default=detect@:>@])], - [want_conformant_autoscroll=$enableval], []) - -if test "x$want_conformant_autoscroll" != "xno"; then - PKG_CHECK_MODULES([ELEMENTARY_X], - [ecore-x >= 1.0.0], - [ - AC_DEFINE(HAVE_CONFORMANT_AUTOSCROLL, 1, [autoscroll with conformant]) - have_conformant_autoscroll="yes" - requirement_elm="ecore-x >= 1.0.0 ${requirement_elm}" - ], - [have_conformant_autoscroll="no"] - ) -else - have_conformant_autoscroll="no" -fi -if test "x$want_conformant_autoscroll" = "xyes" -a "x$have_conformant_autoscroll" = "xno"; then - AC_MSG_ERROR([ecore-x support requested, but not found by pkg-config.]) -fi -======= ->>>>>>> remotes/origin/upstream - have_elementary_fb="no" want_elementary_fb="auto" AC_ARG_ENABLE([ecore-fb], @@ -688,11 +651,8 @@ if test "x${have_mman}" = "xyes"; then AC_DEFINE(HAVE_MMAN_H, 1, [Have sys/mman.h header file]) fi -<<<<<<< HEAD -======= AC_CHECK_HEADERS([locale.h langinfo.h]) ->>>>>>> remotes/origin/upstream my_libs="-lm" AC_SUBST(my_libs) AC_SUBST(requirement_elm) @@ -753,15 +713,10 @@ src/lib/Elementary.h src/bin/Makefile src/modules/Makefile src/modules/access_output/Makefile -<<<<<<< HEAD -src/modules/test_entry/Makefile -src/modules/test_map/Makefile -src/modules/ctxpopup_copypasteUI/Makefile -======= src/modules/datetime_input_ctxpopup/Makefile src/modules/test_entry/Makefile src/modules/test_map/Makefile ->>>>>>> remotes/origin/upstream +src/modules/ctxpopup_copypasteUI/Makefile src/edje_externals/Makefile src/examples/Makefile data/Makefile @@ -774,10 +729,7 @@ config/Makefile config/default/Makefile config/standard/Makefile config/illume/Makefile -<<<<<<< HEAD config/slp/Makefile -======= ->>>>>>> remotes/origin/upstream $po_makefile_in ]) diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index 7edfe27..2b9306e 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -160,7 +160,6 @@ EAPI extern Elm_Version *elm_version; /* other includes */ #include -#include // Tom Hacohen #include // OK diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 24e8ba3..c4a7b5f 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -110,7 +110,6 @@ elm_object.h \ elm_object_item.h \ elm_panel.h \ elm_panes.h \ -elm_password.h \ elm_photocam.h \ elm_photo.h \ elm_progressbar.h \ diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c index 984c131..8fbfce0 100644 --- a/src/lib/elc_fileselector_entry.c +++ b/src/lib/elc_fileselector_entry.c @@ -346,21 +346,6 @@ elm_fileselector_entry_add(Evas_Object *parent) } EAPI void -<<<<<<< HEAD -elm_fileselector_entry_button_label_set(Evas_Object *obj, const char *label) -{ - _elm_fileselector_entry_button_label_set(obj, NULL, label); -} - -EAPI const char * -elm_fileselector_entry_button_label_get(const Evas_Object *obj) -{ - return _elm_fileselector_entry_button_label_get(obj, NULL); -} - -EAPI void -======= ->>>>>>> remotes/origin/upstream elm_fileselector_entry_selected_set(Evas_Object *obj, const char *path) { ELM_CHECK_WIDTYPE(obj, widtype); @@ -504,24 +489,3 @@ elm_fileselector_entry_inwin_mode_get(const Evas_Object *obj) if (!wd) return EINA_FALSE; return elm_fileselector_button_inwin_mode_get(wd->button); } -<<<<<<< HEAD - -EAPI void -elm_fileselector_entry_button_icon_set(Evas_Object *obj, Evas_Object *icon) -{ - _content_set_hook(obj, NULL, icon); -} - -EAPI Evas_Object * -elm_fileselector_entry_button_icon_get(const Evas_Object *obj) -{ - return _content_get_hook(obj, NULL); -} - -EAPI Evas_Object * -elm_fileselector_entry_button_icon_unset(Evas_Object *obj) -{ - return _content_unset_hook(obj, NULL); -} -======= ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c index dbeb67b..9195be4 100644 --- a/src/lib/elm_config.c +++ b/src/lib/elm_config.c @@ -15,10 +15,7 @@ Elm_Config *_elm_config = NULL; char *_elm_profile = NULL; static Eet_Data_Descriptor *_config_edd = NULL; static Eet_Data_Descriptor *_config_font_overlay_edd = NULL; -<<<<<<< HEAD -======= const char *_elm_preferred_engine = NULL; ->>>>>>> remotes/origin/upstream static Ecore_Poller *_elm_cache_flush_poller = NULL; @@ -291,10 +288,7 @@ _desc_init(void) ELM_CONFIG_VAL(D, T, bring_in_scroll_friction, T_DOUBLE); ELM_CONFIG_VAL(D, T, zoom_friction, T_DOUBLE); ELM_CONFIG_VAL(D, T, thumbscroll_bounce_enable, T_UCHAR); -<<<<<<< HEAD ELM_CONFIG_VAL(D, T, scroll_smooth_time_interval, T_DOUBLE); -======= ->>>>>>> remotes/origin/upstream ELM_CONFIG_VAL(D, T, scroll_smooth_amount, T_DOUBLE); ELM_CONFIG_VAL(D, T, scroll_smooth_history_weight, T_DOUBLE); ELM_CONFIG_VAL(D, T, scroll_smooth_future_time, T_DOUBLE); @@ -341,12 +335,9 @@ _desc_init(void) ELM_CONFIG_VAL(D, T, glayer_long_tap_start_timeout, T_DOUBLE); ELM_CONFIG_VAL(D, T, access_mode, T_INT); ELM_CONFIG_VAL(D, T, glayer_continues_enable, T_UCHAR); -<<<<<<< HEAD -======= ELM_CONFIG_VAL(D, T, week_start, T_INT); ELM_CONFIG_VAL(D, T, weekend_start, T_INT); ELM_CONFIG_VAL(D, T, weekend_len, T_INT); ->>>>>>> remotes/origin/upstream #undef T #undef D #undef T_INT @@ -551,10 +542,7 @@ _elm_config_text_classes_get(void) { Elm_Text_Class *tc; tc = malloc(sizeof(*tc)); -<<<<<<< HEAD -======= if (!tc) continue; ->>>>>>> remotes/origin/upstream *tc = _elm_text_classes[i]; @@ -576,11 +564,7 @@ _elm_config_text_classes_free(Eina_List *l) Eina_List * _elm_config_profiles_list(void) { -<<<<<<< HEAD - const Eina_File_Direct_Info *info; -======= Eina_File_Direct_Info *info; ->>>>>>> remotes/origin/upstream Eina_List *flist = NULL; Eina_Iterator *file_it; char buf[PATH_MAX]; @@ -600,8 +584,6 @@ _elm_config_profiles_list(void) EINA_ITERATOR_FOREACH(file_it, info) { -<<<<<<< HEAD -======= Eina_Stat st; if (eina_file_statat(eina_iterator_container_get(file_it), info, &st)) @@ -609,7 +591,6 @@ _elm_config_profiles_list(void) ERR("this is bad."); continue; } ->>>>>>> remotes/origin/upstream if (info->name_length >= len) continue; @@ -774,11 +755,7 @@ _config_sub_apply(void) static Eina_Bool _elm_cache_flush_cb(void *data __UNUSED__) { -<<<<<<< HEAD - elm_all_flush(); -======= elm_cache_all_flush(); ->>>>>>> remotes/origin/upstream return ECORE_CALLBACK_RENEW; } @@ -791,11 +768,7 @@ _elm_recache(void) Eina_List *l; Evas_Object *win; -<<<<<<< HEAD - elm_all_flush(); -======= elm_cache_all_flush(); ->>>>>>> remotes/origin/upstream EINA_LIST_FOREACH(_elm_win_list, l, win) { @@ -881,13 +854,8 @@ _config_load(void) * profile. Fallback to default before moving on */ // config load fail - defaults -<<<<<<< HEAD - /* XXX: do these make sense? Only if it's valid to install the lib - * without the config, but do we want that? */ -======= // why are these here? well if they are, it means you can make a gui // config recovery app i guess... ->>>>>>> remotes/origin/upstream _elm_config = ELM_NEW(Elm_Config); _elm_config->config_version = ELM_CONFIG_VERSION; _elm_config->engine = eina_stringshare_add("software_x11"); @@ -903,10 +871,7 @@ _config_load(void) _elm_config->zoom_friction = 0.5; _elm_config->thumbscroll_border_friction = 0.5; _elm_config->thumbscroll_sensitivity_friction = 0.25; // magic number! just trial and error shows this makes it behave "nicer" and not run off at high speed all the time -<<<<<<< HEAD _elm_config->scroll_smooth_time_interval = 0.008; -======= ->>>>>>> remotes/origin/upstream _elm_config->scroll_smooth_amount = 1.0; _elm_config->scroll_smooth_history_weight = 0.3; _elm_config->scroll_smooth_future_time = 0.0; @@ -952,12 +917,9 @@ _config_load(void) _elm_config->glayer_flick_time_limit_ms = 120; /* ms to finish flick */ _elm_config->glayer_long_tap_start_timeout = 1.2; /* 1.2 second to start long-tap */ _elm_config->glayer_continues_enable = EINA_TRUE; /* Continue gestures default */ -<<<<<<< HEAD -======= _elm_config->week_start = 1; /* monday */ _elm_config->weekend_start = 6; /* saturday */ _elm_config->weekend_len = 2; ->>>>>>> remotes/origin/upstream } static const char * @@ -1088,11 +1050,7 @@ _elm_config_save(void) ok = ecore_file_mkpath(buf); if (!ok) { -<<<<<<< HEAD - ERR("Problem acessing Elementary's user configuration directory: %s", -======= ERR("Problem accessing Elementary's user configuration directory: %s", ->>>>>>> remotes/origin/upstream buf); return EINA_FALSE; } @@ -1314,11 +1272,8 @@ _env_get(void) _elm_config->thumbscroll_sensitivity_friction = friction; } -<<<<<<< HEAD s = getenv("ELM_SCROLL_SMOOTH_TIME_INTERVAL"); if (s) _elm_config->scroll_smooth_time_interval = atof(s); -======= ->>>>>>> remotes/origin/upstream s = getenv("ELM_SCROLL_SMOOTH_AMOUNT"); if (s) _elm_config->scroll_smooth_amount = atof(s); s = getenv("ELM_SCROLL_SMOOTH_HISTORY_WEIGHT"); @@ -1457,28 +1412,18 @@ _env_get(void) } EAPI Eina_Bool -<<<<<<< HEAD -elm_mirrored_get(void) -======= elm_config_mirrored_get(void) ->>>>>>> remotes/origin/upstream { return _elm_config->is_mirrored; } EAPI void -<<<<<<< HEAD -elm_mirrored_set(Eina_Bool mirrored) -======= elm_config_mirrored_set(Eina_Bool mirrored) ->>>>>>> remotes/origin/upstream { _elm_config->is_mirrored = mirrored; _elm_rescale(); } -<<<<<<< HEAD -======= EAPI Eina_Bool elm_config_cursor_engine_only_get(void) { @@ -2001,7 +1946,6 @@ elm_config_all_flush(void) #endif } ->>>>>>> remotes/origin/upstream static void _translation_init() { @@ -2030,14 +1974,11 @@ _elm_config_init(void) _desc_init(); _profile_fetch_from_conf(); _config_load(); -<<<<<<< HEAD -======= if (_elm_preferred_engine) eina_stringshare_del(_elm_preferred_engine); if (_elm_config->engine) _elm_preferred_engine = eina_stringshare_add(_elm_config->engine); else _elm_preferred_engine = NULL; ->>>>>>> remotes/origin/upstream _translation_init(); _env_get(); _config_apply(); @@ -2133,18 +2074,6 @@ _elm_config_engine_set(const char *engine) _elm_config->engine = eina_stringshare_add(engine); } -<<<<<<< HEAD -void -_elm_config_all_update(void) -{ -#ifdef HAVE_ELEMENTARY_X - if (_prop_all_update_timer) ecore_timer_del(_prop_all_update_timer); - _prop_all_update_timer = ecore_timer_add(0.1, _prop_all_update_cb, NULL); - _prop_config_set(); - ecore_x_window_prop_string_set(_root_1st, _atom[ATOM_E_PROFILE], - _elm_profile); -#endif -======= EAPI const char * elm_config_preferred_engine_get(void) { @@ -2161,7 +2090,6 @@ elm_config_preferred_engine_set(const char *engine) if (_elm_preferred_engine) eina_stringshare_del(_elm_preferred_engine); _elm_preferred_engine = eina_stringshare_add(_elm_config->engine); } ->>>>>>> remotes/origin/upstream } void @@ -2196,15 +2124,9 @@ _elm_config_shutdown(void) if (_prop_all_update_timer) { ecore_timer_del(_prop_all_update_timer); -<<<<<<< HEAD - _prop_all_update_cb(NULL); - } - _prop_all_update_timer = NULL; -======= _prop_all_update_timer = NULL; _prop_all_update_cb(NULL); } ->>>>>>> remotes/origin/upstream if (_prop_change_delay_timer) ecore_timer_del(_prop_change_delay_timer); _prop_change_delay_timer = NULL; #endif @@ -2222,14 +2144,11 @@ _elm_config_shutdown(void) #endif } _config_free(); -<<<<<<< HEAD -======= if (_elm_preferred_engine) { eina_stringshare_del(_elm_preferred_engine); _elm_preferred_engine = NULL; } ->>>>>>> remotes/origin/upstream if (_elm_profile) { free(_elm_profile); diff --git a/src/lib/elm_config.h b/src/lib/elm_config.h index 2974ed9..625936b 100644 --- a/src/lib/elm_config.h +++ b/src/lib/elm_config.h @@ -3,17 +3,10 @@ * * Elementary configuration is formed by a set options bounded to a * given @ref Profile profile, like @ref Theme theme, @ref Fingers -<<<<<<< HEAD - * "finger size", etc. These are functions with which one syncronizes - * changes made to those values to the configuration storing files, de - * facto. You most probably don't want to use the functions in this - * group unlees you're writing an elementary configuration manager. -======= * "finger size", etc. These are functions with which one synchronizes * changes made to those values to the configuration storing files, de * facto. You most probably don't want to use the functions in this * group unless you're writing an elementary configuration manager. ->>>>>>> remotes/origin/upstream * * @{ */ @@ -22,19 +15,11 @@ * Save back Elementary's configuration, so that it will persist on * future sessions. * -<<<<<<< HEAD - * @return @c EINA_TRUE, when sucessful. @c EINA_FALSE, otherwise. - * @ingroup Config - * - * This function will take effect -- thus, do I/O -- immediately. Use - * it when you want to apply all configuration changes at once. The -======= * @return @c EINA_TRUE, when successful. @c EINA_FALSE, otherwise. * @ingroup Config * * This function will take effect -- thus, do I/O -- immediately. Use * it when you want to save all configuration changes at once. The ->>>>>>> remotes/origin/upstream * current configuration set will get saved onto the current profile * configuration file. * @@ -45,11 +30,7 @@ EAPI Eina_Bool elm_config_save(void); * Reload Elementary's configuration, bounded to current selected * profile. * -<<<<<<< HEAD - * @return @c EINA_TRUE, when sucessful. @c EINA_FALSE, otherwise. -======= * @return @c EINA_TRUE, when successful. @c EINA_FALSE, otherwise. ->>>>>>> remotes/origin/upstream * @ingroup Config * * Useful when you want to force reloading of configuration values for @@ -60,8 +41,6 @@ EAPI Eina_Bool elm_config_save(void); EAPI void elm_config_reload(void); /** -<<<<<<< HEAD -======= * Flush all config settings then apply those settings to all applications * using elementary on the current display. * @@ -70,7 +49,6 @@ EAPI void elm_config_reload(void); EAPI void elm_config_all_flush(void); /** ->>>>>>> remotes/origin/upstream * @} */ @@ -81,11 +59,7 @@ EAPI void elm_config_all_flush(void); * Elementary-based applications. There are, for example, profiles * aimed at desktop computer applications and others aimed at mobile, * touchscreen-based ones. You most probably don't want to use the -<<<<<<< HEAD - * functions in this group unlees you're writing an elementary -======= * functions in this group unless you're writing an elementary ->>>>>>> remotes/origin/upstream * configuration manager. * * @{ @@ -100,17 +74,6 @@ EAPI void elm_config_all_flush(void); * @return The profile's name * @ingroup Profile */ -<<<<<<< HEAD -EAPI const char *elm_profile_current_get(void); - -/** - * Get an Elementary's profile directory path in the filesystem. One - * may want to fetch a system profile's dir or an user one (fetched - * inside $HOME). - * - * @param profile The profile's name - * @param is_user Whether to lookup for an user profile (@c EINA_TRUE) -======= EAPI const char *elm_config_profile_get(void); /** @@ -120,20 +83,10 @@ EAPI const char *elm_config_profile_get(void); * * @param profile The profile's name * @param is_user Whether to lookup for a user profile (@c EINA_TRUE) ->>>>>>> remotes/origin/upstream * or a system one (@c EINA_FALSE) * @return The profile's directory path. * @ingroup Profile * -<<<<<<< HEAD - * @note You must free it with elm_profile_dir_free(). - */ -EAPI const char *elm_profile_dir_get(const char *profile, Eina_Bool is_user); - -/** - * Free an Elementary's profile directory path, as returned by - * elm_profile_dir_get(). -======= * @note You must free it with elm_config_profile_dir_free(). */ EAPI const char *elm_config_profile_dir_get(const char *profile, Eina_Bool is_user); @@ -141,17 +94,12 @@ EAPI const char *elm_config_profile_dir_get(const char *profile, Eina_Bool is_us /** * Free an Elementary's profile directory path, as returned by * elm_config_profile_dir_get(). ->>>>>>> remotes/origin/upstream * * @param p_dir The profile's path * @ingroup Profile * */ -<<<<<<< HEAD -EAPI void elm_profile_dir_free(const char *p_dir); -======= EAPI void elm_config_profile_dir_free(const char *p_dir); ->>>>>>> remotes/origin/upstream /** * Get Elementary's list of available profiles. @@ -161,32 +109,18 @@ EAPI void elm_config_profile_dir_free(const char *p_dir); * @ingroup Profile * * @note One must free this list, after usage, with the function -<<<<<<< HEAD - * elm_profile_list_free(). - */ -EAPI Eina_List *elm_profile_list_get(void); -======= * elm_config_profile_list_free(). */ EAPI Eina_List *elm_config_profile_list_get(void); ->>>>>>> remotes/origin/upstream /** * Free Elementary's list of available profiles. * -<<<<<<< HEAD - * @param l The profiles list, as returned by elm_profile_list_get(). - * @ingroup Profile - * - */ -EAPI void elm_profile_list_free(Eina_List *l); -======= * @param l The profiles list, as returned by elm_config_profile_list_get(). * @ingroup Profile * */ EAPI void elm_config_profile_list_free(Eina_List *l); ->>>>>>> remotes/origin/upstream /** * Set Elementary's profile. @@ -199,23 +133,7 @@ EAPI void elm_config_profile_list_free(Eina_List *l); * @ingroup Profile * */ -<<<<<<< HEAD -EAPI void elm_profile_set(const char *profile); - -/** - * Set Elementary's profile. - * - * This sets the global profile that is applied to all Elementary - * applications. All running Elementary windows will be affected. - * - * @param profile The profile's name - * @ingroup Profile - * - */ -EAPI void elm_profile_all_set(const char *profile); -======= EAPI void elm_config_profile_set(const char *profile); ->>>>>>> remotes/origin/upstream /** * @} @@ -239,11 +157,7 @@ EAPI void elm_config_profile_set(const char *profile); * This is the default behavior for touch screens, in general. * @ingroup Scrolling */ -<<<<<<< HEAD -EAPI Eina_Bool elm_scroll_bounce_enabled_get(void); -======= EAPI Eina_Bool elm_config_scroll_bounce_enabled_get(void); ->>>>>>> remotes/origin/upstream /** * Set whether scrollers should bounce when they reach their @@ -251,30 +165,10 @@ EAPI Eina_Bool elm_config_scroll_bounce_enabled_get(void); * * @param enabled the thumb scroll bouncing state * -<<<<<<< HEAD - * @see elm_thumbscroll_bounce_enabled_get() - * @ingroup Scrolling - */ -EAPI void elm_scroll_bounce_enabled_set(Eina_Bool enabled); - -/** - * Set whether scrollers should bounce when they reach their - * viewport's edge during a scroll, for all Elementary application - * windows. - * - * @param enabled the thumb scroll bouncing state - * - * @see elm_thumbscroll_bounce_enabled_get() - * @ingroup Scrolling - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_scroll_bounce_enabled_all_set(Eina_Bool enabled); -======= * @see elm_config_scroll_bounce_enabled_get() * @ingroup Scrolling */ EAPI void elm_config_scroll_bounce_enabled_set(Eina_Bool enabled); ->>>>>>> remotes/origin/upstream /** * Get the amount of inertia a scroller will impose at bounce @@ -284,11 +178,7 @@ EAPI void elm_config_scroll_bounce_enabled_set(Eina_Bool enabled); * * @ingroup Scrolling */ -<<<<<<< HEAD -EAPI double elm_scroll_bounce_friction_get(void); -======= EAPI double elm_config_scroll_bounce_friction_get(void); ->>>>>>> remotes/origin/upstream /** * Set the amount of inertia a scroller will impose at bounce @@ -296,29 +186,10 @@ EAPI double elm_config_scroll_bounce_friction_get(void); * * @param friction the thumb scroll bounce friction * -<<<<<<< HEAD - * @see elm_thumbscroll_bounce_friction_get() - * @ingroup Scrolling - */ -EAPI void elm_scroll_bounce_friction_set(double friction); - -/** - * Set the amount of inertia a scroller will impose at bounce - * animations, for all Elementary application windows. - * - * @param friction the thumb scroll bounce friction - * - * @see elm_thumbscroll_bounce_friction_get() - * @ingroup Scrolling - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_scroll_bounce_friction_all_set(double friction); -======= * @see elm_config_scroll_bounce_friction_get() * @ingroup Scrolling */ EAPI void elm_config_scroll_bounce_friction_set(double friction); ->>>>>>> remotes/origin/upstream /** * Get the amount of inertia a paged scroller will impose at @@ -328,11 +199,7 @@ EAPI void elm_config_scroll_bounce_friction_set(double friction); * * @ingroup Scrolling */ -<<<<<<< HEAD -EAPI double elm_scroll_page_scroll_friction_get(void); -======= EAPI double elm_config_scroll_page_scroll_friction_get(void); ->>>>>>> remotes/origin/upstream /** * Set the amount of inertia a paged scroller will impose at @@ -340,29 +207,10 @@ EAPI double elm_config_scroll_page_scroll_friction_get(void); * * @param friction the page scroll friction * -<<<<<<< HEAD - * @see elm_thumbscroll_page_scroll_friction_get() - * @ingroup Scrolling - */ -EAPI void elm_scroll_page_scroll_friction_set(double friction); - -/** - * Set the amount of inertia a paged scroller will impose at - * page fitting animations, for all Elementary application windows. - * - * @param friction the page scroll friction - * - * @see elm_thumbscroll_page_scroll_friction_get() - * @ingroup Scrolling - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_scroll_page_scroll_friction_all_set(double friction); -======= * @see elm_config_scroll_page_scroll_friction_get() * @ingroup Scrolling */ EAPI void elm_config_scroll_page_scroll_friction_set(double friction); ->>>>>>> remotes/origin/upstream /** * Get the amount of inertia a scroller will impose at region bring @@ -372,11 +220,7 @@ EAPI void elm_config_scroll_page_scroll_friction_set(double friction); * * @ingroup Scrolling */ -<<<<<<< HEAD -EAPI double elm_scroll_bring_in_scroll_friction_get(void); -======= EAPI double elm_config_scroll_bring_in_scroll_friction_get(void); ->>>>>>> remotes/origin/upstream /** * Set the amount of inertia a scroller will impose at region bring @@ -384,29 +228,10 @@ EAPI double elm_config_scroll_bring_in_scroll_friction_get(void); * * @param friction the bring in scroll friction * -<<<<<<< HEAD - * @see elm_thumbscroll_bring_in_scroll_friction_get() - * @ingroup Scrolling - */ -EAPI void elm_scroll_bring_in_scroll_friction_set(double friction); - -/** - * Set the amount of inertia a scroller will impose at region bring - * animations, for all Elementary application windows. - * - * @param friction the bring in scroll friction - * - * @see elm_thumbscroll_bring_in_scroll_friction_get() - * @ingroup Scrolling - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_scroll_bring_in_scroll_friction_all_set(double friction); -======= * @see elm_config_scroll_bring_in_scroll_friction_get() * @ingroup Scrolling */ EAPI void elm_config_scroll_bring_in_scroll_friction_set(double friction); ->>>>>>> remotes/origin/upstream /** * Get the amount of inertia scrollers will impose at animations @@ -416,11 +241,7 @@ EAPI void elm_config_scroll_bring_in_scroll_friction_set(double friction * * @ingroup Scrolling */ -<<<<<<< HEAD -EAPI double elm_scroll_zoom_friction_get(void); -======= EAPI double elm_config_scroll_zoom_friction_get(void); ->>>>>>> remotes/origin/upstream /** * Set the amount of inertia scrollers will impose at animations @@ -428,30 +249,10 @@ EAPI double elm_config_scroll_zoom_friction_get(void); * * @param friction the zoom friction * -<<<<<<< HEAD - * @see elm_thumbscroll_zoom_friction_get() - * @ingroup Scrolling - */ -EAPI void elm_scroll_zoom_friction_set(double friction); - -/** - * Set the amount of inertia scrollers will impose at animations - * triggered by Elementary widgets' zooming API, for all Elementary - * application windows. - * - * @param friction the zoom friction - * - * @see elm_thumbscroll_zoom_friction_get() - * @ingroup Scrolling - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_scroll_zoom_friction_all_set(double friction); -======= * @see elm_config_scroll_zoom_friction_get() * @ingroup Scrolling */ EAPI void elm_config_scroll_zoom_friction_set(double friction); ->>>>>>> remotes/origin/upstream /** * Get whether scrollers should be draggable from any point in their @@ -465,11 +266,7 @@ EAPI void elm_config_scroll_zoom_friction_set(double friction); * * @ingroup Scrolling */ -<<<<<<< HEAD -EAPI Eina_Bool elm_scroll_thumbscroll_enabled_get(void); -======= EAPI Eina_Bool elm_config_scroll_thumbscroll_enabled_get(void); ->>>>>>> remotes/origin/upstream /** * Set whether scrollers should be draggable from any point in their @@ -477,135 +274,56 @@ EAPI Eina_Bool elm_config_scroll_thumbscroll_enabled_get(void); * * @param enabled the thumb scroll state * -<<<<<<< HEAD - * @see elm_thumbscroll_enabled_get() - * @ingroup Scrolling - */ -EAPI void elm_scroll_thumbscroll_enabled_set(Eina_Bool enabled); - -/** - * Set whether scrollers should be draggable from any point in their - * views, for all Elementary application windows. - * - * @param enabled the thumb scroll state - * - * @see elm_thumbscroll_enabled_get() - * @ingroup Scrolling - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_scroll_thumbscroll_enabled_all_set(Eina_Bool enabled); -======= * @see elm_config_scroll_thumbscroll_enabled_get() * @ingroup Scrolling */ EAPI void elm_config_scroll_thumbscroll_enabled_set(Eina_Bool enabled); ->>>>>>> remotes/origin/upstream /** * Get the number of pixels one should travel while dragging a * scroller's view to actually trigger scrolling. * -<<<<<<< HEAD - * @return the thumb scroll threshould -======= * @return the thumb scroll threshold ->>>>>>> remotes/origin/upstream * * One would use higher values for touch screens, in general, because * of their inherent imprecision. * @ingroup Scrolling */ -<<<<<<< HEAD -EAPI unsigned int elm_scroll_thumbscroll_threshold_get(void); -======= EAPI unsigned int elm_config_scroll_thumbscroll_threshold_get(void); ->>>>>>> remotes/origin/upstream /** * Set the number of pixels one should travel while dragging a * scroller's view to actually trigger scrolling. * -<<<<<<< HEAD - * @param threshold the thumb scroll threshould - * - * @see elm_thumbscroll_threshould_get() - * @ingroup Scrolling - */ -EAPI void elm_scroll_thumbscroll_threshold_set(unsigned int threshold); - -/** - * Set the number of pixels one should travel while dragging a - * scroller's view to actually trigger scrolling, for all Elementary - * application windows. - * - * @param threshold the thumb scroll threshould - * - * @see elm_thumbscroll_threshould_get() - * @ingroup Scrolling - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_scroll_thumbscroll_threshold_all_set(unsigned int threshold); -======= * @param threshold the thumb scroll threshold * * @see elm_config_thumbscroll_threshold_get() * @ingroup Scrolling */ EAPI void elm_config_scroll_thumbscroll_threshold_set(unsigned int threshold); ->>>>>>> remotes/origin/upstream /** * Get the minimum speed of mouse cursor movement which will trigger * list self scrolling animation after a mouse up event * (pixels/second). * -<<<<<<< HEAD - * @return the thumb scroll momentum threshould - * - * @ingroup Scrolling - */ -EAPI double elm_scroll_thumbscroll_momentum_threshold_get(void); -======= * @return the thumb scroll momentum threshold * * @ingroup Scrolling */ EAPI double elm_config_scroll_thumbscroll_momentum_threshold_get(void); ->>>>>>> remotes/origin/upstream /** * Set the minimum speed of mouse cursor movement which will trigger * list self scrolling animation after a mouse up event * (pixels/second). * -<<<<<<< HEAD - * @param threshold the thumb scroll momentum threshould - * - * @see elm_thumbscroll_momentum_threshould_get() - * @ingroup Scrolling - */ -EAPI void elm_scroll_thumbscroll_momentum_threshold_set(double threshold); - -/** - * Set the minimum speed of mouse cursor movement which will trigger - * list self scrolling animation after a mouse up event - * (pixels/second), for all Elementary application windows. - * - * @param threshold the thumb scroll momentum threshould - * - * @see elm_thumbscroll_momentum_threshould_get() - * @ingroup Scrolling - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_scroll_thumbscroll_momentum_threshold_all_set(double threshold); -======= * @param threshold the thumb scroll momentum threshold * * @see elm_config_thumbscroll_momentum_threshold_get() * @ingroup Scrolling */ EAPI void elm_config_scroll_thumbscroll_momentum_threshold_set(double threshold); ->>>>>>> remotes/origin/upstream /** * Get the amount of inertia a scroller will impose at self scrolling @@ -615,11 +333,7 @@ EAPI void elm_config_scroll_thumbscroll_momentum_threshold_set(double th * * @ingroup Scrolling */ -<<<<<<< HEAD -EAPI double elm_scroll_thumbscroll_friction_get(void); -======= EAPI double elm_config_scroll_thumbscroll_friction_get(void); ->>>>>>> remotes/origin/upstream /** * Set the amount of inertia a scroller will impose at self scrolling @@ -627,29 +341,10 @@ EAPI double elm_config_scroll_thumbscroll_friction_get(void); * * @param friction the thumb scroll friction * -<<<<<<< HEAD - * @see elm_thumbscroll_friction_get() - * @ingroup Scrolling - */ -EAPI void elm_scroll_thumbscroll_friction_set(double friction); - -/** - * Set the amount of inertia a scroller will impose at self scrolling - * animations, for all Elementary application windows. - * - * @param friction the thumb scroll friction - * - * @see elm_thumbscroll_friction_get() - * @ingroup Scrolling - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_scroll_thumbscroll_friction_all_set(double friction); -======= * @see elm_config_thumbscroll_friction_get() * @ingroup Scrolling */ EAPI void elm_config_scroll_thumbscroll_friction_set(double friction); ->>>>>>> remotes/origin/upstream /** * Get the amount of lag between your actual mouse cursor dragging @@ -660,11 +355,7 @@ EAPI void elm_config_scroll_thumbscroll_friction_set(double friction); * * @ingroup Scrolling */ -<<<<<<< HEAD -EAPI double elm_scroll_thumbscroll_border_friction_get(void); -======= EAPI double elm_config_scroll_thumbscroll_border_friction_get(void); ->>>>>>> remotes/origin/upstream /** * Set the amount of lag between your actual mouse cursor dragging @@ -675,37 +366,12 @@ EAPI double elm_config_scroll_thumbscroll_border_friction_get(void); * perfect synchrony between two movements, @c 1.0 for maximum * lag. * -<<<<<<< HEAD - * @see elm_thumbscroll_border_friction_get() - * @note parameter value will get bound to 0.0 - 1.0 interval, always - * - * @ingroup Scrolling - */ -EAPI void elm_scroll_thumbscroll_border_friction_set(double friction); - -/** - * Set the amount of lag between your actual mouse cursor dragging - * movement and a scroller's view movement itself, while pushing it - * into bounce state manually, for all Elementary application windows. - * - * @param friction the thumb scroll border friction. @c 0.0 for - * perfect synchrony between two movements, @c 1.0 for maximum - * lag. - * - * @see elm_thumbscroll_border_friction_get() -======= * @see elm_config_thumbscroll_border_friction_get() ->>>>>>> remotes/origin/upstream * @note parameter value will get bound to 0.0 - 1.0 interval, always * * @ingroup Scrolling */ -<<<<<<< HEAD -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_scroll_thumbscroll_border_friction_all_set(double friction); -======= EAPI void elm_config_scroll_thumbscroll_border_friction_set(double friction); ->>>>>>> remotes/origin/upstream /** * Get the sensitivity amount which is be multiplied by the length of @@ -715,51 +381,21 @@ EAPI void elm_config_scroll_thumbscroll_border_friction_set(double frict * * @ingroup Scrolling */ -<<<<<<< HEAD -EAPI double elm_scroll_thumbscroll_sensitivity_friction_get(void); -======= EAPI double elm_config_scroll_thumbscroll_sensitivity_friction_get(void); ->>>>>>> remotes/origin/upstream /** * Set the sensitivity amount which is be multiplied by the length of * mouse dragging. * * @param friction the thumb scroll sensitivity friction. @c 0.1 for -<<<<<<< HEAD - * minimun sensitivity, @c 1.0 for maximum sensitivity. 0.25 - * is proper. - * - * @see elm_thumbscroll_sensitivity_friction_get() -======= * minimum sensitivity, @c 1.0 for maximum sensitivity. 0.25 * is proper. * * @see elm_config_thumbscroll_sensitivity_friction_get() ->>>>>>> remotes/origin/upstream * @note parameter value will get bound to 0.1 - 1.0 interval, always * * @ingroup Scrolling */ -<<<<<<< HEAD -EAPI void elm_scroll_thumbscroll_sensitivity_friction_set(double friction); - -/** - * Set the sensitivity amount which is be multiplied by the length of - * mouse dragging, for all Elementary application windows. - * - * @param friction the thumb scroll sensitivity friction. @c 0.1 for - * minimun sensitivity, @c 1.0 for maximum sensitivity. 0.25 - * is proper. - * - * @see elm_thumbscroll_sensitivity_friction_get() - * @note parameter value will get bound to 0.1 - 1.0 interval, always - * - * @ingroup Scrolling - */ -// XXX: deprecate and replace with elm_config_all_flush() -EAPI void elm_scroll_thumbscroll_sensitivity_friction_all_set(double friction); -======= EAPI void elm_config_scroll_thumbscroll_sensitivity_friction_set(double friction); /** @@ -898,29 +534,12 @@ EAPI double elm_config_password_show_last_timeout_get(void); * @ingroup Password_last_show */ EAPI void elm_config_password_show_last_timeout_set(double password_show_last_timeout); ->>>>>>> remotes/origin/upstream /** * @} */ /** -<<<<<<< HEAD - * Get the duration for occuring long press event. - * - * @return Timeout for long press event - * @ingroup Longpress - */ -EAPI double elm_longpress_timeout_get(void); - -/** - * Set the duration for occuring long press event. - * - * @param lonpress_timeout Timeout for long press event - * @ingroup Longpress - */ -EAPI void elm_longpress_timeout_set(double longpress_timeout); -======= * @defgroup Engine Elementary Engine * * These are functions setting and querying which rendering engine @@ -1321,5 +940,3 @@ EAPI void elm_config_mirrored_set(Eina_Bool mirrored); /** * @} */ - ->>>>>>> remotes/origin/upstream diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index a8a4382..6764836 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -542,11 +542,7 @@ elm_quicklaunch_seed(void) elm_win_resize_object_add(win, bg); evas_object_show(bg); bt = elm_button_add(win); -<<<<<<< HEAD - elm_button_label_set(bt, " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~-_=+\\|]}[{;:'\",<.>/?"); -======= elm_object_text_set(bt, " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789~-_=+\\|]}[{;:'\",<.>/?"); ->>>>>>> remotes/origin/upstream elm_win_resize_object_add(win, bt); ecore_main_loop_iterate(); evas_object_del(win); @@ -1021,70 +1017,12 @@ elm_object_content_part_unset(Evas_Object *obj, const char *part) return elm_widget_content_part_unset(obj, part); } -<<<<<<< HEAD -EAPI double -elm_scale_get(void) -{ - return _elm_config->scale; -} - -EAPI void -elm_scale_set(double scale) -{ - if (_elm_config->scale == scale) return; - _elm_config->scale = scale; - _elm_rescale(); -} - -EAPI void -elm_scale_all_set(double scale) -{ - elm_scale_set(scale); - _elm_config_all_update(); -} - -EAPI Eina_Bool -elm_password_show_last_get(void) -{ - return _elm_config->password_show_last; -} - -EAPI void -elm_password_show_last_set(Eina_Bool password_show_last) -{ - if (_elm_config->password_show_last == password_show_last) return; - _elm_config->password_show_last = password_show_last; - edje_password_show_last_set(_elm_config->password_show_last); -} - -EAPI double -elm_password_show_last_timeout_get(void) -{ - return _elm_config->password_show_last_timeout; -} - -EAPI void -elm_password_show_last_timeout_set(double password_show_last_timeout) -{ - if (_elm_config->password_show_last_timeout == password_show_last_timeout) return; - _elm_config->password_show_last_timeout = password_show_last_timeout; - edje_password_show_last_timeout_set(_elm_config->password_show_last_timeout); -} - -EAPI void -elm_object_style_set(Evas_Object *obj, - const char *style) -{ - EINA_SAFETY_ON_NULL_RETURN(obj); - elm_widget_style_set(obj, style); -======= EAPI Eina_Bool elm_object_style_set(Evas_Object *obj, const char *style) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); return elm_widget_style_set(obj, style); ->>>>>>> remotes/origin/upstream } EAPI const char * @@ -1109,245 +1047,8 @@ elm_object_disabled_get(const Evas_Object *obj) return elm_widget_disabled_get(obj); } -<<<<<<< HEAD -EAPI Eina_Bool -elm_config_save(void) -{ - return _elm_config_save(); -} - -EAPI void -elm_config_reload(void) -{ - _elm_config_reload(); -} - -EAPI const char * -elm_profile_current_get(void) -{ - return _elm_config_current_profile_get(); -} - -EAPI const char * -elm_profile_dir_get(const char *profile, - Eina_Bool is_user) -{ - return _elm_config_profile_dir_get(profile, is_user); -} - -EAPI void -elm_profile_dir_free(const char *p_dir) -{ - free((void *)p_dir); -} - -EAPI Eina_List * -elm_profile_list_get(void) -{ - return _elm_config_profiles_list(); -} - -EAPI void -elm_profile_list_free(Eina_List *l) -{ - const char *dir; - - EINA_LIST_FREE(l, dir) - eina_stringshare_del(dir); -} - -EAPI void -elm_profile_set(const char *profile) -{ - EINA_SAFETY_ON_NULL_RETURN(profile); - _elm_config_profile_set(profile); -} - -EAPI void -elm_profile_all_set(const char *profile) -{ - _elm_config_profile_set(profile); - _elm_config_all_update(); -} - -EAPI const char * -elm_engine_current_get(void) -{ - return _elm_config->engine; -} - -EAPI void -elm_engine_set(const char *engine) -{ - EINA_SAFETY_ON_NULL_RETURN(engine); - - _elm_config_engine_set(engine); -} - -EAPI const Eina_List * -elm_text_classes_list_get(void) -{ - return _elm_config_text_classes_get(); -} - -EAPI void -elm_text_classes_list_free(const Eina_List *list) -{ - _elm_config_text_classes_free((Eina_List *)list); -} - -EAPI const Eina_List * -elm_font_overlay_list_get(void) -{ - return _elm_config_font_overlays_list(); -} - -EAPI void -elm_font_overlay_set(const char *text_class, - const char *font, - Evas_Font_Size size) -{ - _elm_config_font_overlay_set(text_class, font, size); -} - -EAPI void -elm_font_overlay_unset(const char *text_class) -{ - _elm_config_font_overlay_remove(text_class); -} - -EAPI void -elm_font_overlay_apply(void) -{ - _elm_config_font_overlay_apply(); -} - -EAPI void -elm_font_overlay_all_apply(void) -{ - elm_font_overlay_apply(); - _elm_config_all_update(); -} - -EAPI Elm_Font_Properties * -elm_font_properties_get(const char *font) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(font, NULL); - return _elm_font_properties_get(NULL, font); -} - -EAPI void -elm_font_properties_free(Elm_Font_Properties *efp) -{ - const char *str; - - EINA_SAFETY_ON_NULL_RETURN(efp); - EINA_LIST_FREE(efp->styles, str) - if (str) eina_stringshare_del(str); - if (efp->name) eina_stringshare_del(efp->name); - free(efp); -} - -EAPI const char * -elm_font_fontconfig_name_get(const char *name, - const char *style) -{ - char buf[256]; - - EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); - if (!style || style[0] == 0) return eina_stringshare_add(name); - snprintf(buf, 256, "%s" ELM_FONT_TOKEN_STYLE "%s", name, style); - return eina_stringshare_add(buf); -} - -EAPI void -elm_font_fontconfig_name_free(const char *name) -{ - eina_stringshare_del(name); -} - -EAPI Eina_Hash * -elm_font_available_hash_add(Eina_List *list) -{ - Eina_Hash *font_hash; - Eina_List *l; - void *key; - - font_hash = NULL; - - /* populate with default font families */ - font_hash = _elm_font_available_hash_add(font_hash, "Sans:style=Regular"); - font_hash = _elm_font_available_hash_add(font_hash, "Sans:style=Bold"); - font_hash = _elm_font_available_hash_add(font_hash, "Sans:style=Oblique"); - font_hash = _elm_font_available_hash_add(font_hash, - "Sans:style=Bold Oblique"); - - font_hash = _elm_font_available_hash_add(font_hash, "Serif:style=Regular"); - font_hash = _elm_font_available_hash_add(font_hash, "Serif:style=Bold"); - font_hash = _elm_font_available_hash_add(font_hash, "Serif:style=Oblique"); - font_hash = _elm_font_available_hash_add(font_hash, - "Serif:style=Bold Oblique"); - - font_hash = _elm_font_available_hash_add(font_hash, - "Monospace:style=Regular"); - font_hash = _elm_font_available_hash_add(font_hash, - "Monospace:style=Bold"); - font_hash = _elm_font_available_hash_add(font_hash, - "Monospace:style=Oblique"); - font_hash = _elm_font_available_hash_add(font_hash, - "Monospace:style=Bold Oblique"); - - EINA_LIST_FOREACH(list, l, key) - font_hash = _elm_font_available_hash_add(font_hash, key); - - return font_hash; -} - -EAPI void -elm_font_available_hash_del(Eina_Hash *hash) -{ - _elm_font_available_hash_del(hash); -} - -EAPI Evas_Coord -elm_finger_size_get(void) -{ - return _elm_config->finger_size; -} - -EAPI void -elm_finger_size_set(Evas_Coord size) -{ - if (_elm_config->finger_size == size) return; - _elm_config->finger_size = size; - _elm_rescale(); -} - -EAPI void -elm_finger_size_all_set(Evas_Coord size) -{ - elm_finger_size_set(size); - _elm_config_all_update(); -} - -EAPI void -elm_coords_finger_size_adjust(int times_w, - Evas_Coord *w, - int times_h, - Evas_Coord *h) -{ - if ((w) && (*w < (_elm_config->finger_size * times_w))) - *w = _elm_config->finger_size * times_w; - if ((h) && (*h < (_elm_config->finger_size * times_h))) - *h = _elm_config->finger_size * times_h; -} - -EAPI void -elm_all_flush(void) -======= EAPI void elm_cache_all_flush(void) ->>>>>>> remotes/origin/upstream { const Eina_List *l; Evas_Object *obj; @@ -1364,144 +1065,10 @@ elm_cache_all_flush(void) } } -<<<<<<< HEAD -EAPI int -elm_cache_flush_interval_get(void) -{ - return _elm_config->cache_flush_poll_interval; -} - -EAPI void -elm_cache_flush_interval_set(int size) -{ - if (_elm_config->cache_flush_poll_interval == size) return; - _elm_config->cache_flush_poll_interval = size; - - _elm_recache(); -} - -EAPI void -elm_cache_flush_interval_all_set(int size) -{ - elm_cache_flush_interval_set(size); - _elm_config_all_update(); -} - -EAPI Eina_Bool -elm_cache_flush_enabled_get(void) -{ - return _elm_config->cache_flush_enable; -} - -EAPI void -elm_cache_flush_enabled_set(Eina_Bool enabled) -{ - enabled = !!enabled; - if (_elm_config->cache_flush_enable == enabled) return; - _elm_config->cache_flush_enable = enabled; - - _elm_recache(); -} - -EAPI void -elm_cache_flush_enabled_all_set(Eina_Bool enabled) -{ - elm_cache_flush_enabled_set(enabled); - _elm_config_all_update(); -} - -EAPI int -elm_font_cache_get(void) -{ - return _elm_config->font_cache; -} - -EAPI void -elm_font_cache_set(int size) -{ - if (_elm_config->font_cache == size) return; - _elm_config->font_cache = size; - - _elm_recache(); -} - -EAPI void -elm_font_cache_all_set(int size) -{ - elm_font_cache_set(size); - _elm_config_all_update(); -} - -EAPI int -elm_image_cache_get(void) -{ - return _elm_config->image_cache; -} - -EAPI void -elm_image_cache_set(int size) -{ - if (_elm_config->image_cache == size) return; - _elm_config->image_cache = size; - - _elm_recache(); -} - -EAPI void -elm_image_cache_all_set(int size) -{ - elm_image_cache_set(size); - _elm_config_all_update(); -} - -EAPI int -elm_edje_file_cache_get(void) -{ - return _elm_config->edje_cache; -} - -EAPI void -elm_edje_file_cache_set(int size) -{ - if (_elm_config->edje_cache == size) return; - _elm_config->edje_cache = size; - - _elm_recache(); -} - -EAPI void -elm_edje_file_cache_all_set(int size) -{ - elm_edje_file_cache_set(size); - _elm_config_all_update(); -} - -EAPI int -elm_edje_collection_cache_get(void) -{ - return _elm_config->edje_collection_cache; -} - -EAPI void -elm_edje_collection_cache_set(int size) -{ - if (_elm_config->edje_collection_cache == size) return; - _elm_config->edje_collection_cache = size; - - _elm_recache(); -} - -EAPI void -elm_edje_collection_cache_all_set(int size) -{ - elm_edje_collection_cache_set(size); - _elm_config_all_update(); -======= EINA_DEPRECATED EAPI void elm_all_flush(void) { elm_cache_all_flush(); ->>>>>>> remotes/origin/upstream } EAPI Eina_Bool @@ -1516,32 +1083,6 @@ elm_object_focus_set(Evas_Object *obj, Eina_Bool focus) { EINA_SAFETY_ON_NULL_RETURN(obj); -<<<<<<< HEAD - if (focus) - { - if (elm_widget_focus_get(obj)) return; - elm_widget_focus_cycle(obj, ELM_FOCUS_NEXT); - } - else - { - if (!elm_widget_can_focus_get(obj)) return; - elm_widget_focused_object_clear(obj); - } -} - -EAPI void -elm_object_focus(Evas_Object *obj) -{ - EINA_SAFETY_ON_NULL_RETURN(obj); - elm_object_focus_set(obj, EINA_TRUE); -} - -EAPI void -elm_object_unfocus(Evas_Object *obj) -{ - EINA_SAFETY_ON_NULL_RETURN(obj); - elm_object_focus_set(obj, EINA_FALSE); -======= if (focus == elm_widget_focus_get(obj)) return; @@ -1549,7 +1090,6 @@ elm_object_unfocus(Evas_Object *obj) elm_widget_focus_cycle(obj, ELM_FOCUS_NEXT); else elm_widget_focused_object_clear(obj); ->>>>>>> remotes/origin/upstream } EAPI void @@ -1558,11 +1098,8 @@ elm_object_focus_allow_set(Evas_Object *obj, { EINA_SAFETY_ON_NULL_RETURN(obj); elm_widget_can_focus_set(obj, enable); -<<<<<<< HEAD -======= /*FIXME: According to the elm_object_focus_allow_get(), child_can_focus field of the parent should be updated. Otherwise, the checking of it's child focus allow states should not be in elm_object_focus_allow_get() */ ->>>>>>> remotes/origin/upstream } EAPI Eina_Bool @@ -1600,10 +1137,6 @@ elm_object_focus_custom_chain_append(Evas_Object *obj, Evas_Object *relative_child) { EINA_SAFETY_ON_NULL_RETURN(obj); -<<<<<<< HEAD - EINA_SAFETY_ON_NULL_RETURN(child); -======= ->>>>>>> remotes/origin/upstream elm_widget_focus_custom_chain_append(obj, child, relative_child); } @@ -1613,279 +1146,6 @@ elm_object_focus_custom_chain_prepend(Evas_Object *obj, Evas_Object *relative_child) { EINA_SAFETY_ON_NULL_RETURN(obj); -<<<<<<< HEAD - EINA_SAFETY_ON_NULL_RETURN(child); - elm_widget_focus_custom_chain_prepend(obj, child, relative_child); -} - -EAPI void -elm_object_focus_cycle(Evas_Object *obj, - Elm_Focus_Direction dir) -{ - EINA_SAFETY_ON_NULL_RETURN(obj); - elm_widget_focus_cycle(obj, dir); -} - -EAPI void -elm_object_focus_direction_go(Evas_Object *obj, - int x, - int y) -{ - EINA_SAFETY_ON_NULL_RETURN(obj); - elm_widget_focus_direction_go(obj, x, y); -} - -EAPI void -elm_object_tree_unfocusable_set(Evas_Object *obj, - Eina_Bool tree_unfocusable) -{ - EINA_SAFETY_ON_NULL_RETURN(obj); - elm_widget_tree_unfocusable_set(obj, tree_unfocusable); -} - -EAPI Eina_Bool -elm_object_tree_unfocusable_get(const Evas_Object *obj) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); - return elm_widget_tree_unfocusable_get(obj); -} - -EAPI Eina_Bool -elm_focus_highlight_enabled_get(void) -{ - return _elm_config->focus_highlight_enable; -} - -EAPI void -elm_focus_highlight_enabled_set(Eina_Bool enable) -{ - _elm_config->focus_highlight_enable = !!enable; -} - -EAPI Eina_Bool -elm_focus_highlight_animate_get(void) -{ - return _elm_config->focus_highlight_animate; -} - -EAPI void -elm_focus_highlight_animate_set(Eina_Bool animate) -{ - _elm_config->focus_highlight_animate = !!animate; -} - -EAPI Eina_Bool -elm_scroll_bounce_enabled_get(void) -{ - return _elm_config->thumbscroll_bounce_enable; -} - -EAPI void -elm_scroll_bounce_enabled_set(Eina_Bool enabled) -{ - _elm_config->thumbscroll_bounce_enable = enabled; -} - -EAPI void -elm_scroll_bounce_enabled_all_set(Eina_Bool enabled) -{ - elm_scroll_bounce_enabled_set(enabled); - _elm_config_all_update(); -} - -EAPI double -elm_scroll_bounce_friction_get(void) -{ - return _elm_config->thumbscroll_bounce_friction; -} - -EAPI void -elm_scroll_bounce_friction_set(double friction) -{ - _elm_config->thumbscroll_bounce_friction = friction; -} - -EAPI void -elm_scroll_bounce_friction_all_set(double friction) -{ - elm_scroll_bounce_friction_set(friction); - _elm_config_all_update(); -} - -EAPI double -elm_scroll_page_scroll_friction_get(void) -{ - return _elm_config->page_scroll_friction; -} - -EAPI void -elm_scroll_page_scroll_friction_set(double friction) -{ - _elm_config->page_scroll_friction = friction; -} - -EAPI void -elm_scroll_page_scroll_friction_all_set(double friction) -{ - elm_scroll_page_scroll_friction_set(friction); - _elm_config_all_update(); -} - -EAPI double -elm_scroll_bring_in_scroll_friction_get(void) -{ - return _elm_config->bring_in_scroll_friction; -} - -EAPI void -elm_scroll_bring_in_scroll_friction_set(double friction) -{ - _elm_config->bring_in_scroll_friction = friction; -} - -EAPI void -elm_scroll_bring_in_scroll_friction_all_set(double friction) -{ - elm_scroll_bring_in_scroll_friction_set(friction); - _elm_config_all_update(); -} - -EAPI double -elm_scroll_zoom_friction_get(void) -{ - return _elm_config->zoom_friction; -} - -EAPI void -elm_scroll_zoom_friction_set(double friction) -{ - _elm_config->zoom_friction = friction; -} - -EAPI void -elm_scroll_zoom_friction_all_set(double friction) -{ - elm_scroll_zoom_friction_set(friction); - _elm_config_all_update(); -} - -EAPI Eina_Bool -elm_scroll_thumbscroll_enabled_get(void) -{ - return _elm_config->thumbscroll_enable; -} - -EAPI void -elm_scroll_thumbscroll_enabled_set(Eina_Bool enabled) -{ - _elm_config->thumbscroll_enable = enabled; -} - -EAPI void -elm_scroll_thumbscroll_enabled_all_set(Eina_Bool enabled) -{ - elm_scroll_thumbscroll_enabled_set(enabled); - _elm_config_all_update(); -} - -EAPI unsigned int -elm_scroll_thumbscroll_threshold_get(void) -{ - return _elm_config->thumbscroll_threshold; -} - -EAPI void -elm_scroll_thumbscroll_threshold_set(unsigned int threshold) -{ - _elm_config->thumbscroll_threshold = threshold; -} - -EAPI void -elm_scroll_thumbscroll_threshold_all_set(unsigned int threshold) -{ - elm_scroll_thumbscroll_threshold_set(threshold); - _elm_config_all_update(); -} - -EAPI double -elm_scroll_thumbscroll_momentum_threshold_get(void) -{ - return _elm_config->thumbscroll_momentum_threshold; -} - -EAPI void -elm_scroll_thumbscroll_momentum_threshold_set(double threshold) -{ - _elm_config->thumbscroll_momentum_threshold = threshold; -} - -EAPI void -elm_scroll_thumbscroll_momentum_threshold_all_set(double threshold) -{ - elm_scroll_thumbscroll_momentum_threshold_set(threshold); - _elm_config_all_update(); -} - -EAPI double -elm_scroll_thumbscroll_friction_get(void) -{ - return _elm_config->thumbscroll_friction; -} - -EAPI void -elm_scroll_thumbscroll_friction_set(double friction) -{ - _elm_config->thumbscroll_friction = friction; -} - -EAPI void -elm_scroll_thumbscroll_friction_all_set(double friction) -{ - elm_scroll_thumbscroll_friction_set(friction); - _elm_config_all_update(); -} - -EAPI double -elm_scroll_thumbscroll_border_friction_get(void) -{ - return _elm_config->thumbscroll_border_friction; -} - -EAPI void -elm_scroll_thumbscroll_border_friction_set(double friction) -{ - if (friction < 0.0) friction = 0.0; - if (friction > 1.0) friction = 1.0; - _elm_config->thumbscroll_friction = friction; -} - -EAPI void -elm_scroll_thumbscroll_border_friction_all_set(double friction) -{ - elm_scroll_thumbscroll_border_friction_set(friction); - _elm_config_all_update(); -} - -EAPI double -elm_scroll_thumbscroll_sensitivity_friction_get(void) -{ - return _elm_config->thumbscroll_sensitivity_friction; -} - -EAPI void -elm_scroll_thumbscroll_sensitivity_friction_set(double friction) -{ - if (friction < 0.1) friction = 0.1; - if (friction > 1.0) friction = 1.0; - _elm_config->thumbscroll_friction = friction; -} - -EAPI void -elm_scroll_thumbscroll_sensitivity_friction_all_set(double friction) -{ - elm_scroll_thumbscroll_sensitivity_friction_set(friction); - _elm_config_all_update(); -======= elm_widget_focus_custom_chain_prepend(obj, child, relative_child); } @@ -1930,7 +1190,6 @@ elm_object_tree_focus_allow_get(const Evas_Object *obj) { EINA_SAFETY_ON_NULL_RETURN_VAL(obj, EINA_FALSE); return elm_widget_tree_unfocusable_get(obj); ->>>>>>> remotes/origin/upstream } EAPI void @@ -2087,17 +1346,6 @@ elm_object_tree_dot_dump(const Evas_Object *top, } EAPI void -<<<<<<< HEAD -elm_longpress_timeout_set(double longpress_timeout) -{ - _elm_config->longpress_timeout = longpress_timeout; -} - -EAPI double -elm_longpress_timeout_get(void) -{ - return _elm_config->longpress_timeout; -======= elm_coords_finger_size_adjust(int times_w, Evas_Coord *w, int times_h, @@ -2107,7 +1355,6 @@ elm_coords_finger_size_adjust(int times_w, *w = _elm_config->finger_size * times_w; if ((h) && (*h < (_elm_config->finger_size * times_h))) *h = _elm_config->finger_size * times_h; ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * @@ -2121,11 +1368,7 @@ elm_object_item_content_part_set(Elm_Object_Item *it, const char *part, Evas_Object *content) { -<<<<<<< HEAD - _elm_widget_item_content_part_set((Elm_Widget_Item *) it, part, content); -======= _elm_widget_item_content_part_set((Elm_Widget_Item *)it, part, content); ->>>>>>> remotes/origin/upstream } EAPI void @@ -2133,53 +1376,33 @@ elm_object_item_part_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content) { -<<<<<<< HEAD - _elm_widget_item_content_part_set((Elm_Widget_Item *) it, part, content); -======= _elm_widget_item_content_part_set((Elm_Widget_Item *)it, part, content); ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * elm_object_item_content_part_get(const Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - return _elm_widget_item_content_part_get((Elm_Widget_Item *) it, part); -======= return _elm_widget_item_content_part_get((Elm_Widget_Item *)it, part); ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * elm_object_item_part_content_get(const Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - return _elm_widget_item_content_part_get((Elm_Widget_Item *) it, part); -======= return _elm_widget_item_content_part_get((Elm_Widget_Item *)it, part); ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * elm_object_item_content_part_unset(Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - return _elm_widget_item_content_part_unset((Elm_Widget_Item *) it, part); -======= return _elm_widget_item_content_part_unset((Elm_Widget_Item *)it, part); ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * elm_object_item_part_content_unset(Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - return _elm_widget_item_content_part_unset((Elm_Widget_Item *) it, part); -======= return _elm_widget_item_content_part_unset((Elm_Widget_Item *)it, part); ->>>>>>> remotes/origin/upstream } EAPI void @@ -2187,11 +1410,7 @@ elm_object_item_text_part_set(Elm_Object_Item *it, const char *part, const char *label) { -<<<<<<< HEAD - _elm_widget_item_text_part_set((Elm_Widget_Item *) it, part, label); -======= _elm_widget_item_text_part_set((Elm_Widget_Item *)it, part, label); ->>>>>>> remotes/origin/upstream } EAPI void @@ -2199,31 +1418,19 @@ elm_object_item_part_text_set(Elm_Object_Item *it, const char *part, const char *label) { -<<<<<<< HEAD - _elm_widget_item_text_part_set((Elm_Widget_Item *) it, part, label); -======= _elm_widget_item_text_part_set((Elm_Widget_Item *)it, part, label); ->>>>>>> remotes/origin/upstream } EAPI const char * elm_object_item_text_part_get(const Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - return _elm_widget_item_text_part_get((Elm_Widget_Item *) it, part); -======= return _elm_widget_item_text_part_get((Elm_Widget_Item *)it, part); ->>>>>>> remotes/origin/upstream } EAPI const char * elm_object_item_part_text_get(const Elm_Object_Item *it, const char *part) { -<<<<<<< HEAD - return _elm_widget_item_text_part_get((Elm_Widget_Item *) it, part); -======= return _elm_widget_item_text_part_get((Elm_Widget_Item *)it, part); ->>>>>>> remotes/origin/upstream } EAPI void @@ -2241,11 +1448,7 @@ elm_object_name_find(const Evas_Object *obj, const char *name, int recurse) EAPI void elm_object_item_access_info_set(Elm_Object_Item *it, const char *txt) { -<<<<<<< HEAD - _elm_widget_item_access_info_set((Elm_Widget_Item *) it, txt); -======= _elm_widget_item_access_info_set((Elm_Widget_Item *)it, txt); ->>>>>>> remotes/origin/upstream } EAPI void * @@ -2263,135 +1466,26 @@ elm_object_item_data_set(Elm_Object_Item *it, void *data) EAPI void elm_object_item_signal_emit(Elm_Object_Item *it, const char *emission, const char *source) { -<<<<<<< HEAD - _elm_widget_item_signal_emit((Elm_Widget_Item *) it, emission, source); -======= _elm_widget_item_signal_emit((Elm_Widget_Item *)it, emission, source); ->>>>>>> remotes/origin/upstream } EAPI void elm_object_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled) { -<<<<<<< HEAD - _elm_widget_item_disabled_set((Elm_Widget_Item *) it, disabled); -======= _elm_widget_item_disabled_set((Elm_Widget_Item *)it, disabled); ->>>>>>> remotes/origin/upstream } EAPI Eina_Bool elm_object_item_disabled_get(const Elm_Object_Item *it) { -<<<<<<< HEAD - return _elm_widget_item_disabled_get((Elm_Widget_Item *) it); -======= return _elm_widget_item_disabled_get((Elm_Widget_Item *)it); ->>>>>>> remotes/origin/upstream } EAPI void elm_object_item_del_cb_set(Elm_Object_Item *it, Evas_Smart_Cb del_cb) { -<<<<<<< HEAD - _elm_widget_item_del_cb_set((Elm_Widget_Item *) it, del_cb); -======= _elm_widget_item_del_cb_set((Elm_Widget_Item *)it, del_cb); ->>>>>>> remotes/origin/upstream } EAPI void elm_object_item_del(Elm_Object_Item *it) { -<<<<<<< HEAD - _elm_widget_item_del((Elm_Widget_Item *) it); -} - -EAPI void -elm_object_item_tooltip_text_set(Elm_Object_Item *item, const char *text) -{ - elm_widget_item_tooltip_text_set(item, text); -} - -EAPI void -elm_object_item_tooltip_content_cb_set(Elm_Object_Item *item, Elm_Tooltip_Item_Content_Cb func, const void *data, Evas_Smart_Cb del_cb) -{ - elm_widget_item_tooltip_content_cb_set(item, func, data, del_cb); -} - -EAPI void -elm_object_item_tooltip_unset(Elm_Object_Item *item) -{ - elm_widget_item_tooltip_unset(item); -} - -EAPI Eina_Bool -elm_object_item_tooltip_window_mode_set(Elm_Object_Item *item, Eina_Bool disable) -{ - return elm_widget_item_tooltip_window_mode_set(item, disable); -} - -EAPI Eina_Bool -elm_object_item_tooltip_window_mode_get(const Elm_Object_Item *item) -{ - return elm_widget_item_tooltip_window_mode_get(item); -} - -EAPI void -elm_object_item_tooltip_style_set(Elm_Object_Item *item, const char *style) -{ - elm_widget_item_tooltip_style_set(item, style); -} - -EAPI const char * -elm_object_item_tooltip_style_get(const Elm_Object_Item *item) -{ - return elm_widget_item_tooltip_style_get(item); -} - -EINA_DEPRECATED EAPI Evas_Object * -elm_object_item_object_get(const Elm_Object_Item *it) -{ - return elm_object_item_widget_get(it); -} - -EAPI void -elm_object_item_cursor_set(Elm_Object_Item *item, const char *cursor) -{ - elm_widget_item_tooltip_style_set(item, cursor); -} - -EAPI const char * -elm_object_item_cursor_get(const Elm_Object_Item *item) -{ - return elm_widget_item_cursor_get(item); -} - -EAPI void -elm_object_item_cursor_unset(Elm_Object_Item *item) -{ - elm_widget_item_cursor_unset(item); -} - -EAPI void -elm_object_item_cursor_style_set(Elm_Object_Item *item, const char *style) -{ - elm_widget_item_cursor_style_set(item, style); -} - -EAPI const char * -elm_object_item_cursor_style_get(const Elm_Object_Item *item) -{ - return elm_widget_item_cursor_style_get(item); -} - -EAPI void -elm_object_item_cursor_engine_only_set(Elm_Object_Item *item, Eina_Bool engine_only) -{ - elm_widget_item_cursor_engine_only_set(item, engine_only); -} - -EAPI Eina_Bool -elm_object_item_cursor_engine_only_get(const Elm_Object_Item *item) -{ - return elm_widget_item_cursor_engine_only_get(item); -======= _elm_widget_item_del((Elm_Widget_Item *)it); } @@ -2490,5 +1584,4 @@ elm_object_item_smart_callback_del(Elm_Object_Item *it, const char *event, Elm_O { return elm_widget_item_smart_callback_del((Elm_Widget_Item *)it, event, func); ->>>>>>> remotes/origin/upstream } diff --git a/src/lib/elm_password.h b/src/lib/elm_password.h deleted file mode 100644 index 0d1acfd..0000000 --- a/src/lib/elm_password.h +++ /dev/null @@ -1,61 +0,0 @@ -/** - * @defgroup Password_last_show Password last input show - * - * Last show feature of password mode enables user to view - * the last input entered for few seconds before masking it. - * These functions allow to set this feature in password mode - * of entry widget and also allow to manipulate the duration - * for which the input has to be visible. - * - * @{ - */ - -/** - * Get show last setting of password mode. - * - * This gets the show last input setting of password mode which might be - * enabled or disabled. - * - * @return @c EINA_TRUE, if the last input show setting is enabled, @c EINA_FALSE - * if it's disabled. - * @ingroup Password_last_show - */ -EAPI Eina_Bool elm_password_show_last_get(void); - -/** - * Set show last setting in password mode. - * - * This enables or disables show last setting of password mode. - * - * @param password_show_last If EINA_TRUE enable's last input show in password mode. - * @see elm_password_show_last_timeout_set() - * @ingroup Password_last_show - */ -EAPI void elm_password_show_last_set(Eina_Bool password_show_last); - -/** - * Get's the timeout value in last show password mode. - * - * This gets the time out value for which the last input entered in password - * mode will be visible. - * - * @return The timeout value of last show password mode. - * @ingroup Password_last_show - */ -EAPI double elm_password_show_last_timeout_get(void); - -/** - * Set's the timeout value in last show password mode. - * - * This sets the time out value for which the last input entered in password - * mode will be visible. - * - * @param password_show_last_timeout The timeout value. - * @see elm_password_show_last_set() - * @ingroup Password_last_show - */ -EAPI void elm_password_show_last_timeout_set(double password_show_last_timeout); - -/** - * @} - */ diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c index 20a1ad8..2eb2d48 100644 --- a/src/lib/elm_widget.c +++ b/src/lib/elm_widget.c @@ -20,10 +20,7 @@ typedef struct _Smart_Data Smart_Data; typedef struct _Edje_Signal_Data Edje_Signal_Data; typedef struct _Elm_Event_Cb_Data Elm_Event_Cb_Data; typedef struct _Elm_Translate_String_Data Elm_Translate_String_Data; -<<<<<<< HEAD -======= typedef struct _Elm_Widget_Item_Callback Elm_Widget_Item_Callback; ->>>>>>> remotes/origin/upstream struct _Smart_Data { @@ -146,8 +143,6 @@ struct _Elm_Translate_String_Data const char *string; }; -<<<<<<< HEAD -======= struct _Elm_Widget_Item_Callback { const char *event; @@ -158,7 +153,6 @@ struct _Elm_Widget_Item_Callback }; ->>>>>>> remotes/origin/upstream /* local subsystem functions */ static void _smart_reconfigure(Smart_Data *sd); static void _smart_add(Evas_Object *obj); @@ -508,11 +502,7 @@ elm_widget_add(Evas *evas) Evas_Object *obj; _smart_init(); obj = evas_object_smart_add(evas, _e_smart); -<<<<<<< HEAD - elm_widget_mirrored_set(obj, elm_mirrored_get()); -======= elm_widget_mirrored_set(obj, elm_config_mirrored_get()); ->>>>>>> remotes/origin/upstream return obj; } @@ -665,27 +655,13 @@ elm_widget_signal_callback_del_hook_set(Evas_Object *obj, sd->callback_del_func = func; } -<<<<<<< HEAD -EAPI void -======= EAPI Eina_Bool ->>>>>>> remotes/origin/upstream elm_widget_theme(Evas_Object *obj) { const Eina_List *l; Evas_Object *child; Elm_Tooltip *tt; Elm_Cursor *cur; -<<<<<<< HEAD - - API_ENTRY return; - EINA_LIST_FOREACH(sd->subobjs, l, child) elm_widget_theme(child); - if (sd->resize_obj) elm_widget_theme(sd->resize_obj); - if (sd->hover_obj) elm_widget_theme(sd->hover_obj); - EINA_LIST_FOREACH(sd->tooltips, l, tt) elm_tooltip_theme(tt); - EINA_LIST_FOREACH(sd->cursors, l, cur) elm_cursor_theme(cur); - if (sd->theme_func) sd->theme_func(obj); -======= Eina_Bool ret = EINA_TRUE; API_ENTRY return EINA_FALSE; @@ -697,7 +673,6 @@ elm_widget_theme(Evas_Object *obj) if (sd->theme_func) sd->theme_func(obj); return ret; ->>>>>>> remotes/origin/upstream } EAPI void @@ -804,11 +779,7 @@ void _elm_widget_mirrored_reload(Evas_Object *obj) { API_ENTRY return; -<<<<<<< HEAD - Eina_Bool mirrored = elm_mirrored_get(); -======= Eina_Bool mirrored = elm_config_mirrored_get(); ->>>>>>> remotes/origin/upstream if (elm_widget_mirrored_automatic_get(obj) && (sd->is_mirrored != mirrored)) { sd->is_mirrored = mirrored; @@ -847,11 +818,7 @@ elm_widget_mirrored_automatic_set(Evas_Object *obj, if (automatic) { -<<<<<<< HEAD - elm_widget_mirrored_set(obj, elm_mirrored_get()); -======= elm_widget_mirrored_set(obj, elm_config_mirrored_get()); ->>>>>>> remotes/origin/upstream } } } @@ -967,15 +934,12 @@ elm_widget_sub_object_add(Evas_Object *obj, Elm_Theme *th, *pth = elm_widget_theme_get(sobj); Eina_Bool mirrored, pmirrored = elm_widget_mirrored_get(obj); -<<<<<<< HEAD -======= if (sobj == sd->parent_obj) { elm_widget_sub_object_del(sobj, obj); WRN("You passed a parent object of obj = %p as the sub object = %p!", obj, sobj); } ->>>>>>> remotes/origin/upstream if (_elm_widget_is(sobj)) { Smart_Data *sd2 = evas_object_smart_data_get(sobj); @@ -1094,25 +1058,12 @@ elm_widget_resize_object_set(Evas_Object *obj, { Smart_Data *sd2 = evas_object_smart_data_get(sd->resize_obj); if (sd2) sd2->parent_obj = NULL; -<<<<<<< HEAD - evas_object_event_callback_del_full(sd->resize_obj, EVAS_CALLBACK_HIDE, -======= evas_object_event_callback_del_full(sd->resize_obj, EVAS_CALLBACK_HIDE, ->>>>>>> remotes/origin/upstream _sub_obj_hide, sd); } evas_object_event_callback_del_full(sd->resize_obj, EVAS_CALLBACK_DEL, _sub_obj_del, sd); -<<<<<<< HEAD - evas_object_event_callback_del_full(sd->resize_obj, EVAS_CALLBACK_MOUSE_DOWN, - _sub_obj_mouse_down, sd); - evas_object_event_callback_del_full(sd->resize_obj, EVAS_CALLBACK_MOUSE_MOVE, - _sub_obj_mouse_move, sd); - evas_object_event_callback_del_full(sd->resize_obj, EVAS_CALLBACK_MOUSE_UP, - _sub_obj_mouse_up, sd); - evas_object_smart_member_del(sd->resize_obj); -======= evas_object_event_callback_del_full(sd->resize_obj, EVAS_CALLBACK_MOUSE_DOWN, _sub_obj_mouse_down, sd); @@ -1124,7 +1075,6 @@ elm_widget_resize_object_set(Evas_Object *obj, _sub_obj_mouse_up, sd); evas_object_smart_member_del(sd->resize_obj); ->>>>>>> remotes/origin/upstream if (_elm_widget_is(sd->resize_obj)) { if (elm_widget_focus_get(sd->resize_obj)) _unfocus_parents(obj); @@ -1212,17 +1162,12 @@ elm_widget_can_focus_set(Evas_Object *obj, Eina_Bool can_focus) { API_ENTRY return; -<<<<<<< HEAD - sd->can_focus = can_focus; - if (can_focus) -======= can_focus = !!can_focus; if (sd->can_focus == can_focus) return; sd->can_focus = can_focus; if (sd->can_focus) ->>>>>>> remotes/origin/upstream { evas_object_event_callback_add(obj, EVAS_CALLBACK_KEY_DOWN, _propagate_event, @@ -1280,14 +1225,9 @@ elm_widget_tree_unfocusable_set(Evas_Object *obj, { API_ENTRY return; -<<<<<<< HEAD - if (sd->tree_unfocusable == tree_unfocusable) return; - sd->tree_unfocusable = !!tree_unfocusable; -======= tree_unfocusable = !!tree_unfocusable; if (sd->tree_unfocusable == tree_unfocusable) return; sd->tree_unfocusable = tree_unfocusable; ->>>>>>> remotes/origin/upstream elm_widget_focus_tree_unfocusable_handle(obj); } @@ -1626,31 +1566,16 @@ elm_widget_focus_custom_chain_append(Evas_Object *obj, { API_ENTRY return; EINA_SAFETY_ON_NULL_RETURN(child); -<<<<<<< HEAD - if (!sd->focus_next_func) - return; -======= if (!sd->focus_next_func) return; ->>>>>>> remotes/origin/upstream evas_object_event_callback_del_full(child, EVAS_CALLBACK_DEL, _elm_object_focus_chain_del_cb, sd); if (!relative_child) -<<<<<<< HEAD - { - sd->focus_chain = eina_list_append(sd->focus_chain, child); - return; - } - - sd->focus_chain = eina_list_append_relative(sd->focus_chain, child, relative_child); - return; -======= sd->focus_chain = eina_list_append(sd->focus_chain, child); else sd->focus_chain = eina_list_append_relative(sd->focus_chain, child, relative_child); ->>>>>>> remotes/origin/upstream } /** @@ -1675,32 +1600,17 @@ elm_widget_focus_custom_chain_prepend(Evas_Object *obj, { API_ENTRY return; EINA_SAFETY_ON_NULL_RETURN(child); -<<<<<<< HEAD - if (!sd->focus_next_func) - return; -======= if (!sd->focus_next_func) return; ->>>>>>> remotes/origin/upstream evas_object_event_callback_del_full(child, EVAS_CALLBACK_DEL, _elm_object_focus_chain_del_cb, sd); if (!relative_child) -<<<<<<< HEAD - { - sd->focus_chain = eina_list_prepend(sd->focus_chain, child); - return; - } - - sd->focus_chain = eina_list_prepend_relative(sd->focus_chain, child, relative_child); - return; -======= sd->focus_chain = eina_list_prepend(sd->focus_chain, child); else sd->focus_chain = eina_list_prepend_relative(sd->focus_chain, child, relative_child); ->>>>>>> remotes/origin/upstream } /** @@ -1743,14 +1653,10 @@ elm_widget_focus_cycle(Evas_Object *obj, * * @ingroup Widget */ -<<<<<<< HEAD -EAPI void -======= //FIXME: If x, y indicates the elements of the directional vector, //It would be better if these values are the normalized value(float x, float y) //or degree. EINA_DEPRECATED EAPI void ->>>>>>> remotes/origin/upstream elm_widget_focus_direction_go(Evas_Object *obj __UNUSED__, int x __UNUSED__, int y __UNUSED__) @@ -1976,12 +1882,6 @@ elm_widget_signal_callback_del(Evas_Object *obj, eina_stringshare_del(esd->source); data = esd->data; free(esd); -<<<<<<< HEAD - break; - } - } - sd->callback_del_func(obj, emission, source, _edje_signal_callback, esd); -======= sd->callback_del_func (obj, emission, source, _edje_signal_callback, esd); @@ -1989,7 +1889,6 @@ elm_widget_signal_callback_del(Evas_Object *obj, } } ->>>>>>> remotes/origin/upstream return data; } @@ -2228,20 +2127,12 @@ elm_widget_show_region_set(Evas_Object *obj, Evas_Object *parent_obj, *child_obj; Evas_Coord px, py, cx, cy; -<<<<<<< HEAD - evas_smart_objects_calculate(evas_object_evas_get(obj)); - - API_ENTRY return; - if (!forceshow && (x == sd->rx) && (y == sd->ry) - && (w == sd->rw) && (h == sd->rh)) return; -======= API_ENTRY return; evas_smart_objects_calculate(evas_object_evas_get(obj)); if (!forceshow && (x == sd->rx) && (y == sd->ry) && (w == sd->rw) && (h == sd->rh)) return; ->>>>>>> remotes/origin/upstream sd->rx = x; sd->ry = y; sd->rw = w; @@ -2586,11 +2477,7 @@ elm_widget_access_info_set(Evas_Object *obj, const char *txt) } EAPI const char * -<<<<<<< HEAD -elm_widget_access_info_get(Evas_Object *obj) -======= elm_widget_access_info_get(const Evas_Object *obj) ->>>>>>> remotes/origin/upstream { API_ENTRY return NULL; return sd->access_info; @@ -2610,16 +2497,6 @@ elm_widget_theme_get(const Evas_Object *obj) return sd->theme; } -<<<<<<< HEAD -EAPI void -elm_widget_style_set(Evas_Object *obj, - const char *style) -{ - API_ENTRY return; - - if (eina_stringshare_replace(&sd->style, style)) - elm_widget_theme(obj); -======= EAPI Eina_Bool elm_widget_style_set(Evas_Object *obj, const char *style) @@ -2630,7 +2507,6 @@ elm_widget_style_set(Evas_Object *obj, return elm_widget_theme(obj); return EINA_TRUE; ->>>>>>> remotes/origin/upstream } EAPI const char * @@ -2883,11 +2759,8 @@ elm_widget_stringlist_free(Eina_List *list) EAPI void elm_widget_focus_hide_handle(Evas_Object *obj) { -<<<<<<< HEAD -======= if (!_elm_widget_is(obj)) return; ->>>>>>> remotes/origin/upstream _if_focused_revert(obj, EINA_TRUE); } @@ -2911,11 +2784,8 @@ elm_widget_focus_tree_unfocusable_handle(Evas_Object *obj) { API_ENTRY return; -<<<<<<< HEAD -======= //FIXME: Need to check whether the object is unfocusable or not. ->>>>>>> remotes/origin/upstream if (!elm_widget_parent_get(obj)) elm_widget_focused_object_clear(obj); else @@ -2930,8 +2800,6 @@ elm_widget_focus_disabled_handle(Evas_Object *obj) elm_widget_focus_tree_unfocusable_handle(obj); } -<<<<<<< HEAD -======= EAPI unsigned int elm_widget_focus_order_get(const Evas_Object *obj) { @@ -2939,7 +2807,6 @@ elm_widget_focus_order_get(const Evas_Object *obj) return sd->focus_order; } ->>>>>>> remotes/origin/upstream /** * @internal * @@ -2979,12 +2846,6 @@ _elm_widget_item_new(Evas_Object *widget, return item; } -<<<<<<< HEAD -void -_elm_widget_item_free(Elm_Widget_Item *item) -{ - ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); -======= EAPI void _elm_widget_item_free(Elm_Widget_Item *item) { @@ -2998,7 +2859,6 @@ _elm_widget_item_free(Elm_Widget_Item *item) } EINA_LIST_FREE(item->callbacks, cb) free(cb); ->>>>>>> remotes/origin/upstream if (item->del_func) item->del_func((void *)item->data, item->widget, item); @@ -3045,17 +2905,11 @@ _elm_widget_item_del(Elm_Widget_Item *item) //Widget item delete callback if (item->del_pre_func) { -<<<<<<< HEAD - if (item->del_pre_func((Elm_Object_Item *) item)) - _elm_widget_item_free(item); - } -======= if (item->del_pre_func((Elm_Object_Item *)item)) _elm_widget_item_free(item); } else _elm_widget_item_free(item); ->>>>>>> remotes/origin/upstream } /** @@ -3063,12 +2917,6 @@ _elm_widget_item_del(Elm_Widget_Item *item) * * Set the function to notify to widgets when item is being deleted by user. * -<<<<<<< HEAD - * This function will complain if there was a callback set already, - * however it will set the new one. - * -======= ->>>>>>> remotes/origin/upstream * @param item a valid #Elm_Widget_Item to be notified * @see elm_widget_item_del_pre_hook_set() convenience macro. * @ingroup Widget @@ -3077,11 +2925,6 @@ EAPI void _elm_widget_item_del_pre_hook_set(Elm_Widget_Item *item, Elm_Widget_Del_Pre_Cb func) { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); -<<<<<<< HEAD - if ((item->del_pre_func) && (item->del_pre_func != func)) - WRN("You're replacing a previously set del_pre_cb %p of item %p with %p", item->del_pre_func, item, func); -======= ->>>>>>> remotes/origin/upstream item->del_pre_func = func; } @@ -3523,11 +3366,7 @@ _elm_widget_item_cursor_engine_only_set(Elm_Widget_Item *item, Eina_Bool engine_only) { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); -<<<<<<< HEAD - elm_object_cursor_engine_only_set(item->view, engine_only); -======= elm_object_cursor_theme_search_enabled_set(item->view, engine_only); ->>>>>>> remotes/origin/upstream } /** @@ -3546,11 +3385,7 @@ EAPI Eina_Bool _elm_widget_item_cursor_engine_only_get(const Elm_Widget_Item *item) { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, EINA_FALSE); -<<<<<<< HEAD - return elm_object_cursor_engine_only_get(item->view); -======= return elm_object_cursor_theme_search_enabled_get(item->view); ->>>>>>> remotes/origin/upstream } // smart object funcs @@ -3576,11 +3411,7 @@ _elm_widget_item_content_part_set(Elm_Widget_Item *item, { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); if (!item->content_set_func) return; -<<<<<<< HEAD - item->content_set_func((Elm_Object_Item *) item, part, content); -======= item->content_set_func((Elm_Object_Item *)item, part, content); ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * @@ -3589,11 +3420,7 @@ _elm_widget_item_content_part_get(const Elm_Widget_Item *item, { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL); if (!item->content_get_func) return NULL; -<<<<<<< HEAD - return item->content_get_func((Elm_Object_Item *) item, part); -======= return item->content_get_func((Elm_Object_Item *)item, part); ->>>>>>> remotes/origin/upstream } EAPI Evas_Object * @@ -3602,11 +3429,7 @@ _elm_widget_item_content_part_unset(Elm_Widget_Item *item, { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL); if (!item->content_unset_func) return NULL; -<<<<<<< HEAD - return item->content_unset_func((Elm_Object_Item *) item, part); -======= return item->content_unset_func((Elm_Object_Item *)item, part); ->>>>>>> remotes/origin/upstream } EAPI void @@ -3616,11 +3439,7 @@ _elm_widget_item_text_part_set(Elm_Widget_Item *item, { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); if (!item->text_set_func) return; -<<<<<<< HEAD - item->text_set_func((Elm_Object_Item *) item, part, label); -======= item->text_set_func((Elm_Object_Item *)item, part, label); ->>>>>>> remotes/origin/upstream } EAPI void @@ -3630,11 +3449,7 @@ _elm_widget_item_signal_emit(Elm_Widget_Item *item, { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item); if (item->signal_emit_func) -<<<<<<< HEAD - item->signal_emit_func((Elm_Object_Item *) item, emission, source); -======= item->signal_emit_func((Elm_Object_Item *)item, emission, source); ->>>>>>> remotes/origin/upstream } EAPI const char * @@ -3643,11 +3458,7 @@ _elm_widget_item_text_part_get(const Elm_Widget_Item *item, { ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL); if (!item->text_get_func) return NULL; -<<<<<<< HEAD - return item->text_get_func((Elm_Object_Item *) item, part); -======= return item->text_get_func((Elm_Object_Item *)item, part); ->>>>>>> remotes/origin/upstream } EAPI void @@ -3707,8 +3518,6 @@ _elm_widget_item_access_info_set(Elm_Widget_Item *item, const char *txt) else item->access_info = eina_stringshare_add(txt); } -<<<<<<< HEAD -======= EAPI void elm_widget_item_smart_callback_add(Elm_Widget_Item *item, const char *event, Elm_Object_Item_Smart_Cb func, const void *data) { @@ -3789,7 +3598,6 @@ _elm_widget_item_smart_callback_call(Elm_Widget_Item *item, const char *event, v if (item->delete_me && !item->walking) elm_widget_item_free(item); } ->>>>>>> remotes/origin/upstream static void _smart_add(Evas_Object *obj) @@ -3800,15 +3608,9 @@ _smart_add(Evas_Object *obj) if (!sd) return; sd->obj = obj; sd->x = sd->y = sd->w = sd->h = 0; -<<<<<<< HEAD - sd->can_focus = 1; - sd->mirrored_auto_mode = EINA_TRUE; /* will follow system locale settings */ - evas_object_smart_data_set(obj, sd); -======= sd->mirrored_auto_mode = EINA_TRUE; /* will follow system locale settings */ evas_object_smart_data_set(obj, sd); elm_widget_can_focus_set(obj, EINA_TRUE); ->>>>>>> remotes/origin/upstream } static Evas_Object * @@ -4159,11 +3961,8 @@ EAPI void elm_widget_tree_dump(const Evas_Object *top) { #ifdef ELM_DEBUG -<<<<<<< HEAD -======= if (!_elm_widget_is(top)) return; ->>>>>>> remotes/origin/upstream _sub_obj_tree_dump(top, 0); #else return; diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index ea103a9..822162e 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -18,32 +18,20 @@ struct _Elm_Win Elm_Win_Type type; Elm_Win_Keyboard_Mode kbdmode; -<<<<<<< HEAD -======= Elm_Win_Indicator_Mode indmode; Elm_Win_Indicator_Opacity_Mode ind_o_mode; ->>>>>>> remotes/origin/upstream struct { const char *info; Ecore_Timer *timer; int repeat_count; int shot_counter; } shot; -<<<<<<< HEAD - Eina_Bool autodel : 1; - Eina_Bool constrain : 1; - Eina_Bool resizing : 1; -======= ->>>>>>> remotes/origin/upstream int resize_location; int *autodel_clear, rot; int show_count; struct { int x, y; } screen; -<<<<<<< HEAD - -======= struct { Ecore_Evas *ee; @@ -51,7 +39,6 @@ struct _Elm_Win Evas_Object *obj, *hot_obj; int hot_x, hot_y; } pointer; ->>>>>>> remotes/origin/upstream struct { Evas_Object *top; @@ -69,8 +56,6 @@ struct _Elm_Win Eina_Bool top_animate : 1; Eina_Bool geometry_changed : 1; } focus_highlight; -<<<<<<< HEAD -======= Evas_Object *icon; const char *title; @@ -90,7 +75,6 @@ struct _Elm_Win Eina_Bool fullscreen : 1; Eina_Bool maximized : 1; Eina_Bool skip_focus : 1; ->>>>>>> remotes/origin/upstream }; static const char *widtype = NULL; @@ -124,18 +108,13 @@ static void _elm_win_frame_cb_minimize(void *data, Evas_Object *obj __UNUSED__, static void _elm_win_frame_cb_maximize(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__); static void _elm_win_frame_cb_close(void *data, Evas_Object *obj __UNUSED__, const char *sig __UNUSED__, const char *source __UNUSED__); -<<<<<<< HEAD -======= //static void _elm_win_pointer_add(Elm_Win *win, const char *style); ->>>>>>> remotes/origin/upstream static const char SIG_DELETE_REQUEST[] = "delete,request"; static const char SIG_FOCUS_OUT[] = "focus,out"; static const char SIG_FOCUS_IN[] = "focus,in"; static const char SIG_MOVED[] = "moved"; static const char SIG_THEME_CHANGED[] = "theme,changed"; -<<<<<<< HEAD -======= static const char SIG_WITHDRAWN[] = "withdrawn"; static const char SIG_ICONIFIED[] = "iconified"; static const char SIG_NORMAL[] = "normal"; @@ -145,15 +124,12 @@ static const char SIG_FULLSCREEN[] = "fullscreen"; static const char SIG_UNFULLSCREEN[] = "unfullscreen"; static const char SIG_MAXIMIZED[] = "maximized"; static const char SIG_UNMAXIMIZED[] = "unmaximized"; ->>>>>>> remotes/origin/upstream static const Evas_Smart_Cb_Description _signals[] = { {SIG_DELETE_REQUEST, ""}, {SIG_FOCUS_OUT, ""}, {SIG_FOCUS_IN, ""}, {SIG_MOVED, ""}, -<<<<<<< HEAD -======= {SIG_WITHDRAWN, ""}, {SIG_ICONIFIED, ""}, {SIG_NORMAL, ""}, @@ -163,7 +139,6 @@ static const Evas_Smart_Cb_Description _signals[] = { {SIG_UNFULLSCREEN, ""}, {SIG_MAXIMIZED, ""}, {SIG_UNMAXIMIZED, ""}, ->>>>>>> remotes/origin/upstream {NULL, NULL} }; @@ -398,11 +373,7 @@ _elm_win_focus_in(Ecore_Evas *ee) win = elm_widget_data_get(obj); if (!win) return; _elm_widget_top_win_focused_set(win->win_obj, EINA_TRUE); -<<<<<<< HEAD - if (win->show_count == 1) -======= if (!elm_widget_focus_order_get(obj)) ->>>>>>> remotes/origin/upstream { elm_widget_focus_steal(win->win_obj); win->show_count++; @@ -446,8 +417,6 @@ _elm_win_focus_out(Ecore_Evas *ee) } } -<<<<<<< HEAD -======= static void _elm_win_state_change(Ecore_Evas *ee) { @@ -520,7 +489,6 @@ _elm_win_state_change(Ecore_Evas *ee) } } ->>>>>>> remotes/origin/upstream static Eina_Bool _elm_win_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next) { @@ -633,14 +601,11 @@ _elm_win_obj_callback_hide(void *data, Evas *e __UNUSED__, Evas_Object *obj __UN { evas_object_hide(win->img_obj); } -<<<<<<< HEAD -======= if (win->pointer.obj) { evas_object_hide(win->pointer.obj); ecore_evas_hide(win->pointer.ee); } ->>>>>>> remotes/origin/upstream } static void @@ -707,14 +672,11 @@ _elm_win_obj_callback_del(void *data, Evas *e, Evas_Object *obj, void *event_inf _elm_win_focus_highlight_shutdown(win); eina_stringshare_del(win->focus_highlight.style); -<<<<<<< HEAD -======= if (win->title) eina_stringshare_del(win->title); if (win->icon_name) eina_stringshare_del(win->icon_name); if (win->role) eina_stringshare_del(win->role); if (win->icon) evas_object_del(win->icon); ->>>>>>> remotes/origin/upstream free(win); if ((!_elm_win_list) && @@ -781,15 +743,12 @@ _elm_win_obj_intercept_show(void *data, Evas_Object *obj) { evas_object_show(win->img_obj); } -<<<<<<< HEAD -======= if (win->pointer.obj) { ecore_evas_show(win->pointer.ee); evas_object_show(win->pointer.obj); /* ecore_evas_wayland_pointer_set(win->pointer.ee, 10, 10); */ } ->>>>>>> remotes/origin/upstream evas_object_show(obj); } @@ -909,11 +868,7 @@ _elm_win_xwindow_get(Elm_Win *win) { win->xwin = 0; -<<<<<<< HEAD -#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name)) -======= #define ENGINE_COMPARE(name) (!strcmp(_elm_preferred_engine, name)) ->>>>>>> remotes/origin/upstream if (ENGINE_COMPARE(ELM_SOFTWARE_X11)) { if (win->ee) win->xwin = ecore_evas_software_x11_window_get(win->ee); @@ -957,11 +912,8 @@ _elm_win_xwindow_get(Elm_Win *win) static void _elm_win_xwin_update(Elm_Win *win) { -<<<<<<< HEAD -======= const char *s; ->>>>>>> remotes/origin/upstream _elm_win_xwindow_get(win); if (win->parent) { @@ -977,8 +929,6 @@ _elm_win_xwin_update(Elm_Win *win) if (!win->xwin) return; /* nothing more to do */ -<<<<<<< HEAD -======= s = win->title; if (!s) s = _elm_appname; if (!s) s = ""; @@ -1033,7 +983,6 @@ _elm_win_xwin_update(Elm_Win *win) } } ->>>>>>> remotes/origin/upstream switch (win->type) { case ELM_WIN_BASIC: @@ -1083,15 +1032,12 @@ _elm_win_xwin_update(Elm_Win *win) } ecore_x_e_virtual_keyboard_state_set (win->xwin, (Ecore_X_Virtual_Keyboard_State)win->kbdmode); -<<<<<<< HEAD -======= if (win->indmode == ELM_WIN_INDICATOR_SHOW) ecore_x_e_illume_indicator_state_set (win->xwin, ECORE_X_ILLUME_INDICATOR_STATE_ON); else if (win->indmode == ELM_WIN_INDICATOR_HIDE) ecore_x_e_illume_indicator_state_set (win->xwin, ECORE_X_ILLUME_INDICATOR_STATE_OFF); ->>>>>>> remotes/origin/upstream } #endif @@ -1628,10 +1574,6 @@ _elm_win_frame_cb_resize_start(void *data, Evas_Object *obj __UNUSED__, const ch else win->resize_location = 0; -<<<<<<< HEAD - /* FIXME: Change to more generic wayland resize function */ -======= ->>>>>>> remotes/origin/upstream if (win->resize_location > 0) ecore_evas_wayland_resize(win->ee, win->resize_location); } @@ -1642,10 +1584,7 @@ _elm_win_frame_cb_minimize(void *data, Evas_Object *obj __UNUSED__, const char * Elm_Win *win; if (!(win = data)) return; -<<<<<<< HEAD -======= win->iconified = EINA_TRUE; ->>>>>>> remotes/origin/upstream ecore_evas_iconified_set(win->ee, EINA_TRUE); } @@ -1655,13 +1594,9 @@ _elm_win_frame_cb_maximize(void *data, Evas_Object *obj __UNUSED__, const char * Elm_Win *win; if (!(win = data)) return; -<<<<<<< HEAD - ecore_evas_maximized_set(win->ee, EINA_TRUE); -======= if (win->maximized) win->maximized = EINA_FALSE; else win->maximized = EINA_TRUE; ecore_evas_maximized_set(win->ee, win->maximized); ->>>>>>> remotes/origin/upstream } static void @@ -1673,8 +1608,6 @@ _elm_win_frame_cb_close(void *data, Evas_Object *obj __UNUSED__, const char *sig evas_object_del(win->win_obj); } -<<<<<<< HEAD -======= /* static void _elm_win_pointer_add(Elm_Win *win, const char *style) @@ -1697,7 +1630,6 @@ _elm_win_pointer_add(Elm_Win *win, const char *style) } */ ->>>>>>> remotes/origin/upstream #ifdef ELM_DEBUG static void _debug_key_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj, void *event_info) @@ -1790,8 +1722,6 @@ _subobj_del(Elm_Win *win, Evas_Object *obj, Evas_Object *subobj) _elm_win_eval_subobjs(obj); } -<<<<<<< HEAD -======= static void _elm_win_obj_icon_callback_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__) { @@ -1799,7 +1729,6 @@ _elm_win_obj_icon_callback_del(void *data, Evas *e __UNUSED__, Evas_Object *obj, if (win->icon == obj) win->icon = NULL; } ->>>>>>> remotes/origin/upstream EAPI Evas_Object * elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) { @@ -1815,12 +1744,6 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) CRITICAL(engine " engine creation failed. Trying default."); \ win->ee = ecore_evas_new(NULL, 0, 0, 1, 1, NULL); \ if (win->ee) \ -<<<<<<< HEAD - elm_engine_set(ecore_evas_engine_name_get(win->ee)); \ - } while (0) -#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name)) - -======= elm_config_preferred_engine_set(ecore_evas_engine_name_get(win->ee)); \ } while (0) #define ENGINE_COMPARE(name) (_elm_preferred_engine && !strcmp(_elm_preferred_engine, name)) @@ -1828,7 +1751,6 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) win->kbdmode = ELM_WIN_KEYBOARD_UNKNOWN; win->indmode = ELM_WIN_INDICATOR_UNKNOWN; ->>>>>>> remotes/origin/upstream switch (type) { case ELM_WIN_INLINED_IMAGE: @@ -1973,31 +1895,14 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) else if (ENGINE_COMPARE(ELM_WAYLAND_SHM)) { win->ee = ecore_evas_wayland_shm_new(NULL, 0, 0, 0, 1, 1, 0); -<<<<<<< HEAD - win->evas = ecore_evas_get(win->ee); - - _elm_win_frame_add(win, "default"); -======= win->evas = ecore_evas_get(win->ee); _elm_win_frame_add(win, "default"); // _elm_win_pointer_add(win, "default"); ->>>>>>> remotes/origin/upstream } else if (ENGINE_COMPARE(ELM_WAYLAND_EGL)) { win->ee = ecore_evas_wayland_egl_new(NULL, 0, 0, 0, 1, 1, 0); -<<<<<<< HEAD - win->evas = ecore_evas_get(win->ee); - - _elm_win_frame_add(win, "default"); - } - else if (!strncmp(_elm_config->engine, "shot:", 5)) - { - win->ee = ecore_evas_buffer_new(1, 1); - ecore_evas_manual_render_set(win->ee, EINA_TRUE); - win->shot.info = eina_stringshare_add(_elm_config->engine + 5); -======= win->evas = ecore_evas_get(win->ee); _elm_win_frame_add(win, "default"); @@ -2008,7 +1913,6 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) win->ee = ecore_evas_buffer_new(1, 1); ecore_evas_manual_render_set(win->ee, EINA_TRUE); win->shot.info = eina_stringshare_add(_elm_preferred_engine + 5); ->>>>>>> remotes/origin/upstream _shot_init(win); } #undef FALLBACK_TRY @@ -2054,11 +1958,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) if (win->frame_obj) { -<<<<<<< HEAD -// evas_object_clip_set(win->win_obj, win->frame_obj); -======= evas_object_clip_set(win->win_obj, win->frame_obj); ->>>>>>> remotes/origin/upstream evas_object_stack_below(win->frame_obj, win->win_obj); } @@ -2092,10 +1992,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type) ecore_evas_callback_focus_in_set(win->ee, _elm_win_focus_in); ecore_evas_callback_focus_out_set(win->ee, _elm_win_focus_out); ecore_evas_callback_move_set(win->ee, _elm_win_move); -<<<<<<< HEAD -======= ecore_evas_callback_state_change_set(win->ee, _elm_win_state_change); ->>>>>>> remotes/origin/upstream evas_image_cache_set(win->evas, (_elm_config->image_cache * 1024)); evas_font_cache_set(win->evas, (_elm_config->font_cache * 1024)); EINA_LIST_FOREACH(_elm_config->font_dirs, l, fontpath) @@ -2203,18 +2100,11 @@ elm_win_title_set(Evas_Object *obj, const char *title) Elm_Win *win; ELM_CHECK_WIDTYPE(obj, widtype); win = elm_widget_data_get(obj); -<<<<<<< HEAD - if (!win) return; - ecore_evas_title_set(win->ee, title); - if (win->frame_obj) - edje_object_part_text_set(win->frame_obj, "elm.text.title", title); -======= if (!win || !title) return; eina_stringshare_replace(&(win->title), title); ecore_evas_title_set(win->ee, win->title); if (win->frame_obj) edje_object_part_text_set(win->frame_obj, "elm.text.title", win->title); ->>>>>>> remotes/origin/upstream } EAPI const char * @@ -2224,9 +2114,6 @@ elm_win_title_get(const Evas_Object *obj) ELM_CHECK_WIDTYPE(obj, widtype) NULL; win = elm_widget_data_get(obj); if (!win) return NULL; -<<<<<<< HEAD - return ecore_evas_title_get(win->ee); -======= return win->title; } @@ -2303,7 +2190,6 @@ elm_win_icon_object_get(const Evas_Object *obj) win = elm_widget_data_get(obj); if (!win) return NULL; return win->icon; ->>>>>>> remotes/origin/upstream } EAPI void @@ -2477,11 +2363,7 @@ elm_win_alpha_get(const Evas_Object *obj) return ecore_evas_alpha_get(win->ee); } -<<<<<<< HEAD -EAPI void -======= EINA_DEPRECATED EAPI void ->>>>>>> remotes/origin/upstream elm_win_transparent_set(Evas_Object *obj, Eina_Bool transparent) { Elm_Win *win; @@ -2510,11 +2392,7 @@ elm_win_transparent_set(Evas_Object *obj, Eina_Bool transparent) } } -<<<<<<< HEAD -EAPI Eina_Bool -======= EINA_DEPRECATED EAPI Eina_Bool ->>>>>>> remotes/origin/upstream elm_win_transparent_get(const Evas_Object *obj) { Elm_Win *win; @@ -2555,14 +2433,8 @@ elm_win_fullscreen_set(Evas_Object *obj, Eina_Bool fullscreen) ELM_CHECK_WIDTYPE(obj, widtype); win = elm_widget_data_get(obj); if (!win) return; -<<<<<<< HEAD - - // YYY: handle if win->img_obj -#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name)) -======= // YYY: handle if win->img_obj #define ENGINE_COMPARE(name) (!strcmp(_elm_preferred_engine, name)) ->>>>>>> remotes/origin/upstream if (ENGINE_COMPARE(ELM_SOFTWARE_FB) || ENGINE_COMPARE(ELM_SOFTWARE_16_WINCE)) { @@ -2571,10 +2443,7 @@ elm_win_fullscreen_set(Evas_Object *obj, Eina_Bool fullscreen) } else { -<<<<<<< HEAD -======= win->fullscreen = fullscreen; ->>>>>>> remotes/origin/upstream ecore_evas_fullscreen_set(win->ee, fullscreen); #ifdef HAVE_ELEMENTARY_X _elm_win_xwin_update(win); @@ -2590,12 +2459,7 @@ elm_win_fullscreen_get(const Evas_Object *obj) ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; win = elm_widget_data_get(obj); if (!win) return EINA_FALSE; -<<<<<<< HEAD - -#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name)) -======= #define ENGINE_COMPARE(name) (!strcmp(_elm_preferred_engine, name)) ->>>>>>> remotes/origin/upstream if (ENGINE_COMPARE(ELM_SOFTWARE_FB) || ENGINE_COMPARE(ELM_SOFTWARE_16_WINCE)) { @@ -2604,11 +2468,7 @@ elm_win_fullscreen_get(const Evas_Object *obj) } else { -<<<<<<< HEAD - return ecore_evas_fullscreen_get(win->ee); -======= return win->fullscreen; ->>>>>>> remotes/origin/upstream } #undef ENGINE_COMPARE } @@ -2620,10 +2480,7 @@ elm_win_maximized_set(Evas_Object *obj, Eina_Bool maximized) ELM_CHECK_WIDTYPE(obj, widtype); win = elm_widget_data_get(obj); if (!win) return; -<<<<<<< HEAD -======= win->maximized = maximized; ->>>>>>> remotes/origin/upstream // YYY: handle if win->img_obj ecore_evas_maximized_set(win->ee, maximized); #ifdef HAVE_ELEMENTARY_X @@ -2638,11 +2495,7 @@ elm_win_maximized_get(const Evas_Object *obj) ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; win = elm_widget_data_get(obj); if (!win) return EINA_FALSE; -<<<<<<< HEAD - return ecore_evas_maximized_get(win->ee); -======= return win->maximized; ->>>>>>> remotes/origin/upstream } EAPI void @@ -2652,10 +2505,7 @@ elm_win_iconified_set(Evas_Object *obj, Eina_Bool iconified) ELM_CHECK_WIDTYPE(obj, widtype); win = elm_widget_data_get(obj); if (!win) return; -<<<<<<< HEAD -======= win->iconified = iconified; ->>>>>>> remotes/origin/upstream ecore_evas_iconified_set(win->ee, iconified); #ifdef HAVE_ELEMENTARY_X _elm_win_xwin_update(win); @@ -2669,9 +2519,6 @@ elm_win_iconified_get(const Evas_Object *obj) ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; win = elm_widget_data_get(obj); if (!win) return EINA_FALSE; -<<<<<<< HEAD - return ecore_evas_iconified_get(win->ee); -======= return win->iconified; } @@ -2793,7 +2640,6 @@ elm_win_aspect_get(const Evas_Object *obj) win = elm_widget_data_get(obj); if (!win) return EINA_FALSE; return win->aspect; ->>>>>>> remotes/origin/upstream } EAPI void @@ -2872,10 +2718,7 @@ elm_win_sticky_set(Evas_Object *obj, Eina_Bool sticky) ELM_CHECK_WIDTYPE(obj, widtype); win = elm_widget_data_get(obj); if (!win) return; -<<<<<<< HEAD -======= win->sticky = sticky; ->>>>>>> remotes/origin/upstream ecore_evas_sticky_set(win->ee, sticky); #ifdef HAVE_ELEMENTARY_X _elm_win_xwin_update(win); @@ -2889,11 +2732,7 @@ elm_win_sticky_get(const Evas_Object *obj) ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE; win = elm_widget_data_get(obj); if (!win) return EINA_FALSE; -<<<<<<< HEAD - return ecore_evas_sticky_get(win->ee); -======= return win->sticky; ->>>>>>> remotes/origin/upstream } EAPI void @@ -2957,8 +2796,6 @@ elm_win_keyboard_win_get(const Evas_Object *obj) } EAPI void -<<<<<<< HEAD -======= elm_win_indicator_mode_set(Evas_Object *obj, Elm_Win_Indicator_Mode mode) { Elm_Win *win; @@ -3031,7 +2868,6 @@ elm_win_indicator_opacity_get(const Evas_Object *obj) } EAPI void ->>>>>>> remotes/origin/upstream elm_win_screen_position_get(const Evas_Object *obj, int *x, int *y) { Elm_Win *win; @@ -3255,28 +3091,8 @@ elm_win_prop_focus_skip_set(Evas_Object *obj, Eina_Bool skip) ELM_CHECK_WIDTYPE(obj, widtype); win = elm_widget_data_get(obj); if (!win) return; -<<<<<<< HEAD -#ifdef HAVE_ELEMENTARY_X - _elm_win_xwindow_get(win); - if (skip) - { - if (win->xwin) - { - Ecore_X_Window_State states[2]; - - ecore_x_icccm_hints_set(win->xwin, 0, 0, 0, 0, 0, 0, 0); - states[0] = ECORE_X_WINDOW_STATE_SKIP_TASKBAR; - states[1] = ECORE_X_WINDOW_STATE_SKIP_PAGER; - ecore_x_netwm_window_state_set(win->xwin, states, 2); - } - } -#else - (void) skip; -#endif -======= win->skip_focus = skip; ecore_evas_focus_skip_set(win->ee, skip); ->>>>>>> remotes/origin/upstream } EAPI void @@ -3378,55 +3194,6 @@ elm_win_focus_highlight_style_get(const Evas_Object *obj) return win->focus_highlight.style; } -<<<<<<< HEAD -EAPI void -elm_win_indicator_state_set(Evas_Object *obj, int show_state) -{ - Elm_Win *win; - if (strcmp(elm_widget_type_get(obj), "win")) return; - win = elm_widget_data_get(obj); - if (!win) return; -#ifdef HAVE_ELEMENTARY_X - _elm_win_xwindow_get(win); - if (win->xwin) - return ecore_x_window_prop_property_set (win->xwin, - ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE, ECORE_X_ATOM_CARDINAL, 32, &show_state, 1); -#endif - return; -} - -EAPI int -elm_win_indicator_state_get(Evas_Object *obj) -{ - Elm_Win *win; - if (strcmp(elm_widget_type_get(obj), "win")) return -1; - win = elm_widget_data_get(obj); - if (!win) return -1; -#ifdef HAVE_ELEMENTARY_X - _elm_win_xwindow_get(win); - if (win->xwin) - { - int ret; - int count; - int show = -1; - unsigned int *prop_data = NULL; - - ret = ecore_x_window_prop_property_get (win->xwin, - ECORE_X_ATOM_E_ILLUME_INDICATOR_STATE, ECORE_X_ATOM_CARDINAL, 32, (void *)&prop_data, &count); - if( ret && prop_data ) - memcpy (&show, prop_data, sizeof (int)); - - if (prop_data) free (prop_data); - - return show; - } -#endif - return -1; -} - - -======= ->>>>>>> remotes/origin/upstream typedef struct _Widget_Data Widget_Data; struct _Widget_Data @@ -3484,8 +3251,6 @@ _elm_inwin_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas } static void -<<<<<<< HEAD -======= _elm_inwin_text_set_hook(Evas_Object *obj, const char *item, const char *text) { Widget_Data *wd = elm_widget_data_get(obj); @@ -3505,7 +3270,6 @@ _elm_inwin_text_get_hook(const Evas_Object *obj, const char *item) } static void ->>>>>>> remotes/origin/upstream _sizing_eval(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); @@ -3560,11 +3324,8 @@ elm_win_inwin_add(Evas_Object *obj) elm_widget_del_hook_set(obj2, _del_hook); elm_widget_theme_hook_set(obj2, _theme_hook); elm_widget_focus_next_hook_set(obj2, _elm_inwin_focus_next_hook); -<<<<<<< HEAD -======= elm_widget_text_set_hook_set(obj2, _elm_inwin_text_set_hook); elm_widget_text_get_hook_set(obj2, _elm_inwin_text_get_hook); ->>>>>>> remotes/origin/upstream elm_widget_can_focus_set(obj2, EINA_TRUE); elm_widget_highlight_ignore_set(obj2, EINA_TRUE); diff --git a/src/lib/elm_win.h b/src/lib/elm_win.h index b54ec90..e79c6a4 100644 --- a/src/lib/elm_win.h +++ b/src/lib/elm_win.h @@ -52,11 +52,7 @@ * window is shown before doing the virtual "in memory" rendering and then * save the output to the file specified by the file option (and then exit). * If no delay is given, the default is 0.5 seconds. If no file is given the -<<<<<<< HEAD - * default output file is "out.png". Repeat option is for continous -======= * default output file is "out.png". Repeat option is for continuous ->>>>>>> remotes/origin/upstream * capturing screenshots. Repeat range is from 1 to 999 and filename is * fixed to "out001.png" Some examples of using the shot engine: * @@ -73,8 +69,6 @@ * @li "focus,in": window got focus * @li "focus,out": window lost focus * @li "moved": window that holds the canvas was moved -<<<<<<< HEAD -======= * @li "withdrawn": window is still managed normally but removed from view * @li "iconified": window is minimized (perhaps into an icon or taskbar) * @li "normal": window is in a normal state (not withdrawn or iconified) @@ -84,7 +78,6 @@ * @li "unfullscreen": window has stopped being fullscreen * @li "maximized": window has been maximized * @li "unmaximized": window has stopped being maximized ->>>>>>> remotes/origin/upstream * * Examples: * @li @ref win_example_01 @@ -115,11 +108,7 @@ typedef enum similar. */ ELM_WIN_MENU, /**< Similar to #ELM_WIN_TOOLBAR. */ ELM_WIN_UTILITY, /**< A persistent utility window, like a toolbox or -<<<<<<< HEAD - pallete. */ -======= palette. */ ->>>>>>> remotes/origin/upstream ELM_WIN_SPLASH, /**< Splash window for a starting up application. */ ELM_WIN_DROPDOWN_MENU, /**< The window is a dropdown menu, as when an entry in a menubar is clicked. Typically used @@ -155,11 +144,7 @@ typedef enum Evas_Object. */ ELM_WIN_SOCKET_IMAGE,/**< The window is rendered onto an image buffer and can be shown other process's plug image object. -<<<<<<< HEAD - No actural window is created for this type, -======= No actual window is created for this type, ->>>>>>> remotes/origin/upstream instead the window and all of its contents will be rendered to an image buffer and can be shown other process's plug image object*/ @@ -171,10 +156,6 @@ typedef enum * When the application window is being managed by Illume, it may request * any of the following layouts for the virtual keyboard. */ -<<<<<<< HEAD -// XXX: remove this as it conflicts with input panel -======= ->>>>>>> remotes/origin/upstream typedef enum { ELM_WIN_KEYBOARD_UNKNOWN, /**< Unknown keyboard state */ @@ -185,11 +166,7 @@ typedef enum ELM_WIN_KEYBOARD_PIN, /**< PIN keyboard layout */ ELM_WIN_KEYBOARD_PHONE_NUMBER, /**< Phone keyboard layout */ ELM_WIN_KEYBOARD_HEX, /**< Hexadecimal numeric keyboard layout */ -<<<<<<< HEAD - ELM_WIN_KEYBOARD_TERMINAL, /**< Full (QUERTY) keyboard layout */ -======= ELM_WIN_KEYBOARD_TERMINAL, /**< Full (QWERTY) keyboard layout */ ->>>>>>> remotes/origin/upstream ELM_WIN_KEYBOARD_PASSWORD, /**< Password keyboard layout */ ELM_WIN_KEYBOARD_IP, /**< IP keyboard layout */ ELM_WIN_KEYBOARD_HOST, /**< Host keyboard layout */ @@ -200,8 +177,6 @@ typedef enum } Elm_Win_Keyboard_Mode; /** -<<<<<<< HEAD -======= * In some environments, like phones, you may have an indicator that * shows battery status, reception, time etc. This is the indicator. * @@ -230,7 +205,6 @@ typedef enum } Elm_Win_Indicator_Opacity_Mode; /** ->>>>>>> remotes/origin/upstream * Available commands that can be sent to the Illume manager. * * When running under an Illume session, a window may send commands to the @@ -241,11 +215,7 @@ typedef enum ELM_ILLUME_COMMAND_FOCUS_BACK, /**< Reverts focus to the previous window */ ELM_ILLUME_COMMAND_FOCUS_FORWARD, /**< Sends focus to the next window in the list */ ELM_ILLUME_COMMAND_FOCUS_HOME, /**< Hides all windows to show the Home screen */ -<<<<<<< HEAD - ELM_ILLUME_COMMAND_CLOSE /**< Closes the currently active window */ -======= ELM_ILLUME_COMMAND_CLOSE, /**< Closes the currently active window */ ->>>>>>> remotes/origin/upstream } Elm_Illume_Command; /** @@ -256,11 +226,7 @@ typedef enum * @param name The name of the window * @param type The window type, one of #Elm_Win_Type. * -<<<<<<< HEAD - * The @p parent paramter can be @c NULL for every window @p type except -======= * The @p parent parameter can be @c NULL for every window @p type except ->>>>>>> remotes/origin/upstream * #ELM_WIN_INLINED_IMAGE, which needs a parent to retrieve the canvas on * which the image object will be created. * @@ -348,8 +314,6 @@ EAPI void elm_win_title_set(Evas_Object *obj, const char *title EAPI const char *elm_win_title_get(const Evas_Object *obj); /** -<<<<<<< HEAD -======= * Set the icon name of the window * * @param obj The window object @@ -416,7 +380,6 @@ EAPI void elm_win_icon_object_set(Evas_Object *obj, Evas_Object EAPI const Evas_Object *elm_win_icon_object_get(const Evas_Object *obj); /** ->>>>>>> remotes/origin/upstream * Set the window's autodel state. * * When closing the window in any way outside of the program control, like @@ -491,11 +454,7 @@ EAPI void elm_win_raise(Evas_Object *obj); * Center a window on its screen * * This function centers window @p obj horizontally and/or vertically based on the values -<<<<<<< HEAD - * of @p h and @v. -======= * of @p h and @p v. ->>>>>>> remotes/origin/upstream * @param obj The window object * @param h If true, center horizontally. If false, do not change horizontal location. * @param v If true, center vertically. If false, do not change vertical location. @@ -527,11 +486,7 @@ EAPI Eina_Bool elm_win_borderless_get(const Evas_Object *obj); * Shaped windows, when supported, will render the parts of the window that * has no content, transparent. * -<<<<<<< HEAD - * If @p shaped is EINA_FALSE, then it is strongly adviced to have some -======= * If @p shaped is EINA_FALSE, then it is strongly advised to have some ->>>>>>> remotes/origin/upstream * background object or cover the entire window in any other way, or the * parts of the canvas that have no data will show framebuffer artifacts. * @@ -570,33 +525,6 @@ EAPI Eina_Bool elm_win_shaped_get(const Evas_Object *obj); EAPI void elm_win_alpha_set(Evas_Object *obj, Eina_Bool alpha); /** -<<<<<<< HEAD - * Get the transparency state of a window. - * - * @param obj The window object - * @return If true, the window is transparent - * - * @see elm_win_transparent_set() - */ -// XXX: deprecate this -EAPI Eina_Bool elm_win_transparent_get(const Evas_Object *obj); - -/** - * Set the transparency state of a window. - * - * Use elm_win_alpha_set() instead. - * - * @param obj The window object - * @param transparent If true, the window is transparent - * - * @see elm_win_alpha_set() - */ -// XXX: deprecate this -EAPI void elm_win_transparent_set(Evas_Object *obj, Eina_Bool transparent); - -/** -======= ->>>>>>> remotes/origin/upstream * Get the alpha channel state of a window. * * @param obj The window object @@ -681,8 +609,6 @@ EAPI void elm_win_iconified_set(Evas_Object *obj, Eina_Bool ico EAPI Eina_Bool elm_win_iconified_get(const Evas_Object *obj); /** -<<<<<<< HEAD -======= * Set the withdrawn state of a window. * * @param obj The window object @@ -764,7 +690,6 @@ EAPI void elm_win_aspect_set(Evas_Object *obj, double aspect); EAPI double elm_win_aspect_get(const Evas_Object *obj); /** ->>>>>>> remotes/origin/upstream * Set the layer of the window. * * What this means exactly will depend on the underlying engine used. @@ -1052,11 +977,7 @@ EAPI void elm_win_focus_highlight_style_set(Evas_Object *obj, c /** * Get the style set for the focus highlight object * -<<<<<<< HEAD - * Gets the style set for this windows highilght object, or NULL if none -======= * Gets the style set for this windows highlight object, or NULL if none ->>>>>>> remotes/origin/upstream * is set. * * @param obj The window to retrieve the highlights style from @@ -1064,24 +985,6 @@ EAPI void elm_win_focus_highlight_style_set(Evas_Object *obj, c * @return The style set or NULL if none was. Default is used in that case. */ EAPI const char *elm_win_focus_highlight_style_get(const Evas_Object *obj); -<<<<<<< HEAD -EAPI void elm_win_indicator_state_set(Evas_Object *obj, int show_state); -EAPI int elm_win_indicator_state_get(Evas_Object *obj); -/*... - * ecore_x_icccm_hints_set -> accepts_focus (add to ecore_evas) - * ecore_x_icccm_hints_set -> window_group (add to ecore_evas) - * ecore_x_icccm_size_pos_hints_set -> request_pos (add to ecore_evas) - * ecore_x_icccm_client_leader_set -> l (add to ecore_evas) - * ecore_x_icccm_window_role_set -> role (add to ecore_evas) - * ecore_x_icccm_transient_for_set -> forwin (add to ecore_evas) - * ecore_x_netwm_window_type_set -> type (add to ecore_evas) - * - * (add to ecore_x) set netwm argb icon! (add to ecore_evas) - * (blank mouse, private mouse obj, defaultmouse) - * - */ -======= ->>>>>>> remotes/origin/upstream /** * Sets the keyboard mode of the window. @@ -1116,8 +1019,6 @@ EAPI void elm_win_keyboard_win_set(Evas_Object *obj, Eina_Bool EAPI Eina_Bool elm_win_keyboard_win_get(const Evas_Object *obj); /** -<<<<<<< HEAD -======= * Sets the indicator mode of the window. * * @param obj The window object @@ -1150,7 +1051,6 @@ EAPI void elm_win_indicator_opacity_set(Evas_Object *obj, Elm_W EAPI Elm_Win_Indicator_Opacity_Mode elm_win_indicator_opacity_get(const Evas_Object *obj); /** ->>>>>>> remotes/origin/upstream * Get the screen position of a window. * * @param obj The window object @@ -1164,13 +1064,8 @@ EAPI void elm_win_screen_position_get(const Evas_Object *obj, i * * @param obj The window object * @param svcname The name of the service to be advertised. ensure that it is unique (when combined with @p svcnum) otherwise creation may fail. -<<<<<<< HEAD - * @param svcnum A number (any value, 0 beig the common default) to differentiate multiple instances of services with the same name. - * @param svcsys A boolean that if true, specifies to create a system-wide service all users can connect to, otherwise the service is private to the user ide that created the service. -======= * @param svcnum A number (any value, 0 being the common default) to differentiate multiple instances of services with the same name. * @param svcsys A boolean that if true, specifies to create a system-wide service all users can connect to, otherwise the service is private to the user id that created the service. ->>>>>>> remotes/origin/upstream * @return If socket creation is successful */ EAPI Eina_Bool elm_win_socket_listen(Evas_Object *obj, const char *svcname, int svcnum, Eina_Bool svcsys); @@ -1230,10 +1125,6 @@ EAPI Eina_Bool elm_win_socket_listen(Evas_Object *obj, const char *s * @param parent The parent object * @return The new object or NULL if it cannot be created */ -<<<<<<< HEAD -// XXX: deprecate this -======= ->>>>>>> remotes/origin/upstream EAPI Evas_Object *elm_win_inwin_add(Evas_Object *parent); /** @@ -1249,10 +1140,6 @@ EAPI Evas_Object *elm_win_inwin_add(Evas_Object *parent); * * @param obj The inwin to activate */ -<<<<<<< HEAD -// XXX: deprecate this -======= ->>>>>>> remotes/origin/upstream EAPI void elm_win_inwin_activate(Evas_Object *obj); /** @@ -1265,20 +1152,12 @@ EAPI void elm_win_inwin_activate(Evas_Object *obj); * @param obj The inwin object * @param content The object to set as content */ -<<<<<<< HEAD -// XXX: deprecate this -======= ->>>>>>> remotes/origin/upstream EAPI void elm_win_inwin_content_set(Evas_Object *obj, Evas_Object *content); /** * Get the content of an inwin object. * -<<<<<<< HEAD - * Return the content object which is set for this widget. -======= * Return the content object for this widget. ->>>>>>> remotes/origin/upstream * * The returned object is valid as long as the inwin is still alive and no * other content is set on it. Deleting the object will notify the inwin @@ -1290,10 +1169,6 @@ EAPI void elm_win_inwin_content_set(Evas_Object *obj, Evas_Object *conte * @param obj The inwin object * @return The content that is being used */ -<<<<<<< HEAD -// XXX: deprecate this -======= ->>>>>>> remotes/origin/upstream EAPI Evas_Object *elm_win_inwin_content_get(const Evas_Object *obj); /** @@ -1304,10 +1179,6 @@ EAPI Evas_Object *elm_win_inwin_content_get(const Evas_Object *obj); * @param obj The inwin object * @return The content that was being used */ -<<<<<<< HEAD -// XXX: deprecate this -======= ->>>>>>> remotes/origin/upstream EAPI Evas_Object *elm_win_inwin_content_unset(Evas_Object *obj); /** diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am index 46f3adb..fbbbae9 100644 --- a/src/modules/Makefile.am +++ b/src/modules/Makefile.am @@ -3,12 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = \ test_entry \ -<<<<<<< HEAD ctxpopup_copypasteUI \ test_map \ -access_output -======= -test_map \ access_output \ datetime_input_ctxpopup ->>>>>>> remotes/origin/upstream -- 2.7.4