ruby-miyako 2.1.0 → 2.1.1

data/miyako_no_katana.c

@@ -32,6 +32,10 @@ License:: LGPL2.1
 static VALUE mSDL = Qnil;
 static VALUE mMiyako = Qnil;
 static VALUE mScreen = Qnil;
+static VALUE mAudio = Qnil;
+static VALUE mInput = Qnil;
+static VALUE mSpriteBase = Qnil;
+static VALUE mAnimation = Qnil;
 static VALUE mDiagram = Qnil;
 static VALUE cSurface = Qnil;
 static VALUE cGL = Qnil;
@@ -40,22 +44,37 @@ static VALUE cThread = Qnil;
 static VALUE cSprite = Qnil;
 static VALUE cSpriteAnimation = Qnil;
 static VALUE cPlane = Qnil;
-#if 0
-static VALUE cParts = Qnil;
-#endif
 static VALUE cMap = Qnil;
 static VALUE cMapLayer = Qnil;
 static VALUE cFixedMap = Qnil;
 static VALUE cFixedMapLayer = Qnil;
-static VALUE cProcessor = Qnil;
+static VALUE cTextbox = Qnil;
 static VALUE nZero = Qnil;
 static VALUE nOne = Qnil;
-static volatile ID id_update = Qnil;
-static volatile ID id_kakko  = Qnil;
-static volatile ID id_render = Qnil;
-static volatile ID id_to_a   = Qnil;
-static volatile int zero = Qnil;
-static volatile int one = Qnil;
+static volatile ID id_update     = Qnil;
+static volatile ID id_kakko      = Qnil;
+static volatile ID id_kakko_eq   = Qnil;
+static volatile ID id_render     = Qnil;
+static volatile ID id_render_to  = Qnil;
+static volatile ID id_to_a       = Qnil;
+static volatile ID id_move       = Qnil;
+static volatile ID id_move_to    = Qnil;
+static volatile ID id_defined    = Qnil;
+static volatile ID id_pos        = Qnil;
+static volatile ID id_ua         = Qnil;
+static volatile ID id_start      = Qnil;
+static volatile ID id_stop       = Qnil;
+static volatile ID id_reset      = Qnil;
+static volatile int zero         = Qnil;
+static volatile int one          = Qnil;
+static const char *str_visible       = "@visible";
+static const char *str_textarea      = "@textarea";
+static const char *str_waiting       = "@waiting";
+static const char *str_wait_cursor   = "@wait_cursor";
+static const char *str_selecting     = "@selecting";
+static const char *str_select_cursor = "@select_cursor";
+static const char *str_choices       = "@choices";
+static const char *str_ahash          = "@@anim_hash";
 
 // from rubysdl_video.c
 static GLOBAL_DEFINE_GET_STRUCT(Surface, GetSurface, cSurface, "SDL::Surface");
@@ -73,6 +92,32 @@ extern void Init_miyako_font();
 extern void Init_miyako_utility();
 extern void Init_miyako_sprite2();
 extern void Init_miyako_input_audio();
+extern void Init_miyako_diagram();
+extern void Init_miyako_yuki();
+
+static VALUE anim_m_update(VALUE self);
+
+static VALUE miyako_main_loop(int argc, VALUE *argv, VALUE self)
+{
+  VALUE clear = Qnil;
+  int is_clear = 0;
+  if(argc == 0){ is_clear = 1; }
+  rb_scan_args(argc, argv, "01", &clear);
+  if(clear != Qnil && clear != Qfalse){ is_clear = 1; }
+  rb_need_block();
+  for(;;)
+  {
+    _miyako_audio_update();
+    _miyako_input_update();
+    _miyako_counter_update();
+    if(is_clear){ _miyako_screen_clear(); }
+    rb_yield(Qnil);
+    _miyako_counter_post_update();
+    anim_m_update(mAnimation);
+    _miyako_screen_render();
+  }
+  return Qnil;
+}
 
 /*
 ===内部用レンダメソッド
@@ -80,13 +125,13 @@ extern void Init_miyako_input_audio();
 static void render_to_inner(MiyakoBitmap *sb, MiyakoBitmap *db)
 {
 	if(sb->ptr == db->ptr){ return; }
-	
+
 	MiyakoSize size;
   if(_miyako_init_rect(sb, db, &size) == 0) return;
-	
+
 	SDL_LockSurface(sb->surface);
 	SDL_LockSurface(db->surface);
-  
+
 	int x, y;
 	for(y = 0; y < size.h; y++)
 	{
@@ -158,13 +203,55 @@ static void render_inner(MiyakoBitmap *sb, MiyakoBitmap *db)
   SDL_BlitSurface(sb->surface, &(sb->rect), db->surface, &(db->rect));
 }
 
+/*
+インスタンスの内容を画面に描画する
+*/
+static VALUE sprite_b_render_xy(VALUE self, VALUE vx, VALUE vy)
+{
+  if(rb_iv_get(self, str_visible) == Qfalse) return self;
+  VALUE cls = rb_obj_class(self);
+  if(rb_funcall(cls, id_defined, ID2SYM(id_move_to)) == Qfalse ||
+      rb_funcall(cls, id_defined, ID2SYM(id_pos)) == Qfalse ){
+    rb_funcall(self, id_render, 0);
+    return self;
+  }
+  VALUE *p_pos = RSTRUCT_PTR(_miyako_layout_pos(self));
+  VALUE x = *(p_pos + 0);
+  VALUE y = *(p_pos + 1);
+  _miyako_layout_move_to(self, vx, vy);
+  rb_funcall(self, id_render, 0);
+  _miyako_layout_move_to(self, x, y);
+  return self;
+}
+
+/*
+インスタンスの内容を別のインスタンスに描画する
+*/
+static VALUE sprite_b_render_xy_to_sprite(VALUE self, VALUE vdst, VALUE vx, VALUE vy)
+{
+  if(rb_iv_get(self, str_visible) == Qfalse) return self;
+  VALUE cls = rb_obj_class(self);
+  if(rb_funcall(cls, id_defined, ID2SYM(id_move_to)) == Qfalse ||
+      rb_funcall(cls, id_defined, ID2SYM(id_pos)) == Qfalse ){
+    rb_funcall(self, id_render_to, 1, vdst);
+    return self;
+  }
+  VALUE *p_pos = RSTRUCT_PTR(_miyako_layout_pos(self));
+  VALUE x = *(p_pos + 0);
+  VALUE y = *(p_pos + 1);
+  _miyako_layout_move_to(self, vx, vy);
+  rb_funcall(self, id_render_to, 1, vdst);
+  _miyako_layout_move_to(self, x, y);
+  return self;
+}
+
 /*
 インスタンスの内容を別のインスタンスに描画する
 */
 static VALUE sprite_c_render_to_sprite(VALUE self, VALUE vsrc, VALUE vdst)
 {
-	MiyakoBitmap src, dst;
-	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
+  MiyakoBitmap src, dst;
+  SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
   _miyako_setup_unit_2(vsrc, vdst, scr, &src, &dst, Qnil, Qnil, 1);
   render_to_inner(&src, &dst);
   return self;
@@ -175,25 +262,98 @@ static VALUE sprite_c_render_to_sprite(VALUE self, VALUE vsrc, VALUE vdst)
 */
 static VALUE sprite_render(VALUE self)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
-  if(visible == Qfalse) return self;
+  if(rb_iv_get(self, str_visible) == Qfalse) return self;
+
+  VALUE src_unit = rb_iv_get(self, "@unit");
+  VALUE dst_unit = rb_iv_get(mScreen, "@@unit");
+
+  SDL_Surface  *src = GetSurface(*(RSTRUCT_PTR(src_unit)+0))->surface;
+  SDL_Surface  *dst = GetSurface(*(RSTRUCT_PTR(dst_unit)+0))->surface;
+
+  SDL_Rect srect, drect;
+
+  VALUE *s_p = RSTRUCT_PTR(src_unit);
+  srect.x = NUM2INT(*(s_p + 1));
+  srect.y = NUM2INT(*(s_p + 2));
+  srect.w = NUM2INT(*(s_p + 3));
+  srect.h = NUM2INT(*(s_p + 4));
+
+  VALUE *d_p = RSTRUCT_PTR(dst_unit);
+  drect.x = NUM2INT(*(d_p + 1)) + NUM2INT(*(s_p + 5));
+  drect.y = NUM2INT(*(d_p + 2)) + NUM2INT(*(s_p + 6));
+  drect.w = NUM2INT(*(d_p + 3));
+  drect.h = NUM2INT(*(d_p + 4));
+
+  SDL_BlitSurface(src, &srect, dst, &drect);
+  return self;
+}
+
+VALUE _miyako_sprite_render(VALUE sprite)
+{
+  return sprite_render(sprite);
+}
+
+/*
+インスタンスの内容を別のインスタンスに描画する
+*/
+static VALUE sprite_render_to_sprite(VALUE self, VALUE vdst)
+{
+  if(rb_iv_get(self, str_visible) == Qfalse) return self;
 	MiyakoBitmap src, dst;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
-  _miyako_setup_unit_2(self, mScreen, scr, &src, &dst, Qnil, Qnil, 1);
-  render_inner(&src, &dst);
+  _miyako_setup_unit_2(self, vdst, scr, &src, &dst, Qnil, Qnil, 1);
+  render_to_inner(&src, &dst);
   return self;
 }
 
+/*
+インスタンスの内容を画面に描画する
+*/
+static VALUE sprite_render_xy(VALUE self, VALUE vx, VALUE vy)
+{
+  if(rb_iv_get(self, str_visible) == Qfalse) return self;
+
+  VALUE src_unit = rb_iv_get(self, "@unit");
+  VALUE dst_unit = rb_iv_get(mScreen, "@@unit");
+
+  SDL_Surface  *src = GetSurface(*(RSTRUCT_PTR(src_unit)+0))->surface;
+  SDL_Surface  *dst = GetSurface(*(RSTRUCT_PTR(dst_unit)+0))->surface;
+
+  SDL_Rect srect, drect;
+
+  VALUE *s_p = RSTRUCT_PTR(src_unit);
+  srect.x = NUM2INT(*(s_p + 1));
+  srect.y = NUM2INT(*(s_p + 2));
+  srect.w = NUM2INT(*(s_p + 3));
+  srect.h = NUM2INT(*(s_p + 4));
+
+  VALUE *d_p = RSTRUCT_PTR(dst_unit);
+  drect.x = NUM2INT(*(d_p + 1)) + NUM2INT(vx);
+  drect.y = NUM2INT(*(d_p + 2)) + NUM2INT(vy);
+  drect.w = NUM2INT(*(d_p + 3));
+  drect.h = NUM2INT(*(d_p + 4));
+
+  SDL_BlitSurface(src, &srect, dst, &drect);
+  return self;
+}
+
+VALUE _miyako_sprite_render_xy(VALUE sprite, VALUE x, VALUE y)
+{
+  return sprite_render_xy(sprite, x, y);
+}
+
 /*
 インスタンスの内容を別のインスタンスに描画する
 */
-static VALUE sprite_render_to_sprite(VALUE self, VALUE vdst)
+static VALUE sprite_render_xy_to_sprite(VALUE self, VALUE vdst, VALUE vx, VALUE vy)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
 	MiyakoBitmap src, dst;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
   _miyako_setup_unit_2(self, vdst, scr, &src, &dst, Qnil, Qnil, 1);
+  src.x = NUM2INT(vx);
+  src.y = NUM2INT(vy);
   render_to_inner(&src, &dst);
   return self;
 }
@@ -203,9 +363,9 @@ static VALUE sprite_render_to_sprite(VALUE self, VALUE vdst)
 */
 static VALUE screen_update_tick(VALUE self)
 {
-  int t = NUM2INT(rb_funcall(mSDL, rb_intern("getTicks"), 0));
-  int tt = NUM2INT(rb_iv_get(mScreen, "@@t"));
-  int interval = t - tt;
+  Uint32 t = SDL_GetTicks();
+  Uint32 tt = NUM2INT(rb_iv_get(mScreen, "@@t"));
+  Uint32 interval = t - tt;
   int fps_cnt = NUM2INT(rb_iv_get(mScreen, "@@fpscnt"));
 
   while(interval < fps_cnt){
@@ -219,36 +379,9 @@ static VALUE screen_update_tick(VALUE self)
   return Qnil;
 }
 
-/*
-:nodoc:
-*/
-static VALUE render_auto_render_array(VALUE array)
+void _miyako_screen_update_tick()
 {
-  int len = RARRAY_LEN(array);
-  if(len == 0){ return Qnil; }
-  VALUE *ptr = RARRAY_PTR(array);
-
-  int i;
-  for(i=0; i<len; i++)
-  {
-    VALUE v = *ptr;
-    if(v == Qnil)
-    {
-      ptr++;
-      continue;
-    }
-    else if(TYPE(v) == T_ARRAY)
-    {
-      render_auto_render_array(v);
-    }
-    else
-    {
-      rb_funcall(v, id_render, 0);
-    }
-    ptr++;
-  }
-  
-  return Qnil;
+  screen_update_tick(mScreen);
 }
 
 /*
@@ -256,14 +389,15 @@ static VALUE render_auto_render_array(VALUE array)
 */
 static VALUE screen_pre_render(VALUE self)
 {
-  VALUE pre_render_array = rb_iv_get(mScreen, "@@pre_render_array");
-  if(RARRAY_LEN(pre_render_array) > 0)
-  {
-    render_auto_render_array(pre_render_array);
-  }
+  _miyako_sprite_list_render(rb_iv_get(mScreen, "@@pre_render_array"));
   return Qnil;
 }
 
+void _miyako_screen_pre_render()
+{
+  screen_pre_render(mScreen);
+}
+
 /*
 画面を更新する
 */
@@ -272,13 +406,11 @@ static VALUE screen_render(VALUE self)
   VALUE dst = rb_iv_get(mScreen, "@@unit");
 	SDL_Surface *pdst = GetSurface(*(RSTRUCT_PTR(dst)))->surface;
   VALUE fps_view = rb_iv_get(mScreen, "@@fpsView");
-  
-  VALUE auto_render_array = rb_iv_get(mScreen, "@@auto_render_array");
-  if(RARRAY_LEN(auto_render_array) > 0)
-  {
-    render_auto_render_array(auto_render_array);
-  }
-  
+
+  _miyako_sprite_list_render(rb_iv_get(cSprite, "@@sprites"));
+
+  _miyako_sprite_list_render(rb_iv_get(mScreen, "@@auto_render_array"));
+
   if(fps_view == Qtrue){
     char str[256];
     int interval = NUM2INT(rb_iv_get(mScreen, "@@interval"));
@@ -290,7 +422,7 @@ static VALUE screen_render(VALUE self)
 
     sprintf(str, "%d fps", fps_max / interval);
     VALUE fps_str = rb_str_new2((const char *)str);
-		
+
     fps_sprite = rb_funcall(fps_str, rb_intern("to_sprite"), 1, sans_serif);
     sprite_render(fps_sprite);
   }
@@ -303,10 +435,15 @@ static VALUE screen_render(VALUE self)
     return Qnil;
   }
   rb_funcall(cGL, rb_intern("swap_buffers"), 0);
-  
+
   return Qnil;
 }
 
+void _miyako_screen_render()
+{
+  screen_render(mScreen);
+}
+
 /*
 インスタンスの内容を画面に描画する
 */
@@ -319,6 +456,74 @@ static VALUE screen_render_screen(VALUE self, VALUE vsrc)
   return self;
 }
 
+void _miyako_screen_render_screen(VALUE src)
+{
+  screen_render_screen(mScreen, src);
+}
+
+static int anim_m_hash_start(VALUE key, VALUE val)
+{
+  if(val == Qnil){ return 0; }
+  rb_funcall(val, id_start, 0);
+  return 0;
+}
+
+static int anim_m_hash_stop(VALUE key, VALUE val)
+{
+  if(val == Qnil){ return 0; }
+  rb_funcall(val, id_stop, 0);
+  return 0;
+}
+
+static int anim_m_hash_reset(VALUE key, VALUE val)
+{
+  if(val == Qnil){ return 0; }
+  rb_funcall(val, id_reset, 0);
+  return 0;
+}
+
+static int anim_m_hash_update(VALUE key, VALUE val)
+{
+  if(val == Qnil){ return 0; }
+  rb_funcall(val, id_ua, 0);
+  return 0;
+}
+
+/*
+:nodoc:
+*/
+static VALUE anim_m_start(VALUE self)
+{
+  rb_hash_foreach(rb_iv_get(self, str_ahash), anim_m_hash_start, Qnil);
+  return Qnil;
+}
+
+/*
+:nodoc:
+*/
+static VALUE anim_m_stop(VALUE self)
+{
+  rb_hash_foreach(rb_iv_get(self, str_ahash), anim_m_hash_stop, Qnil);
+  return Qnil;
+}
+
+/*
+:nodoc:
+*/
+static VALUE anim_m_reset(VALUE self)
+{
+  rb_hash_foreach(rb_iv_get(self, str_ahash), anim_m_hash_reset, Qnil);
+  return Qnil;
+}
+
+/*
+:nodoc:
+*/
+static VALUE anim_m_update(VALUE self)
+{
+  rb_hash_foreach(rb_iv_get(self, str_ahash), anim_m_hash_update, Qnil);
+  return Qnil;
+}
 
 /*
 ===マップレイヤー転送インナーメソッド
@@ -349,7 +554,7 @@ static void maplayer_render_inner(VALUE self, MiyakoBitmap *dst)
 
   VALUE munits = rb_iv_get(self, "@mapchip_units");
   VALUE mapdat = rb_iv_get(self, "@mapdat");
-  
+
   if(pos_x < 0){ pos_x = real_size_w + (pos_x % real_size_w); }
   if(pos_y < 0){ pos_y = real_size_h + (pos_y % real_size_h); }
   if(pos_x >= real_size_w){ pos_x %= real_size_w; }
@@ -362,10 +567,10 @@ static void maplayer_render_inner(VALUE self, MiyakoBitmap *dst)
 
   MiyakoBitmap src;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
-  
+
   int bx = dst->rect.x;
   int by = dst->rect.y;
-  
+
   int x, y, idx1, idx2;
   for(y = 0; y < ch; y++){
     idx1 = (y + dy) % size_h;
@@ -377,7 +582,7 @@ static void maplayer_render_inner(VALUE self, MiyakoBitmap *dst)
       _miyako_setup_unit(
 			  rb_funcall(*(RARRAY_PTR(munits) + code),
                    rb_intern("to_unit"), 0),
-        scr, &src, 
+        scr, &src,
         INT2NUM(x * ow - mx), INT2NUM(y * oh - my), 0);
       render_inner(&src, dst);
       dst->rect.x = bx;
@@ -409,10 +614,10 @@ static void fixedmaplayer_render_inner(VALUE self, MiyakoBitmap *dst)
 
   MiyakoBitmap src;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
-  
+
   int bx = dst->rect.x;
   int by = dst->rect.y;
-  
+
   int x, y, idx1, idx2;
   for(y = 0; y < ch; y++){
     idx1 = y % size_h;
@@ -459,7 +664,7 @@ static void maplayer_render_to_inner(VALUE self, MiyakoBitmap *dst)
 
   VALUE munits = rb_iv_get(self, "@mapchip_units");
   VALUE mapdat = rb_iv_get(self, "@mapdat");
-  
+
   if(pos_x < 0){ pos_x = real_size_w + (pos_x % real_size_w); }
   if(pos_y < 0){ pos_y = real_size_h + (pos_y % real_size_h); }
   if(pos_x >= real_size_w){ pos_x %= real_size_w; }
@@ -472,10 +677,10 @@ static void maplayer_render_to_inner(VALUE self, MiyakoBitmap *dst)
 
   MiyakoBitmap src;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
-  
+
   int bx = dst->rect.x;
   int by = dst->rect.y;
-  
+
   int x, y, idx1, idx2;
   for(y = 0; y < ch; y++){
     idx1 = (y + dy) % size_h;
@@ -516,10 +721,10 @@ static void fixedmaplayer_render_to_inner(VALUE self, MiyakoBitmap *dst)
 
   MiyakoBitmap src;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
-  
+
   int bx = dst->rect.x;
   int by = dst->rect.y;
-  
+
   int x, y, idx1, idx2;
   for(y = 0; y < ch; y++){
     idx1 = y % size_h;
@@ -542,7 +747,7 @@ static void fixedmaplayer_render_to_inner(VALUE self, MiyakoBitmap *dst)
 */
 static VALUE maplayer_render(VALUE self)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
 	MiyakoBitmap dst;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
@@ -556,7 +761,7 @@ static VALUE maplayer_render(VALUE self)
 */
 static VALUE fixedmaplayer_render(VALUE self)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
 	MiyakoBitmap dst;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
@@ -570,7 +775,7 @@ static VALUE fixedmaplayer_render(VALUE self)
 */
 static VALUE maplayer_render_to_sprite(VALUE self, VALUE vdst)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
 	MiyakoBitmap dst;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
@@ -584,7 +789,7 @@ static VALUE maplayer_render_to_sprite(VALUE self, VALUE vdst)
 */
 static VALUE fixedmaplayer_render_to_sprite(VALUE self, VALUE vdst)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
 	MiyakoBitmap dst;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
@@ -598,7 +803,7 @@ static VALUE fixedmaplayer_render_to_sprite(VALUE self, VALUE vdst)
 */
 static VALUE map_render(VALUE self)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
 	MiyakoBitmap dst;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
@@ -608,7 +813,7 @@ static VALUE map_render(VALUE self)
   for(i=0; i<RARRAY_LEN(map_layers); i++){
     maplayer_render_inner(*(RARRAY_PTR(map_layers) + i), &dst);
   }
-  
+
   return self;
 }
 
@@ -617,7 +822,7 @@ static VALUE map_render(VALUE self)
 */
 static VALUE fixedmap_render(VALUE self)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
 	MiyakoBitmap dst;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
@@ -636,7 +841,7 @@ static VALUE fixedmap_render(VALUE self)
 */
 static VALUE map_render_to_sprite(VALUE self, VALUE vdst)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
 	MiyakoBitmap dst;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
@@ -656,7 +861,7 @@ static VALUE map_render_to_sprite(VALUE self, VALUE vdst)
 */
 static VALUE fixedmap_render_to_sprite(VALUE self, VALUE vdst)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
 	MiyakoBitmap dst;
 	SDL_Surface  *scr = GetSurface(rb_iv_get(mScreen, "@@screen"))->surface;
@@ -727,16 +932,16 @@ static VALUE sa_update_wait_counter(VALUE self)
   VALUE waiting = rb_funcall(cnt, rb_intern("waiting?"), 0);
 
   if(waiting == Qtrue) return Qfalse;
-  
+
   VALUE num = rb_iv_get(self, "@pnum");
   VALUE loop = rb_iv_get(self, "@loop");
 
   int pnum = NUM2INT(num);
   int pats = NUM2INT(rb_iv_get(self, "@pats"));
   pnum = (pnum + 1) % pats;
-    
+
   rb_iv_set(self, "@pnum", INT2NUM(pnum));
-    
+
   if(loop == Qfalse && pnum == 0){
     rb_funcall(self, rb_intern("stop"), 0);
     return Qfalse;
@@ -764,7 +969,7 @@ static VALUE sa_update(VALUE self)
     is_change = sa_update_frame(self);
   else
     is_change = sa_update_wait_counter(self);
-  
+
   return is_change;
 }
 
@@ -773,13 +978,13 @@ static VALUE sa_update(VALUE self)
 */
 static VALUE sa_render(VALUE self)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
   VALUE vsrc = rb_iv_get(self, "@now");
   VALUE *runit = RSTRUCT_PTR(vsrc);
   VALUE polist = rb_iv_get(self, "@pos_offset");
   VALUE dir = rb_iv_get(self, "@dir");
-  
+
   int num = NUM2INT(rb_iv_get(self, "@pnum"));
 
   VALUE *move_off = RARRAY_PTR(rb_funcall(*(RARRAY_PTR(rb_iv_get(self, "@move_offset")) + num), id_to_a, 0));
@@ -787,7 +992,7 @@ static VALUE sa_render(VALUE self)
   int pos_off = NUM2INT(*(RARRAY_PTR(polist) + num));
 
   int didx = (rb_to_id(dir) == rb_intern("h") ? 2 : 1);
-  
+
   VALUE tmp_oxy = *(runit +  didx);
   VALUE tmp_x = *(runit + 5);
   VALUE tmp_y = *(runit + 6);
@@ -813,13 +1018,13 @@ static VALUE sa_render(VALUE self)
 */
 static VALUE sa_render_to_sprite(VALUE self, VALUE vdst)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
   VALUE vsrc = rb_iv_get(self, "@now");
   VALUE *runit = RSTRUCT_PTR(vsrc);
   VALUE polist = rb_iv_get(self, "@pos_offset");
   VALUE dir = rb_iv_get(self, "@dir");
-  
+
   int num = NUM2INT(rb_iv_get(self, "@pnum"));
 
   int pos_off = NUM2INT(*(RARRAY_PTR(polist) + num));
@@ -828,7 +1033,7 @@ static VALUE sa_render_to_sprite(VALUE self, VALUE vdst)
   VALUE move_off = *(RARRAY_PTR(molist) + num);
 
   int didx = (rb_to_id(dir) == rb_intern("h") ? 3 : 2);
-  
+
   VALUE tmp_oxy = *(runit +  didx);
   VALUE tmp_x = *(runit + 5);
   VALUE tmp_y = *(runit + 6);
@@ -854,7 +1059,7 @@ static VALUE sa_render_to_sprite(VALUE self, VALUE vdst)
 */
 static VALUE plane_render(VALUE self)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
   VALUE sprite = rb_iv_get(self, "@sprite");
 
@@ -886,7 +1091,7 @@ static VALUE plane_render(VALUE self)
       }
     }
   }
-  
+
   return Qnil;
 }
 
@@ -895,7 +1100,7 @@ static VALUE plane_render(VALUE self)
 */
 static VALUE plane_render_to_sprite(VALUE self, VALUE vdst)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
+  VALUE visible = rb_iv_get(self, str_visible);
   if(visible == Qfalse) return self;
   VALUE sprite = rb_iv_get(self, "@sprite");
 
@@ -927,79 +1132,66 @@ static VALUE plane_render_to_sprite(VALUE self, VALUE vdst)
       }
     }
   }
-  
+
   return Qnil;
 }
 
-#if 0
 /*
-パーツを画面に描画する
+:nodoc:
 */
-static VALUE parts_render(VALUE self)
+static VALUE textbox_render(VALUE self)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
-  if(visible == Qfalse) return self;
-  VALUE parts_list = rb_iv_get(self, "@parts_list");
-  VALUE parts_hash = rb_iv_get(self, "@parts");
+  if(rb_iv_get(self, str_visible) == Qfalse){ return self; }
+  sprite_render(rb_iv_get(self, str_textarea));
+  VALUE wait_cursor = rb_iv_get(self, str_wait_cursor);
+  if(wait_cursor != Qnil)
+  {
+    VALUE waiting = rb_iv_get(self, str_waiting);
+    if(waiting == Qtrue)
+    {
+      rb_funcall(wait_cursor, id_render, 0);
+    }
+  }
 
-  int i;
-  for(i=0; i<RARRAY_LEN(parts_list); i++)
+  if(rb_iv_get(self, str_selecting) == Qtrue)
   {
-    VALUE parts = rb_hash_aref(parts_hash, *(RARRAY_PTR(parts_list) + i));
-    rb_funcall(parts, id_render, 0);
+    rb_funcall(rb_iv_get(self, str_choices), id_render, 0);
+    VALUE select_cursor = rb_iv_get(self, str_select_cursor);
+    if(select_cursor != Qnil)
+    {
+      rb_funcall(select_cursor, id_render, 0);
+    }
   }
-  
-  return Qnil;
+  return self;
 }
 
 /*
-パーツを画面に描画する
+:nodoc:
 */
-static VALUE parts_render_to_sprite(VALUE self, VALUE vdst)
+static VALUE textbox_render_to(VALUE self, VALUE dst)
 {
-  VALUE visible = rb_iv_get(self, "@visible");
-  if(visible == Qfalse) return self;
-  VALUE parts_list = rb_iv_get(self, "@parts_list");
-  VALUE parts_hash = rb_iv_get(self, "@parts");
 
-  int i;
-  for(i=0; i<RARRAY_LEN(parts_list); i++)
+  if(rb_iv_get(self, str_visible) == Qfalse){ return self; }
+  sprite_render_to_sprite(rb_iv_get(self, str_textarea), dst);
+  VALUE wait_cursor = rb_iv_get(self, str_wait_cursor);
+  if(wait_cursor != Qnil)
   {
-    VALUE parts = rb_hash_aref(parts_hash, *(RARRAY_PTR(parts_list) + i));
-    rb_funcall(parts, rb_intern("render_to"), 1, vdst);
+    VALUE waiting = rb_iv_get(self, str_waiting);
+    if(waiting == Qtrue)
+    {
+      rb_funcall(wait_cursor, id_render_to, 1, dst);
+    }
   }
-  
-  return Qnil;
-}
-#endif
 
-/*
-:nodoc:
-*/
-static VALUE processor_mainloop(VALUE self)
-{
-  VALUE diagram = rb_iv_get(self, "@diagram");
-  VALUE states = rb_iv_get(self, "@states");
-  VALUE mutex = rb_iv_get(self, "@mutex");
-  VALUE str_execute = rb_str_new2("execute");
-  VALUE sym_execute = rb_funcall(str_execute, rb_intern("to_sym"), 0);
-  VALUE str_pause = rb_str_new2("pause");
-  VALUE sym_pause = rb_funcall(str_pause, rb_intern("to_sym"), 0);
-  rb_funcall(diagram, rb_intern("start"), 0);
-  VALUE executing = rb_funcall(states, id_kakko, 1, sym_execute);
-  while(executing == Qtrue){
-    VALUE pausing = rb_funcall(states, id_kakko, 1, sym_pause);
-    if(pausing == Qfalse){
-        rb_funcall(mutex, rb_intern("lock"), 0);
-        rb_funcall(diagram, id_update, 0);
-        rb_funcall(mutex, rb_intern("unlock"), 0);
-        rb_funcall(cThread, rb_intern("pass"), 0);
-        VALUE is_finish = rb_funcall(diagram, rb_intern("finish?"), 0);
-        if(is_finish == Qtrue){ rb_funcall(states, rb_intern("[]="), 2, sym_execute, Qfalse); }
+  if(rb_iv_get(self, str_selecting) == Qtrue)
+  {
+    rb_funcall(rb_iv_get(self, str_choices), id_render_to, 1, dst);
+    VALUE select_cursor = rb_iv_get(self, str_select_cursor);
+    if(select_cursor != Qnil)
+    {
+      rb_funcall(select_cursor, id_render_to, 1, dst);
     }
-    executing = rb_funcall(states, id_kakko, 1, sym_execute);
   }
-  rb_funcall(diagram, rb_intern("stop"), 0);
   return self;
 }
 
@@ -1008,6 +1200,10 @@ void Init_miyako_no_katana()
   mSDL = rb_define_module("SDL");
   mMiyako = rb_define_module("Miyako");
   mScreen = rb_define_module_under(mMiyako, "Screen");
+  mAudio = rb_define_module_under(mMiyako, "Audio");
+  mInput = rb_define_module_under(mMiyako, "Input");
+  mSpriteBase = rb_define_module_under(mMiyako, "SpriteBase");
+  mAnimation = rb_define_module_under(mMiyako, "Animation");
   mDiagram = rb_define_module_under(mMiyako, "Diagram");
   cSurface = rb_define_class_under(mSDL, "Surface", rb_cObject);
   cGL  = rb_define_module_under(mSDL, "GL");
@@ -1016,30 +1212,59 @@ void Init_miyako_no_katana()
   cSprite = rb_define_class_under(mMiyako, "Sprite", rb_cObject);
   cSpriteAnimation = rb_define_class_under(mMiyako, "SpriteAnimation", rb_cObject);
   cPlane = rb_define_class_under(mMiyako, "Plane", rb_cObject);
-#if 0
-  cParts = rb_define_class_under(mMiyako, "Parts", rb_cObject);
-#endif
   cMap = rb_define_class_under(mMiyako, "Map", rb_cObject);
   cMapLayer = rb_define_class_under(cMap, "MapLayer", rb_cObject);
   cFixedMap = rb_define_class_under(mMiyako, "FixedMap", rb_cObject);
   cFixedMapLayer = rb_define_class_under(cFixedMap, "FixedMapLayer", rb_cObject);
-  cProcessor = rb_define_class_under(mDiagram, "Processor", rb_cObject);
-
-  id_update = rb_intern("update");
-  id_kakko  = rb_intern("[]");
-  id_render = rb_intern("render");
-  id_to_a   = rb_intern("to_a");
+  cTextbox = rb_define_class_under(mMiyako, "TextBox", rb_cObject);
+
+  id_update     = rb_intern("update");
+  id_kakko      = rb_intern("[]");
+  id_kakko_eq   = rb_intern("[]=");
+  id_render     = rb_intern("render");
+  id_render_to  = rb_intern("render_to");
+  id_to_a       = rb_intern("to_a");
+  id_move       = rb_intern("move!");
+  id_move_to    = rb_intern("move_to!");
+  id_defined    = rb_intern("method_defined?");
+  id_pos        = rb_intern("pos");
+  id_start      = rb_intern("start");
+  id_stop       = rb_intern("stop");
+  id_reset      = rb_intern("reset");
+  id_ua         = rb_intern("update_animation");
 
   zero = 0;
   nZero = INT2NUM(zero);
   one = 1;
   nOne = INT2NUM(one);
-  
+
+#if 1
+  rb_define_singleton_method(mMiyako, "main_loop", miyako_main_loop, -1);
+
+  rb_define_singleton_method(mScreen, "update_tick", screen_update_tick, 0);
+  rb_define_singleton_method(mScreen, "pre_render", screen_pre_render, 0);
+  rb_define_singleton_method(mScreen, "render", screen_render, 0);
+  rb_define_singleton_method(mScreen, "render_screen", screen_render_screen, 1);
+
+  rb_define_singleton_method(mAnimation, "start", anim_m_start, 0);
+  rb_define_singleton_method(mAnimation, "stop", anim_m_stop, 0);
+  rb_define_singleton_method(mAnimation, "reset", anim_m_reset, 0);
+  rb_define_singleton_method(mAnimation, "update", anim_m_update, 0);
+  rb_define_singleton_method(mAnimation, "update_animation", anim_m_update, 0);
+#else
+  rb_define_module_function(mMiyako, "main_loop", miyako_main_loop, -1);
+
   rb_define_module_function(mScreen, "update_tick", screen_update_tick, 0);
   rb_define_module_function(mScreen, "pre_render", screen_pre_render, 0);
   rb_define_module_function(mScreen, "render", screen_render, 0);
   rb_define_module_function(mScreen, "render_screen", screen_render_screen, 1);
 
+  rb_define_module_function(mAnimation, "start", anim_m_start, 0);
+  rb_define_module_function(mAnimation, "stop", anim_m_stop, 0);
+  rb_define_module_function(mAnimation, "reset", anim_m_reset, 0);
+  rb_define_module_function(mAnimation, "update", anim_m_update, 0);
+  rb_define_module_function(mAnimation, "update_animation", anim_m_update, 0);
+#endif
   rb_define_method(cSpriteAnimation, "update_animation", sa_update, 0);
   rb_define_method(cSpriteAnimation, "update_frame", sa_update_frame, 0);
   rb_define_method(cSpriteAnimation, "update_wait_counter", sa_update_wait_counter, 0);
@@ -1047,20 +1272,17 @@ void Init_miyako_no_katana()
   rb_define_method(cSpriteAnimation, "render", sa_render, 0);
   rb_define_method(cSpriteAnimation, "render_to", sa_render_to_sprite, 1);
 
+  rb_define_method(mSpriteBase, "render_xy", sprite_b_render_xy, 2);
+  rb_define_method(mSpriteBase, "render_xy_to", sprite_b_render_xy_to_sprite, 3);
   rb_define_singleton_method(cSprite, "render_to", sprite_c_render_to_sprite, 2);
   rb_define_method(cSprite, "render", sprite_render, 0);
   rb_define_method(cSprite, "render_to", sprite_render_to_sprite, 1);
+  rb_define_method(cSprite, "render_xy", sprite_render_xy, 2);
+  rb_define_method(cSprite, "render_xy_to", sprite_render_xy_to_sprite, 3);
 
   rb_define_method(cPlane, "render", plane_render, 0);
   rb_define_method(cPlane, "render_to", plane_render_to_sprite, 1);
 
-#if 0
-  rb_define_method(cParts, "render", parts_render, 0);
-  rb_define_method(cParts, "render_to", parts_render_to_sprite, 1);
-#endif
-
-  rb_define_method(cProcessor, "main_loop", processor_mainloop, 0);
-  
   rb_define_method(cMapLayer, "render", maplayer_render, 0);
   rb_define_method(cFixedMapLayer, "render", fixedmaplayer_render, 0);
   rb_define_method(cMap, "render", map_render, 0);
@@ -1070,8 +1292,11 @@ void Init_miyako_no_katana()
   rb_define_method(cMapLayer, "render_to", maplayer_render_to_sprite, 1);
   rb_define_method(cFixedMapLayer, "render_to", fixedmaplayer_render_to_sprite, 1);
 
+  rb_define_method(cTextbox, "render", textbox_render, 0);
+  rb_define_method(cTextbox, "render_to", textbox_render_to, 1);
+
   use_opengl = rb_gv_get("$miyako_use_opengl");
-  
+
   Init_miyako_bitmap();
   Init_miyako_transform();
   Init_miyako_hsv();
@@ -1083,4 +1308,6 @@ void Init_miyako_no_katana()
   Init_miyako_font();
   Init_miyako_utility();
   Init_miyako_input_audio();
+  Init_miyako_diagram();
+  Init_miyako_yuki();
 }