Changeset 56:c7bcc0ec2267

Timestamp:

04/30/09 21:05:09 (3 years ago)

Author:

thib

Branch:

default

convert_revision:

svn:d0a2da98-017c-47d2-8c43-22b54484806d/trunk@57

Message:

* replaced Grp and Text classes by the TextImpl and GrpImpl ones
* splitted scn2k.h into smaller header files
* moved some definitions from scn2k_*.cc to the header files
* moved opcode implementation to scn2k_*impl.cc

Files:

• THANKS (added)
• scn2k/Makefile.am (modified) (1 diff)
• scn2k/scn2k.h (modified) (2 diffs)
• scn2k/scn2k_cmd.h (added)
• scn2k/scn2k_flags.h (added)
• scn2k/scn2k_grp.cc (modified) (40 diffs)
• scn2k/scn2k_grp.h (added)
• scn2k/scn2k_grpimpl.cc (added)
• scn2k/scn2k_text.cc (modified) (27 diffs)
• scn2k/scn2k_text.h (added)
• scn2k/scn2k_textimpl.cc (added)
• system/system_config.h (modified) (2 diffs)
• window/Makefile.am (modified) (1 diff)
• window/render.cc (modified) (1 diff)
• window/render.h (added)
• window/surface.h (modified) (1 diff)
• window/system.h (modified) (1 diff)

scn2k/Makefile.am

@@ -1 +1 @@
 noinst_LIBRARIES = libscn2k.a
-libscn2k_a_SOURCES = scn2k_cmd.cc scn2k_text.cc scn2k_grp.cc scn2k_impl.cc \
+libscn2k_a_SOURCES = scn2k_cmd.cc scn2k_cmd.h scn2k_flags.h\
+                     scn2k_text.cc scn2k_text.h scn2k_textimpl.cc\
+                     scn2k_grp.cc scn2k_grp.h scn2k_grpimpl.cc\
+                     scn2k_impl.cc \
                      command_handler.cc \
                      scn2k.h scn2k_impl.h

scn2k/scn2k.h

@@ -34 +34 @@
 #include <set>
 
+#include "scn2k_cmd.h"
+#include "scn2k_grp.h"
+#include "scn2k_text.h"
+
 /*
 namespace Widget {
@@ -60 +64 @@
 class Surface;
 
-void dprintf(const char* fmt, ...);
-void eprintf(const char* fmt, ...);
-
-struct VarInfo {
-#define TYPE_NONSYSVARMAX 5
-#define TYPE_VARMAX 9
-#define TYPE_VARLOCSTR 10
-#define TYPE_VARSYSSTR 12
-#define TYPE_VARSTR 18
-#define TYPE_STR 58
-#define TYPE_VAL 68
-#define TYPE_SYS 0xc8
-#define TYPE_END 0x7f
-
-#define TYPE_SYS_SYS 0
-#define TYPE_SYS_SKIPMODE 1
-        int type;
-        int number;
-        int value;
-        VarInfo() { type = TYPE_VAL; value = 0;}
-        VarInfo(int n) { type = TYPE_VAL; value = n;}
-        VarInfo(const VarInfo& i) { type = i.type; number = i.number; value = i.value;}
-};
-
-
-class Flags {
-/* flag:
-**  type 0-5 : ¥í¡Œ¥«¥ëÀ°¿ô¡¢³Æ2000žÄ
-**  type 6, 25 : ¥°¥í¡Œ¥Ð¥ëÀ°¿ô¡¢2000žÄ
-**      type 10,11: ¥í¡Œ¥«¥ëÀ°¿ô??¡¢³Æ2000žÄ
-**      type 12 : ¥°¥í¡Œ¥Ð¥ëÊž»úÎó¡¢2000žÄ (º£€Ï̵»ë€·€Æ€âÎÉ€€€¬)
-**      type 18 : ¥í¡Œ¥«¥ëÊž»úÎó¡¢2000žÄ
-**      type 25: ¥·¥¹¥Æ¥àÊÑ¿ô¡Ê¥Þ¥Š¥¹ºÂÉž€Ê€É¡©¡Ë 1000 žÄ¡©
-**  type 26-32, 51 : 1-bit access to 0-6, 25
-**  type 52-58, 77 : 2-bit access to 0-6, 25
-**  type 78-84, 103 : 4-bit access to 0-6, 25
-**  type 104-110, 129 : 8-bit access to 0-6, 25
-*/
-        private:
-                typedef unsigned int uint;
-                int sys;
-                int var[TYPE_VARMAX+1][2000];
-                std::string str[2000];
-                std::string sys_str[2000];
-                std::string loc_str[3];
-        public:
-                Flags(void);
-                int operator () () const;
-                int operator () (VarInfo info) const;
-                void Str(int type, unsigned int number, char* buf, int sz) const;
-                std::string Str(int type, unsigned int number) const;
-                std::set<int> cgm_data;
-
-                bool IsInt(int type) const;
-                int MaxIndex(int type) const;
-
-                void Set(VarInfo info, int value);
-                int Get(int type, int number) const;
-                void SetSys(int value);
-                void SetStr(VarInfo info, std::string val);
-
-                bool Exec(class Cmd& cmd);
-
-                void Save(std::string& str);
-                void Load(const char* str);
-
-                void SaveSys(std::string& str);
-                void LoadSys(const char* str);
-};
-
-/* commands */
-#define STRHEAP_SIZE 10000
-enum Cmdtype {
-        CMD_NOP, CMD_FLAGS, CMD_JMP, CMD_TEXT, CMD_OTHER, CMD_SYSVAR,
-        CMD_TEXTEND,
-        CMD_SAVECMDGRP, CMD_SAVECMDGRP_START, CMD_SAVECMDGRP_ONCE, CMD_SAVECMD_ONCE, CMD_WAITFRAMEUPDATE,CMD_SAVEPOINT, CMD_ROLLBACKPOINT,
-        CMD_SAVEREQ, CMD_SAVE,
-        CMD_LOADREQ, CMD_LOAD,
-        CMD_MENUREQ,
-        CMD_BACKLOGREQ, CMD_BACKLOGREQ_FWD,
-        CMD_END};
-
-struct CmdSimplified { // Cmd ÊÝžÍÑ
-        int type, cmd1, cmd2, cmd3, cmd4, argc;
-        char* args;
-        void Save(std::string& save);
-        void Load(const char* save, char*& args_buffer);
-        void copy(const CmdSimplified& from, char*& args_buffer);
-};
-
-class SimpleCmd {
-        public:
-                SimpleCmd(int a, int b, int c);
-                SimpleCmd();
-
-                bool operator==(const SimpleCmd& cmd) const;
-                bool operator<(const SimpleCmd& cmd) const;
-
-        public:
-                int cmd1, cmd2, cmd3;
-};
-
-class Cmd : public SimpleCmd{
-        public:
-                Cmdtype cmd_type;
-                int cmd4;
-                int argc;
-                int pos, scn;
-                const char* rawdata;
-                char cmdstr[1024];
-                std::vector<VarInfo> args;
-
-        private:
-                const Flags& flags;
-                bool errorflag;
-                int system_version;
-
-                int GetArgs(const char*& d);
-                int GetArgsSpecial(int normal_args,const char*& d);
-                void GetSelection(const char*& d);
-                int GetSwitch(const char*& d);
-                int GetSimpleSwitch(const char*& d);
-                int GetExpression(const char*& d, struct VarInfo* info = 0);
-                int GetExpressionCond(const char*& d);
-                int GetLeftToken(const char*& d, struct VarInfo& info);
-                int GetString(const char*& d);
-                int CopyString(const char* d);
-                int StrVar(int type, int number);
-                static char strtype[256];
-                static int StrType(const char* d) { return strtype[*(unsigned const char*)d];}
-
-        public:
-                const char* Str(const VarInfo& info) const;
-                int AddStr(char* s);
-
-        private:
-                char strheap[STRHEAP_SIZE];
-                int strend;
-                void SetError(void) { errorflag = true;}
-                void ResetString(void) {
-                        strend = 0;
-                }
-
-        public:
-                void GetCmd(Flags& f, const char*& d);
-                void SetSysvar(int n, int v);
-                void SetSysvar(int v) { SetSysvar(TYPE_SYS_SYS, v); }
-                void SetFlagvar(VarInfo info, int v);
-                void SetStrvar(VarInfo info, const std::string& s);
-                bool IsError() { return errorflag;}
-                void clear(void);
-                virtual const char * CmdDescr(int, int, int, int) { return "Not supported"; }
-                Cmd(const Flags& f, int _sys_ver);
-                void read(const CmdSimplified& cmd);
-                void write(CmdSimplified& cmd, char*& args_buffer) const;
-};
-
-class CommandHandler {
-        public:
-                typedef void (CommandHandler::*CmdImpl)(Cmd& cmd);
-                typedef struct {
-                        const char* descr;
-                        CmdImpl function;
-                } CommandInfo;
-                void RegisterCommand(int cmd1, int cmd2, int cmd3, const char* descr, CmdImpl func);
-                bool Exec(Cmd& cmd);
-                void PrintCmd(Cmd& cmd);
-
-        private:
-                typedef std::map<SimpleCmd, CommandInfo> CommandMap;
-                CommandMap command_map;
-};
-
-enum SkipMode {
-        SKIP_NO=0, SKIP_TEXT=1, SKIP_GRP_FAST=16, SKIP_GRP_NOEFFEC=32,
-        SKIP_GRP_NODRAW=64, SKIPEND_TEXT=256, SKIPEND_KEY=512, SKIP_IN_MENU=1024
-};
-
-#include "font/text.h"
-
-struct BacklogItem {
-        enum {SaveSelect = -2};
-        int scn, pos;
-        int koe;
-        std::string face;
-        struct TextStream text;
-        BacklogItem(void);
-        void Clear(void);
-        void AddTextPos(Cmd&);
-        void DeleteTextPos();
-        void SetSavepos(int pos);
-        BacklogItem& operator =(const BacklogItem&);
-};
-
-class Text {
-        private:
-                class TextImpl* pimpl;
-        public:
-                std::vector<BacklogItem> backlog;
-                BacklogItem backlog_item;
-                Text(Event::Container& _event, PicContainer& _parent);
-                ~Text();
-                void InitWindow(void);
-                void Exec(Cmd& cmd);
-                bool Wait(unsigned int current_time, Cmd& cmd);
-                void SetSkipMode(SkipMode mode);
-                void hide(void);
-                void show(void);
-                void show(int num);
-                void Save(std::string& str, bool rollback_save);
-                void Load(const char* str);
-                void DrawBacklog(BacklogItem& item, Cmd& cmd);
-};
-
-#include "../window/rect.h"
-
-class Grp {
-        private:
-                class GrpImpl* pimpl;
-        public:
-                Grp(Event::Container& _event, PicContainer& _parent, const Flags& f, std::set<int>& _cgm_data);
-                ~Grp();
-                bool Wait(unsigned int current_time, Cmd& cmd);
-                void Exec(Cmd& cmd);
-                void SetSkipMode(SkipMode mode);
-                void InitSel(void);
-                void Save(std::string& str);
-                void Load(const char* str);
-                void SaveSys(std::string& str);
-                void LoadSys(const char* str);
-};
-
 void dprintf(const char* fmt, ...); // debug ÍÑ
 void eprintf(const char* fmt, ...); // ¥³¥Þ¥ó¥ÉŒÂ¹Ô(XXXexec)ÄÉÀ×ÍÑ

scn2k/scn2k_grp.cc

@@ -27 +27 @@
 
 #include "scn2k.h"
-#include "window/widget.h"
 #include "system/file.h"
 #include "system/system_config.h"
 #include "font/text.h"
-#include <set>
-
-using namespace std;
-
-extern void DSurfaceFill(Surface* dest, const Rect& rect, int r, int g, int b, int a=0xff);
-extern void DSurfaceMove(Surface* src_o, const Rect& srcrect, Surface* dst_o, const Rect& dstpos);
-extern Rect DSurfaceRenderText(TextGlyphStream::iterator start, TextGlyphStream::iterator end, const Rect& srcrect,
-        Surface* dst, const Rect& dstrect);
+#include "window/render.h"
+
 extern XKFont::HorizLayout* DefaultLayout(int text_size);
 
-/*******************************************************************
-** GrpObj(interface)
-*/
-
-struct SEL {
-        Rect from;
-        Rect to;
-        int time;
-        int sel_no;
-        int args[8];
-        SEL() : from(0,0), to(0,0) {}
-};
-
-struct GrpObj;
-typedef std::map<int, GrpObj> GrpObjMap;
-
-struct GrpObj {
-        string name;
-        string gan_name;
-        PicContainer* pic_parent;
-        PicBase* picture;
-        WidAnmTime* anm;
-        int _posx, _posy;
-        int posx[9], posy[9];
-        Rect clip_area;
-        unsigned char alpha;
-        int order;
-        int surface_num;
-
-        GrpObjMap children_obj;
-
-        string print_moji;
-        int print_size, print_r, print_b, print_g;
-
-        int dig_number, dig_digit;
-
-        // zoom / rotate ŽØ·ž
-        int zoom; // 256 €Ç 1 ÇÜ
-        int rotate; // 0-360ÅÙ
-
-        vector<Rect> src_pos;
-        enum GrpType { FILLRECT = 1, FILE = 2, GAN = 3, MOJI = 4, DIGIT = 5} gtype;
-        enum Attribute { NONE=0, WIPEON=1, SATURATE=2, HIDDEN=4,
-                UPDATE_PICTURE = 16, UPDATE_POS = 32, UPDATE_ALPHA = 64, UPDATE_SNUM = 128, UPDATE_CLIP = 256, UPDATE_VISIBLE = 512,
-                UPDATE_ALL = (UPDATE_PICTURE | UPDATE_POS | UPDATE_ALPHA | UPDATE_SNUM | UPDATE_CLIP | UPDATE_VISIBLE),
-                ANM_PLAYSTART = 0x8000, ANM_PLAYING = 0x10000,
-                DIG_ZERO = 0x10000*2, DIG_SIGN = 0x10000*4, DIG_PACK=0x10000*8,DIG_SPACE=0x10000*16
-                };
-        Attribute attr;
-
-        GrpObj(void);
-        ~GrpObj(void);
-
-        void SetPos(int index, int x, int y);
-        void GetPos(int index, int& x, int& y);
-        int PosX(void);
-        int PosY(void);
-        void SetAlpha(void);
-        void SetAlpha(int alpha);
-        void SetSurfaceNum(int num = -1);
-        void SetZoomRotate(int zoom=-1, int rotate=-1);
-        void SetClipArea(int x, int y, int width, int height);
-        void GetSrcGeom(int& width, int& height);
-        void SetUpdate(void);
-        void UpdateMoji(void);
-        void UpdateDigit(void);
-        void UpdateSurface(void);
-        void ZoomRotate(void);
-        void Refresh(GrpObj& parent_obj);
-        void _debug_Dump(int, int);
-        void Update(void);
-        void CreateSurface(PicContainer* parent);
-        void CreateGan(Event::Container& event, int event_number);
-        void CreateGanSpecial(Event::Container& event, int event_number, int time);
-        PicBase* DeletePic(void);
-};
-
-/*******************************************************************
-** GrpObj(interface)
-*/
-
-class GrpImpl : public CommandHandler {
-#define MAXPDT 256
-#define WORKPDT 255
-        private:
-                void CreateObj(int number);
-                void CreateSubObj(int grp_num, int number);
-                void ZMoveObj(int number);
-                void SetObjChanged(int number);
-                void SwapObj(int a1, int a2);
-                void DeleteObjPic(int num);// object €Î surface €Î€ßºïœü
-                void DeleteSubObjPic(int grp_num, int num);
-                void DeleteObj(int num);
-                void DeleteSubObj(int grp_num, int num);
-                void RefreshObj(void);
-
-                Surface* Dsurface(int pdt);
-                Surface* Ssurface(int pdt);
-
-                // cgmode ÍѲèÁüœèÍýŽØÏ¢
-                void LoadCgm(void);
-
-        public:
-                GrpImpl(Event::Container& _event, PicContainer& _parent, const Flags& _flag, set<int>& _cgm_data);
-                ~GrpImpl();
-                bool Wait(unsigned int current_time, Cmd& cmd);
-                void Exec(Cmd& cmd);
-                void InitSel(void);
-                void Save(std::string& str);
-                void Load(const char* str);
-                void SaveSys(std::string& str);
-                void LoadSys(const char* str);
-                void SetSkipMode(SkipMode _mode);
-                void LoadSurface(const char* str, int pdt);
-
-        private:
-                void LoadSurface(const char* str);
-                void LoadSurface(void);
-                void AddSurface(const char* str);
-
-                void StartAnm(int type);
-                void StartShake(int total, const int* pattern);
-                void AbortAnm(void);
-                static bool Pressed(int x, int y, void* pointer);
-
-                GrpObj* GetGraphicObj(int grp, bool fg=true);
-                GrpObj* GetGraphicObj(int grp, int index, bool fg=true);
-                GrpObj* GetGraphicObjVarMode(Cmd& cmd, int &base_arg, bool fg=true);
-
-                // Opcode handling
-                void impl_stackClear(Cmd& cmd);
-                void impl_grpBuffer(Cmd& cmd);
-                void impl_grpMulti(Cmd &cmd);
-                void impl_grpOpen(Cmd &cmd);
-                void impl_shake(Cmd &cmd);
-                void impl_grpCopy(Cmd &cmd);
-                void impl_recFill(Cmd &cmd);
-                void impl_recCopy(Cmd &cmd);
-                void impl_recAdd(Cmd &cmd);
-                void impl_grpPan(Cmd &cmd);
-                void impl_snmPlay(Cmd &cmd);
-                void impl_snmBgScroll(Cmd &cmd);
-                void impl_cgGet(Cmd &cmd);
-                void impl_cgStatus(Cmd &cmd);
-                void impl_objClear(Cmd &cmd);
-                void impl_createObj(Cmd &cmd);
-                void impl_gan(Cmd &cmd);
-                void impl_objSetPos(Cmd &cmd);
-                void impl_objAlpha(Cmd &cmd);
-                void impl_objShow(Cmd &cmd);
-                void impl_objColour(Cmd &cmd);
-                void impl_objComposite(Cmd &cmd);
-                void impl_objSetText(Cmd &cmd);
-                void impl_objTextOpts(Cmd &cmd);
-                void impl_objOrder(Cmd &cmd);
-                void impl_objDispArea(Cmd &cmd);
-                void impl_objSetDigits(Cmd &cmd);
-                void impl_objNumOpts(Cmd &cmd);
-                void impl_objPattNo(Cmd &cmd);
-                void impl_objScale(Cmd &cmd);
-                void impl_objRotate(Cmd &cmd);
-                void impl_objPosDims(Cmd &cmd);
-                void impl_refresh(Cmd &cmd);
-                void impl_bgmLoop(Cmd &cmd);
-                void impl_bgmStop(Cmd &cmd);
-                void impl_playWav(Cmd &cmd);
-                void impl_playSE(Cmd &cmd);
-                void impl_stopWav(Cmd &cmd);
-                void impl_SetVolMod(Cmd &cmd);
-                void impl_GetVolMod(Cmd &cmd);
-                void impl_koePlay(Cmd &cmd);
-                void impl_movPlay(Cmd &cmd);
-
-        public:
-                AyuSysConfig *config;
-
-        private:
-                Event::Container& event;
-                const Flags& flags;
-                PicBase* screen;
-                PicBase* screen_front;
-                Surface* surface, *surface_update;
-
-                Surface* dsurface[MAXPDT]; // œñ€­¹þ€ß²ÄÇœ€Ê Surface
-                Surface* ssurface[MAXPDT]; // ¥Õ¥¡¥€¥ë€ÎÆâÍÆÅù¡¢Æɀ߹þ€ß€Î€ß²ÄÇœ€ÊŸõÂրΠSurface
-                PicContainer& parent;
-
-                // ²èÁüžú²Ì€ÎÊÝžÍÑ
-                WidAnmTime* anm1, *anm2;
-                typedef enum { NORMAL, WAIT_ANM, WAIT_SHAKE, WAIT_SE, WAIT_MOVIE} Status;
-                Status status;
-                SkipMode skip_mode;
-
-                std::string bg_name;
-                std::map<int, SEL> anmtype;
-                GrpObjMap grpobj;
-                GrpObjMap bs_obj;
-
-                std::map<std::string, int> cgm_info;
-                set<int>& cgm_data;
-                int cgm_size;
-
-                class MuSys *music;
-
-                std::set<int> changed_obj;
-                string reserved_load_surface0;
-                vector<PicBase*> deleted_pic;
-};
 /*******************************************************************
 ** GrpObj(implementation)
@@ -753 +538 @@
 */
 /* Princess Bride: Çطʲè€Î°ìÉô€Î€ß°ÜÆ°¡¢€ÎŒÂÁõ */
-struct ScnGrpMove : public WidAnmTime {
-        Surface* dest;
-        Surface* src;
-        PicRoot& root;
-        Rect dest_r, from, to;
-        ScnGrpMove(Event::Container& container, PicBase* _pic, PicRoot& root, Surface* dest, const Rect& _dest_r, Surface* src, const Rect& from, const Rect& to, int total_time);
-        void Exec(int count);
-};
+
 ScnGrpMove::ScnGrpMove(Event::Container& container, PicBase* _pic, PicRoot& _root, Surface* _dest, const Rect& _dest_r, Surface* _src, const Rect& _from, const Rect& _to, int total_time) :
         WidAnmTime(container, _pic, total_time),
@@ -786 +564 @@
 }
 
-/* Princess Bride: ¥«¡Œ¥É€¬€ª€Á€ë¥¢¥Ë¥á¡Œ¥·¥ç¥ó */
-
-struct ScnGrpAnmAtom {
-        string name;
-        int time;
-        ScnGrpAnmAtom(const char* _n, int _t) : name(_n), time(_t) {}
-};
-
-struct ScnGrpAnm : public WidAnmTime, vector<ScnGrpAnmAtom> {
-        GrpImpl& owner;
-        ScnGrpAnm(Event::Container& container, PicBase* _pic, GrpImpl& _owner) :
-                WidAnmTime(container, _pic, 0), owner(_owner) {
-        }
-        void CalcTotal(void);
-        void Exec(int count);
-};
-
 void ScnGrpAnm::CalcTotal(void) {
         /* total time €ò·×»» */
@@ -826 +587 @@
 /*****************************************************
 *
-*  GrpImpl(implementation) : ÄêµÁ
+*  Grp
 *
 */
@@ -832 +593 @@
 #include "music2/music.h"
 
-GrpImpl::GrpImpl(Event::Container& _event, PicContainer& _parent, const Flags& f, set<int>& _cgm_data):
+Grp::Grp(Event::Container& _event, PicContainer& _parent, const Flags& f, set<int>& _cgm_data):
         event(_event),
         flags(f), 
@@ -862 +623 @@
         LoadCgm();
 
-        RegisterCommand(1, 30, 0, "stackClear", (CmdImpl) &GrpImpl::impl_stackClear);
-        RegisterCommand(1, 33, 70, "grpBuffer", (CmdImpl) &GrpImpl::impl_grpBuffer);
-        RegisterCommand(1, 33, 73, "grpOpenBG", (CmdImpl) &GrpImpl::impl_grpOpen);
-        RegisterCommand(1, 33, 75, "grpMulti", (CmdImpl) &GrpImpl::impl_grpMulti); //FIXME: or not...
-        RegisterCommand(1, 33, 76, "grpOpen", (CmdImpl) &GrpImpl::impl_grpOpen);
-        RegisterCommand(1, 33, 32, "shake", (CmdImpl) &GrpImpl::impl_shake);
-        RegisterCommand(1, 33, 100, "grpCopy", (CmdImpl) &GrpImpl::impl_grpCopy);
-        RegisterCommand(1, 33, 1201, "recFill", (CmdImpl) &GrpImpl::impl_recFill);
-        RegisterCommand(1, 33, 1100, "recCopy", (CmdImpl) &GrpImpl::impl_recCopy);
+        RegisterCommand(1, 30, 0, "stackClear", (CmdImpl) &Grp::impl_stackClear);
+        RegisterCommand(1, 33, 70, "grpBuffer", (CmdImpl) &Grp::impl_grpBuffer);
+        RegisterCommand(1, 33, 73, "grpOpenBG", (CmdImpl) &Grp::impl_grpOpen);
+        RegisterCommand(1, 33, 75, "grpMulti", (CmdImpl) &Grp::impl_grpMulti); //FIXME: or not...
+        RegisterCommand(1, 33, 76, "grpOpen", (CmdImpl) &Grp::impl_grpOpen);
+        RegisterCommand(1, 33, 32, "shake", (CmdImpl) &Grp::impl_shake);
+        RegisterCommand(1, 33, 100, "grpCopy", (CmdImpl) &Grp::impl_grpCopy);
+        RegisterCommand(1, 33, 1201, "recFill", (CmdImpl) &Grp::impl_recFill);
+        RegisterCommand(1, 33, 1100, "recCopy", (CmdImpl) &Grp::impl_recCopy);
         RegisterCommand(1, 33, 1101, "recMaskCopy", NULL); //FIXME
-        RegisterCommand(1, 33, 1600, "recAdd", (CmdImpl) &GrpImpl::impl_recAdd);
-        RegisterCommand(1, 33, 406, "grpPan", (CmdImpl) &GrpImpl::impl_grpPan);
-
-        RegisterCommand(1, 34, 3120, "snmBgScroll", (CmdImpl) &GrpImpl::impl_snmBgScroll);
-        RegisterCommand(1, 34, 3100, "snmBgPlay", (CmdImpl) &GrpImpl::impl_snmPlay);
-        RegisterCommand(1, 34, 2100, "snmPlay", (CmdImpl) &GrpImpl::impl_snmPlay);
-        RegisterCommand(1, 34, 2101, "snmPlayEx", (CmdImpl) &GrpImpl::impl_snmPlay);
-
-        RegisterCommand(1, 4, 1500, "cgGetTotal", (CmdImpl) &GrpImpl::impl_cgGet);
-        RegisterCommand(1, 4, 1501, "cgGetViewed", (CmdImpl) &GrpImpl::impl_cgGet);
-        RegisterCommand(1, 4, 1502, "cgGetViewedPcnt", (CmdImpl) &GrpImpl::impl_cgGet);
-        RegisterCommand(1, 4, 1503, "cgGetFlag", (CmdImpl) &GrpImpl::impl_cgStatus);
-        RegisterCommand(1, 4, 1504, "cgStatus", (CmdImpl) &GrpImpl::impl_cgStatus);
+        RegisterCommand(1, 33, 1600, "recAdd", (CmdImpl) &Grp::impl_recAdd);
+        RegisterCommand(1, 33, 406, "grpPan", (CmdImpl) &Grp::impl_grpPan);
+
+        RegisterCommand(1, 34, 3120, "snmBgScroll", (CmdImpl) &Grp::impl_snmBgScroll);
+        RegisterCommand(1, 34, 3100, "snmBgPlay", (CmdImpl) &Grp::impl_snmPlay);
+        RegisterCommand(1, 34, 2100, "snmPlay", (CmdImpl) &Grp::impl_snmPlay);
+        RegisterCommand(1, 34, 2101, "snmPlayEx", (CmdImpl) &Grp::impl_snmPlay);
+
+        RegisterCommand(1, 4, 1500, "cgGetTotal", (CmdImpl) &Grp::impl_cgGet);
+        RegisterCommand(1, 4, 1501, "cgGetViewed", (CmdImpl) &Grp::impl_cgGet);
+        RegisterCommand(1, 4, 1502, "cgGetViewedPcnt", (CmdImpl) &Grp::impl_cgGet);
+        RegisterCommand(1, 4, 1503, "cgGetFlag", (CmdImpl) &Grp::impl_cgStatus);
+        RegisterCommand(1, 4, 1504, "cgStatus", (CmdImpl) &Grp::impl_cgStatus);
 
         RegisterCommand(1, 4, 0x6a4, "CreateInput", NULL);
         RegisterCommand(1, 4, 0x6ae, "SetInput", NULL);
 
-        RegisterCommand(1, 61, 10, "objClear", (CmdImpl) &GrpImpl::impl_objClear);
-        RegisterCommand(1, 61, 11, "objDelete", (CmdImpl) &GrpImpl::impl_objClear);
-
-        RegisterCommand(1, 71, 1000, "createObjG00", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(1, 71, 1003, "createObjGAN", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(1, 71, 1100, "createObjRect", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(1, 71, 1200, "createObjText", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(1, 71, 1300, "createObjWeaver", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(1, 71, 1400, "createObjDigit", (CmdImpl) &GrpImpl::impl_createObj);
-
-        RegisterCommand(2, 71, 1000, "createSubObjG00", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(2, 71, 1003, "createSubObjGAN", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(2, 71, 1100, "createSubObjRect", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(2, 71, 1200, "createSubObjText", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(2, 71, 1300, "createSubObjWeaver", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(2, 71, 1400, "createSubObjDigit", (CmdImpl) &GrpImpl::impl_createObj);
+        RegisterCommand(1, 61, 10, "objClear", (CmdImpl) &Grp::impl_objClear);
+        RegisterCommand(1, 61, 11, "objDelete", (CmdImpl) &Grp::impl_objClear);
+
+        RegisterCommand(1, 71, 1000, "objOfFile", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(1, 71, 1003, "objOfFileGan", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(1, 71, 1100, "objOfArea", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(1, 71, 1200, "objOfText", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(1, 71, 1300, "objDriftOfFile", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(1, 71, 1400, "objOfDigits", (CmdImpl) &Grp::impl_createObj);
+
+        RegisterCommand(2, 71, 1000, "subObjOfFile", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(2, 71, 1003, "subObjOfGan", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(2, 71, 1100, "subObjOfArea", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(2, 71, 1200, "subObjOfText", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(2, 71, 1300, "subObjDriftOfFile", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(2, 71, 1400, "subObjOfDigits", (CmdImpl) &Grp::impl_createObj);
 
         //I suppose it's the same thing as createObj*, but I didn't see it in action. For now, mark it unhandled.
-        RegisterCommand(1, 72, 1000, "createBgObjG00", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(1, 72, 1003, "createBgObjGAN", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(1, 72, 1100, "createBgObjRect", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(1, 72, 1200, "createBgObjText", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(1, 72, 1300, "createBgObjWeaver", (CmdImpl) &GrpImpl::impl_createObj);
-        RegisterCommand(1, 72, 1400, "createBgObjDigit", (CmdImpl) &GrpImpl::impl_createObj);
-
-        RegisterCommand(2, 72, 1000, "createBgSubObjG00", NULL);//FIXME
-        RegisterCommand(2, 72, 1003, "createBgSubObjGAN", NULL);//FIXME
-        RegisterCommand(2, 72, 1100, "createBgSubObjRect", NULL);//FIXME
-        RegisterCommand(2, 72, 1200, "createBgSubObjText", NULL);//FIXME
-        RegisterCommand(2, 72, 1300, "createBgSubObjWeaver", NULL);//FIXME
-        RegisterCommand(2, 72, 1400, "createBgSubObjDigit", NULL);//FIXME
-
+        RegisterCommand(1, 72, 1000, "objBgOfFile", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(1, 72, 1003, "objBgOfFileGan", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(1, 72, 1100, "objBgOfArea", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(1, 72, 1200, "objBgOfText", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(1, 72, 1300, "objBgDriftOfFile", (CmdImpl) &Grp::impl_createObj);
+        RegisterCommand(1, 72, 1400, "objBgOfDigits", (CmdImpl) &Grp::impl_createObj);
+
+        RegisterCommand(2, 72, 1000, "subObjBgOfFile", NULL);//FIXME
+        RegisterCommand(2, 72, 1003, "subObjBgOfGan", NULL);//FIXME
+        RegisterCommand(2, 72, 1100, "subObjBgOfArea", NULL);//FIXME
+        RegisterCommand(2, 72, 1200, "subObjBgOfText", NULL);//FIXME
+        RegisterCommand(2, 72, 1300, "subObjBgDriftOfFile", NULL);//FIXME
+        RegisterCommand(2, 72, 1400, "subObjBgOfDigits", NULL);//FIXME;
 
         RegisterCommand(1, 73, 0, "ganStop?", NULL); //That's what xclannad says, but I'm not sure...
-        RegisterCommand(1, 73, 1000, "ganStop", (CmdImpl) &GrpImpl::impl_gan); //That's what rldev says
-        RegisterCommand(1, 73, 3, "ganIsPlaying", (CmdImpl) &GrpImpl::impl_gan);
-        RegisterCommand(1, 73, 2003, "objPlay", (CmdImpl) &GrpImpl::impl_gan);
-        RegisterCommand(1, 73, 1001, "ganLoop", (CmdImpl) &GrpImpl::impl_gan);
-        RegisterCommand(1, 73, 1003, "ganPlay", (CmdImpl) &GrpImpl::impl_gan);
-        RegisterCommand(1, 73, 1005, "ganPlayOnce", (CmdImpl) &GrpImpl::impl_gan);
-        RegisterCommand(1, 73, 3001, "ganLoop2", (CmdImpl) &GrpImpl::impl_gan);
-        RegisterCommand(1, 73, 3003, "ganPlay2", (CmdImpl) &GrpImpl::impl_gan);
-        RegisterCommand(1, 73, 3005, "ganPlayOnce2", (CmdImpl) &GrpImpl::impl_gan);
+        RegisterCommand(1, 73, 1000, "ganStop", (CmdImpl) &Grp::impl_gan); //That's what rldev says
+        RegisterCommand(1, 73, 3, "ganIsPlaying", (CmdImpl) &Grp::impl_gan);
+        RegisterCommand(1, 73, 2003, "objPlay", (CmdImpl) &Grp::impl_gan);
+        RegisterCommand(1, 73, 1001, "ganLoop", (CmdImpl) &Grp::impl_gan);
+        RegisterCommand(1, 73, 1003, "ganPlay", (CmdImpl) &Grp::impl_gan);
+        RegisterCommand(1, 73, 1005, "ganPlayOnce", (CmdImpl) &Grp::impl_gan);
+        RegisterCommand(1, 73, 3001, "ganLoop2", (CmdImpl) &Grp::impl_gan);
+        RegisterCommand(1, 73, 3003, "ganPlay2", (CmdImpl) &Grp::impl_gan);
+        RegisterCommand(1, 73, 3005, "ganPlayOnce2", (CmdImpl) &Grp::impl_gan);
 
         RegisterCommand(2, 73, 0, "ganSubStop?", NULL); //FIXME
@@ -940 +700 @@
         RegisterCommand(2, 73, 1003, "ganSubPlay", NULL); //FIXME
         RegisterCommand(2, 73, 1005, "ganSubPlayOnce", NULL); //FIXME
-        RegisterCommand(2, 73, 3001, "ganSubLoop2", (CmdImpl) &GrpImpl::impl_gan); //FIXME
+        RegisterCommand(2, 73, 3001, "ganSubLoop2", (CmdImpl) &Grp::impl_gan); //FIXME
         RegisterCommand(2, 73, 3003, "ganSubPlay2", NULL); //FIXME
         RegisterCommand(2, 73, 3005, "ganSubPlayOnce2", NULL); //FIXME
 
 
-        RegisterCommand(1, 81, 1000, "objMove", (CmdImpl) &GrpImpl::impl_objSetPos);
-        RegisterCommand(1, 82, 1000, "objBgMove", (CmdImpl) &GrpImpl::impl_objSetPos);
-        RegisterCommand(1, 81, 1001, "objLeft", (CmdImpl) &GrpImpl::impl_objSetPos);
-        RegisterCommand(1, 82, 1001, "objBgLeft", (CmdImpl) &GrpImpl::impl_objSetPos);
-        RegisterCommand(1, 81, 1002, "objTop", (CmdImpl) &GrpImpl::impl_objSetPos);
-        RegisterCommand(1, 82, 1002, "objBgTop", (CmdImpl) &GrpImpl::impl_objSetPos);
-        RegisterCommand(1, 81, 1003, "objAlpha", (CmdImpl) &GrpImpl::impl_objAlpha);
-        RegisterCommand(1, 82, 1003, "objBgAlpha", (CmdImpl) &GrpImpl::impl_objAlpha);
-        RegisterCommand(1, 81, 1004, "objShow", (CmdImpl) &GrpImpl::impl_objShow);
-        RegisterCommand(1, 82, 1004, "objBgShow", (CmdImpl) &GrpImpl::impl_objShow);
+        RegisterCommand(1, 81, 1000, "objMove", (CmdImpl) &Grp::impl_objSetPos);
+        RegisterCommand(1, 82, 1000, "objBgMove", (CmdImpl) &Grp::impl_objSetPos);
+        RegisterCommand(1, 81, 1001, "objLeft", (CmdImpl) &Grp::impl_objSetPos);
+        RegisterCommand(1, 82, 1001, "objBgLeft", (CmdImpl) &Grp::impl_objSetPos);
+        RegisterCommand(1, 81, 1002, "objTop", (CmdImpl) &Grp::impl_objSetPos);
+        RegisterCommand(1, 82, 1002, "objBgTop", (CmdImpl) &Grp::impl_objSetPos);
+        RegisterCommand(1, 81, 1003, "objAlpha", (CmdImpl) &Grp::impl_objAlpha);
+        RegisterCommand(1, 82, 1003, "objBgAlpha", (CmdImpl) &Grp::impl_objAlpha);
+        RegisterCommand(1, 81, 1004, "objShow", (CmdImpl) &Grp::impl_objShow);
+        RegisterCommand(1, 82, 1004, "objBgShow", (CmdImpl) &Grp::impl_objShow);
         RegisterCommand(1, 81, 1005, "objDispArea", NULL);
         RegisterCommand(1, 82, 1005, "objBgDispArea", NULL);
-        RegisterCommand(1, 81, 1006, "objAdjust", (CmdImpl) &GrpImpl::impl_objSetPos);
-        RegisterCommand(1, 82, 1006, "objBgAdjust", NULL); //FIXME: (CmdImpl) &GrpImpl::impl_objSetPos);
+        RegisterCommand(1, 81, 1006, "objAdjust", (CmdImpl) &Grp::impl_objSetPos);
+        RegisterCommand(1, 82, 1006, "objBgAdjust", NULL); //FIXME: (CmdImpl) &Grp::impl_objSetPos);
         RegisterCommand(1, 81, 1007, "objAdjustX", NULL);
         RegisterCommand(1, 82, 1007, "objBgAdjustX", NULL);
         RegisterCommand(1, 81, 1008, "objAdjustY", NULL);
         RegisterCommand(1, 82, 1008, "objBgAdjustY", NULL);
-        RegisterCommand(1, 81, 2006, "objAdjust2?", NULL); //FIXME: (CmdImpl) &GrpImpl::impl_objSetPos); I don't know if it is usefull or properly implemented
-        RegisterCommand(1, 82, 2006, "objBgAdjust2?", NULL); //FIXME: (CmdImpl) &GrpImpl::impl_objSetPos); See above
-        RegisterCommand(1, 81, 1016, "objColour", NULL); //FIXME: (CmdImpl) &GrpImpl::impl_objColour);
-        RegisterCommand(1, 82, 1016, "objBgColour", NULL); //FIXME: (CmdImpl) &GrpImpl::impl_objColour);
+        RegisterCommand(1, 81, 2006, "objAdjust2?", NULL); //FIXME: (CmdImpl) &Grp::impl_objSetPos); I don't know if it is usefull or properly implemented
+        RegisterCommand(1, 82, 2006, "objBgAdjust2?", NULL); //FIXME: (CmdImpl) &Grp::impl_objSetPos); See above
+        RegisterCommand(1, 81, 1016, "objColour", NULL); //FIXME: (CmdImpl) &Grp::impl_objColour);
+        RegisterCommand(1, 82, 1016, "objBgColour", NULL); //FIXME: (CmdImpl) &Grp::impl_objColour);
         RegisterCommand(1, 81, 1017, "objColR", NULL);
         RegisterCommand(1, 82, 1017, "objBgColR", NULL);
@@ -975 +735 @@
         RegisterCommand(1, 81, 1020, "objColLevel", NULL);
         RegisterCommand(1, 82, 1020, "objBgColLevel", NULL);
-        RegisterCommand(1, 81, 1021, "objComposite", NULL);//(CmdImpl) &GrpImpl::impl_objComposite); //FIXME: May be broken
-        RegisterCommand(1, 82, 1021, "objBgComposite", (CmdImpl) &GrpImpl::impl_objComposite);
-        RegisterCommand(1, 81, 1024, "objSetText", (CmdImpl) &GrpImpl::impl_objSetText);
-        RegisterCommand(1, 82, 1024, "objBgSetText", (CmdImpl) &GrpImpl::impl_objSetText);
-        RegisterCommand(1, 81, 1025, "objTextOpts", (CmdImpl) &GrpImpl::impl_objTextOpts); //FIXME: Incomplete
-        RegisterCommand(1, 82, 1025, "objBgTextOpts", (CmdImpl) &GrpImpl::impl_objTextOpts);
-        RegisterCommand(1, 81, 1032, "objOrder", (CmdImpl) &GrpImpl::impl_objOrder);
-        RegisterCommand(1, 82, 1032, "objBgOrder", (CmdImpl) &GrpImpl::impl_objOrder);
-        RegisterCommand(1, 81, 1034, "objDispRect", (CmdImpl) &GrpImpl::impl_objDispArea);
-        RegisterCommand(1, 82, 1034, "objBgDispRect", (CmdImpl) &GrpImpl::impl_objDispArea);
-        RegisterCommand(1, 81, 1037, "objSetDigits", (CmdImpl) &GrpImpl::impl_objSetDigits);
-        RegisterCommand(1, 82, 1037, "objBgSetDigits", (CmdImpl) &GrpImpl::impl_objSetDigits);
-        RegisterCommand(1, 81, 1038, "objNumOpts", (CmdImpl) &GrpImpl::impl_objNumOpts);
-        RegisterCommand(1, 82, 1038, "objBgNumOpts", (CmdImpl) &GrpImpl::impl_objNumOpts);
-        RegisterCommand(1, 81, 1039, "objPattNo", (CmdImpl) &GrpImpl::impl_objPattNo);
-        RegisterCommand(1, 82, 1039, "objBgPattNo", (CmdImpl) &GrpImpl::impl_objPattNo);
-        RegisterCommand(1, 81, 1046, "objScale", (CmdImpl) &GrpImpl::impl_objScale); //FIXME: Broken behaviour
-        RegisterCommand(1, 82, 1046, "objBgScale", (CmdImpl) &GrpImpl::impl_objScale);
+        RegisterCommand(1, 81, 1021, "objComposite", NULL);//(CmdImpl) &Grp::impl_objComposite); //FIXME: May be broken
+        RegisterCommand(1, 82, 1021, "objBgComposite", (CmdImpl) &Grp::impl_objComposite);
+        RegisterCommand(1, 81, 1024, "objSetText", (CmdImpl) &Grp::impl_objSetText);
+        RegisterCommand(1, 82, 1024, "objBgSetText", (CmdImpl) &Grp::impl_objSetText);
+        RegisterCommand(1, 81, 1025, "objTextOpts", (CmdImpl) &Grp::impl_objTextOpts); //FIXME: Incomplete
+        RegisterCommand(1, 82, 1025, "objBgTextOpts", (CmdImpl) &Grp::impl_objTextOpts);
+        RegisterCommand(1, 81, 1032, "objOrder", (CmdImpl) &Grp::impl_objOrder);
+        RegisterCommand(1, 82, 1032, "objBgOrder", (CmdImpl) &Grp::impl_objOrder);
+        RegisterCommand(1, 81, 1034, "objDispRect", (CmdImpl) &Grp::impl_objDispArea);
+        RegisterCommand(1, 82, 1034, "objBgDispRect", (CmdImpl) &Grp::impl_objDispArea);
+        RegisterCommand(1, 81, 1037, "objSetDigits", (CmdImpl) &Grp::impl_objSetDigits);
+        RegisterCommand(1, 82, 1037, "objBgSetDigits", (CmdImpl) &Grp::impl_objSetDigits);
+        RegisterCommand(1, 81, 1038, "objNumOpts", (CmdImpl) &Grp::impl_objNumOpts);
+        RegisterCommand(1, 82, 1038, "objBgNumOpts", (CmdImpl) &Grp::impl_objNumOpts);
+        RegisterCommand(1, 81, 1039, "objPattNo", (CmdImpl) &Grp::impl_objPattNo);
+        RegisterCommand(1, 82, 1039, "objBgPattNo", (CmdImpl) &Grp::impl_objPattNo);
+        RegisterCommand(1, 81, 1046, "objScale", (CmdImpl) &Grp::impl_objScale); //FIXME: Broken behaviour
+        RegisterCommand(1, 82, 1046, "objBgScale", (CmdImpl) &Grp::impl_objScale);
         RegisterCommand(1, 81, 1047, "objWidth", NULL);
         RegisterCommand(1, 82, 1047, "objBgWidth", NULL);
-        RegisterCommand(1, 81, 1049, "objRotate", (CmdImpl) &GrpImpl::impl_objRotate);
-        RegisterCommand(1, 82, 1049, "objBgRotate", (CmdImpl) &GrpImpl::impl_objRotate);
-
-        RegisterCommand(2, 81, 1000, "childObjMove", (CmdImpl) &GrpImpl::impl_objSetPos);
-        RegisterCommand(2, 82, 1000, "childObjBgMove", (CmdImpl) &GrpImpl::impl_objSetPos);
+        RegisterCommand(1, 81, 1049, "objRotate", (CmdImpl) &Grp::impl_objRotate);
+        RegisterCommand(1, 82, 1049, "objBgRotate", (CmdImpl) &Grp::impl_objRotate);
+
+        RegisterCommand(2, 81, 1000, "childObjMove", (CmdImpl) &Grp::impl_objSetPos);
+        RegisterCommand(2, 82, 1000, "childObjBgMove", (CmdImpl) &Grp::impl_objSetPos);
         RegisterCommand(2, 81, 1001, "childObjLeft", NULL);
         RegisterCommand(2, 82, 1001, "childObjBgLeft", NULL);
         RegisterCommand(2, 81, 1002, "childObjTop", NULL);
         RegisterCommand(2, 82, 1002, "childObjBgTop", NULL);
-        RegisterCommand(2, 81, 1003, "childObjAlpha", (CmdImpl) &GrpImpl::impl_objAlpha);
-        RegisterCommand(2, 82, 1003, "childObjBgAlpha", (CmdImpl) &GrpImpl::impl_objAlpha);
-        RegisterCommand(2, 81, 1004, "childObjShow", (CmdImpl) &GrpImpl::impl_objShow);
-        RegisterCommand(2, 82, 1004, "childObjBgShow", (CmdImpl) &GrpImpl::impl_objShow);
+        RegisterCommand(2, 81, 1003, "childObjAlpha", (CmdImpl) &Grp::impl_objAlpha);
+        RegisterCommand(2, 82, 1003, "childObjBgAlpha", (CmdImpl) &Grp::impl_objAlpha);
+        RegisterCommand(2, 81, 1004, "childObjShow", (CmdImpl) &Grp::impl_objShow);
+        RegisterCommand(2, 82, 1004, "childObjBgShow", (CmdImpl) &Grp::impl_objShow);
         RegisterCommand(2, 81, 1005, "childObjDispArea", NULL);
         RegisterCommand(2, 82, 1005, "childObjBgDispArea", NULL);
-        RegisterCommand(2, 81, 1006, "childObjAdjust", (CmdImpl) &GrpImpl::impl_objSetPos);
-        RegisterCommand(2, 82, 1006, "childObjBgAdjust", (CmdImpl) &GrpImpl::impl_objSetPos);
+        RegisterCommand(2, 81, 1006, "childObjAdjust", (CmdImpl) &Grp::impl_objSetPos);
+        RegisterCommand(2, 82, 1006, "childObjBgAdjust", (CmdImpl) &Grp::impl_objSetPos);
         RegisterCommand(2, 81, 1007, "childObjAdjustX", NULL);
         RegisterCommand(2, 82, 1007, "childObjBgAdjustX", NULL);
@@ -1030 +790 @@
         RegisterCommand(2, 81, 1021, "childObjComposite", NULL);
         RegisterCommand(2, 82, 1021, "childObjBgComposite", NULL);
-        RegisterCommand(2, 81, 1024, "childObjSetText", (CmdImpl) &GrpImpl::impl_objSetText);
-        RegisterCommand(2, 82, 1024, "childObjBgSetText", (CmdImpl) &GrpImpl::impl_objSetText);
-        RegisterCommand(2, 81, 1025, "childObjTextOpts", (CmdImpl) &GrpImpl::impl_objTextOpts);
-        RegisterCommand(2, 82, 1025, "childObjBgTextOpts", (CmdImpl) &GrpImpl::impl_objTextOpts);
+        RegisterCommand(2, 81, 1024, "childObjSetText", (CmdImpl) &Grp::impl_objSetText);
+        RegisterCommand(2, 82, 1024, "childObjBgSetText", (CmdImpl) &Grp::impl_objSetText);
+        RegisterCommand(2, 81, 1025, "childObjTextOpts", (CmdImpl) &Grp::impl_objTextOpts);
+        RegisterCommand(2, 82, 1025, "childObjBgTextOpts", (CmdImpl) &Grp::impl_objTextOpts);
         RegisterCommand(2, 81, 1032, "childObjOrder", NULL);
         RegisterCommand(2, 82, 1032, "childObjBgOrder", NULL);
         RegisterCommand(2, 81, 1034, "childObjDispRect", NULL);
         RegisterCommand(2, 82, 1034, "childObjBgDispRect", NULL);
-        RegisterCommand(2, 81, 1037, "childObjSetDigits", (CmdImpl) &GrpImpl::impl_objSetDigits);
-        RegisterCommand(2, 82, 1037, "childObjBgSetDigits", (CmdImpl) &GrpImpl::impl_objSetDigits);
-        RegisterCommand(2, 81, 1038, "childObjNumOpts", (CmdImpl) &GrpImpl::impl_objNumOpts);
-        RegisterCommand(2, 82, 1038, "childObjBgNumOpts", (CmdImpl) &GrpImpl::impl_objNumOpts);
-        RegisterCommand(2, 81, 1039, "childObjPattNo", (CmdImpl) &GrpImpl::impl_objPattNo);
-        RegisterCommand(2, 82, 1039, "childObjBgPattNo", (CmdImpl) &GrpImpl::impl_objPattNo);
-        RegisterCommand(2, 81, 1046, "childObjScale", (CmdImpl) &GrpImpl::impl_objScale);
-        RegisterCommand(2, 82, 1046, "childObjBgScale", (CmdImpl) &GrpImpl::impl_objScale);
+        RegisterCommand(2, 81, 1037, "childObjSetDigits", (CmdImpl) &Grp::impl_objSetDigits);
+        RegisterCommand(2, 82, 1037, "childObjBgSetDigits", (CmdImpl) &Grp::impl_objSetDigits);
+        RegisterCommand(2, 81, 1038, "childObjNumOpts", (CmdImpl) &Grp::impl_objNumOpts);
+        RegisterCommand(2, 82, 1038, "childObjBgNumOpts", (CmdImpl) &Grp::impl_objNumOpts);
+        RegisterCommand(2, 81, 1039, "childObjPattNo", (CmdImpl) &Grp::impl_objPattNo);
+        RegisterCommand(2, 82, 1039, "childObjBgPattNo", (CmdImpl) &Grp::impl_objPattNo);
+        RegisterCommand(2, 81, 1046, "childObjScale", (CmdImpl) &Grp::impl_objScale);
+        RegisterCommand(2, 82, 1046, "childObjBgScale", (CmdImpl) &Grp::impl_objScale);
         RegisterCommand(2, 81, 1047, "childObjWidth", NULL);
         RegisterCommand(2, 82, 1047, "childObjBgWidth", NULL);
@@ -1051 +811 @@
         RegisterCommand(2, 82, 1049, "childObjBgRotate", NULL);
 
-        RegisterCommand(1, 84, 1000, "objGetPos", (CmdImpl) &GrpImpl::impl_objPosDims);
-        RegisterCommand(1, 84, 1100, "objGetDims", (CmdImpl) &GrpImpl::impl_objPosDims);
-
-        RegisterCommand(2, 84, 1000, "childObjGetPos", (CmdImpl) &GrpImpl::impl_objPosDims);
-        RegisterCommand(2, 84, 1100, "childObjGetDims", (CmdImpl) &GrpImpl::impl_objPosDims);
-
-        RegisterCommand(1, 31, 0, "refresh", (CmdImpl) &GrpImpl::impl_refresh);
-
-        RegisterCommand(1, 20, 0, "bgmLoop", (CmdImpl) &GrpImpl::impl_bgmLoop);
-        RegisterCommand(1, 20, 1, "bgmPlayEx", (CmdImpl) &GrpImpl::impl_bgmLoop); //FIXME: wait
-        RegisterCommand(1, 20, 2, "bgmPlay", (CmdImpl) &GrpImpl::impl_bgmLoop);
-        RegisterCommand(1, 20, 5, "bgmStop", (CmdImpl) &GrpImpl::impl_bgmStop);
-        RegisterCommand(1, 20, 105, "bgmFadeOut", (CmdImpl) &GrpImpl::impl_bgmStop);
-
-        RegisterCommand(1, 21, 0, "wavPlay", (CmdImpl) &GrpImpl::impl_playWav);
-        RegisterCommand(1, 21, 1, "wavPlayEx", (CmdImpl) &GrpImpl::impl_playWav);
-        RegisterCommand(1, 21, 2, "wavLoop", (CmdImpl) &GrpImpl::impl_playWav);
+        RegisterCommand(1, 84, 1000, "objGetPos", (CmdImpl) &Grp::impl_objPosDims);
+        RegisterCommand(1, 84, 1100, "objGetDims", (CmdImpl) &Grp::impl_objPosDims);
+
+        RegisterCommand(2, 84, 1000, "childObjGetPos", (CmdImpl) &Grp::impl_objPosDims);
+        RegisterCommand(2, 84, 1100, "childObjGetDims", (CmdImpl) &Grp::impl_objPosDims);
+
+        RegisterCommand(1, 31, 0, "refresh", (CmdImpl) &Grp::impl_refresh);
+
+        RegisterCommand(1, 20, 0, "bgmLoop", (CmdImpl) &Grp::impl_bgmLoop);
+        RegisterCommand(1, 20, 1, "bgmPlayEx", (CmdImpl) &Grp::impl_bgmLoop); //FIXME: wait
+        RegisterCommand(1, 20, 2, "bgmPlay", (CmdImpl) &Grp::impl_bgmLoop);
+        RegisterCommand(1, 20, 5, "bgmStop", (CmdImpl) &Grp::impl_bgmStop);
+        RegisterCommand(1, 20, 105, "bgmFadeOut", (CmdImpl) &Grp::impl_bgmStop);
+
+        RegisterCommand(1, 21, 0, "wavPlay", (CmdImpl) &Grp::impl_playWav);
+        RegisterCommand(1, 21, 1, "wavPlayEx", (CmdImpl) &Grp::impl_playWav);
+        RegisterCommand(1, 21, 2, "wavLoop", (CmdImpl) &Grp::impl_playWav);
         RegisterCommand(1, 21, 3, "wavWait", NULL);
         RegisterCommand(1, 21, 4, "wavPlaying", NULL);
-        RegisterCommand(1, 21, 5, "wavStop", (CmdImpl) &GrpImpl::impl_stopWav);
-        RegisterCommand(1, 21, 105, "wavFadeout", (CmdImpl) &GrpImpl::impl_stopWav);
-
-        RegisterCommand(1, 22, 0, "sePlay", (CmdImpl) &GrpImpl::impl_playSE);
-
-        RegisterCommand(1, 4, 2230, "SetBgmVolMod", (CmdImpl) &GrpImpl::impl_SetVolMod);
-        RegisterCommand(1, 4, 2231, "SetKoeVolMod", (CmdImpl) &GrpImpl::impl_SetVolMod);
-        RegisterCommand(1, 4, 2232, "SetPCMVolMod", (CmdImpl) &GrpImpl::impl_SetVolMod);
-        RegisterCommand(1, 4, 2233, "SetSeVolMod", (CmdImpl) &GrpImpl::impl_SetVolMod);
-        RegisterCommand(1, 4, 2330, "BgmVolMod", (CmdImpl) &GrpImpl::impl_GetVolMod);
-        RegisterCommand(1, 4, 2331, "KoeVolMod", (CmdImpl) &GrpImpl::impl_GetVolMod);
-        RegisterCommand(1, 4, 2332, "PCMVolMod", (CmdImpl) &GrpImpl::impl_GetVolMod);
-        RegisterCommand(1, 4, 2333, "SeVolMod", (CmdImpl) &GrpImpl::impl_GetVolMod);
-
-        RegisterCommand(1, 23, 0, "koePlay", (CmdImpl) &GrpImpl::impl_koePlay);
-        RegisterCommand(1, 23, 1, "koePlayEx", (CmdImpl) &GrpImpl::impl_koePlay); //FIXME
-        RegisterCommand(1, 23, 7, "koePlayExC", (CmdImpl) &GrpImpl::impl_koePlay); //FIXME
-        RegisterCommand(1, 23, 8, "koeDoPlay", (CmdImpl) &GrpImpl::impl_koePlay); //FIXME
-        RegisterCommand(1, 23, 9, "koeDoPlayEx", (CmdImpl) &GrpImpl::impl_koePlay); //FIXME
-        RegisterCommand(1, 23, 10, "koeDoPlayExC", (CmdImpl) &GrpImpl::impl_koePlay); //FIXME
-
-        RegisterCommand(1, 26, 1, "movPlayEx", (CmdImpl) &GrpImpl::impl_movPlay);
-        RegisterCommand(1, 26, 20, "movPlayExC", (CmdImpl) &GrpImpl::impl_movPlay);
+        RegisterCommand(1, 21, 5, "wavStop", (CmdImpl) &Grp::impl_stopWav);
+        RegisterCommand(1, 21, 105, "wavFadeout", (CmdImpl) &Grp::impl_stopWav);
+
+        RegisterCommand(1, 22, 0, "sePlay", (CmdImpl) &Grp::impl_playSE);
+
+        RegisterCommand(1, 4, 2230, "SetBgmVolMod", (CmdImpl) &Grp::impl_SetVolMod);
+        RegisterCommand(1, 4, 2231, "SetKoeVolMod", (CmdImpl) &Grp::impl_SetVolMod);
+        RegisterCommand(1, 4, 2232, "SetPCMVolMod", (CmdImpl) &Grp::impl_SetVolMod);
+        RegisterCommand(1, 4, 2233, "SetSeVolMod", (CmdImpl) &Grp::impl_SetVolMod);
+        RegisterCommand(1, 4, 2330, "BgmVolMod", (CmdImpl) &Grp::impl_GetVolMod);
+        RegisterCommand(1, 4, 2331, "KoeVolMod", (CmdImpl) &Grp::impl_GetVolMod);
+        RegisterCommand(1, 4, 2332, "PCMVolMod", (CmdImpl) &Grp::impl_GetVolMod);
+        RegisterCommand(1, 4, 2333, "SeVolMod", (CmdImpl) &Grp::impl_GetVolMod);
+
+        RegisterCommand(1, 23, 0, "koePlay", (CmdImpl) &Grp::impl_koePlay);
+        RegisterCommand(1, 23, 1, "koePlayEx", (CmdImpl) &Grp::impl_koePlay); //FIXME
+        RegisterCommand(1, 23, 7, "koePlayExC", (CmdImpl) &Grp::impl_koePlay); //FIXME
+        RegisterCommand(1, 23, 8, "koeDoPlay", (CmdImpl) &Grp::impl_koePlay); //FIXME
+        RegisterCommand(1, 23, 9, "koeDoPlayEx", (CmdImpl) &Grp::impl_koePlay); //FIXME
+        RegisterCommand(1, 23, 10, "koeDoPlayExC", (CmdImpl) &Grp::impl_koePlay); //FIXME
+
+        RegisterCommand(1, 26, 1, "movPlayEx", (CmdImpl) &Grp::impl_movPlay);
+        RegisterCommand(1, 26, 20, "movPlayExC", (CmdImpl) &Grp::impl_movPlay);
 
         RegisterCommand(1, 61, 14, "objSwap?", NULL);
@@ -1105 +865 @@
 }
 
-GrpImpl::~GrpImpl() {
-
+Grp::~Grp() {
         map<int,GrpObj>::iterator it;
         for (it=grpobj.begin(); it!=grpobj.end(); it++) {
@@ -1124 +883 @@
 }
 
-Surface* GrpImpl::Dsurface(int pdt) {
+Surface* Grp::Dsurface(int pdt) {
         if (pdt == 0) return surface;
         if (dsurface[pdt] == 0) { // €È€ê€¢€š€º²èÌÌ€ÎÂ瀭€µ€È€€€Š€³€È€Ë€¹€ë
@@ -1140 +899 @@
 }
 
-GrpObj* GrpImpl::GetGraphicObj(int grp, bool fg) {
+GrpObj* Grp::GetGraphicObj(int grp, bool fg) {
         if (fg)
                 return &grpobj[grp];
@@ -1147 +906 @@
 }
 
-GrpObj* GrpImpl::GetGraphicObj(int grp, int index, bool fg) {
+GrpObj* Grp::GetGraphicObj(int grp, int index, bool fg) {
         GrpObj* g = GetGraphicObj(grp, fg);
         return &g->children_obj[index];
 }
 
-GrpObj* GrpImpl::GetGraphicObjVarMode(Cmd& cmd, int &base_arg, bool fg) {
+GrpObj* Grp::GetGraphicObjVarMode(Cmd& cmd, int &base_arg, bool fg) {
         GrpObj* g;
         if (cmd.cmd1 == 2) {
@@ -1164 +923 @@
 
 #include <SDL.h>
-Surface* GrpImpl::Ssurface(int pdt) {
+Surface* Grp::Ssurface(int pdt) {
         if (pdt == 0) return surface;
         if (ssurface[pdt]) {
@@ -1172 +931 @@
 }
 
-void GrpImpl::LoadSurface(const char* str, int pdt) {
+void Grp::LoadSurface(const char* str, int pdt) {
         string s = str;
         if (cgm_info.find(s) != cgm_info.end()) {
@@ -1202 +961 @@
 }
 
-void GrpImpl::InitSel(void) {
+void Grp::InitSel(void) {
         int i;
         int args[16];
@@ -1229 +988 @@
 }
 
-void GrpImpl::SetSkipMode(SkipMode _mode) {
+void Grp::SetSkipMode(SkipMode _mode) {
         if ( (skip_mode & SKIP_IN_MENU) && (_mode & SKIP_IN_MENU) == 0) {
                 RefreshObj();
@@ -1237 +996 @@
 }
 
-void GrpImpl::SetObjChanged(int num) {
+void Grp::SetObjChanged(int num) {
         changed_obj.insert(num);
 }
 
-void GrpImpl::RefreshObj(void) {
+void Grp::RefreshObj(void) {
         if (!deleted_pic.empty()) {
                 vector<PicBase*>::iterator it;
@@ -1267 +1026 @@
 
 #include <SDL.h>
-void GrpImpl::StartAnm(int type) {
+void Grp::StartAnm(int type) {
         SEL sel;
 
@@ -1349 +1108 @@
 }
 
-void GrpImpl::StartShake(int total, const int* pattern) {
+void Grp::StartShake(int total, const int* pattern) {
         if (anm2) {
                 fprintf(stderr,"Warning: StartShake() called before another animation finished\n");
@@ -1372 +1131 @@
 }
 
-void GrpImpl::AbortAnm(void) {
+void Grp::AbortAnm(void) {
         if (anm1 == NULL) return;
         anm1->Abort();
@@ -1393 +1152 @@
 }
 
-void GrpImpl::LoadSurface(const char* str) {
+void Grp::LoadSurface(const char* str) {
         if (anm1 != NULL) AbortAnm(); // Á°€ÎÉÁ²è€¬œª€ï€Ã€Æ€Ê€±€ì€Ð¶¯À©œªÎ»
         LoadSurface(str, 1);
@@ -1399 +1158 @@
 }
 
-void GrpImpl::LoadSurface(void) {
+void Grp::LoadSurface(void) {
         if (anm1 != NULL) AbortAnm(); // Á°€ÎÉÁ²è€¬œª€ï€Ã€Æ€Ê€±€ì€Ð¶¯À©œªÎ»
         LoadSurface(bg_name.c_str(), 1);
 }
 
-void GrpImpl::AddSurface(const char* str) {
+void Grp::AddSurface(const char* str) {
         if (anm1 != NULL) AbortAnm(); // Á°€ÎÉÁ²è€¬œª€ï€Ã€Æ€Ê€±€ì€Ð¶¯À©œªÎ»
         LoadSurface(bg_name.c_str());
@@ -1422 +1181 @@
 }
 
-void GrpImpl::CreateObj(int index) {
+void Grp::CreateObj(int index) {
         GrpObjMap::iterator cur = grpobj.find(index);
         if (cur == grpobj.end()) return;
@@ -1434 +1193 @@
 }
 
-void GrpImpl::CreateSubObj(int grp_index, int index) {
+void Grp::CreateSubObj(int grp_index, int index) {
         GrpObjMap::iterator cur = grpobj.find(grp_index);
         if (cur == grpobj.end()) return;
@@ -1450 +1209 @@
 }
 
-void GrpImpl::ZMoveObj(int index) {
+void Grp::ZMoveObj(int index) {
         GrpObjMap::iterator cur = grpobj.find(index);
         if (cur == grpobj.end()) return;
@@ -1477 +1236 @@
 }
 
-void GrpImpl::SwapObj(int index1, int index2) {
+void Grp::SwapObj(int index1, int index2) {
         // ¥Ç¥Õ¥©¥ë¥ÈÃÍ€«€é order €¬Êѹ¹€µ€ì€Æ€€€¿Ÿì¹ç€Î€ß¡¢order €ÏÊÝž€µ€ì€ë
         // €Þ€º€ÏΟÊý€Îobject€òswap
@@ -1512 +1271 @@
 }
 
-bool GrpImpl::Pressed(int x, int y, void* pointer) { // ¥Þ¥Š¥¹¥¯¥ê¥Ã¥¯€Ç¥­¥ã¥ó¥»¥ë
-        GrpImpl* g = (GrpImpl*)pointer;
+bool Grp::Pressed(int x, int y, void* pointer) { // ¥Þ¥Š¥¹¥¯¥ê¥Ã¥¯€Ç¥­¥ã¥ó¥»¥ë
+        Grp* g = (Grp*)pointer;
         if (g->status == WAIT_MOVIE)
                 g->music->StopMovie();
@@ -1562 +1321 @@
 };
 
-void GrpImpl::LoadCgm() {
+void Grp::LoadCgm() {
         /* cgm ¥Õ¥¡¥€¥ëÆɀ߹þ€ß */
         const char* fname = config->GetParaStr("#CGTABLE_FILE");
@@ -1602 +1361 @@
 /*****************************************************
 *
-*   GrpImpl :: Save, Load : ¥»¡Œ¥Ö¥Õ¥¡¥€¥ëœèÍý
+*   Grp :: Save, Load : ¥»¡Œ¥Ö¥Õ¥¡¥€¥ëœèÍý
 *
 */
-void GrpImpl::Save(std::string& str) {
-}
-
-void GrpImpl::Load(const char* str) {
+void Grp::Save(std::string& str) {
+}
+
+void Grp::Load(const char* str) {
         status = NORMAL;
         if (anm1 != NULL) {
@@ -1629 +1388 @@
 }
 
-void GrpImpl::SaveSys(string& save) {
+void Grp::SaveSys(string& save) {
         char buf[1024];
         save = "\n[Graphics]\n";
@@ -1642 +1401 @@
 }
 
-void GrpImpl::LoadSys(const char* save) {
+void Grp::LoadSys(const char* save) {
         cgm_data.clear();
         save = strstr(save, "\n[Graphics]\n");
@@ -1669 +1428 @@
 /*****************************************************
 *
-*   GrpImpl :: Wait , Exec : ¥³¥Þ¥ó¥ÉŒÂ¹ÔÉô
+*   Grp :: Wait , Exec : ¥³¥Þ¥ó¥ÉŒÂ¹ÔÉô
 *
 */
@@ -1675 +1434 @@
 static int draw_n = 0;
 extern bool grpdump_req;
-bool GrpImpl::Wait(unsigned int current_time, Cmd& cmd) {
+bool Grp::Wait(unsigned int current_time, Cmd& cmd) {
         if (grpdump_req) {
                 grpdump_req = 0;
@@ -1752 +1511 @@
 }
 
-void GrpImpl::DeleteObjPic(int num) { // object €Î surface €Î€ßºïœü
+void Grp::DeleteObjPic(int num) { // object €Î surface €Î€ßºïœü
         if (grpobj.find(num) == grpobj.end()) return;
         deleted_pic.push_back(grpobj[num].DeletePic());
 }
 
-void GrpImpl::DeleteSubObjPic(int num_grp, int num) {
+void Grp::DeleteSubObjPic(int num_grp, int num) {
         if (grpobj.find(num_grp) == grpobj.end()) return;
         if (grpobj[num_grp].children_obj.find(num) == grpobj[num_grp].children_obj.end()) return;
@@ -1763 +1522 @@
 }
 
-void GrpImpl::DeleteObj(int num) {
+void Grp::DeleteObj(int num) {
         if (grpobj.find(num) == grpobj.end()) return;
         deleted_pic.push_back(grpobj[num].DeletePic());
@@ -1773 +1532 @@
 }
 
-void GrpImpl::DeleteSubObj(int num_grp, int num) {
+void Grp::DeleteSubObj(int num_grp, int num) {
         if (grpobj.find(num_grp) == grpobj.end()) return;
         if (grpobj[num_grp].children_obj.find(num) == grpobj[num_grp].children_obj.end()) return;
@@ -1780 +1539 @@
 }
 
-void GrpImpl::impl_stackClear (Cmd& cmd) {
-        cmd.cmd_type = CMD_SAVECMDGRP_START;
-}
-
-void GrpImpl::impl_grpBuffer (Cmd& cmd) {
-        const char* name = cmd.Str(cmd.args[0]);
-        int pdt = cmd.args[1].value;
-        eprintf("load surface %s pdt %d\n",name, pdt);
-        if (pdt == 0)
-                reserved_load_surface0 = name; // ²èÁüÆɀ߹þ€ß€Ï 01-1f:0000 €Þ€ÇÂÔ€Ä
-        else if (pdt == 1)
-                LoadSurface(name); // ÇطʳšÆɀ߹þ€ß¡©
-        else
-                LoadSurface(name, pdt);
-        cmd.cmd_type = CMD_SAVECMDGRP;
-}
-
-void GrpImpl::impl_grpMulti(Cmd& cmd) {
-        int pos = cmd.args[0].value;
-        const char* name = cmd.Str(cmd.args[1]);
-        int sel = cmd.args[2].value;
-        eprintf("set foreground %s sel %d pos %d\n",name, sel, pos);
-        AddSurface(name);
-        StartAnm(sel);
-        event.RegisterGlobalPressFunc(&Pressed, (void*)this);
-        status = WAIT_ANM;
-        cmd.cmd_type = CMD_SAVECMDGRP_ONCE;
-}
-
-void GrpImpl::impl_grpOpen(Cmd& cmd) {
-        const char* name = cmd.Str(cmd.args[0]);
-        int sel = cmd.args[1].value;
-
-        if (name[0] == '?')
-                LoadSurface();
-        else if(cmd.cmd3 == 73)
-                LoadSurface(name, 1);
-        else
-                LoadSurface(name);
-
-        StartAnm(sel);
-        status = WAIT_ANM;
-        event.RegisterGlobalPressFunc(&Pressed, (void*)this);
-
-        if (name[0] == '?')
-                cmd.cmd_type = CMD_SAVECMDGRP_ONCE;
-        else
-                cmd.cmd_type = CMD_SAVECMDGRP_START;
-}
-
-void GrpImpl::impl_shake(Cmd& cmd) {
-        // shake screen
-        char key[11];
-        sprintf(key, "#SHAKE.%03d", cmd.args[0].value);
-        if (config->SearchParam(key) != 2) {
-                fprintf(stderr,"Cannot find shake pattern %d; use default pattern\n",cmd.args[0].value);
-                strcpy(key, "#SHAKE.000"); // default key
-        }
-        int num;
-        const int* pattern;
-        pattern = config->GetParamArray(key, num);
-        if (pattern) {
-                StartShake(num, pattern);
-                status = WAIT_SHAKE;
-        }
-        cmd.clear();
-}
-
-void GrpImpl::impl_grpCopy(Cmd& cmd) {
-        if (cmd.cmd4 == 2) { // copy (KANOGI)
-                int sx = cmd.args[0].value;
-                int sy = cmd.args[1].value;
-                int w = cmd.args[2].value - sx;
-                int h = cmd.args[3].value - sy;
-                Rect rect(sx, sy, sx+w, sy+h);
-                int src = cmd.args[4].value;
-                int dx = cmd.args[5].value;
-                int dy = cmd.args[6].value;
-                int dest = cmd.args[7].value;
-                unsigned char alpha;
-                eprintf("copy surface %d:(%d,%d) size(%d,%d) -> %d:(%d,%d)\n",src,sx,sy,w,h,dest,dx,dy);
-                printf("copy surface %d:(%d,%d) size(%d,%d) -> %d:(%d,%d)\n",src,sx,sy,w,h,dest,dx,dy);
-                if (src == dest) {
-                        DSurfaceMove(Ssurface(src), rect, Dsurface(WORKPDT), rect);
-                        src = WORKPDT;
-                }
-                parent.Root().BlitSurface(Ssurface(src), rect, Dsurface(dest), Rect(dx,dy));
-                if (dest == 0) screen->ReBlit(Rect(dx,dy,dx+w,dy+h));
-                cmd.clear();
-        }
-}
-
-void GrpImpl::impl_recFill(Cmd& cmd) {
-        int x = cmd.args[0].value;
-        int y = cmd.args[1].value;
-        int w = cmd.args[2].value;
-        int h = cmd.args[3].value;
-        Rect rect(x, y, x+w, y+w);
-        int pdt = cmd.args[4].value;
-        int r = cmd.args[5].value;
-        int g = cmd.args[6].value;
-        int b = cmd.args[7].value;
-
-        if (cmd.cmd4 == 2) {
-                eprintf("clear %d:(%d,%d) size (%d,%d) r %d g %d b %d\n",pdt,x,y,w,h,r,g,b);
-                DSurfaceFill(Dsurface(pdt), rect, r, g, b);
-                // if (pdt == 0) screen->ReBlit(rect);
-                cmd.cmd_type = CMD_SAVECMDGRP;
-        }
-        else if (cmd.cmd4 == 3) { // alpha €Ä€­fill
-                int a = cmd.args[8].value;
-                eprintf("alpha-clear %d:(%d,%d) size (%d,%d) r %d g %d b %d a %d\n",pdt,x,y,w,h,r,g,b,a);
-                if (a <= 0) ;
-                else if (a >= 255) DSurfaceFill(Dsurface(pdt), rect, r, g, b);
-                else {
-                        DSurfaceFill(Dsurface(WORKPDT), rect, r, g, b, a);
-                        parent.Root().BlitSurface(Dsurface(WORKPDT), rect, Dsurface(pdt), rect);
-                }
-                // if (pdt == 0) screen->ReBlit(rect);
-                cmd.clear();
-        }
-}
-
-void GrpImpl::impl_recCopy(Cmd& cmd) {
-        int sx = cmd.args[0].value;
-        int sy = cmd.args[1].value;
-        int w = cmd.args[2].value;
-        int h = cmd.args[3].value;
-        Rect rect(sx, sy, sx + w, sy + h);
-        int src = cmd.args[4].value;
-        int dx = cmd.args[5].value;
-        int dy = cmd.args[6].value;
-        int dest = cmd.args[7].value;
-
-        if (cmd.cmd4 == 2) {
-                eprintf("copy surface %d:(%d,%d) size(%d,%d) -> %d:(%d,%d)\n",src,sx,sy,w,h,dest,dx,dy);
-                parent.Root().BlitSurface(Ssurface(src), rect, Dsurface(dest), Rect(dx,dy));
-                //DSurfaceMove(Ssurface(src), Rect(sx,sy,sx+w,sy+h), Dsurface(dest), Rect(dx,dy));
-                // if (dest == 0) screen->ReBlit(Rect(dx,dy,dx+w,dy+h));
-                cmd.cmd_type = CMD_SAVECMDGRP;
-        }
-
-        else if (cmd.cmd4 == 3) { // alpha €Ä€­copy
-                unsigned char alpha;
-                if (cmd.args[8].value < 0) alpha = 0;
-                else if (cmd.args[8].value > 255) alpha = 255;
-                else alpha = cmd.args[8].value;
-                eprintf("copy surface %d:(%d,%d) size(%d,%d) -> %d:(%d,%d)\n",src,sx,sy,w,h,dest,dx,dy);
-                if (src == dest) {
-                        DSurfaceMove(Ssurface(src), rect, Dsurface(WORKPDT), rect);
-                        src = WORKPDT;
-                }
-                if (alpha != 0)
-                        parent.Root().BlitSurface(Ssurface(src), rect, &alpha, Rect(0,0,1,1), Dsurface(dest), Rect(dx,dy), 0);
-                // if (dest == 0) screen->ReBlit(Rect(dx,dy,dx+w,dy+h));
-                cmd.clear();
-        }
-}
-
-void GrpImpl::impl_recAdd(Cmd& cmd) {
-        if (cmd.cmd4 == 3) { // saturate mode €Ç alpha ÉÕ€­ copy
-                int sx = cmd.args[0].value;
-                int sy = cmd.args[1].value;
-                int w = cmd.args[2].value;
-                int h = cmd.args[3].value;
-                Rect rect(sx, sy, sx+w, sy+h);
-                int src = cmd.args[4].value;
-                int dx = cmd.args[5].value;
-                int dy = cmd.args[6].value;
-                int dest = cmd.args[7].value;
-                unsigned char alpha;
-                if (cmd.args[8].value < 0) alpha = 0;
-                else if (cmd.args[8].value > 255) alpha = 255;
-                else alpha = cmd.args[8].value;
-                eprintf("copy surface w/ saturate %d:(%d,%d) size(%d,%d) -> %d:(%d,%d)\n",src,sx,sy,w,h,dest,dx,dy);
-                if (src == dest) {
-                        DSurfaceMove(Ssurface(src), rect, Dsurface(WORKPDT), rect);
-                        src = WORKPDT;
-                }
-                if (alpha != 0) {
-                        // saturate mode : screen (picture) €ò°ì»þŪ€ËºîÀ®
-                        PicBase* screen_tmp = parent.create_leaf(Rect(0, 0, parent.Width(), parent.Height()), 0);
-                        screen_tmp->SetSurface(Ssurface(src), 0, 0, PicBase::BLIT_SATURATE);
-                        screen_tmp->SetSurfaceRect(rect);
-                        screen_tmp->Move(dx, dy);
-                        screen_tmp->SetSurfaceAlpha(&alpha, Rect(0,0,1,1));
-                        screen_tmp->SimpleBlit(Dsurface(dest));
-                        delete screen_tmp;
-                }
-                cmd.clear();
-        }
-}
-
-void GrpImpl::impl_grpPan(Cmd& cmd) {
-        if (cmd.cmd4 == 0) {
-                Rect r_from(cmd.args[0].value, cmd.args[1].value);
-                Rect r_to(cmd.args[2].value, cmd.args[3].value);
-                int src_pdt = cmd.args[4].value;
-                Rect r(cmd.args[5].value,cmd.args[6].value,cmd.args[7].value+1,cmd.args[8].value+1);
-                int tm = cmd.args[9].value;
-                fprintf(stderr,"??? cmd time %d\n",tm);
-                // anm1 = new ScnGrpMove(event, screen, parent.Root(), surface, r, Ssurface(2), r_from, r_to, tm);
-                // status = WAIT_ANM;
-        }
-}
-
-void GrpImpl::impl_snmBgScroll(Cmd& cmd) {
-        if (cmd.cmd4 == 0) { // ¥¹¥¯¥í¡Œ¥ë€¹€ë²èÁüžú²Ì(Princess Bride)
-                if (anm2 != NULL) {
-                        anm2->Abort();
-                        delete anm2;
-                        anm2 = NULL;
-                }
-                PicBase* pic; Surface* s;
-                Rect r(cmd.args[1].value, cmd.args[2].value, cmd.args[3].value+1, cmd.args[4].value+1);
-                const char* name = cmd.Str(cmd.args[5]);
-                Rect sr_start(cmd.args[6].value,cmd.args[7].value);
-                Rect sr_end(cmd.args[8].value,cmd.args[9].value);
-                int tm = cmd.args[10].value;
-                LoadSurface(name, 2); /* PDT2 €ËÆɀ߹þ€ß¡¢€È·è€áÂÇ€Á */
-
-                anm2 = new ScnGrpMove(event, screen, parent.Root(), Dsurface(1), r, Ssurface(2), sr_start, sr_end, tm);
-                cmd.cmd_type = CMD_SAVECMDGRP;
-        }
-}
-
-void GrpImpl::impl_snmPlay(Cmd& cmd) {
-        if (cmd.cmd4 == 0) {
-                // ¥«¡Œ¥É€¬Íî€Á€ë¥¢¥Ë¥á¡Œ¥·¥ç¥ó
-                int i;
-                ScnGrpAnm* new_anm = new ScnGrpAnm(event, screen, *this);
-                if (cmd.cmd3 == 0x834 || cmd.cmd3 == 0x835) {
-                        AbortAnm();
-                        anm1 = new_anm;
-                        if (cmd.cmd3 == 0x835) {
-                                status = WAIT_ANM;
-                                event.RegisterGlobalPressFunc(&Pressed, (void*)this);
-                        }
-                } else {
-                        anm2 = new_anm;
-                }
-                for (i=0; i<cmd.argc; i++) {
-                        const char* name = cmd.Str(cmd.args[i*3+1]);
-                        int tm = cmd.args[i*3+2].value;
-                        new_anm->push_back(ScnGrpAnmAtom(name,tm));
-                }
-                new_anm->CalcTotal();
-                cmd.clear();
-        }
-}
-
-void GrpImpl::impl_cgGet(Cmd& cmd) {
-        if (cmd.cmd3 == 0x5dc) // Total number of CG
-                cmd.SetSysvar(cgm_size);
-
-        if (cmd.cmd3 == 0x5dd) // Number of CG viewed
-                cmd.SetSysvar(cgm_data.size());
-
-        if (cmd.cmd3 == 0x5de) // Percentage of CG viewed
-                cmd.SetSysvar(cgm_data.size() * 100 / cgm_size);
-}
-
-void GrpImpl::impl_cgStatus(Cmd& cmd) {
-        string s = cmd.Str(cmd.args[0]);
-        if (cgm_info.find(s) == cgm_info.end()) {
-                fprintf(stderr,"cmd 01-04:05e0 : cannot find cgm-info of '%s'\n",s.c_str());
-                cmd.SetSysvar(-1);
-        }
-        else {
-                int n = cgm_info[s];
-                if (cmd.cmd3 == 1503) cmd.SetSysvar(n);
-                else {
-                        if (cgm_data.find(n) == cgm_data.end()) cmd.SetSysvar(0);
-                        else cmd.SetSysvar(1);
-                }
-        }
-}
-
-void GrpImpl::impl_objClear(Cmd& cmd) { //FIXME: may be broken (doesn't reflect what Haeleth says)
-        if (cmd.cmd1 == 1)
-                DeleteObj(cmd.args[0].value);
-        if (cmd.cmd1 == 2)
-                DeleteSubObj(cmd.args[0].value, cmd.args[1].value);
-        cmd.clear();
-}
-
-void GrpImpl::impl_createObj(Cmd& cmd) {
-        /**************:
-        0x47 : ¥ª¥Ö¥ž¥§¥¯¥ÈÆâÍÆ€ÎÀßÄê
-                        1100: G00 file
-                        1003: GAN file
-                        1100: rect
-                        1200: string
-                        1300: weather effects
-                        1400: number
-        */
-        int base_argc = 0;
-
-        if (cmd.cmd1 == 1) { // 1: group object
-                DeleteObjPic(cmd.args[0].value); // µì¥Õ¥¡¥€¥ëÌŸ€Îsurface€òºïœü
-                if (cmd.cmd2 == 71)
-                        DeleteObjPic(cmd.args[0].value); // µì¥Õ¥¡¥€¥ëÌŸ€Îsurface€òºïœü
-        }
-        else { // 2: single object in group
-                DeleteSubObjPic(cmd.args[0].value, cmd.args[1].value); // µì¥Õ¥¡¥€¥ëÌŸ€Îsurface€òºïœü
-                if (cmd.cmd2 == 71)
-                        DeleteSubObjPic(cmd.args[0].value, cmd.args[1].value); // µì¥Õ¥¡¥€¥ëÌŸ€Îsurface€òºïœü
-        }
-
-        GrpObj* g = (cmd.cmd2 == 71) ? &grpobj[cmd.args[0].value] : &bs_obj[cmd.args[0].value];
-        if (cmd.cmd1 == 2) // 2: single object in a group
-                g = &g->children_obj[cmd.args[1].value];
-
-        if (cmd.cmd1 == 2)
-                base_argc = 1;
-
-        if (cmd.cmd3 == 1000) { /* ¥Õ¥¡¥€¥ëÌŸÀßÄê */
-                g->gtype = GrpObj::FILE; //FIXME: Strange thing in the main menu; that happens with objComposite
-                string name = cmd.Str(cmd.args[base_argc + 1]);
-                if (name.find('?') != -1) {
-                        //Maybe it's for shading or something like that?
-                        printf("Warning: the part after the '?' was removed: '%s'\n", name.c_str());
-                        name.erase(name.find('?')); // '?' °Ê¹ß€Î°ÕÌ£€¬€ï€«€é€Ê€€
-                }
-                g->name = name;
-        } else if (cmd.cmd3 == 1003) { /* ¥Õ¥¡¥€¥ëÌŸÀßÄê(GANŽÞ€à) */
-                g->gtype = GrpObj::GAN;
-                if (cmd.Str(cmd.args[base_argc + 1]) == string("???"))
-                        g->name = cmd.Str(cmd.args[base_argc + 2]);
-                else
-                        g->name = cmd.Str(cmd.args[base_argc + 1]);
-                g->gan_name = cmd.Str(cmd.args[base_argc + 2]);
-
-                if (cmd.cmd4 >= 1 && cmd.args[base_argc + 3].value == 0)
-                        g->attr =  GrpObj::Attribute(g->attr | GrpObj::HIDDEN);
-                else
-                        g->attr =  GrpObj::Attribute(g->attr & ~(GrpObj::HIDDEN));
-
-                if (cmd.argc >= base_argc + 5)
-                        g->SetPos(1, cmd.args[base_argc + 4].value, -cmd.args[base_argc + 5].value);
-
-                if (g->name.find('?') != -1) {
-                        g->name.erase(g->name.find('?'));
-                        g->gan_name = cmd.Str(cmd.args[base_argc + 2]);
-                }
-        } else if (cmd.cmd3 == 1200) { // ²èÁü€òÊž»úÎó€È€·€Æ»ØÄê
-                g->gtype = GrpObj::MOJI;
-                g->print_moji = cmd.Str(cmd.args[base_argc + 1]);
-                g->attr = GrpObj::Attribute(g->attr & (~GrpObj::HIDDEN)); // Ÿï€ËÉœŒš€¬¥Ç¥Õ¥©¥ë¥È¡©
-                cmd.clear();
-        } else if (cmd.cmd3 == 1400) { // ¿ôÃÍ€ò²èÁü€È€·€ÆÉœŒš
-                g->gtype = GrpObj::DIGIT;
-                g->name = cmd.Str(cmd.args[base_argc + 1]);
-        }
-
-        CreateObj(cmd.args[0].value);
-        if (cmd.cmd1 == 2)
-                CreateSubObj(cmd.args[0].value, cmd.args[1].value);
-
-        if (cmd.cmd3 == 1000 || cmd.cmd3 == 1003 || cmd.cmd3 == 1200 || cmd.cmd3 == 1400) {
-                // FILE, GAN, MOJI, DIGIT €Ê€é€ÐºÂÉžÅù€ÎÀßÄê€ò¹Ô€Š
-                if (cmd.cmd4 >= 1) {
-                        if (cmd.args[2+base_argc].value == 0) {
-                                g->attr = GrpObj::Attribute(g->attr | GrpObj::HIDDEN);
-                        } else {
-                                g->attr = GrpObj::Attribute(g->attr & (~GrpObj::HIDDEN));
-                        }
-                        SetObjChanged(cmd.args[0].value);
-                }
-                if (cmd.cmd4 >= 2) { // ºÂÉžÅù€âÀßÄê
-                        g->SetPos(0, cmd.args[3+base_argc].value, cmd.args[4+base_argc].value);
-                }
-                if ( (cmd.cmd3 == 1000 || cmd.cmd3 == 1003) && cmd.cmd4 >= 3) { // pattern ÈÖ¹æ€âÀßÄê
-                        g->SetSurfaceNum(cmd.args[5+base_argc].value);
-                        base_argc++; // 1000 (FILE) / 1003 (GAN) €ÎŸì¹ç€Î€ß€³€Î¥ª¥×¥·¥ç¥ó€Ïžºß€¹€ë
-                }
-                cmd.clear();
-        } else {
-                fprintf(stderr,"CreateObj : cmd.cmd3 = %04x ; not supported!\n",cmd.cmd3);
-        }
-}
-
-void GrpImpl::impl_gan(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg);
-
-        if (cmd.cmd3 == 3) { // ganIsPlaying
-                if (g->anm == NULL || g->anm->IsEnd())
-                        cmd.SetSysvar(0);
-                else
-                        cmd.SetSysvar(1);
-        }
-        else if (cmd.cmd3 == 1000) { // ganStop
-                if (g->anm == NULL || g->anm->IsEnd())
-                        g->SetSurfaceNum(cmd.args[1].value);
-                else {
-                        g->anm->Abort();
-                        g->SetSurfaceNum(cmd.args[1].value);
-                }
-                SetObjChanged(cmd.args[0].value);
-                cmd.clear();
-        }
-        else if (cmd.cmd3 == 2003) { // objPlay
-                g->CreateGanSpecial(event, 0, cmd.args[1].value);
-                // g.attr = GrpObj::Attribute(g.attr & (~GrpObj::HIDDEN));
-                SetObjChanged(cmd.args[0].value);
-                cmd.clear();
-        }
-        else if (cmd.cmd3 == 3001 || cmd.cmd3 == 3003 || cmd.cmd3 == 3005 ||
-                         cmd.cmd3 == 1001 || cmd.cmd3 == 1003 || cmd.cmd3 == 1005) { // ganPlay*
-                g->CreateGan(event, cmd.args[1].value);
-                // g.attr = GrpObj::Attribute(g.attr & (~GrpObj::HIDDEN));
-                SetObjChanged(cmd.args[0].value);
-                cmd.clear();
-        }
-}
-
-void GrpImpl::impl_objSetPos(Cmd& cmd) {
-        //obj or objBg
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        int index, x, y;
-        if (cmd.cmd3 == 1006 || cmd.cmd3 == 2006) { //objAdjust
-                index = cmd.args[1+base_arg].value + 1;
-                x = cmd.args[2+base_arg].value;
-                y = cmd.args[3+base_arg].value;
-        }
-        else {
-                index = 0;
-                if (cmd.cmd3 == 1000) {
-                        x = cmd.args[1+base_arg].value;
-                        y = cmd.args[2+base_arg].value;
-                }
-                else {
-                        g->GetPos(index, x, y);
-                        if (cmd.cmd3 == 1001)
-                                x = cmd.args[1+base_arg].value;
-                        else
-                                y = cmd.args[1+base_arg].value;
-                }
-        }
-
-        g->SetPos(index, x, y);
-        cmd.clear();
-}
-
-void GrpImpl::impl_objAlpha(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        g->SetAlpha(cmd.args[base_arg + 1].value);
-        cmd.clear();
-}
-
-void GrpImpl::impl_objShow(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        if (cmd.args[base_arg + 1].value)
-                g->attr = GrpObj::Attribute(g->attr & (~GrpObj::HIDDEN));
-        else
-                g->attr = GrpObj::Attribute(g->attr | GrpObj::HIDDEN);
-
-        g->attr = GrpObj::Attribute(g->attr | GrpObj::UPDATE_VISIBLE);
-                // ¥°¥ë¡Œ¥×ñ°Ì€ÇŒ¡€Î RefreshObj €ÇÉœŒš¡ŠŸÃµî
-        if (cmd.cmd2 == 0x51) //not Bg
-                SetObjChanged(cmd.args[0].value);
-        cmd.clear();
-}
-
-void GrpImpl::impl_objColour(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        g->print_r = cmd.args[base_arg+1].value;
-        g->print_g = cmd.args[base_arg+2].value;
-        g->print_b = cmd.args[base_arg+3].value;
-        g->SetUpdate();
-        cmd.clear();
-}
-
-void GrpImpl::impl_objComposite(Cmd& cmd) {//FIXME
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        if (cmd.args[base_arg + 1].value == 1) {
-                g->attr = GrpObj::Attribute(g->attr | GrpObj::SATURATE);
-                cmd.clear();
-        } else if (cmd.args[base_arg + 1].value == 0) {
-                g->attr = GrpObj::Attribute(g->attr & (~GrpObj::SATURATE));
-                cmd.clear();
-        }
-        g->SetUpdate();
-}
-
-void GrpImpl::impl_objSetText(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        g->print_moji = cmd.Str(cmd.args[base_arg + 1]);
-        g->SetUpdate();
-        cmd.clear();
-}
-
-void GrpImpl::impl_objTextOpts(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        // ²èÁü€òÊž»úÎó€È€·€ÆÀßÄꡧʞ»ú€ÎÂ瀭€µ€Ê€É
-        g->print_size = cmd.args[base_arg + 1].value;
-        /* Á°·Ê¿§€òÆÀ€ë */
-        int cr, cg, cb;
-        char key[17];
-        sprintf(key, "#COLOR_TABLE.%03d", cmd.args[base_arg + 5].value);
-        if (config->GetParam(key, 3, &cr, &cg, &cb)) { // color not found
-                cr = cg = cb = 0;
-        }
-        g->print_r = cr;
-        g->print_g = cg;
-        g->print_b = cb;
-        g->SetUpdate();
-        cmd.clear();
-}
-
-void GrpImpl::impl_objOrder(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        int order = cmd.args[base_arg + 1].value;
-        g->order = order;
-        ZMoveObj(cmd.args[0].value);
-        cmd.clear();
-}
-
-void GrpImpl::impl_objDispArea(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        // ¥ª¥Ö¥ž¥§¥¯¥È€Î€É€ÎÉôʬ€ò²èÌÌ€ËÉœŒš€¹€ë€«¡Ê¥¯¥ê¥Ã¥×Îΰè¡Ë€ÎÀßÄê
-        int rx, ry, w, h;
-        if (cmd.args.size() == base_arg + 5) {
-                int rx = cmd.args[base_arg + 1].value;
-                int ry = cmd.args[base_arg + 2].value;
-                int w = cmd.args[base_arg + 3].value;
-                int h = cmd.args[base_arg + 4].value;
-                if (cmd.cmd3 == 1005) {
-                        w -= rx;
-                        h -= ry;
-                }
-        }
-        else {
-                rx = ry = 0;
-                w = screen->Width();
-                h = screen->Height();
-        }
-        g->SetClipArea(rx, ry, w, h); //TODO: case when cmd.args.size() == 1
-        cmd.clear();
-}
-
-void GrpImpl::impl_objSetDigits(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        g->dig_number = cmd.args[base_arg + 1].value;
-        g->SetUpdate();
-        cmd.clear();
-}
-
-void GrpImpl::impl_objNumOpts(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        g->dig_digit = cmd.args[base_arg + 1].value;
-        int attr = g->attr;
-        attr &= ~(GrpObj::DIG_ZERO | GrpObj::DIG_SIGN | GrpObj::DIG_PACK);
-        if (cmd.args[base_arg + 2].value) attr |= GrpObj::DIG_ZERO;
-        if (cmd.args[base_arg + 3].value) attr |= GrpObj::DIG_SIGN;
-        if (cmd.args[base_arg + 4].value) attr |= GrpObj::DIG_PACK;
-        g->attr = GrpObj::Attribute(attr);
-        g->SetUpdate();
-        cmd.clear();
-}
-
-void GrpImpl::impl_objPattNo(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        g->SetSurfaceNum(cmd.args[base_arg + 1].value);
-        cmd.clear();
-}
-
-void GrpImpl::impl_objScale(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        int zoom = (cmd.args[base_arg + 1].value + cmd.args[base_arg + 2].value)/2; //FIXME: eurk
-        zoom = zoom*256/100;
-        g->SetZoomRotate(zoom, -1);
-        cmd.clear();
-}
-
-void GrpImpl::impl_objRotate(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, (cmd.cmd2 == 0x51));
-
-        int angle = cmd.args[base_arg + 1].value;
-        angle /= 10;
-        if (angle < 0) {
-                angle %= 360;
-                angle += 360;
-        }
-        angle %= 360;
-        g->SetZoomRotate(-1, angle);
-        cmd.clear();
-}
-
-void GrpImpl::impl_objPosDims(Cmd& cmd) {
-        int base_arg = 0;
-        GrpObj* g = GetGraphicObjVarMode(cmd, base_arg, true);
-
-        VarInfo arg1 = cmd.args[base_arg + 1];
-        VarInfo arg2 = cmd.args[base_arg + 2];
-
-        int val1, val2;
-
-        if (cmd.cmd3 == 1000)
-                g->GetPos(0, val1, val2);
-        else if (cmd.cmd3 == 1100)
-                g->GetSrcGeom(val1, val2);
-
-        cmd.SetFlagvar(arg1, val1);
-        cmd.SetFlagvar(arg2, val2);
-}
-
-void GrpImpl::impl_refresh(Cmd& cmd) {
-        // ËÜÍè€Ï grpstack clear €é€·€€
-        RefreshObj();
-        // Princess Bride €ÎÃæÅÓ Staff roll
-        // €³€Î¥¿¥€¥ß¥ó¥°€ÇÉÁ²è€¹€ë€Î€¬ÅԹ瀬€€€€€Î€Ç¡¢
-        //¥·¥Ê¥ê¥ª¥ë¡Œ¥×€òÈŽ€±€ÆÉÁ²è€òµ¯Æ°
-        cmd.cmd_type = CMD_WAITFRAMEUPDATE;
-}
-
-void GrpImpl::impl_bgmLoop(Cmd& cmd) {
-        if (cmd.cmd4 == 0 || cmd.cmd4 == 2) {
-                int count = 8000;
-                if (cmd.cmd3 == 2)
-                        count = 0; //bgmPlay, play once
-                music->PlayCDROM((char*)cmd.Str(cmd.args[0]), count);
-                cmd.cmd_type = CMD_SAVECMD_ONCE;
-        }
-}
-
-void GrpImpl::impl_bgmStop(Cmd& cmd) {
-        if (cmd.cmd4 == 0) {
-                if (cmd.cmd3 == 5)
-                        music->StopCDROM(0);
-                else if (cmd.cmd3 == 105)
-                        music->StopCDROM(cmd.args[0].value);
-                cmd.cmd_type = CMD_SAVECMD_ONCE;
-        }
-}
-
-void GrpImpl::impl_playWav(Cmd& cmd) {
-        if (cmd.cmd3 == 2) {
-                music->PlaySE(cmd.Str(cmd.args[0]), 1); //loop
-                cmd.cmd_type = CMD_SAVECMD_ONCE;
-        }
-        else {
-                music->PlaySE(cmd.Str(cmd.args[0]));
-                cmd.clear();
-        }
-        if (cmd.cmd3 == 1)
-                status = WAIT_SE;
-}
-
-void GrpImpl::impl_playSE(Cmd& cmd) {
-        music->PlaySE(cmd.args[0].value);
-        cmd.clear();
-}
-
-void GrpImpl::impl_stopWav(Cmd& cmd) {
-        if (cmd.cmd3 == 5)
-                music->StopSE();
-        else if (cmd.cmd3 == 105)
-                music->StopSE(cmd.args[0].value);
-
-        cmd.cmd_type = CMD_SAVECMD_ONCE;
-}
-
-void GrpImpl::impl_SetVolMod(Cmd& cmd) {
-        music->volmod[cmd.cmd3-0x8b6] = cmd.args[0].value;
-        config->SetParam("#VOLMOD", 4, music->volmod[0], music->volmod[1], music->volmod[2], music->volmod[3]);
-        cmd.clear();
-}
-
-void GrpImpl::impl_GetVolMod(Cmd& cmd) {
-        cmd.SetSysvar(music->volmod[cmd.cmd3-0x91a]);
-}
-
-void GrpImpl::impl_koePlay(Cmd& cmd) {
-        eprintf("play koe %d",cmd.args[0].value);
-        if (cmd.cmd4 == 1) {
-                eprintf(", para? %d",cmd.args[1].value);
-        }
-        eprintf("\n");
-        char buf[1024]; sprintf(buf, "%d",cmd.args[0].value);
-        if ( !(skip_mode & SKIP_TEXT)) music->PlayKoe(buf);
-        cmd.clear();
-}
-
-/*It may be useful... or not.
-void GrpImpl::impl_objSwap(Cmd& cmd) {
-        if (cmd.cmd1 == 1 && cmd.args.size() == 2) {
-                SwapObj(cmd.args[0].value, cmd.args[1].value);
-        }
-        cmd.clear();
-}*/
-
-void GrpImpl::impl_movPlay(Cmd& cmd) {
-        if ( cmd.cmd4 == 0) {
-                const char* str = cmd.Str(cmd.args[0]);
-                int x = cmd.args[1].value;
-                int y = cmd.args[2].value;
-                int x2 = cmd.args[3].value;
-                int y2 = cmd.args[4].value;
-                eprintf("play movie ; name %s pos %d,%d - %d,%d\n",str,x,y,x2,y2);
-                music->PlayMovie(str, x, y, x2, y2,1);
-                status = WAIT_MOVIE;
-                event.RegisterGlobalPressFunc(&Pressed, (void*)this);
-                cmd.clear();
-        }
-}
-
-void GrpImpl::Exec(Cmd& cmd) {
+void Grp::Exec(Cmd& cmd) {
         if (cmd.cmd_type == CMD_TEXTEND) {
                 music->StopKoe(500); // ¥Æ¥­¥¹¥ÈœªÎ»€ÇÀŒ€ò»ß€á€ë
@@ -2556 +1580 @@
 }
 
-
-/********************************************************
-**
-**      class Grp
-*/
-
-Grp::Grp(Event::Container& _event, PicContainer& _parent, const Flags& f, set<int>& _cgm) {
-        pimpl = new GrpImpl(_event, _parent, f, _cgm);
-}
-
-Grp::~Grp() {
-        delete pimpl;
-}
-
-bool Grp::Wait(unsigned int current_time, Cmd& cmd) {
-        return pimpl->Wait(current_time, cmd);
-}
-
-void Grp::Exec(Cmd& cmd) {
-        pimpl->Exec(cmd);
-}
-
-void Grp::SetSkipMode(SkipMode mode) {
-        pimpl->SetSkipMode(mode);
-}
-
-void Grp::InitSel(void) {
-        pimpl->InitSel();
-}
-
-void Grp::Save(std::string& str) {
-        pimpl->Save(str);
-}
-
-void Grp::Load(const char* str) {
-        pimpl->Load(str);
-}
-void Grp::SaveSys(std::string& str) {
-        pimpl->SaveSys(str);
-}
-
-void Grp::LoadSys(const char* str) {
-        pimpl->LoadSys(str);
-}

scn2k/scn2k_text.cc

@@ -10 +10 @@
                         Flush €¹€ë€È¥Ð¥Ã¥Õ¥¡Æâ€ÎÊž»ú€ò€¹€Ù€ÆÉÁ²è€¹€ë
                         Wait €¹€ë€ÈÁŽÉÁ²èžå¡¢¥¯¥ê¥Ã¥¯€µ€ì€ë€Þ€Ç¥«¡Œ¥œ¥ë€òÉœŒš€¹€ë€Þ€ÇÂÔ€Ä
-                TextImpl Š€ÎŸõÂրȀ·€Æ€Ï Wait €Î€ß€ò»ý€Ä (PREPARE€ËÌá€ë€Î€òÂÔ€Ä)
+                Text Š€ÎŸõÂրȀ·€Æ€Ï Wait €Î€ß€ò»ý€Ä (PREPARE€ËÌá€ë€Î€òÂÔ€Ä)
                 €¿€À€·¡¢Skip €Îž¢Íø€Ï€É€Ã€Á€¬€â€Ä¡©¡ÊžœŸõ€Ï¡©¡Ë
 
@@ -56 +56 @@
  */
 
-#include "window/event.h"
-#include "window/picture.h"
-#include "window/widget.h"
+#include "scn2k_text.h"
+
 #include "system/file.h"
-#include "system/system_config.h"
 #include "scn2k.h"
 
@@ -66 +64 @@
 using namespace std;
 
-// kanji conv : ¥Ç¥Ð¥Ã¥°ÉœŒšÍÑ
-void kconv(const unsigned char* src, unsigned char* dest);
-void kconv_rev(const unsigned char* src, unsigned char* dest);
-string kconv(const string& s);
-string kconv_rev(const string& s);
-// render.cc
-void DSurfaceFillA(Surface* src, const Rect& rect, int r, int g, int b, int a); // ¥Æ¥­¥¹¥È¥Š¥£¥ó¥É¥ŠÇØ·Ê€ÎÀßÄê
-void DSurfaceMove(Surface* src_o, const Rect& srcrect, Surface* dst_o, const Rect& dstrect); // ¥³¥Ô¡Œ
+#include "window/render.h"
 
 /**************************************************************::
 **
-**      TextImpl(interface)
+**      Text(implementation)
 */
-struct TimerAtom {
-        int from;
-        int to;
-        unsigned int start_time;
-        unsigned int total_time;
-};
-
-struct TextWindow {
-/* @@@ : SetWindowColor €Ç€Î surface ºÆÀßÄê€ËÃí°Õ */
-        WidText* wid;
-        bool name_visible;
-        WidLabel* name;
-        PicContainer* name_container;
-        PicBase* face;
-        PicBase* face_pics[8];
-        TextWindow(PicContainer& parent, Event::Container& event, int window_no, void* callback);
-        ~TextWindow() {
-                if (name_container != NULL) {
-                        delete name_container;
-                        name_container = NULL;
-                }
-                int i;
-                for (i=0; i<8; i++) {
-                        if (face_pics[i] != NULL) {
-                                delete face_pics[i];
-                                face_pics[i] = NULL;
-                        }
-                }
-                if (wid != NULL) {
-                        delete wid;
-                        wid = NULL;
-                }
-        }
-        Rect WakuSize(PicContainer& pic, int waku_no);
-        void MakeWaku(PicContainer& pic, Event::Container& event, int waku_no,int window_no, bool* use_btn, void* callback);
-        void show(void) {
-                wid->show();
-                if (name_container && name_visible) name_container->show();
-                if (face) face->show();
-        }
-        void hide(void) {
-                wid->hide();
-                if (name_container) name_container->hide();
-                if (face) face->hide();
-        }
-        void ShowFace(const char* path) {
-                if (!face) return;
-                face->SetSurface( path, 0,0);
-        }
-        void ResetFace(void) {
-                if (!face) return;
-                face->SetSurface( (Surface*)0, 0,0);
-        }
-        void StartText(const TextStream& _stream) {
-                wid->Clear();
-                wid->stream = _stream;
-                if (name_container) {
-                        char namestr[1024];
-                        namestr[0] = 0;
-                        wid->stream.RemoveName(namestr, 1024);
-                        if (namestr[0] == 0) {
-                                name_container->hide();
-                        } else {
-                                if (name) {
-                                        name_container->show_all();
-                                        name->SetText(namestr);
-                                }
-                        }
-                }
-                wid->Start();
-        }
-        void SetName(const char* n) {
-                if (name_container && name) {
-                        if (n[0]) {
-                                name_container->show();
-                                name->SetText(n);
-                                name_visible = true;
-                        } else {
-                                name_container->hide();
-                                name_visible = false;
-                        }
-                }
-        }
-};
-
-class TextImpl : public CommandHandler {
-        public:
-                TextImpl(Event::Container& _event, PicContainer& _parent, vector<BacklogItem>& parent_backlog, BacklogItem& parent_backlog_item);
-                ~TextImpl();
-                void InitWindow(void);
-                void SetWindowColor(int r, int g, int b, int a, bool is_transparent);
-                void SetTextSpeed(int new_speed);
-                void SetTextWait(int new_wait);
-                void CreateSelect(Cmd& cmd);
-                void Exec(Cmd& cmd);
-                bool Wait(unsigned int current_time, Cmd& cmd);
-                void hide(void);
-                void show(void) { show(text_window_number); }
-                void show(int num);
-                void DrawBacklog(BacklogItem& item, Cmd& cmd);
-                void Save(std::string& str, bool select_save);
-                void Load(const char* str);
-                void SetSkipMode(SkipMode _mode);
-                void CreateSelBG(void);
-
-                void AddText(const char* str);
-
-                static void PressFuncSkip(void* pointer, WidButton* from);
-                static void PressFuncLoad(void* pointer, WidButton* from);
-                static void PressFuncSave(void* pointer, WidButton* from);
-                static void PressFuncBacklog(void* pointer, WidButton* from);
-                static void PressFuncBacklogFwd(void* pointer, WidButton* from);
-
-        private:
-                static void PressFuncButton(void* pointer, WidButton* from);
-                static bool PressFunc(int x, int y, void* pointer);
-                void SetCursor(int num);
-
-        public:
-                TextWindow* text;
-                typedef enum {NORMAL=0, WAIT_TEXT=1, WAIT=2,
-                        WAIT_CLICK=3, WAIT_ABORT=4, WAIT_CLICK_MOUSEPOS = 5,
-                        WAIT_CLICK_MOUSEPOSEND_L = 6, WAIT_CLICK_MOUSEPOSEND_R = 7,
-                        WAIT_SELECT_INBOX = 10, WAIT_SELECT_OUTBOX=11, WAIT_SELECT_VALUE = 12,
-                        WAIT_EXTRN_MASK = 64, SAVEMASK = 128, LOADMASK = 256, SKIPMASK = 512,
-                        CLEARSCR_MASK = 1024, STATSAVE_MASK = 2048, CLEARSCR_WAIT_MASK=(1<<12),
-                        SKIPEND_MASK = (1<<13), BACKLOG_MASK=(1<<14), BACKLOG_MASK_FWD=(1<<15),
-                        BACKLOG_MASK_KOE=(1<<16), BACKLOG_WAIT_MASK=(1<<17),
-                        ALLMASK = (CLEARSCR_MASK | WAIT_EXTRN_MASK | SAVEMASK |
-                                                LOADMASK | SKIPMASK | BACKLOG_MASK | BACKLOG_MASK_FWD |
-                                                BACKLOG_MASK_KOE | BACKLOG_WAIT_MASK | STATSAVE_MASK |
-                                                CLEARSCR_WAIT_MASK | SKIPEND_MASK)
-                } Status;
-                Status status, status_saved, status_mask;
-
-        private:
-                std::string ruby_text;
-                bool ruby_text_flag;
-                unsigned int wait_time;
-                unsigned int old_time;
-                unsigned int base_time;
-                int text_window_number;
-                bool text_parsing;
-                TextStream text_stream;
-                SkipMode skip_mode;
-                int save_selectcount;
-
-                std::map<int, TimerAtom> timer_var;
-                std::vector<WidTextButton*> selects;
-                std::vector<int> sel_backlog_pos;
-                string replace_name[26];
-                string replace_name2[26];
-                PicContainer* sel_widget;
-                PicWidget* backlog_widget;
-
-                vector<BacklogItem>& backlog;
-                BacklogItem& backlog_item;
-                BacklogItem cur_backlog_item;
-                BacklogItem drawn_backlog_item;
-
-                TextWindow* widgets[32];
-                WidTimeCursor* kcursor;
-                Surface* sel_bg1;
-                Surface* sel_bg2;
-                Rect sel_bg_rect;
-
-                VarInfo wait_savedvar[2];
-
-                AyuSysConfig *config;
-
-                Event::Container& event;
-                PicContainer& parent;
-
-                //Opcode handling
-                void impl_txtClear(Cmd& cmd);
-                void impl_logKoe(Cmd& cmd);
-                void impl_pause(Cmd& cmd);
-                void impl_br(Cmd& cmd);
-                void impl_FaceOpen(Cmd& cmd);
-                void impl_FaceClear(Cmd& cmd);
-};
-
-/**************************************************************::
-**
-**      TextImpl(implementation)
-*/
-TextImpl::TextImpl(Event::Container& _event, PicContainer& _parent, vector<BacklogItem>& parent_backlog, BacklogItem& parent_backlog_item) :
-        text(0),status(TextImpl::NORMAL), status_saved(TextImpl::NORMAL), status_mask(TextImpl::NORMAL), ruby_text_flag(false),
+Text::Text(Event::Container& _event, PicContainer& _parent) :
+        text(0),status(Text::NORMAL), status_saved(Text::NORMAL), status_mask(Text::NORMAL), ruby_text_flag(false),
         old_time(0), base_time(0), text_window_number(0), text_parsing(false), skip_mode(SKIP_NO), save_selectcount(0), sel_widget(0),
-        backlog_widget(0), backlog(parent_backlog), backlog_item(parent_backlog_item), parent(_parent), event(_event),
+        backlog_widget(0), parent(_parent), event(_event),
         kcursor(0), sel_bg1(0), sel_bg2(0), sel_bg_rect(0,0,0,0) {
         config = AyuSysConfig::GetInstance();
@@ -278 +83 @@
         event.RegisterGlobalPressFunc(&PressFunc, (void*)this);
 
-        RegisterCommand(1, 33, 73, "grpOpenBg", (CmdImpl) &TextImpl::impl_txtClear);
-        RegisterCommand(1, 33, 75, "grpMulti", (CmdImpl) &TextImpl::impl_txtClear);
-        RegisterCommand(1, 33, 76, "grpOpen", (CmdImpl) &TextImpl::impl_txtClear);
-
-        RegisterCommand(1, 23, 0, "koePlay", (CmdImpl) &TextImpl::impl_logKoe);
-        RegisterCommand(1, 23, 8, "koeDoPlay", (CmdImpl) &TextImpl::impl_logKoe);
-
-        RegisterCommand(0, 3, 151, "msgHide", (CmdImpl) &TextImpl::impl_txtClear);
-        RegisterCommand(0, 3, 17, "pause", (CmdImpl) &TextImpl::impl_pause);
-        RegisterCommand(0, 3, 3, "par", (CmdImpl) &TextImpl::impl_br); //FIXME
-        RegisterCommand(0, 3, 201, "br", (CmdImpl) &TextImpl::impl_br);
-        RegisterCommand(0, 3, 1000, "FaceOpen", (CmdImpl) &TextImpl::impl_FaceOpen);
-        RegisterCommand(0, 3, 1001, "FaceClear", (CmdImpl) &TextImpl::impl_FaceClear);
-}
-
-TextImpl::~TextImpl() {
-        if (sel_widget) delete sel_widget;
+        RegisterCommand(1, 33, 73, "grpOpenBg", (CmdImpl) &Text::impl_txtClear);
+        RegisterCommand(1, 33, 75, "grpMulti", (CmdImpl) &Text::impl_txtClear);
+        RegisterCommand(1, 33, 76, "grpOpen", (CmdImpl) &Text::impl_txtClear);
+
+        RegisterCommand(1, 23, 0, "koePlay", (CmdImpl) &Text::impl_logKoe);
+        RegisterCommand(1, 23, 8, "koeDoPlay", (CmdImpl) &Text::impl_logKoe);
+
+        RegisterCommand(0, 3, 151, "msgHide", (CmdImpl) &Text::impl_txtClear);
+        RegisterCommand(0, 3, 17, "pause", (CmdImpl) &Text::impl_pause);
+        RegisterCommand(0, 3, 3, "par", (CmdImpl) &Text::impl_br); //FIXME
+        RegisterCommand(0, 3, 201, "br", (CmdImpl) &Text::impl_br);
+        RegisterCommand(0, 3, 1000, "FaceOpen", (CmdImpl) &Text::impl_FaceOpen);
+        RegisterCommand(0, 3, 1001, "FaceClear", (CmdImpl) &Text::impl_FaceClear);
+        RegisterCommand(0, 3, 120, "__doruby", (CmdImpl) &Text::impl_doRuby); //FIXME: I don't know how it works
+        RegisterCommand(0, 3, 102, "TextWindow", (CmdImpl) &Text::impl_TextWindow);
+        RegisterCommand(0, 3, 103, "FastText", NULL);//FIXME: (CmdImpl) &Text::impl_FastText);
+        RegisterCommand(0, 3, 104, "NormalText", NULL);
+        RegisterCommand(0, 3, 152, "msgClear", (CmdImpl) &Text::impl_msgClear);
+
+        RegisterCommand(0, 2, 1, "select", (CmdImpl) &Text::impl_createSelect);
+        RegisterCommand(0, 2, 3, "select2?", (CmdImpl) &Text::impl_createSelect); //What difference with select?
+
+        RegisterCommand(0, 4, 1000, "ShowBackground", (CmdImpl) &Text::impl_ShowBackground);
+        RegisterCommand(0, 4, 1100, "SetSkipMode", (CmdImpl) &Text::impl_SetSkipMode);
+        RegisterCommand(1, 4, 100, "wait", (CmdImpl) &Text::impl_Wait);
+        RegisterCommand(1, 4, 111, "time", (CmdImpl) &Text::impl_Wait);
+        RegisterCommand(1, 4, 121, "timeEx", (CmdImpl) &Text::impl_Wait);
+}
+
+Text::~Text() {
+        if (sel_widget != NULL)
+                delete sel_widget;
         int i;
         for (i=0; i<32; i++) {
-                if (widgets[i]) delete widgets[i];
-        }
-        if (backlog_widget) delete backlog_widget;
-        if (sel_bg1) parent.Root().DeleteSurface(sel_bg1);
-        if (sel_bg2) parent.Root().DeleteSurface(sel_bg2);
+                if (widgets[i] != NULL)
+                        delete widgets[i];
+        }
+        if (backlog_widget != NULL)
+                delete backlog_widget;
+        if (sel_bg1 != NULL)
+                parent.Root().DeleteSurface(sel_bg1);
+        if (sel_bg2 != NULL)
+                parent.Root().DeleteSurface(sel_bg2);
         event.DeleteGlobalPressFunc(&PressFunc, (void*)this);
 }
 
-bool TextImpl::PressFunc(int x, int y, void* pointer) {
-        TextImpl* t = (TextImpl*)pointer;
+bool Text::PressFunc(int x, int y, void* pointer) {
+        Text* t = (Text*)pointer;
         if (t->status == WAIT_CLICK) {
                 t->status = WAIT_ABORT;
@@ -329 +153 @@
         return true; // event not deleted
 }
-void TextImpl::PressFuncButton(void* pointer, WidButton* from) {
-        TextImpl* t = (TextImpl*)pointer;
+
+void Text::PressFuncButton(void* pointer, WidButton* from) {
+        Text* t = (Text*)pointer;
         if (t->status != WAIT_SELECT_INBOX && t->status != WAIT_SELECT_OUTBOX) return;
         vector<WidTextButton*>::iterator it;
@@ -338 +163 @@
         }
         if (it == t->selects.end()) {
-                fprintf(stderr,"TextImpl::PressFuncButton: Cannot find select widget\n");
+                fprintf(stderr,"Text::PressFuncButton: Cannot find select widget\n");
                 return;
         }
         t->status = Status(WAIT_SELECT_VALUE + sel);
-        return;
-}
-
-void TextImpl::SetSkipMode(SkipMode _mode) {
+}
+
+void Text::SetSkipMode(SkipMode _mode) {
         if ( (skip_mode & SKIP_IN_MENU) && (_mode & SKIP_IN_MENU) == 0) {
                 if (status_mask & BACKLOG_WAIT_MASK) { // backlog mode €«€éÉüµ¢
@@ -376 +200 @@
 }
 
-/* hash_map €¬Í߀·€€¡Ä¡Ä*/
-#include <map>
-#include <list>
-struct SaveFaceHash { // ¥Ð¥Ã¥¯¥í¥°¥»¡Œ¥Ö»þ€ÎŽé²èÁüŽÉÍý€ò¹Ô€Š
-        map<string, int> facetonum;
-        typedef pair<string,int> Node;
-        typedef list<Node> List;
-        List container;
-        int id_max;
-        static int size_max;
-        SaveFaceHash() : id_max(0) {
-        }
-        void NewNode(string face, int face_id) {
-                facetonum[face] = face_id;
-                container.push_front(Node(face, face_id));
-                if (container.size() > size_max) {
-                        Node remove = container.back();
-                        container.pop_back();
-                        facetonum.erase(remove.first);
-                }
-        }
-        int Add(string face) {
-                int id; int ret = -1;
-                int i; List::iterator it;
-                if (face.empty()) return -1;
-                if (facetonum.find(face) == facetonum.end()) {
-                        id = ++id_max;
-                        NewNode(face, id);
-                        ret = -1;
-                } else {
-                        id = facetonum[face];
-                        for (i=0, it=container.begin(); it != container.end(); i++, it++) {
-                                if (it->second == id) {
-                                        ret = i;
-                                        Node n = *it;
-                                        container.erase(it);
-                                        container.push_front(n);
-                                        break;
-                                }
-                        }
-                }
-                return ret;
-        }
-        string Get(int num) {
-                if (num < 0) return "";
-                List::iterator it = container.begin();
-                for (; it != container.end(); it++) {
-                        if (num == 0) return it->first;
-                        num--;
-                }
-                return "";
-        }
-};
-
-int SaveFaceHash::size_max = 20;
-
-void TextImpl::Save(string& str, bool rollback_save) {
+void Text::InitWindow(void) {
+        int i;
+        int w;
+        std::string str;
+
+        for (w=0; w<32; w++) {
+                widgets[w] = new TextWindow(parent, event, w, (void*)this);
+                if (widgets[w]->wid == 0) {
+                        delete widgets[w];
+                        widgets[w] = NULL;
+                }
+        }
+        SetCursor(0);
+        for (i=0; i<26; i++) {
+                char buf[1024];
+                sprintf(buf, "#NAME.%c", i+'A');
+                const char* s = config->GetParaStr(buf);
+                if (s != NULL) replace_name[i] = s;
+        }
+        // replace_name2 : œéŽüÀßÄê
+        // œí¡¢œ©Àž¡¢œí (CLANNAD)
+        char name_nagisa[3] = {'\x8f', '\x8d', '\0'};
+        char name_akio[5] = {'\x8f', '\x48', '\x90', '\xb6', '\0'};
+        replace_name2[0] = name_nagisa;
+        replace_name2[1] = name_akio;
+        replace_name2[2] = name_nagisa;
+        text = NULL;
+        /* ¥Æ¥­¥¹¥È®ÅÙ€ÎÀßÄê */
+        int speed, mod, wait, auto_mod;
+        config->GetParam("#INIT_MESSAGE_SPEED", 1, &speed);
+        config->GetParam("#INIT_MESSAGE_SPEED_MOD", 1, &mod);
+        config->GetParam("#MESSAGE_KEY_WAIT_USE", 1, &auto_mod);
+        config->GetParam("#MESSAGE_KEY_WAIT_TIME", 1, &wait);
+        if (mod) speed = -1;
+        if (!auto_mod) wait = -1;
+        SetTextSpeed(speed);
+        SetTextWait(wait);
+}
+
+void Text::Save(string& str, bool rollback_save) {
         char buf[1024];
         str = "\n";
-        str += "[TextImpl Window]\n";
-        sprintf(buf, "TextImplWindow=%d\n",text_window_number);
+        str += "[Text Window]\n";
+        sprintf(buf, "TextWindow=%d\n",text_window_number);
         str += buf;
         if (rollback_save) {
@@ -459 +266 @@
                 SaveFaceHash face_log;
                 do {
-                int cur_scn = -1; int cur_pos = -1;
-                sprintf(buf, "Backlog.%d=",++cnt);
-                str += buf;
-                for (; it != backlog.end(); it++) {
-                        buf[0] = 0; int buflen = 0;
-                        if (it->scn == -1) continue;
-                        if (it->pos == -1 && it->scn != 0) continue;
-
-                        buf[buflen++] = ';';
-                        if (it->scn == 0 && it->pos == -1) {
-                                buflen += snprintf(buf+buflen, 1000-buflen, "\"%s\".", it->text.Save().c_str());
-                        } else {
-                                if (cur_scn != -1 && cur_scn != it->scn) break; // scn change
-                                if (cur_pos != -1 && cur_pos/5000 != it->pos/5000) break; // pos exceeded
-                                if (!it->text.container.empty()) {
-                                        buflen += snprintf(buf+buflen, 1000-buflen, "\"%s\"", it->text.Save().c_str());
+                        int cur_scn = -1; int cur_pos = -1;
+                        sprintf(buf, "Backlog.%d=",++cnt);
+                        str += buf;
+                        for (; it != backlog.end(); it++) {
+                                buf[0] = 0;
+                                int buflen = 0;
+                                if (it->scn == -1)
+                                        continue;
+                                if (it->pos == -1 && it->scn != 0)
+                                        continue;
+
+                                buf[buflen++] = ';';
+                                if (it->scn == 0 && it->pos == -1)
+                                        buflen += snprintf(buf+buflen, 1000-buflen, "\"%s\".", it->text.Save().c_str());
+                                else {
+                                        if (cur_scn != -1 && cur_scn != it->scn) break; // scn change
+                                        if (cur_pos != -1 && cur_pos/5000 != it->pos/5000) break; // pos exceeded
+                                        if (!it->text.container.empty()) {
+                                                buflen += snprintf(buf+buflen, 1000-buflen, "\"%s\"", it->text.Save().c_str());
+                                        }
+                                        if (cur_scn == -1) { // scene change
+                                                buflen += snprintf(buf+buflen, 1000-buflen, ":%d:%d",it->scn,it->pos);
+                                                cur_scn = it->scn;
+                                        }
+                                        else
+                                                buflen += snprintf(buf+buflen, 1000-buflen, "%d",it->pos);
+                                        cur_pos = it->pos;
                                 }
-                                if (cur_scn == -1) { // scene change
-                                        buflen += snprintf(buf+buflen, 1000-buflen, ":%d:%d",it->scn,it->pos);
-                                        cur_scn = it->scn;
-                                } else {
-                                        buflen += snprintf(buf+buflen, 1000-buflen, "%d",it->pos);
+                                if (it->koe != -1)
+                                        buflen += snprintf(buf+buflen, 1000-buflen, ",%d",it->koe);
+                                if (!it->face.empty()) {
+                                        if (it->koe == -1) buf[buflen++] = ',';
+                                        int face_num = face_log.Add(it->face);
+                                        if (face_num >= 0 && face_num < 20)
+                                                buflen += snprintf(buf+buflen, 1000-buflen, ",%c", 'A'+face_num);
+                                        else
+                                                buflen += snprintf(buf+buflen, 1000-buflen, ",\"%s\"", it->face.c_str());
                                 }
-                                cur_pos = it->pos;
-                        }
-                        if (it->koe != -1)
-                                buflen += snprintf(buf+buflen, 1000-buflen, ",%d",it->koe);
-                        if (!it->face.empty()) {
-                                if (it->koe == -1) buf[buflen++] = ',';
-                                int face_num = face_log.Add(it->face);
-                                if (face_num >= 0 && face_num < 20)
-                                        buflen += snprintf(buf+buflen, 1000-buflen, ",%c", 'A'+face_num);
-                                else
-                                        buflen += snprintf(buf+buflen, 1000-buflen, ",\"%s\"", it->face.c_str());
-                        }
-                        buf[buflen++] = '\0';
-                        if (buflen >= 1000) { // Ëü€¬°ì¡¢¥Ð¥Ã¥¯¥í¥°£±¥¢¥€¥Æ¥à€ÎÂ瀭€µ€¬ 1000byte €ò±Û€š€ë€È€­
-                                fprintf(stderr,"Fatal : Cannot save backlog crrectly; Please send bug report to the author.\n");
-                        } else str += buf;
-                }
-                str += "\n";
-        } while(it != backlog.end());
-        }
-        return;
-}
-
-void TextImpl::Load(const char* str) {
+                                buf[buflen++] = '\0';
+                                if (buflen >= 1000) { // Ëü€¬°ì¡¢¥Ð¥Ã¥¯¥í¥°£±¥¢¥€¥Æ¥à€ÎÂ瀭€µ€¬ 1000byte €ò±Û€š€ë€È€­
+                                        fprintf(stderr,"Fatal : Cannot save backlog crrectly; Please send bug report to the author.\n");
+                                } else str += buf;
+                        }
+                        str += "\n";
+                } while(it != backlog.end());
+        }
+}
+
+void Text::Load(const char* str) {
         if (text) text->wid->Clear();
         hide();
@@ -531 +340 @@
         drawn_backlog_item.Clear();
 
-        str = strstr(str, "\n[TextImpl Window]\n");
+        str = strstr(str, "\n[Text Window]\n");
 
         if (str) {
                 SaveFaceHash face_log;
-                str += strlen("\n[TextImpl Window]\n");
+                str += strlen("\n[Text Window]\n");
                 const char* strend = str;
                 do {
@@ -545 +354 @@
 
                         if (str[0] == '[') break; // next section
-                        if (strncmp(str, "TextImplWindow=",15) == 0) {
+                        if (strncmp(str, "TextWindow=",15) == 0) {
                                 str += 15;
                                 sscanf(str, "%d", &text_window_number);
@@ -633 +442 @@
 }
 
-void TextImpl::hide(void) {
+void Text::hide(void) {
         if (text) text->hide();
         if (kcursor) kcursor->hide();
         text = NULL;
 }
-void TextImpl::show(int num) {
+void Text::show(int num) {
         if (num != text_window_number) {
                 hide();
@@ -661 +470 @@
 }
 
-void TextImpl::DrawBacklog(BacklogItem& item, Cmd& cmd) {
+void Text::DrawBacklog(BacklogItem& item, Cmd& cmd) {
         show();
         text->wid->deactivate();
@@ -682 +491 @@
 }
 
-void TextImpl::CreateSelBG(void) {
+void Text::CreateSelBG(void) {
         if (sel_bg1 != NULL || sel_bg2 != NULL) return;
 
@@ -705 +514 @@
 }
 
-void TextImpl::CreateSelect(Cmd& cmd) {
-        char key[1024];
+void Text::CreateSelect(Cmd& cmd) {
+        char key[23];
         sprintf(key, "#WINDOW.%03d.SELCOM_USE",text_window_number);
         int sel_type = 0;
@@ -826 +635 @@
 }
 
-void TextImpl::AddText(const char* str_o) {
+void Text::AddText(const char* str_o) {
         char str[10001];
         if (text == NULL) return;
@@ -891 +700 @@
 }
 
-void TextImpl::impl_txtClear(Cmd& cmd) {
-        if (text != NULL) {
-                text->ResetFace();
-                if (cmd.cmd2 == 3 && cmd.cmd3 == 151)
-                        text->wid->Clear();
-        }
-        cur_backlog_item.face = "";
-        if (cmd.cmd2 == 3 && cmd.cmd3 == 151)
-                text_stream.Clear();
-        hide();
-}
-
-void TextImpl::impl_logKoe(Cmd& cmd) {
-        // PlayKoe ; ÀŒœÐÎÏ¥³¥Þ¥ó¥É€ò¥Á¥§¥Ã¥¯€¹€ë */
-        cur_backlog_item.koe = cmd.args[0].value;
-}
-
-void TextImpl::impl_pause(Cmd& cmd) {
-        if (text != NULL) {
-                eprintf("start\n");
-                text->StartText(text_stream);
-                if (skip_mode & SKIP_TEXT) text->wid->Flush();
-                else if (kcursor) kcursor->show();
-                status = WAIT_TEXT;
-                text_parsing = false;
-        }
-        backlog_item = cur_backlog_item;
-        if (cur_backlog_item.scn == 0 && cur_backlog_item.pos == -1) backlog_item.text = text_stream;
-        cur_backlog_item.Clear();
-
-        cmd.clear();
-        cmd.cmd_type = CMD_WAITFRAMEUPDATE; // ²èÁüÉÁ²è€ËÌá€ë(skip»þ€Ë¥Æ¥­¥¹¥È€¬ÉÁ²è€µ€ì€ä€¹€¯€¹€ë€¿€á)
-}
-
-void TextImpl::impl_br(Cmd& cmd) {
-        text_stream.AddReturn();
-        cur_backlog_item.DeleteTextPos();
-        cmd.clear();
-}
-
-void TextImpl::impl_FaceOpen(Cmd& cmd) {
-        if (text == NULL)
-                show();
-        string s = cmd.Str(cmd.args[0]);
-        s += ".g00";
-        if (text != NULL)
-                text->ShowFace(s.c_str());
-        cur_backlog_item.face = s;
-        cmd.cmd_type = CMD_SAVECMD_ONCE;
-}
-
-void TextImpl::impl_FaceClear(Cmd& cmd) {
-        if (text == NULL)
-                show();
-        if (text)
-                text->ResetFace();
-        cur_backlog_item.face = "";
-        cmd.cmd_type = CMD_SAVECMD_ONCE;
-}
-
-void TextImpl::Exec(Cmd& cmd) {
+void Text::Exec(Cmd& cmd) {
         if (cmd.cmd_type == CMD_TEXT) {
                 if (text == NULL) {
@@ -980 +729 @@
         CommandHandler::Exec(cmd);
 
-        if (cmd.cmd1 == 0 && cmd.cmd2 == 3) {
-                if (cmd.cmd3 == 0x78) { // ¥ë¥ÓŽØÏ¢
-                        if (text == NULL) {
-                                show();
-                        }
-                        if (cmd.cmd4 == 1) {
-                                ruby_text_flag = true;
-                                eprintf("SetRubyTextImpl.");
-                                cmd.clear();
-                        } else if (cmd.cmd4 == 0) {
-                                if (ruby_text.length() == 0) { // ¥ë¥Ó€ò¿¶€ë¥Æ¥­¥¹¥È€¬€Ê€€
-                                        eprintf("Cannot find ruby text.\n");
-                                        return;
-                                }
-                                if (cmd.args.size() != 1) return;
-                                char debug1[1024], debug2[1024];
-                                kconv( (unsigned char*)ruby_text.c_str(), (unsigned char*)debug1);
-                                kconv( (unsigned char*)cmd.Str(cmd.args[0]), (unsigned char*)debug2);
-                                eprintf("SetRuby. %s, %s",debug1, debug2);
-                                text_stream.AddRuby(ruby_text.c_str(), cmd.Str(cmd.args[0]));
-                                cur_backlog_item.DeleteTextPos();
-                                cmd.clear();
-                        }
-                } else if (cmd.cmd3 == 0x66) { // ¥Æ¥­¥¹¥È¥Š¥£¥ó¥É¥Š€Î·Á
-                        if (cmd.cmd4 == 0) {
-                                eprintf("set text window <- %d\n",cmd.args[0].value);
-                                if (text) show(cmd.args[0].value);
-                                else text_window_number = cmd.args[0].value;
-                        } else if (cmd.cmd4 == 1) { // default value
-                                eprintf("set text window <- default\n");
-                                if (text) show(0);
-                                else text_window_number = 0;
-                        }
-                        cmd.clear();
-                } else if (cmd.cmd3 == 0x67) { // ¥Æ¥­¥¹¥È¥Š¥£¥ó¥É¥ŠÉœŒš¡©
-                        show();
-// ÉœŒš€ÎºÝ€Ï¥Æ¥­¥¹¥È€ò¥¯¥ê¥¢€·€Ê€€¡©
-//                      if (text) text->wid->Clear();
-//                      text_stream.Clear();
-                        cmd.clear();
-                } else if (cmd.cmd3 == 0x68) { // ¥Æ¥­¥¹¥ÈÉœŒš¡©
-                        // ÁŽ¥Æ¥­¥¹¥ÈÉœŒš
-                        if (text) {
-                                text->StartText(text_stream);
-                                text->wid->Flush();
-                        }
-                        cmd.clear();
-                } else if (cmd.cmd3 == 0x98) { // ¥Æ¥­¥¹¥È¥Š¥£¥ó¥É¥Š¥¯¥ê¥¢¡©
-                        show();
-                        if (text) text->wid->Clear();
-                        text_stream.Clear();
-                        cmd.clear();
-                }
-        } else if (cmd.cmd1 == 0 && cmd.cmd2 == 2 && (cmd.cmd3 == 1 || cmd.cmd3 == 3) && cmd.cmd4 == 0) {
-                // ÁªÂò»è
-                CreateSelect(cmd);
-                //FIXME: Check if it's really clean
-                if (text_parsing) {
-                        show();
-                        text->StartText(text_stream);
-                        if (skip_mode & SKIP_TEXT) text->wid->Flush();
-                        else if (kcursor) kcursor->hide();
-                        text_parsing = false;
-                        text_stream.Clear();
-                }
-                cmd.cmd_type = CMD_ROLLBACKPOINT; /* ÁªÂò»è€Ï¥»¡Œ¥Ö°ÌÃÖ / ¥·¥Ê¥ê¥ªŽ¬€­Ì့°ÌÃÖ */
-                // cmd.clear();
-        } else if (cmd.cmd1 == 0 && cmd.cmd2 == 4) {
-                if (cmd.cmd3 == 0x44c) { // ¥Æ¥­¥¹¥È¥¹¥­¥Ã¥×³«»Ï
-                        status_mask = Status(SKIPMASK | status_mask);
-                        cmd.clear();
-                } else if (cmd.cmd3 == 0x3e8) { // ¥Š¥£¥ó¥É¥ŠŸÃµî
-                        status_mask = Status(CLEARSCR_MASK | status_mask);
-                        cmd.clear();
-                }
-        } else if (cmd.cmd1 == 1 && cmd.cmd2 == 0x04) {
+        if (cmd.cmd1 == 1 && cmd.cmd2 == 4) {
                 /* ¥Š¥§¥€¥ÈŽØϢ̿Îá */
-                if (cmd.cmd3 == 0x64 || cmd.cmd3 == 0x6f || cmd.cmd3 == 0x79) {
-                        eprintf("wait %dmsec\n",cmd.args[0].value);
-                        if (cmd.cmd3 == 0x64 && text) {
-                                /* 0x64 €À€ÈÊž»úÉÁ²èÃæ€ÎÂÔ€Á€Ë»È€Š€³€È€¬€¢€ë */
-                                text->StartText(text_stream);
-                                text->wid->Flush();
-                        }
-                        if (cmd.cmd3 == 0x6f || cmd.cmd3 == 0x79) wait_time = base_time + cmd.args[0].value;
-                        else wait_time = old_time + cmd.args[0].value;
-                        status = WAIT;
-                        cmd.cmd_type = CMD_WAITFRAMEUPDATE; // ²èÁüÉÁ²è€ËÌá€ë(skip»þ€Ë¥Æ¥­¥¹¥È€¬ÉÁ²è€µ€ì€ä€¹€¯€¹€ë€¿€á)
-                } else if (cmd.cmd3 == 0x65 || cmd.cmd3 == 0x70) {
+                if (cmd.cmd3 == 0x65 || cmd.cmd3 == 0x70) {
                         eprintf("wait %dmsec(click stop)\n",cmd.args[0].value);
                         if (cmd.cmd3 == 0x70) wait_time = base_time + cmd.args[0].value;
@@ -1375 +1038 @@
 
 extern int print_blit;
-bool TextImpl::Wait(unsigned int current_time, Cmd& cmd) {
+bool Text::Wait(unsigned int current_time, Cmd& cmd) {
         if (current_time != Event::Time::NEVER_WAKE) old_time = current_time;
 /*
@@ -1561 +1224 @@
 void clearbtn_press(void* pointer, WidButton* button) {
         if (pointer == NULL) return;
-        TextImpl* t = (TextImpl*)pointer;
-        t->status_mask = TextImpl::Status(t->status_mask | TextImpl::CLEARSCR_MASK);
+        Text* t = (Text*)pointer;
+        t->status_mask = Text::Status(t->status_mask | Text::CLEARSCR_MASK);
+}
+
+void Text::PressFuncSkip(void* pointer, WidButton* from) {
+        if (pointer == NULL) return;
+        Text* t = (Text*)pointer;
+        t->status_mask = Text::Status(t->status_mask | Text::SKIPMASK);
         return;
 }
-void TextImpl::PressFuncSkip(void* pointer, WidButton* from) {
+void Text::PressFuncLoad(void* pointer, WidButton* from) {
         if (pointer == NULL) return;
-        TextImpl* t = (TextImpl*)pointer;
-        t->status_mask = TextImpl::Status(t->status_mask | TextImpl::SKIPMASK);
-        return;
-}
-void TextImpl::PressFuncLoad(void* pointer, WidButton* from) {
+        Text* t = (Text*)pointer;
+        t->status_mask = Text::Status(t->status_mask | Text::LOADMASK);
+}
+
+void Text::PressFuncSave(void* pointer, WidButton* from) {
         if (pointer == NULL) return;
-        TextImpl* t = (TextImpl*)pointer;
-        t->status_mask = TextImpl::Status(t->status_mask | TextImpl::LOADMASK);
-        return;
-}
-void TextImpl::PressFuncSave(void* pointer, WidButton* from) {
+        Text* t = (Text*)pointer;
+        t->status_mask = Text::Status(t->status_mask | Text::SAVEMASK);
+}
+
+void Text::PressFuncBacklog(void* pointer, WidButton* from) {
         if (pointer == NULL) return;
-        TextImpl* t = (TextImpl*)pointer;
-        t->status_mask = TextImpl::Status(t->status_mask | TextImpl::SAVEMASK);
-        return;
-}
-void TextImpl::PressFuncBacklog(void* pointer, WidButton* from) {
+        Text* t = (Text*)pointer;
+        t->status_mask = Text::Status(t->status_mask | Text::BACKLOG_MASK);
+}
+
+void Text::PressFuncBacklogFwd(void* pointer, WidButton* from) {
         if (pointer == NULL) return;
-        TextImpl* t = (TextImpl*)pointer;
-        t->status_mask = TextImpl::Status(t->status_mask | TextImpl::BACKLOG_MASK);
-        return;
-}
-void TextImpl::PressFuncBacklogFwd(void* pointer, WidButton* from) {
-        if (pointer == NULL) return;
-        TextImpl* t = (TextImpl*)pointer;
-        t->status_mask = TextImpl::Status(t->status_mask | TextImpl::BACKLOG_MASK_FWD);
-        return;
-}
+        Text* t = (Text*)pointer;
+        t->status_mask = Text::Status(t->status_mask | Text::BACKLOG_MASK_FWD);
+}
+
 void movebtn_drag(int from_x, int from_y, int x, int y, void* pointer, WidButton* button) {
         if (pointer == NULL) return;
@@ -1620 +1283 @@
 
 static WidButton::PressFunc btnpress[BTNCNT] = {
-        0, clearbtn_press, &TextImpl::PressFuncSkip,0,&TextImpl::PressFuncBacklogFwd,&TextImpl::PressFuncBacklog,&TextImpl::PressFuncBacklogFwd,&TextImpl::PressFuncSave,&TextImpl::PressFuncLoad,0
+        0, clearbtn_press, &Text::PressFuncSkip,0,&Text::PressFuncBacklogFwd,&Text::PressFuncBacklog,&Text::PressFuncBacklogFwd,&Text::PressFuncSave,&Text::PressFuncLoad,0
 };
 
@@ -1627 +1290 @@
 };
 
-void TextImpl::SetTextSpeed(int speed) {
+void Text::SetTextSpeed(int speed) {
         // 100 : 10char / sec
         // 10 : 100char / sec
@@ -1639 +1302 @@
 }
 
-void TextImpl::SetTextWait(int wait) {
+void Text::SetTextWait(int wait) {
         int i;
         for (i=0; i<32; i++)
@@ -1645 +1308 @@
 }
 
-void TextImpl::SetWindowColor(int r, int g, int b, int a, bool is_transparent) {
+void Text::SetWindowColor(int r, int g, int b, int a, bool is_transparent) {
         char key[1024];
         int w;
@@ -1669 +1332 @@
 }
 
-void TextImpl::SetCursor(int cursor_no) {
+void Text::SetCursor(int cursor_no) {
         char key[1024];
         sprintf(key, "#CURSOR.%03d.NAME", cursor_no);
@@ -1774 +1437 @@
 /**************************************************************::
 **
-**      Text
-*/
-Text::Text(Event::Container& _event, PicContainer& _parent) {
-        pimpl = new TextImpl(_event, _parent, backlog, backlog_item);
-}
-
-Text::~Text() {
-        delete pimpl;
-        pimpl = NULL;
-}
-
-void Text::InitWindow(void) {
-        pimpl->InitWindow();
-}
-
-void Text::Exec(Cmd& cmd) {
-        pimpl->Exec(cmd);
-}
-
-bool Text::Wait(unsigned int current_time, Cmd& cmd) {
-        return pimpl->Wait(current_time, cmd);
-}
-
-void Text::SetSkipMode(SkipMode mode) {
-        pimpl->SetSkipMode(mode);
-}
-
-void Text::Save(std::string& str, bool select_save) {
-        pimpl->Save(str, select_save);
-}
-
-void Text::Load(const char* str) {
-        pimpl->Load(str);
-}
-
-void Text::hide(void) {
-        pimpl->hide();
-}
-
-void Text::show(void) {
-        pimpl->show();
-}
-
-void Text::show(int num) {
-        pimpl->show(num);
-}
-
-void Text::DrawBacklog(BacklogItem& item, Cmd& cmd) {
-        pimpl->DrawBacklog(item, cmd);
-}
-
-/**************************************************************::
-**
 **      BacklogItem
 */
@@ -1872 +1482 @@
         pos = p;
 }
+
+
+/**************************************************************::
+**
+**      TextWindow
+*/
 
 Rect TextWindow::WakuSize(PicContainer& pic, int waku_no) {
@@ -2076 +1692 @@
 }
 
-void TextImpl::InitWindow(void) {
+TextWindow::~TextWindow()
+{
+        if (name_container != NULL) {
+                delete name_container;
+                name_container = NULL;
+        }
         int i;
-        int w;
-        std::string str;
-
-        for (w=0; w<32; w++) {
-                widgets[w] = new TextWindow(parent, event, w, (void*)this);
-                if (widgets[w]->wid == 0) {
-                        delete widgets[w];
-                        widgets[w] = NULL;
-                }
-        }
-        SetCursor(0);
-        for (i=0; i<26; i++) {
-                char buf[1024];
-                sprintf(buf, "#NAME.%c", i+'A');
-                const char* s = config->GetParaStr(buf);
-                if (s != NULL) replace_name[i] = s;
-        }
-        // replace_name2 : œéŽüÀßÄê
-        // œí¡¢œ©Àž¡¢œí (CLANNAD)
-        char name_nagisa[3] = {'\x8f', '\x8d', '\0'};
-        char name_akio[5] = {'\x8f', '\x48', '\x90', '\xb6', '\0'};
-        replace_name2[0] = name_nagisa;
-        replace_name2[1] = name_akio;
-        replace_name2[2] = name_nagisa;
-        text = NULL;
-        /* ¥Æ¥­¥¹¥È®ÅÙ€ÎÀßÄê */
-        int speed, mod, wait, auto_mod;
-        config->GetParam("#INIT_MESSAGE_SPEED", 1, &speed);
-        config->GetParam("#INIT_MESSAGE_SPEED_MOD", 1, &mod);
-        config->GetParam("#MESSAGE_KEY_WAIT_USE", 1, &auto_mod);
-        config->GetParam("#MESSAGE_KEY_WAIT_TIME", 1, &wait);
-        if (mod) speed = -1;
-        if (!auto_mod) wait = -1;
-        SetTextSpeed(speed);
-        SetTextWait(wait);
-        return;
-}
+        for (i=0; i<8; i++) {
+                if (face_pics[i] != NULL) {
+                        delete face_pics[i];
+                        face_pics[i] = NULL;
+                }
+        }
+        if (wid != NULL) {
+                delete wid;
+                wid = NULL;
+        }
+}
+
+void TextWindow::show(void)
+{
+        wid->show();
+        if (name_container != NULL && name_visible)
+                name_container->show();
+        if (face != NULL)
+                face->show();
+}
+
+void TextWindow::hide(void)
+{
+        wid->hide();
+        if (name_container != NULL)
+                name_container->hide();
+        if (face != NULL)
+                face->hide();
+}
+
+void TextWindow::ShowFace(const char* path)
+{
+        if (face == NULL)
+                return;
+        face->SetSurface(path, 0, 0);
+}
+
+void TextWindow::ResetFace(void) {
+        if (face == NULL)
+                return;
+        face->SetSurface((Surface*) NULL, 0, 0);
+}
+
+void TextWindow::StartText(const TextStream& _stream)
+{
+        wid->Clear();
+        wid->stream = _stream;
+        if (name_container != NULL) {
+                char namestr[1024];
+                namestr[0] = 0;
+                wid->stream.RemoveName(namestr, 1024);
+                if (namestr[0] == 0) {
+                        name_container->hide();
+                }
+                else {
+                        if (name != NULL) {
+                                name_container->show_all();
+                                name->SetText(namestr);
+                        }
+                }
+        }
+        wid->Start();
+}
+
+void TextWindow::SetName(const char* n)
+{
+        if (name_container != NULL && name != NULL) {
+                if (n[0]) {
+                        name_container->show();
+                        name->SetText(n);
+                        name_visible = true;
+                }
+                else {
+                        name_container->hide();
+                        name_visible = false;
+                }
+        }
+}
+
+/**************************************************************::
+**
+** SaveFaceHash
+*/
+
+void SaveFaceHash::NewNode(string face, int face_id)
+{
+        facetonum[face] = face_id;
+        container.push_front(Node(face, face_id));
+        if (container.size() > size_max) {
+                Node remove = container.back();
+                container.pop_back();
+                facetonum.erase(remove.first);
+        }
+}
+
+int SaveFaceHash::Add(string face)
+{
+        int id;
+        int ret = -1;
+        int i;
+        List::iterator it;
+        if (face.empty()) return -1;
+        if (facetonum.find(face) == facetonum.end()) {
+                id = ++id_max;
+                NewNode(face, id);
+                ret = -1;
+        }
+        else {
+                id = facetonum[face];
+                for (i=0, it=container.begin(); it != container.end(); i++, it++) {
+                        if (it->second == id) {
+                                ret = i;
+                                Node n = *it;
+                                container.erase(it);
+                                container.push_front(n);
+                                break;
+                        }
+                }
+        }
+        return ret;
+}
+
+string SaveFaceHash::Get(int num) {
+        if (num < 0) return "";
+        List::iterator it = container.begin();
+        for (; it != container.end(); it++) {
+                if (num == 0) return it->first;
+                num--;
+        }
+        return "";
+}
+
+int SaveFaceHash::size_max = 20;
+

system/system_config.h

@@ -22 +22 @@
  *
 */
+
+#ifndef __SYSTEM_CONFIG_H__
+#define __SYSTEM_CONFIG_H__
 
 #include <string>
@@ -112 +115 @@
 };
 
+#endif
+

window/Makefile.am

@@ -2 +2 @@
 libwindow_a_SOURCES = render.cc event.cc system.cc picture.cc widget.cc \
                       button.cc menuitem.cc rect.cc \
-                      event.h menuitem.h picture.h rect.h \
+                      event.h menuitem.h picture.h rect.h render.h \
                       surface.h system.h widget.h
 

window/render.cc

@@ -28 +28 @@
 #include "font/font.h"
 #include "font/text.h"
+#include "SDL.h"
+#include "render.h"
 #include "rect.h"
-#include "SDL.h"
 #include "surface.h"
 #include <stdio.h>
-
-Rect DSurfaceRenderText(TextGlyphStream::iterator start, TextGlyphStream::iterator end, const Rect& srcrect,
-        Surface* dst, const Rect& dstrect); // Êž»úÉÁ²è
-void DSurfaceFill(Surface* src, const Rect& rect, int r, int g, int b, int a); // ¥¯¥ê¥¢
-void DSurfaceFillA(Surface* src, const Rect& rect, int r, int g, int b, int a); // ¥Æ¥­¥¹¥È¥Š¥£¥ó¥É¥ŠÇØ·Ê€ÎÀßÄê
-void DSurfaceMove(Surface* src_o, const Rect& srcrect, Surface* dst_o, const Rect& dstrect); // ¥³¥Ô¡Œ
-void DSurfaceBlitAlpha(Surface* src_o, const Rect& srcrect_o, Surface* dst_o, const Rect& dstrect_o, const unsigned char* alpha, const Rect& alpharect);
-void DSurfaceBlitSaturate(Surface* src_o, const Rect& srcrect, Surface* dst_o, const Rect& dstrect, unsigned char alpha);
-void DSurfaceBlitMultiply(Surface* src_o, const Rect& srcrect_o, Surface* dst_o, const Rect& dstrect_o);
 
 #ifndef ALPHA_MAX

window/surface.h

@@ -29 +29 @@
 #define __SURFACE_H__
 
-#include<SDL.h>
-#include"rect.h"
+#include <SDL.h>
+#include "rect.h"
 
 struct Surface : public SDL_Surface {

window/system.h

@@ -35 +35 @@
 
 namespace System {
-        struct Main {
-                int framerate;
-                static int event_filter(const SDL_Event* event);
-                static bool is_exit;
-                static bool is_video_update;
-                static Main* instance;
-                WidMouseCursor* cursor;
-        public:
-                Event::Container event;
-                PicRoot root;
-                Main(void);
-                ~Main();
-                void Mainloop(void);
-                static void Quit(void);
-                static void DisableVideo(void);
-                static void EnableVideo(void);
+        class Main {
+                public:
+                        Main(void);
+                        ~Main();
+                        void Mainloop(void);
+                        static void Quit(void);
+                        static void DisableVideo(void);
+                        static void EnableVideo(void);
 #define DEFAULT_MOUSECURSOR (Surface*)0xffff0000 //FIXME: WTF?!?
-                static void SetCursor(Surface* s, const Rect& r);
+                        static void SetCursor(Surface* s, const Rect& r);
+
+                private:
+                        static int event_filter(const SDL_Event* event);
+
+                public:
+                        Event::Container event;
+                        PicRoot root;
+
+                private:
+                        int framerate;
+                        static bool is_exit;
+                        static bool is_video_update;
+                        static Main* instance;
+                        WidMouseCursor* cursor;
         };
 }