navit-cvs-commit — CVS commit mailing list

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.16, 1.17

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/graphics/gtk_drawing_area
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7588/src/graphics/gtk_drawing_area

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Reworked osd

Index: graphics_gtk_drawing_area.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** graphics_gtk_drawing_area.c	28 Aug 2007 17:31:18 -0000	1.16
--- graphics_gtk_drawing_area.c	29 Aug 2007 18:32:14 -0000	1.17
***************
*** 8,11 ****
--- 8,12 ----
  #endif
  #include <gdk/gdkx.h>
+ #include "debug.h"
  #include "point.h"
  #include "graphics.h"
***************
*** 19,22 ****
--- 20,24 ----
  	GdkDrawable *drawable;
  	GdkDrawable *background;
+ 	int background_ready;
  	GdkColormap *colormap;
  	FT_Library library;
***************
*** 494,501 ****
  		}
  	}
! 	if (window)
! 		gdk_draw_drawable(parent->drawable, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], overlay->background, 0, 0, overlay->p.x, overlay->p.y, overlay->width, overlay->height);
! 	else
  		gdk_draw_drawable(overlay->background, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], parent->drawable, overlay->p.x, overlay->p.y, 0, 0, overlay->width, overlay->height);
  	gdk_draw_pixbuf(parent->drawable, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], pixbuf2, 0, 0, overlay->p.x, overlay->p.y, overlay->width, overlay->height, GDK_RGB_DITHER_NONE, 0, 0);
  	if (window)
--- 496,507 ----
  		}
  	}
! 	if (window) {
! 		if (overlay->background_ready)
! 			gdk_draw_drawable(parent->drawable, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], overlay->background, 0, 0, overlay->p.x, overlay->p.y, overlay->width, overlay->height);
! 	}
! 	else {
  		gdk_draw_drawable(overlay->background, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], parent->drawable, overlay->p.x, overlay->p.y, 0, 0, overlay->width, overlay->height);
+ 		overlay->background_ready=1;
+ 	}
  	gdk_draw_pixbuf(parent->drawable, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], pixbuf2, 0, 0, overlay->p.x, overlay->p.y, overlay->width, overlay->height, GDK_RGB_DITHER_NONE, 0, 0);
  	if (window)

[Navit-cvs-commit] navit/src/osd Makefile.am,1.1,1.2

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/osd
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7588/src/osd

Modified Files:
	Makefile.am 
Log Message:
Reworked osd

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/osd/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	5 Jul 2007 21:05:52 -0000	1.1
--- Makefile.am	29 Aug 2007 18:32:15 -0000	1.2
***************
*** 1 ****
! SUBDIRS=
--- 1 ----
! SUBDIRS=core

[Navit-cvs-commit] navit/src Makefile.am, 1.15, 1.16 attr.c, 1.6, 1.7 attr_def.h, 1.4, 1.5 graphics.c, 1.14, 1.15 navit.c, 1.25, 1.26 osd.c, 1.2, 1.3 osd.h, 1.1, 1.2 plugin_def.h, 1.6, 1.7 xmlconfig.c, 1.14, 1.15

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7588/src

Modified Files:
	Makefile.am attr.c attr_def.h graphics.c navit.c osd.c osd.h 
	plugin_def.h xmlconfig.c 
Log Message:
Reworked osd

Index: attr.c
===================================================================
RCS file: /cvsroot/navit/navit/src/attr.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** attr.c	28 Aug 2007 17:31:05 -0000	1.6
--- attr.c	29 Aug 2007 18:32:12 -0000	1.7
***************
*** 58,65 ****
  		ret->u.item_type=item_from_name(value);
  		break;
- 	case attr_data:
- 		ret->u.str=value;
- 		break;
  	default:
  		dbg(1,"default\n");
  		g_free(ret);
--- 58,70 ----
  		ret->u.item_type=item_from_name(value);
  		break;
  	default:
+ 		if (attr >= attr_type_string_begin && attr <= attr_type_string_end) {
+ 			ret->u.str=value;
+ 			break;
+ 		}
+ 		if (attr >= attr_type_int_begin && attr <= attr_type_int_end) {
+ 			ret->u.num=atoi(value);
+ 			break;
+ 		}
  		dbg(1,"default\n");
  		g_free(ret);

Index: plugin_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/plugin_def.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** plugin_def.h	28 Aug 2007 17:31:13 -0000	1.6
--- plugin_def.h	29 Aug 2007 18:32:13 -0000	1.7
***************
*** 4,11 ****
  PLUGIN_FUNC3(popup, struct container *, map, struct popup *, p, struct popup_item **, list)
  struct navit;
! PLUGIN_TYPE(graphics, (struct graphics_methods *meth, struct attr **attr)) 
! PLUGIN_TYPE(gui, (struct navit *nav, struct gui_methods *meth, struct attr **attr)) 
! PLUGIN_TYPE(map, (struct map_methods *meth, struct attr **attr)) 
! PLUGIN_TYPE(osd, (struct osd_methods *meth)) 
  PLUGIN_TYPE(speech, (char *data, struct speech_methods *meth)) 
  PLUGIN_TYPE(vehicle, (struct vehicle_methods *meth)) 
--- 4,11 ----
  PLUGIN_FUNC3(popup, struct container *, map, struct popup *, p, struct popup_item **, list)
  struct navit;
! PLUGIN_TYPE(graphics, (struct graphics_methods *meth, struct attr **attrs)) 
! PLUGIN_TYPE(gui, (struct navit *nav, struct gui_methods *meth, struct attr **attrs)) 
! PLUGIN_TYPE(map, (struct map_methods *meth, struct attr **attrs)) 
! PLUGIN_TYPE(osd, (struct navit *nav, struct osd_methods *meth, struct attr **attrs))
  PLUGIN_TYPE(speech, (char *data, struct speech_methods *meth)) 
  PLUGIN_TYPE(vehicle, (struct vehicle_methods *meth)) 

Index: attr_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/attr_def.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** attr_def.h	28 Aug 2007 17:31:06 -0000	1.4
--- attr_def.h	29 Aug 2007 18:32:13 -0000	1.5
***************
*** 2,5 ****
--- 2,6 ----
  ATTR2(none,0x00000000)
  ATTR(any)
+ 
  ATTR2(type_item_begin,0x00010000)
  ATTR(town_streets_item)
***************
*** 10,19 ****
  ATTR(item_type)
  ATTR2(type_item_end,0x0001ffff)
  ATTR2(type_int_begin,0x00020000)
  ATTR(id)
  ATTR(limit)
  ATTR(w)
! ATTR(h)
  ATTR2(type_int_end,0x0002ffff)
  ATTR2(type_string_begin,0x00030000)
  ATTR(label)
--- 11,24 ----
  ATTR(item_type)
  ATTR2(type_item_end,0x0001ffff)
+ 
  ATTR2(type_int_begin,0x00020000)
+ ATTR(h)
  ATTR(id)
  ATTR(limit)
  ATTR(w)
! ATTR(x)
! ATTR(y)
  ATTR2(type_int_end,0x0002ffff)
+ 
  ATTR2(type_string_begin,0x00030000)
  ATTR(label)

Index: graphics.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** graphics.c	28 Aug 2007 17:31:06 -0000	1.14
--- graphics.c	29 Aug 2007 18:32:13 -0000	1.15
***************
*** 45,48 ****
--- 45,57 ----
  }
  
+ struct graphics *
+ graphics_overlay_new(struct graphics *parent, struct point *p, int w, int h)
+ {
+ 	struct graphics *this_;
+ 	this_=g_new0(struct graphics, 1);
+ 	this_->priv=parent->meth.overlay_new(parent->priv, &this_->meth, p, w, h);
+ 	return this_;
+ }
+ 
  
  void
***************
*** 162,165 ****
--- 171,181 ----
  
  
+ void
+ graphics_draw_rectangle(struct graphics *this_, struct graphics_gc *gc, struct point *p, int w, int h)
+ {
+ 	this_->meth.draw_rectangle(this_->priv, gc->priv, p, w, h);
+ }
+ 
+ 
  #include "attr.h"
  #include "popup.h"

Index: osd.h
===================================================================
RCS file: /cvsroot/navit/navit/src/osd.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** osd.h	5 Feb 2007 16:12:31 -0000	1.1
--- osd.h	29 Aug 2007 18:32:13 -0000	1.2
***************
*** 1,2 ****
! struct osd * osd_new(struct container *co);
! void osd_draw(struct osd *comp, struct container *co);
--- 1,10 ----
! struct osd_methods {
!        void (*osd_destroy)(struct osd_priv *osd);
! };
! 
! /* prototypes */
! struct attr;
! struct navit;
! struct osd;
! struct osd *osd_new(struct navit *nav, const char *type, struct attr **attrs);
! /* end of prototypes */

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.am	8 Jul 2007 20:41:32 -0000	1.15
--- Makefile.am	29 Aug 2007 18:32:12 -0000	1.16
***************
*** 12,16 ****
  navit_SOURCES = attr.c callback.c compass.c coord.c country.c cursor.c data_window.c debug.c \
  	file.c graphics.c gui.c item.c layout.c log.c main.c map.c \
! 	mapset.c maptype.c menu.c navit.c navigation.c param.c phrase.c plugin.c popup.c \
  	profile.c route.c search.c speech.c transform.c track.c \
  	util.c vehicle.c xmlconfig.c attr.h attr_def.h callback.h color.h compass.h coord.h country.h \
--- 12,16 ----
  navit_SOURCES = attr.c callback.c compass.c coord.c country.c cursor.c data_window.c debug.c \
  	file.c graphics.c gui.c item.c layout.c log.c main.c map.c \
! 	mapset.c maptype.c menu.c navit.c navigation.c osd.c param.c phrase.c plugin.c popup.c \
  	profile.c route.c search.c speech.c transform.c track.c \
  	util.c vehicle.c xmlconfig.c attr.h attr_def.h callback.h color.h compass.h coord.h country.h \

Index: xmlconfig.c
===================================================================
RCS file: /cvsroot/navit/navit/src/xmlconfig.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** xmlconfig.c	28 Aug 2007 17:31:14 -0000	1.14
--- xmlconfig.c	29 Aug 2007 18:32:14 -0000	1.15
***************
*** 19,22 ****
--- 19,23 ----
  #include "gui.h"
  #include "xmlconfig.h"
+ #include "osd.h"
  
  
***************
*** 352,355 ****
--- 353,368 ----
  
  static int
+ xmlconfig_osd(struct xmlstate *state)
+ {
+ 	struct attr **attrs;
+ 	const char *type=find_attribute(state, "type", 1);
+ 	if (! type)
+ 		return 0;
+ 	attrs=convert_to_attrs(state);
+ 	state->element_object = osd_new(state->parent->element_object, type, attrs);
+ 	return 1;
+ }
+ 
+ static int
  xmlconfig_announce(struct xmlstate *state)
  {
***************
*** 592,595 ****
--- 605,609 ----
  	{ "map",  "mapset", xmlconfig_map},
  	{ "navigation", "navit", xmlconfig_navigation},
+ 	{ "osd", "navit", xmlconfig_osd},
  	{ "announce", "navigation", xmlconfig_announce},
  	{ "speech", "navit", xmlconfig_speech},

Index: osd.c
===================================================================
RCS file: /cvsroot/navit/navit/src/osd.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** osd.c	20 Feb 2007 14:19:25 -0000	1.2
--- osd.c	29 Aug 2007 18:32:13 -0000	1.3
***************
*** 1,2 ****
--- 1,3 ----
+ #if 0
  //#include <math.h>
  #include <stdio.h>
***************
*** 11,25 ****
  #include "osd.h"
  
- struct osd {
- 	struct graphics *gr;
- 	struct graphics_gc *bg;
- 	struct graphics_gc *white;
- 	struct graphics_gc *green;
- 	struct graphics_font *font;
- 
- 	char command[256];
- 	char road_name[256];	
- };
- 
  void
  osd_set_next_command(char *new_command,char *new_road){
--- 12,15 ----
***************
*** 82,83 ****
--- 72,100 ----
  	return this;	
  }
+ #endif
+ 
+ #include <glib.h>
+ #include "debug.h"
+ #include "plugin.h"
+ #include "osd.h"
+ 
+ 
+ struct osd {
+ 	struct osd_methods meth;
+ 	struct osd_priv *priv;
+ };
+ 
+ struct osd *
+ osd_new(struct navit *nav, const char *type, struct attr **attrs)
+ {
+         struct osd *o;
+         struct osd_priv *(*new)(struct navit *nav, struct osd_methods *meth, struct attr **attrs);
+ 
+         new=plugin_get_osd_type(type);
+         if (! new)
+                 return NULL;
+         o=g_new0(struct osd, 1);
+         o->priv=new(nav, &o->meth, attrs);
+         return o;
+ }
+ 

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** navit.c	28 Aug 2007 17:31:11 -0000	1.25
--- navit.c	29 Aug 2007 18:32:13 -0000	1.26
***************
*** 75,78 ****
--- 75,79 ----
  	struct navit_vehicle *vehicle;
  	struct callback_list *vehicle_cbl;
+ 	struct callback_list *init_cbl;
  	int pid;
  	struct callback *nav_speech_cb;
***************
*** 186,189 ****
--- 187,191 ----
  	main_add_navit(this_);
  	this_->vehicle_cbl=callback_list_new();
+ 	this_->init_cbl=callback_list_new();
  
  	f=popen("pidof /usr/bin/ipaq-sleep","r");
***************
*** 230,233 ****
--- 232,241 ----
  }
  
+ struct graphics *
+ navit_get_graphics(struct navit *this_)
+ {
+ 	return this_->gra;
+ }
+ 
  static void
  navit_map_toggle(struct menu *menu, void *this__p, void *map_p)
***************
*** 818,821 ****
--- 826,830 ----
  #endif
  	navit_debug(this_);
+ 	callback_list_call_1(this_->init_cbl, this_);
  }
  
***************
*** 974,977 ****
--- 983,998 ----
  
  void
+ navit_add_init_cb(struct navit *this_, struct callback *cb)
+ {
+ 	callback_list_add(this_->init_cbl, cb);
+ }
+ 
+ void
+ navit_remove_init_cb(struct navit *this_, struct callback *cb)
+ {
+ 	callback_list_remove(this_->init_cbl, cb);
+ }
+ 
+ void
  navit_set_vehicle(struct navit *this_, struct navit_vehicle *nv)
  {

[Navit-cvs-commit] navit configure.in,1.27,1.28

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7588

Modified Files:
	configure.in 
Log Message:
Reworked osd

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** configure.in	23 Aug 2007 19:55:44 -0000	1.27
--- configure.in	29 Aug 2007 18:32:11 -0000	1.28
***************
*** 266,269 ****
--- 266,270 ----
  src/gui/sdl/Makefile
  src/osd/Makefile
+ src/osd/core/Makefile
  src/speech/Makefile
  src/speech/cmdline/Makefile

[Navit-cvs-commit] navit/src/data/mg poly.c,1.5,1.6

[Horwitz <ho...@us...>]

Update of /cvsroot/navit/navit/src/data/mg
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23608/data/mg

Modified Files:
	poly.c 
Log Message:
Add some more polygon types

Index: poly.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/poly.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** poly.c	17 Jul 2007 12:24:23 -0000	1.5
--- poly.c	28 Aug 2007 20:09:29 -0000	1.6
***************
*** 143,146 ****
--- 143,152 ----
  				item->type=type_hospital_poly;
  				break;
+ 			case 0x2e:
+ 				item->type=type_hospital_poly;
+ 				break;
+ 			case 0x2f:
+ 				item->type=type_university;
+ 				break;
  			case 0x32:
  				item->type=type_park_poly;
***************
*** 149,155 ****
--- 155,170 ----
  				item->type=type_sport_poly;
  				break;
+ 			case 0x35:
+ 				item->type=type_sport_poly;
+ 				break;
  			case 0x37:
  				item->type=type_golf_course;
  				break;
+ 			case 0x38:
+ 				item->type=type_national_park;
+ 				break;
+ 			case 0x39:
+ 				item->type=type_nature_park;
+ 				break;
  			case 0x3c:
  				item->type=type_water_poly;

[Navit-cvs-commit] navit/src item_def.h,1.6,1.7

[Horwitz <ho...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23608

Modified Files:
	item_def.h 
Log Message:
Add some more polygon types

Index: item_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/item_def.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** item_def.h	11 Aug 2007 08:02:29 -0000	1.6
--- item_def.h	28 Aug 2007 20:09:29 -0000	1.7
***************
*** 134,139 ****
--- 134,143 ----
  ITEM(park_poly)
  ITEM(sport_poly)
+ ITEM(museum_poly)
  ITEM(image)
  ITEM(image_path)
  ITEM(commercial_center)
  ITEM(golf_course)
+ ITEM(university)
+ ITEM(national_park)
+ ITEM(nature_park)

[Navit-cvs-commit] navit/src/data/poi_geodownload poi_geodownload.c, 1.2, 1.3

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/poi_geodownload
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22032

Modified Files:
	poi_geodownload.c 
Log Message:
Changed api for gui and graphics

Index: poi_geodownload.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/poi_geodownload/poi_geodownload.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** poi_geodownload.c	11 Aug 2007 21:58:18 -0000	1.2
--- poi_geodownload.c	28 Aug 2007 17:38:09 -0000	1.3
***************
*** 2,8 ****
  #include "debug.h"
  #include "coord.h"
  #include "map.h"
  #include "item.h"
- #include "projection.h"
  #include "plugin.h"
  
--- 2,8 ----
  #include "debug.h"
  #include "coord.h"
+ #include "projection.h"
  #include "map.h"
  #include "item.h"
  #include "plugin.h"
  
***************
*** 694,697 ****
--- 694,699 ----
  
  static struct map_methods map_methods_poi_geodownload = {
+ 	projection_mg,
+ 	"iso8859-1",
  	map_destroy_poi_geodownload,
  	map_rect_new_poi_geodownload,
***************
*** 702,717 ****
  
  static struct map_priv *
! map_new_poi_geodownload(struct map_methods *meth, char *filename, struct attr **attrs, char **charset, enum projection *pro)
  {
          struct map_priv *m;
-         dbg(1,"filename %s\n",filename);
  	MdbCatalogEntry *entry;
  	GPtrArray *catalog;
  	int i;
  	struct attr *attr;
! 
          *meth=map_methods_poi_geodownload;
-         *charset="iso8859-1";
-         *pro=projection_mg;
  
          m=g_new(struct map_priv, 1);
--- 704,721 ----
  
  static struct map_priv *
! map_new_poi_geodownload(struct map_methods *meth, struct attr **attrs)
  {
          struct map_priv *m;
  	MdbCatalogEntry *entry;
  	GPtrArray *catalog;
  	int i;
  	struct attr *attr;
! 	struct attr *data=attr_search(attrs, NULL, attr_data);
! 	char *filename;
!         if (! data)
! 		return NULL;
! 	filename=data->u.str;
!         dbg(1,"filename %s\n",filename);
          *meth=map_methods_poi_geodownload;
  
          m=g_new(struct map_priv, 1);

[Navit-cvs-commit] navit/src attr.c, 1.5, 1.6 attr.h, 1.5, 1.6 attr_def.h, 1.3, 1.4 graphics.c, 1.13, 1.14 graphics.h, 1.6, 1.7 gui.c, 1.4, 1.5 gui.h, 1.4, 1.5 item.c, 1.5, 1.6 item.h, 1.4, 1.5 map.c, 1.4, 1.5 map.h, 1.4, 1.5 mapset.c, 1.3, 1.4 maptype.c, 1.2, 1.3 navigation.c, 1.21, 1.22 navit.c, 1.24, 1.25 navit.h, 1.13, 1.14 navit.xml, 1.8, 1.9 plugin_def.h, 1.5, 1.6 route.c, 1.15, 1.16 search.c, 1.5, 1.6 track.c, 1.10, 1.11 xmlconfig.c, 1.13, 1.14

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16569/src

Modified Files:
	attr.c attr.h attr_def.h graphics.c graphics.h gui.c gui.h 
	item.c item.h map.c map.h mapset.c maptype.c navigation.c 
	navit.c navit.h navit.xml plugin_def.h route.c search.c 
	track.c xmlconfig.c 
Log Message:
Changed api for gui and graphics

Index: navigation.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navigation.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** navigation.c	17 Jul 2007 15:53:37 -0000	1.21
--- navigation.c	28 Aug 2007 17:31:11 -0000	1.22
***************
*** 13,16 ****
--- 13,17 ----
  #include "transform.h"
  #include "mapset.h"
+ #include "projection.h"
  #include "map.h"
  #include "navit.h"

Index: xmlconfig.c
===================================================================
RCS file: /cvsroot/navit/navit/src/xmlconfig.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** xmlconfig.c	11 Aug 2007 21:58:17 -0000	1.13
--- xmlconfig.c	28 Aug 2007 17:31:14 -0000	1.14
***************
*** 6,18 ****
  #include "layout.h"
  #include "mapset.h"
  #include "map.h"
  #include "navigation.h"
  #include "navit.h"
  #include "plugin.h"
- #include "projection.h"
  #include "route.h"
  #include "speech.h"
  #include "track.h"
  #include "vehicle.h"
  #include "xmlconfig.h"
  
--- 6,21 ----
  #include "layout.h"
  #include "mapset.h"
+ #include "projection.h"
  #include "map.h"
  #include "navigation.h"
  #include "navit.h"
  #include "plugin.h"
  #include "route.h"
  #include "speech.h"
  #include "track.h"
  #include "vehicle.h"
+ #include "point.h"
+ #include "graphics.h"
+ #include "gui.h"
  #include "xmlconfig.h"
  
***************
*** 29,33 ****
  
  
! static struct attr ** convert_to_attr(struct xmlstate *state)
  {
  	const gchar **attribute_name=state->attribute_names;
--- 32,36 ----
  
  
! static struct attr ** convert_to_attrs(struct xmlstate *state)
  {
  	const gchar **attribute_name=state->attribute_names;
***************
*** 40,44 ****
  		attribute_name++;
  	}
! 	ret=g_new(struct attr, count+1);
  	attribute_name=state->attribute_names;
  	count=0;
--- 43,47 ----
  		attribute_name++;
  	}
! 	ret=g_new(struct attr *, count+1);
  	attribute_name=state->attribute_names;
  	count=0;
***************
*** 187,191 ****
  xmlconfig_navit(struct xmlstate *state)
  {
! 	const char *value,*gui,*graphics;
  	int zoom=0;
  	struct coord c;
--- 190,194 ----
  xmlconfig_navit(struct xmlstate *state)
  {
! 	const char *value;
  	int zoom=0;
  	struct coord c;
***************
*** 202,214 ****
  		c.y=7000000;
  	}
! 	gui=find_attribute(state, "gui", 0);
! 	if (! gui)
! 		gui="gtk";
! 	graphics=find_attribute(state, "graphics", 0);
! 	if (! graphics)
! 		graphics="gtk_drawing_area";
! 	state->element_object = navit_new(gui, graphics, &c, pro, zoom);
  	if (! state->element_object)
  		return 0;
  	return 1;
  }
--- 205,241 ----
  		c.y=7000000;
  	}
! 	state->element_object = navit_new(&c, pro, zoom);
! 	if (! state->element_object)
! 		return 0;
! 	return 1;
! }
! 
! static int
! xmlconfig_graphics(struct xmlstate *state)
! {
! 	struct attr **attrs;
! 	const char *type=find_attribute(state, "type", 1);
! 	if (! type)
! 		return 0;
! 	attrs=convert_to_attrs(state);
! 	state->element_object = graphics_new(type, attrs);
! 	if (! state->element_object)
! 		return 0;
! 	navit_set_graphics(state->parent->element_object, state->element_object);
! 	return 1;
! }
! 
! static int
! xmlconfig_gui(struct xmlstate *state)
! {
! 	struct attr **attrs;
! 	const char *type=find_attribute(state, "type", 1);
! 	if (! type)
! 		return 0;
! 	attrs=convert_to_attrs(state);
! 	state->element_object = gui_new(state->parent->element_object, type, attrs);
  	if (! state->element_object)
  		return 0;
+ 	navit_set_gui(state->parent->element_object, state->element_object);
  	return 1;
  }
***************
*** 370,380 ****
  xmlconfig_map(struct xmlstate *state)
  {
! 	struct attr **attr;
  	const char *type=find_attribute(state, "type", 1);
! 	const char *data=find_attribute(state, "data", 1);
! 	if (! type || ! data)
  		return 0;
! 	attr=convert_to_attr(state);
! 	state->element_object = map_new(type, data, attr);
  	if (! state->element_object)
  		return 0;
--- 397,406 ----
  xmlconfig_map(struct xmlstate *state)
  {
! 	struct attr **attrs;
  	const char *type=find_attribute(state, "type", 1);
! 	if (! type)
  		return 0;
! 	attrs=convert_to_attrs(state);
! 	state->element_object = map_new(type, attrs);
  	if (! state->element_object)
  		return 0;
***************
*** 552,555 ****
--- 578,583 ----
  	{ "debug", NULL, xmlconfig_debug},
  	{ "navit", NULL, xmlconfig_navit},
+ 	{ "graphics", "navit", xmlconfig_graphics},
+ 	{ "gui", "navit", xmlconfig_gui},
  	{ "layout", "navit", xmlconfig_layout},
  	{ "layer", "layout", xmlconfig_layer},

Index: item.c
===================================================================
RCS file: /cvsroot/navit/navit/src/item.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** item.c	11 Aug 2007 08:02:29 -0000	1.5
--- item.c	28 Aug 2007 17:31:09 -0000	1.6
***************
*** 54,58 ****
  
  enum item_type
! item_from_name(char *name)
  {
  	int i;
--- 54,58 ----
  
  enum item_type
! item_from_name(const char *name)
  {
  	int i;

Index: item.h
===================================================================
RCS file: /cvsroot/navit/navit/src/item.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** item.h	11 Aug 2007 08:02:29 -0000	1.4
--- item.h	28 Aug 2007 17:31:09 -0000	1.5
***************
*** 44,48 ****
  int item_attr_get(struct item *it, enum attr_type attr_type, struct attr *attr);
  struct item *item_new(char *type, int zoom);
! enum item_type item_from_name(char *name);
  char *item_to_name(enum item_type item);
  struct item_hash *item_hash_new(void);
--- 44,48 ----
  int item_attr_get(struct item *it, enum attr_type attr_type, struct attr *attr);
  struct item *item_new(char *type, int zoom);
! enum item_type item_from_name(const char *name);
  char *item_to_name(enum item_type item);
  struct item_hash *item_hash_new(void);

Index: track.c
===================================================================
RCS file: /cvsroot/navit/navit/src/track.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** track.c	16 Jul 2007 20:22:41 -0000	1.10
--- track.c	28 Aug 2007 17:31:14 -0000	1.11
***************
*** 6,9 ****
--- 6,10 ----
  #include "item.h"
  #include "route.h"
+ #include "projection.h"
  #include "map.h"
  #include "mapset.h"

Index: attr.c
===================================================================
RCS file: /cvsroot/navit/navit/src/attr.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** attr.c	11 Aug 2007 21:58:16 -0000	1.5
--- attr.c	28 Aug 2007 17:31:05 -0000	1.6
***************
*** 21,25 ****
  
  enum attr_type
! attr_from_name(char *name)
  {
  	int i;
--- 21,25 ----
  
  enum attr_type
! attr_from_name(const char *name)
  {
  	int i;
***************
*** 45,49 ****
  
  struct attr *
! attr_new_from_text(char *name, char *value)
  {
  	enum attr_type attr;
--- 45,49 ----
  
  struct attr *
! attr_new_from_text(const char *name, const char *value)
  {
  	enum attr_type attr;
***************
*** 58,61 ****
--- 58,64 ----
  		ret->u.item_type=item_from_name(value);
  		break;
+ 	case attr_data:
+ 		ret->u.str=value;
+ 		break;
  	default:
  		dbg(1,"default\n");

Index: mapset.c
===================================================================
RCS file: /cvsroot/navit/navit/src/mapset.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mapset.c	11 Aug 2007 08:02:30 -0000	1.3
--- mapset.c	28 Aug 2007 17:31:11 -0000	1.4
***************
*** 4,7 ****
--- 4,8 ----
  #include "item.h"
  #include "mapset.h"
+ #include "projection.h"
  #include "map.h"
  

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** navit.xml	16 Jul 2007 12:49:19 -0000	1.8
--- navit.xml	28 Aug 2007 17:31:12 -0000	1.9
***************
*** 6,12 ****
  </plugins>
  <debug name="navit:do_draw" level="0" />
! <navit gui="gtk" graphics="gtk_drawing_area" center="5031.51 N 735.83 E" zoom="8192" >
! <!-- For SDL, use rather the following line
! <navit gui="sdl" graphics="opengl" center="5031.51 N 305.83 E" zoom="128" >
  -->
  	
--- 6,15 ----
  </plugins>
  <debug name="navit:do_draw" level="0" />
! <navit center="5031.51 N 735.83 E" zoom="8192" >
! 	<gui type="gtk" />
! 	<graphics type="gtk_drawing_area" />
! <!-- For SDL, use rather the following lines
! 	<gui type="sdl" />
! 	<graphics type="opengl" />
  -->
  	

Index: attr.h
===================================================================
RCS file: /cvsroot/navit/navit/src/attr.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** attr.h	11 Aug 2007 20:13:13 -0000	1.5
--- attr.h	28 Aug 2007 17:31:05 -0000	1.6
***************
*** 22,30 ****
  };
  
! enum attr_type attr_from_name(char *name);
! char * attr_to_name(enum attr_type attr);
! struct attr * attr_new_from_text(char *name, char *value);
! struct attr * attr_search(struct attr **attrs, struct attr *last, enum attr_type attr);
  void attr_free(struct attr *attr);
! 
  #endif
--- 22,33 ----
  };
  
! /* prototypes */
! enum attr_type;
! struct attr;
! enum attr_type attr_from_name(const char *name);
! char *attr_to_name(enum attr_type attr);
! struct attr *attr_new_from_text(const char *name, const char *value);
! struct attr *attr_search(struct attr **attrs, struct attr *last, enum attr_type attr);
  void attr_free(struct attr *attr);
! /* end of prototypes */
  #endif

Index: plugin_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/plugin_def.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** plugin_def.h	11 Aug 2007 08:02:30 -0000	1.5
--- plugin_def.h	28 Aug 2007 17:31:13 -0000	1.6
***************
*** 4,10 ****
  PLUGIN_FUNC3(popup, struct container *, map, struct popup *, p, struct popup_item **, list)
  struct navit;
! PLUGIN_TYPE(graphics, (struct graphics_methods *meth)) 
! PLUGIN_TYPE(gui, (struct navit *nav, struct gui_methods *meth, int w, int h)) 
! PLUGIN_TYPE(map, (struct map_methods *meth, char *data, struct attr **attr, char **charset, enum projection *pro)) 
  PLUGIN_TYPE(osd, (struct osd_methods *meth)) 
  PLUGIN_TYPE(speech, (char *data, struct speech_methods *meth)) 
--- 4,10 ----
  PLUGIN_FUNC3(popup, struct container *, map, struct popup *, p, struct popup_item **, list)
  struct navit;
! PLUGIN_TYPE(graphics, (struct graphics_methods *meth, struct attr **attr)) 
! PLUGIN_TYPE(gui, (struct navit *nav, struct gui_methods *meth, struct attr **attr)) 
! PLUGIN_TYPE(map, (struct map_methods *meth, struct attr **attr)) 
  PLUGIN_TYPE(osd, (struct osd_methods *meth)) 
  PLUGIN_TYPE(speech, (char *data, struct speech_methods *meth)) 

Index: route.c
===================================================================
RCS file: /cvsroot/navit/navit/src/route.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** route.c	22 Jul 2007 15:37:54 -0000	1.15
--- route.c	28 Aug 2007 17:31:13 -0000	1.16
***************
*** 12,15 ****
--- 12,16 ----
  #include "profile.h"
  #include "coord.h"
+ #include "projection.h"
  #include "map.h"
  #include "mapset.h"
***************
*** 959,963 ****
  
  #include "point.h"
- #include "projection.h"
  
  struct street_data *
--- 960,963 ----

Index: attr_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/attr_def.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** attr_def.h	11 Aug 2007 08:02:28 -0000	1.3
--- attr_def.h	28 Aug 2007 17:31:06 -0000	1.4
***************
*** 13,19 ****
--- 13,22 ----
  ATTR(id)
  ATTR(limit)
+ ATTR(w)
+ ATTR(h)
  ATTR2(type_int_end,0x0002ffff)
  ATTR2(type_string_begin,0x00030000)
  ATTR(label)
+ ATTR(data)
  ATTR(country_all)
  ATTR(country_iso3)

Index: gui.h
===================================================================
RCS file: /cvsroot/navit/navit/src/gui.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gui.h	13 Jul 2007 11:48:09 -0000	1.4
--- gui.h	28 Aug 2007 17:31:08 -0000	1.5
***************
*** 26,29 ****
--- 26,30 ----
  
  /* prototypes */
+ struct attr;
  struct callback;
  struct coord;
***************
*** 34,38 ****
  struct navit;
  struct statusbar;
! struct gui *gui_new(struct navit *nav, const char *type, int w, int h);
  struct statusbar *gui_statusbar_new(struct gui *gui);
  struct menu *gui_menubar_new(struct gui *gui);
--- 35,39 ----
  struct navit;
  struct statusbar;
! struct gui *gui_new(struct navit *nav, const char *type, struct attr **attrs);
  struct statusbar *gui_statusbar_new(struct gui *gui);
  struct menu *gui_menubar_new(struct gui *gui);

Index: map.h
===================================================================
RCS file: /cvsroot/navit/navit/src/map.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** map.h	11 Aug 2007 08:02:30 -0000	1.4
--- map.h	28 Aug 2007 17:31:09 -0000	1.5
***************
*** 11,14 ****
--- 11,16 ----
  
  struct map_methods {
+ 	enum projection pro;
+ 	char *charset;
  	void 			(*map_destroy)(struct map_priv *priv);
  	struct map_rect_priv *  (*map_rect_new)(struct map_priv *map, struct map_selection *sel);
***************
*** 29,39 ****
  struct map_search;
  struct map_selection;
! struct map *map_new(const char *type, const char *filename, struct attr **attrs);
! char * map_convert_string(struct map *this, char *str);
! void map_convert_free(char *str);
  char *map_get_filename(struct map *this);
  char *map_get_type(struct map *this);
  int map_get_active(struct map *this);
  void map_set_active(struct map *this, int active);
  enum projection map_projection(struct map *this);
  void map_destroy(struct map *m);
--- 31,42 ----
  struct map_search;
  struct map_selection;
! struct map *map_new(const char *type, struct attr **attrs);
  char *map_get_filename(struct map *this);
  char *map_get_type(struct map *this);
  int map_get_active(struct map *this);
  void map_set_active(struct map *this, int active);
+ int map_requires_conversion(struct map *this);
+ char *map_convert_string(struct map *this, char *str);
+ void map_convert_free(char *str);
  enum projection map_projection(struct map *this);
  void map_destroy(struct map *m);
***************
*** 45,47 ****
  struct item *map_search_get_item(struct map_search *this);
  void map_search_destroy(struct map_search *this);
! int map_requires_conversion(struct map *this);
--- 48,50 ----
  struct item *map_search_get_item(struct map_search *this);
  void map_search_destroy(struct map_search *this);
! /* end of prototypes */

Index: gui.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gui.c	13 Jul 2007 11:48:08 -0000	1.4
--- gui.c	28 Aug 2007 17:31:08 -0000	1.5
***************
*** 8,15 ****
  
  struct gui *
! gui_new(struct navit *nav, const char *type, int w, int h)
  {
  	struct gui *this_;
! 	struct gui_priv *(*guitype_new)(struct navit *nav, struct gui_methods *meth, int w, int h);
  
          guitype_new=plugin_get_gui_type(type);
--- 8,15 ----
  
  struct gui *
! gui_new(struct navit *nav, const char *type, struct attr **attrs)
  {
  	struct gui *this_;
! 	struct gui_priv *(*guitype_new)(struct navit *nav, struct gui_methods *meth, struct attr **attrs);
  
          guitype_new=plugin_get_gui_type(type);
***************
*** 18,22 ****
  
  	this_=g_new0(struct gui, 1);
! 	this_->priv=guitype_new(nav, &this_->meth, w, h);
  	return this_;
  }
--- 18,22 ----
  
  	this_=g_new0(struct gui, 1);
! 	this_->priv=guitype_new(nav, &this_->meth, attrs);
  	return this_;
  }

Index: map.c
===================================================================
RCS file: /cvsroot/navit/navit/src/map.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** map.c	11 Aug 2007 08:02:29 -0000	1.4
--- map.c	28 Aug 2007 17:31:09 -0000	1.5
***************
*** 3,10 ****
  #include "debug.h"
  #include "coord.h"
  #include "map.h"
  #include "maptype.h"
  #include "transform.h"
- #include "projection.h"
  #include "item.h"
  #include "plugin.h"
--- 3,10 ----
  #include "debug.h"
  #include "coord.h"
+ #include "projection.h"
  #include "map.h"
  #include "maptype.h"
  #include "transform.h"
  #include "item.h"
  #include "plugin.h"
***************
*** 14,22 ****
  	struct map_methods meth;
  	struct map_priv *priv;
- 	char *filename;
  	char *type;
! 	char *charset;
  	int active;
- 	enum projection projection;
  };
  
--- 14,20 ----
  	struct map_methods meth;
  	struct map_priv *priv;
  	char *type;
! 	char *filename;
  	int active;
  };
  
***************
*** 27,34 ****
  
  struct map *
! map_new(const char *type, const char *filename, struct attr **attrs)
  {
  	struct map *m;
! 	struct map_priv *(*maptype_new)(struct map_methods *meth, const char *name, struct attr *attrs, char **charset, enum projection *pro);
  
  	maptype_new=plugin_get_map_type(type);
--- 25,34 ----
  
  struct map *
! map_new(const char *type, struct attr **attrs)
  {
  	struct map *m;
! 	struct map_priv *(*maptype_new)(struct map_methods *meth, struct attr **attrs);
! 	struct attr *data=attr_search(attrs, NULL, attr_data);
! 
  
  	maptype_new=plugin_get_map_type(type);
***************
*** 38,44 ****
  	m=g_new0(struct map, 1);
  	m->active=1;
- 	m->filename=g_strdup(filename);
  	m->type=g_strdup(type);
! 	m->priv=maptype_new(&m->meth, filename, attrs, &m->charset, &m->projection);
  	return m;
  }
--- 38,45 ----
  	m=g_new0(struct map, 1);
  	m->active=1;
  	m->type=g_strdup(type);
! 	if (data) 
! 		m->filename=g_strdup(data->u.str);
! 	m->priv=maptype_new(&m->meth, attrs);
  	return m;
  }
***************
*** 71,75 ****
  map_requires_conversion(struct map *this)
  {
! 	return (this->charset != NULL);	
  }
  
--- 72,76 ----
  map_requires_conversion(struct map *this)
  {
! 	return (this->meth.charset != NULL);	
  }
  
***************
*** 77,81 ****
  map_convert_string(struct map *this, char *str)
  {
! 	return g_convert(str, -1,"utf-8",this->charset,NULL,NULL,NULL);
  }
  
--- 78,82 ----
  map_convert_string(struct map *this, char *str)
  {
! 	return g_convert(str, -1,"utf-8",this->meth.charset,NULL,NULL,NULL);
  }
  
***************
*** 89,93 ****
  map_projection(struct map *this)
  {
! 	return this->projection;
  }
  
--- 90,94 ----
  map_projection(struct map *this)
  {
! 	return this->meth.pro;
  }
  

Index: maptype.c
===================================================================
RCS file: /cvsroot/navit/navit/src/maptype.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** maptype.c	4 Jul 2007 22:44:26 -0000	1.2
--- maptype.c	28 Aug 2007 17:31:11 -0000	1.3
***************
*** 1,3 ****
--- 1,4 ----
  #include <glib.h>
+ #include "projection.h"
  #include "map.h"
  #include "maptype.h"

Index: search.c
===================================================================
RCS file: /cvsroot/navit/navit/src/search.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** search.c	11 Aug 2007 08:02:30 -0000	1.5
--- search.c	28 Aug 2007 17:31:14 -0000	1.6
***************
*** 1,4 ****
--- 1,5 ----
  #include <glib.h>
  #include "debug.h"
+ #include "projection.h"
  #include "map.h"
  #include "mapset.h"

Index: graphics.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** graphics.c	11 Aug 2007 08:02:28 -0000	1.13
--- graphics.c	28 Aug 2007 17:31:06 -0000	1.14
***************
*** 7,14 ****
  #include "point.h"
  #include "graphics.h"
  #include "map.h"
  #include "coord.h"
  #include "transform.h"
- #include "projection.h"
  #include "plugin.h"
  #include "profile.h"
--- 7,14 ----
  #include "point.h"
  #include "graphics.h"
+ #include "projection.h"
  #include "map.h"
  #include "coord.h"
  #include "transform.h"
  #include "plugin.h"
  #include "profile.h"
***************
*** 32,39 ****
  
  struct graphics *
! graphics_new(const char *type)
  {
  	struct graphics *this_;
! 	struct graphics_priv * (*new)(struct graphics_methods *meth);
  
  	new=plugin_get_graphics_type(type);
--- 32,39 ----
  
  struct graphics *
! graphics_new(const char *type, struct attr **attrs)
  {
  	struct graphics *this_;
! 	struct graphics_priv * (*new)(struct graphics_methods *meth, struct attr **attrs);
  
  	new=plugin_get_graphics_type(type);
***************
*** 41,45 ****
  		return NULL;	
  	this_=g_new0(struct graphics, 1);
! 	this_->priv=(*new)(&this_->meth);
  	return this_;
  }
--- 41,45 ----
  		return NULL;	
  	this_=g_new0(struct graphics, 1);
! 	this_->priv=(*new)(&this_->meth, attrs);
  	return this_;
  }

Index: navit.h
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** navit.h	11 Aug 2007 14:38:17 -0000	1.13
--- navit.h	28 Aug 2007 17:31:11 -0000	1.14
***************
*** 4,13 ****
  extern struct gui *main_loop_gui;
  /* prototypes */
- enum projection;
  enum item_type;
  struct callback;
  struct color;
  struct coord;
  struct displaylist;
  struct gui;
  struct layout;
--- 4,14 ----
  extern struct gui *main_loop_gui;
  /* prototypes */
  enum item_type;
+ enum projection;
  struct callback;
  struct color;
  struct coord;
  struct displaylist;
+ struct graphics;
  struct gui;
  struct layout;
***************
*** 17,20 ****
--- 18,22 ----
  struct navit;
  struct navit_vehicle;
+ struct navit_window_items;
  struct point;
  struct route;
***************
*** 30,34 ****
  void navit_zoom_in(struct navit *this_, int factor);
  void navit_zoom_out(struct navit *this_, int factor);
! struct navit *navit_new(const char *ui, const char *graphics, struct coord *center, enum projection pro, int zoom);
  void navit_set_destination(struct navit *this_, struct coord *c, char *description);
  void navit_add_bookmark(struct navit *this_, struct coord *c, char *description);
--- 32,38 ----
  void navit_zoom_in(struct navit *this_, int factor);
  void navit_zoom_out(struct navit *this_, int factor);
! struct navit *navit_new(struct coord *center, enum projection pro, int zoom);
! void navit_set_gui(struct navit *this_, struct gui *gui);
! void navit_set_graphics(struct navit *this_, struct graphics *gra);
  void navit_set_destination(struct navit *this_, struct coord *c, char *description);
  void navit_add_bookmark(struct navit *this_, struct coord *c, char *description);
***************
*** 43,49 ****
  void navit_add_menu_vehicle(struct navit *this_, struct menu *men);
  void navit_speak(struct navit *this_);
- void navit_window_roadbook_new(struct navit *this_);
  void navit_window_roadbook_destroy(struct navit *this_);
! struct navit_window_items * navit_window_items_new(char *name, int distance);
  void navit_window_items_add_item(struct navit_window_items *nwi, enum item_type type);
  void navit_add_window_items(struct navit *this_, struct navit_window_items *nwi);
--- 47,53 ----
  void navit_add_menu_vehicle(struct navit *this_, struct menu *men);
  void navit_speak(struct navit *this_);
  void navit_window_roadbook_destroy(struct navit *this_);
! void navit_window_roadbook_new(struct navit *this_);
! struct navit_window_items *navit_window_items_new(const char *name, int distance);
  void navit_window_items_add_item(struct navit_window_items *nwi, enum item_type type);
  void navit_add_window_items(struct navit *this_, struct navit_window_items *nwi);

Index: graphics.h
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** graphics.h	9 Jul 2007 22:18:25 -0000	1.6
--- graphics.h	28 Aug 2007 17:31:07 -0000	1.7
***************
*** 83,86 ****
--- 83,87 ----
  /* prototypes */
  enum draw_mode_num;
+ struct attr;
  struct color;
  struct displayitem;
***************
*** 95,99 ****
  struct route;
  struct transformation;
! struct graphics *graphics_new(const char *type);
  void graphics_init(struct graphics *this_);
  void *graphics_get_data(struct graphics *this_, char *type);
--- 96,100 ----
  struct route;
  struct transformation;
! struct graphics *graphics_new(const char *type, struct attr **attrs);
  void graphics_init(struct graphics *this_);
  void *graphics_get_data(struct graphics *this_, char *type);
***************
*** 113,116 ****
--- 114,118 ----
  void display_add(struct displaylist *displaylist, struct item *item, int count, struct point *pnt, char *label);
  int graphics_ready(struct graphics *this_);
+ void graphics_displaylist_draw(struct graphics *gra, struct displaylist *displaylist, struct transformation *trans, GList *layouts, struct route *route);
  void graphics_draw(struct graphics *gra, struct displaylist *displaylist, GList *mapsets, struct transformation *trans, GList *layouts, struct route *route);
  struct displaylist_handle *graphics_displaylist_open(struct displaylist *displaylist);
***************
*** 118,122 ****
  void graphics_displaylist_close(struct displaylist_handle *dlh);
  struct displaylist *graphics_displaylist_new(void);
- void graphics_displaylist_draw(struct graphics *gra, struct displaylist *displaylist, struct transformation *trans, GList *layouts, struct route *route);
  struct item *graphics_displayitem_get_item(struct displayitem *di);
  char *graphics_displayitem_get_label(struct displayitem *di);
--- 120,123 ----

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** navit.c	11 Aug 2007 20:13:13 -0000	1.24
--- navit.c	28 Aug 2007 17:31:11 -0000	1.25
***************
*** 12,15 ****
--- 12,16 ----
  #include "gui.h"
  #include "item.h"
+ #include "projection.h"
  #include "map.h"
  #include "mapset.h"
***************
*** 18,22 ****
  #include "point.h"
  #include "transform.h"
- #include "projection.h"
  #include "param.h"
  #include "menu.h"
--- 19,22 ----
***************
*** 30,33 ****
--- 30,34 ----
  #include "track.h"
  #include "vehicle.h"
+ #include "color.h"
  
  #define _(STRING)    gettext(STRING)
***************
*** 39,42 ****
--- 40,44 ----
  	int follow;
  	int follow_curr;
+ 	struct color c;
  	struct menu *menu;
  	struct cursor *cursor;
***************
*** 84,87 ****
--- 86,90 ----
  struct gui *main_loop_gui;
  
+ static void navit_cursor_update(struct navit *this_, struct cursor *cursor);
  
  void
***************
*** 176,180 ****
  
  struct navit *
! navit_new(const char *ui, const char *graphics, struct coord *center, enum projection pro, int zoom)
  {
  	struct navit *this_=g_new0(struct navit, 1);
--- 179,183 ----
  
  struct navit *
! navit_new(struct coord *center, enum projection pro, int zoom)
  {
  	struct navit *this_=g_new0(struct navit, 1);
***************
*** 199,208 ****
  	transform_setup(this_->trans, center, zoom, 0);
  	this_->displaylist=graphics_displaylist_new();
! 	this_->gui=gui_new(this_, ui, 792, 547);
! 	if (! this_->gui) {
! 		g_warning("failed to create gui '%s'", ui);
! 		navit_destroy(this_);
! 		return NULL;
! 	}
  	if (gui_has_main_loop(this_->gui)) {
  		if (! main_loop_gui) {
--- 202,212 ----
  	transform_setup(this_->trans, center, zoom, 0);
  	this_->displaylist=graphics_displaylist_new();
! 	return this_;
! }
! 
! void
! navit_set_gui(struct navit *this_, struct gui *gui)
! {
! 	this_->gui=gui;
  	if (gui_has_main_loop(this_->gui)) {
  		if (! main_loop_gui) {
***************
*** 210,215 ****
  		} else {
  			g_warning("gui with main loop already active, ignoring this instance");
! 			navit_destroy(this_);
! 			return NULL;
  		}
  	}
--- 214,218 ----
  		} else {
  			g_warning("gui with main loop already active, ignoring this instance");
! 			return;
  		}
  	}
***************
*** 217,235 ****
  	this_->toolbar=gui_toolbar_new(this_->gui);
  	this_->statusbar=gui_statusbar_new(this_->gui);
! 	this_->gra=graphics_new(graphics);
! 	if (! this_->gra) {
! 		g_warning("failed to create graphics '%s'", graphics);
! 		navit_destroy(this_);
! 		return NULL;
! 	}
  	graphics_register_resize_callback(this_->gra, navit_resize, this_);
  	graphics_register_button_callback(this_->gra, navit_button, this_);
- 	if (gui_set_graphics(this_->gui, this_->gra)) {
- 		g_warning("failed to connect graphics '%s' to gui '%s'\n", graphics, ui);
- 		navit_destroy(this_);
- 		return NULL;
- 	}
- 	graphics_init(this_->gra);
- 	return this_;
  }
  
--- 220,231 ----
  	this_->toolbar=gui_toolbar_new(this_->gui);
  	this_->statusbar=gui_statusbar_new(this_->gui);
! }
! 
! void
! navit_set_graphics(struct navit *this_, struct graphics *gra)
! {
! 	this_->gra=gra;
  	graphics_register_resize_callback(this_->gra, navit_resize, this_);
  	graphics_register_button_callback(this_->gra, navit_button, this_);
  }
  
***************
*** 722,726 ****
  
  struct navit_window_items *
! navit_window_items_new(char *name, int distance)
  {
  	struct navit_window_items *nwi=g_new0(struct navit_window_items, 1);
--- 718,722 ----
  
  struct navit_window_items *
! navit_window_items_new(const char *name, int distance)
  {
  	struct navit_window_items *nwi=g_new0(struct navit_window_items, 1);
***************
*** 763,767 ****
--- 759,779 ----
  	struct menu *men;
  	struct mapset *ms;
+ 	GList *l;
+ 	struct navit_vehicle *nv;
  
+ 	if (!this_->gui || !this_->gra || gui_set_graphics(this_->gui, this_->gra)) {
+ 		g_warning("failed to connect graphics to gui\n");
+ 		navit_destroy(this_);
+ 		return;
+ 	}
+ 	graphics_init(this_->gra);
+ 	l=this_->vehicles;
+ 	while (l) {
+ 		nv=l->data;
+ 		nv->cursor=cursor_new(this_->gra, nv->vehicle, &nv->c, this_->trans);
+ 		nv->update_cb=callback_new_1(callback_cast(navit_cursor_update), this_);
+ 		cursor_add_callback(nv->cursor, nv->update_cb);
+ 		l=g_list_next(l);
+ 	}
  	if (this_->mapsets) {
  		ms=this_->mapsets->data;
***************
*** 880,884 ****
  	dir=cursor_get_dir(cursor);
  	speed=cursor_get_speed(cursor);
! 	pro=vehicle_projection(this_->vehicle);
  
  	if (!transform(this_->trans, pro, cursor_c, &pnt) || !transform_within_border(this_->trans, &pnt, border)) {
--- 892,896 ----
  	dir=cursor_get_dir(cursor);
  	speed=cursor_get_speed(cursor);
! 	pro=vehicle_projection(this_->vehicle->vehicle);
  
  	if (!transform(this_->trans, pro, cursor_c, &pnt) || !transform_within_border(this_->trans, &pnt, border)) {
***************
*** 943,949 ****
  	nv->update_curr=nv->update=update;
  	nv->follow_curr=nv->follow=follow;
! 	nv->cursor=cursor_new(this_->gra, v, c, this_->trans);
! 	nv->update_cb=callback_new_1(callback_cast(navit_cursor_update), this_);
! 	cursor_add_callback(nv->cursor, nv->update_cb);
  
  	this_->vehicles=g_list_append(this_->vehicles, nv);
--- 955,959 ----
  	nv->update_curr=nv->update=update;
  	nv->follow_curr=nv->follow=follow;
! 	nv->c=*c;
  
  	this_->vehicles=g_list_append(this_->vehicles, nv);

[Navit-cvs-commit] navit/src/xpm Makefile.am,1.4,1.5

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/xpm
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16569/src/xpm

Modified Files:
	Makefile.am 
Log Message:
Changed api for gui and graphics

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/xpm/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile.am	9 Jul 2007 22:18:31 -0000	1.4
--- Makefile.am	28 Aug 2007 17:31:21 -0000	1.5
***************
*** 1,3 ****
  include $(top_srcdir)/Makefile.inc
! xpm_DATA = camping.xpm car_dealer.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm hospital.xpm hotel.xpm parking.xpm restaurant.xpm unknown.xpm
  EXTRA_DIST = $(xpm_DATA)
--- 1,5 ----
  include $(top_srcdir)/Makefile.inc
! xpm_DATA = camping.xpm car_dealer.xpm flag_bk_tr.xpm flag_bk_wh.xpm flag_bl_wh.xpm fuel.xpm hospital.xpm hotel.xpm parking.xpm restaurant.xpm unknown.xpm burgerking.ico
  EXTRA_DIST = $(xpm_DATA)
+ burgerking.ico:
+ 	wget http://www.burgerking.de/favicon.ico -O burgerking.ico

[Navit-cvs-commit] navit/src/gui/sdl gui_sdl_window.cpp,1.9,1.10

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/gui/sdl
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16569/src/gui/sdl

Modified Files:
	gui_sdl_window.cpp 
Log Message:
Changed api for gui and graphics

Index: gui_sdl_window.cpp
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/sdl/gui_sdl_window.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gui_sdl_window.cpp	21 Aug 2007 19:53:47 -0000	1.9
--- gui_sdl_window.cpp	28 Aug 2007 17:31:20 -0000	1.10
***************
*** 681,685 ****
  
  static struct gui_priv *
! gui_sdl_new(struct navit *nav, struct gui_methods *meth, int w, int h) 
  {
  	dbg(1,"Begin SDL init\n");
--- 681,685 ----
  
  static struct gui_priv *
! gui_sdl_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs) 
  {
  	dbg(1,"Begin SDL init\n");

[Navit-cvs-commit] navit/src/gui/gtk gui_gtk_window.c,1.11,1.12

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/gui/gtk
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16569/src/gui/gtk

Modified Files:
	gui_gtk_window.c 
Log Message:
Changed api for gui and graphics

Index: gui_gtk_window.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_window.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gui_gtk_window.c	13 Jul 2007 21:45:45 -0000	1.11
--- gui_gtk_window.c	28 Aug 2007 17:31:19 -0000	1.12
***************
*** 150,159 ****
  
  static struct gui_priv *
! gui_gtk_new(struct navit *nav, struct gui_methods *meth, int w, int h) 
  {
  	struct gui_priv *this;
  
  	*meth=gui_gtk_methods;
! 
  	this=g_new0(struct gui_priv, 1);
  	this->nav=nav;
--- 150,160 ----
  
  static struct gui_priv *
! gui_gtk_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs) 
  {
  	struct gui_priv *this;
+ 	int w=792, h=547;
  
  	*meth=gui_gtk_methods;
! 	
  	this=g_new0(struct gui_priv, 1);
  	this->nav=nav;

[Navit-cvs-commit] navit/src/data/garmin_img garmin_img.c,1.4,1.5

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/garmin_img
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16569/src/data/garmin_img

Modified Files:
	garmin_img.c 
Log Message:
Changed api for gui and graphics

Index: garmin_img.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/garmin_img/garmin_img.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** garmin_img.c	16 Jul 2007 13:46:19 -0000	1.4
--- garmin_img.c	28 Aug 2007 17:31:16 -0000	1.5
***************
*** 6,9 ****
--- 6,10 ----
  #include "plugin.h"
  #include "data.h"
+ #include "projection.h"
  #include "map.h"
  #include "maptype.h"
***************
*** 12,16 ****
  #include "coord.h"
  #include "transform.h"
- #include "projection.h"
  #include <stdio.h>
  #include "attr.h"
--- 13,16 ----
***************
*** 1459,1462 ****
--- 1459,1464 ----
  
  static struct map_methods map_methods_garmin_img = {
+ 	projection_garmin,
+ 	"iso8859-1",
  	map_destroy_garmin_img,
  	map_charset_garmin_img,
***************
*** 1469,1479 ****
  
  static struct map_priv *
! map_new_garmin_img(struct map_methods *meth, char *filename)
  {
  	struct map_priv *m;
  	*meth=map_methods_garmin_img;
  	m=g_new(struct map_priv, 1);
  	m->id=++map_id;
! 	m->filename=g_strdup(filename);
  	return m;
  }
--- 1471,1485 ----
  
  static struct map_priv *
! map_new_garmin_img(struct map_methods *meth, struct attr **attrs)
  {
  	struct map_priv *m;
+ 	struct attr *data=attr_search(attrs, NULL, attr_data);
+ 	if (! data)
+ 		return NULL;
+ 
  	*meth=map_methods_garmin_img;
  	m=g_new(struct map_priv, 1);
  	m->id=++map_id;
! 	m->filename=g_strdup(data->u.str);
  	return m;
  }

[Navit-cvs-commit] navit/src/graphics/null graphics_null.c, 1.3, 1.4

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/graphics/null
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16569/src/graphics/null

Modified Files:
	graphics_null.c 
Log Message:
Changed api for gui and graphics

Index: graphics_null.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/null/graphics_null.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** graphics_null.c	5 Jul 2007 20:55:38 -0000	1.3
--- graphics_null.c	28 Aug 2007 17:31:18 -0000	1.4
***************
*** 195,199 ****
  
  static struct graphics_priv *
! graphics_null_new(struct graphics_methods *meth)
  {
  	*meth=graphics_methods;
--- 195,199 ----
  
  static struct graphics_priv *
! graphics_null_new(struct graphics_methods *meth, struct attr **attrs)
  {
  	*meth=graphics_methods;

[Navit-cvs-commit] navit/src/data/mg map.c,1.3,1.4 mg.h,1.5,1.6

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/mg
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16569/src/data/mg

Modified Files:
	map.c mg.h 
Log Message:
Changed api for gui and graphics

Index: map.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/map.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** map.c	11 Aug 2007 08:02:31 -0000	1.3
--- map.c	28 Aug 2007 17:31:16 -0000	1.4
***************
*** 4,12 ****
  #include "plugin.h"
  #include "maptype.h"
- #include "projection.h"
  #include "mg.h"
  
  
! struct map_priv * map_new_mg(struct map_methods *meth, char *dirname, struct attr **attrs, char **charset, enum projection *pro);
  
  static int map_id;
--- 4,11 ----
  #include "plugin.h"
  #include "maptype.h"
  #include "mg.h"
  
  
! struct map_priv * map_new_mg(struct map_methods *meth, struct attr **attrs);
  
  static int map_id;
***************
*** 249,252 ****
--- 248,253 ----
  
  static struct map_methods map_methods_mg = {
+ 	projection_mg,
+ 	"iso8859-1",
  	map_destroy_mg,
  	map_rect_new_mg,
***************
*** 260,281 ****
  
  struct map_priv *
! map_new_mg(struct map_methods *meth, char *dirname, struct attr **attrs, char **charset, enum projection *pro)
  {
  	struct map_priv *m;
! 	int i,maybe_missing,len=strlen(dirname);
! 	char filename[len+16];
  	
  	*meth=map_methods_mg;
! 	*charset="iso8859-1";
! 	*pro=projection_mg;
  
  	m=g_new(struct map_priv, 1);
  	m->id=++map_id;
! 	m->dirname=g_strdup(dirname);
! 	strcpy(filename, dirname);
! 	filename[len]='/';
  	for (i = 0 ; i < file_end ; i++) {
  		if (file[i]) {
! 			strcpy(filename+len+1, file[i]);
  			m->file[i]=file_create_caseinsensitive(filename);
  			if (! m->file[i]) {
--- 261,282 ----
  
  struct map_priv *
! map_new_mg(struct map_methods *meth, struct attr **attrs)
  {
  	struct map_priv *m;
! 	int i,maybe_missing;
! 	struct attr *data;
! 	char *filename;
  	
  	*meth=map_methods_mg;
! 	data=attr_search(attrs, NULL, attr_data);
! 	if (! data)
! 		return NULL;
  
  	m=g_new(struct map_priv, 1);
  	m->id=++map_id;
! 	m->dirname=g_strdup(data->u.str);
  	for (i = 0 ; i < file_end ; i++) {
  		if (file[i]) {
! 			filename=g_strdup_printf("%s/%s", data->u.str, file[i]);
  			m->file[i]=file_create_caseinsensitive(filename);
  			if (! m->file[i]) {
***************
*** 284,287 ****
--- 285,289 ----
  					g_warning("Failed to load %s", filename);
  			}
+ 			g_free(filename);
  		}
  	}

Index: mg.h
===================================================================
RCS file: /cvsroot/navit/navit/src/data/mg/mg.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mg.h	11 Aug 2007 08:02:31 -0000	1.5
--- mg.h	28 Aug 2007 17:31:17 -0000	1.6
***************
*** 4,7 ****
--- 4,8 ----
  #include "coord.h"
  #include "data.h"
+ #include "projection.h"
  #include "map.h"
  #include "file.h"

[Navit-cvs-commit] navit/src/graphics/opengl graphics_opengl.c, 1.3, 1.4

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/graphics/opengl
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16569/src/graphics/opengl

Modified Files:
	graphics_opengl.c 
Log Message:
Changed api for gui and graphics

Index: graphics_opengl.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/opengl/graphics_opengl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** graphics_opengl.c	10 Jul 2007 13:57:20 -0000	1.3
--- graphics_opengl.c	28 Aug 2007 17:31:19 -0000	1.4
***************
*** 892,896 ****
  
  static struct graphics_priv *
! graphics_opengl_new(struct graphics_methods *meth)
  {
  	struct graphics_priv *this=g_new0(struct graphics_priv,1);
--- 892,896 ----
  
  static struct graphics_priv *
! graphics_opengl_new(struct graphics_methods *meth, struct attr **attrs)
  {
  	struct graphics_priv *this=g_new0(struct graphics_priv,1);

[Navit-cvs-commit] navit/src/data/textfile textfile.c,1.5,1.6

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/textfile
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16569/src/data/textfile

Modified Files:
	textfile.c 
Log Message:
Changed api for gui and graphics

Index: textfile.c
===================================================================
RCS file: /cvsroot/navit/navit/src/data/textfile/textfile.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** textfile.c	11 Aug 2007 08:02:46 -0000	1.5
--- textfile.c	28 Aug 2007 17:31:17 -0000	1.6
***************
*** 6,9 ****
--- 6,10 ----
  #include "debug.h"
  #include "plugin.h"
+ #include "projection.h"
  #include "map.h"
  #include "maptype.h"
***************
*** 12,16 ****
  #include "coord.h"
  #include "transform.h"
- #include "projection.h"
  
  #include "textfile.h"
--- 13,16 ----
***************
*** 284,287 ****
--- 284,289 ----
  
  static struct map_methods map_methods_textfile = {
+ 	projection_mg,
+ 	"iso8859-1",
  	map_destroy_textfile,
  	map_rect_new_textfile,
***************
*** 292,306 ****
  
  static struct map_priv *
! map_new_textfile(struct map_methods *meth, char *filename, struct attr **attrs, char **charset, enum projection *pro)
  {
  	struct map_priv *m;
! 	dbg(1,"map_new_textfile %s\n",filename);	
  	*meth=map_methods_textfile;
- 	*charset="iso8859-1";
- 	*pro=projection_mg;
  
  	m=g_new(struct map_priv, 1);
  	m->id=++map_id;
! 	m->filename=g_strdup(filename);
  	return m;
  }
--- 294,309 ----
  
  static struct map_priv *
! map_new_textfile(struct map_methods *meth, struct attr **attrs)
  {
  	struct map_priv *m;
! 	struct attr *data=attr_search(attrs, NULL, attr_data);
! 	if (! data)
! 		return NULL;
! 	dbg(1,"map_new_textfile %s\n", data->u.str);	
  	*meth=map_methods_textfile;
  
  	m=g_new(struct map_priv, 1);
  	m->id=++map_id;
! 	m->filename=g_strdup(data->u.str);
  	return m;
  }

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.15, 1.16

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/graphics/gtk_drawing_area
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16569/src/graphics/gtk_drawing_area

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Changed api for gui and graphics

Index: graphics_gtk_drawing_area.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** graphics_gtk_drawing_area.c	9 Jul 2007 22:18:30 -0000	1.15
--- graphics_gtk_drawing_area.c	28 Aug 2007 17:31:18 -0000	1.16
***************
*** 759,763 ****
  
  static struct graphics_priv *
! graphics_gtk_drawing_area_new(struct graphics_methods *meth)
  {
  	GtkWidget *draw;
--- 759,763 ----
  
  static struct graphics_priv *
! graphics_gtk_drawing_area_new(struct graphics_methods *meth, struct attr **attrs)
  {
  	GtkWidget *draw;

[Navit-cvs-commit] navit/src/binding/python binding_python.c, 1.2, 1.3

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/binding/python
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16569/src/binding/python

Modified Files:
	binding_python.c 
Log Message:
Changed api for gui and graphics

Index: binding_python.c
===================================================================
RCS file: /cvsroot/navit/navit/src/binding/python/binding_python.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** binding_python.c	11 Aug 2007 10:30:00 -0000	1.2
--- binding_python.c	28 Aug 2007 17:31:15 -0000	1.3
***************
*** 3,6 ****
--- 3,7 ----
  #include <fcntl.h>
  #include "coord.h"
+ #include "projection.h"
  #include "map.h"
  #include "mapset.h"
***************
*** 174,178 ****
  		return NULL;
  	ret=PyObject_NEW(mapObject, &map_Type);
! 	ret->m=map_new(type,filename,NULL);
  	return (PyObject *)ret;
  }
--- 175,179 ----
  		return NULL;
  	ret=PyObject_NEW(mapObject, &map_Type);
! 	ret->m=map_new(type,NULL);
  	return (PyObject *)ret;
  }

[Navit-cvs-commit] navit/po de.po, 1.12, 1.13 es.po, 1.3, 1.4 fr.po, 1.23, 1.24 it.po, 1.4, 1.5 no.po, 1.5, 1.6 pl.po, 1.5, 1.6

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/po
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6889/po

Modified Files:
	de.po es.po fr.po it.po no.po pl.po 
Log Message:
New version 0.0.2

Index: it.po
===================================================================
RCS file: /cvsroot/navit/navit/po/it.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** it.po	9 Aug 2007 08:40:24 -0000	1.4
--- it.po	23 Aug 2007 19:55:46 -0000	1.5
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.1\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-08-03 14:49+0200\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.2\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-08-03 14:49+0200\n"

Index: fr.po
===================================================================
RCS file: /cvsroot/navit/navit/po/fr.po,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** fr.po	9 Aug 2007 08:40:24 -0000	1.23
--- fr.po	23 Aug 2007 19:55:46 -0000	1.24
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.1\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-08-03 14:49+0200\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.2\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-08-03 14:49+0200\n"

Index: de.po
===================================================================
RCS file: /cvsroot/navit/navit/po/de.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** de.po	9 Aug 2007 08:40:23 -0000	1.12
--- de.po	23 Aug 2007 19:55:45 -0000	1.13
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.1\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-08-03 14:49+0200\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.2\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-08-03 14:49+0200\n"

Index: es.po
===================================================================
RCS file: /cvsroot/navit/navit/po/es.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** es.po	21 Aug 2007 20:10:06 -0000	1.3
--- es.po	23 Aug 2007 19:55:45 -0000	1.4
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.1\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-08-03 14:49+0200\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.2\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-08-03 14:49+0200\n"

Index: pl.po
===================================================================
RCS file: /cvsroot/navit/navit/po/pl.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pl.po	9 Aug 2007 08:40:24 -0000	1.5
--- pl.po	23 Aug 2007 19:55:46 -0000	1.6
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.1\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-08-03 14:49+0200\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.2\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-08-03 14:49+0200\n"

Index: no.po
===================================================================
RCS file: /cvsroot/navit/navit/po/no.po,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** no.po	9 Aug 2007 08:40:24 -0000	1.5
--- no.po	23 Aug 2007 19:55:46 -0000	1.6
***************
*** 6,10 ****
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.1\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-08-03 14:49+0200\n"
--- 6,10 ----
  msgid ""
  msgstr ""
! "Project-Id-Version: Navit 0.0.2\n"
  "Report-Msgid-Bugs-To: \n"
  "POT-Creation-Date: 2007-08-03 14:49+0200\n"

[Navit-cvs-commit] navit configure.in,1.26,1.27

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6889

Modified Files:
	configure.in 
Log Message:
New version 0.0.2

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** configure.in	23 Aug 2007 18:58:44 -0000	1.26
--- configure.in	23 Aug 2007 19:55:44 -0000	1.27
***************
*** 1,3 ****
! AC_INIT(navit, 0.0.1)
  AM_INIT_AUTOMAKE
  AM_CONFIG_HEADER(config.h)
--- 1,3 ----
! AC_INIT(navit, 0.0.2)
  AM_INIT_AUTOMAKE
  AM_CONFIG_HEADER(config.h)

[Navit-cvs-commit] navit/src/data/poi_geodownload/libmdb Makefile.am, 1.2, 1.3

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/poi_geodownload/libmdb
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22361/libmdb

Modified Files:
	Makefile.am 
Log Message:
Fixed make distcheck

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/data/poi_geodownload/libmdb/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	23 Aug 2007 18:58:47 -0000	1.2
--- Makefile.am	23 Aug 2007 19:29:51 -0000	1.3
***************
*** 1,14 ****
  SUBDIRS=include
! AUTOMAKE_OPTIONS = no-exeext
! AM_CPPFLAGS = @NAVIT_CFLAGS@ -Iinclude
! 
! objdir=$(prefix)
! obj_PROGRAMS=libmdb.a
! INSTALL_PROGRAM=/bin/true
! 
! libmdb_a_SOURCES=backend.c catalog.c data.c dump.c file.c iconv.c index.c kkd.c like.c map.c mem.c money.c options.c props.c sargs.c stats.c table.c worktable.c write.c
! 
! libmdb.a: $(libmdb_a_OBJECTS)
! 	ar r $@ $(libmdb_a_OBJECTS)
! 
! 
--- 1,5 ----
  SUBDIRS=include
! AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(srcdir)/include
! noinst_LTLIBRARIES = libmdb.la
! libmdb_la_LDFLAGS = -static
! libmdb_la_SOURCES=backend.c catalog.c data.c dump.c file.c iconv.c index.c kkd.c like.c map.c mem.c money.c options.c props.c sargs.c stats.c table.c worktable.c write.c

[Navit-cvs-commit] navit/src/data/poi_geodownload Makefile.am, 1.1, 1.2

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/poi_geodownload
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22361

Modified Files:
	Makefile.am 
Log Message:
Fixed make distcheck

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/data/poi_geodownload/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	11 Aug 2007 08:02:32 -0000	1.1
--- Makefile.am	23 Aug 2007 19:29:50 -0000	1.2
***************
*** 1,5 ****
  SUBDIRS=libmdb
  include $(top_srcdir)/Makefile.inc
! AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -Ilibmdb/include -DMODULE=\"data_poi_geodownload\"
  moduledata_LTLIBRARIES = libdata_poi_geodownload.la
  libdata_poi_geodownload_la_SOURCES = poi_geodownload.c
--- 1,5 ----
  SUBDIRS=libmdb
  include $(top_srcdir)/Makefile.inc
! AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/src -I$(srcdir)/libmdb/include -DMODULE=\"data_poi_geodownload\"
  moduledata_LTLIBRARIES = libdata_poi_geodownload.la
  libdata_poi_geodownload_la_SOURCES = poi_geodownload.c

[Navit-cvs-commit] navit/src/data/poi_geodownload/libmdb/include Makefile.am, NONE, 1.1

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/poi_geodownload/libmdb/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1703/src/data/poi_geodownload/libmdb/include

Added Files:
	Makefile.am 
Log Message:
Fixed make distcheck

--- NEW FILE: Makefile.am ---
EXTRA_DIST = mdbtools.h

[Navit-cvs-commit] navit/src/data/poi_geodownload/libmdb Makefile.am, 1.1, 1.2

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit/src/data/poi_geodownload/libmdb
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1703/src/data/poi_geodownload/libmdb

Modified Files:
	Makefile.am 
Log Message:
Fixed make distcheck

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/data/poi_geodownload/libmdb/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.am	11 Aug 2007 08:02:33 -0000	1.1
--- Makefile.am	23 Aug 2007 18:58:47 -0000	1.2
***************
*** 1,2 ****
--- 1,3 ----
+ SUBDIRS=include
  AUTOMAKE_OPTIONS = no-exeext
  AM_CPPFLAGS = @NAVIT_CFLAGS@ -Iinclude

[Navit-cvs-commit] navit configure.in,1.25,1.26

[Martin S. <mar...@us...>]

Update of /cvsroot/navit/navit
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1703

Modified Files:
	configure.in 
Log Message:
Fixed make distcheck

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** configure.in	11 Aug 2007 08:02:27 -0000	1.25
--- configure.in	23 Aug 2007 18:58:44 -0000	1.26
***************
*** 256,259 ****
--- 256,260 ----
  src/data/poi_geodownload/Makefile
  src/data/poi_geodownload/libmdb/Makefile
+ src/data/poi_geodownload/libmdb/include/Makefile
  src/fib-1.1/Makefile
  src/graphics/Makefile