]> Pileus Git - grits/blobdiff - src/aweather-gui.c
* Removing glade (pure gtk-builder)
[grits] / src / aweather-gui.c
index 555a9c268f7e62f5e61890952c381a3677e5894d..771ff20b1745d0b03209e38d3ccf1b7bdc5f050b 100644 (file)
 
 #include "aweather-gui.h"
 #include "aweather-view.h"
+#include "aweather-plugin.h"
 #include "location.h"
 
+/****************
+ * GObject code *
+ ****************/
+G_DEFINE_TYPE(AWeatherGui, aweather_gui, GTK_TYPE_WINDOW);
+static void aweather_gui_init(AWeatherGui *gui)
+{
+       gui->plugins = NULL;
+       g_debug("AWeatherGui: init");
+}
+static GObject *aweather_gui_constructor(GType gtype, guint n_properties,
+               GObjectConstructParam *properties)
+{
+       g_debug("aweather_gui: constructor");
+       GObjectClass *parent_class = G_OBJECT_CLASS(aweather_gui_parent_class);
+       return  parent_class->constructor(gtype, n_properties, properties);
+}
+static void aweather_gui_dispose(GObject *gobject)
+{
+       g_debug("AWeatherGui: dispose");
+       AWeatherGui *gui = AWEATHER_GUI(gobject);
+       if (gui->view) {
+               g_object_unref(gui->view);
+               gui->view = NULL;
+       }
+       if (gui->builder) {
+               /* Reparent to avoid double unrefs */
+               GtkWidget *body   = aweather_gui_get_widget(gui, "body");
+               GtkWidget *window = aweather_gui_get_widget(gui, "window");
+               gtk_widget_reparent(body, window);
+               g_object_unref(gui->builder);
+               gui->builder = NULL;
+       }
+       if (gui->plugins) {
+               g_list_foreach(gui->plugins, (GFunc)g_object_unref, NULL);
+               g_list_free(gui->plugins);
+               gui->plugins = NULL;
+       }
+       //for (GList *cur = gui->plugins; cur; cur = cur->next)
+       //      g_object_unref(cur->data);
+       G_OBJECT_CLASS(aweather_gui_parent_class)->dispose(gobject);
+}
+static void aweather_gui_finalize(GObject *gobject)
+{
+       g_debug("AWeatherGui: finalize");
+       G_OBJECT_CLASS(aweather_gui_parent_class)->finalize(gobject);
+       gtk_main_quit();
+
+}
+static void aweather_gui_class_init(AWeatherGuiClass *klass)
+{
+       g_debug("AWeatherGui: class_init");
+       GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
+       gobject_class->constructor  = aweather_gui_constructor;
+       gobject_class->dispose      = aweather_gui_dispose;
+       gobject_class->finalize     = aweather_gui_finalize;
+}
+
 /*************
- * callbacks *
+ * Callbacks *
  *************/
-gboolean on_window_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
+gboolean on_drawing_button_press(GtkWidget *widget, GdkEventButton *event, AWeatherGui *gui)
 {
-       if (event->keyval == GDK_q)
-               gtk_main_quit();
+       g_debug("AWeatherGui: on_drawing_button_press - Grabbing focus");
+       GtkWidget *drawing = aweather_gui_get_widget(gui, "drawing");
+       gtk_widget_grab_focus(drawing);
+       return TRUE;
+}
+gboolean on_drawing_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *gui)
+{
+       g_debug("AWeatherGui: on_drawing_key_press - key=%x, state=%x",
+                       event->keyval, event->state);
+       AWeatherView *view = aweather_gui_get_view(gui);
+       double x,y,z;
+       aweather_view_get_location(view, &x, &y, &z);
+       guint kv = event->keyval;
+       if      (kv == GDK_Right || kv == GDK_l) aweather_view_pan(view,  z/10, 0, 0);
+       else if (kv == GDK_Left  || kv == GDK_h) aweather_view_pan(view, -z/10, 0, 0);
+       else if (kv == GDK_Up    || kv == GDK_k) aweather_view_pan(view, 0,  z/10, 0);
+       else if (kv == GDK_Down  || kv == GDK_j) aweather_view_pan(view, 0, -z/10, 0);
+       else if (kv == GDK_minus || kv == GDK_o) aweather_view_zoom(view, 10./9);
+       else if (kv == GDK_plus  || kv == GDK_i) aweather_view_zoom(view, 9./10);
        return TRUE;
 }
 
-void on_refresh(GtkToolButton *button, AWeatherGui *gui)
+gboolean on_gui_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *gui)
 {
+       g_debug("AWeatherGui: on_gui_key_press - key=%x, state=%x",
+                       event->keyval, event->state);
        AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_refresh(view);
+       if (event->keyval == GDK_q)
+               gtk_widget_destroy(GTK_WIDGET(gui));
+       else if (event->keyval == GDK_r && event->state & GDK_CONTROL_MASK)
+               aweather_view_refresh(view);
+       else if (event->keyval == GDK_Tab || event->keyval == GDK_ISO_Left_Tab) {
+               GtkNotebook *tabs = GTK_NOTEBOOK(aweather_gui_get_widget(gui, "tabs"));
+               gint num_tabs = gtk_notebook_get_n_pages(tabs);
+               gint cur_tab  = gtk_notebook_get_current_page(tabs);
+               if (event->state & GDK_SHIFT_MASK)
+                       gtk_notebook_set_current_page(tabs, (cur_tab-1)%num_tabs);
+               else 
+                       gtk_notebook_set_current_page(tabs, (cur_tab+1)%num_tabs);
+       };
+       return FALSE;
 }
 
-void on_zoomin(GtkToolButton *button, AWeatherGui *gui)
+void on_quit(GtkMenuItem *menu, AWeatherGui *gui)
+{
+       gtk_widget_destroy(GTK_WIDGET(gui));
+}
+
+void on_offline(GtkToggleAction *action, AWeatherGui *gui)
 {
        AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_zoomin(view);
+       aweather_view_set_offline(view,
+               gtk_toggle_action_get_active(action));
 }
 
-void on_zoomout(GtkToolButton *button, AWeatherGui *gui)
+void on_zoomin(GtkAction *action, AWeatherGui *gui)
 {
        AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_zoomout(view);
+       aweather_view_zoom(view, 3./4);
 }
 
-void on_site_changed(GtkComboBox *combo, AWeatherGui *gui)
+void on_zoomout(GtkAction *action, AWeatherGui *gui)
 {
-       gchar *site;
-       GtkTreeIter iter;
-       GtkTreeModel *model = gtk_combo_box_get_model(combo);
-       gtk_combo_box_get_active_iter(combo, &iter);
-       gtk_tree_model_get(model, &iter, 1, &site, -1);
        AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_set_location(view, site);
-       g_free(site);
+       aweather_view_zoom(view, 4./3);
+}
+
+void on_refresh(GtkAction *action, AWeatherGui *gui)
+{
+       AWeatherView *view = aweather_gui_get_view(gui);
+       aweather_view_refresh(view);
+}
+
+void on_about(GtkAction *action, AWeatherGui *gui)
+{
+       // TODO: use gtk_widget_hide_on_delete()
+       GError *error = NULL;
+       GtkBuilder *builder = gtk_builder_new();
+       if (!gtk_builder_add_from_file(builder, DATADIR "/aweather/about.ui", &error))
+               g_error("Failed to create gtk builder: %s", error->message);
+       gtk_builder_connect_signals(builder, NULL);
+       GtkWidget *window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
+       gtk_window_set_transient_for(GTK_WINDOW(window),
+                       GTK_WINDOW(aweather_gui_get_widget(gui, "window")));
+       gtk_widget_show_all(window);
+       g_object_unref(builder);
 }
 
 void on_time_changed(GtkTreeView *view, GtkTreePath *path,
@@ -80,11 +191,22 @@ void on_time_changed(GtkTreeView *view, GtkTreePath *path,
        g_free(time);
 }
 
-static gboolean on_map(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
+void on_site_changed(GtkComboBox *combo, AWeatherGui *gui)
 {
-       //g_message("map:map");
+       gchar *site;
+       GtkTreeIter iter;
+       GtkTreeModel *model = gtk_combo_box_get_model(combo);
+       gtk_combo_box_get_active_iter(combo, &iter);
+       gtk_tree_model_get(model, &iter, 1, &site, -1);
+       AWeatherView *view = aweather_gui_get_view(gui);
+       aweather_view_set_site(view, site);
+       g_free(site);
+}
+
+gboolean on_map(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
+{
+       g_debug("AWeatherGui: on_map");
        AWeatherView *view = aweather_gui_get_view(gui);
-       aweather_view_set_location(view, "IND");
 
        /* Misc */
        glEnable(GL_BLEND);
@@ -106,51 +228,74 @@ static gboolean on_map(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui
        return FALSE;
 }
 
-static gboolean on_configure(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
+gboolean on_configure(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
 {
+       g_debug("AWeatherGui: on_confiure");
        aweather_gui_gl_begin(gui);
 
+       double x, y, z;
+       AWeatherView *view = aweather_gui_get_view(gui);
+       aweather_view_get_location(view, &x, &y, &z);
+
+       /* Window is at 500 m from camera */
        double width  = da->allocation.width;
        double height = da->allocation.height;
-       double dist   = 500*1000; // 500 km
-       double cam    = 300*1000; // 500 km
 
        glViewport(0, 0, width, height);
 
        /* Perspective */
        glMatrixMode(GL_PROJECTION);
        glLoadIdentity();
-       double rad = atan(height/2*1000.0/dist); // 1px = 1000 meters
-       double deg = (rad*180)/M_PI;
-       gluPerspective(deg*2, width/height, cam-20, cam+20);
+       double rad  = atan((height/2)/500);
+       double deg  = (rad*180)/M_PI;
 
-       /* Camera position? */
-       glMatrixMode(GL_MODELVIEW);
-       glLoadIdentity();
-       glTranslatef(0.0, 0.0, -cam);
-       //glRotatef(-45, 1, 0, 0);
+       gluPerspective(deg*2, width/height, -z-20, -z+20);
+       //gluPerspective(deg*2, width/height, 1, 500*1000);
 
        aweather_gui_gl_end(gui);
        return FALSE;
 }
 
-static gboolean on_expose_begin(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui)
+gboolean on_expose(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui)
 {
+       g_debug("AWeatherGui: on_expose - begin");
        aweather_gui_gl_begin(gui);
-       return FALSE;
-}
-static gboolean on_expose_end(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui)
-{
-       g_message("aweather:espose_end\n");
+
+       double x, y, z;
+       AWeatherView *view = aweather_gui_get_view(gui);
+       aweather_view_get_location(view, &x, &y, &z);
+
+       glMatrixMode(GL_MODELVIEW);
+       glLoadIdentity();
+       glTranslatef(x, y, z);
+
+       //glRotatef(-45, 1, 0, 0);
+
+       /* Expose plugins */
+       for (GList *cur = gui->plugins; cur; cur = cur->next) {
+               AWeatherPlugin *plugin = AWEATHER_PLUGIN(cur->data);
+               aweather_plugin_expose(plugin);
+       }
+
        aweather_gui_gl_end(gui);
        aweather_gui_gl_flush(gui);
+       g_debug("AWeatherGui: on_expose - end\n");
        return FALSE;
 }
 
+void on_location_changed(AWeatherView *view,
+               gdouble x, gdouble y, gdouble z, AWeatherGui *gui)
+{
+       /* Reset clipping area and redraw */
+       GtkWidget *da = aweather_gui_get_widget(gui, "drawing");
+       on_configure(da, NULL, gui);
+       aweather_gui_gl_redraw(gui);
+}
+
 /* TODO: replace the code in these with `gtk_tree_model_find' utility */
-static void update_time_widget(AWeatherView *view, char *time, AWeatherGui *gui)
+static void update_time_widget(AWeatherView *view, const char *time, AWeatherGui *gui)
 {
-       g_message("updating time widget");
+       g_debug("AWeatherGui: update_time_widget - time=%s", time);
        GtkTreeView  *tview = GTK_TREE_VIEW(aweather_gui_get_widget(gui, "time"));
        GtkTreeModel *model = GTK_TREE_MODEL(gtk_tree_view_get_model(tview));
        for (int i = 0; i < gtk_tree_model_iter_n_children(model, NULL); i++) {
@@ -172,9 +317,9 @@ static void update_time_widget(AWeatherView *view, char *time, AWeatherGui *gui)
                g_free(text);
        }
 }
-static void update_location_widget(AWeatherView *view, char *location, AWeatherGui *gui)
+static void update_site_widget(AWeatherView *view, char *site, AWeatherGui *gui)
 {
-       g_message("updating location widget to %s", location);
+       g_debug("AWeatherGui: updat_site_widget - site=%s", site);
        GtkComboBox  *combo = GTK_COMBO_BOX(aweather_gui_get_widget(gui, "site"));
        GtkTreeModel *model = GTK_TREE_MODEL(gtk_combo_box_get_model(combo));
        for (int i = 0; i < gtk_tree_model_iter_n_children(model, NULL); i++) {
@@ -185,7 +330,9 @@ static void update_location_widget(AWeatherView *view, char *location, AWeatherG
                        gtk_tree_model_iter_nth_child(model, &iter2, &iter1, i);
                        char *text;
                        gtk_tree_model_get(model, &iter2, 1, &text, -1);
-                       if (g_str_equal(text, location)) {
+                       if (text == NULL)
+                               continue;
+                       if (g_str_equal(text, site)) {
                                g_signal_handlers_block_by_func(combo,
                                                G_CALLBACK(on_site_changed), gui);
                                gtk_combo_box_set_active_iter(combo, &iter2);
@@ -212,7 +359,7 @@ static void combo_sensitive(GtkCellLayout *cell_layout, GtkCellRenderer *cell,
 static void site_setup(AWeatherGui *gui)
 {
        GtkTreeIter state, city;
-       GtkTreeStore *store = gtk_tree_store_new(2, G_TYPE_STRING, G_TYPE_STRING);
+       GtkTreeStore *store = GTK_TREE_STORE(aweather_gui_get_object(gui, "sites"));
        for (int i = 0; cities[i].label; i++) {
                if (cities[i].type == LOCATION_STATE) {
                        gtk_tree_store_append(store, &state, NULL);
@@ -225,33 +372,25 @@ static void site_setup(AWeatherGui *gui)
                }
        }
 
-       GtkWidget       *combo    = aweather_gui_get_widget(gui, "site");
-       GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
-       gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo), renderer, FALSE);
-       gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo), renderer, "text", 0, NULL);
-       gtk_combo_box_set_model(GTK_COMBO_BOX(combo), GTK_TREE_MODEL(store));
-       gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo), renderer,
-                       combo_sensitive, NULL, NULL);
-       g_object_unref(renderer);
-       g_object_unref(store);
-
-       g_signal_connect(combo, "changed", G_CALLBACK(on_site_changed),  gui);
+       GtkWidget *combo    = aweather_gui_get_widget(gui, "site");
+       GObject   *renderer = aweather_gui_get_object(gui, "site_rend");
+       gtk_cell_layout_set_cell_data_func(GTK_CELL_LAYOUT(combo),
+                       GTK_CELL_RENDERER(renderer), combo_sensitive, NULL, NULL);
+
        AWeatherView *aview = aweather_gui_get_view(gui);
-       g_signal_connect(aview, "location-changed", G_CALLBACK(update_location_widget), gui);
+       g_signal_connect(aview, "site-changed", G_CALLBACK(update_site_widget), gui);
 }
 
 static void time_setup(AWeatherGui *gui)
 {
-       GtkTreeView  *tview  = GTK_TREE_VIEW(aweather_gui_get_widget(gui, "time"));
-       GtkTreeModel *store  = GTK_TREE_MODEL(gtk_list_store_new(1, G_TYPE_STRING));
-       gtk_tree_view_set_model(tview, store);
-
-       GtkCellRenderer   *rend = gtk_cell_renderer_text_new();
-       GtkTreeViewColumn *col  = gtk_tree_view_column_new_with_attributes(
+       GtkTreeView       *tview = GTK_TREE_VIEW(aweather_gui_get_widget(gui, "time"));
+       GtkCellRenderer   *rend  = gtk_cell_renderer_text_new();
+       GtkTreeViewColumn *col   = gtk_tree_view_column_new_with_attributes(
                                        "Time", rend, "text", 0, NULL);
+
        gtk_tree_view_append_column(tview, col);
+       g_object_set(rend, "size-points", 8.0, NULL);
 
-       g_signal_connect(tview, "row-activated", G_CALLBACK(on_time_changed), gui);
        AWeatherView *aview = aweather_gui_get_view(gui);
        g_signal_connect(aview, "time-changed", G_CALLBACK(update_time_widget), gui);
 }
@@ -269,93 +408,39 @@ static void opengl_setup(AWeatherGui *gui)
                                glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE))
                g_error("GL lacks required capabilities");
 
-       /* Set up OpenGL Stuff */
-       g_signal_connect      (drawing, "map-event",       G_CALLBACK(on_map),          gui);
-       g_signal_connect      (drawing, "configure-event", G_CALLBACK(on_configure),    gui);
-       g_signal_connect      (drawing, "expose-event",    G_CALLBACK(on_expose_begin), gui);
-       g_signal_connect_after(drawing, "expose-event",    G_CALLBACK(on_expose_end),   gui);
-}
-
-static void toolbar_setup(AWeatherGui *gui)
-{
-       GtkWidget *refresh = aweather_gui_get_widget(gui, "refresh_button");
-       GtkWidget *zoomin  = aweather_gui_get_widget(gui, "zoomin_button");
-       GtkWidget *zoomout = aweather_gui_get_widget(gui, "zoomout_button");
-       g_signal_connect(refresh, "clicked", G_CALLBACK(on_refresh), gui);
-       g_signal_connect(zoomin,  "clicked", G_CALLBACK(on_zoomin ), gui);
-       g_signal_connect(zoomout, "clicked", G_CALLBACK(on_zoomout), gui);
-}
-
-
-/****************
- * GObject code *
- ****************/
-G_DEFINE_TYPE(AWeatherGui, aweather_gui, G_TYPE_OBJECT);
-
-/* Constructor / destructors */
-static void aweather_gui_init(AWeatherGui *gui)
-{
-       //g_message("aweather_gui_init");
+       /* Set up OpenGL Stuff, glade doesn't like doing these */
+       g_signal_connect(drawing, "map-event",       G_CALLBACK(on_map),       gui);
+       g_signal_connect(drawing, "configure-event", G_CALLBACK(on_configure), gui);
+       g_signal_connect(drawing, "expose-event",    G_CALLBACK(on_expose),    gui);
 }
 
-static GObject *aweather_gui_constructor(GType gtype, guint n_properties,
-               GObjectConstructParam *properties)
-{
-       //g_message("aweather_gui_constructor");
-       GObjectClass *parent_class = G_OBJECT_CLASS(aweather_gui_parent_class);
-       return  parent_class->constructor(gtype, n_properties, properties);
-}
-
-static void aweather_gui_dispose (GObject *gobject)
-{
-       //g_message("aweather_gui_dispose");
-       AWeatherGui *gui = AWEATHER_GUI(gobject);
-       g_object_unref(gui->view   );
-       g_object_unref(gui->builder);
-       g_object_unref(gui->window );
-       g_object_unref(gui->tabs   );
-       g_object_unref(gui->drawing);
-       G_OBJECT_CLASS(aweather_gui_parent_class)->dispose(gobject);
-}
-
-static void aweather_gui_finalize(GObject *gobject)
-{
-       //g_message("aweather_gui_finalize");
-       G_OBJECT_CLASS(aweather_gui_parent_class)->finalize(gobject);
-}
 
-static void aweather_gui_class_init(AWeatherGuiClass *klass)
-{
-       //g_message("aweather_gui_class_init");
-       GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
-       gobject_class->constructor  = aweather_gui_constructor;
-       gobject_class->dispose      = aweather_gui_dispose;
-       gobject_class->finalize     = aweather_gui_finalize;
-}
 
-/* Methods */
+/***********
+ * Methods *
+ ***********/
 AWeatherGui *aweather_gui_new()
 {
-       //g_message("aweather_gui_new");
+       g_debug("AWeatherGui: new");
        GError *error = NULL;
 
-       AWeatherGui *gui = g_object_new(AWEATHER_TYPE_GUI, NULL);
+       AWeatherGui *self = g_object_new(AWEATHER_TYPE_GUI, NULL);
+       self->view    = aweather_view_new();
+       self->builder = gtk_builder_new();
 
-       gui->builder = gtk_builder_new();
-       if (!gtk_builder_add_from_file(gui->builder, DATADIR "/aweather/aweather.xml", &error))
+       if (!gtk_builder_add_from_file(self->builder, DATADIR "/aweather/main.ui", &error))
                g_error("Failed to create gtk builder: %s", error->message);
-       gui->view    = aweather_view_new();
-       gui->window  = GTK_WINDOW      (gtk_builder_get_object(gui->builder, "window"));
-       gui->tabs    = GTK_NOTEBOOK    (gtk_builder_get_object(gui->builder, "tabs")); 
-       gui->drawing = GTK_DRAWING_AREA(gtk_builder_get_object(gui->builder, "drawing"));
-       gtk_builder_connect_signals(gui->builder, NULL);
+       gtk_builder_connect_signals(self->builder, self);
+       g_signal_connect(self, "key-press-event", G_CALLBACK(on_gui_key_press), self);
+       gtk_widget_reparent(aweather_gui_get_widget(self, "body"), GTK_WIDGET(self));
 
        /* Load components */
-       toolbar_setup(gui);
-       site_setup(gui);
-       time_setup(gui);
-       opengl_setup(gui);
-       return gui;
+       aweather_view_set_location(self->view, 0, 0, -300*1000);
+       g_signal_connect(self->view, "location-changed", G_CALLBACK(on_location_changed), self);
+       site_setup(self);
+       time_setup(self);
+       opengl_setup(self);
+       return self;
 }
 AWeatherView *aweather_gui_get_view(AWeatherGui *gui)
 {
@@ -364,16 +449,36 @@ AWeatherView *aweather_gui_get_view(AWeatherGui *gui)
 }
 GtkBuilder *aweather_gui_get_builder(AWeatherGui *gui)
 {
+       g_debug("AWeatherGui: get_builder");
        g_assert(AWEATHER_IS_GUI(gui));
        return gui->builder;
 }
 GtkWidget *aweather_gui_get_widget(AWeatherGui *gui, const gchar *name)
 {
+       g_debug("AWeatherGui: get_widget - name=%s", name);
        g_assert(AWEATHER_IS_GUI(gui));
        GObject *widget = gtk_builder_get_object(gui->builder, name);
-       g_assert(GTK_IS_WIDGET(widget));
+       if (!GTK_IS_WIDGET(widget))
+               g_error("Failed to get widget `%s'", name);
        return GTK_WIDGET(widget);
 }
+GObject *aweather_gui_get_object(AWeatherGui *gui, const gchar *name)
+{
+       g_debug("AWeatherGui: get_widget - name=%s", name);
+       g_assert(AWEATHER_IS_GUI(gui));
+       return gtk_builder_get_object(gui->builder, name);
+}
+void aweather_gui_register_plugin(AWeatherGui *gui, AWeatherPlugin *plugin)
+{
+       g_debug("AWeatherGui: register_plugin");
+       gui->plugins = g_list_append(gui->plugins, plugin);
+}
+void aweather_gui_gl_redraw(AWeatherGui *gui)
+{
+       g_debug("AWeatherGui: gl_redraw");
+       GtkWidget *drawing = aweather_gui_get_widget(gui, "drawing");
+       gtk_widget_queue_draw(drawing);
+}
 void aweather_gui_gl_begin(AWeatherGui *gui)
 {
        g_assert(AWEATHER_IS_GUI(gui));
@@ -403,4 +508,3 @@ void aweather_gui_gl_flush(AWeatherGui *gui)
                glFlush();
        gdk_gl_drawable_gl_end(gldrawable);
 }
-//void aweather_gui_register_plugin(AWeatherGui *gui, AWeatherPlugin *plugin);