Mercurial > wow > cyborg-mmo7
comparison OptionView.lua @ 13:6cb9a2936580
Miscellanous Lua code consistency improvements:
- no semicolon except between statements on same line
- use of implicit cast to bool in if/while conditions, instead of various eq/neq against true, false or nil
- no parenthesis around if/while conditions (C-ism)
- avoid long function calls in if conditions
- removed space in comma-separated expressions lists in multiple assignments
- added spaces between arguments of functions calls
- use tabs for indentation (in Lua files only)
- don't reverse == in if conditions, like "if 42==foo then" (C-ism)
- removed some extra parenthesis in complex expressions (C-ism)
- added spaces around operators in most expressions for ease of reading
- added comma after last element of table initializers
- removed space after # operator
- moved comment prefix of disabled code into tab (to keep disabled code aligned)
author | madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09 |
---|---|
date | Thu, 25 Apr 2013 01:29:45 +0000 |
parents | 8428fa7cf0e4 |
children | cccc7661a2e6 |
comparison
equal
deleted
inserted
replaced
12:72b92b3e476e | 13:6cb9a2936580 |
---|---|
1 --~ Warcraft Plugin for Cyborg MMO7 | 1 --~ Warcraft Plugin for Cyborg MMO7 |
2 --~ Filename: OptionView.lua | 2 --~ Filename: OptionView.lua |
3 --~ Description: The code for the Option page in the UI, not much here because we dont have many options. Probably could refactor. | 3 --~ Description: The code for the Option page in the UI, not much here because we dont have many options. Probably could refactor. |
4 --~ Copyright (C) 2012 Mad Catz Inc. | 4 --~ Copyright (C) 2012 Mad Catz Inc. |
5 --~ Author: Christopher Hooks | 5 --~ Author: Christopher Hooks |
6 | 6 |
18 --~ along with this program; if not, write to the Free Software | 18 --~ along with this program; if not, write to the Free Software |
19 --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. | 19 --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
20 | 20 |
21 CyborgMMO_OptionView = { | 21 CyborgMMO_OptionView = { |
22 new = function(self) | 22 new = function(self) |
23 self.name = "Cyborg MMO7 Plugin" | 23 self.name = "Cyborg MMO7 Plugin" |
24 InterfaceOptions_AddCategory(self); | 24 InterfaceOptions_AddCategory(self) |
25 return self | 25 return self |
26 | 26 end, |
27 end | |
28 } | 27 } |
29 | 28 |
30 local lastButton = nil | 29 local lastButton = nil |
31 | 30 |
32 function CyborgMMO_BindButton(name) | 31 function CyborgMMO_BindButton(name) |
33 lastButton = name | 32 lastButton = name |
34 local index = CyborgMMO_GetButtonIndex(name) | 33 local index = CyborgMMO_GetButtonIndex(name) |
35 local mode = 1 | 34 local mode = 1 |
36 while(index > 13) do | 35 while index > 13 do |
37 mode = mode + 1 | 36 mode = mode + 1 |
38 index = index - 13 | 37 index = index - 13 |
39 end | 38 end |
40 local buttonStr = CyborgMMO_StringTable[("CyborgMMO_OptionPageRebindMouseRow"..index.."Name")] | 39 local buttonStr = CyborgMMO_StringTable[("CyborgMMO_OptionPageRebindMouseRow"..index.."Name")] |
41 | 40 |
42 getglobal("CyborgMMO_BindingFrameButtonName"):SetText(buttonStr.." Mode "..mode) | 41 getglobal("CyborgMMO_BindingFrameButtonName"):SetText(buttonStr.." Mode "..mode) |
43 getglobal("CyborgMMO_BindingFrameKey"):SetText(CyborgMMO_StringTable["CyborgMMO_CurrentBinding"].." "..CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)]) | 42 getglobal("CyborgMMO_BindingFrameKey"):SetText(CyborgMMO_StringTable["CyborgMMO_CurrentBinding"].." "..CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)]) |
44 CyborgMMO_BindingFrame:Show() | 43 CyborgMMO_BindingFrame:Show() |
45 | |
46 end | 44 end |
47 | 45 |
48 function CyborgMMO_GetBindingButtonText(name) | 46 function CyborgMMO_GetBindingButtonText(name) |
49 if(nil == CyborgMMO_WowCommands) then | 47 if not CyborgMMO_WowCommands then |
50 CyborgMMO_LoadWowCommands(); | 48 CyborgMMO_LoadWowCommands() |
51 end | 49 end |
52 | 50 |
53 local binding = CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(name)] | 51 local binding = CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(name)] |
54 getglobal(name):SetText(binding) | 52 getglobal(name):SetText(binding) |
55 end | 53 end |
56 | 54 |
57 function CyborgMMO_GetButtonIndex(name) | 55 function CyborgMMO_GetButtonIndex(name) |
60 local rowStr = string.sub(name, row-1,row-1) | 58 local rowStr = string.sub(name, row-1,row-1) |
61 return (CyborgMMO_GetNumberFromHexLetter(rowStr) + ((CyborgMMO_GetNumberFromHexLetter(modeStr) - 1) * 13)) | 59 return (CyborgMMO_GetNumberFromHexLetter(rowStr) + ((CyborgMMO_GetNumberFromHexLetter(modeStr) - 1) * 13)) |
62 end | 60 end |
63 | 61 |
64 function CyborgMMO_ShowProfileTooltip(self) | 62 function CyborgMMO_ShowProfileTooltip(self) |
65 local red, green, blue, _ = self:GetVertexColor() | 63 local red,green,blue = self:GetVertexColor() |
66 if((red == 0) and (green == 0) and (blue == 0)) then | 64 if red == 0 and green == 0 and blue == 0 then |
67 GameTooltip:SetOwner(self:GetParent(), "ANCHOR_RIGHT"); | 65 GameTooltip:SetOwner(self:GetParent(), "ANCHOR_RIGHT") |
68 GameTooltip:SetText(CyborgMMO_StringTable["CyborgMMO_ToolTipLine1"], nil, nil, nil, nil, 1); | 66 GameTooltip:SetText(CyborgMMO_StringTable["CyborgMMO_ToolTipLine1"], nil, nil, nil, nil, 1) |
69 GameTooltip:AddLine(nil, 0.8, 1.0, 0.8); | 67 GameTooltip:AddLine(nil, 0.8, 1.0, 0.8) |
70 GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine2"], 0.8, 1.0, 0.8); | 68 GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine2"], 0.8, 1.0, 0.8) |
71 GameTooltip:AddLine(nil, 0.8, 1.0, 0.8); | 69 GameTooltip:AddLine(nil, 0.8, 1.0, 0.8) |
72 GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine3"], 0.8, 1.0, 0.8); | 70 GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine3"], 0.8, 1.0, 0.8) |
73 GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine4"], 0.8, 1.0, 0.8); | 71 GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine4"], 0.8, 1.0, 0.8) |
74 GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine5"], 0.8, 1.0, 0.8); | 72 GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine5"], 0.8, 1.0, 0.8) |
75 GameTooltip:AddLine(nil, 0.8, 1.0, 0.8); | 73 GameTooltip:AddLine(nil, 0.8, 1.0, 0.8) |
76 GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine6"], 0.8, 1.0, 0.8); | 74 GameTooltip:AddLine(CyborgMMO_StringTable["CyborgMMO_ToolTipLine6"], 0.8, 1.0, 0.8) |
77 GameTooltip:Show(); | 75 GameTooltip:Show() |
78 end | 76 end |
79 end | 77 end |
80 | 78 |
81 function CyborgMMO_HideProfileTooltip(self) | 79 function CyborgMMO_HideProfileTooltip(self) |
82 GameTooltip:Hide(); | 80 GameTooltip:Hide() |
83 end | 81 end |
84 | 82 |
85 function CyborgMMO_GetNumberFromHexLetter(str) | 83 function CyborgMMO_GetNumberFromHexLetter(str) |
86 local number = 0 | 84 local number = 0 |
87 if("A" == str) then | 85 if str == "A" then |
88 number = 10 | 86 number = 10 |
89 elseif("B" == str) then | 87 elseif str == "B" then |
90 number = 11 | 88 number = 11 |
91 elseif("C" == str) then | 89 elseif str == "C" then |
92 number = 12 | 90 number = 12 |
93 elseif("D" == str) then | 91 elseif str == "D" then |
94 number = 13 | 92 number = 13 |
95 elseif("E" == str) then | 93 elseif str == "E" then |
96 number = 14 | 94 number = 14 |
97 elseif("F" == str) then | 95 elseif str == "F" then |
98 number = 15 | 96 number = 15 |
99 else | 97 else |
100 number = tonumber(str) | 98 number = tonumber(str) |
101 end | 99 end |
102 return number | 100 return number |
103 end | 101 end |
104 | 102 |
105 function CyborgMMO_SetNewKeybind(keyOrButton) | 103 function CyborgMMO_SetNewKeybind(keyOrButton) |
106 local previous = CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)] | 104 local previous = CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)] |
107 CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)] = keyOrButton; | 105 CyborgMMO_WowCommands[CyborgMMO_GetButtonIndex(lastButton)] = keyOrButton |
108 CyborgMMO_GetBindingButtonText(lastButton); | 106 CyborgMMO_GetBindingButtonText(lastButton) |
109 CyborgMMO_BindingFrame:Hide() | 107 CyborgMMO_BindingFrame:Hide() |
110 CyborgMMO_RatPageModel.Instance().LoadData() | 108 CyborgMMO_RatPageModel.Instance().LoadData() |
111 end | 109 end |
112 | 110 |
113 function CyborgMMO_BindingFrameOnKeyDown(self, keyOrButton) | 111 function CyborgMMO_BindingFrameOnKeyDown(self, keyOrButton) |
114 if keyOrButton=="ESCAPE" then | 112 if keyOrButton == "ESCAPE" then |
115 CyborgMMO_BindingFrame:Hide() | 113 CyborgMMO_BindingFrame:Hide() |
116 return | 114 return |
117 end | 115 end |
118 | 116 |
119 if ( GetBindingFromClick(keyOrButton) == "SCREENSHOT" ) then | 117 if GetBindingFromClick(keyOrButton) == "SCREENSHOT" then |
120 RunBinding("SCREENSHOT"); | 118 RunBinding("SCREENSHOT") |
121 return; | 119 return |
122 end | 120 end |
123 | 121 |
124 local keyPressed = keyOrButton; | 122 local keyPressed = keyOrButton |
125 | 123 |
126 if ( keyPressed == "UNKNOWN" ) then | 124 if keyPressed == "UNKNOWN" then |
127 return; | 125 return |
128 end | 126 end |
129 | 127 |
130 -- Convert the mouse button names | 128 -- Convert the mouse button names |
131 if ( keyPressed == "LeftButton" ) then | 129 if keyPressed == "LeftButton" then |
132 keyPressed = "BUTTON1"; | 130 keyPressed = "BUTTON1" |
133 elseif ( keyPressed == "RightButton" ) then | 131 elseif keyPressed == "RightButton" then |
134 keyPressed = "BUTTON2"; | 132 keyPressed = "BUTTON2" |
135 elseif ( keyPressed == "MiddleButton" ) then | 133 elseif keyPressed == "MiddleButton" then |
136 keyPressed = "BUTTON3"; | 134 keyPressed = "BUTTON3" |
137 elseif ( keyPressed == "Button4" ) then | 135 elseif keyPressed == "Button4" then |
138 keyPressed = "BUTTON4" | 136 keyPressed = "BUTTON4" |
139 elseif ( keyOrButton == "Button5" ) then | 137 elseif keyOrButton == "Button5" then |
140 keyPressed = "BUTTON5" | 138 keyPressed = "BUTTON5" |
141 elseif ( keyPressed == "Button6" ) then | 139 elseif keyPressed == "Button6" then |
142 keyPressed = "BUTTON6" | 140 keyPressed = "BUTTON6" |
143 elseif ( keyOrButton == "Button7" ) then | 141 elseif keyOrButton == "Button7" then |
144 keyPressed = "BUTTON7" | 142 keyPressed = "BUTTON7" |
145 elseif ( keyPressed == "Button8" ) then | 143 elseif keyPressed == "Button8" then |
146 keyPressed = "BUTTON8" | 144 keyPressed = "BUTTON8" |
147 elseif ( keyOrButton == "Button9" ) then | 145 elseif keyOrButton == "Button9" then |
148 keyPressed = "BUTTON9" | 146 keyPressed = "BUTTON9" |
149 elseif ( keyPressed == "Button10" ) then | 147 elseif keyPressed == "Button10" then |
150 keyPressed = "BUTTON10" | 148 keyPressed = "BUTTON10" |
151 elseif ( keyOrButton == "Button11" ) then | 149 elseif keyOrButton == "Button11" then |
152 keyPressed = "BUTTON11" | 150 keyPressed = "BUTTON11" |
153 elseif ( keyPressed == "Button12" ) then | 151 elseif keyPressed == "Button12" then |
154 keyPressed = "BUTTON12" | 152 keyPressed = "BUTTON12" |
155 elseif ( keyOrButton == "Button13" ) then | 153 elseif keyOrButton == "Button13" then |
156 keyPressed = "BUTTON13" | 154 keyPressed = "BUTTON13" |
157 elseif ( keyPressed == "Button14" ) then | 155 elseif keyPressed == "Button14" then |
158 keyPressed = "BUTTON14" | 156 keyPressed = "BUTTON14" |
159 elseif ( keyOrButton == "Button15" ) then | 157 elseif keyOrButton == "Button15" then |
160 keyPressed = "BUTTON15" | 158 keyPressed = "BUTTON15" |
161 elseif ( keyPressed == "Button16" ) then | 159 elseif keyPressed == "Button16" then |
162 keyPressed = "BUTTON16" | 160 keyPressed = "BUTTON16" |
163 elseif ( keyOrButton == "Button17" ) then | 161 elseif keyOrButton == "Button17" then |
164 keyPressed = "BUTTON17" | 162 keyPressed = "BUTTON17" |
165 elseif ( keyPressed == "Button18" ) then | 163 elseif keyPressed == "Button18" then |
166 keyPressed = "BUTTON18" | 164 keyPressed = "BUTTON18" |
167 elseif ( keyOrButton == "Button19" ) then | 165 elseif keyOrButton == "Button19" then |
168 keyPressed = "BUTTON19" | 166 keyPressed = "BUTTON19" |
169 elseif ( keyPressed == "Button20" ) then | 167 elseif keyPressed == "Button20" then |
170 keyPressed = "BUTTON20" | 168 keyPressed = "BUTTON20" |
171 elseif ( keyOrButton == "Button21" ) then | 169 elseif keyOrButton == "Button21" then |
172 keyPressed = "BUTTON21" | 170 keyPressed = "BUTTON21" |
173 elseif ( keyPressed == "Button22" ) then | 171 elseif keyPressed == "Button22" then |
174 keyPressed = "BUTTON22" | 172 keyPressed = "BUTTON22" |
175 elseif ( keyOrButton == "Button23" ) then | 173 elseif keyOrButton == "Button23" then |
176 keyPressed = "BUTTON23" | 174 keyPressed = "BUTTON23" |
177 elseif ( keyPressed == "Button24" ) then | 175 elseif keyPressed == "Button24" then |
178 keyPressed = "BUTTON24" | 176 keyPressed = "BUTTON24" |
179 elseif ( keyOrButton == "Button25" ) then | 177 elseif keyOrButton == "Button25" then |
180 keyPressed = "BUTTON25" | 178 keyPressed = "BUTTON25" |
181 elseif ( keyPressed == "Button26" ) then | 179 elseif keyPressed == "Button26" then |
182 keyPressed = "BUTTON26" | 180 keyPressed = "BUTTON26" |
183 elseif ( keyOrButton == "Button27" ) then | 181 elseif keyOrButton == "Button27" then |
184 keyPressed = "BUTTON27" | 182 keyPressed = "BUTTON27" |
185 elseif ( keyPressed == "Button28" ) then | 183 elseif keyPressed == "Button28" then |
186 keyPressed = "BUTTON28" | 184 keyPressed = "BUTTON28" |
187 elseif ( keyOrButton == "Button29" ) then | 185 elseif keyOrButton == "Button29" then |
188 keyPressed = "BUTTON29" | 186 keyPressed = "BUTTON29" |
189 elseif ( keyPressed == "Button30" ) then | 187 elseif keyPressed == "Button30" then |
190 keyPressed = "BUTTON30" | 188 keyPressed = "BUTTON30" |
191 elseif ( keyOrButton == "Button31" ) then | 189 elseif keyOrButton == "Button31" then |
192 keyPressed = "BUTTON31" | 190 keyPressed = "BUTTON31" |
193 end | 191 end |
194 | 192 |
195 if ( keyPressed == "LSHIFT" or | 193 if keyPressed == "LSHIFT" or |
196 keyPressed == "RSHIFT" or | 194 keyPressed == "RSHIFT" or |
197 keyPressed == "LCTRL" or | 195 keyPressed == "LCTRL" or |
198 keyPressed == "RCTRL" or | 196 keyPressed == "RCTRL" or |
199 keyPressed == "LALT" or | 197 keyPressed == "LALT" or |
200 keyPressed == "RALT" ) then | 198 keyPressed == "RALT" then |
201 return; | 199 return |
202 end | 200 end |
203 if ( IsShiftKeyDown() ) then | 201 if IsShiftKeyDown() then |
204 keyPressed = "SHIFT-"..keyPressed | 202 keyPressed = "SHIFT-"..keyPressed |
205 end | 203 end |
206 if ( IsControlKeyDown() ) then | 204 if IsControlKeyDown() then |
207 keyPressed = "CTRL-"..keyPressed | 205 keyPressed = "CTRL-"..keyPressed |
208 end | 206 end |
209 if ( IsAltKeyDown() ) then | 207 if IsAltKeyDown() then |
210 keyPressed = "ALT-"..keyPressed | 208 keyPressed = "ALT-"..keyPressed |
211 end | 209 end |
212 if ( keyPressed == "BUTTON1" or keyPressed == "BUTTON2" ) then | 210 if keyPressed == "BUTTON1" or keyPressed == "BUTTON2" then |
213 return; | 211 return |
214 end | 212 end |
215 | 213 |
216 CyborgMMO_SetNewKeybind(keyPressed) | 214 CyborgMMO_SetNewKeybind(keyPressed) |
217 | 215 end |
218 end |