--- a/Bindings.xml	Tue Mar 20 21:20:20 2007 +0000
+++ b/Bindings.xml	Tue Mar 20 21:25:29 2007 +0000
@@ -1,8 +1,8 @@
 <Bindings>
   <Binding name="REACTION_TOGGLELOCK" header="REACTION">
-    ReAction:ToggleLocked()
+    ReActionAddOn:ToggleLocked()
   </Binding>
-  <Binding name="REBINDER_TOGGLEBINDINGMODE">
-    ReBinder:ToggleEnabled()
+  <Binding name="REBOUND_TOGGLEBINDINGMODE">
+    ReBound:ToggleEnabled()
   </Binding>
 </Bindings>

--- a/Button.xml	Tue Mar 20 21:20:20 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-<Ui xmlns="http://www.blizzard.com/wow/ui/" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.blizzard.com/wow/ui/..\FrameXML\UI.xsd">
-
-
-  <CheckButton name="ReActionButtonTemplate" inherits="ActionButtonTemplate, SecureActionButtonTemplate" virtual="true" enableMouse="true">
-		<Layers>
-		  <Layer level="ARTWORK">
-        <FontString name="$parentActionID" inherits="NumberFontNormalSmall" hidden="true" text="">
-          <Anchors>
-            <Anchor point="BOTTOMLEFT"/>
-          </Anchors>
-          <Color r="1.0" g="0.82" b="0.0"/>
-        </FontString>
-      </Layer>
-		</Layers>
-		<Scripts>
-			<OnLoad>
-        this:RegisterForDrag("LeftButton", "RightButton")
-        this:RegisterForClicks("AnyUp")
-			</OnLoad>
-			<PostClick>
-        if this.rxnBtn:ShouldPickupAction(button) then
-					PickupAction(this.rxnBtn:GetActionID())
-				end
-        this.rxnBtn:UpdateCheckedState()
-			</PostClick>
-			<OnDragStart>
-				if LOCK_ACTIONBAR ~= "1" then
-					PickupAction(this.rxnBtn:GetActionID())
-          this.rxnBtn:UpdateDisplay()
-				end
-			</OnDragStart>
-			<OnReceiveDrag>
-				if LOCK_ACTIONBAR ~= "1" then
-					PlaceAction(this.rxnBtn:GetActionID())
-          this.rxnBtn:UpdateDisplay()
-				end
-			</OnReceiveDrag>
-			<OnEnter>
-        this.rxnBtn:SetTooltip()
-			</OnEnter>
-			<OnLeave>
-				this.rxnBtn:ClearTooltip()
-			</OnLeave>
-		</Scripts>
-  </CheckButton>
-
-  <Frame name="ReActionButtonRecyler" parent="UIParent" hidden="true" setAllPoints="true" enableMouse="false"/>
-  
-  <Frame name="ReActionKeybindFrame" frameStrata="DIALOG" enableMouse="true" enableKeyboard="true" parent="UIParent" hidden="true">
-    <Size>
-      <AbsDimension x="160" y="52"/>
-    </Size>
-    <Backdrop file="Interface\Tooltips\UI-Tooltip-Background" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
-      <EdgeSize>
-        <AbsValue val="16"/>
-      </EdgeSize>
-      <TileSize>
-        <AbsValue val="16"/>
-      </TileSize>
-      <BackgroundInsets>
-        <AbsInset left="0" right="0" top="0" bottom="0"/>
-      </BackgroundInsets>
-    </Backdrop>
-    <Layers>
-      <Layer level="BACKGROUND">
-        <Texture>
-          <Color r="0" g="0" b="0" a="0.5"/>
-        </Texture>
-      </Layer>
-      <Layer level="ARTWORK">
-        <FontString inherits="GameFontNormal" text="Set Keybinding">
-          <Anchors>
-            <Anchor point="TOP">
-              <Offset>
-                <AbsDimension x="0" y="-5"/>
-              </Offset>
-            </Anchor>
-          </Anchors>
-        </FontString>
-      </Layer>
-    </Layers>
-    <Frames>
-      <Button name="$parentButton" inherits="UIPanelButtonTemplate2" enableKeyboard="true" enableMouse="true">
-        <Size>
-          <AbsDimension x="120" y="22"/>
-        </Size>
-        <Anchors>
-          <Anchor point="BOTTOM" relativePoint="BOTTOM">
-            <Offset>
-              <AbsDimension x="-2" y="5"/>
-            </Offset>
-          </Anchor>
-        </Anchors>
-        <Scripts>
-          <OnLoad>
-            this:RegisterForClicks("AnyUp")
-          </OnLoad>
-          <OnClick>
-            if this.selected and this.keybindTarget then
-              this.keybindTarget:HandleKeybindAssign(this, nil, arg1)
-            else
-              this.selected = not(this.selected)
-            end
-            if this.selected and this.keybindTarget then
-              this:LockHighlight()
-              this:SetScript("OnKeyDown", 
-                function() 
-                  this.keybindTarget:HandleKeybindAssign(this,arg1)
-                  if not this.selected then 
-                    this:UnlockHighlight()
-                    this:SetScript("OnKeyDown", nil)
-                  end
-                end )
-            else
-              this:UnlockHighlight()
-              this:SetScript("OnKeyDown", nil)
-            end
-          </OnClick>
-          <OnShow>
-            this.keybindTarget.button:SetChecked(1)
-            this.keybindTarget:UpdateDisplay()
-          </OnShow>
-          <OnHide>
-            if this.keybindTarget then
-              this.keybindTarget.button:SetChecked(0)
-              this.keybindTarget:UpdateDisplay()
-            end
-          </OnHide>
-        </Scripts>
-        <NormalFont    inherits="GameFontHighlightSmall"/>
-        <HighlightFont inherits="GameFontHighlightSmall"/>
-      </Button>
-    </Frames>
-    <Scripts>
-      <OnLoad>
-        table.insert(UISpecialFrames, this:GetName())  -- auto-hide on escape
-      </OnLoad>
-    </Scripts>
-  </Frame>
-
-</Ui>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Buttons.lua	Tue Mar 20 21:25:29 2007 +0000
@@ -0,0 +1,271 @@
+-- Buttons.lua
+--
+-- Defines button types for use with the ReAction AddOn
+--
+
+local AceOO = AceLibrary("AceOO-2.0")
+
+local Action = AceOO.Class(
+  ReAction, 
+  ReAction.ActionType, 
+  ReAction.ActionDisplay, 
+  ReAction.DefaultColorScheme
+)
+
+local PetAction = AceOO.Class(
+  ReAction, 
+  ReAction.PetActionType, 
+  ReAction.PetActionDisplay, 
+  ReAction.DefaultColorScheme
+)
+
+
+ReAction:AddButtonType( "Action",    Action,    120 )
+ReAction:AddButtonType( "Pet Action", PetAction, 10  )
+
+
+
+-----------------------
+-- static class members
+-----------------------
+Action.defaultProfile = {
+  type = "ReAction",
+  subtype = "Action",
+  ids = { },
+  selfcast = nil,
+  keyBindLoc = "TOPRIGHT",
+  stackCountLoc = "BOTTOMRIGHT",
+  showKeyBind = true,
+  showStackCount = true,
+  showMacroText = true,
+  showGrid = false,
+  showBorder = true,
+  keyBindColorCode = false,
+}
+
+PetAction.defaultProfile = {
+  type = "ReAction",
+  subtype = "Pet Action",
+  ids = { },
+  keyBindLoc = "TOPRIGHT",
+  showKeyBind = false,
+  showGrid = false,
+  showBorder = true,
+  keyBindColorCode = false,
+}
+
+
+
+-----------------------
+-- static class methods
+-----------------------
+function Action:GetDefaultProfile()
+  return self.defaultProfile
+end
+
+function PetAction:GetDefaultProfile()
+  return self.defaultProfile
+end
+
+
+
+local labelPlacementOptions = { 
+  "TOP", 
+  "BOTTOM", 
+  "LEFT", 
+  "RIGHT", 
+  "TOPLEFT", 
+  "TOPRIGHT", 
+  "BOTTOMLEFT", 
+  "BOTTOMRIGHT" 
+}
+
+
+function Action:GenerateOptionsTable( config, buttonListFunc )
+
+  local function refresh()
+    for _, b in pairs(buttonListFunc()) do
+      b:UpdateAction()
+      b:UpdateTooltip()
+      b:UpdateDisplay()
+    end
+  end
+
+  return {
+    type = "group",
+    args = {
+      selfcast = {
+        type = "text",
+        name = "Self Cast",
+        desc = "Choose a modifier key to hold down or an alternate button to click to self-cast spells. "..
+               "'default' uses the settings in the Interface Options Advanced panel (use this to achieve 'smart self cast'). "..
+               "'right-click' self-casting is not supported for multi-page bars.",
+        get  = function() return config.selfcast or "default" end,
+        set  = function(opt) 
+          if opt == "default" then opt = nil end
+          config.selfcast = opt
+          for _, b in pairs(buttonListFunc()) do
+            b:UpdateSelfcast()
+          end
+        end,
+        validate = { "default", "none", "alt", "ctrl", "shift", "right-click" },
+      },
+
+      keyloc = {
+        type = "text",
+        name = "Hotkey Location",
+        desc = "Sets hotkey location",
+        get  = function() return config.keyBindLoc end,
+        set  = function(loc) config.keyBindLoc = loc ; refresh() end,
+        validate = labelPlacementOptions,
+      },
+      
+      stackloc = {
+        type = "text",
+        name = "Stack Count Location",
+        desc = "Sets stack count location",
+        get  = function() return config.stackCountLoc end,
+        set  = function(loc) config.stackCountLoc = loc ; refresh() end,
+        validate = labelPlacementOptions,
+      },
+
+      showkeybind = {
+        type = "toggle",
+        name = "Show Hotkey",
+        desc = "Toggle show/hide hot key labels",
+        get  = function() return config.showKeyBind end,
+        set  = function() config.showKeyBind = not config.showKeyBind ; refresh() end,
+      },
+
+      showstackcount = {
+        type = "toggle",
+        name = "Show Stack Count",
+        desc = "Toggle show/hide stack count labels",
+        get  = function() return config.showStackCount end,
+        set  = function() config.showStackCount = not config.showStackCount ; refresh() end,
+      },
+
+      showmacrotext = {
+        type = "toggle",
+        name = "Show Macro Names",
+        desc = "Toggle show/hide macro name labels",
+        get  = function() return config.showMacroText end,
+        set  = function() config.showMacroText = not config.showMacroText ; refresh() end,
+      },
+
+      showgrid = {
+        type = "toggle",
+        name = "Always Show Buttons",
+        desc = "Show button placeholders when no action is assigned or on the cursor. Note that buttons are always shown when bars are unlocked.",
+        get  = function() return config.showGrid end,
+        set  = function() config.showGrid = not config.showGrid ; refresh() end,
+      },
+
+      colorhotkeys = {
+        type = "toggle",
+        name = "Colorize Hotkeys",
+        desc = "Toggles coloring hotkeys based on the modifier key. Out-of-range coloring is always enabled.",
+        get  = function() return config.keyBindColorCode end,
+        set  = function() config.keyBindColorCode = not config.keyBindColorCode ; refresh() end,
+      },
+
+      --[[
+      hideborder = {
+        type = "toggle",
+        name = "Hide Border",
+        desc = "Toggles hiding of the button border frame.",
+        get  = function() return not config.showBorder end,
+        set  = function() config.showBorder = not config.showBorder ; refresh() end,
+      },]]
+    }
+  }
+end
+
+
+function PetAction:GenerateOptionsTable( config, buttonListFunc )
+
+  local function refresh()
+    for _, b in pairs(buttonListFunc()) do
+      b:UpdateAction()
+      b:UpdateTooltip()
+      b:UpdateDisplay()
+    end
+  end
+
+  return {
+    type = "group",
+    args = {
+      keyloc = {
+        type = "text",
+        name = "Hotkey Location",
+        desc = "Sets hotkey location",
+        get  = function() return config.keyBindLoc end,
+        set  = function(loc) config.keyBindLoc = loc ; refresh() end,
+        validate = { "TOP", "BOTTOM", "LEFT", "RIGHT", "TOPLEFT", "TOPRIGHT", "BOTTOMLEFT", "BOTTOMRIGHT" },
+      },
+      
+      showkeybind = {
+        type = "toggle",
+        name = "Show Hotkey",
+        desc = "Toggle show/hide hot key labels",
+        get  = function() return config.showKeyBind end,
+        set  = function() config.showKeyBind = not config.showGrid ; refresh() end,
+      },
+
+      showgrid = {
+        type = "toggle",
+        name = "Always Show Buttons",
+        desc = "Show button placeholders when no action is assigned or on the cursor. Note that buttons are always shown when bars are unlocked.",
+        get  = function() return config.showGrid end,
+        set  = function() config.showGrid = not config.showGrid ; refresh() end,
+      },
+
+      colorhotkeys = {
+        type = "toggle",
+        name = "Colorize Hotkeys",
+        desc = "Toggles coloring hotkeys based on the modifier key. Out-of-range coloring is always enabled.",
+        get  = function() return config.keyBindColorCode end,
+        set  = function() config.keyBindColorCode = not config.keyBindColorCode ; refresh() end,
+      },
+
+      --[[
+      hideborder = {
+        type = "toggle",
+        name = "Hide Border",
+        desc = "Toggles hiding of the button border frame.",
+        get  = function() return not config.showBorder end,
+        set  = function() config.showBorder = not config.showBorder ; refresh() end,
+      },]]
+    }
+  }
+end
+
+
+
+----------------------
+-- Instance methods
+----------------------
+function Action.prototype:init( id )
+  Action.super.prototype.init(self)
+  
+  self:SetupDisplay("ReActionButton"..id)
+  self:SetupAction()
+
+  -- register button with ReBound for keybinding
+  if ReBound then
+    ReBound:AddKeybindTarget(self:GetActionFrame())
+  end
+end
+
+function PetAction.prototype:init( id )
+  Action.super.prototype.init(self)
+  
+  self:SetupDisplay("ReActionPetButton"..id)
+  self:SetupAction()
+
+  -- register button with ReBound for keybinding
+  if ReBound then
+    ReBound:AddKeybindTarget(self:GetActionFrame())
+  end
+end
+

--- a/Defaults.lua	Tue Mar 20 21:20:20 2007 +0000
+++ b/Defaults.lua	Tue Mar 20 21:25:29 2007 +0000
@@ -1,79 +1,231 @@
+local function tcopy(t)
+  local r = { }
+  for k, v in pairs(t) do
+    r[k] = (type(v) == "table" and tcopy(v) or v)
+  end
+  return r
+end
+
 -- ReAction default variable tables
+local defaultActionConfig    = ReAction:GetButtonType("Action"):GetDefaultProfile()
+local defaultPetActionConfig = ReAction:GetButtonType("Pet Action"):GetDefaultProfile()
 
 
--- configuration options for ReActionButton groups
-ReActionButtonConfigDefaults = {
-  type = "ReActionButton",
-  actionIDs = { },
-  keyBindLoc = "TOPLEFT",
-  keyBindColorCode = true,
-  stackCountLoc = "BOTTOMRIGHT",
-  showKeyBind = true,
-  showNumericCooldown = false,
-  showStackCount = true,
-  showMacroName = true,
-  showGrid = true,
+-- default saved variables
+ReAction_DefaultProfile = {
+  hideArt = false,
+
+  bars = { }
 }
 
-ReActionBarConfigDefaults = {
-  visibility = true,
-  size = 36,
-  spacing = 6,
-  rows = 1,
-  columns = 12,
-  pages = 1,
-  opacity = 100,
-  anchor = { 
-    to = "UIParent",
-    point = "CENTER",
-    relPoint = "CENTER",
-    x = 0,
-    y = 0
-  },
-  btnConfig = ReActionButtonConfigDefaults
-}
-
-
-
--- default variables
-ReActionProfileDefaults = {
-
-  -- global options
-  hideArt = false,
-
-
-  -- default layout replicates Blizzard layout
-  bars = {
-
-    -- main paged action bar
-    [1] = {
-      visibility = true,
+ReAction_DefaultBarConfig = {
+  ["ReAction"] = {
+    ["Action"] = {
+      visible = true,
       size = 36,
       spacing = 6,
       rows = 1,
       columns = 12,
-      pages = 5,
+      pages = nil,
       opacity = 100,
-      anchor = { 
-        to = "UIParent",
-        point = "BOTTOMRIGHT",
-        relPoint = "BOTTOM",
-        x = 2,
-        y = -4
+      anchor = {
+        frame = "UIParent",
+        point = "CENTER",
+        relPoint = "CENTER",
+        x = 0,
+        y = 0,
       },
-      btnConfig = {
-        type = "ReActionButton",
-        actionIDs = { },
-        keyBindLoc = "TOPLEFT",
-        keyBindColorCode = true,
-        stackCountLoc = "BOTTOMRIGHT",
-        showKeyBind = true,
-        showNumericCooldown = false,
-        showStackCount = true,
-        showMacroName = true,
-        showGrid = true,
-      }
+      btnConfig = tcopy(defaultActionConfig)
+    },
+    ["Pet Action"] = {
+      visible = true,
+      parent = "PetActionBarFrame",
+      size = 30,
+      spacing = 8,
+      rows = 1,
+      columns = 10,
+      pages = nil,
+      opacity = 100,
+      anchor = {
+        frame = "UIParent",
+        point = "CENTER",
+        relPoint = "CENTER",
+        x = 0,
+        y = 0,
+      },
+      btnConfig = tcopy(defaultPetActionConfig),
+    }
+  },
+}
 
+-- startup layout replicates Blizzard layout (only set on first-run or reset)
+ReAction_DefaultBlizzardBars = {
+
+  -- main paged action bar
+  [1] = {
+    visible = true,
+    size = 36,
+    spacing = 6,
+    rows = 1,
+    columns = 12,
+    growLeft = false,
+    growUp = false,
+    columnMajor = false,
+    pages = {
+      n = 6,
+      showControls = true,
+      controlsLoc = "Blizzard",
+      autoStanceSwitch = true,   -- priests will get a shadowform bar switch, unlike blizzard's
+      autoStealthSwitch = true,  -- this is different from blizzard's layout, only for druids
     },
+    opacity = 100,
+    anchor = { 
+      frame = "MainMenuBarArtFrame",
+      point = "BOTTOMLEFT",
+      relPoint = "BOTTOMLEFT",
+      x = 3,
+      y = 0,
+    },
+    btnConfig = tcopy(defaultActionConfig),
+  },
+
+  -- multibar right
+  [2] = {
+    visible = false,
+    size = 36,
+    spacing = 6,
+    rows = 12,
+    columns = 1,
+    growLeft = true,
+    growUp = false,
+    columnMajor = true,
+    pages = nil,
+    opacity = 100,
+    anchor = { 
+      frame = "UIParent",
+      point = "BOTTOMRIGHT",
+      relPoint = "BOTTOMRIGHT",
+      x = -4,
+      y = 95,
+    },
+    btnConfig = tcopy(defaultActionConfig),
+  },
+
+  -- multibar left
+  [3] = {
+    visible = false,
+    size = 36,
+    spacing = 6,
+    rows = 12,
+    columns = 1,
+    growLeft = true,
+    growUp = false,
+    columnMajor = true,
+    pages = nil,
+    opacity = 100,
+    anchor = { 
+      frame = "UIParent",
+      point = "BOTTOMRIGHT",
+      relPoint = "BOTTOMRIGHT",
+      x = -51,
+      y = 95,
+    },
+    btnConfig = tcopy(defaultActionConfig),
+  },
+
+  -- multibar bottom right
+  [4] = {
+    visible = false,
+    size = 36,
+    spacing = 6,
+    rows = 1,
+    columns = 12,
+    growLeft = false,
+    growUp = false,
+    columnMajor = false,
+    pages = nil,
+    opacity = 100,
+    anchor = { 
+      frame = "MainMenuBarArtFrame",
+      point = "BOTTOMLEFT",
+      relPoint = "BOTTOMLEFT",
+      x = 514,
+      y = 53,
+    },
+    btnConfig = tcopy(defaultActionConfig),
+  },
+
+  -- multibar bottom left
+  [5] = {
+    visible = false,
+    size = 36,
+    spacing = 6,
+    rows = 1,
+    columns = 12,
+    growLeft = false,
+    growUp = false,
+    columnMajor = false,
+    pages = nil,
+    opacity = 100,
+    anchor = { 
+      frame = "MainMenuBarArtFrame",
+      point = "BOTTOMLEFT",
+      relPoint = "BOTTOMLEFT",
+      x = 3,
+      y = 53,
+    },
+    btnConfig = tcopy(defaultActionConfig),
+  },
+
+  -- pet action bar
+  [6] = {
+    visible = true,
+    parent = "PetActionBarFrame",
+    size = 30,
+    spacing = 8,
+    rows = 1,
+    columns = 10,
+    growLeft = false,
+    growUp = false,
+    columnMajor = false,
+    pages = nil,
+    opacity = 100,
+    anchor = {
+      frame = "PetActionBarFrame",
+      point = "BOTTOMLEFT",
+      relPoint = "BOTTOMLEFT",
+      x = 31,
+      y = -1,
+    },
+    btnConfig = tcopy(defaultPetActionConfig),
+  },
+
+}
+
+-- default settings for action IDs match Blizzard's settings... 
+-- ... except on the main bar extra pages, which map directly to the default shapeshift IDs
+-- rather than mirroring the multi action bars, to give access to all 120 actions
+local bars = ReAction_DefaultBlizzardBars
+
+for i = 1, 12 do
+  bars[1].btnConfig.ids[i] = {
+    i, 
+    72+i, 
+    84+i,
+    96+i,
+    108+i,
+    12+i
   }
-}
+end
+
+for b = 2, 5 do
+  for i = 1, 12 do
+    bars[b].btnConfig.ids[i] = { 12*(b-1) + i }
+  end
+end
+
+for i = 1, 10 do
+  bars[6].btnConfig.ids[i] = { i }
+end
+
+

--- a/Options.lua	Tue Mar 20 21:20:20 2007 +0000
+++ b/Options.lua	Tue Mar 20 21:25:29 2007 +0000
@@ -1,4 +1,19 @@
--- Ace2 Options table for ReAction
+-- Ace2 global options tables for ReAction
+
+
+-- autogenerate the NewBar sub-types table
+local function GenerateNewBarArgs()
+  local args = { }
+  for _, name in pairs(ReAction:GetButtonTypeList() ) do
+    args[name] = {
+      type="execute",
+      name=name,
+      desc=name,
+    }
+  end
+  return args
+end
+
 
 ReActionConsoleOptions = {
   type="group",
@@ -21,7 +36,7 @@
       type = "execute",
       name = "bindings",
       desc = "Launches keybinding setup mode",
-      func = function() ReBinder:Enable() end,
+      func = function() ReBound:Enable() end,
     },
 
     hideart = {
@@ -31,27 +46,29 @@
       get  = "IsArtHidden",
       set  = "ToggleHideArt",
     },
-    
-    new = {
-      type = "execute",
-      name = "new",
-      desc = "Create a new bar with default settings",
-      func = "NewBar"
-    },
-    
+
     showid = {
       type = "toggle",
       name = "showid",
       desc = "Show ActionIDs on buttons",
-      get  = "IsActionIDVisible",
-      set  = "ToggleActionID",
+      get  = "AreIdsVisible",
+      set  = "ToggleIds",
+    },
+
+    create = {
+      type = "group",
+      name = "create",
+      pass = true,
+      func = "NewBar",
+      args = GenerateNewBarArgs(),
+      desc = "Create a new bar",
     },
 
     resetall = {
       type = "execute",
       name = "resetall",
       desc = "Resets to single bar in the default position",
-      func = "ResetBars"
+      func = "ResetBars",
     },
     
     --[[
@@ -59,7 +76,8 @@
       type = "execute",
       name = "resync",
       desc = "Re-orders action IDs sequentially amongst bars",
-      func = "ResyncActionIDs"
+      func = "ResyncActionIDs",
+      disabled = true -- not yet implemented
     },
     ]]
   }
@@ -67,213 +85,320 @@
 
 
 ReActionGlobalMenuOptions = {
-  type="group",
+  type = "group",
+  -- handler = nil, -- NOTE: this variable isn't defined yet, must be added later
   args={ 
     lockbars = {
       type = "toggle",
       name = "Lock Bars",
       desc = "Locks action bars and disables rearrangement",
-      get = function() return ReAction:IsLocked() end,
-      set = function() ReAction:ToggleLocked() end,
+      get = "IsLocked",
+      set = "ToggleLocked",
       order = 1,
     },
 
     lockbtns = {
       type = "toggle",
       name = "Lock Buttons",
-      desc = "Locks action bars and disables rearrangement",
+      desc = "Prevents buttons from being dragged off accidentally. Shift-drag instead.",
       get = function() return LOCK_ACTIONBAR == "1" end,
       set = function() LOCK_ACTIONBAR = (LOCK_ACTIONBAR == "1" and "0" or "1") end,
       order = 2,
     },
 
+    new = {
+      type = "group",
+      name = "New bar",
+      pass = true,
+      func = "NewBar",
+      args = GenerateNewBarArgs(),
+      desc = "Create a new bar",
+      order = 3,
+    },
+
     bindings = {
       type = "execute",
       name = "Set Key Bindings",
       desc = "Launches keybinding setup mode",
-      func = function() ReBinder:Enable() end,
-      order = 3,
+      func = function() ReBound:Enable() end,
+      order = 4,
     },
 
-    new = {
-      type = "execute",
-      name = "New Bar",
-      desc = "Create a new bar with default settings",
-      func = function() ReAction:NewBar() end,
-      order = 4,
-    },
-    
     showid = {
       type = "toggle",
       name = "Show Action IDs",
       desc = "Show ActionIDs on buttons",
-      get  = function() return ReAction:IsActionIDVisible() end,
-      set  = function() ReAction:ToggleActionID() end,
+      get  = "AreIdsVisible",
+      set  = "ToggleIds",
       order = 5,
     },
 
+    hidedefault = {
+      type = "toggle",
+      name = "Hide Default Main Menu Bar",
+      desc = "Hides default Blizzard main menu bar, including bag bar, micro menu bar, shapeshift bar, lag meter, and XP bar",
+      get  = "IsArtHidden",
+      set  = "ToggleHideArt",
+      order = 6,
+    },
+    
     --[[
     resync = {
       type = "execute",
       name = "Re-sync Action IDs",
       desc = "Re-orders action IDs sequentially amongst bars",
-      func = function() ReAction:ResyncActionIDs() end,
-      order = 6,
+      func = "ResyncActionIDs",
+      disabled = true, -- not yet implemented
     },
     ]]
 
-    hideart = {
-      type = "toggle",
-      name = "Hide Default Art",
-      desc = "Hide default Blizzard action bar artwork and XP bar",
-      get  = function() return ReAction:IsArtHidden() end,
-      set  = function() return ReAction:ToggleHideArt() end,
-      order = 7,
-    },
-    
-    --[[
-    reset = {
-      type = "execute",
-      name = "Reset Bars",
-      desc = "Resets to single bar in the default position",
-      func = function() ReAction:ResetBars() end,
-      order = 8,
-    },
-   ]]
-    
   }
 }
 
-function GenerateReActionBarOptions( bar )
-  return {
+
+
+  
+
+function GenerateReActionBarOptions( bar, main )
+  local opts = {
     type = "group",
+    handler = bar,
     args = { 
     
       sep1 = {
         type = "header",
         name = " ",
         desc = " ",
-        order = 9,
+        order = 1,
       },
       
       hdr1 = {
         type = "header",
-        name = "Bar Options",
-        des = "Bar Options",
-        order = 10,
+        name = "Options for Bar #"..bar.barID,
+        desc = "Options for Bar #"..bar.barID,
+        order = 2,
+      },
+
+      layout = {
+        type = "group",
+        name = "Layout",
+        desc = "Button ordering options",
+        order = 3,
+        args = {
+          growLeft = {
+            type = "toggle",
+            name = "Right to Left",
+            desc = "Lay out buttons right-to-left rather than left-to-right",
+            get  = "GetGrowLeft",
+            set  = "SetGrowLeft",
+            order = 3,
+          },
+
+          growUp = {
+            type = "toggle",
+            name = "Bottom to Top",
+            desc = "Lay out buttons bottom-to-top rather than top-to-bottom",
+            get  = "GetGrowUp",
+            set  = "SetGrowUp",
+            order = 4,
+          },
+
+          columnMajor = {
+            type = "toggle",
+            name = "Arrange in Columns",
+            desc = "Lay out buttons sequentially in columns, rather than in rows",
+            get  = "GetColumnMajor",
+            set  = "SetColumnMajor",
+            order = 5,
+          },
+
+          flip = {
+            type = "execute",
+            name = "Flip rows/columns",
+            desc = "Swaps the number of rows and columns, and inverts the button numbering",
+            func = "FlipRowsColumns",
+            order = 6,
+          },
+        },
       },
       
-      --[[
-      hidden = {
-        type = "toggle",
-        name = "Hidden",
-        desc = "Hides the bar except when rearranging bars",
-        get = function() return not bar:GetVisibility() end,
-        set = function() bar:ToggleVisibility() end,
-        order = 11,
+      paging = {
+        type = "group",
+        name = "Paging",
+        desc = "Multi-page options",
+        order = 4,
+        args = {
+          pages = {
+            type = "range",
+            name = "Number of Pages",
+            desc = "Sets the number of pages",
+            get = "GetPages",
+            set = "SetPages",
+            min = 1,
+            max = 10,
+            step = 1,
+            order = 1,
+          },
+
+          autostance = {
+            type = "toggle",
+            name = "Auto Stance Switch",
+            desc = "Automatically switch pages when changing stance or shapeshift form.",
+            get  = "GetAutoStanceSwitch",
+            set  = "ToggleAutoStanceSwitch",
+            order = 2,
+          },
+
+          autostealth = {
+            type = "toggle",
+            name = "Auto Stealth Switch",
+            desc = "Automatically switch pages when stealthing/unstealthing.",
+            get  = "GetAutoStealthSwitch",
+            set  = "ToggleAutoStealthSwitch",
+            order = 3,
+          },
+
+          hidecontrols = {
+            type = "toggle",
+            name = "Hide Paging Controls",
+            desc = "Hide the page up/down controls",
+            get  = "ArePageControlsHidden",
+            set  = "TogglePageControlsHidden",
+            order = 4,
+            disabled = "IsPagingDisabled",
+          },
+
+          controlsloc = {
+            type = "text",
+            name = "Control location",
+            desc = "Location of the page up/down controls",
+            get  = function() return bar:GetPageControlsLoc() or "Blizzard" end,
+            set  = function(loc) bar:SetPageControlsLoc(loc) end,
+            order = 5,
+            disabled = function() return bar:IsPagingDisabled() or bar:ArePageControlsHidden() end,
+            validate = { "Blizzard", "LEFT", "RIGHT", "TOP", "BOTTOM" }
+          },
+        },
       },
-      ]]
+
+      visibility = {
+        type = "group",
+        name = "Visibility",
+        desc = "Set bar visibility options",
+        order = 5,
+        args = {
+          visible = {
+            type = "toggle",
+            name = "Always Visible",
+            desc = "The bar will always be visible.|n This setting overrides conditional settings below.",
+            get = "GetVisibility",
+            set = function() bar:SetVisibility(true) end,
+            order = 1,
+          },
+
+          hidden = {
+            type = "toggle",
+            name = "Always Hidden",
+            desc = "The bar will always be hidden, except when bars are unlocked.|n This setting overrides conditional settings below.",
+            get  = function() return not bar:GetVisibility() end,
+            set  = function() bar:SetVisibility(false) end,
+            order = 2,
+          },
+
+          spring = {
+            type = "toggle",
+            name = "Spring Bar Mode",
+            desc = "The bar is collapsed to a single button, which displays the last action used. Mousing over the button shows the entire bar.|n This setting overrides conditional settings below.",
+            get  = function() end,
+            set  = function() end,
+            hidden = true,
+            disabled = true, -- not yet implemented
+            order = 3,
+          },
+
+          conditional = {
+            type = "group",
+            name = "Auto Show",
+            desc = "Dynamically hide and show the entire bar based on certain conditions.",
+            hidden = true,
+            disabled = true, -- not yet implemented
+            order = 4,
+            args = {
+
+              mouseover = {
+                type = "toggle",
+                name = "Show On Mouseover",
+                desc = "Show the bar only when the mouse is over it.",
+                disabled = true, -- not yet implemented
+                get  = function() end,
+                set  = function() end,
+                order = 1,
+              },
+
+              combat = {
+                type = "toggle",
+                name = "Show In Combat",
+                desc = "Show the bar only when in combat.",
+                disabled = true, -- not yet implemented
+                get  = function() end,
+                set  = function() end,
+                order = 2,
+              },
+
+              nocombat = {
+                type = "toggle",
+                name = "Hide in Combat",
+                desc = "Show the bar only when not in combat.",
+                disabled = true, -- not yet implemented
+                get = function() end,
+                set = function() end,
+                order = 3,
+              }
+            }
+          },
+
+        }
+      },
       
       opacity = {
         type = "range",
         name = "Opacity",
-        desc = "Set bar opacity",
-        get = function() return bar:GetOpacity() end,
-        set = function(o) bar:SetOpacity(o) end,
+        desc = "Set the bar alpha value, from fully transparent (0) to fully opaque (100).",
+        get = "GetOpacity",
+        set = "SetOpacity",
         min = 0,
         max = 100,
         step = 1,
-        order = 12
+        order = 6,
       },
       
       delete = {
         type = "execute",
-        name = "Delete Bar",
-        desc = "Deletes the bar",
-        func = function() ReAction:DeleteBar(bar.barID) end,
-        order = 13,
+        name = "Delete Bar #"..bar.barID,
+        desc = "Deletes bar #"..bar.barID,
+        func = function() main:DeleteBar(bar.barID) end,
+        order = 7
       },
     }
   }
+
+  -- generate the auto-hide options for shapeshift forms. Note that this will 
+  -- only show forms that the character has learned, and the ordering may (? did this get fixed?)
+  -- vary from character to character of the same class
+  local args = opts.args.visibility.args.conditional.args
+  for i = 1, GetNumShapeshiftForms() do
+    local _, name = GetShapeshiftFormInfo(i)
+    args["stance"..i] = {
+      type = "toggle",
+      name = "Show In "..name,
+      desc = "Show the bar when in "..name.."." ,
+      get = function() end,
+      set = function() end,
+      order = #args + 1,
+      disabled = true,
+    }
+  end
+
+  return opts
 end
 
-
-local function setButtonConfig( bar, field, value )
-  if bar and bar.config and bar.config.btnConfig then
-    bar.config.btnConfig[field] = value
-    for _, b in ipairs(bar.buttons) do
-      b:ApplyLayout()
-      b:UpdateDisplay()
-    end
-  end
-end
-
-local function getButtonConfig( bar, field )
-  if bar and bar.config and bar.config.btnConfig then
-    return bar.config.btnConfig[field]
-  end
-end
-
-local function toggleButtonConfig( bar, field )
-  if bar and bar.config and bar.config.btnConfig then
-    bar.config.btnConfig[field] = not bar.config.btnConfig[field]
-    for _, b in ipairs(bar.buttons) do
-      b:ApplyLayout()
-      b:UpdateDisplay()
-    end
-  end
-end
-
-
-function GenerateReActionButtonOptions( bar )
-  return {
-    type = "group",
-    args = { 
-        
-      sep2 = {
-        type = "header",
-        name = "  ",
-        desc = "  ",
-        order = 14,
-      },
-      
-      hdr2 = {
-        type = "header",
-        name = "Button Options",
-        desc = "Button Options",
-        order = 15,
-      },
-      
-      showgrid = {
-        type = "toggle",
-        name = "Always Show Buttons",
-        desc = "Show button placeholders when no action is assigned or on the cursor. Note that buttons are always shown when bars are unlocked.",
-        get  = function() return getButtonConfig(bar, "showGrid") end,
-        set  = function() toggleButtonConfig(bar, "showGrid") end,
-        order = 16,
-      },
-      
-      colorkeys = {
-        type = "toggle",
-        name = "Color Hotkeys",
-        desc = "Enables/disables colorizing hotkeys by key modifier",
-        get  = function() return getButtonConfig(bar, "keyBindColorCode") end,
-        set  = function() toggleButtonConfig(bar, "keyBindColorCode", c) end,
-        order = 17,
-      },
-  
-      keyloc = {
-        type = "text",
-        name = "Hotkey Location",
-        desc = "Sets hotkey location",
-        get  = function() return getButtonConfig(bar, "keyBindLoc") end,
-        set  = function(loc) setButtonConfig(bar, "keyBindLoc", loc) end,
-        validate = { "TOP", "BOTTOM", "TOPLEFT", "TOPRIGHT", "BOTTOMLEFT", "BOTTOMRIGHT" },
-        order = 18,
-      },
-      
-    }    
-  }
-end
-
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/README.html	Tue Mar 20 21:25:29 2007 +0000
@@ -0,0 +1,202 @@
+<html>
+<head>
+<title>ReAction: README</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<body bgcolor="#FFFFFF" text="#000000">
+<h1 align="center">ReAction</h1>
+<h3 align="center">AddOn for World of Warcraft</h3>
+<p><font size="2">Current Version: 0.3 (beta)<br>
+  Released: 29 Jan 2007</font><font size="2"><br>
+  WoW Version Compatibility/TOC: 2.0.6 / TOC 20003</font></p>
+<h2>The Basics</h2>
+<p>ReAction is a replacement for the default Blizzard action bars. It allows you 
+  redefine your action button layout any way you like.</p>
+<h2>Features</h2>
+<ul>
+  <li>Move, resize, create, and arrange as many action bars as you want. Each 
+    bar can contain any number of buttons arranged in a grid layout of any size 
+    and spacing. The full complement of 120 action slots is supported.</li>
+  <li>Works with all types of actions, including abilities, items, and macros</li>
+  <li>Layout is done with the mouse, by dragging bars and bar edges on screen. 
+    Automatically anchor bars to each other or the screen edges by holding shift 
+    down as you drag.</li>
+  <li>Context menus provide independent configuration options for each bar.</li>
+  <li>Point and click keybinding interface.</li>
+  <li>Supports multiple 'pages' per bar, configured independently. Automatic stance, 
+    form, and stealth switching among pages is supported, including Shadowform.</li>
+  <li>Pet action bar is fully supported and configurable.</li>
+  <li>Settings can be saved per account, realm, character, class, or independent 
+    profile. </li>
+  <li>Compatible with OmniCC</li>
+</ul>
+<p>ReAction is built using the <a href="http://www.wowace.com/Wiki/Ace2">Ace2</a> 
+  development framework.</p>
+<h2>Using ReAction</h2>
+<h3>Installation</h3>
+<p>To install ReAction, drag the ReAction folder to World of Warcraft/Interface/AddOns. 
+  Exit World of Warcraft if it's running, then restart.</p>
+<h3>Welcome to ReAction</h3>
+<p>When you first enter World of Warcraft with ReAction installed, it will look 
+  very similar to the default Blizzard UI, depending on what other AddOns are 
+  installed. Any keybindings you have made to the action bars, however, are not 
+  in effect. Also, only the main menu bar is shown by default. The bottom left, 
+  bottom right, and two right action bars are hidden.</p>
+<p>If you have FuBar installed, on the left side you should see the ReAction plugin 
+  icon and label. If not, there should be a button on your minimap. In either 
+  case, that button (the ReAction Control Button) is the gateway to configuring 
+  ReAction.</p>
+<p>ReAction has three modes of operation:</p>
+<ul>
+  <li>Normal (&quot;locked&quot;)</li>
+  <li>Configuration (&quot;unlocked&quot;)</li>
+  <li>Keybinding</li>
+</ul>
+<p>You can toggle Configuration mode by shift-clicking the ReAction Control Button 
+  and toggle Keybinding mode by alt-clicking the button. Global configuration 
+  options are also available by right-clicking the ReAction button. There are 
+  also a limited set of console commands that can be accessed with the &quot;/reaction&quot; 
+  or &quot;/rxn&quot; slash-commands. Type /rxn in the chat box to print a list 
+  of commands.</p>
+<p>You can also set key bindings to toggle Configuration and Keybinding modes, 
+  in the standard UI keybindings panel.</p>
+<h3>Configuring ReAction</h3>
+<p>Start by shift-clicking the ReAction button to enter Configuration mode. All 
+  bars, including hidden bars, are shown in this mode and <b>normal button click 
+  operation is disabled </b>(though keybindings still work). Mouse over the bars, 
+  edges, and corners to see tooltip instructions for moving, resizing, and rearranging 
+  them. Right click each bar for a menu of options pertaining to that bar. For 
+  example, to change a hidden bar to a visible bar, right-click on a bar and choose 
+  Visibility -&gt; Always Visible. Tooltips for each menu option provide details.</p>
+<p>When you're done configuring ReAction, shift-click the ReAction button again 
+  to go back to Normal mode.</p>
+<p>Configuration mode is not available if you are in combat, and is automatically 
+  cancelled if you enter combat.</p>
+<h3>Setting Keybindings</h3>
+<p><b>ReAction buttons don't use the regular keybindings of the default UI.</b> 
+  In order to get your buttons to use hotkeys, enter ReAction Keybinding Setup 
+  mode by alt-clicking the ReAction Control Button (or choosing 'keybinding mode' 
+  from the right-click menu). <b>ReAction button keybindings are not available 
+  from the standard keybindings menu!</b> You <i>must</i> use the ReAction keybinding 
+  interface.</p>
+<p>Like configuration mode, normal button operation is disabled while in keybinding 
+  mode (though again, any hotkeys you have assigned will work).</p>
+<p>With the keybinding interface out, you can mouseover any ReAction button to 
+  see what its current keybinding is. You can set the keybinding on a button by 
+  pressing the key, then clicking the button. To clear a keybinding from a ReAction 
+  button, right-click the button. If you've set up bars with multiple pages, you 
+  can also bind a key to the page up/down buttons on a per-bar basis. Just make 
+  sure the buttons are showing (they can be hidden later) and assign the keybinding 
+  like any other ReAction button.</p>
+<p>Keybindings are saved on a per-character basis. Keybinding mode is not available 
+  if you are in combat, and is automatically cancelled if you enter combat.</p>
+<h3>Playing with ReAction</h3>
+<p>Once you get your keybindings and configuration set up, you're ready to go. 
+  The buttons behave just like regular Blizzard buttons. However, at any time 
+  when you're not in combat, you can quickly switch to configuration mode and 
+  create a new bar, rearrange bars, hide/show a special-use bar, etc. Perfect 
+  for when you get some goofy quest item that has to be used temporarily, or get 
+  a new skill that doesn't fit on your current layout.</p>
+<h2>Limitations</h2>
+<ul>
+  <li>Due to a lack of certain functionality being made available by Blizzard, 
+    dragging and dropping actions onto action bars while in combat is a little 
+    funky. You have to click the destination button rather than just release drag 
+    on it.</li>
+  <li>You can't configure the pet bar unless you actually have a pet out at the 
+    moment. </li>
+  <li>No support for shapeshift/stance bar (yet)</li>
+  <li>If you have a bar with empty buttons, even though they're invisible they 
+    still block mouse input from reaching whatever might be under the button. 
+    This is a workaround so that you can drag and drop actions onto hidden slots 
+    during combat.</li>
+  <li>If you hide the default main menu bar, there is no substitute for the XP 
+    bar, bag bar, or micro menu bar (although the hotkeys for them still work)</li>
+  <li>The pet bar, by default, appears underneath bar #6 (lower left). You'll 
+    have to move bar 6 out of the way if you want to move the pet bar. Also, it 
+    does not</li>
+</ul>
+<h2>Known Issues</h2>
+<ul>
+  <li>There may or may not be a particular case in which turning off a pet's attack 
+    while using Eyes of the Beast doesn't work. Further investigation (and leveling 
+    a hunter to get Eyes of the Beast :-P) is required.</li>
+  <li>The initial mapping of action IDs for shapeshift forms doesn't exactly match 
+    Blizzard's mapping. When first starting up as a warrior, druid, or rogue, 
+    you will probably need to move your actions around.</li>
+  <li>Action IDs may not always be laid out in sequence, meaning that similar 
+    layouts on different machines may put the actions in a different order.</li>
+  <li>Keybindings are only saved per character, which causes problems when switching 
+    profiles.</li>
+  <li>There seems to be a big performance hit when first dragging a bar after 
+    entering configuration mode, and when first enabling keybinding mode.</li>
+</ul>
+<h2>Future Plans</h2>
+<ul>
+  <li>Use override bindings for the keybindings, and automatically switch with 
+    profiles. Also &quot;steal&quot; bindings from the default UI on first run 
+    so that they're populated with something reasonable.</li>
+  <li>Add support for bag bar, shapeshift bar, and micro menu bar. May also add 
+    XP bar to default unit frames for those who don't want to use a unit frame 
+    addon to get the XP bar back.</li>
+  <li>More dynamic bar support: auto show/hide/fade on stance switch, in combat, 
+    key pressed, etc.</li>
+  <li>&quot;pop-up&quot; bar support, in which a single button shows/hides a bar 
+    when moused over</li>
+  <li>Better and more flexible interface for defining page transitions on stance/form 
+    shift </li>
+  <li>Provide a method for normalizing the action ID layout, permitting better 
+    compatibility when used on different computers.</li>
+  <li>Provide some additional console commands so that enterprising users can 
+    macro certain configuration functionality (notably hiding and showing individual 
+    bars) </li>
+  <li>Yet more configurable button display options (disable cooldown flash, different 
+    borders, etc)</li>
+  <li>Localization</li>
+</ul>
+<h2>Version History</h2>
+<p>Version 0.3</p>
+<ul>
+  <li>Complete rewrite of the innards for better modularity</li>
+  <li>Lots of bug fixes</li>
+  <li>Multi-paged bar support</li>
+  <li>Pet bar support</li>
+  <li>Auto stance/form/stealth switching</li>
+  <li>Lots and lots of new configuration options</li>
+</ul>
+<p>Version 0.2</p>
+<ul>
+  <li>Bug fixes from 0.1</li>
+  <li>new keybinding interface</li>
+</ul>
+<p>Version 0.1</p>
+<ul>
+  <li>Initial concept, button arrangement</li>
+</ul>
+<h2>Credits</h2>
+<p>Huge credit to the <a href="http://www.wowace.com">Ace 2</a> development team, 
+  whose framework provides a level of functionality that I consider critical to 
+  the success of this addon.</p>
+<p>Similarly, enormous credit goes to <a href="http://ckknight.wowinterface.com">ckknight</a>, 
+  whose Dewdrop menuing system and FuBar plugin system are ridiculously easy to 
+  use.</p>
+<p>Finally, thanks to my alpha testers and stalwart adventuring companions: Deor, 
+  Nogrim, Sorabel, and Yngvi.</p>
+<h2>Copyright</h2>
+<p>ReAction &copy; 2007 by Ryan Findley.</p>
+<p>You are free to distribute this AddOn package without notice to the author, 
+  as long as the package is unmodified, this readme.html file accompanies the 
+  distribution, and no claim of authorship of the contents of the package is made. 
+  Derived works are expressly permitted but must be clearly labeled as not the 
+  work of the original author and packaged separately, with credit given to the 
+  original author. Inclusion of this package within a compilation is expressly 
+  permitted.</p>
+<p>The author expressly disclaims any warranty of any kind for the material contained 
+  in this package. USE AT YOUR OWN RISK.</p>
+<p>All files in this package under the 'libs/' directory are libraries made available 
+  by <a href="http://www.wowace.com">WoWAce</a>, and are not the work of this 
+  author.</p>
+<p>World of Warcraft is a registered trademark of Blizzard Entertainment, Inc.</p>
+</body>
+</html>

--- a/ReAction.toc	Tue Mar 20 21:20:20 2007 +0000
+++ b/ReAction.toc	Tue Mar 20 21:25:29 2007 +0000
@@ -1,15 +1,16 @@
-## Interface: 20000
+## Interface: 20003
 ## Title: ReAction |cff7fff7f -Ace2-|r
-## Notes: An action button layout tool
+## Notes: An action bar and button layout tool
 ## DefaultState: enabled
 ## LoadOnDemand: 0
 ## Author: Flick
-## Version: 0.1
+## Version: 0.3
 ## X-Description: An action bar and button layout tool
 ## X-Category: Action Bars
 ## SavedVariables: ReActionDB
 ## SavedVariablesPerCharacter: ReActionDBPC
-## OptionalDeps: Ace2
+## OptionalDeps: Ace2, FuBar
+## X-Embeds: Ace2, DewdropLib, TabletLib
 
 libs\AceLibrary\AceLibrary.lua
 libs\AceOO-2.0\AceOO-2.0.lua
@@ -17,22 +18,29 @@
 libs\AceDB-2.0\AceDB-2.0.lua
 libs\AceConsole-2.0\AceConsole-2.0.lua
 libs\AceEvent-2.0\AceEvent-2.0.lua
+libs\AceLocale-2.2\AceLocale-2.2.lua
 libs\Dewdrop-2.0\Dewdrop-2.0.lua
 libs\Tablet-2.0\Tablet-2.0.lua
 libs\FuBarPlugin-2.0\FuBarPlugin-2.0.lua
 
-ReBinder.lua
-ReBinder.xml
+locale-enUS.lua
 
+classes\ReAnchor.xml
+classes\ReAnchor.lua
+classes\ReBound.xml
+classes\ReBound.lua
+classes\ReBar.xml
+classes\ReBar.lua
+
+classes\ReAction.lua
+classes\ReAction_ActionType.lua
+classes\ReAction_ActionDisplay.lua
+classes\ReAction_ColorScheme.lua
+classes\ReAction_PetActionType.lua
+classes\ReAction_PetActionDisplay.lua
+
+Buttons.lua
 Defaults.lua
 Options.lua
 
-ReBar.lua
-ReBar.xml
-
-Button.lua
-Button.xml
-
-ReAction.lua
-
-
+main.lua

--- a/classes/ReAction.lua	Tue Mar 20 21:20:20 2007 +0000
+++ b/classes/ReAction.lua	Tue Mar 20 21:25:29 2007 +0000
@@ -1,19 +1,39 @@
+--
+-- ReAction is a base class for action button management. It provides a
+-- framework for button setup, placement, recycling, keybinding, etc.
+-- It does not define any layout or actual action functionality,
+-- which is deferred to derived classes. 
+--
+-- ReAction implements the ReBar.IButton interface. It is designed to be used with ReBar
+-- for grouping and laying out buttons.
+--
+-- ReAction supports the ReBound keybinding interface (only).
+--
+-- Each instance of a ReAction-derived object is associated with a single action
+-- button frame, which may or may not have a one-to-one mapping with actionID.
+--
+-- ReAction makes use of a configuration structure, which can (and should) be
+-- extended by implementations. A single config structure is shared amongst all
+-- ReAction class instances within a single ReBar group, so the structure should
+-- contain sub-tables for any property that needs to be defined on a per-button
+-- basis. Each button is passed a 'barIdx' parameter to be used as an index into
+-- such tables.
+--
+-- The base config structure is as follows:
+--
+-- config = {
+--   type = "ReAction", -- static string (used by ReBar)
+--   subtype = "string", -- ReAction implementation identifier (index into ReAction.buttonTypes)
+--   ids = { {paged list}, {paged list}, ... } -- indexed by self.barIdx
+-- }
+--
+
+
+local AceOO = AceLibrary("AceOO-2.0")
+local kbValidate = AceLibrary("AceConsole-2.0").keybindingValidateFunc
+
+
 -- private constants
-local namePrefix = "ReActionButton"
-local _G = getfenv(0)
-local ACTION_FREE = { }
-local MAX_ACTIONS = 120
-
-local hotKeyDefaultColor    = { r=1.0, g=1.0, b=1.0, a=1.0 }
-local hotKeyDisabledColor   = { r=0.6, g=0.6, b=0.6, a=1.0 }
-local hotKeyOutOfRangeColor = { r=1.0, g=0.2, b=0.2, a=1.0 }
-
-local hotKeyModifierColors = {
-  S = { r=0.6, g=0.6, b=1.0, a=1.0 },  -- shift
-  C = { r=1.0, g=0.82, b=0, a=1.0 },  -- ctrl
-  A = { r=0.1, g=1.0, b=0.1, a=1.0 },  -- alt
-}
-
 -- TODO: localize these key names with GetBindingText(KEY_)
 local keybindAbbreviations = {
   ["Mouse Button "] = "M-",
@@ -24,750 +44,324 @@
   [" Arrow"] = "",
 }
 
-local equippedActionBorderColor = { r=0, g=1.0, b=0, a=0.35 }
 
-local actionUsableColor        = { r=1.0, g=1.0, b=1.0, a=1.0 }
-local actionNotUsableColor     = { r=0.4, g=0.4, b=0.4, a=1.0 }
-local actionNotEnoughManaColor = { r=0.2, g=0.2, b=0.7, a=1.0 }
-local actionOutOfRangeColor    = { r=1.0, g=0.2, b=0.2, a=1.0 }
+------------------------
+-- Interface Declarations
+------------------------
 
--- private variables
-local kbValidate = AceLibrary("AceConsole-2.0").keybindingValidateFunc
-local actionButtonTbl = { }
+-- The ActionType interface defines what the button does when it is clicked. At a
+-- minimum it must do the equivalent of SetAttribute("type", ...) and handle events that
+-- cause the action to change.
+-- ReAction implementations must provide this interface (implicitly or explicitly).
+local IActionType = AceOO.Interface {
+ SetID         = "function", -- SetID(id, [page]) optional argument indicates page #: omitting indicates default. self.config.idx[barIdx] must be updated.
+ GetID         = "function", -- id = GetID([page]) optional argument indicates page #: omitting indicates current page
+ IsActionEmpty = "function", -- bool = IsActionEmpty()
+ SetupAction   = "function", -- one-time setup
+ UpdateAction  = "function", -- general action properties should be refreshed
+ PickupAction  = "function", -- pick up the action on the button and put on the cursor
+ PlaceAction   = "function", -- place the action on the cursor
+ UpdateTooltip = "function", -- update the tooltip with the action's info
+}
 
+-- The Display interface defines the "look and feel" of the action button. It should define the
+-- actual widgets and widget layout and provide methods to update the display.
+-- ReAction implementations must provide this interface (implicitly or explicitly).
+-- Note that ReAction implementations may also require additional display interfaces to be supported.
+--
+-- Also note: the class 'new' method must take *only* the primary button ID as an argument.
+local IDisplay = AceOO.Interface {
+  SetupDisplay       = "function", -- SetupDisplay(buttonName), one-time setup
+  UpdateDisplay      = "function", -- UpdateDisplay(), general display state should be refreshed
+  TempShow           = "function", -- TempShow(visible), calls to this can be nested so keep track.
+  GetActionFrame     = "function", -- f = GetActionFrame(), return a frame derived from SecureActionButtonTemplate (note: this is inherited unimplemented from ReBar.IButton)
+  GetBaseButtonSize  = "function", -- sz = GetBaseButtonSize(), return size in pixels of the nominal button (square)
+  DisplayID          = "function", -- DisplayID(id), show the action ID (or equivalent). Pass nil to hide.
+  DisplayHotkey      = "function", -- DisplayHotkey(keyText), set the hotkey display text
+}
 
 
--- ReActionButton is a class prototype object.
-ReActionButton = AceLibrary("AceOO-2.0").Class("AceEvent-2.0")
+----------------------------
+-- ReAction class definition
+----------------------------
 
--------------------
--- Class methods
--------------------
+ReAction = AceOO.Class("AceEvent-2.0", ReBar.IButton, IActionType, IDisplay)
+ReAction.virtual = true
+ReAction.IActionType = IActionType
+ReAction.IDisplay = IDisplay
 
--- In addition to supporting the 'new' creation method (in which case an action ID must be specified directly),
--- ReActionButton supports the 'acquire'/'release' creation method, which recycles objects and manages actionID assignment.
 
-function ReActionButton:acquire(parent, config, barIdx)
+-----------------------
+-- Static class members
+-----------------------
+
+ReAction.recycler = CreateFrame("Frame",nil,UIParent)
+ReAction.recycler:SetAllPoints(UIParent)
+ReAction.recycler:Hide()
+
+ReAction.buttonTypes = { }
+
+
+
+-----------------------
+-- Static class methods
+-----------------------
+
+function ReAction:AddButtonType( name, class, maxIDs )
+  self.buttonTypes[name] = { subtype = class, maxIDs = maxIDs }
+end
+
+function ReAction:GetButtonType( name )
+  if name then
+    local t = self.buttonTypes[name]
+    if t then
+      return t.subtype, t.maxIDs
+    end
+  end
+end
+
+function ReAction:GetButtonTypeList()
+  local list = { }
+  for name, _ in pairs(self.buttonTypes) do
+    table.insert(list,name)
+  end
+  return list
+end
+
+function ReAction:GetAvailableID( subtype, hint )
+  local class, maxIDs = self:GetButtonType(subtype)
+
+  -- store the list of action buttons in use in the button type class factory
+  if class._idTbl == nil then class._idTbl = { } end
+  local t = class._idTbl
   local id = nil
-  for i = 1, MAX_ACTIONS do
-    if actionButtonTbl[i] == nil or actionButtonTbl[i].inUse == false then
+  
+  -- find lowest ID not in use
+  for i = 1, maxIDs do
+    if t[i] == nil or t[i].inUse == false then
       id = i
       break
     end
   end
 
-  if id == nil then return nil end  -- all buttons and action ids are in use
+  if id == nil then return nil end  -- all action ids are in use
 
-  local hint = config.actionIDs[barIdx]
-  if hint and (actionButtonTbl[hint] == nil or actionButtonTbl[hint].inUse == false) then
+  -- if a hint is given, see if that one is free instead
+  if hint and (t[hint] == nil or t[hint].inUse == false) then
     id = hint
   end
 
-  if actionButtonTbl[id] == nil then 
-    actionButtonTbl[id] = { }
+  if t[id] == nil then 
+    t[id] = { }
   end
-  local t = actionButtonTbl[id]
+  t[id].inUse = true
 
-  t.inUse = true
-  if t.button then
-    t.button:Configure(parent,config,barIdx)
-  else
-    t.button = self:new(parent,config,barIdx,id)
+  return id, t[id]
+end
+
+function ReAction:Acquire(config, barIdx, pages, buttonsPerPage)
+  local btnType = self:GetButtonType(config.subtype)
+  if not btnType then
+    error("ReAction: Unknown button type specified.")
+  end
+  pages = pages or 1
+  
+  local ids = { }
+  local primary = nil
+
+  for i = 1, pages do
+    local hint = config.ids[barIdx] and config.ids[barIdx][i]
+    if hint == nil and i > 1 and ids[i-1] then
+      hint = ids[i-1] + (buttonsPerPage or 0)
+    end
+    local id, p = self:GetAvailableID(config.subtype, hint)
+    if id == nil then
+      break
+    end
+    primary = primary or p
+    if id then
+      ids[i] = id
+    end
   end
 
-  -- fix screwy config with overlapping IDs
-  config.actionIDs[barIdx] = id
-  return t.button
+  if primary then
+    if not primary.button then
+      primary.button = btnType:new(ids[1])
+    end
+    if primary.button then
+      config.ids[barIdx] = ids
+      primary.button:Configure(config,barIdx)
+    end
+  end
+
+  return primary and primary.button
 end
 
-function ReActionButton:release( b )
+function ReAction:Release( b )
   if b then
-    actionButtonTbl[b:GetActionID()].inUse = false
+    for i = 1, #b.config.ids[b.barIdx] do
+      local id = b:GetID(i)
+      if id then
+        b.class._idTbl[id].inUse = false
+      end
+    end
+    b.config = nil
     b:Recycle()
   end
 end
 
-
-
-function ReActionButton:ShowAllActionIDs()
-  for _, b in ipairs(actionButtonTbl) do
-    b:ShowActionID()
+function ReAction:ShowAllIds()
+  for _, t in pairs(self.buttonTypes) do
+    if t.subtype._idTbl then
+      for _, tbl in pairs(t.subtype._idTbl) do
+        if tbl.button then tbl.button:DisplayID(tbl.button:GetID()) end
+      end
+    end
   end
+  self.showIDs_ = true
 end
 
-function ReActionButton:HideAllActionIDs()
-  for _, b in ipairs(actionButtonTbl) do
-    b:HideActionID()
+function ReAction:HideAllIds()
+  for _, t in pairs(self.buttonTypes) do
+    if t.subtype._idTbl then
+      for _, tbl in pairs(t.subtype._idTbl) do
+        if tbl.button then tbl.button:DisplayID(nil) end
+      end
+    end
   end
+  self.showIDs_ = false
 end
 
 
 ----------------------
 -- Instance methods
 ----------------------
-function ReActionButton.prototype:init( parentFrame, config, barIdx, id )
-  ReActionButton.super.prototype.init(self)
 
-  -- create the button widget
-  self.name = namePrefix..id
-  self.button = CreateFrame("CheckButton", self.name, parentFrame, "ReActionButtonTemplate")
-  
-  -- store references to the various sub-frames so we don't have to look it up all the time
-  self.frames      = {
-    hotkey         = _G[self.name.."HotKey"],
-    count          = _G[self.name.."Count"],
-    cooldown       = _G[self.name.."Cooldown"],
---    nCooldown      = _G[self.name.."CooldownNumeric"],
-    macro          = _G[self.name.."Name"],
-    icon           = _G[self.name.."Icon"],
-    border         = _G[self.name.."Border"],
-    normalTexture  = _G[self.name.."NormalTexture"],
-    flash          = _G[self.name.."Flash"],
-    actionID       = _G[self.name.."ActionID"],
-  }
+-- constructor
 
-  -- provide a reference back to this object for the frame to use in event handlers
-  self.button.rxnBtn = self
-
-  -- set the action ID
-  self:SetActionID(id)
-
-  -- register button with ReBinder for keybinding
-  ReBinder:AddKeybindTarget(self.button)
-
-  -- initialize
-  self:Configure(parentFrame, config, barIdx)
+function ReAction.prototype:init()
+  ReAction.super.prototype.init(self)
 end
 
-local function tcopy(t)
-  local r = { }
-  for k, v in pairs(t) do
-    r[k] = (type(v) == "table" and tcopy(v) or v)
-  end
-  return r
+
+-- ReBar.IButton interface
+
+function ReAction.prototype:BarUnlocked()
+  self:TempShow(true)
 end
 
-function ReActionButton.prototype:Recycle()
-  local b = self.button
-
-  self:SetKeyBinding(nil)
-  self:UpdateDisplay()
-  b:UnregisterAllEvents()
-  b:SetParent(ReActionButtonRecycleFrame)
-  b:ClearAllPoints()
-  b:SetPoint("TOPLEFT",0,0)
-  b:Hide()
-  self.config = tcopy(self.config) -- ew, but necessary
+function ReAction.prototype:BarLocked()
+  self:TempShow(false)
 end
 
-function ReActionButton.prototype:BarUnlocked()
-  self:ShowGridTmp()
-end
-
-function ReActionButton.prototype:BarLocked()
-  self:HideGridTmp()
-end
-
-
--- set the button location
-function ReActionButton.prototype:PlaceButton(point, x, y, sz)
-  local b = self.button
-  local scale = sz / 36
+function ReAction.prototype:PlaceButton(parent, point, x, y, sz)
+  local b = self:GetActionFrame()
+  local baseSize = self:GetBaseButtonSize()
+  local scale = baseSize and baseSize ~= 0 and ((sz or 1) / baseSize) or 1
+  if scale == 0 then scale = 1 end
   b:ClearAllPoints()
-  b:SetScale( scale )
+  b:SetParent(parent)
+  b:SetScale(scale)
   b:SetPoint(point,x/scale,y/scale)
 end
 
-
-function ReActionButton.prototype:ShowActionID()
-  self.frames.actionID:Show()
-end
-
-function ReActionButton.prototype:HideActionID()
-  self.frames.actionID:Hide()
-end
-
-
-
--- configuration and setup
-function ReActionButton.prototype:Configure( parentFrame, config, barIdx )
-  self.config   = config
-  self.barIdx   = barIdx
-  self.showGridTmp_ = 0
-
-  self.button:ClearAllPoints()
-  self.button:SetParent(parentFrame)
-
-  self:SetupAttributes()
-  self:RegisterStaticEvents()
-
-  self:ApplyLayout()
-  self:ApplyStyle()
-
-  self:UpdateDisplay()
-end
-
-function ReActionButton.prototype:SetupAttributes()
-  local b = self.button
-  b:SetAttribute("type", "action")
-	b:SetAttribute("shift-type*", ATTRIBUTE_NOOP)
-	b:SetAttribute("checkselfcast", true)
-	b:SetAttribute("useparent-unit", true)
-end
-
-function ReActionButton.prototype:RegisterStaticEvents()
-	self:RegisterEvent("PLAYER_ENTERING_WORLD")
-	self:RegisterEvent("ACTIONBAR_SLOT_CHANGED")
-	self:RegisterEvent("UPDATE_BINDINGS")
-  self:RegisterEvent("ACTIONBAR_SHOWGRID")
-  self:RegisterEvent("ACTIONBAR_HIDEGRID")
-end
-
-function ReActionButton.prototype:RegisterActionEvents()
-  self:RegisterEvent("ACTIONBAR_UPDATE_STATE")
-  self:RegisterEvent("ACTIONBAR_UPDATE_USABLE")
-  self:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN", "ACTIONBAR_UPDATE_USABLE")
-  self:RegisterEvent("UPDATE_INVENTORY_ALERTS", "ACTIONBAR_UPDATE_USABLE")
-  self:RegisterEvent("PLAYER_AURAS_CHANGED", "ACTIONBAR_UPDATE_USABLE")
-  self:RegisterEvent("PLAYER_TARGET_CHANGED", "ACTIONBAR_UPDATE_USABLE")
-  self:RegisterEvent("UNIT_INVENTORY_CHANGED")
-  self:RegisterEvent("CRAFT_SHOW")
-  self:RegisterEvent("CRAFT_CLOSE", "CRAFT_SHOW")
-  self:RegisterEvent("TRADE_SKILL_SHOW", "CRAFT_SHOW")
-  self:RegisterEvent("TRADE_SKILL_CLOSE", "CRAFT_SHOW")
-  self:RegisterEvent("PLAYER_ENTER_COMBAT", "CRAFT_SHOW")
-  self:RegisterEvent("PLAYER_LEAVE_COMBAT")
-  self:RegisterEvent("START_AUTOREPEAT_SPELL")
-  self:RegisterEvent("STOP_AUTOREPEAT_SPELL")
-
-  self.button:SetScript("OnUpdate", function() self:OnUpdate(arg1) end)
-  self.actionEventsRegistered = true
-end
-
-function ReActionButton.prototype:UnregisterActionEvents()
-  self:UnregisterEvent("ACTIONBAR_UPDATE_STATE")
-  self:UnregisterEvent("ACTIONBAR_UPDATE_USABLE")
-  self:UnregisterEvent("ACTIONBAR_UPDATE_COOLDOWN")
-  self:UnregisterEvent("UPDATE_INVENTORY_ALERTS")
-  self:UnregisterEvent("PLAYER_AURAS_CHANGED")
-  self:UnregisterEvent("PLAYER_TARGET_CHANGED")
-  self:UnregisterEvent("UNIT_INVENTORY_CHANGED")
-  self:UnregisterEvent("CRAFT_SHOW")
-  self:UnregisterEvent("CRAFT_CLOSE")
-  self:UnregisterEvent("TRADE_SKILL_SHOW")
-  self:UnregisterEvent("TRADE_SKILL_CLOSE")
-  self:UnregisterEvent("PLAYER_ENTER_COMBAT")
-  self:UnregisterEvent("PLAYER_LEAVE_COMBAT")
-  self:UnregisterEvent("START_AUTOREPEAT_SPELL")
-  self:UnregisterEvent("STOP_AUTOREPEAT_SPELL")
-
-  self.button:SetScript("OnUpdate", nil)
-  self.actionEventsRegistered = false
-end
-
-
--- event handlers
-function ReActionButton.prototype:ACTIONBAR_SLOT_CHANGED()
-  if arg1 == 0 or arg1 == self:GetActionID() then
-    self:UpdateDisplay()
-  end
-end
-
-function ReActionButton.prototype:PLAYER_ENTERING_WORLD()
-  self:UpdateDisplay()
-end
-
-function ReActionButton.prototype:UPDATE_BINDINGS()
-  self:UpdateDisplay()
-end
-
-function ReActionButton.prototype:ACTIONBAR_SHOWGRID()
-  self:ShowGridTmp()
-end
-
-function ReActionButton.prototype:ACTIONBAR_HIDEGRID()
-  self:HideGridTmp()
-end
-
-function ReActionButton.prototype:ACTIONBAR_UPDATE_STATE()
-  self:UpdateCheckedState()
-end
-
-function ReActionButton.prototype:ACTIONBAR_UPDATE_USABLE()
-  self:UpdateUsable()
-  self:UpdateCooldown()
-  self:ColorHotKey()
-end
-
-function ReActionButton.prototype:UNIT_INVENTORY_CHANGED()
-  if arg1 == "player" then
-    self:UpdateDisplay()
-  end
-end
-
-function ReActionButton.prototype:CRAFT_SHOW()
-  self:UpdateCheckedState()
-end
-
-function ReActionButton.prototype:PLAYER_ENTER_COMBAT()
-  if IsAttackAction(self:GetActionID()) then
-    self:StartFlash()
-  end
-end
-
-function ReActionButton.prototype:PLAYER_LEAVE_COMBAT()
-  if IsAttackAction(self:GetActionID()) then
-    self:StopFlash()
-  end
-end
-
-function ReActionButton.prototype:START_AUTOREPEAT_SPELL()
-  if IsAutoRepeatAction(self:GetActionID()) then
-    self:StartFlash()
-  end
-end
-
-function ReActionButton.prototype:STOP_AUTOREPEAT_SPELL()
-  if self:IsFlashing() and not IsAttackAction(self:GetActionID()) then
-    self:StopFlash()
-  end
-end
-
-
--- OnUpdate handler
-function ReActionButton.prototype:OnUpdate(elapsed)
-  local action = self:GetActionID()
-  local f = self.frames
-
-  -- handle flashing
-	if self:IsFlashing() then
-		self.flashtime = self.flashtime - elapsed
-		if self.flashtime <= 0 then
-			local overtime = -self.flashtime
-			if overtime >= ATTACK_BUTTON_FLASH_TIME then
-				overtime = 0
-			end
-			self.flashtime = ATTACK_BUTTON_FLASH_TIME - overtime
-
-			if f.flash:IsVisible() then
-        f.flash:Hide()
-      else
-        f.flash:Show()
-			end
-		end
-	end
-	
-	-- Handle range indicator
-	if self.rangeTimer then
-		self.rangeTimer = self.rangeTimer - elapsed
-		if self.rangeTimer <= 0 then
-      self:ColorHotKey()
-      self:UpdateUsable()
-			self.rangeTimer = TOOLTIP_UPDATE_TIME
-		end
-	end
-
-  -- handle toltip update
-  if self.tooltipTime then
-    self.tooltipTime = self.tooltipTime - elapsed
-    if self.tooltipTime <= 0 then
-      if GameTooltip:IsOwned(self.button) then
-        self:UpdateTooltip()
-      else
-        self.tooltipTime = nil
+function ReAction.prototype:SetPages( n )
+  n = tonumber(n)
+  local ids = self.config.ids[self.barIdx]
+  if n and n >= 1 then
+    -- note that as long as n >= 1 then id[1] will never be modified, which is what we want
+    -- because then the button frame ID would be out of sync with the static button name
+    while #ids < n do
+      local id = ReAction:GetAvailableID(self.config.subtype, ids[#ids] + #self.config.ids)
+      if id == nil then
+        break
       end
+      self:SetID( id, #ids + 1 )
+      table.insert(ids, id)
+    end
+    while #ids > n do
+      local id = table.remove(ids)
+      self:SetID( nil, #ids + 1 )
+      self.class._idTbl[id].inUse = false
     end
   end
 end
 
+-- Event handlers
 
+function ReAction.prototype:UPDATE_BINDINGS()
+  self:DisplayHotkey(self:GetKeyBindingText(nil, true))
+end
 
 
--- keybinding functions
-function ReActionButton.prototype:SetKeyBinding( k )
+-- Internal functions
+
+function ReAction.prototype:Recycle()
+  --self:SetKeyBinding(nil) -- TODO: only if we're using override bindings
+  self:UnregisterAllEvents()
+  
+  -- tuck the frame away
+  local b = self:GetActionFrame()
+  b:SetParent(ReAction.recycler)
+  b:ClearAllPoints()
+  b:SetPoint("TOPLEFT",0,0)
+  b:Hide()
+end
+
+function ReAction.prototype:Configure( config, barIdx )
+  self.config   = config
+  self.barIdx   = barIdx
+
+  local ids = config.ids[barIdx]
+  self:SetID(ids[1]) -- default id
+  for i = 1, #ids do
+    self:SetID(ids[i], i) -- paged ids
+  end
+  self:UpdateAction()
+  self:UpdateDisplay()
+  self:DisplayHotkey(self:GetKeyBindingText(nil, true))
+
+	self:RegisterEvent("UPDATE_BINDINGS")
+end
+
+function ReAction.prototype:SetKeyBinding( k, mouseBtn )
   if k == nil or kbValidate(k) then
-    local current = self:GetKeyBinding()
-  	ClearOverrideBindings(self.button)
+    local current = self:GetKeyBinding(mouseBtn)
+  	-- !!!TODO: do we need this?
+  	-- ClearOverrideBindings(self:GetActionFrame())
     if current then
       SetBinding(current,nil)
     end
     if k then
-      SetBindingClick(k, self.name, "LeftButton")
+      -- TODO: use OverrideBinding and store the keybinding in the profile.
+      SetBindingClick(k, self:GetActionFrame():GetName(), mouseBtn or "LeftButton")
     end
   end
 end
 
-function ReActionButton.prototype:GetKeyBinding()
-  return GetBindingKey("CLICK "..self.name..":LeftButton")
+function ReAction.prototype:GetKeyBinding( mouseBtn )
+  return GetBindingKey("CLICK "..self:GetActionFrame():GetName()..":"..(mouseBtn or "LeftButton"))
 end
 
--- action ID functions
-function ReActionButton.prototype:SetActionID( id )
-  self.actionID = tonumber(id) -- force data integrity
-  self:ApplyActionID()
+function ReAction.prototype:GetKeyBindingText( mouseBtn, abbrev )
+  local key = self:GetKeyBinding(mouseBtn)
+  local txt = key and GetBindingText(key, "KEY_", abbrev and 1) or ""
+
+  if txt and abbrev then
+    -- further abbreviate some key names
+    for pat, rep in pairs(keybindAbbreviations) do
+      txt = string.gsub(txt,pat,rep)
+    end
+  end
+  return txt
 end
 
-function ReActionButton.prototype:GetActionID()
-  return self.actionID
-end
-
-function ReActionButton.prototype:ApplyActionID()
-  local action = tonumber(self:GetActionID())
-  self.button:SetAttribute("action",action)
-  self.frames.actionID:SetText(action or "")
-end
-
-function ReActionButton.prototype:ShowActionID()
-  self.frames.actionID:Show()
-end
-
-function ReActionButton.prototype:HideActionID()
-  self.frames.actionID:Hide()
-end
-
-function ReActionButton:ShowAllActionIDs() -- class-wide function
-  for _, tbl in pairs(actionButtonTbl) do
-    if tbl.button then tbl.button:ShowActionID() end
-  end
-end
-
-function ReActionButton:HideAllActionIDs() -- class-wide function
-  for _, tbl in pairs(actionButtonTbl) do
-    if tbl.button then tbl.button:HideActionID() end
-  end
-end
-
-
--- action transfer functions
-function ReActionButton.prototype:ShouldPickupAction(mouseButton)
-	return IsShiftKeyDown() and not SecureButton_GetModifiedAttribute(self.button, "type", mouseButton)
-end
-
-function ReActionButton.prototype:ShowGridTmp()
-  self.showGridTmp_ = self.showGridTmp_ + 1
-  self:UpdateVisibility()
-end
-
-function ReActionButton.prototype:HideGridTmp()
-  self.showGridTmp_ = self.showGridTmp_ - 1
-  self:UpdateVisibility()
-end
-
-function ReActionButton.prototype:ShowGrid()
-  self.config.showGrid = true
-  self:UpdateVisibility()
-end
-
-function ReActionButton.prototype:HideGrid()
-  self.config.showGrid = false
-  self:UpdateVisibility()
-end
-
-
-
--- layout & style functions
-function ReActionButton.prototype:ApplyLayout()
-  local f = self.frames
-
-  if self.config.keyBindLoc then
-    local h = f.hotkey
-    local loc = self.config.keyBindLoc
-    local top = string.match(loc,"TOP")
-    local bottom = string.match(loc, "BOTTOM")
-    h:ClearAllPoints()
-    h:SetWidth(40)
-    h:SetPoint(top or bottom,0,top and 2 or -2)
-    local j
-    if string.match(loc,"LEFT") then
-      j = "LEFT"
-    elseif string.match(loc,"RIGHT") then
-      j = "RIGHT"
-    else
-      j = "CENTER"
-    end
-    h:SetJustifyH(j)
-  end
-
-  if self.config.stackCountLoc then
-    local c = f.count
-    local loc = self.config.stackCountLoc
-    local top = string.match(loc,"TOP")
-    local bottom = string.match(loc, "BOTTOM")
-    c:ClearAllPoints()
-    c:SetWidth(40)
-    c:SetPoint(top or bottom,0,top and 2 or -2)
-    local j
-    if string.match(loc,"LEFT") then
-      j = "LEFT"
-    elseif string.match(loc,"RIGHT") then
-      j = "RIGHT"
-    else
-      j = "CENTER"
-    end
-    c:SetJustifyH(j)
-  end
-
-  if self.config.showKeyBind then
-    f.hotkey:Show()
-  else
-    f.hotkey:Hide()
-  end
-    
-  if self.config.showStackCount then
-    f.count:Show()
-  else
-    f.count:Hide()
-  end
-
---[[
-  if self.config.showNumericCooldown then
-    f.nCooldown:Show()
-  else
-    f.nCooldown:Hide()
-  end
-]]
-
-  if self.config.showMacroName then
-    f.macro:Show()
-  else
-    f.macro:Hide()
-  end
-end
-
-function ReActionButton.prototype:ApplyStyle()
-  local f = self.frames
-  -- for now, just a static style
-  f.hotkey:SetFontObject(NumberFontNormal)
-  f.count:SetFontObject(NumberFontNormalYellow)
-end
-
-
-
--- start/stop flashing
-function ReActionButton.prototype:StartFlash()
-  self.flashing = true
-  self.flashtime = 0
-  self:UpdateCheckedState()
-end
-
-function ReActionButton.prototype:StopFlash()
-  self.flashing = false
-  self.frames.flash:Hide()
-  self:UpdateCheckedState()
-end
-
-function ReActionButton.prototype:IsFlashing()
-  return self.flashing
-end
-
-
-
-
-
--- set the tooltip
-function ReActionButton.prototype:SetTooltip()
-  GameTooltip_SetDefaultAnchor(GameTooltip, self.button)
+function ReAction.prototype:SetTooltip()
+  GameTooltip_SetDefaultAnchor(GameTooltip, self:GetActionFrame())
   self:UpdateTooltip()
 end
 
-function ReActionButton.prototype:ClearTooltip()
+function ReAction.prototype:ClearTooltip()
   tooltipTime = nil
   GameTooltip:Hide()
 end
-
-
-
--- colorize the hotkey
-function ReActionButton.prototype:ColorHotKey()
-  local action = self:GetActionID()
-  local c = hotKeyDefaultColor
-
-  if action and HasAction(action) then
-    if IsActionInRange(action) == 0 then
-      c = hotKeyOutOfRangeColor
-    elseif self.config.keyBindColorCode then
-      local modKey = string.match( self.frames.hotkey:GetText() or "", "([ACS])%-")
-      c = modKey and hotKeyModifierColors[modKey] or c
-    end
-  else
-    c = hotKeyDisabledColor
-  end
-
-  self.frames.hotkey:SetTextColor(c.r, c.g, c.b)
-end
-
-
-
-
--- display update functions
-function ReActionButton.prototype:UpdateDisplay()
-  self:UpdateIcon()
-  self:UpdateHotkey()
-  self:UpdateCount()
-  self:UpdateMacroText()
-  self:UpdateUsable()
-  self:UpdateCooldown()
-  self:UpdateFlash()
-  self:UpdateEvents()
-  self:UpdateVisibility()
-  self:UpdateTooltip()
-end
-
-function ReActionButton.prototype:UpdateIcon()
-  local f = self.frames
-  local b = self.button
-
-  local action = self:GetActionID()
-  local texture = action and GetActionTexture(action)
-
-  if action and texture then
-    f.icon:SetTexture(texture)
-    f.icon:Show()
-    self.rangeTimer = -1
-    b:SetNormalTexture("Interface\\Buttons\\UI-Quickslot2")
-  else
-    f.icon:Hide()
-    f.cooldown:Hide()
-    self.rangeTimer = nil
-    b:SetNormalTexture("Interface\\Buttons\\UI-Quickslot")
-  end
-
-  self:UpdateCheckedState()
-
-  -- Add a green border if action is an equipped item
-  if action and IsEquippedAction(action) then
-    local c = equippedActionBorderColor
-    f.border:SetVertexColor(c.r, c.g, c.b, c.a or 1)
-    f.border:Show()
-  else
-    f.border:Hide()
-  end
-end
-
-function ReActionButton.prototype:UpdateCheckedState()
-  local action = self:GetActionID()
-	if action and (IsCurrentAction(action) or IsAutoRepeatAction(action)) then
-		self.button:SetChecked(1)
-	else
-		self.button:SetChecked(0)
-	end
-end
-
-
-function ReActionButton.prototype:UpdateHotkey()
-  local action = self:GetActionID()
-  local b = self.button
-  local f = self.frames
-  local key = self:GetKeyBinding()
-  local txt = GetBindingText(key, "KEY_",1)
-
-  -- abbreviate long key names
-  for pat, rep in pairs(keybindAbbreviations) do
-    txt = string.gsub(txt,pat,rep)
-  end
-   
-  if txt then
-    f.hotkey:SetText(string.upper(txt))
-    self:ColorHotKey()
-  else
-    f.hotkey:SetText("")
-  end
-end
-
-function ReActionButton.prototype:UpdateCount()
-  local action = self:GetActionID()
-	if action and (IsConsumableAction(action) or IsStackableAction(action)) then
-		self.frames.count:SetText(GetActionCount(action))
-	else
-		self.frames.count:SetText("")
-	end
-end
-
-function ReActionButton.prototype:UpdateMacroText()
-  local action = self:GetActionID()
-	self.frames.macro:SetText(action and GetActionText(action) or "")
-end
-
-function ReActionButton.prototype:UpdateUsable()
-  local f = self.frames
-  local action = self:GetActionID()
-	local isUsable, notEnoughMana
-  if action then
-    isUsable, notEnoughMana = IsUsableAction(action)
-  end
-	if isUsable then
-    local c = actionUsableColor
-    if IsActionInRange(action) == 0 then
-      c = actionOutOfRangeColor
-    else
-  		f.normalTexture:SetVertexColor(c.r, c.g, c.b, c.a)
-    end
-		f.icon:SetVertexColor(c.r, c.g, c.b, c.a)
-	elseif notEnoughMana then
-    local c = actionNotEnoughManaColor
-		f.icon:SetVertexColor(c.r, c.g, c.b, c.a)
-		f.normalTexture:SetVertexColor(c.r, c.g, c.b, c.a)
-  else
-    local c = actionNotUsableColor
-		f.icon:SetVertexColor(c.r, c.g, c.b, c.a)
-		f.normalTexture:SetVertexColor(1.0, 1.0, 1.0)
-	end
-end
-
-function ReActionButton.prototype:UpdateCooldown()
-  local action = self:GetActionID()
-  if action then
-  	local start, duration, enable = GetActionCooldown(self:GetActionID())
-  	CooldownFrame_SetTimer(self.frames.cooldown, start, duration, enable)
-    -- do numeric cooldown stuff here
-  end
-end
-
-function ReActionButton.prototype:UpdateFlash()
-  local b = self.button
-  local action = self:GetActionID()
-	if action and ((IsAttackAction(action) and IsCurrentAction(action)) or IsAutoRepeatAction(action)) then
-    self:StartFlash()
-	else
-    self:StopFlash()
-	end
-end
-
-function ReActionButton.prototype:UpdateVisibility()
-  local action = self:GetActionID()
-  local b = self.button
-
-  if b:GetAttribute("statehidden") then
-    b:Hide()
-  elseif action and HasAction(action) then
-    b:GetNormalTexture():SetAlpha(1.0)
-    b:Show()
-  elseif self.showGridTmp_ > 0 or self.config.showGrid then
-    b:GetNormalTexture():SetAlpha(0.5)
-    self.frames.cooldown:Hide()
-    b:Show()
-  else
-    b:Hide()
-  end
-end
-
-function ReActionButton.prototype:UpdateEvents()
-  local action = self:GetActionID()
-	if action and HasAction(action) then
-    self:RegisterActionEvents()
-  elseif self.actionEventsRegistered then
-    self:UnregisterActionEvents()
-	end
-end
-
-function ReActionButton.prototype:UpdateTooltip()
-  local action = self:GetActionID()
-	if GameTooltip:IsOwned(self.button) and action and GameTooltip:SetAction(action) then
-		self.tooltipTime = TOOLTIP_UPDATE_TIME
-	else
-		self.tooltipTime = nil
-	end
-end
-
-
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/classes/ReAction_ActionDisplay.lua	Tue Mar 20 21:25:29 2007 +0000
@@ -0,0 +1,391 @@
+-- The ReAction.ActionDisplay mixin defines 'regular' action button display functionality
+-- and is an implementation of the ReAction.IDisplay and ReAction.ActionType.IDisplay interfaces.
+--
+-- This Mixin assumes that it has been mixed in with a ReAction-derived class which implements
+-- the ReAction.IActionType and ReAction.IColorScheme interfaces.
+--
+-- This mixin uses properties of self.config to define display elements:
+--
+-- self.config = {
+--   keyBindLoc = "POSITION",       -- keybind anchor location
+--   stackCountLoc = "POSITION",    -- stack count anchor location
+--   showKeyBind = true/false,      -- show keybind labels
+--   showStackCount = true/false,   -- show stack count labels
+--   showMacroText = true/false,    -- show macro name labels
+--   showGrid = true/false,         -- always show empty buttons
+-- }
+--
+
+local AceOO = AceLibrary("AceOO-2.0")
+
+ReAction.ActionDisplay = AceOO.Mixin {
+  -- ReAction.IDisplay interface
+  "SetupDisplay",
+  "UpdateDisplay",
+  "TempShow",
+  "GetActionFrame",
+  "GetBaseButtonSize",
+  "DisplayID",
+  "DisplayHotkey",
+
+  -- ReAction.ActionType.IDisplay interface
+  "DisplayUsable",
+  "DisplayEquipped",
+  "DisplayAutoRepeat",
+  "DisplayInUse",
+  "DisplayIcon",
+  "DisplayName",
+  "DisplayCount",
+  "DisplayCooldown",
+
+  -- Event handlers
+  "PostClick",
+  "OnDragStart",
+  "OnReceiveDrag",
+  "OnEnter",
+  "OnLeave",
+  "OnUpdate",
+
+  -- internal functions
+  "ApplyLayout",
+  "ApplyStyle",
+  "StartFlash",
+  "StopFlash",
+  "IsFlashing",
+  "DisplayVisibility",
+}
+
+local RAAD = ReAction.ActionDisplay
+
+
+-- private constants
+local _G = getfenv(0)
+
+local equippedActionBorderColor  = { r=0.00,  g=1.00,  b=0.00,  a=0.35 } -- transparent green
+local actionIDColor              = { r=1.00,  g=0.82,  b=0.00,  a=1.00 } -- gold
+
+-- private functions
+-- extract and return color fields from a table, to be fed into SetVertexColor()/SetTextColor()
+local function tcolor(c)
+  return c.r, c.g, c.b, c.a
+end
+
+
+-----------------------------------
+-- Interface Implementation Methods
+-----------------------------------
+function RAAD:SetupDisplay( name )
+  -- create the button widget
+  local b = CreateFrame("CheckButton", name, nil, "SecureActionButtonTemplate, ActionButtonTemplate")
+
+  -- store references to the various sub-frames of ActionButtonTemplate so we don't have to look it up all the time
+  self.frames = {
+    button         = b,
+    hotkey         = _G[name.."HotKey"],
+    count          = _G[name.."Count"],
+    cooldown       = _G[name.."Cooldown"],
+    macro          = _G[name.."Name"],
+    icon           = _G[name.."Icon"],
+    border         = _G[name.."Border"],
+    flash          = _G[name.."Flash"],
+    normalTexture  = _G[name.."NormalTexture"],
+    actionID       = nil,    -- defer creating actionID font string until it's actually requested
+  }
+
+  -- ??? odd: why do we have to increment the cooldown frame level to get it to show? 
+  -- (otherwise it's behind the icon). The default UI doesn't have to (or at least I can't
+  -- find where it does) but for some reason we have to here.
+  self.frames.cooldown:SetFrameLevel(self.frames.cooldown:GetFrameLevel() + 1)
+
+  b:EnableMouse()
+  b:RegisterForDrag("LeftButton", "RightButton")
+  b:RegisterForClicks("AnyUp")
+  b:SetScript("PostClick",           function(arg1) self:PostClick(arg1) end)
+  b:SetScript("OnDragStart",         function(arg1) self:OnDragStart(arg1) end)
+  b:SetScript("OnReceiveDrag",       function() self:OnReceiveDrag() end)
+  b:SetScript("OnEnter",             function() self:OnEnter() end)
+  b:SetScript("OnLeave",             function() self:OnLeave() end)
+  -- defer setting OnUpdate until actions are actually attached
+
+  self.tmpShow_ = 0
+end
+
+function RAAD:UpdateDisplay()
+  self:ApplyLayout()
+  self:ApplyStyle()
+  self:DisplayVisibility()
+  -- refresh the action ID display
+  if ReAction.showIDs_ then
+    self:DisplayID(self:GetID())
+  end
+end
+
+function RAAD:TempShow( visible )
+  visible = visible and true or false -- force data integrity
+  self.showTmp_ = max(0, (self.showTmp_ or 0) + (visible and 1 or -1))
+  self:DisplayVisibility()
+end
+
+function RAAD:GetActionFrame()
+  return self.frames.button
+end
+
+function RAAD:GetBaseButtonSize()
+  return 36
+end
+
+function RAAD:DisplayID( id )
+  local f = self.frames.actionID
+  if id then
+    if not f then
+      -- create the actionID label
+      f = self.frames.button:CreateFontString(nil,"ARTWORK","NumberFontNormalSmall")
+      f:SetPoint("BOTTOMLEFT")
+      f:SetTextColor( tcolor(actionIDColor) )
+      self.frames.actionID = f
+    end
+    f:SetText(tostring(id))
+    f:Show()
+  elseif f then
+    f:Hide()
+  end
+end
+
+function RAAD:DisplayHotkey(txt)
+  self.frames.hotkey:SetText(string.upper(txt or ""))
+  self:UpdateUsable()
+end
+
+function RAAD:DisplayUsable( isUsable, notEnoughMana, outOfRange )
+  local f = self.frames
+  f.icon:SetVertexColor(          self:GetIconColor(isUsable, notEnoughMana, outOfRange) )
+  f.button:GetNormalTexture():SetVertexColor( self:GetBorderColor(isUsable, notEnoughMana, outOfRange) )
+  f.hotkey:SetTextColor(          self:GetHotkeyColor(isUsable, notEnoughMana, outOfRange, f.hotkey:GetText()) )
+end
+
+function RAAD:DisplayEquipped( equipped )
+  local b = self.frames.border
+  if equipped then
+    b:Show()
+  else
+    b:Hide()
+  end
+end
+
+function RAAD:DisplayAutoRepeat( r )
+  if r then
+    self:StartFlash()
+  else
+    self:StopFlash()
+  end
+end
+
+function RAAD:DisplayInUse( inUse )
+  self.frames.button:SetChecked( inUse and 1 or 0 )
+end
+
+function RAAD:DisplayIcon( texture )
+  local f = self.frames.button
+  local icon = self.frames.icon
+  if texture then
+    icon:SetTexture(texture)
+    icon:Show()
+    self.rangeTimer = -1
+    f:SetNormalTexture("Interface\\Buttons\\UI-Quickslot2")
+    if f:GetScript("OnUpdate") == nil then
+      f:SetScript("OnUpdate", function(frame, elapsed) self:OnUpdate(elapsed) end)
+    end
+  else
+    icon:Hide()
+    self.rangeTimer = nil
+    f:SetNormalTexture("Interface\\Buttons\\UI-Quickslot")
+    f:SetScript("OnUpdate",nil)
+  end
+  self:DisplayVisibility()
+end
+
+function RAAD:DisplayCooldown( start, duration, enable )
+  CooldownFrame_SetTimer(self.frames.cooldown, start, duration, enable)
+end
+
+function RAAD:DisplayName( name )
+  self.frames.macro:SetText(name and tostring(name) or "")
+end
+
+function RAAD:DisplayCount( count )
+  self.frames.count:SetText(count and tostring(count) or "")
+end
+
+
+
+
+
+----------------------
+-- Event Handlers
+----------------------
+function RAAD:PostClick()
+  self:UpdateInUse()
+end
+
+function RAAD:OnDragStart()
+  if LOCK_ACTIONBAR ~= "1" or IsShiftKeyDown() then
+    self:PickupAction()
+  end
+end
+
+function RAAD:OnReceiveDrag()
+  self:PlaceAction()
+end
+
+function RAAD:OnEnter()
+  self:SetTooltip() -- from ReAction base class
+  self.tooltipTime = TOOLTIP_UPDATE_TIME
+end
+
+function RAAD:OnLeave()
+  self:ClearTooltip() -- from ReAction base class
+  self.tooltipTime = nil
+end
+
+function RAAD:OnUpdate(elapsed)
+  -- handle flashing
+	if self:IsFlashing() then
+		self.flashtime = self.flashtime - elapsed
+		if self.flashtime <= 0 then
+			local overtime = -self.flashtime
+			if overtime >= ATTACK_BUTTON_FLASH_TIME then
+				overtime = 0
+			end
+			self.flashtime = ATTACK_BUTTON_FLASH_TIME - overtime
+			
+			local f = self.frames.flash
+			if f then
+        if f:IsVisible() then
+          f:Hide()
+        else
+          f:Show()
+        end
+      end
+		end
+	end
+	
+	-- Handle range indicator
+	if self.rangeTimer then
+		self.rangeTimer = self.rangeTimer - elapsed
+		if self.rangeTimer <= 0 then
+      self:UpdateUsable()
+			self.rangeTimer = TOOLTIP_UPDATE_TIME
+		end
+	end
+
+  -- handle tooltip update
+  if self.tooltipTime then
+    self.tooltipTime = self.tooltipTime - elapsed
+    if self.tooltipTime <= 0 then
+      if GameTooltip:IsOwned(self.frames.button) then
+        self:UpdateTooltip()
+        self.tooltipTime = TOOLTIP_UPDATE_TIME
+      else
+        self.tooltipTime = nil
+      end
+    end
+  end
+end
+
+
+
+----------------------
+-- Internal methods
+----------------------
+
+local function placeLabel( label, anchor )
+  local top = string.match(anchor,"TOP")
+  local bottom = string.match(anchor, "BOTTOM")
+  label:ClearAllPoints()
+  label:SetWidth(40)
+  label:SetPoint(top or bottom or "CENTER",0,top and 2 or bottom and -2 or 0)
+  local j
+  if string.match(anchor,"LEFT") then
+    j = "LEFT"
+  elseif string.match(anchor,"RIGHT") then
+    j = "RIGHT"
+  else
+    j = "CENTER"
+  end
+  label:SetJustifyH(j)
+end
+
+
+function RAAD:ApplyLayout()
+  local f = self.frames
+
+  if self.config.keyBindLoc then
+    placeLabel(f.hotkey, self.config.keyBindLoc)
+  end
+
+  if self.config.stackCountLoc then
+    placeLabel(f.count, self.config.stackCountLoc)
+  end
+
+  if self.config.showKeyBind then
+    f.hotkey:Show()
+  else
+    f.hotkey:Hide()
+  end
+    
+  if self.config.showStackCount then
+    f.count:Show()
+  else
+    f.count:Hide()
+  end
+
+  if self.config.showMacroName then
+    f.macro:Show()
+  else
+    f.macro:Hide()
+  end
+
+end
+
+function RAAD:ApplyStyle()
+  local f = self.frames
+  -- for now, just a static style
+  f.hotkey:SetFontObject(NumberFontNormal)
+  f.count:SetFontObject(NumberFontNormalYellow)
+  f.border:SetVertexColor( tcolor(equippedActionBorderColor) )
+end
+
+function RAAD:StartFlash()
+  self.flashing = true
+  self.flashtime = 0
+end
+
+function RAAD:StopFlash()
+  self.flashing = false
+  self.frames.flash:Hide()
+end
+
+function RAAD:IsFlashing()
+  return self.flashing
+end
+
+function RAAD:DisplayVisibility()
+  local b = self.frames.button
+
+  if b:GetAttribute("statehidden") then
+    -- can't hide/show in combat
+    if not InCombatLockdown() then
+      b:Hide()
+    end
+  elseif not self:IsActionEmpty() then
+    b:GetNormalTexture():SetAlpha(1.0)
+    b:SetAlpha(1)
+  elseif self.showTmp_ and self.showTmp_ > 0 or self.config.showGrid then
+    b:GetNormalTexture():SetAlpha(0.5)
+    self.frames.cooldown:Hide()
+    b:SetAlpha(1)
+  else
+    b:SetAlpha(0)
+  end
+end
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/classes/ReAction_ActionType.lua	Tue Mar 20 21:25:29 2007 +0000
@@ -0,0 +1,361 @@
+-- The ReAction.ActionType mixin defines 'regular' action button functionality 
+-- and is an implementation of the ReAction.IActionType interface.
+--
+-- The Mixin assumes that it is being mixed in with a ReAction-derived class
+-- which implements the ReAction.IDisplay and ReAction.ActionType.IDisplay interfaces.
+--
+-- This mixin using the following configuration properties:
+--
+-- self.config = {
+--   selfcast = nil / "alt" / "ctrl" / "shift" / "auto" / "none". nil (default) = use Interface Options menu setting.
+-- }
+--
+
+local AceOO = AceLibrary("AceOO-2.0")
+
+ReAction.ActionType = AceOO.Mixin {
+  -- ReAction.IActionType interface
+  "SetID",
+  "GetID",
+  "SetupAction",
+  "UpdateAction",
+  "PickupAction",
+  "PlaceAction",
+  "IsActionEmpty",
+  "UpdateTooltip",
+
+  -- event handlers
+  "ACTIONBAR_SLOT_CHANGED",
+  "PLAYER_ENTERING_WORLD",
+  "ACTIONBAR_SHOWGRID",
+  "ACTIONBAR_HIDEGRID",
+  "ACTIONBAR_UPDATE_STATE",
+  "ACTIONBAR_UPDATE_USABLE",
+  "UNIT_INVENTORY_CHANGED",
+  "CRAFT_SHOW",
+  "PLAYER_ENTER_COMBAT",
+  "PLAYER_LEAVE_COMBAT",
+  "START_AUTOREPEAT_SPELL",
+  "STOP_AUTOREPEAT_SPELL",
+  "OnAttributeChanged",
+  
+  -- internal functions
+  "UpdateSelfcast",
+  "UpdateIcon",
+  "UpdateInUse",
+  "UpdateCount",
+  "UpdateMacroText",
+  "UpdateUsable",
+  "UpdateCooldown",
+  "UpdateActionEvents",
+}
+
+local RAAT = ReAction.ActionType
+
+
+-- Required display elements
+RAAT.IDisplay = AceOO.Interface {
+  DisplayUsable      = "function", -- DisplayUsable(bool, notEnoughMana, outOfRange), change display to indicate action usable/unusable
+  DisplayEquipped    = "function", -- DisplayEquipped(bool)
+  DisplayAutoRepeat  = "function", -- DisplayAutoRepeat(bool)
+  DisplayInUse       = "function", -- DisplayInUse(bool)
+  DisplayIcon        = "function", -- DisplayIcon(texture), nil means empty slot
+  DisplayName        = "function", -- DisplayName(text), macro names
+  DisplayCount       = "function", -- DisplayCount(number), stack count
+  DisplayCooldown    = "function", -- DisplayCooldown(start,duration,enable)
+}
+
+
+---------------------------------------
+-- ReAction.IActionType interface implementation
+---------------------------------------
+function RAAT:SetID( id, page )
+  local f = self:GetActionFrame()
+  id = tonumber(id) -- force data integrity
+  page = tonumber(page)
+  local button = page and ("-page"..page) or "*"
+  if id then
+    f:SetAttribute("*action"..button, id)
+    if page and page > 1 and self.config.selfcast == "right-click" then
+      -- disable right-click auto-cast
+      self.config.selfcast = nil
+    end
+  elseif page then
+    f:SetAttribute("*action"..button, ATTRIBUTE_NOOP)
+  end
+  self:UpdateSelfcast()
+end
+
+function RAAT:GetID(page)
+  local f = self:GetActionFrame()
+  page = tonumber(page)
+  local button = page and ("page"..page) or SecureStateChild_GetEffectiveButton(f)
+  return SecureButton_GetModifiedAttribute(f, "action", button)
+end
+
+function RAAT:SetupAction()
+  local f = self:GetActionFrame()
+	f:SetAttribute("useparent*", true)
+  f:SetAttribute("type", "action")
+
+  self:RegisterEvent("PLAYER_ENTERING_WORLD")
+	self:RegisterEvent("ACTIONBAR_SLOT_CHANGED")
+  self:RegisterEvent("ACTIONBAR_SHOWGRID")
+  self:RegisterEvent("ACTIONBAR_HIDEGRID")
+
+  self:UpdateSelfcast()
+
+  f:SetScript("OnAttributeChanged",  function(frame,name,value) self:OnAttributeChanged(name,value) end)
+end
+
+function RAAT:UpdateAction()
+  self:UpdateIcon()
+  self:UpdateCount()
+  self:UpdateMacroText()
+  self:UpdateUsable()
+  self:UpdateCooldown()
+  self:UpdateActionEvents()
+end
+
+function RAAT:PickupAction()
+  PickupAction(self:GetID())
+  self:UpdateAction()
+end
+
+function RAAT:PlaceAction()
+  if not InCombatLockdown() then
+    -- PlaceAction() is protected. However the user can still drop a new action
+    -- onto a button while in combat by dragging then clicking, because
+    -- UseAction() appears to swap the cursor action for the current action if
+    -- an action is on the cursor.
+    PlaceAction(self:GetID())
+  end
+  self:UpdateActionEvents()
+  self:UpdateIcon()
+end
+
+function RAAT:IsActionEmpty()
+  local slot = self:GetID()
+  return not(slot and HasAction(slot))
+end
+
+function RAAT:UpdateTooltip()
+  local action = self:GetID()
+	if action and GameTooltip:IsOwned(self:GetActionFrame()) then
+    GameTooltip:SetAction(action)
+  end
+end
+
+
+
+
+
+
+
+-----------------------------
+-- Event Handling
+-----------------------------
+function RAAT:ACTIONBAR_SLOT_CHANGED(slot)
+  if slot == 0 or slot == self:GetID() then
+    self:UpdateAction()
+  end
+end
+
+function RAAT:PLAYER_ENTERING_WORLD()
+  self:UpdateAction()
+end
+
+function RAAT:ACTIONBAR_SHOWGRID()
+  self:TempShow(true)
+end
+
+function RAAT:ACTIONBAR_HIDEGRID()
+  self:TempShow(false)
+end
+
+function RAAT:ACTIONBAR_UPDATE_STATE()
+  self:UpdateInUse()
+end
+
+function RAAT:ACTIONBAR_UPDATE_USABLE()
+  self:UpdateUsable()
+  self:UpdateCooldown()
+end
+
+function RAAT:UNIT_INVENTORY_CHANGED(unit)
+  if unit == "player" then
+    self:UpdateIcon()
+    self:UpdateCount()
+  end
+end
+
+function RAAT:CRAFT_SHOW()
+  self:UpdateInUse()
+end
+
+function RAAT:PLAYER_ENTER_COMBAT()
+  if IsAttackAction(self:GetID()) then
+    self:DisplayAutoRepeat(true)
+    self:UpdateInUse()
+  end
+end
+
+function RAAT:PLAYER_LEAVE_COMBAT()
+  if IsAttackAction(self:GetID()) then
+    self:DisplayAutoRepeat(false)
+    self:UpdateInUse()
+  end
+end
+
+function RAAT:START_AUTOREPEAT_SPELL()
+  if IsAutoRepeatAction(self:GetID()) then
+    self:DisplayAutoRepeat(true)
+  end
+end
+
+function RAAT:STOP_AUTOREPEAT_SPELL()
+  if not IsAttackAction(self:GetID()) then
+    self:DisplayAutoRepeat(false)
+    self:UpdateInUse()
+  end
+end
+
+function RAAT:OnAttributeChanged(name, value)
+  if self.config then
+    self:UpdateAction()
+    self:UpdateDisplay()
+  end
+end
+
+
+
+
+---------------------------------
+-- Internal methods
+---------------------------------
+function RAAT:UpdateSelfcast()
+  if not InCombatLockdown() then
+    local c = self.config and self.config.selfcast
+    local f = self:GetActionFrame()
+
+    f:SetAttribute("alt-unit*",nil)
+    f:SetAttribute("ctrl-unit*",nil)
+    f:SetAttribute("shift-unit*",nil)
+    f:SetAttribute("*unit2",nil)
+    if c == nil then
+      f:SetAttribute("unit",nil)
+      f:SetAttribute("checkselfcast", true)
+    else
+      f:SetAttribute("checkselfcast",ATTRIBUTE_NOOP)
+      f:SetAttribute("unit","none") -- "none" gives you the glowing cast hand if no target selected, or casts on target if target selected
+      if c == "none" then
+        -- nothing to do
+      elseif c == "alt" or c == "ctrl" or c == "shift" then
+        f:SetAttribute(c.."-unit*","player")
+      elseif c == "right-click" then
+        if f:GetAttribute("*action-page2") then
+          -- right-click modifier not supported with multipage
+          self.config.selfcast = nil
+          f:SetAttribute("unit",nil)
+          f:SetAttribute("checkselfcast",true)
+        else
+          f:SetAttribute("*unit2","player")
+        end
+      end
+    end
+  end
+end
+
+function RAAT:UpdateIcon()
+  local action = self:GetID()
+  local texture = action and GetActionTexture(action)
+
+  self:DisplayIcon(action and texture)
+  self:DisplayEquipped(action and IsEquippedAction(action))
+  self:UpdateInUse()
+  self:UpdateUsable()
+  self:UpdateCooldown()
+end
+
+function RAAT:UpdateInUse()
+  local action = self:GetID()
+	if action and (IsCurrentAction(action) or IsAutoRepeatAction(action)) then
+		self:DisplayInUse(true)
+	else
+    self:DisplayInUse(false)
+	end
+end
+
+function RAAT:UpdateCount()
+  local action = self:GetID()
+  if action and (IsConsumableAction(action) or IsStackableAction(action)) then
+    self:DisplayCount(GetActionCount(action)) -- will display a 0 if none remaining
+  else
+    self:DisplayCount(nil) -- will display nothing
+  end
+end
+
+function RAAT:UpdateMacroText()
+  local action = self:GetID()
+  self:DisplayName(action and GetActionText(action))
+end
+
+function RAAT:UpdateUsable()
+  local action = self:GetID()
+  if action and HasAction(action) then
+    local isUsable, notEnoughMana = IsUsableAction(action)
+    local outOfRange = IsActionInRange(action) == 0
+    self:DisplayUsable(isUsable and not outOfRange, notEnoughMana, outOfRange)
+  else
+    self:DisplayUsable(false, false, false)
+  end
+end
+
+function RAAT:UpdateCooldown()
+  local action = self:GetID()
+  if action then
+    self:DisplayCooldown(GetActionCooldown(action))
+  end
+end
+
+function RAAT:UpdateActionEvents()
+  local action = self:GetID()
+	if action and HasAction(action) then
+    if not self.actionEventsRegistered then
+      self:RegisterEvent("ACTIONBAR_UPDATE_STATE")
+      self:RegisterEvent("ACTIONBAR_UPDATE_USABLE")
+      self:RegisterEvent("ACTIONBAR_UPDATE_COOLDOWN", "ACTIONBAR_UPDATE_USABLE")
+      self:RegisterEvent("UPDATE_INVENTORY_ALERTS", "ACTIONBAR_UPDATE_USABLE")
+      self:RegisterEvent("PLAYER_AURAS_CHANGED", "ACTIONBAR_UPDATE_USABLE")
+      self:RegisterEvent("PLAYER_TARGET_CHANGED", "ACTIONBAR_UPDATE_USABLE")
+      self:RegisterEvent("UNIT_INVENTORY_CHANGED")
+      self:RegisterEvent("CRAFT_SHOW")
+      self:RegisterEvent("CRAFT_CLOSE", "CRAFT_SHOW")
+      self:RegisterEvent("TRADE_SKILL_SHOW", "CRAFT_SHOW")
+      self:RegisterEvent("TRADE_SKILL_CLOSE", "CRAFT_SHOW")
+      self:RegisterEvent("PLAYER_ENTER_COMBAT")
+      self:RegisterEvent("PLAYER_LEAVE_COMBAT")
+      self:RegisterEvent("START_AUTOREPEAT_SPELL")
+      self:RegisterEvent("STOP_AUTOREPEAT_SPELL")
+      self.actionEventsRegistered = true
+    end
+  elseif self.actionEventsRegistered then
+    self:UnregisterEvent("ACTIONBAR_UPDATE_STATE")
+    self:UnregisterEvent("ACTIONBAR_UPDATE_USABLE")
+    self:UnregisterEvent("ACTIONBAR_UPDATE_COOLDOWN")
+    self:UnregisterEvent("UPDATE_INVENTORY_ALERTS")
+    self:UnregisterEvent("PLAYER_AURAS_CHANGED")
+    self:UnregisterEvent("PLAYER_TARGET_CHANGED")
+    self:UnregisterEvent("UNIT_INVENTORY_CHANGED")
+    self:UnregisterEvent("CRAFT_SHOW")
+    self:UnregisterEvent("CRAFT_CLOSE")
+    self:UnregisterEvent("TRADE_SKILL_SHOW")
+    self:UnregisterEvent("TRADE_SKILL_CLOSE")
+    self:UnregisterEvent("PLAYER_ENTER_COMBAT")
+    self:UnregisterEvent("PLAYER_LEAVE_COMBAT")
+    self:UnregisterEvent("START_AUTOREPEAT_SPELL")
+    self:UnregisterEvent("STOP_AUTOREPEAT_SPELL")
+    self.actionEventsRegistered = false
+	end
+end
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/classes/ReAction_ColorScheme.lua	Tue Mar 20 21:25:29 2007 +0000
@@ -0,0 +1,107 @@
+-- ReAction.IColorScheme is an interface to describe color schemes for hotkey labels and
+-- icon/border colorization, depending on the current state.
+--
+
+local AceOO = AceLibrary("AceOO-2.0")
+
+ReAction.IColorScheme = AceOO.Interface {
+  GetHotkeyColor = "function", -- r,g,b,a = GetHotkeyColor( isUsable, notEnoughMana, outOfRange, [bindingText] )
+  GetIconColor   = "function", -- r,g,b,a = GetIconColor( isUsable, notEnoughMana, outOfRange )
+  GetBorderColor = "function", -- r,g,b,a = GetBorderColor( isUsable, notEnoughMana, outOfRange )
+}
+
+
+
+-- ReAction.DefaultColorScheme is a Mixin implementation of ReAction.IColorScheme which
+-- supports the standard Blizzard colorization plus optional hotkey modifier-driven colorization
+-- and colorizing icons red (in addition to hotkeys) when out of range.
+--
+-- DefaultColorScheme makes use of self.config as follows:
+--
+-- self.config = {
+--   keyBindColorCode = true/false, -- color-code keybindings based on modifier key
+-- }
+
+
+ReAction.DefaultColorScheme = AceOO.Mixin {
+  "GetHotkeyColor",
+  "GetModifiedHotkeyColor",  -- returns the default modified color (if configured)
+  "GetIconColor",
+  "GetBorderColor"
+}
+
+
+-- private variables
+local hotKeyDefaultColor         = { r=1.00,  g=1.00,  b=1.00,  a=1.00 } -- white
+local hotKeyDisabledColor        = { r=0.60,  g=0.60,  b=0.60,  a=1.00 } -- 60% gray
+local hotKeyOutOfRangeColor      = { r=1.00,  g=0.20,  b=0.20,  a=1.00 } -- red
+
+local actionUsableColor          = { r=1.00,  g=1.00,  b=1.00,  a=1.00 } -- white
+local actionNotUsableColor       = { r=0.40,  g=0.40,  b=0.40,  a=1.00 } -- 40% gray
+local actionNotEnoughManaColor   = { r=0.20,  g=0.20,  b=0.70,  a=1.00 } -- medium blue
+local actionOutOfRangeColor      = { r=1.00,  g=0.20,  b=0.20,  a=1.00 } -- red
+
+local hotKeyModifierColors = {
+  S = { r=0.60, g=0.60, b=1.00, a=1.00 },  -- shift (blue)
+  C = { r=1.00, g=0.82, b=0.00, a=1.00 },  -- ctrl  (gold)
+  A = { r=0.10, g=1.00, b=0.10, a=1.00 },  -- alt   (green)
+  M = { r=0.90, g=0.30, b=1.00, a=1.00 },  -- mouse (purple)
+}
+
+-- build list of modifier keys (as a string) from table above
+local hotKeyModifiers = ""
+for k, _ in pairs(hotKeyModifierColors) do
+  hotKeyModifiers = hotKeyModifiers..k
+end
+
+-- private functions
+-- extract and return color fields from a table, to be fed into SetVertexColor()/SetTextColor()
+local function tcolor(c)
+  return c.r, c.g, c.b, c.a
+end
+
+
+
+-- mixin methods
+
+local RADCS = ReAction.DefaultColorScheme
+
+function RADCS:GetHotkeyColor( isUsable, notEnoughMana, outOfRange, bindingTxt )
+	if isUsable or notEnoughMana then
+    return tcolor(self:GetModifiedHotkeyColor(bindingTxt))
+  elseif outOfRange then
+    return tcolor(hotKeyOutOfRangeColor)
+  else
+    return tcolor(hotKeyDisabledColor)
+  end
+end
+
+function RADCS:GetModifiedHotkeyColor(txt)
+  local c = hotKeyDefaultColor
+  if txt and self.config.keyBindColorCode then
+    local modKey = string.match( txt or "", "(["..hotKeyModifiers.."])%-")
+    c = modKey and hotKeyModifierColors[modKey] or c
+  end
+  return c
+end
+
+function RADCS:GetIconColor( isUsable, notEnoughMana, outOfRange )
+	if isUsable then
+    return tcolor(actionUsableColor)
+  elseif notEnoughMana then
+    return tcolor(actionNotEnoughManaColor)
+  elseif outOfRange then
+    return tcolor(actionOutOfRangeColor)
+  else
+    return tcolor(actionNotUsableColor)
+  end
+end
+
+function RADCS:GetBorderColor( isUsable, notEnoughMana, outOfRange )
+	if isUsable or notEnoughMana or outOfRange then
+    return tcolor(actionUsableColor)
+  else
+    return tcolor(actionNotUsableColor)
+  end
+end
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/classes/ReAction_PetActionDisplay.lua	Tue Mar 20 21:25:29 2007 +0000
@@ -0,0 +1,322 @@
+-- The ReAction.PetActionDisplay mixin defines 'regular' action button display functionality
+-- and is an implementation of the ReAction.IDisplay and ReAction.ActionType.IDisplay interfaces.
+--
+-- This Mixin assumes that it has been mixed in with a ReAction-derived class which implements
+-- the ReAction.IActionType and ReAction.IColorScheme interfaces.
+--
+-- This mixin uses properties of self.config to define display elements:
+--
+-- self.config = {
+--   keyBindLoc = "POSITION",       -- keybind anchor location
+--   showKeyBind = true/false,      -- show keybind labels
+--   showGrid = true/false,         -- always show empty buttons
+-- }
+--
+
+local AceOO = AceLibrary("AceOO-2.0")
+
+ReAction.PetActionDisplay = AceOO.Mixin {
+  -- ReAction.IDisplay interface
+  "SetupDisplay",
+  "UpdateDisplay",
+  "TempShow",
+  "GetActionFrame",
+  "GetBaseButtonSize",
+  "DisplayID",
+  "DisplayHotkey",
+
+  -- ReAction.PetActionType.IDisplay interface
+  "DisplayAutoCast",
+  "DisplayAutoCastable",
+  "DisplayInUse",
+  "DisplayUsable",
+  "DisplayIcon",
+  "DisplayCooldown",
+
+  -- Event handlers
+  "PreClick",
+  "PostClick",
+  "OnDragStart",
+  "OnReceiveDrag",
+  "OnEnter",
+  "OnLeave",
+
+  -- internal functions
+  "ApplyLayout",
+  "ApplyStyle",
+  "DisplayVisibility",
+}
+
+local RAPAD = ReAction.PetActionDisplay
+
+
+-- private constants
+local _G = getfenv(0)
+
+local actionIDColor = { r=1.00,  g=0.82,  b=0.00,  a=1.00 } -- gold
+
+
+-- private functions
+-- extract and return color fields from a table, to be fed into SetVertexColor()/SetTextColor()
+local function tcolor(c)
+  return c.r, c.g, c.b, c.a
+end
+
+
+-----------------------------------
+-- Interface Implementation Methods
+-----------------------------------
+function RAPAD:SetupDisplay( name )
+  -- create the button widget
+  local b = CreateFrame("CheckButton", name, nil, "ActionButtonTemplate, SecureActionButtonTemplate")
+  b:EnableMouse()
+  b:RegisterForDrag("LeftButton", "RightButton")
+  b:RegisterForClicks("AnyUp")
+  b:SetScript("PreClick",      function(arg1) self:PreClick(arg1) end)
+  b:SetScript("PostClick",     function(arg1) self:PostClick(arg1) end)
+  b:SetScript("OnDragStart",   function(arg1) self:OnDragStart(arg1) end)
+  b:SetScript("OnReceiveDrag", function() self:OnReceiveDrag() end)
+  b:SetScript("OnEnter",       function() self:OnEnter() end)
+  b:SetScript("OnLeave",       function() self:OnLeave() end)
+
+
+  b:SetWidth(30)
+  b:SetHeight(30)
+  
+  local tx = b:GetNormalTexture()
+  tx:ClearAllPoints()
+  tx:SetWidth(54)
+  tx:SetHeight(54)
+  tx:SetPoint("CENTER",0,-1)
+
+  local autoCastable = b:CreateTexture(nil, "OVERLAY")
+  autoCastable:SetTexture("Interface\\Buttons\\UI-AutoCastableOverlay")
+  autoCastable:SetWidth(58)
+  autoCastable:SetHeight(58)
+  autoCastable:SetPoint("CENTER")
+  autoCastable:Hide()
+
+  local autoCast = CreateFrame("Model",nil,b)
+  autoCast:SetModel("Interface\\Buttons\\UI-AutoCastButton.mdx")
+  autoCast:SetScale(1.2)
+  autoCast:SetAllPoints()
+  autoCast:SetSequence(0)
+  autoCast:SetSequenceTime(0,0)
+  autoCast:SetFrameStrata("HIGH") -- Otherwise it won't appear on top of the icon for some reason
+  autoCast:Hide()
+
+
+  local cd = _G[name.."Cooldown"]
+	cd:SetScale(1);
+	cd:ClearAllPoints();
+	cd:SetWidth(33);
+	cd:SetHeight(33);
+	cd:SetPoint("CENTER", -2, -1);
+
+  -- store references to the various sub-frames of ActionButtonTemplate so we don't have to look it up all the time
+  self.frames      = {
+    button         = b,
+    autoCastable   = autoCastable, --_G[name.."AutoCastable"],
+    autoCast       = autoCast, --_G[name.."AutoCast"],
+    hotkey         = _G[name.."HotKey"],
+    cooldown       = cd,
+    icon           = _G[name.."Icon"],
+    normalTexture  = tx, --_G[name.."NormalTexture2"],
+    actionID       = nil,    -- defer creating actionID font string until it's actually requested
+  }
+
+  self.tmpShow_ = 0
+end
+
+function RAPAD:UpdateDisplay()
+  self:ApplyLayout()
+  self:ApplyStyle()
+  self:DisplayVisibility()
+  -- refresh the action ID display
+  if ReAction.showIDs_ then
+    self:DisplayID(self:GetID())
+  end
+end
+
+function RAPAD:TempShow( visible )
+  visible = visible and true or false -- force data integrity
+  self.showTmp_ = max(0, (self.showTmp_ or 0) + (visible and 1 or -1))
+  self:DisplayVisibility()
+end
+
+function RAPAD:GetActionFrame()
+  return self.frames.button
+end
+
+function RAPAD:GetBaseButtonSize()
+  return 30
+end
+
+function RAPAD:DisplayID( id )
+  local f = self.frames.actionID
+  if id then
+    if not f then
+      -- create the actionID label
+      f = self.frames.button:CreateFontString(nil,"ARTWORK","NumberFontNormalSmall")
+      f:SetPoint("BOTTOMLEFT")
+      f:SetTextColor( tcolor(actionIDColor) )
+      self.frames.actionID = f
+    end
+    f:SetText(tostring(id))
+    f:Show()
+  elseif f then
+    f:Hide()
+  end
+end
+
+function RAPAD:DisplayHotkey(txt)
+  self.frames.hotkey:SetText(string.upper(txt or ""))
+end
+
+function RAPAD:DisplayInUse( inUse )
+  self.frames.button:SetChecked( inUse and 1 or 0 )
+end
+
+function RAPAD:DisplayUsable( usable )
+  SetDesaturation(self.frames.icon, (not usable) and 1 or nil) -- argument is backward
+  self.frames.hotkey:SetTextColor(self:GetHotkeyColor(usable, false, false, self.frames.hotkey:GetText()) )
+end
+
+function RAPAD:DisplayAutoCast( show )
+  if show then 
+    self.frames.autoCast:Show()
+  else
+    self.frames.autoCast:Hide()
+  end
+end
+
+function RAPAD:DisplayAutoCastable( show )
+  if show then 
+    self.frames.autoCastable:Show()
+  else
+    self.frames.autoCastable:Hide()
+  end
+end
+
+function RAPAD:DisplayIcon( texture )
+  local f = self.frames.button
+  local icon = self.frames.icon
+  if texture then
+    icon:SetTexture(texture)
+    icon:Show()
+    f:SetNormalTexture("Interface\\Buttons\\UI-Quickslot2")
+  else
+    f:SetScript("OnUpdate",nil)
+    icon:Hide()
+    f:SetNormalTexture("Interface\\Buttons\\UI-Quickslot")
+  end
+  self:DisplayVisibility()
+end
+
+function RAPAD:DisplayCooldown( start, duration, enable )
+  CooldownFrame_SetTimer(self.frames.cooldown, start, duration, enable)
+end
+
+
+
+
+
+
+----------------------
+-- Event Handlers
+----------------------
+function RAPAD:PreClick()
+  -- not sure why we have to do this
+  self.frames.button:SetChecked(0)
+end
+
+function RAPAD:PostClick()
+  self:UpdateAction()
+end
+
+function RAPAD:OnDragStart()
+  if LOCK_ACTIONBAR ~= "1" or IsShiftKeyDown() then
+    self:PickupAction()
+  end
+end
+
+function RAPAD:OnReceiveDrag()
+  self:PlaceAction()
+end
+
+function RAPAD:OnEnter()
+  self:SetTooltip() -- from ReAction base class
+end
+
+function RAPAD:OnLeave()
+  self:ClearTooltip() -- from ReAction base class
+end
+
+
+
+----------------------
+-- Internal methods
+----------------------
+
+local function placeLabel( label, anchor )
+  local top = string.match(anchor,"TOP")
+  local bottom = string.match(anchor, "BOTTOM")
+  label:ClearAllPoints()
+  label:SetWidth(40)
+  label:SetPoint(top or bottom,0,top and 2 or -2)
+  local j
+  if string.match(anchor,"LEFT") then
+    j = "LEFT"
+  elseif string.match(anchor,"RIGHT") then
+    j = "RIGHT"
+  else
+    j = "CENTER"
+  end
+  label:SetJustifyH(j)
+end
+
+
+function RAPAD:ApplyLayout()
+  local f = self.frames
+
+  if self.config.keyBindLoc then
+    placeLabel(f.hotkey, self.config.keyBindLoc)
+  end
+
+  if self.config.showKeyBind then
+    f.hotkey:Show()
+  else
+    f.hotkey:Hide()
+  end
+
+  if self.config.showBorder then
+    f.normalTexture:SetAlpha(1)
+  else
+    f.normalTexture:SetAlpha(0)
+  end
+end
+
+function RAPAD:ApplyStyle()
+
+end
+
+function RAPAD:DisplayVisibility()
+  local b = self.frames.button
+
+  -- can't hide/show in combat
+  if not InCombatLockdown() then
+    if b:GetAttribute("statehidden") then
+      b:Hide()
+    elseif not self:IsActionEmpty() then
+      b:GetNormalTexture():SetAlpha(1.0)
+      b:Show()
+    elseif self.showTmp_ and self.showTmp_ > 0 or self.config.showGrid then
+      b:GetNormalTexture():SetAlpha(0.5)
+      self.frames.cooldown:Hide()
+      b:Show()
+    else
+      b:Hide()
+    end
+  end
+end
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/classes/ReAction_PetActionType.lua	Tue Mar 20 21:25:29 2007 +0000
@@ -0,0 +1,222 @@
+-- The ReAction.PetActionType mixin defines Pet action button functionality 
+-- and is an implementation of the ReAction.IActionType interface.
+--
+-- The Mixin assumes that it is being mixed in with a ReAction-derived class
+-- which implements the ReAction.IDisplay and ReAction.PetActionType.IDisplay interfaces.
+
+local AceOO = AceLibrary("AceOO-2.0")
+
+ReAction.PetActionType = AceOO.Mixin {
+  -- ReAction.IDisplay interface
+  "SetID",
+  "GetID",
+  "SetupAction",
+  "UpdateAction",
+  "PickupAction",
+  "PlaceAction",
+  "IsActionEmpty",
+  "UpdateTooltip",
+
+  -- Event handlers
+  "PLAYER_ENTERING_WORLD",
+  "PLAYER_CONTROL_LOST",
+  "PLAYER_CONTROL_GAINED",
+  "PLAYER_FARSIGHT_FOCUS_CHANGED",
+  "UNIT_PET",
+  "UNIT_FLAGS",
+  "UNIT_AURA",
+  "PET_BAR_UPDATE",
+  "PET_BAR_UPDATE_COOLDOWN",
+  "PET_BAR_SHOWGRID",
+  "PET_BAR_HIDEGRID",
+
+  -- Internal functions
+  "UpdateCooldown",
+}
+
+local RAPAT = ReAction.PetActionType
+
+-- Required display elements
+RAPAT.IDisplay = AceOO.Interface {
+  DisplayAutoCast     = "function", -- DisplayAutoCast(bool)
+  DisplayAutoCastable = "function", -- DisplayAutoCastable(bool)
+  DisplayIcon         = "function", -- DisplayIcon(texture), Display the icon texture (nil for empty slot)
+  DisplayCooldown     = "function", -- DisplayCooldown(start, duration, enable), display cooldown timer
+  DisplayInUse        = "function", -- DisplayInUse(bool), display whether the action is in use
+  DisplayUsable       = "function", -- DisplayUsable(bool), display whether the action can be used now
+}
+
+
+-- private constants
+local actionIDColor = { r=1.00,  g=0.82,  b=0.00,  a=1.00 } -- gold
+
+-- private functions
+-- extract and return color fields from a table, to be fed into SetVertexColor()/SetTextColor()
+local function tcolor(c)
+  return c.r, c.g, c.b, c.a
+end
+
+---------------------------------------
+-- ReAction.IActionType interface implementation
+---------------------------------------
+function RAPAT:SetID( id )  -- paging not supported
+  id = tonumber(id)  -- force data integrity
+  if id then
+    self.config.ids[self.barIdx] = { id }
+    local f = self:GetActionFrame()
+    f:SetAttribute("action",id)
+    -- the following is the goofy hack to work around Blizzard not exporting the pet functions securely
+    f:SetAttribute("clickbutton2",getglobal("PetActionButton"..id))
+  end
+end
+
+function RAPAT:GetID()
+  return SecureButton_GetModifiedAttribute(self:GetActionFrame(), "action", button)
+end
+
+function RAPAT:SetupAction()
+  local b = self:GetActionFrame()
+  -- Blizzard didn't support TogglePetAutocast functionality in
+  -- SecureButton_OnClick(), so we have to spoof it
+  -- by delegating right-clicks to the hidden default action buttons
+  b:SetAttribute("type", "pet")
+  b:SetAttribute("type2", "click") 
+
+  -- shift-clicking to drag locked buttons off
+	b:SetAttribute("checkselfcast", true)
+	b:SetAttribute("useparent-unit", true)
+	
+	self:RegisterEvent("PLAYER_ENTERING_WORLD")
+	self:RegisterEvent("PLAYER_CONTROL_LOST");
+	self:RegisterEvent("PLAYER_CONTROL_GAINED");
+	self:RegisterEvent("PLAYER_FARSIGHT_FOCUS_CHANGED");
+	self:RegisterEvent("UNIT_PET");
+	self:RegisterEvent("UNIT_FLAGS");
+	self:RegisterEvent("UNIT_AURA");
+	self:RegisterEvent("PET_BAR_UPDATE");
+	self:RegisterEvent("PET_BAR_UPDATE_COOLDOWN");
+	self:RegisterEvent("PET_BAR_SHOWGRID");
+	self:RegisterEvent("PET_BAR_HIDEGRID");
+  
+  self:UpdateAction()
+end
+
+function RAPAT:UpdateAction()
+  local id = self:GetID()
+  if id then
+    local name, subtext, texture, isToken, isActive, autoCastAllowed, autoCastEnabled = GetPetActionInfo(id);
+    self:DisplayIcon( isToken and getglobal(texture) or texture )
+    self:DisplayInUse( isActive )
+    self:DisplayAutoCastable( autoCastAllowed )
+    self:DisplayAutoCast( autoCastEnabled )
+    self:DisplayCooldown( GetPetActionCooldown(id) )
+    self:DisplayUsable(GetPetActionsUsable())
+    -- If it's a 'token' save away the tooltip name for updateTooltip
+    self.isToken = isToken
+    if isToken then
+      self.tooltipName = getglobal(name)
+      self.tooltipSubtext = subtext
+    end
+  end
+end
+
+function RAPAT:PickupAction()
+  PickupPetAction(self:GetID())
+  self:UpdateAction()
+end
+
+function RAPAT:PlaceAction()
+  if not InCombatLockdown() then
+    PlacePetAction(self:GetID())
+  end
+  self:UpdateAction()
+end
+
+function RAPAT:IsActionEmpty()
+  local id = self:GetID()
+  return not(id and GetPetActionInfo(id))
+end
+
+function RAPAT:UpdateTooltip()
+  local id = self:GetID()
+	if GameTooltip:IsOwned(self:GetActionFrame()) and id then
+    if self.isToken then
+      GameTooltip:SetText(self.tooltipName, 1.0, 1.0, 1.0)
+      if ( self.tooltipSubtext ) then
+        GameTooltip:AddLine(self.tooltipSubtext, "", 0.5, 0.5, 0.5);
+      end
+      GameTooltip:Show();
+    else
+      if GameTooltip:SetPetAction(id) then
+    		self.tooltipTime = TOOLTIP_UPDATE_TIME
+      end
+    end
+	else
+		self.tooltipTime = nil
+	end
+end
+
+
+-----------------------------
+-- Event Handling
+-----------------------------
+function RAPAT:PLAYER_ENTERING_WORLD()
+  self:UpdateAction()
+end
+
+function RAPAT:PLAYER_CONTROL_LOST()
+  self:UpdateAction()
+end
+
+function RAPAT:PLAYER_CONTROL_GAINED()
+  self:UpdateAction()
+end
+
+function RAPAT:PLAYER_FARSIGHT_FOCUS_CHANGED()
+  self:UpdateAction()
+end
+
+function RAPAT:UNIT_PET(unit)
+  if unit == "player" then
+    self:UpdateAction()
+  end
+end
+
+function RAPAT:UNIT_FLAGS(unit)
+  if unit == "pet" then
+    self:UpdateAction()
+  end
+end
+
+function RAPAT:UNIT_AURA(unit)
+  if unit == "pet" then
+    self:UpdateAction()
+  end
+end
+
+function RAPAT:PET_BAR_UPDATE()
+  self:UpdateAction()
+end
+
+function RAPAT:PET_BAR_UPDATE_COOLDOWN()
+  self:UpdateCooldown()
+end
+
+function RAPAT:PET_BAR_SHOWGRID()
+  self:TempShow(true)
+end
+
+function RAPAT:PET_BAR_HIDEGRID()
+  self:TempShow(false)
+end
+
+
+-------------------------------------
+-- Internal functions
+-------------------------------------
+function RAPAT:UpdateCooldown()
+  local id = self:GetID()
+  if id then
+    self:DisplayCooldown( GetPetActionCooldown(id) )
+  end
+end