Index: trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm
===================================================================
--- trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm	(revision 431)
+++ trunk/ChameleonPrefPane/Sources/AdvancedSetupController.mm	(revision 432)
@@ -27,6 +27,7 @@
     BootProp::instance().addOptionDesc(mCPU, mCPUText, OptionKernel, "cpus", "");
     BootProp::instance().addOptionDesc(mBusRatio, mBusRatioText, OptionKernel,  "busratio", "");
     BootProp::instance().addOptionDesc(mDebug, mDebugText, OptionKernel, "debug", "");
+    BootProp::instance().addOptionDesc(mDarkWake, mDarkWakeText, OptionKernel, "darkwake", "");
     BootProp::instance().addOptionDesc(mIO, mIOText, OptionString, "io", "");
     BootProp::instance().addOptionDesc(mDisableKextsBlacklisting, nil, OptionUnix, "blacklist=0", "");
     BootProp::instance().addOptionDesc(mDSDTFile, mDSDTFileText, OptionFileString, "DSDT", "");
Index: trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h
===================================================================
--- trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h	(revision 431)
+++ trunk/ChameleonPrefPane/Sources/AdvancedSetupController.h	(revision 432)
@@ -19,18 +19,20 @@
 	IBOutlet NSTextField*	mDeviceRdText;
 	
 	IBOutlet NSButton*		mArch;
-	IBOutlet NSComboBox*	mArchText;
+	IBOutlet NSComboBox*		mArchText;
 	IBOutlet NSButton*		mCPU;
-	IBOutlet NSComboBox*	mCPUText;
+	IBOutlet NSComboBox*		mCPUText;
 	IBOutlet NSButton*		mBusRatio;
-	IBOutlet NSComboBox*	mBusRatioText;
+	IBOutlet NSComboBox*		mBusRatioText;
 	IBOutlet NSButton*		mSystemType;
-	IBOutlet NSComboBox*	mSystemTypeText;
+	IBOutlet NSComboBox*		mSystemTypeText;
 	
 	IBOutlet NSButton*		mDebug;
-	IBOutlet NSComboBox*	mDebugText;
+	IBOutlet NSComboBox*		mDebugText;
+	IBOutlet NSButton*		mDarkWake;
+	IBOutlet NSComboBox*		mDarkWakeText;
 	IBOutlet NSButton*		mIO;
-	IBOutlet NSComboBox*	mIOText;
+	IBOutlet NSComboBox*		mIOText;
 	IBOutlet NSButton*		mDisableKextsBlacklisting;
 
 	IBOutlet NSButton*		mDSDTFile;
Index: trunk/ChameleonPrefPane/Sources/KernOptionsParser.cpp
===================================================================
--- trunk/ChameleonPrefPane/Sources/KernOptionsParser.cpp	(revision 431)
+++ trunk/ChameleonPrefPane/Sources/KernOptionsParser.cpp	(revision 432)
@@ -66,7 +66,7 @@
 	std::string::size_type found = _options.find(f);
 	if (found==std::string::npos) return;
 	// find the end of the flag
-	for ( pos=found+flag.length(); pos<l && _options[pos]!=' '; pos++);
+	for ( pos=found+f.length(); pos<l && _options[pos]!=' '; pos++);
 	_options.erase(found, pos);
 	_options = trim(_options);
 }
Index: trunk/ChameleonPrefPane/English.lproj/Chameleon.xib
===================================================================
--- trunk/ChameleonPrefPane/English.lproj/Chameleon.xib	(revision 431)
+++ trunk/ChameleonPrefPane/English.lproj/Chameleon.xib	(revision 432)
@@ -12,7 +12,7 @@
     </object>
     <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
       <bool key="EncodedWithXMLCoder">YES</bool>
-      <integer value="286"/>
+      <integer value="172"/>
     </object>
     <object class="NSArray" key="IBDocument.PluginDependencies">
       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -293,7 +293,7 @@
                 <object class="NSTabViewItem" id="210384195">
                   <string key="NSIdentifier">Item 1</string>
                   <object class="NSView" key="NSView" id="389526238">
-                    <nil key="NSNextResponder"/>
+                    <reference key="NSNextResponder" ref="869599070"/>
                     <int key="NSvFlags">292</int>
                     <object class="NSMutableArray" key="NSSubviews">
                       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -1000,6 +1000,7 @@
                       </object>
                     </object>
                     <string key="NSFrameSize">{541, 408}</string>
+                    <reference key="NSSuperview" ref="869599070"/>
                     <int key="NSViewLayerContentsRedrawPolicy">2</int>
                   </object>
                   <string key="NSLabel">Startup Disk</string>
@@ -1580,7 +1581,7 @@
                 <object class="NSTabViewItem" id="10883603">
                   <string key="NSIdentifier">Item 3</string>
                   <object class="NSView" key="NSView" id="798772941">
-                    <reference key="NSNextResponder" ref="869599070"/>
+                    <nil key="NSNextResponder"/>
                     <int key="NSvFlags">256</int>
                     <object class="NSMutableArray" key="NSSubviews">
                       <bool key="EncodedWithXMLCoder">YES</bool>
@@ -1876,7 +1877,7 @@
                                   <object class="NSComboTableView" key="NSTableView" id="497140426">
                                     <reference key="NSNextResponder"/>
                                     <int key="NSvFlags">274</int>
-                                    <string key="NSFrameSize">{13, 210}</string>
+                                    <string key="NSFrameSize">{13, 231}</string>
                                     <reference key="NSSuperview"/>
                                     <reference key="NSWindow"/>
                                     <bool key="NSEnabled">YES</bool>
@@ -2176,7 +2177,6 @@
                       </object>
                     </object>
                     <string key="NSFrameSize">{541, 408}</string>
-                    <reference key="NSSuperview" ref="869599070"/>
                     <int key="NSViewLayerContentsRedrawPolicy">2</int>
                   </object>
                   <string key="NSLabel">Boot Flags</string>
@@ -2866,6 +2866,29 @@
                                           <int key="NSPeriodicInterval">25</int>
                                         </object>
                                       </object>
+                                      <object class="NSButton" id="232732509">
+                                        <reference key="NSNextResponder" ref="59588505"/>
+                                        <int key="NSvFlags">268</int>
+                                        <string key="NSFrame">{{277, 46}, {205, 23}}</string>
+                                        <reference key="NSSuperview" ref="59588505"/>
+                                        <int key="NSViewLayerContentsRedrawPolicy">2</int>
+                                        <bool key="NSEnabled">YES</bool>
+                                        <object class="NSButtonCell" key="NSCell" id="893682965">
+                                          <int key="NSCellFlags">67239424</int>
+                                          <int key="NSCellFlags2">0</int>
+                                          <string key="NSContents">Dark Wake</string>
+                                          <reference key="NSSupport" ref="930899267"/>
+                                          <reference key="NSControlView" ref="232732509"/>
+                                          <int key="NSButtonFlags">1211912703</int>
+                                          <int key="NSButtonFlags2">2</int>
+                                          <reference key="NSNormalImage" ref="1062345216"/>
+                                          <reference key="NSAlternateImage" ref="731537593"/>
+                                          <string key="NSAlternateContents"/>
+                                          <string key="NSKeyEquivalent"/>
+                                          <int key="NSPeriodicDelay">200</int>
+                                          <int key="NSPeriodicInterval">25</int>
+                                        </object>
+                                      </object>
                                       <object class="NSButton" id="449337560">
                                         <reference key="NSNextResponder" ref="59588505"/>
                                         <int key="NSvFlags">268</int>
@@ -2930,6 +2953,87 @@
                                           <int key="NSPeriodicInterval">25</int>
                                         </object>
                                       </object>
+                                      <object class="NSComboBox" id="566032593">
+                                        <reference key="NSNextResponder" ref="59588505"/>
+                                        <int key="NSvFlags">268</int>
+                                        <string key="NSFrame">{{378, 46}, {76, 26}}</string>
+                                        <reference key="NSSuperview" ref="59588505"/>
+                                        <int key="NSViewLayerContentsRedrawPolicy">2</int>
+                                        <bool key="NSEnabled">YES</bool>
+                                        <object class="NSComboBoxCell" key="NSCell" id="887588379">
+                                          <int key="NSCellFlags">343014976</int>
+                                          <int key="NSCellFlags2">272630784</int>
+                                          <string key="NSContents"/>
+                                          <reference key="NSSupport" ref="930899267"/>
+                                          <reference key="NSControlView" ref="566032593"/>
+                                          <bool key="NSDrawsBackground">YES</bool>
+                                          <reference key="NSBackgroundColor" ref="501125233"/>
+                                          <reference key="NSTextColor" ref="560934093"/>
+                                          <int key="NSVisibleItemCount">2</int>
+                                          <bool key="NSHasVerticalScroller">YES</bool>
+                                          <object class="NSMutableArray" key="NSPopUpListData">
+                                            <bool key="EncodedWithXMLCoder">YES</bool>
+                                            <string>0</string>
+                                            <string>1</string>
+                                          </object>
+                                          <reference key="NSDelegate" ref="566032593"/>
+                                          <object class="NSComboTableView" key="NSTableView" id="630205025">
+                                            <reference key="NSNextResponder"/>
+                                            <int key="NSvFlags">274</int>
+                                            <string key="NSFrameSize">{13, 63}</string>
+                                            <reference key="NSSuperview"/>
+                                            <reference key="NSWindow"/>
+                                            <bool key="NSEnabled">YES</bool>
+                                            <object class="NSMutableArray" key="NSTableColumns">
+                                              <bool key="EncodedWithXMLCoder">YES</bool>
+                                              <object class="NSTableColumn">
+                                                <double key="NSWidth">10</double>
+                                                <double key="NSMinWidth">10</double>
+                                                <double key="NSMaxWidth">1000</double>
+                                                <object class="NSTableHeaderCell" key="NSHeaderCell">
+                                                  <int key="NSCellFlags">75628032</int>
+                                                  <int key="NSCellFlags2">0</int>
+                                                  <string key="NSContents"/>
+                                                  <reference key="NSSupport" ref="445094936"/>
+                                                  <object class="NSColor" key="NSBackgroundColor">
+                                                    <int key="NSColorSpace">3</int>
+                                                    <bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+                                                  </object>
+                                                  <reference key="NSTextColor" ref="732916706"/>
+                                                </object>
+                                                <object class="NSTextFieldCell" key="NSDataCell">
+                                                  <int key="NSCellFlags">338820672</int>
+                                                  <int key="NSCellFlags2">268436480</int>
+                                                  <reference key="NSSupport" ref="930899267"/>
+                                                  <reference key="NSControlView" ref="630205025"/>
+                                                  <bool key="NSDrawsBackground">YES</bool>
+                                                  <reference key="NSBackgroundColor" ref="694251928"/>
+                                                  <reference key="NSTextColor" ref="560934093"/>
+                                                </object>
+                                                <int key="NSResizingMask">3</int>
+                                                <bool key="NSIsResizeable">YES</bool>
+                                                <reference key="NSTableView" ref="630205025"/>
+                                              </object>
+                                            </object>
+                                            <double key="NSIntercellSpacingWidth">3</double>
+                                            <double key="NSIntercellSpacingHeight">2</double>
+                                            <reference key="NSBackgroundColor" ref="694251928"/>
+                                            <reference key="NSGridColor" ref="178056349"/>
+                                            <double key="NSRowHeight">19</double>
+                                            <string key="NSAction">tableViewAction:</string>
+                                            <int key="NSTvFlags">-765427712</int>
+                                            <reference key="NSDelegate" ref="887588379"/>
+                                            <reference key="NSDataSource" ref="887588379"/>
+                                            <reference key="NSTarget" ref="887588379"/>
+                                            <int key="NSColumnAutoresizingStyle">1</int>
+                                            <int key="NSDraggingSourceMaskForLocal">15</int>
+                                            <int key="NSDraggingSourceMaskForNonLocal">0</int>
+                                            <bool key="NSAllowsTypeSelect">YES</bool>
+                                            <int key="NSTableViewDraggingDestinationStyle">0</int>
+                                            <int key="NSTableViewGroupRowStyle">1</int>
+                                          </object>
+                                        </object>
+                                      </object>
                                     </object>
                                     <string key="NSFrame">{{1, 1}, {509, 78}}</string>
                                     <reference key="NSSuperview" ref="965868050"/>
@@ -4595,14 +4699,14 @@
                   <reference key="NSTabView" ref="869599070"/>
                 </object>
               </object>
-              <reference key="NSSelectedTabViewItem" ref="10883603"/>
+              <reference key="NSSelectedTabViewItem" ref="210384195"/>
               <reference key="NSFont" ref="22"/>
               <int key="NSTvFlags">268435462</int>
               <bool key="NSAllowTruncatedLabels">YES</bool>
               <bool key="NSDrawsBackground">YES</bool>
               <object class="NSMutableArray" key="NSSubviews">
                 <bool key="EncodedWithXMLCoder">YES</bool>
-                <reference ref="798772941"/>
+                <reference ref="389526238"/>
               </object>
             </object>
             <object class="NSImageView" id="2913">
@@ -6368,6 +6472,38 @@
           </object>
           <int key="connectionID">1427</int>
         </object>
+        <object class="IBConnectionRecord">
+          <object class="IBActionConnection" key="connection">
+            <string key="label">onCheckButtonChange:</string>
+            <reference key="source" ref="523685185"/>
+            <reference key="destination" ref="232732509"/>
+          </object>
+          <int key="connectionID">1430</int>
+        </object>
+        <object class="IBConnectionRecord">
+          <object class="IBActionConnection" key="connection">
+            <string key="label">onTextFiedChange:</string>
+            <reference key="source" ref="523685185"/>
+            <reference key="destination" ref="566032593"/>
+          </object>
+          <int key="connectionID">1433</int>
+        </object>
+        <object class="IBConnectionRecord">
+          <object class="IBOutletConnection" key="connection">
+            <string key="label">mDarkWake</string>
+            <reference key="source" ref="523685185"/>
+            <reference key="destination" ref="232732509"/>
+          </object>
+          <int key="connectionID">1434</int>
+        </object>
+        <object class="IBConnectionRecord">
+          <object class="IBOutletConnection" key="connection">
+            <string key="label">mDarkWakeText</string>
+            <reference key="source" ref="523685185"/>
+            <reference key="destination" ref="566032593"/>
+          </object>
+          <int key="connectionID">1435</int>
+        </object>
       </object>
       <object class="IBMutableOrderedSet" key="objectRecords">
         <object class="NSArray" key="orderedObjects">
@@ -8044,6 +8180,8 @@
               <reference ref="353259796"/>
               <reference ref="449337560"/>
               <reference ref="344346433"/>
+              <reference ref="232732509"/>
+              <reference ref="566032593"/>
             </object>
             <reference key="parent" ref="683634001"/>
           </object>
@@ -8437,6 +8575,34 @@
             <reference key="object" ref="41430622"/>
             <reference key="parent" ref="1032245036"/>
           </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">1428</int>
+            <reference key="object" ref="232732509"/>
+            <object class="NSMutableArray" key="children">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <reference ref="893682965"/>
+            </object>
+            <reference key="parent" ref="965868050"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">1429</int>
+            <reference key="object" ref="893682965"/>
+            <reference key="parent" ref="232732509"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">1431</int>
+            <reference key="object" ref="566032593"/>
+            <object class="NSMutableArray" key="children">
+              <bool key="EncodedWithXMLCoder">YES</bool>
+              <reference ref="887588379"/>
+            </object>
+            <reference key="parent" ref="965868050"/>
+          </object>
+          <object class="IBObjectRecord">
+            <int key="objectID">1432</int>
+            <reference key="object" ref="887588379"/>
+            <reference key="parent" ref="566032593"/>
+          </object>
         </object>
       </object>
       <object class="NSMutableDictionary" key="flattenedProperties">
@@ -8581,6 +8747,13 @@
           <string>1424.IBPluginDependency</string>
           <string>1424.IBViewBoundsToFrameTransform</string>
           <string>1425.IBPluginDependency</string>
+          <string>1428.IBAttributePlaceholdersKey</string>
+          <string>1428.IBPluginDependency</string>
+          <string>1428.IBViewBoundsToFrameTransform</string>
+          <string>1429.IBPluginDependency</string>
+          <string>1431.IBPluginDependency</string>
+          <string>1431.IBViewBoundsToFrameTransform</string>
+          <string>1432.IBPluginDependency</string>
           <string>158.IBPluginDependency</string>
           <string>160.IBPluginDependency</string>
           <string>172.IBAttributePlaceholdersKey</string>
@@ -8715,6 +8888,7 @@
           <string>562.IBPluginDependency</string>
           <string>563.IBAttributePlaceholdersKey</string>
           <string>563.IBPluginDependency</string>
+          <string>563.IBViewBoundsToFrameTransform</string>
           <string>566.IBPluginDependency</string>
           <string>567.IBPluginDependency</string>
           <string>568.IBPluginDependency</string>
@@ -8791,6 +8965,7 @@
           <string>847.IBPluginDependency</string>
           <string>848.IBPluginDependency</string>
           <string>851.IBPluginDependency</string>
+          <string>851.IBViewBoundsToFrameTransform</string>
           <string>852.IBPluginDependency</string>
           <string>855.IBPluginDependency</string>
           <string>856.IBPluginDependency</string>
@@ -9057,9 +9232,9 @@
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{938, 770}, {668, 439}}</string>
+          <string>{{344, 343}, {668, 439}}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-          <string>{{938, 770}, {668, 439}}</string>
+          <string>{{344, 343}, {668, 439}}</string>
           <boolean value="YES"/>
           <string>{224.66399999999999, 10}</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -9185,8 +9360,26 @@
             <bytes key="NSTransformStruct">P4AAAL+AAABDUQAAwy4AAA</bytes>
           </object>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <object class="NSMutableDictionary">
+            <string key="NS.key.0">ToolTip</string>
+            <object class="IBToolTipAttribute" key="NS.object.0">
+              <string key="name">ToolTip</string>
+              <reference key="object" ref="232732509"/>
+              <string key="toolTip">Force using the sleepimage (default=No)</string>
+            </object>
+          </object>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <object class="NSAffineTransform">
+            <bytes key="NSTransformStruct">P4AAAL+AAABDJgAAwnwAAA</bytes>
+          </object>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <object class="NSAffineTransform">
+            <bytes key="NSTransformStruct">P4AAAL+AAABDvYAAwoYAAA</bytes>
+          </object>
+          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <object class="NSMutableDictionary">
             <string key="NS.key.0">InitialTabViewItem</string>
             <object class="IBInitialTabViewItemAttribute" key="NS.object.0">
@@ -9584,6 +9777,9 @@
             </object>
           </object>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <object class="NSAffineTransform">
+            <bytes key="NSTransformStruct">P4AAAL+AAABDIQAAwogAAA</bytes>
+          </object>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -9753,6 +9949,9 @@
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+          <object class="NSAffineTransform">
+            <bytes key="NSTransformStruct">P4AAAL+AAABCzAAAwyYAAA</bytes>
+          </object>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
           <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -9845,7 +10044,7 @@
         </object>
       </object>
       <nil key="sourceID"/>
-      <int key="maxID">1427</int>
+      <int key="maxID">1435</int>
     </object>
     <object class="IBClassDescriber" key="IBDocument.Classes">
       <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -9928,6 +10127,8 @@
               <string>mDSDTDrop</string>
               <string>mDSDTFile</string>
               <string>mDSDTFileText</string>
+              <string>mDarkWake</string>
+              <string>mDarkWakeText</string>
               <string>mDebug</string>
               <string>mDebugText</string>
               <string>mDeviceRd</string>
@@ -9966,6 +10167,8 @@
               <string>NSButton</string>
               <string>NSComboBox</string>
               <string>NSButton</string>
+              <string>NSComboBox</string>
+              <string>NSButton</string>
               <string>NSTextField</string>
               <string>NSButton</string>
               <string>NSButton</string>
@@ -10001,6 +10204,8 @@
               <string>mDSDTDrop</string>
               <string>mDSDTFile</string>
               <string>mDSDTFileText</string>
+              <string>mDarkWake</string>
+              <string>mDarkWakeText</string>
               <string>mDebug</string>
               <string>mDebugText</string>
               <string>mDeviceRd</string>
@@ -10064,6 +10269,14 @@
                 <string key="candidateClassName">NSTextField</string>
               </object>
               <object class="IBToOneOutletInfo">
+                <string key="name">mDarkWake</string>
+                <string key="candidateClassName">NSButton</string>
+              </object>
+              <object class="IBToOneOutletInfo">
+                <string key="name">mDarkWakeText</string>
+                <string key="candidateClassName">NSComboBox</string>
+              </object>
+              <object class="IBToOneOutletInfo">
                 <string key="name">mDebug</string>
                 <string key="candidateClassName">NSButton</string>
               </object>