Changeset 9
- Timestamp:
- 03/24/07 19:48:30 (2 years ago)
- Files:
-
- trunk/src/main-crb.c (modified) (20 diffs)
- trunk/src/osx/English.lproj/main.nib/info.nib (modified) (1 diff)
- trunk/src/osx/English.lproj/main.nib/objects.xib (modified) (6 diffs)
- trunk/src/osx/osx_tables.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/src/main-crb.c
r1 r9 290 290 static GlyphInfo glyph_data[MAX_TERM_DATA+1]; 291 291 292 static WindowRef aboutDialog; 292 293 293 294 … … 429 430 430 431 /* Convert pathname to FSRef ... */ 431 err = FSPathMakeRef( path, &ref, NULL);432 err = FSPathMakeRef((byte*) path, &ref, NULL); 432 433 if (err != noErr) return (err); 433 434 … … 454 455 455 456 /* ... then FSRef to pathname */ 456 err = FSRefMakePath(&ref, buf, size);457 err = FSRefMakePath(&ref, (byte*)buf, size); 457 458 458 459 /* Inform caller of success or failure */ … … 706 707 ATSUSetRunStyle(info->layout, info->style, 0, 1); 707 708 708 ByteCount oCount ;709 ByteCount oCount = 0; 709 710 FontNameCode oCode; 710 ATSUGetIndFontName(fid, 6, sizeof(info->psname), info->psname,711 err = ATSUGetIndFontName(fid, 6, sizeof(info->psname), info->psname, 711 712 &oCount, &oCode, 0, 0, 0); 712 713 714 require_noerr(err, CantInitialize); 715 if(oCount == 0 || strlen(info->psname) == 0) 716 goto CantInitialize; 717 718 info->psname[oCount] = 0; 713 719 // Is font mono-space? 714 720 err = ATSUCreateTextLayout(&info->layout); … … 753 759 754 760 info->refcount++; 755 756 761 return info; 757 762 … … 793 798 { 794 799 GlyphInfo *info = get_glyph_info(td->font_id, td->font_size); 795 if( info) {796 release_glyph_info(td->ginfo); 797 td->ginfo = info;798 }800 if(!info) return; 801 802 release_glyph_info(td->ginfo); 803 td->ginfo = info; 799 804 800 805 td->font_wid = (info->font_wid +.999); … … 885 890 {td->cols * td->tile_wid, td->rows * td->tile_hgt}}; 886 891 887 /* Assume no graphics */892 /* Assume no graphics, monospace */ 888 893 td->t->higher_pict = FALSE; 889 894 td->t->always_pict = FALSE; … … 891 896 892 897 /* Handle graphics */ 893 if (td->ginfo->monospace) td->t->higher_pict = TRUE; 898 if (!td->ginfo->monospace) { 899 /* Draw every character */ 900 td->t->always_pict = TRUE; 901 } 894 902 else if (use_graphics && (td == &data[0])) 895 903 { 896 904 /* Use higher pict whenever possible */ 897 if (td->ginfo->monospace) td->t->higher_pict = TRUE; 898 899 /* Use always_pict only when necessary */ 900 else td->t->always_pict = TRUE; 905 td->t->higher_pict = TRUE; 901 906 } 902 907 … … 2034 2039 2035 2040 /* Get the URL in the file system's native string representation */ 2036 success = CFURLGetFileSystemRepresentation(main_url, TRUE, buf, size);2041 success = CFURLGetFileSystemRepresentation(main_url, TRUE, (byte*)buf, size); 2037 2042 2038 2043 /* Free the url */ … … 2520 2525 quit("Cannot prepare menu bar!"); 2521 2526 2527 (void) CreateWindowFromNib(nib, CFSTR("DLOG:about"), &aboutDialog); 2528 2522 2529 DisposeNibReference(nib); 2523 2530 … … 2537 2544 /* Tile size */ 2538 2545 strnfmt((char*)buf, 15, "%d", i); 2539 CFStringRef cfstr = CFStringCreateWithBytes ( NULL, buf,2546 CFStringRef cfstr = CFStringCreateWithBytes ( NULL, (byte*) buf, 2540 2547 strlen(buf), kCFStringEncodingASCII, false); 2541 2548 AppendMenuItemTextWithCFString(m, cfstr, 0, j, NULL); … … 2661 2668 prt("[Choose 'New', 'Open' or 'Import' from the 'File' menu]", 23, 11); 2662 2669 2670 SetFontInfoForSelection(kFontSelectionATSUIType, 0, 0, 0); 2671 2663 2672 for(int i = kNew; i <= kImport; i++) 2664 2673 EnableMenuItem(MyGetMenuHandle(kFileMenu), i); … … 2669 2678 RevalidateGraphics(&data[i], 0); 2670 2679 } 2671 2680 2672 2681 /* Flush the prompt */ 2673 2682 Term_fresh(); … … 3025 3034 command.commandID = 0; 3026 3035 command.menu.menuRef = 0; 3027 int menuID = 0;3028 3036 if(inEvent) { 3029 3037 GetEventParameter( inEvent, kEventParamDirectObject, typeHICommand, … … 3032 3040 3033 3041 // Only rescale graphics when absolutely necessary. 3034 if(command.commandID == 'graf') 3035 menuID = GetMenuID(command.menu.menuRef); 3036 if((menuID != kTileWidMenu || menuID != kTileHgtMenu)) 3042 if(command.commandID != kTileWidMenu && command.commandID != kTileHgtMenu) 3037 3043 { 3038 3044 // Reset tilesize to default when graphics change. … … 3163 3169 typeATSUFontID, NULL, sizeof(fid), NULL, &fid); 3164 3170 3171 if(size > 32*(1<<16)) size = 32*(1<<16); 3165 3172 float fsize = 1.0*size/(1<<16); 3166 3173 FontChanged(fid, fsize); … … 3180 3187 return noErr; 3181 3188 } 3182 else if( type== 'font' && type == kEventFontPanelClosed) {3183 SetMenuItemTextWithCFString(GetMenuHandle( 102), 3, CFSTR("Show Fonts"));3189 else if(class == 'font' && type == kEventFontPanelClosed) { 3190 SetMenuItemTextWithCFString(GetMenuHandle(kStyleMenu), kFonts, CFSTR("Show Fonts")); 3184 3191 return noErr; 3185 3192 } … … 3223 3230 p.y -= (td->r.top + 21); 3224 3231 3225 3226 3232 Term_mousepress(p.x/td->tile_wid, p.y/td->tile_hgt, button); 3227 3233 … … 3313 3319 } 3314 3320 3321 /* About angband... */ 3315 3322 static OSStatus AboutCommand(EventHandlerCallRef inCallRef, EventRef inEvent, 3316 3323 void *inUserData ) … … 3324 3331 return eventNotHandledErr; 3325 3332 3326 /* About angband... */3327 DialogPtr dialog;3328 short item_hit;3329 3330 /* Get the about dialogue */3331 dialog = GetNewDialog(128, 0, (WindowRef)-1);3332 3333 3333 /* Move it to the middle of the screen */ 3334 RepositionWindow( GetDialogWindow(dialog),NULL, kWindowCenterOnMainScreen);3334 RepositionWindow(aboutDialog, NULL, kWindowCenterOnMainScreen); 3335 3335 3336 3336 /* Show the dialog */ 3337 TransitionWindow( GetDialogWindow(dialog),3337 TransitionWindow(aboutDialog, 3338 3338 kWindowZoomTransitionEffect, 3339 3339 kWindowShowTransitionAction, 3340 3340 NULL); 3341 3341 3342 /* wait for user to click on it */ 3343 ModalDialog(0, &item_hit); 3344 3345 /* Free the dialogue */ 3346 DisposeDialog(dialog); 3342 /* wait for user input */ 3343 for(;;) { 3344 EventTargetRef target = GetEventDispatcherTarget(); 3345 EventRef event; 3346 OSStatus err = ReceiveNextEvent(0, 0, kEventDurationForever, true, &event); 3347 EventClass evc = GetEventClass(event); 3348 EventType evt = GetEventKind(event); 3349 if(err == noErr) { 3350 SendEventToEventTarget (event, target); 3351 ReleaseEvent(event); 3352 } 3353 if(evc == 'keyb' || (evc == 'mous' && evt == kEventMouseDown)) 3354 break; 3355 } 3356 3357 /* Hide the dialogue */ 3358 TransitionWindow(aboutDialog, 3359 kWindowZoomTransitionEffect, 3360 kWindowHideTransitionAction, 3361 NULL); 3362 3347 3363 return noErr; 3348 3364 } trunk/src/osx/English.lproj/main.nib/info.nib
r1 r9 4 4 <dict> 5 5 <key>IBDocumentLocation</key> 6 <string> 139 131356 240 0 0 1280 832 </string>6 <string>81 68 356 240 0 0 1280 832 </string> 7 7 <key>IBEditorPositions</key> 8 8 <dict> 9 9 <key>29</key> 10 <string> 291 788 42144 0 0 1280 832 </string>10 <string>75 721 402 44 0 0 1280 832 </string> 11 11 </dict> 12 12 <key>IBFramework Version</key> 13 13 <string>446.1</string> 14 14 <key>IBOldestOS</key> 15 <integer> 2</integer>15 <integer>3</integer> 16 16 <key>IBOpenObjects</key> 17 17 <array> trunk/src/osx/English.lproj/main.nib/objects.xib
r1 r9 5 5 <string name="customClass">NSApplication</string> 6 6 </object> 7 <array count="7 6" name="allObjects">7 <array count="73" name="allObjects"> 8 8 <object class="IBCarbonMenu" id="29"> 9 9 <string name="title">main</string> … … 123 123 <boolean name="updateSingleItem">TRUE</boolean> 124 124 <string name="title">Show Fonts</string> 125 <string name="keyEquivalent"> g</string>125 <string name="keyEquivalent">t</string> 126 126 <ostype name="command">font</ostype> 127 127 </object> … … 291 291 </array> 292 292 <string name="name">_NSWindowsMenu</string> 293 <boolean name="excludesMarkColumn">TRUE</boolean>294 293 </object> 295 294 </object> … … 367 366 <reference idRef="244"/> 368 367 <reference idRef="245"/> 369 <object class="IBCarbonStaticText" id="282">370 <string name="bounds">154 114 170 195 </string>371 <string name="viewFrame">114 154 81 16 </string>372 <int name="controlID">9</int>373 <boolean name="enabled">FALSE</boolean>374 <string name="title">Ben Harrison</string>375 </object>376 <object class="IBCarbonStaticText" id="283">377 <string name="bounds">6 96 23 213 </string>378 <string name="viewFrame">96 6 117 17 </string>379 <int name="controlID">2</int>380 <boolean name="enabled">FALSE</boolean>381 <string name="title">Angband 3.0.7</string>382 </object>383 <object class="IBCarbonUserPane" id="284">384 <string name="bounds">-4 0 243 308 </string>385 <string name="viewFrame">0 -4 308 247 </string>386 <int name="controlID">1</int>387 <ostype name="command">abou</ostype>388 <boolean name="layoutSuspended">TRUE</boolean>389 <int name="featureBits">16</int>390 </object>391 <object class="IBCarbonStaticText" id="285">392 <string name="bounds">105 85 121 223 </string>393 <string name="viewFrame">85 105 138 16 </string>394 <int name="controlID">6</int>395 <boolean name="enabled">FALSE</boolean>396 <string name="title">Original Copyright by</string>397 </object>398 <object class="IBCarbonStaticText" id="286">399 <string name="bounds">38 94 54 214 </string>400 <string name="viewFrame">94 38 120 16 </string>401 <int name="controlID">3</int>402 <boolean name="enabled">FALSE</boolean>403 <string name="title">Copyright (c) 2006</string>404 </object>405 <object class="IBCarbonStaticText" id="287">406 <string name="bounds">57 109 73 199 </string>407 <string name="viewFrame">109 57 90 16 </string>408 <int name="controlID">4</int>409 <boolean name="enabled">FALSE</boolean>410 <string name="title">Andrew Doull</string>411 </object>412 <object class="IBCarbonWindow" id="288">413 <string name="windowRect">126 334 369 642 </string>414 <string name="title"></string>415 <object name="rootControl" class="IBCarbonRootControl" id="290">416 <string name="bounds">0 0 243 308 </string>417 <string name="viewFrame">0 0 308 243 </string>418 <array count="12" name="subviews">419 <reference idRef="284"/>420 <reference idRef="283"/>421 <reference idRef="286"/>422 <reference idRef="287"/>423 <object class="IBCarbonStaticText" id="289">424 <string name="bounds">71 71 87 238 </string>425 <string name="viewFrame">71 71 167 16 </string>426 <int name="controlID">5</int>427 <boolean name="enabled">FALSE</boolean>428 <string name="title">andrewdoull@hotmail.com</string>429 </object>430 <reference idRef="285"/>431 <object class="IBCarbonStaticText" id="294">432 <string name="bounds">139 96 155 212 </string>433 <string name="viewFrame">96 139 116 16 </string>434 <int name="controlID">7</int>435 <boolean name="enabled">FALSE</boolean>436 <string name="title">Robert A. Koeneke</string>437 </object>438 <object class="IBCarbonStaticText" id="291">439 <string name="bounds">170 105 186 204 </string>440 <string name="viewFrame">105 170 99 16 </string>441 <int name="controlID">8</int>442 <boolean name="enabled">FALSE</boolean>443 <string name="title">James E. Wilson</string>444 </object>445 <reference idRef="282"/>446 <object class="IBCarbonStaticText" id="292">447 <string name="bounds">212 94 229 214 </string>448 <string name="viewFrame">94 212 120 17 </string>449 <int name="controlID">11</int>450 <boolean name="enabled">FALSE</boolean>451 <string name="title">Macintosh Version</string>452 </object>453 <object class="IBCarbonStaticText" id="322">454 <string name="bounds">121 96 137 215 </string>455 <string name="viewFrame">96 121 119 16 </string>456 <int name="controlID">4</int>457 <boolean name="enabled">FALSE</boolean>458 <string name="title">Robert Ruehlmann</string>459 </object>460 <object class="IBCarbonStaticText" id="293">461 <string name="bounds">188 74 204 234 </string>462 <string name="viewFrame">74 188 160 16 </string>463 <int name="controlID">10</int>464 <boolean name="enabled">FALSE</boolean>465 <string name="title">and many other people...</string>466 </object>467 </array>468 </object>469 <boolean name="receiveUpdates">FALSE</boolean>470 <boolean name="hasCloseBox">FALSE</boolean>471 <boolean name="hasCollapseBox">FALSE</boolean>472 <boolean name="hasHorizontalZoom">FALSE</boolean>473 <boolean name="isResizable">FALSE</boolean>474 <boolean name="hasVerticalZoom">FALSE</boolean>475 <boolean name="liveResize">TRUE</boolean>476 <boolean name="compositing">TRUE</boolean>477 <int name="carbonWindowClass">3</int>478 <boolean name="isConstrained">FALSE</boolean>479 </object>480 <reference idRef="289"/>481 <reference idRef="290"/>482 <reference idRef="291"/>483 <reference idRef="292"/>484 <reference idRef="293"/>485 <reference idRef="294"/>486 368 <reference idRef="297"/> 487 369 <reference idRef="298"/> … … 499 381 <reference idRef="316"/> 500 382 <reference idRef="317"/> 501 <object class="IBCarbonRootControl" id="318"> 502 <string name="bounds">0 0 123 448 </string> 503 <string name="viewFrame">0 0 448 123 </string> 504 </object> 505 <object class="IBCarbonWindow" id="319"> 506 <string name="windowRect">165 344 288 792 </string> 507 <string name="title">Window</string> 508 <reference name="rootControl" idRef="318"/> 383 <reference idRef="323"/> 384 <object class="IBCarbonWindow" id="324"> 385 <string name="windowRect">134 467 363 777 </string> 386 <string name="title"></string> 387 <object name="rootControl" class="IBCarbonRootControl" id="325"> 388 <string name="bounds">0 0 229 310 </string> 389 <string name="viewFrame">0 0 310 229 </string> 390 <array count="11" name="subviews"> 391 <object class="IBCarbonUserPane" id="329"> 392 <string name="bounds">-4 1 225 309 </string> 393 <string name="viewFrame">1 -4 308 229 </string> 394 <int name="controlID">1</int> 395 <ostype name="command">abou</ostype> 396 <boolean name="layoutSuspended">TRUE</boolean> 397 <int name="featureBits">16</int> 398 </object> 399 <object class="IBCarbonStaticText" id="336"> 400 <string name="bounds">7 107 24 204 </string> 401 <string name="viewFrame">107 7 97 17 </string> 402 <int name="controlID">2</int> 403 <boolean name="enabled">FALSE</boolean> 404 <string name="title">Angband 3.0.x</string> 405 </object> 406 <object class="IBCarbonStaticText" id="327"> 407 <string name="bounds">38 95 55 215 </string> 408 <string name="viewFrame">95 38 120 17 </string> 409 <int name="controlID">3</int> 410 <boolean name="enabled">FALSE</boolean> 411 <string name="title">Copyright (c) 2003</string> 412 </object> 413 <object class="IBCarbonStaticText" id="334"> 414 <string name="bounds">56 96 72 215 </string> 415 <string name="viewFrame">96 56 119 16 </string> 416 <int name="controlID">4</int> 417 <boolean name="enabled">FALSE</boolean> 418 <string name="title">Robert Ruehlmann</string> 419 </object> 420 <object class="IBCarbonStaticText" id="330"> 421 <string name="bounds">71 79 88 232 </string> 422 <string name="viewFrame">79 71 153 17 </string> 423 <int name="controlID">5</int> 424 <boolean name="enabled">FALSE</boolean> 425 <string name="title">(rr9@thangorodrim.net)</string> 426 </object> 427 <object class="IBCarbonStaticText" id="332"> 428 <string name="bounds">105 86 122 224 </string> 429 <string name="viewFrame">86 105 138 17 </string> 430 <int name="controlID">6</int> 431 <boolean name="enabled">FALSE</boolean> 432 <string name="title">Original Copyright by</string> 433 </object> 434 <object class="IBCarbonStaticText" id="326"> 435 <string name="bounds">123 97 139 213 </string> 436 <string name="viewFrame">97 123 116 16 </string> 437 <int name="controlID">7</int> 438 <boolean name="enabled">FALSE</boolean> 439 <string name="title">Robert A. Koeneke</string> 440 </object> 441 <object class="IBCarbonStaticText" id="335"> 442 <string name="bounds">139 106 155 205 </string> 443 <string name="viewFrame">106 139 99 16 </string> 444 <int name="controlID">8</int> 445 <boolean name="enabled">FALSE</boolean> 446 <string name="title">James E. Wilson</string> 447 </object> 448 <object class="IBCarbonStaticText" id="333"> 449 <string name="bounds">155 115 171 196 </string> 450 <string name="viewFrame">115 155 81 16 </string> 451 <int name="controlID">9</int> 452 <boolean name="enabled">FALSE</boolean> 453 <string name="title">Ben Harrison</string> 454 </object> 455 <object class="IBCarbonStaticText" id="331"> 456 <string name="bounds">171 75 187 235 </string> 457 <string name="viewFrame">75 171 160 16 </string> 458 <int name="controlID">10</int> 459 <boolean name="enabled">FALSE</boolean> 460 <string name="title">and many other people...</string> 461 </object> 462 <object class="IBCarbonStaticText" id="328"> 463 <string name="bounds">194 95 211 215 </string> 464 <string name="viewFrame">95 194 120 17 </string> 465 <int name="controlID">11</int> 466 <boolean name="enabled">FALSE</boolean> 467 <string name="title">Macintosh Version</string> 468 </object> 469 </array> 470 </object> 509 471 <boolean name="receiveUpdates">FALSE</boolean> 472 <boolean name="hasCloseBox">FALSE</boolean> 473 <boolean name="hasCollapseBox">FALSE</boolean> 474 <boolean name="hasHorizontalZoom">FALSE</boolean> 510 475 <boolean name="isResizable">FALSE</boolean> 476 <boolean name="hasVerticalZoom">FALSE</boolean> 511 477 <boolean name="liveResize">TRUE</boolean> 512 478 <boolean name="compositing">TRUE</boolean> 513 <int name="carbonWindowClass">1</int> 514 <int name="themeBrush">3</int> 515 <int name="windowPosition">7</int> 479 <int name="carbonWindowClass">3</int> 516 480 <boolean name="isConstrained">FALSE</boolean> 517 481 </object> 518 <reference idRef="322"/> 519 <reference idRef="323"/> 482 <reference idRef="325"/> 483 <reference idRef="326"/> 484 <reference idRef="327"/> 485 <reference idRef="328"/> 486 <reference idRef="329"/> 487 <reference idRef="330"/> 488 <reference idRef="331"/> 489 <reference idRef="332"/> 490 <reference idRef="333"/> 491 <reference idRef="334"/> 492 <reference idRef="335"/> 493 <reference idRef="336"/> 520 494 </array> 521 <array count="7 6" name="allParents">495 <array count="73" name="allParents"> 522 496 <reference idRef="1"/> 523 497 <reference idRef="29"/> … … 564 538 <reference idRef="224"/> 565 539 <reference idRef="131"/> 566 <reference idRef="290"/> 567 <reference idRef="290"/> 568 <reference idRef="290"/> 569 <reference idRef="290"/> 570 <reference idRef="290"/> 571 <reference idRef="290"/> 540 <reference idRef="215"/> 541 <reference idRef="215"/> 542 <reference idRef="215"/> 543 <reference idRef="215"/> 544 <reference idRef="215"/> 545 <reference idRef="215"/> 546 <reference idRef="215"/> 547 <reference idRef="308"/> 548 <reference idRef="215"/> 549 <reference idRef="215"/> 550 <reference idRef="215"/> 551 <reference idRef="312"/> 552 <reference idRef="215"/> 553 <reference idRef="147"/> 554 <reference idRef="215"/> 555 <reference idRef="215"/> 572 556 <reference idRef="1"/> 573 <reference idRef="290"/> 574 <reference idRef="288"/> 575 <reference idRef="290"/> 576 <reference idRef="290"/> 577 <reference idRef="290"/> 578 <reference idRef="290"/> 579 <reference idRef="215"/> 580 <reference idRef="215"/> 581 <reference idRef="215"/> 582 <reference idRef="215"/> 583 <reference idRef="215"/> 584 <reference idRef="215"/> 585 <reference idRef="215"/> 586 <reference idRef="308"/> 587 <reference idRef="215"/> 588 <reference idRef="215"/> 589 <reference idRef="215"/> 590 <reference idRef="312"/> 591 <reference idRef="215"/> 592 <reference idRef="147"/> 593 <reference idRef="215"/> 594 <reference idRef="319"/> 595 <reference idRef="1"/> 596 <reference idRef="290"/> 597 <reference idRef="215"/> 557 <reference idRef="324"/> 558 <reference idRef="325"/> 559 <reference idRef="325"/> 560 <reference idRef="325"/> 561 <reference idRef="325"/> 562 <reference idRef="325"/> 563 <reference idRef="325"/> 564 <reference idRef="325"/> 565 <reference idRef="325"/> 566 <reference idRef="325"/> 567 <reference idRef="325"/> 568 <reference idRef="325"/> 598 569 </array> 599 <dictionary count=" 4" name="nameTable">600 <string>DLOG: 128</string>601 <reference idRef=" 288"/>570 <dictionary count="3" name="nameTable"> 571 <string>DLOG:about</string> 572 <reference idRef="324"/> 602 573 <string>Files Owner</string> 603 574 <reference idRef="1"/> 604 575 <string>MenuBar</string> 605 576 <reference idRef="29"/> 606 <string>Window</string>607 <reference idRef="319"/>608 577 </dictionary> 609 <unsigned_int name="nextObjectID">3 24</unsigned_int>578 <unsigned_int name="nextObjectID">337</unsigned_int> 610 579 </object> trunk/src/osx/osx_tables.h
r1 r9 207 207 { &use_sound, kSpecialMenu, kSound, false}, 208 208 { &use_bigtile, kStyleMenu, kBigTile, true}, 209 { &interpolate, kStyleMenu, kInterpolate, true} 210 }; 211 209 { &interpolate, kStyleMenu, kInterpolate, true}, 210 { &antialias, kStyleMenu, kAntialias, true} 211 }; 212
