X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Faweather-gui.c;h=771ff20b1745d0b03209e38d3ccf1b7bdc5f050b;hb=1cf8b4ecd92f49dfbbe0472e02d4e5bc8841fe2f;hp=7adecf0c054cd6510b70c478dd491d6eeddeecb2;hpb=55d69c616a9f4f3bae23045f1174047003e2e1d4;p=grits diff --git a/src/aweather-gui.c b/src/aweather-gui.c index 7adecf0..771ff20 100644 --- a/src/aweather-gui.c +++ b/src/aweather-gui.c @@ -31,38 +31,54 @@ /**************** * GObject code * ****************/ -G_DEFINE_TYPE(AWeatherGui, aweather_gui, G_TYPE_OBJECT); +G_DEFINE_TYPE(AWeatherGui, aweather_gui, GTK_TYPE_WINDOW); static void aweather_gui_init(AWeatherGui *gui) { gui->plugins = NULL; - //g_message("aweather_gui_init"); + g_debug("AWeatherGui: init"); } static GObject *aweather_gui_constructor(GType gtype, guint n_properties, GObjectConstructParam *properties) { - //g_message("aweather_gui_constructor"); + 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) +static void aweather_gui_dispose(GObject *gobject) { - //g_message("aweather_gui_dispose"); + g_debug("AWeatherGui: 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); + 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_message("aweather_gui_finalize"); + 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_message("aweather_gui_class_init"); + g_debug("AWeatherGui: class_init"); GObjectClass *gobject_class = G_OBJECT_CLASS(klass); gobject_class->constructor = aweather_gui_constructor; gobject_class->dispose = aweather_gui_dispose; @@ -72,22 +88,39 @@ static void aweather_gui_class_init(AWeatherGuiClass *klass) /************* * Callbacks * *************/ -gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *gui) +gboolean on_drawing_button_press(GtkWidget *widget, GdkEventButton *event, AWeatherGui *gui) +{ + 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_message("key_press: key=%x, state=%x", event->keyval, event->state); + 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; +} + +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); if (event->keyval == GDK_q) - gtk_main_quit(); + 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_Right) aweather_view_pan(view, z/10, 0, 0); - else if (event->keyval == GDK_Left) aweather_view_pan(view, -z/10, 0, 0); - else if (event->keyval == GDK_Up) aweather_view_pan(view, 0, z/10, 0); - else if (event->keyval == GDK_Down) aweather_view_pan(view, 0, -z/10, 0); - else if (event->keyval == GDK_minus) aweather_view_zoom(view, 10./9); - else if (event->keyval == GDK_plus) aweather_view_zoom(view, 9./10); 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); @@ -97,27 +130,54 @@ gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *gui) else gtk_notebook_set_current_page(tabs, (cur_tab+1)%num_tabs); }; - return TRUE; + return FALSE; } -void on_refresh(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_refresh(view); + aweather_view_set_offline(view, + gtk_toggle_action_get_active(action)); } -void on_zoomin(GtkToolButton *button, AWeatherGui *gui) +void on_zoomin(GtkAction *action, AWeatherGui *gui) { AWeatherView *view = aweather_gui_get_view(gui); aweather_view_zoom(view, 3./4); } -void on_zoomout(GtkToolButton *button, AWeatherGui *gui) +void on_zoomout(GtkAction *action, AWeatherGui *gui) { AWeatherView *view = aweather_gui_get_view(gui); 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, GtkTreeViewColumn *column, AWeatherGui *gui) { @@ -145,9 +205,8 @@ void on_site_changed(GtkComboBox *combo, AWeatherGui *gui) gboolean on_map(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui) { - g_message("on_map"); + g_debug("AWeatherGui: on_map"); AWeatherView *view = aweather_gui_get_view(gui); - aweather_view_set_site(view, "IND"); /* Misc */ glEnable(GL_BLEND); @@ -171,7 +230,7 @@ gboolean on_map(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui) gboolean on_configure(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui) { - //g_message("on_confiure"); + g_debug("AWeatherGui: on_confiure"); aweather_gui_gl_begin(gui); double x, y, z; @@ -190,16 +249,16 @@ gboolean on_configure(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui) double rad = atan((height/2)/500); double deg = (rad*180)/M_PI; - //gluPerspective(deg*2, width/height, -z-20, -z+20); - gluPerspective(deg*2, width/height, 1, 500*1000); + gluPerspective(deg*2, width/height, -z-20, -z+20); + //gluPerspective(deg*2, width/height, 1, 500*1000); aweather_gui_gl_end(gui); return FALSE; } -gboolean on_expose_begin(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui) +gboolean on_expose(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui) { - g_message("aweather:expose_begin"); + g_debug("AWeatherGui: on_expose - begin"); aweather_gui_gl_begin(gui); double x, y, z; @@ -218,30 +277,12 @@ gboolean on_expose_begin(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui) aweather_plugin_expose(plugin); } - return FALSE; -} -gboolean on_expose_end(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui) -{ - g_message("aweather:expose_end\n"); aweather_gui_gl_end(gui); aweather_gui_gl_flush(gui); + g_debug("AWeatherGui: on_expose - end\n"); return FALSE; } -void on_about(GtkMenuItem *item, AWeatherGui *gui) -{ - GError *error = NULL; - GtkBuilder *builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, DATADIR "/aweather/about.xml", &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_location_changed(AWeatherView *view, gdouble x, gdouble y, gdouble z, AWeatherGui *gui) { @@ -252,9 +293,9 @@ void on_location_changed(AWeatherView *view, } /* 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++) { @@ -278,7 +319,7 @@ static void update_time_widget(AWeatherView *view, char *time, AWeatherGui *gui) } static void update_site_widget(AWeatherView *view, char *site, AWeatherGui *gui) { - g_message("updating site widget to %s", site); + 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++) { @@ -289,6 +330,8 @@ static void update_site_widget(AWeatherView *view, char *site, AWeatherGui *gui) gtk_tree_model_iter_nth_child(model, &iter2, &iter1, i); char *text; gtk_tree_model_get(model, &iter2, 1, &text, -1); + if (text == NULL) + continue; if (g_str_equal(text, site)) { g_signal_handlers_block_by_func(combo, G_CALLBACK(on_site_changed), gui); @@ -316,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); @@ -329,15 +372,10 @@ 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); + 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, "site-changed", G_CALLBACK(update_site_widget), gui); @@ -345,14 +383,13 @@ static void site_setup(AWeatherGui *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); AWeatherView *aview = aweather_gui_get_view(gui); g_signal_connect(aview, "time-changed", G_CALLBACK(update_time_widget), gui); @@ -372,10 +409,9 @@ static void opengl_setup(AWeatherGui *gui) g_error("GL lacks required capabilities"); /* 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_begin), gui); - g_signal_connect_after(drawing, "expose-event", G_CALLBACK(on_expose_end), gui); + 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); } @@ -385,28 +421,26 @@ static void opengl_setup(AWeatherGui *gui) ***********/ 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/main.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, "main")); - 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, gui); - + 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 */ - aweather_view_set_location(gui->view, 0, 0, -300*1000); - g_signal_connect(gui->view, "location-changed", G_CALLBACK(on_location_changed), 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) { @@ -415,25 +449,33 @@ 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); 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_message("registering plugin"); + g_debug("AWeatherGui: register_plugin"); gui->plugins = g_list_append(gui->plugins, plugin); } void aweather_gui_gl_redraw(AWeatherGui *gui) { - g_message("redraw"); + g_debug("AWeatherGui: gl_redraw"); GtkWidget *drawing = aweather_gui_get_widget(gui, "drawing"); gtk_widget_queue_draw(drawing); }