Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/estyle
Dir : e17/libs/estyle/test
Modified Files:
Makefile.am estyle_test_simple.c
Removed Files:
estyle_test_callbacks.c
Log Message:
Merge of estyle from SPLIT.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 19 May 2002 07:19:42 -0000 1.4
+++ Makefile.am 14 Jan 2003 18:51:02 -0000 1.5
@@ -4,14 +4,9 @@
CFLAGS = -g -W -Wall -Wno-implicit
INCLUDES = -I$(top_srcdir)/src @evas_cflags@ @ewd_cflags@
@ecore_cflags@ @edb_cflags@
-bin_PROGRAMS = estyle_test_simple estyle_test_callbacks
+bin_PROGRAMS = estyle_test_simple
estyle_test_simple_DEPENDENCIES = $(top_builddir)/src/libestyle.la
estyle_test_simple_SOURCES = estyle_test_simple.c
estyle_test_simple_LDFLAGS = -static
estyle_test_simple_LDADD = $(top_builddir)/src/libestyle.la
@evas_libs@ @evas_libs@ @ecore_libs@ @edb_libs@
-
-estyle_test_callbacks_DEPENDENCIES = $(top_builddir)/src/libestyle.la
-estyle_test_callbacks_SOURCES = estyle_test_callbacks.c
-estyle_test_callbacks_LDFLAGS = -static
-estyle_test_callbacks_LDADD = $(top_builddir)/src/libestyle.la
@evas_libs@ @evas_libs@ @ecore_libs@ @edb_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/test/estyle_test_simple.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- estyle_test_simple.c 19 May 2002 07:19:42 -0000 1.6
+++ estyle_test_simple.c 14 Jan 2003 18:51:11 -0000 1.7
@@ -3,6 +3,7 @@
#include <math.h>
#include <Evas.h>
#include <Ecore.h>
+#include <Evas_Engine_Software_X11.h>
#include "src/Estyle.h"
#include "estyle-config.h"
@@ -15,7 +16,7 @@
#define OBST_X 100.0
#define OBST_Y 100.0
-char string1[] = "This text should test the basic styles";
+char string1[] = "This text should\ntest the basic styles";
char string2[] = "This is the alternate text to test";
char *last = string1;
@@ -35,9 +36,11 @@
void setup(void);
-Evas evas;
-Evas_Render_Method render_method = RENDER_ENGINE;
-Evas_Object cursor = NULL;
+Evas *evas;
+#if 0
+int render_method = RENDER_ENGINE;
+#endif
+Evas_Object *cursor = NULL;
Estyle *e;
static void e_idle(void *data)
@@ -52,7 +55,7 @@
Ecore_Event_Window_Expose *e;
e = (Ecore_Event_Window_Expose *) ev->event;
- evas_update_rect(evas, e->x, e->y, e->w, e->h);
+ evas_damage_rectangle_add(evas, e->x, e->y, e->w, e->h);
}
static void ecore_mouse_in(Ecore_Event * ev)
@@ -90,11 +93,10 @@
if (index < 0)
printf("Click occurred outside of estyle\n");
else {
- printf
- ("Clicked letter %c at %d, %d size %d x %d\n",
- last[index], x, y, w, h);
- evas_move(evas, cursor, x, y);
- evas_resize(evas, cursor, w, h);
+ printf("Clicked letter %c at %d, %d size %d x %d\n",
+ last[index], x, y, w, h);
+ evas_object_move(cursor, x, y);
+ evas_object_resize(cursor, w, h);
}
} else if (eemd->button == 2) {
@@ -127,6 +129,7 @@
void setup(void)
{
Window win, ewin;
+ Display *disp=ecore_display_get();
ecore_event_filter_handler_add(ECORE_EVENT_WINDOW_EXPOSE,
ecore_window_expose);
@@ -139,13 +142,35 @@
ecore_event_filter_handler_add(ECORE_EVENT_MOUSE_OUT,
ecore_mouse_out);
ecore_event_filter_idle_handler_add(e_idle, NULL);
- win = ecore_window_new(0, 0, 0, 400, 400);
+#if 0
evas = evas_new_all(ecore_display_get(), win, 0, 0, 400, 400,
render_method, MAX_EVAS_COLORS, MAX_FONT_CACHE,
MAX_IMAGE_CACHE, PACKAGE_DATA_DIR "/fnt");
-
- ewin = evas_get_window(evas);
+#else
+ evas=evas_new();
+#endif
+
+ ewin = ecore_window_new(0,0,0,400,400); /* evas_get_window(evas); */
+
+ evas_output_method_set(evas, evas_render_method_lookup("software_x11"));
+ evas_output_size_set(evas, 400, 400);
+ evas_output_viewport_set(evas, 0, 0, 400, 400);
+
+ {
+ Evas_Engine_Info_Software_X11 *einfo;
+
+ einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
+
+ einfo->info.display = disp;
+ einfo->info.visual = DefaultVisual(disp, DefaultScreen(disp));
+ einfo->info.colormap = DefaultColormap(disp, DefaultScreen(disp));
+ einfo->info.drawable = ewin;
+ einfo->info.depth = DefaultDepth(disp, DefaultScreen(disp));
+ einfo->info.rotation = 0;
+ einfo->info.debug = 0;
+ evas_engine_info_set(evas, (Evas_Engine_Info *) einfo);
+ }
ecore_window_show(ewin);
ecore_window_set_events(ewin, XEV_EXPOSE | XEV_BUTTON | XEV_MOUSE_MOVE /* |
@@ -157,14 +182,15 @@
{
int i;
int curs_x, curs_y, curs_w, curs_h;
- Evas_Object clip_rect;
- Evas_Object bg, et_bg, obst;
+ Evas_Object *clip_rect;
+ Evas_Object *bg, *et_bg, *obst;
obstacle_x = OBST_X;
obstacle_y = OBST_Y;
for (i = 1; i < argc; i++) {
+#if 0
if (!strcmp(argv[i], "soft") ||
!strcmp(argv[i], "x11") || !strcmp(argv[i], "hard")) {
if (!strcmp(argv[i], "soft"))
@@ -176,6 +202,9 @@
if (!strcmp(argv[i], "hard"))
render_method = RENDER_METHOD_3D_HARDWARE;
} else {
+#else
+ {
+#endif
if (obstacle_w < 0.0)
obstacle_w = atoi(argv[i]);
else if (obstacle_h < 0.0)
@@ -196,36 +225,36 @@
setup();
/* add a background */
- bg = evas_add_rectangle(evas);
- evas_resize(evas, bg, 400, 400);
- evas_move(evas, bg, 0, 0);
- evas_set_layer(evas, bg, -10000);
- evas_set_color(evas, bg, 255, 255, 255, 255);
- evas_show(evas, bg);
+ bg = evas_object_rectangle_add(evas);
+ evas_object_resize(bg, 400, 400);
+ evas_object_move(bg, 0, 0);
+ evas_object_layer_set(bg, -10000);
+ evas_object_color_set(bg, 255, 255, 255, 255);
+ evas_object_show(bg);
/* add an estyle-background */
- et_bg = evas_add_rectangle(evas);
- evas_resize(evas, et_bg, 380, 380);
- evas_move(evas, et_bg, 10, 10);
- evas_set_layer(evas, et_bg, -10000);
- evas_set_color(evas, et_bg, 0, 0, 255, 50);
- evas_show(evas, et_bg);
+ et_bg = evas_object_rectangle_add(evas);
+ evas_object_resize(et_bg, 380, 380);
+ evas_object_move(et_bg, 10, 10);
+ evas_object_layer_set(et_bg, -10000);
+ evas_object_color_set(et_bg, 0, 0, 255, 50);
+ evas_object_show(et_bg);
/* draw obstacle-rect */
- obst = evas_add_rectangle(evas);
- evas_resize(evas, obst, obstacle_w, obstacle_h);
- evas_move(evas, obst, obstacle_x, obstacle_y);
- evas_set_color(evas, obst, 255, 0, 0, 50);
- evas_show(evas, obst);
+ obst = evas_object_rectangle_add(evas);
+ evas_object_resize(obst, obstacle_w, obstacle_h);
+ evas_object_move(obst, obstacle_x, obstacle_y);
+ evas_object_color_set(obst, 255, 0, 0, 50);
+ evas_object_show(obst);
/*
* Create a clip rectangle for bounding where the text is drawn
*/
- clip_rect = evas_add_rectangle(evas);
- evas_move(evas, clip_rect, 100, 100);
- evas_resize(evas, clip_rect, 200, 200);
- evas_show(evas, clip_rect);
- evas_set_color(evas, clip_rect, 255, 255, 255, 255);
+ clip_rect = evas_object_rectangle_add(evas);
+ evas_object_move(clip_rect, 100, 100);
+ evas_object_resize(clip_rect, 100, 100);
+ evas_object_show(clip_rect);
+ evas_object_color_set(clip_rect, 255, 255, 255, 255);
/*
* Create an estyle.
@@ -237,13 +266,18 @@
estyle_show(e);
estyle_text_at(e, 0, &curs_x, &curs_y, &curs_w, &curs_h);
+ printf("size: %d\n",estyle_get_font_size(e));
+ printf("name: %s\n",estyle_get_font(e));
+
+ estyle_set_font(e,"andover",32);
+
/* add a cursor */
- cursor = evas_add_rectangle(evas);
- evas_move(evas, cursor, curs_x, curs_y);
- evas_resize(evas, cursor, curs_w, curs_h);
- evas_set_layer(evas, cursor, 10000);
- evas_set_color(evas, cursor, 255, 255, 255, 128);
- evas_show(evas, cursor);
+ cursor = evas_object_rectangle_add(evas);
+ evas_object_move(cursor, curs_x, curs_y);
+ evas_object_resize(cursor, curs_w, curs_h);
+ evas_object_layer_set(cursor, 10000);
+ evas_object_color_set(cursor, 255, 255, 255, 128);
+ evas_object_show(cursor);
ecore_event_loop();
-------------------------------------------------------
This SF.NET email is sponsored by: Take your first step towards giving
your online business a competitive advantage. Test-drive a Thawte SSL
certificate - our easy online guide will show you how. Click here to get
started: http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0027en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
