try to add settings button
[livewp] / applet / src / livewp-home-widget.c
index 52a2651..1be14c4 100644 (file)
@@ -1,4 +1,4 @@
-/* vim: set sw=4 ts=4 et: */
+/*vim: set sw=4 ts=4 et: */
 /*
  * This file is part of Live Wallpaper (livewp)
  * 
@@ -27,6 +27,7 @@
 #include <gconf/gconf-client.h>
 #include "livewp-rules.h"
 #include <sys/time.h>
+#include <stdlib.h>
 
 #define PLUGIN_NAME "livewp-home-widget.desktop-0"
 #define GCONF_KEY_POSITION "/apps/osso/hildon-desktop/applets/%s/position"
@@ -40,10 +41,9 @@ HD_DEFINE_PLUGIN_MODULE (AWallpaperPlugin, animation_wallpaper_plugin, HD_TYPE_H
 
 /* Position of plugin on desktop */
 #define Xstartposition 700 
-#define Ystartposition 425 
+#define Ystartposition 448 
 
 gint xapplet = 0, yapplet = 0;
-GSList * objects_list = NULL;
 Scene scene;
 
 static void
@@ -140,7 +140,7 @@ init_applet_position(void)
        yapplet = Ystartposition;
   }
   g_free (position_key);
-  modified = g_strdup_printf ("%ld", 0);
+  modified = g_strdup_printf ("%i", 0);
   modified_key = g_strdup_printf (GCONF_KEY_MODIFIED, PLUGIN_NAME);
   gconf_client_set_string (gconf_client,
                            modified_key,
@@ -170,7 +170,7 @@ path_line(gint x0, gint x1, double t)
 void
 destroy_hildon_actor(Actor *actor)
 {
-    fprintf(stderr, "estroy_hildon_actor %p\n",actor->widget);
+    //fprintf(stderr, "destroy_hildon_actor %s\n",actor->name);
     gtk_widget_destroy(actor->widget);
     actor->widget = NULL;
 }
@@ -203,8 +203,8 @@ init_object(AWallpaperPlugin *desktop_plugin,
   actor->opacity = opacity;
   actor->filename = g_strdup(filename);
   actor->name = g_strdup(name);
-  actor->func_change = pfunc_change; 
-  actor->func_probability = pfunc_probability;
+  actor->func_change = (gpointer)pfunc_change; 
+  actor->func_probability = (gpointer)pfunc_probability;
   if (visible)
     create_hildon_actor(actor, desktop_plugin);
   else 
@@ -223,19 +223,50 @@ init_object(AWallpaperPlugin *desktop_plugin,
   return actor;
 }
 
+gint 
+rnd(gint max)
+{
+    srand(time(NULL));
+    return rand() % max;
+}
+gint fast_rnd(gint max)
+{
+    guint offset = 12923;
+    guint multiplier = 4079;
+    
+    scene.seed = scene.seed * multiplier + offset;
+    return (gint)(scene.seed % max);
+}
+
+gint 
+probability_sun()
+{
+    /* update sun position after ...  second */
+    return 60;
+}
+
+
+gint 
+probability_plane()
+{
+    return (fast_rnd(10) + 1) * 60;
+//    return 0;
+}
+
 void 
 change_moon(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
-    gint x, y, z, daytime, phase;
+    gint phase;
     char *newfile;
 
     if (actor){
-        daytime = get_daytime();
-        if (daytime == TIME_NIGHT){
+        if (scene.daytime == TIME_NIGHT){
             if (!actor->visible){
                 actor->visible = TRUE;
                 phase = get_moon_phase();
                 newfile = g_strdup_printf( "%s%d.png", actor->name, phase);
+                if (actor->filename)
+                    g_free(actor->filename);
                 actor->filename = newfile;
                 create_hildon_actor(actor, desktop_plugin);
 
@@ -250,7 +281,7 @@ change_moon(Actor * actor, AWallpaperPlugin *desktop_plugin)
             fprintf(stderr, "destroy moon \n");
             destroy_hildon_actor(actor);
             /* TO DO make moonrise*/
-            actor->time_start_animation = get_next_sunset();
+            actor->time_start_animation = 0;
         } 
     }
     
@@ -260,14 +291,13 @@ void
 change_sun(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
     double alt, azm;
-    gint x, y, z, daytime;
+    gint x, y;
 
+    //fprintf(stderr, "change sun\n");
     if (actor){
-        daytime = get_daytime();
-        if (daytime != TIME_NIGHT){
+        if (scene.daytime != TIME_NIGHT){
             if (!actor->visible){
                 actor->visible = TRUE;
-
                 create_hildon_actor(actor, desktop_plugin);
             }
             get_sun_pos(&alt, &azm);
@@ -275,15 +305,17 @@ change_sun(Actor * actor, AWallpaperPlugin *desktop_plugin)
             actor->x = x;
             actor->y = y;
             actor_set_position_full(actor->widget, x, y, actor->z);
-            probability_sun(actor);
+            //probability_sun(actor);
+            actor->time_start_animation = time(NULL) + probability_sun();
          }else if (actor->visible){
             actor->visible = FALSE;
             destroy_hildon_actor(actor);
-            actor->time_start_animation = get_next_sunrise();
+            actor->time_start_animation = 0;
         } 
     }
     
 }
+
 static void 
 change_tram(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
@@ -293,22 +325,25 @@ change_tram(Actor * actor, AWallpaperPlugin *desktop_plugin)
     struct timeval tvb;     
     suseconds_t ms;
     long sec;
+    double t;
 
+    //fprintf(stderr, "change tram\n");
     gettimeofday(&tvb, NULL);
     
-    gint daytime = get_daytime();
     ms = tvb.tv_usec;
     sec = tvb.tv_sec;
-    time_t now = time(NULL);
-    double t;
-//    fprintf(stderr, "1 %f - %d\n", sec+(double)ms/100000, now);
-   
+    
     if (!actor->visible){
         actor->visible = TRUE;
-        if (daytime == TIME_NIGHT)
+        if (scene.daytime == TIME_NIGHT){
+            if (actor->filename)
+                g_free(actor->filename);
             actor->filename = g_strdup("tram_dark.png");
-        else
+        } else{
+            if (actor->filename)
+                g_free(actor->filename);
             actor->filename = g_strdup("tram.png");
+        }
         create_hildon_actor(actor, desktop_plugin);
     }
     t = (double)((double)sec+(double)ms/1000000 - actor->time_start_animation) / actor->duration_animation;
@@ -317,21 +352,230 @@ change_tram(Actor * actor, AWallpaperPlugin *desktop_plugin)
     scale = path_line(scale0, scale1, t);
     //fprintf(stderr, "change tram t=%f x=%d y=%d scale=%d\n", t, x, y, scale);
     actor_set_position_full(actor->widget, x, y, actor->z);
-    hildon_animation_actor_set_scale(actor->widget, (double)scale/100, (double)scale/100);
+    hildon_animation_actor_set_scale(HILDON_ANIMATION_ACTOR(actor->widget), (double)scale/100, (double)scale/100);
     if (t >= 1){
         /* stop animation */
         actor->visible = FALSE;
         destroy_hildon_actor(actor);
-        actor->time_start_animation = now + 5*60;
+        actor->time_start_animation = sec + fast_rnd(300);
     }
 }
+
+void
+change_plane1(Actor *actor, AWallpaperPlugin *desktop_plugin)
+{
+    gint x0 = 620, y0 = 233, scale0 = 100,
+         x1 = 79, y1 = -146, scale1 = 100, 
+         x, y, scale;
+    struct timeval tvb;     
+    suseconds_t ms;
+    long sec;
+    double t;
+
+    gettimeofday(&tvb, NULL);
+    
+    ms = tvb.tv_usec;
+    sec = tvb.tv_sec;
+//    fprintf(stderr, "1 %f - %d\n", sec+(double)ms/100000, now);
+   
+    if (scene.daytime != TIME_NIGHT){
+        if (actor->time_start_animation == 0){
+            actor->time_start_animation = sec + probability_plane();
+            return;
+        }
+    }
+    if (!actor->visible){
+        actor->visible = TRUE;
+        create_hildon_actor(actor, desktop_plugin);
+    }
+    t = (double)((double)sec+(double)ms/1000000 - actor->time_start_animation) / actor->duration_animation;
+    x = path_line(x0, x1, t);
+    y = path_line(y0, y1, t);
+    //scale = path_line(scale0, scale1, t);
+    //fprintf(stderr, "change tram t=%f x=%d y=%d scale=%d\n", t, x, y, scale);
+    actor_set_position_full(actor->widget, x, y, actor->z);
+    //hildon_animation_actor_set_scale(HILDON_ANIMATION_ACTOR(actor->widget), (double)scale/100, (double)scale/100);
+    if (t >= 1){
+        /* stop animation */
+        actor->visible = FALSE;
+        destroy_hildon_actor(actor);
+        if (scene.daytime == TIME_NIGHT) 
+            actor->time_start_animation = 0;
+        else 
+            actor->time_start_animation = sec + probability_plane();
+    }
+
+}
+
+void
+change_plane2(Actor *actor, AWallpaperPlugin *desktop_plugin)
+{
+    gint x0 = -actor->width, y0 = 45, scale0 = 100,
+         x1 = 800, y1 = 20, scale1 = 100, 
+         x, y, scale;
+    struct timeval tvb;     
+    suseconds_t ms;
+    long sec;
+    double t;
+
+    gettimeofday(&tvb, NULL);
+    
+    ms = tvb.tv_usec;
+    sec = tvb.tv_sec;
+//    fprintf(stderr, "1 %f - %d\n", sec+(double)ms/100000, now);
+    if (scene.daytime != TIME_NIGHT){
+        if (actor->time_start_animation == 0){
+            actor->time_start_animation = sec + probability_plane();
+            return;
+        }
+    }
+    if (!actor->visible){
+        actor->visible = TRUE;
+        create_hildon_actor(actor, desktop_plugin);
+    }
+
+    t = (double)((double)sec+(double)ms/1000000 - actor->time_start_animation) / actor->duration_animation;
+    x = path_line(x0, x1, t);
+    y = path_line(y0, y1, t);
+    //scale = path_line(scale0, scale1, t);
+    //fprintf(stderr, "change tram t=%f x=%d y=%d scale=%d\n", t, x, y, scale);
+    actor_set_position_full(actor->widget, x, y, actor->z);
+    //hildon_animation_actor_set_scale(HILDON_ANIMATION_ACTOR(actor->widget), (double)scale/100, (double)scale/100);
+    if (t >= 1){
+        /* stop animation */
+        actor->visible = FALSE;
+        destroy_hildon_actor(actor);
+        if (scene.daytime == TIME_NIGHT) 
+            actor->time_start_animation = 0;
+        else 
+            actor->time_start_animation = sec + probability_plane();
+    }
+
+}
+
+void
+change_cloud(Actor *actor, AWallpaperPlugin *desktop_plugin)
+{
+    gint x0, y0 = 300, scale0 = 100,
+         x1, y1 = -actor->height, scale1 = 150, 
+         x, y, scale;
+    struct timeval tvb;     
+    suseconds_t ms;
+    long sec;
+    double t;
+    gchar *newfile;
+
+    //fprintf(stderr, "change cloud\n");
+    gettimeofday(&tvb, NULL);
+    
+    ms = tvb.tv_usec;
+    sec = tvb.tv_sec;
+    //fprintf(stderr, "c1oud %s - y0=%d\n", actor->name, actor->y);
+   
+    if (!actor->visible){
+        actor->visible = TRUE;
+        if (scene.daytime == TIME_NIGHT){
+            newfile = g_strdup_printf("%s_dark.png", actor->name);
+        }else{
+            newfile = g_strdup_printf("%s.png", actor->name);
+        } 
+        if (actor->filename)
+            g_free(actor->filename);
+        actor->filename = newfile;
+         
+
+        create_hildon_actor(actor, desktop_plugin);
+    }
+    t = (double)((double)sec+(double)ms/1000000 - actor->time_start_animation) / actor->duration_animation;
+    
+    if (scene.wind_orientation == 1){
+        x0 = -actor->width;
+        x1 = 800;
+    }
+    else {
+        x0 = 800;
+        x1 = -actor->width;
+    }
+
+    x = path_line(x0, x1, t);    
+    y = -scene.wind_angle * (x - x0) + actor->y;
+    scale = path_line(scale0, scale1, (double)(y - y0)/(y1 - y0));
+
+    //fprintf(stderr, "change cloud t=%f x=%d y=%d scale=%d\n", t, x, y, scale);
+    actor_set_position_full(actor->widget, x, y, actor->z);
+    hildon_animation_actor_set_scale(HILDON_ANIMATION_ACTOR(actor->widget), (double)scale/100, (double)scale/100);
+    if ((y < y1 || y > y0) || t >= 1){
+        /* stop animation */
+        actor->visible = FALSE;
+        destroy_hildon_actor(actor);
+        actor->time_start_animation = sec + fast_rnd(300);
+        actor->y = fast_rnd(300);
+    }
+
+}
+
+void
+change_wind(Actor *actor, AWallpaperPlugin *desktop_plugin)
+{
+    scene.wind_orientation = fast_rnd(2);
+    if (scene.wind_orientation == 0) scene.wind_orientation = -1;
+    scene.wind_angle = (double)(fast_rnd(200) - 100) / 100;
+    actor->time_start_animation = time(NULL) + (fast_rnd(10) + 10) * 60;
+    //fprintf(stderr, "change wind orient = %d angle = %f after = %d\n", scene.wind_orientation, scene.wind_angle, actor->time_start_animation-time(NULL));
+}
+
+void 
+change_window1(Actor * actor, AWallpaperPlugin *desktop_plugin)
+{
+    
+    gint now = time(NULL);
+    if (scene.daytime == TIME_DAY){
+        if (actor->visible){
+            actor->visible = FALSE;
+            destroy_hildon_actor(actor);
+        }
+        actor->time_start_animation = 0;
+        return;
+    }else if (actor->time_start_animation == 0){
+        actor->time_start_animation = now + fast_rnd(30);
+        return;
+    }
+
+    if (!actor->visible){
+        actor->visible = TRUE;
+        create_hildon_actor(actor, desktop_plugin);
+        actor->time_start_animation = now + fast_rnd(60) + 10;
+    }else {
+        actor->visible = FALSE;
+        destroy_hildon_actor(actor);
+        actor->time_start_animation = now + fast_rnd(60) + 10;
+    }
+   
+}
+
+void 
+change_signal(Actor * actor, AWallpaperPlugin *desktop_plugin)
+{
+    gchar *newfile;
+    gint now = time(NULL);
+    newfile = g_strdup_printf("%s%d.png", actor->name, scene.daytime); 
+    if (!strcmp(actor->filename, "red.png"))
+        newfile = g_strdup_printf("%s", "green.png");
+    else 
+        newfile = g_strdup_printf("%s", "red.png");
+    g_free(actor->filename);
+    actor->filename = newfile;
+    change_hildon_actor(actor, desktop_plugin);
+    actor->time_start_animation = now + fast_rnd(30) + 10;
+}
+
 void
 create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin) 
 {
   GtkWidget *ha = NULL;
   GdkPixbuf *pixbuf = NULL;
   GtkWidget *image = NULL;
-  gchar *str;
+  gchar     *str = NULL;
 
   /* fprintf(stderr, "create_hildon_actor %s\n", actor->name);*/
   ha = hildon_animation_actor_new();
@@ -341,6 +585,8 @@ create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
                                              actor->width, 
                                              actor->height, 
                                              NULL);
+  if (str)
+      g_free(str);
   if (pixbuf){
       image = gtk_image_new_from_pixbuf (pixbuf);
       g_object_unref(G_OBJECT(pixbuf));
@@ -351,11 +597,14 @@ create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
     gtk_container_add (GTK_CONTAINER (ha), image);
   }  
   actor_set_position_full(ha, actor->x, actor->y, actor->z);
-  hildon_animation_actor_set_show (ha, actor->visible);
-  hildon_animation_actor_set_scale(ha, (double)actor->scale/100, (double)actor->scale/100);
+  hildon_animation_actor_set_show (HILDON_ANIMATION_ACTOR(ha), actor->visible);
+  hildon_animation_actor_set_scale(HILDON_ANIMATION_ACTOR(ha), (double)actor->scale/100, (double)actor->scale/100);
   realize(ha);
   gtk_widget_show_all(ha);
 
+  /* TO DO check it */
+  /*  gdk_flush (); */
+
   //g_object_set_data(G_OBJECT(ha), "name", name);
   //g_object_set_data(G_OBJECT(ha), "filename", filename);
   g_object_set_data(G_OBJECT(ha), "image", image);
@@ -370,7 +619,7 @@ create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
   g_object_set_data(G_OBJECT(ha), "opacity", opacity);
   g_object_set_data(G_OBJECT(ha), "func", pfunc);
   */
-  hildon_animation_actor_set_parent (HILDON_ANIMATION_ACTOR (ha), desktop_plugin);
+  hildon_animation_actor_set_parent (HILDON_ANIMATION_ACTOR (ha), GTK_WINDOW(desktop_plugin));
   actor->widget = ha;
 }
 
@@ -380,7 +629,7 @@ change_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
 {
     GtkWidget *image = NULL;
     GdkPixbuf *pixbuf = NULL;
-    gchar *str;
+    gchar     *str = NULL;
 
     str = g_strdup_printf( "%s/%s/%s", THEME_PATH, 
                             desktop_plugin->priv->theme, actor->filename);
@@ -389,6 +638,8 @@ change_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
                                                actor->width, 
                                                actor->height, 
                                                NULL);
+    if(str)
+        g_free(str);
     if (pixbuf){
         image = gtk_image_new_from_pixbuf (pixbuf);
         g_object_unref(G_OBJECT(pixbuf));
@@ -397,12 +648,16 @@ change_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
         g_signal_connect(G_OBJECT(image), "expose_event",
                                        G_CALLBACK(expose_event), pixbuf);
         if (g_object_get_data(G_OBJECT(actor->widget), "image")){
-            gtk_container_remove(actor->widget, g_object_get_data(G_OBJECT(actor->widget), "image"));  
+            gtk_container_remove(GTK_CONTAINER(actor->widget), g_object_get_data(G_OBJECT(actor->widget), "image"));  
         }
         g_object_set_data(G_OBJECT(actor->widget), "image", image);
         gtk_container_add (GTK_CONTAINER (actor->widget), image);
         realize(actor->widget);
         gtk_widget_show_all(actor->widget);
+        /* TO DO check it */
+       /*  gdk_flush (); */
+
+
     }
 
 }
@@ -411,24 +666,62 @@ change_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
 void 
 change_static_actor(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
-    gint daytime;
     gchar *newfile;
-    if (!actor) return;
-    daytime = get_daytime();
-    newfile = g_strdup_printf("%s%d.png", actor->name, daytime); 
+    newfile = g_strdup_printf("%s%d.png", actor->name, scene.daytime); 
+    if (actor->filename)
+            g_free(actor->filename);
     actor->filename = newfile;
     change_hildon_actor(actor, desktop_plugin);
 }
 
+void 
+change_static_actor_with_corner(Actor * actor, AWallpaperPlugin *desktop_plugin)
+{
+    gchar *newfile;
+    gchar           buffer[2048];
+
+    if (desktop_plugin->priv->right_corner)
+        gtk_widget_destroy(desktop_plugin->priv->right_corner);
+    snprintf(buffer, sizeof(buffer) - 1, "%s/%s/town%i_right_corner.png", \
+                                  THEME_PATH, desktop_plugin->priv->theme, scene.daytime);
+    desktop_plugin->priv->right_corner = gtk_image_new_from_file (buffer);
+    if (desktop_plugin->priv->right_corner){
+        gtk_fixed_put(GTK_FIXED(desktop_plugin->priv->main_widget), desktop_plugin->priv->right_corner, 0, 0);
+        gtk_widget_show (desktop_plugin->priv->right_corner);
+    }
+    change_static_actor(actor, desktop_plugin);
 
+}
 
+void
+change_layer1(Actor * actor, AWallpaperPlugin *desktop_plugin)
+{
+    gint y;
+    y = actor->y + 10;
+    if (y > 480) y = -480;
+    //fprintf(stderr, "!! %s - %d\n", actor->name, y);
+    actor_set_position_full(actor->widget, actor->x, y, actor->z);
+    actor->y = y;
+}
 
+void
+change_layer2(Actor * actor, AWallpaperPlugin *desktop_plugin)
+{
+    gint y;
+    y = actor->y + 15;
+    if (y >= 480) y = -480;
+    //fprintf(stderr, "!! %s - %d\n", actor->name, y);
+    actor_set_position_full(actor->widget, actor->x, y, actor->z);
+    actor->y = y;
+}
+
+/*
 static gint 
 get_time(gint t){
     // уравнение изменения времени
     return t*1.1;
 }
-
+*/
 static void 
 destroy_scene(void){
     GSList * tmp = scene.actors;
@@ -436,6 +729,10 @@ destroy_scene(void){
     while (tmp != NULL){
         actor = tmp->data;
         if (actor){
+            if (actor->filename)
+                g_free(actor->filename);
+            if (actor->name)
+                g_free(actor->name);
             gtk_widget_destroy(actor->widget);
             //actor->widget = NULL;
             g_free(actor);
@@ -455,62 +752,337 @@ reload_scene(AWallpaperPlugin *desktop_plugin)
         init_scene(desktop_plugin);
     else if (!strcmp(desktop_plugin->priv->theme,"Berlin")) 
         init_scene1(desktop_plugin);
+    else if (!strcmp(desktop_plugin->priv->theme,"Matrix")) 
+        init_scene2(desktop_plugin);
+
 }
 
-void 
-probability_sun(Actor *actor)
+static void
+init_scene2(AWallpaperPlugin *desktop_plugin)
 {
-    actor->time_start_animation += 20 * 1;
-    actor->duration_animation = G_MAXINT;
+  Actor *actor;
+  gint now = time(NULL);
+
+  /* fprintf(stderr, "init scene \n");*/
+  scene.daytime = get_daytime();
+  scene.actors = NULL;
+
+  
+  actor = init_object(desktop_plugin, "background", "bg.png", 
+                      0, 0, 5, 800, 480, 
+                      TRUE, 100, 255, NULL, NULL);
+  scene.actors = g_slist_append(scene.actors, actor);
+
+  actor = init_object(desktop_plugin, "symbols", "symbols_without.png", 
+                      0, 0, 10, 800, 480, 
+                      TRUE, 100, 255, NULL, NULL);
+  scene.actors = g_slist_append(scene.actors, actor);
+
+  actor = init_object(desktop_plugin, "layer1", "layer1_2.png", 
+                      0, -480, 6, 800, 960, 
+                      TRUE, 100, 255, (gpointer)&change_layer1, NULL);
+  actor->time_start_animation = now;
+  actor->duration_animation = G_MAXINT;
+  scene.actors = g_slist_append(scene.actors, actor);
+
+  actor = init_object(desktop_plugin, "layer1", "layer1_1.png", 
+                      0, (-480 - 480), 7, 800, 960, 
+                      TRUE, 100, 255, (gpointer)&change_layer1, NULL);
+  actor->time_start_animation = now;
+  actor->duration_animation = G_MAXINT;
+  scene.actors = g_slist_append(scene.actors, actor);
+
+  actor = init_object(desktop_plugin, "layer2", "layer2_2.png", 
+                      0, -480, 8, 800, 960, 
+                      TRUE, 100, 255, (gpointer)&change_layer2, NULL);
+  actor->time_start_animation = now;
+  actor->duration_animation = G_MAXINT;
+  scene.actors = g_slist_append(scene.actors, actor);
+
+  actor = init_object(desktop_plugin, "layer2", "layer2_1.png", 
+                      0, (-480 - 480), 9, 800, 960, 
+                      TRUE, 100, 255, (gpointer)&change_layer2, NULL);
+  actor->time_start_animation = now;
+  actor->duration_animation = G_MAXINT;
+  scene.actors = g_slist_append(scene.actors, actor);
+
+
+    
+
+
+    run_long_timeout(desktop_plugin);
 }
 /* Init Modern Scene */
 static void
 init_scene(AWallpaperPlugin *desktop_plugin)
 {
   Actor *actor;
+  gint now = time(NULL);
+  gint i;
+  gint winds[13][2];
 
   /* fprintf(stderr, "init scene \n");*/
   scene.daytime = get_daytime();
   scene.actors = NULL;
+  scene.wind_orientation = -1;
+  scene.wind_angle = 0.3;
+  /* init value for random */
+  scene.seed = time(NULL);
+
+  
 
   actor = init_object(desktop_plugin, "sky", "sky0.png", 0, 0, 5, 800, 480, 
-                      TRUE, 100, 255, &change_static_actor, NULL);
+                      TRUE, 100, 255, (gpointer)&change_static_actor, NULL);
   change_static_actor(actor, desktop_plugin);
   scene.actors = g_slist_append(scene.actors, actor);
 
   actor = init_object(desktop_plugin, "sun", "sun.png", 0, 0, 6, 88, 88, 
-                      TRUE, 100, 255, &change_sun, &probability_sun);
-  actor->time_start_animation = time(NULL);
+                      TRUE, 100, 255, (gpointer)&change_sun, &probability_sun);
+  actor->time_start_animation = now;
   actor->duration_animation = G_MAXINT;
   change_sun(actor, desktop_plugin);
   scene.actors = g_slist_append(scene.actors, actor);
 
-  actor = init_object(desktop_plugin, "dot", "dot1.png", 0, 0, 11, 50, 50, 
-                      TRUE, 100, 255, NULL, NULL);
+  //actor = init_object(desktop_plugin, "dot", "dot1.png", 0, 0, 11, 50, 50, 
+    //                  TRUE, 100, 255, NULL, NULL);
+  //scene.actors = g_slist_append(scene.actors, actor);
+  
+  actor = init_object(desktop_plugin, "cloud1", "cloud1.png", 0, fast_rnd(300)-97, 7, 150, 97, 
+                      FALSE, 100, 255, (gpointer)&change_cloud, NULL);
+  actor->time_start_animation = now + fast_rnd(180);
+  actor->duration_animation = 3*60;
+  scene.actors = g_slist_append(scene.actors, actor);
+  
+  actor = init_object(desktop_plugin, "cloud2", "cloud2.png", 0, fast_rnd(300)-75, 7, 188, 75, 
+                      FALSE, 100, 255, (gpointer)&change_cloud, NULL);
+  actor->time_start_animation = now + fast_rnd(180);
+  actor->duration_animation = 3*60;
+  scene.actors = g_slist_append(scene.actors, actor);
+
+  actor = init_object(desktop_plugin, "cloud4", "cloud4.png", 0, fast_rnd(300)-75, 7, 150, 75, 
+                      FALSE, 100, 255, (gpointer)&change_cloud, NULL);
+  actor->time_start_animation = now + fast_rnd(180);
+  actor->duration_animation = 5*60;
   scene.actors = g_slist_append(scene.actors, actor);
 
 
-  actor = init_object(desktop_plugin, "town", "town0.png", 0, 0, 7, 800, 480, 
-                      TRUE, 100, 255, &change_static_actor, NULL);
+  actor = init_object(desktop_plugin, "town", "town0.png", 0, 0, 8, 800, 480, 
+                      TRUE, 100, 255, (gpointer)&change_static_actor, NULL);
   change_static_actor(actor, desktop_plugin);
   scene.actors = g_slist_append(scene.actors, actor);
 
+  actor = init_object(desktop_plugin, "tram", "tram.png", -300, 225, 9, 350, 210, 
+                      FALSE, 100, 255, (gpointer)&change_tram, NULL);
+  actor->time_start_animation = time(NULL) + fast_rnd(10); 
+  actor->duration_animation = 60;
+  scene.actors = g_slist_append(scene.actors, actor);
 
-  actor = init_object(desktop_plugin, "moon", "moon1.png", 400, 20, 10, 60, 60, 
-                      FALSE, 100, 255, &change_moon, NULL);
+  actor = init_object(desktop_plugin, "border", "border0.png", 0, 480-79, 10, 800, 79,
+                      TRUE, 100, 255, (gpointer)&change_static_actor_with_corner, NULL);
+  change_static_actor_with_corner(actor, desktop_plugin);
+  scene.actors = g_slist_append(scene.actors, actor);
+  
+  actor = init_object(desktop_plugin, "moon", "moon1.png", 400, 20, 6, 60, 60, 
+                      FALSE, 100, 255, (gpointer)&change_moon, NULL);
   change_moon(actor, desktop_plugin);
   scene.actors = g_slist_append(scene.actors, actor);
 
-  actor = init_object(desktop_plugin, "tram", "tram.png", -300, 225, 8, 350, 210, 
-                      FALSE, 100, 255, &change_tram, NULL);
-  actor->time_start_animation = time(NULL) + 10;
-  actor->duration_animation = 60;
+  actor = init_object(desktop_plugin, "wind", "", 0, 0, 5, 0, 0, 
+                      FALSE, 100, 255, (gpointer)&change_wind, NULL);
+  change_wind(actor, desktop_plugin);
   scene.actors = g_slist_append(scene.actors, actor);
 
-  actor = init_object(desktop_plugin, "border", "border0.png", 0, 480-79, 9, 800, 79,
-                      TRUE, 100, 255, &change_static_actor, NULL);
-  change_static_actor(actor, desktop_plugin);
-  scene.actors = g_slist_append(scene.actors, actor);
+    /* windows in 4-th house  */
+
+    winds[0][0] = 482;
+    winds[0][1] = 180;
+
+    winds[1][0] = 495;
+    winds[1][1] = 179;
+
+    winds[2][0] = 482;
+    winds[2][1] = 191;
+
+    winds[3][0] = 495;
+    winds[3][1] = 190;
+    
+    winds[4][0] = 482;
+    winds[4][1] = 201;
+    
+    winds[5][0] = 495;
+    winds[5][1] = 210;
+    
+    winds[6][0] = 482;
+    winds[6][1] = 222;
+    
+    winds[7][0] = 495;
+    winds[7][1] = 221;
+    
+    winds[8][0] = 459;
+    winds[8][1] = 203;
+    
+    winds[9][0] = 495;
+    winds[9][1] = 241;
+    
+    winds[10][0] = 495;
+    winds[10][1] = 252;
+    
+    winds[11][0] = 482;
+    winds[11][1] = 273;
+    
+    winds[12][0] = 495;
+    winds[12][1] = 303;
+    for (i=0; i<13; i++){
+        actor = init_object(desktop_plugin, "window1", "window1.png", 
+                            winds[i][0], winds[i][1], 8, 8, 10, 
+                            FALSE, 100, 255, (gpointer)&change_window1, NULL);
+        //change_window1(actor, desktop_plugin);
+        actor->time_start_animation = now + fast_rnd(30);
+        scene.actors = g_slist_append(scene.actors, actor);
+
+    }
+    
+    /* windows in 1-th house  */
+    
+    winds[0][0] = 86;
+    winds[0][1] = 321;
+
+    winds[1][0] = 86;
+    winds[1][1] = 363;
+
+    winds[2][0] = 86;
+    winds[2][1] = 385;
+
+    winds[3][0] = 86;
+    winds[3][1] = 286;
+    
+    winds[4][0] = 94;
+    winds[4][1] = 232;
+    
+    winds[5][0] = 94;
+    winds[5][1] = 243;
+    
+    winds[6][0] = 94;
+    winds[6][1] = 265;
+    
+    winds[7][0] = 94;
+    winds[7][1] = 331;
+    for (i=0; i<8; i++){
+        actor = init_object(desktop_plugin, "window2", "window2.png", 
+                            winds[i][0], winds[i][1], 8, 8, 10, 
+                            FALSE, 100, 255, (gpointer)&change_window1, NULL);
+        //change_window1(actor, desktop_plugin);
+        actor->time_start_animation = now + fast_rnd(30);
+        scene.actors = g_slist_append(scene.actors, actor);
+
+    }
+    
+    /* windows in 3-th house  */
+    
+    winds[0][0] = 251;
+    winds[0][1] = 162;
+
+    winds[1][0] = 251;
+    winds[1][1] = 196;
+
+    winds[2][0] = 251;
+    winds[2][1] = 278;
+
+    winds[3][0] = 251;
+    winds[3][1] = 289;
+    
+    winds[4][0] = 313;
+    winds[4][1] = 173;
+    
+    winds[5][0] = 322;
+    winds[5][1] = 160;
+    
+    winds[6][0] = 303;
+    winds[6][1] = 217;
+    
+    winds[7][0] = 322;
+    winds[7][1] = 224;
+    
+    winds[8][0] = 323;
+    winds[8][1] = 217;
+    
+    winds[9][0] = 322;
+    winds[9][1] = 288;
+    
+    for (i=0; i<10; i++){
+        actor = init_object(desktop_plugin, "window3", "window3.png", 
+                            winds[i][0], winds[i][1], 8, 8, 10, 
+                            FALSE, 100, 255, (gpointer)&change_window1, NULL);
+        //change_window1(actor, desktop_plugin);
+        actor->time_start_animation = now + fast_rnd(30);
+        scene.actors = g_slist_append(scene.actors, actor);
+
+    }
+
+    /* windows in 5-th house  */
+    
+    winds[0][0] = 610;
+    winds[0][1] = 224;
+
+    winds[1][0] = 602;
+    winds[1][1] = 245;
+
+    winds[2][0] = 602;
+    winds[2][1] = 264;
+
+    winds[3][0] = 610;
+    winds[3][1] = 301;
+    
+    winds[4][0] = 610;
+    winds[4][1] = 320;
+    
+    winds[5][0] = 593;
+    winds[5][1] = 352;
+    
+    winds[6][0] = 610;
+    winds[6][1] = 368;
+    
+    for (i=0; i<7; i++){
+        actor = init_object(desktop_plugin, "window4", "window4.png", 
+                            winds[i][0], winds[i][1], 8, 8, 10, 
+                            FALSE, 100, 255, (gpointer)&change_window1, NULL);
+        //change_window1(actor, desktop_plugin);
+        actor->time_start_animation = now + fast_rnd(30);
+        scene.actors = g_slist_append(scene.actors, actor);
+
+    }
+
+    /* windows in 6-th house  */
+    
+    winds[0][0] = 717;
+    winds[0][1] = 283;
+
+    winds[1][0] = 698;
+    winds[1][1] = 293;
+
+    winds[2][0] = 717;
+    winds[2][1] = 315;
+
+    winds[3][0] = 717;
+    winds[3][1] = 323;
+    
+    winds[4][0] = 698;
+    winds[4][1] = 362;
+    
+    winds[5][0] = 698;
+    winds[5][1] = 400;
+    
+    for (i=0; i<6; i++){
+        actor = init_object(desktop_plugin, "window5", "window5.png", 
+                            winds[i][0], winds[i][1], 8, 8, 10, 
+                            FALSE, 100, 255, (gpointer)&change_window1, NULL);
+        //change_window1(actor, desktop_plugin);
+        actor->time_start_animation = now + fast_rnd(30);
+        scene.actors = g_slist_append(scene.actors, actor);
+
+    }
+
+    run_long_timeout(desktop_plugin);
 #if 0    
   anim = g_new0(Animation, 1);
   anim->count = 1;
@@ -529,51 +1101,138 @@ static void
 init_scene1(AWallpaperPlugin *desktop_plugin)
 {
   Actor *actor;
+  gint now = time(NULL);
+  gint i; 
+  gint winds[13][2];
 
   scene.daytime = get_daytime();
   scene.actors = NULL;
+  scene.wind_orientation = -1;
+  scene.wind_angle = 0.3;
+  /* init value for random */
+  scene.seed = time(NULL);
+
   
   actor = init_object(desktop_plugin, "sky", "sky.png", 0, 0, 5, 800, 480, 
-                      TRUE, 100, 255, &change_static_actor, NULL);
+                      TRUE, 100, 255, (gpointer)&change_static_actor, NULL);
   change_static_actor(actor, desktop_plugin);
   scene.actors = g_slist_append(scene.actors, actor);
 
   
   actor = init_object(desktop_plugin, "sun", "sun.png", 0, 0, 6, 88, 88, 
-                      TRUE, 100, 255, &change_sun, &probability_sun);
+                      TRUE, 100, 255, (gpointer)&change_sun, &probability_sun);
   actor->time_start_animation = time(NULL);
   actor->duration_animation = G_MAXINT;
   change_sun(actor, desktop_plugin);
   scene.actors = g_slist_append(scene.actors, actor);
-  actor = init_object(desktop_plugin, "dot", "dot1.png", 0, 0, 9, 50, 50, 
+
+#if 0
+  actor = init_object(desktop_plugin, "dot", "dot1.png", 0, 0, 11, 50, 50, 
                       TRUE, 100, 255, NULL, NULL);
   scene.actors = g_slist_append(scene.actors, actor);
+#endif
 
-
-  actor = init_object(desktop_plugin, "town", "town.png", 0, 0, 7, 800, 480, 
-                      TRUE, 100, 255, &change_static_actor, NULL);
-  change_static_actor(actor, desktop_plugin);
+  actor = init_object(desktop_plugin, "moon", "moon1.png", 400, 15, 6, 60, 60, 
+                      FALSE, 100, 255, (gpointer)&change_moon, NULL);
+  change_moon(actor, desktop_plugin);
+  scene.actors = g_slist_append(scene.actors, actor);
+  
+  actor = init_object(desktop_plugin, "cloud1", "cloud1.png", 0, fast_rnd(300)-97, 7, 150, 97, 
+                      FALSE, 100, 255, (gpointer)&change_cloud, NULL);
+  actor->time_start_animation = now + fast_rnd(180);
+  actor->duration_animation = 3*60;
+  scene.actors = g_slist_append(scene.actors, actor);
+  
+  actor = init_object(desktop_plugin, "cloud2", "cloud2.png", 0, fast_rnd(300)-75, 7, 188, 75, 
+                      FALSE, 100, 255, (gpointer)&change_cloud, NULL);
+  actor->time_start_animation = now + fast_rnd(180);
+  actor->duration_animation = 3*60;
   scene.actors = g_slist_append(scene.actors, actor);
 
-  actor = init_object(desktop_plugin, "moon", "moon1.png", 400, 15, 8, 60, 60, 
-                      FALSE, 100, 255, &change_moon, NULL);
-  change_moon(actor, desktop_plugin);
+  actor = init_object(desktop_plugin, "cloud4", "cloud4.png", 0, fast_rnd(300)-75, 7, 150, 75, 
+                      FALSE, 100, 255, (gpointer)&change_cloud, NULL);
+  actor->time_start_animation = now + fast_rnd(180);
+  actor->duration_animation = 5*60;
   scene.actors = g_slist_append(scene.actors, actor);
-  //scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
+
  
-   /*
-  actor = init_object("cloud1", 400, 150, 2, 200, 150, NULL);
-  scene.dynamic_actors = g_slist_append(scene.dynamic_actors, G_OBJECT(actor));
+  actor = init_object(desktop_plugin, "plane2", "plane3.png", 0, 45, 8, 160, 50, 
+                      FALSE, 100, 255, (gpointer)&change_plane2, NULL);
+  actor->time_start_animation = now + probability_plane();
+  actor->duration_animation = 60;
+  scene.actors = g_slist_append(scene.actors, actor);
+  
+  actor = init_object(desktop_plugin, "plane1", "tu154.png", 620, 233, 9, 300, 116, 
+                      FALSE, 100, 255, (gpointer)&change_plane1, NULL);
+  actor->time_start_animation = now + probability_plane();
+  actor->duration_animation = 30;
+  scene.actors = g_slist_append(scene.actors, actor);
 
-  actor = init_object("sun", 10, 10, 50, 88, 88, NULL);
-  list = g_slist_append(list, G_OBJECT(actor));
-  actor = init_object("cloud1", 50, 50, 49, 150, 100, NULL);
-  list = g_slist_append(list, G_OBJECT(actor));
+  actor = init_object(desktop_plugin, "town", "town.png", 0, 0, 10, 800, 480, 
+                      TRUE, 100, 255, (gpointer)&change_static_actor_with_corner, NULL);
+  change_static_actor_with_corner(actor, desktop_plugin);
+  scene.actors = g_slist_append(scene.actors, actor);
 
-  ma1 = multiactor_init("multi", list, 0, 0, 50, 1.0, TRUE);
-  //objects_list = g_slist_append(objects_list, G_OBJECT(ma)); 
-  */
+  actor = init_object(desktop_plugin, "wind", "", 0, 0, 5, 0, 0, 
+                      FALSE, 100, 255, (gpointer)&change_wind, NULL);
+  change_wind(actor, desktop_plugin);
+  scene.actors = g_slist_append(scene.actors, actor);
+
+  actor = init_object(desktop_plugin, "signal", "red.png", 486, 425, 10, 18, 38, 
+                      TRUE, 100, 255, (gpointer)&change_signal, NULL);
+  actor->time_start_animation = now + fast_rnd(30) + 10;  
+  scene.actors = g_slist_append(scene.actors, actor);winds[0][0] = 717;
+    
+    winds[0][0] = 389;
+    winds[0][1] = 305;
+
+    winds[1][0] = 373;
+    winds[1][1] = 306;
+
+    winds[2][0] = 355;
+    winds[2][1] = 306;
+
+    winds[3][0] = 356;
+    winds[3][1] = 288;
+    
+    winds[4][0] = 337;
+    winds[4][1] = 269;
+    
+    winds[5][0] = 372;
+    winds[5][1] = 268;
+  
+    winds[6][0] = 372;
+    winds[6][1] = 249;
+    
+    winds[7][0] = 388;
+    winds[7][1] = 249;
+    
+    winds[8][0] = 387;
+    winds[8][1] = 230;
+    
+    winds[9][0] = 372;
+    winds[9][1] = 211;
+    
+    winds[10][0] = 355;
+    winds[10][1] = 159;
+    
+    winds[11][0] = 335;
+    winds[11][1] = 158;
+    
+    winds[12][0] = 386;
+    winds[12][1] = 119;
+  
+    for (i=0; i<13; i++){
+        actor = init_object(desktop_plugin, "window", "window.png", 
+                            winds[i][0], winds[i][1], 10, 8, 9, 
+                            FALSE, 100, 255, (gpointer)&change_window1, NULL);
+        //change_window1(actor, desktop_plugin);
+        actor->time_start_animation = now + fast_rnd(30);
+        scene.actors = g_slist_append(scene.actors, actor);
+
+    }
+    
+    run_long_timeout(desktop_plugin);
 
 }
 
@@ -582,8 +1241,6 @@ void
 get_sun_screen_pos(double alt, double azm, gint * x, gint * y)
 {
     gint y0 = 365;// - уровень горизонта
-    gint o_width = 128,
-         o_height = 128; 
     *x = (int)(azm * 800) - 64;
     *y = (int)((1 - alt) * y0) - 64;
     //fprintf(stderr, "sun pos alt=%f azm=%f x=%d y=%d\n", alt, azm, *x, *y);
@@ -664,19 +1321,20 @@ change_actor(GtkWidget * actor)
 static gboolean
 short_timeout (AWallpaperPlugin *desktop_plugin)
 {
-      gint daytime = get_daytime();
-      GSList * tmp;
-      gchar * name;
-      void (*pfunc)(gpointer, gpointer);
-      time_t now;
-      gint t;
-      Actor *actor;
-      gboolean stop_flag = TRUE;
+    gint daytime = get_daytime();
+    GSList * tmp;
+    void (*pfunc)(gpointer, gpointer);
+    time_t now;
+    Actor *actor;
+    gboolean stop_flag = TRUE;
 
-    if (!desktop_plugin->priv->visible)
-        return TRUE;
+if (!desktop_plugin->priv->visible || !desktop_plugin->priv->rich_animation){
+        desktop_plugin->priv->short_timer = 0;
+        return FALSE;
+    }
 
     now = time(NULL);
+    //scene.daytime = daytime;
     /* fprintf(stderr, "Short timer %d\n", now); */
     tmp = scene.actors;
     while (tmp != NULL){
@@ -692,7 +1350,6 @@ short_timeout (AWallpaperPlugin *desktop_plugin)
             }
             tmp = g_slist_next(tmp);
     }
-    scene.daytime = daytime;
     if (stop_flag){
          desktop_plugin->priv->short_timer = 0;
          return FALSE;
@@ -700,52 +1357,70 @@ short_timeout (AWallpaperPlugin *desktop_plugin)
          return TRUE; /* keep running this event */
 }
 
+void
+run_long_timeout(AWallpaperPlugin *desktop_plugin){
 
-static gboolean
-long_timeout (AWallpaperPlugin *desktop_plugin)
-{
-      gint daytime = get_daytime();
-      GSList * tmp;
-      gchar * name;
-      void (*pfunc)(gpointer, gpointer);
-      time_t now;
-      gint t;
-      Actor *actor;
-
-    /* TODO  remove timeout */
-    if (!desktop_plugin->priv->visible)
-        return TRUE;
-  //fprintf(stderr, "timer daytime=%d\n", daytime);
-  if (scene.daytime != daytime){
-      tmp = scene.actors;
-      while (tmp != NULL){
-          //change_actor(tmp->data);
-          pfunc =((Actor*)tmp->data)->func_change;
-          if (pfunc){
-              (*pfunc)(tmp->data, desktop_plugin);
-          }
-          tmp = g_slist_next(tmp);
-      }
-   }
+    gint daytime = get_daytime();
+    GSList * tmp;
+    void (*pfunc)(gpointer, gpointer);
+    time_t now;
+    Actor *actor;
+
+
+    //fprintf(stderr, "timer daytime=%d\n", daytime);
+    if (scene.daytime != daytime){
+        scene.daytime = daytime;
+        tmp = scene.actors;
+        while (tmp != NULL){
+            //change_actor(tmp->data);
+            pfunc =((Actor*)tmp->data)->func_change;
+            if (pfunc){
+                (*pfunc)(tmp->data, desktop_plugin);
+            }
+            tmp = g_slist_next(tmp);
+        }
+    }
    
-   now = time(NULL);
-//fprintf(stderr, "Now  %d\n", now);
-   tmp = scene.actors;
-   while (tmp != NULL){
-       actor = tmp->data;
-       if (now >= actor->time_start_animation  
-           && actor->time_start_animation > 0
-           && desktop_plugin->priv->short_timer == 0){
-            actor->time_start_animation = now;
+    now = time(NULL);
+    //fprintf(stderr, "Now  %d\n", now);
+    tmp = scene.actors;
+    while (tmp != NULL){
+        actor = tmp->data;
+        if (now >= actor->time_start_animation  
+            && actor->time_start_animation > 0
+            && desktop_plugin->priv->short_timer == 0){
             /* fprintf(stderr, "start short timer act = %s %d\n", actor->name, now); */
-            desktop_plugin->priv->short_timer = g_timeout_add(SHORT_TIMER, short_timeout, desktop_plugin);
+            if (desktop_plugin->priv->rich_animation){
+                actor->time_start_animation = now;
+                desktop_plugin->priv->short_timer = g_timeout_add(SHORT_TIMER, (GtkFunction)short_timeout, desktop_plugin);
+            }
+            else {
+                (*actor->func_change)(actor, desktop_plugin);
+            }
         }
         tmp = g_slist_next(tmp);
-   }
-   
- scene.daytime = daytime;
+    }
+}
 
- return TRUE; /* keep running this event */
+static gboolean
+long_timeout (AWallpaperPlugin *desktop_plugin)
+{
+    /* fprintf(stderr, "long_timeout %i\n", desktop_plugin->priv->long_timer); */
+    if (desktop_plugin->priv->long_timer == 0 )
+        return FALSE;
+    if (!desktop_plugin->priv->visible){
+        if(desktop_plugin->priv->short_timer != 0){
+            g_source_remove(desktop_plugin->priv->short_timer);
+            desktop_plugin->priv->short_timer = 0;
+        }
+        desktop_plugin->priv->long_timer = 0;
+        return FALSE;
+    }
+  
+
+    run_long_timeout(desktop_plugin);
+    return TRUE; /* keep running this event */
 }
 
 static void
@@ -753,46 +1428,94 @@ desktop_plugin_visible_notify (GObject    *object,
                                           GParamSpec *spec,
                                           AWallpaperPlugin *desktop_plugin)
 {
-      gboolean visible;
-      g_object_get (object, "is-on-current-desktop", &visible, NULL);
-      if (visible)
+    gboolean visible;
+    g_object_get (object, "is-on-current-desktop", &visible, NULL);
+    /* fprintf (stderr, "is-on-current-desktop changed. visible: %u", visible); */
+    if (visible){
         desktop_plugin->priv->visible = TRUE;
-      else
+        if (desktop_plugin->priv->long_timer == 0 ){
+            desktop_plugin->priv->long_timer = g_timeout_add(LONG_TIMER, (GtkFunction)long_timeout, desktop_plugin);
+            run_long_timeout(desktop_plugin);
+        }
+    }else{
         desktop_plugin->priv->visible = FALSE;
-   /*   fprintf (stderr, "is-on-current-desktop changed. visible: %u", visible); */
+        if (desktop_plugin->priv->long_timer != 0 ){
+            g_source_remove(desktop_plugin->priv->long_timer);
+            desktop_plugin->priv->long_timer = 0;
+        }
+    }
 }
 
+gboolean
+rich_animation_press(GtkWidget *widget, GdkEvent *event,
+                                            gpointer user_data){
+    fprintf(stderr,"gggggggggggggggggggg2222\n");
+}    
 static void
 animation_wallpaper_plugin_init (AWallpaperPlugin *desktop_plugin)
 {
-    GtkWidget *label;
+    GtkWidget *rich_animation;
+    gchar           buffer[2048];
+
 
     fprintf(stderr, "!!!!!!!plugin init \n");
     Animation_WallpaperPrivate *priv =  Animation_Wallpaper_HOME_PLUGIN_GET_PRIVATE (desktop_plugin);
     desktop_plugin->priv =  Animation_Wallpaper_HOME_PLUGIN_GET_PRIVATE (desktop_plugin);
+
     /* Load config */
     read_config(priv);
     priv->desktop_plugin = desktop_plugin;
-    label = gtk_label_new (""); 
+    desktop_plugin->priv->main_widget = gtk_fixed_new();
+
+    gtk_widget_set_size_request(desktop_plugin->priv->main_widget, 100, 32);
+    desktop_plugin->priv->right_corner = NULL;
+    snprintf(buffer, sizeof(buffer) - 1, "%s/%s/%s", THEME_PATH, desktop_plugin->priv->theme, "town0_right_corner.png");
+    desktop_plugin->priv->right_corner = gtk_image_new_from_file (buffer);
+    if (desktop_plugin->priv->right_corner){
+        gtk_fixed_put(GTK_FIXED(desktop_plugin->priv->main_widget), desktop_plugin->priv->right_corner, 0, 0);
+        gtk_widget_show (desktop_plugin->priv->right_corner);
+    }
+    /* Create rich animation event */
+    rich_animation = gtk_event_box_new();
+    if(rich_animation){
+        gtk_widget_set_events(rich_animation, GDK_BUTTON_PRESS_MASK);
+        gtk_event_box_set_visible_window(GTK_EVENT_BOX(rich_animation), FALSE);
+        gtk_widget_set_size_request(rich_animation, 100, 32);
+        gtk_widget_show (rich_animation);
+        g_signal_connect(rich_animation, "button-press-event", G_CALLBACK(rich_animation_press), desktop_plugin);
+        gtk_fixed_put(GTK_FIXED(desktop_plugin->priv->main_widget), rich_animation, 0, 0);
+    }
+/*
+    GtkWidget *label = gtk_label_new ("ddddddddddddd"); 
     gtk_widget_set_size_request(label, 95, 30);
     gtk_widget_show (label);
+//    gtk_container_add (GTK_CONTAINER (desktop_plugin), label);
+    gtk_fixed_put(GTK_FIXED(widget), label, 0, 0);
+*/
     hd_home_plugin_item_set_settings (HD_HOME_PLUGIN_ITEM (desktop_plugin), TRUE);
     g_signal_connect (desktop_plugin, "show-settings",
                             G_CALLBACK (lw_settings), priv);
-    g_signal_connect (desktop_plugin, "notify::is-on-current-desktop",
-                     G_CALLBACK (desktop_plugin_visible_notify), desktop_plugin);
-
-    gtk_container_add (GTK_CONTAINER (desktop_plugin), label);
+    gtk_widget_show (desktop_plugin->priv->main_widget);
+    gtk_container_add (GTK_CONTAINER (desktop_plugin), desktop_plugin->priv->main_widget);
     init_applet_position();
+
+    
     fprintf(stderr, "!!!theme = %s\n", priv->theme);
     if (!strcmp(priv->theme,"Modern"))
         init_scene(desktop_plugin);
     else if (!strcmp(priv->theme,"Berlin")) 
         init_scene1(desktop_plugin);
-    priv->long_timer = g_timeout_add(LONG_TIMER, long_timeout, desktop_plugin);
+    else if (!strcmp(priv->theme, "Matrix"))
+        init_scene2(desktop_plugin);
+    priv->long_timer = g_timeout_add(LONG_TIMER, (GtkFunction)long_timeout, desktop_plugin);
     priv->short_timer = 0;
     /* TODO Move scene to priv */
     scene.timer_type = LONG_TIMER_TYPE;
+    g_signal_connect (desktop_plugin, "notify::is-on-current-desktop",
+                     G_CALLBACK (desktop_plugin_visible_notify), desktop_plugin);
+
+   
+    //sleep(2);
 }
 
 static void
@@ -800,7 +1523,8 @@ lw_applet_finalize (GObject *object)
 {
      AWallpaperPlugin *desktop_plugin = Animation_Wallpaper_HOME_PLUGIN (object);
      Animation_WallpaperPrivate *priv = desktop_plugin->priv;
-
+     
+     fprintf(stderr,"finalaze %i\n", priv->long_timer);
      if (priv->long_timer){
         g_source_remove(priv->long_timer);
         priv->long_timer = 0;
@@ -820,7 +1544,7 @@ animation_wallpaper_plugin_class_init (AWallpaperPluginClass *klass) {
     GtkObjectClass *gobject_class = GTK_OBJECT_CLASS (klass);
 
     /* gobject */
-    gobject_class->destroy = lw_applet_finalize;
+    gobject_class->destroy = (gpointer)lw_applet_finalize;
     widget_class->realize = lw_applet_realize;
     widget_class->expose_event = lw_applet_expose_event;
 
@@ -829,4 +1553,5 @@ animation_wallpaper_plugin_class_init (AWallpaperPluginClass *klass) {
 }
 
 static void
-animation_wallpaper_plugin_class_finalize (AWallpaperPluginClass *class) {}
+animation_wallpaper_plugin_class_finalize (AWallpaperPluginClass *class) {
+}