From: <enl...@li...> - 2006-01-05 17:23:34
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: configure.in Log Message: Virtual terminal and pam config autodetector script. NOTE until further testing is done, this has to be run manually by the user after entranced is installed. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/configure.in,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- configure.in 13 Oct 2005 06:06:32 -0000 1.45 +++ configure.in 5 Jan 2006 17:23:27 -0000 1.46 @@ -158,6 +158,7 @@ data/Makefile data/config/Makefile data/config/build_config.sh +data/config/autodetect.sh data/fonts/Makefile data/images/Makefile data/images/sessions/Makefile |
From: <enl...@li...> - 2006-01-05 17:23:35
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/config Modified Files: .cvsignore Added Files: autodetect.sh.in Log Message: Virtual terminal and pam config autodetector script. NOTE until further testing is done, this has to be run manually by the user after entranced is installed. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/config/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- .cvsignore 16 Aug 2005 04:04:04 -0000 1.3 +++ .cvsignore 5 Jan 2006 17:23:27 -0000 1.4 @@ -1,4 +1,5 @@ Makefile Makefile.in +autodetect.sh build_config.sh entrance_config.cfg |
From: <enl...@li...> - 2006-01-13 06:39:25
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/daemon Modified Files: spawner.c Log Message: Minor API breakage and fixage. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/spawner.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- spawner.c 20 Dec 2005 10:08:04 -0000 1.27 +++ spawner.c 13 Jan 2006 06:38:43 -0000 1.28 @@ -257,7 +257,7 @@ { /* Filter out redundant exit events */ - if (type == ECORE_EVENT_EXE_EXIT) + if (type == ECORE_EXE_EVENT_DEL) { if (exev) return 0; @@ -525,7 +525,7 @@ /* Set up event handlers */ _e_handler = - ecore_event_handler_add(ECORE_EVENT_EXE_EXIT, Entranced_Exe_Exited, d); + ecore_event_handler_add(ECORE_EXE_EVENT_DEL, Entranced_Exe_Exited, d); _d_handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, Entranced_Signal_Exit, NULL); |
From: <enl...@li...> - 2006-01-15 11:27:56
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/daemon Modified Files: spawner.c Log Message: More ecore_exe naming break'n'fix. Should be all done now. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/spawner.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- spawner.c 13 Jan 2006 06:38:43 -0000 1.28 +++ spawner.c 15 Jan 2006 11:27:18 -0000 1.29 @@ -293,10 +293,10 @@ int Entranced_Exe_Exited(void *data, int type, void *event) { - Ecore_Event_Exe_Exit *e = (Ecore_Event_Exe_Exit *) event; + Ecore_Exe_Event_Del *e = (Ecore_Exe_Event_Del *) event; Entranced_Display *d = (Entranced_Display *) data; - entranced_debug("Ecore_Event_Exe_Exit triggered.\n"); + entranced_debug("Ecore_Exe_Event_Del triggered.\n"); if (is_respawning) { |
From: <enl...@li...> - 2006-03-07 18:14:06
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: Makefile.am Log Message: Integrate autodetect.sh into the install procedure. My autofoo fu is almost non existant, someone may want to double check this for me. The object of the exercise is to have data/config/autodetect.sh execute as the last thing that make install does, certainly after the pam and entrance_config.cfg files are installed into /etc. Thought I had committed this hours ago. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/entrance/Makefile.am,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- Makefile.am 14 Oct 2005 22:17:03 -0000 1.8 +++ Makefile.am 7 Mar 2006 18:13:58 -0000 1.9 @@ -21,3 +21,6 @@ if test -d data; then \ (cd $(srcdir); tar -cf - data) | (cd $(distdir); tar -xf -) \ fi + +install-data-am: + sh data/config/autodetect.sh |
From: Enlightenment C. <no...@cv...> - 2006-04-05 20:34:35
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/entrance Dir : e17/apps/entrance Modified Files: .cvsignore Log Message: cvsignore++ =================================================================== RCS file: /cvs/e/e17/apps/entrance/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- .cvsignore 1 Sep 2005 20:45:21 -0000 1.5 +++ .cvsignore 5 Apr 2006 20:34:20 -0000 1.6 @@ -11,6 +11,7 @@ configure-stamp autom4te.cache depcomp +entrance.spec install-sh missing ltmain.sh |
From: Enlightenment C. <no...@cv...> - 2006-07-16 19:32:52
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/entrance Dir : e17/apps/entrance/data/config Modified Files: .cvsignore Log Message: .cvsignore++ =================================================================== RCS file: /cvs/e/e17/apps/entrance/data/config/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 17:23:27 -0000 1.4 +++ .cvsignore 17 Jul 2006 00:32:21 -0000 1.5 @@ -1,5 +1,4 @@ Makefile Makefile.in -autodetect.sh build_config.sh entrance_config.cfg |
From: Enlightenment C. <no...@cv...> - 2006-08-29 17:28:04
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/client Modified Files: entrance_config.c Log Message: Search the FDO paths for xsession files. =================================================================== RCS file: /cvs/e/e17/apps/entrance/src/client/entrance_config.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- entrance_config.c 29 Aug 2006 01:24:23 -0000 1.35 +++ entrance_config.c 29 Aug 2006 17:28:03 -0000 1.36 @@ -10,7 +10,15 @@ #include "../config.h" +struct _Entrance_Config_And_Path +{ + Entrance_Config *e; + const char *path; +}; + + static void _cb_xsessions_foreach(void *list_data, void *data); +static void _cb_desktop_xsessions_foreach(void *list_data, void *data); /** @file entrance_config.c @@ -88,6 +96,7 @@ int i, num_session, num_user; char buf[PATH_MAX]; + struct _Entrance_Config_And_Path ep; if (!e) return; @@ -144,11 +153,15 @@ } } - + /* Search the local session directory first. */ + ep.e = e; + ep.path = ENTRANCE_SESSIONS_DIR; Ecore_List *xsessions = ecore_file_ls(ENTRANCE_SESSIONS_DIR); if(xsessions) - ecore_list_for_each(xsessions, _cb_xsessions_foreach, e); - + ecore_list_for_each(xsessions, _cb_xsessions_foreach, &ep); + /* Search all the relevant FDO paths second. */ + if(ecore_desktop_paths_xsessions) + ecore_list_for_each(ecore_desktop_paths_xsessions, _cb_desktop_xsessions_foreach, &ep); num_session = ecore_config_int_get("/entrance/session/count"); for (i = 0; i < num_session; i++) @@ -461,33 +474,58 @@ static void _cb_xsessions_foreach(void *list_data, void *data) { - const char* filename = list_data; - if(!filename) - return; - - Entrance_Config *e = data; - if(!e) - return; - - char path[PATH_MAX]; - snprintf(path, PATH_MAX, ENTRANCE_SESSIONS_DIR "/%s", filename); - - Ecore_Desktop *ed = ecore_desktop_get(path, "en_US"); - if(!ed) - return; + const char* filename = list_data; + struct _Entrance_Config_And_Path *ep = data; + Entrance_Config *e; + + if(!filename) + return; + + e = ep->e; + if(!e) + return; - Entrance_X_Session *exs = NULL; + char path[PATH_MAX]; + snprintf(path, PATH_MAX, "%s/%s", ep->path, filename); + + Ecore_Desktop *ed = ecore_desktop_get(path, "en_US"); + if(!ed) + return; + + Entrance_X_Session *exs = NULL; if ((exs = entrance_x_session_new(ed->name, ed->icon, ed->exec))) { - e->sessions.keys = evas_list_append(e->sessions.keys, ed->name); - e->sessions.hash = - evas_hash_add(e->sessions.hash, exs->name, exs); + /* Sessions found earlier in the FDO search sequence override those found later. */ + if (evas_hash_find(e->sessions.hash, exs->name) == NULL) + { + e->sessions.keys = evas_list_append(e->sessions.keys, ed->name); + e->sessions.hash = evas_hash_add(e->sessions.hash, exs->name, exs); + } + else + { + entrance_x_session_free(exs); + } } ecore_desktop_destroy(ed); } +static void +_cb_desktop_xsessions_foreach(void *list_data, void *data) +{ + const char* path = list_data; + struct _Entrance_Config_And_Path *ep = data; + Ecore_List *xsessions; + + if(!path) + return; + + ep->path = path; + xsessions = ecore_file_ls(path); + if(xsessions) + ecore_list_for_each(xsessions, _cb_xsessions_foreach, ep); +} #if 0 |
From: Enlightenment C. <no...@cv...> - 2006-09-05 17:56:33
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/client Modified Files: entrance_config.c Log Message: Fix what I broke. =================================================================== RCS file: /cvs/e/e17/apps/entrance/src/client/entrance_config.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- entrance_config.c 31 Aug 2006 16:31:55 -0000 1.37 +++ entrance_config.c 5 Sep 2006 17:56:31 -0000 1.38 @@ -160,8 +160,7 @@ if(xsessions) ecore_list_for_each(xsessions, _cb_xsessions_foreach, &ep); /* Search all the relevant FDO paths second. */ - if(ecore_desktop_paths_xsessions) - ecore_list_for_each(ecore_desktop_paths_xsessions, _cb_desktop_xsessions_foreach, &ep); + ecore_desktop_paths_for_each(ECORE_DESKTOP_PATHS_XSESSIONS, _cb_desktop_xsessions_foreach, &ep); num_session = ecore_config_int_get("/entrance/session/count"); for (i = 0; i < num_session; i++) |
From: Enlightenment C. <no...@cv...> - 2006-10-22 04:22:48
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/client Modified Files: entrance_config.c Log Message: Get the full command from the .desktop file. =================================================================== RCS file: /cvs/e/e17/apps/entrance/src/client/entrance_config.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- entrance_config.c 5 Sep 2006 17:56:31 -0000 1.38 +++ entrance_config.c 22 Oct 2006 04:22:45 -0000 1.39 @@ -492,8 +492,11 @@ return; Entrance_X_Session *exs = NULL; + char *command; - if ((exs = entrance_x_session_new(ed->name, ed->icon, ed->exec))) + /* Get the full command. */ + command = ecore_desktop_get_command(ed, NULL, 1); + if ((exs = entrance_x_session_new(ed->name, ed->icon, command))) { /* Sessions found earlier in the FDO search sequence override those found later. */ if (evas_hash_find(e->sessions.hash, exs->name) == NULL) |
From: Enlightenment C. <no...@cv...> - 2006-10-25 10:24:30
|
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/entrance Dir : e17/apps/entrance/src/client Modified Files: entrance_config.c Log Message: ecore_desktop_get_command can now return a list of commands if it needs to. =================================================================== RCS file: /cvs/e/e17/apps/entrance/src/client/entrance_config.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -3 -r1.39 -r1.40 --- entrance_config.c 22 Oct 2006 04:22:45 -0000 1.39 +++ entrance_config.c 25 Oct 2006 10:24:29 -0000 1.40 @@ -476,6 +476,7 @@ const char* filename = list_data; struct _Entrance_Config_And_Path *ep = data; Entrance_Config *e; + Ecore_List *commands; if(!filename) return; @@ -495,7 +496,17 @@ char *command; /* Get the full command. */ - command = ecore_desktop_get_command(ed, NULL, 1); + /* We are not passing a list of files, so we only expect one command. */ + commands = ecore_desktop_get_command(ed, NULL, 1); + if (commands) + { + char *temp; + + temp = ecore_list_first(commands); + if (temp) + command = strdup(temp); + ecore_list_destroy(commands); + } if ((exs = entrance_x_session_new(ed->name, ed->icon, command))) { /* Sessions found earlier in the FDO search sequence override those found later. */ |