WebSVN – Kolibri OS – Diff – /programs/other/Weather/weather.c

 #include
 #include
 #include
 #include
-#define VERSION  "Weather 1.2b"
+#define VERSION  "Weather 1.3"
 enum BUTTONS{
     BTN_QUIT = 1,
-    BTN_UPDATE = 2
-};
-#define JSON_OBJ(X) value->u.object.values[X]
-#define OK 200
+    BTN_UPDATE = 2
-#define API       "http://api.openweathermap.org/data/2.5/weather?q=%s&appid=%s&units=metric"
+};
 #define IMAGE_URL "http://openweathermap.org/img/w/%s.png"
+#define START_YPOS 34
+#define UTF8_W 8
-#define START_YPOS 34
+#define CP866_W 6
+#define JSON_OBJ(X) value->u.object.values[X]
+#define OK 200
-#define UTF8_W 8
+unsigned WINDOW_W = 200;
 #define CP866_W 6
+#define API       "api.openweathermap.org/data/2.5/weather?q=%s&appid=%s&units=%s&lang=%s"
+#define IMAGE_URL "openweathermap.org/img/w/%s.png"
+Image *image;
+Image *blend;
+char  *units;
 unsigned char char_size=1;
 #define WINDOW_W 200
+char *wind_speed_str, *pressure_str, *visibility_str, *humidity_str, *update_str;
+char lang[3]="en";
 char format_temp_str[6];
-Image *image;
+char full_url[512];
-Image *blend;
+char full_url_image[256];
-char full_url[512];
+char temp_char='K';
 char full_url_image[256];
 struct kolibri_system_colors sys_color_table;
 pos_t win_pos;
-#pragma pack(push,1)
-typedef struct {
+#pragma pack(push,1)
-    char City[256];
+struct open_weather_data{
-    int wind_speed;
+    char    City[100];
-    //int wind_deg;
+    int     wind_speed;
-    int pressure;
+    int     wind_deg;
-    int humidity;
+    int     pressure;
-    //char weath_main[256];
-    char weath_desc[256];
-    int visibility;
+    int     humidity;
-    int timezone;
+    char    weath_desc[100];
-    char image_code[4];
+    int     visibility;
-    int temp;
+    int     timezone;
-}open_weather_data;
+    char    image_code[4];
-#pragma pack(pop)
+    int     temp;
+}myw;
-open_weather_data myw;
+#pragma pack(pop)
 void notify_show(char *text)
+{
    start_app("/sys/@notify", text);
     vsnprintf(tmp_buff, sizeof tmp_buff ,format_str, ap);
     va_end(ap);
     draw_text_sys(tmp_buff, x, y , 0, color);
+}
-void find_and_set(json_value *value, open_weather_data* weather)
+void find_and_set(json_value *value, struct open_weather_data* weather)
+{
     for(int i=0; iu.object.length; i++){
         if(!strcmp(JSON_OBJ(i).name, "main")){
             if(JSON_OBJ(i).value->u.object.values[0].value->type==json_double)
+        }
         if(!strcmp(JSON_OBJ(i).name, "message")){
             char *errmsg = safe_malloc(weather->timezone = JSON_OBJ(i).value->u.string.length+6);
             sprintf(errmsg,"'%s!' -E", JSON_OBJ(i).value->u.string.ptr);
             notify_show(errmsg);
-            free(errmsg);
+            user_free(errmsg);
+        }
+    }
+}
-http_msg* get_json(char *City, char *Token)
+http_msg* get_json(char *City, char *Token, char* Units)
 {
-    sprintf(full_url, API, City, Token);
+    sprintf(full_url, API, City, Token, Units, lang);
     http_msg *h = http_get(full_url, 0,  HTTP_FLAG_BLOCK, "");
     http_long_receive(h);
     if (h->status == OK || h->status == 404) {
         return h;
+    } else {
+        user_free(h->content_ptr);
-    } else {
+        user_free(h);
         return NULL;
+    }
+}
                 if (!image) {
                 notify_show("'Convetring image error!' -E");
                 exit(0);
+            }
+        }
-        user_free(h->content_ptr);
-        user_free(h);
         blend = img_create(64, 64, IMAGE_BPP32);  // Create an empty layer
         img_fill_color(blend, 64, 64, sys_color_table.work_area); // Fill the layer with one color
         Image* image2 = img_scale(image, 0, 0, 50, 50, NULL, LIBIMG_SCALE_STRETCH , LIBIMG_INTER_BILINEAR, 64, 64);
         img_blend(blend, image2, 0, 0, 0, 0, 64, 64);  // Blending images to display the alpha channel.
         img_destroy(image);
         img_destroy(image2);
     }else{
        notify_show("'Image not loaded!!' -W");
+    }
+    user_free(h->content_ptr);
+    user_free(h);
+}
-void RedrawGUI() //Рисуем окно
+void RedrawGUI()
 {
-    begin_draw(); //Начинаем рисование интерфейса )
+    begin_draw();
-    int new_win_w = (strlen(myw.City)+11)*UTF8_W;
+    int new_win_w = (strlen(myw.City)/char_size+10)*(UTF8_W+char_size-1);
     if(new_win_w
         new_win_w=WINDOW_W;
+    }
-    sys_create_window(win_pos.x, win_pos.y, new_win_w, START_YPOS+200, VERSION, sys_color_table.work_area, 0x14); // Создаём окно.
+    sys_create_window(win_pos.x, win_pos.y, new_win_w, START_YPOS+200, VERSION, sys_color_table.work_area, 0x14);
     draw_format_text_sys(20, START_YPOS, 0xB0000000 | sys_color_table.work_text, "%s (UTC%+d)", myw.City, myw.timezone);
     draw_format_text_sys(21, START_YPOS, 0xB0000000 | sys_color_table.work_text, "%s (UTC%+d)", myw.City, myw.timezone);
     img_draw(blend, 10, START_YPOS+30, 64,64,0,0);
     draw_format_text_sys(20, START_YPOS+20, 0xb0000000 | sys_color_table.work_text, myw.weath_desc);
     draw_format_text_sys(21, START_YPOS+20, 0xb0000000 | sys_color_table.work_text, myw.weath_desc);
-    draw_format_text_sys(100, START_YPOS+45, 0xB1000000 | sys_color_table.work_text, "%+d°C", myw.temp);
+    draw_format_text_sys(100, START_YPOS+45, 0xb1000000 | sys_color_table.work_text, format_temp_str, myw.temp);
-    draw_format_text_sys(101, START_YPOS+46, 0xB1000000 | sys_color_table.work_text, "%+d°C", myw.temp);
+    draw_format_text_sys(101, START_YPOS+46, 0xb1000000 | sys_color_table.work_text, format_temp_str, myw.temp);
-    draw_format_text_sys(20, START_YPOS+80, 0x90000000 | sys_color_table.work_text,  "Pressure:   %d hPa",myw.pressure);
+    draw_format_text_sys(20, START_YPOS+80,  0xb0000000 | sys_color_table.work_text, pressure_str,myw.pressure);
-    draw_format_text_sys(20, START_YPOS+100, 0x90000000 | sys_color_table.work_text, "Humidity:   %d %s", myw.humidity, "%");
+    draw_format_text_sys(20, START_YPOS+100, 0xb0000000 | sys_color_table.work_text, humidity_str, myw.humidity, "%");
-          *City = JSON_OBJ(i).value->u.string.ptr;
+            *City = JSON_OBJ(i).value->u.string.ptr;
+        }
         if(!strcmp(JSON_OBJ(i).name, "Token")){
-           *Token = JSON_OBJ(i).value->u.string.ptr;
+            *Token = JSON_OBJ(i).value->u.string.ptr;
+        }
+        if(!strcmp(JSON_OBJ(i).name, "Celsius")){
+            if(JSON_OBJ(i).value->u.boolean){
+                units = "metric";
+                temp_char = 'C';
+            }else{
+                units = "imperial";
+                temp_char = 'F';
+            }
+        }
+        if(!strcmp(JSON_OBJ(i).name, "Lang")){
+            strncpy(lang, JSON_OBJ(i).value->u.string.ptr,2);
+        }
+    }
     if(*City==NULL || *Token ==NULL){
-         notify_show("'Invalid config!!' -E");
+         notify_show("'Invalid config!' -E");
          exit(0);
+    }
-    free(config_buff);
+    user_free(config_buff);
     fclose(config_j);
+}
 void Update(char* city, char* token)
+{
     if(blend!=NULL){
+        img_destroy(blend);
-        img_destroy(blend);
+        blend = NULL;
+    }
     memset(&myw, 0, sizeof myw);
     strcpy(myw.City,"None");
     strcpy(myw.weath_desc,"unknown");
-    http_msg *json_file = get_json(city, token);
+    http_msg *json_file = get_json(city, token, units);
     if(json_file != NULL){
         json_value* value=json_parse (json_file->content_ptr, json_file->content_length);
+        find_and_set(value, &myw);
-        find_and_set(value, &myw);
+        sprintf(format_temp_str, "%s°%c","%d",temp_char);
         get_image();
         json_value_free(value);
         user_free(json_file->content_ptr);
-        user_free(json_file);
         user_free(json_file);
     }else{
        notify_show("'Connection error!' -E");
+    }
+}
+void set_lang()
+{
+    if(!strcmp(lang, "ru")){
+        wind_speed_str = "Скорость ветра: %d м/с";
+        pressure_str   = "Давление:       %d гПa";
+        visibility_str = "Видимость:      %d м";
+        humidity_str   = "Влажность:      %d%s";
+        update_str     = "Обновить";
+        char_size = 2;
+        WINDOW_W = 230;
+    }else if(!strcmp(lang, "de")){
+        wind_speed_str = "Windgeschwindigkeit: %d m/s";
+        pressure_str   = "Druck:               %d hPa";
+        visibility_str = "Sichtbarkeit:        %d m";
+        humidity_str   = "Luftfeuchtigkeit:    %d%s";
+        WINDOW_W = 270;
+        update_str     = "Aktualisieren";
+    }else{
+        pressure_str   = "Pressure:   %d hPa";
+        humidity_str   = "Humidity:   %d%s";
+        visibility_str = "Visibility: %d m";
+        wind_speed_str = "Wind speed: %d m/s";
+        update_str     = "Refresh";
+    }
+}
 int main(){
     win_pos = get_mouse_pos(0);
     if(!kolibri_libimg_init()){
         notify_show("Libimg.obj not loaded!' -E");
         exit(0);
+    }
     get_system_colors(&sys_color_table);
+    char *City = NULL;
-    char *City = NULL;
+    char *Token = NULL;
-    char *Token = NULL;
+    get_config(&City, &Token);
-    get_config(&City, &Token);
+    set_lang();
     Update(City,Token);
     while(1){
         switch(get_os_event()){
             case KOLIBRI_EVENT_NONE:
                 break;
             case KOLIBRI_EVENT_REDRAW:
                 RedrawGUI();
                 break;
-            case KOLIBRI_EVENT_BUTTON: // Событие обработки кнопок
+            case KOLIBRI_EVENT_BUTTON:
                 switch (get_os_button()){
                     case BTN_UPDATE:

Subversion Repositories Kolibri OS

(root)/programs/other/Weather/weather.c – Rev 8554 → 8555