Enlightenment CVS committal
Author : monkeyiq
Project : misc
Module : gevas2
Dir : misc/gevas2/demo
Modified Files:
gevasanim.c gwinmaptest.c imagesize.c rawimage.c testgevas.c
Log Message:
Gevas now runs against Evas_Coord==int evas,es,es,es
Making you feeling better.
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/demo/gevasanim.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- gevasanim.c 31 Aug 2002 09:34:48 -0000 1.5
+++ gevasanim.c 15 Nov 2004 16:41:07 -0000 1.6
@@ -24,7 +24,7 @@
distribution.
- $Id: gevasanim.c,v 1.5 2002/08/31 09:34:48 monkeyiq Exp $
+ $Id: gevasanim.c,v 1.6 2004/11/15 16:41:07 monkeyiq Exp $
*******************************************************************************
*******************************************************************************
@@ -75,13 +75,13 @@
GtkgEvasObj* go = 0;
int i = 0;
- sprite = gevas_sprite_new( gevas );
+ sprite = gevas_sprite_new( GTK_GEVAS(gevas) );
for( i=1; i<7; ++i )
{
gchar* md = g_strdup_printf(
"cell%ld.png?x=270&y=120&visible=0&fill_size=1", i );
- gi = gevasimage_new_from_metadata( gevas, md );
+ gi = gevasimage_new_from_metadata( GTK_GEVAS(gevas), md );
gevas_sprite_add( sprite, GTK_GEVASOBJ( gi ) );
g_free( md );
@@ -127,7 +127,7 @@
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_signal_connect(GTK_OBJECT(window),"delete_event",
GTK_SIGNAL_FUNC(delete_event_cb), NULL);
- gevas_new_gtkscrolledwindow( &gevas, &wtoy );
+ gevas_new_gtkscrolledwindow( (GtkgEvas**)(&gevas), &wtoy );
gtk_container_add(GTK_CONTAINER(window), wtoy);
gtk_widget_set_usize(gevas, 3000, 3000);
gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
@@ -139,17 +139,17 @@
gtk_window_set_title(GTK_WINDOW(window), "gevas does sprites");
gtk_widget_show_all(window);
- gevas_add_metadata_prefix( gevas, PACKAGE_DATA_DIR );
- gevas_add_image_prefix ( gevas, PACKAGE_DATA_DIR );
- gevas_add_fontpath ( gevas, PACKAGE_DATA_DIR );
- gevas_add_metadata_prefix( gevas, "./" );
- gevas_add_image_prefix ( gevas, "./" );
- gevas_add_fontpath ( gevas, "./" );
+ gevas_add_metadata_prefix( GTK_GEVAS(gevas), PACKAGE_DATA_DIR );
+ gevas_add_image_prefix ( GTK_GEVAS(gevas), PACKAGE_DATA_DIR );
+ gevas_add_fontpath ( GTK_GEVAS(gevas), PACKAGE_DATA_DIR );
+ gevas_add_metadata_prefix( GTK_GEVAS(gevas), "./" );
+ gevas_add_image_prefix ( GTK_GEVAS(gevas), "./" );
+ gevas_add_fontpath ( GTK_GEVAS(gevas), "./" );
fprintf( stderr, "Creating the background\n");
bg = gevasimage_new_from_metadata(
- gevas, "bg.png?"
+ GTK_GEVAS(gevas), "bg.png?"
"x=0&y=0&visible=1&fill_size=1&layer=-9999&resize_x=9999&resize_y=9999" );
/* make a group selector object */
@@ -163,14 +163,14 @@
fprintf( stderr, "Creating a sprite\n");
- sprite = gevas_sprite_new( gevas );
+ sprite = gevas_sprite_new( GTK_GEVAS(gevas) );
fprintf( stderr, "Adding the frames\n");
for( i=1; i<7; ++i )
{
gchar* md = g_strdup_printf(
"cell%ld.png?x=120&y=120&visible=0&fill_size=1", i );
- gi = gevasimage_new_from_metadata( gevas, md );
+ gi = gevasimage_new_from_metadata( GTK_GEVAS(gevas), md );
gevas_sprite_add( sprite, GTK_GEVASOBJ( gi ) );
g_free( md );
@@ -189,7 +189,7 @@
}
fprintf( stderr, "Make the sprite selectable\n");
- makeSelectable( sprite );
+ makeSelectable( (GtkgEvasObj*)sprite );
/* gi = gevasimage_new_from_metadata( gevas,
"cell4.png?x=220&y=290&visible=0&fill_size=1" ); */
@@ -199,12 +199,12 @@
- sprite = gevas_sprite_new( gevas );
+ sprite = gevas_sprite_new( GTK_GEVAS(gevas) );
for( i=1; i<7; ++i )
{
gchar* md = g_strdup_printf(
"cell%ld.png?x=260&y=120&visible=0&fill_size=1", i );
- gi = gevasimage_new_from_metadata( gevas, md );
+ gi = gevasimage_new_from_metadata( GTK_GEVAS(gevas), md );
gevas_sprite_add( sprite, GTK_GEVASOBJ( gi ) );
g_free( md );
@@ -218,7 +218,7 @@
gevas_sprite_set_transition_function( sprite, i, trans );
}
- gevas_add_fontpath( gevas, "/usr/X11R6/lib/X11/fonts/msttcorefonts" );
+ gevas_add_fontpath( GTK_GEVAS(gevas),
"/usr/X11R6/lib/X11/fonts/msttcorefonts" );
twin = gevastwin_new();
gevastwin_set_main_obj(twin, sprite);
label = go = (GtkgEvasObj *) gevastext_new(GTK_GEVAS(gevas));
@@ -231,7 +231,7 @@
// gevasobj_add_evhandler(go, m_evhDrag);
gevastwin_set_aux_obj( twin, label);
// makeSelectable( twin );
- makeSelectable( sprite );
+ makeSelectable( (GtkgEvasObj*)sprite );
gevasevh_throb_new_for_twin( twin, GTK_GEVASOBJ(sprite) );
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/demo/gwinmaptest.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- gwinmaptest.c 15 Aug 2002 02:38:06 -0000 1.1
+++ gwinmaptest.c 15 Nov 2004 16:41:21 -0000 1.2
@@ -48,11 +48,11 @@
GtkWidget *wtoy;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gevas_new_gtkscrolledwindow( &gevas, &wtoy );
+ gevas_new_gtkscrolledwindow( (GtkgEvas**)(&gevas), &wtoy );
- gevas_add_fontpath( gevas, PACKAGE_DATA_DIR );
- gevas_add_fontpath( gevas, g_get_current_dir() );
- gevas_add_fontpath( gevas, "/usr/X11R6/lib/X11/fonts/msttcorefonts" );
+ gevas_add_fontpath( GTK_GEVAS(gevas), PACKAGE_DATA_DIR );
+ gevas_add_fontpath( GTK_GEVAS(gevas), g_get_current_dir() );
+ gevas_add_fontpath( GTK_GEVAS(gevas),
"/usr/X11R6/lib/X11/fonts/msttcorefonts" );
gtk_container_add(GTK_CONTAINER(window), wtoy);
gtk_widget_set_usize(gevas, 3000, 3000);
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/demo/imagesize.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- imagesize.c 31 Aug 2002 09:34:48 -0000 1.2
+++ imagesize.c 15 Nov 2004 16:41:21 -0000 1.3
@@ -51,11 +51,11 @@
GtkgEvasObj* go;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gevas_new_gtkscrolledwindow( &gevas, &wtoy );
+ gevas_new_gtkscrolledwindow( (GtkgEvas**)(&gevas), &wtoy );
- gevas_add_fontpath( gevas, PACKAGE_DATA_DIR );
- gevas_add_fontpath( gevas, g_get_current_dir() );
- gevas_add_fontpath( gevas, "/usr/X11R6/lib/X11/fonts/msttcorefonts" );
+ gevas_add_fontpath( GTK_GEVAS(gevas), PACKAGE_DATA_DIR );
+ gevas_add_fontpath( GTK_GEVAS(gevas), g_get_current_dir() );
+ gevas_add_fontpath( GTK_GEVAS(gevas),
"/usr/X11R6/lib/X11/fonts/msttcorefonts" );
gtk_container_add(GTK_CONTAINER(window), wtoy);
gtk_widget_set_usize(gevas, 3000, 3000);
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/demo/rawimage.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- rawimage.c 31 Aug 2002 09:34:48 -0000 1.3
+++ rawimage.c 15 Nov 2004 16:41:21 -0000 1.4
@@ -51,11 +51,11 @@
GtkgEvasObj* go;
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gevas_new_gtkscrolledwindow( &gevas, &wtoy );
+ gevas_new_gtkscrolledwindow( (GtkgEvas**)(&gevas), &wtoy );
- gevas_add_fontpath( gevas, PACKAGE_DATA_DIR );
- gevas_add_fontpath( gevas, g_get_current_dir() );
- gevas_add_fontpath( gevas, "/usr/X11R6/lib/X11/fonts/msttcorefonts" );
+ gevas_add_fontpath( GTK_GEVAS(gevas), PACKAGE_DATA_DIR );
+ gevas_add_fontpath( GTK_GEVAS(gevas), g_get_current_dir() );
+ gevas_add_fontpath( GTK_GEVAS(gevas),
"/usr/X11R6/lib/X11/fonts/msttcorefonts" );
gtk_container_add(GTK_CONTAINER(window), wtoy);
gtk_widget_set_usize(gevas, 3000, 3000);
@@ -94,7 +94,7 @@
GtkgEvasObj* go = GTK_GEVASOBJ( gimage );
Evas_Object *eo = gevasobj_get_evasobj( GTK_OBJECT( go ));
GtkgEvasImage* gnew;
- double w,h;
+ Evas_Coord w,h;
int* data;
gevasobj_get_size( go, &w, &h );
@@ -119,7 +119,7 @@
gevasobj_set_layer( go, 2 );
gevasobj_show( go );
- gevas_queue_redraw( gevas );
+ gevas_queue_redraw( GTK_GEVAS(gevas) );
return 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/demo/testgevas.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- testgevas.c 31 Aug 2002 09:34:48 -0000 1.4
+++ testgevas.c 15 Nov 2004 16:41:21 -0000 1.5
@@ -44,8 +44,10 @@
#include <stdio.h>
-#define FONT_NAME "verdana.ttf"
-//#define FONT_NAME "andover.ttf"
+//#define FONT_NAME "verdana.ttf"
+#define FONT_NAME "andover"
+
+//#define PACKAGE_DATA_DIR "/usr/share/gevas"
static gint delete_event_cb(GtkWidget * w, GdkEventAny * e, gpointer data);
@@ -220,7 +222,7 @@
int _b = ev->buttons;
int _x = ev->output.x;
int _y = ev->output.y;
- double x = 0, y = 0, w = 0, h = 0;
+ Evas_Coord x = 0, y = 0, w = 0, h = 0;
printf("mouse in evas callback...\n");
@@ -238,7 +240,7 @@
int _b = ev->buttons;
int _x = ev->output.x;
int _y = ev->output.y;
- double x = 0, y = 0, w = 0, h = 0;
+ Evas_Coord x = 0, y = 0, w = 0, h = 0;
printf("mouse out evas callback...\n");
evas_object_geometry_get( _o, &x, &y, &w, &h);
evas_object_resize( _o, raptor_w, raptor_h);
@@ -637,6 +639,7 @@
gevas_image = gevasimage_new();
gevasobj_set_gevas(gevas_image, gevas);
+
gevasimage_set_image_name(gevas_image, PACKAGE_DATA_DIR "/raptor.png");
gevasimage_get_image_size(GTK_GEVASOBJ(gevas_image), &w, &h);
gevasimage_set_image_fill(GTK_GEVASOBJ(gevas_image), 0, 0, w, h );
@@ -1040,7 +1043,7 @@
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
fprintf(stderr,"test gevas starting\n\n");
- gevas_new_gtkscrolledwindow( &gevas, &wtoy );
+ gevas_new_gtkscrolledwindow( (GtkgEvas**)(&gevas), &wtoy );
fprintf(stderr,"main(2)\n");
@@ -1050,9 +1053,9 @@
/* gevas = gevas_new();*/
/* gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(wtoy),
gevas);*/
- gevas_add_fontpath( gevas, PACKAGE_DATA_DIR );
- gevas_add_fontpath( gevas, g_get_current_dir() );
- gevas_add_fontpath( gevas, "/usr/X11R6/lib/X11/fonts/msttcorefonts" );
+ gevas_add_fontpath( GTK_GEVAS(gevas), PACKAGE_DATA_DIR );
+ gevas_add_fontpath( GTK_GEVAS(gevas), g_get_current_dir() );
+ gevas_add_fontpath( GTK_GEVAS(gevas),
"/usr/X11R6/lib/X11/fonts/msttcorefonts" );
gtk_container_add(GTK_CONTAINER(window), wtoy);
-------------------------------------------------------
This SF.Net email is sponsored by: InterSystems CACHE
FREE OODBMS DOWNLOAD - A multidimensional database that combines
robust object and relational technologies, making it a perfect match
for Java, C++,COM, XML, ODBC and JDBC. www.intersystems.com/match8
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
