fxruby 1.6.41-x64-mingw32 → 1.6.45-x64-mingw32

data/lib/fox16/canvas.rb

@@ -133,6 +133,13 @@ module Fox
       # Default: make 6 control points
       def makeControlPoints
       end
+
+      protected def apply_dc(dc)
+        oldForeground = dc.foreground
+        dc.foreground = foreground
+        yield
+        dc.foreground = oldForeground
+      end
     end
 
     class ShapeGroup
@@ -191,29 +198,28 @@ module Fox
       end
 
       def draw(dc)
-        # Save old values
-        oldForeground = dc.foreground
-        oldLineWidth = dc.lineWidth
-        oldLineCap = dc.lineCap
-        oldLineJoin = dc.lineJoin
-        oldLineStyle = dc.lineStyle
-
-        # Set properties for this line
-        dc.foreground = foreground
-        dc.lineWidth = lineWidth
-        dc.lineCap = lineCap
-        dc.lineJoin = lineJoin
-        dc.lineStyle = lineStyle
-
-        # Draw the line
-        dc.drawLine(x1, y1, x2, y2)
-
-        # Restore old properties
-        dc.lineWidth = oldLineWidth
-        dc.lineCap = oldLineCap
-        dc.lineJoin = oldLineJoin
-        dc.lineStyle = oldLineStyle
-        dc.foreground = oldForeground
+        apply_dc(dc) do
+          # Save old values
+          oldLineWidth = dc.lineWidth
+          oldLineCap = dc.lineCap
+          oldLineJoin = dc.lineJoin
+          oldLineStyle = dc.lineStyle
+
+          # Set properties for this line
+          dc.lineWidth = lineWidth
+          dc.lineCap = lineCap
+          dc.lineJoin = lineJoin
+          dc.lineStyle = lineStyle
+
+          # Draw the line
+          dc.drawLine(x1, y1, x2, y2)
+
+          # Restore old properties
+          dc.lineWidth = oldLineWidth
+          dc.lineCap = oldLineCap
+          dc.lineJoin = oldLineJoin
+          dc.lineStyle = oldLineStyle
+        end
       end
     end
 
@@ -228,31 +234,42 @@ module Fox
       end
 
       def draw(dc)
-        oldForeground = dc.foreground
-        dc.foreground = foreground
-        dc.drawRectangle(x, y, width, height)
-        dc.foreground = oldForeground
+        apply_dc(dc) do
+          dc.lineWidth = 5 if selected?
+          dc.drawRectangle(x, y, width, height)
+        end
       end
     end
 
-    class TextShape < RectangleShape
+    class TextShape < Shape
 
       attr_reader :font, :text
+      attr_accessor :width, :height
 
       def initialize(x, y, w, h, text=nil)
-        super(x, y, w, h)
+        super(x, y)
+        @width = w
+        @height = h
         @text = text
         @font = FXApp.instance.normalFont
       end
 
       def draw(dc)
-        super(dc)
-        oldForeground = dc.foreground
-        oldTextFont = dc.font
-        dc.font = @font
-        dc.drawImageText(x, y, text)
-        dc.font = oldTextFont if oldTextFont
-        dc.foreground = oldForeground
+        old_foreground = dc.foreground
+        apply_dc(dc) do
+          if selected?
+            dc.lineWidth = 5
+            dc.drawRectangle(x - 3, y - 3, width + 6, height + 6)
+          end
+
+          old_background = dc.background
+          dc.background = old_foreground
+          oldTextFont = dc.font
+          dc.font = @font
+          dc.drawImageText(x, y + height, text)
+          dc.font = oldTextFont if oldTextFont
+          dc.background = old_foreground
+        end
       end
     end
 
@@ -274,14 +291,13 @@ module Fox
       end
 
       def draw(dc)
-        oldForeground = dc.foreground
-        oldLineWidth = dc.lineWidth
-        dc.foreground = foreground
-        dc.lineWidth = 5 if selected?
-        dc.drawArc(x, y, width, height,      0, 64*180)
-        dc.drawArc(x, y, width, height, 64*180, 64*360)
-        dc.foreground = oldForeground
-        dc.lineWidth = oldLineWidth
+        apply_dc(dc) do
+          oldLineWidth = dc.lineWidth
+          dc.lineWidth = 5 if selected?
+          dc.drawArc(x, y, width, height,      0, 64*180)
+          dc.drawArc(x, y, width, height, 64*180, 64*360)
+          dc.lineWidth = oldLineWidth
+        end
       end
     end
 
@@ -293,11 +309,26 @@ module Fox
       attr_accessor :image
 
       def initialize(x, y, image)
+        super(x, y)
         @image = image
       end
 
+      def width
+        @image.width
+      end
+
+      def height
+        @image.height
+      end
+
       def draw(dc)
-        dc.drawImage(image)
+        apply_dc(dc) do
+          if selected?
+            dc.lineWidth = 5
+            dc.drawRectangle(x - 3, y - 3, width + 5, height + 5)
+          end
+          dc.drawImage(image, x, y)
+        end
       end
     end
 

data/lib/fox16/glgroup.rb

@@ -9,7 +9,7 @@ module Fox
   # A group of OpenGL objects
   #
   class FXGLGroup < FXGLObject
-
+    include OpenGL if defined?(OpenGL)
     include Enumerable
 
     FLT_MAX =  1.0e+20
@@ -80,12 +80,12 @@ module Fox
     #
     def hit(viewer)
 #     GL.PushName(0xffffffff)
-      GL.PushName(1000000)
+      glPushName(1000000)
       @list.each_with_index do |obj, i|
-        GL.LoadName(i)
-	obj.hit(viewer)
+        glLoadName(i)
+        obj.hit(viewer)
       end
-      GL.PopName
+      glPopName
     end
 
     #

data/lib/fox16/glshapes.rb

@@ -9,6 +9,7 @@ module Fox
   # OpenGL point object
   #
   class FXGLPoint < FXGLObject
+    include OpenGL
 
     # Point position, in model coordinates (a 3-element array)
     attr_accessor :pos
@@ -47,20 +48,20 @@ module Fox
     # Draw this point into _viewer_ (an FXGLViewer instance).
     #
     def draw(viewer)
-      GL::Color(0.0, 0.0, 1.0)
-      GL::PointSize(HANDLE_SIZE)
-      GL::Begin(GL::POINTS)
-      GL::Vertex(@pos)
-      GL::End()
+      glColor3d(0.0, 0.0, 1.0)
+      glPointSize(HANDLE_SIZE)
+      glBegin(GL_POINTS)
+      glVertex3d(*@pos)
+      glEnd()
     end
 
     #
     # Perform hit test for this point in _viewer_ (an FXGLViewer instance).
     #
     def hit(viewer)
-      GL::Begin(GL::POINTS)
-      GL::Vertex(@pos)
-      GL::End()
+      glBegin(GL_POINTS)
+      glVertex3d(*@pos)
+      glEnd()
     end
   end
 
@@ -68,6 +69,7 @@ module Fox
   # OpenGL line object
   #
   class FXGLLine < FXGLObject
+    include OpenGL
 
     # Starting point for line [FXGLPoint]
     attr_accessor :fm
@@ -93,14 +95,14 @@ module Fox
     def initialize(*args)
       super()
       if args.length == 0
-	@fm = FXGLPoint.new(-0.5, 0.0, 0.0)
-	@to = FXGLPoint.new( 0.5, 0.0, 0.0)
+        @fm = FXGLPoint.new(-0.5, 0.0, 0.0)
+        @to = FXGLPoint.new( 0.5, 0.0, 0.0)
       elsif args.length == 1
-	@fm = args[0].fm
-	@to = args[0].to
+        @fm = args[0].fm
+        @to = args[0].to
       else
-	@fm = FXGLPoint.new(args[0], args[1], args[2])
-	@to = FXGLPoint.new(args[3], args[4], args[5])
+        @fm = FXGLPoint.new(args[0], args[1], args[2])
+        @to = FXGLPoint.new(args[3], args[4], args[5])
       end
     end
 
@@ -120,22 +122,22 @@ module Fox
     # Draw this line into _viewer_ (an FXGLViewer instance).
     #
     def draw(viewer)
-      GL::Color(1.0, 0.0, 0.0)
-      GL::PointSize(HANDLE_SIZE)
-      GL::Begin(GL::LINES)
-      GL::Vertex(@fm.pos)
-      GL::Vertex(@to.pos)
-      GL::End()
+      glColor3d(1.0, 0.0, 0.0)
+      glPointSize(HANDLE_SIZE)
+      glBegin(GL_LINES)
+      glVertex3d(*@fm.pos)
+      glVertex3d(*@to.pos)
+      glEnd()
     end
 
     #
     # Perform hit-test for this line in _viewer_ (an FXGLViewer instance).
     #
     def hit(viewer)
-      GL::Begin(GL::LINES)
-      GL::Vertex(@fm.pos)
-      GL::Vertex(@to.pos)
-      GL::End()
+      glBegin(GL_LINES)
+      glVertex3d(*@fm.pos)
+      glVertex3d(*@to.pos)
+      glEnd()
     end
   end
 
@@ -143,6 +145,7 @@ module Fox
   # OpenGL cube object
   #
   class FXGLCube < FXGLShape
+    include OpenGL
 
     # Cube width [Float]
     attr_accessor :width
@@ -173,17 +176,17 @@ module Fox
     #
     def initialize(*args)
       if args.length == 7
-	super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE,
+        super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE,
               args[6], args[6])
       else
-	super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE)
+        super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE)
       end
       @width = args[3] ? args[3] : 1.0
       @height = args[4] ? args[4] : 1.0
       @depth = args[5] ? args[5] : 1.0
       setRange(FXRangef.new(-0.5*@width, 0.5*@width,
-                           -0.5*@height, 0.5*@height,
-                           -0.5*@depth, 0.5*@depth))
+                          -0.5*@height, 0.5*@height,
+                          -0.5*@depth, 0.5*@depth))
     end
 
     #
@@ -195,58 +198,58 @@ module Fox
       zmin, zmax = -0.5*@depth, 0.5*@depth
 
       # Draw low face
-      GL::Begin(GL::TRIANGLE_STRIP)
-	GL::Normal(0.0, 0.0, -1.0)
-	GL::Vertex(xmin, ymin, zmin)
-	GL::Vertex(xmin, ymax, zmin)
-	GL::Vertex(xmax, ymin, zmin)
-	GL::Vertex(xmax, ymax, zmin)
-      GL::End()
+      glBegin(GL_TRIANGLE_STRIP)
+        glNormal3d(0.0, 0.0, -1.0)
+        glVertex3d(xmin, ymin, zmin)
+        glVertex3d(xmin, ymax, zmin)
+        glVertex3d(xmax, ymin, zmin)
+        glVertex3d(xmax, ymax, zmin)
+      glEnd()
 
       # Draw east face
-      GL::Begin(GL::TRIANGLE_STRIP)
-	GL::Normal(1.0, 0.0, 0.0)
-	GL::Vertex(xmax, ymin, zmin)
-	GL::Vertex(xmax, ymax, zmin)
-	GL::Vertex(xmax, ymin, zmax)
-	GL::Vertex(xmax, ymax, zmax)
-      GL::End()
+      glBegin(GL_TRIANGLE_STRIP)
+        glNormal3d(1.0, 0.0, 0.0)
+        glVertex3d(xmax, ymin, zmin)
+        glVertex3d(xmax, ymax, zmin)
+        glVertex3d(xmax, ymin, zmax)
+        glVertex3d(xmax, ymax, zmax)
+      glEnd()
 
       # Draw high face
-      GL::Begin(GL::TRIANGLE_STRIP)
-	GL::Normal(0.0, 0.0, 1.0)
-	GL::Vertex(xmax, ymin, zmax)
-	GL::Vertex(xmax, ymax, zmax)
-	GL::Vertex(xmin, ymin, zmax)
-	GL::Vertex(xmin, ymax, zmax)
-      GL::End()
+      glBegin(GL_TRIANGLE_STRIP)
+        glNormal3d(0.0, 0.0, 1.0)
+        glVertex3d(xmax, ymin, zmax)
+        glVertex3d(xmax, ymax, zmax)
+        glVertex3d(xmin, ymin, zmax)
+        glVertex3d(xmin, ymax, zmax)
+      glEnd()
 
       # Draw west face
-      GL::Begin(GL::TRIANGLE_STRIP)
-	GL::Normal(-1.0, 0.0, 0.0)
-	GL::Vertex(xmin, ymin, zmax)
-	GL::Vertex(xmin, ymax, zmax)
-	GL::Vertex(xmin, ymin, zmin)
-	GL::Vertex(xmin, ymax, zmin)
-      GL::End()
+      glBegin(GL_TRIANGLE_STRIP)
+        glNormal3d(-1.0, 0.0, 0.0)
+        glVertex3d(xmin, ymin, zmax)
+        glVertex3d(xmin, ymax, zmax)
+        glVertex3d(xmin, ymin, zmin)
+        glVertex3d(xmin, ymax, zmin)
+      glEnd()
 
       # Draw north face
-      GL::Begin(GL::TRIANGLE_STRIP)
-	GL::Normal(0.0, 1.0, 0.0)
-	GL::Vertex(xmin, ymax, zmin)
-	GL::Vertex(xmin, ymax, zmax)
-	GL::Vertex(xmax, ymax, zmin)
-	GL::Vertex(xmax, ymax, zmax)
-      GL::End()
+      glBegin(GL_TRIANGLE_STRIP)
+        glNormal3d(0.0, 1.0, 0.0)
+        glVertex3d(xmin, ymax, zmin)
+        glVertex3d(xmin, ymax, zmax)
+        glVertex3d(xmax, ymax, zmin)
+        glVertex3d(xmax, ymax, zmax)
+      glEnd()
 
       # Draw south face
-      GL::Begin(GL::TRIANGLE_STRIP)
-	GL::Normal(0.0, -1.0, 0.0)
-	GL::Vertex(xmin, ymin, zmax)
-	GL::Vertex(xmin, ymin, zmin)
-	GL::Vertex(xmax, ymin, zmax)
-	GL::Vertex(xmax, ymin, zmin)
-      GL::End()
+      glBegin(GL_TRIANGLE_STRIP)
+        glNormal3d(0.0, -1.0, 0.0)
+        glVertex3d(xmin, ymin, zmax)
+        glVertex3d(xmin, ymin, zmin)
+        glVertex3d(xmax, ymin, zmax)
+        glVertex3d(xmax, ymin, zmin)
+      glEnd()
     end
   end
 
@@ -254,6 +257,9 @@ module Fox
   # OpenGL cone object
   #
   class FXGLCone < FXGLShape
+    include OpenGL
+    include GLU
+
     # Cone fidelity
     SLICES_NUMBER = 20
     STACKS_NUMBER = 20
@@ -293,9 +299,9 @@ module Fox
     #
     def initialize(*args)
       if args.length == 5
-	super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE)
+        super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE)
       elsif args.length == 6
-	super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE,
+        super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE,
               args[5], args[5])
       end
       @height = args[3] ? args[3] : 1.0
@@ -310,15 +316,15 @@ module Fox
     # Draw this cone into _viewer_ (an FXGLViewer instance).
     #
     def drawshape(viewer)
-      quad = GLU::NewQuadric()
-      GLU::QuadricDrawStyle(quad, GLU::FILL)
-      GL::PushMatrix()
-      GL::Rotate(-90, 1, 0, 0)
-      GLU::Cylinder(quad, @radius, 0, @height, @slices, @stacks)
-      GLU::QuadricOrientation(quad, GLU::INSIDE)
-      GLU::Disk(quad, 0, @radius, @slices, @loops)
-      GLU::DeleteQuadric(quad)
-      GL::PopMatrix()
+      quad = gluNewQuadric()
+      gluQuadricDrawStyle(quad, GLU_FILL)
+      glPushMatrix()
+      glRotated(-90, 1, 0, 0)
+      gluCylinder(quad, @radius, 0, @height, @slices, @stacks)
+      gluQuadricOrientation(quad, GLU_INSIDE)
+      gluDisk(quad, 0, @radius, @slices, @loops)
+      gluDeleteQuadric(quad)
+      glPopMatrix()
     end
   end
 
@@ -326,6 +332,9 @@ module Fox
   # OpenGL cylinder object
   #
   class FXGLCylinder < FXGLShape
+    include OpenGL
+    include GLU
+
     # Cylinder fidelity
     SLICES_NUMBER = 20
     STACKS_NUMBER = 20
@@ -365,9 +374,9 @@ module Fox
     #
     def initialize(*args)
       if args.length == 5
-	super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE)
+        super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE)
       else
-	super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE,
+        super(args[0], args[1], args[2], SHADING_SMOOTH|STYLE_SURFACE,
               args[5], args[5])
       end
       @height = args[3] ? args[3] : 1.0
@@ -382,18 +391,18 @@ module Fox
     # Draw this cylinder into _viewer_ (an FXGLViewer instance).
     #
     def drawshape(viewer)
-      quad = GLU::NewQuadric()
-      GLU::QuadricDrawStyle(quad, GLU::FILL)
-      GL::PushMatrix()
-      GL::Rotate(-90, 1, 0, 0)
-      GLU::Cylinder(quad, @radius, @radius, @height, @slices, @stacks)
-      GLU::QuadricOrientation(quad, GLU::INSIDE)
-      GLU::Disk(quad, 0, @radius, @slices, @loops)
-      GL::Translate(0, 0, @height)
-      GLU::QuadricOrientation(quad, GLU::OUTSIDE)
-      GLU::Disk(quad, 0, @radius, @slices, @loops)
-      GL::PopMatrix()
-      GLU::DeleteQuadric(quad)
+      quad = gluNewQuadric()
+      gluQuadricDrawStyle(quad, GLU_FILL)
+      glPushMatrix()
+      glRotated(-90, 1, 0, 0)
+      gluCylinder(quad, @radius, @radius, @height, @slices, @stacks)
+      gluQuadricOrientation(quad, GLU_INSIDE)
+      gluDisk(quad, 0, @radius, @slices, @loops)
+      glTranslated(0, 0, @height)
+      gluQuadricOrientation(quad, GLU_OUTSIDE)
+      gluDisk(quad, 0, @radius, @slices, @loops)
+      glPopMatrix()
+      gluDeleteQuadric(quad)
     end
   end
 
@@ -401,6 +410,9 @@ module Fox
   # OpenGL sphere object
   #
   class FXGLSphere < FXGLShape
+    include OpenGL
+    include GLU
+
     # Sphere fidelity
     SLICES_NUMBER = 20
     STACKS_NUMBER = 20
@@ -448,10 +460,10 @@ module Fox
     # Draw this sphere into _viewer_ (an FXGLViewer instance).
     #
     def drawshape(viewer)
-      quad = GLU::NewQuadric()
-      GLU::QuadricDrawStyle(quad, GLU::FILL)
-      GLU::Sphere(quad, @radius, @slices, @stacks)
-      GLU::DeleteQuadric(quad)
+      quad = gluNewQuadric()
+      gluQuadricDrawStyle(quad, GLU_FILL)
+      gluSphere(quad, @radius, @slices, @stacks)
+      gluDeleteQuadric(quad)
     end
   end
 end

data/lib/fox16/version.rb

@@ -1,5 +1,5 @@
 module Fox
   def Fox.fxrubyversion
-    "1.6.41"
+    "1.6.45"
   end
 end

data/lib/fox16.rb

@@ -18,11 +18,9 @@ rescue LoadError
       end
     end
 
+    ruby_plat = RUBY_PLATFORM.gsub("i386", "x86")
     # Temporary add this directory for DLL search, so that bundled DLLs can be found.
-    ports_dir = RbConfig::CONFIG["host"].gsub('i686-pc-mingw32') do
-      major_minor < '2.0' ? 'i586-mingw32msvc' : 'i686-w64-mingw32'
-    end
-    ports_bin = File.expand_path("../../ports/#{ports_dir}/bin", __FILE__)
+    ports_bin = File.expand_path("../../ports/#{ruby_plat}/bin", __FILE__)
     add_dll_path.call(ports_bin) do
       require "#{major_minor}/fox16_c"
     end