navit-cvs-commit — CVS commit mailing list

[Navit-cvs-commit] navit/src/vehicle/gpsd vehicle_gpsd.c, 1.10, 1.11

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

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

Modified Files:
	vehicle_gpsd.c 
Log Message:
Fix:vehicle_gpsd:Fixed a buffer overrun

Index: vehicle_gpsd.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/gpsd/vehicle_gpsd.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** vehicle_gpsd.c	3 Mar 2008 23:30:38 -0000	1.10
--- vehicle_gpsd.c	16 Mar 2008 16:08:26 -0000	1.11
***************
*** 45,50 ****
  	char *pos,*nmea_data_buf;
  	struct vehicle_priv *priv = vehicle_last;
! 	if (buf[0] == '$') {
! 		char buffer[len+1];
  		buffer[len+1]='\0';
  		memcpy(buffer, buf, len);
--- 45,50 ----
  	char *pos,*nmea_data_buf;
  	struct vehicle_priv *priv = vehicle_last;
! 	if (buf[0] == '$' && len > 0) {
! 		char buffer[len+2];
  		buffer[len+1]='\0';
  		memcpy(buffer, buf, len);

[Navit-cvs-commit] navit/src item_def.h,1.26,1.27

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

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

Modified Files:
	item_def.h 
Log Message:
Add:Core:Added definitions for bridge and tunnel

Index: item_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/item_def.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** item_def.h	22 Feb 2008 09:08:39 -0000	1.26
--- item_def.h	14 Mar 2008 16:03:52 -0000	1.27
***************
*** 275,278 ****
--- 275,280 ----
  ITEM(coverage)
  ITEM(street_pedestrian)
+ ITEM(bridge)
+ ITEM(tunnel)
  /* Area */
  ITEM2(0xc0000000,area)

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

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

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

Modified Files:
	menu.c menu.h 
Log Message:
Core:Cleanup:Remove dead code from menu

Index: menu.h
===================================================================
RCS file: /cvsroot/navit/navit/src/menu.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** menu.h	13 Jan 2008 11:29:06 -0000	1.6
--- menu.h	12 Mar 2008 10:58:26 -0000	1.7
***************
*** 25,30 ****
  
  /* prototypes */
- void menu_route_do_update(struct container *co);
- void menu_route_update(struct container *co);
  struct menu *menu_add(struct menu *menu, char *name, enum menu_type type, struct callback *cb);
  void menu_set_toggle(struct menu *menu, int active);
--- 25,28 ----

Index: menu.c
===================================================================
RCS file: /cvsroot/navit/navit/src/menu.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** menu.c	13 Jan 2008 11:29:06 -0000	1.6
--- menu.c	12 Mar 2008 10:58:26 -0000	1.7
***************
*** 3,30 ****
  #include "debug.h"
  
- void
- menu_route_do_update(struct container *co)
- {
- #if 0
- 	if (co->cursor) {
- #if 0 /* FIXME */
- 		route_set_position(co->route, cursor_pos_get(co->cursor));
- #endif
- 		graphics_redraw(co);
- 		if (co->statusbar && co->statusbar->statusbar_route_update)
- 			co->statusbar->statusbar_route_update(co->statusbar, co->route);
- 	}
- #endif
- }
- 
- void
- menu_route_update(struct container *co)
- {
- #if 0
- 	menu_route_do_update(co);
- 	graphics_redraw(co);
- #endif
- }
- 
  struct menu *
  menu_add(struct menu *menu, char *name, enum menu_type type, struct callback *cb)
--- 3,6 ----

[Navit-cvs-commit] navit/src/gui Makefile.am,1.2,1.3

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

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

Modified Files:
	Makefile.am 
Log Message:
Add:Core:New GUI internal


Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/src/gui/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.am	4 Jul 2007 22:44:42 -0000	1.2
--- Makefile.am	6 Mar 2008 19:24:29 -0000	1.3
***************
*** 1,3 ****
! SUBDIRS=
  if GUI_GTK
    SUBDIRS += gtk
--- 1,3 ----
! SUBDIRS=internal
  if GUI_GTK
    SUBDIRS += gtk

[Navit-cvs-commit] navit/src/gui/internal Makefile.am, NONE, 1.1 gui_internal.c, NONE, 1.1

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

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

Added Files:
	Makefile.am gui_internal.c 
Log Message:
Add:Core:New GUI internal


--- NEW FILE: Makefile.am ---
include $(top_srcdir)/Makefile.inc
AM_CPPFLAGS = -I$(top_srcdir)/src @NAVIT_CFLAGS@ @GTK2_CFLAGS@ -DMODULE=gui_internal
modulegui_LTLIBRARIES = libgui_internal.la
libgui_internal_la_SOURCES = gui_internal.c
libgui_internal_la_LIBADD = @GTK2_LIBS@

--- NEW FILE: gui_internal.c ---
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <gdk/gdkkeysyms.h>
#if !defined(GDK_Book) || !defined(GDK_Calendar)
#include <X11/XF86keysym.h>
#endif
#include <libintl.h>
#include <gtk/gtk.h>
#include "config.h"
#include "item.h"
#include "navit.h"
#include "debug.h"
#include "gui.h"
#include "coord.h"
#include "point.h"
#include "plugin.h"
#include "graphics.h"
#include "transform.h"
#include "config.h"

struct gui_priv {
        struct navit *nav;
};

static int
gui_internal_set_graphics(struct gui_priv *this, struct graphics *gra)
{
	void *graphics;
	
	dbg(0,"enter\n");
	graphics=graphics_get_data(gra, "window");
        if (! graphics)
                return 1;
	return 0;
}


struct gui_methods gui_internal_methods = {
	NULL,
	NULL,
	NULL,
	NULL,
        gui_internal_set_graphics,
};

static struct gui_priv *
gui_internal_new(struct navit *nav, struct gui_methods *meth, struct attr **attrs) 
{
	struct gui_priv *this;
	*meth=gui_internal_methods;
	this=g_new0(struct gui_priv, 1);
	this->nav=nav;

	return this;
}

void
plugin_init(void)
{
	plugin_register_gui_type("internal", gui_internal_new);
}

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.39, 1.40

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

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

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Add:Core:New GUI internal


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.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** graphics_gtk_drawing_area.c	4 Mar 2008 20:23:21 -0000	1.39
--- graphics_gtk_drawing_area.c	6 Mar 2008 19:24:29 -0000	1.40
***************
*** 22,25 ****
--- 22,26 ----
  	int button_timeout;
  	GtkWidget *widget;
+ 	GtkWidget *win;
  	GdkDrawable *drawable;
  	GdkDrawable *background;
***************
*** 790,799 ****
  }
  
  static void *
  get_data(struct graphics_priv *this, char *type)
  {
! 	if (strcmp(type,"gtk_widget"))
! 		return NULL;
! 	return this->widget;
  }
  
--- 791,815 ----
  }
  
+ static int gtk_argc;
+ static char **gtk_argv={NULL};
+ 
+ 
  static void *
  get_data(struct graphics_priv *this, char *type)
  {
! 	if (!strcmp(type,"gtk_widget"))
! 		return this->widget;
! 	if (!strcmp(type,"window")) {
! 		gtk_init(&gtk_argc, &gtk_argv);
! 		gtk_set_locale();
! 		this->win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
! 		gtk_window_set_default_size(GTK_WINDOW(this->win), 792, 547);
! 		gtk_window_set_title(GTK_WINDOW(this->win), "Navit");
! 		gtk_widget_realize(this->win);
! 		gtk_container_add(GTK_CONTAINER(this->win), this->widget);
! 		gtk_widget_show_all(this->win);
! 		return this->win;
! 	}
! 	return NULL;
  }
  

[Navit-cvs-commit] navit/src popup.c,1.24,1.25

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

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

Modified Files:
	popup.c 
Log Message:
Add:Core:New GUI internal


Index: popup.c
===================================================================
RCS file: /cvsroot/navit/navit/src/popup.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** popup.c	25 Jan 2008 16:15:44 -0000	1.24
--- popup.c	6 Mar 2008 19:24:29 -0000	1.25
***************
*** 226,229 ****
--- 226,231 ----
  
  	popup=gui_popup_new(navit_get_gui(nav));
+ 	if (! popup)
+ 		return;
  	transform_reverse(navit_get_trans(nav), p, &co);
  	men=popup_printf(popup, menu_type_submenu, _("Point 0x%x 0x%x"), co.x, co.y);

[Navit-cvs-commit] navit configure.in,1.78,1.79

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

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

Modified Files:
	configure.in 
Log Message:
Add:Core:New GUI internal


Index: configure.in
===================================================================
RCS file: /cvsroot/navit/navit/configure.in,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** configure.in	26 Feb 2008 18:18:45 -0000	1.78
--- configure.in	6 Mar 2008 19:24:29 -0000	1.79
***************
*** 473,476 ****
--- 473,477 ----
  src/gui/Makefile
  src/gui/gtk/Makefile
+ src/gui/internal/Makefile
  src/gui/sdl/Makefile
  src/gui/sdl/datafiles/Makefile

[Navit-cvs-commit] navit/src/gui/internal - New directory

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

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

Log Message:
Directory /cvsroot/navit/navit/src/gui/internal added to the repository

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.38, 1.39

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

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

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Fix:graphics_gtk_drawing_area:Fixed a memory leak

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.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** graphics_gtk_drawing_area.c	4 Mar 2008 06:11:23 -0000	1.38
--- graphics_gtk_drawing_area.c	4 Mar 2008 20:23:21 -0000	1.39
***************
*** 595,598 ****
--- 595,600 ----
  	if (window)
  		gdk_draw_drawable(widget->window, widget->style->fg_gc[GTK_WIDGET_STATE(widget)], parent->drawable, x, y, x, y, overlay->width, overlay->height);
+ 	g_object_unref(pixbuf);
+ 	g_object_unref(pixbuf2);
  #if 0
  	gdk_draw_drawable(gr->gra->drawable,

[Navit-cvs-commit] navit/src/graphics/null graphics_null.c, 1.5, 1.6

[Matt C. <mat...@us...>]

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

Modified Files:
	graphics_null.c 
Log Message:
fix:core:Update gc_set_dashes to match new signature

Index: graphics_null.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/null/graphics_null.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** graphics_null.c	3 Jan 2008 11:13:37 -0000	1.5
--- graphics_null.c	4 Mar 2008 06:28:12 -0000	1.6
***************
*** 54,58 ****
  
  static void
! gc_set_dashes(struct graphics_gc_priv *gc, unsigned char *dash_list, int n)
  {
  }
--- 54,58 ----
  
  static void
! gc_set_dashes(struct graphics_gc_priv *gc, int w, int offset, unsigned char *dash_list, int n)
  {
  }

[Navit-cvs-commit] navit/src navit.c, 1.86, 1.87 navit.xml, 1.41, 1.42 graphics.c, 1.36, 1.37 graphics.h, 1.16, 1.17 cursor.c, 1.15, 1.16 cursor.h, 1.11, 1.12 attr_def.h, 1.33, 1.34

[Matt C. <mat...@us...>]

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

Modified Files:
	navit.c navit.xml graphics.c graphics.h cursor.c cursor.h 
	attr_def.h 
Log Message:
fix:gtk:Provide options to make the cursor more visible in gtk. Fixes ticket #22

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** navit.xml	29 Feb 2008 23:11:21 -0000	1.41
--- navit.xml	4 Mar 2008 06:11:13 -0000	1.42
***************
*** 23,26 ****
--- 23,30 ----
  	
  	<vehicle name="Meins" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xjr+" color="#0000ff"/>
+ 	<!-- To improve visibility of the cursor in gtk, you may optionally add:
+ 		color2="#rrggbb"  - draws a second cursor inside the original, in the specified colour
+ 		animate="1" - animates the cursor, as series of moving dots
+ 	-->
  	<!-- For SDL, you should add follow="1" refresh="1" to have the view centered on your position
  	<vehicle name="Meins" enabled="yes" source="gpsd://localhost" color="#0000ff" follow="1" refresh="1"/>

Index: attr_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/attr_def.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** attr_def.h	29 Feb 2008 23:11:21 -0000	1.33
--- attr_def.h	4 Mar 2008 06:11:19 -0000	1.34
***************
*** 48,51 ****
--- 48,52 ----
  ATTR(statusbar)
  ATTR(toolbar)
+ ATTR(animate)
  ATTR2(0x0002ffff,type_int_end)
  ATTR2(0x00030000,type_string_begin)
***************
*** 106,109 ****
--- 107,111 ----
  ATTR2(0x00070000,type_color_begin)
  ATTR(color)
+ ATTR(color2)
  ATTR2(0x0007ffff,type_color_end)
  ATTR2(0x00080000,type_object_begin)

Index: cursor.c
===================================================================
RCS file: /cvsroot/navit/navit/src/cursor.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** cursor.c	18 Dec 2007 19:36:56 -0000	1.15
--- cursor.c	4 Mar 2008 06:11:16 -0000	1.16
***************
*** 26,30 ****
  struct cursor {
  	struct graphics *gra;
! 	struct graphics_gc *cursor_gc;
  	struct point cursor_pnt;
  };
--- 26,36 ----
  struct cursor {
  	struct graphics *gra;
! #define NUM_GC 5
! 	struct graphics_gc *cursor_gc[NUM_GC];
! 	struct graphics_gc *cursor_gc2[NUM_GC];
! 	int current_gc;
! 	int last_dir;
! 	int last_draw_dir;
! 	guint animate_timer;	
  	struct point cursor_pnt;
  };
***************
*** 46,49 ****
--- 52,57 ----
  	if (!graphics_ready(gra))
  		return;
+ 	this_->last_dir = dir;
+ 	this_->last_draw_dir = draw_dir;
  	cpnt[0]=this_->cursor_pnt;
  	cpnt[0].x-=r+lw;
***************
*** 57,61 ****
  		cpnt[0].x=x;
  		cpnt[0].y=y;
! 		graphics_draw_circle(gra, this_->cursor_gc, &cpnt[0], r*2);
  		if (draw_dir) {
  			dx=sin(M_PI*dir/180.0);
--- 65,71 ----
  		cpnt[0].x=x;
  		cpnt[0].y=y;
! 		graphics_draw_circle(gra, this_->cursor_gc[this_->current_gc], &cpnt[0], r*2);
! 		if (this_->cursor_gc2[this_->current_gc])
! 			graphics_draw_circle(gra, this_->cursor_gc2[this_->current_gc], &cpnt[0], r*2-4);
  		if (draw_dir) {
  			dx=sin(M_PI*dir/180.0);
***************
*** 70,77 ****
  			cpnt[2].x=x-dx*fac1-dy*fac2;
  			cpnt[2].y=y-dy*fac1+dx*fac2;
! 			graphics_draw_lines(gra, this_->cursor_gc, cpnt, 3);
  		} else {
  			cpnt[1]=cpnt[0];
! 			graphics_draw_lines(gra, this_->cursor_gc, cpnt, 2);
  		}
  		graphics_draw_mode(gra, draw_mode_end);
--- 80,102 ----
  			cpnt[2].x=x-dx*fac1-dy*fac2;
  			cpnt[2].y=y-dy*fac1+dx*fac2;
! 			graphics_draw_lines(gra, this_->cursor_gc[this_->current_gc], cpnt, 3);
! 
! 			if (this_->cursor_gc2[this_->current_gc]) {
! 				r-=4;
! 				fac1=0.7*r;
! 				fac2=0.4*r;	
! 				cpnt[0].x=x-dx*fac1+dy*fac2;
! 				cpnt[0].y=y-dy*fac1-dx*fac2;
! 				cpnt[1].x=x+dx*r;
! 				cpnt[1].y=y+dy*r;
! 				cpnt[2].x=x-dx*fac1-dy*fac2;
! 				cpnt[2].y=y-dy*fac1+dx*fac2;
! 				graphics_draw_lines(gra, this_->cursor_gc2[this_->current_gc], cpnt, 3);
! 			}
  		} else {
  			cpnt[1]=cpnt[0];
! 			graphics_draw_lines(gra, this_->cursor_gc[this_->current_gc], cpnt, 2);
! 			if (this_->cursor_gc2[this_->current_gc])
! 				graphics_draw_circle(gra, this_->cursor_gc2[this_->current_gc], &cpnt[0], 4);
  		}
  		graphics_draw_mode(gra, draw_mode_end);
***************
*** 79,91 ****
  }
  
  struct cursor *
! cursor_new(struct graphics *gra, struct color *c)
  {
  	dbg(2,"enter gra=%p c=%p\n", gra, c);
  	struct cursor *this=g_new(struct cursor,1);
  	this->gra=gra;
! 	this->cursor_gc=graphics_gc_new(gra);
! 	graphics_gc_set_foreground(this->cursor_gc, c);
! 	graphics_gc_set_linewidth(this->cursor_gc, 2);
  	dbg(2,"ret=%p\n", this);
  	return this;
--- 104,154 ----
  }
  
+ static gboolean cursor_animate(struct cursor * this)
+ {
+ 	this->current_gc++;
+ 	if (this->current_gc >= NUM_GC)
+ 		this->current_gc=0;
+ 	struct point p;
+ 	p.x = this->cursor_pnt.x;
+ 	p.y = this->cursor_pnt.y;
+ 	cursor_draw(this, &p, this->last_dir, this->last_draw_dir, 1);
+ 	return TRUE;
+ }
+ 
  struct cursor *
! cursor_new(struct graphics *gra, struct color *c, struct color *c2, int animate)
  {
+ 	unsigned char dash_list[] = { 4, 6 };
+ 	int i;
  	dbg(2,"enter gra=%p c=%p\n", gra, c);
  	struct cursor *this=g_new(struct cursor,1);
  	this->gra=gra;
! 	this->animate_timer=0;
! 	for (i=0;i<NUM_GC;i++) {
! 		this->cursor_gc[i]=NULL;
! 		this->cursor_gc2[i]=NULL;
! 	}
! 	this->current_gc=0;
! 	for (i=0;i<NUM_GC;i++) {
! 		this->cursor_gc[i]=graphics_gc_new(gra);
! 		graphics_gc_set_foreground(this->cursor_gc[i], c);
! 		graphics_gc_set_linewidth(this->cursor_gc[i], 2);
! 		if (c2) {
! 			this->cursor_gc2[i]=graphics_gc_new(gra);
! 			graphics_gc_set_foreground(this->cursor_gc2[i], c2);
! 		}
! 		if (animate) {
! 			graphics_gc_set_dashes(this->cursor_gc[i], 2, (NUM_GC-i)*2, dash_list, 2);
! 			if(this->cursor_gc2[i])
! 				graphics_gc_set_dashes(this->cursor_gc2[i], 2, i*2, dash_list, 2);
! 		} else {
! 			graphics_gc_set_linewidth(this->cursor_gc[i], 2);
! 			if(this->cursor_gc2[i])
! 				graphics_gc_set_linewidth(this->cursor_gc2[i], 2);
! 			break; // no need to create other GCs if we are not animating
! 		}
! 	}
! 	if (animate)
! 		this->animate_timer=g_timeout_add(250, (GSourceFunc)cursor_animate, (gpointer *)this);	
  	dbg(2,"ret=%p\n", this);
  	return this;
***************
*** 95,99 ****
  cursor_destroy(struct cursor *this_)
  {
! 	graphics_gc_destroy(this_->cursor_gc);
  	g_free(this_);
  }
--- 158,169 ----
  cursor_destroy(struct cursor *this_)
  {
! 	int i;
! 	if (this_->animate_timer)
! 		g_source_remove(this_->animate_timer);
! 	for (i=0;i<NUM_GC;i++)
! 		if(this_->cursor_gc[i])
! 			graphics_gc_destroy(this_->cursor_gc[i]);
! 		if(this_->cursor_gc2[i])
! 			graphics_gc_destroy(this_->cursor_gc2[i]);
  	g_free(this_);
  }

Index: graphics.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** graphics.c	29 Feb 2008 12:58:43 -0000	1.36
--- graphics.c	4 Mar 2008 06:11:14 -0000	1.37
***************
*** 140,143 ****
--- 140,150 ----
  }
  
+ void
+ graphics_gc_set_dashes(struct graphics_gc *gc, int width, int offset, unsigned char dash_list[], int n)
+ {
+ 	if (gc->meth.gc_set_dashes)
+ 		gc->meth.gc_set_dashes(gc->priv, width, offset, dash_list, n);
+ }
+ 
  struct graphics_image *
  graphics_image_new(struct graphics *gra, char *path)

Index: cursor.h
===================================================================
RCS file: /cvsroot/navit/navit/src/cursor.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** cursor.h	18 Dec 2007 19:36:56 -0000	1.11
--- cursor.h	4 Mar 2008 06:11:19 -0000	1.12
***************
*** 8,12 ****
  struct point;
  void cursor_draw(struct cursor *this_, struct point *pnt, int dir, int draw_dir, int force);
! struct cursor *cursor_new(struct graphics *gra, struct color *c);
  void cursor_destroy(struct cursor *this_);
  /* end of prototypes */
--- 8,12 ----
  struct point;
  void cursor_draw(struct cursor *this_, struct point *pnt, int dir, int draw_dir, int force);
! struct cursor *cursor_new(struct graphics *gra, struct color *c, struct color *c2, int animate);
  void cursor_destroy(struct cursor *this_);
  /* end of prototypes */

Index: graphics.h
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** graphics.h	29 Feb 2008 12:58:43 -0000	1.16
--- graphics.h	4 Mar 2008 06:11:15 -0000	1.17
***************
*** 63,67 ****
  	void (*gc_destroy)(struct graphics_gc_priv *gc);
  	void (*gc_set_linewidth)(struct graphics_gc_priv *gc, int width);
! 	void (*gc_set_dashes)(struct graphics_gc_priv *gc, unsigned char dash_list[], int n);
  	void (*gc_set_foreground)(struct graphics_gc_priv *gc, struct color *c);
  	void (*gc_set_background)(struct graphics_gc_priv *gc, struct color *c);
--- 63,67 ----
  	void (*gc_destroy)(struct graphics_gc_priv *gc);
  	void (*gc_set_linewidth)(struct graphics_gc_priv *gc, int width);
! 	void (*gc_set_dashes)(struct graphics_gc_priv *gc, int width, int offset, unsigned char dash_list[], int n);
  	void (*gc_set_foreground)(struct graphics_gc_priv *gc, struct color *c);
  	void (*gc_set_background)(struct graphics_gc_priv *gc, struct color *c);
***************
*** 113,116 ****
--- 113,117 ----
  void graphics_gc_set_background(struct graphics_gc *gc, struct color *c);
  void graphics_gc_set_linewidth(struct graphics_gc *gc, int width);
+ void graphics_gc_set_dashes(struct graphics_gc *gc, int width, int offset, unsigned char dash_list[], int n);
  struct graphics_image *graphics_image_new(struct graphics *gra, char *path);
  void graphics_image_free(struct graphics *gra, struct graphics_image *img);

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** navit.c	3 Mar 2008 22:46:45 -0000	1.86
--- navit.c	4 Mar 2008 06:11:12 -0000	1.87
***************
*** 51,58 ****
--- 51,60 ----
  	int speed;
  	struct color c;
+ 	struct color *c2;
  	struct menu *menu;
  	struct cursor *cursor;
  	struct vehicle *vehicle;
  	struct attr callback;
+ 	int animate_cursor;
  };
  
***************
*** 1105,1109 ****
  		dbg(1,"parsed one vehicle\n");
  		nv=l->data;
! 		nv->cursor=cursor_new(this_->gra, &nv->c);
  		nv->callback.type=attr_callback;
  		nv->callback.u.callback=callback_new_2(callback_cast(navit_vehicle_update), this_, nv);
--- 1107,1111 ----
  		dbg(1,"parsed one vehicle\n");
  		nv=l->data;
! 		nv->cursor=cursor_new(this_->gra, &nv->c, nv->c2, nv->animate_cursor);
  		nv->callback.type=attr_callback;
  		nv->callback.u.callback=callback_new_2(callback_cast(navit_vehicle_update), this_, nv);
***************
*** 1480,1487 ****
  {
  	struct navit_vehicle *nv=g_new0(struct navit_vehicle, 1);
! 	struct attr *name,*update,*follow,*color,*active;
  	nv->vehicle=v;
  	nv->update=1;
  	nv->follow=0;
  	nv->name="Noname";
  	if ((name=attr_search(attrs, NULL, attr_name)))
--- 1482,1490 ----
  {
  	struct navit_vehicle *nv=g_new0(struct navit_vehicle, 1);
! 	struct attr *name,*update,*follow,*color,*active, *color2, *animate;
  	nv->vehicle=v;
  	nv->update=1;
  	nv->follow=0;
+ 	nv->animate_cursor=0;
  	nv->name="Noname";
  	if ((name=attr_search(attrs, NULL, attr_name)))
***************
*** 1493,1496 ****
--- 1496,1503 ----
  	if ((color=attr_search(attrs, NULL, attr_color)))
  		nv->c=*(color->u.color);
+ 	if ((color2=attr_search(attrs, NULL, attr_color2)))
+ 		nv->c2=color2->u.color;
+ 	else
+ 		nv->c2=NULL;
  	nv->update_curr=nv->update;
  	nv->follow_curr=nv->follow;
***************
*** 1498,1502 ****
  	if ((active=attr_search(attrs, NULL, attr_active)) && active->u.num)
  		navit_set_vehicle(this_, nv);
! 
  	return nv;
  }
--- 1505,1510 ----
  	if ((active=attr_search(attrs, NULL, attr_active)) && active->u.num)
  		navit_set_vehicle(this_, nv);
! 	if ((animate=attr_search(attrs, NULL, attr_animate)))
! 		nv->animate_cursor=animate->u.num;
  	return nv;
  }

[Navit-cvs-commit] navit/src/graphics/opengl graphics_opengl.c, 1.15, 1.16

[Matt C. <mat...@us...>]

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

Modified Files:
	graphics_opengl.c 
Log Message:
fix:gtk:Provide options to make the cursor more visible in gtk. Fixes ticket #22

Index: graphics_opengl.c
===================================================================
RCS file: /cvsroot/navit/navit/src/graphics/opengl/graphics_opengl.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** graphics_opengl.c	17 Feb 2008 16:58:16 -0000	1.15
--- graphics_opengl.c	4 Mar 2008 06:11:22 -0000	1.16
***************
*** 124,132 ****
  
  static void
! gc_set_dashes(struct graphics_gc_priv *gc, unsigned char *dash_list, int n)
  {
  #if 0
! 	gdk_gc_set_dashes(gc->gc, 0, (gint8 *)dash_list, n);
! 	gdk_gc_set_line_attributes(gc->gc, 1, GDK_LINE_ON_OFF_DASH, GDK_CAP_ROUND, GDK_JOIN_ROUND);
  #endif
  }
--- 124,132 ----
  
  static void
! gc_set_dashes(struct graphics_gc_priv *gc, int width, int offset, unsigned char *dash_list, int n)
  {
  #if 0
! 	gdk_gc_set_dashes(gc->gc, offset, (gint8 *)dash_list, n);
! 	gdk_gc_set_line_attributes(gc->gc, width, GDK_LINE_ON_OFF_DASH, GDK_CAP_ROUND, GDK_JOIN_ROUND);
  #endif
  }

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.37, 1.38

[Matt C. <mat...@us...>]

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

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
fix:gtk:Provide options to make the cursor more visible in gtk. Fixes ticket #22

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.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** graphics_gtk_drawing_area.c	4 Mar 2008 00:07:34 -0000	1.37
--- graphics_gtk_drawing_area.c	4 Mar 2008 06:11:23 -0000	1.38
***************
*** 161,168 ****
  
  static void
! gc_set_dashes(struct graphics_gc_priv *gc, unsigned char *dash_list, int n)
  {
! 	gdk_gc_set_dashes(gc->gc, 0, (gint8 *)dash_list, n);
! 	gdk_gc_set_line_attributes(gc->gc, 1, GDK_LINE_ON_OFF_DASH, GDK_CAP_ROUND, GDK_JOIN_ROUND);
  }
  
--- 161,168 ----
  
  static void
! gc_set_dashes(struct graphics_gc_priv *gc, int w, int offset, unsigned char *dash_list, int n)
  {
! 	gdk_gc_set_dashes(gc->gc, offset, (gint8 *)dash_list, n);
! 	gdk_gc_set_line_attributes(gc->gc, w, GDK_LINE_ON_OFF_DASH, GDK_CAP_ROUND, GDK_JOIN_ROUND);
  }
  

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.36, 1.37

[Matt C. <mat...@us...>]

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

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
fix:gtk:Move initialisation of fontconfig lib

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.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** graphics_gtk_drawing_area.c	29 Feb 2008 12:58:43 -0000	1.36
--- graphics_gtk_drawing_area.c	4 Mar 2008 00:07:34 -0000	1.37
***************
*** 209,214 ****
  	gc->gc=gdk_gc_new(gr->widget->window);
  	gc->gr=gr;
- 	if (FcInit() != FcTrue)
- 		dbg(0, "Failed to init fontconfig");
  	return gc;
  }
--- 209,212 ----
***************
*** 875,878 ****
--- 873,878 ----
  	g_signal_connect(G_OBJECT(draw), "scroll_event", G_CALLBACK(scroll), this);
  	g_signal_connect(G_OBJECT(draw), "motion_notify_event", G_CALLBACK(motion_notify), this);
+ 	if (FcInit() != FcTrue)
+ 		dbg(0, "Failed to init fontconfig");
  	return this;
  }

[Navit-cvs-commit] navit/src/vehicle/gpsd vehicle_gpsd.c,1.9,1.10

[Matt C. <mat...@us...>]

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

Modified Files:
	vehicle_gpsd.c 
Log Message:
fix:gpsd:Ensure retry timer is cancelled when connection is closed

Index: vehicle_gpsd.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/gpsd/vehicle_gpsd.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** vehicle_gpsd.c	29 Feb 2008 23:11:22 -0000	1.9
--- vehicle_gpsd.c	3 Mar 2008 23:30:38 -0000	1.10
***************
*** 28,31 ****
--- 28,32 ----
  	char *nmea_data;
          char *nmea_data_buf;
+ 	guint retry_timer;
  } *vehicle_last;
  
***************
*** 141,146 ****
  vehicle_gpsd_open(struct vehicle_priv *priv)
  {
  	if (vehicle_gpsd_try_open((gpointer *)priv)) {
! 		g_timeout_add(priv->retry_interval*1000, (GSourceFunc)vehicle_gpsd_try_open, (gpointer *)priv);
  	}
  }
--- 142,148 ----
  vehicle_gpsd_open(struct vehicle_priv *priv)
  {
+ 	priv->retry_timer=0;
  	if (vehicle_gpsd_try_open((gpointer *)priv)) {
! 		priv->retry_timer = g_timeout_add(priv->retry_interval*1000, (GSourceFunc)vehicle_gpsd_try_open, (gpointer *)priv);
  	}
  }
***************
*** 155,158 ****
--- 157,164 ----
  		priv->watch = 0;
  	}
+ 	if (priv->retry_timer) {
+ 		g_source_remove(priv->retry_timer);
+ 		priv->retry_timer=0;
+ 	}
  	if (priv->iochan) {
  		g_io_channel_shutdown(priv->iochan, 0, &error);

[Navit-cvs-commit] navit/src navit.c,1.85,1.86

[Matt C. <mat...@us...>]

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

Modified Files:
	navit.c 
Log Message:
fix:core:Typo in navit_init()

Index: navit.c
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** navit.c	27 Feb 2008 18:04:00 -0000	1.85
--- navit.c	3 Mar 2008 22:46:45 -0000	1.86
***************
*** 1088,1092 ****
  	}
  	if (!this_->gra) {
! 		g_warning("failed to instantiate gui '%s'\n",this_->gra_type);
  		navit_destroy(this_);
  		return;
--- 1088,1092 ----
  	}
  	if (!this_->gra) {
! 		g_warning("failed to instantiate graphics '%s'\n",this_->gra_type);
  		navit_destroy(this_);
  		return;

[Navit-cvs-commit] navit/projs/CodeBlocks Navit_gtk.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-serv26426

Modified Files:
	Navit_gtk.cbp 
Log Message:
Fix:projs/CodeBlocks:win32 add bytwswap and endian header files

Index: Navit_gtk.cbp
===================================================================
RCS file: /cvsroot/navit/navit/projs/CodeBlocks/Navit_gtk.cbp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Navit_gtk.cbp	4 Feb 2008 00:46:04 -0000	1.1
--- Navit_gtk.cbp	3 Mar 2008 19:23:01 -0000	1.2
***************
*** 81,84 ****
--- 81,85 ----
  					<Add library="gdk_pixbuf-2.0" />
  					<Add library="freetype" />
+ 					<Add library="fontconfig" />
  					<Add library="z" />
  					<Add library="gobject-2.0" />

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

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

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

Added Files:
	byteswap.h endian.h 
Log Message:
Fix:projs/CodeBlocks:win32 add bytwswap and endian header files

--- NEW FILE: byteswap.h ---
#ifndef _BYTESWAP_H
#define _BYTESWAP_H

static inline unsigned short bswap_16(unsigned short x) {
  return (x>>8) | (x<<8);
}

static inline unsigned int bswap_32(unsigned int x) {
  return (bswap_16(x&0xffff)<<16) | (bswap_16(x>>16));
}

static inline unsigned long long bswap_64(unsigned long long x) {
  return (((unsigned long long)bswap_32(x&0xffffffffull))<<32) | (bswap_32(x>>32));
}

#endif


--- NEW FILE: endian.h ---
#ifndef ENDIAN_H_INCLUDED
#define ENDIAN_H_INCLUDED

#endif

[Navit-cvs-commit] navit/src attr_def.h, 1.32, 1.33 navit.xml, 1.40, 1.41

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

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

Modified Files:
	attr_def.h navit.xml 
Log Message:
Core:Add:Add an attribute for the gpsd_query format string

Index: navit.xml
===================================================================
RCS file: /cvsroot/navit/navit/src/navit.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** navit.xml	26 Feb 2008 08:54:47 -0000	1.40
--- navit.xml	29 Feb 2008 23:11:21 -0000	1.41
***************
*** 22,26 ****
  -->
  	
! 	<vehicle name="Meins" enabled="yes" active="1" source="gpsd://localhost" color="#0000ff"/>
  	<!-- For SDL, you should add follow="1" refresh="1" to have the view centered on your position
  	<vehicle name="Meins" enabled="yes" source="gpsd://localhost" color="#0000ff" follow="1" refresh="1"/>
--- 22,26 ----
  -->
  	
! 	<vehicle name="Meins" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xjr+" color="#0000ff"/>
  	<!-- For SDL, you should add follow="1" refresh="1" to have the view centered on your position
  	<vehicle name="Meins" enabled="yes" source="gpsd://localhost" color="#0000ff" follow="1" refresh="1"/>

Index: attr_def.h
===================================================================
RCS file: /cvsroot/navit/navit/src/attr_def.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** attr_def.h	27 Feb 2008 18:04:00 -0000	1.32
--- attr_def.h	29 Feb 2008 23:11:21 -0000	1.33
***************
*** 92,95 ****
--- 92,96 ----
  ATTR(layout)
  ATTR(position_nmea)
+ ATTR(gpsd_query)
  ATTR2(0x0003ffff,type_string_end)
  ATTR(order_limit)

[Navit-cvs-commit] navit/src/vehicle/gpsd vehicle_gpsd.c,1.8,1.9

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

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

Modified Files:
	vehicle_gpsd.c 
Log Message:
Core:Add:Add an attribute for the gpsd_query format string

Index: vehicle_gpsd.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/gpsd/vehicle_gpsd.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** vehicle_gpsd.c	29 Feb 2008 18:29:38 -0000	1.8
--- vehicle_gpsd.c	29 Feb 2008 23:11:22 -0000	1.9
***************
*** 13,16 ****
--- 13,17 ----
  static struct vehicle_priv {
  	char *source;
+ 	char *gpsd_query;
  	struct callback_list *cbl;
  	GIOChannel *iochan;
***************
*** 124,128 ****
  		return TRUE;
  	}
! 	gps_query(priv->gps, "w+xr+\n");
  	gps_set_raw_hook(priv->gps, vehicle_gpsd_callback);
  	priv->iochan = g_io_channel_unix_new(priv->gps->gps_fd);
--- 125,129 ----
  		return TRUE;
  	}
! 	gps_query(priv->gps, priv->gpsd_query);
  	gps_set_raw_hook(priv->gps, vehicle_gpsd_callback);
  	priv->iochan = g_io_channel_unix_new(priv->gps->gps_fd);
***************
*** 190,193 ****
--- 191,196 ----
  	if (priv->source)
  		g_free(priv->source);
+ 	if (priv->gpsd_query)
+ 		g_free(priv->gpsd_query);
  	g_free(priv);
  }
***************
*** 239,243 ****
  {
  	struct vehicle_priv *ret;
! 	struct attr *source, *retry_int;
  
  	dbg(1, "enter\n");
--- 242,246 ----
  {
  	struct vehicle_priv *ret;
! 	struct attr *source, *query, *retry_int;
  
  	dbg(1, "enter\n");
***************
*** 245,248 ****
--- 248,258 ----
  	ret = g_new0(struct vehicle_priv, 1);
  	ret->source = g_strdup(source->u.str);
+ 	query = attr_search(attrs, NULL, attr_gpsd_query);
+ 	if (query) {
+ 		ret->gpsd_query = g_strconcat(query->u.str, "\n", NULL);
+ 	} else {
+ 		ret->gpsd_query = g_strdup("w+xr+\n");
+ 	}
+ 	dbg(1,"Format string for gpsd_query: %s\n",ret->gpsd_query);
  	retry_int = attr_search(attrs, NULL, attr_retry_interval);
  	if (retry_int) {

[Navit-cvs-commit] navit/src/vehicle/gpsd vehicle_gpsd.c,1.7,1.8

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

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

Modified Files:
	vehicle_gpsd.c 
Log Message:
Fix:vehicle_gpsd:Fixed nmea query

Index: vehicle_gpsd.c
===================================================================
RCS file: /cvsroot/navit/navit/src/vehicle/gpsd/vehicle_gpsd.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** vehicle_gpsd.c	19 Feb 2008 00:31:55 -0000	1.7
--- vehicle_gpsd.c	29 Feb 2008 18:29:38 -0000	1.8
***************
*** 25,28 ****
--- 25,30 ----
  	int sats;
  	int sats_used;
+ 	char *nmea_data;
+         char *nmea_data_buf;
  } *vehicle_last;
  
***************
*** 39,43 ****
--- 41,62 ----
  		      int level)
  {
+ 	char *pos,*nmea_data_buf;
  	struct vehicle_priv *priv = vehicle_last;
+ 	if (buf[0] == '$') {
+ 		char buffer[len+1];
+ 		buffer[len+1]='\0';
+ 		memcpy(buffer, buf, len);
+ 		pos=strchr(buffer,'\n');
+ 		if (pos) {
+ 			*++pos='\0';
+ 			if (!priv->nmea_data_buf || strlen(priv->nmea_data_buf) < 65536) {
+ 				nmea_data_buf=g_strconcat(priv->nmea_data_buf ? priv->nmea_data_buf : "", buffer, NULL);
+ 				g_free(priv->nmea_data_buf);
+ 				priv->nmea_data_buf=nmea_data_buf;
+ 			} else {
+ 				dbg(0, "nmea buffer overflow, discarding '%s'\n", buffer);
+ 			}
+ 		}
+ 	}	
  	dbg(1,"data->set=0x%x\n", data->set);
  	// If data->fix.speed is NAN, then the drawing gets jumpy. 
***************
*** 75,78 ****
--- 94,100 ----
  		priv->geo.lng = data->fix.longitude;
  		dbg(1,"lat=%f lng=%f\n", priv->geo.lat, priv->geo.lng);
+ 		g_free(priv->nmea_data);
+ 		priv->nmea_data=priv->nmea_data_buf;
+ 		priv->nmea_data_buf=NULL;
  		callback_list_call_0(priv->cbl);
  		data->set &= ~LATLON_SET;
***************
*** 102,106 ****
  		return TRUE;
  	}
! 	gps_query(priv->gps, "w+x\n");
  	gps_set_raw_hook(priv->gps, vehicle_gpsd_callback);
  	priv->iochan = g_io_channel_unix_new(priv->gps->gps_fd);
--- 124,128 ----
  		return TRUE;
  	}
! 	gps_query(priv->gps, "w+xr+\n");
  	gps_set_raw_hook(priv->gps, vehicle_gpsd_callback);
  	priv->iochan = g_io_channel_unix_new(priv->gps->gps_fd);
***************
*** 194,197 ****
--- 216,224 ----
  		attr->u.coord_geo = &priv->geo;
  		break;
+ 	case attr_position_nmea:
+ 		attr->u.str=priv->nmea_data;
+ 		if (! attr->u.str)
+ 			return 0;
+ 		break;
  	default:
  		return 0;

[Navit-cvs-commit] navit Makefile.am,1.7,1.8

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

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

Modified Files:
	Makefile.am 
Log Message:
Fix:Core:Add missing file

Index: Makefile.am
===================================================================
RCS file: /cvsroot/navit/navit/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	5 Nov 2007 21:07:38 -0000	1.7
--- Makefile.am	29 Feb 2008 13:46:09 -0000	1.8
***************
*** 2,4 ****
  SUBDIRS=src po intl
  pkgdoc_DATA = README
! EXTRA_DIST = README
--- 2,4 ----
  SUBDIRS=src po intl
  pkgdoc_DATA = README
! EXTRA_DIST = README COPYRIGHT

[Navit-cvs-commit] navit COPYRIGHT,NONE,1.1

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

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

Added Files:
	COPYRIGHT 
Log Message:


--- NEW FILE: COPYRIGHT ---
Unless stated otherwise, all files are:
Copyright 2005 - 2008 Navit Team (see AUTHORS) and are licensed under the GPLv2 or later (see COPYING)

[Navit-cvs-commit] navit/src/graphics/gtk_drawing_area graphics_gtk_drawing_area.c, 1.35, 1.36

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

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

Modified Files:
	graphics_gtk_drawing_area.c 
Log Message:
Fix:osd_core:Fixed navigation 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.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** graphics_gtk_drawing_area.c	27 Feb 2008 18:04:00 -0000	1.35
--- graphics_gtk_drawing_area.c	29 Feb 2008 12:58:43 -0000	1.36
***************
*** 94,98 ****
   * If no font found, let fontconfig pick the best match
   */
! static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, int size)
  {
  	struct graphics_font_priv *font=g_new(struct graphics_font_priv, 1);
--- 94,98 ----
   * If no font found, let fontconfig pick the best match
   */
! static struct graphics_font_priv *font_new(struct graphics_priv *gr, struct graphics_font_methods *meth, int size, int flags)
  {
  	struct graphics_font_priv *font=g_new(struct graphics_font_priv, 1);
***************
*** 112,115 ****
--- 112,117 ----
  			dbg(1, "Looking for font family %s. exact=%d\n", *family, exact);
  			FcPattern *required = FcPatternBuild(NULL, FC_FAMILY, FcTypeString, *family, NULL);
+ 			if (flags)
+ 				FcPatternAddInteger(required,FC_WEIGHT,FC_WEIGHT_BOLD);
  			FcConfigSubstitute(FcConfigGetCurrent(), required, FcMatchFont);
  			FcDefaultSubstitute(required);