Initialize attributes.event_mask correctly.

diff --git a/akamaru.c b/akamaru.c
index cc551436cd371449ec3a2f19ef7c9faf5559c1ed..c667c371fade45e09ca49cdd274e177723dc9e1d 100644 (file)
--- a/akamaru.c
+++ b/akamaru.c
@@ -20,7 +20,7 @@
 
 #include "akamaru.h"
 
-const double elasticity = 0.5;
+const double elasticity = 0.7;
 const double friction = 4;
 const double gravity = 50;
 
@@ -435,7 +435,7 @@ model_step (Model *model, double delta_t)
 
   model_accumulate_forces (model);
   model_integrate (model, delta_t);
-  for (i = 0; i < 2; i++)
+  for (i = 0; i < 20; i++)
     model_constrain (model);
 
   model->theta += delta_t;

diff --git a/dock.c b/dock.c
index 54e4746774bffa9f92cd58471f57c1aece50c6d2..37707a98fcb243eb81014b40af25ab76ff4622a6 100644 (file)
--- a/dock.c
+++ b/dock.c
@@ -32,8 +32,8 @@ timeout_callback (gpointer data)
 
   for (i = 0; i < closure->num_icons; i++) {
     gdk_window_move (closure->windows[i],
-                    closure->model.objects[i + 1].position.x + 0.5,
-                    closure->model.objects[i + 1].position.y + 0.5);
+                    closure->model.objects[i + 1].position.x,
+                    closure->model.objects[i + 1].position.y);
   }
 
   model_step (&closure->model, 0.1);
@@ -56,12 +56,13 @@ create_window (GdkScreen *screen, int x, int y, int width, int height)
   attributes.y = y;
   attributes.width = width;
   attributes.height = height;
-  attributes.event_mask |=
+  attributes.event_mask =
     GDK_EXPOSURE_MASK |
     GDK_BUTTON_PRESS_MASK |
     GDK_BUTTON_RELEASE_MASK |
     GDK_ENTER_NOTIFY_MASK |
     GDK_LEAVE_NOTIFY_MASK |
+    GDK_POINTER_MOTION_MASK |
     GDK_POINTER_MOTION_HINT_MASK;
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
@@ -107,7 +108,7 @@ model_init_dock (Model *model, int num_items, int x, int y, int spacing)
   spacer = model->spacers;
 
   for (i = 1; i < num_objects; i++, object++) {
-    object_init (&model->objects[i], 200 + i * spacing / 2, 300, 1);
+    object_init (&model->objects[i], 200 + i * spacing / 2, 300, 3);
     spring_init (spring++, &model->objects[0], object, spacing);
     for (j = 1; j < num_objects - i; j++) {
       spacer_init (spacer++, object, object + j, spacing);