From: Enlightenment C. <no...@cv...> - 2008-07-25 15:58:11
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_evas Modified Files: ecore_evas_private.h Log Message: fix software 16 build! =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_private.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- ecore_evas_private.h 23 Jul 2008 10:00:00 -0000 1.45 +++ ecore_evas_private.h 25 Jul 2008 15:41:32 -0000 1.46 @@ -51,7 +51,7 @@ # ifdef BUILD_ECORE_EVAS_OPENGL_X11 # include <Evas_Engine_GL_X11.h> # endif -# ifdef BUILD_ECORE_EVAS_X11_16 +# ifdef BUILD_ECORE_EVAS_SOFTWARE_16_X11 # include <Evas_Engine_Software_16_X11.h> # endif # endif |
From: Enlightenment C. <no...@cv...> - 2008-07-29 22:07:22
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore Modified Files: Ecore.h ecore_exe.c Log Message: add new ecore_Exe control calls (interrupt and quit) and dont ertror dialog on all exits of apps (sigint/quit/.term can be ignored i think). =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/Ecore.h,v retrieving revision 1.65 retrieving revision 1.66 diff -u -3 -r1.65 -r1.66 --- Ecore.h 26 May 2008 05:31:20 -0000 1.65 +++ Ecore.h 29 Jul 2008 22:07:19 -0000 1.66 @@ -252,6 +252,8 @@ EAPI void *ecore_exe_data_get(Ecore_Exe *exe); EAPI void ecore_exe_pause(Ecore_Exe *exe); EAPI void ecore_exe_continue(Ecore_Exe *exe); + EAPI void ecore_exe_interrupt(Ecore_Exe *exe); + EAPI void ecore_exe_quit(Ecore_Exe *exe); EAPI void ecore_exe_terminate(Ecore_Exe *exe); EAPI void ecore_exe_kill(Ecore_Exe *exe); EAPI void ecore_exe_signal(Ecore_Exe *exe, int num); =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_exe.c,v retrieving revision 1.71 retrieving revision 1.72 diff -u -3 -r1.71 -r1.72 --- ecore_exe.c 10 Mar 2008 06:44:32 -0000 1.71 +++ ecore_exe.c 29 Jul 2008 22:07:19 -0000 1.72 @@ -47,6 +47,7 @@ static int _ecore_exe_make_sure_its_really_dead(void *data); static Ecore_Exe_Event_Add *_ecore_exe_event_add_new(void); static void _ecore_exe_event_add_free(void *data, void *ev); +static void _ecore_exe_dead_attach(Ecore_Exe *exe); EAPI int ECORE_EXE_EVENT_ADD = 0; EAPI int ECORE_EXE_EVENT_DEL = 0; @@ -1007,32 +1008,53 @@ } /** - * Sends the given spawned process a terminate (@c SIGTERM) signal. + * Sends the given spawned process a interrupt (@c SIGINT) signal. * @param exe Process handle to the given process. * @ingroup Ecore_Exe_Signal_Group */ EAPI void -ecore_exe_terminate(Ecore_Exe * exe) +ecore_exe_interrupt(Ecore_Exe * exe) { - struct _ecore_exe_dead_exe *dead; - if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) { - ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_terminate"); + ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_interrupt"); return; } + _ecore_exe_dead_attach(exe); + kill(exe->pid, SIGINT); +} - dead = calloc(1, sizeof(struct _ecore_exe_dead_exe)); - if (dead) +/** + * Sends the given spawned process a quit (@c SIGQUIT) signal. + * @param exe Process handle to the given process. + * @ingroup Ecore_Exe_Signal_Group + */ +EAPI void +ecore_exe_quit(Ecore_Exe * exe) +{ + if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) { - dead->pid = exe->pid; - dead->cmd = strdup(exe->cmd); - IF_FN_DEL(ecore_timer_del, exe->doomsday_clock); - exe->doomsday_clock = - ecore_timer_add(10.0, _ecore_exe_make_sure_its_dead, dead); - exe->doomsday_clock_dead = dead; + ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_quit"); + return; } + _ecore_exe_dead_attach(exe); + kill(exe->pid, SIGQUIT); +} +/** + * Sends the given spawned process a terminate (@c SIGTERM) signal. + * @param exe Process handle to the given process. + * @ingroup Ecore_Exe_Signal_Group + */ +EAPI void +ecore_exe_terminate(Ecore_Exe * exe) +{ + if (!ECORE_MAGIC_CHECK(exe, ECORE_MAGIC_EXE)) + { + ECORE_MAGIC_FAIL(exe, ECORE_MAGIC_EXE, "ecore_exe_terminate"); + return; + } + _ecore_exe_dead_attach(exe); printf("Sending TERM signal to %s (%d).\n", exe->cmd, exe->pid); kill(exe->pid, SIGTERM); } @@ -1589,6 +1611,24 @@ if (e->exe) ecore_exe_free(e->exe); free(e); +} + +static void +_ecore_exe_dead_attach(Ecore_Exe *exe) +{ + struct _ecore_exe_dead_exe *dead; + + if (exe->doomsday_clock_dead) return; + dead = calloc(1, sizeof(struct _ecore_exe_dead_exe)); + if (dead) + { + dead->pid = exe->pid; + dead->cmd = strdup(exe->cmd); + IF_FN_DEL(ecore_timer_del, exe->doomsday_clock); + exe->doomsday_clock = + ecore_timer_add(10.0, _ecore_exe_make_sure_its_dead, dead); + exe->doomsday_clock_dead = dead; + } } #endif |
From: Enlightenment C. <no...@cv...> - 2008-08-10 02:01:19
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_evas Modified Files: ecore_evas_x.c Log Message: actually activating... use "2" (for pager) as this should normally activate as opposed to just ask for attention =================================================================== RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/ecore_evas_x.c,v retrieving revision 1.127 retrieving revision 1.128 diff -u -3 -r1.127 -r1.128 --- ecore_evas_x.c 23 Jul 2008 10:00:00 -0000 1.127 +++ ecore_evas_x.c 10 Aug 2008 02:01:17 -0000 1.128 @@ -2129,7 +2129,7 @@ _ecore_evas_x_activate(Ecore_Evas *ee) { ecore_x_netwm_client_active_request(ee->engine.x.win_root, - ee->engine.x.win, 1, 0); + ee->engine.x.win, 2, 0); } static void |