#include "grits.h"
+#include "compat.h"
+
GritsPrefs *prefs = NULL;
GritsPlugins *plugins = NULL;
GritsViewer *viewer = NULL;
static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event,
gpointer _)
{
- if (event->keyval == GDK_q)
+ if (event->keyval == GDK_KEY_q)
return grits_shutdown(widget);
return FALSE;
}
***********/
int main(int argc, char **argv)
{
- g_thread_init(NULL);
- gdk_threads_init();
gtk_init(&argc, &argv);
prefs = grits_prefs_new(NULL, NULL);
plugins = grits_plugins_new(g_getenv("GRITS_PLUGIN_PATH"), prefs);
viewer = grits_opengl_new(plugins, prefs);
- gdk_threads_enter();
GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
+ GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
GtkWidget *config = gtk_notebook_new();
g_signal_connect(window, "delete-event", G_CALLBACK(on_delete), NULL);
g_signal_connect(window, "key-press-event", G_CALLBACK(on_key_press), NULL);
(void)load_plugin;
load_plugin(plugins, "env", viewer, prefs, GTK_NOTEBOOK(config));
//load_plugin(plugins, "elev", viewer, prefs, GTK_NOTEBOOK(config));
- load_plugin(plugins, "sat", viewer, prefs, GTK_NOTEBOOK(config));
- //load_plugin(plugins, "map", viewer, prefs, GTK_NOTEBOOK(config));
+ //load_plugin(plugins, "sat", viewer, prefs, GTK_NOTEBOOK(config));
+ load_plugin(plugins, "map", viewer, prefs, GTK_NOTEBOOK(config));
//load_plugin(plugins, "alert", viewer, prefs, GTK_NOTEBOOK(config));
//load_plugin(plugins, "radar", viewer, prefs, GTK_NOTEBOOK(config));
load_plugin(plugins, "test", viewer, prefs, GTK_NOTEBOOK(config));
gtk_widget_show_all(config);
gtk_main();
- gdk_threads_leave();
- gdk_display_close(gdk_display_get_default());
+ //gdk_display_close(gdk_display_get_default());
prefs = NULL;
plugins = NULL;