changed matrix behavior when rich_animation off
[livewp] / applet / src / livewp-home-widget.c
index 39263da..393673b 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)
  * 
@@ -41,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
@@ -171,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;
 }
@@ -186,10 +185,12 @@ init_object(AWallpaperPlugin *desktop_plugin,
             gint width, 
             gint height, 
             gboolean visible, 
+            gboolean load_image,
             gint scale, 
             gint opacity, 
             void (*pfunc_change)(Actor*),
-            void (*pfunc_probability)(Actor*)
+            void (*pfunc_probability)(Actor*),
+            GPtrArray *child
            )
 {
   Actor *actor = NULL;
@@ -206,7 +207,8 @@ init_object(AWallpaperPlugin *desktop_plugin,
   actor->name = g_strdup(name);
   actor->func_change = (gpointer)pfunc_change; 
   actor->func_probability = (gpointer)pfunc_probability;
-  if (visible)
+  actor->child = child;
+  if (load_image)
     create_hildon_actor(actor, desktop_plugin);
   else 
     actor->widget = NULL;
@@ -230,23 +232,28 @@ rnd(gint max)
     srand(time(NULL));
     return rand() % max;
 }
-guint seed;
 gint fast_rnd(gint max)
 {
     guint offset = 12923;
     guint multiplier = 4079;
     
-    seed = seed * multiplier + offset;
-    return (gint)(seed % max);
+    scene.seed = scene.seed * multiplier + offset;
+    return (gint)(scene.seed % max);
+}
+
+gint 
+probability_sun()
+{
+    /* update sun position after ...  second */
+    return 60;
 }
 
 
 gint 
 probability_plane()
 {
-    gint t = (fast_rnd(10) + 1) * 60;
-    fprintf(stderr, "probability_plane %d\n", t);
-    return t;
+    //return (fast_rnd(10) + 1) * 60;
+    return fast_rnd(180);
 }
 
 void 
@@ -254,6 +261,25 @@ change_moon(Actor * actor, AWallpaperPlugin *desktop_plugin)
 {
     gint phase;
     char *newfile;
+    gint x0 = 150,
+         x1 = 650, 
+         x, y,
+         y0=150, y1 = 150, x2=400, y2=30;
+    double a, b, c;
+    struct timeval tvb;     
+    suseconds_t ms;
+    long sec;
+    double t;
+#if 0
+    a = (double)(y2 - (double)(x2*(y1-y0) + x1*y0 - x0*y1)/(x1-x0))/(x2*(x2-x0-x1)+x0*x1);
+    b = (double)(y1-y0)/(x1-x0) - (double)a*(x0+x1);
+    c = (double)(x1*y0 - x0*y1)/(x1-x0) + (double)a*x0*x1;
+    fprintf(stderr, "a=%f, b=%f, c=%f\n", a, b, c);
+#endif
+    gettimeofday(&tvb, NULL);
+    
+    ms = tvb.tv_usec;
+    sec = tvb.tv_sec;
 
     if (actor){
         if (scene.daytime == TIME_NIGHT){
@@ -264,20 +290,32 @@ change_moon(Actor * actor, AWallpaperPlugin *desktop_plugin)
                 if (actor->filename)
                     g_free(actor->filename);
                 actor->filename = newfile;
+                actor->time_start_animation = sec - fast_rnd(60 * 60);
+                actor->duration_animation = 1 * 60 * 60;
                 create_hildon_actor(actor, desktop_plugin);
 
             }
-            //actor->x = 400;
-            //actor->y = 10;
-           // actor_set_position_full(actor->widget, x, y, actor->z);
-            //probability_sun(actor);
-            //fprintf(stderr, "after change sun %d\n", actor->time_start_animation);
+            t = (double)((double)sec+(double)ms/1000000 - actor->time_start_animation) / actor->duration_animation;
+            if (t <= 1)
+                x = path_line(x0, x1, t);
+            else 
+                x = path_line(x1, x0, t-1);
+            //y = path_line(y0, y1, t);
+            y = 0.001920*x*x - 1.536*x + 337.2;
+            //y = a*x*x + b*x + c;
+
+            actor_set_position_full(actor->widget, x, y, actor->z);
+
+            if (t>=2){
+                actor->time_start_animation = sec;
+            }
+
          }else if (actor->visible){
             actor->visible = FALSE;
             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;
         } 
     }
     
@@ -289,11 +327,11 @@ change_sun(Actor * actor, AWallpaperPlugin *desktop_plugin)
     double alt, azm;
     gint x, y;
 
+    //fprintf(stderr, "change sun\n");
     if (actor){
         if (scene.daytime != TIME_NIGHT){
             if (!actor->visible){
                 actor->visible = TRUE;
-
                 create_hildon_actor(actor, desktop_plugin);
             }
             get_sun_pos(&alt, &azm);
@@ -301,11 +339,12 @@ 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;
         } 
     }
     
@@ -322,12 +361,12 @@ change_tram(Actor * actor, AWallpaperPlugin *desktop_plugin)
     long sec;
     double t;
 
+    //fprintf(stderr, "change tram\n");
     gettimeofday(&tvb, NULL);
     
     ms = tvb.tv_usec;
     sec = tvb.tv_sec;
-//    fprintf(stderr, "1 %f - %d\n", sec+(double)ms/100000, now);
-   
+    
     if (!actor->visible){
         actor->visible = TRUE;
         if (scene.daytime == TIME_NIGHT){
@@ -352,16 +391,16 @@ change_tram(Actor * actor, AWallpaperPlugin *desktop_plugin)
         /* stop animation */
         actor->visible = FALSE;
         destroy_hildon_actor(actor);
-        actor->time_start_animation = sec + 5*60;
+        actor->time_start_animation = sec + fast_rnd(60);
     }
 }
 
 void
 change_plane1(Actor *actor, AWallpaperPlugin *desktop_plugin)
 {
-    gint x0 = 620, y0 = 233, scale0 = 100,
-         x1 = 79, y1 = -146, scale1 = 100, 
-         x, y, scale;
+    gint x0 = 620, y0 = 233,
+         x1 = 79, y1 = -146, 
+         x, y;
     struct timeval tvb;     
     suseconds_t ms;
     long sec;
@@ -373,17 +412,14 @@ change_plane1(Actor *actor, AWallpaperPlugin *desktop_plugin)
     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;
-        if (scene.daytime == TIME_NIGHT){
-            if (actor->filename)
-                g_free(actor->filename);
-            actor->filename = g_strdup("tu154.png");
-        }else{
-            if (actor->filename)
-                g_free(actor->filename);
-            actor->filename = g_strdup("tu154.png");
-        }
         create_hildon_actor(actor, desktop_plugin);
     }
     t = (double)((double)sec+(double)ms/1000000 - actor->time_start_animation) / actor->duration_animation;
@@ -397,7 +433,10 @@ change_plane1(Actor *actor, AWallpaperPlugin *desktop_plugin)
         /* stop animation */
         actor->visible = FALSE;
         destroy_hildon_actor(actor);
-        actor->time_start_animation = sec + probability_plane();
+        if (scene.daytime == TIME_NIGHT) 
+            actor->time_start_animation = 0;
+        else 
+            actor->time_start_animation = sec + probability_plane();
     }
 
 }
@@ -405,9 +444,9 @@ change_plane1(Actor *actor, AWallpaperPlugin *desktop_plugin)
 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;
+    gint x0 = -actor->width, y0 = 45,
+         x1 = 800, y1 = 20, 
+         x, y;
     struct timeval tvb;     
     suseconds_t ms;
     long sec;
@@ -418,21 +457,17 @@ change_plane2(Actor *actor, AWallpaperPlugin *desktop_plugin)
     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;
-        if (scene.daytime == TIME_NIGHT){
-            if (actor->filename)
-                g_free(actor->filename);
-        if (scene.daytime == TIME_NIGHT)
-            actor->filename = g_strdup("plane3.png");
-        }else{
-            if (actor->filename)
-                g_free(actor->filename);
-            actor->filename = g_strdup("plane3.png");
-        }
         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);
@@ -444,7 +479,10 @@ change_plane2(Actor *actor, AWallpaperPlugin *desktop_plugin)
         /* stop animation */
         actor->visible = FALSE;
         destroy_hildon_actor(actor);
-        actor->time_start_animation = sec + probability_plane();
+        if (scene.daytime == TIME_NIGHT) 
+            actor->time_start_animation = 0;
+        else 
+            actor->time_start_animation = sec + probability_plane();
     }
 
 }
@@ -459,19 +497,26 @@ change_cloud(Actor *actor, AWallpaperPlugin *desktop_plugin)
     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, "1 %f - %d\n", sec+(double)ms/100000, now);
+    //fprintf(stderr, "c1oud %s - y0=%d\n", actor->name, actor->y);
    
     if (!actor->visible){
         actor->visible = TRUE;
-        if (scene.daytime == TIME_NIGHT)
-            actor->filename = actor->filename;
-        else
-            actor->filename = actor->filename;
+        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;
@@ -496,12 +541,92 @@ change_cloud(Actor *actor, AWallpaperPlugin *desktop_plugin)
         /* stop animation */
         actor->visible = FALSE;
         destroy_hildon_actor(actor);
-        actor->time_start_animation = sec + 5*60;
+        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->widget){
+            actor->visible = FALSE;
+            destroy_hildon_actor(actor);
+        }
+        actor->time_start_animation = 0;
+        return;
+    }else {
+        if (!actor->widget)
+            create_hildon_actor(actor, desktop_plugin);
+        if (actor->time_start_animation == 0){
+            actor->time_start_animation = now + fast_rnd(30);
+            return;
+        }
+    }
+
+    if (!actor->visible)
+        actor->visible = TRUE;
+    else 
+        actor->visible = FALSE;
+    hildon_animation_actor_set_show(
+            HILDON_ANIMATION_ACTOR(actor->widget), 
+            actor->visible
+    );
+    actor->time_start_animation = now + fast_rnd(60) + 10;
+
+}
+
+void 
+change_signal(Actor * actor, AWallpaperPlugin *desktop_plugin)
+{
+    gint now = time(NULL);
+    Actor *a;
+#if 0
+    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;
+#endif
+    a = g_ptr_array_index(actor->child, 0);
+    //fprintf(stderr, "actor name= %p \n", child->widget);
+    if (a->visible)
+        a->visible = FALSE;
+    else 
+        a->visible = TRUE;
+    hildon_animation_actor_set_show (HILDON_ANIMATION_ACTOR(a->widget), a->visible);
+    
+    a = g_ptr_array_index(actor->child, 1);
+    //fprintf(stderr, "actor name= %s \n", child->name);
+    if (a->visible)
+        a->visible = FALSE;
+    else 
+        a->visible = TRUE;
+    hildon_animation_actor_set_show (HILDON_ANIMATION_ACTOR(a->widget), a->visible);
+
+    actor->time_start_animation = now + fast_rnd(30) + 10;
+}
+
+void
 create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin) 
 {
   GtkWidget *ha = NULL;
@@ -509,7 +634,6 @@ create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
   GtkWidget *image = NULL;
   gchar     *str = NULL;
 
-  /* fprintf(stderr, "create_hildon_actor %s\n", actor->name);*/
   ha = hildon_animation_actor_new();
   str = g_strdup_printf( "%s/%s/%s", THEME_PATH, 
                         desktop_plugin->priv->theme, actor->filename);
@@ -517,6 +641,7 @@ create_hildon_actor(Actor *actor, AWallpaperPlugin *desktop_plugin)
                                              actor->width, 
                                              actor->height, 
                                              NULL);
+  /*fprintf(stderr, "create_hildon_actor %s %s\n", actor->name, str);*/
   if (str)
       g_free(str);
   if (pixbuf){
@@ -529,10 +654,10 @@ 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 (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);
+  hildon_animation_actor_set_show (HILDON_ANIMATION_ACTOR(ha), actor->visible);
 
   /* TO DO check it */
   /*  gdk_flush (); */
@@ -598,18 +723,91 @@ 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 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_layer(Actor * actor, AWallpaperPlugin *desktop_plugin)
+{
+    gint y;
+    Actor *a;
+
+    if (!desktop_plugin->priv->rich_animation) return;
+
+    a = g_ptr_array_index(actor->child, 0);
+    y = a->y + 10;
+    if (y > 480) y = -480;
+    //fprintf(stderr, "!! %s - %d\n", actor->name, y);
+    actor_set_position_full(a->widget, a->x, y, a->z);
+    a->y = y;
+    
+    a = g_ptr_array_index(actor->child, 1);
+    y = a->y + 10;
+    if (y > 480) y = -480;
+    //fprintf(stderr, "!! %s - %d\n", actor->name, y);
+    actor_set_position_full(a->widget, a->x, y, a->z);
+    a->y = y;
+
+    a = g_ptr_array_index(actor->child, 2);
+    y = a->y + 20;
+    if (y > 480) y = -480;
+    //fprintf(stderr, "!! %s - %d\n", actor->name, y);
+    actor_set_position_full(a->widget, a->x, y, a->z);
+    a->y = y;
+
+    a = g_ptr_array_index(actor->child, 3);
+    y = a->y + 20;
+    if (y > 480) y = -480;
+    //fprintf(stderr, "!! %s - %d\n", actor->name, y);
+    actor_set_position_full(a->widget, a->x, y, a->z);
+    a->y = y;
+
+}
+
+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 
@@ -625,6 +823,9 @@ destroy_scene(void){
     while (tmp != NULL){
         actor = tmp->data;
         if (actor){
+            if (actor->child){
+                g_ptr_array_free(actor->child, TRUE);
+            }
             if (actor->filename)
                 g_free(actor->filename);
             if (actor->name)
@@ -648,66 +849,387 @@ 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;
+  GPtrArray *child;
+  gint now = time(NULL);
+  gint y1, y2;
+
+  if (desktop_plugin->priv->rich_animation){
+      y1 = -480;
+      y2 = -480-480;
+  }else {
+      y1 = 0;
+      y2 = -480;
+  }
+
+  fprintf(stderr, "init scene2 \n");
+  //scene.daytime = get_daytime();
+  scene.actors = NULL;
+
+  
+  actor = init_object(desktop_plugin, "background", "bg.png", 
+                      0, 0, 5, 800, 480, 
+                      TRUE, TRUE, 100, 255, 
+                      NULL, NULL, NULL);
+  scene.actors = g_slist_append(scene.actors, actor);
 
+  actor = init_object(desktop_plugin, "symbols", "symbols.png", 
+                      0, 0, 10, 800, 480, 
+                      TRUE, TRUE, 100, 255, 
+                      NULL, NULL, NULL);
+  scene.actors = g_slist_append(scene.actors, actor);
+
+  child = g_ptr_array_sized_new(4);
+  actor = init_object(desktop_plugin, "layer1", "layer1_2.png", 
+                      0, y1, 6, 800, 960, 
+                      TRUE, TRUE, 100, 255, 
+                      NULL, NULL, NULL);
+  //actor->time_start_animation = now;
+  //actor->duration_animation = G_MAXINT;
+  scene.actors = g_slist_append(scene.actors, actor);
+  g_ptr_array_add(child, actor);
+
+  actor = init_object(desktop_plugin, "layer1", "layer1_1.png", 
+                      0, y2, 7, 800, 960, 
+                      TRUE, TRUE, 100, 255, 
+                      NULL, NULL, NULL);
+  //actor->time_start_animation = now;
+  //actor->duration_animation = G_MAXINT;
+  scene.actors = g_slist_append(scene.actors, actor);
+  g_ptr_array_add(child, actor);
+
+  actor = init_object(desktop_plugin, "layer2", "layer2_2.png", 
+                      0, y1, 8, 800, 960, 
+                      TRUE, TRUE, 100, 255, 
+                      NULL, NULL, NULL);
+  //actor->time_start_animation = now;
+  //actor->duration_animation = G_MAXINT;
+  scene.actors = g_slist_append(scene.actors, actor);
+  g_ptr_array_add(child, actor);
+
+  actor = init_object(desktop_plugin, "layer2", "layer2_1.png", 
+                      0, y2, 9, 800, 960, 
+                      TRUE, TRUE, 100, 255, 
+                      NULL, NULL, NULL);
+  //actor->time_start_animation = now;
+  //actor->duration_animation = G_MAXINT;
+  scene.actors = g_slist_append(scene.actors, actor);
+  g_ptr_array_add(child, actor);
+
+  actor = init_object(desktop_plugin, "layers", "", 
+                      0, y2, 9, 800, 960, 
+                      FALSE, FALSE, 100, 255, 
+                      (gpointer)&change_layer, NULL, child);
+  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, (gpointer)&change_static_actor, NULL);
+  actor = init_object(desktop_plugin, "sky", "sky0.png", 
+                      0, 0, 5, 800, 480, 
+                      TRUE , TRUE, 100, 255, 
+                      (gpointer)&change_static_actor, NULL, 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, (gpointer)&change_sun, &probability_sun);
-  actor->time_start_animation = time(NULL);
+  actor = init_object(desktop_plugin, "sun", "sun.png", 
+                      0, 0, 6, 88, 88, 
+                      FALSE, FALSE, 100, 255, 
+                      (gpointer)&change_sun, (gpointer)&probability_sun, NULL);
+  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, FALSE, 100, 255, 
+                      (gpointer)&change_cloud, NULL, NULL);
+  actor->time_start_animation = now + fast_rnd(20);
+  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, FALSE, 100, 255, 
+                      (gpointer)&change_cloud, NULL, NULL);
+  actor->time_start_animation = now + fast_rnd(40)+10;
+  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, FALSE, 100, 255, 
+                      (gpointer)&change_cloud, NULL, NULL);
+  actor->time_start_animation = now + fast_rnd(60) + 20;
+  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, (gpointer)&change_static_actor, NULL);
+  actor = init_object(desktop_plugin, "town", "town0.png", 
+                      0, 0, 8, 800, 480, 
+                      TRUE, TRUE, 100, 255, 
+                      (gpointer)&change_static_actor, NULL, 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, 8, 350, 210, 
-                      FALSE, 100, 255, (gpointer)&change_tram, NULL);
-  actor->time_start_animation = time(NULL) + 10;
+  actor = init_object(desktop_plugin, "tram", "tram.png", 
+                      -300, 225, 9, 350, 210, 
+                      FALSE, FALSE, 100, 255, 
+                      (gpointer)&change_tram, NULL, 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, "border", "border0.png", 0, 480-79, 9, 800, 79,
-                      TRUE, 100, 255, (gpointer)&change_static_actor, NULL);
-  change_static_actor(actor, desktop_plugin);
+  actor = init_object(desktop_plugin, "border", "border0.png", 
+                      0, 480-79, 10, 800, 79,
+                      TRUE, TRUE, 100, 255, 
+                      (gpointer)&change_static_actor_with_corner, NULL, 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, 10, 60, 60, 
-                      FALSE, 100, 255, (gpointer)&change_moon, NULL);
+  actor = init_object(desktop_plugin, "moon", "moon1.png", 
+                      400, 20, 6, 60, 60, 
+                      FALSE, FALSE, 100, 255, 
+                      (gpointer)&change_moon, NULL, NULL);
   change_moon(actor, desktop_plugin);
   scene.actors = g_slist_append(scene.actors, actor);
 
+  actor = init_object(desktop_plugin, "wind", "", 
+                      0, 0, 5, 0, 0, 
+                      FALSE, FALSE, 100, 255, 
+                      (gpointer)&change_wind, NULL, NULL);
+  change_wind(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, FALSE, 100, 255, 
+                            (gpointer)&change_window1, NULL, 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, FALSE, 100, 255, 
+                            (gpointer)&change_window1, NULL, 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, FALSE, 100, 255, 
+                            (gpointer)&change_window1, NULL, 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, FALSE, 100, 255, 
+                            (gpointer)&change_window1, NULL, 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, FALSE, 100, 255, 
+                            (gpointer)&change_window1, NULL, 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;
@@ -725,62 +1247,168 @@ init_scene(AWallpaperPlugin *desktop_plugin)
 static void
 init_scene1(AWallpaperPlugin *desktop_plugin)
 {
-  Actor *actor;
+  Actor *actor, *actor1, *actor2;
   gint now = time(NULL);
-  
+  gint i; 
+  gint winds[13][2];
+  GPtrArray *child = NULL;
 
   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, (gpointer)&change_static_actor, NULL);
+                      TRUE, TRUE, 100, 255, 
+                      (gpointer)&change_static_actor, NULL, 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, (gpointer)&change_sun, &probability_sun);
+                      FALSE, FALSE, 100, 255, 
+                      (gpointer)&change_sun, (gpointer)&probability_sun, NULL);
   actor->time_start_animation = time(NULL);
   actor->duration_animation = G_MAXINT;
   change_sun(actor, desktop_plugin);
   scene.actors = g_slist_append(scene.actors, actor);
 
-
+#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);
-
-
-  actor = init_object(desktop_plugin, "town", "town.png", 0, 0, 10, 800, 480, 
-                      TRUE, 100, 255, (gpointer)&change_static_actor, NULL);
-  change_static_actor(actor, desktop_plugin);
-  scene.actors = g_slist_append(scene.actors, actor);
+#endif
 
   actor = init_object(desktop_plugin, "moon", "moon1.png", 400, 15, 6, 60, 60, 
-                      FALSE, 100, 255, (gpointer)&change_moon, NULL);
+                      FALSE, FALSE, 100, 255, 
+                      (gpointer)&change_moon, NULL, 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, FALSE, 100, 255, 
+                      (gpointer)&change_cloud, NULL, NULL);
+  actor->time_start_animation = now + fast_rnd(30) + 10;
+  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, FALSE, 100, 255, 
+                      (gpointer)&change_cloud, NULL, NULL);
+  actor->time_start_animation = now + fast_rnd(10);
+  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, FALSE, 100, 255, 
+                      (gpointer)&change_cloud, NULL, NULL);
+  actor->time_start_animation = now + fast_rnd(60) + 20;
+  actor->duration_animation = 5*60;
+  scene.actors = g_slist_append(scene.actors, 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();
+                      FALSE, FALSE, 100, 255, 
+                      (gpointer)&change_plane2, NULL, NULL);
+  actor->time_start_animation = now + fast_rnd(40) + 20;
   actor->duration_animation = 60;
   scene.actors = g_slist_append(scene.actors, actor);
   
-  actor = init_object(desktop_plugin, "plane1", "tu154_small.png", 620, 233, 9, 300, 116, 
-                      FALSE, 100, 255, (gpointer)&change_plane1, NULL);
-  actor->time_start_animation = now + probability_plane();
+  actor = init_object(desktop_plugin, "plane1", "tu154.png", 620, 233, 9, 300, 116, 
+                      FALSE, FALSE, 100, 255, 
+                      (gpointer)&change_plane1, NULL, NULL);
+  actor->time_start_animation = now + fast_rnd(20);
   actor->duration_animation = 30;
   scene.actors = g_slist_append(scene.actors, actor);
 
-  actor = init_object(desktop_plugin, "cloud1", "cloud2.png", 0, 50, 7, 188, 75, 
-                      FALSE, 100, 255, (gpointer)&change_cloud, NULL);
-  actor->time_start_animation = now + 5;
-  actor->duration_animation = 5*60;
+  actor = init_object(desktop_plugin, "town", "town.png", 0, 0, 10, 800, 480, 
+                      TRUE, TRUE, 100, 255, 
+                      (gpointer)&change_static_actor_with_corner, NULL, NULL);
+  change_static_actor_with_corner(actor, desktop_plugin);
+  scene.actors = g_slist_append(scene.actors, actor);
+
+  actor = init_object(desktop_plugin, "wind", "", 0, 0, 5, 0, 0, 
+                      FALSE, FALSE, 100, 255, 
+                      (gpointer)&change_wind, NULL, NULL);
+  change_wind(actor, desktop_plugin);
   scene.actors = g_slist_append(scene.actors, actor);
 
+  actor1 = init_object(desktop_plugin, "signal_red", "red.png", 
+                      486, 425, 10, 18, 38, 
+                      FALSE, TRUE, 100, 255, NULL, NULL, NULL);
+  //actor->time_start_animation = now + fast_rnd(30) + 10;  
+  scene.actors = g_slist_append(scene.actors, actor1);
+   
+  actor2 = init_object(desktop_plugin, "signal_green", "green.png", 
+                      486, 425, 10, 18, 38, 
+                      TRUE, TRUE, 100, 255, NULL, NULL, NULL);
+  //actor->time_start_animation = now + fast_rnd(30) + 10;  
+  scene.actors = g_slist_append(scene.actors, actor2);
+  child = g_ptr_array_sized_new(2);
+  g_ptr_array_add(child, actor1);
+  g_ptr_array_add(child, actor2);
+  actor = init_object(desktop_plugin, "signal", "",
+                      486, 425, 10, 18, 38,
+                      FALSE, FALSE, 100, 255, 
+                      (gpointer)&change_signal, NULL, child);
+  actor->time_start_animation = now + fast_rnd(30) + 10;
+  scene.actors = g_slist_append(scene.actors, actor);
+    
+    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, TRUE, 100, 255, 
+                            (gpointer)&change_window1, NULL, 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);
+
 }
 
 
@@ -868,17 +1496,20 @@ change_actor(GtkWidget * actor)
 static gboolean
 short_timeout (AWallpaperPlugin *desktop_plugin)
 {
-      gint daytime = get_daytime();
-      GSList * tmp;
-      void (*pfunc)(gpointer, gpointer);
-      time_t now;
-      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){
@@ -894,7 +1525,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;
@@ -902,50 +1532,71 @@ short_timeout (AWallpaperPlugin *desktop_plugin)
          return TRUE; /* keep running this event */
 }
 
-
-static gboolean
-long_timeout (AWallpaperPlugin *desktop_plugin)
+void
+run_long_timeout(AWallpaperPlugin *desktop_plugin)
 {
-      gint daytime = get_daytime();
-      GSList * tmp;
-      void (*pfunc)(gpointer, gpointer);
-      time_t now;
-      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, "!!!run long timeout short_timer=%d\n", desktop_plugin->priv->short_timer);
+    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, (GtkFunction)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
@@ -953,68 +1604,100 @@ 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,"gggggggggggggggggggg\n");
+    fprintf(stderr,"gggggggggggggggggggg2222\n");
+    return FALSE;
 }    
 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);
+    priv->osso = osso_initialize(PACKAGE, VERSION, TRUE, NULL);
+
     /* Load config */
     read_config(priv);
+    /* Initialize DBUS */
+    livewp_initialize_dbus(priv);
+
     priv->desktop_plugin = desktop_plugin;
+    priv->visible = TRUE;
+    priv->short_timer = 0;
+    //priv->theme = g_strdup("Modern");
+    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, 95, 30);
-       gtk_widget_show (rich_animation);
+        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);
     }
 /*
-    label = gtk_label_new (""); 
+    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_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), rich_animation);
+                            G_CALLBACK (show_settings), priv);
+    gtk_widget_show (desktop_plugin->priv->main_widget);
+    gtk_container_add (GTK_CONTAINER (desktop_plugin), desktop_plugin->priv->main_widget);
     init_applet_position();
 
-    /* start value for random */
-    seed = time(NULL);
-
+    
     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);
+    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);
 }
 
@@ -1023,7 +1706,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;
@@ -1052,4 +1736,5 @@ animation_wallpaper_plugin_class_init (AWallpaperPluginClass *klass) {
 }
 
 static void
-animation_wallpaper_plugin_class_finalize (AWallpaperPluginClass *class) {}
+animation_wallpaper_plugin_class_finalize (AWallpaperPluginClass *class) {
+}