update on the implementation of OnGhost* events

diff --git a/ChangeLog b/ChangeLog
index 63e88ad..dbf9669 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu November 15 2012   Shyouzou Sugitani <shy@users.sourceforge.jp>
+       * OnGhostChangingイベントのReferenceの内容を修正した.
+         (Reference0からReference3まで全てに対応した.)
+       * OnGhostCalling(ゴースト呼び出し中)イベントを実装した.
+
 Wed November 14 2012   Shyouzou Sugitani <shy@users.sourceforge.jp>
        * OnDressupChanged(着せ替え変更通知)イベントを実装した.
        * TransparentWindowクラスのinput_shape_combine_regionの処理を

diff --git a/lib/ninix_main.py b/lib/ninix_main.py
index c46a7e4..1f83e27 100644 (file)
--- a/lib/ninix_main.py
+++ b/lib/ninix_main.py
@@ -675,6 +675,10 @@ class Application:
         return self.__menu_owner.get_current_balloon_directory()
 
     def start_sakura_cb(self, key): ## FIXME
+        sakura_name = self.ghosts[key].instance.get_selfname(default='')
+        name = self.ghosts[key].instance.get_name(default='')
+        self.__menu_owner.notify_event(
+            'OnGhostCalling', sakura_name, 'manual', name, key)
         self.start_sakura(key, init=1) # XXX
 
     def select_sakura(self, key):
@@ -991,8 +995,10 @@ class Application:
         elif not event:
             proc()
         else:
-            name = self.ghosts[key].instance.get_selfname(default='')
-            sakura.enqueue_event('OnGhostChanging', name, method, proc=proc)
+            sakura_name = self.ghosts[key].instance.get_selfname(default='')
+            name = self.ghosts[key].instance.get_name(default='')
+            sakura.enqueue_event(
+                'OnGhostChanging', sakura_name, method, name, key, proc=proc)
 
     def stop_sakura(self, sakura, starter=None, *args):
         sakura.finalize()