boring: add --location by country,city

Also, add missing usage() text and catch Esc to exit the program when
run from a Linux PC.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

Author: troglobit

boring/boring.c

@@ -185,6 +185,19 @@ static gboolean on_webview_timeout(gpointer data)
     return G_SOURCE_REMOVE;
 }
 
+static gboolean on_key_press(GtkWidget *widget, GdkEventKey *event,
+                             gpointer data)
+{
+    (void)widget;
+    (void)data;
+
+    if (event->keyval == GDK_KEY_Escape) {
+        gtk_main_quit();
+        return TRUE;
+    }
+    return FALSE;
+}
+
 static gboolean on_button_press(GtkWidget *widget, GdkEventButton *event,
                                 gpointer data)
 {
@@ -277,24 +290,54 @@ static GtkWidget *create_web_view(void)
 /* Argument parsing                                                   */
 /* ------------------------------------------------------------------ */
 
+static void usage(const char *name)
+{
+    printf("Usage: %s [OPTIONS]\n"
+           "\n"
+           "Options:\n"
+           "  -f, --fullscreen         Run in fullscreen mode\n"
+           "  -l, --location LOCATION  City or Country,City (e.g., \"Stockholm\"\n"
+           "                           or \"Sweden,Stockholm\"), geocoded via Open-Meteo\n"
+           "  --lat LATITUDE           Latitude for weather (default: 59.3293)\n"
+           "  --lon LONGITUDE          Longitude for weather (default: 18.0686)\n"
+           "  --url URL                Web page URL shown on touch/click\n"
+           "  -h, --help               Show this help message\n"
+           "\n"
+           "Environment variables LATITUDE, LONGITUDE, LOCATION, and WEB_URL\n"
+           "are used as fallbacks when options are not given.\n"
+           "\n"
+           "Press Escape to exit.\n", name);
+}
+
 static void parse_args(int argc, char *argv[])
 {
     /* Defaults from environment, then fallback */
     const char *env;
+    const char *location = NULL;
 
     env = getenv("LATITUDE");
     app.latitude = env ? atof(env) : 59.3293;       /* Stockholm */
 
     env = getenv("LONGITUDE");
     app.longitude = env ? atof(env) : 18.0686;
 
+    env = getenv("LOCATION");
+    if (env) location = env;
+
     env = getenv("WEB_URL");
     app.web_url = env ? strdup(env) : NULL;
 
     app.fullscreen = FALSE;
 
     for (int i = 1; i < argc; i++) {
-        if ((strcmp(argv[i], "--lat") == 0) && i + 1 < argc) {
+        if (strcmp(argv[i], "-h") == 0 ||
+            strcmp(argv[i], "--help") == 0) {
+            usage(argv[0]);
+            exit(0);
+        } else if ((strcmp(argv[i], "-l") == 0 ||
+                    strcmp(argv[i], "--location") == 0) && i + 1 < argc) {
+            location = argv[++i];
+        } else if ((strcmp(argv[i], "--lat") == 0) && i + 1 < argc) {
             app.latitude = atof(argv[++i]);
         } else if ((strcmp(argv[i], "--lon") == 0) && i + 1 < argc) {
             app.longitude = atof(argv[++i]);
@@ -306,6 +349,20 @@ static void parse_args(int argc, char *argv[])
             app.fullscreen = TRUE;
         }
     }
+
+    if (location) {
+        double lat, lon;
+
+        if (weather_geocode(location, &lat, &lon)) {
+            app.latitude = lat;
+            app.longitude = lon;
+            fprintf(stderr, "Location \"%s\" -> %.4f, %.4f\n",
+                    location, lat, lon);
+        } else {
+            fprintf(stderr, "Could not geocode \"%s\", using default coordinates\n",
+                    location);
+        }
+    }
 }
 
 /* ------------------------------------------------------------------ */
@@ -343,10 +400,12 @@ int main(int argc, char *argv[])
     if (app.fullscreen)
         gtk_window_fullscreen(GTK_WINDOW(app.window));
 
-    /* Enable button press events on the window */
-    gtk_widget_add_events(app.window, GDK_BUTTON_PRESS_MASK);
+    /* Enable input events on the window */
+    gtk_widget_add_events(app.window, GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK);
     g_signal_connect(app.window, "button-press-event",
                      G_CALLBACK(on_button_press), NULL);
+    g_signal_connect(app.window, "key-press-event",
+                     G_CALLBACK(on_key_press), NULL);
 
     /* Stack with two children */
     app.stack = gtk_stack_new();

boring/weather.c

@@ -234,3 +234,119 @@ WeatherData weather_fetch(double latitude, double longitude)
 
     return data;
 }
+
+bool weather_geocode(const char *location, double *latitude, double *longitude)
+{
+    SoupSession *session;
+    SoupMessage *msg;
+    char url[512];
+    char *city = NULL;
+    char *country = NULL;
+
+    /* Parse "Country,City" or just "City" */
+    const char *comma = strchr(location, ',');
+    if (comma) {
+        country = strndup(location, comma - location);
+        city = strdup(comma + 1);
+        /* Trim leading spaces from city */
+        while (*city == ' ')
+            memmove(city, city + 1, strlen(city));
+    } else {
+        city = strdup(location);
+    }
+
+    /* URL-encode spaces as + for the query */
+    for (char *p = city; *p; p++)
+        if (*p == ' ') *p = '+';
+    if (country)
+        for (char *p = country; *p; p++)
+            if (*p == ' ') *p = '+';
+
+    snprintf(url, sizeof(url),
+             "https://geocoding-api.open-meteo.com/v1/search?name=%s&count=5",
+             city);
+
+    session = soup_session_new();
+    msg = soup_message_new("GET", url);
+    if (!msg) {
+        g_object_unref(session);
+        free(city);
+        free(country);
+        return false;
+    }
+
+    GError *error = NULL;
+    GInputStream *stream = soup_session_send(session, msg, NULL, &error);
+    if (!stream || soup_message_get_status(msg) != 200) {
+        g_clear_error(&error);
+        g_clear_object(&stream);
+        g_object_unref(msg);
+        g_object_unref(session);
+        free(city);
+        free(country);
+        return false;
+    }
+
+    GByteArray *buf = g_byte_array_new();
+    guint8 chunk[4096];
+    gssize n;
+
+    while ((n = g_input_stream_read(stream, chunk, sizeof(chunk), NULL, NULL)) > 0)
+        g_byte_array_append(buf, chunk, n);
+    g_object_unref(stream);
+
+    g_byte_array_append(buf, (const guint8 *)"\0", 1);
+    cJSON *root = cJSON_Parse((const char *)buf->data);
+    g_byte_array_free(buf, TRUE);
+
+    bool found = false;
+    if (root) {
+        cJSON *results = cJSON_GetObjectItem(root, "results");
+        int count = results ? cJSON_GetArraySize(results) : 0;
+
+        /* If country filter given, prefer a match; otherwise take first */
+        for (int i = 0; i < count && !found; i++) {
+            cJSON *item = cJSON_GetArrayItem(results, i);
+            if (country) {
+                cJSON *ctry = cJSON_GetObjectItem(item, "country");
+                if (!ctry || !ctry->valuestring)
+                    continue;
+                if (strcasecmp(ctry->valuestring, country) != 0) {
+                    /* Also try country_code (e.g. "SE") */
+                    cJSON *code = cJSON_GetObjectItem(item, "country_code");
+                    if (!code || !code->valuestring ||
+                        strcasecmp(code->valuestring, country) != 0)
+                        continue;
+                }
+            }
+            cJSON *lat = cJSON_GetObjectItem(item, "latitude");
+            cJSON *lon = cJSON_GetObjectItem(item, "longitude");
+            if (lat && lon) {
+                *latitude = lat->valuedouble;
+                *longitude = lon->valuedouble;
+                found = true;
+            }
+        }
+
+        /* Fall back to first result if country filter didn't match */
+        if (!found && count > 0 && !country) {
+            cJSON *item = cJSON_GetArrayItem(results, 0);
+            cJSON *lat = cJSON_GetObjectItem(item, "latitude");
+            cJSON *lon = cJSON_GetObjectItem(item, "longitude");
+            if (lat && lon) {
+                *latitude = lat->valuedouble;
+                *longitude = lon->valuedouble;
+                found = true;
+            }
+        }
+
+        cJSON_Delete(root);
+    }
+
+    g_object_unref(msg);
+    g_object_unref(session);
+    free(city);
+    free(country);
+
+    return found;
+}

boring/weather.h

@@ -40,4 +40,11 @@ const char *weather_description(WeatherType type);
 /* Format sunrise/sunset hours as HH:MM string into buf (>= 6 bytes) */
 void weather_format_time(double hours, char *buf, int bufsize);
 
+/*
+ * Geocode a location string to lat/lon using Open-Meteo's geocoding API.
+ * Accepts "City" or "Country,City" (e.g., "Stockholm" or "Sweden,Stockholm").
+ * Returns true on success and fills in *latitude and *longitude.
+ */
+bool weather_geocode(const char *location, double *latitude, double *longitude);
+
 #endif /* WEATHER_H */