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

 #include
 #include
 #include
 #include
-#define VERSION  "Weather 1.0b"
+#define VERSION  "Weather 1.2b"
 enum BUTTONS{
     BTN_QUIT = 1,
 #define JSON_OBJ(X) value->u.object.values[X]
 #define OK 200
 #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 CP866_W 6
+#define WINDOW_W 200
+Image *image;
+Image *blend;
-Image *image;
-char full_url[256];
+char full_url[512];
 char full_url_image[256];
+struct kolibri_system_colors sys_color_table;
-struct kolibri_system_colors sys_color_table;
+pos_t win_pos;
 #pragma pack(push,1)
 typedef struct {
-    char *City;
+    char City[256];
-    float wind_speed;
+    int wind_speed;
     //int wind_deg;
     int pressure;
     int humidity;
-    char *weath_main;
+    //char weath_main[256];
-    char *weath_desc;
+    char weath_desc[256];
     int visibility;
     int timezone;
-    char* image_code;
+    char image_code[4];
-    double temp;
+    int temp;
 }open_weather_data;
     }else{
         return p;
+    }
+}
+ char tmp_buff[100];
 static void draw_format_text_sys(int x, int y, color_t color, const char *format_str, ... )
-{
     char tmp_buff[100];
     va_list ap;
     va_start (ap, format_str);
     vsnprintf(tmp_buff, sizeof tmp_buff ,format_str, ap);
     va_end(ap);
 void find_and_set(json_value *value, 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, "main")){
+            {
+                weather->temp = (int)JSON_OBJ(i).value->u.object.values[0].value->u.dbl;
+            }else{
+                weather->temp = JSON_OBJ(i).value->u.object.values[0].value->u.integer;
             weather->temp = JSON_OBJ(i).value->u.object.values[0].value->u.dbl;
             weather->pressure = JSON_OBJ(i).value->u.object.values[4].value->u.integer;
             weather->humidity = JSON_OBJ(i).value->u.object.values[5].value->u.integer;
+        }
         if(!strcmp(JSON_OBJ(i).name, "name")){
-            weather->City = JSON_OBJ(i).value->u.string.ptr;
+            strcpy(weather->City,JSON_OBJ(i).value->u.string.ptr);
+        }
         if(!strcmp(JSON_OBJ(i).name, "weather")){
-           weather->weath_desc = JSON_OBJ(i).value->u.array.values[0]->u.object.values[2].value->u.string.ptr;
+           strcpy(weather->weath_desc, JSON_OBJ(i).value->u.array.values[0]->u.object.values[2].value->u.string.ptr);
-           weather->image_code = JSON_OBJ(i).value->u.array.values[0]->u.object.values[3].value->u.string.ptr;
+           strcpy(weather->image_code, JSON_OBJ(i).value->u.array.values[0]->u.object.values[3].value->u.string.ptr);
+        }
+        if(!strcmp(JSON_OBJ(i).name, "wind")){
+            if(JSON_OBJ(i).value->u.object.values[0].value->type==json_double)
-        if(!strcmp(JSON_OBJ(i).name, "wind")){
+            {
+                weather->wind_speed = (int)JSON_OBJ(i).value->u.object.values[0].value->u.dbl;
+            }else{
+                weather->wind_speed = JSON_OBJ(i).value->u.object.values[0].value->u.integer;
             weather->wind_speed = JSON_OBJ(i).value->u.object.values[0].value->u.dbl;
+        }
         if(!strcmp(JSON_OBJ(i).name, "visibility")){
             weather->visibility = JSON_OBJ(i).value->u.integer;
+        }
+        }
         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);
+        }
+    }
+}
                 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
+        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
+        img_fill_color(blend, 64, 64, sys_color_table.work_area); // Fill the layer with one color
-        image = img_scale(image, 0, 0, 50, 50, NULL, LIBIMG_SCALE_STRETCH , LIBIMG_INTER_BILINEAR, 64, 64);
+        Image* image2 = img_scale(image, 0, 0, 50, 50, NULL, LIBIMG_SCALE_STRETCH , LIBIMG_INTER_BILINEAR, 64, 64);
-        //img_blend(blend, image, 0, 0, 0, 0, 64, 64);  // Blending images to display the alpha channel.
+        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");
+    }
+}
 void RedrawGUI() //Рисуем окно
-{
-    char buff[1000];
     pos_t win_pos = get_mouse_pos(0); // Получаем координаты курсора
-    begin_draw(); //Начинаем рисование интерфейса )
+    begin_draw(); //Начинаем рисование интерфейса )
+    int new_win_w = (strlen(myw.City)+11)*UTF8_W;
+    if(new_win_w
+        new_win_w=WINDOW_W;
+    }
-    sys_create_window(win_pos.x, win_pos.y, 220, START_YPOS+200, VERSION, 0xffffff, 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(10, START_YPOS, 0xB0000000 /*| sys_color_table.work_text*/,  "%s (UTC%+d)\0", myw.City, myw.timezone);
+    draw_format_text_sys(20, START_YPOS, 0xB0000000 | sys_color_table.work_text, "%s (UTC%+d)", myw.City, myw.timezone);
-    draw_format_text_sys(11, START_YPOS, 0xB0000000 /*| sys_color_table.work_text */, "%s (UTC%+d)\0", 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(image, 10, START_YPOS+30, 64,64,0,0);
+    img_draw(blend, 10, START_YPOS+30, 64,64,0,0);
-    draw_format_text_sys(10, START_YPOS+20, 0xb0000000 /* | sys_color_table.work_text */, myw.weath_desc);
+    draw_format_text_sys(20, START_YPOS+20, 0xb0000000 | sys_color_table.work_text, myw.weath_desc);
-    draw_format_text_sys(11, 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(90, START_YPOS+45, 0xB1000000 /*| sys_color_table.work_text*/, "%.1f °C", myw.temp);
+    draw_format_text_sys(100, START_YPOS+45, 0xB1000000 | sys_color_table.work_text, "%+d°C", myw.temp);
-    draw_format_text_sys(91, START_YPOS+46, 0xB1000000 /*| sys_color_table.work_text*/, "%.1f °C", myw.temp);
+    draw_format_text_sys(101, START_YPOS+46, 0xB1000000 | sys_color_table.work_text, "%+d°C", myw.temp);
-    draw_format_text_sys(10, START_YPOS+80, 0x90000000 /*| sys_color_table.work_text*/,  "Pressure:   %d hPa",myw.pressure);
+    draw_format_text_sys(20, START_YPOS+80, 0x90000000 | sys_color_table.work_text,  "Pressure:   %d hPa",myw.pressure);
-    draw_format_text_sys(10, START_YPOS+100, 0x90000000 /* | sys_color_table.work_text*/,"Humidity:   %d %s", myw.humidity, "%");
+    draw_format_text_sys(20, START_YPOS+100, 0x90000000 | sys_color_table.work_text, "Humidity:   %d %s", myw.humidity, "%");
-    draw_format_text_sys(10, START_YPOS+120, 0x90000000 /*| sys_color_table.work_text*/, "Wind speed: %.1f m/s", myw.wind_speed);
+    draw_format_text_sys(20, START_YPOS+120, 0x90000000 | sys_color_table.work_text, "Wind speed: %d m/s", myw.wind_speed);
-    draw_format_text_sys(10, START_YPOS+140, 0x90000000 /*| sys_color_table.work_text*/, "Visibility: %d m", myw.visibility);
+    draw_format_text_sys(20, START_YPOS+140, 0x90000000 | sys_color_table.work_text, "Visibility: %d m", myw.visibility);
     if(*City==NULL || *Token ==NULL){
          notify_show("'Invalid config!!' -E");
          exit(0);
+    }
     free(config_buff);
+    fclose(config_j);
+}
 void Update(char* city, char* token)
+{
+    if(blend!=NULL){
+        img_destroy(blend);
+    }
     memset(&myw, 0, sizeof myw);
-    myw.City="None";
+    strcpy(myw.City,"None");
-    myw.weath_desc="unknown";
+    strcpy(myw.weath_desc,"unknown");
     http_msg *json_file = get_json(city, token);
     if(json_file != NULL){
-        json_value* value =json_parse (json_file->content_ptr, json_file->content_length);
+        json_value* value=json_parse (json_file->content_ptr, json_file->content_length);
         find_and_set(value, &myw);
+        get_image();
+        json_value_free(value);
+        user_free(json_file->content_ptr);
+        user_free(json_file);
         get_image();
     }else{
-        notify_show("'Connection error!' -E");
+       notify_show("'Connection error!' -E");
+    }
+}
+int main(){
+    win_pos = get_mouse_pos(0);
+    if(!kolibri_libimg_init()){
+        notify_show("Libimg.obj not loaded!' -E");
-int main(){
+        exit(0);
-    kolibri_libimg_init();
     get_system_colors(&sys_color_table);
     get_system_colors(&sys_color_table);
     char *City = NULL;
     char *Token = NULL;

Subversion Repositories Kolibri OS

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