Files
@ r28417:68079c799b60
Branch filter:
Location: cpp/openttd-patchpack/source/src/video/cocoa/cocoa_v.mm - annotation
r28417:68079c799b60
22.7 KiB
text/x-objective-c++
Fix: Use consistent wording on waypoint button tooltip (#11700)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 | r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r17872:b79cbd1ba78a r17872:b79cbd1ba78a r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r12386:d4d6ee913899 r13189:ab2ccc525850 r7939:523d421f9d0c r12386:d4d6ee913899 r12386:d4d6ee913899 r7939:523d421f9d0c r24861:229a8cb4248a r12386:d4d6ee913899 r12386:d4d6ee913899 r12386:d4d6ee913899 r12386:d4d6ee913899 r12386:d4d6ee913899 r27160:192bc991c2e6 r24860:fb2788d47d86 r24776:fef5522d8f0f r12386:d4d6ee913899 r24556:fb8120e96ffe r12386:d4d6ee913899 r24776:fef5522d8f0f r12386:d4d6ee913899 r24776:fef5522d8f0f r24776:fef5522d8f0f r24837:5dde15d396bd r24776:fef5522d8f0f r20651:569557ed35c9 r20651:569557ed35c9 r12386:d4d6ee913899 r7939:523d421f9d0c r24776:fef5522d8f0f r7939:523d421f9d0c r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r24556:fb8120e96ffe r25724:cf37407a0fa2 r7939:523d421f9d0c r24776:fef5522d8f0f r24776:fef5522d8f0f r20904:fe60cc29ad9c r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r24763:3e5471ff2d4e r20904:fe60cc29ad9c r24768:48450d9ea0c2 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24920:a20fba25923b r24764:1ef60c5f1172 r26145:f785a693652c r26145:f785a693652c r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24768:48450d9ea0c2 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24860:fb2788d47d86 r24764:1ef60c5f1172 r7939:523d421f9d0c r24782:080a46243662 r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r24556:fb8120e96ffe r20626:ec7a90c7bf8f r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24764:1ef60c5f1172 r24768:48450d9ea0c2 r24764:1ef60c5f1172 r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r24919:657f22b3726f r24919:657f22b3726f r7939:523d421f9d0c r24557:8de6fcb74f32 r7965:724a81116ee2 r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r7939:523d421f9d0c r24762:5a4d1e409614 r7939:523d421f9d0c r24665:20a8caea4459 r24768:48450d9ea0c2 r24665:20a8caea4459 r24764:1ef60c5f1172 r7939:523d421f9d0c r7939:523d421f9d0c r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r7939:523d421f9d0c r7939:523d421f9d0c r24860:fb2788d47d86 r24860:fb2788d47d86 r7939:523d421f9d0c r7939:523d421f9d0c r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r7939:523d421f9d0c r7939:523d421f9d0c r20626:ec7a90c7bf8f r20626:ec7a90c7bf8f r20626:ec7a90c7bf8f r20626:ec7a90c7bf8f r20626:ec7a90c7bf8f r13196:3cb3f432e842 r7939:523d421f9d0c r7939:523d421f9d0c r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r7939:523d421f9d0c r7939:523d421f9d0c r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24766:0cbb7137cad5 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24766:0cbb7137cad5 r24766:0cbb7137cad5 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r7939:523d421f9d0c r7939:523d421f9d0c r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r17872:b79cbd1ba78a r8171:ff11fcdf6589 r7939:523d421f9d0c r24764:1ef60c5f1172 r7939:523d421f9d0c r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24977:4d2f47a2cfeb r24977:4d2f47a2cfeb r24977:4d2f47a2cfeb r24977:4d2f47a2cfeb r24764:1ef60c5f1172 r25007:c39f47be967b r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r7939:523d421f9d0c r7939:523d421f9d0c r26145:f785a693652c r26145:f785a693652c r26145:f785a693652c r26145:f785a693652c r26145:f785a693652c r26145:f785a693652c r26145:f785a693652c r26145:f785a693652c r26145:f785a693652c r26145:f785a693652c r26145:f785a693652c r26145:f785a693652c r26145:f785a693652c r17872:b79cbd1ba78a r18160:133e96e28508 r18160:133e96e28508 r18160:133e96e28508 r18160:133e96e28508 r18160:133e96e28508 r25005:73570e000548 r24768:48450d9ea0c2 r18160:133e96e28508 r18160:133e96e28508 r18160:133e96e28508 r20648:393668109c79 r20648:393668109c79 r20648:393668109c79 r20648:393668109c79 r25117:15b54362c6f4 r20936:99b9f68e0f14 r25005:73570e000548 r20648:393668109c79 r20648:393668109c79 r24565:5dd2777a6959 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r25019:7bd7e70574c6 r24665:20a8caea4459 r24665:20a8caea4459 r24665:20a8caea4459 r24665:20a8caea4459 r24665:20a8caea4459 r24665:20a8caea4459 r24665:20a8caea4459 r24665:20a8caea4459 r24798:b9ee83bbe580 r24798:b9ee83bbe580 r24798:b9ee83bbe580 r24798:b9ee83bbe580 r24798:b9ee83bbe580 r24798:b9ee83bbe580 r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24920:a20fba25923b r24665:20a8caea4459 r24782:080a46243662 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24565:5dd2777a6959 r24565:5dd2777a6959 r24565:5dd2777a6959 r24565:5dd2777a6959 r24565:5dd2777a6959 r24764:1ef60c5f1172 r24565:5dd2777a6959 r24565:5dd2777a6959 r24565:5dd2777a6959 r24565:5dd2777a6959 r24565:5dd2777a6959 r24565:5dd2777a6959 r24790:dc721278c245 r24790:dc721278c245 r28074:fffdbfe84aad r24790:dc721278c245 r24790:dc721278c245 r24565:5dd2777a6959 r24565:5dd2777a6959 r24764:1ef60c5f1172 r24782:080a46243662 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24764:1ef60c5f1172 r24767:dedfc39121ac r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24767:dedfc39121ac r24768:48450d9ea0c2 r16834:1d03199cc9a5 r24556:fb8120e96ffe r24556:fb8120e96ffe r24782:080a46243662 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24556:fb8120e96ffe r24556:fb8120e96ffe r24556:fb8120e96ffe r24768:48450d9ea0c2 r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r24768:48450d9ea0c2 r25719:14932b129f4d r24770:fdcfd3362821 r24556:fb8120e96ffe r25655:1030dcb7eb52 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24556:fb8120e96ffe r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24782:080a46243662 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24556:fb8120e96ffe r28389:d1118c144a7d r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24556:fb8120e96ffe r24556:fb8120e96ffe r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24556:fb8120e96ffe r24772:2d660991e437 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24782:080a46243662 r24770:fdcfd3362821 r24771:8e2ad2807649 r24556:fb8120e96ffe r25655:1030dcb7eb52 r24768:48450d9ea0c2 r24768:48450d9ea0c2 r24556:fb8120e96ffe r24772:2d660991e437 r24556:fb8120e96ffe r24770:fdcfd3362821 r24919:657f22b3726f r24770:fdcfd3362821 r25655:1030dcb7eb52 r24770:fdcfd3362821 r24770:fdcfd3362821 r24770:fdcfd3362821 r24770:fdcfd3362821 r24770:fdcfd3362821 r24782:080a46243662 r24770:fdcfd3362821 r24770:fdcfd3362821 r24773:589823de4b62 r24770:fdcfd3362821 r24768:48450d9ea0c2 r24556:fb8120e96ffe r24768:48450d9ea0c2 r24556:fb8120e96ffe r24556:fb8120e96ffe r27160:192bc991c2e6 r24556:fb8120e96ffe r24556:fb8120e96ffe r24556:fb8120e96ffe r24768:48450d9ea0c2 r16834:1d03199cc9a5 r20649:dc9717cc7bca r24772:2d660991e437 r24782:080a46243662 r24782:080a46243662 r24782:080a46243662 r24782:080a46243662 r24776:fef5522d8f0f r24776:fef5522d8f0f r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r25719:14932b129f4d r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r24849:01243a72f255 r24849:01243a72f255 r24849:01243a72f255 r24849:01243a72f255 r24849:01243a72f255 r24849:01243a72f255 r25719:14932b129f4d r25719:14932b129f4d r24849:01243a72f255 r24970:1ff44d19fa4a r24849:01243a72f255 r24849:01243a72f255 r24849:01243a72f255 r24849:01243a72f255 r24782:080a46243662 r24941:4e760118066a r24776:fef5522d8f0f r25014:e1f1bf3a062e r25014:e1f1bf3a062e r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r25011:61d28a13bb41 r24855:196c88971d0d r24776:fef5522d8f0f r24776:fef5522d8f0f r25014:e1f1bf3a062e r25014:e1f1bf3a062e r24776:fef5522d8f0f r24776:fef5522d8f0f r24776:fef5522d8f0f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24772:2d660991e437 r24772:2d660991e437 r24919:657f22b3726f r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24778:ede24664c30a r24778:ede24664c30a r24778:ede24664c30a r24778:ede24664c30a r24778:ede24664c30a r24778:ede24664c30a r24861:229a8cb4248a r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24778:ede24664c30a r24778:ede24664c30a r24778:ede24664c30a r24778:ede24664c30a r24778:ede24664c30a r24778:ede24664c30a r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24778:ede24664c30a r24772:2d660991e437 r24778:ede24664c30a r24772:2d660991e437 r24772:2d660991e437 r24772:2d660991e437 r24790:dc721278c245 r24790:dc721278c245 r24790:dc721278c245 r24790:dc721278c245 r24790:dc721278c245 r24790:dc721278c245 r24790:dc721278c245 r24772:2d660991e437 r24772:2d660991e437 r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r27737:728d55b97775 r24919:657f22b3726f r27737:728d55b97775 r27737:728d55b97775 r27737:728d55b97775 r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24920:a20fba25923b r24920:a20fba25923b r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r25014:e1f1bf3a062e r25014:e1f1bf3a062e r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r27942:f7389062d120 r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r27737:728d55b97775 r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r27737:728d55b97775 r24919:657f22b3726f r27737:728d55b97775 r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r28335:7107f9cc6900 r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r27160:192bc991c2e6 r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24920:a20fba25923b r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r27737:728d55b97775 r27737:728d55b97775 r27737:728d55b97775 r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r27737:728d55b97775 r27737:728d55b97775 r27737:728d55b97775 r27737:728d55b97775 r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r25724:cf37407a0fa2 r25724:cf37407a0fa2 r25724:cf37407a0fa2 r24919:657f22b3726f r25724:cf37407a0fa2 r25724:cf37407a0fa2 r25724:cf37407a0fa2 r25724:cf37407a0fa2 r24919:657f22b3726f r25724:cf37407a0fa2 r25724:cf37407a0fa2 r25724:cf37407a0fa2 r24919:657f22b3726f r25724:cf37407a0fa2 r25724:cf37407a0fa2 r24919:657f22b3726f r25724:cf37407a0fa2 r25724:cf37407a0fa2 r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r24919:657f22b3726f r7939:523d421f9d0c | /*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file cocoa_v.mm Code related to the cocoa video driver(s). */
/******************************************************************************
* Cocoa video driver *
* Known things left to do: *
* Nothing at the moment. *
******************************************************************************/
#ifdef WITH_COCOA
#include "../../stdafx.h"
#include "../../os/macosx/macos.h"
#define Rect OTTDRect
#define Point OTTDPoint
#import <Cocoa/Cocoa.h>
#import <QuartzCore/QuartzCore.h>
#undef Rect
#undef Point
#include "../../openttd.h"
#include "../../debug.h"
#include "../../error_func.h"
#include "../../core/geometry_func.hpp"
#include "../../core/math_func.hpp"
#include "cocoa_v.h"
#include "cocoa_wnd.h"
#include "../../blitter/factory.hpp"
#include "../../framerate_type.h"
#include "../../gfx_func.h"
#include "../../thread.h"
#include "../../core/random_func.hpp"
#include "../../progress.h"
#include "../../settings_type.h"
#include "../../window_func.h"
#include "../../window_gui.h"
#import <sys/param.h> /* for MAXPATHLEN */
#import <sys/time.h> /* gettimeofday */
/* The 10.12 SDK added new names for some enum constants and
* deprecated the old ones. As there's no functional change in any
* way, just use a define for older SDKs to the old names. */
#ifndef HAVE_OSX_1012_SDK
# define NSEventModifierFlagCommand NSCommandKeyMask
# define NSEventModifierFlagControl NSControlKeyMask
# define NSEventModifierFlagOption NSAlternateKeyMask
# define NSEventModifierFlagShift NSShiftKeyMask
# define NSEventModifierFlagCapsLock NSAlphaShiftKeyMask
#endif
/**
* Important notice regarding all modifications!!!!!!!
* There are certain limitations because the file is objective C++.
* gdb has limitations.
* C++ and objective C code can't be joined in all cases (classes stuff).
* Read http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html for more information.
*/
bool _cocoa_video_started = false;
static Palette _local_palette; ///< Current palette to use for drawing.
extern bool _tab_is_down;
/** List of common display/window sizes. */
static const Dimension _default_resolutions[] = {
{ 640, 480 },
{ 800, 600 },
{ 1024, 768 },
{ 1152, 864 },
{ 1280, 800 },
{ 1280, 960 },
{ 1280, 1024 },
{ 1400, 1050 },
{ 1600, 1200 },
{ 1680, 1050 },
{ 1920, 1200 },
{ 2560, 1440 }
};
VideoDriver_Cocoa::VideoDriver_Cocoa()
{
this->setup = false;
this->buffer_locked = false;
this->refresh_sys_sprites = true;
this->window = nil;
this->cocoaview = nil;
this->delegate = nil;
this->color_space = nullptr;
this->dirty_rect = {};
}
/** Stop Cocoa video driver. */
void VideoDriver_Cocoa::Stop()
{
if (!_cocoa_video_started) return;
CocoaExitApplication();
/* Release window mode resources */
if (this->window != nil) [ this->window close ];
[ this->cocoaview release ];
[ this->delegate release ];
CGColorSpaceRelease(this->color_space);
_cocoa_video_started = false;
}
/** Common driver initialization. */
const char *VideoDriver_Cocoa::Initialize()
{
if (!MacOSVersionIsAtLeast(10, 7, 0)) return "The Cocoa video driver requires Mac OS X 10.7 or later.";
if (_cocoa_video_started) return "Already started";
_cocoa_video_started = true;
/* Don't create a window or enter fullscreen if we're just going to show a dialog. */
if (!CocoaSetupApplication()) return nullptr;
this->UpdateAutoResolution();
this->orig_res = _cur_resolution;
return nullptr;
}
/**
* Set dirty a rectangle managed by a cocoa video subdriver.
* @param left Left x cooordinate of the dirty rectangle.
* @param top Uppder y coordinate of the dirty rectangle.
* @param width Width of the dirty rectangle.
* @param height Height of the dirty rectangle.
*/
void VideoDriver_Cocoa::MakeDirty(int left, int top, int width, int height)
{
Rect r = {left, top, left + width, top + height};
this->dirty_rect = BoundingRect(this->dirty_rect, r);
}
/**
* Start the main programme loop when using a cocoa video driver.
*/
void VideoDriver_Cocoa::MainLoop()
{
/* Restart game loop if it was already running (e.g. after bootstrapping),
* otherwise this call is a no-op. */
[ [ NSNotificationCenter defaultCenter ] postNotificationName:OTTDMainLaunchGameEngine object:nil ];
/* Start the main event loop. */
[ NSApp run ];
}
/**
* Change the resolution when using a cocoa video driver.
* @param w New window width.
* @param h New window height.
* @return Whether the video driver was successfully updated.
*/
bool VideoDriver_Cocoa::ChangeResolution(int w, int h)
{
NSSize screen_size = [ [ NSScreen mainScreen ] frame ].size;
w = std::min(w, (int)screen_size.width);
h = std::min(h, (int)screen_size.height);
NSRect contentRect = NSMakeRect(0, 0, w, h);
[ this->window setContentSize:contentRect.size ];
/* Ensure frame height - title bar height >= view height */
float content_height = [ this->window contentRectForFrameRect:[ this->window frame ] ].size.height;
contentRect.size.height = Clamp(h, 0, (int)content_height);
if (this->cocoaview != nil) {
h = (int)contentRect.size.height;
[ this->cocoaview setFrameSize:contentRect.size ];
}
[ (OTTD_CocoaWindow *)this->window center ];
this->AllocateBackingStore();
return true;
}
/**
* Toggle between windowed and full screen mode for cocoa display driver.
* @param full_screen Whether to switch to full screen or not.
* @return Whether the mode switch was successful.
*/
bool VideoDriver_Cocoa::ToggleFullscreen(bool full_screen)
{
if (this->IsFullscreen() == full_screen) return true;
if ([ this->window respondsToSelector:@selector(toggleFullScreen:) ]) {
[ this->window performSelector:@selector(toggleFullScreen:) withObject:this->window ];
/* Hide the menu bar and the dock */
[ NSMenu setMenuBarVisible:!full_screen ];
this->UpdateVideoModes();
InvalidateWindowClassesData(WC_GAME_OPTIONS, 3);
return true;
}
return false;
}
void VideoDriver_Cocoa::ClearSystemSprites()
{
this->refresh_sys_sprites = true;
}
void VideoDriver_Cocoa::PopulateSystemSprites()
{
if (this->refresh_sys_sprites && this->window != nil) {
[ this->window refreshSystemSprites ];
this->refresh_sys_sprites = false;
}
}
/**
* Callback invoked after the blitter was changed.
* @return True if no error.
*/
bool VideoDriver_Cocoa::AfterBlitterChange()
{
this->AllocateBackingStore(true);
return true;
}
/**
* An edit box lost the input focus. Abort character compositing if necessary.
*/
void VideoDriver_Cocoa::EditBoxLostFocus()
{
[ [ this->cocoaview inputContext ] performSelectorOnMainThread:@selector(discardMarkedText) withObject:nil waitUntilDone:[ NSThread isMainThread ] ];
/* Clear any marked string from the current edit box. */
HandleTextInput(nullptr, true);
}
/**
* Get refresh rates of all connected monitors.
*/
std::vector<int> VideoDriver_Cocoa::GetListOfMonitorRefreshRates()
{
std::vector<int> rates{};
if (MacOSVersionIsAtLeast(10, 6, 0)) {
std::array<CGDirectDisplayID, 16> displays;
uint32_t count = 0;
CGGetActiveDisplayList(displays.size(), displays.data(), &count);
for (uint32_t i = 0; i < count; i++) {
CGDisplayModeRef mode = CGDisplayCopyDisplayMode(displays[i]);
int rate = (int)CGDisplayModeGetRefreshRate(mode);
if (rate > 0) rates.push_back(rate);
CGDisplayModeRelease(mode);
}
}
return rates;
}
/**
* Get the resolution of the main screen.
*/
Dimension VideoDriver_Cocoa::GetScreenSize() const
{
NSRect frame = [ [ NSScreen mainScreen ] frame ];
return { static_cast<uint>(NSWidth(frame)), static_cast<uint>(NSHeight(frame)) };
}
/** Get DPI scale of our window. */
float VideoDriver_Cocoa::GetDPIScale()
{
return this->cocoaview != nil ? [ this->cocoaview getContentsScale ] : 1.0f;
}
/** Lock video buffer for drawing if it isn't already mapped. */
bool VideoDriver_Cocoa::LockVideoBuffer()
{
if (this->buffer_locked) return false;
this->buffer_locked = true;
_screen.dst_ptr = this->GetVideoPointer();
assert(_screen.dst_ptr != nullptr);
return true;
}
/** Unlock video buffer. */
void VideoDriver_Cocoa::UnlockVideoBuffer()
{
if (_screen.dst_ptr != nullptr) {
/* Hand video buffer back to the drawing backend. */
this->ReleaseVideoPointer();
_screen.dst_ptr = nullptr;
}
this->buffer_locked = false;
}
/**
* Are we in fullscreen mode?
* @return whether fullscreen mode is currently used
*/
bool VideoDriver_Cocoa::IsFullscreen()
{
return this->window != nil && ([ this->window styleMask ] & NSWindowStyleMaskFullScreen) != 0;
}
/**
* Handle a change of the display area.
*/
void VideoDriver_Cocoa::GameSizeChanged()
{
/* Store old window size if we entered fullscreen mode. */
bool fullscreen = this->IsFullscreen();
if (fullscreen && !_fullscreen) this->orig_res = _cur_resolution;
_fullscreen = fullscreen;
BlitterFactory::GetCurrentBlitter()->PostResize();
::GameSizeChanged();
/* We need to store the window size as non-Retina size in
* the config file to get same windows size on next start. */
_cur_resolution.width = [ this->cocoaview frame ].size.width;
_cur_resolution.height = [ this->cocoaview frame ].size.height;
}
/**
* Update the video mode.
*/
void VideoDriver_Cocoa::UpdateVideoModes()
{
_resolutions.clear();
if (this->IsFullscreen()) {
/* Full screen, there is only one possible resolution. */
NSSize screen = [ [ this->window screen ] frame ].size;
_resolutions.emplace_back((uint)screen.width, (uint)screen.height);
} else {
/* Windowed; offer a selection of common window sizes up until the
* maximum usable screen space. This excludes the menu and dock areas. */
NSSize maxSize = [ [ NSScreen mainScreen] visibleFrame ].size;
for (const auto &d : _default_resolutions) {
if (d.width < maxSize.width && d.height < maxSize.height) _resolutions.push_back(d);
}
_resolutions.emplace_back((uint)maxSize.width, (uint)maxSize.height);
}
}
/**
* Build window and view with a given size.
* @param width Window width.
* @param height Window height.
*/
bool VideoDriver_Cocoa::MakeWindow(int width, int height)
{
this->setup = true;
/* Limit window size to screen frame. */
NSSize screen_size = [ [ NSScreen mainScreen ] frame ].size;
if (width > screen_size.width) width = screen_size.width;
if (height > screen_size.height) height = screen_size.height;
NSRect contentRect = NSMakeRect(0, 0, width, height);
/* Create main window. */
#ifdef HAVE_OSX_1012_SDK
unsigned int style = NSWindowStyleMaskTitled | NSWindowStyleMaskResizable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskClosable;
#else
unsigned int style = NSTitledWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask | NSClosableWindowMask;
#endif
this->window = [ [ OTTD_CocoaWindow alloc ] initWithContentRect:contentRect styleMask:style backing:NSBackingStoreBuffered defer:NO driver:this ];
if (this->window == nil) {
Debug(driver, 0, "Could not create the Cocoa window.");
this->setup = false;
return false;
}
/* Add built in full-screen support when available (OS X 10.7 and higher)
* This code actually compiles for 10.5 and later, but only makes sense in conjunction
* with the quartz fullscreen support as found only in 10.7 and later. */
if ([ this->window respondsToSelector:@selector(toggleFullScreen:) ]) {
NSWindowCollectionBehavior behavior = [ this->window collectionBehavior ];
behavior |= NSWindowCollectionBehaviorFullScreenPrimary;
[ this->window setCollectionBehavior:behavior ];
NSButton *fullscreenButton = [ this->window standardWindowButton:NSWindowZoomButton ];
[ fullscreenButton setAction:@selector(toggleFullScreen:) ];
[ fullscreenButton setTarget:this->window ];
}
this->delegate = [ [ OTTD_CocoaWindowDelegate alloc ] initWithDriver:this ];
[ this->window setDelegate:this->delegate ];
[ this->window center ];
[ this->window makeKeyAndOrderFront:nil ];
/* Create wrapper view for input and event handling. */
NSRect view_frame = [ this->window contentRectForFrameRect:[ this->window frame ] ];
this->cocoaview = [ [ OTTD_CocoaView alloc ] initWithFrame:view_frame ];
if (this->cocoaview == nil) {
Debug(driver, 0, "Could not create the event wrapper view.");
this->setup = false;
return false;
}
[ this->cocoaview setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable ];
/* Create content view. */
NSView *draw_view = this->AllocateDrawView();
if (draw_view == nil) {
Debug(driver, 0, "Could not create the drawing view.");
this->setup = false;
return false;
}
[ draw_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable ];
/* Create view chain: window -> input wrapper view -> content view. */
[ this->window setContentView:this->cocoaview ];
[ this->cocoaview addSubview:draw_view ];
[ this->window makeFirstResponder:this->cocoaview ];
[ draw_view release ];
[ this->window setColorSpace:[ NSColorSpace sRGBColorSpace ] ];
CGColorSpaceRelease(this->color_space);
this->color_space = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
if (this->color_space == nullptr) this->color_space = CGColorSpaceCreateDeviceRGB();
if (this->color_space == nullptr) FatalError("Could not get a valid colour space for drawing.");
this->setup = false;
return true;
}
/**
* Poll and handle a single event from the OS.
* @return True if there was an event to handle.
*/
bool VideoDriver_Cocoa::PollEvent()
{
#ifdef HAVE_OSX_1012_SDK
NSEventMask mask = NSEventMaskAny;
#else
NSEventMask mask = NSAnyEventMask;
#endif
NSEvent *event = [ NSApp nextEventMatchingMask:mask untilDate:[ NSDate distantPast ] inMode:NSDefaultRunLoopMode dequeue:YES ];
if (event == nil) return false;
[ NSApp sendEvent:event ];
return true;
}
void VideoDriver_Cocoa::InputLoop()
{
NSUInteger cur_mods = [ NSEvent modifierFlags ];
bool old_ctrl_pressed = _ctrl_pressed;
_ctrl_pressed = (cur_mods & ( _settings_client.gui.right_mouse_btn_emulation != RMBE_CONTROL ? NSEventModifierFlagControl : NSEventModifierFlagCommand)) != 0;
_shift_pressed = (cur_mods & NSEventModifierFlagShift) != 0;
this->fast_forward_key_pressed = _tab_is_down;
if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
}
/** Main game loop. */
void VideoDriver_Cocoa::MainLoopReal()
{
this->StartGameThread();
for (;;) {
@autoreleasepool {
if (_exit_game) {
/* Restore saved resolution if in fullscreen mode. */
if (this->IsFullscreen()) _cur_resolution = this->orig_res;
break;
}
this->Tick();
this->SleepTillNextTick();
}
}
this->StopGameThread();
}
/* Subclass of OTTD_CocoaView to fix Quartz rendering */
@interface OTTD_QuartzView : NSView {
VideoDriver_CocoaQuartz *driver;
}
- (instancetype)initWithFrame:(NSRect)frameRect andDriver:(VideoDriver_CocoaQuartz *)drv;
@end
@implementation OTTD_QuartzView
- (instancetype)initWithFrame:(NSRect)frameRect andDriver:(VideoDriver_CocoaQuartz *)drv
{
if (self = [ super initWithFrame:frameRect ]) {
self->driver = drv;
/* We manage our content updates ourselves. */
self.layerContentsRedrawPolicy = NSViewLayerContentsRedrawOnSetNeedsDisplay;
self.wantsLayer = YES;
self.layer.magnificationFilter = kCAFilterNearest;
self.layer.opaque = YES;
}
return self;
}
- (BOOL)acceptsFirstResponder
{
return NO;
}
- (BOOL)isOpaque
{
return YES;
}
- (BOOL)wantsUpdateLayer
{
return YES;
}
- (void)updateLayer
{
if (driver->cgcontext == nullptr) return;
/* Set layer contents to our backing buffer, which avoids needless copying. */
CGImageRef fullImage = CGBitmapContextCreateImage(driver->cgcontext);
self.layer.contents = (__bridge id)fullImage;
CGImageRelease(fullImage);
}
- (void)viewDidChangeBackingProperties
{
[ super viewDidChangeBackingProperties ];
self.layer.contentsScale = [ driver->cocoaview getContentsScale ];
}
@end
static FVideoDriver_CocoaQuartz iFVideoDriver_CocoaQuartz;
/** Clear buffer to opaque black. */
static void ClearWindowBuffer(uint32_t *buffer, uint32_t pitch, uint32_t height)
{
uint32_t fill = Colour(0, 0, 0).data;
for (uint32_t y = 0; y < height; y++) {
for (uint32_t x = 0; x < pitch; x++) {
buffer[y * pitch + x] = fill;
}
}
}
VideoDriver_CocoaQuartz::VideoDriver_CocoaQuartz()
{
this->window_width = 0;
this->window_height = 0;
this->window_pitch = 0;
this->buffer_depth = 0;
this->window_buffer = nullptr;
this->pixel_buffer = nullptr;
this->cgcontext = nullptr;
}
const char *VideoDriver_CocoaQuartz::Start(const StringList ¶m)
{
const char *err = this->Initialize();
if (err != nullptr) return err;
int bpp = BlitterFactory::GetCurrentBlitter()->GetScreenDepth();
if (bpp != 8 && bpp != 32) {
Stop();
return "The cocoa quartz subdriver only supports 8 and 32 bpp.";
}
bool fullscreen = _fullscreen;
if (!this->MakeWindow(_cur_resolution.width, _cur_resolution.height)) {
Stop();
return "Could not create window";
}
this->AllocateBackingStore(true);
if (fullscreen) this->ToggleFullscreen(fullscreen);
this->GameSizeChanged();
this->UpdateVideoModes();
this->is_game_threaded = !GetDriverParamBool(param, "no_threads") && !GetDriverParamBool(param, "no_thread");
return nullptr;
}
void VideoDriver_CocoaQuartz::Stop()
{
this->VideoDriver_Cocoa::Stop();
CGContextRelease(this->cgcontext);
free(this->window_buffer);
free(this->pixel_buffer);
}
NSView *VideoDriver_CocoaQuartz::AllocateDrawView()
{
return [ [ OTTD_QuartzView alloc ] initWithFrame:[ this->cocoaview bounds ] andDriver:this ];
}
/** Resize the window. */
void VideoDriver_CocoaQuartz::AllocateBackingStore(bool)
{
if (this->window == nil || this->cocoaview == nil || this->setup) return;
this->UpdatePalette(0, 256);
NSRect newframe = [ this->cocoaview getRealRect:[ this->cocoaview frame ] ];
this->window_width = (int)newframe.size.width;
this->window_height = (int)newframe.size.height;
this->window_pitch = Align(this->window_width, 16 / sizeof(uint32_t)); // Quartz likes lines that are multiple of 16-byte.
this->buffer_depth = BlitterFactory::GetCurrentBlitter()->GetScreenDepth();
/* Create Core Graphics Context */
free(this->window_buffer);
this->window_buffer = malloc(this->window_pitch * this->window_height * sizeof(uint32_t));
/* Initialize with opaque black. */
ClearWindowBuffer((uint32_t *)this->window_buffer, this->window_pitch, this->window_height);
CGContextRelease(this->cgcontext);
this->cgcontext = CGBitmapContextCreate(
this->window_buffer, // data
this->window_width, // width
this->window_height, // height
8, // bits per component
this->window_pitch * 4, // bytes per row
this->color_space, // color space
kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host
);
assert(this->cgcontext != nullptr);
CGContextSetShouldAntialias(this->cgcontext, FALSE);
CGContextSetAllowsAntialiasing(this->cgcontext, FALSE);
CGContextSetInterpolationQuality(this->cgcontext, kCGInterpolationNone);
if (this->buffer_depth == 8) {
free(this->pixel_buffer);
this->pixel_buffer = malloc(this->window_width * this->window_height);
if (this->pixel_buffer == nullptr) UserError("Out of memory allocating pixel buffer");
} else {
free(this->pixel_buffer);
this->pixel_buffer = nullptr;
}
/* Tell the game that the resolution has changed */
_screen.width = this->window_width;
_screen.height = this->window_height;
_screen.pitch = this->buffer_depth == 8 ? this->window_width : this->window_pitch;
_screen.dst_ptr = this->GetVideoPointer();
/* Redraw screen */
this->MakeDirty(0, 0, _screen.width, _screen.height);
this->GameSizeChanged();
}
/**
* This function copies 8bpp pixels from the screen buffer in 32bpp windowed mode.
*
* @param left The x coord for the left edge of the box to blit.
* @param top The y coord for the top edge of the box to blit.
* @param right The x coord for the right edge of the box to blit.
* @param bottom The y coord for the bottom edge of the box to blit.
*/
void VideoDriver_CocoaQuartz::BlitIndexedToView32(int left, int top, int right, int bottom)
{
const uint32_t *pal = this->palette;
const uint8_t *src = (uint8_t*)this->pixel_buffer;
uint32_t *dst = (uint32_t*)this->window_buffer;
uint width = this->window_width;
uint pitch = this->window_pitch;
for (int y = top; y < bottom; y++) {
for (int x = left; x < right; x++) {
dst[y * pitch + x] = pal[src[y * width + x]];
}
}
}
/** Update the palette */
void VideoDriver_CocoaQuartz::UpdatePalette(uint first_color, uint num_colors)
{
if (this->buffer_depth != 8) return;
for (uint i = first_color; i < first_color + num_colors; i++) {
uint32_t clr = 0xff000000;
clr |= (uint32_t)_local_palette.palette[i].r << 16;
clr |= (uint32_t)_local_palette.palette[i].g << 8;
clr |= (uint32_t)_local_palette.palette[i].b;
this->palette[i] = clr;
}
this->MakeDirty(0, 0, _screen.width, _screen.height);
}
void VideoDriver_CocoaQuartz::CheckPaletteAnim()
{
if (!CopyPalette(_local_palette)) return;
Blitter *blitter = BlitterFactory::GetCurrentBlitter();
switch (blitter->UsePaletteAnimation()) {
case Blitter::PALETTE_ANIMATION_VIDEO_BACKEND:
this->UpdatePalette(_local_palette.first_dirty, _local_palette.count_dirty);
break;
case Blitter::PALETTE_ANIMATION_BLITTER:
blitter->PaletteAnimate(_local_palette);
break;
case Blitter::PALETTE_ANIMATION_NONE:
break;
default:
NOT_REACHED();
}
}
/** Draw window */
void VideoDriver_CocoaQuartz::Paint()
{
PerformanceMeasurer framerate(PFE_VIDEO);
/* Check if we need to do anything */
if (IsEmptyRect(this->dirty_rect) || [ this->window isMiniaturized ]) return;
/* We only need to blit in indexed mode since in 32bpp mode the game draws directly to the image. */
if (this->buffer_depth == 8) {
BlitIndexedToView32(
this->dirty_rect.left,
this->dirty_rect.top,
this->dirty_rect.right,
this->dirty_rect.bottom
);
}
NSRect dirtyrect;
dirtyrect.origin.x = this->dirty_rect.left;
dirtyrect.origin.y = this->window_height - this->dirty_rect.bottom;
dirtyrect.size.width = this->dirty_rect.right - this->dirty_rect.left;
dirtyrect.size.height = this->dirty_rect.bottom - this->dirty_rect.top;
/* Notify OS X that we have new content to show. */
[ this->cocoaview setNeedsDisplayInRect:[ this->cocoaview getVirtualRect:dirtyrect ] ];
/* Tell the OS to get our contents to screen as soon as possible. */
[ CATransaction flush ];
this->dirty_rect = {};
}
#endif /* WITH_COCOA */
|