RubyGems - tung-tea - Versions diffs - 0.2.3 → 0.2.4 - Mend

tung-tea 0.2.3 → 0.2.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

data/doc/reference.textile +2 -2
data/lib/tea/c_bitmap.rb +5 -5
data/lib/tea/c_error.rb +2 -1
data/lib/tea/m_event_app.rb +17 -8
data/lib/tea/m_event_keyboard.rb +198 -183
data/lib/tea/m_event_mouse.rb +9 -6
data/lib/tea/{m_blitting.rb → mix_blitting.rb} +4 -4
data/lib/tea/{m_clipping.rb → mix_clipping.rb} +3 -1
data/lib/tea/{m_primitive_drawing.rb → mix_primitive.rb} +2 -4
data/lib/tea/{screen.rb → o_screen.rb} +22 -10
data/lib/tea.rb +1 -1
metadata +6 -6

data/doc/reference.textile CHANGED Viewed

@@ -32,7 +32,7 @@ Tea::Clipping:
 These clip methods get, set and run a block with a clipping rectangle respectively.  While a clipping rectangle is set, drawing will be clipped inside it.
-Tea::PrimitiveDrawing:
+Tea::Primitive:
 * clear()
 * point(x, y, color)
 * rect(x, y, w, h, color[, {:mix => :blend (alt. :replace)}])
@@ -76,7 +76,7 @@ Tea::Clipping:
 These clip methods get, set and run a block with a clipping rectangle respectively.  While a clipping rectangle is set, drawing will be clipped inside it.
-Tea::PrimitiveDrawing:
+Tea::Primitive:
 * clear()
 * point(x, y, color)
 * rect(x, y, w, h, color[, {:mix => :blend (alt. :replace)}])

data/lib/tea/c_bitmap.rb CHANGED Viewed

@@ -3,9 +3,9 @@
 require 'sdl'
-require 'tea/m_blitting'
-require 'tea/m_clipping'
-require 'tea/m_primitive_drawing'
+require 'tea/mix_blitting'
+require 'tea/mix_clipping'
+require 'tea/mix_primitive'
 #
 module Tea
@@ -40,7 +40,7 @@ module Tea
     end
     include Tea::Blitting
-    def blittable_buffer
+    def blitting_buffer
       @buffer
     end
@@ -49,7 +49,7 @@ module Tea
       @buffer
     end
-    include Tea::PrimitiveDrawing
+    include Tea::Primitive
     def primitive_buffer
       @buffer
     end

data/lib/tea/c_error.rb CHANGED Viewed

@@ -5,6 +5,7 @@ module Tea
   # Error is the exception class raised when Bad Things happen in any of
   # Tea's objects or methods.
-  class Error < StandardError; end
+  class Error < StandardError
+  end
 end

data/lib/tea/m_event_app.rb CHANGED Viewed

@@ -7,34 +7,43 @@ module Tea
   module Mouse
     # Event generated when mouse focus is gained.
-    class Gained; end
+    class Gained
+    end
     # Event generated when mouse focus is lost.
-    class Lost; end
+    class Lost
+    end
   end
   module Kbd
     # Event generated when keyboard input focus is gained.
-    class Gained; end
+    class Gained
+    end
     # Event generated when keyboard input focus is lost.
-    class Lost; end
+    class Lost
+    end
   end
   module App
     # Event generated when the player acts to close the screen window.
-    class Exit; end
+    class Exit
+    end
     # Event generated when the screen window is minimised.
-    class Minimized; end
+    class Minimized
+    end
     # Event generated when the screen window is restored from being minimised.
-    class Restored; end
+    class Restored
+    end
+    # Default for App.visible?.
+    @visible = true
     # Returns true if the screen window has not been minimised, otherwise
     # false.
     def App.visible?
-      @visible = true if !instance_variable_defined?(:@visible)
       @visible
     end

data/lib/tea/m_event_keyboard.rb CHANGED Viewed

@@ -6,6 +6,181 @@ require 'sdl'
 module Tea
   module Kbd
+    # Superclass for all Kbd events.
+    class Event
+      @@sdl_key_table = {
+          SDL::Key::BACKSPACE => :BACKSPACE,
+          SDL::Key::TAB => :TAB,
+          #SDL::Key::CLEAR => clear, # ???
+          SDL::Key::RETURN => :ENTER,
+          SDL::Key::PAUSE => :PAUSE,
+          SDL::Key::ESCAPE => :ESCAPE,
+          SDL::Key::SPACE => :SPACE,
+          SDL::Key::EXCLAIM => :EXCLAMATION_MARK,
+          SDL::Key::QUOTEDBL => :DOUBLE_QUOTE,
+          SDL::Key::HASH => :HASH,
+          SDL::Key::DOLLAR => :DOLLAR,
+          SDL::Key::AMPERSAND => :AMPERSAND,
+          SDL::Key::QUOTE => :QUOTE,
+          SDL::Key::LEFTPAREN => :OPEN_PAREN,
+          SDL::Key::RIGHTPAREN => :CLOSE_PAREN,
+          SDL::Key::ASTERISK => :ASTERISK,
+          SDL::Key::PLUS => :PLUS,
+          SDL::Key::COMMA => :COMMA,
+          SDL::Key::MINUS => :MINUS,
+          SDL::Key::PERIOD => :PERIOD,
+          SDL::Key::SLASH => :SLASH,
+          SDL::Key::K0 => :K0,
+          SDL::Key::K1 => :K1,
+          SDL::Key::K2 => :K2,
+          SDL::Key::K3 => :K3,
+          SDL::Key::K4 => :K4,
+          SDL::Key::K5 => :K5,
+          SDL::Key::K6 => :K6,
+          SDL::Key::K7 => :K7,
+          SDL::Key::K8 => :K8,
+          SDL::Key::K9 => :K9,
+          SDL::Key::COLON => :COLON,
+          SDL::Key::SEMICOLON => :SEMICOLON,
+          SDL::Key::LESS => :LESS_THAN,
+          SDL::Key::EQUALS => :EQUALS,
+          SDL::Key::GREATER => :GREATER_THAN,
+          SDL::Key::QUESTION => :QUESTION_MARK,
+          SDL::Key::AT => :AT,
+          SDL::Key::LEFTBRACKET => :OPEN_SQUARE_BRACKET,
+          SDL::Key::BACKSLASH => :BACKSLASH,
+          SDL::Key::RIGHTBRACKET => :CLOSE_SQUARE_BRACKET,
+          SDL::Key::CARET => :CARET,
+          SDL::Key::UNDERSCORE => :UNDERSCORE,
+          SDL::Key::BACKQUOTE => :BACKTICK,
+          SDL::Key::A => :A,
+          SDL::Key::B => :B,
+          SDL::Key::C => :C,
+          SDL::Key::D => :D,
+          SDL::Key::E => :E,
+          SDL::Key::F => :F,
+          SDL::Key::G => :G,
+          SDL::Key::H => :H,
+          SDL::Key::I => :I,
+          SDL::Key::J => :J,
+          SDL::Key::K => :K,
+          SDL::Key::L => :L,
+          SDL::Key::M => :M,
+          SDL::Key::N => :N,
+          SDL::Key::O => :O,
+          SDL::Key::P => :P,
+          SDL::Key::Q => :Q,
+          SDL::Key::R => :R,
+          SDL::Key::S => :S,
+          SDL::Key::T => :T,
+          SDL::Key::U => :U,
+          SDL::Key::V => :V,
+          SDL::Key::W => :W,
+          SDL::Key::X => :X,
+          SDL::Key::Y => :Y,
+          SDL::Key::Z => :Z,
+          SDL::Key::DELETE => :DELETE,
+          SDL::Key::KP0 => :NP0,
+          SDL::Key::KP1 => :NP1,
+          SDL::Key::KP2 => :NP2,
+          SDL::Key::KP3 => :NP3,
+          SDL::Key::KP4 => :NP4,
+          SDL::Key::KP5 => :NP5,
+          SDL::Key::KP6 => :NP6,
+          SDL::Key::KP7 => :NP7,
+          SDL::Key::KP8 => :NP8,
+          SDL::Key::KP9 => :NP9,
+          SDL::Key::KP_PERIOD => :NP_PERIOD,
+          SDL::Key::KP_DIVIDE => :NP_DIVIDE,
+          SDL::Key::KP_MULTIPLY => :NP_MULTIPLY,
+          SDL::Key::KP_MINUS => :NP_MINUS,
+          SDL::Key::KP_PLUS => :NP_PLUS,
+          SDL::Key::KP_ENTER => :NP_ENTER,
+          SDL::Key::KP_EQUALS => :NP_EQUALS,
+          SDL::Key::UP => :UP,
+          SDL::Key::DOWN => :DOWN,
+          SDL::Key::RIGHT => :RIGHT,
+          SDL::Key::LEFT => :LEFT,
+          SDL::Key::INSERT => :INSERT,
+          SDL::Key::HOME => :HOME,
+          SDL::Key::END => :END,
+          SDL::Key::PAGEUP => :PAGE_UP,
+          SDL::Key::PAGEDOWN => :PAGE_DOWN,
+          SDL::Key::F1 => :F1,
+          SDL::Key::F2 => :F2,
+          SDL::Key::F3 => :F3,
+          SDL::Key::F4 => :F4,
+          SDL::Key::F5 => :F5,
+          SDL::Key::F6 => :F6,
+          SDL::Key::F7 => :F7,
+          SDL::Key::F8 => :F8,
+          SDL::Key::F9 => :F9,
+          SDL::Key::F10 => :F10,
+          SDL::Key::F11 => :F11,
+          SDL::Key::F12 => :F12,
+          #SDL::Key::F13 => F13, # Who
+          #SDL::Key::F14 => F14, # has
+          #SDL::Key::F15 => F15, # these?
+          SDL::Key::NUMLOCK => :NUM_LOCK,
+          SDL::Key::CAPSLOCK => :CAPS_LOCK,
+          SDL::Key::SCROLLOCK => :SCROLL_LOCK,
+          SDL::Key::RSHIFT => :R_SHIFT,
+          SDL::Key::LSHIFT => :L_SHIFT,
+          SDL::Key::RCTRL => :R_CTRL,
+          SDL::Key::LCTRL => :L_CTRL,
+          SDL::Key::RALT => :R_ALT,
+          SDL::Key::LALT => :L_ALT,
+          #SDL::Key::RMETA => right meta, # 'meta' should
+          #SDL::Key::LMETA => left meta,  # be 'alt'?
+          SDL::Key::LSUPER => :L_SUPER,
+          SDL::Key::RSUPER => :R_SUPER,
+          SDL::Key::MODE => :ALT_GR,
+          #SDL::Key::HELP => help, # Rare enough to cause problems.
+          SDL::Key::PRINT => :PRINT_SCREEN,
+          SDL::Key::SYSREQ => :SYS_REQ,
+          SDL::Key::BREAK => :BREAK,
+          SDL::Key::MENU => :MENU,
+          #SDL::Key::POWER => power, # "Power Macintosh" power key
+          SDL::Key::EURO => :EURO, # Some European keyboards need this.
+          }
+      # Call a block for each defined Tea key constant.
+      def Event.each_key
+        @@sdl_key_table.each_value { |key_const| yield key_const }
+      end
+      protected
+      # Convert an SDL keysym to a Tea key constant
+      def sdl_keysym_to_key(sdl_keysym)
+        @@sdl_key_table[sdl_keysym]
+      end
+      # Convert SDL key modifier info into an array of active key modifiers.
+      def sdl_keymod_to_mods(sdl_keymod)
+        mods = {}
+        mods[:L_SHIFT] = (sdl_keymod & SDL::Key::MOD_LSHIFT) != 0
+        mods[:R_SHIFT] = (sdl_keymod & SDL::Key::MOD_RSHIFT) != 0
+        mods[:SHIFT]   = mods[:L_SHIFT] || mods[:R_SHIFT]
+        mods[:L_CTRL] = (sdl_keymod & SDL::Key::MOD_LCTRL) != 0
+        mods[:R_CTRL] = (sdl_keymod & SDL::Key::MOD_RCTRL) != 0
+        mods[:CTRL]   = mods[:L_CTRL] || mods[:R_CTRL]
+        mods[:L_ALT] = (sdl_keymod & SDL::Key::MOD_LALT) != 0
+        mods[:R_ALT] = (sdl_keymod & SDL::Key::MOD_RALT) != 0
+        mods[:ALT]   = mods[:L_ALT] || mods[:R_ALT]
+        mods[:NUM_LOCK]  = (sdl_keymod & SDL::Key::MOD_NUM) != 0
+        mods[:CAPS_LOCK] = (sdl_keymod & SDL::Key::MOD_CAPS) != 0
+        mods[:ALT_GR]    = (sdl_keymod & SDL::Key::MOD_MODE) != 0
+        mods
+      end
+    end
     # Event generated when a key is pressed down.
     #
     # +key+::   Physical key that was pressed, as a symbol (see key reference).
@@ -18,11 +193,11 @@ module Tea
     # +char+::  String character generated by that key and those modifiers.
     #           With Ruby >= 1.9, the encoding of this character is UTF-8,
     #           otherwise it varies with the running environment.
-    class Down
+    class Down < Event
       attr_reader :key, :mods, :char
       def initialize(sdl_event)
-        @key = Kbd.instance_variable_get(:@sdl_key_table)[sdl_event.sym]
-        @mods = Kbd.send(:decode_modifiers, sdl_event.mod)
+        @key = sdl_keysym_to_key(sdl_event.sym)
+        @mods = sdl_keymod_to_mods(sdl_event.mod)
         # Ruby 1.9 uses UTF-8 Unicode encoding.  Below this, who knows how
         # Unicode code points are interpreted?
@@ -49,14 +224,27 @@ module Tea
     #           +:CAPS_LOCK+, +:ALT_GR+.  Also, +:SHIFT+, +:CTRL+ and +:ALT+
     #           are provided for convenience, and Tea key constants with the
     #           same names can be used instead.
-    class Up
+    class Up < Event
       attr_reader :key, :mods
       def initialize(sdl_event)
-        @key = Kbd.instance_variable_get(:@sdl_key_table)[sdl_event.sym]
-        @mods = Kbd.send(:decode_modifiers, sdl_event.mod)
+        @key = sdl_keysym_to_key(sdl_event.sym)
+        @mods = sdl_keymod_to_mods(sdl_event.mod)
       end
     end
+    # Defaults for Kbd.key_down?, Kbd.mod_active? and Kbd.in_app?.
+    @key_states = {}
+    Event.each_key { |key| @key_states[key] = false }
+    @mod_states = { :L_SHIFT => false, :R_SHIFT => false, :SHIFT => false,
+                    :L_CTRL  => false, :R_CTRL  => false, :CTRL  => false,
+                    :L_ALT   => false, :R_ALT   => false, :ALT   => false,
+                    :NUM_LOCK => false,
+                    :CAPS_LOCK => false,
+                    :ALT_GR => false }
+    @in_app = true
     # Returns +true+ if +key+ is being pressed down.
     def Kbd.key_down?(key)
       if (down = @key_states[key]) == nil
@@ -78,7 +266,6 @@ module Tea
     # Returns true if the keyboard is focused in the screen window.
     def Kbd.in_app?
-      @in_app = true if !instance_variable_defined?(:@in_app)
       @in_app
     end
@@ -94,186 +281,14 @@ module Tea
       end
     end
-    # Decode the SDL key event mod into a hash of easily consulted key modifier
-    # symbols.  For internal use only.
-    def Kbd.decode_modifiers(sdl_key_event_mod)
-      mods = {}
-      mods[:L_SHIFT] = (sdl_key_event_mod & SDL::Key::MOD_LSHIFT) != 0
-      mods[:R_SHIFT] = (sdl_key_event_mod & SDL::Key::MOD_RSHIFT) != 0
-      mods[:SHIFT]   = mods[:L_SHIFT] || mods[:R_SHIFT]
-      mods[:L_CTRL] = (sdl_key_event_mod & SDL::Key::MOD_LCTRL) != 0
-      mods[:R_CTRL] = (sdl_key_event_mod & SDL::Key::MOD_RCTRL) != 0
-      mods[:CTRL]   = mods[:L_CTRL] || mods[:R_CTRL]
-      mods[:L_ALT] = (sdl_key_event_mod & SDL::Key::MOD_LALT) != 0
-      mods[:R_ALT] = (sdl_key_event_mod & SDL::Key::MOD_RALT) != 0
-      mods[:ALT]   = mods[:L_ALT] || mods[:R_ALT]
-      mods[:NUM_LOCK]  = (sdl_key_event_mod & SDL::Key::MOD_NUM) != 0
-      mods[:CAPS_LOCK] = (sdl_key_event_mod & SDL::Key::MOD_CAPS) != 0
-      mods[:ALT_GR]    = (sdl_key_event_mod & SDL::Key::MOD_MODE) != 0
-      mods
-    end
-    private_class_method :decode_modifiers
-    # Big fat table of SDL keys to Ruby strings.  For internal use only.
-    @sdl_key_table = { SDL::Key::BACKSPACE => :BACKSPACE,
-                       SDL::Key::TAB => :TAB,
-                       #SDL::Key::CLEAR => clear, # ???
-                       SDL::Key::RETURN => :ENTER,
-                       SDL::Key::PAUSE => :PAUSE,
-                       SDL::Key::ESCAPE => :ESCAPE,
-                       SDL::Key::SPACE => :SPACE,
-                       SDL::Key::EXCLAIM => :EXCLAMATION_MARK,
-                       SDL::Key::QUOTEDBL => :DOUBLE_QUOTE,
-                       SDL::Key::HASH => :HASH,
-                       SDL::Key::DOLLAR => :DOLLAR,
-                       SDL::Key::AMPERSAND => :AMPERSAND,
-                       SDL::Key::QUOTE => :QUOTE,
-                       SDL::Key::LEFTPAREN => :OPEN_PAREN,
-                       SDL::Key::RIGHTPAREN => :CLOSE_PAREN,
-                       SDL::Key::ASTERISK => :ASTERISK,
-                       SDL::Key::PLUS => :PLUS,
-                       SDL::Key::COMMA => :COMMA,
-                       SDL::Key::MINUS => :MINUS,
-                       SDL::Key::PERIOD => :PERIOD,
-                       SDL::Key::SLASH => :SLASH,
-                       SDL::Key::K0 => :K0,
-                       SDL::Key::K1 => :K1,
-                       SDL::Key::K2 => :K2,
-                       SDL::Key::K3 => :K3,
-                       SDL::Key::K4 => :K4,
-                       SDL::Key::K5 => :K5,
-                       SDL::Key::K6 => :K6,
-                       SDL::Key::K7 => :K7,
-                       SDL::Key::K8 => :K8,
-                       SDL::Key::K9 => :K9,
-                       SDL::Key::COLON => :COLON,
-                       SDL::Key::SEMICOLON => :SEMICOLON,
-                       SDL::Key::LESS => :LESS_THAN,
-                       SDL::Key::EQUALS => :EQUALS,
-                       SDL::Key::GREATER => :GREATER_THAN,
-                       SDL::Key::QUESTION => :QUESTION_MARK,
-                       SDL::Key::AT => :AT,
-                       SDL::Key::LEFTBRACKET => :OPEN_SQUARE_BRACKET,
-                       SDL::Key::BACKSLASH => :BACKSLASH,
-                       SDL::Key::RIGHTBRACKET => :CLOSE_SQUARE_BRACKET,
-                       SDL::Key::CARET => :CARET,
-                       SDL::Key::UNDERSCORE => :UNDERSCORE,
-                       SDL::Key::BACKQUOTE => :BACKTICK,
-                       SDL::Key::A => :A,
-                       SDL::Key::B => :B,
-                       SDL::Key::C => :C,
-                       SDL::Key::D => :D,
-                       SDL::Key::E => :E,
-                       SDL::Key::F => :F,
-                       SDL::Key::G => :G,
-                       SDL::Key::H => :H,
-                       SDL::Key::I => :I,
-                       SDL::Key::J => :J,
-                       SDL::Key::K => :K,
-                       SDL::Key::L => :L,
-                       SDL::Key::M => :M,
-                       SDL::Key::N => :N,
-                       SDL::Key::O => :O,
-                       SDL::Key::P => :P,
-                       SDL::Key::Q => :Q,
-                       SDL::Key::R => :R,
-                       SDL::Key::S => :S,
-                       SDL::Key::T => :T,
-                       SDL::Key::U => :U,
-                       SDL::Key::V => :V,
-                       SDL::Key::W => :W,
-                       SDL::Key::X => :X,
-                       SDL::Key::Y => :Y,
-                       SDL::Key::Z => :Z,
-                       SDL::Key::DELETE => :DELETE,
-                       SDL::Key::KP0 => :NP0,
-                       SDL::Key::KP1 => :NP1,
-                       SDL::Key::KP2 => :NP2,
-                       SDL::Key::KP3 => :NP3,
-                       SDL::Key::KP4 => :NP4,
-                       SDL::Key::KP5 => :NP5,
-                       SDL::Key::KP6 => :NP6,
-                       SDL::Key::KP7 => :NP7,
-                       SDL::Key::KP8 => :NP8,
-                       SDL::Key::KP9 => :NP9,
-                       SDL::Key::KP_PERIOD => :NP_PERIOD,
-                       SDL::Key::KP_DIVIDE => :NP_DIVIDE,
-                       SDL::Key::KP_MULTIPLY => :NP_MULTIPLY,
-                       SDL::Key::KP_MINUS => :NP_MINUS,
-                       SDL::Key::KP_PLUS => :NP_PLUS,
-                       SDL::Key::KP_ENTER => :NP_ENTER,
-                       SDL::Key::KP_EQUALS => :NP_EQUALS,
-                       SDL::Key::UP => :UP,
-                       SDL::Key::DOWN => :DOWN,
-                       SDL::Key::RIGHT => :RIGHT,
-                       SDL::Key::LEFT => :LEFT,
-                       SDL::Key::INSERT => :INSERT,
-                       SDL::Key::HOME => :HOME,
-                       SDL::Key::END => :END,
-                       SDL::Key::PAGEUP => :PAGE_UP,
-                       SDL::Key::PAGEDOWN => :PAGE_DOWN,
-                       SDL::Key::F1 => :F1,
-                       SDL::Key::F2 => :F2,
-                       SDL::Key::F3 => :F3,
-                       SDL::Key::F4 => :F4,
-                       SDL::Key::F5 => :F5,
-                       SDL::Key::F6 => :F6,
-                       SDL::Key::F7 => :F7,
-                       SDL::Key::F8 => :F8,
-                       SDL::Key::F9 => :F9,
-                       SDL::Key::F10 => :F10,
-                       SDL::Key::F11 => :F11,
-                       SDL::Key::F12 => :F12,
-                       #SDL::Key::F13 => F13, # Who
-                       #SDL::Key::F14 => F14, # has
-                       #SDL::Key::F15 => F15, # these?
-                       SDL::Key::NUMLOCK => :NUM_LOCK,
-                       SDL::Key::CAPSLOCK => :CAPS_LOCK,
-                       SDL::Key::SCROLLOCK => :SCROLL_LOCK,
-                       SDL::Key::RSHIFT => :R_SHIFT,
-                       SDL::Key::LSHIFT => :L_SHIFT,
-                       SDL::Key::RCTRL => :R_CTRL,
-                       SDL::Key::LCTRL => :L_CTRL,
-                       SDL::Key::RALT => :R_ALT,
-                       SDL::Key::LALT => :L_ALT,
-                       #SDL::Key::RMETA => right meta, # 'meta' should
-                       #SDL::Key::LMETA => left meta,  # be 'alt'?
-                       SDL::Key::LSUPER => :L_SUPER,
-                       SDL::Key::RSUPER => :R_SUPER,
-                       SDL::Key::MODE => :ALT_GR,
-                       #SDL::Key::HELP => help, # Rare enough to cause problems.
-                       SDL::Key::PRINT => :PRINT_SCREEN,
-                       SDL::Key::SYSREQ => :SYS_REQ,
-                       SDL::Key::BREAK => :BREAK,
-                       SDL::Key::MENU => :MENU,
-                       #SDL::Key::POWER => power, # "Power Macintosh" power key
-                       SDL::Key::EURO => :EURO, # Some European keyboards need this.
-                       }
     # Define Tea key symbols as constants to avoid typo errors.
-    @sdl_key_table.each_value { |sym| const_set(sym, sym) }
+    Event.each_key { |key| const_set(key, key) }
     # Extra modifier constants for making modifier detection more consistent.
-    SHIFT = :shift
-    CTRL = :ctrl
-    ALT = :alt
+    SHIFT = :SHIFT
+    CTRL = :CTRL
+    ALT = :ALT
-    # Initialise key states to false, as opposed to nil.
-    @key_states = {}
-    @sdl_key_table.each_value { |sym| @key_states[sym] = false }
-    # Modifier states, same deal.
-    @mod_states = { :L_SHIFT => false, :R_SHIFT => false, :SHIFT => false,
-                    :L_CTRL  => false, :R_CTRL  => false, :CTRL  => false,
-                    :L_ALT   => false, :R_ALT   => false, :ALT   => false,
-                    :NUM_LOCK => false,
-                    :CAPS_LOCK => false,
-                    :ALT_GR => false }
   end
   module Event

data/lib/tea/m_event_mouse.rb CHANGED Viewed

@@ -81,44 +81,47 @@ module Tea
       end
     end
+    # Defaults for Mouse.x, Mouse.y, Mouse.left?, Mouse.middle?, Mouse.right?
+    # and Mouse.in_app?
+    @x = 0
+    @y = 0
+    @left = false
+    @middle = false
+    @right = false
+    @in_app = false
     # Report the x position of the mouse in the screen window.  Updated when
     # Event.get is called.
     def Mouse.x
-      @x = 0 if !instance_variable_defined?(:@x)
       @x
     end
     # Report the y position of the mouse in the screen window.  Updated when
     # Event.get is called.
     def Mouse.y
-      @y = 0 if !instance_variable_defined?(:@y)
       @y
     end
     # Returns true if the left mouse button is down.  Updated when Event.get is
     # called.
     def Mouse.left?
-      @left = false if !instance_variable_defined?(:@left)
       @left
     end
     # Returns true if the middle mouse button is down.  Updated when Event.get
     # is called.
     def Mouse.middle?
-      @middle = false if !instance_variable_defined?(:@middle)
       @middle
     end
     # Returns true if the right mouse button is down.  Updated when Event.get
     # is called.
     def Mouse.right?
-      @right = false if !instance_variable_defined?(:@right)
       @right
     end
     # Returns true if the mouse is in the screen window
     def Mouse.in_app?
-      @in_app = true if !instance_variable_defined?(:@in_app)
       @in_app
     end

data/lib/tea/{m_blitting.rb → mix_blitting.rb} RENAMED Viewed

@@ -8,11 +8,11 @@ module Tea
   # The Blitting mixin allows objects with SDL::Surface to draw or 'blit' onto
   # each other.
   #
-  # To use this mixin, include it and write/alias a blittable_buffer method
+  # To use this mixin, include it and write/alias a blitting_buffer method
   # that gets the SDL::Surface.
   #
   #   include Blitting
-  #   def blittable_buffer
+  #   def blitting_buffer
   #     @my_sdl_surface
   #   end
   module Blitting
@@ -21,8 +21,8 @@ module Tea
     #
     # source_blittable needs to include the Blitting mixin too.
     def blit(source_blittable, x, y)
-      src = source_blittable.send(:blittable_buffer)
-      dest = blittable_buffer
+      src = source_blittable.blitting_buffer
+      dest = blitting_buffer
       SDL::Surface.blit src, 0, 0, src.w, src.h, dest, x, y
     end

data/lib/tea/{m_clipping.rb → mix_clipping.rb} RENAMED Viewed

@@ -12,7 +12,9 @@ module Tea
   # that returns the buffer to be clipped.
   #
   #   include Tea::Clipping
-  #   def clipping_buffer; @sdl_buffer; end
+  #   def clipping_buffer
+  #     @sdl_buffer
+  #   end
   module Clipping
     # Get, set or run a block with a clipping rectangle that restricts where

data/lib/tea/{m_primitive_drawing.rb → mix_primitive.rb} RENAMED Viewed

@@ -5,19 +5,17 @@ require 'sdl'
 #
 module Tea
-  private
   # The PrimitiveDrawing mixin enables primitive shapes to be drawn to classes
   # with an internal SDL::Surface.
   #
   # To use this mixin, include it and implement/alias a +primitive_buffer+
   # method that gets the object's SDL::Surface.
   #
-  #   include 'PrimitiveDrawing'
+  #   include 'Primitive'
   #   def primitive_buffer
   #     @internal_sdl_buffer
   #   end
-  module PrimitiveDrawing
+  module Primitive
     # Clear the drawing buffer.  This is the same as drawing a completely black
     # rectangle over the whole buffer.

data/lib/tea/{screen.rb → o_screen.rb} RENAMED Viewed

@@ -2,9 +2,9 @@
 require 'sdl'
-require 'tea/m_blitting'
-require 'tea/m_clipping'
-require 'tea/m_primitive_drawing'
+require 'tea/mix_blitting'
+require 'tea/mix_clipping'
+require 'tea/mix_primitive'
 #
 module Tea
@@ -41,22 +41,34 @@ module Tea
     @set_mode_callbacks = []
     # Get the screen width in pixels.
-    def Screen.w; @screen.w; end
+    def Screen.w
+      @screen.w
+    end
     # Get the screen height in pixels.
-    def Screen.h; @screen.h; end
+    def Screen.h
+      @screen.h
+    end
     # Update the screen so that things drawn on it are displayed.
-    def Screen.update; @screen.flip; end
+    def Screen.update
+      @screen.flip
+    end
     extend Blitting
-    def Screen.blittable_buffer; @screen; end
+    def Screen.blitting_buffer
+      @screen
+    end
     extend Clipping
-    def Screen.clipping_buffer; @screen; end
+    def Screen.clipping_buffer
+      @screen
+    end
-    extend PrimitiveDrawing
-    def Screen.primitive_buffer; @screen; end
+    extend Primitive
+    def Screen.primitive_buffer
+      @screen
+    end
   end

data/lib/tea.rb CHANGED Viewed

@@ -5,7 +5,7 @@ require 'sdl'
 require 'tea/c_bitmap'
 require 'tea/c_error'
 require 'tea/m_event'
-require 'tea/screen'
+require 'tea/o_screen'
 # The Tea module acts as a namespace for all Tea-related objects and
 # methods.

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tung-tea
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Tung Nguyen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-08-12 00:00:00 -07:00
+date: 2009-08-21 00:00:00 -07:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -67,15 +67,15 @@ files:
 - lib/tea.rb
 - lib/tea/c_bitmap.rb
 - lib/tea/c_error.rb
-- lib/tea/m_blitting.rb
-- lib/tea/m_clipping.rb
 - lib/tea/m_event.rb
 - lib/tea/m_event_app.rb
 - lib/tea/m_event_dispatch.rb
 - lib/tea/m_event_keyboard.rb
 - lib/tea/m_event_mouse.rb
-- lib/tea/m_primitive_drawing.rb
-- lib/tea/screen.rb
+- lib/tea/mix_blitting.rb
+- lib/tea/mix_clipping.rb
+- lib/tea/mix_primitive.rb
+- lib/tea/o_screen.rb
 has_rdoc: false
 homepage: http://github.com/tung/tea
 licenses: