+/* main.c */
#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
#include <time.h>
+#include <gconf/gconf-client.h>
+
#include "dive.h"
-#include "display.h"
+#include "divelist.h"
+
+GConfClient *gconf;
+struct units output_units;
+
+#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;
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--;
+ }
+
+ dive_list_update_dives();
}
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;
-static GtkWidget *dive_profile;
+ 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;
+}
-void repaint_dive(void)
+void renumber_dives(int nr)
{
- gtk_widget_queue_draw(dive_profile);
+ 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;
- GtkWidget *divelist;
- GtkWidget *table;
- GtkWidget *frame;
- parse_xml_init();
+ output_units = SI_units;
- gtk_init(&argc, &argv);
+ parse_xml_init();
+ init_ui(argc, argv);
+
for (i = 1; i < argc; i++) {
const char *a = argv[i];
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();
- win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
-
- /* Table for the list of dives, cairo window, and dive info */
- table = gtk_table_new(2, 2, FALSE);
- gtk_container_set_border_width(GTK_CONTAINER(table), 5);
- gtk_container_add(GTK_CONTAINER(win), table);
- gtk_widget_show(table);
-
- /* Create the atual divelist */
- divelist = create_dive_list();
- gtk_table_attach_defaults(GTK_TABLE(table), divelist, 0, 1, 0, 2);
-
- /* Frame for dive profile */
- frame = dive_profile_frame();
- gtk_table_attach_defaults(GTK_TABLE(table), frame, 1, 2, 1, 2);
-
- dive_profile = frame;
-
- gtk_widget_set_app_paintable(win, TRUE);
- gtk_widget_show_all(win);
-
- gtk_main();
+ run_ui();
return 0;
}