Cleanup

[speedometer] / main.c

diff --git a/main.c b/main.c
index d15a304..e67a164 100644 (file)
--- a/main.c
+++ b/main.c
@@ -20,89 +20,71 @@
 #include <hildon/hildon-window.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
-#include <location/location-gps-device.h>
-#include <location/location-gpsd-control.h>
+#include <libosso.h>
 
 #include "callbacks.h"
 #include "appdata.h"
 #include "ui.h"
+#include "util.h"
+
+#define PROGNAME "org.wellu.speedometer"
+
+static AppData *appdata;
+static osso_context_t* osso_ctx;
+
+/* Requests delay from screen blanking
+ * Should be called at least once in every 60 seconds
+ * we're not bothered about errors here as dbus calls
+ * either succeed or not. Worst case would be dimmed
+ * screen anyway.
+ */
+static gboolean delay_display_blanking(gpointer data) {
+       g_print("Requesting not to blank the screen in the next 60 secs.\n");
+       osso_display_blanking_pause(data);
+       return TRUE;
+}
 
-int main(int argc, char** argv) {
-
-       AppData *appdata = g_new0(AppData, 1);
-
-       gtk_init(&argc, &argv);
-
-
-       GtkWidget *hbox;
-       GtkWidget *vbox;
-
+void init_app() {
+       appdata = g_new0(AppData, 1);
        appdata->program = HILDON_PROGRAM(hildon_program_get_instance());
        appdata->window = HILDON_WINDOW(hildon_window_new());
        hildon_program_add_window(appdata->program, appdata->window);
 
-       set_app_bg_black(appdata);
-
-       populate_image_array(appdata);
-
-       load_default_images(appdata);
-
-       vbox = gtk_vbox_new(FALSE, 0);
-       hbox = gtk_hbox_new(TRUE, 0);
+       osso_ctx = osso_initialize(PROGNAME, "1.0", FALSE, NULL);
 
-       gtk_box_pack_start_defaults(vbox, gtk_event_box_new());
-       gtk_box_pack_start_defaults(vbox, hbox);
-
-       gtk_box_pack_start(hbox, appdata->speed_array[0], FALSE, FALSE, 0);
-       gtk_box_pack_start(hbox, appdata->speed_array[1], FALSE, FALSE, 0);
-       gtk_box_pack_start(hbox, appdata->speed_array[2], FALSE, FALSE, 0);
+       delay_display_blanking(osso_ctx);
+       g_timeout_add(55000, (GSourceFunc) delay_display_blanking, osso_ctx);
+}
 
-       gtk_box_pack_start_defaults(vbox, gtk_button_new_with_label("Bottom"));
+void deinit_app() {
+       osso_deinitialize(osso_ctx);
+       stop_gps(appdata);
+}
 
-       gtk_container_add(GTK_CONTAINER(appdata->window), GTK_WIDGET(vbox));
+int main(int argc, char** argv) {
+       gtk_init(&argc, &argv);
 
-       // set the window fullscreen
-       gtk_window_fullscreen(GTK_WINDOW(appdata->window));
+       init_app();
 
-       gtk_widget_show_all(GTK_WIDGET(appdata->window));
+       // loads images from the disk to the image array
+       load_graphics(appdata);
 
+       // set display to 000
+       set_digits_to_zero(appdata);
 
+       // inits the ui placement
+       create_ui(appdata);
 
        g_thread_init(NULL);
 
-       g_idle_add(randomize, appdata);
-
-
-#ifdef __arm__
-       // gps device
-       LocationGPSDevice *device;
-       device = g_object_new(LOCATION_TYPE_GPS_DEVICE, NULL);
-
-       // connect some signal handlers
-       g_signal_connect (device, "changed", G_CALLBACK (location_changed), NULL);
-
-       LocationGPSDControl *control;
-
-       control = location_gpsd_control_get_default();
-       location_gpsd_control_start(control);
-#endif // __arm__
-
-       g_signal_connect(G_OBJECT(appdata->window),
-                       "delete_event",
-                       G_CALLBACK(gtk_main_quit),
-                       NULL);
+       show_cardware_dialog();
 
-    g_signal_connect(G_OBJECT(appdata->window),
-               "key_press_event",
-               G_CALLBACK(key_press_cb),
-               appdata->window);
+       start_gps(appdata);
 
-    g_signal_connect(G_OBJECT(appdata->window),
-               "button_press_event",
-               G_CALLBACK(button_press),
-               appdata->window);
+       gtk_main();
 
-    gtk_main();
+       // here we cleanup things
+       deinit_app();
 
        return EXIT_SUCCESS;
 }