From: Enlightenment S. <no-...@en...> - 2008-09-25 01:01:17
|
Log: fix remember to actually rememebr skip* stuff and save it Author: raster Date: 2008-09-24 18:01:07 -0700 (Wed, 24 Sep 2008) New Revision: 36227 Modified: trunk/e/src/bin/e_border.c trunk/e/src/bin/e_config.c Modified: trunk/e/src/bin/e_border.c =================================================================== --- trunk/e/src/bin/e_border.c 2008-09-25 00:40:56 UTC (rev 36226) +++ trunk/e/src/bin/e_border.c 2008-09-25 01:01:07 UTC (rev 36227) @@ -5946,7 +5946,7 @@ if (bd->remember) { rem = bd->remember; - + if (rem->apply & E_REMEMBER_APPLY_ZONE) { E_Zone *zone; Modified: trunk/e/src/bin/e_config.c =================================================================== --- trunk/e/src/bin/e_config.c 2008-09-25 00:40:56 UTC (rev 36226) +++ trunk/e/src/bin/e_config.c 2008-09-25 01:01:07 UTC (rev 36227) @@ -343,6 +343,8 @@ E_CONFIG_VAL(D, T, prop.sticky, UCHAR); E_CONFIG_VAL(D, T, prop.shaded, UCHAR); E_CONFIG_VAL(D, T, prop.skip_winlist, UCHAR); + E_CONFIG_VAL(D, T, prop.skip_pager, UCHAR); + E_CONFIG_VAL(D, T, prop.skip_taskbar, UCHAR); E_CONFIG_VAL(D, T, prop.desk_x, INT); E_CONFIG_VAL(D, T, prop.desk_y, INT); E_CONFIG_VAL(D, T, prop.zone, INT); |
From: Enlightenment S. <no-...@en...> - 2008-09-25 04:47:37
|
Log: shorter text for disable Author: raster Date: 2008-09-24 21:47:27 -0700 (Wed, 24 Sep 2008) New Revision: 36237 Modified: trunk/e/src/bin/e_init_main.c Modified: trunk/e/src/bin/e_init_main.c =================================================================== --- trunk/e/src/bin/e_init_main.c 2008-09-25 04:30:53 UTC (rev 36236) +++ trunk/e/src/bin/e_init_main.c 2008-09-25 04:47:27 UTC (rev 36237) @@ -305,7 +305,7 @@ } edje_object_part_text_set(_e_init_object, "e.text.disable_text", - "Disable this splash screen in the future?"); + "Disable this splash screen"); edje_object_signal_callback_add(_e_init_object, "e,action,init,disable", "e", _e_init_cb_signal_disable, NULL); edje_object_signal_callback_add(_e_init_object, "e,action,init,enable", "e", |
From: Enlightenment S. <no-...@en...> - 2008-09-25 14:15:25
|
Log: reduce text. Author: raster Date: 2008-09-25 07:15:16 -0700 (Thu, 25 Sep 2008) New Revision: 36254 Modified: trunk/e/src/bin/e_init.c Modified: trunk/e/src/bin/e_init.c =================================================================== --- trunk/e/src/bin/e_init.c 2008-09-25 13:52:56 UTC (rev 36253) +++ trunk/e/src/bin/e_init.c 2008-09-25 14:15:16 UTC (rev 36254) @@ -359,7 +359,7 @@ if (s) evas_stringshare_del(s); edje_object_part_text_set(_e_init_object, "e.text.disable_text", - _("Disable this splash screen in the future?")); + _("Disable splash screen")); edje_object_signal_callback_add(_e_init_object, "e,action,init,disable", "e", _e_init_cb_signal_disable, NULL); edje_object_signal_callback_add(_e_init_object, "e,action,init,enable", "e", |
From: Enlightenment S. <no-...@en...> - 2008-09-25 14:16:35
|
Log: and match both text to be smaller. Author: raster Date: 2008-09-25 07:16:30 -0700 (Thu, 25 Sep 2008) New Revision: 36255 Modified: trunk/e/src/bin/e_init_main.c Modified: trunk/e/src/bin/e_init_main.c =================================================================== --- trunk/e/src/bin/e_init_main.c 2008-09-25 14:15:16 UTC (rev 36254) +++ trunk/e/src/bin/e_init_main.c 2008-09-25 14:16:30 UTC (rev 36255) @@ -305,7 +305,7 @@ } edje_object_part_text_set(_e_init_object, "e.text.disable_text", - "Disable this splash screen"); + "Disable splash screen"); edje_object_signal_callback_add(_e_init_object, "e,action,init,disable", "e", _e_init_cb_signal_disable, NULL); edje_object_signal_callback_add(_e_init_object, "e,action,init,enable", "e", |
From: Enlightenment S. <no-...@en...> - 2008-09-26 17:00:42
|
Log: add auto-scrolloption to dialogs (place content in scrolled viw). Author: raster Date: 2008-09-26 10:00:32 -0700 (Fri, 26 Sep 2008) New Revision: 36268 Modified: trunk/e/src/bin/e_config_dialog.c trunk/e/src/bin/e_config_dialog.h Modified: trunk/e/src/bin/e_config_dialog.c =================================================================== --- trunk/e/src/bin/e_config_dialog.c 2008-09-26 15:27:46 UTC (rev 36267) +++ trunk/e/src/bin/e_config_dialog.c 2008-09-26 17:00:32 UTC (rev 36268) @@ -163,7 +163,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type) { E_Dialog *pdia; - Evas_Object *o, *ob; + Evas_Object *o, *ob, *sf; Evas_Coord mw = 0, mh = 0; char buf[256]; @@ -186,14 +186,28 @@ { o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0); ob = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); - e_widget_list_object_append(o, ob, 1, 1, 0.0); + if (cfd->view->scroll) + { + e_widget_min_size_resize(ob); + sf = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), ob); + e_widget_list_object_append(o, sf, 1, 1, 0.0); + } + else + e_widget_list_object_append(o, ob, 1, 1, 0.0); ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), _("Advanced"), "widget/new_dialog", _e_config_dialog_cb_advanced, cfd, NULL); e_widget_list_object_append(o, ob, 0, 0, 1.0); } else - o = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + { + o = cfd->view->basic.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + if (cfd->view->scroll) + { + e_widget_min_size_resize(o); + o = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), o); + } + } } else { @@ -201,14 +215,28 @@ { o = e_widget_list_add(e_win_evas_get(cfd->dia->win), 0, 0); ob = cfd->view->advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); - e_widget_list_object_append(o, ob, 1, 1, 0.0); + if (cfd->view->scroll) + { + e_widget_min_size_resize(ob); + sf = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), ob); + e_widget_list_object_append(o, sf, 1, 1, 0.0); + } + else + e_widget_list_object_append(o, ob, 1, 1, 0.0); ob = e_widget_button_add(e_win_evas_get(cfd->dia->win), _("Basic"), "widget/new_dialog", _e_config_dialog_cb_basic, cfd, NULL); e_widget_list_object_append(o, ob, 0, 0, 1.0); } else - o = cfd->view->advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + { + o = cfd->view->advanced.create_widgets(cfd, e_win_evas_get(cfd->dia->win), cfd->cfdata); + if (cfd->view->scroll) + { + e_widget_min_size_resize(o); + o = e_widget_scrollframe_simple_add(e_win_evas_get(cfd->dia->win), o); + } + } } e_widget_min_size_get(o, &mw, &mh); Modified: trunk/e/src/bin/e_config_dialog.h =================================================================== --- trunk/e/src/bin/e_config_dialog.h 2008-09-26 15:27:46 UTC (rev 36267) +++ trunk/e/src/bin/e_config_dialog.h 2008-09-26 17:00:32 UTC (rev 36268) @@ -25,6 +25,7 @@ unsigned char override_auto_apply : 1; unsigned char basic_only : 1; unsigned char normal_win : 1; + unsigned char scroll : 1; void *(*create_cfdata) (E_Config_Dialog *cfd); void (*free_cfdata) (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); |
From: Enlightenment S. <no-...@en...> - 2008-10-19 04:23:09
|
Log: fix theme about to use max size.. properly. and calc min size too. Author: raster Date: 2008-10-18 21:23:04 -0700 (Sat, 18 Oct 2008) New Revision: 36799 Modified: trunk/e/src/bin/e_theme_about.c Modified: trunk/e/src/bin/e_theme_about.c =================================================================== --- trunk/e/src/bin/e_theme_about.c 2008-10-19 04:22:51 UTC (rev 36798) +++ trunk/e/src/bin/e_theme_about.c 2008-10-19 04:23:04 UTC (rev 36799) @@ -69,8 +69,7 @@ o = edje_object_add(e_win_evas_get(about->win)); about->bg_object = o; - e_theme_edje_object_set(o, "base/theme", - "e/theme/about"); + e_theme_edje_object_set(o, "base/theme", "e/theme/about"); evas_object_move(o, 0, 0); evas_object_show(o); @@ -85,9 +84,10 @@ EAPI void e_theme_about_show(E_Theme_About *about) { - Evas_Coord w, h, mw, mh; + Evas_Coord w, h, mw, mh, mcw, mch; edje_object_size_min_get(about->bg_object, &mw, &mh); + edje_object_size_min_restricted_calc(about->bg_object, &mw, &mh, mw, mh); evas_object_resize(about->bg_object, mw, mh); e_win_resize(about->win, mw, mh); e_win_size_min_set(about->win, mw, mh); @@ -97,7 +97,7 @@ { if (w < mw) w = mw; if (h < mh) h = mh; - e_win_size_max_set(about->win, mw, mh); + e_win_size_max_set(about->win, w, h); } e_win_show(about->win); e_win_border_icon_set(about->win, "enlightenment/themes"); |
From: Enlightenment S. <no-...@en...> - 2008-10-19 14:15:33
|
Log: oh yeah. handle sizing right. Author: raster Date: 2008-10-19 07:15:23 -0700 (Sun, 19 Oct 2008) New Revision: 36818 Modified: trunk/e/src/bin/e_about.c Modified: trunk/e/src/bin/e_about.c =================================================================== --- trunk/e/src/bin/e_about.c 2008-10-19 14:13:17 UTC (rev 36817) +++ trunk/e/src/bin/e_about.c 2008-10-19 14:15:23 UTC (rev 36818) @@ -158,7 +158,7 @@ Evas_Coord w, h, mw, mh; edje_object_size_min_get(about->bg_object, &w, &h); - edje_object_size_min_calc(about->bg_object, &mw, &mh); + edje_object_size_min_restricted_calc(about->bg_object, &mw, &mh, w, h); if (w > mw) mw = w; if (h > mh) mh = h; evas_object_resize(about->bg_object, mw, mh); @@ -170,7 +170,7 @@ { if (w < mw) w = mw; if (h < mh) h = mh; - e_win_size_max_set(about->win, mw, mh); + e_win_size_max_set(about->win, w, h); } e_win_show(about->win); } |
From: Enlightenment S. <no-...@en...> - 2008-10-20 03:30:29
|
Log: was using this for debugging. keep it there for future reference. didn't know we had such malloc hooks! i might consider using these in future! Author: raster Date: 2008-10-19 20:30:22 -0700 (Sun, 19 Oct 2008) New Revision: 36831 Modified: trunk/e/src/bin/e_main.c Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2008-10-20 02:45:38 UTC (rev 36830) +++ trunk/e/src/bin/e_main.c 2008-10-20 03:30:22 UTC (rev 36831) @@ -7,6 +7,53 @@ #include <Ecore_IMF.h> #endif +/* + * i need to make more use of these when i'm baffled as to when something is + * up. other hooks: + * + * void *(*__malloc_hook)(size_t size, const void *caller); + * + * void *(*__realloc_hook)(void *ptr, size_t size, const void *caller); + * + * void *(*__memalign_hook)(size_t alignment, size_t size, + * const void *caller); + * + * void (*__free_hook)(void *ptr, const void *caller); + * + * void (*__malloc_initialize_hook)(void); + * + * void (*__after_morecore_hook)(void); + * + +static void my_init_hook(void); +static void my_free_hook(void *p, const void *caller); + +static void (*old_free_hook)(void *ptr, const void *caller) = NULL; +void (*__free_hook)(void *ptr, const void *caller); + +void (*__malloc_initialize_hook) (void) = my_init_hook; +static void +my_init_hook(void) +{ + old_free_hook = __free_hook; + __free_hook = my_free_hook; +} + +//void *magicfree = NULL; + +static void my_free_hook(void *p, const void *caller) +{ + __free_hook = old_free_hook; +// if ((p) && (p == magicfree)) +// { +// printf("CAUGHT!!!!! %p ...\n", p); +// abort(); +// } + free(p); + __free_hook = my_free_hook; +} +*/ + EAPI int e_precache_end = 0; /* local subsystem functions */ |
From: Enlightenment S. <no-...@en...> - 2008-10-23 00:55:25
|
Log: enable instant_edit (pesss and hold for 1 second to drag around) Author: raster Date: 2008-10-22 17:55:21 -0700 (Wed, 22 Oct 2008) New Revision: 37009 Modified: trunk/e/src/bin/e_shelf.c Modified: trunk/e/src/bin/e_shelf.c =================================================================== --- trunk/e/src/bin/e_shelf.c 2008-10-23 00:51:42 UTC (rev 37008) +++ trunk/e/src/bin/e_shelf.c 2008-10-23 00:55:21 UTC (rev 37009) @@ -158,6 +158,7 @@ } es->gadcon = e_gadcon_swallowed_new(es->name, es->id, es->o_base, "e.swallow.content"); + es->gadcon->instant_edit = 1; e_gadcon_min_size_request_callback_set(es->gadcon, _e_shelf_gadcon_min_size_request, es); |
From: Enlightenment S. <no-...@en...> - 2008-10-23 04:49:56
|
Log: instant edit -- Author: raster Date: 2008-10-22 21:49:52 -0700 (Wed, 22 Oct 2008) New Revision: 37012 Modified: trunk/e/src/bin/e_shelf.c Modified: trunk/e/src/bin/e_shelf.c =================================================================== --- trunk/e/src/bin/e_shelf.c 2008-10-23 03:58:18 UTC (rev 37011) +++ trunk/e/src/bin/e_shelf.c 2008-10-23 04:49:52 UTC (rev 37012) @@ -158,7 +158,8 @@ } es->gadcon = e_gadcon_swallowed_new(es->name, es->id, es->o_base, "e.swallow.content"); - es->gadcon->instant_edit = 1; +// hmm dnd in ibar and ibox kill this. ok. need to look into this more +// es->gadcon->instant_edit = 1; e_gadcon_min_size_request_callback_set(es->gadcon, _e_shelf_gadcon_min_size_request, es); |
From: Enlightenment S. <no-...@en...> - 2008-10-26 09:17:50
|
Log: sort profiles. Author: raster Date: 2008-10-26 02:11:49 -0700 (Sun, 26 Oct 2008) New Revision: 37121 Modified: trunk/e/src/bin/e_config.c Modified: trunk/e/src/bin/e_config.c =================================================================== --- trunk/e/src/bin/e_config.c 2008-10-26 09:11:45 UTC (rev 37120) +++ trunk/e/src/bin/e_config.c 2008-10-26 09:11:49 UTC (rev 37121) @@ -1409,6 +1409,11 @@ return NULL; } +static int _cb_sort_files(char *f1, char *f2) +{ + return strcmp(f1, f2); +} + EAPI Eina_List * e_config_profile_list(void) { @@ -1425,6 +1430,7 @@ { char *file; + ecore_list_sort(files, ECORE_COMPARE_CB(_cb_sort_files), ECORE_SORT_MIN); ecore_list_first_goto(files); while ((file = ecore_list_current(files))) { @@ -1442,6 +1448,7 @@ { char *file; + ecore_list_sort(files, ECORE_COMPARE_CB(_cb_sort_files), ECORE_SORT_MIN); ecore_list_first_goto(files); while ((file = ecore_list_current(files))) { |
From: Enlightenment S. <no-...@en...> - 2008-10-26 22:45:01
|
Log: oops. i was on drugs that day. wrong call (right parameters!) good catch Author: raster Date: 2008-10-26 15:44:57 -0700 (Sun, 26 Oct 2008) New Revision: 37178 Modified: trunk/e/src/bin/e_desklock.c Modified: trunk/e/src/bin/e_desklock.c =================================================================== --- trunk/e/src/bin/e_desklock.c 2008-10-26 20:50:21 UTC (rev 37177) +++ trunk/e/src/bin/e_desklock.c 2008-10-26 22:44:57 UTC (rev 37178) @@ -297,8 +297,7 @@ edje_object_part_text_set(edp->login_box, "e.text.title", _("Please enter your unlock password")); edje_object_size_min_calc(edp->login_box, &mw, &mh); - /* FIXME: This is wrong, edje_file_group_exists needs a file, not an object! */ - if (edje_file_group_exists(edp->bg_object, "e.swallow.login_box")) + if (edje_object_part_exists(edp->bg_object, "e.swallow.login_box")) { edje_extern_object_min_size_set(edp->login_box, mw, mh); edje_object_part_swallow(edp->bg_object, "e.swallow.login_box", edp->login_box); |
From: Enlightenment S. <no-...@en...> - 2008-10-27 00:38:06
|
Log: add a (disabled) dump call for string dumping. Author: raster Date: 2008-10-26 17:38:03 -0700 (Sun, 26 Oct 2008) New Revision: 37187 Modified: trunk/e/src/bin/e_main.c Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2008-10-27 00:36:22 UTC (rev 37186) +++ trunk/e/src/bin/e_main.c 2008-10-27 00:38:03 UTC (rev 37187) @@ -106,7 +106,14 @@ #else #define TS(x) #endif - + +static int stdbg(void) +{ +// enable to debug eina stringshare usage +// eina_stringshare_dump(); + return 0; +} + /* externally accessible functions */ int main(int argc, char **argv) @@ -994,6 +1001,9 @@ /* no longer starting up */ starting = 0; /* start our main loop */ + + ecore_timer_add(5.0, stdbg, NULL); + ecore_main_loop_begin(); e_canvas_idle_flush(); |
From: Enlightenment S. <no-...@en...> - 2008-10-27 05:30:45
|
Log: an d link to e_hal in e17's bin too Author: raster Date: 2008-10-26 22:30:39 -0700 (Sun, 26 Oct 2008) New Revision: 37197 Modified: trunk/e/src/bin/Makefile.am Modified: trunk/e/src/bin/Makefile.am =================================================================== --- trunk/e/src/bin/Makefile.am 2008-10-27 05:24:12 UTC (rev 37196) +++ trunk/e/src/bin/Makefile.am 2008-10-27 05:30:39 UTC (rev 37197) @@ -7,6 +7,7 @@ @cf_cflags@ \ @VALGRIND_CFLAGS@ \ @EDJE_DEF@ \ + @E_HAL_CFLAGS@ \ -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \ @@ -304,7 +305,7 @@ e_main.c \ $(enlightenment_src) -enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @E_DBUS_LIBS@ +enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @E_DBUS_LIBS@ @E_HAL_LIBS@ enlightenment_remote_SOURCES = \ e.h \ |
From: Enlightenment S. <no-...@en...> - 2008-10-28 13:32:27
|
Log: try and make intl more forgiving of encoding-free locales (assume encoding works?) Author: raster Date: 2008-10-28 06:32:21 -0700 (Tue, 28 Oct 2008) New Revision: 37272 Modified: trunk/e/src/bin/e_intl.c Modified: trunk/e/src/bin/e_intl.c =================================================================== --- trunk/e/src/bin/e_intl.c 2008-10-28 13:30:39 UTC (rev 37271) +++ trunk/e/src/bin/e_intl.c 2008-10-28 13:32:21 UTC (rev 37272) @@ -143,6 +143,7 @@ e_intl_language_set(const char *lang) { int set_envars; + int ok; set_envars = 1; /* NULL lang means set everything back to the original environment @@ -172,12 +173,27 @@ else _e_intl_language = NULL; - if ((!_e_intl_locale_validate(_e_intl_language_alias)) && - (strcmp(_e_intl_language_alias, "C"))) + ok = 1; + if (strcmp(_e_intl_language_alias, "C")) { + ok = _e_intl_locale_validate(_e_intl_language_alias); + if (!ok) + { + char *p, *new_lang; + + new_lang = _e_intl_language_alias; + p = strchr(new_lang, '.'); + if (p) *p = 0; + _e_intl_language_alias = strdup(new_lang); + E_FREE(new_lang); + ok = _e_intl_locale_validate(_e_intl_language_alias); + } + } + if (!ok) + { fprintf(stderr, "The locale '%s' cannot be found on your " - "system. Please install this locale or try " - "something else.", _e_intl_language_alias); + "system. Please install this locale or try " + "something else.", _e_intl_language_alias); } else { @@ -563,6 +579,7 @@ Evas_Hash *alias_hash; char *alias; char *lower_language; + char *noenc_language; int i; if ((language == NULL) || (!strncmp(language, "POSIX", strlen("POSIX")))) @@ -900,7 +917,6 @@ locale_lr = e_intl_locale_parts_combine(locale_parts, E_INTL_LOC_LANG | E_INTL_LOC_REGION); - if (locale_lr == NULL) { /* Not valid locale, maybe its an alias */ |
From: Enlightenment S. <no-...@en...> - 2008-11-02 01:29:20
|
Log: use priority set call Author: raster Date: 2008-11-01 18:29:15 -0700 (Sat, 01 Nov 2008) New Revision: 37390 Modified: trunk/e/src/bin/e_main.c Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2008-11-02 01:29:08 UTC (rev 37389) +++ trunk/e/src/bin/e_main.c 2008-11-02 01:29:15 UTC (rev 37390) @@ -561,6 +561,9 @@ _e_main_shutdown(-1); } _e_main_shutdown_push(e_config_shutdown); + + /* set all execced stuff to pri 1 - nice. make this config later? */ + ecore_exe_run_priority_set(1); TS("scale"); /* init config system */ |
From: Enlightenment S. <no-...@en...> - 2008-11-03 07:34:54
|
Log: make e_start run dbus-launch - if that fails, fall back. Author: raster Date: 2008-11-02 23:34:44 -0800 (Sun, 02 Nov 2008) New Revision: 37433 Modified: trunk/e/src/bin/e_start_main.c Modified: trunk/e/src/bin/e_start_main.c =================================================================== --- trunk/e/src/bin/e_start_main.c 2008-11-03 07:33:39 UTC (rev 37432) +++ trunk/e/src/bin/e_start_main.c 2008-11-03 07:34:44 UTC (rev 37433) @@ -388,14 +388,27 @@ precache(); } done: + + /* try dbus-launch */ + snprintf(buf, sizeof(buf), "%s/bin/enlightenment", _prefix_path); - args = alloca((argc + 1) * sizeof(char *)); + args = alloca((argc + 3) * sizeof(char *)); + if (!getenv("DBUS_SESSION_BUS_ADDRESS")) + { + args[0] = "dbus-launch"; + args[1] = "--exit-with-session"; + args[2] = buf; + for (i = 1; i < argc; i++) args[2 + i] = argv[i]; + args[2 + i] = NULL; + execvp("dbus-launch", args); + } + + /* dbus-launch failed - run e direct */ args[0] = "enlightenment"; for (i = 1; i < argc; i++) args[i] = argv[i]; args[i] = NULL; - - snprintf(buf, sizeof(buf), "%s/bin/enlightenment", _prefix_path); execv(buf, args); + printf("FAILED TO RUN:\n"); printf(" %s\n", buf); perror("execv"); |
From: Enlightenment S. <no-...@en...> - 2008-11-03 08:56:26
|
Log: thomas fix for single click dirs Author: raster Date: 2008-11-03 00:56:16 -0800 (Mon, 03 Nov 2008) New Revision: 37436 Modified: trunk/e/src/bin/e_fm.c Modified: trunk/e/src/bin/e_fm.c =================================================================== --- trunk/e/src/bin/e_fm.c 2008-11-03 08:21:36 UTC (rev 37435) +++ trunk/e/src/bin/e_fm.c 2008-11-03 08:56:16 UTC (rev 37436) @@ -5155,18 +5155,17 @@ { /* if its a directory && open dirs in-place is set then change the dir * to be the dir + file */ - if ((S_ISDIR(ic->info.statinfo.st_mode)) && + if ( + (S_ISDIR(ic->info.statinfo.st_mode)) && (ic->sd->config->view.open_dirs_in_place) && (!ic->sd->config->view.no_subdir_jump) && (!ic->sd->config->view.single_click) ) { - char buf[4096], *dev = NULL; + char buf[4096]; - if (ic->sd->dev) dev = strdup(ic->sd->dev); snprintf(buf, sizeof(buf), "%s/%s", ic->sd->path, ic->info.file); - e_fm2_path_set(ic->sd->obj, dev, buf); - E_FREE(dev); + e_fm2_path_set(ic->sd->obj, ic->sd->dev, buf); } else evas_object_smart_callback_call(ic->sd->obj, "selected", NULL); @@ -5189,7 +5188,7 @@ ic->drag.dnd = 0; ic->drag.src = 1; } - _e_fm2_mouse_1_handler(ic, 0, ev->modifiers); + _e_fm2_mouse_1_handler(ic, 0, ev->modifiers); } else if (ev->button == 3) { @@ -5214,6 +5213,24 @@ ic->drag.start = 0; ic->drag.dnd = 0; ic->drag.src = 0; + + if ( + (S_ISDIR(ic->info.statinfo.st_mode)) && + (ic->sd->config->view.open_dirs_in_place) && + (!ic->sd->config->view.no_subdir_jump) && + (ic->sd->config->view.single_click) + ) + { + char buf[4096]; + + snprintf(buf, sizeof(buf), "%s/%s", ic->sd->path, ic->info.file); + e_fm2_path_set(ic->sd->obj, ic->sd->dev, buf); + } + else if ((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; } |
From: Enlightenment S. <no-...@en...> - 2008-11-14 10:53:09
|
Log: fix restart! mouse bindings broken! manage windows and use config before config loaded! Author: raster Date: 2008-11-14 02:53:03 -0800 (Fri, 14 Nov 2008) New Revision: 37619 Modified: trunk/e/src/bin/e_main.c trunk/e/src/bin/e_manager.c Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2008-11-14 10:22:57 UTC (rev 37618) +++ trunk/e/src/bin/e_main.c 2008-11-14 10:53:03 UTC (rev 37619) @@ -65,6 +65,7 @@ static int _e_main_dirs_shutdown(void); static int _e_main_screens_init(void); static int _e_main_screens_shutdown(void); +static void _e_main_manage_all(void); static int _e_main_path_init(void); static int _e_main_path_shutdown(void); @@ -1016,6 +1017,9 @@ TS("shelf config init"); e_shelf_config_init(); + TS("manage all windows"); + _e_main_manage_all(); + /* an idle enterer to be called after all others */ _e_main_idle_enterer_after = ecore_idle_enterer_add(_e_main_cb_idler_after, NULL); @@ -1242,7 +1246,7 @@ e_grabinput_focus(con->bg_win, E_FOCUS_METHOD_PASSIVE); e_hints_manager_init(man); _e_main_desk_restore(man, con); - e_manager_manage_windows(man); +// e_manager_manage_windows(man); } else { @@ -1278,6 +1282,15 @@ return 1; } +static void +_e_main_manage_all(void) +{ + Eina_List *l; + + for (l = e_manager_list(); l; l = l->next) + e_manager_manage_windows(l->data); +} + static int _e_main_path_init(void) { Modified: trunk/e/src/bin/e_manager.c =================================================================== --- trunk/e/src/bin/e_manager.c 2008-11-14 10:22:57 UTC (rev 37618) +++ trunk/e/src/bin/e_manager.c 2008-11-14 10:53:03 UTC (rev 37619) @@ -285,7 +285,7 @@ /* FIXME: * It's enough to set the desk, the zone will * be set according to the desk */ - if (zone) e_border_zone_set(bd, zone); +// if (zone) e_border_zone_set(bd, zone); if (desk) e_border_desk_set(bd, desk); } } |
From: Enlightenment S. <no-...@en...> - 2008-11-15 01:26:29
|
Log: leak--! Author: raster Date: 2008-11-14 17:26:20 -0800 (Fri, 14 Nov 2008) New Revision: 37645 Modified: trunk/e/src/bin/e_fm_main.c Modified: trunk/e/src/bin/e_fm_main.c =================================================================== --- trunk/e/src/bin/e_fm_main.c 2008-11-15 00:53:22 UTC (rev 37644) +++ trunk/e/src/bin/e_fm_main.c 2008-11-15 01:26:20 UTC (rev 37645) @@ -434,12 +434,12 @@ _e_dbus_cb_dev_add(void *data, DBusMessage *msg) { DBusError err; - char *udi; + char *udi = NULL; int ret; dbus_error_init(&err); dbus_message_get_args(msg, &err, DBUS_TYPE_STRING, &udi, DBUS_TYPE_INVALID); - udi = strdup(udi); + if (!udi) return; // printf("DB DEV+: %s\n", udi); ret = e_hal_device_query_capability(_e_dbus_conn, udi, "storage", _e_dbus_cb_store_is, strdup(udi)); |
From: Enlightenment S. <no-...@en...> - 2008-11-15 05:12:36
|
Log: disable feeds in popup - its the same window! how did this all of a sudden start happening now?.... hmmmm.. Author: raster Date: 2008-11-14 21:12:31 -0800 (Fri, 14 Nov 2008) New Revision: 37649 Modified: trunk/e/src/bin/e_popup.c Modified: trunk/e/src/bin/e_popup.c =================================================================== --- trunk/e/src/bin/e_popup.c 2008-11-15 04:25:09 UTC (rev 37648) +++ trunk/e/src/bin/e_popup.c 2008-11-15 05:12:31 UTC (rev 37649) @@ -7,15 +7,19 @@ static void _e_popup_free(E_Popup *pop); static int _e_popup_cb_window_shape(void *data, int ev_type, void *ev); static E_Popup *_e_popup_find_by_window(Ecore_X_Window win); +/* static int _e_popup_cb_mouse_down(void *data, int type, void *event); static int _e_popup_cb_mouse_up(void *data, int type, void *event); static int _e_popup_cb_mouse_wheel(void *data, int type, void *event); +*/ /* local subsystem globals */ static Ecore_Event_Handler *_e_popup_window_shape_handler = NULL; +/* static Ecore_Event_Handler *_e_popup_mouse_down_handler = NULL; static Ecore_Event_Handler *_e_popup_mouse_up_handler = NULL; static Ecore_Event_Handler *_e_popup_mouse_wheel_handler = NULL; + */ static Eina_List *_e_popup_list = NULL; /* externally accessible functions */ @@ -25,12 +29,14 @@ { _e_popup_window_shape_handler = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHAPE, _e_popup_cb_window_shape, NULL); +/* _e_popup_mouse_down_handler = ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_DOWN, _e_popup_cb_mouse_down, NULL); _e_popup_mouse_up_handler = ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, _e_popup_cb_mouse_up, NULL); _e_popup_mouse_wheel_handler = ecore_event_handler_add(ECORE_X_EVENT_MOUSE_WHEEL, _e_popup_cb_mouse_wheel, NULL); + */ return 1; } @@ -38,9 +44,11 @@ e_popup_shutdown(void) { E_FN_DEL(ecore_event_handler_del, _e_popup_window_shape_handler); +/* E_FN_DEL(ecore_event_handler_del, _e_popup_mouse_down_handler); E_FN_DEL(ecore_event_handler_del, _e_popup_mouse_up_handler); E_FN_DEL(ecore_event_handler_del, _e_popup_mouse_wheel_handler); + */ return 1; } @@ -315,7 +323,7 @@ } return NULL; } - +/* static int _e_popup_cb_mouse_down(void *data, int type, void *event) { @@ -373,3 +381,4 @@ } return 1; } +*/ |
From: Enlightenment S. <no-...@en...> - 2008-11-21 04:35:32
|
Log: add Sans font test. Author: raster Date: 2008-11-20 20:35:26 -0800 (Thu, 20 Nov 2008) New Revision: 37722 Modified: trunk/e/src/bin/e_main.c Modified: trunk/e/src/bin/e_main.c =================================================================== --- trunk/e/src/bin/e_main.c 2008-11-21 03:59:30 UTC (rev 37721) +++ trunk/e/src/bin/e_main.c 2008-11-21 04:35:26 UTC (rev 37722) @@ -662,8 +662,9 @@ TS("test file format support"); { Ecore_Evas *ee; - Evas_Object *im; + Evas_Object *im, *txt; char buf[4096]; + Evas_Coord tw, th; ee = ecore_evas_buffer_new(1, 1); if (!ee) @@ -672,6 +673,7 @@ "Evas has Software Buffer engine support.\n")); _e_main_shutdown(-1); } + e_canvas_add(ee); im = evas_object_image_add(ecore_evas_get(ee)); snprintf(buf, sizeof(buf), "%s/data/images/test.png", e_prefix_data_get()); @@ -701,6 +703,18 @@ _e_main_shutdown(-1); } evas_object_del(im); + txt = evas_object_text_add(ecore_evas_get(ee)); + evas_object_text_font_set(txt, "Sans", 10); + evas_object_text_text_set(txt, "Hello"); + evas_object_geometry_get(txt, NULL, NULL, &tw, &th); + if ((tw <= 0) && (th <= 0)) + { + e_error_message_show(_("Enlightenment found Evas can't load the 'Sans' font. Check Evas has fontconfig\n" + "support and system fontconfig defines a 'Sans' font.\n")); + _e_main_shutdown(-1); + } + evas_object_del(txt); + e_canvas_del(ee); ecore_evas_free(ee); } |
From: Enlightenment S. <no-...@en...> - 2008-11-25 23:43:10
|
Log: fix config upgrade for syscon. Author: raster Date: 2008-11-25 15:43:00 -0800 (Tue, 25 Nov 2008) New Revision: 37807 Modified: trunk/e/src/bin/e_config.c Modified: trunk/e/src/bin/e_config.c =================================================================== --- trunk/e/src/bin/e_config.c 2008-11-25 23:26:14 UTC (rev 37806) +++ trunk/e/src/bin/e_config.c 2008-11-25 23:43:00 UTC (rev 37807) @@ -848,6 +848,11 @@ IFCFGEND; IFCFG(0x012c); + COPYVAL(syscon.main.icon_size); + COPYVAL(syscon.secondary.icon_size); + COPYVAL(syscon.extra.icon_size); + COPYVAL(syscon.timeout); + COPYVAL(syscon.do_input); COPYPTR(syscon.actions); IFCFGEND; |
From: Enlightenment S. <no-...@en...> - 2008-12-02 02:29:55
|
Log: unfortunately disable.. breaks! need to find exactly why and fix though... Author: raster Date: 2008-12-01 18:29:50 -0800 (Mon, 01 Dec 2008) New Revision: 37897 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-02 01:40:13 UTC (rev 37896) +++ trunk/e/src/bin/e_fm.c 2008-12-02 02:29:50 UTC (rev 37897) @@ -3054,8 +3054,8 @@ static inline char _e_fm2_view_mode_get(const E_Fm2_Smart_Data *sd) { - if (sd->view_mode > -1) - return sd->view_mode; +// if (sd->view_mode > -1) +// return sd->view_mode; return sd->config->view.mode; } |
From: Enlightenment S. <no-...@en...> - 2008-12-02 03:46:56
|
Log: mark it with a comment Author: raster Date: 2008-12-01 19:46:50 -0800 (Mon, 01 Dec 2008) New Revision: 37900 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-02 02:33:09 UTC (rev 37899) +++ trunk/e/src/bin/e_fm.c 2008-12-02 03:46:50 UTC (rev 37900) @@ -3054,6 +3054,7 @@ static inline char _e_fm2_view_mode_get(const E_Fm2_Smart_Data *sd) { +// this breaks illume on openembedded. disable! :( // if (sd->view_mode > -1) // return sd->view_mode; return sd->config->view.mode; |