Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/bin
Modified Files:
Tag: SPLIT
Makefile.am ecore_evas_test.c ecore_test.c
Log Message:
bee testing as cross-compile target for my ipaq... it works... well after
these minor patches... :) i have to use a script to cross-compile as using
configure/make/libtool just doesnt work. i'm refining the script. will come
later.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/Attic/Makefile.am,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -3 -r1.1.2.9 -r1.1.2.10
--- Makefile.am 13 Feb 2003 13:04:50 -0000 1.1.2.9
+++ Makefile.am 15 Feb 2003 14:54:28 -0000 1.1.2.10
@@ -48,7 +48,7 @@
ecore_test_SOURCES = \
ecore_test.c
-ecore_test_LDADD = $(LDFLAGS) \
+ecore_test_LDADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(ECORE_JOB_LIB) \
$(ECORE_FB_LIB) \
@@ -56,9 +56,7 @@
$(ECORE_EVAS_LIB) \
-lm
-ecore_test_LDFLAGS = \
-$(LDFLAGS) \
--static
+ecore_test_LDFLAGS =
ecore_test_CFLAGS = \
$(CFLAGS) \
@@ -74,7 +72,7 @@
ecore_evas_test_SOURCES = \
ecore_evas_test.c
-ecore_evas_test_LDADD = $(LDFLAGS) \
+ecore_evas_test_LDADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
$(ECORE_JOB_LIB) \
$(ECORE_FB_LIB) \
@@ -82,9 +80,7 @@
$(ECORE_EVAS_LIB) \
-lm
-ecore_evas_test_LDFLAGS = \
-$(LDFLAGS) \
--static
+ecore_evas_test_LDFLAGS =
ecore_evas_test_CFLAGS = \
$(CFLAGS) \
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/Attic/ecore_evas_test.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -3 -r1.1.2.1 -r1.1.2.2
--- ecore_evas_test.c 13 Feb 2003 13:04:50 -0000 1.1.2.1
+++ ecore_evas_test.c 15 Feb 2003 14:54:28 -0000 1.1.2.2
@@ -48,6 +48,14 @@
return 1;
}
+/* NB: on ipaq
+ *
+ * "F1" "F2" "F3" "F4"
+ * "Up"
+ * "Left" "Return" "Right"
+ * "Down"
+ *
+ */
void
cb_key_down(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
@@ -57,63 +65,66 @@
if (!strcmp(ev->keyname, "Escape")) ecore_main_loop_quit();
if (!strcmp(ev->keyname, "q")) ecore_main_loop_quit();
if (!strcmp(ev->keyname, "Q")) ecore_main_loop_quit();
- if (!strcmp(ev->keyname, "f"))
+ if ((!strcmp(ev->keyname, "f")) ||
+ (!strcmp(ev->keyname, "F1")))
{
- if (!ecore_evas_fullscreen_get(ee))
- ecore_evas_fullscreen_set(ee, 1);
- else
- ecore_evas_fullscreen_set(ee, 0);
+ if (!ecore_evas_fullscreen_get(ee))
+ ecore_evas_fullscreen_set(ee, 1);
+ else
+ ecore_evas_fullscreen_set(ee, 0);
}
if (!strcmp(ev->keyname, "o"))
{
- if (!ecore_evas_override_get(ee))
- ecore_evas_override_set(ee, 1);
- else
- ecore_evas_override_set(ee, 0);
- }
- if (!strcmp(ev->keyname, "r"))
- {
- int r;
-
- r = ecore_evas_rotation_get(ee);
- if (r == 0) r = 90;
- else if (r == 90) r = 270;
- else if (r == 270) r = 0;
- ecore_evas_rotation_set(ee, r);
+ if (!ecore_evas_override_get(ee))
+ ecore_evas_override_set(ee, 1);
+ else
+ ecore_evas_override_set(ee, 0);
+ }
+ if ((!strcmp(ev->keyname, "r")) ||
+ (!strcmp(ev->keyname, "F4")))
+ {
+ int r;
+
+ r = ecore_evas_rotation_get(ee);
+ if (r == 0) r = 90;
+ else if (r == 90) r = 270;
+ else if (r == 270) r = 0;
+ ecore_evas_rotation_set(ee, r);
}
if (!strcmp(ev->keyname, "b"))
{
- if (!ecore_evas_borderless_get(ee))
- ecore_evas_borderless_set(ee, 1);
- else
- ecore_evas_borderless_set(ee, 0);
+ if (!ecore_evas_borderless_get(ee))
+ ecore_evas_borderless_set(ee, 1);
+ else
+ ecore_evas_borderless_set(ee, 0);
}
if (!strcmp(ev->keyname, "d"))
{
- if (!ecore_evas_avoid_damage_get(ee))
- ecore_evas_avoid_damage_set(ee, 1);
- else
- ecore_evas_avoid_damage_set(ee, 0);
+ if (!ecore_evas_avoid_damage_get(ee))
+ ecore_evas_avoid_damage_set(ee, 1);
+ else
+ ecore_evas_avoid_damage_set(ee, 0);
}
if (!strcmp(ev->keyname, "s"))
{
- if (!ecore_evas_shaped_get(ee))
- ecore_evas_shaped_set(ee, 1);
- else
- ecore_evas_shaped_set(ee, 0);
- }
-# if 1 /* no data files shipped yet to test this */
- if (!strcmp(ev->keyname, "p"))
- {
- char *fl;
-
- ecore_evas_cursor_get(ee, &fl, NULL, NULL, NULL);
- if (!fl)
- ecore_evas_cursor_set(ee,
"/home/raster/C/evas_shadow/i/mouse_pointer.png", 1000000, 2, 2);
- else
- ecore_evas_cursor_set(ee, NULL, 0, 0, 0);
+ if (!ecore_evas_shaped_get(ee))
+ ecore_evas_shaped_set(ee, 1);
+ else
+ ecore_evas_shaped_set(ee, 0);
+ }
+#if 1 /* no data files shipped yet to test this */
+ if ((!strcmp(ev->keyname, "p")) ||
+ (!strcmp(ev->keyname, "Return")))
+ {
+ char *fl;
+
+ ecore_evas_cursor_get(ee, &fl, NULL, NULL, NULL);
+ if (!fl)
+ ecore_evas_cursor_set(ee, "data/pointers/mouse_pointer.png", 1000000, 2, 2);
+ else
+ ecore_evas_cursor_set(ee, NULL, 0, 0, 0);
}
-# endif
+#endif
}
void
@@ -130,15 +141,15 @@
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, cb_key_down, ee);
evas_object_focus_set(o, 1);
evas_object_show(o);
- o_bg_rect = o;
-
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, IM"evas_logo.png", NULL);
- evas_object_resize(o, 200, 198);
- evas_object_image_fill_set(o, 0, 0, 200, 192);
- evas_object_move(o, (240 - 200) / 2, (320 -198) / 2);
- evas_object_show(o);
-
+ o_bg_rect = o;
+
+ o = evas_object_image_add(evas);
+ evas_object_image_file_set(o, IM"evas_logo.png", NULL);
+ evas_object_resize(o, 200, 198);
+ evas_object_image_fill_set(o, 0, 0, 200, 192);
+ evas_object_move(o, (240 - 200) / 2, (320 -198) / 2);
+ evas_object_show(o);
+
/* add a timer to animate them */
anim_timer = ecore_timer_add(0.01, app_animate_obj_timer, NULL);
}
@@ -155,25 +166,29 @@
/* create an evas */
if (!ecore_evas_init()) return -1;
- if ((argc > 1) && (!strcmp(argv[1], "-fb")))
- ee = ecore_evas_fb_new(NULL, 0, 240, 320);
- else if ((argc > 1) && (!strcmp(argv[1], "-x")))
- ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320);
- else if ((argc > 1) && (!strcmp(argv[1], "-h")))
- {
- printf("%s -x Test ecore_evas in X (default)\n"
- "%s -fb Test
ecore_evas in the Framebuffer\n"
- "%s -h Display this
help\n",
- argv[0], argv[0], argv[0]);
- ecore_evas_shutdown();
- ecore_shutdown();
- return 0;
- }
- else
- ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320);
+ if ((argc > 1) && (!strcmp(argv[1], "-fb")))
+ ee = ecore_evas_fb_new(NULL, 270, 240, 320);
+ else if ((argc > 1) && (!strcmp(argv[1], "-x")))
+ ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320);
+ else if ((argc > 1) && (!strcmp(argv[1], "-h")))
+ {
+ printf("%s -x Test ecore_evas in X (default)\n"
+ "%s -fb Test ecore_evas in the Framebuffer\n"
+ "%s -h Display this help\n",
+ argv[0], argv[0], argv[0]);
+ ecore_evas_shutdown();
+ ecore_shutdown();
+ return 0;
+ }
+ else
+#ifdef BUILD_ECORE_X
+ ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320);
+#else if BUILD_ECORE_FB
+ ee = ecore_evas_fb_new(NULL, 270, 240, 320);
+#endif
if (!ee) return -1;
ecore_evas_callback_delete_request_set(ee, app_delete_request);
- ecore_evas_callback_resize_set(ee, app_resize);
+ ecore_evas_callback_resize_set(ee, app_resize);
ecore_evas_title_set(ee, "Ecore Evas Test");
ecore_evas_name_class_set(ee, "ecore_test", "test_evas");
ecore_evas_show(ee);
@@ -181,7 +196,7 @@
evas_image_cache_set(evas, 8192 * 1024);
evas_font_cache_set(evas, 512 * 1024);
evas_font_path_append(evas, FN);
-
+
setup_ecore_evas_test();
ecore_main_loop_begin();
@@ -194,7 +209,7 @@
int
main(int argc, const char **argv)
{
- printf("Ecore_evas module not compiled. This program is empty.\n");
- return -1;
+ printf("Ecore_evas module not compiled. This program is empty.\n");
+ return -1;
}
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/bin/Attic/ecore_test.c,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -3 -r1.1.2.28 -r1.1.2.29
--- ecore_test.c 13 Feb 2003 01:59:13 -0000 1.1.2.28
+++ ecore_test.c 15 Feb 2003 14:54:28 -0000 1.1.2.29
@@ -378,7 +378,7 @@
ecore_evas_cursor_get(ee, &fl, NULL, NULL, NULL);
if (!fl)
- ecore_evas_cursor_set(ee, "/home/raster/C/evas_shadow/i/mouse_pointer.png",
1000000, 2, 2);
+ ecore_evas_cursor_set(ee, "data/pointers/mouse_pointer.png", 1000000, 2, 2);
else
ecore_evas_cursor_set(ee, NULL, 0, 0, 0);
}
@@ -396,7 +396,7 @@
ee = ecore_evas_software_x11_new(NULL, 0, 0, 0, 240, 320);
#endif
#ifdef TEST_FB
- ee = ecore_evas_fb_new(NULL, 0, 240, 320);
+ ee = ecore_evas_fb_new(NULL, 270, 240, 320);
#endif
if (!ee) return 0;
ecore_evas_title_set(ee, "Ecore Evas Test");
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
