The master and develop branches track hengband.
OS X development happens on the macos-1-6-2, macos-2-2-1, and macos-develop branches.
| Revision | 989fc783c769d754fa0765f0027516068cc114a7 (tree) |
|---|---|
| Zeit | 2020-10-09 06:07:11 |
| Autor | Eric Branlund <ebranlund@fast...> |
| Commiter | Eric Branlund |
Fixed up the formatting of more multi-line comments.
src/main-cocoa.m (diff)| @@ -1817,7 +1817,8 @@ static void draw_image_tile( | ||
| 1817 | 1817 | } |
| 1818 | 1818 | |
| 1819 | 1819 | |
| 1820 | -/* The max number of glyphs we support. Currently this only affects | |
| 1820 | +/* | |
| 1821 | + * The max number of glyphs we support. Currently this only affects | |
| 1821 | 1822 | * updateGlyphInfo() for the calculation of the tile size, fontAscender, |
| 1822 | 1823 | * fontDescender, nColPre, and nColPost. The rendering in drawWChar() will |
| 1823 | 1824 | * work for a glyph not in updateGlyphInfo()'s set, and that is used for |
| @@ -1948,8 +1949,10 @@ static void draw_image_tile( | ||
| 1948 | 1949 | /* Display (flush) our Angband views */ |
| 1949 | 1950 | - (void)displayIfNeeded; |
| 1950 | 1951 | |
| 1951 | -/* Resize context to size of contentRect, and optionally save size to | |
| 1952 | - * defaults */ | |
| 1952 | +/* | |
| 1953 | + * Resize context to size of contentRect, and optionally save size to | |
| 1954 | + * defaults | |
| 1955 | + */ | |
| 1953 | 1956 | - (void)resizeTerminalWithContentRect: (NSRect)contentRect saveToDefaults: (BOOL)saveToDefaults; |
| 1954 | 1957 | |
| 1955 | 1958 | /* |
| @@ -4345,8 +4348,10 @@ static void Term_init_cocoa(term_type *t) | ||
| 4345 | 4348 | [window setFrame: windowFrame display: NO]; |
| 4346 | 4349 | } |
| 4347 | 4350 | |
| 4348 | - /* Override the default frame above if the user has adjusted windows in | |
| 4349 | - * the past */ | |
| 4351 | + /* | |
| 4352 | + * Override the default frame above if the user has adjusted windows in | |
| 4353 | + * the past | |
| 4354 | + */ | |
| 4350 | 4355 | if (autosaveName) [window setFrameAutosaveName:autosaveName]; |
| 4351 | 4356 | |
| 4352 | 4357 | /* |
| @@ -4840,20 +4845,22 @@ static errr Term_text_cocoa( | ||
| 4840 | 4845 | } |
| 4841 | 4846 | |
| 4842 | 4847 | #if 0 |
| 4843 | -/* From the Linux mbstowcs(3) man page: | |
| 4844 | - * If dest is NULL, n is ignored, and the conversion proceeds as above, | |
| 4845 | - * except that the converted wide characters are not written out to mem‐ | |
| 4846 | - * ory, and that no length limit exists. | |
| 4848 | +/* | |
| 4849 | + * From the Linux mbstowcs(3) man page: | |
| 4850 | + * If dest is NULL, n is ignored, and the conversion proceeds as above, | |
| 4851 | + * except that the converted wide characters are not written out to | |
| 4852 | + * memory, and that no length limit exists. | |
| 4847 | 4853 | */ |
| 4848 | 4854 | static size_t Term_mbcs_cocoa(wchar_t *dest, const char *src, int n) |
| 4849 | 4855 | { |
| 4850 | 4856 | int i; |
| 4851 | 4857 | int count = 0; |
| 4852 | 4858 | |
| 4853 | - /* Unicode code point to UTF-8 | |
| 4854 | - * 0x0000-0x007f: 0xxxxxxx | |
| 4855 | - * 0x0080-0x07ff: 110xxxxx 10xxxxxx | |
| 4856 | - * 0x0800-0xffff: 1110xxxx 10xxxxxx 10xxxxxx | |
| 4859 | + /* | |
| 4860 | + * Unicode code point to UTF-8 | |
| 4861 | + * 0x0000-0x007f: 0xxxxxxx | |
| 4862 | + * 0x0080-0x07ff: 110xxxxx 10xxxxxx | |
| 4863 | + * 0x0800-0xffff: 1110xxxx 10xxxxxx 10xxxxxx | |
| 4857 | 4864 | * 0x10000-0x1fffff: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx |
| 4858 | 4865 | * Note that UTF-16 limits Unicode to 0x10ffff. This code is not |
| 4859 | 4866 | * endian-agnostic. |
| @@ -5062,7 +5069,8 @@ static void AngbandHandleEventMouseDown( NSEvent *event ) | ||
| 5062 | 5069 | |
| 5063 | 5070 | /** |
| 5064 | 5071 | * Encodes an NSEvent Angband-style, or forwards it along. Returns YES if the |
| 5065 | - * event was sent to Angband, NO if Cocoa (or nothing) handled it */ | |
| 5072 | + * event was sent to Angband, NO if Cocoa (or nothing) handled it | |
| 5073 | + */ | |
| 5066 | 5074 | static BOOL send_event(NSEvent *event) |
| 5067 | 5075 | { |
| 5068 | 5076 |
| @@ -6018,7 +6026,7 @@ static void init_windows(void) | ||
| 6018 | 6026 | } |
| 6019 | 6027 | |
| 6020 | 6028 | /** |
| 6021 | - * Send a command to Angband via a menu item. This places the appropriate key | |
| 6029 | + * Send a command to Angband via a menu item. This places the appropriate key | |
| 6022 | 6030 | * down events into the queue so that it seems like the user pressed them |
| 6023 | 6031 | * (instead of trying to use the term directly). |
| 6024 | 6032 | */ |
| @@ -6058,7 +6066,7 @@ static void init_windows(void) | ||
| 6058 | 6066 | } |
| 6059 | 6067 | |
| 6060 | 6068 | /** |
| 6061 | - * Set up the command menu dynamically, based on CommandMenu.plist. | |
| 6069 | + * Set up the command menu dynamically, based on CommandMenu.plist. | |
| 6062 | 6070 | */ |
| 6063 | 6071 | - (void)prepareCommandMenu |
| 6064 | 6072 | { |
Fork