fxruby 1.6.19 → 1.6.20

data/ext/fox16/include/FXRbXPMImage.h

@@ -1,6 +1,6 @@
 /***********************************************************************
  * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
- * Copyright (c) 2001-2003 by J. Lyle Johnson. All Rights Reserved.
+ * Copyright (c) 2001-2009 by Lyle Johnson. All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * For further information please contact the author by e-mail
- * at "lyle@users.sourceforge.net".
+ * at "lyle@lylejohnson.name".
  ***********************************************************************/
 
 /***********************************************************************

data/ext/fox16/include/FXRuby.h

@@ -1,6 +1,6 @@
 /***********************************************************************
  * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
- * Copyright (c) 2001-2003 by J. Lyle Johnson. All Rights Reserved.
+ * Copyright (c) 2001-2009 by Lyle Johnson. All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * For further information please contact the author by e-mail
- * at "lyle@users.sourceforge.net".
+ * at "lyle@lylejohnson.name".
  ***********************************************************************/
 
 /***********************************************************************

data/ext/fox16/include/impl.h

@@ -1,6 +1,6 @@
 /***********************************************************************
  * FXRuby -- the Ruby language bindings for the FOX GUI toolkit.
- * Copyright (c) 2001-2003 by J. Lyle Johnson. All Rights Reserved.
+ * Copyright (c) 2001-2009 by Lyle Johnson. All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * For further information please contact the author by e-mail
- * at "lyle@users.sourceforge.net".
+ * at "lyle@lylejohnson.name".
  ***********************************************************************/
 
 FXRbIMPLEMENT(FXRb4Splitter,FX4Splitter,NULL,0)

data/ext/fox16/make_impl.rb

@@ -0,0 +1,121 @@
+#!/bin/env ruby
+
+$special_stubclasses = ["FXGLSHAPE", "FXICONITEM", "FXTABLE", "FXTABLEITEM", "FXTREEITEM"]
+
+class Processor
+  def initialize
+    @inside_class = false
+  end
+
+  def inside_class?
+    @inside_class
+  end
+
+  def getBaseClassName(klass) 
+    klass.sub(/FXRb/, "FX")
+  end
+
+  def start_class(classname, baseclass)
+  end
+
+  def end_class
+  end
+
+  def process(filename)
+    begin
+      File.open(filename, "rb") do |f|
+	@inside_class = false
+	f.readlines.each do |line|
+	  if inside_class?
+	    if line =~ /^  \};/
+	      @inside_class = false
+	      end_class
+	    else
+	      process_line(line)
+	    end
+	  else
+	    if line =~ /^class/
+	      classname = line.split.at(1)
+	      start_class(classname, getBaseClassName(classname))
+	      @inside_class = true
+	    end
+	  end
+	end
+      end
+    ensure
+      @inside_class = false
+    end
+  end
+end
+
+class MyProcessor < Processor
+  def initialize(fcpp, finc)
+    @fcpp = fcpp
+    @finc = finc
+    @classname = nil
+    @baseclass = nil
+  end
+  
+  def start_class(classname, baseclass)
+    @classname = classname
+    @baseclass = baseclass
+    if classname == "FXRbScintilla"
+      @fcpp.puts "#ifdef WITH_FXSCINTILLA\n\n"
+      @finc.puts "#ifdef WITH_FXSCINTILLA\n\n"
+    end
+    @fcpp.printf("/* Start stub implementations for class %s */\n", classname)
+    @finc.printf("/* Start stub declarations for class %s */\n", classname)
+  end
+  
+  def implement_overrides(filename)
+    stubclass = filename.gsub('"', '').sub("FXRb", "FX")
+    stubclass = stubclass.sub(/Virtuals\.h/, "").upcase
+    unless $special_stubclasses.include? stubclass
+      @fcpp.printf("IMPLEMENT_%s_STUBS(%s)\n", stubclass, @classname)
+    else
+      @fcpp.printf("IMPLEMENT_%s_STUBS(%s,%s)\n", stubclass, @classname, @baseclass)
+    end
+  end
+  
+  def implement_stubs(filename)
+    stubclass = filename.gsub('"', '').sub("FXRb", "FX")
+    stubclass = stubclass.sub(/Virtuals\.h/, "").upcase
+    unless $special_stubclasses.include? stubclass
+      @finc.printf("DECLARE_%s_STUBS(%s)\n", stubclass, @baseclass)
+    else
+      @finc.printf("DECLARE_%s_STUBS(%s,%s)\n", stubclass, @baseclass, @classname)
+    end
+  end
+
+  def process_line(line)
+    if line =~ /^#include/
+      words = line.split()
+      incfile = words[1]
+      implement_overrides(incfile)
+      implement_stubs(incfile)
+    end
+  end
+  
+  def end_class
+    if @classname == "FXRbScintilla"
+      @fcpp.puts "\n#endif"
+      @finc.puts "\n#endif"
+    end
+    @fcpp.puts ""
+    @finc.puts ""
+    @classname = nil
+    @baseclass = nil
+  end
+end
+
+fcpp = File.new('impl.cpp', 'wb')
+finc = File.new('./include/inlinestubs.h', 'wb')
+fcpp.puts '#include "FXRbCommon.h"'
+Dir.glob("./include/FX*.h").sort.each do |file|
+  unless file =~ /BitmapView/
+    MyProcessor.new(fcpp, finc).process(file)
+  end
+end
+finc.close
+fcpp.close
+

data/lib/fox16.rb

@@ -0,0 +1,8 @@
+if RUBY_PLATFORM =~ /(mswin|mingw)/i
+  require "#{RUBY_VERSION.sub(/\.\d+$/, '')}/fox16.so"
+elsif RUBY_PLATFORM =~ /darwin/
+  require "fox16.bundle"
+else
+  require "fox16.so"
+end
+

data/lib/fox16/bitmapview.rb

@@ -0,0 +1,223 @@
+module Fox
+  #
+  # The FXBitmapView widget displays a scrollable view of a bitmap.
+  #
+  # === Bitmap alignment styles
+  #
+  # +BITMAPVIEW_NORMAL+::	Normal mode is centered
+  # +BITMAPVIEW_CENTER_X+::	Centered horizontally
+  # +BITMAPVIEW_LEFT+::		Left-aligned
+  # +BITMAPVIEW_RIGHT+::	Right-aligned
+  # +BITMAPVIEW_CENTER_Y+::	Centered vertically
+  # +BITMAPVIEW_TOP+::		Top-aligned
+  # +BITMAPVIEW_BOTTOM+::	Bottom-aligned
+  #
+  # === Events
+  #
+  # +SEL_RIGHTBUTTONPRESS+::	sent when the right mouse button goes down; the message data is an FXEvent instance.
+  # +SEL_RIGHTBUTTONRELEASE+::	sent when the right mouse button goes up; the message data is an FXEvent instance.
+  #
+  class FXBitmapView < FXScrollArea
+  
+    # Bitmap alignment styles
+    BITMAPVIEW_NORMAL    = 0          # Normal mode is centered
+    BITMAPVIEW_CENTER_X  = 0          # Centered horizontally
+    BITMAPVIEW_LEFT      = 0x00100000 # Left-aligned
+    BITMAPVIEW_RIGHT     = 0x00200000 # Right-aligned
+    BITMAPVIEW_CENTER_Y  = 0,         # Centered vertically
+    BITMAPVIEW_TOP       = 0x00400000 # Top-aligned
+    BITMAPVIEW_BOTTOM    = 0x00800000 # Bottom-aligned
+
+    #
+    # Return an initialized FXBitmapView instance.
+    #
+    def initialize(p, bmp=nil, tgt=nil, sel=0, opts=0, x=0, y=0, w=0, h=0) # :yields: theBitmapView
+      super(p, opts, x, y, w, h)
+      self.flags |= FLAG_ENABLED
+      self.target = tgt
+      self.message = sel
+      @bitmap = bmp
+      @onColor = FXRGB(0, 0, 0)
+      @offColor = backColor
+      @grabx = 0
+      @graby = 0
+    end
+
+    def create
+      super
+      bitmap.create unless bitmap.nil?
+    end
+
+    def detach
+      super
+      bitmap.detach unless bitmap.nil?
+    end
+
+    def canFocus
+      true
+    end
+
+    def getContentWidth
+      bitmap.nil? 1 : bitmap.width
+    end
+
+    def getContentHeight
+      bitmap.nil? 1 : bitmap.height
+    end
+
+    def layout
+      super
+      update
+      self.flags &= ~FLAG_DIRTY
+    end
+
+    # Handle expose (paint) event
+    def onPaint(sender, sel, event)
+      FXDCWindow.new(self, event) do |dc|
+        unless bitmap.nil?
+          ww = bitmap.width
+          hh = bitmap.height
+          xx = pos_x
+          yy = pos_y
+          if ww < viewport_w
+            if (options & BITMAPVIEW_LEFT) != 0
+              xx = 0
+            elsif (options & BITMAPVIEW_RIGHT) != 0
+              xx = viewport_w - ww
+            else
+              xx = (viewport_w - ww)/2
+            end
+          end
+          if hh < viewport_h
+            if (options & BITMAPVIEW_TOP) != 0
+              yy = 0
+            elsif (options & BITMAPVIEW_BOTTOM) != 0
+              yy = viewport_h - hh
+            else
+              yy = (viewport_h - hh)/2
+            end
+          end
+          dc.foreground = onColor
+          dc.background = offColor
+          dc.drawBitmap(bitmap, xx, yy)
+          dc.foreground = backColor
+          xl = xx; xr = xx + ww
+          yt = yy; yb = yy + hh
+          xl = 0 if (xl < 0)
+          xr = viewport_w if (xr > viewport_w)
+          yt = 0 if (yt < 0)
+          yb = viewport_h if (yb > viewport_h)
+          dc.fillRectangle(0, 0, xr, yt)
+          dc.fillRectangle(0, yt, xl, viewport_h - yt)
+          dc.fillRectangle(xr, 0, viewport_w - xr, yb)
+          dc.fillRectangle(xl, yb, viewport_w - xl, viewport_h - yb)
+        else
+          dc.foreground = backColor
+          dc.fillRectangle(0, 0, width, height)
+        end
+      end
+    end
+
+    # Handle right mouse button press
+    def onRightBtnPress(sender, sel, ev)
+      self.flags &= ~FLAG_TIP
+      handle(self, FXSEL(SEL_FOCUS_SELF, 0), ev)
+      if enabled?
+        grab
+        if target && target.handle(self, FXSEL(SEL_RIGHTBUTTONPRESS, message), ev) != 0
+          return 1
+        end
+        self.flags &= ~FLAG_UPDATE
+        self.flags |= FLAG_PRESSED|FLAG_SCROLLING
+        @grabx = ev.win_x - pos_x
+        @graby = ev.win_y - pos_y
+        return 1
+      end
+      return 0
+    end
+
+    # Handle right mouse button release
+    def onRightBtnRelease(sender, sel, ev)
+      if enabled?
+        ungrab
+        self.flags &= ~(FLAG_PRESSED|FLAG_SCROLLING)
+        self.flags |= FLAG_UPDATE
+        if target && target.handle(self, FXSEL(SEL_RIGHTBUTTONPRESS, message), ev) != 0 
+          return 1
+        end
+        return 1
+      end
+      return 0
+    end
+
+    # Handle real or simulated mouse motion
+    def onMotion(sender, sel, ev)
+      if (flags & FLAG_SCROLLING) != 0
+        setPosition(ev.win_x - @grabx, ev.win_y - @graby)
+        return 1
+      end
+      return 0
+    end
+
+    #
+    # Set the bitmap for this FXBitmapView, where _bmp_ is either +nil+ or
+    # a reference to an FXBitmap instance.
+    #
+    def bitmap=(bmp)
+      @bitmap = bmp
+      recalc
+      update
+    end
+
+    #
+    # Return a reference to the bitmap (an FXBitmap instance) for this FXBitmapView,
+    # or +nil+ if no bitmap has been set.
+    #
+    def bitmap; @bitmap; end
+
+    # Set the color used for the "on" bits in the bitmap.
+    def onColor=(clr)
+      if clr != onColor
+        @onColor = clr
+        update
+      end
+    end
+
+    # Return the color used for the "on" bits in the bitmap.
+    def onColor; @onColor; end
+
+    # Set the color used for the "off" bits in the bitmap.
+    def offColor=(clr)
+      if clr != offColor
+        @offColor = clr
+        update
+      end
+    end
+
+    # Return the color used for the "off" bits in the bitmap.
+    def offColor; @offColor; end
+
+    #
+    # Set the current alignment for the bitmap inside the FXBitmapView,
+    # where _mode_ is some combination of the bitmap alignment flags
+    # listed above.
+    #
+    def alignment=(mode)
+      opts = (options & ~(BITMAPVIEW_LEFT|BITMAPVIEW_RIGHT|BITMAPVIEW_TOP|BITMAPVIEW_BOTTOM)) |
+             (mode & (BITMAPVIEW_LEFT|BITMAPVIEW_RIGHT|BITMAPVIEW_TOP|BITMAPVIEW_BOTTOM))
+      if options != opts
+        @options = opts
+        update
+      end
+    end
+
+    #
+    # Return the current alignment for the bitmap inside the
+    # FXBitmapView.
+    #
+    def alignment
+      options & (BITMAPVIEW_LEFT|BITMAPVIEW_RIGHT|BITMAPVIEW_TOP|BITMAPVIEW_BOTTOM)
+    end
+  end
+end
+

data/lib/fox16/scintilla.rb

@@ -345,8 +345,15 @@ module Fox
       sendMessage(2466, line, set)
     end
 
+    # Set the alpha used for a marker that is drawn in the text area, not the margin.
+    def markerSetAlpha(markerNumber, alpha)
+      sendMessage(2476, markerNumber, alpha)
+    end
+
     SC_MARGIN_SYMBOL = 0
     SC_MARGIN_NUMBER = 1
+    SC_MARGIN_BACK = 2
+    SC_MARGIN_FORE = 3
 
     # Set a margin to be either numeric or symbolic.
     def setMarginTypeN(margin, marginType)
@@ -388,14 +395,15 @@ module Fox
       sendMessage(2247, margin, 0) == 1 ? true : false
     end
 
-    # Styles in range 32..37 are predefined for parts of the UI and are not used as normal styles.
-    # Styles 38 and 39 are for future use.
+    # Styles in range 32..38 are predefined for parts of the UI and are not used as normal styles.
+    # Style 39 is for future use.
     STYLE_DEFAULT = 32
     STYLE_LINENUMBER = 33
     STYLE_BRACELIGHT = 34
     STYLE_BRACEBAD = 35
     STYLE_CONTROLCHAR = 36
     STYLE_INDENTGUIDE = 37
+    STYLE_CALLTIP = 38
     STYLE_LASTPREDEFINED = 39
     STYLE_MAX = 127
 
@@ -501,6 +509,16 @@ module Fox
       sendMessage(2068, useSetting, back & 0xffffff)
     end
 
+    # Get the alpha of the selection.
+    def getSelAlpha
+      sendMessage(2477, 0, 0)
+    end
+
+    # Set the alpha of the selection.
+    def setSelAlpha(alpha)
+      sendMessage(2478, alpha, 0)
+    end
+
     # Set the foreground colour of the caret.
     def setCaretFore(fore)
       sendMessage(2069, fore & 0xffffff, 0)
@@ -566,6 +584,7 @@ module Fox
     INDIC_STRIKE = 4
     INDIC_HIDDEN = 5
     INDIC_BOX = 6
+    INDIC_ROUNDBOX = 7
     INDIC0_MASK = 0x20
     INDIC1_MASK = 0x40
     INDIC2_MASK = 0x80
@@ -1273,6 +1292,11 @@ module Fox
       sendMessage(2207, fore & 0xffffff, 0)
     end
 
+    # Enable use of STYLE_CALLTIP and set call tip tab size in pixels.
+    def callTipUseStyle(tabSize)
+      sendMessage(2212, tabSize, 0)
+    end
+
     # Find the display line of a document line taking hidden lines into account.
     def visibleFromDocLine(line)
       sendMessage(2220, line, 0)
@@ -2100,7 +2124,6 @@ module Fox
     end
 
     # Set the focus to this Scintilla widget.
-    # GTK+ Specific.
     def grabFocus
       sendMessage(2400, 0, 0)
     end
@@ -2398,6 +2421,20 @@ module Fox
       sendMessage(2469, 0, 0)
     end
 
+    SC_ALPHA_TRANSPARENT = 0
+    SC_ALPHA_OPAQUE = 255
+    SC_ALPHA_NOALPHA = 256
+
+    # Set background alpha of the caret line.
+    def setCaretLineBackAlpha(alpha)
+      sendMessage(2470, alpha, 0)
+    end
+
+    # Get the background alpha of the caret line.
+    def getCaretLineBackAlpha
+      sendMessage(2471, 0, 0)
+    end
+
     # Start notifying the container of all key presses and commands.
     def startRecord
       sendMessage(3001, 0, 0)
@@ -2601,6 +2638,9 @@ module Fox
     SCLEX_FLAGSHIP = 73
     SCLEX_CSOUND = 74
     SCLEX_FREEBASIC = 75
+    SCLEX_INNOSETUP = 76
+    SCLEX_OPAL = 77
+    SCLEX_SPICE = 78
 
     # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
     # value assigned in sequence from SCLEX_AUTOMATIC+1.
@@ -2643,6 +2683,29 @@ module Fox
     SCE_C_COMMENTDOCKEYWORD = 17
     SCE_C_COMMENTDOCKEYWORDERROR = 18
     SCE_C_GLOBALCLASS = 19
+    # Lexical states for SCLEX_TCL
+    SCE_TCL_DEFAULT = 0
+    SCE_TCL_COMMENT = 1
+    SCE_TCL_COMMENTLINE = 2
+    SCE_TCL_NUMBER = 3
+    SCE_TCL_WORD_IN_QUOTE = 4
+    SCE_TCL_IN_QUOTE = 5
+    SCE_TCL_OPERATOR = 6
+    SCE_TCL_IDENTIFIER = 7
+    SCE_TCL_SUBSTITUTION = 8
+    SCE_TCL_SUB_BRACE = 9
+    SCE_TCL_MODIFIER = 10
+    SCE_TCL_EXPAND = 11
+    SCE_TCL_WORD = 12
+    SCE_TCL_WORD2 = 13
+    SCE_TCL_WORD3 = 14
+    SCE_TCL_WORD4 = 15
+    SCE_TCL_WORD5 = 16
+    SCE_TCL_WORD6 = 17
+    SCE_TCL_WORD7 = 18
+    SCE_TCL_WORD8 = 19
+    SCE_TCL_COMMENT_BOX = 20
+    SCE_TCL_BLOCK_COMMENT = 21
     # Lexical states for SCLEX_HTML, SCLEX_XML
     SCE_H_DEFAULT = 0
     SCE_H_TAG = 1
@@ -2861,6 +2924,7 @@ module Fox
     SCE_PROPS_SECTION = 2
     SCE_PROPS_ASSIGNMENT = 3
     SCE_PROPS_DEFVAL = 4
+    SCE_PROPS_KEY = 5
     # Lexical states for SCLEX_LATEX
     SCE_L_DEFAULT = 0
     SCE_L_COMMAND = 1
@@ -3368,6 +3432,7 @@ module Fox
     SCE_AU3_SPECIAL = 12
     SCE_AU3_EXPAND = 13
     SCE_AU3_COMOBJ = 14
+    SCE_AU3_UDF = 15
     # Lexical states for SCLEX_APDL
     SCE_APDL_DEFAULT = 0
     SCE_APDL_COMMENT = 1
@@ -3593,6 +3658,41 @@ module Fox
     SCE_CSOUND_IRATE_VAR = 13
     SCE_CSOUND_GLOBAL_VAR = 14
     SCE_CSOUND_STRINGEOL = 15
+    # Lexical states for SCLEX_INNOSETUP
+    SCE_INNO_DEFAULT = 0
+    SCE_INNO_COMMENT = 1
+    SCE_INNO_KEYWORD = 2
+    SCE_INNO_PARAMETER = 3
+    SCE_INNO_SECTION = 4
+    SCE_INNO_PREPROC = 5
+    SCE_INNO_PREPROC_INLINE = 6
+    SCE_INNO_COMMENT_PASCAL = 7
+    SCE_INNO_KEYWORD_PASCAL = 8
+    SCE_INNO_KEYWORD_USER = 9
+    SCE_INNO_STRING_DOUBLE = 10
+    SCE_INNO_STRING_SINGLE = 11
+    SCE_INNO_IDENTIFIER = 12
+    # Lexical states for SCLEX_OPAL
+    SCE_OPAL_SPACE = 0
+    SCE_OPAL_COMMENT_BLOCK = 1
+    SCE_OPAL_COMMENT_LINE = 2
+    SCE_OPAL_INTEGER = 3
+    SCE_OPAL_KEYWORD = 4
+    SCE_OPAL_SORT = 5
+    SCE_OPAL_STRING = 6
+    SCE_OPAL_PAR = 7
+    SCE_OPAL_BOOL_CONST = 8
+    SCE_OPAL_DEFAULT = 32
+    # Lexical states for SCLEX_SPICE
+    SCE_SPICE_DEFAULT = 0
+    SCE_SPICE_IDENTIFIER = 1
+    SCE_SPICE_KEYWORD = 2
+    SCE_SPICE_KEYWORD2 = 3
+    SCE_SPICE_KEYWORD3 = 4
+    SCE_SPICE_NUMBER = 5
+    SCE_SPICE_DELIMITER = 6
+    SCE_SPICE_VALUE = 7
+    SCE_SPICE_COMMENTLINE = 8
 
     # Events