navit-cvs-commit Mailing List for Navit (Page 28)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5455
          http://navit.svn.sourceforge.net/navit/?rev=5455&view=rev
Author:   martin-s
Date:     2013-04-28 15:18:17 +0000 (Sun, 28 Apr 2013)
Log Message:
-----------
Add:Core:Improved osd interface

Modified Paths:
--------------
    trunk/navit/navit/osd/core/osd_core.c
    trunk/navit/navit/osd.c
    trunk/navit/navit/osd.h

Modified: trunk/navit/navit/osd/core/osd_core.c
===================================================================

--- trunk/navit/navit/osd/core/osd_core.c	2013-04-28 15:17:17 UTC (rev 5454)
+++ trunk/navit/navit/osd/core/osd_core.c	2013-04-28 15:18:17 UTC (rev 5455)
@@ -81,7 +81,7 @@
 
 struct odometer;
 
-int set_std_osd_attr(struct osd_priv_common*opc, struct attr*the_attr);
+int set_std_osd_attr(struct osd_priv *priv, struct attr*the_attr);
 static void osd_odometer_reset(struct osd_priv_common *opc, int flags);
 static void osd_cmd_odometer_reset(struct navit *this, char *function, struct attr **in, struct attr ***out, int *valid);
 static void osd_odometer_draw(struct osd_priv_common *opc, struct navit *nav, struct vehicle *v);
@@ -219,8 +219,9 @@
 	return g_strdup_printf("%.0f", num);
 }
 
-int set_std_osd_attr(struct osd_priv_common*opc, struct attr*the_attr)
+int set_std_osd_attr(struct osd_priv *priv, struct attr*the_attr)
 {
+	struct osd_priv_common *opc=(struct osd_priv_common *)priv;
 	if(opc && the_attr && ATTR_IS_INT(the_attr->type)) {
 		if(attr_w == the_attr->type) {
 			opc->osd_item.w = the_attr->u.num;
@@ -443,7 +444,7 @@
 	opc->osd_item.navit = nav;
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_route_guard_draw);
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr)) set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 	osd_set_std_attr(attrs, &opc->osd_item, 2);
 
 	attr = attr_search(attrs, NULL, attr_min_dist);
@@ -920,7 +921,7 @@
 	opc->osd_item.navit = nav;
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_odometer_draw);
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 
 	this->bActive         = 0; //do not count on init
 	this->sum_dist        = 0;
@@ -1141,7 +1142,7 @@
 	opc->osd_item.meth.draw = osd_draw_cast(osd_cmd_interface_draw);
 
 	opc->spec_set_attr_func = osd_cmd_interface_set_attr;
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 
 	osd_set_std_attr(attrs, &opc->osd_item, 2);
 
@@ -1300,7 +1301,7 @@
 	opc->osd_item.navit = nav;
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_stopwatch_draw);
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 
 	this->bActive = 0; //do not count on init
 	this->current_base_time = 0;
@@ -1414,7 +1415,7 @@
 	opc->osd_item.navit = nav;
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_compass_draw);
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 	osd_set_std_attr(attrs, &opc->osd_item, 2);
 	attr = attr_search(attrs, NULL, attr_width);
 	this->width=attr ? attr->u.num : 2;
@@ -1543,7 +1544,7 @@
 	opc->osd_item.navit = nav;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_button_draw);
 
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 	opc->spec_set_attr_func = osd_button_set_attr;
 
 	attr=attr_search(attrs, NULL, attr_use_overlay);
@@ -1624,7 +1625,7 @@
 	opc->data = (void*)this;
 	opc->osd_item.navit = nav;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_button_draw);
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 	opc->spec_set_attr_func = osd_button_set_attr;
 
 	osd_set_std_attr(attrs, &opc->osd_item, 1);
@@ -1767,7 +1768,7 @@
 	opc->osd_item.h = 70;
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_nav_next_turn_draw);
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 	osd_set_std_attr(attrs, &opc->osd_item, 0);
 
 	this->icon_w = -1;
@@ -1899,7 +1900,7 @@
 	opc->osd_item.navit = nav;
 	opc->osd_item.p.y = 76;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_nav_toggle_announcer_draw);
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 
 	osd_set_std_attr(attrs, &opc->osd_item, 0);
 
@@ -2192,7 +2193,7 @@
   opc->osd_item.navit = nav;
   opc->osd_item.font_size = 200;
   opc->osd_item.meth.draw = osd_draw_cast(osd_speed_cam_draw);
-  meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+  meth->set_attr = set_std_osd_attr;
 
   osd_set_std_attr(attrs, &opc->osd_item, 2);
   attr = attr_search(attrs, NULL, attr_width);
@@ -2427,7 +2428,7 @@
 	opc->osd_item.h=60;
 	this->active=-1;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_speed_warner_draw);
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 
 	attr = attr_search(attrs, NULL, attr_speed_exceed_limit_offset);
 	if (attr) {
@@ -3092,7 +3093,7 @@
 	opc->osd_item.navit = nav;
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_text_draw);
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 	opc->spec_set_attr_func = osd_text_set_attr;
 	osd_set_std_attr(attrs, &opc->osd_item, 2);
 
@@ -3203,7 +3204,7 @@
 	opc->osd_item.h = 40;
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_gps_status_draw);
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 	osd_set_std_attr(attrs, &opc->osd_item, 0);
 
 	this->icon_w = -1;
@@ -3314,7 +3315,7 @@
 	opc->osd_item.h = 40;
 	opc->osd_item.font_size = 200;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_volume_draw);
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 	osd_set_std_attr(attrs, &opc->osd_item, 0);
 
 	this->icon_w = -1;
@@ -3480,7 +3481,7 @@
 
 	opc->osd_item.navit = nav;
 	opc->osd_item.meth.draw = osd_draw_cast(osd_scale_draw);
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 
 	osd_set_std_attr(attrs, &opc->osd_item, 3);
 
@@ -3584,7 +3585,7 @@
 	opc->osd_item.w = 60;
 	opc->osd_item.h = 40;
 	opc->osd_item.font_size = 200;
-	meth->set_attr = (void (*)(struct osd_priv *osd, struct attr* attr))set_std_osd_attr;
+	meth->set_attr = set_std_osd_attr;
 	osd_set_std_attr(attrs, &opc->osd_item, 0);
 
 	navit_add_callback(nav, callback_new_attr_1(callback_cast(osd_auxmap_init), attr_navit, opc));

Modified: trunk/navit/navit/osd.c
===================================================================
--- trunk/navit/navit/osd.c	2013-04-28 15:17:17 UTC (rev 5454)
+++ trunk/navit/navit/osd.c	2013-04-28 15:18:17 UTC (rev 5455)
@@ -37,12 +37,18 @@
 	struct osd_priv *priv;
 };
 
+int
+osd_set_methods(struct osd_methods *in, int in_size, struct osd_methods *out)
+{
+	return navit_object_set_methods(in, in_size, out, sizeof(struct osd_methods));
+}
+
 struct osd *
 osd_new(struct attr *parent, struct attr **attrs)
 {
 	struct osd *o;
 	struct osd_priv *(*new)(struct navit *nav, struct osd_methods *meth, struct attr **attrs);
-	struct attr *type=attr_search(attrs, NULL, attr_type);
+	struct attr *type=attr_search(attrs, NULL, attr_type),cbl;
 
 	if (! type)
 		return NULL;
@@ -50,27 +56,50 @@
         if (! new)
                 return NULL;
         o=g_new0(struct osd, 1);
-        o->priv=new(parent->u.navit, &o->meth, attrs);
+	o->attrs=attr_list_dup(attrs);
+	cbl.type=attr_callback_list;
+	cbl.u.callback_list=callback_list_new();
+	o->attrs=attr_generic_prepend_attr(o->attrs, &cbl);
+
+        o->priv=new(parent->u.navit, &o->meth, o->attrs);
 	if (o->priv) {
 		o->func=&osd_func;
 		navit_object_ref((struct navit_object *)o);
-		o->attrs=attr_list_dup(attrs);
 	} else {
+		attr_list_free(o->attrs);
 		g_free(o);
 		o=NULL;
 	}
+	dbg(0,"new osd %p\n",o);
         return o;
 }
 
 int
+osd_get_attr(struct osd *osd, enum attr_type type, struct attr *attr, struct attr_iter *iter)
+{
+	int ret=0;
+	if(osd && osd->meth.get_attr) 
+		/* values for ret: -1: Not possible, 0: Ignored by driver, 1 valid */
+		ret=osd->meth.get_attr(osd->priv, type, attr);
+	if (ret == -1)
+		return 0;
+	if (ret > 0)
+		return 1;
+	return navit_object_get_attr((struct navit_object *)osd, type, attr, iter);
+}
+
+int
 osd_set_attr(struct osd *osd, struct attr* attr)
 {
-	if(osd && osd->meth.set_attr) {
-		navit_object_set_attr((struct navit_object *)osd, attr);
-		osd->meth.set_attr(osd->priv, attr);
+	int ret=0;
+	if(osd && osd->meth.set_attr) 
+		/* values for ret: -1: Not possible, 0: Ignored by driver, 1 set and store, 2 set, don't store */
+		ret=osd->meth.set_attr(osd->priv, attr);
+	if (ret == -1)
+		return 0;
+	if (ret == 2)
 		return 1;
-	}
-	return 0;
+	return navit_object_set_attr((struct navit_object *)osd, attr);
 }
 
 void
@@ -79,6 +108,7 @@
 	if (osd && osd->meth.destroy) {
 		osd->meth.destroy(osd->priv);
 	}
+	attr_list_free(osd->attrs);
 	g_free(osd);
 }
 
@@ -387,12 +417,12 @@
 struct object_func osd_func = {
 	attr_osd,
 	(object_func_new)osd_new,
-	(object_func_get_attr)navit_object_get_attr,
+	(object_func_get_attr)osd_get_attr,
 	(object_func_iter_new)navit_object_attr_iter_new,
 	(object_func_iter_destroy)navit_object_attr_iter_destroy,
 	(object_func_set_attr)osd_set_attr,
-	(object_func_add_attr)NULL,
-	(object_func_remove_attr)NULL,
+	(object_func_add_attr)navit_object_add_attr,
+	(object_func_remove_attr)navit_object_remove_attr,
 	(object_func_init)NULL,
 	(object_func_destroy)osd_destroy,
 	(object_func_dup)NULL,

Modified: trunk/navit/navit/osd.h
===================================================================
--- trunk/navit/navit/osd.h	2013-04-28 15:17:17 UTC (rev 5454)
+++ trunk/navit/navit/osd.h	2013-04-28 15:18:17 UTC (rev 5455)
@@ -25,8 +25,9 @@
 
 struct osd_methods {
 	void (*osd_destroy)(struct osd_priv *osd);
-	void (*set_attr)(struct osd_priv *osd, struct attr* attr);
+	int (*set_attr)(struct osd_priv *osd, struct attr* attr);
 	void (*destroy)(struct osd_priv *osd);
+	int (*get_attr)(struct osd_priv *osd, enum attr_type type, struct attr* attr);
 };
 
 #define osd_draw_cast(x) (void (*)(struct osd_priv *osd, struct navit *navit, struct vehicle *v))(x)
@@ -61,6 +62,7 @@
 struct navit;
 struct osd;
 struct osd *osd_new(struct attr *parent, struct attr **attrs);
+int osd_set_methods(struct osd_methods *in, int in_size, struct osd_methods *out);
 void osd_wrap_point(struct point *p, struct navit *nav);
 void osd_std_click(struct osd_item *this, struct navit *nav, int pressed, int button, struct point *p);
 void osd_set_std_attr(struct attr **attrs, struct osd_item *item, int flags);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2007	Jan	Feb	Mar	Apr	May	Jun	Jul (4)	Aug (59)	Sep (43)	Oct (95)	Nov (135)	Dec (108)
2008	Jan (229)	Feb (141)	Mar (59)	Apr (70)	May (64)	Jun (87)	Jul (57)	Aug (108)	Sep (74)	Oct (203)	Nov (141)	Dec (108)
2009	Jan (114)	Feb (91)	Mar (101)	Apr (69)	May (54)	Jun (82)	Jul (49)	Aug (109)	Sep (81)	Oct (93)	Nov (100)	Dec (79)
2010	Jan (46)	Feb (36)	Mar (135)	Apr (103)	May (116)	Jun (130)	Jul (52)	Aug (31)	Sep (46)	Oct (48)	Nov (98)	Dec (110)
2011	Jan (234)	Feb (184)	Mar (150)	Apr (43)	May (53)	Jun (52)	Jul (112)	Aug (72)	Sep (79)	Oct (23)	Nov (6)	Dec (30)
2012	Jan (39)	Feb (37)	Mar (49)	Apr (60)	May (63)	Jun (38)	Jul (33)	Aug (24)	Sep (20)	Oct (14)	Nov (23)	Dec (50)
2013	Jan (30)	Feb (32)	Mar (27)	Apr (41)	May (59)	Jun (21)	Jul (10)	Aug (73)	Sep (23)	Oct (60)	Nov (14)	Dec (15)
2014	Jan (4)	Feb (8)	Mar (11)	Apr (6)	May (27)	Jun (4)	Jul (29)	Aug (62)	Sep (11)	Oct (17)	Nov (58)	Dec (9)
2015	Jan (23)	Feb (3)	Mar (26)	Apr (47)	May (8)	Jun (28)	Jul (10)	Aug (3)	Sep	Oct	Nov	Dec

navit-cvs-commit Mailing List for Navit (Page 28)

navit-cvs-commit — CVS commit mailing list