X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=src%2Faweather-gui.c;h=081b8778b7d569698d757d72ce15b52a5d1fe0da;hb=d26865d4af82ff82e7146b4590baedc21aac47bb;hp=320a14d59de224a17a8a36c9de2d45c5981ea44e;hpb=93c853165104b5119e17be07e325f9097a5ebdb3;p=grits

diff --git a/src/aweather-gui.c b/src/aweather-gui.c
index 320a14d..081b877 100644
--- a/src/aweather-gui.c
+++ b/src/aweather-gui.c
@@ -30,13 +30,48 @@
 /*************
  * callbacks *
  *************/
-gboolean on_window_key_press_event(GtkWidget *widget, GdkEventKey *event, gpointer data)
+gboolean on_key_press(GtkWidget *widget, GdkEventKey *event, AWeatherGui *gui)
 {
+	g_message("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();
+	else if (event->keyval == GDK_r && event->state & GDK_CONTROL_MASK)
+		aweather_view_refresh(view);
+	else if (event->keyval == GDK_plus)
+		aweather_view_zoomin(view);
+	else if (event->keyval == GDK_minus)
+		aweather_view_zoomout(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 TRUE;
 }
 
+void on_refresh(GtkToolButton *button, AWeatherGui *gui)
+{
+	AWeatherView *view = aweather_gui_get_view(gui);
+	aweather_view_refresh(view);
+}
+
+void on_zoomin(GtkToolButton *button, AWeatherGui *gui)
+{
+	AWeatherView *view = aweather_gui_get_view(gui);
+	aweather_view_zoomin(view);
+}
+
+void on_zoomout(GtkToolButton *button, AWeatherGui *gui)
+{
+	AWeatherView *view = aweather_gui_get_view(gui);
+	aweather_view_zoomout(view);
+}
+
 void on_site_changed(GtkComboBox *combo, AWeatherGui *gui)
 {
 	gchar *site;
@@ -46,6 +81,7 @@ void on_site_changed(GtkComboBox *combo, AWeatherGui *gui)
 	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);
 }
 
 void on_time_changed(GtkTreeView *view, GtkTreePath *path,
@@ -58,11 +94,12 @@ void on_time_changed(GtkTreeView *view, GtkTreePath *path,
 	gtk_tree_model_get(model, &iter, 0, &time, -1);
 	AWeatherView *aview = aweather_gui_get_view(gui);
 	aweather_view_set_time(aview, time);
+	g_free(time);
 }
 
-static gboolean map(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
+gboolean on_map(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
 {
-	//g_message("map:map");
+	g_message("on_map");
 	AWeatherView *view = aweather_gui_get_view(gui);
 	aweather_view_set_location(view, "IND");
 
@@ -86,8 +123,9 @@ static gboolean map(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
 	return FALSE;
 }
 
-static gboolean configure(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
+gboolean on_configure(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *gui)
 {
+	//g_message("on_confiure");
 	aweather_gui_gl_begin(gui);
 
 	double width  = da->allocation.width;
@@ -114,12 +152,13 @@ static gboolean configure(GtkWidget *da, GdkEventConfigure *event, AWeatherGui *
 	return FALSE;
 }
 
-static gboolean expose_begin(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui)
+gboolean on_expose_begin(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui)
 {
+	g_message("aweather:espose_begin");
 	aweather_gui_gl_begin(gui);
 	return FALSE;
 }
-static gboolean expose_end(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui)
+gboolean on_expose_end(GtkWidget *da, GdkEventExpose *event, AWeatherGui *gui)
 {
 	g_message("aweather:espose_end\n");
 	aweather_gui_gl_end(gui);
@@ -140,11 +179,16 @@ static void update_time_widget(AWeatherView *view, char *time, AWeatherGui *gui)
 		gtk_tree_model_get(model, &iter, 0, &text, -1);
 		if (g_str_equal(text, time)) {
 			GtkTreePath *path = gtk_tree_model_get_path(model, &iter);
-			g_signal_handlers_block_by_func(tview, G_CALLBACK(on_site_changed), gui);
+			g_signal_handlers_block_by_func(tview,
+					G_CALLBACK(on_site_changed), gui);
 			gtk_tree_view_set_cursor(tview, path, NULL, FALSE);
-			g_signal_handlers_unblock_by_func(tview, G_CALLBACK(on_site_changed), gui);
+			g_signal_handlers_unblock_by_func(tview,
+					G_CALLBACK(on_site_changed), gui);
+			gtk_tree_path_free(path);
+			g_free(text);
 			return;
 		}
+		g_free(text);
 	}
 }
 static void update_location_widget(AWeatherView *view, char *location, AWeatherGui *gui)
@@ -161,10 +205,11 @@ static void update_location_widget(AWeatherView *view, char *location, AWeatherG
 			char *text;
 			gtk_tree_model_get(model, &iter2, 1, &text, -1);
 			if (g_str_equal(text, location)) {
-				GtkTreePath *path = gtk_tree_model_get_path(model, &iter2);
-				g_signal_handlers_block_by_func(combo, G_CALLBACK(on_site_changed), gui);
+				g_signal_handlers_block_by_func(combo,
+						G_CALLBACK(on_site_changed), gui);
 				gtk_combo_box_set_active_iter(combo, &iter2);
-				g_signal_handlers_unblock_by_func(combo, G_CALLBACK(on_site_changed), gui);
+				g_signal_handlers_unblock_by_func(combo,
+						G_CALLBACK(on_site_changed), gui);
 				g_free(text);
 				return;
 			}
@@ -206,8 +251,9 @@ static void site_setup(AWeatherGui *gui)
 	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);
 	AWeatherView *aview = aweather_gui_get_view(gui);
 	g_signal_connect(aview, "location-changed", G_CALLBACK(update_location_widget), gui);
 }
@@ -223,12 +269,11 @@ static void time_setup(AWeatherGui *gui)
 					"Time", rend, "text", 0, NULL);
 	gtk_tree_view_append_column(tview, col);
 
-	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);
 }
 
-gboolean opengl_setup(AWeatherGui *gui)
+static void opengl_setup(AWeatherGui *gui)
 {
 	GtkDrawingArea *drawing = GTK_DRAWING_AREA(aweather_gui_get_widget(gui, "drawing"));
 
@@ -237,15 +282,15 @@ gboolean opengl_setup(AWeatherGui *gui)
 			GDK_GL_MODE_DOUBLE | GDK_GL_MODE_ALPHA);
 	if (!glconfig)
 		g_error("Failed to create glconfig");
-	if (!gtk_widget_set_gl_capability(GTK_WIDGET(drawing), glconfig, NULL, TRUE, GDK_GL_RGBA_TYPE))
+	if (!gtk_widget_set_gl_capability(GTK_WIDGET(drawing),
+				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(map),          gui);
-	g_signal_connect      (drawing, "configure-event", G_CALLBACK(configure),    gui);
-	g_signal_connect      (drawing, "expose-event",    G_CALLBACK(expose_begin), gui);
-	g_signal_connect_after(drawing, "expose-event",    G_CALLBACK(expose_end),   gui);
-	return TRUE;
+	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);
 }
 
 
@@ -310,7 +355,7 @@ AWeatherGui *aweather_gui_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(gui->builder, gui);
 
 	/* Load components */
 	site_setup(gui);