From: Enlightenment S. <no-...@en...> - 2008-12-07 22:19:24
|
Log: char is used for numeric values... thus should be explicitly signed! Author: raster Date: 2008-12-07 13:57:11 -0800 (Sun, 07 Dec 2008) New Revision: 37991 Modified: trunk/e/src/bin/e_fm.c Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2008-12-07 20:40:17 UTC (rev 37990) +++ trunk/e/src/bin/e_fm.c 2008-12-07 21:57:11 UTC (rev 37991) @@ -76,8 +76,8 @@ unsigned char typebuf_visible : 1; unsigned char show_hidden_files : 1; unsigned char listing : 1; - char view_mode; /* -1 = unset */ - short icon_size; /* -1 = unset */ + signed char view_mode; /* -1 = unset */ + signed short icon_size; /* -1 = unset */ E_Fm2_Config *config; const char *custom_theme; @@ -114,11 +114,10 @@ unsigned char drop_all : 1; unsigned char drag : 1; unsigned char selecting : 1; - struct - { - int ox, oy; - int x, y, w, h; - } selrect; + struct { + int ox, oy; + int x, y, w, h; + } selrect; }; struct _E_Fm2_Region |
From: Enlightenment S. <no-...@en...> - 2008-12-09 05:16:57
|
Log: fix double-manage of windows on start! Author: raster Date: 2008-12-08 21:16:52 -0800 (Mon, 08 Dec 2008) New Revision: 38040 Modified: trunk/e/src/bin/e_manager.c Modified: trunk/e/src/bin/e_manager.c =================================================================== --- trunk/e/src/bin/e_manager.c 2008-12-09 03:44:18 UTC (rev 38039) +++ trunk/e/src/bin/e_manager.c 2008-12-09 05:16:52 UTC (rev 38040) @@ -186,6 +186,7 @@ unsigned int ret_val, deskxy[2]; int ret; + if (e_border_find_by_client_window(windows[i])) continue; ecore_x_window_attributes_get(windows[i], &att); if ((att.override) || (att.input_only)) { |
From: Enlightenment S. <no-...@en...> - 2008-12-10 10:48:46
|
Log: avoid o_box being null by creating early. Author: raster Date: 2008-12-10 02:48:42 -0800 (Wed, 10 Dec 2008) New Revision: 38081 Modified: trunk/e/src/bin/e_widget_toolbar.c Modified: trunk/e/src/bin/e_widget_toolbar.c =================================================================== --- trunk/e/src/bin/e_widget_toolbar.c 2008-12-10 10:25:00 UTC (rev 38080) +++ trunk/e/src/bin/e_widget_toolbar.c 2008-12-10 10:48:42 UTC (rev 38081) @@ -52,6 +52,9 @@ o = e_scrollframe_add(evas); wd->o_base = o; + o = e_box_add(evas); + wd->o_box = o; + o = wd->o_base; e_scrollframe_custom_theme_set(o, "base/theme/widgets", "e/widgets/toolbar"); e_scrollframe_single_dir_set(o, 1); e_scrollframe_policy_set(o, E_SCROLLFRAME_POLICY_AUTO, E_SCROLLFRAME_POLICY_OFF); @@ -66,9 +69,8 @@ evas_object_show(o); e_widget_sub_object_add(obj, o); e_widget_resize_object_set(obj, o); - - o = e_box_add(evas); - wd->o_box = o; + + o = wd->o_box; e_box_orientation_set(o, 1); e_box_homogenous_set(o, 1); e_scrollframe_child_set(wd->o_base, o); |
From: Enlightenment S. <no-...@en...> - 2009-01-02 01:08:19
|
Log: move internal binaries to subdir - patch from albin Author: raster Date: 2009-01-01 17:08:14 -0800 (Thu, 01 Jan 2009) New Revision: 38414 Modified: trunk/e/src/bin/Makefile.am trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_fm_main.c trunk/e/src/bin/e_init.c trunk/e/src/bin/e_sys.c trunk/e/src/bin/e_thumb.c Modified: trunk/e/src/bin/Makefile.am =================================================================== --- trunk/e/src/bin/Makefile.am 2009-01-01 20:42:28 UTC (rev 38413) +++ trunk/e/src/bin/Makefile.am 2009-01-02 01:08:14 UTC (rev 38414) @@ -1,4 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in + INCLUDES = -I$(top_srcdir) \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ @@ -18,12 +19,15 @@ enlightenment_remote \ enlightenment_imc \ enlightenment_start \ -enlightenment_thumb \ -enlightenment_sys \ +enlightenment_fm_open + +internal_bindir = $(libdir)/enlightenment/utils +internal_bin_PROGRAMS = \ +enlightenment_init \ enlightenment_fm \ -enlightenment_init \ enlightenment_fm_op \ -enlightenment_fm_open +enlightenment_sys \ +enlightenment_thumb ENLIGHTENMENTHEADERS = \ e.h \ Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2009-01-01 20:42:28 UTC (rev 38413) +++ trunk/e/src/bin/e_fm.c 2009-01-02 01:08:14 UTC (rev 38414) @@ -1511,7 +1511,7 @@ char buf[4096]; if (_e_fm2_client_spawning) return; - snprintf(buf, sizeof(buf), "%s/enlightenment_fm", e_prefix_bin_get()); + snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_fm", e_prefix_lib_get()); exe = ecore_exe_run(buf, NULL); _e_fm2_client_spawning = 1; } Modified: trunk/e/src/bin/e_fm_main.c =================================================================== --- trunk/e/src/bin/e_fm_main.c 2009-01-01 20:42:28 UTC (rev 38413) +++ trunk/e/src/bin/e_fm_main.c 2009-01-02 01:08:14 UTC (rev 38414) @@ -2177,7 +2177,7 @@ length = 256 + strlen(e_prefix_bin_get()) + strlen(args); buffer = malloc(length); - length = snprintf(buffer, length, "%s/enlightenment_fm_op %s %s", e_prefix_bin_get(), command, args); + length = snprintf(buffer, length, "%s/enlightenment/utils/enlightenment_fm_op %s %s", e_prefix_lib_get(), command, args); return buffer; } Modified: trunk/e/src/bin/e_init.c =================================================================== --- trunk/e/src/bin/e_init.c 2009-01-01 20:42:28 UTC (rev 38413) +++ trunk/e/src/bin/e_init.c 2009-01-02 01:08:14 UTC (rev 38414) @@ -77,8 +77,8 @@ if (version) ver = strdup(e_util_filename_escape(version)); else ver = strdup("XvX"); - snprintf(buf, sizeof(buf), "%s/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'", - e_prefix_bin_get(), + snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_init \'%s\' \'%i\' \'%i\' \'%s\' \'%s\'", + e_prefix_lib_get(), theme, e_canvas_engine_decide(e_config->evas_engine_init), e_config->font_hinting, Modified: trunk/e/src/bin/e_sys.c =================================================================== --- trunk/e/src/bin/e_sys.c 2009-01-01 20:42:28 UTC (rev 38413) +++ trunk/e/src/bin/e_sys.c 2009-01-02 01:08:14 UTC (rev 38414) @@ -168,13 +168,13 @@ char buf[4096]; e_init_status_set(_("Checking System Permissions")); - snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t halt", e_prefix_bin_get()); + snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t halt", e_prefix_lib_get()); _e_sys_halt_check_exe = ecore_exe_run(buf, NULL); - snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t reboot", e_prefix_bin_get()); + snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t reboot", e_prefix_lib_get()); _e_sys_reboot_check_exe = ecore_exe_run(buf, NULL); - snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t suspend", e_prefix_bin_get()); + snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t suspend", e_prefix_lib_get()); _e_sys_suspend_check_exe = ecore_exe_run(buf, NULL); - snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t hibernate", e_prefix_bin_get()); + snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys -t hibernate", e_prefix_lib_get()); _e_sys_hibernate_check_exe = ecore_exe_run(buf, NULL); return 0; } @@ -515,8 +515,8 @@ case E_SYS_HALT_NOW: /* shutdown -h now */ if (e_util_immortal_check()) return 0; - snprintf(buf, sizeof(buf), "%s/enlightenment_sys halt", - e_prefix_bin_get()); + snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys halt", + e_prefix_lib_get()); if (_e_sys_exe) { _e_sys_current_action(); @@ -542,8 +542,8 @@ case E_SYS_REBOOT: /* shutdown -r now */ if (e_util_immortal_check()) return 0; - snprintf(buf, sizeof(buf), "%s/enlightenment_sys reboot", - e_prefix_bin_get()); + snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys reboot", + e_prefix_lib_get()); if (_e_sys_exe) { _e_sys_current_action(); @@ -568,8 +568,8 @@ break; case E_SYS_SUSPEND: /* /etc/acpi/sleep.sh force */ - snprintf(buf, sizeof(buf), "%s/enlightenment_sys suspend", - e_prefix_bin_get()); + snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys suspend", + e_prefix_lib_get()); if (_e_sys_exe) { _e_sys_current_action(); @@ -594,8 +594,8 @@ break; case E_SYS_HIBERNATE: /* /etc/acpi/hibernate.sh force */ - snprintf(buf, sizeof(buf), "%s/enlightenment_sys hibernate", - e_prefix_bin_get()); + snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys hibernate", + e_prefix_lib_get()); if (_e_sys_exe) { _e_sys_current_action(); Modified: trunk/e/src/bin/e_thumb.c =================================================================== --- trunk/e/src/bin/e_thumb.c 2009-01-01 20:42:28 UTC (rev 38413) +++ trunk/e/src/bin/e_thumb.c 2009-01-02 01:08:14 UTC (rev 38414) @@ -135,7 +135,7 @@ { Ecore_Exe *exe; - snprintf(buf, sizeof(buf), "%s/enlightenment_thumb --nice=%d", e_prefix_bin_get(), + snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_thumb --nice=%d", e_prefix_lib_get(), e_config->thumb_nice); exe = ecore_exe_run(buf, NULL); _thumbnailers_exe = eina_list_append(_thumbnailers_exe, exe); |
From: Enlightenment S. <no-...@en...> - 2009-01-02 11:19:13
|
Log: fix things that broke after utils moved to lib/e/subdir Author: raster Date: 2009-01-02 03:19:06 -0800 (Fri, 02 Jan 2009) New Revision: 38418 Modified: trunk/e/src/bin/Makefile.am trunk/e/src/bin/e_fm_main.c trunk/e/src/bin/e_prefix.c Modified: trunk/e/src/bin/Makefile.am =================================================================== --- trunk/e/src/bin/Makefile.am 2009-01-02 10:57:02 UTC (rev 38417) +++ trunk/e/src/bin/Makefile.am 2009-01-02 11:19:06 UTC (rev 38418) @@ -345,8 +345,7 @@ enlightenment_fm_SOURCES = \ e_fm_main.c \ e_user.c \ -e_sha1.c \ -e_prefix.c +e_sha1.c enlightenment_fm_LDADD = @E_FM_LIBS@ enlightenment_fm_CFLAGS = $(INCLUDES) @@ -375,9 +374,12 @@ enlightenment_init_LDADD = @E_INIT_LIBS@ +# HACK! why install-data-hook? install-exec-hook is run after bin_PROGRAMS +# and before internal_bin_PROGRAMS are installed. install-data-hook is +# run after both setuid_root_mode = a=rx,u+xs -install-exec-hook: - @chmod $(setuid_root_mode) $(DESTDIR)$(bindir)/enlightenment_sys$(EXEEXT) || true +install-data-hook: + @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true installed_headersdir = $(prefix)/include/enlightenment installed_headers_DATA = $(ENLIGHTENMENTHEADERS) Modified: trunk/e/src/bin/e_fm_main.c =================================================================== --- trunk/e/src/bin/e_fm_main.c 2009-01-02 10:57:02 UTC (rev 38417) +++ trunk/e/src/bin/e_fm_main.c 2009-01-02 11:19:06 UTC (rev 38418) @@ -41,11 +41,9 @@ #define E_TYPEDEFS #include "e_config_data.h" #include "e_fm_op.h" -#include "e_prefix.h" #undef E_TYPEDEFS #include "e_config_data.h" #include "e_fm_op.h" -#include "e_prefix.h" /* FIXME: things to add to the slave enlightenment_fm process and ipc to e: * @@ -254,17 +252,6 @@ ecore_file_init(); ecore_ipc_init(); - if (!e_prefix_determine(argv[0])) - { - fprintf(stderr, - "ERROR: Enlightenment cannot determine its installed\n" - " prefix from the system or argv[0].\n" - " This is because it is not on Linux AND has been\n" - " Executed strangely. This is unusual.\n" - ); - e_prefix_fallback(); - } - ecore_event_handler_add(ECORE_EXE_EVENT_DATA, _e_fm_slave_data_cb, NULL); ecore_event_handler_add(ECORE_EXE_EVENT_ERROR, _e_fm_slave_error_cb, NULL); ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_fm_slave_del_cb, NULL); @@ -306,8 +293,6 @@ e_dbus_shutdown(); _e_storage_volume_edd_shutdown(); - e_prefix_shutdown(); - ecore_ipc_shutdown(); ecore_file_shutdown(); eina_stringshare_shutdown(); @@ -2175,9 +2160,11 @@ else strcpy(command, "cp"); - length = 256 + strlen(e_prefix_bin_get()) + strlen(args); + length = 256 + strlen(getenv("E_LIB_DIR")) + strlen(args); buffer = malloc(length); - length = snprintf(buffer, length, "%s/enlightenment/utils/enlightenment_fm_op %s %s", e_prefix_lib_get(), command, args); + length = snprintf(buffer, length, + "%s/enlightenment/utils/enlightenment_fm_op %s %s", + getenv("E_LIB_DIR"), command, args); return buffer; } Modified: trunk/e/src/bin/e_prefix.c =================================================================== --- trunk/e/src/bin/e_prefix.c 2009-01-02 10:57:02 UTC (rev 38417) +++ trunk/e/src/bin/e_prefix.c 2009-01-02 11:19:06 UTC (rev 38418) @@ -29,6 +29,7 @@ { char *p, buf[4096]; + printf("e_prefix_determine()\n"); e_prefix_shutdown(); /* if user provides E_PREFIX - then use that or also more specific sub @@ -37,28 +38,40 @@ { _prefix_path = strdup(getenv("E_PREFIX")); if (getenv("E_BIN_DIR")) - snprintf(buf, sizeof(buf), "%s/bin", getenv("E_BIN_DIR")); + _prefix_path_bin = strdup(getenv("E_BIN_DIR")); else - snprintf(buf, sizeof(buf), "%s/bin", _prefix_path); - _prefix_path_bin = strdup(buf); + { + snprintf(buf, sizeof(buf), "%s/bin", _prefix_path); + _prefix_path_bin = strdup(buf); + e_util_env_set("E_BIN_DIR", _prefix_path_bin); + } if (getenv("E_LIB_DIR")) - snprintf(buf, sizeof(buf), "%s/lib", getenv("E_LIB_DIR")); + _prefix_path_lib = strdup(getenv("E_LIB_DIR")); else - snprintf(buf, sizeof(buf), "%s/lib", _prefix_path); - _prefix_path_lib = strdup(buf); + { + snprintf(buf, sizeof(buf), "%s/lib", _prefix_path); + _prefix_path_lib = strdup(buf); + e_util_env_set("E_LIB_DIR", _prefix_path_lib); + } if (getenv("E_DATA_DIR")) - snprintf(buf, sizeof(buf), "%s/"SHARE_D, getenv("E_DATA_DIR")); + _prefix_path_data = strdup(getenv("E_DATA_DIR")); else - snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path); - _prefix_path_data = strdup(buf); + { + snprintf(buf, sizeof(buf), "%s/"SHARE_D, _prefix_path); + _prefix_path_data = strdup(buf); + e_util_env_set("E_DATA_DIR", _prefix_path_data); + } if (getenv("E_LOCALE_DIR")) - snprintf(buf, sizeof(buf), "%s/"LOCALE_D, getenv("E_LOCALE_DIR")); + _prefix_path_locale = strdup(getenv("E_LOCALE_DIR")); else - snprintf(buf, sizeof(buf), "%s/"LOCALE_D, _prefix_path); - _prefix_path_locale = strdup(buf); + { + snprintf(buf, sizeof(buf), "%s/"LOCALE_D, _prefix_path); + _prefix_path_locale = strdup(buf); + e_util_env_set("E_LOCALE_DIR", _prefix_path_locale); + } return 1; } /* no env var - examine process and possible argv0 */ @@ -67,6 +80,10 @@ if (!_e_prefix_try_argv(argv0)) { e_prefix_fallback(); + e_util_env_set("E_PREFIX", _prefix_path); + e_util_env_set("E_BIN_DIR", _prefix_path_bin); + e_util_env_set("E_LIB_DIR", _prefix_path_lib); + e_util_env_set("E_DATA_DIR", _prefix_path_data); return 0; } } @@ -121,14 +138,26 @@ else { e_prefix_fallback(); + e_util_env_set("E_PREFIX", _prefix_path); + e_util_env_set("E_BIN_DIR", _prefix_path_bin); + e_util_env_set("E_LIB_DIR", _prefix_path_lib); + e_util_env_set("E_DATA_DIR", _prefix_path_data); return 0; } } + e_util_env_set("E_PREFIX", _prefix_path); + e_util_env_set("E_BIN_DIR", _prefix_path_bin); + e_util_env_set("E_LIB_DIR", _prefix_path_lib); + e_util_env_set("E_DATA_DIR", _prefix_path_data); return 1; } else { e_prefix_fallback(); + e_util_env_set("E_PREFIX", _prefix_path); + e_util_env_set("E_BIN_DIR", _prefix_path_bin); + e_util_env_set("E_LIB_DIR", _prefix_path_lib); + e_util_env_set("E_DATA_DIR", _prefix_path_data); return 0; } } @@ -136,6 +165,10 @@ } } e_prefix_fallback(); + e_util_env_set("E_PREFIX", _prefix_path); + e_util_env_set("E_BIN_DIR", _prefix_path_bin); + e_util_env_set("E_LIB_DIR", _prefix_path_lib); + e_util_env_set("E_DATA_DIR", _prefix_path_data); return 0; } |
From: Enlightenment S. <no-...@en...> - 2009-01-05 12:55:31
|
Log: allow check widget to have a file path for icon. Author: raster Date: 2009-01-05 04:55:19 -0800 (Mon, 05 Jan 2009) New Revision: 38460 Modified: trunk/e/src/bin/e_widget_check.c Modified: trunk/e/src/bin/e_widget_check.c =================================================================== --- trunk/e/src/bin/e_widget_check.c 2009-01-05 04:06:19 UTC (rev 38459) +++ trunk/e/src/bin/e_widget_check.c 2009-01-05 12:55:19 UTC (rev 38460) @@ -120,13 +120,21 @@ } if (icon) { - o2 = edje_object_add(evas); - wd->o_icon = o2; - e_util_edje_icon_set(o2, icon); - edje_extern_object_min_size_set(o2, icon_w, icon_h); + if (icon[0] == '/') + { + o2 = e_icon_add(evas); + e_icon_file_set(o2, icon); + } + else + { + o2 = edje_object_add(evas); + e_util_edje_icon_set(o2, icon); + } + edje_extern_object_min_size_set(o2, icon_w, icon_h); edje_object_part_swallow(wd->o_check, "e.swallow.icon", o2); evas_object_show(o2); e_widget_sub_object_add(obj, o2); + wd->o_icon = o2; } edje_object_size_min_calc(o, &mw, &mh); |
From: Enlightenment S. <no-...@en...> - 2009-01-05 13:07:30
|
Log: this apparently fixes some fullscreen maximising issues Author: raster Date: 2009-01-05 05:07:19 -0800 (Mon, 05 Jan 2009) New Revision: 38461 Modified: trunk/e/src/bin/e_border.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2009-01-05 12:55:19 UTC (rev 38460) +++ trunk/e/src/bin/e_border.c 2009-01-05 13:07:19 UTC (rev 38461) @@ -1915,7 +1915,8 @@ if (bd->bg_object) { Evas_Coord cx, cy, cw, ch; - + + edje_object_message_signal_process(bd->bg_object); edje_object_signal_emit(bd->bg_object, "e,action,maximize,fullscreen", "e"); edje_object_message_signal_process(bd->bg_object); @@ -2049,6 +2050,7 @@ { Evas_Coord cx, cy, cw, ch; + edje_object_message_signal_process(bd->bg_object); edje_object_signal_emit(bd->bg_object, "e,action,unmaximize,fullscreen", "e"); edje_object_message_signal_process(bd->bg_object); |
From: Enlightenment S. <no-...@en...> - 2009-01-06 07:55:04
|
Log: only use evdir.. if its there. Author: raster Date: 2009-01-05 23:55:03 -0800 (Mon, 05 Jan 2009) New Revision: 38478 Modified: trunk/e/src/bin/e_fm.c Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2009-01-06 07:51:15 UTC (rev 38477) +++ trunk/e/src/bin/e_fm.c 2009-01-06 07:55:03 UTC (rev 38478) @@ -1901,16 +1901,20 @@ switch (e->minor) { case E_FM_OP_HELLO:/*hello*/ +// printf("E_FM_OP_HELLO\n"); break; case E_FM_OP_OK:/*req ok*/ +// printf("E_FM_OP_OK\n"); cl->req--; break; case E_FM_OP_FILE_ADD:/*file add*/ +// printf("E_FM_OP_FILE_ADD\n"); case E_FM_OP_FILE_CHANGE:/*file change*/ +// printf("E_FM_OP_FILE_CHANGE\n"); { E_Fm2_Finfo finf; - - p = e->data; + + p = e->data; /* NOTE: i am NOT converting this data to portable arch/os independant * format. i am ASSUMING e_fm_main and e are local and built together * and thus this will work. if this ever changes this here needs to @@ -1936,9 +1940,10 @@ finf.rlnk = rlnk; evdir = ecore_file_dir_get(path); - if ((sd->id == e->ref_to) && + if ((evdir) && (sd->id == e->ref_to) && ((!strcmp(evdir, "") || (!strcmp(dir, evdir))))) { +// printf(" ch/add response = %i\n", e->response); if (e->response == 0)/*live changes*/ { if (e->minor == E_FM_OP_FILE_ADD)/*file add*/ @@ -2003,8 +2008,10 @@ } else { +// printf(" ...\n"); if ((sd->id == e->ref_to) && (path[0] == 0)) { +// printf(" end response = %i\n", e->response); if (e->response == 2)/* end of scan */ { sd->listing = 0; @@ -2023,10 +2030,11 @@ } } } - free(evdir); + if (evdir) free(evdir); } break; case E_FM_OP_FILE_DEL:/*file del*/ +// printf("E_FM_OP_FILE_DEL\n"); path = e->data; evdir = ecore_file_dir_get(path); if ((sd->id == e->ref_to) && (!strcmp(dir, evdir))) @@ -2037,6 +2045,7 @@ free(evdir); break; case E_FM_OP_MONITOR_END:/*mon dir del*/ +// printf("E_FM_OP_MONITOR_END\n"); path = e->data; if ((sd->id == e->ref_to) && (!strcmp(dir, path))) { |
From: Enlightenment S. <no-...@en...> - 2009-01-22 20:54:36
|
Log: shorten system action text - simpler. also fix actiosn to be system. Author: raster Date: 2009-01-22 12:54:26 -0800 (Thu, 22 Jan 2009) New Revision: 38698 Modified: trunk/e/src/bin/e_actions.c trunk/e/src/bin/e_sys.c Modified: trunk/e/src/bin/e_actions.c =================================================================== --- trunk/e/src/bin/e_actions.c 2009-01-22 18:33:23 UTC (rev 38697) +++ trunk/e/src/bin/e_actions.c 2009-01-22 20:54:26 UTC (rev 38698) @@ -2612,7 +2612,7 @@ /* exec */ ACT_GO(exec); - e_action_predef_name_set(_("Launch"), _("Defined Command"), "exec", NULL, + e_action_predef_name_set(_("Launch"), _("Command"), "exec", NULL, "syntax: CommandName, example: /usr/bin/xmms", 1); /* app */ @@ -2628,20 +2628,20 @@ e_action_predef_name_set(_("Enlightenment"), _("Exit"), "exit", NULL, NULL, 0); + ACT_GO(exit_now); + e_action_predef_name_set(_("Enlightenment"), _("Exit Now"), + "exit_now", NULL, NULL, 0); + ACT_GO(logout); - e_action_predef_name_set(_("Enlightenment"), _("Log Out"), "logout", + e_action_predef_name_set(_("System"), _("Log Out"), "logout", NULL, NULL, 0); - ACT_GO(exit_now); - e_action_predef_name_set(_("Enlightenment"), _("Exit Immediately"), - "exit_now", NULL, NULL, 0); - ACT_GO(halt_now); - e_action_predef_name_set(_("Enlightenment"), _("Off Now"), + e_action_predef_name_set(_("System"), _("Power Off Now"), "halt_now", NULL, NULL, 0); ACT_GO(halt); - e_action_predef_name_set(_("System"), _("Off"), "halt", + e_action_predef_name_set(_("System"), _("Power Off"), "halt", NULL, NULL, 0); ACT_GO(reboot); Modified: trunk/e/src/bin/e_sys.c =================================================================== --- trunk/e/src/bin/e_sys.c 2009-01-22 18:33:23 UTC (rev 38697) +++ trunk/e/src/bin/e_sys.c 2009-01-22 20:54:26 UTC (rev 38698) @@ -363,7 +363,7 @@ _("Logout in progress"), "E", "_sys_logout"); e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/logout"); e_obj_dialog_obj_part_text_set(od, "e.textblock.message", - _("Logout is currently in progress.<br>" + _("Logout in progress.<br>" "<hilight>Please wait.</hilight>")); e_obj_dialog_show(od); e_obj_dialog_icon_set(od, "enlightenment/logout"); @@ -398,7 +398,7 @@ { case E_SYS_LOGOUT: e_dialog_text_set(dia, - _("Enlightenment is busy logging out.<br>" + _("Logging out.<br>" "You cannot perform other system actions<br>" "once a logout has begun.") ); @@ -406,28 +406,28 @@ case E_SYS_HALT: case E_SYS_HALT_NOW: e_dialog_text_set(dia, - _("Enlightenment is shutting the system down.<br>" + _("Powering off.<br>" "You cannot do any other system actions<br>" "once a shutdown has been started.") ); break; case E_SYS_REBOOT: e_dialog_text_set(dia, - _("Enlightenment is rebooting the system.<br>" + _("Resetting.<br>" "You cannot do any other system actions<br>" "once a reboot has begun.") ); break; case E_SYS_SUSPEND: e_dialog_text_set(dia, - _("Enlightenment is suspending the system.<br>" + _("Suspending.<br>" "Until suspend is complete you cannot perform<br>" "any other system actions.") ); break; case E_SYS_HIBERNATE: e_dialog_text_set(dia, - _("Enlightenment is hibernating the system.<br>" + _("Hibernating.<br>" "You cannot perform an other system actions<br>" "until this is complete.") ); @@ -460,22 +460,22 @@ case E_SYS_HALT: case E_SYS_HALT_NOW: e_dialog_text_set(dia, - _("Shutting down of your system failed.") + _("Power off failed.") ); break; case E_SYS_REBOOT: e_dialog_text_set(dia, - _("Rebooting your system failed.") + _("Reset failed.") ); break; case E_SYS_SUSPEND: e_dialog_text_set(dia, - _("Suspend of your system failed.") + _("Suspend failed.") ); break; case E_SYS_HIBERNATE: e_dialog_text_set(dia, - _("Hibernating your system failed.") + _("Hibernate failed.") ); break; default: @@ -526,10 +526,10 @@ { _e_sys_exe = ecore_exe_run(buf, NULL); od = e_obj_dialog_new(e_container_current_get(e_manager_current_get()), - _("Shutting down"), "E", "_sys_halt"); + _("Power off"), "E", "_sys_halt"); e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/halt"); e_obj_dialog_obj_part_text_set(od, "e.textblock.message", - _("Shutting down your Computer.<br>" + _("Power off.<br>" "<hilight>Please wait.</hilight>")); e_obj_dialog_show(od); e_obj_dialog_icon_set(od, "enlightenment/halt"); @@ -553,10 +553,10 @@ { _e_sys_exe = ecore_exe_run(buf, NULL); od = e_obj_dialog_new(e_container_current_get(e_manager_current_get()), - _("Rebooting"), "E", "_sys_reboot"); + _("Resetting"), "E", "_sys_reboot"); e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/reboot"); e_obj_dialog_obj_part_text_set(od, "e.textblock.message", - _("Rebooting your Computer.<br>" + _("Resetting.<br>" "<hilight>Please wait.</hilight>")); e_obj_dialog_show(od); e_obj_dialog_icon_set(od, "enlightenment/reboot"); @@ -582,7 +582,7 @@ _("Suspending"), "E", "_sys_suspend"); e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/suspend"); e_obj_dialog_obj_part_text_set(od, "e.textblock.message", - _("Suspending your Computer.<br>" + _("Suspending.<br>" "<hilight>Please wait.</hilight>")); e_obj_dialog_show(od); e_obj_dialog_icon_set(od, "enlightenment/suspend"); @@ -608,7 +608,7 @@ _("Hibernating"), "E", "_sys_hibernate"); e_obj_dialog_obj_theme_set(od, "base/theme/sys", "e/sys/hibernate"); e_obj_dialog_obj_part_text_set(od, "e.textblock.message", - _("Hibernating your Computer.<br>" + _("Hibernating.<br>" "<hilight>Please wait.</hilight>")); e_obj_dialog_show(od); e_obj_dialog_icon_set(od, "enlightenment/hibernate"); |
From: Enlightenment S. <no-...@en...> - 2009-01-31 23:57:36
|
Log: by popular request - reboot. Author: raster Date: 2009-01-31 15:57:32 -0800 (Sat, 31 Jan 2009) New Revision: 38868 Modified: trunk/e/src/bin/e_actions.c Modified: trunk/e/src/bin/e_actions.c =================================================================== --- trunk/e/src/bin/e_actions.c 2009-01-31 23:23:51 UTC (rev 38867) +++ trunk/e/src/bin/e_actions.c 2009-01-31 23:57:32 UTC (rev 38868) @@ -2645,7 +2645,7 @@ NULL, NULL, 0); ACT_GO(reboot); - e_action_predef_name_set(_("System"), _("Reset"), "reboot", + e_action_predef_name_set(_("System"), _("Reboot"), "reboot", NULL, NULL, 0); ACT_GO(suspend); |
From: Enlightenment S. <no-...@en...> - 2009-02-26 03:47:04
|
Log: use new efreet api fo extra icon dirs. Author: raster Date: 2009-02-25 19:46:59 -0800 (Wed, 25 Feb 2009) New Revision: 39227 Modified: trunk/e/src/bin/e_main.c Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2009-02-26 03:46:35 UTC (rev 39226) +++ trunk/e/src/bin/e_main.c 2009-02-26 03:46:59 UTC (rev 39227) @@ -762,15 +762,15 @@ e_init_status_set(_("Setting up Paths")); TS("efreet paths"); { - Eina_List *list; + Eina_List **list; list = efreet_icon_extra_list_get(); if (list) { snprintf(buf, sizeof(buf), "%s/.e/e/icons", e_user_homedir_get()); - list = eina_list_prepend(list, (void *)eina_stringshare_add(buf)); + *list = eina_list_prepend(*list, (void *)eina_stringshare_add(buf)); snprintf(buf, sizeof(buf), "%s/data/icons", e_prefix_data_get()); - list = eina_list_prepend(list, (void *)eina_stringshare_add(buf)); + *list = eina_list_prepend(*list, (void *)eina_stringshare_add(buf)); } } efreet_icon_extension_add(".edj"); |
From: Enlightenment S. <no-...@en...> - 2009-03-23 02:14:14
|
Log: use new timer add func - for when u want the timer to be relative to the loop tick time - not "now". Author: raster Date: 2009-03-22 19:14:10 -0700 (Sun, 22 Mar 2009) New Revision: 39639 Modified: trunk/e/src/bin/e_object.c trunk/e/src/bin/e_pointer.c Modified: trunk/e/src/bin/e_object.c =================================================================== --- trunk/e/src/bin/e_object.c 2009-03-23 02:13:50 UTC (rev 39638) +++ trunk/e/src/bin/e_object.c 2009-03-23 02:14:10 UTC (rev 39639) @@ -107,6 +107,29 @@ return obj->references; } +#if 0 +EAPI void +e_bt(void) +{ + int i, trace_num; + void *trace[128]; + char **messages = NULL; + trace_num = backtrace(trace, 128); + messages = backtrace_symbols(trace, trace_num); + if (messages) + { + for (i = 1; i < trace_num; i++) + { + int j; + + for (j = 1; j < i; j++) putchar(' '); + printf("%s\n", messages[i]); + } + free(messages); + } +} +#endif + EAPI int e_object_error(E_Object *obj) { Modified: trunk/e/src/bin/e_pointer.c =================================================================== --- trunk/e/src/bin/e_pointer.c 2009-03-23 02:13:50 UTC (rev 39638) +++ trunk/e/src/bin/e_pointer.c 2009-03-23 02:14:10 UTC (rev 39639) @@ -528,7 +528,7 @@ if (e_powersave_mode_get() >= E_POWERSAVE_MODE_MEDIUM) return; /* and scedule a pre-idle check in 1 second if no more events happen */ if (!e_config->idle_cursor) return; - p->idle_timer = ecore_timer_add(1.0, _e_pointer_cb_idle_timer_pre, p); + p->idle_timer = ecore_timer_loop_add(1.0, _e_pointer_cb_idle_timer_pre, p); } static int @@ -625,7 +625,7 @@ ecore_x_pointer_xy_get(p->win, &x, &y); p->x = x; p->y = y; - p->idle_timer = ecore_timer_add(4.0, _e_pointer_cb_idle_timer_wait, p); + p->idle_timer = ecore_timer_loop_add(4.0, _e_pointer_cb_idle_timer_wait, p); return 0; } |
From: Enlightenment S. <no-...@en...> - 2009-03-23 09:36:15
|
Log: nuke segv in fm and leaks in menus. Author: raster Date: 2009-03-23 02:36:11 -0700 (Mon, 23 Mar 2009) New Revision: 39644 Modified: trunk/e/src/bin/e_fm.c trunk/e/src/bin/e_int_menus.c Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2009-03-23 04:58:31 UTC (rev 39643) +++ trunk/e/src/bin/e_fm.c 2009-03-23 09:36:11 UTC (rev 39644) @@ -1970,7 +1970,13 @@ size = _e_fm2_icon_mime_size_normalize(ic); icon = efreet_mime_type_icon_get(ic->info.mime, e_config->icon_theme, size); - if (icon) return _e_fm2_icon_explicit_get(evas, ic, icon, type_ret); + if (icon) + { + Evas_Object *o; + o = _e_fm2_icon_explicit_get(evas, ic, icon, type_ret); + free(icon); + return o; + } return NULL; } @@ -6325,13 +6331,13 @@ ic->drag.start = 0; ic->drag.dnd = 0; ic->drag.src = 0; + ic->down_sel = 0; if ((_e_fm2_inplace_open(ic) == 0) && (S_ISDIR(ic->info.statinfo.st_mode)) && (ic->sd->config->view.single_click)) evas_object_smart_callback_call(ic->sd->obj, "selected", NULL); } - ic->down_sel = 0; } static void Modified: trunk/e/src/bin/e_int_menus.c =================================================================== --- trunk/e/src/bin/e_int_menus.c 2009-03-23 04:58:31 UTC (rev 39643) +++ trunk/e/src/bin/e_int_menus.c 2009-03-23 09:36:11 UTC (rev 39644) @@ -513,6 +513,8 @@ _e_int_menus_apps_start, entry); e_menu_item_submenu_set(mi, subm); + e_object_free_attach_func_set(E_OBJECT(subm), + _e_int_menus_apps_free_hook2); } /* TODO: Highlight header else if (entry->type == EFREET_MENU_ENTRY_HEADER) @@ -567,8 +569,15 @@ { E_Menu *m; Efreet_Menu *menu; + Eina_List *l; + E_Menu_Item *mi; m = obj; + EINA_LIST_FOREACH(m->items, l, mi) + { + if (mi->submenu) + e_object_del(E_OBJECT(mi->submenu)); + } menu = e_object_data_get(E_OBJECT(m)); if (menu) efreet_menu_free(menu); } |
From: Enlightenment S. <no-...@en...> - 2009-03-23 10:19:24
|
Log: more leak--! Author: raster Date: 2009-03-23 03:19:13 -0700 (Mon, 23 Mar 2009) New Revision: 39646 Modified: trunk/e/src/bin/e_int_menus.c trunk/e/src/bin/e_intl.c Modified: trunk/e/src/bin/e_int_menus.c =================================================================== --- trunk/e/src/bin/e_int_menus.c 2009-03-23 10:02:26 UTC (rev 39645) +++ trunk/e/src/bin/e_int_menus.c 2009-03-23 10:19:13 UTC (rev 39646) @@ -60,6 +60,7 @@ static void _e_int_menus_main_showhide(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_main_restart(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_main_exit(void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_int_menus_desktops_free_hook(void *obj); static void _e_int_menus_desk_item_cb(void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_item_label_set(Efreet_Menu *entry, E_Menu_Item *mi); @@ -272,6 +273,7 @@ e_util_menu_item_theme_icon_set(mi, "preferences-system-windows"); e_menu_item_callback_set(mi, _e_int_menus_main_showhide, NULL); + e_object_free_attach_func_set(E_OBJECT(m), _e_int_menus_desktops_free_hook); return m; } @@ -663,6 +665,21 @@ } static void +_e_int_menus_desktops_free_hook(void *obj) +{ + E_Menu *m; + Eina_List *l; + E_Menu_Item *mi; + + m = obj; + EINA_LIST_FOREACH(m->items, l, mi) + { + if (mi->submenu) + e_object_del(E_OBJECT(mi->submenu)); + } +} + +static void _e_int_menus_desk_item_cb(void *data, E_Menu *m, E_Menu_Item *mi) { e_configure_registry_call("screen/virtual_desktops", m->zone->container, NULL); Modified: trunk/e/src/bin/e_intl.c =================================================================== --- trunk/e/src/bin/e_intl.c 2009-03-23 10:02:26 UTC (rev 39645) +++ trunk/e/src/bin/e_intl.c 2009-03-23 10:19:13 UTC (rev 39646) @@ -906,6 +906,7 @@ /* Match locale with one from the list */ EINA_LIST_FREE(all_locales, locale_next) + { if (found == 0) { E_Locale_Parts *locale_parts_next; @@ -973,7 +974,9 @@ e_intl_locale_parts_free(locale_parts_next); E_FREE(locale_lr_next); } - + free (locale_next); + } + e_intl_locale_parts_free(locale_parts); free(locale_lr); E_FREE(locale_cs_canonic); |
From: Enlightenment S. <no-...@en...> - 2009-03-23 13:04:08
|
Log: lost windows.. back! Author: raster Date: 2009-03-23 06:04:02 -0700 (Mon, 23 Mar 2009) New Revision: 39652 Modified: trunk/e/src/bin/e_int_menus.c Modified: trunk/e/src/bin/e_int_menus.c =================================================================== --- trunk/e/src/bin/e_int_menus.c 2009-03-23 12:28:15 UTC (rev 39651) +++ trunk/e/src/bin/e_int_menus.c 2009-03-23 13:04:02 UTC (rev 39652) @@ -134,7 +134,7 @@ e_menu_item_label_set(mi, _("Windows")); e_util_menu_item_theme_icon_set(mi, "preferences-system-windows"); e_menu_item_submenu_set(mi, subm); -/* + subm = e_int_menus_lost_clients_new(); e_object_data_set(E_OBJECT(subm), dat); dat->lost_clients = subm; @@ -142,7 +142,6 @@ e_menu_item_label_set(mi, _("Lost Windows")); e_util_menu_item_theme_icon_set(mi, "preferences-windows-lost"); e_menu_item_submenu_set(mi, subm); - */ l = eina_hash_find(_e_int_menus_augmentation, "main/3"); if (l) _e_int_menus_augmentation_add(m, l); |
From: Enlightenment S. <no-...@en...> - 2009-03-23 13:44:26
|
Log: ghost windows-- ? Author: raster Date: 2009-03-23 06:39:24 -0700 (Mon, 23 Mar 2009) New Revision: 39655 Modified: trunk/e/src/bin/e_border.c trunk/e/src/bin/e_manager.c trunk/e/src/bin/e_win.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2009-03-23 13:28:59 UTC (rev 39654) +++ trunk/e/src/bin/e_border.c 2009-03-23 13:39:24 UTC (rev 39655) @@ -467,7 +467,8 @@ bd->y = att->y; bd->changes.pos = 1; bd->re_manage = 1; - bd->ignore_first_unmap = 2; +// needed to be 1 for internal windw and on restart. +// bd->ignore_first_unmap = 2; } /* just to friggin make java happy - we're DELAYING the reparent until @@ -3902,10 +3903,13 @@ bd = data; e = ev; +// printf("HIDE: %x, event %x\n", e->win, e->event_win); // not interested in hide events from windows other than the window in question if (e->win != e->event_win) return 1; bd = e_border_find_by_client_window(e->win); +// printf(" bd = %p\n", bd); if (!bd) return 1; +// printf(" bd->ignore_first_unmap = %i\n", bd->ignore_first_unmap); if (bd->ignore_first_unmap > 0) { bd->ignore_first_unmap--; @@ -3915,18 +3919,23 @@ if ((bd->iconic) || ((!bd->visible) && (!bd->new_client)) || (bd->await_hide_event > 0)) { +// printf(" Don't delete hidden or iconified windows\n"); +// printf(" bd->iconic = %i, bd->visible = %i, bd->new_client = %i, bd->await_hide_event = %i\n", +// bd->iconic, bd->visible, bd->new_client, bd->await_hide_event); if (bd->await_hide_event > 0) { bd->await_hide_event--; } else { +// printf(" hide really\n"); /* Only hide the border if it is visible */ if (bd->visible) e_border_hide(bd, 1); } } else { +// printf(" hide2\n"); e_border_hide(bd, 0); if (e_config->focus_revert_on_hide_or_close) { Modified: trunk/e/src/bin/e_manager.c =================================================================== --- trunk/e/src/bin/e_manager.c 2009-03-23 13:28:59 UTC (rev 39654) +++ trunk/e/src/bin/e_manager.c 2009-03-23 13:39:24 UTC (rev 39655) @@ -280,6 +280,7 @@ bd = e_border_new(con, windows[i], 1, 0); if (bd) { + bd->ignore_first_unmap = 1; /* FIXME: * It's enough to set the desk, the zone will * be set according to the desk */ Modified: trunk/e/src/bin/e_win.c =================================================================== --- trunk/e/src/bin/e_win.c 2009-03-23 13:28:59 UTC (rev 39654) +++ trunk/e/src/bin/e_win.c 2009-03-23 13:39:24 UTC (rev 39655) @@ -90,6 +90,7 @@ _e_win_prop_update(win); ecore_evas_lower(win->ecore_evas); win->border = e_border_new(win->container, win->evas_win, 1, 1); + win->border->ignore_first_unmap = 1; if (!win->placed) win->border->re_manage = 0; win->border->internal = 1; |
From: Enlightenment S. <no-...@en...> - 2009-04-04 07:19:04
|
Log: and properly hide windows that ask to be iconified on start! Author: raster Date: 2009-04-04 00:18:55 -0700 (Sat, 04 Apr 2009) New Revision: 39853 Modified: trunk/e/src/bin/e_border.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2009-04-04 04:14:01 UTC (rev 39852) +++ trunk/e/src/bin/e_border.c 2009-04-04 07:18:55 UTC (rev 39853) @@ -5691,7 +5691,10 @@ /* If this is a new window, set the state as requested. */ if ((bd->new_client) && (bd->client.icccm.initial_state == ECORE_X_WINDOW_STATE_HINT_ICONIC)) - e_border_iconify(bd); + { + e_border_iconify(bd); + e_border_hide(bd, 1); + } } bd->client.icccm.fetch.hints = 0; rem_change = 1; |
From: Enlightenment S. <no-...@en...> - 2009-04-05 03:49:28
|
Log: for e_thumb.. use preload! Author: raster Date: 2009-04-04 20:49:16 -0700 (Sat, 04 Apr 2009) New Revision: 39866 Modified: trunk/e/src/bin/e_icon.c trunk/e/src/bin/e_icon.h trunk/e/src/bin/e_thumb.c Modified: trunk/e/src/bin/e_icon.c =================================================================== --- trunk/e/src/bin/e_icon.c 2009-04-05 00:26:31 UTC (rev 39865) +++ trunk/e/src/bin/e_icon.c 2009-04-05 03:49:16 UTC (rev 39866) @@ -12,6 +12,7 @@ int size; unsigned char fill_inside : 1; unsigned char scale_up : 1; + unsigned char preload : 1; }; /* local subsystem functions */ @@ -50,6 +51,7 @@ if (sd->size != 0) evas_object_image_load_size_set(sd->obj, sd->size, sd->size); evas_object_image_file_set(sd->obj, file, NULL); + if (sd->preload) evas_object_image_preload(sd->obj, 0); _e_icon_smart_reconfigure(sd); } @@ -64,6 +66,7 @@ if (sd->size != 0) evas_object_image_load_size_set(sd->obj, sd->size, sd->size); evas_object_image_file_set(sd->obj, file, key); + if (sd->preload) evas_object_image_preload(sd->obj, 0); _e_icon_smart_reconfigure(sd); } @@ -162,6 +165,26 @@ } EAPI void +e_icon_preload_set(Evas_Object *obj, int preload) +{ + E_Smart_Data *sd; + + sd = evas_object_smart_data_get(obj); + if (!sd) return; + sd->preload = preload; +} + +EAPI int +e_icon_preload_get(Evas_Object *obj) +{ + E_Smart_Data *sd; + + sd = evas_object_smart_data_get(obj); + if (!sd) return 0; + return sd->preload; +} + +EAPI void e_icon_size_get(Evas_Object *obj, int *w, int *h) { E_Smart_Data *sd; @@ -355,6 +378,12 @@ } static void +_e_icon_preloaded(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + evas_object_smart_callback_call(data, "preloaded", NULL); +} + +static void _e_icon_smart_add(Evas_Object *obj) { E_Smart_Data *sd; @@ -362,6 +391,8 @@ sd = calloc(1, sizeof(E_Smart_Data)); if (!sd) return; sd->obj = evas_object_image_add(evas_object_evas_get(obj)); + evas_object_event_callback_add(sd->obj, EVAS_CALLBACK_IMAGE_PRELOADED, + _e_icon_preloaded, obj); sd->x = 0; sd->y = 0; sd->w = 0; Modified: trunk/e/src/bin/e_icon.h =================================================================== --- trunk/e/src/bin/e_icon.h 2009-04-05 00:26:31 UTC (rev 39865) +++ trunk/e/src/bin/e_icon.h 2009-04-05 03:49:16 UTC (rev 39866) @@ -16,6 +16,8 @@ EAPI int e_icon_smooth_scale_get (Evas_Object *obj); EAPI void e_icon_alpha_set (Evas_Object *obj, int smooth); EAPI int e_icon_alpha_get (Evas_Object *obj); +EAPI void e_icon_preload_set (Evas_Object *obj, int preload); +EAPI int e_icon_preload_get (Evas_Object *obj); EAPI void e_icon_size_get (Evas_Object *obj, int *w, int *h); EAPI int e_icon_fill_inside_get (Evas_Object *obj); EAPI void e_icon_fill_inside_set (Evas_Object *obj, int fill_inside); Modified: trunk/e/src/bin/e_thumb.c =================================================================== --- trunk/e/src/bin/e_thumb.c 2009-04-05 00:26:31 UTC (rev 39865) +++ trunk/e/src/bin/e_thumb.c 2009-04-05 03:49:16 UTC (rev 39866) @@ -71,6 +71,12 @@ return 1; } +static void +_thumb_preloaded(void *data, Evas_Object *obj, void *event) +{ + evas_object_smart_callback_call(data, "e_thumb_gen", NULL); +} + EAPI Evas_Object * e_thumb_icon_add(Evas *evas) { @@ -78,6 +84,7 @@ E_Thumb *eth; obj = e_icon_add(evas); + evas_object_smart_callback_add(obj, "preloaded", _thumb_preloaded, obj); _objid++; eth = E_NEW(E_Thumb, 1); eth->objid = _objid; @@ -221,8 +228,9 @@ _pending--; eth->done = 1; if (_pending == 0) _e_thumb_thumbnailers_kill(); + e_icon_preload_set(obj, 1); e_icon_file_key_set(obj, icon, "/thumbnail/data"); - evas_object_smart_callback_call(obj, "e_thumb_gen", NULL); +//x// evas_object_smart_callback_call(obj, "e_thumb_gen", NULL); } } } |
From: Enlightenment S. <no-...@en...> - 2009-04-10 14:21:39
|
Log: From: Sergey Semernin <ser...@gm...> In E_Dialog space key grabbed before than keydown event reach to entry widget in E_Entry_Dialog. Thus, I forced ungrab space key in e_entry_dialog_show constructor. Moreover, I added escape key handling in _e_entry_cb_key_down callback. I do not delete space key grub in E_Dialog, because, I think, it may be usefull here, when we need selecting controls with space. Or not? Author: raster Date: 2009-04-10 07:21:36 -0700 (Fri, 10 Apr 2009) New Revision: 39936 Modified: trunk/e/src/bin/e_entry_dialog.c Modified: trunk/e/src/bin/e_entry_dialog.c =================================================================== --- trunk/e/src/bin/e_entry_dialog.c 2009-04-10 14:05:50 UTC (rev 39935) +++ trunk/e/src/bin/e_entry_dialog.c 2009-04-10 14:21:36 UTC (rev 39936) @@ -18,6 +18,7 @@ E_Entry_Dialog *ed; E_Dialog *dia; Evas_Object *o, *ob; + Evas_Modifier_Mask mask; int w, h; ed = E_OBJECT_ALLOC(E_Entry_Dialog, E_ENTRY_DIALOG_TYPE, _e_entry_dialog_free); @@ -37,6 +38,9 @@ dia->data = ed; ed->dia = dia; + mask = 0; + evas_object_key_ungrab(dia->event_object, "space", mask, ~mask); + e_win_delete_callback_set(dia->win, _e_entry_dialog_delete); if (title) e_dialog_title_set(dia, title); @@ -116,10 +120,10 @@ E_Entry_Dialog *ed; ev = event_info; - if (strcmp(ev->keyname, "Return")) return; if (!(ed = data)) return; - e_object_ref(E_OBJECT(ed)); - if (ed->ok.func) ed->ok.func(ed->text, ed->ok.data); - e_object_del(E_OBJECT(ed)); - e_object_unref(E_OBJECT(ed)); + if (!strcmp(ev->keyname, "Return")) + _e_entry_dialog_ok(data, ed->dia); + else + if (!strcmp(ev->keyname, "Escape")) + _e_entry_dialog_cancel(data, ed->dia); } |
From: Enlightenment S. <no-...@en...> - 2009-04-11 06:20:21
|
Log: allow for system startup .orders... not great - but simple. Author: raster Date: 2009-04-10 23:20:11 -0700 (Fri, 10 Apr 2009) New Revision: 39963 Modified: trunk/e/src/bin/e_startup.c Modified: trunk/e/src/bin/e_startup.c =================================================================== --- trunk/e/src/bin/e_startup.c 2009-04-11 06:13:34 UTC (rev 39962) +++ trunk/e/src/bin/e_startup.c 2009-04-11 06:20:11 UTC (rev 39963) @@ -20,14 +20,23 @@ EAPI void e_startup(E_Startup_Mode mode) { - const char *homedir; + const char *homedir, *prefixdir; char buf[PATH_MAX]; homedir = e_user_homedir_get(); + prefixdir = e_prefix_data_get(); if (mode == E_STARTUP_START) - snprintf(buf, sizeof(buf), "%s/.e/e/applications/startup/.order", homedir); + { + snprintf(buf, sizeof(buf), "%s/.e/e/applications/startup/.order", homedir); + if (!ecore_file_exists(buf)) + snprintf(buf, sizeof(buf), "%s/data/applications/startup/.order", prefixdir); + } else if (mode == E_STARTUP_RESTART) - snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order", homedir); + { + snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order", homedir); + if (!ecore_file_exists(buf)) + snprintf(buf, sizeof(buf), "%s/data/applications/restart/.order", prefixdir); + } startup_apps = e_order_new(buf); if (!startup_apps) return; start_app_pos = 0; |
From: Enlightenment S. <no-...@en...> - 2009-04-15 04:52:50
|
Log: and handle premapped windows Author: raster Date: 2009-04-14 21:52:40 -0700 (Tue, 14 Apr 2009) New Revision: 40075 Modified: trunk/e/src/bin/e_manager.c Modified: trunk/e/src/bin/e_manager.c =================================================================== --- trunk/e/src/bin/e_manager.c 2009-04-15 03:14:41 UTC (rev 40074) +++ trunk/e/src/bin/e_manager.c 2009-04-15 04:52:40 UTC (rev 40075) @@ -156,6 +156,7 @@ /* a manager is designated for each root. lets get all the windows in the managers root */ + printf("--------BD DO!!!\n"); windows = ecore_x_window_children_get(man->root, &wnum); if (windows) { @@ -183,7 +184,8 @@ unsigned int ret_val, deskxy[2]; int ret; - if (e_border_find_by_client_window(windows[i])) continue; + if (e_border_find_by_client_window(windows[i])) + continue; ecore_x_window_attributes_get(windows[i], &att); if ((att.override) || (att.input_only)) { @@ -209,7 +211,7 @@ } } else - continue; + continue; } if (!ecore_x_window_prop_property_get(windows[i], atom_xmbed, @@ -299,7 +301,11 @@ con = e_container_current_get(man); bd = e_border_new(con, windows[i], 1, 0); - if (bd) e_border_show(bd); + if (bd) + { + bd->ignore_first_unmap = 1; + e_border_show(bd); + } } } free(windows); |
From: Enlightenment S. <no-...@en...> - 2009-04-18 13:52:30
|
Log: 1. fix thumb to not use preload thread - i spotted bugs. concurrency ones. 2. also write a sort id (harmless - doesnt affect anything). useful for... sorting. Author: raster Date: 2009-04-18 06:52:24 -0700 (Sat, 18 Apr 2009) New Revision: 40166 Modified: trunk/e/src/bin/Makefile.am trunk/e/src/bin/e_thumb.c trunk/e/src/bin/e_thumb.h trunk/e/src/bin/e_thumb_main.c Modified: trunk/e/src/bin/Makefile.am =================================================================== --- trunk/e/src/bin/Makefile.am 2009-04-18 13:47:29 UTC (rev 40165) +++ trunk/e/src/bin/Makefile.am 2009-04-18 13:52:24 UTC (rev 40166) @@ -344,7 +344,7 @@ e_user.c \ e_sha1.c -enlightenment_thumb_LDADD = @E_THUMB_LIBS@ +enlightenment_thumb_LDADD = @E_THUMB_LIBS@ -lm enlightenment_fm_SOURCES = \ e_fm_main.c \ Modified: trunk/e/src/bin/e_thumb.c =================================================================== --- trunk/e/src/bin/e_thumb.c 2009-04-18 13:47:29 UTC (rev 40165) +++ trunk/e/src/bin/e_thumb.c 2009-04-18 13:52:24 UTC (rev 40166) @@ -11,6 +11,7 @@ int w, h; const char *file; const char *key; + char *sort_id; unsigned char queued : 1; unsigned char busy : 1; unsigned char done : 1; @@ -108,6 +109,8 @@ eth->file = NULL; if (eth->key) eina_stringshare_del(eth->key); eth->key = NULL; + if (eth->sort_id) free(eth->sort_id); + eth->sort_id = NULL; if (file) eth->file = eina_stringshare_add(file); if (key) eth->key = eina_stringshare_add(key); } @@ -201,7 +204,44 @@ e_thumb_icon_begin(obj); } +#define A(v) (((v) >> 24) & 0xff) +#define R(v) (((v) >> 16) & 0xff) +#define G(v) (((v) >> 8 ) & 0xff) +#define B(v) (((v) ) & 0xff) +#define PIX(p, x, y) p[((y) << 2) + (x)] +#define PIX2(p, x, y) p[((y) << 1) + (x)] +static void +_e_thumb_key_load(E_Thumb *eth, const char *icon) +{ + Eet_File *ef; + int size = 0; + + ef = eet_open(icon, EET_FILE_MODE_READ); + if (!ef) return; + eth->sort_id = eet_read(ef, "/thumbnail/sort_id", &size); + if (eth->sort_id) + { + if (size > 0) eth->sort_id[size - 1] = 0; + else + { + free(eth->sort_id); + eth->sort_id = NULL; + } + } + eet_close(ef); +} + +EAPI const char * +e_thumb_sort_id_get(Evas_Object *obj) +{ + E_Thumb *eth; + eth = evas_object_data_get(obj, "e_thumbdata"); + if (!eth) return ""; + if (!eth->sort_id) return ""; + return eth->sort_id; +} + EAPI void e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e) { @@ -228,9 +268,10 @@ _pending--; eth->done = 1; if (_pending == 0) _e_thumb_thumbnailers_kill(); - e_icon_preload_set(obj, 1); +//y// e_icon_preload_set(obj, 1); e_icon_file_key_set(obj, icon, "/thumbnail/data"); -//x// evas_object_smart_callback_call(obj, "e_thumb_gen", NULL); + _e_thumb_key_load(eth, icon); + evas_object_smart_callback_call(obj, "e_thumb_gen", NULL); } } } @@ -316,6 +357,7 @@ _thumb_queue = eina_list_remove(_thumb_queue, eth); if (eth->file) eina_stringshare_del(eth->file); if (eth->key) eina_stringshare_del(eth->key); + if (eth->sort_id) free(eth->sort_id); free(eth); } Modified: trunk/e/src/bin/e_thumb.h =================================================================== --- trunk/e/src/bin/e_thumb.h 2009-04-18 13:47:29 UTC (rev 40165) +++ trunk/e/src/bin/e_thumb.h 2009-04-18 13:52:24 UTC (rev 40166) @@ -17,7 +17,8 @@ EAPI void e_thumb_icon_begin(Evas_Object *obj); EAPI void e_thumb_icon_end(Evas_Object *obj); EAPI void e_thumb_icon_rethumb(Evas_Object *obj); - +EAPI const char *e_thumb_sort_id_get(Evas_Object *obj); + EAPI void e_thumb_client_data(Ecore_Ipc_Event_Client_Data *e); EAPI void e_thumb_client_del(Ecore_Ipc_Event_Client_Del *e); Modified: trunk/e/src/bin/e_thumb_main.c =================================================================== --- trunk/e/src/bin/e_thumb_main.c 2009-04-18 13:47:29 UTC (rev 40165) +++ trunk/e/src/bin/e_thumb_main.c 2009-04-18 13:52:24 UTC (rev 40166) @@ -5,6 +5,7 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> +#include <math.h> #include <Ecore.h> #include <Ecore_Evas.h> #include <Ecore_Ipc.h> @@ -236,6 +237,23 @@ return 0; } +typedef struct _Color Color; + +struct _Color +{ + Color *closest; + int closest_dist; + int use; + unsigned char r, g, b; +}; + +static int +_sort_col(const void *d1, const void *d2) +{ + Color *c1 = (Color *)d1, *c2 = (Color *)d2; + return c2->use - c1->use; +} + static void _e_thumb_generate(E_Thumb *eth) { @@ -245,7 +263,7 @@ Evas_Object *im = NULL, *edje = NULL; Eet_File *ef; int iw, ih, alpha, ww, hh; - int *data = NULL; + unsigned int *data = NULL; time_t mtime_orig, mtime_thumb; id = _e_thumb_file_id(eth->file, eth->key); @@ -294,7 +312,7 @@ evas_im = ecore_evas_get(ee_im); evas_image_cache_set(evas_im, 0); evas_font_cache_set(evas_im, 0); - evas_object_image_size_set(im, ww * 8, hh * 8); + evas_object_image_size_set(im, ww * 4, hh * 4); evas_object_image_fill_set(im, 0, 0, ww, hh); edje = edje_object_add(evas_im); if ((eth->key) && @@ -304,7 +322,7 @@ if (edje_object_file_set(edje, eth->file, eth->key)) { evas_object_move(edje, 0, 0); - evas_object_resize(edje, ww * 8, hh * 8); + evas_object_resize(edje, ww * 4, hh * 4); evas_object_show(edje); } } @@ -348,10 +366,136 @@ eet_data_image_write(ef, "/thumbnail/data", (void *)data, ww, hh, alpha, 0, 91, 1); + ww = 4; hh = 4; + evas_object_image_fill_set(im, 0, 0, ww, hh); + evas_object_resize(im, ww, hh); + ecore_evas_resize(ee, ww, hh); + data = (int *)ecore_evas_buffer_pixels_get(ee); + if (data) + { + unsigned int *data1; + + data1 = malloc(ww * hh * sizeof(unsigned int)); + memcpy(data1, data, ww * hh * sizeof(unsigned int)); + ww = 2; hh = 2; + evas_object_image_fill_set(im, 0, 0, ww, hh); + evas_object_resize(im, ww, hh); + ecore_evas_resize(ee, ww, hh); + data = (int *)ecore_evas_buffer_pixels_get(ee); + if (data) + { + unsigned int *data2; + + data2 = malloc(ww * hh * sizeof(unsigned int)); + memcpy(data2, data, ww * hh * sizeof(unsigned int)); + ww = 1; hh = 1; + evas_object_image_fill_set(im, 0, 0, ww, hh); + evas_object_resize(im, ww, hh); + ecore_evas_resize(ee, ww, hh); + data = (int *)ecore_evas_buffer_pixels_get(ee); + if (data) + { + unsigned int *data3; + unsigned char id[(21 * 4) + 1]; + int n, i; + int hi, si, vi; + float h, s, v; + const int pat2[4] = + { + 0, 3, 1, 2 + }; + const int pat1[16] = + { + 5, 10, 6, 9, + 0, 15, 3, 12, + 1, 14, 7, 8, + 4, 11, 2, 13 + }; + + data3 = malloc(ww * hh * sizeof(unsigned int)); + memcpy(data3, data, ww * hh * sizeof(unsigned int)); + // sort_id + n = 0; +#define A(v) (((v) >> 24) & 0xff) +#define R(v) (((v) >> 16) & 0xff) +#define G(v) (((v) >> 8 ) & 0xff) +#define B(v) (((v) ) & 0xff) +#define HSV(p) \ + evas_color_rgb_to_hsv(R(p), G(p), B(p), &h, &s, &v); \ + hi = 20 * (h / 360.0); \ + si = 20 * s; \ + vi = 20 * v; \ + if (si < 2) hi = 25; +#define SAVEHSV(h, s, v) \ + id[n++] = 'a' + h; \ + id[n++] = 'a' + v; \ + id[n++] = 'a' + s; +#define SAVEX(x) \ + id[n++] = 'a' + x; +#if 0 + HSV(data3[0]); + SAVEHSV(hi, si, vi); + for (i = 0; i < 4; i++) + { + HSV(data2[pat2[i]]); + SAVEHSV(hi, si, vi); + } + for (i = 0; i < 16; i++) + { + HSV(data1[pat1[i]]); + SAVEHSV(hi, si, vi); + } +#else + HSV(data3[0]); + SAVEX(hi); + for (i = 0; i < 4; i++) + { + HSV(data2[pat2[i]]); + SAVEX(hi); + } + for (i = 0; i < 16; i++) + { + HSV(data1[pat1[i]]); + SAVEX(hi); + } + HSV(data3[0]); + SAVEX(vi); + for (i = 0; i < 4; i++) + { + HSV(data2[pat2[i]]); + SAVEX(vi); + } + for (i = 0; i < 16; i++) + { + HSV(data1[pat1[i]]); + SAVEX(vi); + } + HSV(data3[0]); + SAVEX(si); + for (i = 0; i < 4; i++) + { + HSV(data2[pat2[i]]); + SAVEX(si); + } + for (i = 0; i < 16; i++) + { + HSV(data1[pat1[i]]); + SAVEX(si); + } +#endif + id[n++] = 0; + eet_write(ef, "/thumbnail/sort_id", id, n, 1); + free(data3); + } + free(data2); + } + free(data1); + } eet_close(ef); } } } + /* will free all */ if (edje) evas_object_del(edje); if (ee_im) ecore_evas_free(ee_im); |
From: Enlightenment S. <no-...@en...> - 2009-04-18 13:53:33
|
Log: -lm -- and printf-- Author: raster Date: 2009-04-18 06:53:23 -0700 (Sat, 18 Apr 2009) New Revision: 40168 Modified: trunk/e/src/bin/Makefile.am trunk/e/src/bin/e_thumb_main.c Modified: trunk/e/src/bin/Makefile.am =================================================================== --- trunk/e/src/bin/Makefile.am 2009-04-18 13:52:41 UTC (rev 40167) +++ trunk/e/src/bin/Makefile.am 2009-04-18 13:53:23 UTC (rev 40168) @@ -344,7 +344,7 @@ e_user.c \ e_sha1.c -enlightenment_thumb_LDADD = @E_THUMB_LIBS@ -lm +enlightenment_thumb_LDADD = @E_THUMB_LIBS@ enlightenment_fm_SOURCES = \ e_fm_main.c \ Modified: trunk/e/src/bin/e_thumb_main.c =================================================================== --- trunk/e/src/bin/e_thumb_main.c 2009-04-18 13:52:41 UTC (rev 40167) +++ trunk/e/src/bin/e_thumb_main.c 2009-04-18 13:53:23 UTC (rev 40168) @@ -5,7 +5,6 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> -#include <math.h> #include <Ecore.h> #include <Ecore_Evas.h> #include <Ecore_Ipc.h> |
From: Enlightenment S. <no-...@en...> - 2009-05-09 10:26:30
|
Log: mount by label first - more useful in real life Author: raster Date: 2009-05-09 03:26:12 -0700 (Sat, 09 May 2009) New Revision: 40566 Modified: trunk/e/src/bin/e_fm_hal.c Modified: trunk/e/src/bin/e_fm_hal.c =================================================================== --- trunk/e/src/bin/e_fm_hal.c 2009-05-09 06:59:00 UTC (rev 40565) +++ trunk/e/src/bin/e_fm_hal.c 2009-05-09 10:26:12 UTC (rev 40566) @@ -382,10 +382,10 @@ return strdup(v->mount_point); } - if (v->uuid && v->uuid[0] != '\0') + if (v->label && v->label[0] != '\0') + snprintf(buf, sizeof(buf) - 1, "/media/%s", v->label); + else if (v->uuid && v->uuid[0] != '\0') snprintf(buf, sizeof(buf) - 1, "/media/%s", v->uuid); - else if (v->label && v->label[0] != '\0') - snprintf(buf, sizeof(buf) - 1, "/media/%s", v->label); else if ((v->storage) && (v->storage->serial) && v->storage->serial[0] != '\0') snprintf(buf, sizeof(buf) - 1, "/media/%s", v->storage->serial); else |
From: Enlightenment S. <no-...@en...> - 2009-07-17 01:42:45
|
Log: fix placement to actually respect overlay allow of shelves Author: raster Date: 2009-07-16 18:42:37 -0700 (Thu, 16 Jul 2009) New Revision: 41376 Modified: trunk/e/src/bin/e_grabinput.c trunk/e/src/bin/e_place.c Modified: trunk/e/src/bin/e_grabinput.c =================================================================== --- trunk/e/src/bin/e_grabinput.c 2009-07-16 23:13:16 UTC (rev 41375) +++ trunk/e/src/bin/e_grabinput.c 2009-07-17 01:42:37 UTC (rev 41376) @@ -121,6 +121,7 @@ break; case E_FOCUS_METHOD_LOCALLY_ACTIVE: ecore_x_window_focus(win); + ecore_x_sync(); // let x actually get the x focus request ecore_x_icccm_take_focus_send(win, ecore_x_current_time_get()); break; case E_FOCUS_METHOD_GLOBALLY_ACTIVE: Modified: trunk/e/src/bin/e_place.c =================================================================== --- trunk/e/src/bin/e_place.c 2009-07-16 23:13:16 UTC (rev 41375) +++ trunk/e/src/bin/e_place.c 2009-07-17 01:42:37 UTC (rev 41376) @@ -121,7 +121,23 @@ if (es->zone != zone) continue; x2 = es->x; y2 = es->y; w2 = es->w; h2 = es->h; if (E_INTERSECTS(x, y, w, h, x2, y2, w2, h2)) - return 0x7fffffff; + { + int x0, x00, y0, y00; + int iw, ih; + + if (!es->cfg->overlap) return 0x7fffffff; + x0 = x; + if (x < x2) x0 = x2; + x00 = (x + w); + if ((x2 + w2) < (x + w)) x00 = (x2 + w2); + y0 = y; + if (y < y2) y0 = y2; + y00 = (y + h); + if ((y2 + h2) < (y + h)) y00 = (y2 + h2); + iw = x00 - x0; + ih = y00 - y0; + ar += (iw * ih); + } } return ar; } |