#include <config.h>
#include <gtk/gtk.h>
#include <gtk/gtkgl.h>
+#include <glib/gstdio.h>
#include <gis.h>
static void log_func(const gchar *log_domain, GLogLevelFlags log_level,
const gchar *message, gpointer udata)
{
- if (log_level & log_levels)
- g_log_default_handler(log_domain, log_level, message, udata);
+ if (log_level & log_levels) {
+ if (log_level == G_LOG_LEVEL_DEBUG)
+ g_fprintf(stderr, "DEBUG: (%p) %s\n",
+ g_thread_self(), message);
+ else
+ g_log_default_handler(log_domain, log_level, message, udata);
+ }
}
static void on_log_level_changed(GtkSpinButton *spinner, AWeatherGui *self)
log_levels = (1 << (value+1))-1;
}
+gboolean set_location(gpointer _gui)
+{
+ AWeatherGui *gui = _gui;
+ gchar *site = g_object_get_data(G_OBJECT(gui), "site");
+ 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);
+ break;
+ }
+ }
+ return FALSE;
+}
+
/********
* Main *
{
/* Defaults */
gint debug = 6;
- gchar *site = "KIND";
+ gchar *site = "";
gboolean offline = FALSE;
/* Arguments */
/* Init */
GError *error = NULL;
g_thread_init(NULL);
+ gdk_threads_init();
if (!gtk_init_with_args(&argc, &argv, "aweather", entries, NULL, &error)) {
g_print("%s\n", error->message);
g_error_free(error);
g_log_set_handler(NULL, G_LOG_LEVEL_MASK, log_func, NULL);
/* Set up AWeather */
- AWeatherGui *gui = aweather_gui_new();
+ gdk_threads_enter();
+ /* Pre-load some type for gtkbuilder */
+ GIS_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 = gis_prefs_get_integer(gui->prefs, "aweather/log_level", NULL);
gchar *prefs_site = gis_prefs_get_string(gui->prefs, "aweather/initial_site", NULL);
GObject *action = aweather_gui_get_object(gui, "prefs_general_log");
g_signal_connect(action, "changed", G_CALLBACK(on_log_level_changed), NULL);
- /* set locaiton */
- 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);
- break;
- }
+ 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();
+ gdk_display_close(gdk_display_get_default());
return 0;
}