Merge branch 'trip3' of git://git.hohndel.org/subsurface

Pull trip manipulation branch from Dirk Hohndel:
 "I have added yet more of the requested features.

  I am not aware of any outstanding bugs or crashes (except for the Gtk
  problem that causes the import to crash for some people on Ubuntu and
  MacOS - but as I mentioned earlier, that bug has been around as long
  as the import file selector box)."

* 'trip3' of git://git.hohndel.org/subsurface:
  Avoid duplicate dive_trip entries
  More trip manipulations: remove selected dives from trip
  Add ability to merge trip with trip below
  Use the infrastructure for moving dives in more places
  Correct the trip related test dives
  Fix crash when removing the first dive of a trip
  Correctly initialize the toggle state of the autogroup menu entry
  Fix copy_tree_node to no longer overwrite dive duration
  Add autogen menu command
  Fix a crash when changing sort column
  Use truth values with gboolean
  Allow modification and edits of trips
  Clean up macros and auxiliary functions
  Store time_t as long value

1 files changed, 31 insertions, 15 deletions

diff --git a/dive.h b/dive.h
index dffe75325..29814c34e 100644
--- a/dive.h
+++ b/dive.h
@@ -241,6 +241,7 @@ extern const char *tripflag_names[NUM_TRIPFLAGS];
 struct dive {
 	int number;
 	tripflag_t tripflag;
+	struct dive *divetrip;
 	int selected;
 	time_t when;
 	char *location;
@@ -270,49 +271,63 @@ extern gboolean autogroup;
 
 #define UNGROUPED_DIVE(_dive) ((_dive)->tripflag == NO_TRIP)
 #define DIVE_IN_TRIP(_dive) ((_dive)->tripflag == IN_TRIP)
-#define NEXT_TRIP(_entry, _list) ((_entry) ? g_list_next(_entry) : (_list))
-#define PREV_TRIP(_entry, _list) ((_entry) ? g_list_previous(_entry) : g_list_last(_list))
+#define NEXT_TRIP(_entry) ((_entry) ? g_list_next(_entry) : (dive_trip_list))
+#define PREV_TRIP(_entry) ((_entry) ? g_list_previous(_entry) : g_list_last(dive_trip_list))
 #define DIVE_TRIP(_trip) ((struct dive *)(_trip)->data)
 #define DIVE_FITS_TRIP(_dive, _dive_trip) ((_dive_trip)->when - TRIP_THRESHOLD <= (_dive)->when)
 
+/* compare two dives by when they happened */
 static inline int dive_date_cmp(gconstpointer _a, gconstpointer _b) {
-	return ((struct dive *)(_a))->when - ((struct dive *)(_b))->when;
+	return ((struct dive *)_a)->when - ((struct dive *)_b)->when;
 }
 
-#define FIND_TRIP(_trip, _list) g_list_find_custom((_list), (_trip), dive_date_cmp)
+/* returns 0 if the dive happened exactly at time */
+static inline int dive_when_find(gconstpointer _dive, gconstpointer _time) {
+	return ((struct dive *)_dive)->when != (time_t) _time;
+}
+
+#define FIND_TRIP(_when) g_list_find_custom(dive_trip_list, (gconstpointer)(_when), dive_when_find)
 
 #ifdef DEBUG_TRIP
 static void dump_trip_list(void)
 {
 	GList *p = NULL;
 	int i=0;
-	while ((p = NEXT_TRIP(p, dive_trip_list))) {
+	while ((p = NEXT_TRIP(p))) {
 		struct tm *tm = gmtime(&DIVE_TRIP(p)->when);
-		printf("trip %d to \"%s\" on %04u-%02u-%02u\n", ++i, DIVE_TRIP(p)->location,
-			tm->tm_year + 1900, tm->tm_mon+1, tm->tm_mday);
+		printf("trip %d to \"%s\" on %04u-%02u-%02u %02u:%02u:%02u\n", ++i, DIVE_TRIP(p)->location,
+			tm->tm_year + 1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
 	}
 	printf("-----\n");
 }
 #endif
 
-/* insert the trip into the list - but ensure you don't have two trips
- * for the same date; but if you have, make sure you don't keep the
- * one with less information */
-static inline GList *insert_trip(struct dive *_trip, GList *_list)
+/* insert the trip into the dive_trip_list - but ensure you don't have
+ * two trips for the same date; but if you have, make sure you don't
+ * keep the one with less information */
+static void inline insert_trip(struct dive **trip)
 {
-	GList *result = FIND_TRIP(_trip, _list);
+	struct dive *dive_trip = *trip;
+	GList *result = FIND_TRIP(dive_trip->when);
 	if (result) {
 		if (! DIVE_TRIP(result)->location)
-			DIVE_TRIP(result)->location = _trip->location;
+			DIVE_TRIP(result)->location = dive_trip->location;
+		*trip = DIVE_TRIP(result);
 	} else {
-		result = g_list_insert_sorted((_list), (_trip), dive_date_cmp);
+		dive_trip_list = g_list_insert_sorted(dive_trip_list, dive_trip, dive_date_cmp);
 	}
 #ifdef DEBUG_TRIP
 	dump_trip_list();
 #endif
-	return result;
 }
 
+static inline void delete_trip(GList *trip)
+{
+	dive_trip_list = g_list_delete_link(dive_trip_list, trip);
+#ifdef DEBUG_TRIP
+	dump_trip_list();
+#endif
+}
 /*
  * We keep our internal data in well-specified units, but
  * the input and output may come in some random format. This
@@ -421,6 +436,7 @@ extern void remember_event(const char *eventname);
 extern void evn_foreach(void (*callback)(const char *, int *, void *), void *data);
 
 extern int add_new_dive(struct dive *dive);
+extern gboolean edit_trip(struct dive *trip);
 extern int edit_dive_info(struct dive *dive);
 extern int edit_multi_dive_info(struct dive *single_dive);
 extern void dive_list_update_dives(void);