Enlightenment CVS committal
Author : monkeyiq
Project : misc
Module : gevas2
Dir : misc/gevas2/src
Modified Files:
gevas.c gevas_obj_collection.c gevas_sprite.c
gevasevh_clicks.c gevasevh_drag.c gevasevh_emouse_over.c
gevasevh_group_selector.c gevasevh_group_selector.h
gevasevh_obj_changer.c gevasevh_popup.c gevasevh_selectable.c
gevasevh_throb.c gevasevh_throb.h gevasimage.c gevasimage.h
gevasobj.c gevasobj.h gevastext.c gevastrans_alphawipe.c
gevastwin.c
Log Message:
Gevas now runs against Evas_Coord==int evas,es,es,es
Making you feeling better.
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevas.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- gevas.c 27 Aug 2003 14:47:53 -0000 1.7
+++ gevas.c 15 Nov 2004 16:41:21 -0000 1.8
@@ -201,7 +201,7 @@
void gevas_add_fontpath(GtkgEvas * ev, const gchar * path)
{
evas_font_path_append(EVAS(ev), (char*)path);
- fprintf(stderr," GEVAS add font path: %s\n", path);
+// fprintf(stderr," GEVAS add font path: %s\n", path);
}
@@ -430,7 +430,7 @@
GtkWidgetClass *widget_class;
GObjectClass *go;
- printf("gevas_class_init()\n");
+// printf("gevas_class_init()\n");
go = (GObjectClass *) klass;
@@ -464,7 +464,7 @@
klass->object_at_position = gevas_object_at_position;
klass->object_get_named = gevas_object_get_named;
- printf("gevas_class_init() 3\n");
+// printf("gevas_class_init() 3\n");
gtk_object_add_arg_type(GTK_GEVAS_CHECKED_BG,
GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_CHECKED_BG);
@@ -507,7 +507,7 @@
GTK_TYPE_DOUBLE, GTK_ARG_READABLE, ARG_VIEWPORT_H);
- printf("gevas_class_init() end\n");
+// printf("gevas_class_init() end\n");
}
static void gevas_init(GtkgEvas * ev)
@@ -557,13 +557,13 @@
{
GtkgEvas *ev;
- printf("gevas_destroy() 1\n");
+// printf("gevas_destroy() 1\n");
g_return_if_fail(object != NULL);
g_return_if_fail(GTK_IS_GEVAS(object));
ev = GTK_GEVAS(object);
- printf("gevas_destroy() 2\n");
+// printf("gevas_destroy() 2\n");
/* Chain up */
if (GTK_OBJECT_GET_CLASS(parent_class)->destroy)
@@ -577,10 +577,7 @@
g_return_if_fail(GTK_IS_GEVAS(object));
ev = GTK_GEVAS(object);
- fprintf(stderr,"gevas_finalize() top\n");
- printf("gevas_finalize() end\n");
-
- /* Chain up */
+ /* Chain up */
if (G_OBJECT_CLASS(parent_class)->finalize)
(*G_OBJECT_CLASS(parent_class)->finalize) (object);
@@ -852,7 +849,7 @@
GtkgEvas *ev;
Evas *evas;
- printf("gevas_realize()\n");
+// printf("gevas_realize()\n");
g_return_if_fail(widget != NULL);
@@ -944,7 +941,7 @@
einfo = (Evas_Engine_Info_Software_X11 *) evas_engine_info_get(evas);
- fprintf(stderr,"gevas_realize() drawable:%lx\n", GDK_WINDOW_XWINDOW(widget->window));
+// fprintf(stderr,"gevas_realize() drawable:%lx\n", GDK_WINDOW_XWINDOW(widget->window));
/* the following is specific to the engine */
einfo->info.display = GDK_WINDOW_XDISPLAY(widget->window);
@@ -968,7 +965,7 @@
- printf("gevas_realize() end\n");
+// printf("gevas_realize() end\n");
}
static void gevas_unrealize(GtkWidget * widget)
@@ -976,7 +973,7 @@
GtkgEvas *ev;
- printf("gevas_unrealize() start\n");
+// printf("gevas_unrealize() start\n");
g_return_if_fail(widget != NULL);
g_return_if_fail(GTK_IS_GEVAS(widget));
@@ -998,21 +995,21 @@
/* } */
- fprintf(stderr,"gevas_unrealize(1)\n");
+
if (ev->gevasobjlist) {
g_slist_free(ev->gevasobjlist);
ev->gevasobjlist = NULL;
}
- fprintf(stderr,"gevas_unrealize(2)\n");
+
if (ev->gevasobjs) {
g_hash_table_destroy(ev->gevasobjs);
ev->gevasobjs = NULL;
}
- fprintf(stderr,"gevas_unrealize(3)\n");
+
if (ev->checked_bg) {
evas_object_del( ev->checked_bg );
@@ -1020,7 +1017,7 @@
}
- fprintf(stderr,"gevas_unrealize(4) %lx\n", ev->evas );
+
if (ev->evas)
{
@@ -1041,7 +1038,7 @@
*/
if (GTK_WIDGET_CLASS(parent_class)->unrealize)
(*GTK_WIDGET_CLASS(parent_class)->unrealize) (widget);
- printf("gevas_unrealize() end\n");
+// printf("gevas_unrealize() end\n");
}
static void gevas_size_request(GtkWidget * widget, GtkRequisition * requisition)
@@ -1077,7 +1074,7 @@
widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED(widget)) {
- double x, y, w, h;
+ Evas_Coord x, y, w, h;
/* Keep origin, make a given with and height shown */
evas_output_viewport_get(ev->evas, &x, &y, &w, &h);
@@ -1182,7 +1179,7 @@
g_return_if_fail(ev != NULL);
g_return_if_fail(GTK_IS_GEVAS(ev));
- printf("gevas_paint()\n");
+// printf("gevas_paint()\n");
widget = GTK_WIDGET(ev);
@@ -1278,7 +1275,7 @@
if(!GTK_WIDGET_MAPPED(ev))
return FALSE;
- fprintf(stderr,"gevas_view_redraw_cb! gevas:%p\n", gevas);
+// fprintf(stderr,"gevas_view_redraw_cb! gevas:%p\n", gevas);
evas_obscured_clear(ev->evas);
evas_render(ev->evas);
@@ -1320,7 +1317,7 @@
if( !gevas || !GTK_WIDGET_REALIZED(gevas) || !GTK_WIDGET_MAPPED(gevas) )
return;
- fprintf(stderr,"gevas_queue_redraw() gevas:%p \n", gevas );
+// fprintf(stderr,"gevas_queue_redraw() gevas:%p \n", gevas );
/* This call seems to be much slower to use.*/
/*gtk_widget_queue_draw( gevas );*/
@@ -1409,13 +1406,11 @@
GtkBin *bin;
- fprintf(stderr,"gevas_new_gtkscrolledwindow()\n");
+
*scrolledwindow = gtk_scrolled_window_new(NULL, NULL);
- fprintf(stderr,"gevas_new_gtkscrolledwindow(1)\n");
- *gevas = GTK_GEVAS(gevas_new());
- fprintf(stderr,"gevas_new_gtkscrolledwindow(2)\n");
+ *gevas = GTK_GEVAS(gevas_new());
- gtk_scrolled_window_add_with_viewport(
+ gtk_scrolled_window_add_with_viewport(
GTK_SCROLLED_WINDOW(*scrolledwindow), GTK_WIDGET(*gevas));
gevas_bolt_gtkscrolledwindow( *gevas, *scrolledwindow );
@@ -1506,7 +1501,7 @@
/* break; */
case ARG_VIEWPORT_X:
{
- double x = 0, y = 0, w = 0, h = 0;
+ Evas_Coord x = 0, y = 0, w = 0, h = 0;
evas_output_viewport_get(ev->evas, &x, &y, &w, &h);
x = GTK_VALUE_DOUBLE(*arg);
evas_output_viewport_set(ev->evas, x, y, w, h);
@@ -1514,7 +1509,7 @@
break;
case ARG_VIEWPORT_Y:
{
- double x = 0, y = 0, w = 0, h = 0;
+ Evas_Coord x = 0, y = 0, w = 0, h = 0;
evas_output_viewport_get(ev->evas, &x, &y, &w, &h);
y = GTK_VALUE_DOUBLE(*arg);
evas_output_viewport_set(ev->evas, x, y, w, h);
@@ -1536,27 +1531,27 @@
ev = GTK_GEVAS(object);
switch (arg_id) {
- case ARG_CHECKED_BG:
- GTK_VALUE_BOOL(*arg) = ev->show_checked_bg;
- break;
+ case ARG_CHECKED_BG:
+ GTK_VALUE_BOOL(*arg) = ev->show_checked_bg;
+ break;
/* case ARG_RENDER_MODE: */
/* GTK_VALUE_INT(*arg) = evas_get_render_method(ev->evas); */
/* break; */
- case ARG_EVAS:
- GTK_VALUE_POINTER(*arg) = ev->evas;
- break;
- case ARG_FONT_CACHE:
- GTK_VALUE_INT(*arg) = evas_font_cache_get(ev->evas);
- break;
- case ARG_IMAGE_CACHE:
- GTK_VALUE_INT(*arg) = evas_image_cache_get(ev->evas);
- break;
- case ARG_SIZE_REQUEST_X:
- GTK_VALUE_INT(*arg) = ev->size_request_x;
- break;
- case ARG_SIZE_REQUEST_Y:
- GTK_VALUE_INT(*arg) = ev->size_request_y;
- break;
+ case ARG_EVAS:
+ GTK_VALUE_POINTER(*arg) = ev->evas;
+ break;
+ case ARG_FONT_CACHE:
+ GTK_VALUE_INT(*arg) = evas_font_cache_get(ev->evas);
+ break;
+ case ARG_IMAGE_CACHE:
+ GTK_VALUE_INT(*arg) = evas_image_cache_get(ev->evas);
+ break;
+ case ARG_SIZE_REQUEST_X:
+ GTK_VALUE_INT(*arg) = ev->size_request_x;
+ break;
+ case ARG_SIZE_REQUEST_Y:
+ GTK_VALUE_INT(*arg) = ev->size_request_y;
+ break;
/* case ARG_DRAWABLE_SIZE_W: */
/* { */
/* int w = 0, h = 0; */
@@ -1571,38 +1566,38 @@
/* GTK_VALUE_INT(*arg) = h; */
/* } */
/* break; */
- case ARG_VIEWPORT_X:
- {
- double x = 0, y = 0, w = 0, h = 0;
- evas_output_viewport_get(ev->evas, &x, &y, &w, &h);
- GTK_VALUE_DOUBLE(*arg) = x;
- }
- break;
- case ARG_VIEWPORT_Y:
- {
- double x = 0, y = 0, w = 0, h = 0;
- evas_output_viewport_get(ev->evas, &x, &y, &w, &h);
- GTK_VALUE_DOUBLE(*arg) = y;
- }
- break;
- case ARG_VIEWPORT_W:
- {
- double x = 0, y = 0, w = 0, h = 0;
- evas_output_viewport_get(ev->evas, &x, &y, &w, &h);
- GTK_VALUE_DOUBLE(*arg) = w;
- }
- break;
- case ARG_VIEWPORT_H:
- {
- double x = 0, y = 0, w = 0, h = 0;
- evas_output_viewport_get(ev->evas, &x, &y, &w, &h);
- GTK_VALUE_DOUBLE(*arg) = h;
- }
- break;
+ case ARG_VIEWPORT_X:
+ {
+ Evas_Coord x = 0, y = 0, w = 0, h = 0;
+ evas_output_viewport_get(ev->evas, &x, &y, &w, &h);
+ GTK_VALUE_DOUBLE(*arg) = x;
+ }
+ break;
+ case ARG_VIEWPORT_Y:
+ {
+ Evas_Coord x = 0, y = 0, w = 0, h = 0;
+ evas_output_viewport_get(ev->evas, &x, &y, &w, &h);
+ GTK_VALUE_DOUBLE(*arg) = y;
+ }
+ break;
+ case ARG_VIEWPORT_W:
+ {
+ Evas_Coord x = 0, y = 0, w = 0, h = 0;
+ evas_output_viewport_get(ev->evas, &x, &y, &w, &h);
+ GTK_VALUE_DOUBLE(*arg) = w;
+ }
+ break;
+ case ARG_VIEWPORT_H:
+ {
+ Evas_Coord x = 0, y = 0, w = 0, h = 0;
+ evas_output_viewport_get(ev->evas, &x, &y, &w, &h);
+ GTK_VALUE_DOUBLE(*arg) = h;
+ }
+ break;
- default:
- arg->type = GTK_TYPE_INVALID;
- break;
+ default:
+ arg->type = GTK_TYPE_INVALID;
+ break;
}
}
@@ -1801,12 +1796,12 @@
/* get filename and extra args */
- printf("full_buffer:%s\n",full_buffer );
+// printf("full_buffer:%s\n",full_buffer );
filen = strbuf1 = url_file_name_part_new( full_buffer );
d->hash_args = url_args_to_hash( full_buffer );
g_free(full_buffer);
- printf("metadata_find_edb_cb() checking for file exists:%s\n",filen);
+// printf("metadata_find_edb_cb() checking for file exists:%s\n",filen);
if( strstr( filen, ":" ))
{
@@ -1829,13 +1824,13 @@
/* If we have a winner, call the callback and get out of here */
if(ok && (has_imlib2_colon_in_name || gevas_file_exists( filen )))
{
- printf("metadata_find_edb_cb() file exists!! :%s\n",filen);
+// printf("metadata_find_edb_cb() file exists!! :%s\n",filen);
d->edb_full_path = g_strdup(filen);
if( d->edb_found_f )
{
- printf("metadata_find_edb_cb() file exists calling f\n");
+// printf("metadata_find_edb_cb() file exists calling f\n");
d->edb_found_f( d );
}
@@ -1926,15 +1921,15 @@
metadata_lookup_x_data* data = (metadata_lookup_x_data*)d;
E_DB_File* edb = 0;
- printf("gevas_metadata_lookup_x() %d\n",data->loaded);
+// printf("gevas_metadata_lookup_x() %d\n",data->loaded);
g_return_if_fail(d != NULL);
if(data->loaded)
return;
- printf("gevas_metadata_lookup_x() key:%s edb_full_path:%s\n", data->key,
- d->edb_full_path);
+/* printf("gevas_metadata_lookup_x() key:%s edb_full_path:%s\n", data->key, */
+/* d->edb_full_path); */
/* load the data */
@@ -1946,7 +1941,7 @@
data->loaded_data = edb_lookup_str( edb, (char*)data->def, "%s", data->key );
if( data->loaded_data && data->def && strcmp( data->loaded_data, data->def ))
{
- printf("gevas_metadata_lookup_x() loaded_data:%s\n",data->loaded_data);
+// printf("gevas_metadata_lookup_x() loaded_data:%s\n",data->loaded_data);
data->loaded=1;
}
break;
@@ -2124,7 +2119,7 @@
/* get filename and extra args */
- printf("full_buffer:%s\n",full_buffer );
+// printf("full_buffer:%s\n",full_buffer );
filen = strbuf1 = url_file_name_part_new( full_buffer );
hash_args = url_args_to_hash( full_buffer );
g_free(full_buffer);
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevas_obj_collection.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- gevas_obj_collection.c 10 Jan 2003 13:33:50 -0000 1.2
+++ gevas_obj_collection.c 15 Nov 2004 16:41:22 -0000 1.3
@@ -421,7 +421,7 @@
{
GtkgEvasObjCollection_T tl = o1; /* top left*/
GtkgEvasObjCollection_T br = o2; /* bottom right*/
- double x=0,y=0,w=0,h=0,_x=0,_y=0,_w=0,_h=0;
+ Evas_Coord x=0,y=0,w=0,h=0,_x=0,_y=0,_w=0,_h=0;
g_return_if_fail (o1 != NULL);
g_return_if_fail (o2 != NULL);
@@ -528,7 +528,7 @@
if(li->data)
{
lin = li->next;
- printf("gevas_obj_collection_remove_all() ev:%p s:%p data:%p\n",ev,s,li->data);
+/* printf("gevas_obj_collection_remove_all() ev:%p s:%p data:%p\n",ev,s,li->data); */
gevas_obj_collection_remove( ev, li->data );
li = lin;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevas_sprite.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- gevas_sprite.c 31 Aug 2002 09:34:48 -0000 1.6
+++ gevas_sprite.c 15 Nov 2004 16:41:22 -0000 1.7
@@ -102,7 +102,7 @@
}
-static Evas* _gevas_evas(GtkObject * object)
+Evas* _gevas_sprite_evas(GtkObject * object)
{
GtkgEvasSprite *ev;
g_return_if_fail(object != NULL);
@@ -111,7 +111,7 @@
return gevas_get_evas(getActiveObject( ev )->gevas);
}
-static void _gevas_set_obj(GtkObject * object, Evas_Object* eobj)
+static void _gevas_sprite_set_obj(GtkObject * object, Evas_Object* eobj)
{
GtkgEvasSprite *ev;
g_return_if_fail(object != NULL);
@@ -121,7 +121,7 @@
/* fprintf(stderr,"gevas_set_obj() should not be called on a sprite!\n" ); */
}
-static void _gevasobj_ensure_obj_free(GtkObject * object)
+static void _gevas_sprite_ensure_obj_free(GtkObject * object)
{
GtkgEvasSprite *ev;
g_return_if_fail(object != NULL);
@@ -250,7 +250,8 @@
gevasobj_queue_redraw(object);
}
-static void _gevasobj_get_geometry(GtkgEvasObj * object, double *x, double *y, double *w, double *h)
+static void _gevasobj_get_geometry(GtkgEvasObj * object,
+ Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
{
Evas_List* li=0;
GtkgEvasSprite *ev;
@@ -344,7 +345,7 @@
}
}
-static void _gevasobj_get_location(GtkgEvasObj * object, double *x, double *y)
+static void _gevasobj_get_location(GtkgEvasObj * object, Evas_Coord *x, Evas_Coord *y)
{
GtkgEvasSprite *ev;
g_return_if_fail(object != NULL);
@@ -352,7 +353,7 @@
ev = GTK_GEVAS_SPRITE(object);
gevasobj_get_location( getActiveObject( ev ), x, y );
}
-static void _gevasobj_get_size(GtkgEvasObj * object, double *w, double *h)
+static void _gevasobj_get_size(GtkgEvasObj * object, Evas_Coord *w, Evas_Coord *h)
{
GtkgEvasSprite *ev;
g_return_if_fail(object != NULL);
@@ -406,8 +407,8 @@
}
static void
-set_image_fill(GtkgEvasObj * object, double x, double y, double w,
- double h)
+set_image_fill(GtkgEvasObj * object, Evas_Coord x, Evas_Coord y, Evas_Coord w,
+ Evas_Coord h)
{
Evas_List* li=0;
GtkgEvasSprite *ev;
@@ -424,8 +425,8 @@
static void
get_image_fill(GtkgEvasObj * object,
- double* x, double* y,
- double* w, double* h)
+ Evas_Coord* x, Evas_Coord* y,
+ Evas_Coord* w, Evas_Coord* h)
{
Evas_List* li=0;
GtkgEvasSprite *ev;
@@ -436,11 +437,11 @@
active = getActiveObject( ev );
if( GTK_IS_GEVASIMAGE( active ) )
- gevasimage_get_image_fill( GTK_GEVASIMAGE(active), x, y, w, h );
+ gevasimage_get_image_fill( GTK_GEVASOBJ(active), x, y, w, h );
}
-static double
+static Evas_Coord
get_image_fill_width( GtkgEvasObj * object )
{
GtkgEvasSprite *ev;
@@ -451,7 +452,7 @@
return get_image_fill_width( getActiveObject( ev ) );
}
-static double
+static Evas_Coord
get_image_fill_height(GtkgEvasObj * object )
{
GtkgEvasSprite *ev;
@@ -667,11 +668,11 @@
return;
}
- printf("SPRITE load_from_metadata() fully_qualified_prefix: %s\n",
- fully_qualified_prefix);
+/* printf("SPRITE load_from_metadata() fully_qualified_prefix: %s\n", */
+/* fully_qualified_prefix); */
- printf("SPRITE load_from_metadata() ev->metadata_load_postfix:%s\n",
- ev->metadata_load_postfix);
+/* printf("SPRITE load_from_metadata() ev->metadata_load_postfix:%s\n", */
+/* ev->metadata_load_postfix); */
if( strlen( fully_qualified_prefix ))
@@ -685,7 +686,7 @@
}
- printf("full_buffer:%s\n",full_buffer );
+/* printf("full_buffer:%s\n",full_buffer ); */
filen = strbuf1 = url_file_name_part_new( full_buffer );
hash_args = url_args_to_hash( full_buffer );
@@ -694,8 +695,8 @@
filen = gevas_trim_prefix("file:",filen);
edb_prefix = url_args_lookup_str(hash_args, "prefix", "" );
- printf("load_from_metadata() filen :%s\n",filen);
- printf("load_from_metadata() edb_prefix :%s\n",edb_prefix);
+/* printf("load_from_metadata() filen :%s\n",filen); */
+/* printf("load_from_metadata() edb_prefix :%s\n",edb_prefix); */
edb = e_db_open(filen);
@@ -708,7 +709,7 @@
int rc = 0;
gint n = 0;
- printf("load_from_metadata() loaded edb\n");
+/* printf("load_from_metadata() loaded edb\n"); */
t = g_strconcat( edb_prefix, "/Count",0 );
@@ -718,7 +719,7 @@
if( rc == 1 )
{
- printf("load_from_metadata() count:%d\n",count);
+/* printf("load_from_metadata() count:%d\n",count); */
for( idx = 0; loaded && idx < count ; idx++ )
@@ -727,11 +728,11 @@
char* image_name = 0;
t = g_strdup_printf("%s/%d/Location",edb_prefix,idx);
- printf("load_from_metadata() image_name comes from loc:%s\n",t);
+/* printf("load_from_metadata() image_name comes from loc:%s\n",t); */
image_name=e_db_str_get(edb, t);
g_free(t);
- printf("load_from_metadata() image_name:%s\n",image_name);
+/* printf("load_from_metadata() image_name:%s\n",image_name); */
if(!(o = gevasimage_new_from_metadata( GEVAS(ev), image_name )))
{
@@ -798,7 +799,7 @@
gboolean loaded = 1;
GtkgEvasSprite* ev = 0;
- printf("sprite_load_from_metadata() TOP\n");
+/* printf("sprite_load_from_metadata() TOP\n"); */
g_return_if_fail(d != NULL);
g_return_if_fail(data->ev != NULL);
@@ -808,8 +809,8 @@
edb_prefix = url_args_lookup_str(d->hash_args, "prefix", "" );
- printf("sprite_load_from_metadata() edb_full_path:%s\n",d->edb_full_path);
- printf("sprite_load_from_metadata() edb_prefix :%s\n",edb_prefix);
+/* printf("sprite_load_from_metadata() edb_full_path:%s\n",d->edb_full_path); */
+/* printf("sprite_load_from_metadata() edb_prefix :%s\n",edb_prefix); */
/* load the data */
@@ -828,7 +829,7 @@
char* image_name = 0;
image_name = edb_lookup_str( edb, "", "%s/%d/Location", edb_prefix, idx,0 );
- printf("load_from_metadata() image_name:%s\n",image_name);
+/* printf("load_from_metadata() image_name:%s\n",image_name); */
if(!(o = gevasimage_new_from_metadata( GEVAS(ev), image_name )))
{
@@ -908,7 +909,7 @@
ev->metadata_load_loaded = 0;
ev->metadata_load_postfix = loc;
- printf("SPRITE gevas_sprite_load_from_metadata() loc:%s\n", loc );
+/* printf("SPRITE gevas_sprite_load_from_metadata() loc:%s\n", loc ); */
sprite_load_from_metadata_f
@@ -1062,8 +1063,8 @@
ev->frame_delay_ms_base = base;
ev->frame_delay_ms_size = times_size;
- printf("gevas_sprite_set_inter_frame_delays() base:%d times:%p size:%d\n",
- base, times, times_size);
+/* printf("gevas_sprite_set_inter_frame_delays() base:%d times:%p size:%d\n", */
+/* base, times, times_size); */
if(ev->frame_delay_ms)
@@ -1098,17 +1099,17 @@
if( ev->playing_backwards ) { nidx--; if(nidx<0) nidx=size; }
else { nidx++; nidx %= size; }
- printf("clock_sprite() ncurrent:%d nidx:%d\n",ncurrent,nidx);
+/* printf("clock_sprite() ncurrent:%d nidx:%d\n",ncurrent,nidx); */
current = gevas_obj_collection_element_n( ev->col, ncurrent );
next = gevas_obj_collection_element_n( ev->col, nidx );
- printf("clock_sprite() current:%p\n",current);
- printf("clock_sprite() next :%p\n",next);
- {
- Evas_Object* eo = gevasobj_get_evasobj( current );
- printf("clock_sprite() current_eo:%p\n",eo);
- }
+/* printf("clock_sprite() current:%p\n",current); */
+/* printf("clock_sprite() next :%p\n",next); */
+/* { */
+/* Evas_Object* eo = gevasobj_get_evasobj( (GtkObject*)current ); */
+/* printf("clock_sprite() current_eo:%p\n",eo); */
+/* } */
trans = g_array_index( ev->frame_trans_f,
@@ -1116,7 +1117,7 @@
ncurrent );
if( trans )
{
- printf("clock_sprite() trans:%p\n", trans );
+/* printf("clock_sprite() trans:%p\n", trans ); */
gevastrans_perform( trans, current, next );
}
else
@@ -1142,8 +1143,8 @@
g_return_if_fail(GTK_IS_GEVAS_SPRITE(ev));
g_return_if_fail(GTK_IS_GEVAS_OBJ_COLLECTION(ev->col));
- printf("restart_timer() current_frame:%d ms_base:%d ms_size:%d\n",
- ev->current_frame, ev->frame_delay_ms_base, ev->frame_delay_ms_size);
+/* printf("restart_timer() current_frame:%d ms_base:%d ms_size:%d\n", */
+/* ev->current_frame, ev->frame_delay_ms_base, ev->frame_delay_ms_size); */
delay = ev->default_frame_delay_ms;
@@ -1163,7 +1164,7 @@
inter_d = g_array_index(ev->frame_delay_ms, gint, f);
delay += inter_d;
- printf("restart_timer() f:%d inter_d:%d\n",f,inter_d);
+/* printf("restart_timer() f:%d inter_d:%d\n",f,inter_d); */
}
if( ev->m_timerID )
@@ -1197,7 +1198,7 @@
g_return_if_fail(GTK_IS_GEVAS_SPRITE(ev));
g_return_if_fail(GTK_IS_GEVAS_OBJ_COLLECTION(ev->col));
- printf("gevas_sprite_play()\n");
+/* printf("gevas_sprite_play()\n"); */
clock_sprite(ev);
restart_timer(ev);
@@ -1307,9 +1308,9 @@
object_class->set_arg = gevas_sprite_set_arg;
/** Protected inherit **/
- gok->_gevas_evas = _gevas_evas;
- gok->_gevas_set_obj = _gevas_set_obj;
- gok->_gevasobj_ensure_obj_free = _gevasobj_ensure_obj_free;
+ gok->_gevas_evas = _gevas_sprite_evas;
+ gok->_gevas_set_obj = _gevas_sprite_set_obj;
+ gok->_gevasobj_ensure_obj_free = _gevas_sprite_ensure_obj_free;
/** public members **/
gok->set_color = _gevasobj_set_color;
@@ -1489,7 +1490,7 @@
g_array_set_size( ev->frame_trans_f, ev->frame_trans_f_size );
}
- printf("gevas_sprite_set_transition_function() trans:%p\n", trans );
+/* printf("gevas_sprite_set_transition_function() trans:%p\n", trans ); */
ev->frame_trans_f = g_array_insert_val( ev->frame_trans_f, framenum, trans );
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasevh_clicks.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- gevasevh_clicks.c 15 Aug 2002 02:38:06 -0000 1.1
+++ gevasevh_clicks.c 15 Nov 2004 16:41:22 -0000 1.2
@@ -173,7 +173,7 @@
static gboolean sig_dclick(GtkgEvasEvHClicks* ev,
GtkObject* gevasobj, gint _b, gint _x, gint _y)
{
- printf("sig_dclick\n");
+// printf("sig_dclick\n");
return 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasevh_drag.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- gevasevh_drag.c 15 Aug 2002 02:38:06 -0000 1.1
+++ gevasevh_drag.c 15 Nov 2004 16:41:22 -0000 1.2
@@ -92,7 +92,7 @@
GEVASEV_HANDLER_RET_NEXT);
ev = GTK_GEVASEVH_DRAG(object);
if (_b == 1) {
- double x = 0, y = 0, w = 0, h = 0;
+ Evas_Coord x = 0, y = 0, w = 0, h = 0;
gevasobj_get_geometry(GTK_GEVASOBJ(gevasobj), &x, &y, &w, &h);
ev->dragging = 1;
ev->click_x_offset = _x - x;
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasevh_emouse_over.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- gevasevh_emouse_over.c 15 Aug 2002 02:38:06 -0000 1.1
+++ gevasevh_emouse_over.c 15 Nov 2004 16:41:22 -0000 1.2
@@ -83,7 +83,8 @@
gevasev_emouse_over_mouse_in(GtkObject * object, GtkObject * gevasobj, int _b,
int _x, int _y)
{
- double x = 0, y = 0, w = 0, h = 0, sw = 0, sh = 0;
+ Evas_Coord x = 0, y = 0, w = 0, h = 0;
+ double sw = 0, sh = 0;
GtkgEvasEvHEMouseOver *ev;
GtkgEvasObj *ggobj = GTK_GEVASOBJ(gevasobj);
g_return_val_if_fail(object != NULL, GEVASEV_HANDLER_RET_NEXT);
@@ -112,7 +113,7 @@
gevasev_emouse_over_mouse_out(GtkObject * object, GtkObject * gevasobj, int _b,
int _x, int _y)
{
- double x = 0, y = 0, w = 0, h = 0;
+ Evas_Coord x = 0, y = 0, w = 0, h = 0;
GtkgEvasEvHEMouseOver *ev;
GtkgEvasObj *ggobj = GTK_GEVASOBJ(gevasobj);
g_return_val_if_fail(object != NULL, GEVASEV_HANDLER_RET_NEXT);
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasevh_group_selector.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- gevasevh_group_selector.c 10 Jan 2003 13:33:51 -0000 1.4
+++ gevasevh_group_selector.c 15 Nov 2004 16:41:22 -0000 1.5
@@ -106,8 +106,8 @@
void gevas_group_selector_get_wh(
GtkgEvasEvHGroupSelector *ev,
gint cx, gint cy,
- double* x, double* y,
- double* rw, double* rh
+ Evas_Coord* x, Evas_Coord* y,
+ Evas_Coord* rw, Evas_Coord* rh
);
@@ -184,8 +184,8 @@
g_return_if_fail(ev != NULL);
g_return_if_fail(GTK_IS_GEVASEVH_GROUP_SELECTOR(ev));
- printf("gevasevh_group_selector_movesel() col.sz:%ld \n",
- gevas_obj_collection_get_size( ev->col ) );
+/* printf("gevasevh_group_selector_movesel() col.sz:%ld \n", */
+/* gevas_obj_collection_get_size( ev->col ) ); */
gevas_obj_collection_move_relative( ev->col, dx, dy );
@@ -409,7 +409,7 @@
g_return_if_fail( GTK_IS_GEVASOBJ(o));
g_return_if_fail( GTK_IS_GEVASEVH_GROUP_SELECTOR(ev));
- printf("col_item_add()\n");
+// printf("col_item_add()\n");
if(s = gevas_selectable_get_backref( ev->gevas , o))
{
gevas_selectable_select( s , 1 );
@@ -455,7 +455,7 @@
GtkgEvasEvHGroupSelector* ev = 0;
GtkgEvas* gevas = 0;
- fprintf(stderr,"gevasevh_group_selector_set_object(top)\n");
+// fprintf(stderr,"gevasevh_group_selector_set_object(top)\n");
g_return_if_fail(object != NULL);
g_return_if_fail(GTK_IS_GEVASEVH_GROUP_SELECTOR(object));
@@ -486,20 +486,20 @@
GTK_SIGNAL_FUNC(__drag_data_delete), ev);
- fprintf(stderr,"gevasevh_group_selector_set_object(3)\n");
+// fprintf(stderr,"gevasevh_group_selector_set_object(3)\n");
/* printf("gevasevh_group_selector_set_object() %p\n",ev);*/
if( !ev->rect )
{
GtkgEvasObj *ct;
- fprintf(stderr,"gevasevh_group_selector_set_object(4)\n");
+// fprintf(stderr,"gevasevh_group_selector_set_object(4)\n");
ct = ev->rect = (GtkgEvasObj*)gevasgrad_new(gevasobj_get_gevas(
GTK_OBJECT(ev->mark)));
- fprintf(stderr,"gevasevh_group_selector_set_object(5)\n");
+// fprintf(stderr,"gevasevh_group_selector_set_object(5)\n");
gevasgrad_add_color(ct, 255, 200, 200, 128, 8);
gevasgrad_add_color(ct, 200, 150, 150, 128, 8);
- fprintf(stderr,"gevasevh_group_selector_set_object(6)\n");
+// fprintf(stderr,"gevasevh_group_selector_set_object(6)\n");
gevasgrad_set_angle(ct, 315);
/* gevasgrad_seal(ct); */
@@ -507,7 +507,7 @@
/* printf(" Made the gradient\n");*/
}
- fprintf(stderr,"gevasevh_group_selector_set_object(end)\n");
+// fprintf(stderr,"gevasevh_group_selector_set_object(end)\n");
}
@@ -594,7 +594,7 @@
gevasev_group_selector_mouse_up(GtkObject * object, GtkObject * gevasobj, int _b,
int _x, int _y)
{
- double x=0,y=0,w=0,h=0;
+ Evas_Coord x=0,y=0,w=0,h=0;
Evas_List* list;
void* data;
GtkgEvasEvHGroupSelector *ev;
@@ -626,8 +626,8 @@
void gevas_group_selector_get_wh(
GtkgEvasEvHGroupSelector *ev,
gint cx, gint cy,
- double* x, double* y,
- double* rw, double* rh
+ Evas_Coord* x, Evas_Coord* y,
+ Evas_Coord* rw, Evas_Coord* rh
)
{
double w=0, h=0;
@@ -674,7 +674,7 @@
if( ev->rect && ev->tracking )
{
- double d1=0, d2=0, d3=0, d4=0;
+ Evas_Coord d1=0, d2=0, d3=0, d4=0;
gevas_group_selector_get_wh( ev, _x, _y, &d1, &d2, &d3, &d4 );
}
@@ -684,7 +684,7 @@
static gint sig_changed( GtkgEvasEvHGroupSelector* ev, gpointer d1 )
{
- printf("sig_changed\n");
+// printf("sig_changed\n");
return 0;
}
@@ -763,7 +763,7 @@
{
GtkgEvasEvHGroupSelector *ev;
ev = gtk_type_new(gevasevh_group_selector_get_type());
- printf("gevasevh_group_selector_new(void) %d\n", GTK_IS_GEVASEVH(ev));
+// printf("gevasevh_group_selector_new(void) %d\n", GTK_IS_GEVASEVH(ev));
return GTK_OBJECT(ev);
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasevh_group_selector.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- gevasevh_group_selector.h 15 Aug 2002 02:38:06 -0000 1.1
+++ gevasevh_group_selector.h 15 Nov 2004 16:41:22 -0000 1.2
@@ -124,9 +124,10 @@
void gevasevh_group_selector_flushsel(GtkgEvasEvHGroupSelector* ev );
void gevasevh_group_selector_movesel(GtkgEvasEvHGroupSelector* ev, gint32 dx, gint32 dy );
gboolean gevasevh_group_selector_isinsel(GtkgEvasEvHGroupSelector* ev, GtkgEvasEvHSelectable* o );
- void gevas_group_selector_get_wh(GtkgEvasEvHGroupSelector *ev, gint cx,
- gint cy, double* x, double* y, double* rw,
- double* rh);
+ void gevas_group_selector_get_wh(GtkgEvasEvHGroupSelector *ev,
+ gint cx, gint cy,
+ Evas_Coord* x, Evas_Coord* y,
+ Evas_Coord* rw, Evas_Coord* rh);
void gevasevh_group_selector_dragging( GtkgEvasEvHGroupSelector *ev, gboolean d );
GtkgEvasObjCollection* gevasevh_group_selector_get_collection( GtkgEvasEvHGroupSelector *ev );
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasevh_obj_changer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- gevasevh_obj_changer.c 15 Aug 2002 02:38:06 -0000 1.1
+++ gevasevh_obj_changer.c 15 Nov 2004 16:41:22 -0000 1.2
@@ -85,7 +85,7 @@
void gevasev_obj_changer_show(GtkgEvasEvHObjChanger * ev, GtkgEvasObj * newobj)
{
if (newobj && (newobj != ev->current)) {
- double x = 0, y = 0;
+ Evas_Coord x = 0, y = 0;
if (ev->current) {
gevasobj_get_location(ev->current, &x, &y);
gevasobj_hide(ev->current);
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasevh_popup.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- gevasevh_popup.c 15 Aug 2002 02:38:06 -0000 1.1
+++ gevasevh_popup.c 15 Nov 2004 16:41:22 -0000 1.2
@@ -181,7 +181,7 @@
static gboolean sig_popup_activate(GtkgEvasEvHPopup* ev,
GtkObject* gevasobj, gint _b, gint _x, gint _y)
{
- printf("sig_popup_activate\n");
+// printf("sig_popup_activate\n");
return 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasevh_selectable.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- gevasevh_selectable.c 31 Aug 2002 09:34:48 -0000 1.3
+++ gevasevh_selectable.c 15 Nov 2004 16:41:22 -0000 1.4
@@ -116,7 +116,7 @@
{
GtkgEvasEvHSelectable* s = 0;
- printf("col_item_move_relative(1) x:%p y:%p ev:%p o:%p\n", x,y,ev,o );
+/* printf("col_item_move_relative(1) x:%p y:%p ev:%p o:%p\n", x,y,ev,o ); */
g_return_val_if_fail(x != NULL, GEVASOBJ_SIG_VETO);
g_return_val_if_fail(y != NULL, GEVASOBJ_SIG_VETO);
@@ -126,7 +126,7 @@
g_return_val_if_fail( GTK_IS_GEVASOBJ(o), GEVASOBJ_SIG_VETO);
g_return_val_if_fail(GTK_IS_GEVASEVH_SELECTABLE(ev), GEVASOBJ_SIG_VETO);
- printf("col_item_move_rel(2) x:%f y:%f\n",*x,*y);
+/* printf("col_item_move_rel(2) x:%f y:%f\n",*x,*y); */
if( o != ev->normal && o != ev->selected )
@@ -135,15 +135,15 @@
if( ev->confine )
{
gint vx, vy, vw, vh;
- double objw, objh;
+ Evas_Coord objw, objh;
- printf("col_item_move_relative(3) ev->gevas:%p o->eobj:%p\n", ev->gevas, o->eobj );
+/* printf("col_item_move_relative(3) ev->gevas:%p o->eobj:%p\n", ev->gevas, o->eobj ); */
gevas_get_viewport_area( ev->gevas, &vx, &vy, &vw, &vh );
gevasobj_get_size( o, &objw, &objh );
- printf("col_item_move_relative(4) x:%d y:%d objw:%f objh:%f\n",*x,*y,objw,objh);
+// printf("col_item_move_relative(4) x:%d y:%d objw:%f objh:%f\n",*x,*y,objw,objh);
// selected image is larger than standard image, and we dont mind of the lips
// go over the edge of the display.
@@ -208,10 +208,10 @@
GTK_SIGNAL_FUNC(col_item_move_relative), ev);
- printf("gevas_selectable_set_backref() ev:%p o:%p evas:%p reverse lookup:%p\n",
- ev,o,
- gevas_get_evas( o->gevas ),
- gevas_selectable_get_backref( o->gevas ,o));
+/* printf("gevas_selectable_set_backref() ev:%p o:%p evas:%p reverse lookup:%p\n", */
+/* ev,o, */
+/* gevas_get_evas( o->gevas ), */
+/* gevas_selectable_get_backref( o->gevas ,o)); */
}
@@ -251,7 +251,7 @@
ev->gevas = nor->gevas;
}
- printf("Setting backref for ev:%p on obj:%p\n",ev,ev->normal);
+// printf("Setting backref for ev:%p on obj:%p\n",ev,ev->normal);
gevas_selectable_set_backref( ev, ev->normal );
if( GTK_IS_GEVAS_SPRITE( nor ) )
@@ -290,7 +290,7 @@
if( s )
{
- double x=0, y=0, w=0, h=0;
+ Evas_Coord x=0, y=0, w=0, h=0;
gint32 bx = ev->border_x;
gint32 by = ev->border_y;
int lay=0;
@@ -419,7 +419,7 @@
ev->tracking_y = _y;
gdkev = gevas_get_current_event( ev->normal->gevas );
- printf("gevasev_selectable_mouse_down() got gdkev:%p\n", gdkev );
+// printf("gevasev_selectable_mouse_down() got gdkev:%p\n", gdkev );
if( gdkev ) /*&& gdkev->type == GDK_BUTTON_PRESS )*/
{
GdkEventButton* gdkbev;
@@ -431,14 +431,14 @@
if( gdkbev->state & GDK_SHIFT_MASK )
{
- printf("gevasev_selectable_mouse_down() shift key\n");
+// printf("gevasev_selectable_mouse_down() shift key\n");
gevasevh_group_selector_floodtosel( evh_sel, ev, GTK_GEVASOBJ(gevasobj) );
return GEVASEV_HANDLER_RET_NEXT;
}
if( gdkbev->state & GDK_CONTROL_MASK )
{
- printf("gevasev_selectable_mouse_down() control key isinsel:%d\n",
- gevasevh_group_selector_isinsel( evh_sel, ev ));
+/* printf("gevasev_selectable_mouse_down() control key isinsel:%d\n", */
+/* gevasevh_group_selector_isinsel( evh_sel, ev )); */
if( gevasevh_group_selector_isinsel( evh_sel, ev ))
gevasevh_group_selector_remfromsel( evh_sel, ev );
@@ -501,7 +501,7 @@
ev = GTK_GEVASEVH_SELECTABLE(object);
evh_sel = GTK_GEVASEVH_GROUP_SELECTOR(ev->evh_selector);
- printf("gevasev_selectable_mouse_move() this:%p tracking:%d\n", object, ev->tracking );
+// printf("gevasev_selectable_mouse_move() this:%p tracking:%d\n", object, ev->tracking );
if( ev->tracking )
{
@@ -617,12 +617,12 @@
static gint col_item_move_absolute(
GtkgEvasObj* o,
- double* x, double* y,
+ Evas_Coord* x, Evas_Coord* y,
GtkgEvasEvHSelectable *ev )
{
GtkgEvasEvHSelectable* s = 0;
- printf("col_item_move_absolute(1) x:%p y:%p ev:%p o:%p\n", x,y,ev,o );
+// printf("col_item_move_absolute(1) x:%p y:%p ev:%p o:%p\n", x,y,ev,o );
g_return_val_if_fail(o != NULL, GEVASOBJ_SIG_VETO);
g_return_val_if_fail(x != NULL, GEVASOBJ_SIG_VETO);
@@ -632,7 +632,7 @@
g_return_val_if_fail( GTK_IS_GEVASOBJ(o), GEVASOBJ_SIG_VETO);
g_return_val_if_fail( GTK_IS_GEVASEVH_SELECTABLE(ev), GEVASOBJ_SIG_VETO);
- printf("col_item_move_absolute(2) x:%f y:%f\n",*x,*y);
+// printf("col_item_move_absolute(2) x:%f y:%f\n",*x,*y);
if( o == ev->selected )
{
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasevh_throb.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- gevasevh_throb.c 31 Aug 2002 09:34:48 -0000 1.3
+++ gevasevh_throb.c 15 Nov 2004 16:41:22 -0000 1.4
@@ -109,7 +109,7 @@
GtkgEvasEvH* evh = GTK_GEVASEVH( ev );
double ix, iy, iw, ih;
- double x, y, w, h;
+ Evas_Coord x, y, w, h;
GtkgEvasObj* go = evh->eobj;
GTimeVal tv;
@@ -126,8 +126,8 @@
if( x != ev->ix || y != ev->iy )
{
- printf("x:%f ev->ix:%f y:%f ev->iy:%f\n", x, ev->ix, y, ev->iy );
- printf("ev->x:%f ev->y:%f\n", ev->x, ev->y );
+/* printf("x:%f ev->ix:%f y:%f ev->iy:%f\n", x, ev->ix, y, ev->iy ); */
+/* printf("ev->x:%f ev->y:%f\n", ev->x, ev->y ); */
ev->x += x - ev->ix;
ev->y += y - ev->iy;
@@ -217,7 +217,8 @@
gevasev_throb_mouse_in(GtkObject * object, GtkObject * gevasobj, int _b,
int _x, int _y)
{
- double x = 0, y = 0, w = 0, h = 0, sw = 0, sh = 0;
+ Evas_Coord x = 0, y = 0, w = 0, h = 0;
+ double sw = 0, sh = 0;
GtkgEvasEvH* evh;
GtkgEvasObj* go;
GtkgEvasEvHThrob *ev;
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasevh_throb.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- gevasevh_throb.h 17 Aug 2002 15:26:38 -0000 1.2
+++ gevasevh_throb.h 15 Nov 2004 16:41:22 -0000 1.3
@@ -56,8 +56,8 @@
GTimeVal m_timeTracker;
double t;
- double x, y, w, h;
- double ix, iy;
+ Evas_Coord x, y, w, h;
+ Evas_Coord ix, iy;
int r,g,b,a;
/* For operation on a twin */
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasimage.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- gevasimage.c 27 Aug 2003 14:47:53 -0000 1.10
+++ gevasimage.c 15 Nov 2004 16:41:22 -0000 1.11
@@ -94,51 +94,51 @@
#define EVASO(ev) _gevas_get_obj( GTK_OBJECT(ev))
-static void set_image_fill(GtkgEvasObj * object, double x, double y, double w,
- double h)
+static void set_image_fill(GtkgEvasObj * object,
+ Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
{
evas_object_image_fill_set( EVASO(object), x, y, w, h );
}
static void get_image_fill(GtkgEvasObj * object,
- double* x, double* y,
- double* w, double* h)
+ Evas_Coord* x, Evas_Coord* y,
+ Evas_Coord* w, Evas_Coord* h)
{
evas_object_image_fill_get( EVASO(object), x, y, w, h );
}
-static double get_image_fill_width( GtkgEvasObj * object )
+static Evas_Coord get_image_fill_width( GtkgEvasObj * object )
{
- double w,h,x,y;
+ Evas_Coord w,h,x,y;
gevasimage_get_image_fill( object, &x, &y, &w, &h );
return w;
}
-static double get_image_fill_height(GtkgEvasObj * object )
+static Evas_Coord get_image_fill_height(GtkgEvasObj * object )
{
- double w,h,x,y;
+ Evas_Coord w,h,x,y;
gevasimage_get_image_fill( object, &x, &y, &w, &h );
return h;
}
#define VTAB ((GtkgEvasImageClass*)GTK_OBJECT_GET_CLASS(object))
void
-gevasimage_set_image_fill(GtkgEvasObj * object, double x, double y, double w, double h)
+gevasimage_set_image_fill(GtkgEvasObj * object, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h)
{
return VTAB->set_image_fill( object, x, y, w, h );
}
void
-gevasimage_get_image_fill(GtkgEvasObj * object, double *x, double *y, double *w, double *h)
+gevasimage_get_image_fill(GtkgEvasObj * object, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
{
return VTAB->get_image_fill( object, x, y, w, h );
}
-double
+Evas_Coord
gevasimage_get_image_fill_width( GtkgEvasObj * object )
{
return VTAB->get_image_fill_width( object );
}
-double
+Evas_Coord
gevasimage_get_image_fill_height(GtkgEvasObj * object )
{
return VTAB->get_image_fill_height( object );
@@ -268,7 +268,7 @@
g_return_if_fail(object != NULL);
g_return_if_fail(GTK_IS_GEVASIMAGE(object));
- fprintf(stderr," gevasimage_set_arg() \n");
+// fprintf(stderr," gevasimage_set_arg() \n");
ev = GTK_GEVASIMAGE(object);
@@ -291,9 +291,9 @@
evas_object_image_fill_set( o, 0, 0, w, h );
evas_object_resize( o, w, h );
}
- fprintf(stderr,"ARG_IMAGENAME(s): %s gevas:%p\n",
- ev->image_filename,
- GTK_GEVASOBJ(ev)->gevas );
+/* fprintf(stderr,"ARG_IMAGENAME(s): %s gevas:%p\n", */
+/* ev->image_filename, */
+/* GTK_GEVASOBJ(ev)->gevas ); */
}
else
{
@@ -305,7 +305,7 @@
/* while( *gstr && *(gstr+1) && *gstr=='/' && *(gstr+1)=='/') */
/* gstr++; */
- fprintf(stderr,"ARG_IMAGENAME(1): %s %lx\n",gstr, EVAS(ev) );
+// fprintf(stderr,"ARG_IMAGENAME(1): %s %lx\n",gstr, EVAS(ev) );
_gevasobj_ensure_obj_free(object);
@@ -317,7 +317,7 @@
evas_object_image_file_set( o, ev->image_filename, NULL);
_gevas_set_obj(object, o);
- fprintf(stderr,"ARG_IMAGENAME(e): %s %lx\n",gstr, EVAS(ev) );
+// fprintf(stderr,"ARG_IMAGENAME(e): %s %lx\n",gstr, EVAS(ev) );
{
int w=0, h=0;
@@ -326,7 +326,7 @@
evas_object_image_fill_set( o, 0, 0, w, h );
evas_object_resize( o, w, h );
}
- fprintf(stderr,"ARG_IMAGENAME(e2): %s %lx\n",gstr, EVAS(ev) );
+// fprintf(stderr,"ARG_IMAGENAME(e2): %s %lx\n",gstr, EVAS(ev) );
}
gevasobj_queue_redraw( GTK_GEVASOBJ( object ) );
break;
@@ -342,11 +342,11 @@
int w, int h,
int copydata )
{
- double x=0;
- double y=0;
+ Evas_Coord x=0;
+ Evas_Coord y=0;
int layer = 0;
- fprintf( stderr, "gevasimage_load_from_rgba32data(1) x:%f y:%f w:%d h:%d layer:%d\n",
- x, y, w, h, layer );
+/* fprintf( stderr, "gevasimage_load_from_rgba32data(1) x:%f y:%f w:%d h:%d layer:%d\n", */
+/* x, y, w, h, layer ); */
GtkgEvasImage *ev;
Evas_Object* eo;
g_return_if_fail(object != NULL);
@@ -379,8 +379,8 @@
evas_object_image_fill_set( eo, 0, 0, w, h );
- fprintf( stderr, "gevasimage_load_from_rgba32data(2) x:%f y:%f w:%d h:%d layer:%d\n",
- x, y, w, h, layer );
+/* fprintf( stderr, "gevasimage_load_from_rgba32data(2) x:%f y:%f w:%d h:%d layer:%d\n", */
+/* x, y, w, h, layer ); */
gevasobj_set_location( GTK_GEVASOBJ(object), x, y );
gevasobj_set_layer( GTK_GEVASOBJ(object), layer );
@@ -516,12 +516,12 @@
hash_args = url_args_to_hash( full_buffer );
filen = gevas_trim_prefix("file:",filen);
- printf("image load_from_metadata() filen1 :%s\n",filen);
- printf("image load_from_metadata() full_buffer :%s\n",full_buffer);
+/* printf("image load_from_metadata() filen1 :%s\n",filen); */
+/* printf("image load_from_metadata() full_buffer :%s\n",full_buffer); */
if( strstr(filen,":") || gevas_file_exists("%s",filen))
{
- printf("image load_from_metadata() filen1 EXISTS! :%s\n",filen);
+/* printf("image load_from_metadata() filen1 EXISTS! :%s\n",filen); */
gevasimage_set_image_name(ev, filen);
ev->metadata_load_loaded = 1;
setup_attribs( ev, hash_args );
@@ -558,20 +558,20 @@
if( strstr( loc, "#edb" ))
{
const char* p = 0;
- printf("gevasimage_load_from_metadata() edb in URL... old loc:%s\n",loc);
+/* printf("gevasimage_load_from_metadata() edb in URL... old loc:%s\n",loc); */
h = url_args_to_hash( loc );
p = url_args_lookup_str( h, "prefix", "prefix" );
ev->metadata_load_hash = h;
- printf("gevasimage_load_from_metadata() edb in URL... p:%s\n",p);
+/* printf("gevasimage_load_from_metadata() edb in URL... p:%s\n",p); */
loc = gevas_metadata_lookup_string(
gevasobj_get_gevas(GTK_OBJECT(ev)),
loc, "", "%s", p, 0);
- printf("gevasimage_load_from_metadata() edb in URL... NEW loc:%s\n",loc);
+/* printf("gevasimage_load_from_metadata() edb in URL... NEW loc:%s\n",loc); */
}
#endif
@@ -609,7 +609,7 @@
g_return_val_if_fail(o != NULL,0);
g_return_val_if_fail(GTK_IS_GEVASIMAGE(o),0);
- g_return_val_if_fail(GTK_IS_GEVAS(gevasobj_get_gevas(GTK_GEVASOBJ(o))),0);
+ g_return_val_if_fail(GTK_IS_GEVAS(gevasobj_get_gevas((GtkObject*)o)),0);
return o;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasimage.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- gevasimage.h 27 Aug 2003 14:47:53 -0000 1.4
+++ gevasimage.h 15 Nov 2004 16:41:22 -0000 1.5
@@ -74,12 +74,12 @@
Evas(*_gevas_evas) (GtkObject * object);
- void (*set_image_fill) (GtkgEvasObj * object, double x, double y,
- double w, double h);
- void (*get_image_fill) (GtkgEvasObj * object, double* x, double* y,
- double* w, double* h);
- double (*get_image_fill_width)( GtkgEvasObj * object );
- double (*get_image_fill_height)(GtkgEvasObj * object );
+ void (*set_image_fill) (GtkgEvasObj * object, Evas_Coord x, Evas_Coord y,
+ Evas_Coord w, Evas_Coord h);
+ void (*get_image_fill) (GtkgEvasObj * object, Evas_Coord* x, Evas_Coord* y,
+ Evas_Coord* w, Evas_Coord* h);
+ Evas_Coord (*get_image_fill_width)( GtkgEvasObj * object );
+ Evas_Coord (*get_image_fill_height)(GtkgEvasObj * object );
void (*get_image_size) (GtkgEvasObj * object, int *w, int *h);
void (*set_image_border) (GtkgEvasObj * object, int l, int r, int t,
@@ -96,12 +96,14 @@
gboolean gevasimage_load_from_metadata( GtkgEvasObj * object, const char* loc );
- void gevasimage_set_image_fill(GtkgEvasObj * object, double x, double y,
- double w, double h);
- void gevasimage_get_image_fill(GtkgEvasObj * object, double* x, double* y,
- double* w, double* h);
- double gevasimage_get_image_fill_width( GtkgEvasObj * object );
- double gevasimage_get_image_fill_height(GtkgEvasObj * object );
+ void gevasimage_set_image_fill(GtkgEvasObj * object,
+ Evas_Coord x, Evas_Coord y,
+ Evas_Coord w, Evas_Coord h);
+ void gevasimage_get_image_fill(GtkgEvasObj * object,
+ Evas_Coord* x, Evas_Coord* y,
+ Evas_Coord* w, Evas_Coord* h);
+ Evas_Coord gevasimage_get_image_fill_width( GtkgEvasObj * object );
+ Evas_Coord gevasimage_get_image_fill_height(GtkgEvasObj * object );
void gevasimage_set_image_border(GtkgEvasObj * object, int l, int r, int t,
int b);
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasobj.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- gevasobj.c 31 Aug 2002 09:33:11 -0000 1.6
+++ gevasobj.c 15 Nov 2004 16:41:22 -0000 1.7
@@ -297,23 +297,23 @@
evas_object_resize( EVASO(object), w, h);
gevasobj_queue_redraw(object);
}
-void _gevasobj_get_geometry(GtkgEvasObj * object, double *x, double *y,
- double *w, double *h)
+void _gevasobj_get_geometry(GtkgEvasObj * object, Evas_Coord *x, Evas_Coord *y,
+ Evas_Coord *w, Evas_Coord *h)
{
evas_object_geometry_get( EVASO(object), x, y, w, h);
}
-void _gevasobj_get_location(GtkgEvasObj * object, double *x, double *y)
+void _gevasobj_get_location(GtkgEvasObj * object, Evas_Coord *x, Evas_Coord *y)
{
- double w, h;
+ Evas_Coord w, h;
evas_object_geometry_get( EVASO(object), x, y, &w, &h);
}
-void _gevasobj_set_location(GtkgEvasObj * object, double x, double y)
+void _gevasobj_set_location(GtkgEvasObj * object, Evas_Coord x, Evas_Coord y)
{
evas_object_move( EVASO(object), x, y );
}
-void _gevasobj_get_size(GtkgEvasObj * object, double *w, double *h)
+void _gevasobj_get_size(GtkgEvasObj * object, Evas_Coord *w, Evas_Coord *h)
{
- double x, y;
+ Evas_Coord x, y;
evas_object_geometry_get( EVASO(object), &x, &y, w, h);
}
@@ -431,31 +431,31 @@
static gint sig_move_absolute(GtkgEvasObj* ev, gpointer d1, gpointer d2)
{
- printf("sig_move_absolute\n");
+/* printf("sig_move_absolute\n"); */
return 0;
}
static gint sig_move_relative(GtkgEvasObj* ev, gpointer d1, gpointer d2)
{
- printf("sig_move_relative\n");
+/* printf("sig_move_relative\n"); */
return 0;
}
static gint sig_resize(GtkgEvasObj* ev, gpointer d1, gpointer d2)
{
- printf("sig_resize\n");
+/* printf("sig_resize\n"); */
return 0;
}
static gint sig_visible(GtkgEvasObj* ev, gpointer d1)
{
- printf("sig_visible\n");
+/* printf("sig_visible\n"); */
return 0;
}
static gint sig_layer(GtkgEvasObj* ev, gpointer d1)
{
- printf("sig_layer\n");
+/* printf("sig_layer\n"); */
return 0;
}
@@ -517,7 +517,7 @@
gtk_object_add_arg_type(GTK_GEVASOBJ_GEVAS,
GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_GEVAS);
- printf("gevasobj_class_init 1 ********** \n");
+
@@ -531,7 +531,7 @@
GTK_TYPE_POINTER, GTK_TYPE_POINTER);
- printf("gevasobj_class_init 2 ************ \n");
+
signals[SIG_MOVE_RELATIVE] =
gtk_signal_new ("move_relative",
@@ -542,7 +542,7 @@
GTK_TYPE_INT, 2,
GTK_TYPE_POINTER, GTK_TYPE_POINTER);
- printf("gevasobj_class_init 3 ************ \n");
+
signals[SIG_RESIZE] =
gtk_signal_new ("resize", GTK_RUN_LAST,
@@ -722,7 +722,7 @@
void gevasobj_move_relative( GtkgEvasObj * object, double dx, double dy)
{
- double lx=0, ly=0;
+ Evas_Coord lx=0, ly=0;
gint32 x, y;
gevasobj_get_location( object, &lx, &ly );
@@ -742,20 +742,20 @@
VTAB->resize(object, w, h);
}
-void gevasobj_get_geometry(GtkgEvasObj * object, double *x, double *y,
- double *w, double *h)
+void gevasobj_get_geometry(GtkgEvasObj * object, Evas_Coord *x, Evas_Coord *y,
+ Evas_Coord *w, Evas_Coord *h)
{
VTAB->get_geometry(object, x, y, w, h);
}
-void gevasobj_get_location(GtkgEvasObj * object, double *x, double *y)
+void gevasobj_get_location(GtkgEvasObj * object, Evas_Coord *x, Evas_Coord *y)
{
VTAB->get_location(object, x, y);
}
-void gevasobj_set_location(GtkgEvasObj * object, double x, double y)
+void gevasobj_set_location(GtkgEvasObj * object, Evas_Coord x, Evas_Coord y)
{
VTAB->set_location(object, x, y);
}
-void gevasobj_get_size(GtkgEvasObj * object, double *w, double *h)
+void gevasobj_get_size(GtkgEvasObj * object, Evas_Coord *w, Evas_Coord *h)
{
VTAB->get_size(object, w, h );
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevasobj.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- gevasobj.h 31 Aug 2002 09:33:11 -0000 1.5
+++ gevasobj.h 15 Nov 2004 16:41:22 -0000 1.6
@@ -93,8 +93,8 @@
void (*stack_above) (GtkgEvasObj * object, GtkgEvasObj * above);
void (*stack_below) (GtkgEvasObj * object, GtkgEvasObj * below);
void (*resize) (GtkgEvasObj * object, double w, double h);
- void (*get_geometry) (GtkgEvasObj * object, double *x, double *y,
- double *w, double *h);
+ void (*get_geometry) (GtkgEvasObj * object, Evas_Coord *x, Evas_Coord *y,
+ Evas_Coord *w, Evas_Coord *h);
void (*show) (GtkgEvasObj * object);
void (*hide) (GtkgEvasObj * object);
void (*get_color) (GtkgEvasObj * object, int *r, int *g, int *b,
@@ -103,9 +103,9 @@
gchar *(*get_name) (GtkgEvasObj * object);
int (*get_alpha) (GtkgEvasObj * object);
void (*set_alpha) (GtkgEvasObj * object, int a);
- void (*get_location) (GtkgEvasObj * object, double *x, double *y);
- void (*set_location) (GtkgEvasObj * object, double x, double y);
- void (*get_size)(GtkgEvasObj * object, double *w, double *h);
+ void (*get_location) (GtkgEvasObj * object, Evas_Coord *x, Evas_Coord *y);
+ void (*set_location) (GtkgEvasObj * object, Evas_Coord x, Evas_Coord y);
+ void (*get_size)(GtkgEvasObj * object, Evas_Coord *w, Evas_Coord *h);
void (*add_evhandler) (GtkgEvasObj * object, GtkObject * h);
void (*remove_evhandler) (GtkgEvasObj * object, GtkObject * h);
@@ -157,11 +157,11 @@
void gevasobj_stack_below(GtkgEvasObj * object, GtkgEvasObj * below);
void gevasobj_move(GtkgEvasObj * object, double x, double y);
void gevasobj_resize(GtkgEvasObj * object, double w, double h);
- void gevasobj_get_geometry(GtkgEvasObj * object, double *x, double *y,
- double *w, double *h);
- void gevasobj_get_location(GtkgEvasObj * object, double *x, double *y);
- void gevasobj_set_location(GtkgEvasObj * object, double x, double y);
- void gevasobj_get_size( GtkgEvasObj * object, double *w, double *h);
+ void gevasobj_get_geometry(GtkgEvasObj * object, Evas_Coord *x, Evas_Coord *y,
+ Evas_Coord *w, Evas_Coord *h);
+ void gevasobj_get_location(GtkgEvasObj * object, Evas_Coord *x, Evas_Coord *y);
+ void gevasobj_set_location(GtkgEvasObj * object, Evas_Coord x, Evas_Coord y);
+ void gevasobj_get_size( GtkgEvasObj * object, Evas_Coord *w, Evas_Coord *h);
void gevasobj_show(GtkgEvasObj * object);
void gevasobj_hide(GtkgEvasObj * object);
void gevasobj_set_visible(GtkgEvasObj * object, gboolean v);
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevastext.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- gevastext.c 15 Aug 2002 02:38:06 -0000 1.1
+++ gevastext.c 15 Nov 2004 16:41:22 -0000 1.2
@@ -112,7 +112,7 @@
gchar *gevastext_get_font(GtkgEvasObj * object)
{
char* font = 0;
- double sz = 0;
+ Evas_Font_Size sz = 0;
evas_object_text_font_get( EVASO(object), &font, &sz );
return (gchar*)font;
@@ -121,7 +121,7 @@
int gevastext_get_text_size(GtkgEvasObj * object)
{
char* font = 0;
- double sz = 0;
+ Evas_Font_Size sz = 0;
evas_object_text_font_get( EVASO(object), &font, &sz );
return sz;
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevastrans_alphawipe.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- gevastrans_alphawipe.c 18 Aug 2002 12:41:47 -0000 1.2
+++ gevastrans_alphawipe.c 15 Nov 2004 16:41:22 -0000 1.3
@@ -89,7 +89,7 @@
int bfac = blendst->blendAlphaJumpFactor;
int done = 0;
int a = 0;
- Evas_Object* eo = gevasobj_get_evasobj( fobj );
+ Evas_Object* eo = gevasobj_get_evasobj( (GtkObject*)fobj );
a = gevasobj_get_alpha( fobj );
gevasobj_set_alpha( fobj, a-bfac );
@@ -103,7 +103,7 @@
if( done )
{
- printf("blend complete\n");
+// printf("blend complete\n");
// gevasobj_hide( fobj );
free( blendst );
}
@@ -114,8 +114,8 @@
{
struct blendState* s = (struct blendState*)calloc( 1, sizeof(struct blendState) );
- printf("_perform() interval:%ld\n", ev->m_blendTimerInterval );
- printf("_perform() fobj:%p feo:%p\n", fobj, gevasobj_get_evasobj( fobj ) );
+// printf("_perform() interval:%ld\n", ev->m_blendTimerInterval );
+// printf("_perform() fobj:%p feo:%p\n", fobj, gevasobj_get_evasobj( (GtkObject*)fobj ) );
s->fobj = fobj;
s->tobj = tobj;
@@ -197,7 +197,7 @@
g_return_if_fail(GTK_IS_GEVTRANS_ALPHAWIPE(thisp));
ev = GTK_GEVTRANS_ALPHAWIPE( thisp );
- printf("gevastrans_perform() thisp:%p fobj:%p\n", thisp, fobj );
+// printf("gevastrans_perform() thisp:%p fobj:%p\n", thisp, fobj );
ev->perform( ev, fobj, tobj );
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/src/gevastwin.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- gevastwin.c 26 Nov 2002 09:33:13 -0000 1.6
+++ gevastwin.c 15 Nov 2004 16:41:22 -0000 1.7
@@ -184,7 +184,7 @@
void _gevastwin_sync_obj(GtkgEvasTwin * ev, GtkgEvasObj * obj)
{
- double main_x = 0, main_y = 0, main_w = 0, main_h = 0;
+ Evas_Coord main_x = 0, main_y = 0, main_w = 0, main_h = 0;
if (ev->mainobj && ev->auxobj)
{
@@ -200,7 +200,7 @@
if (obj == ev->mainobj)
{
- double ax = 0, ay = 0, ah = 0, aw = 0;
+ Evas_Coord ax = 0, ay = 0, ah = 0, aw = 0;
gevasobj_get_geometry(ev->auxobj, &ax, &ay, &aw, &ah);
// ev->main_obj_move(ev->mainobj, ax - (ev->ax?main_w:0) - ev->ox, ay - (ev->ay?main_h:0) - ev->oy);
|