fxruby 1.6.38-x86-mingw32 → 1.6.43-x86-mingw32

data/examples/glviewer.rb

@@ -7,16 +7,15 @@ begin
 rescue LoadError
   require 'fox16/missingdep'
   MSG = <<EOM
-  Sorry, this example depends on the OpenGL extension. Please
-  check the Ruby Application Archives for an appropriate
-  download site.
+  Sorry, this example depends on the opengl-bindings gems. Please execute:
+    gem install opengl-bindings
 EOM
   missingDependency(MSG)
 end
 
-include Fox
+class TabBook < Fox::FXTabBook
+  include Fox
 
-class TabBook < FXTabBook
   def createAnglesPage(panels, mdiclient)
     # Angles tab
     FXTabItem.new(panels,
@@ -143,8 +142,8 @@ class TabBook < FXTabBook
   end
 end
 
-class GLViewWindow < FXMainWindow
-
+class GLViewWindow < Fox::FXMainWindow
+  include Fox
   include Responder
 
   ID_QUERY_MODE = FXMainWindow::ID_LAST
@@ -162,6 +161,9 @@ class GLViewWindow < FXMainWindow
     # Initialize base class first
     super(app, "OpenGL Example Application", :opts => DECOR_ALL, :width => 800, :height => 600)
 
+    OpenGL.load_lib
+    GLU.load_lib
+
     # Define message identifiers for this class
 
     # Set up the message map
@@ -481,6 +483,8 @@ class GLViewWindow < FXMainWindow
     sphere  = FXGLSphere.new(1.0, 1.0, 0.0, 0.5)
     sphere2 = FXGLSphere.new(0.0, 0.0, 0.0, 0.8)
     sphere.tipText = "Sphere"
+    gp2.append(FXGLLine.new(-2.0, 0.0, 0.0,  -1.0, 1.0, 1.0))
+    gp2.append(FXGLPoint.new(-2.0, 0.0, 0.0))
     gp2.append(FXGLCube.new(-1.0, 0.0, 0.0,  1.0, 1.0, 1.0))
     gp2.append(FXGLCube.new( 1.0, 0.0, 0.0,  1.0, 1.0, 1.0))
     gp2.append(FXGLCube.new( 0.0,-1.0, 0.0,  1.0, 1.0, 1.0))
@@ -556,7 +560,7 @@ end
 
 if __FILE__ == $0
   # Make application
-  application = FXApp.new("GLViewer", "FoxTest")
+  application = Fox::FXApp.new("GLViewer", "FoxTest")
   application.threadsEnabled = false
 
   # Make window

data/examples/inputs.rb

@@ -21,6 +21,7 @@ class InputHandlerWindow < FXMainWindow
 
     # Output will be displayed in a multiline text area
     @cmdOutput = FXText.new(textFrame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
+    @cmdInput.text = "ping rubyinstaller.org"
 
     # Initialize the pipe
     @pipe = nil
@@ -30,6 +31,7 @@ class InputHandlerWindow < FXMainWindow
   def create
     super
     show(PLACEMENT_SCREEN)
+    @cmdInput.setFocus
   end
 
   # Remove previous input (if any)
@@ -54,11 +56,14 @@ class InputHandlerWindow < FXMainWindow
     getApp().addInput(@pipe, INPUT_READ|INPUT_EXCEPT) do |sender, sel, ptr|
       case FXSELTYPE(sel)
       when SEL_IO_READ
-        text = @pipe.read_nonblock(256)
-        if text && text.length > 0
-          @cmdOutput.appendText(text)
-        else
+        begin
+          text = @pipe.read_nonblock(256)
+        rescue IO::WaitReadable
+        rescue EOFError
+          @cmdOutput.appendText("[EOF]")
           closePipe
+        else
+          @cmdOutput.appendText(text)
         end
       when SEL_IO_EXCEPT
         #         puts 'onPipeExcept'

data/examples/pig.rb

@@ -47,9 +47,8 @@ class PigBox < FXMainWindow
       theLabel.layoutHints = LAYOUT_FILL_X
     end
 
-    FXTextField.new(top, 20, @text, FXDataTarget::ID_VALUE) do |theTextField|
+    @theTextField = FXTextField.new(top, 20, @text, FXDataTarget::ID_VALUE) do |theTextField|
       theTextField.layoutHints = LAYOUT_FILL_X
-      theTextField.setFocus()
     end
 
     FXButton.new(top, 'Pig It') do |pigButton|
@@ -66,6 +65,7 @@ class PigBox < FXMainWindow
   def create
     super
     show(PLACEMENT_SCREEN)
+    @theTextField.setFocus
   end
 end
 

data/examples/unicode.rb

@@ -1,36 +1,15 @@
 #!/usr/bin/env ruby
+# -*- encoding: UTF-8 -*-
 
 require 'fox16'
-require 'jcode'
-
-$KCODE = 'UTF8'
-
-class UString < String
-  # Show u-prefix as in Python
-  def inspect; "u#{ super }" end
-
-  # Count multibyte characters
-  def length; self.scan(/./).length end
-
-  # Reverse the string
-  def reverse; self.scan(/./).reverse.join end
-end
-
-module Kernel
-  def u( str )
-    UString.new str.gsub(/U\+([0-9a-fA-F]{4,4})/u){["#$1".hex ].pack('U*')}
-  end
-end
-
-include Fox
 
 # Pass UTF-8 encoded Unicode strings to FXRuby.
-label = u"Les enfants vont U+00E0 l'U+00E9cole.\nLa boulangU+00E8re vend-elle le pain en aoU+00FBt?"
+label = "Les enfants vont \u00E0 l'\u00E9cole.\nLa boulang\u00E8re vend-elle le pain en ao\u00FBt?"
 
-FXApp.new("Unicode Example", "FoxTest") do |app|
-  main = FXMainWindow.new(app, "Unicode Text", nil, nil, DECOR_ALL)
-  FXLabel.new(main, label)
+Fox::FXApp.new("Unicode Example", "FoxTest") do |app|
+  main = Fox::FXMainWindow.new(app, "Unicode Text", nil, nil, Fox::DECOR_ALL)
+  Fox::FXLabel.new(main, label)
   app.create
-  main.show(PLACEMENT_SCREEN)
+  main.show(Fox::PLACEMENT_SCREEN)
   app.run
 end

data/ext/fox16_c/FXRbApp.cpp

@@ -26,12 +26,6 @@
 
 #include "FXRbCommon.h"
 
-#if defined(RUBY_1_8)
-extern "C" {
-#include "rubysig.h" /* For CHECK_INTS */
-}
-#endif
-
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h> /* For struct timeval */
 #endif
@@ -85,7 +79,7 @@ void FXRbApp::setThreadsEnabled(FXbool enabled){
       interrupt_event = CreateEvent(NULL, TRUE, FALSE, NULL);
       addInput(interrupt_event,INPUT_READ,this,ID_CHORE_THREADS);
 #else
-      pipe(interrupt_fds);
+      if(pipe(interrupt_fds) == -1) rb_fatal("failed to allocate pipe for interrupt events");
       fcntl(interrupt_fds[0], F_SETFL, O_NONBLOCK);
       addInput(interrupt_fds[0],INPUT_READ,this,ID_CHORE_THREADS);
 #endif
@@ -130,7 +124,7 @@ long FXRbApp::onChoreThreads(FXObject *obj,FXSelector sel,void *p){
 #else
   char byte;
   // clear the pipe
-  read(interrupt_fds[0], &byte, 1);
+  if(read(interrupt_fds[0], &byte, 1) != 1) rb_fatal("failed to read from pipe for interrupt events");
 #endif
 #endif
   return FXRbApp_onChoreThreads(this, obj, sel, p);
@@ -149,15 +143,7 @@ long FXRbApp::onChoreThreads_gvlcb(FXObject*,FXSelector,void*){
   wait.tv_sec=0;
   wait.tv_usec=100*sleepTime;
 
-  // Confirm that this thread can be interrupted, then go to sleep
-#if defined(RUBY_1_8)
-  CHECK_INTS;
-  if(!rb_thread_critical)
-    rb_thread_wait_for(wait);
-#else
-  // if(!rb_thread_critical) rb_thread_wait_for(wait);
   rb_thread_wait_for(wait);
-#endif /* RUBY_1_8 */
 
   // Re-register this chore for next time
   addChore(this,ID_CHORE_THREADS);
@@ -172,7 +158,7 @@ void fxrb_wakeup_fox(void *){
 #ifdef WIN32
   SetEvent(FXRbApp::interrupt_event);
 #else
-  write(FXRbApp::interrupt_fds[1], "X", 1);
+  if(write(FXRbApp::interrupt_fds[1], "X", 1) != 1) rb_fatal("failed to write to pipe for interrupt events");
 #endif
   }
 #endif

data/ext/fox16_c/FXRuby.cpp

@@ -43,20 +43,9 @@
 #include <signal.h>	// for definitions of SIGINT, etc.
 #endif
 
-#if defined(RUBY_1_8)
-
-extern "C" {
-#include "st.h"
-#include "rubyio.h"     // for GetOpenFile(), etc.
-}
-
-#else
-
 #include "ruby/io.h"
 #include "ruby/st.h"
 
-#endif /* RUBY_1_8 */
-
 
 // Opaque type declaration from SWIG runtime
 struct swig_type_info;
@@ -130,7 +119,7 @@ void FXRbUnregisterRubyObj(const void* foxObj){
  * These objects are allocated by FXRuby on the heap.
  * They are free'd when the FXRuby wrapper is GC'ed and no other reference to the object exists.
  * They are registered in FXRbObjRegistry as owned object.
- * Tey are built per FXRbRegisterRubyObj().
+ * They are built per FXRbRegisterRubyObj().
  *
  * Borrowed objects :
  * These objects are allocated by libfox on the heap.
@@ -145,7 +134,7 @@ void FXRbUnregisterRubyObj(const void* foxObj){
  * They are wrapped for the time of one callback only, because stack memory is free'd afterwards.
  * They are not registered in FXRbObjRegistry, but stored on the stack only.
  * Therefore callback objects aren't re-used, but newly wrapped for each call.
- * This is for arguments to ruby blocks.
+ * The same goes for arguments to ruby blocks.
  * They are built per FXGetRubyObjCb().
  */
 
@@ -929,7 +918,6 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
     case SEL_CLICKED:
     case SEL_DOUBLECLICKED:
     case SEL_TRIPLECLICKED:
-    case SEL_CHANGED:
     case SEL_DESELECTED:
     case SEL_SELECTED:
     case SEL_INSERTED:
@@ -1045,7 +1033,7 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
           return NULL;
         case FXWindow::ID_HSCROLLED:
         case FXWindow::ID_VSCROLLED:
-          return reinterpret_cast<void*>(static_cast<unsigned long>(NUM2UINT(value)));
+          return reinterpret_cast<void*>(static_cast<long>(NUM2INT(value)));
         case FXWindow::ID_SETINTVALUE:
           if(obj->isMemberOf(FXMETACLASS(FXColorWell))){
             colorValue=NUM2UINT(value);
@@ -1086,9 +1074,16 @@ void* FXRbGetExpectedData(VALUE recv,FXSelector key,VALUE value){
 	  if(obj->isMemberOf(FXMETACLASS(FXPicker))){
 			SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXPoint *"),1);
 			return ptr;
-	    }
-		return 0;
     }
+    if(obj->isMemberOf(FXMETACLASS(FXWindow))){
+      switch(id){
+        case FXWindow::ID_HSCROLLED:
+        case FXWindow::ID_VSCROLLED:
+          return reinterpret_cast<void*>(static_cast<long>(NUM2INT(value)));
+      }
+    }
+    return 0;
+  }
 
 	if(type==SEL_DRAGGED){
 	    SWIG_ConvertPtr(value,&ptr,FXRbTypeQuery("FXEvent *"),1);
@@ -1190,8 +1185,8 @@ long FXRbHandleMessage_gvlcb(FXObject* recv,ID func,FXObject* sender,FXSelector
   FXTRACE((100,"FXRbHandleMessage(recv=%p(%s),FXSEL(%s,%d)\n",recv,recv->getClassName(),FXDebugTarget::messageTypeName[FXSELTYPE(key)],FXSELID(key)));
 
   if(FXRbCatchExceptions){
-    retval=rb_rescue2((VALUE(*)(ANYARGS)) handle_body, reinterpret_cast<VALUE>(&hArgs),
-                      (VALUE(*)(ANYARGS)) handle_rescue, Qnil,
+    retval=rb_rescue2(RUBY_VALUE_METHOD_FUNC(handle_body), reinterpret_cast<VALUE>(&hArgs),
+                      RUBY_VALUE_METHOD_FUNC(handle_rescue), Qnil,
                       rb_eStandardError, rb_eNameError, 0);
     }
   else{
@@ -1237,9 +1232,9 @@ void FXRbRange2LoHi(VALUE range,FXint& lo,FXint& hi){
     rb_raise(rb_eTypeError,"wrong argument type %s (expected %s)",rb_class2name(CLASS_OF(range)),rb_class2name(rb_cRange));
     }
   else{
-    VALUE beg=rb_funcall(range,id_begin,0,NULL);
-    VALUE end=rb_funcall(range,id_end,0,NULL);
-    VALUE excl=rb_funcall(range,id_exclude_endp,0,NULL);
+    VALUE beg=rb_funcall(range,id_begin,0);
+    VALUE end=rb_funcall(range,id_end,0);
+    VALUE excl=rb_funcall(range,id_exclude_endp,0);
     lo=NUM2INT(beg);
     hi=NUM2INT(end);
     if(excl==Qtrue){
@@ -1253,9 +1248,9 @@ void FXRbRange2LoHi(VALUE range,FXdouble& lo,FXdouble& hi){
     rb_raise(rb_eTypeError,"wrong argument type %s (expected %s)",rb_class2name(CLASS_OF(range)),rb_class2name(rb_cRange));
     }
   else{
-    VALUE beg=rb_funcall(range,id_begin,0,NULL);
-    VALUE end=rb_funcall(range,id_end,0,NULL);
-    VALUE excl=rb_funcall(range,id_exclude_endp,0,NULL);
+    VALUE beg=rb_funcall(range,id_begin,0);
+    VALUE end=rb_funcall(range,id_end,0);
+    VALUE excl=rb_funcall(range,id_exclude_endp,0);
     lo=NUM2DBL(beg);
     hi=NUM2DBL(end);
     if(excl==Qtrue){
@@ -1270,13 +1265,13 @@ void FXRbCallVoidMethod_gvlcb(FXObject* recv, const char *func) {
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   FXASSERT(!FXRbIsInGC(recv));
-  rb_funcall(obj,rb_intern(func),0,NULL);
+  rb_funcall(obj,rb_intern(func),0);
   }
 
 void FXRbCallVoidMethod_gvlcb(FXDC* recv,const char *func) {
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  rb_funcall(obj,rb_intern(func),0,NULL);
+  rb_funcall(obj,rb_intern(func),0);
   }
 
 //----------------------------------------------------------------------
@@ -1284,7 +1279,7 @@ void FXRbCallVoidMethod_gvlcb(FXDC* recv,const char *func) {
 bool FXRbCallBoolMethod_gvlcb(const FXObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE v=rb_funcall(obj,rb_intern(func),0,NULL);
+  VALUE v=rb_funcall(obj,rb_intern(func),0);
   return (v==Qtrue);
   }
 
@@ -1294,7 +1289,7 @@ bool FXRbCallBoolMethod_gvlcb(const FXObject* recv,const char *func){
 FXint FXRbCallIntMethod_gvlcb(const FXObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0);
   return static_cast<FXint>(NUM2INT(result));
   }
 
@@ -1304,7 +1299,7 @@ FXint FXRbCallIntMethod_gvlcb(const FXObject* recv,const char *func){
 FXGLObject* FXRbCallGLObjectMethod_gvlcb(FXGLObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0);
   return NIL_P(result) ? 0 : reinterpret_cast<FXGLObject*>(DATA_PTR(result));
   }
 
@@ -1392,7 +1387,7 @@ FXIcon* FXRbCallIconMethod_gvlcb(const FXTableItem* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
 	if(!NIL_P(obj)){
-	  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
+	  VALUE result=rb_funcall(obj,rb_intern(func),0);
 	  return NIL_P(result) ? 0 : reinterpret_cast<FXIcon*>(DATA_PTR(result));
 		}
 	else{
@@ -1415,7 +1410,7 @@ FXWindow* FXRbCallWindowMethod_gvlcb(const FXTableItem* recv,const char *func,FX
 FXRangef FXRbCallRangeMethod_gvlcb(FXObject* recv,const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0);
   return *reinterpret_cast<FXRangef*>(DATA_PTR(result));
   }
 
@@ -1425,7 +1420,7 @@ FXRangef FXRbCallRangeMethod_gvlcb(FXObject* recv,const char *func){
 FXString FXRbCallStringMethod_gvlcb(const FXObject* recv, const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0);
   return FXString(StringValuePtr(result));
   }
 
@@ -1452,7 +1447,7 @@ const FXchar* FXRbCallCStringMethod_gvlcb(const FXObject* recv, const char *func
 FXwchar FXRbCallWCharMethod_gvlcb(const FXObject* recv, const char *func){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
-  VALUE result=rb_funcall(obj,rb_intern(func),0,NULL);
+  VALUE result=rb_funcall(obj,rb_intern(func),0);
   return static_cast<FXwchar>(NUM2ULONG(result));
   }
 
@@ -1483,7 +1478,7 @@ FXRbMenuCommand::~FXRbMenuCommand(){
         }
       }
     }
-  acckey=(FXHotKey)NULL;
+  acckey=(FXHotKey)0;
   FXRbUnregisterRubyObj(this);
   }
 
@@ -1499,7 +1494,7 @@ FXRbMenuCheck::~FXRbMenuCheck(){
         }
       }
     }
-  acckey=(FXHotKey)NULL;
+  acckey=(FXHotKey)0;
   FXRbUnregisterRubyObj(this);
   }
 
@@ -1515,7 +1510,7 @@ FXRbMenuRadio::~FXRbMenuRadio(){
         }
       }
     }
-  acckey=(FXHotKey)NULL;
+  acckey=(FXHotKey)0;
   FXRbUnregisterRubyObj(this);
   }
 
@@ -1656,11 +1651,6 @@ FXInputHandle FXRbGetWriteFileHandle(VALUE obj,FXuint mode) {
   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);
@@ -1897,7 +1887,7 @@ void FXRbUnregisterAppSensitiveObject(FXDC* dc){
   FXASSERT(st_lookup(appSensitiveDCs,reinterpret_cast<st_data_t>(dc),reinterpret_cast<st_data_t *>(0))==0);
   }
 
-static int st_cbfunc_obj(st_data_t key,st_data_t,st_data_t arg,int){
+static int st_cbfunc_obj(st_data_t key,st_data_t,st_data_t arg){
   FXASSERT(key!=0);
   FXASSERT(arg!=0);
   FXObjectListOf<FXObject> *pObjectList=reinterpret_cast<FXObjectListOf<FXObject>*>(arg);
@@ -1906,7 +1896,7 @@ static int st_cbfunc_obj(st_data_t key,st_data_t,st_data_t arg,int){
   return 0;
   }
 
-static int st_cbfunc_dc(st_data_t key,st_data_t,st_data_t arg,int){
+static int st_cbfunc_dc(st_data_t key,st_data_t,st_data_t arg){
   FXASSERT(key!=0);
   FXASSERT(arg!=0);
   FXArray<FXDC*> *pDCArray=reinterpret_cast<FXArray<FXDC*>*>(arg);
@@ -1919,7 +1909,7 @@ void FXRbDestroyAppSensitiveObjects(){
   FXTRACE((100,"%s:%d: Begin destroying objects that hold references to the FXApp...\n",__FILE__,__LINE__));
 
   FXObjectListOf<FXObject> objs;
-  st_foreach(appSensitiveObjs,reinterpret_cast<int (*)(ANYARGS)>(st_cbfunc_obj),reinterpret_cast<st_data_t>(&objs));
+  st_foreach(appSensitiveObjs,RUBY_INT_METHOD_FUNC(st_cbfunc_obj),reinterpret_cast<st_data_t>(&objs));
   for(FXint i=0;i<objs.no();i++){
     if(objs[i]->isMemberOf(FXMETACLASS(FXRbCursor))){
       if(dynamic_cast<FXRbCursor*>(objs[i])->ownedByApp)
@@ -1949,7 +1939,7 @@ void FXRbDestroyAppSensitiveObjects(){
     }
 
   FXArray<FXDC*> dcs;
-  st_foreach(appSensitiveDCs,reinterpret_cast<int (*)(ANYARGS)>(st_cbfunc_dc),reinterpret_cast<st_data_t>(&dcs));
+  st_foreach(appSensitiveDCs,RUBY_INT_METHOD_FUNC(st_cbfunc_dc),reinterpret_cast<st_data_t>(&dcs));
   for(FXint j=0;j<dcs.no();j++){
     delete dcs[j];
     }