[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx: [470] trunk/fuse/fusepb

[<fr...@us...>]

Revision: 470
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=470&view=rev
Author:   fredm
Date:     2008-02-13 04:54:53 -0800 (Wed, 13 Feb 2008)

Log Message:
-----------
Fix the blocked keyboard from Command-q (quit), Command-h (hide) and Command-m
(minimise) (fixes bug #1842577).

Modified Paths:
--------------
    trunk/fuse/fusepb/controllers/FuseController.h
    trunk/fuse/fusepb/controllers/FuseController.m
    trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
    trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
    trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
    trunk/fuse/fusepb/views/DisplayOpenGLView.h
    trunk/fuse/fusepb/views/DisplayOpenGLView.m

Modified: trunk/fuse/fusepb/controllers/FuseController.h
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.h	2008-02-11 12:16:49 UTC (rev 469)
+++ trunk/fuse/fusepb/controllers/FuseController.h	2008-02-13 12:54:53 UTC (rev 470)
@@ -119,6 +119,10 @@
 - (IBAction)tape_write:(id)sender;
 - (IBAction)tape_record:(id)sender;
 
+- (IBAction)quit:(id)sender;
+- (IBAction)hide:(id)sender;
+- (IBAction)help:(id)sender;
+
 - (IBAction)showRollbackPane:(id)sender;
 - (IBAction)showTapeBrowserPane:(id)sender;
 - (IBAction)showKeyboardPane:(id)sender;

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2008-02-11 12:16:49 UTC (rev 469)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2008-02-13 12:54:53 UTC (rev 470)
@@ -127,10 +127,13 @@
 };
 
 #define QZ_s      0x01
+#define QZ_h      0x04
 #define QZ_z      0x06
 #define QZ_b      0x0B
+#define QZ_q      0x0C
 #define QZ_o      0x1F
 #define QZ_p      0x23
+#define QZ_SLASH  0x2C
 #define QZ_PERIOD 0x2F
 
 @implementation FuseController
@@ -794,6 +797,24 @@
   [[DisplayOpenGLView instance] tapeToggleRecord];
 }
 
+- (IBAction)quit:(id)sender
+{
+  [[NSApp keyWindow] performClose:self];
+  [self releaseCmdKeys:@"q":QZ_q];
+}
+
+- (IBAction)hide:(id)sender
+{
+  [NSApp hide:self];
+  [self releaseCmdKeys:@"h":QZ_h];
+}
+
+- (IBAction)help:(id)sender
+{
+  [NSApp showHelp:self];
+  [self releaseCmdKeys:@"?":QZ_SLASH];
+}
+
 - (IBAction)cocoa_break:(id)sender
 {
   [[DisplayOpenGLView instance] cocoaBreak];

Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
===================================================================
--- trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib	2008-02-11 12:16:49 UTC (rev 469)
+++ trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib	2008-02-13 12:54:53 UTC (rev 470)
@@ -28,6 +28,8 @@
                 "export_screen" = id;
                 fullscreen = id;
                 "hard_reset" = id;
+                help = id;
+                hide = id;
                 "ide_commit" = id;
                 "ide_eject" = id;
                 "ide_insert" = id;
@@ -47,6 +49,7 @@
                 "profiler_stop" = id;
                 "psg_start" = id;
                 "psg_stop" = id;
+                quit = id;
                 reset = id;
                 resetUserDefaults = id;
                 "rzx_insert_snap" = id;

Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
===================================================================
--- trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib	2008-02-11 12:16:49 UTC (rev 469)
+++ trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib	2008-02-13 12:54:53 UTC (rev 470)
@@ -13,10 +13,10 @@
 	<string>489.0</string>
 	<key>IBOpenObjects</key>
 	<array>
+		<integer>877</integer>
 		<integer>29</integer>
-		<integer>877</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>9B18</string>
+	<string>9C31</string>
 </dict>
 </plist>

Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.h
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.h	2008-02-11 12:16:49 UTC (rev 469)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.h	2008-02-13 12:54:53 UTC (rev 470)
@@ -222,6 +222,7 @@
 
 -(CVReturn) displayFrame:(const CVTimeStamp *)timeStamp;
 -(void) windowChangedScreen:(NSNotification*)inNotification;
+-(void) windowDidDeminiaturize:(NSNotification *)inNotification;
 
 -(void) displayLinkStop;
 -(void) displayLinkStart;

Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m	2008-02-11 12:16:49 UTC (rev 469)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m	2008-02-13 12:54:53 UTC (rev 470)
@@ -43,6 +43,7 @@
 #define QZ_1 0x12
 #define QZ_2 0x13
 #define QZ_3 0x14
+#define QZ_m 0x2E
 
 const void *
 get_byte_pointer(void *bitmap)
@@ -1210,6 +1211,11 @@
   }
 }
 
+-(void) windowDidDeminiaturize:(NSNotification *)inNotification
+{
+  [[FuseController singleton] releaseCmdKeys:@"m":QZ_m];
+}
+
 -(void) displayLinkStop
 {
   if( displayLinkRunning == YES ) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.