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

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

Revision: 504
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=504&view=rev
Author:   fredm
Date:     2008-04-08 06:31:05 -0700 (Tue, 08 Apr 2008)

Log Message:
-----------
Add 4x and 5x zoom options for those with big screens.

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

Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
===================================================================
--- trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib	2008-04-08 12:08:25 UTC (rev 503)
+++ trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib	2008-04-08 13:31:05 UTC (rev 504)
@@ -13,8 +13,8 @@
 	<string>489.0</string>
 	<key>IBOpenObjects</key>
 	<array>
+		<integer>29</integer>
 		<integer>877</integer>
-		<integer>29</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>9C7010</string>

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

Modified: trunk/fuse/fusepb/views/DisplayOpenGLView.m
===================================================================
--- trunk/fuse/fusepb/views/DisplayOpenGLView.m	2008-04-08 12:08:25 UTC (rev 503)
+++ trunk/fuse/fusepb/views/DisplayOpenGLView.m	2008-04-08 13:31:05 UTC (rev 504)
@@ -43,6 +43,8 @@
 #define QZ_1 0x12
 #define QZ_2 0x13
 #define QZ_3 0x14
+#define QZ_4 0x15
+#define QZ_5 0x16
 #define QZ_m 0x2E
 
 const void *
@@ -136,6 +138,16 @@
     size.height = 720;
     [[FuseController singleton] releaseCmdKeys:@"3":QZ_3];
     break;
+  case 4: /* 1280x960 */
+    size.width = 1280;
+    size.height = 960;
+    [[FuseController singleton] releaseCmdKeys:@"4":QZ_4];
+    break;
+  case 5: /* 1600x1200 */
+    size.width = 1600;
+    size.height = 1200;
+    [[FuseController singleton] releaseCmdKeys:@"5":QZ_5];
+    break;
   case 0:
   default: /* Actual size */
     size.width = screenTex[0].image_width;
@@ -175,6 +187,9 @@
     self = [super initWithFrame:frameRect pixelFormat:pixFmt];
     instance = self;
 
+    buffered_screen_lock = [[NSLock alloc] init];
+    [buffered_screen_lock retain];
+
     real_emulator = [[Emulator alloc] init];
   }
 
@@ -287,6 +302,7 @@
   greenDisk = nil;
 
   [buffered_screen_lock release];
+  buffered_screen_lock = nil;
 
   [self release];
 }
@@ -394,8 +410,7 @@
 
   [view_lock lock];
   [buffered_screen_lock lock];
-  if( NO == screenTexInitialised ||
-      ( 0 == buffered_screen.dirty->count && NO == statusbar_updated ) ) {
+  if( NO == screenTexInitialised ) {
     [buffered_screen_lock unlock];
     [view_lock unlock];
     return;


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