roadmap-commit — track CVS commits

[Roadmap-commit] SF.net SVN: roadmap:[2658] trunk/roadmap/src/android/roadmap_dialog.c

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

Revision: 2658
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2658&view=rev
Author:   dannybackx
Date:     2011-02-13 09:54:34 +0000 (Sun, 13 Feb 2011)

Log Message:
-----------
Fix typo in comment

Modified Paths:
--------------
    trunk/roadmap/src/android/roadmap_dialog.c

Modified: trunk/roadmap/src/android/roadmap_dialog.c
===================================================================
--- trunk/roadmap/src/android/roadmap_dialog.c	2011-02-13 09:53:05 UTC (rev 2657)
+++ trunk/roadmap/src/android/roadmap_dialog.c	2011-02-13 09:54:34 UTC (rev 2658)
@@ -715,7 +715,7 @@
  * @brief Store some data. See notes below.
  * @param frame used to determine the dialog
  * @param name used to determine the dialog
- * @return pointer to the data passed back
+ * @param pointer to the data passed back
  *
  * Note the data is sent to the user interface only if the widget is ROADMAP_WIDGET_ENTRY or
  * ROADMAP_WIDGET_LABEL. In those cases we know it's string data.
@@ -723,7 +723,7 @@
  * In other cases, we just pass pointers along from memory, and we're not sure about the data
  * type (they're sometimes pointers to structures).
  */
-void  roadmap_dialog_set_data (const char *frame, const char *name,
+void roadmap_dialog_set_data (const char *frame, const char *name,
                                const void *data) {
    RoadMapDialogItem this_frame, this_item;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2657] trunk/roadmap/src/roadmap_hash.c

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

Revision: 2657
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2657&view=rev
Author:   dannybackx
Date:     2011-02-13 09:53:05 +0000 (Sun, 13 Feb 2011)

Log Message:
-----------
Fix typo in comment

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_hash.c

Modified: trunk/roadmap/src/roadmap_hash.c
===================================================================
--- trunk/roadmap/src/roadmap_hash.c	2011-02-12 13:41:34 UTC (rev 2656)
+++ trunk/roadmap/src/roadmap_hash.c	2011-02-13 09:53:05 UTC (rev 2657)
@@ -51,7 +51,7 @@
 
 /**
  * @brief
- * @parma name
+ * @param name
  * @param size
  * @return
  */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2656] trunk/roadmap/src

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

Revision: 2656
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2656&view=rev
Author:   dannybackx
Date:     2011-02-12 13:41:34 +0000 (Sat, 12 Feb 2011)

Log Message:
-----------
Remove $Header (a CVS thing) from WinCE sources.
Tweak my latest roadmap_trip.c change so it only includes tripdb if
that is compiled (i.e. when using the navigate plugin).

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_trip.c
    trunk/roadmap/src/win32/CEDevice.c
    trunk/roadmap/src/win32/CEDevice.h
    trunk/roadmap/src/win32/CEException.c
    trunk/roadmap/src/win32/CEException.h
    trunk/roadmap/src/win32/Makefile
    trunk/roadmap/src/win32/roadmap_dialog.c
    trunk/roadmap/src/win32/roadmap_main.c

Modified: trunk/roadmap/src/roadmap_trip.c
===================================================================
--- trunk/roadmap/src/roadmap_trip.c	2011-02-12 08:04:21 UTC (rev 2655)
+++ trunk/roadmap/src/roadmap_trip.c	2011-02-12 13:41:34 UTC (rev 2656)
@@ -3816,7 +3816,7 @@
  */
 void roadmap_trip_departure_waypoint (void)
 {
-	roadmap_trip_waypoint_select_navigation_waypoint(PERSONAL_WAYPOINTS, 0);
+   roadmap_trip_waypoint_select_navigation_waypoint(PERSONAL_WAYPOINTS, 0);
 }
 
 /**
@@ -3826,7 +3826,7 @@
  */
 void roadmap_trip_destination_waypoint (void)
 {
-	roadmap_trip_waypoint_select_navigation_waypoint(PERSONAL_WAYPOINTS, 1);
+   roadmap_trip_waypoint_select_navigation_waypoint(PERSONAL_WAYPOINTS, 1);
 }
 #endif
 
@@ -3835,6 +3835,8 @@
  */
 void roadmap_trip_complete (void)
 {
-	roadmap_tripdb_complete ();
-	RoadMapCurrentRoute = (route_head *)ROADMAP_LIST_FIRST(&RoadMapTripRouteHead);
+#ifdef HAVE_NAVIGATE_PLUGIN
+   roadmap_tripdb_complete ();
+#endif
+   RoadMapCurrentRoute = (route_head *)ROADMAP_LIST_FIRST(&RoadMapTripRouteHead);
 }

Modified: trunk/roadmap/src/win32/CEDevice.c
===================================================================
--- trunk/roadmap/src/win32/CEDevice.c	2011-02-12 08:04:21 UTC (rev 2655)
+++ trunk/roadmap/src/win32/CEDevice.c	2011-02-12 13:41:34 UTC (rev 2656)
@@ -15,8 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header: /home/danny/src/roadmap/backup/work/roadmap/src/win32/CEDevice.c,v 1.1 2009-02-09 19:39:17 dannybackx Exp $
- *
  */
 
 #include "windows.h"

Modified: trunk/roadmap/src/win32/CEDevice.h
===================================================================
--- trunk/roadmap/src/win32/CEDevice.h	2011-02-12 08:04:21 UTC (rev 2655)
+++ trunk/roadmap/src/win32/CEDevice.h	2011-02-12 13:41:34 UTC (rev 2656)
@@ -15,8 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header: /home/danny/src/roadmap/backup/work/roadmap/src/win32/CEDevice.h,v 1.2 2009-02-09 19:39:17 dannybackx Exp $
- *
  */
 
 #ifndef CEDEVICE

Modified: trunk/roadmap/src/win32/CEException.c
===================================================================
--- trunk/roadmap/src/win32/CEException.c	2011-02-12 08:04:21 UTC (rev 2655)
+++ trunk/roadmap/src/win32/CEException.c	2011-02-12 13:41:34 UTC (rev 2656)
@@ -15,8 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header: /home/danny/src/roadmap/backup/work/roadmap/src/win32/CEException.c,v 1.1 2009-02-09 19:39:17 dannybackx Exp $
- *
  */
 
 #include "CEException.h"

Modified: trunk/roadmap/src/win32/CEException.h
===================================================================
--- trunk/roadmap/src/win32/CEException.h	2011-02-12 08:04:21 UTC (rev 2655)
+++ trunk/roadmap/src/win32/CEException.h	2011-02-12 13:41:34 UTC (rev 2656)
@@ -15,8 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Header: /home/danny/src/roadmap/backup/work/roadmap/src/win32/CEException.h,v 1.2 2009-02-09 19:39:17 dannybackx Exp $
- *
  */
 
 #include <windows.h>

Modified: trunk/roadmap/src/win32/Makefile
===================================================================
--- trunk/roadmap/src/win32/Makefile	2011-02-12 08:04:21 UTC (rev 2655)
+++ trunk/roadmap/src/win32/Makefile	2011-02-12 13:41:34 UTC (rev 2656)
@@ -119,7 +119,7 @@
 -include .depends.mk
 
 CABFILES=	wroadmap.exe \
-		distribution/libexpat-1.dll \
+		distribution/libexpat.dll \
 		distribution/font.ttf \
 		distribution/roadmap.screenobjects \
 		distribution/roadmap.toolbar \

Modified: trunk/roadmap/src/win32/roadmap_dialog.c
===================================================================
--- trunk/roadmap/src/win32/roadmap_dialog.c	2011-02-12 08:04:21 UTC (rev 2655)
+++ trunk/roadmap/src/win32/roadmap_dialog.c	2011-02-12 13:41:34 UTC (rev 2656)
@@ -1242,3 +1242,7 @@
 
 	MAX_ROW_HEIGHT = (height > 320) ? 40 : 20;
 }
+
+void roadmap_dialog_shutdown (void)
+{
+}

Modified: trunk/roadmap/src/win32/roadmap_main.c
===================================================================
--- trunk/roadmap/src/win32/roadmap_main.c	2011-02-12 08:04:21 UTC (rev 2655)
+++ trunk/roadmap/src/win32/roadmap_main.c	2011-02-12 13:41:34 UTC (rev 2656)
@@ -232,7 +232,7 @@
 	
 	g_hInst = hInstance; // Store instance handle in our global variable
 	
-#ifdef UNDER_CE
+#if defined(UNDER_CE) && defined(HAVE_AYGSHELL)
 	SHInitExtraControls();
 #endif
 	
@@ -381,7 +381,7 @@
 	HDC hdc;
 	BOOL create_menu;
 
-#ifdef UNDER_CE
+#if defined(UNDER_CE) && defined(HAVE_AYGSHELL)
 	static SHACTIVATEINFO s_sai;
 #endif
 	
@@ -427,7 +427,7 @@
 #endif
       create_menu = TRUE;
 
-#ifdef UNDER_CE
+#if defined(UNDER_CE) && defined(HAVE_AYGSHELL)
 		SHMENUBARINFO mbi;
 		
 		memset(&mbi, 0, sizeof(SHMENUBARINFO));
@@ -454,6 +454,7 @@
 				SendMessage(RoadMapMainMenuBar, (UINT) TB_DELETEBUTTON, 0, 0);
 			}
 		}
+#elif defined(UNDER_CE)
 #else
 		if (create_menu) {
 		      RoadMapMainMenuBar = CreateMenu ();
@@ -461,7 +462,7 @@
 		}
 #endif
 		
-#ifdef UNDER_CE                
+#if defined(UNDER_CE) && defined(HAVE_AYGSHELL)
 		// Initialize the shell activate info structure
 		memset(&s_sai, 0, sizeof (s_sai));
 		s_sai.cbSize = sizeof (s_sai);
@@ -611,7 +612,7 @@
 		else return DefWindowProc(hWnd, message, wParam, lParam);
 		break;
 		
-#ifdef UNDER_CE
+#if defined(UNDER_CE) && defined(HAVE_AYGSHELL)
 	case WM_ACTIVATE:
       		if ((LOWORD(wParam)!=WA_INACTIVE) && RoadMapMainFullScreen) {
         		SHFullScreen (RoadMapMainWindow,
@@ -710,7 +711,7 @@
 	// TODO: implement
 	return;
 #else
-#ifdef UNDER_CE
+#if defined(UNDER_CE) && defined(HAVE_AYGSHELL)
       RECT rc;
       int menu_height = 0;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2655] trunk/roadmap/src

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

Revision: 2655
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2655&view=rev
Author:   dannybackx
Date:     2011-02-12 08:04:21 +0000 (Sat, 12 Feb 2011)

Log Message:
-----------
This is a fix for my November 2010 commit : in each _save() function,
not all return statements were given a value to return yet.

Modified Paths:
--------------
    trunk/roadmap/src/buildmap_point.c
    trunk/roadmap/src/buildmap_range.c
    trunk/roadmap/src/buildmap_shape.c
    trunk/roadmap/src/buildmap_street.c

Modified: trunk/roadmap/src/buildmap_point.c
===================================================================
--- trunk/roadmap/src/buildmap_point.c	2011-02-12 08:01:45 UTC (rev 2654)
+++ trunk/roadmap/src/buildmap_point.c	2011-02-12 08:04:21 UTC (rev 2655)
@@ -2,7 +2,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
- *   Copyright (c) 2009, 2011, Danny Backx.
+ *   Copyright (c) 2008, 2009, 2010, 2011, Danny Backx.
  *
  *   This file is part of RoadMap.
  *
@@ -374,7 +374,7 @@
    buildmap_db *table_data;
    buildmap_db *table_bysquare;
 
-   if (!PointCount) return;
+   if (!PointCount) return 0;
 
    buildmap_info ("saving %d points...", PointCount);
 

Modified: trunk/roadmap/src/buildmap_range.c
===================================================================
--- trunk/roadmap/src/buildmap_range.c	2011-02-12 08:01:45 UTC (rev 2654)
+++ trunk/roadmap/src/buildmap_range.c	2011-02-12 08:04:21 UTC (rev 2655)
@@ -2,6 +2,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
+ *   Copyright (c) 2008, 2010, 2011 Danny Backx
  *
  *   This file is part of RoadMap.
  *
@@ -606,10 +607,10 @@
 
    buildmap_info ("building the street search accelerator...");
 
-   if (!RangeCount && !RangeNoAddressCount) return;
+   if (!RangeCount && !RangeNoAddressCount) return 0;
 
    square_count = buildmap_square_get_count();
-   if (!square_count) return;
+   if (!square_count) return 0;
 
 
    square_info = calloc (square_count, sizeof(*square_info));

Modified: trunk/roadmap/src/buildmap_shape.c
===================================================================
--- trunk/roadmap/src/buildmap_shape.c	2011-02-12 08:01:45 UTC (rev 2654)
+++ trunk/roadmap/src/buildmap_shape.c	2011-02-12 08:04:21 UTC (rev 2655)
@@ -2,7 +2,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
- *   Copyright (c) 2009 Danny Backx.
+ *   Copyright (c) 2008, 2009, 2010, 2011 Danny Backx.
  *
  *   This file is part of RoadMap.
  *
@@ -281,7 +281,7 @@
    buildmap_db *table_data;
 
 
-   if (!ShapeCount) return;
+   if (!ShapeCount) return 0;
 
    buildmap_info ("saving %d shapes...", ShapeCount);
 

Modified: trunk/roadmap/src/buildmap_street.c
===================================================================
--- trunk/roadmap/src/buildmap_street.c	2011-02-12 08:01:45 UTC (rev 2654)
+++ trunk/roadmap/src/buildmap_street.c	2011-02-12 08:04:21 UTC (rev 2655)
@@ -2,7 +2,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
- *   Copyright (c) 2009 Danny Backx.
+ *   Copyright (c) 2008, 2009, 2010, 2011 Danny Backx.
  *
  *   This file is part of RoadMap.
  *
@@ -332,7 +332,7 @@
    buildmap_db *table_cfcc;
 
 
-   if (!StreetCount) return;
+   if (!StreetCount) return 0;
 
    buildmap_info ("saving %d streets...", StreetCount);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2654] trunk/roadmap/src/roadmap_history.h

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

Revision: 2654
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2654&view=rev
Author:   dannybackx
Date:     2011-02-12 08:01:45 +0000 (Sat, 12 Feb 2011)

Log Message:
-----------
Add shutdown function declaration

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_history.h

Modified: trunk/roadmap/src/roadmap_history.h
===================================================================
--- trunk/roadmap/src/roadmap_history.h	2011-02-11 20:46:14 UTC (rev 2653)
+++ trunk/roadmap/src/roadmap_history.h	2011-02-12 08:01:45 UTC (rev 2654)
@@ -3,6 +3,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
+ *   Copyright (c) 2011, Danny Backx
  *
  *   This file is part of RoadMap.
  *
@@ -39,5 +40,6 @@
 
 void roadmap_history_purge (int count);
 void roadmap_history_save  (void);
+void roadmap_history_shutdown (void);
 
 #endif // INCLUDE__ROADMAP_HISTORY__H


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2653] trunk/roadmap/src/buildmap_dbwrite.c

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

Revision: 2653
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2653&view=rev
Author:   dannybackx
Date:     2011-02-11 20:46:14 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Remove unused variable

Modified Paths:
--------------
    trunk/roadmap/src/buildmap_dbwrite.c

Modified: trunk/roadmap/src/buildmap_dbwrite.c
===================================================================
--- trunk/roadmap/src/buildmap_dbwrite.c	2011-02-11 20:44:56 UTC (rev 2652)
+++ trunk/roadmap/src/buildmap_dbwrite.c	2011-02-11 20:46:14 UTC (rev 2653)
@@ -206,7 +206,6 @@
  * @param name
  */
 int buildmap_db_remove (const char *path, const char *name) {
-   struct roadmap_db_section *root;
 
    if (path == NULL) {
       path = ".";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2652] trunk/roadmap/src/buildmap_dbwrite.c

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

Revision: 2652
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2652&view=rev
Author:   dannybackx
Date:     2011-02-11 20:44:56 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Add an #include to remove a compiler warning.

Modified Paths:
--------------
    trunk/roadmap/src/buildmap_dbwrite.c

Modified: trunk/roadmap/src/buildmap_dbwrite.c
===================================================================
--- trunk/roadmap/src/buildmap_dbwrite.c	2011-02-11 20:22:03 UTC (rev 2651)
+++ trunk/roadmap/src/buildmap_dbwrite.c	2011-02-11 20:44:56 UTC (rev 2652)
@@ -2,7 +2,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
- *   Copyright (c) 2009 Danny Backx.
+ *   Copyright (c) 2009, 2010, 2011 Danny Backx.
  *
  *   This file is part of RoadMap.
  *
@@ -29,6 +29,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "roadmap_types.h"
 #include "roadmap_path.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2651] trunk/roadmap/src/roadmap_dbread.h

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

Revision: 2651
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2651&view=rev
Author:   dannybackx
Date:     2011-02-11 20:22:03 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Comment change

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_dbread.h

Modified: trunk/roadmap/src/roadmap_dbread.h
===================================================================
--- trunk/roadmap/src/roadmap_dbread.h	2011-02-11 20:21:15 UTC (rev 2650)
+++ trunk/roadmap/src/roadmap_dbread.h	2011-02-11 20:22:03 UTC (rev 2651)
@@ -1,5 +1,4 @@
-/* roadmap_dbread.h - General API for accessing a RoadMap map file.
- *
+/*
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
@@ -21,16 +20,24 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+/**
+ * @file
+ * @brief General API for accessing a RoadMap map file.
+ */
+
 #ifndef INCLUDED__ROADMAP_DBREAD__H
 #define INCLUDED__ROADMAP_DBREAD__H
 
 #include "roadmap_db.h"
 
+/**
+ * @brief
+ */
 struct roadmap_db_tree {
-   struct roadmap_db_tree    *parent;
-   struct roadmap_db_tree    *first;   /* .. child. */
-   struct roadmap_db_tree    *last;    /* .. child. */
-   struct roadmap_db_tree    *next;    /* .. sibling. */
+   struct roadmap_db_tree    *parent;  /**< parent */
+   struct roadmap_db_tree    *first;   /**< .. child. */
+   struct roadmap_db_tree    *last;    /**< .. child. */
+   struct roadmap_db_tree    *next;    /**< .. sibling. */
    struct roadmap_db_section *head;
    int level;
 
@@ -88,4 +95,3 @@
 void roadmap_db_end   (void);
 
 #endif // INCLUDED__ROADMAP_DBREAD__H
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2650] trunk/roadmap/src

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

Revision: 2650
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2650&view=rev
Author:   dannybackx
Date:     2011-02-11 20:21:15 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Add comments

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_address.c
    trunk/roadmap/src/roadmap_county.c

Modified: trunk/roadmap/src/roadmap_address.c
===================================================================
--- trunk/roadmap/src/roadmap_address.c	2011-02-11 20:19:28 UTC (rev 2649)
+++ trunk/roadmap/src/roadmap_address.c	2011-02-11 20:21:15 UTC (rev 2650)
@@ -87,7 +87,11 @@
    roadmap_screen_refresh ();
 }
 
-
+/**
+ * @brief called when the user has selected an address
+ * @param name string with the street name (not used)
+ * @param data pointer passed from calling environment (not used)
+ */
 static void roadmap_address_selected (const char *name, void *data) {
 
    RoadMapGeocode *selected;

Modified: trunk/roadmap/src/roadmap_county.c
===================================================================
--- trunk/roadmap/src/roadmap_county.c	2011-02-11 20:19:28 UTC (rev 2649)
+++ trunk/roadmap/src/roadmap_county.c	2011-02-11 20:21:15 UTC (rev 2650)
@@ -199,11 +199,11 @@
 }
 
 /**
- * @brief
- * @param position
- * @param fips
- * @param count
- * @return
+ * @brief produce a list of FIPS codes that the given position is in
+ * @param position this is the position
+ * @param fips points to a list which we need to fill up
+ * @param count size of the list (cannot exceed this)
+ * @return the number of FIPS codes found
  */
 int roadmap_county_by_position
        (const RoadMapPosition *position, int *fips, int count) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2649] trunk/roadmap/src/buildmap_point.c

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

Revision: 2649
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2649&view=rev
Author:   dannybackx
Date:     2011-02-11 20:19:28 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
More distinctive error messages.

Modified Paths:
--------------
    trunk/roadmap/src/buildmap_point.c

Modified: trunk/roadmap/src/buildmap_point.c
===================================================================
--- trunk/roadmap/src/buildmap_point.c	2011-02-11 20:17:12 UTC (rev 2648)
+++ trunk/roadmap/src/buildmap_point.c	2011-02-11 20:19:28 UTC (rev 2649)
@@ -2,7 +2,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
- *   Copyright (c) 2009 Danny Backx.
+ *   Copyright (c) 2009, 2011, Danny Backx.
  *
  *   This file is part of RoadMap.
  *
@@ -162,7 +162,7 @@
    BuildMapPoint *this_point;
 
    if ((pointid < 0) || (pointid > PointCount)) {
-      buildmap_fatal (0, "invalid point index %d", pointid);
+      buildmap_fatal (0, "buildmap_point_get : invalid point index %d", pointid);
    }
 
    this_point = Point[pointid/BUILDMAP_BLOCK] + (pointid % BUILDMAP_BLOCK);
@@ -225,7 +225,7 @@
       buildmap_fatal (0, "points have not been sorted yet");
    }
    if ((point < 0) || (point > PointCount)) {
-      buildmap_fatal (0, "invalid point index %d", point);
+      buildmap_fatal (0, "buildmap_point_get_square_sorted : invalid point index %d", point);
    }
 
    return buildmap_point_get(SortedPoint[point])->square;
@@ -242,7 +242,7 @@
       buildmap_fatal (0, "points have not been sorted yet");
    }
    if ((point < 0) || (point > PointCount)) {
-      buildmap_fatal (0, "invalid point index %d", point);
+      buildmap_fatal (0, "buildmap_point_get_longitude_sorted : invalid point index %d", point);
    }
 
    return buildmap_point_get(SortedPoint[point])->longitude;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2648] trunk/roadmap/src/roadmap_iso.h

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

Revision: 2648
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2648&view=rev
Author:   dannybackx
Date:     2011-02-11 20:17:12 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Add declaration

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_iso.h

Modified: trunk/roadmap/src/roadmap_iso.h
===================================================================
--- trunk/roadmap/src/roadmap_iso.h	2011-02-11 20:16:36 UTC (rev 2647)
+++ trunk/roadmap/src/roadmap_iso.h	2011-02-11 20:17:12 UTC (rev 2648)
@@ -1,7 +1,7 @@
 /*
  * LICENSE:
  *
- *   Copyright (c) 2008, Danny Backx
+ *   Copyright (c) 2008, 2009, Danny Backx.
  *
  *   This file is part of RoadMap.
  *
@@ -28,6 +28,7 @@
 int roadmap_iso_alpha_to_num(char *alpha);
 void roadmap_iso_create_all_countries(void);
 void roadmap_iso_mapfile_from_fips(char *buf, int fips);
+int roadmap_iso_mapfile_list_from_fips(int fips, char ***mfl);
 int buildmap_osm_filename_iso(char *fn, char *country, char *division, char *suffix);
 int roadmap_iso_division_to_num(char *country, char *division);
 int buildmap_osm_filename_usc(char *fn, int *fips);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2647] trunk/roadmap/src/roadmap_factory.h

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

Revision: 2647
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2647&view=rev
Author:   dannybackx
Date:     2011-02-11 20:16:36 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Add declaration

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_factory.h

Modified: trunk/roadmap/src/roadmap_factory.h
===================================================================
--- trunk/roadmap/src/roadmap_factory.h	2011-02-11 20:16:00 UTC (rev 2646)
+++ trunk/roadmap/src/roadmap_factory.h	2011-02-11 20:16:36 UTC (rev 2647)
@@ -2,7 +2,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
- *   Copyright (c) 2008, 2010, Danny Backx.
+ *   Copyright (c) 2008, 2010, 2011, Danny Backx.
  *
  *   This file is part of RoadMap.
  *
@@ -73,6 +73,7 @@
                             const RoadMapGuiPoint *position);
 
 void roadmap_factory_usage (const char *section, const RoadMapAction *action);
+void roadmap_factory_initialize (void);
 void roadmap_factory_shutdown (void);
 
 #endif /* INCLUDE__ROADMAP_FACTORY__H */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2646] trunk/roadmap/src/roadmap_factory.c

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

Revision: 2646
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2646&view=rev
Author:   dannybackx
Date:     2011-02-11 20:16:00 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Formatting and comments.

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_factory.c

Modified: trunk/roadmap/src/roadmap_factory.c
===================================================================
--- trunk/roadmap/src/roadmap_factory.c	2011-02-11 20:09:49 UTC (rev 2645)
+++ trunk/roadmap/src/roadmap_factory.c	2011-02-11 20:16:00 UTC (rev 2646)
@@ -526,7 +526,7 @@
 }
 
 /**
- * @brief
+ * @brief Define popup menus, only for use by user supplied menu config
  * @param menu
  * @param title
  */
@@ -638,7 +638,7 @@
  * @brief
  * @param item
  * @param actions
- * @param doing_menus
+ * @param doing_menus is 1 if we actually define menus, 0 if only supplying popups for use in user supplied menu file
  * @param use_tips
  */
 void roadmap_factory_config_menu
@@ -770,12 +770,11 @@
 static void roadmap_factory_handle_plugin_actions_menu
 	    (RoadMapAction *actions, const char **menu)
 {
-	int use_tips;
+   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);
+   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);
 }
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2645] trunk/roadmap/src

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

Revision: 2645
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2645&view=rev
Author:   dannybackx
Date:     2011-02-11 20:09:49 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Just changes in comments and copyrights.

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_db.h
    trunk/roadmap/src/roadmap_message.c

Modified: trunk/roadmap/src/roadmap_db.h
===================================================================
--- trunk/roadmap/src/roadmap_db.h	2011-02-11 20:06:56 UTC (rev 2644)
+++ trunk/roadmap/src/roadmap_db.h	2011-02-11 20:09:49 UTC (rev 2645)
@@ -1,5 +1,4 @@
-/* roadmap_db.h - general format of tables in the RoadMap map files.
- *
+/*
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
@@ -21,18 +20,26 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+/**
+ * @file
+ * @brief General format of tables in the RoadMap map files.
+ */
+
 #ifndef _ROADMAP_DB__H_
 #define _ROADMAP_DB__H_
 
 #define ROADMAP_DB_TYPE   ".rdm"
 
+/**
+ * @brief entry in a RoadMap map file
+ */
 struct roadmap_db_section {
 
-   char name[12];
-   int  first;
-   int  next;
-   int  size;
-   int  count;  /* .. of records, when applicable. */
+   char name[12];	/**< */
+   int  first;		/**< */
+   int  next;		/**< */
+   int  size;		/**< */
+   int  count;		/**< .. of records, when applicable. */
 };
 
 #endif // _ROADMAP_DB__H_

Modified: trunk/roadmap/src/roadmap_message.c
===================================================================
--- trunk/roadmap/src/roadmap_message.c	2011-02-11 20:06:56 UTC (rev 2644)
+++ trunk/roadmap/src/roadmap_message.c	2011-02-11 20:09:49 UTC (rev 2645)
@@ -2,6 +2,8 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
+ *   Copyright 2007 Paul G. Fox
+ *   Copyright 2008 Danny Backx
  *
  *   This file is part of RoadMap.
  *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2644] trunk/roadmap/src/roadmap_path.h

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

Revision: 2644
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2644&view=rev
Author:   dannybackx
Date:     2011-02-11 20:06:56 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Add declaration of roadmap_path_shutdown().

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_path.h

Modified: trunk/roadmap/src/roadmap_path.h
===================================================================
--- trunk/roadmap/src/roadmap_path.h	2011-02-11 20:04:55 UTC (rev 2643)
+++ trunk/roadmap/src/roadmap_path.h	2011-02-11 20:06:56 UTC (rev 2644)
@@ -3,6 +3,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
+ *   Copyright (c) 2011, Danny Backx
  *
  *   This file is part of RoadMap.
  *
@@ -146,6 +147,7 @@
 const char *roadmap_path_skip_separator (const char *name);
 
 const char *roadmap_path_temporary (void);
+void roadmap_path_shutdown (void);
 
 #endif // INCLUDE__ROADMAP_PATH__H
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2643] trunk/roadmap/src

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

Revision: 2643
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2643&view=rev
Author:   dannybackx
Date:     2011-02-11 20:04:55 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Some cleanup, add some simple functions for use in navigate/ .

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_dialog.h
    trunk/roadmap/src/roadmap_start.c
    trunk/roadmap/src/roadmap_trip.c
    trunk/roadmap/src/roadmap_trip.h
    trunk/roadmap/src/roadmap_tripdb.c
    trunk/roadmap/src/roadmap_tripdb.h

Modified: trunk/roadmap/src/roadmap_dialog.h
===================================================================
--- trunk/roadmap/src/roadmap_dialog.h	2011-02-11 19:39:29 UTC (rev 2642)
+++ trunk/roadmap/src/roadmap_dialog.h	2011-02-11 20:04:55 UTC (rev 2643)
@@ -2,7 +2,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
- *   Copyright (c) 2008, Danny Backx.
+ *   Copyright (c) 2008, 2011, Danny Backx.
  *
  *   This file is part of RoadMap.
  *
@@ -61,6 +61,7 @@
 
 
 int roadmap_dialog_activate (const char *name, void *context);
+void roadmap_dialog_shutdown (void);
 void roadmap_dialog_hide (const char *name);
 void roadmap_dialog_new_label (const char *frame, const char *name);
 void roadmap_dialog_new_entry (const char *frame, const char *name);
@@ -87,6 +88,7 @@
 void  roadmap_dialog_set_data (const char *frame, const char *name,
                                const void *data);
 void  roadmap_dialog_protect  (const char *frame, const char *name);
+void roadmap_dialog_shutdown (void);
 
 #ifdef LANG_SUPPORT
 #include "roadmap_lang.h"

Modified: trunk/roadmap/src/roadmap_start.c
===================================================================
--- trunk/roadmap/src/roadmap_start.c	2011-02-11 19:39:29 UTC (rev 2642)
+++ trunk/roadmap/src/roadmap_start.c	2011-02-11 20:04:55 UTC (rev 2643)
@@ -1,7 +1,7 @@
 /*
  * LICENSE:
  *
- *   (c) Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ *   (c) Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
  *	 Pascal F. Martin, Paul Fox, Ehud Shabtai, Danny Backx,
  *	 and others.
  *
@@ -87,6 +87,7 @@
 #include "roadmap_layer.h"
 #include "roadmap_sunrise.h"
 #include "roadmap_lang.h"
+#include "roadmap_dialog.h"
 
 #include "roadmap_start.h"
 
@@ -1757,6 +1758,7 @@
 #ifndef HAVE_TRIP_PLUGIN
     roadmap_trip_preserve_focus();
 #endif
+    roadmap_trip_shutdown ();
     roadmap_config_save (0);
     roadmap_screen_shutdown();
     roadmap_dialog_shutdown ();

Modified: trunk/roadmap/src/roadmap_trip.c
===================================================================
--- trunk/roadmap/src/roadmap_trip.c	2011-02-11 19:39:29 UTC (rev 2642)
+++ trunk/roadmap/src/roadmap_trip.c	2011-02-11 20:04:55 UTC (rev 2643)
@@ -2,7 +2,7 @@
  * LICENSE:
  *
  *   Copyright 2002,2005 Pascal F. Martin, Paul G. Fox
- *   Copyright (c) 2008, 2009 Danny Backx
+ *   Copyright (c) 2008, 2009, 2011 Danny Backx
  *
  *   This file is part of RoadMap.
  *
@@ -111,7 +111,7 @@
 extern route_head *RoadMapTrack;
 
 /* route following flags */
-route_head *RoadMapCurrentRoute = NULL;
+static route_head *RoadMapCurrentRoute = NULL;
 static int RoadMapRouteInProgress = 0;
 static int RoadMapRouteIsReversed = 0;
 
@@ -242,7 +242,7 @@
 static time_t RoadMapTripGPSTime = 0;
 
 RoadMapList RoadMapTripWaypointHead;
-RoadMapList RoadMapTripRouteHead;
+static RoadMapList RoadMapTripRouteHead;
 RoadMapList RoadMapTripTrackHead;
 
 static RoadMapList RoadMapTripLostRoutesHead;
@@ -1410,7 +1410,7 @@
 }
 
 static void roadmap_trip_clear (void) {
- 
+
 	waypt_flush_queue (&RoadMapTripWaypointHead);
 	route_flush_queue (&RoadMapTripRouteHead);
 	route_flush_queue (&RoadMapTripTrackHead);
@@ -2619,7 +2619,6 @@
 	roadmap_screen_refresh ();
 }
 
-
 const char *roadmap_trip_path_relative_to_trips(const char *filename) {
     const char *p;
     int pl;
@@ -2844,6 +2843,7 @@
  */
 int roadmap_trip_load (int silent, int merge)
 {
+    roadmap_log (ROADMAP_DEBUG, "roadmap_trip_load(%d,%d)", silent, merge);
 	const char *name = roadmap_trip_current();
 
 	if (!name || !name[0])
@@ -3662,6 +3662,35 @@
 
 }
 
+void roadmap_trip_shutdown (void)
+{
+	// route_del (RoadMapCurrentRoute);
+	RoadMapCurrentRoute = NULL;
+	RoadMapRouteInProgress = 0;
+	RoadMapRouteIsReversed = 0;
+
+	RoadMapTripRefresh = 1;
+	RoadMapTripFocusChanged = 1;
+	RoadMapTripFocusMoved = 1;
+
+	RoadMapTripUntitled = 1;
+	RoadMapTripModified = 0;
+	RoadMapTripRouteLinesPen = NULL;
+
+	RoadMapTripFocus = NULL;
+	RoadMapTripLastSetPoint = NULL;
+
+	RoadMapTripStart = NULL;
+	RoadMapTripNext = NULL;
+
+	RoadMapTripWaypointFocusName = NULL;
+
+	RoadMapTripGPSTime = 0;
+
+	RoadMapTripDefaultPosition.longitude = ROADMAP_INITIAL_LONGITUDE;
+	RoadMapTripDefaultPosition.latitude =  ROADMAP_INITIAL_LATITUDE;
+}
+
 #ifdef HAVE_NAVIGATE_PLUGIN
 /**
  * @brief Copy the position of the selection into the internal variable named in the parameter
@@ -3800,3 +3829,12 @@
 	roadmap_trip_waypoint_select_navigation_waypoint(PERSONAL_WAYPOINTS, 1);
 }
 #endif
+
+/**
+ * @brief call this after having added all waypoints and ways
+ */
+void roadmap_trip_complete (void)
+{
+	roadmap_tripdb_complete ();
+	RoadMapCurrentRoute = (route_head *)ROADMAP_LIST_FIRST(&RoadMapTripRouteHead);
+}

Modified: trunk/roadmap/src/roadmap_trip.h
===================================================================
--- trunk/roadmap/src/roadmap_trip.h	2011-02-11 19:39:29 UTC (rev 2642)
+++ trunk/roadmap/src/roadmap_trip.h	2011-02-11 20:04:55 UTC (rev 2643)
@@ -3,6 +3,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
+ *   Copyright 2011 Danny Backx
  *
  *   This file is part of RoadMap.
  *
@@ -81,6 +82,7 @@
 void  roadmap_trip_new (void);
 
 void  roadmap_trip_initialize (void);
+void  roadmap_trip_shutdown (void);
 
 /* In the two primitives that follow, the name is either NULL (i.e.
  * open a dialog to let the user enter one), or an explicit name.
@@ -147,4 +149,7 @@
 #define TRIP_NUM_PLACEMENTS           3
 #define TRIP_NUM_ROUTE_PLACEMENTS     6
 
+
+void roadmap_trip_departure_waypoint(void);
+void roadmap_trip_destination_waypoint(void);
 #endif // INCLUDE__ROADMAP_TRIP__H

Modified: trunk/roadmap/src/roadmap_tripdb.c
===================================================================
--- trunk/roadmap/src/roadmap_tripdb.c	2011-02-11 19:39:29 UTC (rev 2642)
+++ trunk/roadmap/src/roadmap_tripdb.c	2011-02-11 20:04:55 UTC (rev 2643)
@@ -97,14 +97,14 @@
 /**
  * @brief call this after having added all waypoints and ways
  */
-void roadmap_trip_complete (void)
+void roadmap_tripdb_complete (void)
 {
+	roadmap_log(ROADMAP_WARNING, "roadmap_tripdb_complete(), %d segments", RoadMapTripNumSegments);
 #if 0
         ROADMAP_LIST_MOVE(&TripWaypointHead, &tmp_waypoint_list);
         ROADMAP_LIST_MOVE(&TripRouteHead, &tmp_route_list);
         ROADMAP_LIST_MOVE(&TripTrackHead, &tmp_track_list);
 #endif
-	RoadMapCurrentRoute = (route_head *)ROADMAP_LIST_FIRST(&RoadMapTripRouteHead);
 }
 
 /**

Modified: trunk/roadmap/src/roadmap_tripdb.h
===================================================================
--- trunk/roadmap/src/roadmap_tripdb.h	2011-02-11 19:39:29 UTC (rev 2642)
+++ trunk/roadmap/src/roadmap_tripdb.h	2011-02-11 20:04:55 UTC (rev 2643)
@@ -1,7 +1,7 @@
 /*
  * LICENSE:
  *
- *   Copyright (c) 2008, 2009 Danny Backx
+ *   Copyright (c) 2008, 2009, 2010, 2011 Danny Backx
  *
  *   This file is part of RoadMap.
  *
@@ -31,9 +31,7 @@
 #include "roadmap_gpx.h"
 
 extern RoadMapList	RoadMapTripWaypointHead;
-extern RoadMapList	RoadMapTripRouteHead;
 extern RoadMapList	RoadMapTripTrackHead;
-extern route_head	*RoadMapCurrentRoute;
 extern waypoint		*RoadMapTripDest;
 
 /*
@@ -80,4 +78,6 @@
 void roadmap_tripdb_remove_point (const char *name);
 void roadmap_tripdb_clear(void);
 
+void roadmap_tripdb_complete (void);
+
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2642] trunk/roadmap/src/roadmap_gpsd3.c

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

Revision: 2642
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2642&view=rev
Author:   dannybackx
Date:     2011-02-11 19:39:29 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Changes to comply with the libgpsd 3.0 as communicated by ESR recently.
Note this probably also supports the 2.9x versions that were once said
to become the 3.0 API.

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_gpsd3.c

Modified: trunk/roadmap/src/roadmap_gpsd3.c
===================================================================
--- trunk/roadmap/src/roadmap_gpsd3.c	2011-02-11 19:37:03 UTC (rev 2641)
+++ trunk/roadmap/src/roadmap_gpsd3.c	2011-02-11 19:39:29 UTC (rev 2642)
@@ -49,18 +49,28 @@
 static RoadMapGpsdDilution   RoadmapGpsd2DilutionListener = NULL;
 
 RoadMapSocket gpsd3_socket;
-struct gps_data_t	*gpsdp;
+#if GPSD_API_MAJOR_VERSION == 5
+struct gps_data_t	gpsd_e, *gpsdp = &gpsd_e;
+#else
+struct gps_data_t	*gpsdp = NULL;
+#endif
 
 RoadMapSocket roadmap_gpsd3_connect (const char *name) {
-#ifdef ROADMAP_USES_LIBGPS
+#if defined(ROADMAP_USES_LIBGPS) && defined(GPSD_API_MAJOR_VERSION)
+#if GPSD_API_MAJOR_VERSION == 5
+   if (gps_open(name, "2947", gpsdp) < 0)
+      return ROADMAP_INVALID_SOCKET;
+   gps_stream(gpsdp, WATCH_JSON, NULL);
+#else
    gpsdp = gps_open(name, "2947");
    if (gpsdp == NULL)
       return ROADMAP_INVALID_SOCKET;
    gps_stream(gpsdp, WATCH_NMEA, NULL);
+#endif
    return (RoadMapSocket)gpsdp->gps_fd;
-#else
-   return 0;
-#endif
+#else /* ! (defined(ROADMAP_USES_LIBGPS) && defined(GPSD_API_MAJOR_VERSION)) */
+   return ROADMAP_INVALID_SOCKET;
+#endif /* defined(ROADMAP_USES_LIBGPS) && defined(GPSD_API_MAJOR_VERSION) */
 }
 
 void roadmap_gpsd3_subscribe_to_navigation (RoadMapGpsdNavigation navigation) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2641] trunk/roadmap/src/android

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

Revision: 2641
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2641&view=rev
Author:   dannybackx
Date:     2011-02-11 19:37:03 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
Android changes, including a menu system that works better with a
roadmap.menus file.

Modified Paths:
--------------
    trunk/roadmap/src/android/AndroidManifest.xml
    trunk/roadmap/src/android/Makefile
    trunk/roadmap/src/android/res/layout/list_item.xml
    trunk/roadmap/src/android/roadmap_main.c
    trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/RoadMap.java

Added Paths:
-----------
    trunk/roadmap/src/android/res/values/style.xml
    trunk/roadmap/src/android/roadmap_sound.c

Modified: trunk/roadmap/src/android/AndroidManifest.xml
===================================================================
--- trunk/roadmap/src/android/AndroidManifest.xml	2011-02-10 22:16:20 UTC (rev 2640)
+++ trunk/roadmap/src/android/AndroidManifest.xml	2011-02-11 19:37:03 UTC (rev 2641)
@@ -3,6 +3,7 @@
 	package="net.sourceforge.projects.roadmap"
 	android:installLocation="internalOnly"
 	android:versionCode="1"
+	android:theme="@style/RoadMapStyle"
 	android:versionName="1.0">
 	<uses-sdk android:minSdkVersion="3" />
 	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>

Modified: trunk/roadmap/src/android/Makefile
===================================================================
--- trunk/roadmap/src/android/Makefile	2011-02-10 22:16:20 UTC (rev 2640)
+++ trunk/roadmap/src/android/Makefile	2011-02-11 19:37:03 UTC (rev 2641)
@@ -94,7 +94,7 @@
 
 roadmap-1.apk: libs/armeabi/librmnative.so AndroidManifest.xml bin/classes.dex \
 	libs/armeabi/libexpat-1.so libs/armeabi/gdbserver libs/armeabi/gdb.setup \
-	res/values/strings.xml res/layout/list_item.xml
+	res/values/strings.xml res/values/style.xml res/layout/list_item.xml
 	-rm -f $@
 	${AAPT} package -f -M AndroidManifest.xml -S res -I ${SDKPLAT}/android.jar -F roadmap-1.apk
 
@@ -102,9 +102,11 @@
 	cp /opt/android/lib/libexpat-1.so libs/armeabi/libexpat-1.so
 
 bin/classes.dex:	${CLSES}
+	-mkdir -p bin
 	${DX} --dex --output=$@ ${DIRHIER}/*.class
 
 gen/net/sourceforge/projects/roadmap/R.java: AndroidManifest.xml Makefile
+	-mkdir -p gen
 	${AAPT} package -m -J gen -M AndroidManifest.xml -S res -I ${SDKPLAT}/android.jar
 
 ${DIRHIER}/RoadMap.class:	src/${DIRHIER}/RoadMap.java gen/net/sourceforge/projects/roadmap/R.java
@@ -135,8 +137,7 @@
 		roadmap_progress.c \
 		roadmap_androidgps.c \
 		../win32/roadmap_colors.c \
-		roadmap_sound.c \
-		roadmap_menu.c
+		roadmap_sound.c
 
 libs/armeabi/gdbserver:	${NDKHOME}/toolchains/arm-eabi-4.4.0/prebuilt/gdbserver
 	cp ${NDKHOME}/toolchains/arm-eabi-4.4.0/prebuilt/gdbserver libs/armeabi/gdbserver
@@ -148,6 +149,7 @@
 RMANDROID=	${RMASRC:.c=.o}
 
 libs/armeabi/librmnative.so:	${RMANDROID} ${RMDLIBS}
+	-mkdir -p libs/armeabi
 	arm-eabi-gcc --Wl,-soname,librmnative.so -o libs/armeabi/librmnative.so \
 		${NDK_CFLAGS} ${NDK_LDFLAGS} \
 		${RMANDROID} \

Modified: trunk/roadmap/src/android/res/layout/list_item.xml
===================================================================
--- trunk/roadmap/src/android/res/layout/list_item.xml	2011-02-10 22:16:20 UTC (rev 2640)
+++ trunk/roadmap/src/android/res/layout/list_item.xml	2011-02-11 19:37:03 UTC (rev 2641)
@@ -5,5 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:textAppearance="?android:attr/textAppearanceSmall"
+    android:divider="#FF0000"
+    android:dividerHeight="2px"
+    android:textSize="16sp"
+    android:maxHeight="?android:attr/listPreferredItemHeight"
 />
-<!--    android:minHeight="?android:attr/listPreferredItemHeight" -->

Added: trunk/roadmap/src/android/res/values/style.xml
===================================================================
--- trunk/roadmap/src/android/res/values/style.xml	                        (rev 0)
+++ trunk/roadmap/src/android/res/values/style.xml	2011-02-11 19:37:03 UTC (rev 2641)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2011, Danny Backx -->
+<resources>
+<style name="RoadMapStyle">
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:divider">#FF0000</item>
+    <item name="android:dividerHeight">2px</item>
+    <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+    <item name="android:textSize">10sp</item>
+</style>
+</resources>


Property changes on: trunk/roadmap/src/android/res/values/style.xml
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/roadmap/src/android/roadmap_main.c
===================================================================
--- trunk/roadmap/src/android/roadmap_main.c	2011-02-10 22:16:20 UTC (rev 2640)
+++ trunk/roadmap/src/android/roadmap_main.c	2011-02-11 19:37:03 UTC (rev 2641)
@@ -2,7 +2,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
- *   Copyright 2010 Danny Backx
+ *   Copyright 2010, 2011, Danny Backx
  *
  *   This file is part of RoadMap.
  *
@@ -144,7 +144,7 @@
 	jmethodID	mid = TheMethod(cls, "CreateMenu", "(Ljava/lang/String;)I");
 	jstring		js;
 
-	// __android_log_print(ANDROID_LOG_ERROR, "RoadMap", "roadmap_main_new_menu(%s)", title);
+	roadmap_log (ROADMAP_WARNING, "roadmap_main_new_menu(%s)", title);
 
 	js = (*RoadMapJniEnv)->NewStringUTF(RoadMapJniEnv, title);
 	int i = (*RoadMapJniEnv)->CallIntMethod(RoadMapJniEnv, RoadMapThiz, mid, js);
@@ -158,35 +158,40 @@
 //	__android_log_print(ANDROID_LOG_ERROR, "RoadMap", "roadmap_main_free_menu FIX ME");
 }
 
-
+/**
+ * @brief this is a companion to roadmap_main_new_menu.
+ *	The other function creates a menu that you can use e.g. in popup definitions.
+ *	This one indicates that it should be in the menu bar.
+ * @param menu the return value of the corresponding roadmap_main_new_menu call
+ * @param label the same title as in roadmap_main_new_menu()
+ */
 void roadmap_main_add_menu (RoadMapMenu menu, const char *label)
 {
-	// __android_log_print(ANDROID_LOG_ERROR, "RoadMap", "roadmap_main_add_menu(%d,%s)", (int)menu, label);
-	/*
+	roadmap_log (ROADMAP_WARNING, "roadmap_main_add_menu(%d,%s) /* FIX ME */", (int)menu, label);
 	int		m = (int)menu;
 	jclass		cls = TheRoadMapClass();
-	jmethodID	mid = TheMethod(cls, "AddSubMenu", "(ILjava/lang/String;)I");
-	jstring		js;
+	jmethodID	mid = TheMethod(cls, "AttachMenuToBar", "(I)V");
 
 	__android_log_print(ANDROID_LOG_ERROR, "RoadMap", "roadmap_main_add_menu(%d,%s)", m, label);
 
-	js = (*RoadMapJniEnv)->NewStringUTF(RoadMapJniEnv, label);
-	int i = (*RoadMapJniEnv)->CallIntMethod(RoadMapJniEnv, RoadMapThiz, mid, m, js);
-	*/
+	(*RoadMapJniEnv)->CallVoidMethod(RoadMapJniEnv, RoadMapThiz, mid, m);
 }
 
 
 void roadmap_main_popup_menu (RoadMapMenu menu, const RoadMapGuiPoint *position)
 {
-	__android_log_print(ANDROID_LOG_ERROR, "RoadMap", "roadmap_main_popup_menu FIX ME");
+	roadmap_log (ROADMAP_WARNING, "roadmap_main_popup_menu(%d) FIX ME");
 }
 
 
-struct callback {
+static struct callback {
 	RoadMapCallback	callback;
 	char	*label;			// only for debug
-} callbacks[150] /* FIX ME make dynamic */;
+} *callbacks;
 
+static int	ncallbacks = 0,
+		maxcallbacks = 0;
+
 void roadmap_main_add_menu_item (RoadMapMenu menu,
                                  const char *label,
                                  const char *tip,
@@ -207,8 +212,22 @@
 
 	// __android_log_print(ANDROID_LOG_ERROR, "RoadMap", "roadmap_main_add_menu_item(%d,%s,cb %p) -> %d", m, label, callback, i);
 
-	callbacks[i].callback = callback;
-	callbacks[i].label = strdup(label);	// only for debug
+	if (i >= maxcallbacks) {
+		maxcallbacks += 100;
+		callbacks = realloc(callbacks, sizeof(struct callback) * maxcallbacks);
+
+		roadmap_log (ROADMAP_WARNING, "roadmap_main_add_menu_item %d", maxcallbacks);
+	}
+
+	if (i < maxcallbacks) {	/* This should now always be true */
+		callbacks[i].callback = callback;
+		callbacks[i].label = strdup(label);	// only for debug
+
+		if (ncallbacks < i+1)
+			ncallbacks = i+1;
+	} else {
+		roadmap_log (ROADMAP_WARNING, "Internal error : roadmap_main_add_menu_item %d > %d", maxcallbacks, i);
+	}
 }
 
 /**
@@ -216,10 +235,22 @@
  * @param item the index that this menu entry was given, to be used in our table
  *  (Note: Android doesn't seem to provide a simple way to pass some info so we
  *   need to add yet another table.)
- * @return feedback for the onOptionsMenuSelected -> 1 for true, 0 for false.
+ * @return feedback for the onOptionsMenuSelected -> 1 if we processed this, 0 if the call should still be handled.
  */
 int roadmap_main_callback(int item)
 {
+	if (item == 0) {
+		roadmap_log (ROADMAP_WARNING, "roadmap_main_callback(0) -> return");
+		return 0;
+	}
+
+	if (item >= ncallbacks) {
+		roadmap_log (ROADMAP_WARNING, "roadmap_main_callback(%d), but ncallbacks %d", item, ncallbacks);
+		return 0;
+	}
+
+	roadmap_log (ROADMAP_WARNING, "roadmap_main_callback(%d)", item);
+
 	if (callbacks[item].callback) {
 //		__android_log_print(ANDROID_LOG_ERROR, "RoadMap", "roadmap_main_callback(%d,%s) %p", item, callbacks[item].label, callbacks[item].callback);
 		(*(callbacks[item].callback))();

Added: trunk/roadmap/src/android/roadmap_sound.c
===================================================================
--- trunk/roadmap/src/android/roadmap_sound.c	                        (rev 0)
+++ trunk/roadmap/src/android/roadmap_sound.c	2011-02-11 19:37:03 UTC (rev 2641)
@@ -0,0 +1,172 @@
+/*
+ * LICENSE:
+ *
+ *   Copyright (c) 2008, 2010, Danny Backx.
+ *
+ *   This file is part of RoadMap.
+ *
+ *   RoadMap is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   RoadMap is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with RoadMap; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/**
+ * @file
+ * @brief Play sound on Android
+ */
+
+#include "../roadmap.h"
+#include "../roadmap_path.h"
+#include "../roadmap_file.h"
+#include "../roadmap_res.h"
+#include "../roadmap_sound.h"
+
+#include "roadmap_jni.h"
+
+#define	MYCLS2	"net/sourceforge/projects/roadmap/RoadMap"
+static jclass	myRmClassCache = (jclass) 0;
+
+static jclass TheRoadMapClass()
+{
+	if (myRmClassCache == 0) {
+		myRmClassCache = (*RoadMapJniEnv)->FindClass(RoadMapJniEnv, MYCLS2);
+		myRmClassCache = (*RoadMapJniEnv)->NewGlobalRef(RoadMapJniEnv, myRmClassCache);
+	}
+	if (myRmClassCache == 0) {
+		__android_log_print(ANDROID_LOG_ERROR, "RoadMap", "Class not found");
+		// throw
+		(*RoadMapJniEnv)->ThrowNew(RoadMapJniEnv,
+			(*RoadMapJniEnv)->FindClass(RoadMapJniEnv, "java/io/IOException"),
+			"A JNI Exception occurred");
+	}
+
+	return myRmClassCache;
+}
+
+static jmethodID TheMethod(const jclass cls, const char *name, const char *signature)
+{
+	jmethodID	mid;
+
+	mid = (*RoadMapJniEnv)->GetMethodID(RoadMapJniEnv, cls, name, signature);
+	if (mid == 0) {
+		(*RoadMapJniEnv)->ThrowNew(RoadMapJniEnv,
+			(*RoadMapJniEnv)->FindClass(RoadMapJniEnv, "java/io/IOException"),
+			"A JNI Exception occurred");
+	}
+	return mid;
+}
+
+#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)
+{
+	   return -1;
+}
+
+/**
+ * @brief play a sound from a file
+ * @param file_name this file contains the sound
+ * @return 0 on success, -1 on failure
+ */
+int roadmap_sound_play_file (const char *file_name)
+{
+	jclass		cls = TheRoadMapClass();
+	jmethodID	mid = TheMethod(cls, "PlaySound", "(Ljava/lang/String;)I");
+	jstring		js = (*RoadMapJniEnv)->NewStringUTF(RoadMapJniEnv, file_name);
+	int		r;
+
+	r = (*RoadMapJniEnv)->CallIntMethod(RoadMapJniEnv, RoadMapThiz, mid, js);
+	return r;
+}
+
+void roadmap_sound_test()
+{
+	(void)roadmap_sound_play_file("/sdcard/Ringtones/VideoKilledTheRadioStar1.mp3");
+}
+
+RoadMapSound roadmap_sound_load (const char *path, const char *file, int *mem)
+{
+   return NULL;
+}
+
+
+int roadmap_sound_free (RoadMapSound sound)
+{
+   return 0;
+}
+
+
+RoadMapSoundList roadmap_sound_list_create (int flags)
+{
+   return NULL;
+}
+
+
+int roadmap_sound_list_add (RoadMapSoundList list, const char *name)
+{
+   return -1;
+}
+
+
+int roadmap_sound_list_count (const RoadMapSoundList list)
+{
+   return -1;
+}
+
+const char *roadmap_sound_list_get (const RoadMapSoundList list, int i)
+{
+   return NULL;
+}
+
+void roadmap_sound_list_free (RoadMapSoundList list)
+{
+}
+
+int roadmap_sound_play_list (const RoadMapSoundList list)
+{
+   return 0;
+}
+
+void roadmap_sound_initialize (void)
+{
+}
+
+void roadmap_sound_shutdown (void)
+{
+}
+
+#ifdef NEEDED_LATER
+/* Recording */
+static int allocate_rec_buffer(int seconds)
+{
+   return 0;
+}
+
+static int save_wav_file (void *data, unsigned int size)
+{
+   return 0;
+}
+#endif
+
+int roadmap_sound_record (const char *file_name, int seconds)
+{
+   return 0;
+}


Property changes on: trunk/roadmap/src/android/roadmap_sound.c
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/RoadMap.java
===================================================================
--- trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/RoadMap.java	2011-02-10 22:16:20 UTC (rev 2640)
+++ trunk/roadmap/src/android/src/net/sourceforge/projects/roadmap/RoadMap.java	2011-02-11 19:37:03 UTC (rev 2641)
@@ -84,6 +84,8 @@
 
 import android.media.MediaPlayer;
 
+import android.app.ProgressDialog;
+
 public class RoadMap extends Activity
 {
 	private LocationManager mgr = null;
@@ -447,13 +449,18 @@
 			else
 				parent = menuCache[i].menu;
 
-			try {
+			Log.e("RoadMap", "onCreateOptionsMenu -> " + i
+				+ " [" + menuCache[i].label
+				+ "] in bar : " + menuCache[i].inbar);
+			if (menuCache[i].inbar != 0) {
+			    try {
 				menuCache[i].menu = parent.addSubMenu(menuCache[i].label);
-			} catch (Exception e) {
+			    } catch (Exception e) {
 				Log.e("RoadMap", "AddSubMenu {" + i
 						+ "} (" + parent + ","
 						+ menuCache[i].label + ") : exception " + e);
 				return false;
+			    }
 			}
 		}
 
@@ -464,6 +471,15 @@
 			else {
 				int iparent = menuItemCache[i].parent;
 				parent = menuCache[iparent].menu;
+
+				if (parent == null) {
+					/*
+					 * this probably means menuCache[iparent].inbar == 0
+					 * so this menu is not mentioned in the user specified
+					 * roadmap.menus file.
+					 */
+					continue;
+				}
 			}
 
 			try {
@@ -502,6 +518,7 @@
 		int	parent;
 		Menu	menu;
 		String	label;
+		int	inbar;
 		// more FIX ME
 	};
 
@@ -519,9 +536,19 @@
 		menuCache[nMenuCache] = new MenuCacheEntry();
 		menuCache[nMenuCache].parent = 0 /* m */;
 		menuCache[nMenuCache].label = s;
+		menuCache[nMenuCache].inbar = 0;
 		return nMenuCache++;
 	}
 
+	/**
+	 * @brief indicate that this menu should be in the menu bar.
+	 * @param ix the index returned by CreateMenu()
+	 */
+	public void AttachMenuToBar(int ix)
+	{
+		menuCache[ix].inbar = 1;
+	}
+
 	class MenuItemCacheEntry {
 		int		parent;
 		MenuItem	item;
@@ -956,27 +983,44 @@
 		}
 	};
 
+	DialogInterface.OnClickListener listener2 = new DialogInterface.OnClickListener() {
+		public void onClick(DialogInterface dialog, int which) {
+			Log.e("RoadMap", "OnClickListener(" + which + ")");
+			// RoadMapDialogChosen(position, id);
+		}
+	};
+
 	/*
 	 * Set a list contents
 	 */
 	public void DialogSetListContents(int id, String[] list)
 	{
+/* Not sure how this should work
+		AlertDialog.Builder     db = dialogs[id].db;
 
-//		Log.e("RoadMap", "DialogSetListContents(" + id + "," + list + " count " + list.length + ")");
-//		int	i;
-//		for (i=0; i<list.length; i++) {
-//			Log.e("RoadMap", "\t" + i + " - " + list[i]);
-//		}
-			
+		ArrayAdapter<String>	adapter = new ArrayAdapter<String>(thiz,
+			R.layout.list_item,
+			list);
+		db.setAdapter(adapter, listener2);
+		dialogs[id].ad.getListView().invalidateViews();
+/* */
+
+/* This does work but looks like overkill.
+ *
+ * Requires DialogCreateList() to create an additional widget...
+ * which may not be necessary
+ */
 		try {
 			ListView lv = (ListView)dialogs[id].row.getChildAt(0);
-//			Log.e("RoadMap", "  ListView " + lv);
+
 			lv.setAdapter(new ArrayAdapter<String>(thiz,
+//				android.R.layout.simple_list_item_1,
 				R.layout.list_item,	// smaller than the big default
 				list));
 		} catch (Exception e) {
 			Log.e("RoadMap", "DialogSetListContents -> exception " + e);
 		}
+/* */
 	}
 
 	/*
@@ -997,4 +1041,22 @@
 		};
 		return 0;
 	}
+
+	/*
+	 * Progress bar
+	 */
+	Thread	progressThread;
+	Dialog	progressDialog;
+
+	public void StartProgressBar()
+	{
+	}
+
+	public void EndProgressBar()
+	{
+	}
+
+	public void SetProgress(int percent)
+	{
+	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] SF.net SVN: roadmap:[2640] trunk/roadmap/src/roadmap_gpsd3.c

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

Revision: 2640
          http://roadmap.svn.sourceforge.net/roadmap/?rev=2640&view=rev
Author:   dannybackx
Date:     2011-02-10 22:16:20 +0000 (Thu, 10 Feb 2011)

Log Message:
-----------
test 3

Modified Paths:
--------------
    trunk/roadmap/src/roadmap_gpsd3.c

Modified: trunk/roadmap/src/roadmap_gpsd3.c
===================================================================
--- trunk/roadmap/src/roadmap_gpsd3.c	2011-02-10 22:14:44 UTC (rev 2639)
+++ trunk/roadmap/src/roadmap_gpsd3.c	2011-02-10 22:16:20 UTC (rev 2640)
@@ -2,7 +2,7 @@
  * LICENSE:
  *
  *   Copyright 2002 Pascal F. Martin
- *   Copyright 2010, Danny Backx.
+ *   Copyright 2010, 2011, Danny Backx.
  *
  *   This file is part of RoadMap.
  *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Roadmap-commit] roadmap/src roadmap_start.c, 1.162, 1.163 roadmap_history.c, 1.11, 1.12

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

Update of /cvsroot/roadmap/roadmap/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27019

Modified Files:
	roadmap_start.c roadmap_history.c 
Log Message:
All this work is prompted by the Android implementation that requires _shutdown
functions in several modules.

Add roadmap_history_shutdown() and roadmap_dialog_shutdown().
Also add roadmap_canvas_shutdown to iphone and qt directories, catchup from
previous commit in roadmap_start.c .
Fix some stuff in the Android dialogs so more of the buttons work.


Index: roadmap_history.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_history.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** roadmap_history.c	26 Jun 2005 01:40:36 -0000	1.11
--- roadmap_history.c	20 Jan 2011 19:02:57 -0000	1.12
***************
*** 1,7 ****
! /* roadmap_history.c - manage the roadmap address history.
!  *
   * LICENSE:
   *
   *   Copyright 2002 Pascal F. Martin
   *
   *   This file is part of RoadMap.
--- 1,7 ----
! /*
   * LICENSE:
   *
   *   Copyright 2002 Pascal F. Martin
+  *   Copyright (c) 2011, 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_history.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 roadmap_history.c - manage the roadmap address history.
   */
  
***************
*** 57,60 ****
--- 58,62 ----
  static struct roadmap_history_log_entry *RoadMapLatest = NULL;
  static struct roadmap_history_log_entry *RoadMapOldest = NULL;
+ static int loaded = 0;
  
  
***************
*** 196,201 ****
  void roadmap_history_load (void) {
  
-    static int loaded = 0;
- 
     FILE *file;
     char *p;
--- 198,201 ----
***************
*** 234,237 ****
--- 234,250 ----
  }
  
+ /**
+  * @brief reinitialize to the state at program startup
+  */
+ void roadmap_history_shutdown (void) {
+    roadmap_history_purge (0);
+ 
+    /* Several of these should already be ok because of the purge above. */
+    RoadMapHistoryChanged = 0;
+    RoadMapHistoryCount = 0;
+    RoadMapLatest = NULL;
+    RoadMapOldest = NULL;
+    loaded = 0;
+ }
  
  void roadmap_history_declare (char category, int argv) {
***************
*** 343,347 ****
  }
  
! 
  void roadmap_history_purge (int count) {
  
--- 356,363 ----
  }
  
! /**
!  * @brief clean up the history, leaving only part of it
!  * @param count leave this many entries in the history
!  */
  void roadmap_history_purge (int count) {
  
***************
*** 356,360 ****
  }
  
! 
  void roadmap_history_save (void) {
  
--- 372,378 ----
  }
  
! /**
!  * @brief save to file
!  */
  void roadmap_history_save (void) {
  

Index: roadmap_start.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/roadmap_start.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** roadmap_start.c	20 Aug 2010 18:27:33 -0000	1.162
--- roadmap_start.c	20 Jan 2011 19:02:57 -0000	1.163
***************
*** 522,525 ****
--- 522,530 ----
  /* The RoadMap menu and toolbar items: ----------------------------------- */
  
+ #ifdef ANDROID
+ extern void roadmap_android_test();
+ extern void roadmap_sound_test();
+ #endif
+ 
  /* This table lists all the RoadMap actions that can be initiated
   * fom the user interface (a sort of symbol table).
***************
*** 860,863 ****
--- 865,874 ----
  	   "List the RoadMap plugins", NULL, roadmap_start_list_all_plugins},
  
+ #ifdef ANDROID
+    {"soundtest", "Sound test", NULL, NULL,
+ 	   "Test Android Sound", NULL, roadmap_sound_test},
+    {"androidtest", "Android Test", NULL, NULL,
+ 	   "Test Android Sound", NULL, roadmap_android_test},
+ #endif
     {NULL, NULL, NULL, NULL, NULL, NULL, NULL}
  };
***************
*** 1749,1755 ****
      roadmap_config_save (0);
      roadmap_screen_shutdown();
!     roadmap_display_shutdown  ();
      roadmap_gps_shutdown ();
!     roadmap_factory_shutdown();
      roadmap_config_shutdown ();
      roadmap_sprite_shutdown ();
--- 1760,1768 ----
      roadmap_config_save (0);
      roadmap_screen_shutdown();
!     roadmap_dialog_shutdown ();
!     roadmap_history_shutdown ();
!     roadmap_display_shutdown ();
      roadmap_gps_shutdown ();
!     roadmap_factory_shutdown ();
      roadmap_config_shutdown ();
      roadmap_sprite_shutdown ();

[Roadmap-commit] roadmap/src/android roadmap_dialog.c,1.4,1.5

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

Update of /cvsroot/roadmap/roadmap/src/android
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27019/android

Modified Files:
	roadmap_dialog.c 
Log Message:
All this work is prompted by the Android implementation that requires _shutdown
functions in several modules.

Add roadmap_history_shutdown() and roadmap_dialog_shutdown().
Also add roadmap_canvas_shutdown to iphone and qt directories, catchup from
previous commit in roadmap_start.c .
Fix some stuff in the Android dialogs so more of the buttons work.


Index: roadmap_dialog.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/android/roadmap_dialog.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_dialog.c	8 Jan 2011 14:26:08 -0000	1.4
--- roadmap_dialog.c	20 Jan 2011 19:02:57 -0000	1.5
***************
*** 622,629 ****
  	RoadMapDialogItem	dlgp;
  
  	dlgp = roadmap_dialog_get_nr(NULL, dlg);
  
  	if (dlgp && dlgp->callbacks && dlgp->callbacks[btn])
! 		dlgp->callbacks[btn](dlgp->name, dlgp);
  }
  
--- 622,631 ----
  	RoadMapDialogItem	dlgp;
  
+ 	roadmap_log(ROADMAP_WARNING, "DialogSpecialCallback(%d,%d)", dlg, btn);
+ 
  	dlgp = roadmap_dialog_get_nr(NULL, dlg);
  
  	if (dlgp && dlgp->callbacks && dlgp->callbacks[btn])
! 		dlgp->callbacks[btn](dlgp->name, dlgp->context);
  }
  
***************
*** 650,655 ****
--- 652,666 ----
  
  
+ /**< Not sure how to return a string as return value from a function in JNI, so
+  * using this workaround (call the other way, pass string as an argument) to bypass.
+  */
  static char *ReturnStringDataHack = NULL;
  
+ /**
+  * @brief function to return string data
+  * @param env JNI standard environment pointer
+  * @param thiz JNI standard object from which we're being called
+  * @param js the string we're getting from Java
+  */
  void Java_net_sourceforge_projects_roadmap_RoadMap_ReturnStringDataHack(JNIEnv* env, jobject thiz, jstring js)
  {
***************
*** 658,662 ****
  
  /**
!  * @brief Look up which selection has been made in this dialog, or retrieve the contents of a text entry field, or get the data we stored here.
   * @param frame used to determine the dialog
   * @param name used to determine the dialog
--- 669,675 ----
  
  /**
!  * @brief Look up which selection has been made in this dialog, or retrieve the contents
!  * of a text entry field, or get the data we stored here.
!  *
   * @param frame used to determine the dialog
   * @param name used to determine the dialog
***************
*** 741,758 ****
  }
  
  void roadmap_dialog_new_progress (const char *frame, const char *name)
  {
- 	// __android_log_print(ANDROID_LOG_ERROR, "RoadMap", "roadmap_dialog_new_progress(%s,%s)", frame, name);
  #warning implement roadmap_dialog_new_progress
  }
  
  void  roadmap_dialog_set_progress (const char *frame, const char *name, int progress)
  {
- 	// __android_log_print(ANDROID_LOG_ERROR, "RoadMap", "roadmap_dialog_set_progress(%s,%s,%d)", frame, name, progress);
  #warning implement roadmap_dialog_set_progress
  }
  
! void roadmap_dialog_shutdown(void)
  {
  	RoadMapDialogWindows = NULL;
  	RoadMapDialogCurrent = NULL;
--- 754,788 ----
  }
  
+ /**
+  * @brief
+  * @param frame
+  * @param name
+  *
+  * Note not implemented in gtk2/ either, only used from navigate plugin
+  */
  void roadmap_dialog_new_progress (const char *frame, const char *name)
  {
  #warning implement roadmap_dialog_new_progress
  }
  
+ /**
+  * @brief
+  * @param frame
+  * @param name
+  * @param progress
+  *
+  * Note not implemented in gtk2/ either, only used from navigate plugin
+  */
  void  roadmap_dialog_set_progress (const char *frame, const char *name, int progress)
  {
  #warning implement roadmap_dialog_set_progress
  }
  
! /**
!  * @brief reinitialize this module
!  */
! void roadmap_dialog_shutdown (void)
  {
+ 	/* FIX ME memory leak */
  	RoadMapDialogWindows = NULL;
  	RoadMapDialogCurrent = NULL;

[Roadmap-commit] roadmap/src/iphone roadmap_dialog.m, 1.1, 1.2 roadmap_canvas.m, 1.4, 1.5

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

Update of /cvsroot/roadmap/roadmap/src/iphone
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27019/iphone

Modified Files:
	roadmap_dialog.m roadmap_canvas.m 
Log Message:
All this work is prompted by the Android implementation that requires _shutdown
functions in several modules.

Add roadmap_history_shutdown() and roadmap_dialog_shutdown().
Also add roadmap_canvas_shutdown to iphone and qt directories, catchup from
previous commit in roadmap_start.c .
Fix some stuff in the Android dialogs so more of the buttons work.


Index: roadmap_canvas.m
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/iphone/roadmap_canvas.m,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** roadmap_canvas.m	4 Nov 2008 14:56:23 -0000	1.4
--- roadmap_canvas.m	20 Jan 2011 19:02:57 -0000	1.5
***************
*** 6,9 ****
--- 6,10 ----
   *   Copyright 2008 Morten Bek Ditlevsen
   *   Copyright 2008 Avi Romano
+  *   Copyright (c) 2011, Danny Backx
   *
   *   This file is part of RoadMap.
***************
*** 815,819 ****
  }
  
! 
  
  
--- 816,821 ----
  }
  
! void roadmap_canvas_shutdown (void) {
! }
  
  

Index: roadmap_dialog.m
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/iphone/roadmap_dialog.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** roadmap_dialog.m	4 May 2008 16:49:21 -0000	1.1
--- roadmap_dialog.m	20 Jan 2011 19:02:57 -0000	1.2
***************
*** 5,8 ****
--- 5,9 ----
   *   Copyright 2002 Pascal F. Martin
   *   Copyright 2008 Morten Bek Ditlevsen
+  *   Copyright (c) 2011, Danny Backx
   *
   *   This file is part of RoadMap.
***************
*** 761,762 ****
--- 762,766 ----
     this_item->value = (char *)data;
  }
+ 
+ void roadmap_dialog_shutdown (void) {
+ }

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

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

Update of /cvsroot/roadmap/roadmap/src/win32
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27019/win32

Modified Files:
	roadmap_path.c roadmap_dialog.c 
Log Message:
All this work is prompted by the Android implementation that requires _shutdown
functions in several modules.

Add roadmap_history_shutdown() and roadmap_dialog_shutdown().
Also add roadmap_canvas_shutdown to iphone and qt directories, catchup from
previous commit in roadmap_start.c .
Fix some stuff in the Android dialogs so more of the buttons work.


Index: roadmap_path.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_path.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** roadmap_path.c	30 Oct 2010 18:18:09 -0000	1.15
--- roadmap_path.c	20 Jan 2011 19:02:57 -0000	1.16
***************
*** 3,7 ****
   *
   *   Copyright 2005 Ehud Shabtai
!  *   Copyright (c) 2008, 2009 Danny Backx
   *
   *   Based on an implementation by Pascal F. Martin.
--- 3,7 ----
   *
   *   Copyright 2005 Ehud Shabtai
!  *   Copyright (c) 2008, 2009, 2011 Danny Backx
   *
   *   Based on an implementation by Pascal F. Martin.

Index: roadmap_dialog.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/win32/roadmap_dialog.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** roadmap_dialog.c	3 Apr 2009 19:08:45 -0000	1.15
--- roadmap_dialog.c	20 Jan 2011 19:02:57 -0000	1.16
***************
*** 859,863 ****
  	case WM_INITDIALOG:
  		{
! #ifdef SHIDIM_FLAGS
  			SHINITDLGINFO shidi;
  			RoadMapDialogItem dialog;
--- 859,863 ----
  	case WM_INITDIALOG:
  		{
! #if defined(SHIDIM_FLAGS) && defined(HAVE_AYGSHELL)
  			SHINITDLGINFO shidi;
  			RoadMapDialogItem dialog;
***************
*** 1005,1009 ****
  	case WM_INITDIALOG:
  	{
! #ifdef SHIDIM_FLAGS
  		SHINITDLGINFO sid;
  		PROPSHEETPAGE *psp;
--- 1005,1009 ----
  	case WM_INITDIALOG:
  	{
! #if defined(SHIDIM_FLAGS) && defined(HAVE_AYGSHELL)
  		SHINITDLGINFO sid;
  		PROPSHEETPAGE *psp;
***************
*** 1024,1027 ****
--- 1024,1028 ----
  	return (INT_PTR)TRUE;
  	}
+ #if defined(HAVE_AYGSHELL)
  	case WM_SETTINGCHANGE:
  	{
***************
*** 1051,1054 ****
--- 1052,1056 ----
  	}
  		/* fall through to resize */
+ #endif
  	case WM_SIZE:
  	{

[Roadmap-commit] roadmap/src/gtk2 roadmap_dialog.c,1.21,1.22

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

Update of /cvsroot/roadmap/roadmap/src/gtk2
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27019/gtk2

Modified Files:
	roadmap_dialog.c 
Log Message:
All this work is prompted by the Android implementation that requires _shutdown
functions in several modules.

Add roadmap_history_shutdown() and roadmap_dialog_shutdown().
Also add roadmap_canvas_shutdown to iphone and qt directories, catchup from
previous commit in roadmap_start.c .
Fix some stuff in the Android dialogs so more of the buttons work.


Index: roadmap_dialog.c
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/gtk2/roadmap_dialog.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** roadmap_dialog.c	12 Feb 2009 18:51:38 -0000	1.21
--- roadmap_dialog.c	20 Jan 2011 19:02:57 -0000	1.22
***************
*** 3,7 ****
   *
   *   Copyright 2002 Pascal F. Martin
!  *   Copyright (c) 2008, Danny Backx.
   *
   *   This file is part of RoadMap.
--- 3,7 ----
   *
   *   Copyright 2002 Pascal F. Martin
!  *   Copyright (c) 2008, 2011, Danny Backx.
   *
   *   This file is part of RoadMap.
***************
*** 822,823 ****
--- 822,827 ----
  }
  
+ 
+ void roadmap_dialog_shutdown (void)
+ {
+ }

[Roadmap-commit] roadmap/src/qt roadmap_dialog.cc, 1.11, 1.12 roadmap_canvas.cc, 1.14, 1.15

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

Update of /cvsroot/roadmap/roadmap/src/qt
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv27019/qt

Modified Files:
	roadmap_dialog.cc roadmap_canvas.cc 
Log Message:
All this work is prompted by the Android implementation that requires _shutdown
functions in several modules.

Add roadmap_history_shutdown() and roadmap_dialog_shutdown().
Also add roadmap_canvas_shutdown to iphone and qt directories, catchup from
previous commit in roadmap_start.c .
Fix some stuff in the Android dialogs so more of the buttons work.


Index: roadmap_canvas.cc
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/roadmap_canvas.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** roadmap_canvas.cc	7 Oct 2008 00:42:21 -0000	1.14
--- roadmap_canvas.cc	20 Jan 2011 19:02:57 -0000	1.15
***************
*** 4,7 ****
--- 4,8 ----
   *
   *   (c) Copyright 2003 Latchesar Ionkov
+  *   Copyright (c) 2011, Danny Backx
   *
   *   This file is part of RoadMap.
***************
*** 199,200 ****
--- 200,203 ----
  }
  
+ void roadmap_canvas_shutdown (void) {
+ }

Index: roadmap_dialog.cc
===================================================================
RCS file: /cvsroot/roadmap/roadmap/src/qt/roadmap_dialog.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** roadmap_dialog.cc	2 Apr 2008 17:28:08 -0000	1.11
--- roadmap_dialog.cc	20 Jan 2011 19:02:57 -0000	1.12
***************
*** 4,7 ****
--- 4,8 ----
   *
   *   (c) Copyright 2003 Latchesar Ionkov
+  *   Copyright (c) 2011, Danny Backx
   *
   *   This file is part of RoadMap.
***************
*** 128,129 ****
--- 129,133 ----
     currentDialog->setEntryValue(frame, name, data);
  }
+ 
+ void roadmap_dialog_shutdown (void) {
+ }