navit-cvs-commit — CVS commit mailing list

[Navit-cvs-commit] navit/src/gui/gtk destination.c, 1.13, 1.14 gui_gtk_action.c, 1.29, 1.30

[Albert L F. <af...@us...>]

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

Modified Files:
	destination.c gui_gtk_action.c 
Log Message:
Fix:graphics/gtk:fix win32 popup issue

Index: destination.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/destination.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** destination.c	8 Jan 2008 11:44:44 -0000	1.13
--- destination.c	13 Jan 2008 22:47:57 -0000	1.14
***************
*** 53,59 ****
  	gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), iter, 2, &town, -1);
  	gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), iter, 4, &street, -1);
! 	if (search->attr.type == attr_town_name) 
  		desc=g_strdup_printf("%s-%s %s", car, postal, town);
! 	else 
  		desc=g_strdup_printf("%s-%s %s, %s", car, postal, town, street);
  	return desc;
--- 53,59 ----
  	gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), iter, 2, &town, -1);
  	gtk_tree_model_get (GTK_TREE_MODEL (search->liststore2), iter, 4, &street, -1);
! 	if (search->attr.type == attr_town_name)
  		desc=g_strdup_printf("%s-%s %s", car, postal, town);
! 	else
  		desc=g_strdup_printf("%s-%s %s, %s", car, postal, town, street);
  	return desc;
***************
*** 104,108 ****
  	GList *columns_list,*columns;
  	char **column_text=columns_text[mode];
! 	int i=0;	
  
  	columns_list=gtk_tree_view_get_columns(GTK_TREE_VIEW(param->treeview));
--- 104,108 ----
  	GList *columns_list,*columns;
  	char **column_text=columns_text[mode];
! 	int i=0;
  
  	columns_list=gtk_tree_view_get_columns(GTK_TREE_VIEW(param->treeview));
***************
*** 121,125 ****
  		column_text++;
  	}
! 	
  }
  
--- 121,125 ----
  		column_text++;
  	}
! 
  }
  
***************
*** 139,143 ****
  		dbg(0,"town\n");
  		search->attr.type=attr_town_name;
! 		if (strlen(search->attr.u.str) < 3) 
  			return;
  		set_columns(search, 1);
--- 139,143 ----
  		dbg(0,"town\n");
  		search->attr.type=attr_town_name;
! 		if (strlen(search->attr.u.str) < 3)
  			return;
  		set_columns(search, 1);
***************
*** 150,154 ****
  
  
! 	search_list_search(search->sl, &search->attr, 1);	
  	gtk_list_store_clear(search->liststore);
  	while((res=search_list_get_result(search->sl))) {
--- 150,154 ----
  
  
! 	search_list_search(search->sl, &search->attr, 1);
  	gtk_list_store_clear(search->liststore);
  	while((res=search_list_get_result(search->sl))) {
***************
*** 180,184 ****
  			else
  				gtk_list_store_set(search->liststore,&iter,4,"",-1);
! 			
  		}
  	}
--- 180,184 ----
  			else
  				gtk_list_store_set(search->liststore,&iter,4,"",-1);
! 
  		}
  	}
***************
*** 351,355 ****
  	gtk_tree_view_set_model (GTK_TREE_VIEW (search->treeview), NULL);
  	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(search->listbox),search->treeview);
! 	{ 
  		GType types[COL_COUNT+1];
  		for(i=0;i<COL_COUNT;i++)
--- 351,355 ----
  	gtk_tree_view_set_model (GTK_TREE_VIEW (search->treeview), NULL);
  	gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(search->listbox),search->treeview);
! 	{
  		GType types[COL_COUNT+1];
  		for(i=0;i<COL_COUNT;i++)
***************
*** 412,424 ****
  #endif
  	gtk_widget_show_all(window2);
  	gtk_socket_steal(GTK_SOCKET(keyboard), spawn_xkbd("xkbd","-geometry 200x100"));
  
  	country_attr=country_default();
  	tracking=navit_get_tracking(nav);
! 	if (tracking && tracking_get_current_attr(tracking, attr_country_id, &search_attr)) 
  		country_attr=&search_attr;
  	cs=country_search_new(country_attr, 0);
  	item=country_search_get_item(cs);
! 	if (item && item_attr_get(item, attr_country_name, &country_name)) 
  		gtk_entry_set_text(GTK_ENTRY(search->entry_country), country_name.u.str);
  	country_search_destroy(cs);
--- 412,427 ----
  #endif
  	gtk_widget_show_all(window2);
+ 
+ #ifndef _WIN32
  	gtk_socket_steal(GTK_SOCKET(keyboard), spawn_xkbd("xkbd","-geometry 200x100"));
+ #endif
  
  	country_attr=country_default();
  	tracking=navit_get_tracking(nav);
! 	if (tracking && tracking_get_current_attr(tracking, attr_country_id, &search_attr))
  		country_attr=&search_attr;
  	cs=country_search_new(country_attr, 0);
  	item=country_search_get_item(cs);
! 	if (item && item_attr_get(item, attr_country_name, &country_name))
  		gtk_entry_set_text(GTK_ENTRY(search->entry_country), country_name.u.str);
  	country_search_destroy(cs);

Index: gui_gtk_action.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_action.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** gui_gtk_action.c	13 Jan 2008 11:29:06 -0000	1.29
--- gui_gtk_action.c	13 Jan 2008 22:47:57 -0000	1.30
***************
*** 16,20 ****
  
  struct menu_priv {
! 	char *path;	
  	GtkAction *action;
  	struct gui_priv *gui;
--- 16,20 ----
  
  struct menu_priv {
! 	char *path;
  	GtkAction *action;
  	struct gui_priv *gui;
***************
*** 140,144 ****
  
  
! static void     
  quit_action (GtkWidget *w, struct gui_priv *gui, void *dummy)
  {
--- 140,144 ----
  
  
! static void
  quit_action (GtkWidget *w, struct gui_priv *gui, void *dummy)
  {
***************
*** 191,195 ****
  }
  
! static GtkActionEntry entries[] = 
  {
  	{ "DisplayMenuAction", NULL, gettext_noop("Display") },
--- 191,195 ----
  }
  
! static GtkActionEntry entries[] =
  {
  	{ "DisplayMenuAction", NULL, gettext_noop("Display") },
***************
*** 214,218 ****
  static guint n_entries = G_N_ELEMENTS (entries);
  
! static GtkToggleActionEntry toggleentries[] = 
  {
  	{ "CursorAction", "cursor_icon",_n("Cursor"), NULL, NULL, G_CALLBACK(cursor_action),TRUE },
--- 214,218 ----
  static guint n_entries = G_N_ELEMENTS (entries);
  
! static GtkToggleActionEntry toggleentries[] =
  {
  	{ "CursorAction", "cursor_icon",_n("Cursor"), NULL, NULL, G_CALLBACK(cursor_action),TRUE },
***************
*** 228,232 ****
  static guint n_toggleentries = G_N_ELEMENTS (toggleentries);
  
! static GtkActionEntry debug_entries[] = 
  {
  	{ "DataMenuAction", NULL, _n("Data") },
--- 228,232 ----
  static guint n_toggleentries = G_N_ELEMENTS (toggleentries);
  
! static GtkActionEntry debug_entries[] =
  {
  	{ "DataMenuAction", NULL, _n("Data") },
***************
*** 343,347 ****
  {
  	GtkIconFactory *icon_factory;
! 	GtkIconSet *icon_set; 
  	GdkPixbuf *pixbuf;
  	gint i;
--- 343,347 ----
  {
  	GtkIconFactory *icon_factory;
! 	GtkIconSet *icon_set;
  	GdkPixbuf *pixbuf;
  	gint i;
***************
*** 349,353 ****
  	icon_factory = gtk_icon_factory_new ();
  
! 	for (i = 0; i < n_stock_icons; i++) 
  	{
  		pixbuf = gdk_pixbuf_new_from_xpm_data(stock_icons[i].icon_xpm);
--- 349,353 ----
  	icon_factory = gtk_icon_factory_new ();
  
! 	for (i = 0; i < n_stock_icons; i++)
  	{
  		pixbuf = gdk_pixbuf_new_from_xpm_data(stock_icons[i].icon_xpm);
***************
*** 358,362 ****
  	}
  
! 	gtk_icon_factory_add_default(icon_factory); 
  
  	g_object_unref(icon_factory);
--- 358,362 ----
  	}
  
! 	gtk_icon_factory_add_default(icon_factory);
  
  	g_object_unref(icon_factory);
***************
*** 412,416 ****
  		</popup>\
  	</ui>";
! 	
  
  static void
--- 412,416 ----
  		</popup>\
  	</ui>";
! 
  
  static void
***************
*** 419,423 ****
  	if (menu->cb)
  		callback_call_0(menu->cb);
! }	
  
  static struct menu_methods menu_methods;
--- 419,423 ----
  	if (menu->cb)
  		callback_call_0(menu->cb);
! }
  
  static struct menu_methods menu_methods;
***************
*** 441,445 ****
  		else
  			ret->action=gtk_action_new(dynname, name, NULL, NULL);
! 		if (cb) 
  			ret->handler_id=g_signal_connect(ret->action, "activate", G_CALLBACK(activate), ret);
  		gtk_action_group_add_action(menu->gui->dyn_group, ret->action);
--- 441,445 ----
  		else
  			ret->action=gtk_action_new(dynname, name, NULL, NULL);
! 		if (cb)
  			ret->handler_id=g_signal_connect(ret->action, "activate", G_CALLBACK(activate), ret);
  		gtk_action_group_add_action(menu->gui->dyn_group, ret->action);
***************
*** 455,459 ****
  	g_free(dynname);
  	return ret;
! 		
  }
  
--- 455,459 ----
  	g_free(dynname);
  	return ret;
! 
  }
  
***************
*** 507,515 ****
  	g_signal_handler_disconnect(widget, menu->handler_id);
  	remove_menu(menu, 1);
! }	
  
  static void
  popup_activate(struct menu_priv *menu)
  {
  	gtk_menu_popup(GTK_MENU(menu->widget), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
  	menu->handler_id=g_signal_connect(menu->widget, "selection-done", G_CALLBACK(popup_deactivate), menu);
--- 507,518 ----
  	g_signal_handler_disconnect(widget, menu->handler_id);
  	remove_menu(menu, 1);
! }
  
  static void
  popup_activate(struct menu_priv *menu)
  {
+ #ifdef _WIN32
+ 	menu->widget=gtk_ui_manager_get_widget(menu->gui->menu_manager, menu->path );
+ #endif
  	gtk_menu_popup(GTK_MENU(menu->widget), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
  	menu->handler_id=g_signal_connect(menu->widget, "selection-done", G_CALLBACK(popup_deactivate), menu);

[Navit-cvs-commit] navit/src attr.h, 1.14, 1.15 menu.c, 1.5, 1.6 menu.h, 1.5, 1.6 popup.c, 1.22, 1.23

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

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

Modified Files:
	attr.h menu.c menu.h popup.c 
Log Message:
Fix:Core:Improved popup handling

Index: popup.c
===================================================================
RCS file: /cvsroot/navit/navit/src/popup.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** popup.c	7 Jan 2008 23:15:41 -0000	1.22
--- popup.c	13 Jan 2008 11:29:06 -0000	1.23
***************
*** 241,249 ****
  	popup_printf_cb(men, menu_type_menu, callback_new_2(callback_cast(popup_set_bookmark), nav, &c), _("Add as bookmark"));
  	popup_display(nav, popup, p);
! #ifdef _WIN32
! 	// menu needs first to be constructed before doing the menu popup
! 	// therefore this work around for win32
! 	// needs to be fixed
! 	popup=gui_popup_new(navit_get_gui(nav));
! #endif
  }
--- 241,244 ----
  	popup_printf_cb(men, menu_type_menu, callback_new_2(callback_cast(popup_set_bookmark), nav, &c), _("Add as bookmark"));
  	popup_display(nav, popup, p);
! 	menu_popup(popup);
  }

Index: attr.h
===================================================================
RCS file: /cvsroot/navit/navit/src/attr.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** attr.h	5 Jan 2008 20:04:22 -0000	1.14
--- attr.h	13 Jan 2008 11:29:06 -0000	1.15
***************
*** 46,52 ****
--- 46,54 ----
  enum attr_type;
  struct attr;
+ struct map;
  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);
+ char *attr_to_text(struct attr *attr, struct map *map, int pretty);
  struct attr *attr_search(struct attr **attrs, struct attr *last, enum attr_type attr);
  int attr_data_size(struct attr *attr);

Index: menu.h
===================================================================
RCS file: /cvsroot/navit/navit/src/menu.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** menu.h	4 Jan 2008 08:34:31 -0000	1.5
--- menu.h	13 Jan 2008 11:29:06 -0000	1.6
***************
*** 16,19 ****
--- 16,20 ----
  	void (*set_toggle)(struct menu_priv *menu, int active);
  	int (*get_toggle)(struct menu_priv *menu);
+ 	void (*popup)(struct menu_priv *menu);
  };
  
***************
*** 29,32 ****
--- 30,34 ----
  void menu_set_toggle(struct menu *menu, int active);
  int menu_get_toggle(struct menu *menu);
+ void menu_popup(struct menu *menu);
  /* end of prototypes */
  #endif

Index: menu.c
===================================================================
RCS file: /cvsroot/navit/navit/src/menu.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** menu.c	3 Dec 2007 18:18:54 -0000	1.5
--- menu.c	13 Jan 2008 11:29:06 -0000	1.6
***************
*** 54,55 ****
--- 54,64 ----
  	return ((*menu->meth.get_toggle) && (*menu->meth.get_toggle)(menu->priv));
  }
+ 
+ void
+ menu_popup(struct menu *menu)
+ {
+ 	if (! menu || ! menu->meth.popup)
+ 		return;
+ 	(*menu->meth.popup)(menu->priv);
+ 
+ }

[Navit-cvs-commit] navit/src/gui/gtk gui_gtk_action.c,1.28,1.29

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

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

Modified Files:
	gui_gtk_action.c 
Log Message:
Fix:Core:Improved popup handling

Index: gui_gtk_action.c
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/gtk/gui_gtk_action.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** gui_gtk_action.c	7 Jan 2008 23:15:41 -0000	1.28
--- gui_gtk_action.c	13 Jan 2008 11:29:06 -0000	1.29
***************
*** 25,28 ****
--- 25,29 ----
  	gulong handler_id;
  	guint merge_id;
+ 	GtkWidget *widget;
  };
  
***************
*** 508,515 ****
  }	
  
! #ifdef _WIN32
! // AF needs to be fixed for win32, 
! static int showPopup = 0;
! #endif
  
  static struct menu_priv *
--- 509,518 ----
  }	
  
! static void
! popup_activate(struct menu_priv *menu)
! {
! 	gtk_menu_popup(GTK_MENU(menu->widget), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
! 	menu->handler_id=g_signal_connect(menu->widget, "selection-done", G_CALLBACK(popup_deactivate), menu);
! }
  
  static struct menu_priv *
***************
*** 574,591 ****
  		gtk_widget_show (widget);
  	} else {
! #ifdef _WIN32		
! 	    if ( showPopup )
! 	    {
! 	        showPopup = 0;
! #endif	    	
! 		gtk_menu_popup(GTK_MENU(widget), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time ());
! 		ret->handler_id=g_signal_connect(widget, "selection-done", G_CALLBACK(popup_deactivate), ret);
! #ifdef _WIN32            
! 	    }
! 	    else
! 	    {
! 	        showPopup = 1;
! 	    }
! #endif	    
  	}
  	return ret;
--- 577,582 ----
  		gtk_widget_show (widget);
  	} else {
! 		ret->widget=widget;
! 		meth->popup=popup_activate;
  	}
  	return ret;

[Navit-cvs-commit] navit/src/vehicle/file vehicle_file.c,1.6,1.7

[Albert L F. <af...@us...>]

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

Modified Files:
	vehicle_file.c 
Log Message:
Fix:vehicle/vehicle file: resolve locale dependent parsing issue of GPS data

Index: vehicle_file.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/file/vehicle_file.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** vehicle_file.c	9 Jan 2008 19:06:57 -0000	1.6
--- vehicle_file.c	12 Jan 2008 23:11:57 -0000	1.7
***************
*** 257,266 ****
  		   HDOP[8],Altitude[9],"M"[10],height of geoid[11], "M"[12], time since dgps update[13], dgps ref station [14]
  		 */
! 		sscanf(item[2], "%lf", &lat);
  		priv->geo.lat = floor(lat / 100);
  		lat -= priv->geo.lat * 100;
  		priv->geo.lat += lat / 60;
  
! 		sscanf(item[4], "%lf", &lng);
  		priv->geo.lng = floor(lng / 100);
  		lng -= priv->geo.lng * 100;
--- 257,266 ----
  		   HDOP[8],Altitude[9],"M"[10],height of geoid[11], "M"[12], time since dgps update[13], dgps ref station [14]
  		 */
! 		lat = g_ascii_strtod(item[2], NULL);
  		priv->geo.lat = floor(lat / 100);
  		lat -= priv->geo.lat * 100;
  		priv->geo.lat += lat / 60;
  
! 		lng = g_ascii_strtod(item[4], NULL);
  		priv->geo.lng = floor(lng / 100);
  		lng -= priv->geo.lng * 100;
***************
*** 269,273 ****
  		sscanf(item[6], "%d", &priv->status);
  		sscanf(item[7], "%d", &priv->sats_used);
! 		sscanf(item[9], "%lf", &priv->height);
  
  		callback_list_call_0(priv->cbl);
--- 269,273 ----
  		sscanf(item[6], "%d", &priv->status);
  		sscanf(item[7], "%d", &priv->sats_used);
! 		priv->height = g_ascii_strtod(item[9], NULL);
  
  		callback_list_call_0(priv->cbl);

[Navit-cvs-commit] navit/src file.c,1.13,1.14 file.h,1.9,1.10

[Albert L F. <af...@us...>]

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

Modified Files:
	file.c file.h 
Log Message:
Fix:CORE:add initial memory mapped file support for win32

Index: file.c
===================================================================
RCS file: /cvsroot/navit/navit/src/file.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** file.c	9 Jan 2008 19:04:27 -0000	1.13
--- file.c	12 Jan 2008 22:42:00 -0000	1.14
***************
*** 51,57 ****
  file_mmap(struct file *file)
  {
- 	// not supported for WIN32 right now
  #ifdef _WIN32
! 	return -1;
  #else
  	file->begin=mmap(NULL, file->size, PROT_READ|PROT_WRITE, MAP_PRIVATE, file->fd, 0);
--- 51,56 ----
  file_mmap(struct file *file)
  {
  #ifdef _WIN32
!     file->begin = (char*)mmap_readonly_win32( file->name, &file->map_handle, &file->map_file );
  #else
  	file->begin=mmap(NULL, file->size, PROT_READ|PROT_WRITE, MAP_PRIVATE, file->fd, 0);
***************
*** 61,67 ****
  		return 0;
  	}
  	g_assert(file->begin != (void *)0xffffffff);
  	file->end=file->begin+file->size;
! #endif
  	return 1;
  }
--- 60,67 ----
  		return 0;
  	}
+ #endif
  	g_assert(file->begin != (void *)0xffffffff);
  	file->end=file->begin+file->size;
! 
  	return 1;
  }
***************
*** 155,159 ****
  file_remap_readonly(struct file *f)
  {
! #ifndef _WIN32
  	void *begin;
  	munmap(f->begin, f->size);
--- 155,160 ----
  file_remap_readonly(struct file *f)
  {
! #ifdef _WIN32
! #else
  	void *begin;
  	munmap(f->begin, f->size);
***************
*** 167,171 ****
  file_remap_readonly_all(void)
  {
- #ifndef _WIN32
  	struct file *f=file_list;
  	int limit=1000;
--- 168,171 ----
***************
*** 175,179 ****
  		f=f->next;
  	}
- #endif
  }
  
--- 175,178 ----
***************
*** 181,185 ****
  file_unmap(struct file *f)
  {
! #ifndef _WIN32
  	munmap(f->begin, f->size);
  #endif
--- 180,186 ----
  file_unmap(struct file *f)
  {
! #ifdef _WIN32
!     mmap_unmap_win32( f->begin, f->map_handle , f->map_file );
! #else
  	munmap(f->begin, f->size);
  #endif
***************
*** 267,272 ****
      if ( f->begin != NULL )
      {
!         munmap(f->begin, f->size);
      }
  	g_free(f->name);
  	g_free(f);
--- 268,274 ----
      if ( f->begin != NULL )
      {
!         file_unmap( f );
      }
+ 
  	g_free(f->name);
  	g_free(f);

Index: file.h
===================================================================
RCS file: /cvsroot/navit/navit/src/file.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** file.h	27 Nov 2007 11:10:26 -0000	1.9
--- file.h	12 Jan 2008 22:42:00 -0000	1.10
***************
*** 10,16 ****
  	char *name;
  	int fd;
  	struct file *next;
  };
!  
  /* prototypes */
  struct file;
--- 10,20 ----
  	char *name;
  	int fd;
+ #ifdef _WIN32
+     long map_handle;
+     long map_file;
+ #endif
  	struct file *next;
  };
! 
  /* prototypes */
  struct file;

[Navit-cvs-commit] navit/projs/CodeBlocks data_mg.cbp, NONE, 1.1 gentypes.cbp, NONE, 1.1 makefile_extra, NONE, 1.1 Navit.cbp, 1.5, 1.6 Navit.workspace, 1.4, 1.5 Osm2Navit.cbp, 1.2, 1.3

[Albert L F. <af...@us...>]

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

Modified Files:
	Navit.cbp Navit.workspace Osm2Navit.cbp 
Added Files:
	data_mg.cbp gentypes.cbp makefile_extra 
Log Message:
Add:projs/CodeBlocks: support SAPI-5 TTS function

Index: Navit.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.cbp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Navit.cbp	9 Jan 2008 19:44:03 -0000	1.5
--- Navit.cbp	12 Jan 2008 22:38:25 -0000	1.6
***************
*** 26,30 ****
--- 26,33 ----
  					<Add library="bin\Debug\libmdb.a" />
  					<Add library="bin\Debug\libdata_garmin.la" />
+ 					<Add library="bin\Debug\libspeech_speech_dispatcher.la" />
+ 					<Add library="bin\Debug\libdata_mg.la" />
  					<Add library="libgarmin.a" />
+ 					<Add library="ole32" />
  					<Add library="user32" />
  					<Add library="gtk-win32-2.0" />
***************
*** 62,66 ****
--- 65,72 ----
  					<Add library="bin\Release\libmdb.a" />
  					<Add library="bin\Release\libdata_garmin.la" />
+ 					<Add library="bin\Release\libspeech_speech_dispatcher.la" />
+ 					<Add library="bin\Release\libdata_mg.la" />
  					<Add library="libgarmin.a" />
+ 					<Add library="ole32" />
  					<Add library="user32" />
  					<Add library="gtk-win32-2.0" />
***************
*** 112,115 ****
--- 118,125 ----
  		</Unit>
  		<Unit filename="Win32Extra\setenv.h" />
+ 		<Unit filename="Win32Extra\sys\mman.c">
+ 			<Option compilerVar="CC" />
+ 		</Unit>
+ 		<Unit filename="Win32Extra\sys\mman.h" />
  		<Unit filename="Win32Extra\wordexp.c">
  			<Option compilerVar="CC" />

--- NEW FILE: makefile_extra ---
SRC_GTK_PATH = D:/gtk
SRC_GTK_BIN_PATH = $(SRC_GTK_PATH)/bin
SRC_GTK_ETC_PATH = $(SRC_GTK_PATH)/etc
SRC_GTK_LIB_PATH = $(SRC_GTK_PATH)/lib

SRC_MO_PATH = ./locale

SRC_NAVIT_EXE_PATH = ./bin/release
SRC_XPM_PATH = ../../src/xpm

DST_PATH = ./distr
DST_BIN_PATH = $(DST_PATH)/bin
DST_XPM_PATH = $(DST_BIN_PATH)/xpm
DST_ETC_PATH = $(DST_PATH)/etc
DST_LIB_PATH = $(DST_PATH)/lib
DST_MAP_PATH = $(DST_PATH)/maps
DST_MO_PATH = $(DST_BIN_PATH)/locale


GTK_DLLS =  \
	freetype6.dll \
	iconv.dll \
	intl.dll \
	libatk-1.0-0.dll \
	libcairo-2.dll \
	libfontconfig-1.dll \
	libfreetype-6.dll \
	libgdk-win32-2.0-0.dll \
	libgdk_pixbuf-2.0-0.dll \
	libglib-2.0-0.dll \
	libgmodule-2.0-0.dll \
	libgobject-2.0-0.dll \
	libgtk-win32-2.0-0.dll \
	libpango-1.0-0.dll \
	libpangocairo-1.0-0.dll \
	libpangoft2-1.0-0.dll \
	libpangowin32-1.0-0.dll \
	libpng12.dll \
	libxml2.dll \
	zlib1.dll

NAVIT_EXES = navit.exe osm2navit.exe


SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2

maps_DATA = $(SAMPLE_MAP).bin

samplemap: $(SAMPLE_MAP).bin

$(SAMPLE_MAP).osm.bz2:
	echo "Downloading osm sample map"
	wget -O $(SAMPLE_MAP).osm.bz2.tmp http://navit.sourceforge.net/maps/$(SAMPLE_MAP).osm.bz2
	mv $(SAMPLE_MAP).osm.bz2.tmp $(SAMPLE_MAP).osm.bz2

$(SAMPLE_MAP).bin: $(SAMPLE_MAP).osm.bz2 ./bin/release/osm2navit.exe
	echo "Converting osm sample map"
	cp $(SAMPLE_MAP).osm.bz2 tmp.osm.bz2 ;
	bunzip2 tmp.osm.bz2;
	cat  tmp.osm | ./bin/release/osm2navit.exe --attr-debug-level=5 $(SAMPLE_MAP).bin.tmp ;
	mv $(SAMPLE_MAP).bin.tmp $(SAMPLE_MAP).bin ;
	rm tmp.osm ;

POFILES = cs.mo es.mo fr.mo nl.mo pl.mo de.mo fi.mo it.mo no.mo

MSGFMT=msgfmt.exe

%.mo:../../po/%.po
	$(MSGFMT) --check --verbose --statistics --output-file=$@ $< && \
	mkdir -p ./locale/$(basename $@)/LC_MESSAGES && \
	mv $@ ./locale/$(basename $@)/LC_MESSAGES/navit.mo


locale: $(POFILES)
locale_clean:
	rm -Rf locale

distr: $(SAMPLE_MAP).bin $(POFILES)
	rm -Rf $(DISTR_TARGET_PATH);
	mkdir -p $(DST_BIN_PATH);
	mkdir -p $(DST_ETC_PATH);
	mkdir -p $(DST_LIB_PATH);
	for i in $(NAVIT_EXES); do \
		cp $(SRC_NAVIT_EXE_PATH)/$$i $(DST_BIN_PATH)/$$i; \
	done;
	for i in $(GTK_DLLS); do \
		cp $(SRC_GTK_BIN_PATH)/$$i $(DST_BIN_PATH)/$$i; \
	done;
	cp -r $(SRC_GTK_ETC_PATH)/* $(DST_ETC_PATH) ;
	mkdir -p $(DST_LIB_PATH)/gtk-2.0/2.10.0 ;
	cp -r $(SRC_GTK_LIB_PATH)/gtk-2.0/2.10.0/* $(DST_LIB_PATH)/gtk-2.0/2.10.0 ;
	mkdir -p $(DST_LIB_PATH)/pango ;	
	cp -r $(SRC_GTK_LIB_PATH)/pango/* $(DST_LIB_PATH)/pango ;
	cp ./navit.xml.distr $(DST_BIN_PATH)/navit.xml ;
	cp ./*.ttf $(DST_BIN_PATH)/ ;
	mkdir -p $(DST_MAP_PATH) ;
	cp $(SAMPLE_MAP).bin $(DST_MAP_PATH)/ ;
	mkdir -p $(DST_XPM_PATH) ;	
	cp -r $(SRC_XPM_PATH)/*.xpm $(DST_XPM_PATH)/ ; 
	mkdir -p $(DST_MO_PATH) ;	
	cp -r $(SRC_MO_PATH)/* $(DST_MO_PATH)/		 


Index: Osm2Navit.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Osm2Navit.cbp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Osm2Navit.cbp	8 Jan 2008 22:12:50 -0000	1.2
--- Osm2Navit.cbp	12 Jan 2008 22:38:25 -0000	1.3
***************
*** 61,64 ****
--- 61,68 ----
  			<Add directory="%GTK_DIR%\lib" />
  		</Linker>
+ 		<Unit filename="Win32Extra\sys\mman.c">
+ 			<Option compilerVar="CC" />
+ 		</Unit>
+ 		<Unit filename="Win32Extra\sys\mman.h" />
  		<Unit filename="Win32Extra\wordexp.c">
  			<Option compilerVar="CC" />

Index: Navit.workspace
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.workspace,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Navit.workspace	9 Jan 2008 19:44:03 -0000	1.4
--- Navit.workspace	12 Jan 2008 22:38:25 -0000	1.5
***************
*** 6,9 ****
--- 6,10 ----
  		<Project filename="gentypes.cbp" />
  		<Project filename="binfile.cbp" />
+ 		<Project filename="data_mg.cbp" />
  		<Project filename="data_garmin.cbp">
  			<Depends filename="gentypes.cbp" />
***************
*** 17,20 ****
--- 18,22 ----
  		<Project filename="Navit.cbp" active="1">
  			<Depends filename="fib-1.1.cbp" />
+ 			<Depends filename="gentypes.cbp" />
  			<Depends filename="binfile.cbp" />
  			<Depends filename="data_garmin.cbp" />
***************
*** 24,29 ****
--- 26,34 ----
  			<Depends filename="vehicle_file.cbp" />
  			<Depends filename="gtk_gui.cbp" />
+ 			<Depends filename="data_mg.cbp" />
  			<Depends filename="gtk_graphics.cbp" />
+ 			<Depends filename="speech_speech_dispatcher.cbp" />
  		</Project>
+ 		<Project filename="speech_speech_dispatcher.cbp" />
  	</Workspace>
  </CodeBlocks_workspace_file>

--- NEW FILE: gentypes.cbp ---
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
	<FileVersion major="1" minor="6" />
	<Project>
		<Option title="GenTypes" />
		<Option pch_mode="2" />
		<Option compiler="gcc" />
		<Build>
			<Target title="Debug">
				<Option output="GenTypes" prefix_auto="1" extension_auto="1" />
				<Option object_output="obj\GenTypes\Debug\" />
				<Option type="1" />
				<Option compiler="gcc" />
				<Option use_console_runner="0" />
				<Option parameters="--input-file=d:\CB_Projects\netherlands.osm --attr-debug-level=0 -k netherlands.bin" />
				<Compiler>
					<Add option="-g" />
				</Compiler>
				<Linker>
					<Add directory="%GTK_DIR%\lib" />
					<Add directory="bin\Debug" />
				</Linker>
			</Target>
			<Target title="Release">
				<Option output="GenTypes" prefix_auto="1" extension_auto="1" />
				<Option object_output="obj\GenTypes\Release\" />
				<Option type="1" />
				<Option compiler="gcc" />
				<Compiler>
					<Add option="-O2" />
				</Compiler>
				<Linker>
					<Add option="-s" />
					<Add directory="%GTK_DIR%\lib" />
					<Add directory="bin\Release" />
				</Linker>
			</Target>
		</Build>
		<Compiler>
			<Add option="-Wall" />
			<Add option="-mms-bitfields -DMODULE=GenTypes" />
			<Add directory="%GTK_DIR%\include\glib-2.0" />
			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
			<Add directory="%GTK_DIR%\include" />
			<Add directory="Win32Extra" />
			<Add directory="..\..\src" />
		</Compiler>
		<Linker>
			<Add library="user32" />
			<Add library="gtk-win32-2.0" />
			<Add library="gdk-win32-2.0" />
			<Add library="gdk_pixbuf-2.0" />
			<Add library="freetype" />
			<Add library="z" />
			<Add library="gobject-2.0" />
			<Add library="gmodule-2.0" />
			<Add library="glib-2.0" />
			<Add library="intl" />
			<Add library="zdll" />
			<Add directory="%GTK_DIR%\lib" />
		</Linker>
		<ExtraCommands>
			<Add after="GenTypes.exe ..\..\src\data\garmin\garmintypes.txt ..\..\src\data\garmin\g2nbuiltin.h" />
		</ExtraCommands>
		<Unit filename="Win32Extra\wordexp.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="Win32Extra\wordexp.h" />
		<Unit filename="..\..\src\attr.h" />
		<Unit filename="..\..\src\attr_def.h" />
		<Unit filename="..\..\src\coord.h" />
		<Unit filename="..\..\src\country.h" />
		<Unit filename="..\..\src\data\garmin\gentypes.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\debug.h" />
		<Unit filename="..\..\src\file.h" />
		<Unit filename="..\..\src\item.h" />
		<Unit filename="..\..\src\map.h" />
		<Unit filename="..\..\src\param.h" />
		<Unit filename="..\..\src\plugin.h" />
		<Unit filename="..\..\src\transform.h" />
		<Extensions>
			<code_completion />
			<envvars />
			<debugger />
		</Extensions>
	</Project>
</CodeBlocks_project_file>

--- NEW FILE: data_mg.cbp ---
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
	<FileVersion major="1" minor="6" />
	<Project>
		<Option title="data_mg" />
		<Option pch_mode="2" />
		<Option compiler="gcc" />
		<Build>
			<Target title="Debug">
				<Option output=".\bin\Debug\libdata_mg.la" prefix_auto="1" extension_auto="0" />
				<Option working_dir="" />
				<Option object_output=".\obj\Debug\" />
				<Option type="2" />
				<Option compiler="gcc" />
				<Option createDefFile="1" />
				<Compiler>
					<Add option="-g" />
				</Compiler>
				<Linker>
					<Add directory="%GTK_DIR%\lib" />
					<Add directory="bin\Debug" />
				</Linker>
			</Target>
			<Target title="Release">
				<Option output=".\bin\Release\libdata_mg.la" prefix_auto="1" extension_auto="0" />
				<Option working_dir="" />
				<Option object_output=".\obj\Release\" />
				<Option type="2" />
				<Option compiler="gcc" />
				<Option createDefFile="1" />
				<Compiler>
					<Add option="-O2" />
				</Compiler>
				<Linker>
					<Add option="-s" />
					<Add directory="%GTK_DIR%\lib" />
					<Add directory="bin\Release" />
				</Linker>
			</Target>
		</Build>
		<Compiler>
			<Add option="-Wall" />
			<Add option="-mms-bitfields" />
			<Add option="-DBUILD_DLL" />
			<Add option="-DMODULE=data_mg" />
			<Add directory="%GTK_DIR%\include\glib-2.0" />
			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
			<Add directory="..\..\" />
			<Add directory="..\" />
			<Add directory="D:\CB_Projects\Navit\src\" />
			<Add directory="Win32Extra" />
			<Add directory="..\..\src" />
		</Compiler>
		<Linker>
			<Add library="NavitCommonLib" />
			<Add library="glib-2.0" />
			<Add library="user32" />
			<Add library="intl" />
			<Add library="iconv" />
			<Add directory="%GTK_DIR%\lib" />
		</Linker>
		<Unit filename="..\..\src\data\mg\block.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\data\mg\map.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\data\mg\mg.h" />
		<Unit filename="..\..\src\data\mg\poly.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\data\mg\street.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\data\mg\town.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\data\mg\tree.c">
			<Option compilerVar="CC" />
		</Unit>
		<Extensions>
			<code_completion />
			<envvars />
			<debugger />
		</Extensions>
	</Project>
</CodeBlocks_project_file>

[Navit-cvs-commit] navit/projs/CodeBlocks/Win32Extra/sys mman.c, 1.1, 1.2 mman.h, 1.1, 1.2

[Albert L F. <af...@us...>]

Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/sys
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31386/Win32Extra/sys

Modified Files:
	mman.c mman.h 
Log Message:
Add:projs/CodeBlocks: support SAPI-5 TTS function

Index: mman.c
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/sys/mman.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mman.c	7 Jan 2008 22:11:09 -0000	1.1
--- mman.c	12 Jan 2008 22:38:25 -0000	1.2
***************
*** 2,6 ****
  #include "mman.h"
  
! void * mmap_file_readonly( const char* name )
  {
      void * mapped_ptr = NULL;
--- 2,6 ----
  #include "mman.h"
  
! void * mmap_readonly_win32( const char* name, long* map_handle_ptr, long* map_file_ptr )
  {
      void * mapped_ptr = NULL;
***************
*** 9,18 ****
      HFILE hFile = OpenFile (name, &of, OF_READ);
  
      if ( hFile != HFILE_ERROR )
      {
!         HANDLE hMapping = CreateFileMapping ( (HANDLE)hFile, NULL, PAGE_READONLY, 0, 0, NULL);
          mapped_ptr = MapViewOfFile(hMapping, FILE_MAP_READ, 0 , 0, 0 );
      }
      return mapped_ptr;
  }
  
--- 9,38 ----
      HFILE hFile = OpenFile (name, &of, OF_READ);
  
+     *map_file_ptr = (long)hFile;
+     *map_handle_ptr = 0;
+ 
      if ( hFile != HFILE_ERROR )
      {
!         HANDLE hMapping = CreateFileMapping( (HANDLE)hFile, NULL, PAGE_READONLY, 0, 0, NULL);
          mapped_ptr = MapViewOfFile(hMapping, FILE_MAP_READ, 0 , 0, 0 );
+         *map_handle_ptr = (long)hMapping;
      }
+ 
      return mapped_ptr;
  }
  
+ void mmap_unmap_win32( void* mem_ptr, long map_handle, long map_file )
+ {
+     if ( mem_ptr != NULL )
+     {
+         UnmapViewOfFile( mem_ptr );
+     }
+     if ( map_handle != 0)
+     {
+         CloseHandle( (HANDLE)map_handle );
+     }
+     if ( map_file != 0  )
+     {
+         CloseHandle( (HANDLE)map_file );
+     }
+ }

Index: mman.h
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/sys/mman.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mman.h	7 Jan 2008 22:11:09 -0000	1.1
--- mman.h	12 Jan 2008 22:38:25 -0000	1.2
***************
*** 1,7 ****
! #ifndef _SYS_MAN_H_INCLUDED
! #define	_SYS_MAN_H_INCLUDED
  
! void * mmap_file_readonly( const char* name );
  
! #endif /* !_SYS_MAN_H_INCLUDED */
  
--- 1,8 ----
! #ifndef _WIN32_MMAN_H_INCLUDED
! #define	_WIN32_MMAN_H_INCLUDED
  
! void * mmap_readonly_win32( const char* name, long* map_handle_ptr, long* map_file_ptr );
! void mmap_unmap_win32( void* mem_ptr, long map_handle, long map_file );
  
! #endif /* !_WIN32_MMAN_H_INCLUDED */
  

[Navit-cvs-commit] navit/projs/CodeBlocks/Win32Extra builtin.c, 1.2, 1.3 config.h, 1.2, 1.3

[Albert L F. <af...@us...>]

Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31386/Win32Extra

Modified Files:
	builtin.c config.h 
Log Message:
Add:projs/CodeBlocks: support SAPI-5 TTS function

Index: config.h
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.h	9 Jan 2008 19:44:03 -0000	1.2
--- config.h	12 Jan 2008 22:38:25 -0000	1.3
***************
*** 416,418 ****
  
  #define alarm( a )
- #define munmap( a, b )
--- 416,417 ----

Index: builtin.c
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/builtin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** builtin.c	9 Jan 2008 19:44:03 -0000	1.2
--- builtin.c	12 Jan 2008 22:38:25 -0000	1.3
***************
*** 1,3 ****
--- 1,4 ----
  extern void module_data_binfile_init(void);
+ extern void module_data_mg_init(void);
  extern void module_data_garmin_init(void);
  extern void module_data_poi_geodownload_init(void);
***************
*** 6,12 ****
--- 7,15 ----
  extern void module_vehicle_demo_init(void);
  extern void module_vehicle_file_init(void);
+ extern void module_speech_speech_dispatcher_init(void);
  extern void builtin_init(void);
  void builtin_init(void) {
  	module_data_binfile_init();
+ 	module_data_mg_init();
      module_data_garmin_init();
  	module_data_poi_geodownload_init();
***************
*** 15,17 ****
--- 18,21 ----
  	module_vehicle_demo_init();
  	module_vehicle_file_init();
+ 	module_speech_speech_dispatcher_init();
  }

[Navit-cvs-commit] navit/src/vehicle/gpsd vehicle_gpsd.c,1.3,1.4

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

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

Modified Files:
	vehicle_gpsd.c 
Log Message:
Fix:vehicle_gpsd:Add debug output

Index: vehicle_gpsd.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/gpsd/vehicle_gpsd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** vehicle_gpsd.c	19 Dec 2007 09:57:17 -0000	1.3
--- vehicle_gpsd.c	10 Jan 2008 17:56:33 -0000	1.4
***************
*** 69,72 ****
--- 69,73 ----
  		priv->geo.lat = data->fix.latitude;
  		priv->geo.lng = data->fix.longitude;
+ 		dbg(1,"lat=%f lng=%f\n", priv->geo.lat, priv->geo.lng);
  		callback_list_call_0(priv->cbl);
  		data->set &= ~LATLON_SET;

[Navit-cvs-commit] navit/projs/CodeBlocks/Win32Extra builtin.c, 1.1, 1.2 config.h, 1.1, 1.2 serial_io.h, 1.2, 1.3

[Albert L F. <af...@us...>]

Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26067/Win32Extra

Modified Files:
	builtin.c config.h serial_io.h 
Log Message:
Add:projs/CodeBlocks: support garming maps

Index: config.h
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.h	7 Jan 2008 22:11:08 -0000	1.1
--- config.h	9 Jan 2008 19:44:03 -0000	1.2
***************
*** 416,417 ****
--- 416,418 ----
  
  #define alarm( a )
+ #define munmap( a, b )

Index: builtin.c
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/builtin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** builtin.c	7 Jan 2008 22:11:08 -0000	1.1
--- builtin.c	9 Jan 2008 19:44:03 -0000	1.2
***************
*** 1,3 ****
--- 1,4 ----
  extern void module_data_binfile_init(void);
+ extern void module_data_garmin_init(void);
  extern void module_data_poi_geodownload_init(void);
  extern void module_gtk_graphics_init(void);
***************
*** 8,11 ****
--- 9,13 ----
  void builtin_init(void) {
  	module_data_binfile_init();
+     module_data_garmin_init();
  	module_data_poi_geodownload_init();
  	module_gtk_graphics_init();

Index: serial_io.h
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/serial_io.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** serial_io.h	8 Jan 2008 23:54:34 -0000	1.2
--- serial_io.h	9 Jan 2008 19:44:03 -0000	1.3
***************
*** 3,7 ****
  
  int serial_io_init( const char* port, const char* strsettings );
! int serio_io_read(int fd, char * buffer, int buffer_size );
  int WriteSerial(int fd, const char * buffer);
  void serial_io_shutdown(int fd );
--- 3,7 ----
  
  int serial_io_init( const char* port, const char* strsettings );
! int serial_io_read(int fd, char * buffer, int buffer_size );
  int WriteSerial(int fd, const char * buffer);
  void serial_io_shutdown(int fd );

[Navit-cvs-commit] navit/projs/CodeBlocks/Win32Extra/libgarmin libgarmin.a, NONE, 1.1 libgarmin.h, NONE, 1.1

[Albert L F. <af...@us...>]

Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/libgarmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26067/Win32Extra/libgarmin

Added Files:
	libgarmin.a libgarmin.h 
Log Message:
Add:projs/CodeBlocks: support garming maps

--- NEW FILE: libgarmin.h ---
/*
    Copyright (C) 2007  Alexander Atanasov	<aat...@gm...>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; version 2 of the License.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA


*/

#include <sys/types.h>

#ifdef _WIN32
#define u_int8_t  unsigned char
#define int8_t  char
#define int16_t short
#define u_int16_t unsigned short
#define int32_t int
#define u_int32_t unsigned int
#endif

#ifdef __cplusplus
extern "C" {
#endif

enum {
	L_LBL,
	L_NET,
	L_POI,
};

struct gcoord {
	int x;
	int y;
};

#define GS_COUNTRY	1
#define GS_REGION	2
#define GS_CITY		3
#define GS_ZIP		4
#define GS_ROAD		5
#define GS_INTERSECT	6
#define GS_HOUSENUMBER	7
#define GS_POI		8

#define GM_EXACT	0
#define GM_START	1
#define GM_ANY		2

struct gar_search {
	unsigned char type;
	unsigned char match;
	char *needle;
	struct gobject *fromobj;
};

#define GO_POINT	1
#define GO_POI 		2
#define GO_POLYLINE	3
#define GO_POLYGON	4
#define GO_ROAD		5

struct gar_subfile;
struct gar_objdraworder;

struct gmap {
	struct gar_objdraworder *draworder;
	int subfiles;
	int lastsub;
	struct gar_subfile **subs;
	int zoomlevels;
	int basebits;
	int minlevel;
	int maxlevel;
};

struct gobject {
	int type;
	void *gptr;
	void *priv_data;
	struct gobject *next;
};

struct gar_rect	{
	double lulat;
	double lulong;
	double rllat;
	double rllong;
};


/* Walk and parse all data */
#define OPM_PARSE	(1<<0)
/* Call a callback w/ every object */
#define OPM_DUMP	(1<<1)
/* Work as a map backend */
#define OPM_GPS		(1<<2)

typedef void (*dump_fn)(struct gobject *obj);

#define DBGM_LBLS	(1<<0)
#define DBGM_OBJSRC	(1<<1)


struct gar_config {
	int opm;
	int maxsubdivs;		/* Load max N subdivs for OPM_GPS */
	dump_fn cb;		/* Callback function for OPM_DUMP */
	unsigned debugmask;	/* Debuging aid */
	int debuglevel;		/* Debug level */
};

struct gimg;
struct gar;

typedef void (*log_fn)(char *file, int line, int level, char *fmt, ...)
	__attribute__ ((format(printf,4,5)));
/* Default init w/ config, keep for the latest navit release */
struct gar *gar_init(char *tbd, log_fn l);
struct gar *gar_init_cfg(char *tbd, log_fn l, struct gar_config *cfg);
void gar_free(struct gar *g);
int gar_img_load(struct gar *gar, char *file, int data);
struct gmap *gar_find_subfiles(struct gar *gar, void *select, int flags);
void gar_free_gmap(struct gmap *g);
int gar_get_zoomlevels(struct gar_subfile *sub);

#define GO_GET_SORTED	(1<<0)
#define GO_GET_ROUTABLE	(1<<1)
#define GO_GET_SEARCH	(1<<2)

struct gobject *gar_get_object(struct gar *gar, void *ptr);
int gar_get_objects(struct gmap *gm, int level, void *select,
			struct gobject **ret, int flags);
void gar_free_objects(struct gobject *g);
u_int8_t gar_obj_type(struct gobject *o);
int gar_get_object_position(struct gobject *o, struct gcoord *ret);
int gar_object_subtype(struct gobject *o);
int gar_get_object_dcoord(struct gmap *gm, struct gobject *o, int ndelta, struct gcoord *ret);
int gar_get_object_coord(struct gmap *gm, struct gobject *o, struct gcoord *ret);

int gar_is_object_dcoord_node(struct gmap *gm, struct gobject *o, int ndelta);

int gar_get_object_deltas(struct gobject *o);
/* Get lbl as strdup'ed string */
char *gar_get_object_lbl(struct gobject *o);
int gar_get_object_intlbl(struct gobject *o);
int gar_object_get_draw_order(struct gobject *o);
char *gar_object_debug_str(struct gobject *o);
/* Object index is (subdividx << 16) | (idx << 8) | otype */
int gar_object_index(struct gobject *o);
/* Object mapid is the id of the file containing the object */
int gar_object_mapid(struct gobject *o);
struct gobject *gar_get_object_by_id(struct gar *gar, unsigned int mapid,
					unsigned int objid);

int gar_fat_file2fd(struct gimg *g, char *name, int fd);
/* Get ptr to a dskimg file */
struct gimg *gar_get_dskimg(struct gar *gar, char *file);

#define F_ONEWAY	(1<<0)
#define F_SEGMENTED	(1<<1)

int gar_object_flags(struct gobject *o);


#define GARDEG(x) ((x) < 0x800000 ? (double)(x) * 360.0 / 16777216.0 : -(double)((x) - 0x100000) * 360.0 / 16777216.0)
#define GARRAD(x) ((x) < 0x800000 ? (double)(x) * TWOPI / 16777216.0 : -(double)((x) - 0x100000) * TWOPI / 16777216.0)
#define DEGGAR(x) ((x) * (1/(360.0/(1<<24))))
#define FEET2METER(x) ((x)/3.28084)


#ifdef __cplusplus
}
#endif

--- NEW FILE: libgarmin.a ---
(This appears to be a binary file; contents omitted.)

[Navit-cvs-commit] navit/projs/CodeBlocks LiberationMono-Regular.ttf, NONE, 1.1 data_garmin.cbp, NONE, 1.1 data_garmin_img.cbp, NONE, 1.1 Navit.cbp, 1.4, 1.5 Navit.workspace, 1.3, 1.4

[Albert L F. <af...@us...>]

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

Modified Files:
	Navit.cbp Navit.workspace 
Added Files:
	LiberationMono-Regular.ttf data_garmin.cbp data_garmin_img.cbp 
Log Message:
Add:projs/CodeBlocks: support garming maps

--- NEW FILE: data_garmin.cbp ---
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
	<FileVersion major="1" minor="6" />
	<Project>
		<Option title="data_garmin" />
		<Option pch_mode="2" />
		<Option compiler="gcc" />
		<Build>
			<Target title="Debug">
				<Option output=".\bin\Debug\libdata_garmin.la" prefix_auto="1" extension_auto="0" />
				<Option working_dir="" />
				<Option object_output=".\obj\Debug\" />
				<Option type="2" />
				<Option compiler="gcc" />
				<Option createDefFile="1" />
				<Compiler>
					<Add option="-g" />
				</Compiler>
				<Linker>
					<Add directory="%GTK_DIR%\lib" />
					<Add directory="bin\Debug" />
				</Linker>
			</Target>
			<Target title="Release">
				<Option output=".\bin\Release\libdata_garmin.la" prefix_auto="1" extension_auto="0" />
				<Option working_dir="" />
				<Option object_output=".\obj\Release\" />
				<Option type="2" />
				<Option compiler="gcc" />
				<Option createDefFile="1" />
				<Compiler>
					<Add option="-O2" />
				</Compiler>
				<Linker>
					<Add option="-s" />
					<Add directory="%GTK_DIR%\lib" />
					<Add directory="bin\Release" />
				</Linker>
			</Target>
		</Build>
		<Compiler>
			<Add option="-Wall" />
			<Add option="-mms-bitfields" />
			<Add option="-DBUILD_DLL" />
			<Add option="-DMODULE=data_garmin" />
			<Add directory="%GTK_DIR%\include\glib-2.0" />
			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
			<Add directory="..\..\" />
			<Add directory="..\" />
			<Add directory="D:\CB_Projects\Navit\src\" />
			<Add directory="Win32Extra" />
			<Add directory="..\..\src" />
			<Add directory="." />
			<Add directory="Win32Extra\libgarmin" />
		</Compiler>
		<Linker>
			<Add library="NavitCommonLib" />
			<Add library="glib-2.0" />
			<Add library="user32" />
			<Add library="intl" />
			<Add library="iconv" />
			<Add directory="%GTK_DIR%\lib" />
		</Linker>
		<Unit filename="..\..\src\data\garmin\gar2navit.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\data\garmin\garmin.c">
			<Option compilerVar="CC" />
		</Unit>
		<Unit filename="..\..\src\data\garmin\garmin.h" />
		<Unit filename="..\..\src\data\garmin\gentypes.c">
			<Option compilerVar="CC" />
		</Unit>
		<Extensions>
			<code_completion />
			<envvars />
			<debugger />
		</Extensions>
	</Project>
</CodeBlocks_project_file>

Index: Navit.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.cbp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Navit.cbp	8 Jan 2008 23:54:34 -0000	1.4
--- Navit.cbp	9 Jan 2008 19:44:03 -0000	1.5
***************
*** 25,28 ****
--- 25,30 ----
  					<Add library="bin\Debug\libdata_poi_geodownload.la" />
  					<Add library="bin\Debug\libmdb.a" />
+ 					<Add library="bin\Debug\libdata_garmin.la" />
+ 					<Add library="libgarmin.a" />
  					<Add library="user32" />
  					<Add library="gtk-win32-2.0" />
***************
*** 36,39 ****
--- 38,43 ----
  					<Add library="intl" />
  					<Add directory="bin\Debug" />
+ 					<Add directory="." />
+ 					<Add directory="Win32Extra\libgarmin" />
  				</Linker>
  			</Target>
***************
*** 53,57 ****
--- 57,66 ----
  					<Add library="bin\Release\libdata_binfile.la" />
  					<Add library="bin\Release\libgtk_graphics.la" />
+ 					<Add library="bin\Release\libvehicle_demo.la" />
  					<Add library="bin\Release\libgtk_gui.la" />
+ 					<Add library="bin\Release\libdata_poi_geodownload.la" />
+ 					<Add library="bin\Release\libmdb.a" />
+ 					<Add library="bin\Release\libdata_garmin.la" />
+ 					<Add library="libgarmin.a" />
  					<Add library="user32" />
  					<Add library="gtk-win32-2.0" />
***************
*** 64,67 ****
--- 73,78 ----
  					<Add library="glib-2.0" />
  					<Add library="intl" />
+ 					<Add directory="." />
+ 					<Add directory="Win32Extra\libgarmin" />
  				</Linker>
  			</Target>

--- NEW FILE: LiberationMono-Regular.ttf ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: data_garmin_img.cbp ---
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
	<FileVersion major="1" minor="6" />
	<Project>
		<Option title="data_garming_img" />
		<Option pch_mode="2" />
		<Option compiler="gcc" />
		<Build>
			<Target title="Debug">
				<Option output=".\bin\Debug\libdata_garmin_img.la" prefix_auto="1" extension_auto="0" />
				<Option working_dir="" />
				<Option object_output=".\obj\Debug\" />
				<Option type="2" />
				<Option compiler="gcc" />
				<Option createDefFile="1" />
				<Compiler>
					<Add option="-g" />
				</Compiler>
				<Linker>
					<Add directory="%GTK_DIR%\lib" />
					<Add directory="bin\Debug" />
				</Linker>
			</Target>
			<Target title="Release">
				<Option output=".\bin\Release\libdata_garmin_img.la" prefix_auto="1" extension_auto="0" />
				<Option working_dir="" />
				<Option object_output=".\obj\Release\" />
				<Option type="2" />
				<Option compiler="gcc" />
				<Option createDefFile="1" />
				<Compiler>
					<Add option="-O2" />
				</Compiler>
				<Linker>
					<Add option="-s" />
					<Add directory="%GTK_DIR%\lib" />
					<Add directory="bin\Release" />
				</Linker>
			</Target>
		</Build>
		<Compiler>
			<Add option="-Wall" />
			<Add option="-mms-bitfields" />
			<Add option="-DBUILD_DLL" />
			<Add option="-DMODULE=data_garmin_img" />
			<Add directory="%GTK_DIR%\include\glib-2.0" />
			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
			<Add directory="..\..\" />
			<Add directory="..\" />
			<Add directory="D:\CB_Projects\Navit\src\" />
			<Add directory="Win32Extra" />
			<Add directory="..\..\src" />
		</Compiler>
		<Linker>
			<Add library="NavitCommonLib" />
			<Add library="glib-2.0" />
			<Add library="user32" />
			<Add library="intl" />
			<Add library="iconv" />
			<Add directory="%GTK_DIR%\lib" />
		</Linker>
		<Unit filename="..\..\src\data\garmin_img\garmin_img.c">
			<Option compilerVar="CC" />
		</Unit>
		<Extensions>
			<code_completion />
			<envvars />
			<debugger />
		</Extensions>
	</Project>
</CodeBlocks_project_file>

Index: Navit.workspace
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.workspace,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Navit.workspace	8 Jan 2008 23:54:34 -0000	1.3
--- Navit.workspace	9 Jan 2008 19:44:03 -0000	1.4
***************
*** 4,10 ****
--- 4,22 ----
  		<Project filename="fib-1.1.cbp" />
  		<Project filename="Osm2Navit.cbp" />
+ 		<Project filename="gentypes.cbp" />
+ 		<Project filename="binfile.cbp" />
+ 		<Project filename="data_garmin.cbp">
+ 			<Depends filename="gentypes.cbp" />
+ 		</Project>
+ 		<Project filename="mdb.cbp" />
+ 		<Project filename="data_poi_geodownload.cbp" />
+ 		<Project filename="vehicle_demo.cbp" />
+ 		<Project filename="vehicle_file.cbp" />
+ 		<Project filename="gtk_gui.cbp" />
+ 		<Project filename="gtk_graphics.cbp" />
  		<Project filename="Navit.cbp" active="1">
  			<Depends filename="fib-1.1.cbp" />
  			<Depends filename="binfile.cbp" />
+ 			<Depends filename="data_garmin.cbp" />
  			<Depends filename="mdb.cbp" />
  			<Depends filename="data_poi_geodownload.cbp" />
***************
*** 14,24 ****
  			<Depends filename="gtk_graphics.cbp" />
  		</Project>
- 		<Project filename="binfile.cbp" />
- 		<Project filename="mdb.cbp" />
- 		<Project filename="data_poi_geodownload.cbp" />
- 		<Project filename="vehicle_demo.cbp" />
- 		<Project filename="vehicle_file.cbp" />
- 		<Project filename="gtk_gui.cbp" />
- 		<Project filename="gtk_graphics.cbp" />
  	</Workspace>
  </CodeBlocks_workspace_file>
--- 26,29 ----

[Navit-cvs-commit] navit/projs/CodeBlocks/Win32Extra/libgarmin - New directory

[Albert L F. <af...@us...>]

Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/libgarmin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13722/libgarmin

Log Message:
Directory /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/libgarmin added to the repository

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.25, 1.26

[Albert L F. <af...@us...>]

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

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Fix:graphics/gtk:replace windows font path to local directory

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.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** graphics_gtk_drawing_area.c	8 Jan 2008 19:38:49 -0000	1.25
--- graphics_gtk_drawing_area.c	9 Jan 2008 19:08:42 -0000	1.26
***************
*** 66,70 ****
  static char *fontpaths[]={
  #ifdef _WIN32
! 	"%WINDIR%/fonts",
  #endif
  	"/usr/share/fonts",
--- 66,70 ----
  static char *fontpaths[]={
  #ifdef _WIN32
! 	".",
  #endif
  	"/usr/share/fonts",

[Navit-cvs-commit] navit/src/vehicle/file vehicle_file.c,1.5,1.6

[Albert L F. <af...@us...>]

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

Modified Files:
	vehicle_file.c 
Log Message:
Fix:vehicle/vehicle file: file prototype warning

Index: vehicle_file.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/file/vehicle_file.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** vehicle_file.c	8 Jan 2008 23:56:26 -0000	1.5
--- vehicle_file.c	9 Jan 2008 19:06:57 -0000	1.6
***************
*** 22,25 ****
--- 22,26 ----
  static void vehicle_file_enable_watch(struct vehicle_priv *priv);
  static void vehicle_file_parse(struct vehicle_priv *priv, char *buffer);
+ static int vehicle_file_open(struct vehicle_priv *priv);
  static void vehicle_file_close(struct vehicle_priv *priv);
  

[Navit-cvs-commit] navit/src file.c,1.12,1.13

[Albert L F. <af...@us...>]

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

Modified Files:
	file.c 
Log Message:
Fix:CORE:add config.h file to resolve unmap issue for win32

Index: file.c
===================================================================
RCS file: /cvsroot/navit/navit/src/file.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** file.c	9 Jan 2008 13:46:13 -0000	1.12
--- file.c	9 Jan 2008 19:04:27 -0000	1.13
***************
*** 14,17 ****
--- 14,18 ----
  #include "debug.h"
  #include "file.h"
+ #include "config.h"
  
  #ifndef O_LARGEFILE
***************
*** 32,36 ****
  
  	if (! file)
! 		return file; 
  	file->fd=open(name, O_RDONLY|O_LARGEFILE | O_BINARY);
  	if (file->fd < 0) {
--- 33,37 ----
  
  	if (! file)
! 		return file;
  	file->fd=open(name, O_RDONLY|O_LARGEFILE | O_BINARY);
  	if (file->fd < 0) {
***************
*** 41,45 ****
  	file->size=stat.st_size;
  	file->name = g_strdup(name);
! 	g_assert(file != NULL); 
  	file->next=file_list;
  	file_list=file;
--- 42,46 ----
  	file->size=stat.st_size;
  	file->name = g_strdup(name);
! 	g_assert(file != NULL);
  	file->next=file_list;
  	file_list=file;
***************
*** 79,83 ****
  	}
  	return ret;
! 		
  }
  
--- 80,84 ----
  	}
  	return ret;
! 
  }
  
***************
*** 118,122 ****
  	char buffer[size];
  	uLongf destLen=size_uncomp;
! 	
  	ret=g_malloc(size_uncomp);
  	lseek(file->fd, offset, SEEK_SET);
--- 119,123 ----
  	char buffer[size];
  	uLongf destLen=size_uncomp;
! 
  	ret=g_malloc(size_uncomp);
  	lseek(file->fd, offset, SEEK_SET);
***************
*** 180,184 ****
  file_unmap(struct file *f)
  {
! #ifndef _WIN32	
  	munmap(f->begin, f->size);
  #endif
--- 181,185 ----
  file_unmap(struct file *f)
  {
! #ifndef _WIN32
  	munmap(f->begin, f->size);
  #endif
***************
*** 266,273 ****
      if ( f->begin != NULL )
      {
! 	    munmap(f->begin, f->size);
      }
  	g_free(f->name);
! 	g_free(f);	
  }
  
--- 267,274 ----
      if ( f->begin != NULL )
      {
!         munmap(f->begin, f->size);
      }
  	g_free(f->name);
! 	g_free(f);
  }
  
***************
*** 280,284 ****
  {
  	struct file_wordexp *ret=g_new(struct file_wordexp, 1);
! 	wordexp(pattern, &ret->we, 0);	
  	return ret;
  }
--- 281,285 ----
  {
  	struct file_wordexp *ret=g_new(struct file_wordexp, 1);
! 	wordexp(pattern, &ret->we, 0);
  	return ret;
  }

[Navit-cvs-commit] navit/src/tools/gpx2navit_txt/src elementControl.c, 1.1, 1.2 gpx2navit_txt.h, 1.1, 1.2 parser.c, 1.1, 1.2

[andi <bod...@us...>]

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

Modified Files:
	elementControl.c gpx2navit_txt.h parser.c 
Log Message:
Fix:tools:gpx2navit_txt splitted attributes when containing special chars

Index: parser.c
===================================================================
RCS file: /cvsroot/navit/navit/src/tools/gpx2navit_txt/src/parser.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** parser.c	5 Jan 2008 18:20:23 -0000	1.1
--- parser.c	9 Jan 2008 17:54:50 -0000	1.2
***************
*** 12,24 ****
  {
      static int bufsize = DATABUFSIZE;
      parsedata *pdata = (parsedata *) userdata;
!     if (bufsize < length) {
  	pdata->databuf =
! 	    realloc(pdata->databuf, sizeof(char) * (length + 1));
! 	bufsize = length;
      }
!     strncpy(pdata->databuf, data, length);
!     pdata->bufptr = pdata->databuf;
!     pdata->bufptr += length;
      *pdata->bufptr = '\0';
  }
--- 12,47 ----
  {
      static int bufsize = DATABUFSIZE;
+     static int string_length = 0;
+     int new_length;
+     static int begin_copy = 0;
+     int i;
      parsedata *pdata = (parsedata *) userdata;
!     if (pdata->bufptr == NULL) {
! 	//start of buffer -->pdata->bufptr set to 0 at endelement
! 	string_length = 0;
!         begin_copy = 0; //begin to copy after first space
! 	pdata->bufptr= pdata->databuf;
!     }
!     new_length = string_length + length + 1; //additonal 0
!     if (bufsize < new_length) {
  	pdata->databuf =
! 	    realloc(pdata->databuf, new_length);
! 	bufsize = new_length;
! 	//because of realloc the pointer may have changed
! 	pdata->bufptr = pdata->databuf + string_length;
      }
!     // because expat calls this routine several times on special chars
!     // we need to do following
!     // --concat strings until reset (bufptr set to NULL)
!     // --filter out blank chars at begin of string
!     for (i=0; i<length;i++) {
!        if (begin_copy || !isspace(data[i])) {
!           *pdata->bufptr = data[i];
!           pdata->bufptr++;
!           string_length ++;	
!           begin_copy = 1;  
!           if (DEBUG) fprintf(stderr,"%c",data[i]);
!        }
!     }   	
      *pdata->bufptr = '\0';
  }

Index: elementControl.c
===================================================================
RCS file: /cvsroot/navit/navit/src/tools/gpx2navit_txt/src/elementControl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** elementControl.c	5 Jan 2008 18:20:15 -0000	1.1
--- elementControl.c	9 Jan 2008 17:54:50 -0000	1.2
***************
*** 223,225 ****
--- 223,226 ----
  	wipeAttr(pdata->attr);
      }
+     pdata->bufptr = NULL; //reset bufptr now
  }

Index: gpx2navit_txt.h
===================================================================
RCS file: /cvsroot/navit/navit/src/tools/gpx2navit_txt/src/gpx2navit_txt.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gpx2navit_txt.h	5 Jan 2008 18:20:22 -0000	1.1
--- gpx2navit_txt.h	9 Jan 2008 17:54:50 -0000	1.2
***************
*** 9,17 ****
  #define TYPELENGTH 16
  #define BUFFSIZE 8192
! #define DATABUFSIZE 16 
  #define failToWriteAttr(S, T) failToWriteAttrRep((S), (T),__FILE__, __LINE__ )
  
  #include <stdio.h>
  #include <string.h>
  #include <stdlib.h>
  #include <unistd.h>
--- 9,18 ----
  #define TYPELENGTH 16
  #define BUFFSIZE 8192
! #define DATABUFSIZE 16
  #define failToWriteAttr(S, T) failToWriteAttrRep((S), (T),__FILE__, __LINE__ )
  
  #include <stdio.h>
  #include <string.h>
+ #include <ctype.h>
  #include <stdlib.h>
  #include <unistd.h>

[Navit-cvs-commit] navit configure.in,1.66,1.67

[KaZeR <ka...@us...>]

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

Modified Files:
	configure.in 
Log Message:
Add:core:Added --disable-garmin to configure

Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** configure.in	3 Jan 2008 11:13:34 -0000	1.66
--- configure.in	9 Jan 2008 17:21:33 -0000	1.67
***************
*** 47,50 ****
--- 47,51 ----
  
  AC_ARG_ENABLE(libgps, [  --disable-libgps             don't use libgps], USE_LIBGPS=$enableval, USE_LIBGPS=yes)
+ AC_ARG_ENABLE(garmin, [  --disable-garmin             disable garmin support], USE_GARMIN=$enableval, USE_GARMIN=yes)
  
  AC_ARG_ENABLE(samplemap, [  --disable-samplemap             don't build the samplemap], samplemap=$enableval, samplemap=yes)
***************
*** 280,288 ****
  AM_CONDITIONAL(VEHICLE_GPSD, [test "x$gpsd" = "xyes"])
  
! # check for libgarmin
! PKG_CHECK_MODULES(LIBGARMIN, libgarmin, use_libgarmin=yes, use_libgarmin=no)
! AC_SUBST(LIBGARMIN_CFLAGS)
! AC_SUBST(LIBGARMIN_LIBS)
! AM_CONDITIONAL(HAVELIBGARMIN, [test "x$use_libgarmin" = "xyes"])
  
  AC_ARG_ENABLE(binding-python, [  --disable-binding-python             don't create binding python ], MODULE_BINDING_PYTHON=$enableval, MODULE_BINDING_PYTHON=yes)
--- 281,293 ----
  AM_CONDITIONAL(VEHICLE_GPSD, [test "x$gpsd" = "xyes"])
  
! if test x"${USE_GARMIN}" = xyes
! then
! 	# check for libgarmin
! 	PKG_CHECK_MODULES(LIBGARMIN, libgarmin, use_libgarmin=yes, use_libgarmin=no)
! 	AC_SUBST(LIBGARMIN_CFLAGS)
! 	AC_SUBST(LIBGARMIN_LIBS)
! fi
! 	AM_CONDITIONAL(HAVELIBGARMIN, [test "x$use_libgarmin" = "xyes"])
! 
  
  AC_ARG_ENABLE(binding-python, [  --disable-binding-python             don't create binding python ], MODULE_BINDING_PYTHON=$enableval, MODULE_BINDING_PYTHON=yes)
***************
*** 473,481 ****
  	echo "SPEECHD     : DISABLED"
  fi
! if test "x$use_libgarmin" = "xyes"
  	then
! 	echo "Garmin IMG  : ENABLED"
! 	else
! 	echo "Garmin IMG  : DISABLED (you don't have libgarmin)"
  fi
  if test "x$samplemap" = "xyes"
--- 478,491 ----
  	echo "SPEECHD     : DISABLED"
  fi
! if test x"${USE_GARMIN}" = xyes
  	then
! 	if test "x$use_libgarmin" = "xyes"
! 		then
! 		echo "Garmin IMG  : ENABLED"
! 		else
! 		echo "Garmin IMG  : DISABLED (you don't have libgarmin)"
! 	fi
! 	else 
! 		echo "Garmin IMG  : DISABLED (you requested it)"
  fi
  if test "x$samplemap" = "xyes"

[Navit-cvs-commit] navit/src file.c,1.11,1.12

[Michael F. <ho...@us...>]

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

Modified Files:
	file.c 
Log Message:
Fix:Core:Fix mmap failures

Index: file.c
===================================================================
RCS file: /cvsroot/navit/navit/src/file.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** file.c	7 Jan 2008 21:46:32 -0000	1.11
--- file.c	9 Jan 2008 13:46:13 -0000	1.12
***************
*** 266,270 ****
      if ( f->begin != NULL )
      {
! // AF FIXME        munmap(f->begin, f->size);
      }
  	g_free(f->name);
--- 266,270 ----
      if ( f->begin != NULL )
      {
! 	    munmap(f->begin, f->size);
      }
  	g_free(f->name);

[Navit-cvs-commit] navit/src/vehicle/file vehicle_file.c,1.4,1.5

[Albert L F. <af...@us...>]

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

Modified Files:
	vehicle_file.c 
Log Message:
Fix:vehicle/vehicle_file:use serial settings form xml config file for win32

Index: vehicle_file.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/file/vehicle_file.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** vehicle_file.c	7 Jan 2008 22:33:27 -0000	1.4
--- vehicle_file.c	8 Jan 2008 23:56:26 -0000	1.5
***************
*** 50,54 ****
  #ifdef _WIN32
  	int no_data_count;
! #endif	
  };
  
--- 50,54 ----
  #ifdef _WIN32
  	int no_data_count;
! #endif
  };
  
***************
*** 111,118 ****
  vehicle_file_open(struct vehicle_priv *priv)
  {
! #ifdef _WIN32	
! 	char *name;
!     int port = atoi( priv->source + 5 );
!     priv->fd=serial_io_init( port, 115200 );
  #else
  	char *name;
--- 111,135 ----
  vehicle_file_open(struct vehicle_priv *priv)
  {
! #ifdef _WIN32
!     dbg(1, "enter vehicle_file_open, priv->source='%s'\n", priv->source);
! 
!     if ( priv->source )
!     {
!         char* raw_setting_str = g_strdup( priv->source );
! 
!         char* strport = strchr(raw_setting_str, ':' );
!         char* strsettings = strchr(raw_setting_str, ' ' );
! 
!         if ( strport && strsettings )
!         {
!             strport++;
!             *strsettings = '\0';
!             strsettings++;
! 
!             dbg(1, "calling serial_io_init('%s', '%s')\n", strport, strsettings );
!             priv->fd=serial_io_init( strport, strsettings );
!         }
!         g_free( raw_setting_str );
!     }
  #else
  	char *name;
***************
*** 336,340 ****
  vehicle_file_enable_watch(struct vehicle_priv *priv)
  {
! #ifdef _WIN32	
  	g_timeout_add(500, vehicle_win32_serial_track, priv);
  #else
--- 353,357 ----
  vehicle_file_enable_watch(struct vehicle_priv *priv)
  {
! #ifdef _WIN32
  	g_timeout_add(500, vehicle_win32_serial_track, priv);
  #else
***************
*** 352,356 ****
  		g_source_remove(priv->watch);
  	priv->watch = 0;
! #endif	
  }
  
--- 369,373 ----
  		g_source_remove(priv->watch);
  	priv->watch = 0;
! #endif
  }
  
***************
*** 419,425 ****
  		return ret;
  	}
! #ifdef _WIN32	
      ret->no_data_count = 0;
! #endif    
  	dbg(0, "Failed to open '%s'\n", ret->source);
  	vehicle_file_destroy(ret);
--- 436,442 ----
  		return ret;
  	}
! #ifdef _WIN32
      ret->no_data_count = 0;
! #endif
  	dbg(0, "Failed to open '%s'\n", ret->source);
  	vehicle_file_destroy(ret);

[Navit-cvs-commit] navit/projs/CodeBlocks Navit.cbp, 1.3, 1.4 Navit.workspace, 1.2, 1.3 gtk_graphics.cbp, 1.3, 1.4 mdb.cbp, 1.2, 1.3

[Albert L F. <af...@us...>]

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

Modified Files:
	Navit.cbp Navit.workspace gtk_graphics.cbp mdb.cbp 
Log Message:
Fix:projs/CodeBlocks:dependencies & release build

Index: Navit.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.cbp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Navit.cbp	8 Jan 2008 22:12:50 -0000	1.3
--- Navit.cbp	8 Jan 2008 23:54:34 -0000	1.4
***************
*** 83,87 ****
  			<Add directory="Win32Extra" />
  			<Add directory="..\..\src\fib-1.1" />
! 			<Add directory="D:\msys\1.10\freetype-2.3.5\include" />
  		</Compiler>
  		<Linker>
--- 83,87 ----
  			<Add directory="Win32Extra" />
  			<Add directory="..\..\src\fib-1.1" />
! 			<Add directory="%GTK_DIR%\include\freetype2" />
  		</Compiler>
  		<Linker>
***************
*** 273,275 ****
  	</Project>
  </CodeBlocks_project_file>
- 

[Navit-cvs-commit] navit/projs/CodeBlocks/Win32Extra serial_io.c, 1.2, 1.3 serial_io.h, 1.1, 1.2

[Albert L F. <af...@us...>]

Update of /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4331/Win32Extra

Modified Files:
	serial_io.c serial_io.h 
Log Message:
Fix:projs/CodeBlocks:dependencies & release build

Index: serial_io.c
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/serial_io.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** serial_io.c	7 Jan 2008 22:33:20 -0000	1.2
--- serial_io.c	8 Jan 2008 23:54:34 -0000	1.3
***************
*** 3,12 ****
  #include "serial_io.h"
  
! int serial_io_init( int port, int baudrate )
  {
      HANDLE hCom = NULL;
  
  	char strport[16];
! 	snprintf( strport, sizeof( strport ), "\\\\.\\COM%d", port );
  
  	hCom = CreateFile(
--- 3,12 ----
  #include "serial_io.h"
  
! int serial_io_init( const char* port, const char* strsettings )
  {
      HANDLE hCom = NULL;
  
  	char strport[16];
! 	snprintf( strport, sizeof( strport ), "\\\\.\\%s", port );
  
  	hCom = CreateFile(
***************
*** 34,39 ****
  			NULL
  		);
- 		char * tst = lpMsgBuf;
- 
  		// g_strSerialError = strPort + wxT(": ") + (LPTSTR) lpMsgBuf;
  
--- 34,37 ----
***************
*** 49,54 ****
  	GetCommState(hCom, &dcb);
  
!     char strsettings[255];
!     snprintf( strsettings, sizeof( strsettings ), "baud=%d parity=N data=8 stop=1", baudrate );
  	BuildCommDCB( strsettings, &dcb);
  
--- 47,52 ----
  	GetCommState(hCom, &dcb);
  
! //    char strsettings[255];
! //    snprintf( strsettings, sizeof( strsettings ), "baud=%d parity=N data=8 stop=1", baudrate );
  	BuildCommDCB( strsettings, &dcb);
  

Index: serial_io.h
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Win32Extra/serial_io.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** serial_io.h	7 Jan 2008 22:11:08 -0000	1.1
--- serial_io.h	8 Jan 2008 23:54:34 -0000	1.2
***************
*** 2,12 ****
  #define SERIAL_IO_H_INCLUDED
  
! // wxString EnumSerialPort(int n);
! int serial_io_init( int port, int baudrate );
  int serio_io_read(int fd, char * buffer, int buffer_size );
  int WriteSerial(int fd, const char * buffer);
  void serial_io_shutdown(int fd );
- // wxString GetLastSerialIOError();
- 
  
  #endif
--- 2,9 ----
  #define SERIAL_IO_H_INCLUDED
  
! int serial_io_init( const char* port, const char* strsettings );
  int serio_io_read(int fd, char * buffer, int buffer_size );
  int WriteSerial(int fd, const char * buffer);
  void serial_io_shutdown(int fd );
  
  #endif

[Navit-cvs-commit] navit/src/vehicle/demo vehicle_demo.c, 1.10, 1.11

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

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

Modified Files:
	vehicle_demo.c 
Log Message:
Fix:vehicle_demo:Fixed use of wrong attribute

Index: vehicle_demo.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/demo/vehicle_demo.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** vehicle_demo.c	4 Jan 2008 20:18:15 -0000	1.10
--- vehicle_demo.c	8 Jan 2008 23:48:34 -0000	1.11
***************
*** 157,161 ****
  	}
  	if ((interval=attr_search(attrs, NULL, attr_interval)))
! 		ret->interval=speed->u.num;
  	if ((position_coord_geo=attr_search(attrs, NULL, attr_position_coord_geo))) {
  		ret->geo=*(position_coord_geo->u.coord_geo);
--- 157,161 ----
  	}
  	if ((interval=attr_search(attrs, NULL, attr_interval)))
! 		ret->interval=interval->u.num;
  	if ((position_coord_geo=attr_search(attrs, NULL, attr_position_coord_geo))) {
  		ret->geo=*(position_coord_geo->u.coord_geo);

[Navit-cvs-commit] navit/projs/CodeBlocks Navit.cbp, 1.2, 1.3 Navit.new.cbp, 1.1, 1.2 Navit.workspace, 1.1, 1.2 NavitCommonLib.cbp, 1.1, 1.2 Navit_no_plugin.cbp, 1.1, 1.2 Osm2Navit.cbp, 1.1, 1.2 binfile.cbp, 1.1, 1.2 data_poi_geodownload.cbp, 1.1, 1.2 gtk_graphics.cbp, 1.2, 1.3 gtk_gui.cbp, 1.1, 1.2 gui_sdl.cbp, 1.1, 1.2 mdb.cbp, 1.1, 1.2 vehicle_demo.cbp, 1.1, 1.2 vehicle_file.cbp, 1.1, 1.2

[Albert L F. <af...@us...>]

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

Modified Files:
	Navit.cbp Navit.new.cbp Navit.workspace NavitCommonLib.cbp 
	Navit_no_plugin.cbp Osm2Navit.cbp binfile.cbp 
	data_poi_geodownload.cbp gtk_graphics.cbp gtk_gui.cbp 
	gui_sdl.cbp mdb.cbp vehicle_demo.cbp vehicle_file.cbp 
Log Message:
Fix:projs/CodeBlocks:use GTK_DIR environement variable in coinfig files

Index: Navit.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit.cbp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Navit.cbp	8 Jan 2008 00:04:47 -0000	1.2
--- Navit.cbp	8 Jan 2008 22:12:50 -0000	1.3
***************
*** 72,83 ****
  			<Add option="-DMODULE=Navit" />
  			<Add option='-DPREFIX=\&quot;/usr/local\&quot;' />
! 			<Add directory="D:\gtk\include" />
! 			<Add directory="D:\gtk\include\gtk-2.0" />
! 			<Add directory="D:\gtk\include\glib-2.0" />
! 			<Add directory="D:\gtk\lib\gtk-2.0\include" />
! 			<Add directory="D:\gtk\lib\glib-2.0\include" />
! 			<Add directory="D:\gtk\include\cairo" />
! 			<Add directory="D:\gtk\include\pango-1.0" />
! 			<Add directory="D:\gtk\include\atk-1.0" />
  			<Add directory="..\..\src" />
  			<Add directory="Win32Extra" />
--- 72,83 ----
  			<Add option="-DMODULE=Navit" />
  			<Add option='-DPREFIX=\&quot;/usr/local\&quot;' />
! 			<Add directory="%GTK_DIR%\include" />
! 			<Add directory="%GTK_DIR%\include\gtk-2.0" />
! 			<Add directory="%GTK_DIR%\include\glib-2.0" />
! 			<Add directory="%GTK_DIR%\lib\gtk-2.0\include" />
! 			<Add directory="%GTK_DIR%\lib\glib-2.0\include" />
! 			<Add directory="%GTK_DIR%\include\cairo" />
! 			<Add directory="%GTK_DIR%\include\pango-1.0" />
! 			<Add directory="%GTK_DIR%\include\atk-1.0" />
  			<Add directory="..\..\src" />
  			<Add directory="Win32Extra" />
***************
*** 86,90 ****
  		</Compiler>
  		<Linker>
! 			<Add directory="d:\gtk\lib" />
  			<Add directory="D:\msys\1.10\freetype-2.3.5\objs\.libs" />
  		</Linker>
--- 86,90 ----
  		</Compiler>
  		<Linker>
! 			<Add directory="%GTK_DIR%\lib" />
  			<Add directory="D:\msys\1.10\freetype-2.3.5\objs\.libs" />
  		</Linker>
***************
*** 273,274 ****
--- 273,275 ----
  	</Project>
  </CodeBlocks_project_file>
+ 

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.24, 1.25

[Albert L F. <af...@us...>]

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

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Fix:graphics/gtk:replace hardcoded windows path with %WINDIR%

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.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** graphics_gtk_drawing_area.c	7 Jan 2008 22:10:53 -0000	1.24
--- graphics_gtk_drawing_area.c	8 Jan 2008 19:38:49 -0000	1.25
***************
*** 66,70 ****
  static char *fontpaths[]={
  #ifdef _WIN32
! 	"c:/windows/fonts",
  #endif
  	"/usr/share/fonts",
--- 66,70 ----
  static char *fontpaths[]={
  #ifdef _WIN32
! 	"%WINDIR%/fonts",
  #endif
  	"/usr/share/fonts",
***************
*** 200,206 ****
  	gc_destroy,
  	gc_set_linewidth,
! 	gc_set_dashes,	
! 	gc_set_foreground,	
! 	gc_set_background	
  };
  
--- 200,206 ----
  	gc_destroy,
  	gc_set_linewidth,
! 	gc_set_dashes,
! 	gc_set_foreground,
! 	gc_set_background
  };
  
***************
*** 234,243 ****
  	if (hot) {
  		option=gdk_pixbuf_get_option(pixbuf, "x_hot");
! 		if (option) 
  			hot->x=atoi(option);
  		else
  			hot->x=ret->w/2-1;
  		option=gdk_pixbuf_get_option(pixbuf, "y_hot");
! 		if (option) 
  			hot->y=atoi(option);
  		else
--- 234,243 ----
  	if (hot) {
  		option=gdk_pixbuf_get_option(pixbuf, "x_hot");
! 		if (option)
  			hot->x=atoi(option);
  		else
  			hot->x=ret->w/2-1;
  		option=gdk_pixbuf_get_option(pixbuf, "y_hot");
! 		if (option)
  			hot->y=atoi(option);
  		else
***************
*** 250,254 ****
  draw_lines(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count)
  {
! 	if (gr->mode == draw_mode_begin || gr->mode == draw_mode_end) 
  		gdk_draw_lines(gr->drawable, gc->gc, (GdkPoint *)p, count);
  	if (gr->mode == draw_mode_end || gr->mode == draw_mode_cursor)
--- 250,254 ----
  draw_lines(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count)
  {
! 	if (gr->mode == draw_mode_begin || gr->mode == draw_mode_end)
  		gdk_draw_lines(gr->drawable, gc->gc, (GdkPoint *)p, count);
  	if (gr->mode == draw_mode_end || gr->mode == draw_mode_cursor)
***************
*** 284,288 ****
  	int x,y,w,h;
  	GdkImage *shadow;
! 	unsigned char pixmap[0];		
  };
  
--- 284,288 ----
  	int x,y,w,h;
  	GdkImage *shadow;
! 	unsigned char pixmap[0];
  };
  
***************
*** 308,312 ****
  	shadow=malloc(str*(g->h+2)); /* do not use g_malloc() here */
  	memset(shadow, 0, str*(g->h+2));
! 	for (y = 0 ; y < h ; y++) {	
  		p=shadow+str*y;
  		mask0=0x4000;
--- 308,312 ----
  	shadow=malloc(str*(g->h+2)); /* do not use g_malloc() here */
  	memset(shadow, 0, str*(g->h+2));
! 	for (y = 0 ; y < h ; y++) {
  		p=shadow+str*y;
  		mask0=0x4000;
***************
*** 316,327 ****
  			if (pm[x+y*w]) {
  				p[0]|=(mask0 >> 8);
! 				if (mask0 & 0xff) 
  					p[1]|=mask0;
  
  				p[str]|=(mask1 >> 8);
! 				if (mask1 & 0xff) 
  					p[str+1]|=mask1;
  				p[str*2]|=(mask2 >> 8);
! 				if (mask2 & 0xff) 
  					p[str*2+1]|=mask2;
  			}
--- 316,327 ----
  			if (pm[x+y*w]) {
  				p[0]|=(mask0 >> 8);
! 				if (mask0 & 0xff)
  					p[1]|=mask0;
  
  				p[str]|=(mask1 >> 8);
! 				if (mask1 & 0xff)
  					p[str+1]|=mask1;
  				p[str*2]|=(mask2 >> 8);
! 				if (mask2 & 0xff)
  					p[str*2+1]|=mask2;
  			}
***************
*** 410,414 ****
  	y <<= 6;
  	FT_Set_Transform( font->face, &matrix, &pen );
! 	
  
  
--- 410,414 ----
  	y <<= 6;
  	FT_Set_Transform( font->face, &matrix, &pen );
! 
  
  
***************
*** 419,423 ****
  		FT_Load_Glyph(font->face, glyph_index, FT_LOAD_DEFAULT );
  		FT_Render_Glyph(font->face->glyph, ft_render_mode_normal );
!         
  		curr=g_malloc(sizeof(*curr)+slot->bitmap.rows*slot->bitmap.pitch);
  		ret->glyph[n]=curr;
--- 419,423 ----
  		FT_Load_Glyph(font->face, glyph_index, FT_LOAD_DEFAULT );
  		FT_Render_Glyph(font->face->glyph, ft_render_mode_normal );
! 
  		curr=g_malloc(sizeof(*curr)+slot->bitmap.rows*slot->bitmap.pitch);
  		ret->glyph[n]=curr;
***************
*** 431,439 ****
  			curr->shadow=display_text_render_shadow(curr);
  		}
! 		else 
  			curr->shadow=NULL;
  #if 0
! 		printf("height=%d\n", slot->metrics.height);	
! 		printf("height2=%d\n", face->height);	
  		printf("bbox %d %d %d %d\n", face->bbox.xMin, face->bbox.yMin, face->bbox.xMax, face->bbox.yMax);
  #endif
--- 431,439 ----
  			curr->shadow=display_text_render_shadow(curr);
  		}
! 		else
  			curr->shadow=NULL;
  #if 0
! 		printf("height=%d\n", slot->metrics.height);
! 		printf("height2=%d\n", face->height);
  		printf("bbox %d %d %d %d\n", face->bbox.xMin, face->bbox.yMin, face->bbox.xMax, face->bbox.yMax);
  #endif
***************
*** 456,460 ****
  	{
  		g=*gp++;
! 		if (g->shadow && bg) 
  			gdk_draw_image(gr->drawable, bg->gc, g->shadow, 0, 0, g->x-1, g->y-1, g->w+2, g->h+2);
  	}
--- 456,460 ----
  	{
  		g=*gp++;
! 		if (g->shadow && bg)
  			gdk_draw_image(gr->drawable, bg->gc, g->shadow, 0, 0, g->x-1, g->y-1, g->w+2, g->h+2);
  	}
***************
*** 464,468 ****
  	{
  		g=*gp++;
! 		if (g->w && g->h) 
  			gdk_draw_gray_image(gr->drawable, fg->gc, g->x, g->y, g->w, g->h, GDK_RGB_DITHER_NONE, g->pixmap, g->w);
  	}
--- 464,468 ----
  	{
  		g=*gp++;
! 		if (g->w && g->h)
  			gdk_draw_gray_image(gr->drawable, fg->gc, g->x, g->y, g->w, g->h, GDK_RGB_DITHER_NONE, g->pixmap, g->w);
  	}
***************
*** 552,562 ****
  
  	pixbuf=gdk_pixbuf_get_from_drawable(NULL, overlay->drawable, NULL, 0, 0, 0, 0, overlay->width, overlay->height);
! 	pixbuf2=gdk_pixbuf_new(gdk_pixbuf_get_colorspace(pixbuf), TRUE, gdk_pixbuf_get_bits_per_sample(pixbuf), 
  				gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
  
  	rowstride1 = gdk_pixbuf_get_rowstride (pixbuf);
  	rowstride2 = gdk_pixbuf_get_rowstride (pixbuf2);
! 	pixels1=gdk_pixbuf_get_pixels (pixbuf);	
! 	pixels2=gdk_pixbuf_get_pixels (pixbuf2);	
  	n_channels1 = gdk_pixbuf_get_n_channels (pixbuf);
  	n_channels2 = gdk_pixbuf_get_n_channels (pixbuf2);
--- 552,562 ----
  
  	pixbuf=gdk_pixbuf_get_from_drawable(NULL, overlay->drawable, NULL, 0, 0, 0, 0, overlay->width, overlay->height);
! 	pixbuf2=gdk_pixbuf_new(gdk_pixbuf_get_colorspace(pixbuf), TRUE, gdk_pixbuf_get_bits_per_sample(pixbuf),
  				gdk_pixbuf_get_width(pixbuf), gdk_pixbuf_get_height(pixbuf));
  
  	rowstride1 = gdk_pixbuf_get_rowstride (pixbuf);
  	rowstride2 = gdk_pixbuf_get_rowstride (pixbuf2);
! 	pixels1=gdk_pixbuf_get_pixels (pixbuf);
! 	pixels2=gdk_pixbuf_get_pixels (pixbuf2);
  	n_channels1 = gdk_pixbuf_get_n_channels (pixbuf);
  	n_channels2 = gdk_pixbuf_get_n_channels (pixbuf2);
***************
*** 649,653 ****
  	gra->height=widget->allocation.height;
          gra->drawable = gdk_pixmap_new(widget->window, gra->width, gra->height, -1);
! 	if (gra->resize_callback) 
  		(*gra->resize_callback)(gra->resize_callback_data, gra->width, gra->height);
  	return TRUE;
--- 649,653 ----
  	gra->height=widget->allocation.height;
          gra->drawable = gdk_pixmap_new(widget->window, gra->width, gra->height, -1);
! 	if (gra->resize_callback)
  		(*gra->resize_callback)(gra->resize_callback_data, gra->width, gra->height);
  	return TRUE;
***************
*** 676,681 ****
  #if 0
  	struct container *co=user_data;
! 	int x=co->gra->gra->button_event.x; 
! 	int y=co->gra->gra->button_event.y; 
  	int button=co->gra->gra->button_event.button;
  
--- 676,681 ----
  #if 0
  	struct container *co=user_data;
! 	int x=co->gra->gra->button_event.x;
! 	int y=co->gra->gra->button_event.y;
  	int button=co->gra->gra->button_event.button;
  
***************
*** 696,700 ****
  	p.x=event->x;
  	p.y=event->y;
! 	if (this->button_callback) 
  		(*this->button_callback)(this->button_callback_data, 1, event->button, &p);
  	return FALSE;
--- 696,700 ----
  	p.x=event->x;
  	p.y=event->y;
! 	if (this->button_callback)
  		(*this->button_callback)(this->button_callback_data, 1, event->button, &p);
  	return FALSE;
***************
*** 709,713 ****
  	p.x=event->x;
  	p.y=event->y;
! 	if (this->button_callback) 
  		(*this->button_callback)(this->button_callback_data, 0, event->button, &p);
  	return FALSE;
--- 709,713 ----
  	p.x=event->x;
  	p.y=event->y;
! 	if (this->button_callback)
  		(*this->button_callback)(this->button_callback_data, 0, event->button, &p);
  	return FALSE;
***************
*** 751,755 ****
  	p.x=event->x;
  	p.y=event->y;
! 	if (this->motion_callback) 
  		(*this->motion_callback)(this->motion_callback_data, &p);
  	return FALSE;
--- 751,755 ----
  	p.x=event->x;
  	p.y=event->y;
! 	if (this->motion_callback)
  		(*this->motion_callback)(this->motion_callback_data, &p);
  	return FALSE;
***************
*** 847,854 ****
  	struct graphics_priv *this=graphics_gtk_drawing_area_new_helper(meth);
  	this->widget=draw;
! 	
  	this->colormap=gdk_colormap_new(gdk_visual_get_system(),FALSE);
  	gtk_widget_set_events(draw, GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK|GDK_POINTER_MOTION_MASK|GDK_KEY_PRESS_MASK);
! 	g_signal_connect(G_OBJECT(draw), "expose_event", G_CALLBACK(expose), this); 
          g_signal_connect(G_OBJECT(draw), "configure_event", G_CALLBACK(configure), this);
  #if 0
--- 847,854 ----
  	struct graphics_priv *this=graphics_gtk_drawing_area_new_helper(meth);
  	this->widget=draw;
! 
  	this->colormap=gdk_colormap_new(gdk_visual_get_system(),FALSE);
  	gtk_widget_set_events(draw, GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK|GDK_POINTER_MOTION_MASK|GDK_KEY_PRESS_MASK);
! 	g_signal_connect(G_OBJECT(draw), "expose_event", G_CALLBACK(expose), this);
          g_signal_connect(G_OBJECT(draw), "configure_event", G_CALLBACK(configure), this);
  #if 0