From 520a24fb83acd0bb98f8b364aa5ea1ceae43f76a Mon Sep 17 00:00:00 2001
From: "SND\\MaddTheSane_cp"
 <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>
Date: Thu, 20 Dec 2012 23:04:58 +0000
Subject: Implement fast-forward in the display plug-ins for OS X.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81907 e17a0e51-4ae3-4d35-97c3-1a29b211df97
---
 macosx/English.lproj/Configuration.xib  | 424 +++++++++++++++++++++++++++++---
 macosx/English.lproj/KeyNames.plist     |   2 +
 macosx/ExtendedKeys.h                   |   3 +-
 macosx/HotkeyController.h               |   1 +
 macosx/HotkeyController.m               |   1 +
 macosx/hotkeys.m                        |  24 +-
 macosx/plugins/DFXVideo/macsrc/drawgl.m |  25 +-
 macosx/plugins/PeopsXgl/macsrc/drawgl.m |  25 +-
 8 files changed, 464 insertions(+), 41 deletions(-)

diff --git a/macosx/English.lproj/Configuration.xib b/macosx/English.lproj/Configuration.xib
index 8a9178db..19ee3745 100644
--- a/macosx/English.lproj/Configuration.xib
+++ b/macosx/English.lproj/Configuration.xib
@@ -1725,7 +1725,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 												<string key="NSFrame">{{120, 273}, {310, 22}}</string>
 												<reference key="NSSuperview" ref="958294119"/>
 												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView" ref="795957481"/>
+												<reference key="NSNextKeyView" ref="168188758"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="665963726">
@@ -1750,15 +1750,68 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 													</object>
 												</object>
 											</object>
+											<object class="NSButton" id="168188758">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{-3, 237}, {121, 32}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="823878691"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<int key="NSTag">101</int>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSButtonCell" key="NSCell" id="548509436">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">134217728</int>
+													<string key="NSContents">Frame Limit</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="168188758"/>
+													<int key="NSTag">100</int>
+													<int key="NSButtonFlags">-1232977920</int>
+													<int key="NSButtonFlags2">129</int>
+													<reference key="NSAlternateImage" ref="983951697"/>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">200</int>
+													<int key="NSPeriodicInterval">25</int>
+												</object>
+											</object>
+											<object class="NSTextField" id="823878691">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{120, 243}, {310, 22}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="795957481"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="266713574">
+													<int key="NSCellFlags">-2075131840</int>
+													<int key="NSCellFlags2">272634880</int>
+													<string key="NSContents"/>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSPlaceholderString">None...</string>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="823878691"/>
+													<bool key="NSDrawsBackground">YES</bool>
+													<int key="NSTextBezelStyle">1</int>
+													<reference key="NSBackgroundColor" ref="663213200"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">1</int>
+														<bytes key="NSRGB">MC4xNzQwOTY0ODI5IDAuMzI3ODI0MzQ2NSAwLjY1NzM3NTE2OTgAA</bytes>
+													</object>
+												</object>
+											</object>
 											<object class="NSButton" id="795957481">
 												<reference key="NSNextResponder" ref="958294119"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{-3, 236}, {121, 32}}</string>
+												<string key="NSFrame">{{-3, 205}, {121, 32}}</string>
 												<reference key="NSSuperview" ref="958294119"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="341191480"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
-												<int key="NSTag">101</int>
+												<int key="NSTag">102</int>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="305408243">
 													<int key="NSCellFlags">67108864</int>
@@ -1780,7 +1833,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<object class="NSTextField" id="341191480">
 												<reference key="NSNextResponder" ref="958294119"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{120, 243}, {310, 22}}</string>
+												<string key="NSFrame">{{120, 212}, {310, 22}}</string>
 												<reference key="NSSuperview" ref="958294119"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="659547625"/>
@@ -1806,12 +1859,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<object class="NSButton" id="659547625">
 												<reference key="NSNextResponder" ref="958294119"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{-3, 204}, {121, 32}}</string>
+												<string key="NSFrame">{{-3, 173}, {121, 32}}</string>
 												<reference key="NSSuperview" ref="958294119"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="364881091"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
-												<int key="NSTag">102</int>
+												<int key="NSTag">103</int>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="968300061">
 													<int key="NSCellFlags">67108864</int>
@@ -1833,7 +1886,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<object class="NSTextField" id="364881091">
 												<reference key="NSNextResponder" ref="958294119"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{120, 211}, {310, 22}}</string>
+												<string key="NSFrame">{{120, 180}, {310, 22}}</string>
 												<reference key="NSSuperview" ref="958294119"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="246038820"/>
@@ -1859,12 +1912,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<object class="NSButton" id="246038820">
 												<reference key="NSNextResponder" ref="958294119"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{-3, 172}, {121, 32}}</string>
+												<string key="NSFrame">{{-3, 141}, {121, 32}}</string>
 												<reference key="NSSuperview" ref="958294119"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="1072290452"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
-												<int key="NSTag">103</int>
+												<int key="NSTag">104</int>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="10554974">
 													<int key="NSCellFlags">67108864</int>
@@ -1886,7 +1939,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<object class="NSTextField" id="1072290452">
 												<reference key="NSNextResponder" ref="958294119"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{120, 179}, {310, 22}}</string>
+												<string key="NSFrame">{{120, 148}, {310, 22}}</string>
 												<reference key="NSSuperview" ref="958294119"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="860331374"/>
@@ -1912,12 +1965,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<object class="NSButton" id="860331374">
 												<reference key="NSNextResponder" ref="958294119"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{-3, 138}, {121, 32}}</string>
+												<string key="NSFrame">{{-3, 109}, {121, 32}}</string>
 												<reference key="NSSuperview" ref="958294119"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="205239960"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
-												<int key="NSTag">104</int>
+												<int key="NSTag">105</int>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSButtonCell" key="NSCell" id="744386199">
 													<int key="NSCellFlags">67108864</int>
@@ -1939,10 +1992,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 											<object class="NSTextField" id="205239960">
 												<reference key="NSNextResponder" ref="958294119"/>
 												<int key="NSvFlags">268</int>
-												<string key="NSFrame">{{120, 146}, {310, 22}}</string>
+												<string key="NSFrame">{{120, 117}, {310, 22}}</string>
 												<reference key="NSSuperview" ref="958294119"/>
 												<reference key="NSWindow"/>
-												<reference key="NSNextKeyView"/>
+												<reference key="NSNextKeyView" ref="32956648"/>
 												<string key="NSReuseIdentifierKey">_NS:9</string>
 												<bool key="NSEnabled">YES</bool>
 												<object class="NSTextFieldCell" key="NSCell" id="725698940">
@@ -1962,6 +2015,131 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 													</object>
 												</object>
 											</object>
+											<object class="NSBox" id="32956648">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">42</int>
+												<string key="NSFrame">{{3, 101}, {500, 5}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="267389414"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<string key="NSOffsets">{0, 0}</string>
+												<object class="NSTextFieldCell" key="NSTitleCell">
+													<int key="NSCellFlags">67108864</int>
+													<int key="NSCellFlags2">0</int>
+													<string key="NSContents">Box</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<reference key="NSBackgroundColor" ref="767300285"/>
+													<object class="NSColor" key="NSTextColor">
+														<int key="NSColorSpace">3</int>
+														<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
+													</object>
+												</object>
+												<int key="NSBorderType">3</int>
+												<int key="NSBoxType">2</int>
+												<int key="NSTitlePosition">0</int>
+												<bool key="NSTransparent">NO</bool>
+											</object>
+											<object class="NSTextField" id="267389414">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{0, 78}, {113, 17}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="465452774"/>
+												<string key="NSReuseIdentifierKey">_NS:1535</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSTextFieldCell" key="NSCell" id="27919550">
+													<int key="NSCellFlags">68157504</int>
+													<int key="NSCellFlags2">272630784</int>
+													<string key="NSContents">GPU Key Modifier</string>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:1535</string>
+													<reference key="NSControlView" ref="267389414"/>
+													<reference key="NSBackgroundColor" ref="243535788"/>
+													<reference key="NSTextColor" ref="302293113"/>
+												</object>
+											</object>
+											<object class="NSPopUpButton" id="465452774">
+												<reference key="NSNextResponder" ref="958294119"/>
+												<int key="NSvFlags">268</int>
+												<string key="NSFrame">{{117, 72}, {153, 26}}</string>
+												<reference key="NSSuperview" ref="958294119"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView"/>
+												<string key="NSReuseIdentifierKey">_NS:9</string>
+												<bool key="NSEnabled">YES</bool>
+												<object class="NSPopUpButtonCell" key="NSCell" id="465026198">
+													<int key="NSCellFlags">-2076049856</int>
+													<int key="NSCellFlags2">2048</int>
+													<reference key="NSSupport" ref="113129670"/>
+													<string key="NSCellIdentifier">_NS:9</string>
+													<reference key="NSControlView" ref="465452774"/>
+													<int key="NSButtonFlags">109199360</int>
+													<int key="NSButtonFlags2">129</int>
+													<string key="NSAlternateContents"/>
+													<string key="NSKeyEquivalent"/>
+													<int key="NSPeriodicDelay">400</int>
+													<int key="NSPeriodicInterval">75</int>
+													<object class="NSMenuItem" key="NSMenuItem" id="336696263">
+														<reference key="NSMenu" ref="1009410357"/>
+														<string key="NSTitle">Control ⌃</string>
+														<string key="NSKeyEquiv"/>
+														<int key="NSKeyEquivModMask">262144</int>
+														<int key="NSMnemonicLoc">2147483647</int>
+														<int key="NSState">1</int>
+														<reference key="NSOnImage" ref="853204695"/>
+														<reference key="NSMixedImage" ref="607321304"/>
+														<string key="NSAction">_popUpItemAction:</string>
+														<reference key="NSTarget" ref="465026198"/>
+													</object>
+													<bool key="NSMenuItemRespectAlignment">YES</bool>
+													<object class="NSMenu" key="NSMenu" id="1009410357">
+														<string key="NSTitle">OtherViews</string>
+														<array class="NSMutableArray" key="NSMenuItems">
+															<reference ref="336696263"/>
+															<object class="NSMenuItem" id="724874125">
+																<reference key="NSMenu" ref="1009410357"/>
+																<string key="NSTitle">Shift ⇧</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">131072</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="853204695"/>
+																<reference key="NSMixedImage" ref="607321304"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<reference key="NSTarget" ref="465026198"/>
+															</object>
+															<object class="NSMenuItem" id="1066195432">
+																<reference key="NSMenu" ref="1009410357"/>
+																<string key="NSTitle">Alt / Option ⌥</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">524288</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="853204695"/>
+																<reference key="NSMixedImage" ref="607321304"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<reference key="NSTarget" ref="465026198"/>
+															</object>
+															<object class="NSMenuItem" id="949142848">
+																<reference key="NSMenu" ref="1009410357"/>
+																<string key="NSTitle">Command ⌘</string>
+																<string key="NSKeyEquiv"/>
+																<int key="NSKeyEquivModMask">1048576</int>
+																<int key="NSMnemonicLoc">2147483647</int>
+																<reference key="NSOnImage" ref="853204695"/>
+																<reference key="NSMixedImage" ref="607321304"/>
+																<string key="NSAction">_popUpItemAction:</string>
+																<reference key="NSTarget" ref="465026198"/>
+															</object>
+														</array>
+														<reference key="NSMenuFont" ref="113129670"/>
+													</object>
+													<int key="NSPreferredEdge">1</int>
+													<bool key="NSUsesItemFromMenu">YES</bool>
+													<bool key="NSAltersState">YES</bool>
+													<int key="NSArrowPosition">2</int>
+												</object>
+											</object>
 										</array>
 										<string key="NSFrame">{{10, 33}, {506, 298}}</string>
 										<reference key="NSSuperview" ref="145760790"/>
@@ -2627,6 +2805,22 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<int key="connectionID">879</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hotkeySet:</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="168188758"/>
+					</object>
+					<int key="connectionID">900</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">FrameLimit</string>
+						<reference key="source" ref="958294119"/>
+						<reference key="destination" ref="823878691"/>
+					</object>
+					<int key="connectionID">901</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -3423,6 +3617,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<reference ref="1072290452"/>
 							<reference ref="341191480"/>
 							<reference ref="205239960"/>
+							<reference ref="32956648"/>
+							<reference ref="267389414"/>
+							<reference ref="465452774"/>
+							<reference ref="823878691"/>
+							<reference ref="168188758"/>
 						</array>
 						<reference key="parent" ref="185355004"/>
 						<string key="objectName">Hotkey View</string>
@@ -3557,6 +3756,97 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<reference key="object" ref="725698940"/>
 						<reference key="parent" ref="205239960"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">884</int>
+						<reference key="object" ref="32956648"/>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">885</int>
+						<reference key="object" ref="267389414"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="27919550"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">886</int>
+						<reference key="object" ref="27919550"/>
+						<reference key="parent" ref="267389414"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">887</int>
+						<reference key="object" ref="465452774"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="465026198"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">888</int>
+						<reference key="object" ref="465026198"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1009410357"/>
+						</array>
+						<reference key="parent" ref="465452774"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">889</int>
+						<reference key="object" ref="1009410357"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="336696263"/>
+							<reference ref="724874125"/>
+							<reference ref="949142848"/>
+							<reference ref="1066195432"/>
+						</array>
+						<reference key="parent" ref="465026198"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">890</int>
+						<reference key="object" ref="336696263"/>
+						<reference key="parent" ref="1009410357"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">891</int>
+						<reference key="object" ref="724874125"/>
+						<reference key="parent" ref="1009410357"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">892</int>
+						<reference key="object" ref="949142848"/>
+						<reference key="parent" ref="1009410357"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">893</int>
+						<reference key="object" ref="1066195432"/>
+						<reference key="parent" ref="1009410357"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">896</int>
+						<reference key="object" ref="168188758"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="548509436"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">897</int>
+						<reference key="object" ref="823878691"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="266713574"/>
+						</array>
+						<reference key="parent" ref="958294119"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">898</int>
+						<reference key="object" ref="266713574"/>
+						<reference key="parent" ref="823878691"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">899</int>
+						<reference key="object" ref="548509436"/>
+						<reference key="parent" ref="168188758"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -3750,12 +4040,36 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				<string key="873.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="874.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="875.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="884.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<dictionary class="NSMutableDictionary" key="885.IBAttributePlaceholdersKey"/>
+				<string key="885.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="886.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<object class="NSMutableDictionary" key="887.IBAttributePlaceholdersKey">
+					<string key="NS.key.0">ToolTip</string>
+					<object class="IBToolTipAttribute" key="NS.object.0">
+						<string key="name">ToolTip</string>
+						<reference key="object" ref="465452774"/>
+						<string key="toolTip">Any key pressed at the same time as the GPU Key Modifier will be sent directly to the GPU Plugin. This is useful for plugins with menus. Control (ctrl) is the recommended modifier; command (cmd or apple key) should not be used unless you absolutely want to.</string>
+					</object>
+				</object>
+				<string key="887.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="888.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="889.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="890.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="891.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="892.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="893.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="896.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="896.userInterfaceItemIdentifier">FrameLimit</string>
+				<string key="897.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="898.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="899.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">879</int>
+			<int key="maxID">901</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -3941,6 +4255,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="FastForward">NSTextField</string>
+						<string key="FrameLimit">NSTextField</string>
 						<string key="LoadState">NSTextField</string>
 						<string key="NextState">NSTextField</string>
 						<string key="PrevState">NSTextField</string>
@@ -3951,6 +4266,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string key="name">FastForward</string>
 							<string key="candidateClassName">NSTextField</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="FrameLimit">
+							<string key="name">FrameLimit</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="LoadState">
 							<string key="name">LoadState</string>
 							<string key="candidateClassName">NSTextField</string>
@@ -3973,45 +4292,78 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 						<string key="minorKey">./Classes/HotkeyController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NamedSlider</string>
+					<string key="superclassName">NSSlider</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NamedSlider.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">PluginController</string>
 					<string key="superclassName">NSObject</string>
 					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="doAbout:">id</string>
-						<string key="doConfigure:">id</string>
-						<string key="selectPlugin:">id</string>
+						<string key="cancel:">id</string>
+						<string key="ok:">id</string>
+						<string key="reset:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="doAbout:">
-							<string key="name">doAbout:</string>
+						<object class="IBActionInfo" key="cancel:">
+							<string key="name">cancel:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="doConfigure:">
-							<string key="name">doConfigure:</string>
+						<object class="IBActionInfo" key="ok:">
+							<string key="name">ok:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="selectPlugin:">
-							<string key="name">selectPlugin:</string>
+						<object class="IBActionInfo" key="reset:">
+							<string key="name">reset:</string>
 							<string key="candidateClassName">id</string>
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="aboutButton">NSButton</string>
-						<string key="configureButton">NSButton</string>
-						<string key="pluginMenu">NSPopUpButton</string>
+						<string key="hiCompBox">NSControl</string>
+						<string key="interpolValue">NamedSlider</string>
+						<string key="irqWaitBox">NSControl</string>
+						<string key="monoSoundBox">NSControl</string>
+						<string key="reverbValue">NamedSlider</string>
+						<string key="volumeValue">NamedSlider</string>
+						<string key="xaEnableBox">NSControl</string>
+						<string key="xaSpeedBox">NSControl</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="aboutButton">
-							<string key="name">aboutButton</string>
-							<string key="candidateClassName">NSButton</string>
+						<object class="IBToOneOutletInfo" key="hiCompBox">
+							<string key="name">hiCompBox</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="interpolValue">
+							<string key="name">interpolValue</string>
+							<string key="candidateClassName">NamedSlider</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="irqWaitBox">
+							<string key="name">irqWaitBox</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="monoSoundBox">
+							<string key="name">monoSoundBox</string>
+							<string key="candidateClassName">NSControl</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="reverbValue">
+							<string key="name">reverbValue</string>
+							<string key="candidateClassName">NamedSlider</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="volumeValue">
+							<string key="name">volumeValue</string>
+							<string key="candidateClassName">NamedSlider</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="configureButton">
-							<string key="name">configureButton</string>
-							<string key="candidateClassName">NSButton</string>
+						<object class="IBToOneOutletInfo" key="xaEnableBox">
+							<string key="name">xaEnableBox</string>
+							<string key="candidateClassName">NSControl</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="pluginMenu">
-							<string key="name">pluginMenu</string>
-							<string key="candidateClassName">NSPopUpButton</string>
+						<object class="IBToOneOutletInfo" key="xaSpeedBox">
+							<string key="name">xaSpeedBox</string>
+							<string key="candidateClassName">NSControl</string>
 						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/macosx/English.lproj/KeyNames.plist b/macosx/English.lproj/KeyNames.plist
index bde23943..275976a8 100644
--- a/macosx/English.lproj/KeyNames.plist
+++ b/macosx/English.lproj/KeyNames.plist
@@ -142,6 +142,8 @@
 	<string>/</string>
 	<key>49</key>
 	<string>Space</string>
+	<key>114</key>
+	<string>Insert</string>
 	<key>115</key>
 	<string>Home</string>
 	<key>119</key>
diff --git a/macosx/ExtendedKeys.h b/macosx/ExtendedKeys.h
index 24f54912..b4990b20 100644
--- a/macosx/ExtendedKeys.h
+++ b/macosx/ExtendedKeys.h
@@ -21,7 +21,8 @@ enum {
     
     // Fake HotKeys
     GPU_HOTKEYS = 0x020,
-    GPU_FAST_FORWARD
+    GPU_FAST_FORWARD,
+    GPU_FRAME_LIMIT
 };
 
 #endif //__EXTENDED_KEYS_H__
diff --git a/macosx/HotkeyController.h b/macosx/HotkeyController.h
index 59492c79..baf539d5 100644
--- a/macosx/HotkeyController.h
+++ b/macosx/HotkeyController.h
@@ -18,6 +18,7 @@
     IBOutlet NSTextField *LoadState;
     IBOutlet NSTextField *NextState;
     IBOutlet NSTextField *PrevState;
+    IBOutlet NSTextField *FrameLimit;
 }
 
 @property (assign) NSInteger configInput;
diff --git a/macosx/HotkeyController.m b/macosx/HotkeyController.m
index 65ec1055..fcb15c4e 100644
--- a/macosx/HotkeyController.m
+++ b/macosx/HotkeyController.m
@@ -28,6 +28,7 @@
     [self mapOutletToIdentifier:LoadState forIdentifier:@"LoadState"];
     [self mapOutletToIdentifier:NextState forIdentifier:@"NextState"];
     [self mapOutletToIdentifier:PrevState forIdentifier:@"PrevState"];
+    [self mapOutletToIdentifier:FrameLimit forIdentifier:@"FrameLimit"];
 }
 
 - (void)dealloc
diff --git a/macosx/hotkeys.m b/macosx/hotkeys.m
index 16d92fda..1c917439 100644
--- a/macosx/hotkeys.m
+++ b/macosx/hotkeys.m
@@ -16,6 +16,7 @@
 
 #define HK_MAX_STATE 10
 static id monitor;
+static id gpuMonitor;
 static int currentState = 0;
 static NSMutableDictionary *hotkeys;
 enum {
@@ -23,7 +24,8 @@ enum {
     HK_SAVE_STATE,
     HK_LOAD_STATE,
     HK_NEXT_STATE,
-    HK_PREV_STATE
+    HK_PREV_STATE,
+    HK_FRAME_LIMIT
 };
 
 void nextState() {
@@ -52,6 +54,12 @@ bool handleHotkey(NSString* keyCode) {
                         GPU_keypressed(GPU_FAST_FORWARD);
                     }
                     break;
+                case HK_FRAME_LIMIT:
+                    // Ignore FrameLimit requests if paused
+                    if(![EmuThread isPaused]) {
+                        GPU_keypressed(GPU_FRAME_LIMIT);
+                    }
+                    break;
                 case HK_SAVE_STATE:
                     [PcsxrController saveState:currentState];
                     break;
@@ -90,11 +98,13 @@ void setupHotkeys() {
     setupHotkey(HK_LOAD_STATE, @"LoadState", [bindings objectForKey:@"LoadState"]);
     setupHotkey(HK_NEXT_STATE, @"NextState", [bindings objectForKey:@"NextState"]);
     setupHotkey(HK_PREV_STATE, @"PrevState", [bindings objectForKey:@"PrevState"]);
+    setupHotkey(HK_FRAME_LIMIT, @"FrameLimit", [bindings objectForKey:@"FrameLimit"]);
     
     currentState = 0;
 }
 
 void attachHotkeys() {
+    // Configurable hotkeys
     NSEvent* (^handler)(NSEvent*) = ^(NSEvent *event) {
         if(handleHotkey([NSString stringWithFormat:@"%d", [event keyCode]])) {
             return (NSEvent*)nil; // handled
@@ -105,9 +115,19 @@ void attachHotkeys() {
     };
     setupHotkeys();
     monitor = [NSEvent addLocalMonitorForEventsMatchingMask:NSKeyUpMask handler:handler];
+    
+    // GPU key presses
+    NSEvent* (^gpuKeypress)(NSEvent*) = ^(NSEvent *event) {
+        GPU_keypressed([event keyCode]);
+        return (NSEvent*)nil;
+    };
+    gpuMonitor = [NSEvent addLocalMonitorForEventsMatchingMask:(NSKeyUpMask | NSControlKeyMask) handler:gpuKeypress];
 }
 
 void detachHotkeys() {
-    if(hotkeys)[hotkeys release];
+    [hotkeys release];
     [NSEvent removeMonitor:monitor];
+    [NSEvent removeMonitor:gpuMonitor];
+    monitor = nil;
+    gpuMonitor = nil;
 }
diff --git a/macosx/plugins/DFXVideo/macsrc/drawgl.m b/macosx/plugins/DFXVideo/macsrc/drawgl.m
index be679143..eb3850d4 100644
--- a/macosx/plugins/DFXVideo/macsrc/drawgl.m
+++ b/macosx/plugins/DFXVideo/macsrc/drawgl.m
@@ -175,8 +175,31 @@ void ShowTextGpuPic(void)
 void HandleKey(int keycode)
 {
 	switch (keycode) {
+        case GPU_FRAME_LIMIT:
+            if(UseFrameLimit) {
+                UseFrameLimit = 0;
+                iFrameLimit = 1;
+            }
+            else {
+                UseFrameLimit = 1;
+                iFrameLimit = 2;
+            }
+            SetAutoFrameCap();
+            break;
         case GPU_FAST_FORWARD:
-            UseFrameLimit ^= 1;
+            if(UseFrameLimit) {
+                UseFrameLimit = 0;
+                iFrameLimit = 1;
+                UseFrameSkip = 1;
+                iFastFwd = 0;
+            }
+            else {
+                UseFrameLimit = 1;
+                iFrameLimit = 2;
+                UseFrameSkip = 0;
+                iFastFwd = 0;
+            }
+            bSkipNextFrame = FALSE;
             break;
 		case GPU_FULLSCREEN_KEY:
 			[gameController setFullscreen:![gameController fullscreen]];
diff --git a/macosx/plugins/PeopsXgl/macsrc/drawgl.m b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
index 5a75efab..2ad7b985 100644
--- a/macosx/plugins/PeopsXgl/macsrc/drawgl.m
+++ b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
@@ -233,8 +233,31 @@ void ShowTextGpuPic(void)
 void HandleKey(int keycode)
 {
 	switch (keycode) {
+        case GPU_FRAME_LIMIT:
+            if(bUseFrameLimit) {
+                bUseFrameLimit = false;
+                iFrameLimit = 1;
+            }
+            else {
+                bUseFrameLimit = true;
+                iFrameLimit = 2;
+            }
+            SetAutoFrameCap();
+            break;
         case GPU_FAST_FORWARD:
-            bUseFrameLimit = !bUseFrameLimit;
+            if(bUseFrameLimit) {
+                bUseFrameLimit = false;
+                iFrameLimit = 1;
+                bUseFrameSkip = true;
+                iFastFwd = 0;
+            }
+            else {
+                bUseFrameLimit = true;
+                iFrameLimit = 2;
+                bUseFrameSkip = false;
+                iFastFwd = 0;
+            }
+            bSkipNextFrame = FALSE;
             break;
 		case GPU_FULLSCREEN_KEY:
 			[gameController setFullscreen:![gameController fullscreen]];
-- 
cgit v1.2.3