Enlightenment CVS committal
Author : atmosphere
Project : e17
Module : apps/entice
Dir : e17/apps/entice/src/bin
Modified Files:
entice.c ipc.c main.c prefs.c signals_thumb.c
Log Message:
Ran indent on source files
Code change in main.c - ipc client load requests weren't getting through
because E_Thumb erm, needs an evas to generate them. For now this will
work, an evas free thumb generation routine should prolly be added to
E_Thumb.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/entice.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- entice.c 12 Oct 2003 00:47:10 -0000 1.2
+++ entice.c 12 Oct 2003 01:56:46 -0000 1.3
@@ -118,14 +118,14 @@
{
e_container_fill_policy_set(e->container,
CONTAINER_FILL_POLICY_FILL_Y |
- CONTAINER_FILL_POLICY_KEEP_ASPECT);
+ CONTAINER_FILL_POLICY_KEEP_ASPECT);
e_container_direction_set(e->container, 0);
}
else
{
e_container_fill_policy_set(e->container,
CONTAINER_FILL_POLICY_FILL_X |
- CONTAINER_FILL_POLICY_KEEP_ASPECT);
+ CONTAINER_FILL_POLICY_KEEP_ASPECT);
e_container_direction_set(e->container, 1);
}
edje_object_part_swallow(e->edje, "EnticeThumbnailArea",
@@ -161,6 +161,7 @@
ecore_evas_free(entice->ee);
free(entice);
entice = NULL;
+ entice_ipc_shutdown();
}
}
@@ -217,7 +218,7 @@
entice->current = NULL;
/* clean up the old images */
- swallowed =
+ swallowed =
edje_object_part_swallow_get(entice->preview, "EnticeImage");
if (swallowed)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/ipc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ipc.c 11 Oct 2003 23:45:58 -0000 1.2
+++ ipc.c 12 Oct 2003 01:56:47 -0000 1.3
@@ -104,7 +104,7 @@
snprintf(buf, e->size, "%s", e->data);
entice_file_add(buf);
/*
- printf ("!! Client sent: [%i] [%i] (%i) \"%s\"\n", e->major,
+ printf("!! Client sent: [%i] [%i] (%i) \"%s\"\n", e->major,
e->minor, e->size, buf); */
}
return (1);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- main.c 11 Oct 2003 22:54:12 -0000 1.12
+++ main.c 12 Oct 2003 01:56:47 -0000 1.13
@@ -131,50 +131,49 @@
ecore_app_args_set(argc, (const char **) argv);
ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, exit_cb, NULL);
- if (!entice_ipc_init(argc, (const char **) argv))
+ if (ecore_evas_init())
{
- if (ecore_evas_init())
- {
- Evas_Object *o = NULL;
- Ecore_Evas *ee = NULL;
+ Evas_Object *o = NULL;
+ Ecore_Evas *ee = NULL;
- edje_init();
- edje_frametime_set(1.0 / 60.0);
+ edje_init();
+ edje_frametime_set(1.0 / 60.0);
- entice_config_init();
- if (entice_config_engine_get() == GL_X11)
- ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 320, 240);
- else
- ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 320, 240);
+ entice_config_init();
+ if (entice_config_engine_get() == GL_X11)
+ ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 320, 240);
+ else
+ ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 320, 240);
- 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), 1 * 1024 * 1024);
- evas_image_cache_set(ecore_evas_get(ee), 8 * 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);
+ 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), 1 * 1024 * 1024);
+ evas_image_cache_set(ecore_evas_get(ee), 8 * 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);
+ entice_init(ee);
+ if (!entice_ipc_init(argc, (const char **) argv))
+ {
switch (fork())
{
case 0:
@@ -187,12 +186,11 @@
}
ecore_evas_resize(ee, 640, 480);
ecore_evas_show(ee);
+ ecore_main_loop_begin();
}
- ecore_main_loop_begin();
entice_free();
- ecore_evas_shutdown();
}
- entice_ipc_shutdown();
+ ecore_evas_shutdown();
}
ecore_shutdown();
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/prefs.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- prefs.c 11 Oct 2003 22:54:12 -0000 1.1
+++ prefs.c 12 Oct 2003 01:56:47 -0000 1.2
@@ -25,29 +25,31 @@
entice_config_theme_get(void)
{
char buf[PATH_MAX];
+
if (econfig && econfig->theme)
{
- struct stat status;
+ struct stat status;
- /* theme doesn't exist by abs/relative path in db */
- if(stat(econfig->theme, &status) != 0)
- {
- snprintf(buf, PATH_MAX, "%s/.entice/%s",
- getenv("HOME"), econfig->theme);
- if(stat(buf, &status) != 0)
- {
- snprintf(buf, PATH_MAX, "%s/themes/%s",
- PACKAGE_DATA_DIR, econfig->theme);
- if(stat(buf, &status) != 0)
- {
- snprintf(buf, PATH_MAX, "%s/themes/default.eet",
- PACKAGE_DATA_DIR);
- }
- }
- if(econfig->theme) free(econfig->theme);
- econfig->theme = strdup(buf);
- }
- return(econfig->theme);
+ /* theme doesn't exist by abs/relative path in db */
+ if (stat(econfig->theme, &status) != 0)
+ {
+ snprintf(buf, PATH_MAX, "%s/.entice/%s", getenv("HOME"),
+ econfig->theme);
+ if (stat(buf, &status) != 0)
+ {
+ snprintf(buf, PATH_MAX, "%s/themes/%s", PACKAGE_DATA_DIR,
+ econfig->theme);
+ if (stat(buf, &status) != 0)
+ {
+ snprintf(buf, PATH_MAX, "%s/themes/default.eet",
+ PACKAGE_DATA_DIR);
+ }
+ }
+ if (econfig->theme)
+ free(econfig->theme);
+ econfig->theme = strdup(buf);
+ }
+ return (econfig->theme);
}
return (NULL);
}
@@ -108,14 +110,14 @@
{
entice_keys_init();
snprintf(buf, PATH_MAX, "%s/.entice.db", getenv("HOME"));
-
- /* make sure we have a db, if not generate it */
- if ((db = e_db_open_read(buf)) == NULL)
- entice_config_generate_original_db(buf);
- else
- e_db_close(db);
- /* now actually read the config */
+ /* make sure we have a db, if not generate it */
+ if ((db = e_db_open_read(buf)) == NULL)
+ entice_config_generate_original_db(buf);
+ else
+ e_db_close(db);
+
+ /* now actually read the config */
if ((db = e_db_open_read(buf)))
{
if ((str = e_db_str_get(db, "/entice/theme")))
@@ -169,35 +171,36 @@
static void
entice_config_generate_original_db(char *filename)
{
- int i, count;
- char buf[PATH_MAX];
- E_DB_File *db = NULL;
-
- char *signals[] = { "EnticeZoomIn", "EnticeZoomOut", "EnticeFullScreen",
- "EnticeImageNext", "EnticeImagePrev",
- "EnticeZoomDefault", "EnticeZoomFit",
- "EnticeQuit" };
- char *keys[] =
- { "equal", "minus", "f", "space", "BackSpace", "n", "w", "q" };
- count = sizeof(signals) / sizeof(char*);
-
- if(filename)
- {
- if((db = e_db_open(filename)))
- {
- e_db_str_set(db, "/entice/theme", "default.eet");
- e_db_int_set(db, "/entice/engine", 0);
-
- for(i = 0; i < count; i++)
- {
- snprintf(buf, PATH_MAX, "/entice/keys/up/%i/symbol", i);
- e_db_str_set(db, buf, keys[i]);
- snprintf(buf, PATH_MAX, "/entice/keys/up/%i/signal", i);
- e_db_str_set(db, buf, signals[i]);
- }
- e_db_int_set(db, "/entice/keys/up/count", count);
- e_db_close(db);
- e_db_flush();
- }
- }
+ int i, count;
+ char buf[PATH_MAX];
+ E_DB_File *db = NULL;
+
+ char *signals[] = { "EnticeZoomIn", "EnticeZoomOut", "EnticeFullScreen",
+ "EnticeImageNext", "EnticeImagePrev",
+ "EnticeZoomDefault", "EnticeZoomFit",
+ "EnticeQuit"
+ };
+ char *keys[] =
+ { "equal", "minus", "f", "space", "BackSpace", "n", "w", "q" };
+ count = sizeof(signals) / sizeof(char *);
+
+ if (filename)
+ {
+ if ((db = e_db_open(filename)))
+ {
+ e_db_str_set(db, "/entice/theme", "default.eet");
+ e_db_int_set(db, "/entice/engine", 0);
+
+ for (i = 0; i < count; i++)
+ {
+ snprintf(buf, PATH_MAX, "/entice/keys/up/%i/symbol", i);
+ e_db_str_set(db, buf, keys[i]);
+ snprintf(buf, PATH_MAX, "/entice/keys/up/%i/signal", i);
+ e_db_str_set(db, buf, signals[i]);
+ }
+ e_db_int_set(db, "/entice/keys/up/count", count);
+ e_db_close(db);
+ e_db_flush();
+ }
+ }
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/src/bin/signals_thumb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- signals_thumb.c 11 Oct 2003 22:54:12 -0000 1.1
+++ signals_thumb.c 12 Oct 2003 01:56:47 -0000 1.2
@@ -140,11 +140,11 @@
for (i = 0; i < count; i++)
edje_object_signal_callback_add(o, signals[i], "", funcs[i].func, im);
- /*
- * this is weird, but we intercept callbacks and feed them to edje, for
- * some reason i can't get the mouse callbacks to be handled properly
- * for a swallowed smart object w/o this
- */
+ /*
+ * this is weird, but we intercept callbacks and feed them to edje, for
+ * some reason i can't get the mouse callbacks to be handled properly
+ * for a swallowed smart object w/o this
+ */
if ((thumb = (E_Thumb *) evas_object_smart_data_get(im)))
{
evas_object_event_callback_add(thumb->image, EVAS_CALLBACK_MOUSE_IN,
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
