rubysdl 1.3.1 → 2.0

data/rubysdl_image.c

@@ -17,21 +17,24 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
-#ifdef HAVE_SDL_IMAGE
 #include "rubysdl.h"
+#ifdef HAVE_SDL_IMAGE
 #include <SDL_image.h>
 
-static VALUE sdl_load(VALUE class,VALUE filename)
+static VALUE Surface_s_load(VALUE klass, VALUE filename)
 {
   SDL_Surface *surface;
-  surface = IMG_Load(GETCSTR(filename));
-  if(surface==NULL){
-    rb_raise(eSDLError,"Couldn't load %s: %s",GETCSTR(filename),
-	     SDL_GetError());
-  }
-  return Data_Wrap_Struct(class,0,sdl_freeSurface,surface);
+  
+  rb_secure(4);
+  SafeStringValue(filename);
+
+  surface = IMG_Load(RSTRING_PTR(filename));
+  if(surface == NULL)
+    rb_raise(eSDLError,"Couldn't load %s: %s",
+             RSTRING_PTR(filename), SDL_GetError());
+  return Surface_create(surface);
 }
-static VALUE sdl_loadFromIO(VALUE class,VALUE io)
+static VALUE Surface_s_loadFromIO(VALUE class,VALUE io)
 {
   volatile VALUE guard = io;
   SDL_Surface *surface;
@@ -42,12 +45,33 @@ static VALUE sdl_loadFromIO(VALUE class,VALUE io)
     rb_raise(eSDLError,"Couldn't load image from IO: %s",
 	     SDL_GetError());
   }
-  return Data_Wrap_Struct(class,0,sdl_freeSurface,surface);
+  return Surface_create(surface);
+}
+static VALUE Surface_s_loadFromString(VALUE class,VALUE str)
+{
+  SDL_Surface *surface;
+  rb_secure(4);
+  SafeStringValue(str);
+  
+  surface = IMG_Load_RW(SDL_RWFromConstMem(RSTRING_PTR(str),
+                                           RSTRING_LEN(str)),
+                        1);
+  
+  if(surface==NULL){
+    rb_raise(eSDLError,"Couldn't load image from String: %s",
+	     SDL_GetError());
+  }
+  return Surface_create(surface);
 }
 
-void init_sdl_image()
+void rubysdl_init_image(VALUE mSDL, VALUE cSurface)
+{
+  rb_define_singleton_method(cSurface, "load", Surface_s_load, 1);
+  rb_define_singleton_method(cSurface, "loadFromIO", Surface_s_loadFromIO, 1);
+  rb_define_singleton_method(cSurface, "loadFromString", Surface_s_loadFromString, 1);
+}
+#else /* HAVE_SDL_IMAGE */
+void rubysdl_init_image(VALUE mSDL, VALUE cSurface)
 {
-  rb_define_singleton_method(cSurface,"load",sdl_load,1);
-  rb_define_singleton_method(cSurface,"loadFromIO",sdl_loadFromIO,1);
 }
 #endif /* HAVE_SDL_IMAGE */

data/rubysdl_joystick.c

@@ -19,107 +19,244 @@
   */
 #include "rubysdl.h"
 
+/* basic */
+typedef struct{
+  SDL_Joystick* joystick;
+} Joystick;
 
-static VALUE sdl_getJoyPolling(VALUE class)
+static VALUE cJoystick=Qnil;
+
+static Joystick* GetJoystick(VALUE obj)
+{
+  Joystick* joy;
+  
+  if(!rb_obj_is_kind_of(obj, cJoystick)){
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected SDL::Joystick)",
+             rb_obj_classname(obj));
+  }
+  
+  Data_Get_Struct(obj, Joystick, joy);
+  return joy;
+}
+
+static SDL_Joystick* Get_SDL_Joystick(VALUE obj)
+{
+  Joystick* joy = GetJoystick(obj);
+  if(joy->joystick == NULL){
+    rb_raise(rb_eRuntimeError, "joystick is closed");
+  }
+
+  return joy->joystick;
+}
+
+static void Joystick_free(Joystick* joy)
+{
+  if(rubysdl_is_quit() || joy->joystick == NULL){
+    free(joy);
+  }else{
+    SDL_JoystickClose(joy->joystick);
+    free(joy);
+  }
+}
+
+/* initialize methods */
+static VALUE Joystick_s_alloc(VALUE klass)
 {
-  return BOOL(SDL_JoystickEventState(SDL_QUERY)==SDL_ENABLE);
+  Joystick* joy = ALLOC(Joystick);
+  joy->joystick = NULL;
+  return Data_Wrap_Struct(cJoystick, 0, Joystick_free, joy);
 }
-static VALUE sdl_setJoyPolling(VALUE class,VALUE poll)
+
+static VALUE Joystick_initialize(VALUE self, VALUE index)
 {
-  if(poll)
+  Joystick* joy = GetJoystick(self);
+  rb_secure(4);
+  
+  joy->joystick = SDL_JoystickOpen(NUM2INT(index));
+  if( joy->joystick == NULL ){
+    rb_raise(eSDLError, "Couldn't open joystick No.%d :%s", NUM2INT(index),
+	     SDL_GetError());
+  }
+  return Qnil;
+}
+
+/* class methods */
+static VALUE Joystick_s_poll(VALUE klass)
+{
+  rb_secure(4);
+  return INT2BOOL(SDL_JoystickEventState(SDL_QUERY) == SDL_ENABLE);
+}
+
+static VALUE Joystick_s_set_poll(VALUE klass, VALUE poll)
+{
+  rb_secure(4);
+  
+  if(RTEST(poll))
     SDL_JoystickEventState(SDL_ENABLE);
   else
     SDL_JoystickEventState(SDL_IGNORE);
   return poll;
 }
 
-static VALUE sdl_joystick_num(VALUE class)
+static VALUE Joystick_s_num(VALUE klass)
 {
+  rb_secure(4);
   return INT2FIX(SDL_NumJoysticks());
 }
-static VALUE sdl_joystick_name(VALUE class,VALUE index)
+
+static VALUE Joystick_s_indexName(VALUE klass, VALUE index)
 {
-  return rb_str_new2( SDL_JoystickName(NUM2INT(index)) );
+  rb_secure(4);
+  return rb_str_new2(SDL_JoystickName(NUM2INT(index)));
 }
-static VALUE sdl_joystick_open(VALUE class,VALUE index)
+
+static VALUE Joystick_s_open_p(VALUE klass, VALUE index)
 {
-  SDL_Joystick *joystick;
-  joystick=SDL_JoystickOpen(NUM2INT(index));
-  if(joystick==NULL)
-    rb_raise(eSDLError,"Couldn't open joystick No.%d :%s",NUM2INT(index),
-	     SDL_GetError());
-  return Data_Wrap_Struct(class,0,0,joystick);
+  rb_secure(4);
+  return INT2BOOL(SDL_JoystickOpened(NUM2INT(index)));
 }
-static VALUE sdl_joystick_opened(VALUE class,VALUE index)
+
+static VALUE Joystick_s_open(VALUE klass, VALUE index)
 {
-  return (SDL_JoystickOpened(NUM2INT(index)))?Qtrue:Qfalse;
+  VALUE newobj;
+  rb_secure(4);
+  
+  newobj = Joystick_s_alloc(klass);
+  Joystick_initialize(newobj, index);
+  return newobj;
 }
-static VALUE sdl_joystick_update(VALUE class)
+
+static VALUE Joystick_s_update(VALUE klass)
 {
+  rb_secure(4);
   SDL_JoystickUpdate();
   return Qnil;
 }
-static VALUE sdl_joystick_index(VALUE obj)
+
+/* methods */
+static VALUE Joystick_close(VALUE self)
 {
-  SDL_Joystick *joystick;
-  Data_Get_Struct(obj,SDL_Joystick,joystick);
+  Joystick* joy;
+  rb_secure(4);
+  
+  joy = GetJoystick(self);
+  SDL_JoystickClose(joy->joystick);
+  joy->joystick = NULL;
+  return Qnil;
+}
+  
+static VALUE Joystick_index(VALUE self)
+{
+  SDL_Joystick* joystick;
+  rb_secure(4);
+  
+  joystick = Get_SDL_Joystick(self);
   return INT2FIX(SDL_JoystickIndex(joystick));
 }
-static VALUE sdl_joystick_numAxes(VALUE obj)
+
+static VALUE Joystick_numAxes(VALUE self)
 {
-  SDL_Joystick *joystick;
-  Data_Get_Struct(obj,SDL_Joystick,joystick);
+  SDL_Joystick* joystick;
+  rb_secure(4);
+  
+  joystick = Get_SDL_Joystick(self);
   return INT2FIX(SDL_JoystickNumAxes(joystick));
 }
-static VALUE sdl_joystick_numBalls(VALUE obj)
+
+static VALUE Joystick_numBalls(VALUE self)
 {
   SDL_Joystick *joystick;
-  Data_Get_Struct(obj,SDL_Joystick,joystick);
+  rb_secure(4);
+  
+  joystick = Get_SDL_Joystick(self);
   return INT2FIX(SDL_JoystickNumBalls(joystick));
 }
-static VALUE sdl_joystick_numHats(VALUE obj)
+
+static VALUE Joystick_numHats(VALUE self)
 {
   SDL_Joystick *joystick;
-  Data_Get_Struct(obj,SDL_Joystick,joystick);
+  rb_secure(4);
+  joystick = Get_SDL_Joystick(self);
   return INT2FIX(SDL_JoystickNumHats(joystick));
 }
-static VALUE sdl_joystick_numButtons(VALUE obj)
+
+static VALUE Joystick_numButtons(VALUE self)
 {
   SDL_Joystick *joystick;
-  Data_Get_Struct(obj,SDL_Joystick,joystick);
+  rb_secure(4);
+  
+  joystick = Get_SDL_Joystick(self);
   return INT2FIX(SDL_JoystickNumButtons(joystick));
 }
 
-static VALUE sdl_joystick_getAxis(VALUE obj,VALUE axis)
+static VALUE Joystick_getAxis(VALUE self, VALUE axis)
 {
   SDL_Joystick *joystick;
-  Data_Get_Struct(obj,SDL_Joystick,joystick);
-  return INT2NUM(SDL_JoystickGetAxis(joystick,NUM2INT(axis)));
+  rb_secure(4);
+  
+  joystick = Get_SDL_Joystick(self);
+  return INT2NUM(SDL_JoystickGetAxis(joystick, NUM2INT(axis)));
 }
-static VALUE sdl_joystick_getHat(VALUE obj,VALUE hat)
+
+static VALUE Joystick_getHat(VALUE self, VALUE hat)
 {
   SDL_Joystick *joystick;
-  Data_Get_Struct(obj,SDL_Joystick,joystick);
-  return UINT2NUM(SDL_JoystickGetHat(joystick,NUM2INT(hat)));
+  rb_secure(4);
+  
+  joystick = Get_SDL_Joystick(self);
+  return UINT2NUM(SDL_JoystickGetHat(joystick, NUM2INT(hat)));
 }
-static VALUE sdl_joystick_getButton(VALUE obj,VALUE button)
+
+static VALUE Joystick_getButton(VALUE self, VALUE button)
 {
   SDL_Joystick *joystick;
-  Data_Get_Struct(obj,SDL_Joystick,joystick);
-  return (SDL_JoystickGetButton(joystick,NUM2INT(button)))?Qtrue:Qfalse;
+  rb_secure(4);
+  
+  joystick = Get_SDL_Joystick(self);
+  return INT2BOOL(SDL_JoystickGetButton(joystick, NUM2INT(button)));
 }
-static VALUE sdl_joystick_getBall(VALUE obj,VALUE ball)
+
+static VALUE Joystick_getBall(VALUE self, VALUE ball)
 {
   SDL_Joystick *joystick;
   int dx,dy;
-  Data_Get_Struct(obj,SDL_Joystick,joystick);
-  if( SDL_JoystickGetBall(joystick,NUM2INT(ball),&dx,&dy)== -1 )
+
+  rb_secure(4);
+  
+  joystick = Get_SDL_Joystick(self);
+  if( SDL_JoystickGetBall(joystick, NUM2INT(ball), &dx, &dy) == -1 )
     rb_raise(eSDLError,"SDL_JoystickGetBall failed :%s",SDL_GetError());
-  return rb_ary_new3(2,INT2FIX(dx),INT2FIX(dy));
+  return rb_ary_new3(2, INT2FIX(dx), INT2FIX(dy));
 }
 
-static void defineConstForJoystick()
+void rubysdl_init_Joystick(VALUE mSDL)
 {
+  cJoystick = rb_define_class_under(mSDL, "Joystick", rb_cObject);
+  
+  rb_define_singleton_method(cJoystick, "poll", Joystick_s_poll, 0);
+  rb_define_singleton_method(cJoystick, "poll=", Joystick_s_set_poll, 1);
+  rb_define_singleton_method(cJoystick, "num", Joystick_s_num, 0);
+  rb_define_singleton_method(cJoystick, "indexName", Joystick_s_indexName, 1);
+  rb_define_singleton_method(cJoystick, "open?", Joystick_s_open_p, 1);
+  rb_define_singleton_method(cJoystick, "update", Joystick_s_update, 0);
+  rb_define_singleton_method(cJoystick, "updateAll", Joystick_s_update, 0);
+  rb_define_singleton_method(cJoystick, "open", Joystick_s_open, 1);
+
+  rb_define_alloc_func(cJoystick, Joystick_s_alloc);
+  rb_define_private_method(cJoystick, "initialize", Joystick_initialize, 1);
+
+  rb_define_method(cJoystick, "close", Joystick_close, 0);
+  rb_define_method(cJoystick, "index", Joystick_index, 0);
+  rb_define_method(cJoystick, "numAxes", Joystick_numAxes, 0);
+  rb_define_method(cJoystick, "numBalls", Joystick_numBalls, 0);
+  rb_define_method(cJoystick, "numHats", Joystick_numHats, 0);
+  rb_define_method(cJoystick, "numButtons", Joystick_numButtons, 0);  
+  
+  rb_define_method(cJoystick, "axis", Joystick_getAxis, 1);
+  rb_define_method(cJoystick, "hat", Joystick_getHat, 1);
+  rb_define_method(cJoystick, "button", Joystick_getButton, 1);
+  rb_define_method(cJoystick, "ball", Joystick_getBall, 1);
+  
   rb_define_const(cJoystick,"HAT_CENTERED",UINT2NUM(SDL_HAT_CENTERED));
   rb_define_const(cJoystick,"HAT_UP",UINT2NUM(SDL_HAT_UP));
   rb_define_const(cJoystick,"HAT_RIGHT",UINT2NUM(SDL_HAT_RIGHT));
@@ -130,27 +267,3 @@ static void defineConstForJoystick()
   rb_define_const(cJoystick,"HAT_LEFTUP",UINT2NUM(SDL_HAT_LEFTUP));
   rb_define_const(cJoystick,"HAT_LEFTDOWN",UINT2NUM(SDL_HAT_LEFTDOWN));
 }
-void init_joystick()
-{
-  cJoystick = rb_define_class_under(mSDL,"Joystick",rb_cObject);
-  rb_define_singleton_method(cJoystick,"poll",sdl_getJoyPolling,0);
-  rb_define_singleton_method(cJoystick,"poll=",sdl_setJoyPolling,1);
-  rb_define_singleton_method(cJoystick,"num",sdl_joystick_num,0);
-  rb_define_singleton_method(cJoystick,"indexName",sdl_joystick_name,1);
-  rb_define_singleton_method(cJoystick,"open",sdl_joystick_open,1);
-  rb_define_singleton_method(cJoystick,"open?",sdl_joystick_opened,1);
-  rb_define_singleton_method(cJoystick,"updateAll",sdl_joystick_update,0);
-  
-  rb_define_method(cJoystick,"index",sdl_joystick_index,0);
-  rb_define_method(cJoystick,"numAxes",sdl_joystick_numAxes,0);
-  rb_define_method(cJoystick,"numBalls",sdl_joystick_numBalls,0);
-  rb_define_method(cJoystick,"numHats",sdl_joystick_numHats,0);
-  rb_define_method(cJoystick,"numButtons",sdl_joystick_numButtons,0);
-  
-  rb_define_method(cJoystick,"axis",sdl_joystick_getAxis,1);
-  rb_define_method(cJoystick,"hat",sdl_joystick_getHat,1);
-  rb_define_method(cJoystick,"button",sdl_joystick_getButton,1);
-  rb_define_method(cJoystick,"ball",sdl_joystick_getBall,1);
-
-  defineConstForJoystick();
-}

data/rubysdl_kanji.c

@@ -21,115 +21,101 @@
 #include "SDL_kanji.h"
 #include "rubysdl.h"
 
-static VALUE cKanji;
+static VALUE cKanjiFont;
+typedef int (*Drawer)(Kanji_Font*, int, int, SDL_Surface*, const char*, SDL_Color);
 
-static VALUE kanji_open(VALUE obj,VALUE filename,VALUE size)
+DEFINE_GET_STRUCT(Kanji_Font, Get_Kanji_Font, cKanjiFont, "SDL::Kanji::Font");
+     
+static VALUE Font_s_open(VALUE klass, VALUE filename, VALUE size)
 {
   Kanji_Font* font;
 
-  font = Kanji_OpenFont(GETCSTR(filename),NUM2INT(size));
-  if( font == NULL )
-    rb_raise(eSDLError,"Couldn't open bdf font: %s",GETCSTR(filename));
-  return Data_Wrap_Struct(cKanji,0,Kanji_CloseFont,font);
+  rb_secure(4);
+  SafeStringValue(filename);
+  
+  font = Kanji_OpenFont(RSTRING_PTR(filename), NUM2INT(size));
+  if(font == NULL)
+    rb_raise(eSDLError,"Couldn't open bdf font: %s", RSTRING_PTR(filename));
+  return Data_Wrap_Struct(cKanjiFont, 0, Kanji_CloseFont, font);
 }
 
-static VALUE kanji_setCodingSystem(VALUE obj,VALUE sys)
+static VALUE Font_setCodingSystem(VALUE self, VALUE sys)
 {
-  Kanji_Font* font;
-
-  Data_Get_Struct(obj,Kanji_Font,font);
-  
-  Kanji_SetCodingSystem(font,NUM2INT(sys));
+  Kanji_SetCodingSystem(Get_Kanji_Font(self), NUM2INT(sys));
   return Qnil;
 }
                         
-static VALUE kanji_addFont(VALUE obj, VALUE filename)
+static VALUE Font_add(VALUE self, VALUE filename)
 {
-  Kanji_Font* font;
-
-  Data_Get_Struct(obj,Kanji_Font,font);
-  if( Kanji_AddFont(font,GETCSTR(filename)) == -1)
-    rb_raise(eSDLError,"Couldn't use font: %s",GETCSTR(filename));
+  rb_secure(4);
+  SafeStringValue(filename);
+  if(Kanji_AddFont(Get_Kanji_Font(self), RSTRING_PTR(filename)) == -1)
+    rb_raise(eSDLError, "Couldn't use font: %s", RSTRING_PTR(filename));
   return Qnil;
 }
 
-static VALUE kanji_textwidth(VALUE obj,VALUE text)
+static VALUE Font_textwidth(VALUE self, VALUE text)
 {
-  Kanji_Font* font;
-
-  Data_Get_Struct(obj,Kanji_Font,font);
-  return INT2FIX(Kanji_FontWidth(font,GETCSTR(text)));
+  StringValue(text);
+  return INT2FIX(Kanji_FontWidth(Get_Kanji_Font(self), RSTRING_PTR(text)));
 }
 
-static VALUE kanji_width(VALUE obj)
+static VALUE Font_width(VALUE self)
 {
-  Kanji_Font* font;
-
-  Data_Get_Struct(obj,Kanji_Font,font);
-  return INT2FIX(Kanji_FontWidth(font,NULL));
+  return INT2FIX(Kanji_FontWidth(Get_Kanji_Font(self), NULL));
 }
 
-static VALUE kanji_height(VALUE obj)
+static VALUE Font_height(VALUE self)
 {
-  Kanji_Font* font;
-   
-  Data_Get_Struct(obj,Kanji_Font,font);
-  return INT2FIX(Kanji_FontHeight(font));
+  return INT2FIX(Kanji_FontHeight(Get_Kanji_Font(self)));
 }
 
-static VALUE kanji_putText(VALUE obj,VALUE surface,VALUE text,VALUE x,VALUE y,
-                           VALUE r, VALUE g, VALUE b)
+static void Font_put(VALUE self, VALUE surface, VALUE text,
+                     VALUE x, VALUE y,
+                     VALUE r, VALUE g, VALUE b, Drawer draw)
 {
-  Kanji_Font* font;
-  SDL_Surface* target;
   SDL_Color color;
-  
-  if(!rb_obj_is_kind_of(surface,cSurface))
-    rb_raise( rb_eArgError,"type mismatch(expect Surface)" );
-  
-  Data_Get_Struct(obj,Kanji_Font,font);
-  Data_Get_Struct(surface,SDL_Surface,target);
 
+  rb_secure(4);
+  SafeStringValue(text);
+  
   color.r = NUM2INT(r);color.g = NUM2INT(g); color.b = NUM2INT(b);
-  Kanji_PutText(font,NUM2INT(x),NUM2INT(y),target,GETCSTR(text),
-                color);
+  
+  draw(Get_Kanji_Font(self), NUM2INT(x), NUM2INT(y),
+       Get_SDL_Surface(surface), RSTRING_PTR(text), color);
+}
+  
+static VALUE Font_putText(VALUE self, VALUE surface, VALUE text,
+                          VALUE x, VALUE y,
+                          VALUE r, VALUE g, VALUE b)
+{
+  Font_put(self, surface, text, x, y, r, g, b, Kanji_PutText);
   return Qnil;
 }
 
-static VALUE kanji_putTextTate(VALUE obj,VALUE surface,VALUE text,VALUE x,VALUE y,
-                               VALUE r, VALUE g, VALUE b)
+static VALUE Font_putTextTate(VALUE self, VALUE surface, VALUE text,
+                              VALUE x, VALUE y,
+                              VALUE r, VALUE g, VALUE b)
 {
-  Kanji_Font* font;
-  SDL_Surface* target;
-  SDL_Color color;
-  
-  if(!rb_obj_is_kind_of(surface,cSurface))
-    rb_raise( rb_eArgError,"type mismatch(expect Surface)" );
-  
-  Data_Get_Struct(obj,Kanji_Font,font);
-  Data_Get_Struct(surface,SDL_Surface,target);
-
-  color.r = NUM2INT(r);color.g = NUM2INT(g); color.b = NUM2INT(b);
-  
-  Kanji_PutTextTate(font,NUM2INT(x),NUM2INT(y),target,GETCSTR(text),
-                    color);
+  Font_put(self, surface, text, x, y, r, g, b, Kanji_PutTextTate);
   return Qnil;
 }
 
-void init_kanji(void)
+void rubysdl_init_Kanji(VALUE mSDL)
 {
-  cKanji = rb_define_class_under(mSDL,"Kanji",rb_cObject);
-
-  rb_define_singleton_method(cKanji,"open",kanji_open,2);
-  rb_define_method(cKanji,"add",kanji_addFont,1);
-  rb_define_method(cKanji,"setCodingSystem",kanji_setCodingSystem,1);
-  rb_define_method(cKanji,"textwidth",kanji_textwidth,1);
-  rb_define_method(cKanji,"width",kanji_width,0);
-  rb_define_method(cKanji,"height",kanji_height,0);
-  rb_define_method(cKanji,"put",kanji_putText,7);
-  rb_define_method(cKanji,"putTate",kanji_putTextTate,7);
+  cKanjiFont = rb_define_class_under(mSDL, "Kanji", rb_cObject); 
+  rb_undef_alloc_func(cKanjiFont);
+  
+  rb_define_singleton_method(cKanjiFont, "open", Font_s_open, 2);
+  rb_define_method(cKanjiFont, "add", Font_add, 1);
+  rb_define_method(cKanjiFont, "setCodingSystem", Font_setCodingSystem, 1);
+  rb_define_method(cKanjiFont, "textwidth", Font_textwidth, 1);
+  rb_define_method(cKanjiFont, "width", Font_width, 0);
+  rb_define_method(cKanjiFont, "height", Font_height, 0);
+  rb_define_method(cKanjiFont, "put", Font_putText, 7);
+  rb_define_method(cKanjiFont, "putTate", Font_putTextTate, 7);
   
-  rb_define_const(cKanji,"SJIS",INT2NUM(KANJI_SJIS));
-  rb_define_const(cKanji,"EUC",INT2NUM(KANJI_EUC));
-  rb_define_const(cKanji,"JIS",INT2NUM(KANJI_JIS));
+  rb_define_const(cKanjiFont, "SJIS", INT2NUM(KANJI_SJIS));
+  rb_define_const(cKanjiFont, "EUC", INT2NUM(KANJI_EUC));
+  rb_define_const(cKanjiFont, "JIS", INT2NUM(KANJI_JIS));
 }