Improve shutdown code

[aweather] / src / plugins / radar.c

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index 62b55c0ec501640ec8170aa24e61f3b049a937b7..94b18c6cbc613e602ba9d0f75af196b67f5f9733 100644 (file)
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -21,7 +21,6 @@
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <GL/gl.h>
 #include <math.h>
 #include <rsl.h>
 
@@ -183,7 +182,7 @@ gpointer _site_update_thread(gpointer _site)
        }
        grits_object_hide(GRITS_OBJECT(site->level2), site->hidden);
        grits_viewer_add(site->viewer, GRITS_OBJECT(site->level2),
-                       GRITS_LEVEL_WORLD+1, TRUE);
+                       GRITS_LEVEL_WORLD+3, TRUE);
 
 out:
        g_idle_add(_site_update_end, site);
@@ -252,6 +251,8 @@ void radar_site_load(RadarSite *site)
        gtk_notebook_append_page(GTK_NOTEBOOK(site->pconfig), site->config,
                        gtk_label_new(site->city->name));
        gtk_widget_show_all(site->config);
+       if (gtk_notebook_get_current_page(GTK_NOTEBOOK(site->pconfig)) == 0)
+               gtk_notebook_set_current_page(GTK_NOTEBOOK(site->pconfig), -1);
 
        /* Set up radar loading */
        site->time_id = g_signal_connect_swapped(site->viewer, "time-changed",
@@ -282,12 +283,11 @@ void _site_on_location_changed(GritsViewer *viewer,
                radar_site_unload(site);
 }
 
-gboolean _site_add_marker(gpointer _site)
+gboolean _site_add_marker(RadarSite *site)
 {
-       RadarSite *site = _site;
        site->marker = grits_marker_new(site->city->name);
        GRITS_OBJECT(site->marker)->center = site->city->pos;
-       GRITS_OBJECT(site->marker)->lod    = EARTH_R*site->city->lod;
+       GRITS_OBJECT(site->marker)->lod    = EARTH_R*0.75*site->city->lod;
        grits_viewer_add(site->viewer, GRITS_OBJECT(site->marker),
                        GRITS_LEVEL_OVERLAY, FALSE);
        return FALSE;
@@ -304,6 +304,7 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
                        "level2" G_DIR_SEPARATOR_S);
        site->city    = city;
        site->pconfig = pconfig;
+       site->hidden  = TRUE;
 
        /* Set initial location */
        gdouble lat, lon, elev;
@@ -311,7 +312,7 @@ RadarSite *radar_site_new(city_t *city, GtkWidget *pconfig,
        _site_on_location_changed(viewer, lat, lon, elev, site);
 
        /* Add marker */
-       g_idle_add_full(G_PRIORITY_LOW, _site_add_marker, site, NULL);
+       _site_add_marker(site);
 
        /* Connect signals */
        site->location_id  = g_signal_connect(viewer, "location-changed",
@@ -377,13 +378,14 @@ static void _conus_update_end_copy(GritsTile *tile, guchar *pixels)
                glGenTextures(1, tile->data);
        }
 
+       gchar *clear = g_malloc0(2048*2048*4);
        guint *tex = tile->data;
        glBindTexture(GL_TEXTURE_2D, *tex);
 
        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
        glPixelStorei(GL_PACK_ALIGNMENT, 1);
        glTexImage2D(GL_TEXTURE_2D, 0, 4, 2048, 2048, 0,
-                       GL_RGBA, GL_UNSIGNED_BYTE, NULL);
+                       GL_RGBA, GL_UNSIGNED_BYTE, clear);
        glTexSubImage2D(GL_TEXTURE_2D, 0, 1,1, CONUS_WIDTH/2,CONUS_HEIGHT,
                        GL_RGBA, GL_UNSIGNED_BYTE, pixels);
        tile->coords.n = 1.0/(CONUS_WIDTH/2);
@@ -395,6 +397,7 @@ static void _conus_update_end_copy(GritsTile *tile, guchar *pixels)
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
        glFlush();
+       g_free(clear);
 }
 
 /* Split the pixbuf into east and west halves (with 2K sides)
@@ -423,7 +426,7 @@ static void _conus_update_end_split(guchar *pixels, guchar *west, guchar *east,
                        dst[0] = src[0];
                        dst[1] = src[1];
                        dst[2] = src[2];
-                       dst[3] = 0xff;
+                       dst[3] = 0xff * 0.75;
                        for (int j = 0; j < G_N_ELEMENTS(alphamap); j++)
                                if (src[0] == alphamap[j][0] &&
                                    src[1] == alphamap[j][1] &&
@@ -568,8 +571,8 @@ RadarConus *radar_conus_new(GtkWidget *pconfig,
        conus->tile[1] = grits_tile_new(NULL, CONUS_NORTH, south, east, mid);
        conus->tile[0]->zindex = 2;
        conus->tile[1]->zindex = 1;
-       grits_viewer_add(viewer, GRITS_OBJECT(conus->tile[0]), GRITS_LEVEL_WORLD, TRUE);
-       grits_viewer_add(viewer, GRITS_OBJECT(conus->tile[1]), GRITS_LEVEL_WORLD, TRUE);
+       grits_viewer_add(viewer, GRITS_OBJECT(conus->tile[0]), GRITS_LEVEL_WORLD+2, FALSE);
+       grits_viewer_add(viewer, GRITS_OBJECT(conus->tile[1]), GRITS_LEVEL_WORLD+2, FALSE);
 
        conus->time_id = g_signal_connect_swapped(viewer, "time-changed",
                        G_CALLBACK(_conus_update), conus);
@@ -774,9 +777,13 @@ static void grits_plugin_radar_dispose(GObject *gobject)
 {
        g_debug("GritsPluginRadar: dispose");
        GritsPluginRadar *self = GRITS_PLUGIN_RADAR(gobject);
-       g_signal_handler_disconnect(self->config, self->tab_id);
-       grits_viewer_remove(self->viewer, GRITS_OBJECT(self->hud));
-       radar_conus_free(self->conus);
+       if (self->viewer) {
+               GritsViewer *viewer = self->viewer;
+               self->viewer = NULL;
+               g_signal_handler_disconnect(self->config, self->tab_id);
+               grits_viewer_remove(viewer, GRITS_OBJECT(self->hud));
+               radar_conus_free(self->conus);
+       }
        /* Drop references */
        G_OBJECT_CLASS(grits_plugin_radar_parent_class)->dispose(gobject);
 }