gglib 1.2.1 → 1.3.0

data/examples/ConsoleDemo.rb

@@ -19,7 +19,7 @@ end
 class ConsoleDemoState < GGLib::StateObject
   def onStart
     $window.setBackground("img/bg.png")
-    GGLib::Button.new("button2", "Open Console", 270, 200, Proc.new{ |widget| GGLib::DebugConsole.new }, GGLib::Themes::BlueSteel)
+    GGLib::Button.new(:button1, "Open Console", 270, 200, Proc.new{ |widget| GGLib::DebugConsole.new; GGLib::Label.new(:label1, "Enter /help for help.", 250, 300, GGLib::Themes::Shade) }, GGLib::Themes::BlueSteel)
   end
 end
 

data/examples/TracePanelDemo.rb

@@ -0,0 +1,29 @@
+begin
+  require 'rubygems'
+rescue LoadError
+end
+
+require "gosu"
+require "../gglib"
+require "../ext/widgets"
+require "../ext/themes"
+
+class TracePanelDemoWindow < GGLib::GUIWindow
+  def initialize
+    super(640, 480, false, 20)
+    self.caption = "GGLib Trace Panel Demo"
+    self.state = TracePanelDemoState.new
+  end
+end
+
+class TracePanelDemoState < GGLib::StateObject
+  def onStart
+    $window.setBackground("img/bg.png")
+    $trace = GGLib::TracePanel.new
+    GGLib::Button.new(:button1, "Open Trace", 270, 200, Proc.new{ |widget| $trace.wakeUp }, GGLib::Themes::BlueSteel)
+    GGLib::Button.new(:button2, "put", 270, 280, Proc.new{ |widget| $trace.put "trace data" }, GGLib::Themes::BlueSteel)
+    GGLib::Button.new(:button2, "sput", 270, 315, Proc.new{ |widget| $trace.sput "silent trace data" }, GGLib::Themes::BlueSteel)
+  end
+end
+
+TracePanelDemoWindow.new.show

data/lib/ext/themes.rb

@@ -229,7 +229,6 @@ class ShadeTheme < DrawnTheme
 end
 
 class ShadeLabelTheme < DrawnTheme
-  @@textbox = nil
   def initialize
     font = ThemeFontGroup.new( 
                 Gosu::Font.new($window, Gosu::default_font_name, 17), 
@@ -243,7 +242,6 @@ class ShadeLabelTheme < DrawnTheme
 end
 
 class ShadeCheckGenTheme < DrawnTheme
-  @@textbox = nil
   def initialize
     font = ThemeFontGroup.new( 
                 Gosu::Font.new($window, Gosu::default_font_name, 17), 
@@ -252,7 +250,7 @@ class ShadeCheckGenTheme < DrawnTheme
                 0xffe6e6e6,
                 0xff848484
               )
-    super("Shade.Label", font)
+    super("Shade.Checkable.Unchecked", font)
   end
   def draw(x1,y1, x2, y2, state)
     if state == 1
@@ -272,7 +270,6 @@ class ShadeCheckGenTheme < DrawnTheme
 end
 
 class ShadeCheckGenCTheme < DrawnTheme
-  @@textbox = nil
   def initialize
     font = ThemeFontGroup.new( 
                 Gosu::Font.new($window, Gosu::default_font_name, 17), 
@@ -281,7 +278,7 @@ class ShadeCheckGenCTheme < DrawnTheme
                 0xffe6e6e6,
                 0xff848484
               )
-    super("Shade.Label", font)
+    super("Shade.Checkable.Checked", font)
   end
   def draw(x1,y1, x2, y2, state)
     if state == 1
@@ -396,6 +393,27 @@ class WindowsTheme < ImageTheme
   end
 end
 
+#--
+########################################################################
+#                           SOLID THEME                              #
+########################################################################
+#++
+
+class SolidTheme < DrawnTheme
+  def initialize(color)
+    font = DefaultFontGroup
+    super("Solid.Generic", font)
+    @color = color
+  end
+  def draw 
+    $window.draw_quad(x1, y1, @color, x2, y1, @color, x1, y2, @color, x2, y2, @color, ZOrder::Widget) 
+  end
+end
+
+def Solid(color)
+  return SolidTheme.new(color)
+end
+
 #--
 ########################################################################
 #                           END OF THEMES                              #

data/lib/ext/widgets.rb

@@ -1,28 +1,35 @@
 module GGLib
 
 class DebugConsole < Widget
-  @@allow=false
-  def initialize(name="unnamed", theme=Themes::blank)
+  def initialize(name=:unnamed, theme=Themes::blank)
     super(name, 0, 0, 640, 480, theme)
     @vline=0
     @oldtext=[]
     @textm=false
     clear
     stickFocus
+    begin
+      @theme.font.default = Gosu::Font.new($window, "Courier New", @theme.font.default.height)
+    rescue
+    end
   end  
-  def onKeyPress(key)
-    if key==WidgetEvent::KeyDelete
+  def acceptText?
+    return true
+  end
+  def acceptStickyFocus?
+    return true
+  end
+  def onKeyUp(key)
+    if key==Gosu::Button::KbDelete or key==Gosu::Button::KbBackspace
       thisline=@text[@line]
       if @textm and thisline.length>0
         @text[@line]=thisline.slice(0,thisline.length-1)
       elsif thisline.length>3
         @text[@line]=thisline.slice(0,thisline.length-1)
       end
-    elsif key==WidgetEvent::KeySpace
-      @text[@line]+=" "
-    elsif key==WidgetEvent::KeyEscape
+    elsif key==Gosu::Button::KbEscape or $window.button_id_to_char(key) == '`'
       sleep
-    elsif key==WidgetEvent::KeyEnter
+    elsif key==Gosu::Button::KbReturn or key==Gosu::Button::KbEnter
       if @textm
         if @text[@line]=="/endtext"
           @textm=false
@@ -44,12 +51,12 @@ class DebugConsole < Widget
         runcmd(cmd)
       end
       @vline=@oldtext.size
-    elsif key==WidgetEvent::KeyUp
+    elsif key==Gosu::Button::KbUp
       if @vline-1 >= 0 and 
         @vline-=1
         @text[@line]=@oldtext[@vline]
       end
-    elsif key==WidgetEvent::KeyDown
+    elsif key==Gosu::Button::KbDown
       if @vline+1 < @oldtext.size and 
         @vline+=1
         @text[@line]=@oldtext[@vline]
@@ -57,7 +64,7 @@ class DebugConsole < Widget
     end
   end
   def feedText(char)
-    @text[@line]+=char.to_s unless char=="`"
+    @text[@line]+=char.to_s unless (char=="`" || char=="\n" || char=="\r")
   end
   def justify(ln)
     fin=""
@@ -90,11 +97,10 @@ class DebugConsole < Widget
   end
   def clear
     @text=[]
-    @text[0]="CONSOLE"
-    @text[1]="#########"
-    @text[2]="<Press ` (backquote) or enter '/exit' to exit>"
-    @text[3]=">> "
-    @line=3    
+    @text[0]="-~*CONSOLE*~-"
+    @text[1]="<Press ` (backquote) or enter '/exit' to exit>"
+    @text[2]=">> "
+    @line=2    
     @vline=@oldtext.size-1
   end
   private
@@ -156,12 +162,6 @@ class DebugConsole < Widget
   def onStickyBlur
     $window.setTextInput(nil)
   end
-  def DebugConsole.enabled=(bool)
-    @@allow=bool
-  end
-  def DebugConsole.enabled
-    return @@allow
-  end
   def draw
     i=0
     @text.each {|line|
@@ -172,18 +172,29 @@ class DebugConsole < Widget
 end
 
 class TracePanel < Widget
-  @@allow=false
-  def initialize(name)
+  def initialize(name=:unnamed)
     super(name, 0,0,640,60, Themes::tracePanel)
     clear
+    begin
+      @theme.font.default = Gosu::Font.new($window, "Courier New", @theme.font.default.height)
+    rescue
+    end
+  end
+  def acceptStickyFocus?
+    return true
   end
-  def onKeyPress(key)
-    if key==WidgetEvent::KeyDelete
+  def onKeyUp(key)
+    if key==Gosu::Button::KbDelete
+      theme = Themes::blank
       sleep
-    elsif key==WidgetEvent::KeyEnter
+    elsif key==Gosu::Button::KbReturn or key==Gosu::Button::KbEnter
       clear
     end
   end
+  def wakeUp
+    super
+    theme = Themes::tracePanel
+  end
   def sput(text)
     @line+=1
     @text[@line]=text.to_s    
@@ -211,20 +222,10 @@ class TracePanel < Widget
     @text[1]="Press DELETE to close, ENTER to clear. (Click to activate.)"
     @line=2
   end
-  def TracePanel.enabled=(bool)
-    if bool==true
-      @@allow=true
-    else
-      @@allow=false
-    end
-  end
-  def TracePanel.enabled
-    return @@allow
-  end
   def draw
     i=0
     @text.each {|line|
-      @them.font.default.draw(line, 10, 10+i*@font.height, ZOrder::Text, 1.0, 1.0, 0xffffffff)
+      @theme.font.default.draw(line, 10, 10+i*@theme.font.default.height, ZOrder::Text, 1.0, 1.0, 0xffffffff)
       i+=1
     }
   end
@@ -252,6 +253,9 @@ class TextBox < Widget
     @drawcursor=0
     @realwidth=@x + TextPadding
   end
+  def acceptStickyFocus?
+    return true
+  end
   def onMouseOver
     @theme.setOverState unless self.hasStickyFocus?
   end
@@ -344,13 +348,23 @@ class Button < Widget
 end
 
 class Label < Widget
-  attr_accessor :text
-  def initialize(name, x, y, text="", theme = Themes::blank)
+  attr_reader :text
+  def initialize(name, text, x, y, theme = Themes::blank)
     @text = text
+    @initialized = false
     super(name, x, y, x+100,y+30,theme)
   end
+  def text=(val)
+    @initialized = false
+    @text=val
+  end
   def draw
-    @theme.font.default.draw(@text, x, y, ZOrder::Text, 1, 1, @theme.font.color)
+    if not @initialized
+      @x2 = @x1 + @theme.font.default.text_width(@text)
+      @y2 = @y1 + @theme.font.default.height
+      @initialized = true
+    end
+    @theme.font.default.draw(@text, @x1, @y1, ZOrder::Text, 1, 1, @theme.font.color)
   end
 end
 
@@ -506,23 +520,6 @@ class RadioGroup < Widget
   def selected=(val)
     @selected = val
   end
-=begin
-  def selected=(val)
-    if val.kind_of?(Widget)
-      raise RuntimeException.new("No option #{val} in #{self.inspect} (#{self.name})") unless val.parent == self
-      val.checked = true
-      return true
-    else
-      @buttons.each { |button|
-        if button.name == val
-          val.checked = true
-          return
-        end
-      }
-      raise RuntimeException.new("No option #{val} in #{self.inspect} (#{self.name})")
-    end
-  end
-=end
 end
 
 end #module GGLib

data/lib/mouse.rb

@@ -2,39 +2,155 @@ module GGLib
 
   class Cursor
     attr_reader :img, :visible, :imgObj
-    def initialize(img,visible)
+    def initialize(img,visible=true)
       @img=img
       @visible=visible
       @imgObj=Gosu::Image.new($window,img,true)
       @forced=false
     end
+    #If the cursor is currently invisible, makes it visible. If the cursor is currently visible, makes it invisible. Subject to the constraints of forceVisible.
     def toggleVisible
       if not @forced
         @visible=!@visible
       end
     end
+    #Forces the cursor to adhere to the visibility specified by parameter visible. Subsequent calls to toggleVisible and visible= will have no effect. See also unforceVisible.
     def forceVisible(visible=true)
       @forced=true
       @visible=visible
     end
+    #Allows the cursor to be made invisible via toggleVisible or visible=.
     def unforceVisible
       @forced=false
     end
+    #Returns true if the cursor is currently visible, false otherwise.
     def visible?
       return visible
     end
+    #Reverses the effects of forceVisible. Calls to toggleVisible and visible= will again have an effect.
     def visible=(visible)
       if not @forced
         @visible=visible
       end
     end
+    #Restricts mouse movement along the x axis.
+    def restrictX(restrict=true)
+      @rx = restrict
+      if @rx
+        @ox = $window.mouse_x
+      end
+    end
+    #Restricts mouse movement along the y axis.
+    def restrictY(restrict=true)
+      @ry = restrict
+      if @ry
+        @oy = $window.mouse_y
+      end
+    end
+    #Stops restriction of mouse movement along the x axis.
+    def unrestrictX
+      @rx = false
+    end
+    #Stops restriction of mouse movement along the y axis.
+    def unrestrictY
+      @ry = false
+    end
+    #Returns true if movement along the x axis is currently restricted, false otherwise.
+    def restrictX?
+      return @rx
+    end
+    #Returns true if movement along the y axis is currently restricted, false otherwise.
+    def restrictY?
+      return @ry
+    end
+    #Returns the current x coordinate of the cursor.
+    def x
+      return $window.mouse_x
+    end
+    #Returns the current y coordinate of the cursor.
+    def y
+      return $window.mouse_y
+    end
+    #Sets the current x coordinate of the cursor.
+    def x=(val)
+      $window.mouse_x = val
+    end
+    #Sets the current y coordinate of the cursor.
+    def y=(val)
+      $window.mouse_y = val
+    end
+    #Sets the position of the cursor.
+    def moveTo(xp, yp)
+      $window.mouse_x = xp
+      $window.mouse_y = yp
+    end
     def draw
+      if @rx
+        $window.mouse_x = @x
+      end
+      if @ry
+        $window.mouse_y = @oy
+      end
       if @visible
         @imgObj.draw($window.mouse_x,$window.mouse_y,ZOrder::Cursor)
       end
     end
   end
   
+  class DeltaCursor
+    attr_reader :img, :visible, :imgObj
+    def initialize(img,visible=true)
+      @img=img
+      @visible=visible
+      @imgObj=Gosu::Image.new($window,img,true)
+      @forced=false
+      @centerx = ($window.width/2).floor
+      @centery = ($window.height/2).floor
+      @ax = 0
+      @ay = 0
+    end
+    #If the cursor is currently invisible, makes it visible. If the cursor is currently visible, makes it invisible. Subject to the constraints of forceVisible.
+    def toggleVisible
+      if not @forced
+        @visible=!@visible
+      end
+    end
+    #Forces the cursor to remain visible until unforceVisible is called.
+    def forceVisible(visible=true)
+      @forced=true
+      @visible=visible
+    end
+    #Allows the cursor to be made invisible via toggleVisible or visible=.
+    def unforceVisible
+      @forced=false
+    end
+    #Returns true if the cursor is currently visible, false otherwise.
+    def visible?
+      return visible
+    end
+    #Sets the visibility of the cursor. Subject to the constraints of forceVisible.
+    def visible=(visible)
+      @visible=visible if not @forced
+    end  
+    #Returns the x-axis distance shifted from the center since the last call to draw.
+    def x
+      @ax - @centerx
+    end
+    #Returns the y-axis distance shifted from the center since the last call to draw.
+    def y
+      @ay - @centery
+    end
+    def draw
+      @ax = $window.mouse_x
+      @ay = $window.mouse_y
+      $window.mouse_x = @centerx
+      $window.mouse_y = @centery
+      if @visible
+        @imgObj.draw(@centerx, @centery,ZOrder::Cursor)
+      end
+    end    
+  end
+  
   class MouseDragEvent
     attr_reader :start_x, :start_y, :end_x, :end_y, :inprogress, :starting
     def initialize
@@ -60,4 +176,4 @@ module GGLib
     end
   end
   
-  end #module GGLib
+end #module GGLib