X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=ef6212ae234fd5a19ac41240f38d7ac49675f990;hb=5c8305588b9b47805226ee50ffcb069fd9a6b251;hp=adceca9e6ab1159474ef86ecd4373b523c31e7ed;hpb=0ca546b31e5527713f11676bc965aa1ed8dac619;p=ext%2Fsubsurface.git

diff --git a/main.c b/main.c
index adceca9..ef6212a 100644
--- a/main.c
+++ b/main.c
@@ -1,39 +1,20 @@
+/* main.c */
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <time.h>
-#include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <cairo.h>
 
-#include "dive.h"
-
-static void show_dive(int nr, struct dive *dive)
-{
-	int i;
-	struct tm *tm;
-
-	tm = gmtime(&dive->when);
+#include <gconf/gconf-client.h>
 
-	printf("At %02d:%02d:%02d %04d-%02d-%02d  (%d ft max, %d minutes)\n",
-		tm->tm_hour, tm->tm_min, tm->tm_sec,
-		tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
-		to_feet(dive->maxdepth), dive->duration.seconds / 60);
-
-	if (!verbose)
-		return;
+#include "dive.h"
+#include "divelist.h"
 
-	for (i = 0; i < dive->samples; i++) {
-		struct sample *s = dive->sample + i;
+GConfClient *gconf;
+struct units output_units;
 
-		printf("%4d:%02d: %3d ft, %2d C, %4d PSI\n",
-			s->time.seconds / 60,
-			s->time.seconds % 60,
-			to_feet(s->depth),
-			to_C(s->temperature),
-			to_PSI(s->tankpressure));
-	}
-}
+#define GCONF_NAME(x) "/apps/subsurface/" #x
 
+/* random helper functions, used here or elsewhere */
 static int sortfn(const void *_a, const void *_b)
 {
 	const struct dive *a = *(void **)_a;
@@ -46,13 +27,55 @@ static int sortfn(const void *_a, const void *_b)
 	return 0;
 }
 
+const char *weekday(int wday)
+{
+	static const char wday_array[7][4] = {
+		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
+	};
+	return wday_array[wday];
+}
+
+const char *monthname(int mon)
+{
+	static const char month_array[12][4] = {
+		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+	};
+	return month_array[mon];
+}
+
 /*
  * This doesn't really report anything at all. We just sort the
  * dives, the GUI does the reporting
  */
-static void report_dives(void)
+void report_dives(void)
 {
+	int i;
+
 	qsort(dive_table.dives, dive_table.nr, sizeof(struct dive *), sortfn);
+
+	for (i = 1; i < dive_table.nr; i++) {
+		struct dive **pp = &dive_table.dives[i-1];
+		struct dive *prev = pp[0];
+		struct dive *dive = pp[1];
+		struct dive *merged;
+
+		if (prev->when + prev->duration.seconds < dive->when)
+			continue;
+
+		merged = try_to_merge(prev, dive);
+		if (!merged)
+			continue;
+
+		free(prev);
+		free(dive);
+		*pp = merged;
+		dive_table.nr--;
+		memmove(pp+1, pp+2, sizeof(*pp)*(dive_table.nr - i));
+
+		/* Redo the new 'i'th dive */
+		i--;
+	}
 }
 
 static void parse_argument(const char *arg)
@@ -71,28 +94,42 @@ static void parse_argument(const char *arg)
 	} while (*++p);
 }
 
-static void on_destroy(GtkWidget* w, gpointer data)
+void update_dive(struct dive *new_dive)
 {
-	gtk_main_quit();
+	static struct dive *buffered_dive;
+	struct dive *old_dive = buffered_dive;
+
+	if (old_dive) {
+		flush_dive_info_changes(old_dive);
+		flush_dive_equipment_changes(old_dive);
+		flush_divelist(old_dive);
+	}
+	if (new_dive) {
+		show_dive_info(new_dive);
+		show_dive_equipment(new_dive);
+	}
+	buffered_dive = new_dive;
 }
 
-static gboolean on_expose(GtkWidget* w, GdkEventExpose* e, gpointer data)
+void renumber_dives(int nr)
 {
-	cairo_t* cr;
-	cr = gdk_cairo_create(w->window);
-	cairo_destroy(cr);
-	return FALSE;
+	int i;
+
+	for (i = 0; i < dive_table.nr; i++) {
+		struct dive *dive = dive_table.dives[i];
+		dive->number = nr + i;
+	}
 }
 
 int main(int argc, char **argv)
 {
 	int i;
-	GtkWidget* win;
 
+	output_units = SI_units;
 	parse_xml_init();
 
-	gtk_init(&argc, &argv);
-
+	init_ui(argc, argv);
+	
 	for (i = 1; i < argc; i++) {
 		const char *a = argv[i];
 
@@ -100,18 +137,20 @@ int main(int argc, char **argv)
 			parse_argument(a);
 			continue;
 		}
-		parse_xml_file(a);
+		GError *error = NULL;
+		parse_xml_file(a, &error);
+		
+		if (error != NULL)
+		{
+			report_error(error);
+			g_error_free(error);
+			error = NULL;
+		}
 	}
 
 	report_dives();
+	dive_list_update_dives();
 
-	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	g_signal_connect(G_OBJECT(win), "destroy",      G_CALLBACK(on_destroy), NULL);
-	g_signal_connect(G_OBJECT(win), "expose-event", G_CALLBACK(on_expose), NULL);
-	gtk_widget_set_app_paintable(win, TRUE);
-	gtk_widget_show_all(win);
-
-	gtk_main();
+	run_ui();
 	return 0;
 }
-