fxruby 1.6.35-x64-mingw32 → 1.6.36-x64-mingw32

data/ext/fox16_c/FXRuby.cpp

@@ -29,6 +29,7 @@
 #endif
 
 #include "FXRbCommon.h"
+#include "FXRbObjRegistry.h"
 #include "impl.h"
 
 // SWIG runtime functions we need
@@ -79,82 +80,9 @@ swig_type_info *FXRbTypeQuery(const char *desc){
   }
 
 
-/**
- * The FXRuby_Objects hash table basically maps C++ objects to Ruby instances.
- * Each key in the table is a pointer to a C++ object we've seen before, and
- * the corresponding value is an FXRubyObjDesc struct (see below) that tells
- * us which Ruby instance corresponds to that C++ object.
- */
-
-static st_table * FXRuby_Objects;
-
-static const char * const safe_rb_obj_classname(VALUE obj)
-{
-  int tdata = TYPE(obj)==T_DATA;
-  if( (tdata && FXRbIsInGC(DATA_PTR(obj)))
-#ifdef HAVE_RB_DURING_GC
-      || rb_during_gc()
-#endif
-  ){
-    /* It's not safe to call rb_obj_classname() during GC.
-     * Return dummy value in this case. */
-    return "during GC";
-  } else if (tdata) {
-    return rb_obj_classname(obj);
-  } else {
-    return "no T_DATA";
-  }
-}
-
-/**
- * Each value in the FXRuby_Objects hash table is an instance of this
- * struct. It identifies the Ruby instance associated with a C++ object.
- * It also indicates whether this is merely a "borrowed" reference to
- * some C++ object (i.e. it's not one we need to destroy later).
- *
- * in_gc is set for FXWindows that are in garbage collection and must
- * not call ruby code anymore.
- */
-
-struct FXRubyObjDesc {
-  VALUE obj;
-  bool borrowed;
-  bool in_gc;
-  };
-
-
-/**
- * FXRbNewPointerObj() is a wrapper around SWIG_Ruby_NewPointerObj() that also
- * registers this C++ object & Ruby instance pair in our FXRuby_Objects
- * hash table. This function should only get called for methods that return
- * a reference to an already-existing C++ object (i.e. one that FOX "owns")
- * and for that reason we mark these objects as "borrowed".
- */
-
 VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){
-  if(ptr!=0){
-    FXASSERT(ty!=0);
-    VALUE obj;
-    FXRubyObjDesc *desc;
-    if(FXMALLOC(&desc,FXRubyObjDesc,1)){
-      obj=SWIG_Ruby_NewPointerObj(ptr,ty,1);
-      FXTRACE((1,"FXRbNewPointerObj(foxObj=%p) => rubyObj=%p (%s)\n",ptr,(void *)obj,safe_rb_obj_classname(obj)));
-      desc->obj=obj;
-      desc->borrowed=true;
-      desc->in_gc=false;
-      int overwritten = st_insert(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t>(desc));
-      FXASSERT(!overwritten);
-      return obj;
-      }
-    else{
-      FXASSERT(FALSE);
-      return Qnil;
-      }
-    }
-  else{
-    return Qnil;
-    }
-  }
+  return FXRbObjRegistry::main.NewBorrowedObj(ptr,ty);
+}
 
 
 /**
@@ -163,168 +91,27 @@ VALUE FXRbNewPointerObj(void *ptr,swig_type_info* ty){
  */
 
 bool FXRbIsBorrowed(void* ptr){
-  FXASSERT(ptr!=0);
-  FXRubyObjDesc *desc;
-  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
-    return desc->borrowed;
-    }
-  else{
-    return true;
-    }
-  }
+  return FXRbObjRegistry::main.IsBorrowed(ptr);
+}
 
 bool FXRbSetInGC(const void* ptr, bool enabled){
-  FXASSERT(ptr!=0);
-  FXRubyObjDesc *desc;
-  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
-    desc->in_gc=enabled;
-    return enabled;
-    }
-  return false;
-  }
+  return FXRbObjRegistry::main.SetInGC(ptr, enabled);
+}
 
 bool FXRbIsInGC(const void* ptr){
-  FXASSERT(ptr!=0);
-  FXRubyObjDesc *desc;
-
-#ifdef HAVE_RB_DURING_GC
-  if( rb_during_gc() ){
-    return true;
-  }
-#endif
-  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(ptr),reinterpret_cast<st_data_t *>(&desc))!=0){
-    return desc->in_gc;
-  }
-  return false;
+  return FXRbObjRegistry::main.IsInGC(ptr);
 }
 
 
-/**
- * FXRbConvertPtr() is just a wrapper around SWIG_ConvertPtr().
- */
-
-void* FXRbConvertPtr(VALUE obj,swig_type_info* ty){
-  void *ptr;
-  SWIG_ConvertPtr(obj,&ptr,ty,1);
-  return ptr;
-  }
-
-
-// Should we catch exceptions thrown by message handlers?
-FXbool FXRbCatchExceptions=FALSE;
-
-// Returns an FXInputHandle for this Ruby file object
-FXInputHandle FXRbGetReadFileHandle(VALUE obj,FXuint mode) {
-  int fd;
-  fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
-#ifdef WIN32
-#ifdef __CYGWIN__
-  return (FXInputHandle) get_osfhandle(fd);
-#else
-  WSAEVENT hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
-  long events = 0;
-  if(mode&INPUT_READ) events |= FD_READ|FD_ACCEPT|FD_OOB;
-  if(mode&INPUT_EXCEPT) events |= FD_CLOSE|FD_QOS|FD_GROUP_QOS|FD_ROUTING_INTERFACE_CHANGE|FD_ADDRESS_LIST_CHANGE;
-  if ( WSAEventSelect(_get_osfhandle(fd), hEvent, events) == SOCKET_ERROR ) {
-    WSACloseEvent( hEvent );
-    rb_raise( rb_eRuntimeError, "WSAEventSelect sockett error: %d", WSAGetLastError() );
-  }
-  rb_iv_set(obj, "FXRuby::FXRbGetReadFileHandle", ULL2NUM((intptr_t)hEvent));
-  return (FXInputHandle) hEvent;
-#endif
-#else
-  return (FXInputHandle) fd;
-#endif
-  }
-
-void FXRbRemoveReadFileHandle(VALUE obj,FXuint mode) {
-#ifdef WIN32
-  WSAEVENT hEvent = (HANDLE)NUM2ULL(rb_iv_get(obj, "FXRuby::FXRbGetReadFileHandle"));
-  CloseHandle( hEvent );
-#endif
+// Register this Ruby class instance
+void FXRbRegisterRubyObj(VALUE rubyObj,const void* foxObj) {
+  return FXRbObjRegistry::main.RegisterRubyObj(rubyObj, foxObj);
 }
 
-// Returns an FXInputHandle for this Ruby file object
-FXInputHandle FXRbGetWriteFileHandle(VALUE obj,FXuint mode) {
-  int fd;
-#if defined(RUBINIUS)
-  VALUE vwrite = rb_intern("@write");
-  if(rb_ivar_defined(obj, vwrite)) obj = rb_ivar_get(obj, vwrite);
-  fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
-#elif defined(RUBY_1_8)
-  OpenFile *fptr;
-  GetOpenFile(obj, fptr);
-  FILE *fpw=GetWriteFile(fptr);
-  fd = fileno(fpw);
-#else
-  rb_io_t *fptr;
-  GetOpenFile(obj, fptr);
-  VALUE wrio = fptr->tied_io_for_writing;
-  if(wrio) obj = wrio;
-  fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
-#endif
-#ifdef WIN32
-#ifdef __CYGWIN__
-  return (FXInputHandle) get_osfhandle(fd);
-#else
-  WSAEVENT hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
-  long events = 0;
-  if(mode&INPUT_WRITE) events |= FD_WRITE|FD_CONNECT;
-  if(mode&INPUT_EXCEPT) events |= FD_CLOSE|FD_QOS|FD_GROUP_QOS|FD_ROUTING_INTERFACE_CHANGE|FD_ADDRESS_LIST_CHANGE;
-  if ( WSAEventSelect(_get_osfhandle(fd), hEvent, events) == SOCKET_ERROR ) {
-    WSACloseEvent( hEvent );
-    rb_raise( rb_eRuntimeError, "WSAEventSelect sockettt error: %d", WSAGetLastError() );
-  }
-  rb_iv_set(obj, "FXRuby::FXRbGetWriteFileHandle", ULL2NUM((intptr_t)hEvent));
-  return (FXInputHandle) hEvent;
-#endif
-#else
-  return (FXInputHandle) fd;
-#endif
-  }
-
-void FXRbRemoveWriteFileHandle(VALUE obj,FXuint mode) {
-#ifdef WIN32
-  WSAEVENT hEvent = (HANDLE)NUM2ULL(rb_iv_get(obj, "FXRuby::FXRbGetWriteFileHandle"));
-  CloseHandle( hEvent );
-#endif
+static void FXRbUnregisterRubyObj2(const void* foxObj, bool alsoOwned){
+  return FXRbObjRegistry::main.UnregisterRubyObj(foxObj, alsoOwned);
 }
 
-
-// Register this Ruby class instance
-void FXRbRegisterRubyObj(VALUE rubyObj,const void* foxObj) {
-  FXASSERT(!NIL_P(rubyObj));
-  FXASSERT(foxObj!=0);
-  FXRubyObjDesc* desc;
-  FXTRACE((1,"FXRbRegisterRubyObj(rubyObj=%p (%s),foxObj=%p)\n",(void *)rubyObj,safe_rb_obj_classname(rubyObj),foxObj));
-  if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
-    FXASSERT(desc->borrowed);
-    /* There is already a Ruby object registered for this foxObj.
-     * This can happen, if libfox calls methods out of the C++ object constructor,
-     * that can be overwritten in Ruby (like changeFocus) with the object as
-     * parameter. FXFileSelector is one example.
-     * To avoid double references to the same foxObj from different Ruby objects,
-     * we decouple the foxObj from previoius ruby object and point to the new one.
-     */
-    DATA_PTR(desc->obj) = 0;
-    desc->obj=rubyObj;
-    desc->borrowed=false;
-    }
-  else{
-    if(FXMALLOC(&desc,FXRubyObjDesc,1)){
-      desc->obj=rubyObj;
-      desc->borrowed=false;
-      desc->in_gc=false;
-      int overwritten = st_insert(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t>(desc));
-      FXASSERT(!overwritten);
-      }
-    else{
-      FXASSERT(FALSE);
-      }
-    }
-  FXASSERT(FXRbGetRubyObj(foxObj,false)==rubyObj);
-  }
-
 /**
  * Remove this mapping between a Ruby instance and a C++ object
  */
@@ -332,20 +119,6 @@ void FXRbUnregisterRubyObj(const void* foxObj){
   FXRbUnregisterRubyObj2(foxObj, true);
 }
 
-void FXRbUnregisterRubyObj2(const void* foxObj, bool alsoOwned){
-  if(foxObj!=0){
-    FXRubyObjDesc* desc;
-    if(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
-      if( !alsoOwned && !desc->borrowed ) return;
-      FXTRACE((1,"FXRbUnregisterRubyObj(rubyObj=%p (%s),foxObj=%p)\n",(void *)desc->obj,safe_rb_obj_classname(desc->obj),foxObj));
-      DATA_PTR(desc->obj)=0;
-      FXFREE(&desc);
-      st_delete(FXRuby_Objects,reinterpret_cast<st_data_t *>(const_cast<void**>(&foxObj)),reinterpret_cast<st_data_t *>(0));
-      FXASSERT(st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(0))==0);
-      }
-    }
-  }
-
 void FXRbUnregisterBorrowedRubyObj(const void* foxObj){
   FXRbUnregisterRubyObj2( foxObj, false );
 };
@@ -380,18 +153,9 @@ VALUE to_ruby(const FXObject* obj){
  * Return the registered Ruby class instance associated with this
  * FOX object, or Qnil if not found.
  */
-VALUE FXRbGetRubyObj(const void *foxObj,bool alsoBorrowed, bool in_gc){
-  FXRubyObjDesc* desc;
-  if(foxObj!=0 && st_lookup(FXRuby_Objects,reinterpret_cast<st_data_t>(const_cast<void*>(foxObj)),reinterpret_cast<st_data_t *>(&desc))!=0){
-    FXASSERT(desc!=0);
-    if(alsoBorrowed || !desc->borrowed){
-      const char *classname = in_gc ? "in GC" : safe_rb_obj_classname(desc->obj);
-      FXTRACE((2,"FXRbGetRubyObj(foxObj=%p) => rubyObj=%p (%s)\n", foxObj, (void *)desc->obj, classname));
-      return desc->obj;
-      }
-    }
-  return Qnil;
-  }
+VALUE FXRbGetRubyObj(const void *foxObj,bool alsoBorrowed, bool in_gc_mark){
+  return FXRbObjRegistry::main.GetRubyObj(foxObj, alsoBorrowed, in_gc_mark);
+}
 
 /**
  * Return the registered Ruby class instance associated with this
@@ -438,7 +202,7 @@ void FXRbGcMark(void *obj){
      * example program works if you invoke the GC in ShutterWindow#create;
      * make sure that the shutter items' contents don't get blown away!
      */
-    VALUE value=FXRbGetRubyObj(obj,true, true);
+    VALUE value=FXRbGetRubyObj(obj, true, true);
     if(!NIL_P(value)){
       rb_gc_mark(value);
       }
@@ -522,7 +286,7 @@ VALUE FXRbMakeArray(const FXSegment* segments,FXuint nsegments){
 // Returns a Ruby array of FXColor values
 VALUE FXRbMakeColorArray(const FXColor* colors,FXint w,FXint h){
   VALUE result=rb_ary_new();
-  FXint size=w*h;
+  FXuint size=w*h;
   for(FXuint i=0; i<size; i++)
     rb_ary_push(result,to_ruby(colors[i]));
   return result;
@@ -575,7 +339,6 @@ FXColor *FXRbConvertToFXColors(VALUE string_or_ary, FXuint *opts){
  */
 static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector sel,void* ptr){
   FXTRACE((1,"FXRbConvertMessageData(%s(%p),FXSEL(%s,%d),%p)\n",sender->getClassName(),sender,FXDebugTarget::messageTypeName[FXSELTYPE(sel)],FXSELID(sel),ptr));
-  FXInputHandle fff;
   FXushort type=FXSELTYPE(sel);
   FXushort id=FXSELID(sel);
 
@@ -642,11 +405,6 @@ static VALUE FXRbConvertMessageData(FXObject* sender,FXObject* recv,FXSelector s
   else if(type==SEL_IO_READ ||
           type==SEL_IO_WRITE ||
 	  type==SEL_IO_EXCEPT){
-#ifdef WIN32
-    fff=reinterpret_cast<FXInputHandle>(ptr);
-#else
-    fff=static_cast<FXInputHandle>(reinterpret_cast<long>(ptr));
-#endif
     return Qnil;
     }
   else if(type==SEL_CLOSE ||
@@ -1368,6 +1126,10 @@ static VALUE handle_rescue(VALUE args,VALUE error){
   }
 
 
+// Should we catch exceptions thrown by message handlers?
+FXbool FXRbCatchExceptions=FALSE;
+
+
 // Call the designated function and return its result (which should be a long).
 long FXRbHandleMessage_gvlcb(FXObject* recv,ID func,FXObject* sender,FXSelector key,void* ptr){
   FXRbHandleArgs hArgs;
@@ -1805,6 +1567,94 @@ FXbool FXRbGLViewer::sortProc(FXfloat*& buffer,FXint& used,FXint& size){
   return TRUE;
   }
 
+/**
+ * FXRbConvertPtr() is just a wrapper around SWIG_ConvertPtr().
+ */
+
+void* FXRbConvertPtr(VALUE obj,swig_type_info* ty){
+  void *ptr;
+  SWIG_ConvertPtr(obj,&ptr,ty,1);
+  return ptr;
+  }
+
+
+// Returns an FXInputHandle for this Ruby file object
+FXInputHandle FXRbGetReadFileHandle(VALUE obj,FXuint mode) {
+  int fd;
+  fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
+#ifdef WIN32
+#ifdef __CYGWIN__
+  return (FXInputHandle) get_osfhandle(fd);
+#else
+  WSAEVENT hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+  long events = 0;
+  if(mode&INPUT_READ) events |= FD_READ|FD_ACCEPT|FD_OOB;
+  if(mode&INPUT_EXCEPT) events |= FD_CLOSE|FD_QOS|FD_GROUP_QOS|FD_ROUTING_INTERFACE_CHANGE|FD_ADDRESS_LIST_CHANGE;
+  if ( WSAEventSelect(_get_osfhandle(fd), hEvent, events) == SOCKET_ERROR ) {
+    WSACloseEvent( hEvent );
+    rb_raise( rb_eRuntimeError, "WSAEventSelect sockett error: %d", WSAGetLastError() );
+  }
+  rb_iv_set(obj, "FXRuby::FXRbGetReadFileHandle", ULL2NUM((intptr_t)hEvent));
+  return (FXInputHandle) hEvent;
+#endif
+#else
+  return (FXInputHandle) fd;
+#endif
+  }
+
+void FXRbRemoveReadFileHandle(VALUE obj,FXuint mode) {
+#ifdef WIN32
+  WSAEVENT hEvent = (HANDLE)NUM2ULL(rb_iv_get(obj, "FXRuby::FXRbGetReadFileHandle"));
+  CloseHandle( hEvent );
+#endif
+}
+
+// Returns an FXInputHandle for this Ruby file object
+FXInputHandle FXRbGetWriteFileHandle(VALUE obj,FXuint mode) {
+  int fd;
+#if defined(RUBINIUS)
+  VALUE vwrite = rb_intern("@write");
+  if(rb_ivar_defined(obj, vwrite)) obj = rb_ivar_get(obj, vwrite);
+  fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
+#elif defined(RUBY_1_8)
+  OpenFile *fptr;
+  GetOpenFile(obj, fptr);
+  FILE *fpw=GetWriteFile(fptr);
+  fd = fileno(fpw);
+#else
+  rb_io_t *fptr;
+  GetOpenFile(obj, fptr);
+  VALUE wrio = fptr->tied_io_for_writing;
+  if(wrio) obj = wrio;
+  fd = FIX2INT(rb_funcall(obj, rb_intern("fileno"), 0));
+#endif
+#ifdef WIN32
+#ifdef __CYGWIN__
+  return (FXInputHandle) get_osfhandle(fd);
+#else
+  WSAEVENT hEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+  long events = 0;
+  if(mode&INPUT_WRITE) events |= FD_WRITE|FD_CONNECT;
+  if(mode&INPUT_EXCEPT) events |= FD_CLOSE|FD_QOS|FD_GROUP_QOS|FD_ROUTING_INTERFACE_CHANGE|FD_ADDRESS_LIST_CHANGE;
+  if ( WSAEventSelect(_get_osfhandle(fd), hEvent, events) == SOCKET_ERROR ) {
+    WSACloseEvent( hEvent );
+    rb_raise( rb_eRuntimeError, "WSAEventSelect sockettt error: %d", WSAGetLastError() );
+  }
+  rb_iv_set(obj, "FXRuby::FXRbGetWriteFileHandle", ULL2NUM((intptr_t)hEvent));
+  return (FXInputHandle) hEvent;
+#endif
+#else
+  return (FXInputHandle) fd;
+#endif
+  }
+
+void FXRbRemoveWriteFileHandle(VALUE obj,FXuint mode) {
+#ifdef WIN32
+  WSAEVENT hEvent = (HANDLE)NUM2ULL(rb_iv_get(obj, "FXRuby::FXRbGetWriteFileHandle"));
+  CloseHandle( hEvent );
+#endif
+}
+
 //----------------------------------------------------------------------
 
 // Copied from the Ruby 1.8.6 sources (signal.c)
@@ -2128,7 +1978,6 @@ Init_fox16_c(void) {
   utf8_enc_idx = rb_enc_find_index("UTF-8");
 #endif
 
-  FXRuby_Objects=st_init_numtable();
   appSensitiveObjs=st_init_numtable();
   appSensitiveDCs=st_init_numtable();
   }