Changeset 850

Timestamp:

04/28/08 19:02:43 (4 months ago)

Author:

takkaria

Message:

Commit the latest work on the OS X port by Rowan Beentje:

• Fix #545: add a recent items menu, tracking the last ten savefiles used.
  
• Fix #549: disable the automatic window handling and added manual term tracking, preventing double display of terms in the Window menu
  
• Also remove the "Zoom" menu item from the Windows menu, as it does nothing and the corresponding window button is disabled.
  
• Overhaul the About dialog so that it is generated dynamically, to avoid problems with information becoming out-of-date.
  
• Fix a crash bug. The original cause was that closing the main game window during play followed by a normal quit resulted in pref loading failing an integrity check and aborting early, so prevent that particular bug as well as fixing the crasher.
  
• Clean up code formatting a tad where it was still using multiple spaces.
  

Files:

• trunk/src/main-crb.c (modified) (32 diffs)
• trunk/src/osx/English.lproj/main.nib/classes.nib (modified) (1 diff)
• trunk/src/osx/English.lproj/main.nib/info.nib (modified) (1 diff)
• trunk/src/osx/English.lproj/main.nib/objects.xib (modified) (15 diffs)
• trunk/src/osx/osx_tables.h (modified) (6 diffs)

trunk/src/main-crb.c

@@ -363 +363 @@
-
-/*
+ * A mutable array for Recent Items
+ */ 
+CFMutableArrayRef recentItemsArrayRef = NULL;
+
+/*
- * Support the improved game command handling
- */
@@ -385 +390 @@
-         * First heirarchical call, find and initialize all menu IDs.
-         * Subsequent misses will attempt to update the menuRefs array.
-    
-    
+       
+       
-         *
-         * Invariant: all MenuRefs with ID < MenuID(tmp) have been initialized.
@@ -544 +549 @@
-                }
-                else {
-   
+
-                                                                                kATSUImposeWidthTag };
-                        Fixed advance = (1<<16)*(td->tile_wid - td->font_wid);
@@ -2213 +2218 @@
-
-        /*
+         * Save the recent items array - directly.
+         */
+        CFPreferencesSetAppValue(
+                CFSTR("recent_items"),
+                recentItemsArrayRef,
+                kCFPreferencesCurrentApplication);
+        
+        /*
-         * Make sure preferences are persistent
-         */
@@ -2322 +2335 @@
-
-                load_pref_short(format("term%d.mapped", i), &td->mapped);
+                CheckMenuItem(MyGetMenuHandle(kWindowMenu), kAngbandTerm+i, td->mapped);
-
-                load_pref_short(format("term%d.tile_wid", i), &td->tile_wid);
@@ -2345 +2359 @@
-                }
-        }
+        
+        /*
+         * Load the recent items array, if present, directly
+         */
+        CFArrayRef recentItemsLoaded = (CFArrayRef)CFPreferencesCopyAppValue(
+                CFSTR("recent_items"),
+                kCFPreferencesCurrentApplication);
+        if (recentItemsLoaded != NULL)
+                recentItemsArrayRef = CFArrayCreateMutableCopy(kCFAllocatorDefault, 0, recentItemsLoaded);
-}
-
@@ -2452 +2475 @@
-        /* Main window */
-        Term_activate(td->t);
+}
+
+
+/* Set up the contents of the about dialog */
+static void init_aboutdialogcontent()
+{
+        HIViewRef aboutDialogViewRef;
+        OSStatus err;
+        
+        /* Set the application name from the constants set in defines.h */
+        char *applicationName = format("%s %s", VERSION_NAME, VERSION_STRING);
+        CFStringRef cfstr_applicationName = CFStringCreateWithBytes(NULL, (byte *)applicationName,
+                                                                                strlen(applicationName), kCFStringEncodingASCII, false);
+        HIViewFindByID(HIViewGetRoot(aboutDialog), aboutDialogName, &aboutDialogViewRef);
+        HIViewSetText(aboutDialogViewRef, cfstr_applicationName);
+        
+        /* Set the application copyright as set up in variable.c */
+        HIViewFindByID(HIViewGetRoot(aboutDialog), aboutDialogCopyright, &aboutDialogViewRef);
+        CFStringRef cfstr_applicationCopyright = CFStringCreateWithBytes(NULL, (byte *)copyright,
+                                                                                strlen(copyright), kCFStringEncodingASCII, false);
+        HIViewSetText(aboutDialogViewRef, cfstr_applicationCopyright);
+
+        /* Use a small font for the copyright text */
+        TXNObject txnObject = HITextViewGetTXNObject(aboutDialogViewRef);
+        TXNTypeAttributes typeAttr[1];
+        typeAttr[0].tag = kTXNQDFontSizeAttribute;
+        typeAttr[0].size = kTXNFontSizeAttributeSize;
+        typeAttr[0].data.dataValue = FloatToFixed(10);
+        err = TXNSetTypeAttributes(txnObject, 1, typeAttr, kTXNStartOffset, kTXNEndOffset);
+
+        /* Get the application icon and draw it */
+        ProcessSerialNumber psn = { 0, kCurrentProcess };
+        ControlRef iconControl;
+        FSRef ref;
+        FSSpec appSpec;
+        IconRef iconRef;
+        ControlButtonContentInfo cInfo;
+
+        err = GetProcessBundleLocation(&psn, &ref);
+        if(err == noErr)
+                err = FSGetCatalogInfo(&ref, kFSCatInfoNone, NULL, NULL, &appSpec, NULL);
+        if( err == noErr )
+                err = GetIconRefFromFile((const FSSpec *)&appSpec, &iconRef, nil);
+        if(err == noErr)
+                err = GetControlByID(aboutDialog, &aboutDialogIcon, &iconControl);
+        if( err == noErr )
+        {
+                cInfo.contentType = kControlContentIconRef;
+                cInfo.u.iconRef = iconRef;
+                err = SetControlData(iconControl, 0, kControlIconContentTag, sizeof(cInfo), (Ptr)&cInfo);
+        }
-}
-
@@ -2588 +2662 @@
-                quit("Cannot prepare menu bar!");
-
+        /* Load the about dialog and set its contents */
-        (void) CreateWindowFromNib(nib, CFSTR("DLOG:about"), &aboutDialog);
+        init_aboutdialogcontent();
-
-        DisposeNibReference(nib);
@@ -2670 +2746 @@
-        MenuHandle m;
-
-game_in_progress
+cmd.command != CMD_NULL
-                EnableAllMenuItems(MyGetMenuHandle(kSpecialMenu));
-                EnableAllMenuItems(MyGetMenuHandle(kStyleMenu));
@@ -2692 +2768 @@
-
-        m = MyGetMenuHandle(kFileMenu);
-
+
+
-                EnableMenuItem(MyGetMenuHandle(kFileMenu), kSave);
-        }
-
+
+
-                DisableMenuItem(MyGetMenuHandle(kFileMenu), kSave);
-        }
-        for(int i = kNew; i <= kImport; i++) {
-                if(cmd.command == CMD_NULL) 
-                        EnableMenuItem(MyGetMenuHandle(kFileMenu), i);
-                else
-                        DisableMenuItem(MyGetMenuHandle(kFileMenu), i);
-        }
-
@@ -2709 +2781 @@
-                CheckMenuItem(m, toggle_defs[i].menuItem, *(toggle_defs[i].var));
-        }
+        
+        /* Populate the recent items menu */
+        DeleteMenuItems(MyGetMenuHandle(kOpenRecentMenu), 1, CountMenuItems(MyGetMenuHandle(kOpenRecentMenu)));
+        if (!recentItemsArrayRef || CFArrayGetCount(recentItemsArrayRef) == 0)
+        {
+                AppendMenuItemTextWithCFString(MyGetMenuHandle(kOpenRecentMenu), CFSTR("No recent items"), kMenuItemAttrDisabled, kOpenRecentMenu, NULL);
+        }
+        else
+        {
+                for (int i = 0; i < CFArrayGetCount(recentItemsArrayRef); i++)
+                {
+                        OSErr err;
+                        FSRef recentFileRef;
+                        CFDataRef recentFileData;
+                        Boolean updateAlias = FALSE;
+
+                        recentFileData = CFArrayGetValueAtIndex(recentItemsArrayRef, i);
+                        if (CFDataGetTypeID() != CFGetTypeID(recentFileData)) continue;
+                        AliasHandle recentFileAlias = (AliasHandle)NewHandle(CFDataGetLength(recentFileData));
+                        CFDataGetBytes(recentFileData, CFRangeMake(0, CFDataGetLength(recentFileData)), (UInt8 *) *recentFileAlias);
+                        
+                        err = FSResolveAlias(NULL, recentFileAlias, &recentFileRef, &updateAlias);
+                        if (err != noErr) continue;
+                        
+                        HFSUniStr255 recentFileName;
+                        err = FSGetCatalogInfo(&recentFileRef, kFSCatInfoNone, NULL, &recentFileName, NULL, NULL);
+                        if (err != noErr) continue;
+                        
+                        CFStringRef cfstr = CFStringCreateWithCharacters(kCFAllocatorDefault, recentFileName.unicode, recentFileName.length);
+                        AppendMenuItemTextWithCFString(MyGetMenuHandle(kOpenRecentMenu), cfstr, 0, i, NULL);
+                }
+                AppendMenuItemTextWithCFString(MyGetMenuHandle(kOpenRecentMenu), CFSTR("-"), kMenuItemAttrSeparator, -1, NULL);
+                AppendMenuItemTextWithCFString(MyGetMenuHandle(kOpenRecentMenu), CFSTR("Clear menu"), 0, -1, NULL);
+        }
-}
-
@@ -2718 +2824 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-static OSStatus AngbandGame(EventHandlerCallRef inCallRef,
-                                                        EventRef inEvent, void *inUserData )
-{
-/ Only enabled options are Fonts, Open/New/Import and Quit. 
+* Only enabled options are Fonts, Open/New/Import and Quit. */
-        DisableAllMenuItems(MyGetMenuHandle(kTileWidMenu));
-        DisableAllMenuItems(MyGetMenuHandle(kTileHgtMenu));
@@ -2754 +2955 @@
-{
-        /* If a game is in progress, do not proceed */
-game_in_progress
+cmd.command != CMD_NULL
-
-        /* Let the player to choose savefile */
@@ -2762 +2963 @@
-                return noErr;
-        }
+
+        /* Disable the file-handling options in the file menu */
+        for(int i = kNew; i <= kImport; i++)
+                DisableMenuItem(MyGetMenuHandle(kFileMenu), i);
-
-        /* Wait for a keypress */
@@ -2772 +2977 @@
-                cmd.command = CMD_LOADFILE;
-                
-        /* Game is in progress */
-        game_in_progress = TRUE;
-
-        /* Disable the file-handling options in the file menu */
-        for(int i = kNew; i <= kImport; i++)
-                DisableMenuItem(MyGetMenuHandle(kFileMenu), i);
-        
-        return noErr;
-}
@@ -2802 +3000 @@
-                }
-        }
-
-Bit of a hack, we'll do this when we leave the INIT context in futur
+       
+A game is starting - update status and tracking as appropriat
-        game_in_progress = TRUE; 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return cmd; 
-} 
@@ -2850 +3061 @@
-                }
-                CFStringRef tags[] = {CFSTR("Show Fonts"), CFSTR("Hide Fonts")};
-        
+               
-                SetMenuItemTextWithCFString(command.menu.menuRef, kFonts,
-                                                                                        tags[FPIsFontPanelVisible()] );
@@ -2877 +3088 @@
-
-        /* Track the go-away box */
-
+ && td != &data[0]
-        {
-                /* Not Mapped */
@@ -2890 +3101 @@
-                                                kWindowHideTransitionAction,
-                                                NULL);
+
+                /* Update the menu status */
+                CheckMenuItem(MyGetMenuHandle(kWindowMenu), kAngbandTerm+(td - &data[0]), FALSE);
-        }
-        return noErr;
@@ -3071 +3285 @@
-        SelectWindow(td->w);
-
+        /* Update menu states */
+        if (td == &data[0] && cmd.command != CMD_NULL)
+                DisableMenuItem(MyGetMenuHandle(kFileMenu), kClose);
+        else
+                EnableMenuItem(MyGetMenuHandle(kFileMenu), kClose);
+        
-        return noErr;
-}
@@ -3104 +3324 @@
-                                kWindowShowTransitionAction,
-                                NULL);
+
+        /* Update the menu status */
+        CheckMenuItem(MyGetMenuHandle(kWindowMenu), kAngbandTerm+i, TRUE);
-
-        term_data_check_font(td);
@@ -3286 +3509 @@
-
-static OSStatus MouseCommand ( EventHandlerCallRef inCallRef,
-    
+       
-{
-        WindowRef w = 0;
@@ -3325 +3548 @@
-
-static OSStatus KeyboardCommand ( EventHandlerCallRef inCallRef,
-    
+       
-{
-
@@ -3407 +3630 @@
-
-static OSStatus PrintCommand(EventHandlerCallRef inCallRef, EventRef inEvent,
-    
+       
-{
-        mac_warning((const char*) inUserData);
@@ -3415 +3638 @@
-/* About angband... */
-static OSStatus AboutCommand(EventHandlerCallRef inCallRef, EventRef inEvent,
-    
+       
-{
-        HICommand command;
@@ -3486 +3709 @@
-
-        /* If a game is in progress, do not proceed */
-game_in_progress
+cmd.command != CMD_NULL
-        
-        /* Put the direct parameter (a descriptor list) into a docList */
@@ -3510 +3733 @@
-                        (void)spec_to_path(&myFSS, savefile, sizeof(savefile));
-                        cmd.command = CMD_LOADFILE;
-
+
-                        break;
-                }
@@ -3693 +3916 @@
-        cleanup_sound();
-
+        /* Update the Recent Items list - inserts newly created characters */
+        if (savefile[0])
+                updateRecentItems(savefile);
-
-        /* Dispose of graphic tiles */
@@ -3755 +3981 @@
-        (void)Gestalt(gestaltSystemVersion, &mac_os_version);
-
-
-
-        /* Hooks in some "z-util.c" hooks */
-        plog_aux = hook_plog;
@@ -3767 +3991 @@
-        SetCursor(*(GetCursor(watchCursor)));
-
-
+
+
+
-        /* Prepare the menubar */
-        init_menubar();
@@ -3777 +4003 @@
-        init_windows();
-
-    
-    
-        
-        
-        
-        
-        
+       
+       
+               
+               
+               
+               
+               
-
-        /* Install menu and application handlers */
@@ -3826 +4052 @@
-        /* Start playing! */
-        EventRef newGameEvent = nil;
-    
+
-                                                                        kEventAttributeNone, &newGameEvent ); 
-        PostEventToQueue(GetMainEventQueue(), newGameEvent, kEventPriorityLow);

trunk/src/osx/English.lproj/main.nib/classes.nib

@@ -1 @@
-
-
-
-
+
+
+
+
+
+
+
+

trunk/src/osx/English.lproj/main.nib/info.nib

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
- Computer
+
-<plist version="1.0">
-<dict>
-        <key>IBDocumentLocation</key>
-        <string>81 68 356 240 0 0 1280 832 </string>
-        <key>IBEditorPositions</key>
-        <dict>
-                <key>29</key>
-                <string>75 721 402 44 0 0 1280 832 </string>
-        </dict>
-        <key>IBFramework Version</key>
-446.1
+644
-        <key>IBOldestOS</key>
-        <integer>3</integer>
-        <key>IBOpenObjects</key>
-        <array>
-29
+325
-        </array>
-        <key>IBSystem Version</key>
-8L127
+9C7010
-        <key>targetFramework</key>
-        <string>IBCarbonFramework</string>

trunk/src/osx/English.lproj/main.nib/objects.xib

@@ -1 +1 @@
-<?xml version="1.0" standalone="yes"?>
-<object class="NSIBObjectData">
-  <string name="targetFramework">IBCarbonFramework</string>
-  <object name="rootObject" class="NSCustomObject" id="1">
-    <string name="customClass">NSApplication</string>
-  </object>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    <object class="IBCarbonMenu" id="29">
-      <string name="title">main</string>
+      <string name="name">_NSMainMenu</string>
-      <array count="6" name="items">
-        <object class="IBCarbonMenuItem" id="185">
+          <string name="title">Angband</string>
-          <boolean name="updateSingleItem">TRUE</boolean>
-          <string name="title">Angband</string>
-          <object name="submenu" class="IBCarbonMenu" id="184">
-            <string name="title">Angband</string>
-            <int name="menuID">100</int>
+            <string name="name">_NSAppleMenu</string>
-            <array count="1" name="items">
-              <object class="IBCarbonMenuItem" id="187">
@@ -22 +143 @@
-              </object>
-            </array>
-            <string name="name">_NSAppleMenu</string>
-          </object>
-        </object>
-        <object class="IBCarbonMenuItem" id="127">
+          <string name="title">File</string>
-          <boolean name="updateSingleItem">TRUE</boolean>
-          <string name="title">File</string>
-          <object name="submenu" class="IBCarbonMenu" id="131">
-            <string name="title">File</string>
-            <int name="menuID">101</int>
-9
+10
-              <object class="IBCarbonMenuItem" id="139">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">New</string>
-                <string name="keyEquivalent">n</string>
+                <boolean name="updateSingleItem">TRUE</boolean>
-                <ostype name="command">open</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="134">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Open
</string>
-                <string name="keyEquivalent">o</string>
+                <boolean name="updateSingleItem">TRUE</boolean>
-                <ostype name="command">open</ostype>
-              </object>
+              <reference idRef="338"/>
-              <object class="IBCarbonMenuItem" id="200">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Import...</string>
-                <string name="keyEquivalent">i</string>
+                <boolean name="updateSingleItem">TRUE</boolean>
-                <ostype name="command">open</ostype>
-              </object>
@@ -54 +175 @@
-              </object>
-              <object class="IBCarbonMenuItem" id="138">
-                <boolean name="disabled">TRUE</boolean>
-                <string name="title">Save</string>
-                <string name="keyEquivalent">s</string>
+                <boolean name="disabled">TRUE</boolean>
-                <ostype name="command">save</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="245">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Close</string>
-                <string name="keyEquivalent">w</string>
+                <boolean name="updateSingleItem">TRUE</boolean>
-                <ostype name="command">clos</ostype>
-              </object>
@@ -69 +190 @@
-              </object>
-              <object class="IBCarbonMenuItem" id="135">
-                <boolean name="disabled">TRUE</boolean>
-                <string name="title">Page Setup
</string>
-                <string name="keyEquivalent">P</string>
+                <boolean name="disabled">TRUE</boolean>
-                <ostype name="command">page</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="136">
-                <boolean name="disabled">TRUE</boolean>
-                <string name="title">Print
</string>
-                <string name="keyEquivalent">p</string>
+                <boolean name="disabled">TRUE</boolean>
-                <ostype name="command">prnt</ostype>
-              </object>
@@ -84 +205 @@
-        </object>
-        <object class="IBCarbonMenuItem" id="152">
+          <string name="title">Edit</string>
-          <boolean name="updateSingleItem">TRUE</boolean>
-          <string name="title">Edit</string>
-          <object name="submenu" class="IBCarbonMenu" id="147">
-            <string name="title">Edit</string>
@@ -91 +212 @@
-            <array count="3" name="items">
-              <object class="IBCarbonMenuItem" id="149">
-                <boolean name="disabled">TRUE</boolean>
-                <string name="title">Copy</string>
-                <string name="keyEquivalent">c</string>
+                <boolean name="disabled">TRUE</boolean>
-                <ostype name="command">copy</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="148">
-                <boolean name="disabled">TRUE</boolean>
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Select All</string>
-                <string name="keyEquivalent">a</string>
+                <boolean name="disabled">TRUE</boolean>
+                <boolean name="updateSingleItem">TRUE</boolean>
-                <ostype name="command">sall</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="316">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Undo</string>
-                <string name="keyEquivalent">z</string>
+                <boolean name="updateSingleItem">TRUE</boolean>
-                <ostype name="command">undo</ostype>
-              </object>
@@ -113 +234 @@
-        </object>
-        <object class="IBCarbonMenuItem" id="217">
+          <string name="title">Appearance</string>
-          <boolean name="autoDisable">TRUE</boolean>
-          <boolean name="updateSingleItem">TRUE</boolean>
-          <string name="title">Appearance</string>
-          <object name="submenu" class="IBCarbonMenu" id="215">
-            <string name="title">Appearance</string>
-            <int name="menuID">103</int>
+            <boolean name="autoDisable">TRUE</boolean>
-            <array count="13" name="items">
-              <object class="IBCarbonMenuItem" id="297">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Show Fonts</string>
-                <string name="keyEquivalent">t</string>
+                <boolean name="updateSingleItem">TRUE</boolean>
-                <ostype name="command">font</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="317">
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">Antialias</string>
+                <boolean name="updateSingleItem">TRUE</boolean>
-              </object>
-              <object class="IBCarbonMenuItem" id="305">
@@ -135 +257 @@
-              </object>
-              <object class="IBCarbonMenuItem" id="306">
+                <string name="title">ASCII Graphics</string>
-                <boolean name="checked">TRUE</boolean>
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">ASCII Graphics</string>
-                <ostype name="command">graf</ostype>
-              </object>
-              <object class="IBCarbonMenuItem" id="304">
-                <boolean name="disabled">TRUE</boolean>
-                <boolean name="updateSingleItem">TRUE</boolean>
-                <string name="title">    8x8 Tiles</string>
+                <boolean name="disabled">TRUE</boolean>
+                <boolean name="updateSingleItem">TRUE</boolean>
-                <ostype name="command">graf</ostype>
-&nb