X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Fmain.c;h=af4c0c253d993ac077fc4f8e1b4cc63d5b6553ef;hb=refs%2Fheads%2Fv0.5.x;hp=5f664aa5b78c5f00f65d259c3b30b6af10f170e2;hpb=4c964909b5b3c4ea73f93666dde5a2351658464f;p=aweather
diff --git a/src/main.c b/src/main.c
index 5f664aa..af4c0c2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,12 +15,13 @@
* along with this program. If not, see .
*/
+#define _XOPEN_SOURCE
+#include
#include
#include
-#include
#include
-#include
+#include
#include "aweather-gui.h"
#include "aweather-location.h"
@@ -46,14 +47,23 @@ static void on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
log_levels = (1 << (value+1))-1;
}
-gboolean set_location(gpointer _gui)
+gboolean set_location_time(AWeatherGui *gui, char *site, char *time)
{
- AWeatherGui *gui = _gui;
- gchar *site = g_object_get_data(G_OBJECT(gui), "site");
+ /* Set time
+ * Do this before setting setting location
+ * so that it doesn't refresh twice */
+ struct tm tm = {};
+ strptime(time, "%Y-%m-%d %H:%M", &tm);
+ time_t sec = mktime(&tm);
+ if (sec > 0)
+ grits_viewer_set_time(gui->viewer, sec);
+ g_debug("date = [%s] == %lu\n", time, sec);
+
+ /* Set location */
for (city_t *city = cities; city->type; city++) {
if (city->type == LOCATION_CITY && g_str_equal(city->code, site)) {
- gis_viewer_set_location(gui->viewer,
- city->pos.lat, city->pos.lon, EARTH_R/25);
+ grits_viewer_set_location(gui->viewer,
+ city->pos.lat, city->pos.lon, EARTH_R/35);
break;
}
}
@@ -68,18 +78,21 @@ int main(int argc, char *argv[])
{
/* Defaults */
gint debug = 6;
- gchar *site = "KIND";
+ gchar *site = "";
+ gchar *time = "";
gboolean offline = FALSE;
/* Arguments */
gint opt_debug = 0;
gchar *opt_site = NULL;
+ gchar *opt_time = NULL;
gboolean opt_auto = FALSE;
gboolean opt_offline = FALSE;
GOptionEntry entries[] = {
//long short flg type location description arg desc
{"debug", 'd', 0, G_OPTION_ARG_INT, &opt_debug, "Change default log level", "[1-7]"},
{"site", 's', 0, G_OPTION_ARG_STRING, &opt_site, "Set initial site", NULL},
+ {"time", 't', 0, G_OPTION_ARG_STRING, &opt_time, "Set initial date/time", NULL},
{"offline", 'o', 0, G_OPTION_ARG_NONE, &opt_offline, "Run in offline mode", NULL},
{"auto", 'a', 0, G_OPTION_ARG_NONE, &opt_auto, "Auto update radar (todo)", NULL},
{NULL}
@@ -94,7 +107,6 @@ int main(int argc, char *argv[])
g_error_free(error);
return -1;
}
- gtk_gl_init(&argc, &argv);
/* Do some logging here for aweather_gui_new */
if (opt_debug) log_levels = (1 << (opt_debug+1))-1;
@@ -103,25 +115,31 @@ int main(int argc, char *argv[])
/* Set up AWeather */
gdk_threads_enter();
- AWeatherGui *gui = aweather_gui_new();
-
- gint prefs_debug = gis_prefs_get_integer(gui->prefs, "aweather/log_level", NULL);
- gchar *prefs_site = gis_prefs_get_string(gui->prefs, "aweather/initial_site", NULL);
- gboolean prefs_offline = gis_prefs_get_boolean(gui->prefs, "gis/offline", NULL);
+ /* Pre-load some type for gtkbuilder */
+ GRITS_TYPE_OPENGL;
+ AWEATHER_TYPE_GUI;
+ GtkBuilder *builder = gtk_builder_new();
+ if (!gtk_builder_add_from_file(builder, PKGDATADIR "/main.ui", &error))
+ g_error("Failed to create gtk builder: %s", error->message);
+ AWeatherGui *gui = AWEATHER_GUI(gtk_builder_get_object(builder, "main_window"));
+ g_signal_connect(gui, "destroy", gtk_main_quit, NULL);
+
+ gint prefs_debug = grits_prefs_get_integer(gui->prefs, "aweather/log_level", NULL);
+ gchar *prefs_site = grits_prefs_get_string(gui->prefs, "aweather/initial_site", NULL);
+ gboolean prefs_offline = grits_prefs_get_boolean(gui->prefs, "grits/offline", NULL);
debug = (opt_debug ?: prefs_debug ?: debug);
site = (opt_site ?: prefs_site ?: site);
+ time = (opt_time ?: time);
offline = (opt_offline ?: prefs_offline ?: offline);
- gis_viewer_set_offline(gui->viewer, offline);
+ set_location_time(gui, site, time);
+ grits_viewer_set_offline(gui->viewer, offline);
log_levels = (1 << (debug+1))-1;
GObject *action = aweather_gui_get_object(gui, "prefs_general_log");
g_signal_connect(action, "changed", G_CALLBACK(on_log_level_changed), NULL);
- g_object_set_data(G_OBJECT(gui), "site", site);
- g_idle_add(set_location, gui);
-
gtk_widget_show_all(GTK_WIDGET(gui));
gtk_main();
gdk_threads_leave();