roadmap-commit — track CVS commits

[Roadmap-commit] roadmap/src roadmap_plugin.h,1.6,1.7

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22353

Modified Files:
	roadmap_plugin.h 
Log Message:
Fix the build issue reported by Harold.


Index: roadmap_plugin.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_plugin.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** roadmap_plugin.h	18 Apr 2009 05:46:07 -0000	1.6
--- roadmap_plugin.h	1 May 2009 13:00:44 -0000	1.7
***************
*** 46,49 ****
--- 46,50 ----
  #define INCLUDED__ROADMAP_PLUGIN__H
  
+ #include "roadmap.h"
  #include "roadmap_types.h"
  #include "roadmap_canvas.h"

[Roadmap-commit] roadmap/src Makefile,1.140,1.141

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14156

Modified Files:
	Makefile 
Log Message:
Build before installing, as Harold/dancer581 suggests.


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/Makefile,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -d -r1.140 -r1.141
*** Makefile	8 Apr 2009 14:02:06 -0000	1.140
--- Makefile	30 Apr 2009 15:05:26 -0000	1.141
***************
*** 559,563 ****
  
  
! install: installdata installbin installicons \
  		installdesktop installdoc installman
  	for module in $(RDMODULES) ; \
--- 559,563 ----
  
  
! install: all installdata installbin installicons \
  		installdesktop installdoc installman
  	for module in $(RDMODULES) ; \

[Roadmap-commit] roadmap/src buildmap_osm_text.c,1.15,1.16

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv7793

Modified Files:
	buildmap_osm_text.c 
Log Message:
Fix for the problem reported by Marco Atzeri


Index: buildmap_osm_text.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_text.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** buildmap_osm_text.c	18 Apr 2009 15:47:12 -0000	1.15
--- buildmap_osm_text.c	19 Apr 2009 16:53:35 -0000	1.16
***************
*** 724,727 ****
--- 724,735 ----
          tolat = buildmap_point_get_latitude(to_point);
  
+ 	if (WayLayer == 0) {
+ 		buildmap_info ("Way %d (%s) layer 0 is invalid",
+ 				in_way,
+ 				WayStreetName ? WayStreetName :
+ 				WayStreetRef ? WayStreetRef : "");
+ 		WayLayer = TRAIL;
+ 	}
+ 
          if ((WayFlags & AREA)  && (fromlon == tolon) && (fromlat == tolat)) {
                  static int polyid = 0;
***************
*** 776,780 ****
  		else if (WayStreetRef)
                          rms_name = str2dict(DictionaryStreet, WayStreetRef);
! 
                  /*
                   * Loop over the points of the way.
--- 784,797 ----
  		else if (WayStreetRef)
                          rms_name = str2dict(DictionaryStreet, WayStreetRef);
! #if 0
! 		else {
! 			char s[64];
! 			sprintf(s, "OSM unnamed way %d", in_way);
!                         rms_name = str2dict(DictionaryStreet, s);
! 		}
! #endif
! 		buildmap_verbose ("Way %d [%s] ref [%s]", in_way,
! 				WayStreetName ? WayStreetName : "",
! 				WayStreetRef ? WayStreetRef : "");
                  /*
                   * Loop over the points of the way.

[Roadmap-commit] roadmap/src buildmap_osm_text.c,1.14,1.15

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13414

Modified Files:
	buildmap_osm_text.c 
Log Message:
Remove the duplicate code that appeared in the source.


Index: buildmap_osm_text.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_text.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** buildmap_osm_text.c	18 Apr 2009 11:47:21 -0000	1.14
--- buildmap_osm_text.c	18 Apr 2009 15:47:12 -0000	1.15
***************
*** 679,729 ****
  		WayLayer = ret;
  
-         sscanf(data, "tag k=%*[\"']%[^\"']%*[\"'] v=%*[\"']%[^\"']%*[\"']",
-                 tag, value);
- 
-         /* street names */
-         if (strcmp(tag, "name") == 0) {
-                 if (WayStreetName)
-                         free(WayStreetName);
-                 WayStreetName = FromXmlAndDup(value);
-                 return 0;       /* FIX ME ?? */
- 	} else if (strcmp(tag, "ref") == 0) {
- 		if (WayStreetRef)
- 			free(WayStreetRef);
- 		WayStreetRef = FromXmlAndDup(value);
- 		return 0;	/* FIX ME ?? */
-         } else if (strcmp(tag, "landuse") == 0) {
-                 WayLandUseNotInteresting = 1;
- //              buildmap_info("discarding way %d, landuse %s", in_way, data);
-         }
- 
-         /* Scan list_info */
-         found = 0;
-         for (i=1; found == 0 && list_info[i].name != 0; i++) {
-                 if (strcmp(tag, list_info[i].name) == 0) {
-                         list = list_info[i].list;
-                         found = 1;
-                         break;
-                 }
-         }
- 
-         if (found) {
-                 if (list) {
-                         for (i=1; list[i].name; i++) {
-                                 if (strcmp(value, list[i].name) == 0) {
-                                         WayFlags = list[i].flags;
-                                         if (list[i].layerp)
-                                                 ret = *(list[i].layerp);
-                                 }
-                         }
-                 } else {
-                         /* */
-                 }
-         }
- 
-         /* FIX ME When are we supposed to do this */
-         if (ret)
-                 WayLayer = ret;
- 
          return ret;
  }
--- 679,682 ----

[Roadmap-commit] roadmap/src buildmap_osm_text.c,1.13,1.14

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv31725

Modified Files:
	buildmap_osm_text.c 
Log Message:
For roads with no name, take their "ref" as name. Motorways will typically
get a name now ("E40" or so).


Index: buildmap_osm_text.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_osm_text.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** buildmap_osm_text.c	29 Mar 2009 11:51:49 -0000	1.13
--- buildmap_osm_text.c	18 Apr 2009 11:47:21 -0000	1.14
***************
*** 2,6 ****
   * LICENSE:
   *
!  *   Copyright (c) 2008, Danny Backx
   *   Based on code Copyright 2007 Paul Fox that interprets the OSM
   *   binary stream.
--- 2,7 ----
   * LICENSE:
   *
!  *   Copyright (c) 2008, 2009, Danny Backx.
!  *
   *   Based on code Copyright 2007 Paul Fox that interprets the OSM
   *   binary stream.
***************
*** 78,81 ****
--- 79,84 ----
  static int      WayLayer = 0;           /**< the layer for this way */
  static char     *WayStreetName = 0;     /**< the street name */
+ static char	*WayStreetRef = 0;	/**< street code,
+ 					  to be used when no name (e.g. motorway) */
  static int      WayFlags = 0;           /**< properties of this way, from
                                                          the table flags */
***************
*** 194,197 ****
--- 197,201 ----
          nWayNodes = 0;
          free(WayStreetName); WayStreetName = 0;
+         free(WayStreetRef); WayStreetRef = 0;
          WayFlags = 0;
          WayInvalid = 0;
***************
*** 605,608 ****
--- 609,614 ----
   *     <tag k="name" v="Rue de Thiribut"/>
   *     <tag k="created_by" v="JOSM"/>
+  *     <tag k="ref" v="E40">
+  *     <tag k="int_ref" v="E 40">
   */
  static int
***************
*** 635,638 ****
--- 641,649 ----
  	} else if (strcmp(tag, "oneway") == 0 && strcmp(value, "yes") == 0) {
  		WayIsOneWay = ROADMAP_LINE_DIRECTION_ONEWAY;
+ 	} else if (strcmp(tag, "ref") == 0) {
+ 		if (WayStreetRef)
+ 			free(WayStreetRef);
+ 		WayStreetRef = FromXmlAndDup(value);
+ 		return 0;	/* FIX ME ?? */
  	}
  
***************
*** 677,680 ****
--- 688,696 ----
                  WayStreetName = FromXmlAndDup(value);
                  return 0;       /* FIX ME ?? */
+ 	} else if (strcmp(tag, "ref") == 0) {
+ 		if (WayStreetRef)
+ 			free(WayStreetRef);
+ 		WayStreetRef = FromXmlAndDup(value);
+ 		return 0;	/* FIX ME ?? */
          } else if (strcmp(tag, "landuse") == 0) {
                  WayLandUseNotInteresting = 1;
***************
*** 805,808 ****
--- 821,826 ----
                  if (WayStreetName)
                          rms_name = str2dict(DictionaryStreet, WayStreetName);
+ 		else if (WayStreetRef)
+                         rms_name = str2dict(DictionaryStreet, WayStreetRef);
  
                  /*

[Roadmap-commit] roadmap/src roadmap_display.c,1.39,1.40

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9895

Modified Files:
	roadmap_display.c 
Log Message:
Don't be too verbose


Index: roadmap_display.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_display.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** roadmap_display.c	18 Apr 2009 05:46:07 -0000	1.39
--- roadmap_display.c	18 Apr 2009 05:47:09 -0000	1.40
***************
*** 539,543 ****
             street_has_changed = 1;
          }
! 	roadmap_log (ROADMAP_WARNING, "roadmap_display_activate(%d, %s) %s",
  			line ? line->line_id : 0,
  			sign ? sign->id : "",
--- 539,543 ----
             street_has_changed = 1;
          }
! 	roadmap_log (ROADMAP_DEBUG, "roadmap_display_activate(%d, %s) %s",
  			line ? line->line_id : 0,
  			sign ? sign->id : "",

[Roadmap-commit] roadmap/src roadmap_display.c, 1.38, 1.39 roadmap_plugin.c, 1.7, 1.8 roadmap_plugin.h, 1.5, 1.6

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9804

Modified Files:
	roadmap_display.c roadmap_plugin.c roadmap_plugin.h 
Log Message:
Add the update_position method to the plugin interface.
Use processing that was already in place to pass relevant info to the
plugin (line and street info), instead of picking up raw gps position
info and getting the plugin to do all this work again.


Index: roadmap_display.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_display.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** roadmap_display.c	13 Apr 2009 09:00:15 -0000	1.38
--- roadmap_display.c	18 Apr 2009 05:46:07 -0000	1.39
***************
*** 485,488 ****
--- 485,492 ----
  /**
   * @brief Announce where we are. This function also figures out whether the street changed.
+  *
+  * This function is not only called when the GPS tells us about our position,
+  * but also when the user highlights a position on the map.
+  *
   * @param title name of the sign to use (failure if this is not predefined)
   * @param line
***************
*** 504,508 ****
      PluginStreetProperties properties;
  
- 
      roadmap_log_push ("roadmap_display_activate");
  
--- 508,511 ----
***************
*** 536,539 ****
--- 539,546 ----
             street_has_changed = 1;
          }
+ 	roadmap_log (ROADMAP_WARNING, "roadmap_display_activate(%d, %s) %s",
+ 			line ? line->line_id : 0,
+ 			sign ? sign->id : "",
+ 			street_has_changed ? " changed" : " unchanged");
      }
  
***************
*** 586,590 ****
      }
  
! //    roadmap_plugin_update_position (position);
  
      roadmap_log_pop ();
--- 593,597 ----
      }
  
!     roadmap_plugin_update_position (position, line, street, street_has_changed);
  
      roadmap_log_pop ();

Index: roadmap_plugin.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_plugin.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** roadmap_plugin.h	30 Mar 2009 14:00:44 -0000	1.5
--- roadmap_plugin.h	18 Apr 2009 05:46:07 -0000	1.6
***************
*** 3,7 ****
   *
   *   Copyright 2005 Ehud Shabtai
!  *   Copyright (c) 2008, Danny Backx.
   *
   *   This file is part of RoadMap.
--- 3,7 ----
   *
   *   Copyright 2005 Ehud Shabtai
!  *   Copyright (c) 2008, 2009, Danny Backx.
   *
   *   This file is part of RoadMap.
***************
*** 48,51 ****
--- 48,52 ----
  #include "roadmap_types.h"
  #include "roadmap_canvas.h"
+ #include "roadmap_gps.h"
  
  
***************
*** 203,206 ****
--- 204,209 ----
  typedef void (*plugin_route_clear)(void);
  typedef void (*plugin_route_add)(int, int, int);
+ typedef void (*plugin_update_position)(const RoadMapPosition *,
+ 		const PluginLine *, const PluginStreet *, const int);
  
  /**
***************
*** 232,235 ****
--- 235,239 ----
     plugin_route_clear			route_clear;		/**< clear the route */
     plugin_route_add			route_add;		/**< add a hop to the route */
+    plugin_update_position		update_position;	/**< GPS position info update */
  } RoadMapPluginHooks;
  
***************
*** 303,306 ****
--- 307,312 ----
  void roadmap_plugin_route_clear(void);
  void roadmap_plugin_route_add(int, int, int);
+ void roadmap_plugin_update_position (const RoadMapPosition *,
+ 		const PluginLine *, const PluginStreet *, const int);
  
  #endif /* INCLUDED__ROADMAP_PLUGIN__H */

Index: roadmap_plugin.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_plugin.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** roadmap_plugin.c	29 Mar 2009 12:08:57 -0000	1.7
--- roadmap_plugin.c	18 Apr 2009 05:46:07 -0000	1.8
***************
*** 3,7 ****
   *
   *   Copyright 2005 Ehud Shabtai
!  *   Copyright (c) 2008, Danny Backx.
   *
   *   This file is part of RoadMap.
--- 3,7 ----
   *
   *   Copyright 2005 Ehud Shabtai
!  *   Copyright (c) 2008, 2009, Danny Backx.
   *
   *   This file is part of RoadMap.
***************
*** 36,39 ****
--- 36,40 ----
  #include "roadmap_file.h"
  #include "roadmap_library.h"
+ #include "roadmap_gps.h"
  #include "roadmap_plugin.h"
  #include "roadmap_messagebox.h"
***************
*** 150,154 ****
  
  /**
!  * @brief
   * @param line1
   * @param line2
--- 151,155 ----
  
  /**
!  * @brief are the two lines the same ?
   * @param line1
   * @param line2
***************
*** 596,599 ****
--- 597,603 ----
  }
  
+ /**
+  * @brief call plugins to tell the user where to go
+  */
  void roadmap_plugin_format_messages (void)
  {
***************
*** 606,609 ****
--- 610,637 ----
  }
  
+ /**
+  * @brief call plugins with new information about where we are
+  * This is called by roadmap_display_activate() to pass info to the plugins.
+  * @param position the GPS info
+  * @param line the line we're on
+  * @param street the street we're on
+  * @param street_has_changed boolean value to alert the plugin of a change
+  */
+ void roadmap_plugin_update_position (const RoadMapPosition *position,
+ 		const PluginLine *line, const PluginStreet *street,
+ 		const int street_has_changed)
+ {
+    int i;
+ 
+    for (i=1; i<=PluginCount; i++) {
+       RoadMapPluginHooks *hp = get_hooks (i);
+       if (hp && hp->update_position)
+ 	      hp->update_position (position, line, street, street_has_changed);
+    }
+ }
+ 
+ /**
+  * @brief
+  */
  void roadmap_plugin_after_refresh (void)
  {
***************
*** 786,789 ****
--- 814,820 ----
  }
  
+ /**
+  * @brief plugins that maintain a route should clear it now
+  */
  void roadmap_plugin_route_clear(void)
  {
***************
*** 800,803 ****
--- 831,840 ----
  }
  
+ /**
+  * @brief plugins that maintain a route should add this line to it
+  * @param line
+  * @param layer
+  * @param fips
+  */
  void roadmap_plugin_route_add(int line, int layer, int fips)
  {

[Roadmap-commit] roadmap/src roadmap_display.c,1.37,1.38

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4665

Modified Files:
	roadmap_display.c 
Log Message:
Add a bit of documentation.


Index: roadmap_display.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_display.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** roadmap_display.c	10 Feb 2009 19:04:38 -0000	1.37
--- roadmap_display.c	13 Apr 2009 09:00:15 -0000	1.38
***************
*** 1,7 ****
! /* roadmap_display.c - Manage screen signs.
!  *
   * LICENSE:
   *
   *   Copyright 2002 Pascal F. Martin
   *
   *   This file is part of RoadMap.
--- 1,7 ----
! /*
   * LICENSE:
   *
   *   Copyright 2002 Pascal F. Martin
+  *   Copyright (c) 2009, Danny Backx
   *
   *   This file is part of RoadMap.
***************
*** 20,27 ****
   *   along with RoadMap; if not, write to the Free Software
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  *
!  * SYNOPSYS:
!  *
!  *   See roadmap_display.h.
   */
  
--- 20,28 ----
   *   along with RoadMap; if not, write to the Free Software
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  */
! 
! /**
!  * @file
!  * @brief Manage screen signs.
   */
  
***************
*** 93,96 ****
--- 94,100 ----
  #define SIGN_CENTER   2
  
+ /**
+  * @brief
+  */
  typedef struct {
  
***************
*** 122,126 ****
      const char *default_foreground;
  
!     PluginStreet street;
  
  } RoadMapSign;
--- 126,132 ----
      const char *default_foreground;
  
!     PluginStreet street;	/**< remember current street, this is used in
! 				  roadmap_display_activate() to figure out
! 				  whether we're still in the same street. */
  
  } RoadMapSign;
***************
*** 135,139 ****
       w, t, b, f, PLUGIN_STREET_NULL}
  
! 
  RoadMapSign RoadMapStreetSign[] = {
      ROADMAP_SIGN("GPS", "Current Street",  SIGN_BOTTOM, "%N, %C|%N", "DarkSeaGreen4", "white"),
--- 141,147 ----
       w, t, b, f, PLUGIN_STREET_NULL}
  
! /**
!  * @brief RoadMapSign table, indicates what to show under predefined conditions.
!  */
  RoadMapSign RoadMapStreetSign[] = {
      ROADMAP_SIGN("GPS", "Current Street",  SIGN_BOTTOM, "%N, %C|%N", "DarkSeaGreen4", "white"),
***************
*** 257,261 ****
  }
  
! 
  static RoadMapSign *roadmap_display_search_sign (const char *title) {
  
--- 265,273 ----
  }
  
! /**
!  * @brief look up a named sign
!  * @param title the name/title of this sign
!  * @return pointer to the structure of this sign
!  */
  static RoadMapSign *roadmap_display_search_sign (const char *title) {
  
***************
*** 471,475 ****
  }
  
! 
  int roadmap_display_activate (const char *title,
                                PluginLine *line,
--- 483,494 ----
  }
  
! /**
!  * @brief Announce where we are. This function also figures out whether the street changed.
!  * @param title name of the sign to use (failure if this is not predefined)
!  * @param line
!  * @param position
!  * @param street
!  * @return 0 on success
!  */
  int roadmap_display_activate (const char *title,
                                PluginLine *line,
***************
*** 567,570 ****
--- 586,591 ----
      }
  
+ //    roadmap_plugin_update_position (position);
+ 
      roadmap_log_pop ();
      *street = sign->street;

[Roadmap-commit] roadmap/doc Configuration, 1.4, 1.5 Navigation, 1.1, 1.2

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13894

Modified Files:
	Configuration Navigation 
Log Message:
Configuration : Add one more blank line so the tool works right.
Navigation : Add a comment about turn restrictions.


Index: Configuration
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Configuration,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Configuration	8 Feb 2009 21:27:26 -0000	1.4
--- Configuration	9 Apr 2009 06:12:54 -0000	1.5
***************
*** 1452,1455 ****
--- 1452,1456 ----
       user's preferences and session file are found.)
  
+ 
  == Feature Files ==
  

Index: Navigation
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Navigation,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Navigation	8 Apr 2009 10:13:50 -0000	1.1
--- Navigation	9 Apr 2009 06:12:54 -0000	1.2
***************
*** 59,62 ****
--- 59,64 ----
  
      This allows you to specify that some turns aren't allowed.
+     There's no buildmap support for this feature yet, meaning none of
+     our maps currently contain this table.
  
    - Oneway street and layer table
***************
*** 80,81 ****
--- 82,84 ----
    this awaits understanding of the hashing.
  
+ 

[Roadmap-commit] roadmap/src Makefile,1.139,1.140

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv10392

Modified Files:
	Makefile 
Log Message:
Get dependencies generated for the usermanual.html too.


Index: Makefile
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/Makefile,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** Makefile	29 Mar 2009 11:33:48 -0000	1.139
--- Makefile	8 Apr 2009 14:02:06 -0000	1.140
***************
*** 740,744 ****
  
  
! depends:
  	$(MAKEDEPS) -Y -f - $(C_SRC) > .depends.mk 2>/dev/null ; \
  	for dir in $(ALL_SUBDIRS) ; \
--- 740,744 ----
  
  
! depends::
  	$(MAKEDEPS) -Y -f - $(C_SRC) > .depends.mk 2>/dev/null ; \
  	for dir in $(ALL_SUBDIRS) ; \
***************
*** 748,751 ****
--- 748,754 ----
  	done
  
+ depends::
+ 	awk '/\%\!include/ {printf("usermanual.html: ../doc/%s\n", $$2);}' ../README >>.depends.mk
+ 
  .depends.mk:
  	@echo "Note: run 'make depends' to create dependency files" >&2

[Roadmap-commit] roadmap/doc Map-Building,1.2,1.3

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3396

Modified Files:
	Map-Building 
Log Message:
make sure all section files end in multiple blank lines, to fully
terminate lists within them.


Index: Map-Building
===================================================================
RCS file: /cvsroot/roadmap/roadmap/doc/Map-Building,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Map-Building	27 Jan 2009 01:42:13 -0000	1.2
--- Map-Building	8 Apr 2009 12:43:29 -0000	1.3
***************
*** 107,108 ****
--- 107,110 ----
         information about the format of the maps.
  
+ 
+ 

[Roadmap-commit] roadmap README,1.166,1.167

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25444

Modified Files:
	README 
Log Message:
Add some info about Navigation


Index: README
===================================================================
RCS file: /cvsroot/roadmap/roadmap/README,v
retrieving revision 1.166
retrieving revision 1.167
diff -C2 -d -r1.166 -r1.167
*** README	8 Feb 2009 21:14:31 -0000	1.166
--- README	8 Apr 2009 10:13:50 -0000	1.167
***************
*** 115,117 ****
  %!include: OpenStreetMap
  %!include: Map-Building
! 
--- 115,118 ----
  %!include: OpenStreetMap
  %!include: Map-Building
! @@ runtime-help-link Navigation
! %!include: Navigation

[Roadmap-commit] roadmap/doc Navigation,NONE,1.1

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/doc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25444/doc

Added Files:
	Navigation 
Log Message:
Add some info about Navigation


--- NEW FILE: Navigation ---
RoadMap Navigation

April 2009



= RoadMap Navigation =

 Navigation support is work in progress.

 It requires maps that have been built with a new version of buildmap 
 (or buildmap_osm) because this new version will add a couple of tables
 to the map.

 Navigation support needs to be compiled in, see "Building". RoadMap will
 show an additional menu labelled "Navigate" when this code is compiled in.




 - Building RoadMap with Navigation Support

   Set USE_NAVIGATE_PLUGIN = yes in config.mk and run "make".

   The Makefile dependency rules should cause a recompile of the right files.
   If that doesn't happen, please rebuild the dependencies with
   "make depends".


 - Use of RoadMap Navigation

   Use one of the new buttons in the Trip -> Places -> Personal Landmarks
   dialog to specify both Departure and Destination.
   Then say Navigate -> Navigate.

   A dialog should then appear saying how far you'll travel, and how much
   time it'll take to travel there. The route is also drawn.

   On my Linux PC, calculating the route is almost instantaneous for short
   trips, on my PDA it takes a bit longer.

   The next step isn't there yet (working on that) : RoadMap should do
   sensible things when it notices that you're following the route.

   Also route calculation isn't what it should be, I need to look at the
   algorithm, it makes the strangest moves :-)


= Maps for Navigation =

  In order to support navigation, several extensions were made to the
  RoadMap map format :

  - Line By Point table

    This allows you to query which lines start or end at a given point.

  - Turn restriction table

    This allows you to specify that some turns aren't allowed.

  - Oneway street and layer table

    This table has an indication whether a street is "oneway" only, and
    it also stores the layer (type of street). The layer info was in
    another map table already (RoadMap used it) but it was stored in a
    way which made access to it slow.

  All of these additions are exactly that : there's more info in the maps,
  but the existing tables aren't changed in any way.

  This means that old maps still work for RoadMap, just don't try to use
  navigation with them.

  Both buildmap (Tiger) and buildmap_osm (OpenStreetMap) have been extended,
  both kinds of maps will support navigation.

  You'll find that the maps are substantially bigger than before.
  The line by point tables can use another round of space optimisation,
  this awaits understanding of the hashing.

[Roadmap-commit] roadmap/src/navigate navigate_visual.c,1.2,1.3

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/navigate
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3244/navigate

Modified Files:
	navigate_visual.c 
Log Message:
Remove dead lines.


Index: navigate_visual.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/navigate/navigate_visual.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** navigate_visual.c	29 Mar 2009 12:08:58 -0000	1.2
--- navigate_visual.c	7 Apr 2009 18:36:45 -0000	1.3
***************
*** 35,40 ****
  #include "roadmap.h"
  #include "roadmap_line.h"
- // #include "roadmap_line_route.h"
- // #include "roadmap_line_speed.h"
  #include "roadmap_lang.h"
  #include "roadmap_layer.h"
--- 35,38 ----
***************
*** 47,51 ****
  #include "navigate_visual.h"
  
- // #define MAX_LAYERS (ROADMAP_ROAD_LAST + 1)
  #define MAX_PEN_LAYERS 2
  #define MAX_ROAD_COLORS 2
--- 45,48 ----

[Roadmap-commit] roadmap/src/navigate navigate_simple.c,1.7,1.8

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/navigate
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2390/navigate

Modified Files:
	navigate_simple.c 
Log Message:
Upload my latest changes, including a fix for the coredump Paul encounters.


Index: navigate_simple.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/navigate/navigate_simple.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** navigate_simple.c	29 Mar 2009 12:08:58 -0000	1.7
--- navigate_simple.c	7 Apr 2009 18:35:38 -0000	1.8
***************
*** 135,138 ****
--- 135,147 ----
  
  	iter->next->segment->time = cost;
+ //	iter->next->segment->heuristic = iter->next->segment->dist_from_destination;
+ 	iter->next->segment->heuristic =
+ 		iter->next->segment->dist_from_destination
+ 		+ iter->next->segment->time;
+ 	roadmap_log (ROADMAP_DEBUG, "navigate_simple_algo_cost(cost %d, dist_from_dest %d) -> %d",
+ 			cost,
+ 			iter->next->segment->dist_from_destination,
+ 			iter->next->segment->heuristic);
+ 
  	return cost;
  }
***************
*** 168,177 ****
  	if (nlines == 0) {
  		l = roadmap_navigate_position2line(s->from_pos);
! 		point = roadmap_line_from_point(l->line_id);
! 		nlines = navigate_simple_lines_closeby(point, lines, maxlines);
! 
! 		if (nlines == 0) {
! 			point = roadmap_line_to_point(l->line_id);
  			nlines = navigate_simple_lines_closeby(point, lines, maxlines);
  		}
  	}
--- 177,188 ----
  	if (nlines == 0) {
  		l = roadmap_navigate_position2line(s->from_pos);
! 		if (l) {
! 			point = roadmap_line_from_point(l->line_id);
  			nlines = navigate_simple_lines_closeby(point, lines, maxlines);
+ 
+ 			if (nlines == 0) {
+ 				point = roadmap_line_to_point(l->line_id);
+ 				nlines = navigate_simple_lines_closeby(point, lines, maxlines);
+ 			}
  		}
  	}
***************
*** 272,284 ****
--- 283,307 ----
  				stp->current->next->segment->from_pos.latitude);
  
+ 		/*
+ 		 * Which distance did we cross already ?
+ 		 */
  		stp->current->next->segment->distance = stp->current->segment->distance +
  			roadmap_math_distance(&stp->current->segment->from_pos,
  					&stp->current->segment->to_pos);
  
+ 		/*
+ 		 * Calculate algorithm dependent cost
+ 		 */
  		(void) algo->cost_fn(stp->current);
  
+ #if 0
  		stp->current->next->segment->heuristic =
  			stp->current->next->segment->dist_from_destination;
+ #endif
  
+ 		/*
+ 		 * The heuristic (comes out of the cost function) is what determines
+ 		 * where we go next.
+ 		 */
  		if (bestheuristic < 0 || stp->current->next->segment->heuristic < bestheuristic) {
  			bestseg = *stp->current->next->segment;

[Roadmap-commit] roadmap/src buildus_main.c,1.15,1.16

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15272

Modified Files:
	buildus_main.c 
Log Message:
Try to adhere better to the coding standard.


Index: buildus_main.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildus_main.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** buildus_main.c	16 Oct 2008 19:38:45 -0000	1.15
--- buildus_main.c	5 Apr 2009 10:56:37 -0000	1.16
***************
*** 3,6 ****
--- 3,7 ----
   *
   *   Copyright 2002 Pascal F. Martin
+  *   Copyright (c) 2008, Danny Backx.
   *
   *   This file is part of RoadMap.
***************
*** 189,227 ****
           buildmap_set_source (entry->d_name);
  
! 	 n = buildmap_osm_filename_iso(entry->d_name, country_iso, country_division, ".rdm");
  	 if (n) {
! 		 static BuildMapDictionary BuildMapStateDictionary;
! 		 static BuildMapDictionary county_dictionary;
! 		 RoadMapString state_symbol, county_name;
! 
! 		 fips = roadmap_iso_alpha_to_num(country_iso) * 1000 + 1000000;
! 		 if (n == 2) {
! 			 fips += roadmap_iso_division_to_num(country_iso, country_division);
! 			 buildmap_info("Country %s division %s fips %d",
! 					 country_iso, country_division, fips);
! 		 } else {
! 			 buildmap_info("Country %s fips %d", country_iso, fips);
! 		 }
  
! 		 /* Create a fake county */
! 		 BuildMapStateDictionary = buildmap_dictionary_open ("state");
  
! 		 state_symbol = buildmap_dictionary_add (BuildMapStateDictionary,
! 				 country_iso, strlen(country_iso));
! 		 if (state_symbol == 0) {
! 			 buildmap_fatal (0, "invalid state description");
! 		 }
! 		 buildus_county_add_state (state_symbol, state_symbol);
  
! 		 county_dictionary = buildmap_dictionary_open ("county");
! 		 if (n == 2) {
! 			 county_name = buildmap_dictionary_add (county_dictionary,
! 					 country_division, strlen(country_division));
! 		 } else {
! 			 county_name = buildmap_dictionary_add (county_dictionary,
! 				 "fake county", 11);
! 		 }
  
! 		 buildus_county_add (fips, county_name, state_symbol);
  	 } else if (buildmap_osm_filename_usc(entry->d_name, &fips)) {
  		 ;	/* It's decoded, that's all we needed. */
--- 190,229 ----
           buildmap_set_source (entry->d_name);
  
! 	 n = buildmap_osm_filename_iso(entry->d_name, country_iso,
! 			 country_division, ".rdm");
  	 if (n) {
! 	     static BuildMapDictionary BuildMapStateDictionary;
! 	     static BuildMapDictionary county_dictionary;
! 	     RoadMapString state_symbol, county_name;
  
! 	     fips = roadmap_iso_alpha_to_num(country_iso) * 1000 + 1000000;
! 	     if (n == 2) {
!                  fips += roadmap_iso_division_to_num(country_iso,
! 				 country_division);
! 		 buildmap_info("Country %s division %s fips %d",
! 				 country_iso, country_division, fips);
! 	     } else {
!                  buildmap_info("Country %s fips %d", country_iso, fips);
! 	     }
  
! 	     /* Create a fake county */
! 	     BuildMapStateDictionary = buildmap_dictionary_open ("state");
  
! 	     state_symbol = buildmap_dictionary_add (BuildMapStateDictionary,
! 			     country_iso, strlen(country_iso));
! 	     if (state_symbol == 0) {
!                  buildmap_fatal (0, "invalid state description");
! 	     }
! 	     buildus_county_add_state (state_symbol, state_symbol);
! 	     county_dictionary = buildmap_dictionary_open ("county");
! 	     if (n == 2) {
! 		     county_name = buildmap_dictionary_add (county_dictionary,
! 			     country_division, strlen(country_division));
! 	     } else {
! 		     county_name = buildmap_dictionary_add (county_dictionary,
! 				     "fake county", 11);
! 	     }
  
! 	     buildus_county_add (fips, county_name, state_symbol);
  	 } else if (buildmap_osm_filename_usc(entry->d_name, &fips)) {
  		 ;	/* It's decoded, that's all we needed. */
***************
*** 291,316 ****
  void roadmap_iso_create_all_countries(void)
  {
! 	int	i;
! 	static BuildMapDictionary state_dictionary;
! 	static BuildMapDictionary county_dictionary;
! 	RoadMapString state_symbol, state_name, dw;
! 	char	symbol[8];
! 
! 	state_dictionary = buildmap_dictionary_open ("state");
! 	county_dictionary = buildmap_dictionary_open ("county");
! 	dw = buildmap_dictionary_add(state_dictionary, "DW", 2);
! 	for (i=0; IsoCountryCodeTable[i].name; i++) {
! 		sprintf(symbol, "%s", IsoCountryCodeTable[i].alpha2);
! 		state_symbol = buildmap_dictionary_add (state_dictionary,
! 				IsoCountryCodeTable[i].alpha3, strlen(IsoCountryCodeTable[i].alpha3)
! 			);
! 		state_name = buildmap_dictionary_add (state_dictionary,
! 			IsoCountryCodeTable[i].name, strlen(IsoCountryCodeTable[i].name));
! 		if (state_symbol == 0 || state_name == 0) {
! 			buildmap_fatal (0, "invalid state description");
! 		}
  
! 		buildus_county_add_state (state_name, state_symbol);
! 	}
  }
  
--- 293,318 ----
  void roadmap_iso_create_all_countries(void)
  {
!     int i;
!     static BuildMapDictionary state_dictionary;
!     static BuildMapDictionary county_dictionary;
!     RoadMapString state_symbol, state_name, dw;
!     char symbol[8];
  
!     state_dictionary = buildmap_dictionary_open ("state");
!     county_dictionary = buildmap_dictionary_open ("county");
!     dw = buildmap_dictionary_add(state_dictionary, "DW", 2);
!     for (i=0; IsoCountryCodeTable[i].name; i++) {
!         sprintf(symbol, "%s", IsoCountryCodeTable[i].alpha2);
! 	state_symbol = buildmap_dictionary_add (state_dictionary,
!             IsoCountryCodeTable[i].alpha3,
! 	    strlen(IsoCountryCodeTable[i].alpha3));
! 	state_name = buildmap_dictionary_add (state_dictionary,
!             IsoCountryCodeTable[i].name,
! 	    strlen(IsoCountryCodeTable[i].name));
! 	if (state_symbol == 0 || state_name == 0) {
!             buildmap_fatal (0, "invalid state description");
!         }
! 	buildus_county_add_state (state_name, state_symbol);
!     }
  }
  
***************
*** 374,378 ****
  
     if (BuildMapVerbose) {
- 
        roadmap_hash_summary ();
        buildmap_db_summary ();
--- 376,379 ----
***************
*** 383,385 ****
     return 0;
  }
- 
--- 384,385 ----

[Roadmap-commit] roadmap/src roadmap_trip.c,1.108,1.109

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25141

Modified Files:
	roadmap_trip.c 
Log Message:
Add two ways to select Navigation Destination and Departure.
1. A separate dialog to be used in the Navigate menu
2. (As per Paul's suggestion) additional buttons in the Trip UI dialog


Index: roadmap_trip.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -C2 -d -r1.108 -r1.109
*** roadmap_trip.c	30 Mar 2009 14:00:45 -0000	1.108
--- roadmap_trip.c	4 Apr 2009 08:16:16 -0000	1.109
***************
*** 998,1002 ****
  }
  
! 
  static int roadmap_trip_waypoint_manage_dialog_populate (void *which) {
  
--- 998,1006 ----
  }
  
! /**
!  * @brief populate a list (created before) with items
!  * @param which indicates which list (of waypoints) to use to populate
!  * @return success indicator (1 if ok, 0 if not)
!  */
  static int roadmap_trip_waypoint_manage_dialog_populate (void *which) {
  
***************
*** 1053,1057 ****
--- 1057,1096 ----
  }
  
+ /**
+  * @brief function called from roadmap_trip_waypoint_select_navigation_waypoint
+  *   and roadmap_trip_waypoint_manage_dialog_worker
+  *   to store the Departure waypoint
+  * @param name
+  * @param data
+  */
+ static void roadmap_trip_set_nav_departure (const char *name, void *data)
+ {
+     roadmap_log (ROADMAP_WARNING, "roadmap_trip_departure_waypoint");
+     roadmap_trip_set_point ("Departure",
+ 	    &RoadMapTripSelectedPlace->wpt->pos);
+     roadmap_dialog_hide (name);
+     roadmap_screen_refresh ();
+ }
  
+ /**
+  * @brief function called from roadmap_trip_waypoint_select_navigation_waypoint
+  *   and roadmap_trip_waypoint_manage_dialog_worker
+  *   to store the Destination waypoint
+  * @param name
+  * @param data
+  */
+ static void roadmap_trip_set_nav_destination (const char *name, void *data)
+ {
+     roadmap_log (ROADMAP_DEBUG, "roadmap_trip_destination_waypoint");
+     roadmap_trip_set_point ("Destination",
+ 	    &RoadMapTripSelectedPlace->wpt->pos);
+     roadmap_dialog_hide (name);
+     roadmap_screen_refresh ();
+ }
+ 
+ /**
+  * @brief function to manage the Trip waypoint dialog
+  * @param which indicates which list of waypoints to display
+  */
  static void roadmap_trip_waypoint_manage_dialog_worker (void *which) {
  
***************
*** 1097,1100 ****
--- 1136,1143 ----
          roadmap_dialog_add_button
              ("Okay", roadmap_trip_dialog_cancel);
+ 	roadmap_dialog_add_button
+ 	    ("Destination", roadmap_trip_set_nav_destination);
+ 	roadmap_dialog_add_button
+ 	    ("Departure", roadmap_trip_set_nav_departure);
  
          roadmap_dialog_new_hidden ("Names", ".which");
***************
*** 3680,3681 ****
--- 3723,3809 ----
  	RoadMapTripRefresh = 1;
  }
+ 
+ #if 1
+ /*
+  * Stuff to add menu items in the navigate menu
+  * These could be integrated with the existing Trip UI.
+  * (Done so experimentally already)
+  */
+ /**
+  * @brief Pop up a dialog to select a departure or destination from a list of waypoints
+  * @param which selects the list of waypoints to use for display
+  * @param destination do we select a destination or a departure
+  */
+ void roadmap_trip_waypoint_select_navigation_waypoint (void *which, int destination) {
+ 
+     int empty = 1;      /* warning suppression */
+     const char *name = NULL; /* ditto */
+ 
+     if (destination)
+ 	    name = "Select destination";
+     else
+ 	    name = "Select departure";
+ 
+     if (which == TRIP_WAYPOINTS) {
+ 	    empty = ROADMAP_LIST_EMPTY(&RoadMapTripWaypointHead);
+     } else if (which == PERSONAL_WAYPOINTS) {
+ 	    empty = ROADMAP_LIST_EMPTY(roadmap_landmark_list());
+     } else if (which == ROUTE_WAYPOINTS) {
+ 	    if (RoadMapCurrentRoute == NULL) {
+ 		    return;     /* Nothing to edit. */
+ 	    }
+ 	    empty = ROADMAP_LIST_EMPTY(&RoadMapCurrentRoute->waypoint_list);
+     } else if (which == LOST_WAYPOINTS) {
+ 	    empty = ROADMAP_LIST_EMPTY(roadmap_landmark_list());
+     }
+ 
+     if (empty) {
+         return;         /* Nothing to edit. */
+     }
+ 
+     if (roadmap_dialog_activate ( name, which)) {
+         roadmap_dialog_new_list ("Names", ".Waypoints");
+         if (which == ROUTE_WAYPOINTS) {
+             roadmap_dialog_add_button
+                 ("Back", roadmap_trip_waypoint_manage_dialog_up);
+             roadmap_dialog_add_button
+                 ("Ahead", roadmap_trip_waypoint_manage_dialog_down);
+         }
+         roadmap_dialog_add_button
+             ("Show", roadmap_trip_dialog_cancel);
+ 
+ 	if (destination)
+ 		roadmap_dialog_add_button
+ 			("Destination", roadmap_trip_set_nav_destination);
+ 	else
+ 		roadmap_dialog_add_button
+ 			("Departure", roadmap_trip_set_nav_departure);
+ 
+         roadmap_dialog_new_hidden ("Names", ".which");
+ 
+         roadmap_dialog_complete (0);    /* No need for a keyboard. */
+     }
+ 
+     roadmap_trip_waypoint_manage_dialog_populate (which);
+ }
+ 
+ /**
+  * @brief Pop up a dialog to select a departure from the list of Personal waypoints
+  * Calls the (static) worker function roadmap_trip_waypoint_select_navigation_waypoint
+  * which is a slightly modified version of roadmap_trip_waypoint_manage_dialog_worker .
+  */
+ void roadmap_trip_departure_waypoint (void)
+ {
+ 	roadmap_trip_waypoint_select_navigation_waypoint(PERSONAL_WAYPOINTS, 0);
+ }
+ 
+ /**
+  * @brief Pop up a dialog to select a destination from the list of Personal waypoints
+  * Calls the (static) worker function roadmap_trip_waypoint_select_navigation_waypoint
+  * which is a slightly modified version of roadmap_trip_waypoint_manage_dialog_worker .
+  */
+ void roadmap_trip_destination_waypoint (void)
+ {
+ 	roadmap_trip_waypoint_select_navigation_waypoint(PERSONAL_WAYPOINTS, 1);
+ }
+ #endif

[Roadmap-commit] roadmap/src/win32 roadmap_dialog.c,1.14,1.15

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src/win32
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5238/win32

Modified Files:
	roadmap_dialog.c 
Log Message:
Improve the visual aspect of list and buttons in dialogs on WinCE.


Index: roadmap_dialog.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_dialog.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** roadmap_dialog.c	12 Feb 2009 18:51:38 -0000	1.14
--- roadmap_dialog.c	3 Apr 2009 19:08:45 -0000	1.15
***************
*** 3,7 ****
   *
   *   Copyright 2005 Ehud Shabtai
!  *   Copyright (c) 2008, Danny Backx.
   *
   *   Based on an implementation by Pascal F. Martin.
--- 3,7 ----
   *
   *   Copyright 2005 Ehud Shabtai
!  *   Copyright (c) 2008, 2009, Danny Backx.
   *
   *   Based on an implementation by Pascal F. Martin.
***************
*** 71,75 ****
  const unsigned int MAX_ROW_SPACE = 5;
  const unsigned int MAX_LIST_HEIGHT = 80;
! const unsigned int BUTTON_WIDTH = 50;
  
  static INT_PTR CALLBACK DialogFunc(HWND, UINT, WPARAM, LPARAM);
--- 71,76 ----
  const unsigned int MAX_ROW_SPACE = 5;
  const unsigned int MAX_LIST_HEIGHT = 80;
! 
! const unsigned int ROADMAP_WIDGETLIST_ROWS = 8;
  
  static INT_PTR CALLBACK DialogFunc(HWND, UINT, WPARAM, LPARAM);
***************
*** 416,420 ****
  }
  
! 
  void roadmap_dialog_show_list (const char  *frame,
  		const char  *name,
--- 417,429 ----
  }
  
! /**
!  * @brief populate the list created with roadmap_dialog_new_list()
!  * @param frame names the list
!  * @param name names the list
!  * @param count
!  * @param labels
!  * @param values
!  * @param callback
!  */
  void roadmap_dialog_show_list (const char  *frame,
  		const char  *name,
***************
*** 453,456 ****
--- 462,468 ----
  	roadmap_check_allocated(choice);
  	
+ 	roadmap_log (ROADMAP_WARNING, "roadmap_dialog_show_list(%s,%s) #items %d",
+ 			frame, name, count);
+ 
  	for (i = 0; i < count; ++i) {
  		
***************
*** 806,810 ****
  			NULL);                // Specify NULL for this parameter when you 
  
! 		dwStyle |= WS_BORDER|LBS_NOTIFY;
  		item->w = CreateWindowEx (
  			0,
--- 818,822 ----
  			NULL);                // Specify NULL for this parameter when you 
  
! 		dwStyle |= WS_BORDER|LBS_NOTIFY | WS_VSCROLL;
  		item->w = CreateWindowEx (
  			0,
***************
*** 889,921 ****
  				return (INT_PTR)FALSE;
  			} else {
! 				//buttons
  				int curr_y = height - MAX_ROW_HEIGHT;
  				int row_height = MAX_ROW_HEIGHT - 1;
  				int column_separator = 5;
! 				int curr_x;
  				int num_buttons = 0;
  
  				for (frame = dialog->children; frame != NULL;
  								frame = frame->next) {
  					if (frame->widget_type == ROADMAP_WIDGET_BUTTON) {
! 							num_buttons++;
  					}
  				}
  
! 				if (((BUTTON_WIDTH + column_separator) * num_buttons) >=
! 								(unsigned)width) {
! 					curr_x = width - BUTTON_WIDTH - 1;
! 				} else {
! 					curr_x = width - BUTTON_WIDTH -
! 						(width - (BUTTON_WIDTH + column_separator) *
! 						 num_buttons) / 2;
! 				}
  
  				for (frame = dialog->children; frame != NULL;
  								frame = frame->next) {
  					if (frame->widget_type != ROADMAP_WIDGET_CONTAINER) {
  						MoveWindow(frame->w,
! 							curr_x, curr_y, BUTTON_WIDTH, row_height, TRUE);
! 						curr_x -= BUTTON_WIDTH + column_separator;
  					}	
  				}
--- 901,952 ----
  				return (INT_PTR)FALSE;
  			} else {
! 				/*
! 				 * FIX ME
! 				 *
! 				 * This is already improved w.r.t. the fixed
! 				 * width buttons that used to be here.
! 				 * Now the button width is proportional to
! 				 * its #chars. All the screen width available
! 				 * is used, which is good for manipulating
! 				 * a mobile device with your finger.
! 				 *
! 				 * Still it might be better to use data from
! 				 * the font.
! 				 */
  				int curr_y = height - MAX_ROW_HEIGHT;
  				int row_height = MAX_ROW_HEIGHT - 1;
  				int column_separator = 5;
! 				int curr_x, cw;
  				int num_buttons = 0;
+ 				int chars = 0;
  
+ 				/* Get data about our buttons */
  				for (frame = dialog->children; frame != NULL;
  								frame = frame->next) {
  					if (frame->widget_type == ROADMAP_WIDGET_BUTTON) {
! 						num_buttons++;
! 						chars += 2 + strlen(frame->name);
  					}
  				}
+ 				
+ 				/*
+ 				 * This is the width we'll spend on a character
+ 				 * in a button.
+ 				 */
+ 				cw = (width - num_buttons * column_separator)
+ 					/ chars;
  
! 				curr_x = width;
  
+ 				/* Now position & resize the buttons */
  				for (frame = dialog->children; frame != NULL;
  								frame = frame->next) {
  					if (frame->widget_type != ROADMAP_WIDGET_CONTAINER) {
+ 						int l = strlen(frame->name) + 2;
+ 						curr_x -= l * cw + column_separator;
  						MoveWindow(frame->w,
! 							curr_x, curr_y,
! 							l * cw, row_height,
! 							TRUE);
  					}	
  				}
***************
*** 956,959 ****
--- 987,1002 ----
  }
  
+ /**
+  * @brief the TabDialogFunc is called to handle events of a dialog
+  * Two very important events are WM_SETTINGCHANGE and WM_SIZE. When
+  * they come, the geometry of all widgets in the dialog is changed
+  * by the algorithms in this function.
+  *
+  * @param hDlg the id of this dialog
+  * @param message the message that Windows sends us
+  * @param wParam one of the predefined parameters, context dependent
+  * @param lParam the other predefined parameter, context dependent
+  * @return (need to look up what this means)
+  */
  INT_PTR CALLBACK TabDialogFunc(HWND hDlg, UINT message, WPARAM wParam,
  							   LPARAM lParam)
***************
*** 1037,1041 ****
  				continue;
  			if (item->widget_type == ROADMAP_WIDGET_LIST)
! 				num_entries += 4;
  			else
  				num_entries++;
--- 1080,1084 ----
  				continue;
  			if (item->widget_type == ROADMAP_WIDGET_LIST)
! 				num_entries += ROADMAP_WIDGETLIST_ROWS;
  			else
  				num_entries++;
***************
*** 1090,1094 ****
  					column_edge_width, curr_y,
  					width - column_edge_width*2,
! 					row_height*3, TRUE);
  				curr_y += row_height*3 + row_space;
  			} else {
--- 1133,1138 ----
  					column_edge_width, curr_y,
  					width - column_edge_width*2,
! 					row_height*ROADMAP_WIDGETLIST_ROWS,
! 					TRUE);
  				curr_y += row_height*3 + row_space;
  			} else {

[Roadmap-commit] roadmap/src buildmap_shapefile.c,1.15,1.16

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv14821

Modified Files:
	buildmap_shapefile.c 
Log Message:
As Joshua indicated, this required an additional include.


Index: buildmap_shapefile.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_shapefile.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** buildmap_shapefile.c	29 Mar 2009 18:30:52 -0000	1.15
--- buildmap_shapefile.c	30 Mar 2009 18:53:00 -0000	1.16
***************
*** 1,4 ****
! /* buildmap_shapefile.c - a module to read shapefiles.
!  *
   * LICENSE:
   *
--- 1,3 ----
! /*
   * LICENSE:
   *
***************
*** 20,27 ****
   *   along with RoadMap; if not, write to the Free Software
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  *
!  * SYNOPSYS:
!  *
!  *   see buildmap_shapefile.h
   */
  
--- 19,27 ----
   *   along with RoadMap; if not, write to the Free Software
   *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  */
! 
! /**
!  * @file
!  * @brief a module to read shapefiles.
   */
  
***************
*** 45,48 ****
--- 45,49 ----
  #include "roadmap_math.h"
  #include "roadmap_path.h"
+ #include "roadmap_line.h"
  
  #include "buildmap.h"

[Roadmap-commit] roadmap/src buildmap_line.c,1.24,1.25

[Danny B. <dan...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11408

Modified Files:
	buildmap_line.c 
Log Message:
Yes, Paul, your changes look good. I'm removing the fprintf statement
and cleaning up the comments a bit.


Index: buildmap_line.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_line.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** buildmap_line.c	30 Mar 2009 14:50:04 -0000	1.24
--- buildmap_line.c	30 Mar 2009 18:40:24 -0000	1.25
***************
*** 1056,1060 ****
  
  	sz1 = max_line_by_point;
- /*	sz2 = sizeof(int) * (max_line_by_point + cnt);	*/
  
  	/*
--- 1056,1059 ----
***************
*** 1065,1073 ****
  	tmp = (int *)calloc(max_line_by_point, sizeof(int));
  
! 	/* This is a sparse array, make it NULL first */
! 	// it's already nulled by calloc
! 	// p1 = tmp;
! 	// for (i=0; i<max_line_by_point; i++)
! 	// 	*(p1++) = 0;
  
  	p1 = tmp;
--- 1064,1070 ----
  	tmp = (int *)calloc(max_line_by_point, sizeof(int));
  
! 	/* This is a sparse array, needs to be filled with NULL
! 	 * but calloc() does that for us.
! 	 */
  
  	p1 = tmp;
***************
*** 1090,1099 ****
  
  		if (ix >= sz1) {
! 
  			fprintf (stderr, "realloc'ing: sz1 %d --> ix %d\n", sz1, ix);;
  			int newsize;
  			newsize = ix + 10;	/* Exaggerate a bit. */
  			tmp = realloc((void *)tmp, newsize * sizeof(int));
! 			// zero out the new area
  			memset(&tmp[sz1], 0, (newsize - sz1) * sizeof(int));
  			sz1 = newsize;
--- 1087,1102 ----
  
  		if (ix >= sz1) {
! #if 0
  			fprintf (stderr, "realloc'ing: sz1 %d --> ix %d\n", sz1, ix);;
+ #endif
  			int newsize;
  			newsize = ix + 10;	/* Exaggerate a bit. */
  			tmp = realloc((void *)tmp, newsize * sizeof(int));
! 			/*
! 			 * The new area needs to be zeroed out because the
! 			 * realloc manual doesn't speak about initialisation,
! 			 * and we rely on the fact that this is NULL if
! 			 * not overwritten by us.
! 			 */
  			memset(&tmp[sz1], 0, (newsize - sz1) * sizeof(int));
  			sz1 = newsize;

[Roadmap-commit] roadmap/src buildmap_line.c,1.23,1.24

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv2583

Modified Files:
	buildmap_line.c 
Log Message:
fix the realloc code to null the new area, and fix up the pointers.
(is this all necessary?  in josh's test case, ix is exacly equal to sz1,
making me think it's just an off-by-one resulting from the initial null?)


Index: buildmap_line.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/buildmap_line.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** buildmap_line.c	29 Mar 2009 16:31:33 -0000	1.23
--- buildmap_line.c	30 Mar 2009 14:50:04 -0000	1.24
***************
*** 1043,1049 ****
   * @brief turn the data generated on the fly into the format fit for storage
   */
! static void buildmap_line_transform_linebypoint(RoadMapLineByPoint1 *q1, RoadMapLineByPoint2 *q2)
  {
! 	int	i, j, sz1, sz2;
  	int	cnt = 0;
  	int	*p1, *p2, *b;
--- 1043,1050 ----
   * @brief turn the data generated on the fly into the format fit for storage
   */
! static void buildmap_line_transform_linebypoint
!     (RoadMapLineByPoint1 *q1, RoadMapLineByPoint2 *q2)
  {
! 	int	i, j, sz1;
  	int	cnt = 0;
  	int	*p1, *p2, *b;
***************
*** 1065,1071 ****
  
  	/* This is a sparse array, make it NULL first */
! 	p1 = tmp;
! 	for (i=0; i<max_line_by_point; i++)
! 		*(p1++) = 0;
  
  	p1 = tmp;
--- 1066,1073 ----
  
  	/* This is a sparse array, make it NULL first */
! 	// it's already nulled by calloc
! 	// p1 = tmp;
! 	// for (i=0; i<max_line_by_point; i++)
! 	// 	*(p1++) = 0;
  
  	p1 = tmp;
***************
*** 1087,1093 ****
  		int	ix = buildmap_point_get_sorted(i);
  
! 		if (ix > sz1) {
! 			sz1 = ix + 10;	/* Exaggerate a bit. */
! 			tmp = realloc((void *)tmp, sz1 * sizeof(int));
  		}
  
--- 1089,1102 ----
  		int	ix = buildmap_point_get_sorted(i);
  
! 		if (ix >= sz1) {
! 
! 			fprintf (stderr, "realloc'ing: sz1 %d --> ix %d\n", sz1, ix);;
! 			int newsize;
! 			newsize = ix + 10;	/* Exaggerate a bit. */
! 			tmp = realloc((void *)tmp, newsize * sizeof(int));
! 			// zero out the new area
! 			memset(&tmp[sz1], 0, (newsize - sz1) * sizeof(int));
! 			sz1 = newsize;
! 			p1 = tmp;
  		}
  

[Roadmap-commit] roadmap/src roadmap_layer.c, 1.22, 1.23 roadmap_plugin.h, 1.4, 1.5 roadmap_point.h, 1.1.1.1, 1.2 roadmap_res.c, 1.1, 1.2 roadmap_trip.c, 1.107, 1.108

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20957

Modified Files:
	roadmap_layer.c roadmap_plugin.h roadmap_point.h roadmap_res.c 
	roadmap_trip.c 
Log Message:
compiler warning cleanup


Index: roadmap_plugin.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_plugin.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_plugin.h	15 Feb 2009 15:32:27 -0000	1.4
--- roadmap_plugin.h	30 Mar 2009 14:00:44 -0000	1.5
***************
*** 198,202 ****
  
  typedef RoadMapAction *plugin_actions;
! typedef char **plugin_menu;
  typedef void (*plugin_after_refresh) (void);
  typedef void (*plugin_format_messages) (void);
--- 198,202 ----
  
  typedef RoadMapAction *plugin_actions;
! typedef const char **plugin_menu;
  typedef void (*plugin_after_refresh) (void);
  typedef void (*plugin_format_messages) (void);

Index: roadmap_point.h
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_point.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** roadmap_point.h	21 Feb 2003 20:07:42 -0000	1.1.1.1
--- roadmap_point.h	30 Mar 2009 14:00:44 -0000	1.2
***************
*** 33,35 ****
--- 33,39 ----
  extern roadmap_db_handler RoadMapPointHandler;
  
+ #ifdef HAVE_NAVIGATE_PLUGIN
+ int roadmap_point_count(void);
+ #endif
+ 
  #endif // _ROADMAP_POINT__H_

Index: roadmap_trip.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_trip.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** roadmap_trip.c	19 Feb 2009 18:47:42 -0000	1.107
--- roadmap_trip.c	30 Mar 2009 14:00:45 -0000	1.108
***************
*** 223,228 ****
  	*RoadMapTripAddress = &RoadMapTripFocalPoints[4],
  	*RoadMapTripSelection = &RoadMapTripFocalPoints[5],
! 	*RoadMapTripDeparture = &RoadMapTripFocalPoints[6],
! 	*RoadMapTripHold = &RoadMapTripFocalPoints[7];
  
  /* These will point at one of the above. */
--- 223,229 ----
  	*RoadMapTripAddress = &RoadMapTripFocalPoints[4],
  	*RoadMapTripSelection = &RoadMapTripFocalPoints[5],
! 	*RoadMapTripDeparture = &RoadMapTripFocalPoints[6];
! 
! // 	*RoadMapTripHold = &RoadMapTripFocalPoints[7];
  
  /* These will point at one of the above. */

Index: roadmap_layer.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_layer.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** roadmap_layer.c	23 Mar 2009 20:41:28 -0000	1.22
--- roadmap_layer.c	30 Mar 2009 14:00:44 -0000	1.23
***************
*** 80,84 ****
                          ROADMAP_CONFIG_ITEM("Display", "Skin");
  
! static const char   *RoadMapNavigationMode[ROADMAP_MAX_NAVIGATION_MODES];
  static unsigned int  RoadMapNavigationModeCount = 0;
  
--- 80,84 ----
                          ROADMAP_CONFIG_ITEM("Display", "Skin");
  
! static char   *RoadMapNavigationMode[ROADMAP_MAX_NAVIGATION_MODES];
  static unsigned int  RoadMapNavigationModeCount = 0;
  
***************
*** 919,923 ****
  
      /* Retrieve the navigation modes associated with each layer. */
!     RoadMapNavigationModeCount = roadmap_layer_decode (class_config, "Class", "NavigationModes",
  		    RoadMapNavigationMode, ROADMAP_MAX_NAVIGATION_MODES);
      if (RoadMapNavigationModeCount <= 0) return;
--- 919,924 ----
  
      /* Retrieve the navigation modes associated with each layer. */
!     RoadMapNavigationModeCount = roadmap_layer_decode ( class_config,
! 		    "Class", "NavigationModes",
  		    RoadMapNavigationMode, ROADMAP_MAX_NAVIGATION_MODES);
      if (RoadMapNavigationModeCount <= 0) return;
***************
*** 1114,1118 ****
  {
  	RoadMapLayer		*TheLayer;
- 	RoadMapConfigItem	*r;
  
  	if (RoadMapLayerCurrentClass == NULL) {
--- 1115,1118 ----

Index: roadmap_res.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_res.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_res.c	15 Feb 2009 16:47:49 -0000	1.1
--- roadmap_res.c	30 Mar 2009 14:00:45 -0000	1.2
***************
*** 40,44 ****
  #define BLOCK_SIZE 100
  
! const char *ResourceName[] = {
     "bitmap_res",
     "sound_res"
--- 40,44 ----
  #define BLOCK_SIZE 100
  
! char *ResourceName[] = {
     "bitmap_res",
     "sound_res"

[Roadmap-commit] roadmap/src/gtk roadmap_dialog.c, 1.15, 1.16 roadmap_messagebox.c, 1.8, 1.9

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src/gtk
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20957/gtk

Modified Files:
	roadmap_dialog.c roadmap_messagebox.c 
Log Message:
compiler warning cleanup


Index: roadmap_dialog.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_dialog.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** roadmap_dialog.c	2 Apr 2008 17:28:07 -0000	1.15
--- roadmap_dialog.c	30 Mar 2009 14:00:46 -0000	1.16
***************
*** 667,672 ****
        break;
     }
- 
     this_item->value = (char *)data;
  }
  
--- 667,680 ----
        break;
     }
     this_item->value = (char *)data;
  }
  
+ void roadmap_dialog_new_progress (const char *frame, const char *name)
+ {
+ #warning implement GTK version of roadmap_dialog_new_progress
+ }
+ 
+ void  roadmap_dialog_set_progress (const char *frame, const char *name, int progress)
+ {
+ #warning implement GTK version of roadmap_dialog_set_progress
+ }

Index: roadmap_messagebox.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk/roadmap_messagebox.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** roadmap_messagebox.c	19 Sep 2008 16:21:41 -0000	1.8
--- roadmap_messagebox.c	30 Mar 2009 14:00:47 -0000	1.9
***************
*** 85,91 ****
        (GTK_CONTAINER(GTK_BOX(GTK_DIALOG(dialog)->vbox)), 4);
  
!    gtk_signal_connect (GTK_OBJECT(ok),
                         "clicked",
!                        GTK_SIGNAL_FUNC(die ? roadmap_messagebox_exit : roadmap_messagebox_ok),
                         dialog);
  
--- 85,97 ----
        (GTK_CONTAINER(GTK_BOX(GTK_DIALOG(dialog)->vbox)), 4);
  
!    if (die)
!       gtk_signal_connect (GTK_OBJECT(ok),
                         "clicked",
!                        GTK_SIGNAL_FUNC(roadmap_messagebox_exit),
!                        dialog);
!    else
!       gtk_signal_connect (GTK_OBJECT(ok),
!                        "clicked",
!                        GTK_SIGNAL_FUNC(roadmap_messagebox_ok),
                         dialog);
  

[Roadmap-commit] roadmap/src/unix roadmap_path.c, 1.29, 1.30 roadmap_sound.c, 1.1, 1.2

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src/unix
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20957/unix

Modified Files:
	roadmap_path.c roadmap_sound.c 
Log Message:
compiler warning cleanup


Index: roadmap_sound.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/unix/roadmap_sound.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_sound.c	15 Feb 2009 15:20:24 -0000	1.1
--- roadmap_sound.c	30 Mar 2009 14:00:47 -0000	1.2
***************
*** 34,41 ****
--- 34,45 ----
  #define MAX_LISTS 2
  
+ #ifdef NEEDED_LATER
+ 
  static RoadMapSoundList sound_lists[MAX_LISTS];
  
  static int save_wav_file (void *data, unsigned int size);
  
+ #endif
+ 
  int roadmap_sound_play (RoadMapSound sound)
  {
***************
*** 101,104 ****
--- 105,109 ----
  }
  
+ #ifdef NEEDED_LATER
  /* Recording */
  static int allocate_rec_buffer(int seconds)
***************
*** 111,114 ****
--- 116,120 ----
     return 0;
  }
+ #endif
  
  int roadmap_sound_record (const char *file_name, int seconds)

Index: roadmap_path.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/unix/roadmap_path.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** roadmap_path.c	15 Feb 2009 16:47:49 -0000	1.29
--- roadmap_path.c	30 Mar 2009 14:00:47 -0000	1.30
***************
*** 160,164 ****
  
  /* The default path for the skin files (the "skin" path): */
! static char *RoadMapPathSkin[] =  {
  	"&\\skins\\default\\day",
  	"&\\skins\\default",
--- 160,164 ----
  
  /* The default path for the skin files (the "skin" path): */
! static const char *RoadMapPathSkin[] =  {
  	"&\\skins\\default\\day",
  	"&\\skins\\default",

[Roadmap-commit] roadmap/src roadmap_factory.c,1.35,1.36

[Paul F. <pg...@us...>]

Update of /cvsroot/roadmap/roadmap/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20722

Modified Files:
	roadmap_factory.c 
Log Message:
wrap lines 


Index: roadmap_factory.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_factory.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** roadmap_factory.c	10 Feb 2009 11:41:01 -0000	1.35
--- roadmap_factory.c	30 Mar 2009 13:59:43 -0000	1.36
***************
*** 313,317 ****
        if (strncmp (p, ROADMAP_MENU, sizeof(ROADMAP_MENU)-1) == 0 ||
            strncmp (p, ROADMAP_SUBMENU, sizeof(ROADMAP_SUBMENU)-1) == 0 ||
!           strncmp (p, ROADMAP_INVOKE_SUBMENU, sizeof(ROADMAP_INVOKE_SUBMENU)-1) == 0) {
  
           p = strdup(p);
--- 313,318 ----
        if (strncmp (p, ROADMAP_MENU, sizeof(ROADMAP_MENU)-1) == 0 ||
            strncmp (p, ROADMAP_SUBMENU, sizeof(ROADMAP_SUBMENU)-1) == 0 ||
!           strncmp (p, ROADMAP_INVOKE_SUBMENU,
! 		    sizeof(ROADMAP_INVOKE_SUBMENU)-1) == 0) {
  
           p = strdup(p);
***************
*** 755,772 ****
  /**
   * @brief handler for plugin actions/menu
!  * Drawback of this simplistic implementation : plugin menus can only use their own actions.
   *
!  * To fix this, the actions from the plugin should somehow be concatenated with the ones
!  * RoadMap grabbed initially.
!  * I am not convinced that this is an absolute necessity so I've left that out now.
   *
   * @param actions the list of actions for this plugin
   * @param menu the menu configuration for this plugin
   */
! static void roadmap_factory_handle_plugin_actions_menu(RoadMapAction *actions, const char **menu)
  {
  	int use_tips;
  
! 	roadmap_log(ROADMAP_DEBUG, "roadmap_factory_handle_plugin_actions_menu");
  	use_tips = roadmap_config_match (&RoadMapConfigGeneralTooltips, "yes");
  	roadmap_factory_config_menu(menu, actions, 1, use_tips);
--- 756,777 ----
  /**
   * @brief handler for plugin actions/menu
!  * Drawback of this simplistic implementation :  plugin menus can
!  * only use their own actions.
   *
!  * To fix this, the actions from the plugin should somehow be
!  * concatenated with the ones RoadMap grabbed initially.  I am
!  * not convinced that this is an absolute necessity so I've left
!  * that out now.
   *
   * @param actions the list of actions for this plugin
   * @param menu the menu configuration for this plugin
   */
! static void roadmap_factory_handle_plugin_actions_menu
! 	    (RoadMapAction *actions, const char **menu)
  {
  	int use_tips;
  
! 	roadmap_log(ROADMAP_DEBUG, 
! 	    "roadmap_factory_handle_plugin_actions_menu");
  	use_tips = roadmap_config_match (&RoadMapConfigGeneralTooltips, "yes");
  	roadmap_factory_config_menu(menu, actions, 1, use_tips);
***************
*** 982,986 ****
        }
     }
!    roadmap_log (ROADMAP_ERROR, "Couldn't find configured popup menu '%s'", title);
  }
  
--- 987,992 ----
        }
     }
!    roadmap_log (ROADMAP_ERROR,
! 	"Couldn't find configured popup menu '%s'", title);
  }