Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entice
Dir : e17/apps/entice/src/bin
Modified Files:
entice.c ipc.c main.c
Log Message:
Better ipc handling. Don't bother creating the ecore_evas if we know
we're a second process piping filenames to a preexisting process.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- entice.c 13 Dec 2003 06:36:47 -0000 1.25
+++ entice.c 1 Jan 2004 21:00:12 -0000 1.26
@@ -377,7 +377,7 @@
Epsilon *e = NULL;
char buf[PATH_MAX], *file = NULL;
- if (entice && entice->ee && data)
+ if (data)
{
file = (char *) data;
@@ -387,7 +387,7 @@
snprintf(buf, PATH_MAX, "%s", file);
else if ((strlen(file) > 7) && !strncmp(file, "http://";, 7))
{
- fprintf(stderr, "http file request\n");
+ fprintf(stderr, "Entice Compiled without http loading support\n");
}
else
{
@@ -465,8 +465,8 @@
if ((o = evas_hash_find(entice->thumb.hash, buf)))
{
entice->thumb.hash = evas_hash_del(entice->thumb.hash, buf, o);
- if (entice->thumb.current && entice->thumb.current->prev)
- entice->thumb.current = entice->thumb.current->prev;
+ if (entice->thumb.current && entice->thumb.current->next)
+ entice->thumb.current = entice->thumb.current->next;
else
entice->thumb.current = entice->thumb.list;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/ipc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ipc.c 5 Nov 2003 07:33:56 -0000 1.4
+++ ipc.c 1 Jan 2004 21:00:12 -0000 1.5
@@ -104,9 +104,10 @@
snprintf(buf, e->size, "%s", (char *) e->data);
entice_file_add(buf);
- /*
+ /*
printf("!! Client sent: [%i] [%i] (%i) \"%s\"\n", e->major,
- e->minor, e->size, buf); */
+ e->minor, e->size, buf);
+ */
}
return (1);
}
@@ -147,7 +148,9 @@
snprintf(buf, PATH_MAX, "%s/.ecore/entice/0", getenv("HOME"));
unlink(buf);
- // printf("creating new server\n");
+ /*
+ printf("creating new server\n");
+ */
server = ecore_ipc_server_add(ECORE_IPC_LOCAL_USER, IPC_TITLE, 0, NULL);
if (server == NULL)
printf("creating new IPC server failed\n");
@@ -157,7 +160,9 @@
NULL);
ecore_event_handler_add(ECORE_IPC_EVENT_CLIENT_DATA, ipc_client_data,
NULL);
- // fprintf(stderr, "Listener Started\n");
+ /*
+ fprintf(stderr, "Listener Started\n");
+ */
}
return (0);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/main.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- main.c 18 Oct 2003 20:38:55 -0000 1.16
+++ main.c 1 Jan 2004 21:00:12 -0000 1.17
@@ -152,43 +152,45 @@
edje_frametime_set(1.0 / 60.0);
entice_config_init();
- entice_config_geometry_get(&x, &y, &w, &h);
- if (entice_config_engine_get() == GL_X11)
- ee = ecore_evas_gl_x11_new(NULL, 0, x, y, w, h);
- else
- ee = ecore_evas_software_x11_new(NULL, 0, x, y, w, h);
-
- if (ee)
+ if (!entice_ipc_init(argc, ((const char **) argv)))
{
- ecore_evas_callback_mouse_out_set(ee, win_mouse_out_cb);
- ecore_evas_callback_mouse_in_set(ee, win_mouse_in_cb);
- ecore_evas_callback_resize_set(ee, win_resize_cb);
- ecore_evas_callback_move_set(ee, win_move_cb);
- ecore_evas_callback_delete_request_set(ee, win_del_cb);
- ecore_evas_callback_post_render_set(ee, win_post_render_cb);
- ecore_evas_callback_pre_render_set(ee, win_pre_render_cb);
-
- ecore_evas_name_class_set(ee, "Entice", "Main");
- ecore_evas_title_set(ee, "Entice !!!!");
- ecore_evas_borderless_set(ee, 0);
- ecore_evas_shaped_set(ee, 0);
-
- evas_font_cache_set(ecore_evas_get(ee),
- entice_config_font_cache_get() * 1024 * 1024);
- evas_image_cache_set(ecore_evas_get(ee),
- entice_config_image_cache_get() * 1024 * 1024);
-
- evas_font_path_append(ecore_evas_get(ee), PACKAGE_DATA_DIR "/fonts");
- o = evas_object_rectangle_add(ecore_evas_get(ee));
- evas_object_color_set(o, 255, 255, 255, 255);
- evas_object_resize(o, 5555, 5555);
- evas_object_move(o, 0, 0);
- evas_object_layer_set(o, 0);
- evas_object_show(o);
+ entice_config_geometry_get(&x, &y, &w, &h);
+ if (entice_config_engine_get() == GL_X11)
+ ee = ecore_evas_gl_x11_new(NULL, 0, x, y, w, h);
+ else
+ ee = ecore_evas_software_x11_new(NULL, 0, x, y, w, h);
- entice_init(ee);
- if (!entice_ipc_init(argc, (const char **) argv))
+ if (ee)
{
+ ecore_evas_callback_mouse_out_set(ee, win_mouse_out_cb);
+ ecore_evas_callback_mouse_in_set(ee, win_mouse_in_cb);
+ ecore_evas_callback_resize_set(ee, win_resize_cb);
+ ecore_evas_callback_move_set(ee, win_move_cb);
+ ecore_evas_callback_delete_request_set(ee, win_del_cb);
+ ecore_evas_callback_post_render_set(ee, win_post_render_cb);
+ ecore_evas_callback_pre_render_set(ee, win_pre_render_cb);
+
+ ecore_evas_name_class_set(ee, "Entice", "Main");
+ ecore_evas_title_set(ee, "Entice !!!!");
+ ecore_evas_borderless_set(ee, 0);
+ ecore_evas_shaped_set(ee, 0);
+
+ evas_font_cache_set(ecore_evas_get(ee),
+ entice_config_font_cache_get() * 1024 * 1024);
+ evas_image_cache_set(ecore_evas_get(ee),
+ entice_config_image_cache_get() * 1024 *
+ 1024);
+
+ evas_font_path_append(ecore_evas_get(ee),
+ PACKAGE_DATA_DIR "/fonts");
+ o = evas_object_rectangle_add(ecore_evas_get(ee));
+ evas_object_color_set(o, 255, 255, 255, 255);
+ evas_object_resize(o, 5555, 5555);
+ evas_object_move(o, 0, 0);
+ evas_object_layer_set(o, 0);
+ evas_object_show(o);
+
+ entice_init(ee);
switch (fork())
{
case 0:
@@ -202,12 +204,12 @@
ecore_evas_move_resize(ee, x, y, w, h);
ecore_evas_show(ee);
ecore_main_loop_begin();
+
+ entice_free();
}
- entice_free();
}
ecore_evas_shutdown();
}
ecore_shutdown();
-
return (0);
}
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
