--- a/src/mbaf/animated_menu.c	Mon Jul 19 15:44:49 2010 +0800
+++ b/src/mbaf/animated_menu.c	Wed Dec 01 12:25:56 2010 +0800
@@ -1,3 +1,5 @@
+// -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 4; -*-
+// vim: sw=4:ts=8:sts=4
 #include <stdio.h>
 #include <mb.h>
 #include <string.h>
@@ -12,9 +14,11 @@
 
     FOR_COORD_MEMBERS(g, geo) {
         shape = geo_get_shape(geo);
+#ifdef SH_TEXT
         if(shape->obj.obj_type == MBO_TEXT) {
 		sh_text_set_text(shape, text);
         }
+#endif
     }
 }
 
@@ -22,13 +26,8 @@
 {
     int i;
     coord_t *textgroup;
-    shape_t *text;
     coord_t *group;
     coord_t *lightbar;
-    int tmp;
-    mb_timeval_t start, playing, now;
-    mb_progm_t *progm;
-    mb_word_t *word;
 
     // fill new item
     for(i=0;i<8;i++) {
@@ -63,7 +62,6 @@
 {
     int i;
     coord_t *textgroup;
-    shape_t *text;
     coord_t *group;
     coord_t *lightbar;
     int tmp;
@@ -100,7 +98,7 @@
 
     lightbar = (coord_t *) m->lightbar;
     mb_shift_new(0,m->menus_y[m->cur]-coord_y(lightbar),lightbar,word);
-    
+
     MB_TIMEVAL_SET(&start, 0, m->speed);
     MB_TIMEVAL_SET(&playing, 0, 0);
     word = mb_progm_next_word(progm, &start, &playing);
@@ -110,7 +108,7 @@
     mb_progm_free_completed(progm);
     m->ready--;
     subject_add_observer(mb_progm_get_complete(progm), mb_animated_menu_complete,m);
-    mb_progm_start(progm, X_MB_tman(MBAF_RDMAN(m->app)->rt), &now);
+    mb_progm_start(progm, mb_runtime_timer_man(MBAF_RDMAN(m->app)->rt), &now);
     rdman_redraw_changed(MBAF_RDMAN(m->app));
     tmp = m->items[8];
     for(i=8;i>0;i--) {
@@ -123,11 +121,6 @@
 static void mb_animated_menu_fillMenuContentDown(mb_animated_menu_t *m)
 {
     int i;
-    coord_t *textgroup;
-    shape_t *text;
-    coord_t *group;
-    coord_t *lightbar;
-    char name[255];
     int tmp;
     mb_timeval_t start, playing, now;
     mb_progm_t *progm;
@@ -165,7 +158,7 @@
     mb_progm_free_completed(progm);
     m->ready--;
     subject_add_observer(mb_progm_get_complete(progm), mb_animated_menu_complete,m);
-    mb_progm_start(progm, X_MB_tman(MBAF_RDMAN(m->app)->rt), &now);
+    mb_progm_start(progm, mb_runtime_timer_man(MBAF_RDMAN(m->app)->rt), &now);
     rdman_redraw_changed(MBAF_RDMAN(m->app));
     tmp = m->items[0];
     for(i=0;i<8;i++) {
@@ -179,7 +172,6 @@
     mb_timeval_t start, playing, now;
     mb_progm_t *progm;
     mb_word_t *word;
-    coord_t *group;
     coord_t *lightbar;
 
     m->progm = progm = mb_progm_new(1, MBAF_RDMAN(m->app));
@@ -193,7 +185,7 @@
     mb_progm_free_completed(progm);
     m->ready--;
     subject_add_observer(mb_progm_get_complete(progm), mb_animated_menu_complete,m);
-    mb_progm_start(progm, X_MB_tman(MBAF_RDMAN(m->app)->rt), &now);
+    mb_progm_start(progm, mb_runtime_timer_man(MBAF_RDMAN(m->app)->rt), &now);
     rdman_redraw_changed(MBAF_RDMAN(m->app));
 }
 
@@ -209,7 +201,7 @@
             mb_animated_menu_fillMenuContentUp(m);
 	    mb_animated_menu_update(m);
         } else {
-	    if (m->cur == 0) 
+	    if (m->cur == 0)
 	        return;
 	    m->cur--;
             mb_animated_menu_moveLightBar(m);
@@ -268,7 +260,7 @@
 {
     mb_animated_menu_t *m = (mb_animated_menu_t *) arg;
     X_kb_event_t *xkey;
-    
+
     xkey = &m->pending_keys[m->pending_pos];
     m->pending_pos = (m->pending_pos + 1) & 0xf;
     mb_animated_menu_keyHandler((event_t *) xkey, m);
@@ -314,9 +306,9 @@
     }
 }
 
-/** \brief Create an instace of animated menu. 
+/** \brief Create an instace of animated menu.
  *
- *   The objectnames is used to extract symbols from the SVG file. 
+ *   The objectnames is used to extract symbols from the SVG file.
  *         ${objectnames}0 - ${objectnames}8 is the text object.
  *         ${objectnames}_lightbar is the lightbar.
  *
@@ -324,7 +316,7 @@
 mb_animated_menu_t *mb_animated_menu_new(mbaf_t *app,mb_sprite_t *sp,char *objnames,char *menus[])
 {
     mb_animated_menu_t *m;
-    int i,len;
+    int i;
     char name[255];
     mb_obj_t *l;
     int ii;
@@ -334,7 +326,7 @@
     else
 	    for(i=0;menus[i];i++);
     ii=9;
-    
+
     m = (mb_animated_menu_t *) malloc(sizeof(mb_animated_menu_t));
     m->items = (int *) malloc(sizeof(int)*ii*2+sizeof(mb_obj_t *)*ii);
     m->app = app;