From: <md...@us...> - 2014-12-21 13:29:31
|
Revision: 5978 http://sourceforge.net/p/navit/code/5978 Author: mdankov Date: 2014-12-21 13:29:22 +0000 (Sun, 21 Dec 2014) Log Message: ----------- Add:core:Allow to query graphics attributes (to allow graphics modules to export command interface functions) Modified Paths: -------------- trunk/navit/navit/graphics.c trunk/navit/navit/xmlconfig.c Modified: trunk/navit/navit/graphics.c =================================================================== --- trunk/navit/navit/graphics.c 2014-12-19 23:41:04 UTC (rev 5977) +++ trunk/navit/navit/graphics.c 2014-12-21 13:29:22 UTC (rev 5978) @@ -228,7 +228,7 @@ struct graphics * graphics_new(struct attr *parent, struct attr **attrs) { struct graphics *this_; - struct attr *type_attr; + struct attr *type_attr, cbl_attr; struct graphics_priv * (*graphicstype_new)(struct navit *nav, struct graphics_methods *meth, struct attr **attrs, struct callback_list *cbl); if (! (type_attr=attr_search(attrs, NULL, attr_type))) { @@ -239,9 +239,12 @@ if (! graphicstype_new) return NULL; this_=g_new0(struct graphics, 1); + this_->attrs=attr_list_dup(attrs); this_->cbl=callback_list_new(); - this_->priv=(*graphicstype_new)(parent->u.navit, &this_->meth, attrs, this_->cbl); - this_->attrs=attr_list_dup(attrs); + cbl_attr.type=attr_callback_list; + cbl_attr.u.callback_list=this_->cbl; + this_->attrs=attr_generic_add_attr(this_->attrs, &cbl_attr); + this_->priv=(*graphicstype_new)(parent->u.navit, &this_->meth, this_->attrs, this_->cbl); this_->brightness=0; this_->contrast=65536; this_->gamma=65536; Modified: trunk/navit/navit/xmlconfig.c =================================================================== --- trunk/navit/navit/xmlconfig.c 2014-12-19 23:41:04 UTC (rev 5977) +++ trunk/navit/navit/xmlconfig.c 2014-12-21 13:29:22 UTC (rev 5978) @@ -238,7 +238,7 @@ { attr_coord, NEW(coord_new_from_attrs)}, { attr_cursor, NEW(cursor_new), NULL, NULL, NULL, NULL, ADD(cursor_add_attr)}, { attr_debug, NEW(debug_new)}, - { attr_graphics, NEW(graphics_new)}, + { attr_graphics, NEW(graphics_new), GET(graphics_get_attr)}, { attr_gui, NEW(gui_new), GET(gui_get_attr), NULL, NULL, SET(gui_set_attr), ADD(gui_add_attr)}, { attr_icon, NEW(icon_new), NULL, NULL, NULL, NULL, ADD(element_add_attr)}, { attr_image, NEW(image_new)}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |