#if defined(MACH_O_COCOA)
/* Mac headers */
-#include <Cocoa/Cocoa.h>
+#import "cocoa/AppDelegate.h"
//#include <Carbon/Carbon.h> /* For keycodes */
/* Hack - keycodes to enable compiling in macOS 10.14 */
#define kVK_Return 0x24
#define kVK_ANSI_KeypadEnter 0x4C
static NSString * const AngbandDirectoryNameLib = @"lib";
-static NSString * const AngbandDirectoryNameBase = @"Hengband";
+static NSString * const AngbandDirectoryNameBase = @VERSION_NAME;
static NSString * const AngbandMessageCatalog = @"Localizable";
static NSString * const AngbandTerminalsDefaultsKey = @"Terminals";
static NSString * const AngbandTerminalColumnsDefaultsKey = @"Columns";
static NSString * const AngbandTerminalVisibleDefaultsKey = @"Visible";
static NSString * const AngbandGraphicsDefaultsKey = @"GraphicsID";
+static NSString * const AngbandBigTileDefaultsKey = @"UseBigTiles";
static NSString * const AngbandFrameRateDefaultsKey = @"FramesPerSecond";
static NSString * const AngbandSoundDefaultsKey = @"AllowSound";
static NSInteger const AngbandWindowMenuItemTagBase = 1000;
static NSInteger const AngbandCommandMenuItemTagBase = 2000;
-/* We can blit to a large layer or image and then scale it down during live
- * resize, which makes resizing much faster, at the cost of some image quality
- * during resizing */
-#ifndef USE_LIVE_RESIZE_CACHE
-# define USE_LIVE_RESIZE_CACHE 1
-#endif
-
/* Global defines etc from Angband 3.5-dev - NRM */
#define ANGBAND_TERM_MAX 8
-static bool new_game = TRUE;
-
#define MAX_COLORS 256
#define MSG_MAX SOUND_MAX
AngbandEventWakeup = 1
};
-/* Redeclare some 10.7 constants and methods so we can build on 10.6 */
-enum
-{
- Angband_NSWindowCollectionBehaviorFullScreenPrimary = 1 << 7,
- Angband_NSWindowCollectionBehaviorFullScreenAuxiliary = 1 << 8
-};
-
-@interface NSWindow (AngbandLionRedeclares)
-- (void)setRestorable:(BOOL)flag;
-@end
-
/* Delay handling of pre-emptive "quit" event */
static BOOL quit_when_ready = FALSE;
/* Our frames per second (e.g. 60). A value of 0 means unthrottled. */
static int frames_per_second;
-/* Function to get the default font */
-static NSFont *default_font;
+/* Force a new game or not? */
+static bool new_game = FALSE;
@class AngbandView;
-/*
- * To handle fonts where an individual glyph's bounding box can extend into
- * neighboring columns, Term_curs_cocoa(), Term_pict_cocoa(),
- * Term_text_cocoa(), and Term_wipe_cocoa() merely record what needs to be
- * done with the actual drawing happening in response to the notification to
- * flush all rows, the TERM_XTRA_FRESH case in Term_xtra_cocoa(). Can not use
- * the TERM_XTRA_FROSH notification (the per-row flush), since with a software
- * cursor, there are calls to Term_pict_cocoa(), Term_text_cocoa(), or
- * Term_wipe_cocoa() to take care of the old cursor position which are not
- * followed by a row flush.
+#ifdef JP
+static wchar_t convert_two_byte_eucjp_to_utf16_native(const char *cp);
+#endif
+
+/**
+ * Load sound effects based on sound.cfg within the xtra/sound directory;
+ * bridge to Cocoa to use NSSound for simple loading and playback, avoiding
+ * I/O latency by caching all sounds at the start. Inherits full sound
+ * format support from Quicktime base/plugins.
+ * pelpel favoured a plist-based parser for the future but .cfg support
+ * improves cross-platform compatibility.
*/
-enum PendingCellChangeType {
- CELL_CHANGE_NONE = 0,
- CELL_CHANGE_WIPE,
- CELL_CHANGE_TEXT,
- CELL_CHANGE_PICT
-};
-struct PendingCellChange {
- /*
- * For text rendering, stores the character as a wchar_t; for tile
- * rendering, stores the column in the tile set for the source tile.
- */
- union { wchar_t w; char c; } c;
- /*
- * For text rendering, stores the color; for tile rendering, stores the
- * row in the tile set for the source tile.
+@interface AngbandSoundCatalog : NSObject {
+@private
+ /**
+ * Stores instances of NSSound keyed by path so the same sound can be
+ * used for multiple events.
*/
- TERM_COLOR a;
- /*
- * For text rendering, is one if wc is a character that takes up two
- * columns (i.e. Japanese kanji); otherwise it is zero. For tile
- * rendering, Stores the column in the tile set for the terrain tile. */
- char tcol;
- /*
- * For tile rendering, stores the row in the tile set for the
- * terrain tile.
+ NSMutableDictionary *soundsByPath;
+ /**
+ * Stores arrays of NSSound keyed by event number.
*/
- TERM_COLOR trow;
- enum PendingCellChangeType change_type;
-};
+ NSMutableDictionary *soundArraysByEvent;
+}
-struct PendingRowChange
-{
- /*
- * These are the first and last columns, inclusive, that have been
- * modified. xmin is greater than xmax if no changes have been made.
- */
- int xmin, xmax;
- /*
- * This points to storage for a number of elements equal to the number
- * of columns (implicitly gotten from the enclosing AngbandContext).
- */
- struct PendingCellChange* cell_changes;
-};
+/**
+ * If NO, then playSound effectively becomes a do nothing operation.
+ */
+@property (getter=isEnabled) BOOL enabled;
-static struct PendingRowChange* create_row_change(int ncol)
-{
- struct PendingRowChange* prc =
- (struct PendingRowChange*) malloc(sizeof(struct PendingRowChange));
- struct PendingCellChange* pcc = (struct PendingCellChange*)
- malloc(ncol * sizeof(struct PendingCellChange));
- int i;
+/**
+ * Set up for lazy initialization in playSound(). Set enabled to NO.
+ */
+- (id)init;
- if (prc == 0 || pcc == 0) {
- if (pcc != 0) {
- free(pcc);
- }
- if (prc != 0) {
- free(prc);
- }
- return 0;
- }
+/**
+ * If self.enabled is YES and the given event has one or more sounds
+ * corresponding to it in the catalog, plays one of those sounds, chosen at
+ * random.
+ */
+- (void)playSound:(int)event;
- prc->xmin = ncol;
- prc->xmax = -1;
- prc->cell_changes = pcc;
- for (i = 0; i < ncol; ++i) {
- pcc[i].change_type = CELL_CHANGE_NONE;
- }
- return prc;
-}
+/**
+ * Impose an arbitrary limit on the number of possible samples per event.
+ * Currently not declaring this as a class property for compatibility with
+ * versions of Xcode prior to 8.
+ */
++ (int)maxSamples;
+/**
+ * Return the shared sound catalog instance, creating it if it does not
+ * exist yet. Currently not declaring this as a class property for
+ * compatibility with versions of Xcode prior to 8.
+ */
++ (AngbandSoundCatalog*)sharedSounds;
-static void destroy_row_change(struct PendingRowChange* prc)
-{
- if (prc != 0) {
- if (prc->cell_changes != 0) {
- free(prc->cell_changes);
- }
- free(prc);
+/**
+ * Release any resources associated with shared sounds.
+ */
++ (void)clearSharedSounds;
+
+@end
+
+@implementation AngbandSoundCatalog
+
+- (id)init {
+ if (self = [super init]) {
+ self->soundsByPath = nil;
+ self->soundArraysByEvent = nil;
+ self->_enabled = NO;
}
+ return self;
}
+- (void)playSound:(int)event {
+ if (! self.enabled) {
+ return;
+ }
-struct PendingChanges
-{
- /* Hold the number of rows specified at creation. */
- int nrow;
- /*
- * Hold the position set for the software cursor. Use negative indices
- * to indicate that the cursor is not displayed.
- */
- int xcurs, ycurs;
- /* Is nonzero if the cursor should be drawn at double the tile width. */
- int bigcurs;
- /* Record whether the changes include any text, picts, or wipes. */
- int has_text, has_pict, has_wipe;
- /*
- * These are the first and last rows, inclusive, that have been
- * modified. ymin is greater than ymax if no changes have been made.
- */
- int ymin, ymax;
- /*
- * This is an array of pointers to the changes. The number of elements
- * is the number of rows. An element will be a NULL pointer if no
- * modifications have been made to the row.
- */
- struct PendingRowChange** rows;
-};
-
+ /* Initialize when the first sound is played. */
+ if (self->soundArraysByEvent == nil) {
+ /* Build the "sound" path */
+ char sound_dir[1024];
+ path_build(sound_dir, sizeof(sound_dir), ANGBAND_DIR_XTRA, "sound");
-static struct PendingChanges* create_pending_changes(int ncol, int nrow)
-{
- struct PendingChanges* pc =
- (struct PendingChanges*) malloc(sizeof(struct PendingChanges));
- struct PendingRowChange** pprc = (struct PendingRowChange**)
- malloc(nrow * sizeof(struct PendingRowChange*));
- int i;
+ /* Find and open the config file */
+ char path[1024];
+ path_build(path, sizeof(path), sound_dir, "sound.cfg");
+ FILE *fff = my_fopen(path, "r");
- if (pc == 0 || pprc == 0) {
- if (pprc != 0) {
- free(pprc);
- }
- if (pc != 0) {
- free(pc);
+ /* Handle errors */
+ if (!fff) {
+ NSLog(@"The sound configuration file could not be opened.");
+ return;
}
- return 0;
- }
- pc->nrow = nrow;
- pc->xcurs = -1;
- pc->ycurs = -1;
- pc->bigcurs = 0;
- pc->has_text = 0;
- pc->has_pict = 0;
- pc->has_wipe = 0;
- pc->ymin = nrow;
- pc->ymax = -1;
- pc->rows = pprc;
- for (i = 0; i < nrow; ++i) {
- pprc[i] = 0;
- }
- return pc;
-}
+ self->soundsByPath = [[NSMutableDictionary alloc] init];
+ self->soundArraysByEvent = [[NSMutableDictionary alloc] init];
+ @autoreleasepool {
+ /*
+ * This loop may take a while depending on the count and size of
+ * samples to load.
+ */
+
+ /* Parse the file */
+ /* Lines are always of the form "name = sample [sample ...]" */
+ char buffer[2048];
+ while (my_fgets(fff, buffer, sizeof(buffer)) == 0) {
+ char *msg_name;
+ char *cfg_sample_list;
+ char *search;
+ char *cur_token;
+ char *next_token;
+ int event;
+ /* Skip anything not beginning with an alphabetic character */
+ if (!buffer[0] || !isalpha((unsigned char)buffer[0])) continue;
-static void destroy_pending_changes(struct PendingChanges* pc)
-{
- if (pc != 0) {
- if (pc->rows != 0) {
- int i;
+ /* Split the line into two: message name, and the rest */
+ search = strchr(buffer, ' ');
+ cfg_sample_list = strchr(search + 1, ' ');
+ if (!search) continue;
+ if (!cfg_sample_list) continue;
+
+ /* Set the message name, and terminate at first space */
+ msg_name = buffer;
+ search[0] = '\0';
- for (i = 0; i < pc->nrow; ++i) {
- if (pc->rows[i] != 0) {
- destroy_row_change(pc->rows[i]);
+ /* Make sure this is a valid event name */
+ for (event = MSG_MAX - 1; event >= 0; event--) {
+ if (strcmp(msg_name, angband_sound_name[event]) == 0)
+ break;
}
- }
- free(pc->rows);
- }
- free(pc);
- }
-}
+ if (event < 0) continue;
+ /*
+ * Advance the sample list pointer so it's at the beginning of
+ * text.
+ */
+ cfg_sample_list++;
+ if (!cfg_sample_list[0]) continue;
-static void clear_pending_changes(struct PendingChanges* pc)
-{
- pc->xcurs = -1;
- pc->ycurs = -1;
- pc->bigcurs = 0;
- pc->has_text = 0;
- pc->has_pict = 0;
- pc->has_wipe = 0;
- pc->ymin = pc->nrow;
- pc->ymax = -1;
- if (pc->rows != 0) {
- int i;
+ /* Terminate the current token */
+ cur_token = cfg_sample_list;
+ search = strchr(cur_token, ' ');
+ if (search) {
+ search[0] = '\0';
+ next_token = search + 1;
+ } else {
+ next_token = NULL;
+ }
- for (i = 0; i < pc->nrow; ++i) {
- if (pc->rows[i] != 0) {
- destroy_row_change(pc->rows[i]);
- pc->rows[i] = 0;
- }
- }
- }
-}
+ /*
+ * Now we find all the sample names and add them one by one
+ */
+ while (cur_token) {
+ NSMutableArray *soundSamples =
+ [self->soundArraysByEvent
+ objectForKey:[NSNumber numberWithInteger:event]];
+ if (soundSamples == nil) {
+ soundSamples = [[NSMutableArray alloc] init];
+ [self->soundArraysByEvent
+ setObject:soundSamples
+ forKey:[NSNumber numberWithInteger:event]];
+ }
+ int num = (int) soundSamples.count;
+ /* Don't allow too many samples */
+ if (num >= [AngbandSoundCatalog maxSamples]) break;
-/* Return zero if successful; otherwise return a nonzero value. */
-static int resize_pending_changes(struct PendingChanges* pc, int nrow)
-{
- struct PendingRowChange** pprc;
- int i;
+ NSString *token_string =
+ [NSString stringWithUTF8String:cur_token];
+ NSSound *sound =
+ [self->soundsByPath objectForKey:token_string];
- if (pc == 0) {
- return 1;
- }
+ if (! sound) {
+ /*
+ * We have to load the sound. Build the path to the
+ * sample.
+ */
+ path_build(path, sizeof(path), sound_dir, cur_token);
+ struct stat stb;
+ if (stat(path, &stb) == 0) {
+ /* Load the sound into memory */
+ sound = [[NSSound alloc]
+ initWithContentsOfFile:[NSString stringWithUTF8String:path]
+ byReference:YES];
+ if (sound) {
+ [self->soundsByPath setObject:sound
+ forKey:token_string];
+ }
+ }
+ }
- pprc = (struct PendingRowChange**)
- malloc(nrow * sizeof(struct PendingRowChange*));
- if (pprc == 0) {
- return 1;
- }
- for (i = 0; i < nrow; ++i) {
- pprc[i] = 0;
- }
+ /* Store it if we loaded it */
+ if (sound) {
+ [soundSamples addObject:sound];
+ }
- if (pc->rows != 0) {
- for (i = 0; i < pc->nrow; ++i) {
- if (pc->rows[i] != 0) {
- destroy_row_change(pc->rows[i]);
+ /* Figure out next token */
+ cur_token = next_token;
+ if (next_token) {
+ /* Try to find a space */
+ search = strchr(cur_token, ' ');
+
+ /*
+ * If we can find one, terminate, and set new "next".
+ */
+ if (search) {
+ search[0] = '\0';
+ next_token = search + 1;
+ } else {
+ /* Otherwise prevent infinite looping */
+ next_token = NULL;
+ }
+ }
+ }
}
}
- free(pc->rows);
- }
- pc->nrow = nrow;
- pc->xcurs = -1;
- pc->ycurs = -1;
- pc->bigcurs = 0;
- pc->has_text = 0;
- pc->has_pict = 0;
- pc->has_wipe = 0;
- pc->ymin = nrow;
- pc->ymax = -1;
- pc->rows = pprc;
- return 0;
-}
+ /* Close the file */
+ my_fclose(fff);
+ }
-/* The max number of glyphs we support. Currently this only affects
- * updateGlyphInfo() for the calculation of the tile size, fontAscender,
- * fontDescender, ncol_pre, and ncol_post (the glyphArray and glyphWidths
- * members of AngbandContext are only used in updateGlyphInfo()). The
- * rendering in drawWChar will work for glyphs not in updateGlyphInfo()'s
- * set, and that is used for rendering Japanese characters.
- */
-#define GLYPH_COUNT 256
+ @autoreleasepool {
+ NSMutableArray *samples =
+ [self->soundArraysByEvent
+ objectForKey:[NSNumber numberWithInteger:event]];
-/* An AngbandContext represents a logical Term (i.e. what Angband thinks is
- * a window). This typically maps to one NSView, but may map to more than one
- * NSView (e.g. the Test and real screen saver view). */
-@interface AngbandContext : NSObject <NSWindowDelegate>
-{
-@public
-
- /* The Angband term */
- term *terminal;
-
- /* Column and row cont, by default 80 x 24 */
- size_t cols;
- size_t rows;
-
- /* The size of the border between the window edge and the contents */
- NSSize borderSize;
-
- /* Our array of views */
- NSMutableArray *angbandViews;
-
- /* The buffered image */
- CGLayerRef angbandLayer;
+ if (samples == nil || samples.count == 0) {
+ return;
+ }
- /* The font of this context */
- NSFont *angbandViewFont;
-
- /* If this context owns a window, here it is */
- NSWindow *primaryWindow;
-
- /* "Glyph info": an array of the CGGlyphs and their widths corresponding to
- * the above font. */
- CGGlyph glyphArray[GLYPH_COUNT];
- CGFloat glyphWidths[GLYPH_COUNT];
-
- /* The size of one tile */
- NSSize tileSize;
-
- /* Font's ascender and descender */
- CGFloat fontAscender, fontDescender;
-
- /* Whether we are currently in live resize, which affects how big we render
- * our image */
- int inLiveResize;
-
- /* Last time we drew, so we can throttle drawing */
- CFAbsoluteTime lastRefreshTime;
+ /* Choose a random event. */
+ int s = randint0((int) samples.count);
+ NSSound *sound = samples[s];
- struct PendingChanges* changes;
- /*
- * These are the number of columns before or after, respectively, a text
- * change that may need to be redrawn.
- */
- int ncol_pre, ncol_post;
+ if ([sound isPlaying])
+ [sound stop];
-@private
+ /* Play the sound. */
+ [sound play];
+ }
+}
- BOOL _hasSubwindowFlags;
- BOOL _windowVisibilityChecked;
++ (int)maxSamples {
+ return 16;
}
-@property (nonatomic, assign) BOOL hasSubwindowFlags;
-@property (nonatomic, assign) BOOL windowVisibilityChecked;
+/**
+ * For sharedSounds and clearSharedSounds.
+ */
+static __strong AngbandSoundCatalog* gSharedSounds = nil;
-- (void)drawRect:(NSRect)rect inView:(NSView *)view;
++ (AngbandSoundCatalog*)sharedSounds {
+ if (gSharedSounds == nil) {
+ gSharedSounds = [[AngbandSoundCatalog alloc] init];
+ }
+ return gSharedSounds;
+}
-/* Called at initialization to set the term */
-- (void)setTerm:(term *)t;
++ (void)clearSharedSounds {
+ gSharedSounds = nil;
+}
-/* Called when the context is going down. */
-- (void)dispose;
+@end
-/* Returns the size of the image. */
-- (NSSize)imageSize;
+/**
+ * Each location in the terminal either stores a character, a tile,
+ * padding for a big tile, or padding for a big character (for example a
+ * kanji that takes two columns). These structures represent that. Note
+ * that tiles do not overlap with each other (excepting the double-height
+ * tiles, i.e. from the Shockbolt set; that's handled as a special case).
+ * Characters can overlap horizontally: that is for handling fonts that
+ * aren't fixed width.
+ */
+struct TerminalCellChar {
+ wchar_t glyph;
+ int attr;
+};
+struct TerminalCellTile {
+ /*
+ * These are the coordinates, within the tile set, for the foreground
+ * tile and background tile.
+ */
+ char fgdCol, fgdRow, bckCol, bckRow;
+};
+struct TerminalCellPadding {
+ /*
+ * If the cell at (x, y) is padding, the cell at (x - hoff, y - voff)
+ * has the attributes affecting the padded region.
+ */
+ unsigned char hoff, voff;
+};
+struct TerminalCell {
+ union {
+ struct TerminalCellChar ch;
+ struct TerminalCellTile ti;
+ struct TerminalCellPadding pd;
+ } v;
+ /*
+ * Used for big characters or tiles which are hscl x vscl cells.
+ * The upper left corner of the big tile or character is marked as
+ * TERM_CELL_TILE or TERM_CELL_CHAR. The remainder are marked as
+ * TERM_CELL_TILE_PADDING or TERM_CELL_CHAR_PADDING and have hscl and
+ * vscl set to matcn what's in the upper left corner. Big tiles are
+ * tiles scaled up to occupy more space. Big characters, on the other
+ * hand, are characters that naturally take up more space than standard
+ * for the font with the assumption that vscl will be one for any big
+ * character and hscl will hold the number of columns it occupies (likely
+ * just 2, i.e. for Japanese kanji).
+ */
+ unsigned char hscl;
+ unsigned char vscl;
+ /*
+ * Hold the offsets, as fractions of the tile size expressed as the
+ * rational numbers hoff_n / hoff_d and voff_n / voff_d, within the tile
+ * or character. For something that is not a big tile or character, these
+ * will be 0, 0, 1, and 1. For a big tile or character, these will be
+ * set when the tile or character is changed to be 0, 0, hscl, and vscl
+ * for the upper left corner and i, j, hscl, vscl for the padding element
+ * at (i, j) relative to the upper left corner. For a big tile or
+ * character that is partially overwritten, these are not modified in the
+ * parts that are not overwritten while hscl, vscl, and, for padding,
+ * v.pd.hoff and v.pd.voff are.
+ */
+ unsigned char hoff_n;
+ unsigned char voff_n;
+ unsigned char hoff_d;
+ unsigned char voff_d;
+ /*
+ * Is either TERM_CELL_CHAR, TERM_CELL_CHAR_PADDING, TERM_CELL_TILE, or
+ * TERM_CELL_TILE_PADDING.
+ */
+ unsigned char form;
+};
+#define TERM_CELL_CHAR (0x1)
+#define TERM_CELL_CHAR_PADDING (0x2)
+#define TERM_CELL_TILE (0x4)
+#define TERM_CELL_TILE_PADDING (0x8)
-/* Return the rect for a tile at given coordinates. */
-- (NSRect)rectInImageForTileAtX:(int)x Y:(int)y;
+struct TerminalCellBlock {
+ int ulcol, ulrow, w, h;
+};
-/* Draw the given wide character into the given tile rect. */
-- (void)drawWChar:(wchar_t)wchar inRect:(NSRect)tile context:(CGContextRef)ctx;
+struct TerminalCellLocation {
+ int col, row;
+};
-/* Locks focus on the Angband image, and scales the CTM appropriately. */
-- (CGContextRef)lockFocus;
+typedef int (*TerminalCellPredicate)(const struct TerminalCell*);
-/* Locks focus on the Angband image but does NOT scale the CTM. Appropriate
- * for drawing hairlines. */
-- (CGContextRef)lockFocusUnscaled;
+static int isTileTop(const struct TerminalCell *c)
+{
+ return (c->form == TERM_CELL_TILE ||
+ (c->form == TERM_CELL_TILE_PADDING && c->v.pd.voff == 0)) ? 1 : 0;
+}
-/* Unlocks focus. */
-- (void)unlockFocus;
+static int isPartiallyOverwrittenBigChar(const struct TerminalCell *c)
+{
+ if ((c->form & (TERM_CELL_CHAR | TERM_CELL_CHAR_PADDING)) != 0) {
+ /*
+ * When the tile is set in Term_pict_cocoa, hoff_d is the same as hscl
+ * and voff_d is the same as vscl. hoff_d and voff_d aren't modified
+ * after that, but hscl and vscl are in response to partial overwrites.
+ * If they're diffent, an overwrite has occurred.
+ */
+ return ((c->hoff_d > 1 || c->voff_d > 1) &&
+ (c->hoff_d != c->hscl || c->voff_d != c->vscl)) ? 1 : 0;
+ }
+ return 0;
+}
-/* Returns the primary window for this angband context, creating it if
- * necessary */
-- (NSWindow *)makePrimaryWindow;
+static int isCharNoPartial(const struct TerminalCell *c)
+{
+ return ((c->form & (TERM_CELL_CHAR | TERM_CELL_CHAR_PADDING)) != 0 &&
+ ! isPartiallyOverwrittenBigChar(c)) ? 1 : 0;
+}
-/* Called to add a new Angband view */
-- (void)addAngbandView:(AngbandView *)view;
+/**
+ * Since the drawing is decoupled from Angband's calls to the text_hook,
+ * pict_hook, wipe_hook, curs_hook, and bigcurs_hook callbacks of a terminal,
+ * maintain a version of the Terminal contents.
+ */
+@interface TerminalContents : NSObject {
+@private
+ struct TerminalCell *cells;
+}
-/* Make the context aware that one of its views changed size */
-- (void)angbandViewDidScale:(AngbandView *)view;
+/**
+ * Initialize with zero columns and zero rows.
+ */
+- (id)init;
-/* Handle becoming the main window */
-- (void)windowDidBecomeMain:(NSNotification *)notification;
+/**
+ * Initialize with nCol columns and nRow rows. All elements will be set to
+ * blanks.
+ */
+- (id)initWithColumns:(int)nCol rows:(int)nRow NS_DESIGNATED_INITIALIZER;
-/* Return whether the context's primary window is ordered in or not */
-- (BOOL)isOrderedIn;
+/**
+ * Resize to be nCol by nRow. Current contents still within the new bounds
+ * are preserved. Added areas are filled with blanks.
+ */
+- (void)resizeWithColumns:(int)nCol rows:(int)nRow;
-/* Return whether the context's primary window is key */
-- (BOOL)isMainWindow;
+/**
+ * Get the contents of a given cell.
+ */
+- (const struct TerminalCell*)getCellAtColumn:(int)icol row:(int)irow;
-/* Invalidate the whole image */
-- (void)setNeedsDisplay:(BOOL)val;
+/**
+ * Scans the row, irow, starting at the column, icol0, and stopping before the
+ * column, icol1. Returns the column index for the first cell that's within
+ * the given type mask, tm. If all of the cells in that range are not within
+ * the given type mask, returns icol1.
+ */
+- (int)scanForTypeMaskInRow:(int)irow mask:(unsigned int)tm col0:(int)icol0
+ col1:(int)icol1;
-/* Invalidate part of the image, with the rect expressed in base coordinates */
-- (void)setNeedsDisplayInBaseRect:(NSRect)rect;
+/**
+ * Scans the w x h block whose upper left corner is at (icol, irow). The
+ * scan starts at (icol + pcurs->col, irow + pcurs->row) and proceeds from
+ * left to right and top to bottom. At exit, pcurs will have the location
+ * (relative to icol, irow) of the first cell encountered that's within the
+ * given type mask, tm. If no such cell was found, pcurs->col will be w
+ * and pcurs->row will be h.
+ */
+- (void)scanForTypeMaskInBlockAtColumn:(int)icol row:(int)irow width:(int)w
+ height:(int)h mask:(unsigned int)tm
+ cursor:(struct TerminalCellLocation*)pcurs;
-/* Display (flush) our Angband views */
-- (void)displayIfNeeded;
+/**
+ * Scans the row, irow, starting at the column, icol0, and stopping before the
+ * column, icol1. Returns the column index for the first cell that
+ * func(cell_address) != rval. If all of the cells in the range satisfy the
+ * predicate, returns icol1.
+ */
+- (int)scanForPredicateInRow:(int)irow
+ predicate:(TerminalCellPredicate)func
+ desired:(int)rval
+ col0:(int)icol0
+ col1:(int)icol1;
-/* Resize context to size of contentRect, and optionally save size to
- * defaults */
-- (void)resizeTerminalWithContentRect: (NSRect)contentRect saveToDefaults: (BOOL)saveToDefaults;
+/**
+ * Change the contents to have the given string of n characters appear with
+ * the leftmost character at (icol, irow).
+ */
+- (void)setUniformAttributeTextRunAtColumn:(int)icol
+ row:(int)irow
+ n:(int)n
+ glyphs:(const char*)g
+ attribute:(int)a;
-/* Change the minimum size for the window associated with the context. */
-- (void)setMinimumWindowSize;
+/**
+ * Change the contents to have a tile scaled to w x h appear with its upper
+ * left corner at (icol, irow).
+ */
+- (void)setTileAtColumn:(int)icol
+ row:(int)irow
+ foregroundColumn:(char)fgdCol
+ foregroundRow:(char)fgdRow
+ backgroundColumn:(char)bckCol
+ backgroundRow:(char)bckRow
+ tileWidth:(int)w
+ tileHeight:(int)h;
-/* Called from the view to indicate that it is starting or ending live resize */
-- (void)viewWillStartLiveResize:(AngbandView *)view;
-- (void)viewDidEndLiveResize:(AngbandView *)view;
-- (void)saveWindowVisibleToDefaults: (BOOL)windowVisible;
-- (BOOL)windowVisibleUsingDefaults;
-
-/* Class methods */
-
-/* Begins an Angband game. This is the entry point for starting off. */
-+ (void)beginGame;
-
-/* Ends an Angband game. */
-+ (void)endGame;
-
-/* Internal method */
-- (AngbandView *)activeView;
-
-@end
+/**
+ * Wipe the w x h block whose upper left corner is at (icol, irow).
+ */
+- (void)wipeBlockAtColumn:(int)icol row:(int)irow width:(int)w height:(int)h;
/**
- * Generate a mask for the subwindow flags. The mask is just a safety check to
- * make sure that our windows show and hide as expected. This function allows
- * for future changes to the set of flags without needed to update it here
- * (unless the underlying types change).
+ * Wipe all the contents.
*/
-u32b AngbandMaskForValidSubwindowFlags(void)
-{
- int windowFlagBits = sizeof(*(window_flag)) * CHAR_BIT;
- int maxBits = MIN( 16, windowFlagBits );
- u32b mask = 0;
-
- for( int i = 0; i < maxBits; i++ )
- {
- if( window_flag_desc[i] != NULL )
- {
- mask |= (1 << i);
- }
- }
-
- return mask;
-}
+- (void)wipe;
/**
- * Check for changes in the subwindow flags and update window visibility.
- * This seems to be called for every user event, so we don't
- * want to do any unnecessary hiding or showing of windows.
+ * Wipe any tiles.
*/
-static void AngbandUpdateWindowVisibility(void)
-{
- /* Because this function is called frequently, we'll make the mask static.
- * It doesn't change between calls, as the flags themselves are hardcoded */
- static u32b validWindowFlagsMask = 0;
-
- if( validWindowFlagsMask == 0 )
- {
- validWindowFlagsMask = AngbandMaskForValidSubwindowFlags();
- }
-
- /* Loop through all of the subwindows and see if there is a change in the
- * flags. If so, show or hide the corresponding window. We don't care about
- * the flags themselves; we just want to know if any are set. */
- for( int i = 1; i < ANGBAND_TERM_MAX; i++ )
- {
- AngbandContext *angbandContext = angband_term[i]->data;
-
- if( angbandContext == nil )
- {
- continue;
- }
+- (void)wipeTiles;
- /* This horrible mess of flags is so that we can try to maintain some
- * user visibility preference. This should allow the user a window and
- * have it stay closed between application launches. However, this
- * means that when a subwindow is turned on, it will no longer appear
- * automatically. Angband has no concept of user control over window
- * visibility, other than the subwindow flags. */
- if( !angbandContext.windowVisibilityChecked )
- {
- if( [angbandContext windowVisibleUsingDefaults] )
- {
- [angbandContext->primaryWindow orderFront: nil];
- angbandContext.windowVisibilityChecked = YES;
- }
- else
- {
- [angbandContext->primaryWindow close];
- angbandContext.windowVisibilityChecked = NO;
- }
- }
- else
- {
- BOOL termHasSubwindowFlags = ((window_flag[i] & validWindowFlagsMask) > 0);
+/**
+ * Thie is a helper function for wipeBlockAtColumn.
+ */
+- (void)wipeBlockAuxAtColumn:(int)icol row:(int)irow width:(int)w
+ height:(int)h;
- if( angbandContext.hasSubwindowFlags && !termHasSubwindowFlags )
- {
- [angbandContext->primaryWindow close];
- angbandContext.hasSubwindowFlags = NO;
- [angbandContext saveWindowVisibleToDefaults: NO];
- }
- else if( !angbandContext.hasSubwindowFlags && termHasSubwindowFlags )
- {
- [angbandContext->primaryWindow orderFront: nil];
- angbandContext.hasSubwindowFlags = YES;
- [angbandContext saveWindowVisibleToDefaults: YES];
- }
- }
- }
+/**
+ * This is a helper function for checkForBigStuffOverwriteAtColumn.
+ */
+- (void) splitBlockAtColumn:(int)icol row:(int)irow n:(int)nsub
+ blocks:(const struct TerminalCellBlock*)b;
- /* Make the main window key so that user events go to the right spot */
- AngbandContext *mainWindow = angband_term[0]->data;
- [mainWindow->primaryWindow makeKeyAndOrderFront: nil];
-}
+/**
+ * This is a helper function for setUniformAttributeTextRunAtColumn,
+ * setTileAtColumn, and wipeBlockAtColumn. If a modification could partially
+ * overwrite a big character or tile, make adjustments so what's left can
+ * be handled appropriately in rendering.
+ */
+- (void)checkForBigStuffOverwriteAtColumn:(int)icol row:(int)irow
+ width:(int)w height:(int)h;
/**
- * ------------------------------------------------------------------------
- * Graphics support
- * ------------------------------------------------------------------------ */
+ * Position the upper left corner of the cursor at (icol, irow) and have it
+ * encompass w x h cells.
+ */
+- (void)setCursorAtColumn:(int)icol row:(int)irow width:(int)w height:(int)h;
/**
- * The tile image
+ * Remove the cursor. cursorColumn and cursorRow will be -1 until
+ * setCursorAtColumn is called.
*/
-static CGImageRef pict_image;
+- (void)removeCursor;
/**
- * Numbers of rows and columns in a tileset,
- * calculated by the PICT/PNG loading code
+ * Verify that everying is consistent.
*/
-static int pict_cols = 0;
-static int pict_rows = 0;
+- (void)assertInvariants;
/**
- * Requested graphics mode (as a grafID).
- * The current mode is stored in current_graphics_mode.
+ * Is the number of columns.
*/
-static int graf_mode_req = 0;
+@property (readonly) int columnCount;
/**
- * Helper function to check the various ways that graphics can be enabled,
- * guarding against NULL
+ * Is the number of rows.
*/
-static BOOL graphics_are_enabled(void)
-{
- return current_graphics_mode
- && current_graphics_mode->grafID != GRAPHICS_NONE;
-}
+@property (readonly) int rowCount;
/**
- * Hack -- game in progress
+ * Is the column index for the upper left corner of the cursor. It will be -1
+ * if the cursor is disabled.
*/
-static Boolean game_in_progress = FALSE;
+@property (readonly) int cursorColumn;
+/**
+ * Is the row index for the upper left corner of the cursor. It will be -1
+ * if the cursor is disabled.
+ */
+@property (readonly) int cursorRow;
-#pragma mark Prototypes
-static void wakeup_event_loop(void);
-static void hook_plog(const char *str);
-static void hook_quit(const char * str);
-static void load_prefs(void);
-static void load_sounds(void);
-static void init_windows(void);
-static void handle_open_when_ready(void);
-static void play_sound(int event);
-static BOOL check_events(int wait);
-static BOOL send_event(NSEvent *event);
-static void record_current_savefile(void);
-#ifdef JP
-static wchar_t convert_two_byte_eucjp_to_utf16_native(const char *cp);
-#endif
+/**
+ * Is the cursor width in number of cells.
+ */
+@property (readonly) int cursorWidth;
/**
- * Available values for 'wait'
+ * Is the cursor height in number of cells.
*/
-#define CHECK_EVENTS_DRAIN -1
-#define CHECK_EVENTS_NO_WAIT 0
-#define CHECK_EVENTS_WAIT 1
+@property (readonly) int cursorHeight;
+/**
+ * Return the character to be used for blanks.
+ */
++ (wchar_t)getBlankChar;
/**
- * Note when "open"/"new" become valid
+ * Return the attribute to be used for blanks.
*/
-static bool initialized = FALSE;
++ (int)getBlankAttribute;
-/* Methods for getting the appropriate NSUserDefaults */
-@interface NSUserDefaults (AngbandDefaults)
-+ (NSUserDefaults *)angbandDefaults;
@end
-@implementation NSUserDefaults (AngbandDefaults)
-+ (NSUserDefaults *)angbandDefaults
+@implementation TerminalContents
+
+- (id)init
{
- return [NSUserDefaults standardUserDefaults];
+ return [self initWithColumns:0 rows:0];
}
-@end
-/* Methods for pulling images out of the Angband bundle (which may be separate
- * from the current bundle in the case of a screensaver */
-@interface NSImage (AngbandImages)
-+ (NSImage *)angbandImage:(NSString *)name;
-@end
+- (id)initWithColumns:(int)nCol rows:(int)nRow
+{
+ if (self = [super init]) {
+ self->cells = malloc(nCol * nRow * sizeof(struct TerminalCell));
+ self->_columnCount = nCol;
+ self->_rowCount = nRow;
+ self->_cursorColumn = -1;
+ self->_cursorRow = -1;
+ self->_cursorWidth = 1;
+ self->_cursorHeight = 1;
+ [self wipe];
+ }
+ return self;
+}
-/* The NSView subclass that draws our Angband image */
-@interface AngbandView : NSView
+- (void)dealloc
{
- IBOutlet AngbandContext *angbandContext;
+ if (self->cells != 0) {
+ free(self->cells);
+ self->cells = 0;
+ }
}
-- (void)setAngbandContext:(AngbandContext *)context;
-- (AngbandContext *)angbandContext;
+- (void)resizeWithColumns:(int)nCol rows:(int)nRow
+{
+ /*
+ * Potential issue: big tiles or characters can become clipped by the
+ * resize. That will only matter if drawing occurs before the contents
+ * are updated by Angband. Even then, unless the drawing mode is used
+ * where AppKit doesn't clip to the window bounds, the only artifact will
+ * be clipping when drawn which is acceptable and doesn't require
+ * additional logic to either filter out the clipped big stuff here or
+ * to just clear it when drawing.
+ */
+ struct TerminalCell *newCells =
+ malloc(nCol * nRow * sizeof(struct TerminalCell));
+ struct TerminalCell *cellsOutCursor = newCells;
+ const struct TerminalCell *cellsInCursor = self->cells;
+ int nColCommon = (nCol < self.columnCount) ? nCol : self.columnCount;
+ int nRowCommon = (nRow < self.rowCount) ? nRow : self.rowCount;
+ wchar_t blank = [TerminalContents getBlankChar];
+ int blank_attr = [TerminalContents getBlankAttribute];
+ int i;
-@end
+ for (i = 0; i < nRowCommon; ++i) {
+ (void) memcpy(
+ cellsOutCursor,
+ cellsInCursor,
+ nColCommon * sizeof(struct TerminalCell));
+ cellsInCursor += self.columnCount;
+ for (int j = nColCommon; j < nCol; ++j) {
+ cellsOutCursor[j].v.ch.glyph = blank;
+ cellsOutCursor[j].v.ch.attr = blank_attr;
+ cellsOutCursor[j].hscl = 1;
+ cellsOutCursor[j].vscl = 1;
+ cellsOutCursor[j].hoff_n = 0;
+ cellsOutCursor[j].voff_n = 0;
+ cellsOutCursor[j].hoff_d = 1;
+ cellsOutCursor[j].voff_d = 1;
+ cellsOutCursor[j].form = TERM_CELL_CHAR;
+ }
+ cellsOutCursor += nCol;
+ }
+ while (cellsOutCursor != newCells + nCol * nRow) {
+ cellsOutCursor->v.ch.glyph = blank;
+ cellsOutCursor->v.ch.attr = blank_attr;
+ cellsOutCursor->hscl = 1;
+ cellsOutCursor->vscl = 1;
+ cellsOutCursor->hoff_n = 0;
+ cellsOutCursor->voff_n = 0;
+ cellsOutCursor->hoff_d = 1;
+ cellsOutCursor->voff_d = 1;
+ cellsOutCursor->form = TERM_CELL_CHAR;
+ ++cellsOutCursor;
+ }
-@implementation NSImage (AngbandImages)
+ free(self->cells);
+ self->cells = newCells;
+ self->_columnCount = nCol;
+ self->_rowCount = nRow;
+ if (self->_cursorColumn >= nCol || self->_cursorRow >= nRow) {
+ self->_cursorColumn = -1;
+ self->_cursorRow = -1;
+ } else {
+ if (self->_cursorColumn + self->_cursorWidth > nCol) {
+ self->_cursorWidth = nCol - self->_cursorColumn;
+ }
+ if (self->_cursorRow + self->_cursorHeight > nRow) {
+ self->_cursorHeight = nRow - self->_cursorRow;
+ }
+ }
+}
-/* Returns an image in the resource directoy of the bundle containing the
- * Angband view class. */
-+ (NSImage *)angbandImage:(NSString *)name
+- (const struct TerminalCell*)getCellAtColumn:(int)icol row:(int)irow
{
- NSBundle *bundle = [NSBundle bundleForClass:[AngbandView class]];
- NSString *path = [bundle pathForImageResource:name];
- NSImage *result;
- if (path) result = [[[NSImage alloc] initByReferencingFile:path] autorelease];
- else result = nil;
- return result;
+ return self->cells + icol + irow * self.columnCount;
}
-@end
+- (int)scanForTypeMaskInRow:(int)irow mask:(unsigned int)tm col0:(int)icol0
+ col1:(int)icol1
+{
+ int i = icol0;
+ const struct TerminalCell *cellsRow =
+ self->cells + irow * self.columnCount;
+ while (1) {
+ if (i >= icol1) {
+ return icol1;
+ }
+ if ((cellsRow[i].form & tm) != 0) {
+ return i;
+ }
+ ++i;
+ }
+}
-@implementation AngbandContext
+- (void)scanForTypeMaskInBlockAtColumn:(int)icol row:(int)irow width:(int)w
+ height:(int)h mask:(unsigned int)tm
+ cursor:(struct TerminalCellLocation*)pcurs
+{
+ const struct TerminalCell *cellsRow =
+ self->cells + (irow + pcurs->row) * self.columnCount;
+ while (1) {
+ if (pcurs->col == w) {
+ if (pcurs->row >= h - 1) {
+ pcurs->row = h;
+ return;
+ }
+ ++pcurs->row;
+ pcurs->col = 0;
+ cellsRow += self.columnCount;
+ }
+
+ if ((cellsRow[icol + pcurs->col].form & tm) != 0) {
+ return;
+ }
-@synthesize hasSubwindowFlags=_hasSubwindowFlags;
-@synthesize windowVisibilityChecked=_windowVisibilityChecked;
+ ++pcurs->col;
+ }
+}
-- (NSFont *)selectionFont
+- (int)scanForPredicateInRow:(int)irow
+ predicate:(TerminalCellPredicate)func
+ desired:(int)rval
+ col0:(int)icol0
+ col1:(int)icol1
{
- return angbandViewFont;
+ int i = icol0;
+ const struct TerminalCell *cellsRow =
+ self->cells + irow * self.columnCount;
+
+ while (1) {
+ if (i >= icol1) {
+ return icol1;
+ }
+ if (func(cellsRow + i) != rval) {
+ return i;
+ }
+ ++i;
+ }
}
-- (BOOL)useLiveResizeOptimization
+- (void)setUniformAttributeTextRunAtColumn:(int)icol
+ row:(int)irow
+ n:(int)n
+ glyphs:(const char*)g
+ attribute:(int)a
{
- /* If we have graphics turned off, text rendering is fast enough that we
- * don't need to use a live resize optimization. */
- return inLiveResize && graphics_are_enabled();
+ [self checkForBigStuffOverwriteAtColumn:icol row:irow width:n height:1];
+
+ struct TerminalCell *cellsRow = self->cells + irow * self.columnCount;
+ int i = icol;
+
+ while (i < icol + n) {
+#ifdef JP
+ if (iskanji(*g)) {
+ if (i == n - 1) {
+ /*
+ * The second byte of the character is past the end. Ignore
+ * the character.
+ */
+ break;
+ }
+ cellsRow[i].v.ch.glyph = convert_two_byte_eucjp_to_utf16_native(g);
+ cellsRow[i].v.ch.attr = a;
+ cellsRow[i].hscl = 2;
+ cellsRow[i].vscl = 1;
+ cellsRow[i].hoff_n = 0;
+ cellsRow[i].voff_n = 0;
+ cellsRow[i].hoff_d = 2;
+ cellsRow[i].voff_d = 1;
+ cellsRow[i].form = TERM_CELL_CHAR;
+ ++i;
+ cellsRow[i].v.pd.hoff = 1;
+ cellsRow[i].v.pd.voff = 0;
+ cellsRow[i].hscl = 2;
+ cellsRow[i].vscl = 1;
+ cellsRow[i].hoff_n = 1;
+ cellsRow[i].voff_n = 0;
+ cellsRow[i].hoff_d = 2;
+ cellsRow[i].voff_d = 1;
+ cellsRow[i].form = TERM_CELL_CHAR_PADDING;
+ ++i;
+ g += 2;
+ } else {
+ cellsRow[i].v.ch.glyph = *g++;
+ cellsRow[i].v.ch.attr = a;
+ cellsRow[i].hscl = 1;
+ cellsRow[i].vscl = 1;
+ cellsRow[i].hoff_n = 0;
+ cellsRow[i].voff_n = 0;
+ cellsRow[i].hoff_d = 1;
+ cellsRow[i].voff_d = 1;
+ cellsRow[i].form = TERM_CELL_CHAR;
+ ++i;
+ }
+#else
+ cellsRow[i].v.ch.glyph = *g++;
+ cellsRow[i].v.ch.attr = a;
+ cellsRow[i].hscl = 1;
+ cellsRow[i].vscl = 1;
+ cellsRow[i].hoff_n = 0;
+ cellsRow[i].voff_n = 0;
+ cellsRow[i].hoff_d = 1;
+ cellsRow[i].voff_d = 1;
+ cellsRow[i].form = TERM_CELL_CHAR;
+ ++i;
+#endif /* JP */
+ }
}
-- (NSSize)baseSize
+- (void)setTileAtColumn:(int)icol
+ row:(int)irow
+ foregroundColumn:(char)fgdCol
+ foregroundRow:(char)fgdRow
+ backgroundColumn:(char)bckCol
+ backgroundRow:(char)bckRow
+ tileWidth:(int)w
+ tileHeight:(int)h
{
- /* We round the base size down. If we round it up, I believe we may end up
- * with pixels that nobody "owns" that may accumulate garbage. In general
- * rounding down is harmless, because any lost pixels may be sopped up by
- * the border. */
- return NSMakeSize(floor(cols * tileSize.width + 2 * borderSize.width), floor(rows * tileSize.height + 2 * borderSize.height));
+ [self checkForBigStuffOverwriteAtColumn:icol row:irow width:w height:h];
+
+ struct TerminalCell *cellsRow = self->cells + irow * self.columnCount;
+
+ cellsRow[icol].v.ti.fgdCol = fgdCol;
+ cellsRow[icol].v.ti.fgdRow = fgdRow;
+ cellsRow[icol].v.ti.bckCol = bckCol;
+ cellsRow[icol].v.ti.bckRow = bckRow;
+ cellsRow[icol].hscl = w;
+ cellsRow[icol].vscl = h;
+ cellsRow[icol].hoff_n = 0;
+ cellsRow[icol].voff_n = 0;
+ cellsRow[icol].hoff_d = w;
+ cellsRow[icol].voff_d = h;
+ cellsRow[icol].form = TERM_CELL_TILE;
+
+ int ic;
+ for (ic = icol + 1; ic < icol + w; ++ic) {
+ cellsRow[ic].v.pd.hoff = ic - icol;
+ cellsRow[ic].v.pd.voff = 0;
+ cellsRow[ic].hscl = w;
+ cellsRow[ic].vscl = h;
+ cellsRow[ic].hoff_n = ic - icol;
+ cellsRow[ic].voff_n = 0;
+ cellsRow[ic].hoff_d = w;
+ cellsRow[ic].voff_d = h;
+ cellsRow[ic].form = TERM_CELL_TILE_PADDING;
+ }
+ cellsRow += self.columnCount;
+ for (int ir = irow + 1; ir < irow + h; ++ir) {
+ for (ic = icol; ic < icol + w; ++ic) {
+ cellsRow[ic].v.pd.hoff = ic - icol;
+ cellsRow[ic].v.pd.voff = ir - irow;
+ cellsRow[ic].hscl = w;
+ cellsRow[ic].vscl = h;
+ cellsRow[ic].hoff_n = ic - icol;
+ cellsRow[ic].voff_n = ir - irow;
+ cellsRow[ic].hoff_d = w;
+ cellsRow[ic].voff_d = h;
+ cellsRow[ic].form = TERM_CELL_TILE_PADDING;
+ }
+ cellsRow += self.columnCount;
+ }
}
-/* qsort-compatible compare function for CGSizes */
-static int compare_advances(const void *ap, const void *bp)
+- (void)wipeBlockAtColumn:(int)icol row:(int)irow width:(int)w height:(int)h
{
- const CGSize *a = ap, *b = bp;
- return (a->width > b->width) - (a->width < b->width);
+ [self checkForBigStuffOverwriteAtColumn:icol row:irow width:w height:h];
+ [self wipeBlockAuxAtColumn:icol row:irow width:w height:h];
}
-- (void)updateGlyphInfo
+- (void)wipe
{
- /* Update glyphArray and glyphWidths */
- NSFont *screenFont = [angbandViewFont screenFont];
+ wchar_t blank = [TerminalContents getBlankChar];
+ int blank_attr = [TerminalContents getBlankAttribute];
+ struct TerminalCell *cellCursor = self->cells +
+ self.columnCount * self.rowCount;
+
+ while (cellCursor != self->cells) {
+ --cellCursor;
+ cellCursor->v.ch.glyph = blank;
+ cellCursor->v.ch.attr = blank_attr;
+ cellCursor->hscl = 1;
+ cellCursor->vscl = 1;
+ cellCursor->hoff_n = 0;
+ cellCursor->voff_n = 0;
+ cellCursor->hoff_d = 1;
+ cellCursor->voff_d = 1;
+ cellCursor->form = TERM_CELL_CHAR;
+ }
+}
- /* Generate a string containing each MacRoman character */
- unsigned char latinString[GLYPH_COUNT];
- size_t i;
- for (i=0; i < GLYPH_COUNT; i++) latinString[i] = (unsigned char)i;
-
- /* Turn that into unichar. Angband uses ISO Latin 1. */
- unichar unicharString[GLYPH_COUNT] = {0};
- NSString *allCharsString = [[NSString alloc] initWithBytes:latinString length:sizeof latinString encoding:NSISOLatin1StringEncoding];
- [allCharsString getCharacters:unicharString range:NSMakeRange(0, MIN(GLYPH_COUNT, [allCharsString length]))];
- [allCharsString autorelease];
-
- /* Get glyphs */
- memset(glyphArray, 0, sizeof glyphArray);
- CTFontGetGlyphsForCharacters((CTFontRef)screenFont, unicharString, glyphArray, GLYPH_COUNT);
-
- /* Get advances. Record the max advance. */
- CGSize advances[GLYPH_COUNT] = {};
- CTFontGetAdvancesForGlyphs((CTFontRef)screenFont, kCTFontHorizontalOrientation, glyphArray, advances, GLYPH_COUNT);
- for (i=0; i < GLYPH_COUNT; i++) {
- glyphWidths[i] = advances[i].width;
+- (void)wipeTiles
+{
+ wchar_t blank = [TerminalContents getBlankChar];
+ int blank_attr = [TerminalContents getBlankAttribute];
+ struct TerminalCell *cellCursor = self->cells +
+ self.columnCount * self.rowCount;
+
+ while (cellCursor != self->cells) {
+ --cellCursor;
+ if ((cellCursor->form &
+ (TERM_CELL_TILE | TERM_CELL_TILE_PADDING)) != 0) {
+ cellCursor->v.ch.glyph = blank;
+ cellCursor->v.ch.attr = blank_attr;
+ cellCursor->hscl = 1;
+ cellCursor->vscl = 1;
+ cellCursor->hoff_n = 0;
+ cellCursor->voff_n = 0;
+ cellCursor->hoff_d = 1;
+ cellCursor->voff_d = 1;
+ cellCursor->form = TERM_CELL_CHAR;
+ }
}
-
- /* For good non-mono-font support, use the median advance. Start by sorting
- * all advances. */
- qsort(advances, GLYPH_COUNT, sizeof *advances, compare_advances);
-
- /* Skip over any initially empty run */
- size_t startIdx;
- for (startIdx = 0; startIdx < GLYPH_COUNT; startIdx++)
- {
- if (advances[startIdx].width > 0) break;
- }
-
- /* Pick the center to find the median */
- CGFloat medianAdvance = 0;
- if (startIdx < GLYPH_COUNT)
- {
- /* In case we have all zero advances for some reason */
- medianAdvance = advances[(startIdx + GLYPH_COUNT)/2].width;
- }
-
- /*
- * Record the ascender and descender. Some fonts, for instance DIN
- * Condensed and Rockwell in 10.14, the ascent on '@' exceeds that
- * reported by [screenFont ascender]. Get the overall bounding box
- * for the glyphs and use that instead of the ascender and descender
- * values if the bounding box result extends farther from the baseline.
- */
- CGRect bounds = CTFontGetBoundingRectsForGlyphs((CTFontRef) screenFont, kCTFontHorizontalOrientation, glyphArray, NULL, GLYPH_COUNT);
- fontAscender = [screenFont ascender];
- if (fontAscender < bounds.origin.y + bounds.size.height) {
- fontAscender = bounds.origin.y + bounds.size.height;
- }
- fontDescender = [screenFont descender];
- if (fontDescender > bounds.origin.y) {
- fontDescender = bounds.origin.y;
+}
+
+- (void)wipeBlockAuxAtColumn:(int)icol row:(int)irow width:(int)w
+ height:(int)h
+{
+ struct TerminalCell *cellsRow = self->cells + irow * self.columnCount;
+ wchar_t blank = [TerminalContents getBlankChar];
+ int blank_attr = [TerminalContents getBlankAttribute];
+
+ for (int ir = irow; ir < irow + h; ++ir) {
+ for (int ic = icol; ic < icol + w; ++ic) {
+ cellsRow[ic].v.ch.glyph = blank;
+ cellsRow[ic].v.ch.attr = blank_attr;
+ cellsRow[ic].hscl = 1;
+ cellsRow[ic].vscl = 1;
+ cellsRow[ic].hoff_n = 0;
+ cellsRow[ic].voff_n = 0;
+ cellsRow[ic].hoff_d = 1;
+ cellsRow[ic].voff_d = 1;
+ cellsRow[ic].form = TERM_CELL_CHAR;
+ }
+ cellsRow += self.columnCount;
}
+}
- /*
- * Record the tile size. Round both values up to have tile boundaries
- * match pixel boundaries.
- */
- tileSize.width = ceil(medianAdvance);
- tileSize.height = ceil(fontAscender - fontDescender);
+- (void) splitBlockAtColumn:(int)icol row:(int)irow n:(int)nsub
+ blocks:(const struct TerminalCellBlock*)b
+{
+ const struct TerminalCell *pulold = [self getCellAtColumn:icol row:irow];
- /*
- * Determine whether neighboring columns need to redrawn when a character
- * changes.
- */
- CGRect boxes[GLYPH_COUNT] = {};
- CGFloat beyond_right = 0.;
- CGFloat beyond_left = 0.;
- CTFontGetBoundingRectsForGlyphs(
- (CTFontRef)screenFont,
- kCTFontHorizontalOrientation,
- glyphArray,
- boxes,
- GLYPH_COUNT);
- for (i = 0; i < GLYPH_COUNT; i++) {
- /* Account for the compression and offset used by drawWChar(). */
- CGFloat compression, offset;
- CGFloat v;
+ for (int isub = 0; isub < nsub; ++isub) {
+ struct TerminalCell* cellsRow =
+ self->cells + b[isub].ulrow * self.columnCount;
- if (glyphWidths[i] <= tileSize.width) {
- compression = 1.;
- offset = 0.5 * (tileSize.width - glyphWidths[i]);
- } else {
- compression = tileSize.width / glyphWidths[i];
- offset = 0.;
+ /*
+ * Copy the data from the upper left corner of the big block to
+ * the upper left corner of the piece.
+ */
+ if (b[isub].ulcol != icol || b[isub].ulrow != irow) {
+ if (pulold->form == TERM_CELL_CHAR) {
+ cellsRow[b[isub].ulcol].v.ch = pulold->v.ch;
+ cellsRow[b[isub].ulcol].form = TERM_CELL_CHAR;
+ } else {
+ cellsRow[b[isub].ulcol].v.ti = pulold->v.ti;
+ cellsRow[b[isub].ulcol].form = TERM_CELL_TILE;
+ }
}
- v = (offset + boxes[i].origin.x) * compression;
- if (beyond_left > v) {
- beyond_left = v;
+ cellsRow[b[isub].ulcol].hscl = b[isub].w;
+ cellsRow[b[isub].ulcol].vscl = b[isub].h;
+
+ /*
+ * Point the padding elements in the piece to the new upper left
+ * corner.
+ */
+ int ic;
+ for (ic = b[isub].ulcol + 1; ic < b[isub].ulcol + b[isub].w; ++ic) {
+ cellsRow[ic].v.pd.hoff = ic - b[isub].ulcol;
+ cellsRow[ic].v.pd.voff = 0;
+ cellsRow[ic].hscl = b[isub].w;
+ cellsRow[ic].vscl = b[isub].h;
}
- v = (offset + boxes[i].origin.x + boxes[i].size.width) * compression;
- if (beyond_right < v) {
- beyond_right = v;
+ cellsRow += self.columnCount;
+ for (int ir = b[isub].ulrow + 1;
+ ir < b[isub].ulrow + b[isub].h;
+ ++ir) {
+ for (ic = b[isub].ulcol; ic < b[isub].ulcol + b[isub].w; ++ic) {
+ cellsRow[ic].v.pd.hoff = ic - b[isub].ulcol;
+ cellsRow[ic].v.pd.voff = ir - b[isub].ulrow;
+ cellsRow[ic].hscl = b[isub].w;
+ cellsRow[ic].vscl = b[isub].h;
+ }
+ cellsRow += self.columnCount;
}
}
- ncol_pre = ceil(-beyond_left / tileSize.width);
- if (beyond_right > tileSize.width) {
- ncol_post = ceil((beyond_right - tileSize.width) / tileSize.width);
- } else {
- ncol_post = 0;
- }
}
-- (void)updateImage
+- (void)checkForBigStuffOverwriteAtColumn:(int)icol row:(int)irow
+ width:(int)w height:(int)h
{
- NSSize size = NSMakeSize(1, 1);
-
- AngbandView *activeView = [self activeView];
- if (activeView)
- {
- /* If we are in live resize, draw as big as the screen, so we can scale
- * nicely to any size. If we are not in live resize, then use the
- * bounds of the active view. */
- NSScreen *screen;
- if ([self useLiveResizeOptimization] && (screen = [[activeView window] screen]) != NULL)
- {
- size = [screen frame].size;
- }
- else
- {
- size = [activeView bounds].size;
- }
- }
+ int ire = irow + h, ice = icol + w;
- CGLayerRelease(angbandLayer);
-
- /* Use the highest monitor scale factor on the system to work out what
- * scale to draw at - not the recommended method, but works where we
- * can't easily get the monitor the current draw is occurring on. */
- float angbandLayerScale = 1.0;
- if ([[NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)]) {
- for (NSScreen *screen in [NSScreen screens]) {
- angbandLayerScale = fmax(angbandLayerScale, [screen backingScaleFactor]);
- }
- }
-
- /* Make a bitmap context as an example for our layer */
- CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB();
- CGContextRef exampleCtx = CGBitmapContextCreate(NULL, 1, 1, 8 /* bits per component */, 48 /* bytesPerRow */, cs, kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Host);
- CGColorSpaceRelease(cs);
-
- /* Create the layer at the appropriate size */
- size.width = fmax(1, ceil(size.width * angbandLayerScale));
- size.height = fmax(1, ceil(size.height * angbandLayerScale));
- angbandLayer = CGLayerCreateWithContext(exampleCtx, *(CGSize *)&size, NULL);
-
- CFRelease(exampleCtx);
-
- /* Set the new context of the layer to draw at the correct scale */
- CGContextRef ctx = CGLayerGetContext(angbandLayer);
- CGContextScaleCTM(ctx, angbandLayerScale, angbandLayerScale);
-
- [self lockFocus];
- [[NSColor blackColor] set];
- NSRectFill((NSRect){NSZeroPoint, [self baseSize]});
- [self unlockFocus];
-}
+ for (int ir = irow; ir < ire; ++ir) {
+ for (int ic = icol; ic < ice; ++ic) {
+ const struct TerminalCell *pcell =
+ [self getCellAtColumn:ic row:ir];
-- (void)requestRedraw
-{
- if (! self->terminal) return;
-
- term *old = Term;
-
- /* Activate the term */
- Term_activate(self->terminal);
-
- /* Redraw the contents */
- Term_redraw();
-
- /* Flush the output */
- Term_fresh();
-
- /* Restore the old term */
- Term_activate(old);
-}
+ if ((pcell->form & (TERM_CELL_CHAR | TERM_CELL_TILE)) != 0 &&
+ (pcell->hscl > 1 || pcell->vscl > 1)) {
+ /*
+ * Lost chunk including upper left corner. Split into at most
+ * two new blocks.
+ */
+ /*
+ * Tolerate blocks that were clipped by a resize at some point.
+ */
+ int wb = (ic + pcell->hscl <= self.columnCount) ?
+ pcell->hscl : self.columnCount - ic;
+ int hb = (ir + pcell->vscl <= self.rowCount) ?
+ pcell->vscl : self.rowCount - ir;
+ struct TerminalCellBlock blocks[2];
+ int nsub = 0, ww, hw;
+
+ if (ice < ic + wb) {
+ /* Have something to the right not overwritten. */
+ blocks[nsub].ulcol = ice;
+ blocks[nsub].ulrow = ir;
+ blocks[nsub].w = ic + wb - ice;
+ blocks[nsub].h = (ire < ir + hb) ? ire - ir : hb;
+ ++nsub;
+ ww = ice - ic;
+ } else {
+ ww = wb;
+ }
+ if (ire < ir + hb) {
+ /* Have something below not overwritten. */
+ blocks[nsub].ulcol = ic;
+ blocks[nsub].ulrow = ire;
+ blocks[nsub].w = wb;
+ blocks[nsub].h = ir + hb - ire;
+ ++nsub;
+ hw = ire - ir;
+ } else {
+ hw = hb;
+ }
+ if (nsub > 0) {
+ [self splitBlockAtColumn:ic row:ir n:nsub blocks:blocks];
+ }
+ /*
+ * Wipe the part of the block that's destined to be overwritten
+ * so it doesn't receive further consideration in this loop.
+ * For efficiency, would like to have the loop skip over it or
+ * fill it with the desired content, but this is easier to
+ * implement.
+ */
+ [self wipeBlockAuxAtColumn:ic row:ir width:ww height:hw];
+ } else if ((pcell->form & (TERM_CELL_CHAR_PADDING |
+ TERM_CELL_TILE_PADDING)) != 0) {
+ /*
+ * Lost a chunk that doesn't cover the upper left corner. In
+ * general will split into up to four new blocks (one above,
+ * one to the left, one to the right, and one below).
+ */
+ int pcol = ic - pcell->v.pd.hoff;
+ int prow = ir - pcell->v.pd.voff;
+ const struct TerminalCell *pcell2 =
+ [self getCellAtColumn:pcol row:prow];
-- (void)setTerm:(term *)t
-{
- terminal = t;
-}
+ /*
+ * Tolerate blocks that were clipped by a resize at some point.
+ */
+ int wb = (pcol + pcell2->hscl <= self.columnCount) ?
+ pcell2->hscl : self.columnCount - pcol;
+ int hb = (prow + pcell2->vscl <= self.rowCount) ?
+ pcell2->vscl : self.rowCount - prow;
+ struct TerminalCellBlock blocks[4];
+ int nsub = 0, ww, hw;
+
+ if (prow < ir) {
+ /* Have something above not overwritten. */
+ blocks[nsub].ulcol = pcol;
+ blocks[nsub].ulrow = prow;
+ blocks[nsub].w = wb;
+ blocks[nsub].h = ir - prow;
+ ++nsub;
+ }
+ if (pcol < ic) {
+ /* Have something to the left not overwritten. */
+ blocks[nsub].ulcol = pcol;
+ blocks[nsub].ulrow = ir;
+ blocks[nsub].w = ic - pcol;
+ blocks[nsub].h =
+ (ire < prow + hb) ? ire - ir : prow + hb - ir;
+ ++nsub;
+ }
+ if (ice < pcol + wb) {
+ /* Have something to the right not overwritten. */
+ blocks[nsub].ulcol = ice;
+ blocks[nsub].ulrow = ir;
+ blocks[nsub].w = pcol + wb - ice;
+ blocks[nsub].h =
+ (ire < prow + hb) ? ire - ir : prow + hb - ir;
+ ++nsub;
+ ww = ice - ic;
+ } else {
+ ww = pcol + wb - ic;
+ }
+ if (ire < prow + hb) {
+ /* Have something below not overwritten. */
+ blocks[nsub].ulcol = pcol;
+ blocks[nsub].ulrow = ire;
+ blocks[nsub].w = wb;
+ blocks[nsub].h = prow + hb - ire;
+ ++nsub;
+ hw = ire - ir;
+ } else {
+ hw = prow + hb - ir;
+ }
-- (void)viewWillStartLiveResize:(AngbandView *)view
-{
-#if USE_LIVE_RESIZE_CACHE
- if (inLiveResize < INT_MAX) inLiveResize++;
- else [NSException raise:NSInternalInconsistencyException format:@"inLiveResize overflow"];
-
- if (inLiveResize == 1 && graphics_are_enabled())
- {
- [self updateImage];
-
- [self setNeedsDisplay:YES]; /* We'll need to redisplay everything anyways, so avoid creating all those little redisplay rects */
- [self requestRedraw];
+ [self splitBlockAtColumn:pcol row:prow n:nsub blocks:blocks];
+ /* Same rationale for wiping as above. */
+ [self wipeBlockAuxAtColumn:ic row:ir width:ww height:hw];
+ }
+ }
}
-#endif
}
-- (void)viewDidEndLiveResize:(AngbandView *)view
+- (void)setCursorAtColumn:(int)icol row:(int)irow width:(int)w height:(int)h
{
-#if USE_LIVE_RESIZE_CACHE
- if (inLiveResize > 0) inLiveResize--;
- else [NSException raise:NSInternalInconsistencyException format:@"inLiveResize underflow"];
-
- if (inLiveResize == 0 && graphics_are_enabled())
- {
- [self updateImage];
-
- [self setNeedsDisplay:YES]; /* We'll need to redisplay everything anyways, so avoid creating all those little redisplay rects */
- [self requestRedraw];
- }
-#endif
+ self->_cursorColumn = icol;
+ self->_cursorRow = irow;
+ self->_cursorWidth = w;
+ self->_cursorHeight = h;
}
-/**
- * If we're trying to limit ourselves to a certain number of frames per second,
- * then compute how long it's been since we last drew, and then wait until the
- * next frame has passed. */
-- (void)throttle
+- (void)removeCursor
{
- if (frames_per_second > 0)
- {
- CFAbsoluteTime now = CFAbsoluteTimeGetCurrent();
- CFTimeInterval timeSinceLastRefresh = now - lastRefreshTime;
- CFTimeInterval timeUntilNextRefresh = (1. / (double)frames_per_second) - timeSinceLastRefresh;
-
- if (timeUntilNextRefresh > 0)
- {
- usleep((unsigned long)(timeUntilNextRefresh * 1000000.));
- }
- }
- lastRefreshTime = CFAbsoluteTimeGetCurrent();
+ self->_cursorColumn = -1;
+ self->_cursorHeight = -1;
+ self->_cursorWidth = 1;
+ self->_cursorHeight = 1;
}
-- (void)drawWChar:(wchar_t)wchar inRect:(NSRect)tile context:(CGContextRef)ctx
+- (void)assertInvariants
{
- CGFloat tileOffsetY = fontAscender;
- CGFloat tileOffsetX = 0.0;
- NSFont *screenFont = [angbandViewFont screenFont];
- UniChar unicharString[2] = {(UniChar)wchar, 0};
+ const struct TerminalCell *cellsRow = self->cells;
- /* Get glyph and advance */
- CGGlyph thisGlyphArray[1] = { 0 };
- CGSize advances[1] = { { 0, 0 } };
- CTFontGetGlyphsForCharacters((CTFontRef)screenFont, unicharString, thisGlyphArray, 1);
- CGGlyph glyph = thisGlyphArray[0];
- CTFontGetAdvancesForGlyphs((CTFontRef)screenFont, kCTFontHorizontalOrientation, thisGlyphArray, advances, 1);
- CGSize advance = advances[0];
-
- /* If our font is not monospaced, our tile width is deliberately not big
- * enough for every character. In that event, if our glyph is too wide, we
- * need to compress it horizontally. Compute the compression ratio.
- * 1.0 means no compression. */
- double compressionRatio;
- if (advance.width <= NSWidth(tile))
- {
- /* Our glyph fits, so we can just draw it, possibly with an offset */
- compressionRatio = 1.0;
- tileOffsetX = (NSWidth(tile) - advance.width)/2;
- }
- else
- {
- /* Our glyph doesn't fit, so we'll have to compress it */
- compressionRatio = NSWidth(tile) / advance.width;
- tileOffsetX = 0;
- }
+ /*
+ * The comments with the definition for TerminalCell define the
+ * relationships of hoff_n, voff_n, hoff_d, voff_d, hscl, and vscl
+ * asserted here.
+ */
+ for (int ir = 0; ir < self.rowCount; ++ir) {
+ for (int ic = 0; ic < self.columnCount; ++ic) {
+ switch (cellsRow[ic].form) {
+ case TERM_CELL_CHAR:
+ assert(cellsRow[ic].hscl > 0 && cellsRow[ic].vscl > 0);
+ assert(cellsRow[ic].hoff_n < cellsRow[ic].hoff_d &&
+ cellsRow[ic].voff_n < cellsRow[ic].voff_d);
+ if (cellsRow[ic].hscl == cellsRow[ic].hoff_d) {
+ assert(cellsRow[ic].hoff_n == 0);
+ }
+ if (cellsRow[ic].vscl == cellsRow[ic].voff_d) {
+ assert(cellsRow[ic].voff_n == 0);
+ }
+ /*
+ * Verify that the padding elements have the correct tag
+ * and point back to this cell.
+ */
+ if (cellsRow[ic].hscl > 1 || cellsRow[ic].vscl > 1) {
+ const struct TerminalCell *cellsRow2 = cellsRow;
+
+ for (int ir2 = ir; ir2 < ir + cellsRow[ic].vscl; ++ir2) {
+ for (int ic2 = ic;
+ ic2 < ic + cellsRow[ic].hscl;
+ ++ic2) {
+ if (ir2 == ir && ic2 == ic) {
+ continue;
+ }
+ assert(cellsRow2[ic2].form ==
+ TERM_CELL_CHAR_PADDING);
+ assert(ic2 - cellsRow2[ic2].v.pd.hoff == ic &&
+ ir2 - cellsRow2[ic2].v.pd.voff == ir);
+ }
+ cellsRow2 += self.columnCount;
+ }
+ }
+ break;
-
- /* Now draw it */
- CGAffineTransform textMatrix = CGContextGetTextMatrix(ctx);
- CGFloat savedA = textMatrix.a;
+ case TERM_CELL_TILE:
+ assert(cellsRow[ic].hscl > 0 && cellsRow[ic].vscl > 0);
+ assert(cellsRow[ic].hoff_n < cellsRow[ic].hoff_d &&
+ cellsRow[ic].voff_n < cellsRow[ic].voff_d);
+ if (cellsRow[ic].hscl == cellsRow[ic].hoff_d) {
+ assert(cellsRow[ic].hoff_n == 0);
+ }
+ if (cellsRow[ic].vscl == cellsRow[ic].voff_d) {
+ assert(cellsRow[ic].voff_n == 0);
+ }
+ /*
+ * Verify that the padding elements have the correct tag
+ * and point back to this cell.
+ */
+ if (cellsRow[ic].hscl > 1 || cellsRow[ic].vscl > 1) {
+ const struct TerminalCell *cellsRow2 = cellsRow;
+
+ for (int ir2 = ir; ir2 < ir + cellsRow[ic].vscl; ++ir2) {
+ for (int ic2 = ic;
+ ic2 < ic + cellsRow[ic].hscl;
+ ++ic2) {
+ if (ir2 == ir && ic2 == ic) {
+ continue;
+ }
+ assert(cellsRow2[ic2].form ==
+ TERM_CELL_TILE_PADDING);
+ assert(ic2 - cellsRow2[ic2].v.pd.hoff == ic &&
+ ir2 - cellsRow2[ic2].v.pd.voff == ir);
+ }
+ cellsRow2 += self.columnCount;
+ }
+ }
+ break;
- /* Set the position */
- textMatrix.tx = tile.origin.x + tileOffsetX;
- textMatrix.ty = tile.origin.y + tileOffsetY;
+ case TERM_CELL_CHAR_PADDING:
+ assert(cellsRow[ic].hscl > 0 && cellsRow[ic].vscl > 0);
+ assert(cellsRow[ic].hoff_n < cellsRow[ic].hoff_d &&
+ cellsRow[ic].voff_n < cellsRow[ic].voff_d);
+ assert(cellsRow[ic].hoff_n > 0 || cellsRow[ic].voff_n > 0);
+ if (cellsRow[ic].hscl == cellsRow[ic].hoff_d) {
+ assert(cellsRow[ic].hoff_n == cellsRow[ic].v.pd.hoff);
+ }
+ if (cellsRow[ic].vscl == cellsRow[ic].voff_d) {
+ assert(cellsRow[ic].voff_n == cellsRow[ic].v.pd.voff);
+ }
+ assert(ic >= cellsRow[ic].v.pd.hoff &&
+ ir >= cellsRow[ic].v.pd.voff);
+ /*
+ * Verify that it's padding for something that can point
+ * back to it.
+ */
+ {
+ const struct TerminalCell *parent =
+ [self getCellAtColumn:(ic - cellsRow[ic].v.pd.hoff)
+ row:(ir - cellsRow[ic].v.pd.voff)];
+
+ assert(parent->form == TERM_CELL_CHAR);
+ assert(parent->hscl > cellsRow[ic].v.pd.hoff &&
+ parent->vscl > cellsRow[ic].v.pd.voff);
+ assert(parent->hscl == cellsRow[ic].hscl &&
+ parent->vscl == cellsRow[ic].vscl);
+ assert(parent->hoff_d == cellsRow[ic].hoff_d &&
+ parent->voff_d == cellsRow[ic].voff_d);
+ }
+ break;
- /* Maybe squish it horizontally. */
- if (compressionRatio != 1.)
- {
- textMatrix.a *= compressionRatio;
- }
+ case TERM_CELL_TILE_PADDING:
+ assert(cellsRow[ic].hscl > 0 && cellsRow[ic].vscl > 0);
+ assert(cellsRow[ic].hoff_n < cellsRow[ic].hoff_d &&
+ cellsRow[ic].voff_n < cellsRow[ic].voff_d);
+ assert(cellsRow[ic].hoff_n > 0 || cellsRow[ic].voff_n > 0);
+ if (cellsRow[ic].hscl == cellsRow[ic].hoff_d) {
+ assert(cellsRow[ic].hoff_n == cellsRow[ic].v.pd.hoff);
+ }
+ if (cellsRow[ic].vscl == cellsRow[ic].voff_d) {
+ assert(cellsRow[ic].voff_n == cellsRow[ic].v.pd.voff);
+ }
+ assert(ic >= cellsRow[ic].v.pd.hoff &&
+ ir >= cellsRow[ic].v.pd.voff);
+ /*
+ * Verify that it's padding for something that can point
+ * back to it.
+ */
+ {
+ const struct TerminalCell *parent =
+ [self getCellAtColumn:(ic - cellsRow[ic].v.pd.hoff)
+ row:(ir - cellsRow[ic].v.pd.voff)];
+
+ assert(parent->form == TERM_CELL_TILE);
+ assert(parent->hscl > cellsRow[ic].v.pd.hoff &&
+ parent->vscl > cellsRow[ic].v.pd.voff);
+ assert(parent->hscl == cellsRow[ic].hscl &&
+ parent->vscl == cellsRow[ic].vscl);
+ assert(parent->hoff_d == cellsRow[ic].hoff_d &&
+ parent->voff_d == cellsRow[ic].voff_d);
+ }
+ break;
- textMatrix = CGAffineTransformScale( textMatrix, 1.0, -1.0 );
- CGContextSetTextMatrix(ctx, textMatrix);
- CGContextShowGlyphsWithAdvances(ctx, &glyph, &CGSizeZero, 1);
-
- /* Restore the text matrix if we messed with the compression ratio */
- if (compressionRatio != 1.)
- {
- textMatrix.a = savedA;
- CGContextSetTextMatrix(ctx, textMatrix);
+ default:
+ assert(0);
+ }
+ }
+ cellsRow += self.columnCount;
}
-
- textMatrix = CGAffineTransformScale( textMatrix, 1.0, -1.0 );
- CGContextSetTextMatrix(ctx, textMatrix);
}
-/* Lock and unlock focus on our image or layer, setting up the CTM
- * appropriately. */
-- (CGContextRef)lockFocusUnscaled
++ (wchar_t)getBlankChar
{
- /* Create an NSGraphicsContext representing this CGLayer */
- CGContextRef ctx = CGLayerGetContext(angbandLayer);
- NSGraphicsContext *context = [NSGraphicsContext graphicsContextWithGraphicsPort:ctx flipped:NO];
- [NSGraphicsContext saveGraphicsState];
- [NSGraphicsContext setCurrentContext:context];
- CGContextSaveGState(ctx);
- return ctx;
+ return L' ';
}
-- (void)unlockFocus
++ (int)getBlankAttribute
{
- /* Restore the graphics state */
- CGContextRef ctx = [[NSGraphicsContext currentContext] graphicsPort];
- CGContextRestoreGState(ctx);
- [NSGraphicsContext restoreGraphicsState];
+ return 0;
}
-- (NSSize)imageSize
-{
- /* Return the size of our layer */
- CGSize result = CGLayerGetSize(angbandLayer);
- return NSMakeSize(result.width, result.height);
-}
+@end
-- (CGContextRef)lockFocus
-{
- return [self lockFocusUnscaled];
+/**
+ * TerminalChanges is used to track changes made via the text_hook, pict_hook,
+ * wipe_hook, curs_hook, and bigcurs_hook callbacks on the terminal since the
+ * last call to xtra_hook for TERM_XTRA_FRESH. The locations marked as changed
+ * can then be used to make bounding rectangles for the regions that need to
+ * be redisplayed.
+ */
+@interface TerminalChanges : NSObject {
+ int* colBounds;
+ /*
+ * Outside of firstChangedRow, lastChangedRow and what's in colBounds, the
+ * contents of this are handled lazily.
+ */
+ BOOL* marks;
}
+/**
+ * Initialize with zero columns and zero rows.
+ */
+- (id)init;
-- (NSRect)rectInImageForTileAtX:(int)x Y:(int)y
-{
- int flippedY = y;
- return NSMakeRect(x * tileSize.width + borderSize.width, flippedY * tileSize.height + borderSize.height, tileSize.width, tileSize.height);
-}
+/**
+ * Initialize with nCol columns and nRow rows. No changes will be marked.
+ */
+- (id)initWithColumns:(int)nCol rows:(int)nRow NS_DESIGNATED_INITIALIZER;
-- (void)setSelectionFont:(NSFont*)font adjustTerminal: (BOOL)adjustTerminal
-{
- /* Record the new font */
- [font retain];
- [angbandViewFont release];
- angbandViewFont = font;
-
- /* Update our glyph info */
- [self updateGlyphInfo];
+/**
+ * Resize to be nCol by nRow. Current contents still within the new bounds
+ * are preserved. Added areas are marked as unchanged.
+ */
+- (void)resizeWithColumns:(int)nCol rows:(int)nRow;
- if( adjustTerminal )
- {
- /* Adjust terminal to fit window with new font; save the new columns
- * and rows since they could be changed */
- NSRect contentRect = [self->primaryWindow contentRectForFrameRect: [self->primaryWindow frame]];
+/**
+ * Clears all marked changes.
+ */
+- (void)clear;
- [self setMinimumWindowSize];
- NSSize size = self->primaryWindow.contentMinSize;
- BOOL windowNeedsResizing = NO;
- if (contentRect.size.width < size.width) {
- contentRect.size.width = size.width;
- windowNeedsResizing = YES;
- }
- if (contentRect.size.height < size.height) {
- contentRect.size.height = size.height;
- windowNeedsResizing = YES;
- }
- if (windowNeedsResizing) {
- size.width = contentRect.size.width;
- size.height = contentRect.size.height;
- [self->primaryWindow setContentSize:size];
- }
- [self resizeTerminalWithContentRect: contentRect saveToDefaults: YES];
- }
-
- /* Update our image */
- [self updateImage];
-
- /* Get redrawn */
- [self requestRedraw];
-}
-
-- (id)init
-{
- if ((self = [super init]))
- {
- /* Default rows and cols */
- self->cols = 80;
- self->rows = 24;
-
- /* Default border size */
- self->borderSize = NSMakeSize(2, 2);
-
- /* Allocate our array of views */
- angbandViews = [[NSMutableArray alloc] init];
-
- self->changes = create_pending_changes(self->cols, self->rows);
- if (self->changes == 0) {
- NSLog(@"AngbandContext init: out of memory for pending changes");
- }
- self->ncol_pre = 0;
- self->ncol_post = 0;
-
- /* Make the image. Since we have no views, it'll just be a puny 1x1 image. */
- [self updateImage];
-
- _windowVisibilityChecked = NO;
- }
- return self;
-}
+- (BOOL)isChangedAtColumn:(int)icol row:(int)irow;
/**
- * Destroy all the receiver's stuff. This is intended to be callable more than
- * once.
+ * Scans the row, irow, starting at the column, icol0, and stopping before the
+ * column, icol1. Returns the column index for the first cell that is
+ * changed. The returned index will be equal to icol1 if all of the cells in
+ * the range are unchanged.
*/
-- (void)dispose
-{
- terminal = NULL;
-
- /* Disassociate ourselves from our angbandViews */
- [angbandViews makeObjectsPerformSelector:@selector(setAngbandContext:) withObject:nil];
- [angbandViews release];
- angbandViews = nil;
-
- /* Destroy the layer/image */
- CGLayerRelease(angbandLayer);
- angbandLayer = NULL;
-
- /* Font */
- [angbandViewFont release];
- angbandViewFont = nil;
-
- /* Window */
- [primaryWindow setDelegate:nil];
- [primaryWindow close];
- [primaryWindow release];
- primaryWindow = nil;
-
- /* Pending changes */
- destroy_pending_changes(self->changes);
- self->changes = 0;
-}
-
-/* Usual Cocoa fare */
-- (void)dealloc
-{
- [self dispose];
- [super dealloc];
-}
-
-
-
-#pragma mark -
-#pragma mark Directories and Paths Setup
+- (int)scanForChangedInRow:(int)irow col0:(int)icol0 col1:(int)icol1;
/**
- * Return the path for Angband's lib directory and bail if it isn't found. The
- * lib directory should be in the bundle's resources directory, since it's
- * copied when built.
+ * Scans the row, irow, starting at the column, icol0, and stopping before the
+ * column, icol1. returns the column index for the first cell that has not
+ * changed. The returned index will be equal to icol1 if all of the cells in
+ * the range have changed.
*/
-+ (NSString *)libDirectoryPath
-{
- NSString *bundleLibPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent: AngbandDirectoryNameLib];
- BOOL isDirectory = NO;
- BOOL libExists = [[NSFileManager defaultManager] fileExistsAtPath: bundleLibPath isDirectory: &isDirectory];
-
- if( !libExists || !isDirectory )
- {
- NSLog( @"[%@ %@]: can't find %@/ in bundle: isDirectory: %d libExists: %d", NSStringFromClass( [self class] ), NSStringFromSelector( _cmd ), AngbandDirectoryNameLib, isDirectory, libExists );
-
- NSString *msg = NSLocalizedStringWithDefaultValue(
- @"Error.MissingResources",
- AngbandMessageCatalog,
- [NSBundle mainBundle],
- @"Missing Resources",
- @"Alert text for missing resources");
- NSString *info = NSLocalizedStringWithDefaultValue(
- @"Error.MissingAngbandLib",
- AngbandMessageCatalog,
- [NSBundle mainBundle],
- @"Hengband was unable to find required resources and must quit. Please report a bug on the Angband forums.",
- @"Alert informative message for missing Angband lib/ folder");
- NSString *quit_label = NSLocalizedStringWithDefaultValue(
- @"Label.Quit", AngbandMessageCatalog, [NSBundle mainBundle],
- @"Quit", @"Quit");
- NSAlert *alert = [[NSAlert alloc] init];
+- (int)scanForUnchangedInRow:(int)irow col0:(int)icol0 col1:(int)icol1;
- /*
- * Note that NSCriticalAlertStyle was deprecated in 10.10. The
- * replacement is NSAlertStyleCritical.
- */
- alert.alertStyle = NSCriticalAlertStyle;
- alert.messageText = msg;
- alert.informativeText = info;
- [alert addButtonWithTitle:quit_label];
- NSModalResponse result = [alert runModal];
- [alert release];
- exit( 0 );
- }
+- (void)markChangedAtColumn:(int)icol row:(int)irow;
- return bundleLibPath;
-}
+- (void)markChangedRangeAtColumn:(int)icol row:(int)irow width:(int)w;
/**
- * Return the path for the directory where Angband should look for its standard
- * user file tree.
+ * Marks the block as changed who's upper left hand corner is at (icol, irow).
*/
-+ (NSString *)angbandDocumentsPath
-{
- NSString *documents = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject];
+- (void)markChangedBlockAtColumn:(int)icol
+ row:(int)irow
+ width:(int)w
+ height:(int)h;
-#if defined(SAFE_DIRECTORY)
- NSString *versionedDirectory = [NSString stringWithFormat: @"%@-%s", AngbandDirectoryNameBase, VERSION_STRING];
- return [documents stringByAppendingPathComponent: versionedDirectory];
-#else
- return [documents stringByAppendingPathComponent: AngbandDirectoryNameBase];
-#endif
-}
+/**
+ * Returns the index of the first changed column in the given row. That index
+ * will be equal to the number of columns if there are no changes in the row.
+ */
+- (int)getFirstChangedColumnInRow:(int)irow;
/**
- * Adjust directory paths as needed to correct for any differences needed by
- * Angband. \c init_file_paths() currently requires that all paths provided have
- * a trailing slash and all other platforms honor this.
- *
- * \param originalPath The directory path to adjust.
- * \return A path suitable for Angband or nil if an error occurred.
+ * Returns the index of the last changed column in the given row. That index
+ * will be equal to -1 if there are no changes in the row.
*/
-static NSString *AngbandCorrectedDirectoryPath(NSString *originalPath)
-{
- if ([originalPath length] == 0) {
- return nil;
- }
+- (int)getLastChangedColumnInRow:(int)irow;
- if (![originalPath hasSuffix: @"/"]) {
- return [originalPath stringByAppendingString: @"/"];
- }
+/**
+ * Is the number of columns.
+ */
+@property (readonly) int columnCount;
- return originalPath;
-}
+/**
+ * Is the number of rows.
+ */
+@property (readonly) int rowCount;
/**
- * Give Angband the base paths that should be used for the various directories
- * it needs. It will create any needed directories.
+ * Is the index of the first row with changes. Will be equal to the number
+ * of rows if there are no changes.
*/
-+ (void)prepareFilePathsAndDirectories
-{
- char libpath[PATH_MAX + 1] = "\0";
- NSString *libDirectoryPath = AngbandCorrectedDirectoryPath([self libDirectoryPath]);
- [libDirectoryPath getFileSystemRepresentation: libpath maxLength: sizeof(libpath)];
+@property (readonly) int firstChangedRow;
- char basepath[PATH_MAX + 1] = "\0";
- NSString *angbandDocumentsPath = AngbandCorrectedDirectoryPath([self angbandDocumentsPath]);
- [angbandDocumentsPath getFileSystemRepresentation: basepath maxLength: sizeof(basepath)];
+/**
+ * Is the index of the last row with changes. Will be equal to -1 if there
+ * are no changes.
+ */
+@property (readonly) int lastChangedRow;
- init_file_paths(libpath, libpath, basepath);
- create_needed_dirs();
-}
+@end
-#pragma mark -
+@implementation TerminalChanges
-#if 0
-/* From the Linux mbstowcs(3) man page:
- * If dest is NULL, n is ignored, and the conversion proceeds as above,
- * except that the converted wide characters are not written out to mem‐
- * ory, and that no length limit exists.
- */
-static size_t Term_mbcs_cocoa(wchar_t *dest, const char *src, int n)
+- (id)init
{
- int i;
- int count = 0;
+ return [self initWithColumns:0 rows:0];
+}
- /* Unicode code point to UTF-8
- * 0x0000-0x007f: 0xxxxxxx
- * 0x0080-0x07ff: 110xxxxx 10xxxxxx
- * 0x0800-0xffff: 1110xxxx 10xxxxxx 10xxxxxx
- * 0x10000-0x1fffff: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
- * Note that UTF-16 limits Unicode to 0x10ffff. This code is not
- * endian-agnostic.
- */
- for (i = 0; i < n || dest == NULL; i++) {
- if ((src[i] & 0x80) == 0) {
- if (dest != NULL) dest[count] = src[i];
- if (src[i] == 0) break;
- } else if ((src[i] & 0xe0) == 0xc0) {
- if (dest != NULL) dest[count] =
- (((unsigned char)src[i] & 0x1f) << 6)|
- ((unsigned char)src[i+1] & 0x3f);
- i++;
- } else if ((src[i] & 0xf0) == 0xe0) {
- if (dest != NULL) dest[count] =
- (((unsigned char)src[i] & 0x0f) << 12) |
- (((unsigned char)src[i+1] & 0x3f) << 6) |
- ((unsigned char)src[i+2] & 0x3f);
- i += 2;
- } else if ((src[i] & 0xf8) == 0xf0) {
- if (dest != NULL) dest[count] =
- (((unsigned char)src[i] & 0x0f) << 18) |
- (((unsigned char)src[i+1] & 0x3f) << 12) |
- (((unsigned char)src[i+2] & 0x3f) << 6) |
- ((unsigned char)src[i+3] & 0x3f);
- i += 3;
- } else {
- /* Found an invalid multibyte sequence */
- return (size_t)-1;
- }
- count++;
+- (id)initWithColumns:(int)nCol rows:(int)nRow
+{
+ if (self = [super init]) {
+ self->colBounds = malloc(2 * nRow * sizeof(int));
+ self->marks = malloc(nCol * nRow * sizeof(BOOL));
+ self->_columnCount = nCol;
+ self->_rowCount = nRow;
+ [self clear];
}
- return count;
+ return self;
}
-#endif
-/**
- * Entry point for initializing Angband
- */
-+ (void)beginGame
+- (void)dealloc
{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
- /* Hooks in some "z-util.c" hooks */
- plog_aux = hook_plog;
- quit_aux = hook_quit;
-
- /* Initialize file paths */
- [self prepareFilePathsAndDirectories];
-
- /* Load preferences */
- load_prefs();
-
- /* Prepare the windows */
- init_windows();
-
- /* Set up game event handlers */
- /* init_display(); */
-
- /* Register the sound hook */
- /* sound_hook = play_sound; */
-
- /* Initialise game */
- init_angband();
-
- /* This is not incorporated into Hengband's init_angband() yet. */
- init_graphics_modes();
-
- /* Note the "system" */
- ANGBAND_SYS = "mac";
-
- /* Initialize some save file stuff */
- player_egid = getegid();
-
- /* We are now initialized */
- initialized = TRUE;
-
- /* Handle "open_when_ready" */
- handle_open_when_ready();
-
- /* Handle pending events (most notably update) and flush input */
- Term_flush();
-
- /* Prompt the user. */
- int message_row = (Term->hgt - 23) / 5 + 23;
- Term_erase(0, message_row, 255);
- put_str(
-#ifdef JP
- "['ファイル' メニューから '新' または '開く' を選択します]",
- message_row, (Term->wid - 57) / 2
-#else
- "[Choose 'New' or 'Open' from the 'File' menu]",
- message_row, (Term->wid - 45) / 2
-#endif
- );
- Term_fresh();
-
- /*
- * Play a game -- "new_game" is set by "new", "open" or the open document
- * even handler as appropriate
- */
-
- [pool drain];
-
- while (!game_in_progress) {
- NSAutoreleasePool *splashScreenPool = [[NSAutoreleasePool alloc] init];
- NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantFuture] inMode:NSDefaultRunLoopMode dequeue:YES];
- if (event) [NSApp sendEvent:event];
- [splashScreenPool drain];
+ if (self->marks != 0) {
+ free(self->marks);
+ self->marks = 0;
+ }
+ if (self->colBounds != 0) {
+ free(self->colBounds);
+ self->colBounds = 0;
}
+}
- Term_fresh();
- play_game(new_game);
+- (void)resizeWithColumns:(int)nCol rows:(int)nRow
+{
+ int* newColBounds = malloc(2 * nRow * sizeof(int));
+ BOOL* newMarks = malloc(nCol * nRow * sizeof(BOOL));
+ int nRowCommon = (nRow < self.rowCount) ? nRow : self.rowCount;
+
+ if (self.firstChangedRow <= self.lastChangedRow &&
+ self.firstChangedRow < nRowCommon) {
+ BOOL* marksOutCursor = newMarks + self.firstChangedRow * nCol;
+ const BOOL* marksInCursor =
+ self->marks + self.firstChangedRow * self.columnCount;
+ int nColCommon = (nCol < self.columnCount) ? nCol : self.columnCount;
+
+ if (self.lastChangedRow >= nRowCommon) {
+ self->_lastChangedRow = nRowCommon - 1;
+ }
+ for (int i = self.firstChangedRow; i <= self.lastChangedRow; ++i) {
+ if (self->colBounds[i + i] < nColCommon) {
+ newColBounds[i + i] = self->colBounds[i + i];
+ newColBounds[i + i + 1] =
+ (self->colBounds[i + i + 1] < nColCommon) ?
+ self->colBounds[i + i + 1] : nColCommon - 1;
+ (void) memcpy(
+ marksOutCursor + self->colBounds[i + i],
+ marksInCursor + self->colBounds[i + i],
+ (newColBounds[i + i + 1] - newColBounds[i + i] + 1) *
+ sizeof(BOOL));
+ marksInCursor += self.columnCount;
+ marksOutCursor += nCol;
+ } else {
+ self->colBounds[i + i] = nCol;
+ self->colBounds[i + i + 1] = -1;
+ }
+ }
+ } else {
+ self->_firstChangedRow = nRow;
+ self->_lastChangedRow = -1;
+ }
- quit(NULL);
+ free(self->colBounds);
+ self->colBounds = newColBounds;
+ free(self->marks);
+ self->marks = newMarks;
+ self->_columnCount = nCol;
+ self->_rowCount = nRow;
}
-+ (void)endGame
-{
- /* Hack -- Forget messages */
- msg_flag = FALSE;
-
- p_ptr->playing = FALSE;
- p_ptr->leaving = TRUE;
- quit_when_ready = TRUE;
+- (void)clear
+{
+ self->_firstChangedRow = self.rowCount;
+ self->_lastChangedRow = -1;
}
-- (void)addAngbandView:(AngbandView *)view
+- (BOOL)isChangedAtColumn:(int)icol row:(int)irow
{
- if (! [angbandViews containsObject:view])
- {
- [angbandViews addObject:view];
- [self updateImage];
- [self setNeedsDisplay:YES]; /* We'll need to redisplay everything anyways, so avoid creating all those little redisplay rects */
- [self requestRedraw];
+ if (irow < self.firstChangedRow || irow > self.lastChangedRow) {
+ return NO;
}
+ if (icol < self->colBounds[irow + irow] ||
+ icol > self->colBounds[irow + irow + 1]) {
+ return NO;
+ }
+ return self->marks[icol + irow * self.columnCount];
}
-/**
- * We have this notion of an "active" AngbandView, which is the largest - the
- * idea being that in the screen saver, when the user hits Test in System
- * Preferences, we don't want to keep driving the AngbandView in the
- * background. Our active AngbandView is the widest - that's a hack all right.
- * Mercifully when we're just playing the game there's only one view.
- */
-- (AngbandView *)activeView
+- (int)scanForChangedInRow:(int)irow col0:(int)icol0 col1:(int)icol1
{
- if ([angbandViews count] == 1)
- return [angbandViews objectAtIndex:0];
-
- AngbandView *result = nil;
- float maxWidth = 0;
- for (AngbandView *angbandView in angbandViews)
- {
- float width = [angbandView frame].size.width;
- if (width > maxWidth)
- {
- maxWidth = width;
- result = angbandView;
- }
+ if (irow < self.firstChangedRow || irow > self.lastChangedRow ||
+ icol0 > self->colBounds[irow + irow + 1]) {
+ return icol1;
}
- return result;
-}
-- (void)angbandViewDidScale:(AngbandView *)view
-{
- /* If we're live-resizing with graphics, we're using the live resize
- * optimization, so don't update the image. Otherwise do it. */
- if (! (inLiveResize && graphics_are_enabled()) && view == [self activeView])
- {
- [self updateImage];
-
- [self setNeedsDisplay:YES]; /*we'll need to redisplay everything anyways, so avoid creating all those little redisplay rects */
- [self requestRedraw];
+ int i = (icol0 > self->colBounds[irow + irow]) ?
+ icol0 : self->colBounds[irow + irow];
+ int i1 = (icol1 <= self->colBounds[irow + irow + 1]) ?
+ icol1 : self->colBounds[irow + irow + 1] + 1;
+ const BOOL* marksCursor = self->marks + irow * self.columnCount;
+ while (1) {
+ if (i >= i1) {
+ return icol1;
+ }
+ if (marksCursor[i]) {
+ return i;
+ }
+ ++i;
}
}
-
-- (void)removeAngbandView:(AngbandView *)view
+- (int)scanForUnchangedInRow:(int)irow col0:(int)icol0 col1:(int)icol1
{
- if ([angbandViews containsObject:view])
- {
- [angbandViews removeObject:view];
- [self updateImage];
- [self setNeedsDisplay:YES]; /* We'll need to redisplay everything anyways, so avoid creating all those little redisplay rects */
- if ([angbandViews count]) [self requestRedraw];
+ if (irow < self.firstChangedRow || irow > self.lastChangedRow ||
+ icol0 < self->colBounds[irow + irow] ||
+ icol0 > self->colBounds[irow + irow + 1]) {
+ return icol0;
}
-}
+ int i = icol0;
+ int i1 = (icol1 <= self->colBounds[irow + irow + 1]) ?
+ icol1 : self->colBounds[irow + irow + 1] + 1;
+ const BOOL* marksCursor = self->marks + irow * self.columnCount;
+ while (1) {
+ if (i >= i1 || ! marksCursor[i]) {
+ return i;
+ }
+ ++i;
+ }
+}
-static NSMenuItem *superitem(NSMenuItem *self)
+- (void)markChangedAtColumn:(int)icol row:(int)irow
{
- NSMenu *supermenu = [[self menu] supermenu];
- int index = [supermenu indexOfItemWithSubmenu:[self menu]];
- if (index == -1) return nil;
- else return [supermenu itemAtIndex:index];
+ [self markChangedBlockAtColumn:icol row:irow width:1 height:1];
}
-
-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+- (void)markChangedRangeAtColumn:(int)icol row:(int)irow width:(int)w
{
- int tag = [menuItem tag];
- SEL sel = [menuItem action];
- if (sel == @selector(setGraphicsMode:))
- {
- [menuItem setState: (tag == graf_mode_req)];
- return YES;
- }
- else
- {
- return YES;
- }
+ [self markChangedBlockAtColumn:icol row:irow width:w height:1];
}
-- (NSWindow *)makePrimaryWindow
+- (void)markChangedBlockAtColumn:(int)icol
+ row:(int)irow
+ width:(int)w
+ height:(int)h
{
- if (! primaryWindow)
- {
- /* This has to be done after the font is set, which it already is in
- * term_init_cocoa() */
- CGFloat width = self->cols * tileSize.width + borderSize.width * 2.0;
- CGFloat height = self->rows * tileSize.height + borderSize.height * 2.0;
- NSRect contentRect = NSMakeRect( 0.0, 0.0, width, height );
+ if (irow + h <= self.firstChangedRow) {
+ /* All prior marked regions are on rows after the requested block. */
+ if (self.firstChangedRow > self.lastChangedRow) {
+ self->_lastChangedRow = irow + h - 1;
+ } else {
+ for (int i = irow + h; i < self.firstChangedRow; ++i) {
+ self->colBounds[i + i] = self.columnCount;
+ self->colBounds[i + i + 1] = -1;
+ }
+ }
+ self->_firstChangedRow = irow;
+
+ BOOL* marksCursor = self->marks + irow * self.columnCount;
+ for (int i = irow; i < irow + h; ++i) {
+ self->colBounds[i + i] = icol;
+ self->colBounds[i + i + 1] = icol + w - 1;
+ for (int j = icol; j < icol + w; ++j) {
+ marksCursor[j] = YES;
+ }
+ marksCursor += self.columnCount;
+ }
+ } else if (irow > self.lastChangedRow) {
+ /* All prior marked regions are on rows before the requested block. */
+ int i;
- NSUInteger styleMask = NSTitledWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask;
+ for (i = self.lastChangedRow + 1; i < irow; ++i) {
+ self->colBounds[i + i] = self.columnCount;
+ self->colBounds[i + i + 1] = -1;
+ }
+ self->_lastChangedRow = irow + h - 1;
+
+ BOOL* marksCursor = self->marks + irow * self.columnCount;
+ for (i = irow; i < irow + h; ++i) {
+ self->colBounds[i + i] = icol;
+ self->colBounds[i + i + 1] = icol + w - 1;
+ for (int j = icol; j < icol + w; ++j) {
+ marksCursor[j] = YES;
+ }
+ marksCursor += self.columnCount;
+ }
+ } else {
+ /*
+ * There's overlap between the rows of the requested block and prior
+ * marked regions.
+ */
+ BOOL* marksCursor = self->marks + irow * self.columnCount;
+ int irow0, h0;
+
+ if (irow < self.firstChangedRow) {
+ /* Handle any leading rows where there's no overlap. */
+ for (int i = irow; i < self.firstChangedRow; ++i) {
+ self->colBounds[i + i] = icol;
+ self->colBounds[i + i + 1] = icol + w - 1;
+ for (int j = icol; j < icol + w; ++j) {
+ marksCursor[j] = YES;
+ }
+ marksCursor += self.columnCount;
+ }
+ irow0 = self.firstChangedRow;
+ h0 = irow + h - self.firstChangedRow;
+ self->_firstChangedRow = irow;
+ } else {
+ irow0 = irow;
+ h0 = h;
+ }
- /* Make every window other than the main window closable */
- if( angband_term[0]->data != self )
- {
- styleMask |= NSClosableWindowMask;
- }
+ /* Handle potentially overlapping rows */
+ if (irow0 + h0 > self.lastChangedRow + 1) {
+ h0 = self.lastChangedRow + 1 - irow0;
+ self->_lastChangedRow = irow + h - 1;
+ }
- primaryWindow = [[NSWindow alloc] initWithContentRect:contentRect styleMask: styleMask backing:NSBackingStoreBuffered defer:YES];
+ int i;
+ for (i = irow0; i < irow0 + h0; ++i) {
+ if (icol + w <= self->colBounds[i + i]) {
+ int j;
- /* Not to be released when closed */
- [primaryWindow setReleasedWhenClosed:NO];
- [primaryWindow setExcludedFromWindowsMenu: YES]; /* we're using custom window menu handling */
+ for (j = icol; j < icol + w; ++j) {
+ marksCursor[j] = YES;
+ }
+ if (self->colBounds[i + i] > self->colBounds[i + i + 1]) {
+ self->colBounds[i + i + 1] = icol + w - 1;
+ } else {
+ for (j = icol + w; j < self->colBounds[i + i]; ++j) {
+ marksCursor[j] = NO;
+ }
+ }
+ self->colBounds[i + i] = icol;
+ } else if (icol > self->colBounds[i + i + 1]) {
+ int j;
- /* Make the view */
- AngbandView *angbandView = [[AngbandView alloc] initWithFrame:contentRect];
- [angbandView setAngbandContext:self];
- [angbandViews addObject:angbandView];
- [primaryWindow setContentView:angbandView];
- [angbandView release];
+ for (j = self->colBounds[i + i + 1] + 1; j < icol; ++j) {
+ marksCursor[j] = NO;
+ }
+ for (j = icol; j < icol + w; ++j) {
+ marksCursor[j] = YES;
+ }
+ self->colBounds[i + i + 1] = icol + w - 1;
+ } else {
+ if (icol < self->colBounds[i + i]) {
+ self->colBounds[i + i] = icol;
+ }
+ if (icol + w > self->colBounds[i + i + 1]) {
+ self->colBounds[i + i + 1] = icol + w - 1;
+ }
+ for (int j = icol; j < icol + w; ++j) {
+ marksCursor[j] = YES;
+ }
+ }
+ marksCursor += self.columnCount;
+ }
- /* We are its delegate */
- [primaryWindow setDelegate:self];
+ /* Handle any trailing rows where there's no overlap. */
+ for (i = irow0 + h0; i < irow + h; ++i) {
+ self->colBounds[i + i] = icol;
+ self->colBounds[i + i + 1] = icol + w - 1;
+ for (int j = icol; j < icol + w; ++j) {
+ marksCursor[j] = YES;
+ }
+ marksCursor += self.columnCount;
+ }
+ }
+}
- /* Update our image, since this is probably the first angband view
- * we've gotten. */
- [self updateImage];
+- (int)getFirstChangedColumnInRow:(int)irow
+{
+ if (irow < self.firstChangedRow || irow > self.lastChangedRow) {
+ return self.columnCount;
}
- return primaryWindow;
+ return self->colBounds[irow + irow];
}
+- (int)getLastChangedColumnInRow:(int)irow
+{
+ if (irow < self.firstChangedRow || irow > self.lastChangedRow) {
+ return -1;
+ }
+ return self->colBounds[irow + irow + 1];
+}
+@end
-#pragma mark View/Window Passthrough
/**
- * This is what our views call to get us to draw to the window
+ * Draws one tile as a helper function for AngbandContext's drawRect.
*/
-- (void)drawRect:(NSRect)rect inView:(NSView *)view
+static void draw_image_tile(
+ NSGraphicsContext* nsContext,
+ CGContextRef cgContext,
+ CGImageRef image,
+ NSRect srcRect,
+ NSRect dstRect,
+ NSCompositingOperation op)
{
- /* Take this opportunity to throttle so we don't flush faster than desired.
- */
- BOOL viewInLiveResize = [view inLiveResize];
- if (! viewInLiveResize) [self throttle];
-
- /* With a GLayer, use CGContextDrawLayerInRect */
- CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
- NSRect bounds = [view bounds];
- if (viewInLiveResize) CGContextSetInterpolationQuality(context, kCGInterpolationLow);
- CGContextSetBlendMode(context, kCGBlendModeCopy);
- CGContextDrawLayerInRect(context, *(CGRect *)&bounds, angbandLayer);
- if (viewInLiveResize) CGContextSetInterpolationQuality(context, kCGInterpolationDefault);
-}
+ /* Flip the source rect since the source image is flipped */
+ CGAffineTransform flip = CGAffineTransformIdentity;
+ flip = CGAffineTransformTranslate(flip, 0.0, CGImageGetHeight(image));
+ flip = CGAffineTransformScale(flip, 1.0, -1.0);
+ CGRect flippedSourceRect =
+ CGRectApplyAffineTransform(NSRectToCGRect(srcRect), flip);
-- (BOOL)isOrderedIn
-{
- return [[[angbandViews lastObject] window] isVisible];
+ /*
+ * When we use high-quality resampling to draw a tile, pixels from outside
+ * the tile may bleed in, causing graphics artifacts. Work around that.
+ */
+ CGImageRef subimage =
+ CGImageCreateWithImageInRect(image, flippedSourceRect);
+ [nsContext setCompositingOperation:op];
+ CGContextDrawImage(cgContext, NSRectToCGRect(dstRect), subimage);
+ CGImageRelease(subimage);
}
-- (BOOL)isMainWindow
-{
- return [[[angbandViews lastObject] window] isMainWindow];
-}
-- (void)setNeedsDisplay:(BOOL)val
-{
- for (NSView *angbandView in angbandViews)
- {
- [angbandView setNeedsDisplay:val];
- }
-}
+/* The max number of glyphs we support. Currently this only affects
+ * updateGlyphInfo() for the calculation of the tile size, fontAscender,
+ * fontDescender, nColPre, and nColPost. The rendering in drawWChar() will
+ * work for a glyph not in updateGlyphInfo()'s set, and that is used for
+ * rendering Japanese characters, though there may be clipping or clearing
+ * artifacts because it wasn't included in updateGlyphInfo()'s calculations.
+ */
+#define GLYPH_COUNT 256
-- (void)setNeedsDisplayInBaseRect:(NSRect)rect
+/* An AngbandContext represents a logical Term (i.e. what Angband thinks is
+ * a window). */
+@interface AngbandContext : NSObject <NSWindowDelegate>
{
- for (NSView *angbandView in angbandViews)
- {
- [angbandView setNeedsDisplayInRect: rect];
- }
-}
+@public
-- (void)displayIfNeeded
-{
- [[self activeView] displayIfNeeded];
-}
+ /* The Angband term */
+ term *terminal;
-- (int)terminalIndex
-{
- int termIndex = 0;
+@private
+ /* Is the last time we drew, so we can throttle drawing. */
+ CFAbsoluteTime lastRefreshTime;
- for( termIndex = 0; termIndex < ANGBAND_TERM_MAX; termIndex++ )
- {
- if( angband_term[termIndex] == self->terminal )
- {
- break;
- }
- }
+ /* Flags whether or not a fullscreen transition is in progress. */
+ BOOL inFullscreenTransition;
- return termIndex;
+ /* Our view */
+ AngbandView *angbandView;
}
-- (void)resizeTerminalWithContentRect: (NSRect)contentRect saveToDefaults: (BOOL)saveToDefaults
-{
- CGFloat newRows = floor( (contentRect.size.height - (borderSize.height * 2.0)) / tileSize.height );
- CGFloat newColumns = ceil( (contentRect.size.width - (borderSize.width * 2.0)) / tileSize.width );
-
- if (newRows < 1 || newColumns < 1) return;
- self->cols = newColumns;
- self->rows = newRows;
+/* Column and row counts, by default 80 x 24 */
+@property (readonly) int cols;
+@property (readonly) int rows;
- if (resize_pending_changes(self->changes, self->rows) != 0) {
- destroy_pending_changes(self->changes);
- self->changes = 0;
- NSLog(@"out of memory for pending changes with resize of terminal %d",
- [self terminalIndex]);
- }
+/* The size of the border between the window edge and the contents */
+@property (readonly) NSSize borderSize;
- if( saveToDefaults )
- {
- int termIndex = [self terminalIndex];
- NSArray *terminals = [[NSUserDefaults standardUserDefaults] valueForKey: AngbandTerminalsDefaultsKey];
+/* The font of this context */
+@property NSFont *angbandViewFont;
- if( termIndex < (int)[terminals count] )
- {
- NSMutableDictionary *mutableTerm = [[NSMutableDictionary alloc] initWithDictionary: [terminals objectAtIndex: termIndex]];
- [mutableTerm setValue: [NSNumber numberWithUnsignedInt: self->cols] forKey: AngbandTerminalColumnsDefaultsKey];
- [mutableTerm setValue: [NSNumber numberWithUnsignedInt: self->rows] forKey: AngbandTerminalRowsDefaultsKey];
+/* The size of one tile */
+@property (readonly) NSSize tileSize;
- NSMutableArray *mutableTerminals = [[NSMutableArray alloc] initWithArray: terminals];
- [mutableTerminals replaceObjectAtIndex: termIndex withObject: mutableTerm];
+/* Font's ascender and descender */
+@property (readonly) CGFloat fontAscender;
+@property (readonly) CGFloat fontDescender;
- [[NSUserDefaults standardUserDefaults] setValue: mutableTerminals forKey: AngbandTerminalsDefaultsKey];
- [mutableTerminals release];
- [mutableTerm release];
- }
- [[NSUserDefaults standardUserDefaults] synchronize];
- }
+/*
+ * These are the number of columns before or after, respectively, a text
+ * change that may need to be redrawn.
+ */
+@property (readonly) int nColPre;
+@property (readonly) int nColPost;
- term *old = Term;
- Term_activate( self->terminal );
- Term_resize( (int)newColumns, (int)newRows);
- Term_redraw();
- Term_activate( old );
-}
+/* If this context owns a window, here it is. */
+@property NSWindow *primaryWindow;
-- (void)setMinimumWindowSize
-{
- NSSize minsize;
+/* Holds our version of the contents of the terminal. */
+@property TerminalContents *contents;
- if ([self terminalIndex] == 0) {
- minsize.width = 80;
- minsize.height = 24;
- } else {
- minsize.width = 1;
- minsize.height = 1;
- }
- minsize.width =
- minsize.width * self->tileSize.width + self->borderSize.width * 2.0;
- minsize.height =
- minsize.height * self->tileSize.height + self->borderSize.height * 2.0;
- [[self makePrimaryWindow] setContentMinSize:minsize];
-}
+/*
+ * Marks which locations have been changed by the text_hook, pict_hook,
+ * wipe_hook, curs_hook, and bigcurs_hhok callbacks on the terminal since
+ * the last call to xtra_hook with TERM_XTRA_FRESH.
+ */
+@property TerminalChanges *changes;
-- (void)saveWindowVisibleToDefaults: (BOOL)windowVisible
-{
- int termIndex = [self terminalIndex];
- BOOL safeVisibility = (termIndex == 0) ? YES : windowVisible; /* Ensure main term doesn't go away because of these defaults */
- NSArray *terminals = [[NSUserDefaults standardUserDefaults] valueForKey: AngbandTerminalsDefaultsKey];
+@property (nonatomic, assign) BOOL hasSubwindowFlags;
+@property (nonatomic, assign) BOOL windowVisibilityChecked;
- if( termIndex < (int)[terminals count] )
- {
- NSMutableDictionary *mutableTerm = [[NSMutableDictionary alloc] initWithDictionary: [terminals objectAtIndex: termIndex]];
- [mutableTerm setValue: [NSNumber numberWithBool: safeVisibility] forKey: AngbandTerminalVisibleDefaultsKey];
+- (void)resizeWithColumns:(int)nCol rows:(int)nRow;
- NSMutableArray *mutableTerminals = [[NSMutableArray alloc] initWithArray: terminals];
- [mutableTerminals replaceObjectAtIndex: termIndex withObject: mutableTerm];
+/**
+ * Based on what has been marked as changed, inform AppKit of the bounding
+ * rectangles for the changed areas.
+ */
+- (void)computeInvalidRects;
- [[NSUserDefaults standardUserDefaults] setValue: mutableTerminals forKey: AngbandTerminalsDefaultsKey];
- [mutableTerminals release];
- [mutableTerm release];
- }
-}
+- (void)drawRect:(NSRect)rect inView:(NSView *)view;
-- (BOOL)windowVisibleUsingDefaults
-{
- int termIndex = [self terminalIndex];
+/* Called at initialization to set the term */
+- (void)setTerm:(term *)t;
- if( termIndex == 0 )
- {
- return YES;
- }
+/* Called when the context is going down. */
+- (void)dispose;
- NSArray *terminals = [[NSUserDefaults standardUserDefaults] valueForKey: AngbandTerminalsDefaultsKey];
- BOOL visible = NO;
+/*
+ * Return the rect in view coordinates for the block of cells whose upper
+ * left corner is (x,y).
+ */
+- (NSRect)viewRectForCellBlockAtX:(int)x y:(int)y width:(int)w height:(int)h;
- if( termIndex < (int)[terminals count] )
- {
- NSDictionary *term = [terminals objectAtIndex: termIndex];
- NSNumber *visibleValue = [term valueForKey: AngbandTerminalVisibleDefaultsKey];
+/* Draw the given wide character into the given tile rect. */
+- (void)drawWChar:(wchar_t)wchar inRect:(NSRect)tile screenFont:(NSFont*)font
+ context:(CGContextRef)ctx;
- if( visibleValue != nil )
- {
- visible = [visibleValue boolValue];
- }
- }
+/* Returns the primary window for this angband context, creating it if
+ * necessary */
+- (NSWindow *)makePrimaryWindow;
- return visible;
-}
+/* Handle becoming the main window */
+- (void)windowDidBecomeMain:(NSNotification *)notification;
-#pragma mark -
-#pragma mark NSWindowDelegate Methods
+/* Return whether the context's primary window is ordered in or not */
+- (BOOL)isOrderedIn;
-/*- (void)windowWillStartLiveResize: (NSNotification *)notification
-{
-}*/
+/*
+ * Return whether the context's primary window is the main window.
+ * Since the terminals other than terminal 0 are configured as panels in
+ * Hengband, this will only be true for terminal 0.
+ */
+- (BOOL)isMainWindow;
-- (void)windowDidEndLiveResize: (NSNotification *)notification
-{
- NSWindow *window = [notification object];
- NSRect contentRect = [window contentRectForFrameRect: [window frame]];
- [self resizeTerminalWithContentRect: contentRect saveToDefaults: YES];
-}
+/*
+ * Return whether the context's primary window is the destination for key
+ * input.
+ */
+- (BOOL)isKeyWindow;
-/*- (NSSize)windowWillResize: (NSWindow *)sender toSize: (NSSize)frameSize
-{
-} */
+/* Invalidate the whole image */
+- (void)setNeedsDisplay:(BOOL)val;
-- (void)windowDidEnterFullScreen: (NSNotification *)notification
-{
- NSWindow *window = [notification object];
- NSRect contentRect = [window contentRectForFrameRect: [window frame]];
- [self resizeTerminalWithContentRect: contentRect saveToDefaults: NO];
-}
+/* Invalidate part of the image, with the rect expressed in view coordinates */
+- (void)setNeedsDisplayInRect:(NSRect)rect;
-- (void)windowDidExitFullScreen: (NSNotification *)notification
-{
- NSWindow *window = [notification object];
- NSRect contentRect = [window contentRectForFrameRect: [window frame]];
- [self resizeTerminalWithContentRect: contentRect saveToDefaults: NO];
-}
+/* Display (flush) our Angband views */
+- (void)displayIfNeeded;
-- (void)windowDidBecomeMain:(NSNotification *)notification
-{
- NSWindow *window = [notification object];
+/* Resize context to size of contentRect, and optionally save size to
+ * defaults */
+- (void)resizeTerminalWithContentRect: (NSRect)contentRect saveToDefaults: (BOOL)saveToDefaults;
- if( window != self->primaryWindow )
- {
- return;
- }
+/*
+ * Change the minimum size and size increments for the window associated with
+ * the context. termIdx is the index for the terminal: pass it so this
+ * function can be used when self->terminal has not yet been set.
+ */
+- (void)constrainWindowSize:(int)termIdx;
- int termIndex = [self terminalIndex];
- NSMenuItem *item = [[[NSApplication sharedApplication] windowsMenu] itemWithTag: AngbandWindowMenuItemTagBase + termIndex];
- [item setState: NSOnState];
+- (void)saveWindowVisibleToDefaults: (BOOL)windowVisible;
+- (BOOL)windowVisibleUsingDefaults;
- if( [[NSFontPanel sharedFontPanel] isVisible] )
- {
- [[NSFontPanel sharedFontPanel] setPanelFont: [self selectionFont] isMultiple: NO];
- }
-}
-
-- (void)windowDidResignMain: (NSNotification *)notification
-{
- NSWindow *window = [notification object];
-
- if( window != self->primaryWindow )
- {
- return;
- }
-
- int termIndex = [self terminalIndex];
- NSMenuItem *item = [[[NSApplication sharedApplication] windowsMenu] itemWithTag: AngbandWindowMenuItemTagBase + termIndex];
- [item setState: NSOffState];
-}
+/* Class methods */
+/**
+ * Gets the default font for all contexts. Currently not declaring this as
+ * a class property for compatibility with versions of Xcode prior to 8.
+ */
++ (NSFont*)defaultFont;
+/**
+ * Sets the default font for all contexts.
+ */
++ (void)setDefaultFont:(NSFont*)font;
-- (void)windowWillClose: (NSNotification *)notification
-{
- [self saveWindowVisibleToDefaults: NO];
-}
+/* Internal methods */
+/* Set the title for the primary window. */
+- (void)setDefaultTitle:(int)termIdx;
@end
+/**
+ * Generate a mask for the subwindow flags. The mask is just a safety check to
+ * make sure that our windows show and hide as expected. This function allows
+ * for future changes to the set of flags without needed to update it here
+ * (unless the underlying types change).
+ */
+u32b AngbandMaskForValidSubwindowFlags(void)
+{
+ int windowFlagBits = sizeof(*(window_flag)) * CHAR_BIT;
+ int maxBits = MIN( 16, windowFlagBits );
+ u32b mask = 0;
-@implementation AngbandView
+ for( int i = 0; i < maxBits; i++ )
+ {
+ if( window_flag_desc[i] != NULL )
+ {
+ mask |= (1 << i);
+ }
+ }
-- (BOOL)isOpaque
-{
- return YES;
+ return mask;
}
-- (BOOL)isFlipped
+/**
+ * Check for changes in the subwindow flags and update window visibility.
+ * This seems to be called for every user event, so we don't
+ * want to do any unnecessary hiding or showing of windows.
+ */
+static void AngbandUpdateWindowVisibility(void)
{
- return YES;
-}
+ /* Because this function is called frequently, we'll make the mask static.
+ * It doesn't change between calls, as the flags themselves are hardcoded */
+ static u32b validWindowFlagsMask = 0;
-- (void)drawRect:(NSRect)rect
-{
- if (! angbandContext)
- {
- /* Draw bright orange, 'cause this ain't right */
- [[NSColor orangeColor] set];
- NSRectFill([self bounds]);
- }
- else
+ if( validWindowFlagsMask == 0 )
{
- /* Tell the Angband context to draw into us */
- [angbandContext drawRect:rect inView:self];
+ validWindowFlagsMask = AngbandMaskForValidSubwindowFlags();
}
-}
-- (void)setAngbandContext:(AngbandContext *)context
-{
- angbandContext = context;
-}
+ /* Loop through all of the subwindows and see if there is a change in the
+ * flags. If so, show or hide the corresponding window. We don't care about
+ * the flags themselves; we just want to know if any are set. */
+ for( int i = 1; i < ANGBAND_TERM_MAX; i++ )
+ {
+ AngbandContext *angbandContext =
+ (__bridge AngbandContext*) (angband_term[i]->data);
-- (AngbandContext *)angbandContext
-{
- return angbandContext;
-}
+ if( angbandContext == nil )
+ {
+ continue;
+ }
-- (void)setFrameSize:(NSSize)size
-{
- BOOL changed = ! NSEqualSizes(size, [self frame].size);
- [super setFrameSize:size];
- if (changed) [angbandContext angbandViewDidScale:self];
-}
+ /* This horrible mess of flags is so that we can try to maintain some
+ * user visibility preference. This should allow the user a window and
+ * have it stay closed between application launches. However, this
+ * means that when a subwindow is turned on, it will no longer appear
+ * automatically. Angband has no concept of user control over window
+ * visibility, other than the subwindow flags. */
+ if( !angbandContext.windowVisibilityChecked )
+ {
+ if( [angbandContext windowVisibleUsingDefaults] )
+ {
+ [angbandContext.primaryWindow orderFront: nil];
+ angbandContext.windowVisibilityChecked = YES;
+ }
+ else
+ {
+ [angbandContext.primaryWindow close];
+ angbandContext.windowVisibilityChecked = NO;
+ }
+ }
+ else
+ {
+ BOOL termHasSubwindowFlags = ((window_flag[i] & validWindowFlagsMask) > 0);
-- (void)viewWillStartLiveResize
-{
- [angbandContext viewWillStartLiveResize:self];
-}
+ if( angbandContext.hasSubwindowFlags && !termHasSubwindowFlags )
+ {
+ [angbandContext.primaryWindow close];
+ angbandContext.hasSubwindowFlags = NO;
+ [angbandContext saveWindowVisibleToDefaults: NO];
+ }
+ else if( !angbandContext.hasSubwindowFlags && termHasSubwindowFlags )
+ {
+ [angbandContext.primaryWindow orderFront: nil];
+ angbandContext.hasSubwindowFlags = YES;
+ [angbandContext saveWindowVisibleToDefaults: YES];
+ }
+ }
+ }
-- (void)viewDidEndLiveResize
-{
- [angbandContext viewDidEndLiveResize:self];
+ /* Make the main window key so that user events go to the right spot */
+ AngbandContext *mainWindow =
+ (__bridge AngbandContext*) (angband_term[0]->data);
+ [mainWindow.primaryWindow makeKeyAndOrderFront: nil];
}
-@end
+/**
+ * ------------------------------------------------------------------------
+ * Graphics support
+ * ------------------------------------------------------------------------ */
/**
- * Delay handling of double-clicked savefiles
+ * The tile image
*/
-Boolean open_when_ready = FALSE;
-
+static CGImageRef pict_image;
+/**
+ * Numbers of rows and columns in a tileset,
+ * calculated by the PICT/PNG loading code
+ */
+static int pict_cols = 0;
+static int pict_rows = 0;
/**
- * ------------------------------------------------------------------------
- * Some generic functions
- * ------------------------------------------------------------------------ */
+ * Requested graphics mode (as a grafID).
+ * The current mode is stored in current_graphics_mode.
+ */
+static int graf_mode_req = 0;
/**
- * Sets an Angband color at a given index
+ * Helper function to check the various ways that graphics can be enabled,
+ * guarding against NULL
*/
-static void set_color_for_index(int idx)
+static BOOL graphics_are_enabled(void)
{
- u16b rv, gv, bv;
-
- /* Extract the R,G,B data */
- rv = angband_color_table[idx][1];
- gv = angband_color_table[idx][2];
- bv = angband_color_table[idx][3];
-
- CGContextSetRGBFillColor([[NSGraphicsContext currentContext] graphicsPort], rv/255., gv/255., bv/255., 1.);
+ return current_graphics_mode
+ && current_graphics_mode->grafID != GRAPHICS_NONE;
}
/**
- * Remember the current character in UserDefaults so we can select it by
- * default next time.
+ * Like graphics_are_enabled(), but test the requested graphics mode.
*/
-static void record_current_savefile(void)
+static BOOL graphics_will_be_enabled(void)
{
- NSString *savefileString = [[NSString stringWithCString:savefile encoding:NSMacOSRomanStringEncoding] lastPathComponent];
- if (savefileString)
- {
- NSUserDefaults *angbandDefs = [NSUserDefaults angbandDefaults];
- [angbandDefs setObject:savefileString forKey:@"SaveFile"];
- [angbandDefs synchronize];
+ if (graf_mode_req == GRAPHICS_NONE) {
+ return NO;
}
-}
+ graphics_mode *new_mode = get_graphics_mode(graf_mode_req);
+ return new_mode && new_mode->grafID != GRAPHICS_NONE;
+}
-#ifdef JP
/**
- * Convert a two-byte EUC-JP encoded character (both *cp and (*cp + 1) are in
- * the range, 0xA1-0xFE, or *cp is 0x8E) to a utf16 value in the native byte
- * ordering.
+ * Hack -- game in progress
*/
-static wchar_t convert_two_byte_eucjp_to_utf16_native(const char *cp)
-{
- NSString* str = [[NSString alloc] initWithBytes:cp length:2
- encoding:NSJapaneseEUCStringEncoding];
- wchar_t result = [str characterAtIndex:0];
+static Boolean game_in_progress = FALSE;
- [str release];
- return result;
-}
-#endif /* JP */
+#pragma mark Prototypes
+static BOOL redraw_for_tiles_or_term0_font(void);
+static void wakeup_event_loop(void);
+static void hook_plog(const char *str);
+static void hook_quit(const char * str);
+static NSString* get_lib_directory(void);
+static NSString* get_doc_directory(void);
+static NSString* AngbandCorrectedDirectoryPath(NSString *originalPath);
+static void prepare_paths_and_directories(void);
+static void load_prefs(void);
+static void init_windows(void);
+static void handle_open_when_ready(void);
+static void play_sound(int event);
+static BOOL check_events(int wait);
+static BOOL send_event(NSEvent *event);
+static void set_color_for_index(int idx);
+static void record_current_savefile(void);
/**
- * ------------------------------------------------------------------------
- * Support for the "z-term.c" package
- * ------------------------------------------------------------------------ */
+ * Available values for 'wait'
+ */
+#define CHECK_EVENTS_DRAIN -1
+#define CHECK_EVENTS_NO_WAIT 0
+#define CHECK_EVENTS_WAIT 1
/**
- * Initialize a new Term
+ * Note when "open"/"new" become valid
*/
-static void Term_init_cocoa(term *t)
-{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- AngbandContext *context = [[AngbandContext alloc] init];
-
- /* Give the term a hard retain on context (for GC) */
- t->data = (void *)CFRetain(context);
- [context release];
-
- /* Handle graphics */
- t->higher_pict = !! use_graphics;
- t->always_pict = FALSE;
-
- NSDisableScreenUpdates();
-
- /* Figure out the frame autosave name based on the index of this term */
- NSString *autosaveName = nil;
- int termIdx;
- for (termIdx = 0; termIdx < ANGBAND_TERM_MAX; termIdx++)
- {
- if (angband_term[termIdx] == t)
- {
- autosaveName = [NSString stringWithFormat:@"AngbandTerm-%d", termIdx];
- break;
- }
- }
+static bool initialized = FALSE;
- /* Set its font. */
- NSString *fontName = [[NSUserDefaults angbandDefaults] stringForKey:[NSString stringWithFormat:@"FontName-%d", termIdx]];
- if (! fontName) fontName = [default_font fontName];
+/* Methods for getting the appropriate NSUserDefaults */
+@interface NSUserDefaults (AngbandDefaults)
++ (NSUserDefaults *)angbandDefaults;
+@end
- /* Use a smaller default font for the other windows, but only if the font
- * hasn't been explicitly set */
- float fontSize = (termIdx > 0) ? 10.0 : [default_font pointSize];
- NSNumber *fontSizeNumber = [[NSUserDefaults angbandDefaults] valueForKey: [NSString stringWithFormat: @"FontSize-%d", termIdx]];
+@implementation NSUserDefaults (AngbandDefaults)
++ (NSUserDefaults *)angbandDefaults
+{
+ return [NSUserDefaults standardUserDefaults];
+}
+@end
- if( fontSizeNumber != nil )
- {
- fontSize = [fontSizeNumber floatValue];
- }
+/* Methods for pulling images out of the Angband bundle (which may be separate
+ * from the current bundle in the case of a screensaver */
+@interface NSImage (AngbandImages)
++ (NSImage *)angbandImage:(NSString *)name;
+@end
- [context setSelectionFont:[NSFont fontWithName:fontName size:fontSize] adjustTerminal: NO];
+/* The NSView subclass that draws our Angband image */
+@interface AngbandView : NSView {
+@private
+ NSBitmapImageRep *cacheForResize;
+ NSRect cacheBounds;
+}
- NSArray *terminalDefaults = [[NSUserDefaults standardUserDefaults] valueForKey: AngbandTerminalsDefaultsKey];
- NSInteger rows = 24;
- NSInteger columns = 80;
+@property (nonatomic, weak) AngbandContext *angbandContext;
- if( termIdx < (int)[terminalDefaults count] )
- {
- NSDictionary *term = [terminalDefaults objectAtIndex: termIdx];
- NSInteger defaultRows = [[term valueForKey: AngbandTerminalRowsDefaultsKey] integerValue];
- NSInteger defaultColumns = [[term valueForKey: AngbandTerminalColumnsDefaultsKey] integerValue];
+@end
- if (defaultRows > 0) rows = defaultRows;
- if (defaultColumns > 0) columns = defaultColumns;
- }
+@implementation NSImage (AngbandImages)
- context->cols = columns;
- context->rows = rows;
+/* Returns an image in the resource directoy of the bundle containing the
+ * Angband view class. */
++ (NSImage *)angbandImage:(NSString *)name
+{
+ NSBundle *bundle = [NSBundle bundleForClass:[AngbandView class]];
+ NSString *path = [bundle pathForImageResource:name];
+ return (path) ? [[NSImage alloc] initByReferencingFile:path] : nil;
+}
- if (resize_pending_changes(context->changes, context->rows) != 0) {
- destroy_pending_changes(context->changes);
- context->changes = 0;
- NSLog(@"initializing terminal %d: out of memory for pending changes",
- termIdx);
- }
+@end
- /* Get the window */
- NSWindow *window = [context makePrimaryWindow];
- /* Set its title and, for auxiliary terms, tentative size */
- NSString *title = [NSString stringWithCString:angband_term_name[termIdx]
+
+@implementation AngbandContext
+
+- (NSSize)baseSize
+{
+ /*
+ * We round the base size down. If we round it up, I believe we may end up
+ * with pixels that nobody "owns" that may accumulate garbage. In general
+ * rounding down is harmless, because any lost pixels may be sopped up by
+ * the border.
+ */
+ return NSMakeSize(
+ floor(self.cols * self.tileSize.width + 2 * self.borderSize.width),
+ floor(self.rows * self.tileSize.height + 2 * self.borderSize.height));
+}
+
+/* qsort-compatible compare function for CGSizes */
+static int compare_advances(const void *ap, const void *bp)
+{
+ const CGSize *a = ap, *b = bp;
+ return (a->width > b->width) - (a->width < b->width);
+}
+
+/**
+ * Precompute certain metrics (tileSize, fontAscender, fontDescender, nColPre,
+ * and nColPost) for the current font.
+ */
+- (void)updateGlyphInfo
+{
+ NSFont *screenFont = [self.angbandViewFont screenFont];
+
+ /* Generate a string containing each MacRoman character */
+ /*
+ * Here and below, dynamically allocate working arrays rather than put them
+ * on the stack in case limited stack space is an issue.
+ */
+ unsigned char *latinString = malloc(GLYPH_COUNT);
+ if (latinString == 0) {
+ NSException *exc = [NSException exceptionWithName:@"OutOfMemory"
+ reason:@"latinString in updateGlyphInfo"
+ userInfo:nil];
+ @throw exc;
+ }
+ size_t i;
+ for (i=0; i < GLYPH_COUNT; i++) latinString[i] = (unsigned char)i;
+
+ /* Turn that into unichar. Angband uses ISO Latin 1. */
+ NSString *allCharsString = [[NSString alloc] initWithBytes:latinString
+ length:GLYPH_COUNT encoding:NSISOLatin1StringEncoding];
+ unichar *unicharString = malloc(GLYPH_COUNT * sizeof(unichar));
+ if (unicharString == 0) {
+ free(latinString);
+ NSException *exc = [NSException exceptionWithName:@"OutOfMemory"
+ reason:@"unicharString in updateGlyphInfo"
+ userInfo:nil];
+ @throw exc;
+ }
+ unicharString[0] = 0;
+ [allCharsString getCharacters:unicharString range:NSMakeRange(0, MIN(GLYPH_COUNT, [allCharsString length]))];
+ allCharsString = nil;
+ free(latinString);
+
+ /* Get glyphs */
+ CGGlyph *glyphArray = calloc(GLYPH_COUNT, sizeof(CGGlyph));
+ if (glyphArray == 0) {
+ free(unicharString);
+ NSException *exc = [NSException exceptionWithName:@"OutOfMemory"
+ reason:@"glyphArray in updateGlyphInfo"
+ userInfo:nil];
+ @throw exc;
+ }
+ CTFontGetGlyphsForCharacters((CTFontRef)screenFont, unicharString,
+ glyphArray, GLYPH_COUNT);
+ free(unicharString);
+
+ /* Get advances. Record the max advance. */
+ CGSize *advances = malloc(GLYPH_COUNT * sizeof(CGSize));
+ if (advances == 0) {
+ free(glyphArray);
+ NSException *exc = [NSException exceptionWithName:@"OutOfMemory"
+ reason:@"advances in updateGlyphInfo"
+ userInfo:nil];
+ @throw exc;
+ }
+ CTFontGetAdvancesForGlyphs(
+ (CTFontRef)screenFont, kCTFontHorizontalOrientation, glyphArray,
+ advances, GLYPH_COUNT);
+ CGFloat *glyphWidths = malloc(GLYPH_COUNT * sizeof(CGFloat));
+ if (glyphWidths == 0) {
+ free(glyphArray);
+ free(advances);
+ NSException *exc = [NSException exceptionWithName:@"OutOfMemory"
+ reason:@"glyphWidths in updateGlyphInfo"
+ userInfo:nil];
+ @throw exc;
+ }
+ for (i=0; i < GLYPH_COUNT; i++) {
+ glyphWidths[i] = advances[i].width;
+ }
+
+ /*
+ * For good non-mono-font support, use the median advance. Start by sorting
+ * all advances.
+ */
+ qsort(advances, GLYPH_COUNT, sizeof *advances, compare_advances);
+
+ /* Skip over any initially empty run */
+ size_t startIdx;
+ for (startIdx = 0; startIdx < GLYPH_COUNT; startIdx++)
+ {
+ if (advances[startIdx].width > 0) break;
+ }
+
+ /* Pick the center to find the median */
+ CGFloat medianAdvance = 0;
+ /* In case we have all zero advances for some reason */
+ if (startIdx < GLYPH_COUNT)
+ {
+ medianAdvance = advances[(startIdx + GLYPH_COUNT)/2].width;
+ }
+
+ free(advances);
+
+ /*
+ * Record the ascender and descender. Some fonts, for instance DIN
+ * Condensed and Rockwell in 10.14, the ascent on '@' exceeds that
+ * reported by [screenFont ascender]. Get the overall bounding box
+ * for the glyphs and use that instead of the ascender and descender
+ * values if the bounding box result extends farther from the baseline.
+ */
+ CGRect bounds = CTFontGetBoundingRectsForGlyphs(
+ (CTFontRef) screenFont, kCTFontHorizontalOrientation, glyphArray,
+ NULL, GLYPH_COUNT);
+ self->_fontAscender = [screenFont ascender];
+ if (self->_fontAscender < bounds.origin.y + bounds.size.height) {
+ self->_fontAscender = bounds.origin.y + bounds.size.height;
+ }
+ self->_fontDescender = [screenFont descender];
+ if (self->_fontDescender > bounds.origin.y) {
+ self->_fontDescender = bounds.origin.y;
+ }
+
+ /*
+ * Record the tile size. Round both values up to have tile boundaries
+ * match pixel boundaries.
+ */
+ self->_tileSize.width = ceil(medianAdvance);
+ self->_tileSize.height = ceil(self.fontAscender - self.fontDescender);
+
+ /*
+ * Determine whether neighboring columns need to be redrawn when a
+ * character changes.
+ */
+ CGRect *boxes = malloc(GLYPH_COUNT * sizeof(CGRect));
+ if (boxes == 0) {
+ free(glyphWidths);
+ free(glyphArray);
+ NSException *exc = [NSException exceptionWithName:@"OutOfMemory"
+ reason:@"boxes in updateGlyphInfo"
+ userInfo:nil];
+ @throw exc;
+ }
+ CGFloat beyond_right = 0.;
+ CGFloat beyond_left = 0.;
+ CTFontGetBoundingRectsForGlyphs(
+ (CTFontRef)screenFont,
+ kCTFontHorizontalOrientation,
+ glyphArray,
+ boxes,
+ GLYPH_COUNT);
+ for (i = 0; i < GLYPH_COUNT; i++) {
+ /* Account for the compression and offset used by drawWChar(). */
+ CGFloat compression, offset;
+ CGFloat v;
+
+ if (glyphWidths[i] <= self.tileSize.width) {
+ compression = 1.;
+ offset = 0.5 * (self.tileSize.width - glyphWidths[i]);
+ } else {
+ compression = self.tileSize.width / glyphWidths[i];
+ offset = 0.;
+ }
+ v = (offset + boxes[i].origin.x) * compression;
+ if (beyond_left > v) {
+ beyond_left = v;
+ }
+ v = (offset + boxes[i].origin.x + boxes[i].size.width) * compression;
+ if (beyond_right < v) {
+ beyond_right = v;
+ }
+ }
+ free(boxes);
+ self->_nColPre = ceil(-beyond_left / self.tileSize.width);
+ if (beyond_right > self.tileSize.width) {
+ self->_nColPost =
+ ceil((beyond_right - self.tileSize.width) / self.tileSize.width);
+ } else {
+ self->_nColPost = 0;
+ }
+
+ free(glyphWidths);
+ free(glyphArray);
+}
+
+
+- (void)requestRedraw
+{
+ if (! self->terminal) return;
+
+ term *old = Term;
+
+ /* Activate the term */
+ Term_activate(self->terminal);
+
+ /* Redraw the contents */
+ Term_redraw();
+
+ /* Flush the output */
+ Term_fresh();
+
+ /* Restore the old term */
+ Term_activate(old);
+}
+
+- (void)setTerm:(term *)t
+{
+ self->terminal = t;
+}
+
+/**
+ * If we're trying to limit ourselves to a certain number of frames per second,
+ * then compute how long it's been since we last drew, and then wait until the
+ * next frame has passed. */
+- (void)throttle
+{
+ if (frames_per_second > 0)
+ {
+ CFAbsoluteTime now = CFAbsoluteTimeGetCurrent();
+ CFTimeInterval timeSinceLastRefresh = now - self->lastRefreshTime;
+ CFTimeInterval timeUntilNextRefresh = (1. / (double)frames_per_second) - timeSinceLastRefresh;
+
+ if (timeUntilNextRefresh > 0)
+ {
+ usleep((unsigned long)(timeUntilNextRefresh * 1000000.));
+ }
+ }
+ self->lastRefreshTime = CFAbsoluteTimeGetCurrent();
+}
+
+- (void)drawWChar:(wchar_t)wchar inRect:(NSRect)tile screenFont:(NSFont*)font
+ context:(CGContextRef)ctx
+{
+ CGFloat tileOffsetY = self.fontAscender;
+ CGFloat tileOffsetX = 0.0;
+ UniChar unicharString[2] = {(UniChar)wchar, 0};
+
+ /* Get glyph and advance */
+ CGGlyph thisGlyphArray[1] = { 0 };
+ CGSize advances[1] = { { 0, 0 } };
+ CTFontGetGlyphsForCharacters(
+ (CTFontRef)font, unicharString, thisGlyphArray, 1);
+ CGGlyph glyph = thisGlyphArray[0];
+ CTFontGetAdvancesForGlyphs(
+ (CTFontRef)font, kCTFontHorizontalOrientation, thisGlyphArray,
+ advances, 1);
+ CGSize advance = advances[0];
+
+ /* If our font is not monospaced, our tile width is deliberately not big
+ * enough for every character. In that event, if our glyph is too wide, we
+ * need to compress it horizontally. Compute the compression ratio.
+ * 1.0 means no compression. */
+ double compressionRatio;
+ if (advance.width <= NSWidth(tile))
+ {
+ /* Our glyph fits, so we can just draw it, possibly with an offset */
+ compressionRatio = 1.0;
+ tileOffsetX = (NSWidth(tile) - advance.width)/2;
+ }
+ else
+ {
+ /* Our glyph doesn't fit, so we'll have to compress it */
+ compressionRatio = NSWidth(tile) / advance.width;
+ tileOffsetX = 0;
+ }
+
+ /* Now draw it */
+ CGAffineTransform textMatrix = CGContextGetTextMatrix(ctx);
+ CGFloat savedA = textMatrix.a;
+
+ /* Set the position */
+ textMatrix.tx = tile.origin.x + tileOffsetX;
+ textMatrix.ty = tile.origin.y + tileOffsetY;
+
+ /* Maybe squish it horizontally. */
+ if (compressionRatio != 1.)
+ {
+ textMatrix.a *= compressionRatio;
+ }
+
+ CGContextSetTextMatrix(ctx, textMatrix);
+ CGContextShowGlyphsAtPositions(ctx, &glyph, &CGPointZero, 1);
+
+ /* Restore the text matrix if we messed with the compression ratio */
+ if (compressionRatio != 1.)
+ {
+ textMatrix.a = savedA;
+ }
+
+ CGContextSetTextMatrix(ctx, textMatrix);
+}
+
+- (NSRect)viewRectForCellBlockAtX:(int)x y:(int)y width:(int)w height:(int)h
+{
+ return NSMakeRect(
+ x * self.tileSize.width + self.borderSize.width,
+ y * self.tileSize.height + self.borderSize.height,
+ w * self.tileSize.width, h * self.tileSize.height);
+}
+
+- (void)setSelectionFont:(NSFont*)font adjustTerminal: (BOOL)adjustTerminal
+{
+ /* Record the new font */
+ self.angbandViewFont = font;
+
+ /* Update our glyph info */
+ [self updateGlyphInfo];
+
+ if( adjustTerminal )
+ {
+ /* Adjust terminal to fit window with new font; save the new columns
+ * and rows since they could be changed */
+ NSRect contentRect =
+ [self.primaryWindow
+ contentRectForFrameRect: [self.primaryWindow frame]];
+
+ [self constrainWindowSize:[self terminalIndex]];
+ NSSize size = self.primaryWindow.contentMinSize;
+ BOOL windowNeedsResizing = NO;
+ if (contentRect.size.width < size.width) {
+ contentRect.size.width = size.width;
+ windowNeedsResizing = YES;
+ }
+ if (contentRect.size.height < size.height) {
+ contentRect.size.height = size.height;
+ windowNeedsResizing = YES;
+ }
+ if (windowNeedsResizing) {
+ size.width = contentRect.size.width;
+ size.height = contentRect.size.height;
+ [self.primaryWindow setContentSize:size];
+ }
+ [self resizeTerminalWithContentRect: contentRect saveToDefaults: YES];
+ }
+}
+
+- (id)init
+{
+ if ((self = [super init]))
+ {
+ /* Default rows and cols */
+ self->_cols = 80;
+ self->_rows = 24;
+
+ /* Default border size */
+ self->_borderSize = NSMakeSize(2, 2);
+
+ self->_nColPre = 0;
+ self->_nColPost = 0;
+
+ self->_contents =
+ [[TerminalContents alloc] initWithColumns:self->_cols
+ rows:self->_rows];
+ self->_changes =
+ [[TerminalChanges alloc] initWithColumns:self->_cols
+ rows:self->_rows];
+ self->lastRefreshTime = CFAbsoluteTimeGetCurrent();
+ self->inFullscreenTransition = NO;
+
+ self->_windowVisibilityChecked = NO;
+ }
+ return self;
+}
+
+/**
+ * Destroy all the receiver's stuff. This is intended to be callable more than
+ * once.
+ */
+- (void)dispose
+{
+ self->terminal = NULL;
+
+ /* Disassociate ourselves from our view. */
+ [self->angbandView setAngbandContext:nil];
+ self->angbandView = nil;
+
+ /* Font */
+ self.angbandViewFont = nil;
+
+ /* Window */
+ [self.primaryWindow setDelegate:nil];
+ [self.primaryWindow close];
+ self.primaryWindow = nil;
+
+ /* Contents and pending changes */
+ self.contents = nil;
+ self.changes = nil;
+}
+
+/* Usual Cocoa fare */
+- (void)dealloc
+{
+ [self dispose];
+}
+
+- (void)resizeWithColumns:(int)nCol rows:(int)nRow
+{
+ [self.contents resizeWithColumns:nCol rows:nRow];
+ [self.changes resizeWithColumns:nCol rows:nRow];
+ self->_cols = nCol;
+ self->_rows = nRow;
+}
+
+/**
+ * For defaultFont and setDefaultFont.
+ */
+static __strong NSFont* gDefaultFont = nil;
+
++ (NSFont*)defaultFont
+{
+ return gDefaultFont;
+}
+
++ (void)setDefaultFont:(NSFont*)font
+{
+ gDefaultFont = font;
+}
+
+- (void)setDefaultTitle:(int)termIdx
+{
+ NSMutableString *title =
+ [NSMutableString stringWithCString:angband_term_name[termIdx]
#ifdef JP
- encoding:NSJapaneseEUCStringEncoding
+ encoding:NSJapaneseEUCStringEncoding
#else
- encoding:NSMacOSRomanStringEncoding
+ encoding:NSMacOSRomanStringEncoding
#endif
- ];
- [window setTitle:title];
- [context setMinimumWindowSize];
+ ];
+ [title appendFormat:@" %dx%d", self.cols, self.rows];
+ [[self makePrimaryWindow] setTitle:title];
+}
+
+- (NSWindow *)makePrimaryWindow
+{
+ if (! self.primaryWindow)
+ {
+ /* This has to be done after the font is set, which it already is in
+ * term_init_cocoa() */
+ NSSize sz = self.baseSize;
+ NSRect contentRect = NSMakeRect( 0.0, 0.0, sz.width, sz.height );
+
+ NSUInteger styleMask = NSTitledWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask;
+
+ /*
+ * Make every window other than the main window closable, also create
+ * them as utility panels to get the thinner title bar and other
+ * attributes that already match up with how those windows are used.
+ */
+ if ((__bridge AngbandContext*) (angband_term[0]->data) != self)
+ {
+ NSPanel *panel =
+ [[NSPanel alloc] initWithContentRect:contentRect
+ styleMask:(styleMask | NSClosableWindowMask |
+ NSUtilityWindowMask)
+ backing:NSBackingStoreBuffered defer:YES];
+
+ panel.floatingPanel = NO;
+ self.primaryWindow = panel;
+ } else {
+ self.primaryWindow =
+ [[NSWindow alloc] initWithContentRect:contentRect
+ styleMask:styleMask
+ backing:NSBackingStoreBuffered defer:YES];
+ }
+
+ /* Not to be released when closed */
+ [self.primaryWindow setReleasedWhenClosed:NO];
+ [self.primaryWindow setExcludedFromWindowsMenu: YES]; /* we're using custom window menu handling */
+
+ /* Make the view */
+ self->angbandView = [[AngbandView alloc] initWithFrame:contentRect];
+ [angbandView setAngbandContext:self];
+ [angbandView setNeedsDisplay:YES];
+ [self.primaryWindow setContentView:angbandView];
+
+ /* We are its delegate */
+ [self.primaryWindow setDelegate:self];
+ }
+ return self.primaryWindow;
+}
+
+
+- (void)computeInvalidRects
+{
+ for (int irow = self.changes.firstChangedRow;
+ irow <= self.changes.lastChangedRow;
+ ++irow) {
+ int icol = [self.changes scanForChangedInRow:irow
+ col0:0 col1:self.cols];
+
+ while (icol < self.cols) {
+ /* Find the end of the changed region. */
+ int jcol =
+ [self.changes scanForUnchangedInRow:irow col0:(icol + 1)
+ col1:self.cols];
+
+ /*
+ * If the last column is a character, extend the region drawn
+ * because characters can exceed the horizontal bounds of the cell
+ * and those parts will need to be cleared. Don't extend into a
+ * tile because the clipping is set while drawing to never
+ * extend text into a tile. For a big character that's been
+ * partially overwritten, allow what comes after the point
+ * where the overwrite occurred to influence the stuff before
+ * but not vice versa. If extending the region reaches another
+ * changed block, find the end of that block and repeat the
+ * process.
+ */
+ /*
+ * A value of zero means checking for a character immediately
+ * prior to the column, isrch. A value of one means checking for
+ * something past the end that could either influence the changed
+ * region (within nColPre of it and no intervening tile) or be
+ * influenced by it (within nColPost of it and no intervening
+ * tile or partially overwritten big character). A value of two
+ * means checking for something past the end which is both changed
+ * and could affect the part of the unchanged region that has to
+ * be redrawn because it is affected by the prior changed region
+ * Values of three and four are like one and two, respectively,
+ * but indicate that a partially overwritten big character was
+ * found.
+ */
+ int stage = 0;
+ int isrch = jcol;
+ int irng0 = jcol;
+ int irng1 = jcol;
+ while (1) {
+ if (stage == 0) {
+ const struct TerminalCell *pcell =
+ [self.contents getCellAtColumn:(isrch - 1) row:irow];
+ if ((pcell->form &
+ (TERM_CELL_TILE | TERM_CELL_TILE_PADDING)) != 0) {
+ break;
+ } else {
+ irng0 = isrch + self.nColPre;
+ if (irng0 > self.cols) {
+ irng0 = self.cols;
+ }
+ irng1 = isrch + self.nColPost;
+ if (irng1 > self.cols) {
+ irng1 = self.cols;
+ }
+ if (isrch < irng0 || isrch < irng1) {
+ stage = isPartiallyOverwrittenBigChar(pcell) ?
+ 3 : 1;
+ } else {
+ break;
+ }
+ }
+ }
+
+ if (stage == 1) {
+ const struct TerminalCell *pcell =
+ [self.contents getCellAtColumn:isrch row:irow];
+
+ if ((pcell->form &
+ (TERM_CELL_TILE | TERM_CELL_TILE_PADDING)) != 0) {
+ /*
+ * Check if still in the region that could be
+ * influenced by the changed region. If so,
+ * everything up to the tile will be redrawn anyways
+ * so combine the regions if the tile has changed
+ * as well. Otherwise, terminate the search since
+ * the tile doesn't allow influence to propagate
+ * through it and don't want to affect what's in the
+ * tile.
+ */
+ if (isrch < irng1) {
+ if ([self.changes isChangedAtColumn:isrch
+ row:irow]) {
+ jcol = [self.changes scanForUnchangedInRow:irow
+ col0:(isrch + 1) col1:self.cols];
+ if (jcol < self.cols) {
+ stage = 0;
+ isrch = jcol;
+ continue;
+ }
+ }
+ }
+ break;
+ } else {
+ /*
+ * With a changed character, combine the regions (if
+ * still in the region affected by the changed region
+ * am going to redraw everything up to this new region
+ * anyway; if only in the region that can affect the
+ * changed region, this changed text could influence
+ * the current changed region).
+ */
+ if ([self.changes isChangedAtColumn:isrch row:irow]) {
+ jcol = [self.changes scanForUnchangedInRow:irow
+ col0:(isrch + 1) col1:self.cols];
+ if (jcol < self.cols) {
+ stage = 0;
+ isrch = jcol;
+ continue;
+ }
+ break;
+ }
+
+ if (isrch < irng1) {
+ /*
+ * Can be affected by the changed region so
+ * has to be redrawn.
+ */
+ ++jcol;
+ }
+ ++isrch;
+ if (isrch >= irng1) {
+ irng0 = jcol + self.nColPre;
+ if (irng0 > self.cols) {
+ irng0 = self.cols;
+ }
+ if (isrch >= irng0) {
+ break;
+ }
+ stage = isPartiallyOverwrittenBigChar(pcell) ?
+ 4 : 2;
+ } else if (isPartiallyOverwrittenBigChar(pcell)) {
+ stage = 3;
+ }
+ }
+ }
+
+ if (stage == 2) {
+ /*
+ * Looking for a later changed region that could influence
+ * the region that has to be redrawn. The region that has
+ * to be redrawn ends just before jcol.
+ */
+ const struct TerminalCell *pcell =
+ [self.contents getCellAtColumn:isrch row:irow];
+
+ if ((pcell->form &
+ (TERM_CELL_TILE | TERM_CELL_TILE_PADDING)) != 0) {
+ /* Can not spread influence through a tile. */
+ break;
+ }
+ if ([self.changes isChangedAtColumn:isrch row:irow]) {
+ /*
+ * Found one. Combine with the one ending just before
+ * jcol.
+ */
+ jcol = [self.changes scanForUnchangedInRow:irow
+ col0:(isrch + 1) col1:self.cols];
+ if (jcol < self.cols) {
+ stage = 0;
+ isrch = jcol;
+ continue;
+ }
+ break;
+ }
+
+ ++isrch;
+ if (isrch >= irng0) {
+ break;
+ }
+ if (isPartiallyOverwrittenBigChar(pcell)) {
+ stage = 4;
+ }
+ }
+
+ if (stage == 3) {
+ const struct TerminalCell *pcell =
+ [self.contents getCellAtColumn:isrch row:irow];
+
+ /*
+ * Have encountered a partially overwritten big character
+ * but still may be in the region that could be influenced
+ * by the changed region. That influence can not extend
+ * past the past the padding for the partially overwritten
+ * character.
+ */
+ if ((pcell->form & (TERM_CELL_CHAR | TERM_CELL_TILE |
+ TERM_CELL_TILE_PADDING)) != 0) {
+ if (isrch < irng1) {
+ /*
+ * Still can be affected by the changed region
+ * so everything up to isrch will be redrawn
+ * anyways. If this location has changed,
+ * merge the changed regions.
+ */
+ if ([self.changes isChangedAtColumn:isrch
+ row:irow]) {
+ jcol = [self.changes scanForUnchangedInRow:irow
+ col0:(isrch + 1) col1:self.cols];
+ if (jcol < self.cols) {
+ stage = 0;
+ isrch = jcol;
+ continue;
+ }
+ break;
+ }
+ }
+ if ((pcell->form &
+ (TERM_CELL_TILE | TERM_CELL_TILE_PADDING)) != 0) {
+ /*
+ * It's a tile. That blocks influence in either
+ * direction.
+ */
+ break;
+ }
+
+ /*
+ * The partially overwritten big character was
+ * overwritten by a character. Check to see if it
+ * can either influence the unchanged region that
+ * has to redrawn or the changed region prior to
+ * that.
+ */
+ if (isrch >= irng0) {
+ break;
+ }
+ stage = 4;
+ } else {
+ if (isrch < irng1) {
+ /*
+ * Can be affected by the changed region so has to
+ * be redrawn.
+ */
+ ++jcol;
+ }
+ ++isrch;
+ if (isrch >= irng1) {
+ irng0 = jcol + self.nColPre;
+ if (irng0 > self.cols) {
+ irng0 = self.cols;
+ }
+ if (isrch >= irng0) {
+ break;
+ }
+ stage = 4;
+ }
+ }
+ }
+
+ if (stage == 4) {
+ /*
+ * Have already encountered a partially overwritten big
+ * character. Looking for a later changed region that
+ * could influence the region that has to be redrawn
+ * The region that has to be redrawn ends just before jcol.
+ */
+ const struct TerminalCell *pcell =
+ [self.contents getCellAtColumn:isrch row:irow];
+
+ if ((pcell->form &
+ (TERM_CELL_TILE | TERM_CELL_TILE_PADDING)) != 0) {
+ /* Can not spread influence through a tile. */
+ break;
+ }
+ if (pcell->form == TERM_CELL_CHAR) {
+ if ([self.changes isChangedAtColumn:isrch row:irow]) {
+ /*
+ * Found a changed region. Combine with the one
+ * ending just before jcol.
+ */
+ jcol = [self.changes scanForUnchangedInRow:irow
+ col0:(isrch + 1) col1:self.cols];
+ if (jcol < self.cols) {
+ stage = 0;
+ isrch = jcol;
+ continue;
+ }
+ break;
+ }
+ }
+ ++isrch;
+ if (isrch >= irng0) {
+ break;
+ }
+ }
+ }
+
+ /*
+ * Check to see if there's characters before the changed region
+ * that would have to be redrawn because it's influenced by the
+ * changed region. Do not have to check for merging with a prior
+ * region because of the screening already done.
+ */
+ if (self.nColPre > 0 &&
+ ([self.contents getCellAtColumn:icol row:irow]->form &
+ (TERM_CELL_CHAR | TERM_CELL_CHAR_PADDING)) != 0) {
+ int irng = icol - self.nColPre;
+
+ if (irng < 0) {
+ irng = 0;
+ }
+ while (icol > irng &&
+ ([self.contents getCellAtColumn:(icol - 1)
+ row:irow]->form &
+ (TERM_CELL_CHAR | TERM_CELL_CHAR_PADDING)) != 0) {
+ --icol;
+ }
+ }
+
+ NSRect r = [self viewRectForCellBlockAtX:icol y:irow
+ width:(jcol - icol) height:1];
+ [self setNeedsDisplayInRect:r];
+
+ icol = [self.changes scanForChangedInRow:irow col0:jcol
+ col1:self.cols];
+ }
+ }
+}
+
+
+#pragma mark View/Window Passthrough
+
+/*
+ * This is a qsort-compatible compare function for NSRect, to get them in
+ * ascending order by y origin.
+ */
+static int compare_nsrect_yorigin_greater(const void *ap, const void *bp)
+{
+ const NSRect *arp = ap;
+ const NSRect *brp = bp;
+ return (arp->origin.y > brp->origin.y) - (arp->origin.y < brp->origin.y);
+}
+
+/**
+ * This is a helper function for drawRect.
+ */
+- (void)renderTileRunInRow:(int)irow col0:(int)icol0 col1:(int)icol1
+ nsctx:(NSGraphicsContext*)nsctx ctx:(CGContextRef)ctx
+ grafWidth:(int)graf_width grafHeight:(int)graf_height
+ overdrawRow:(int)overdraw_row overdrawMax:(int)overdraw_max
+{
+ /* Save the compositing mode since it is modified below. */
+ NSCompositingOperation op = nsctx.compositingOperation;
+
+ while (icol0 < icol1) {
+ const struct TerminalCell *pcell =
+ [self.contents getCellAtColumn:icol0 row:irow];
+ NSRect destinationRect =
+ [self viewRectForCellBlockAtX:icol0 y:irow
+ width:pcell->hscl height:pcell->vscl];
+ NSRect fgdRect = NSMakeRect(
+ graf_width * (pcell->v.ti.fgdCol +
+ pcell->hoff_n / (1.0 * pcell->hoff_d)),
+ graf_height * (pcell->v.ti.fgdRow +
+ pcell->voff_n / (1.0 * pcell->voff_d)),
+ graf_width * pcell->hscl / (1.0 * pcell->hoff_d),
+ graf_height * pcell->vscl / (1.0 * pcell->voff_d));
+ NSRect bckRect = NSMakeRect(
+ graf_width * (pcell->v.ti.bckCol +
+ pcell->hoff_n / (1.0 * pcell->hoff_d)),
+ graf_height * (pcell->v.ti.bckRow +
+ pcell->voff_n / (1.0 * pcell->voff_d)),
+ graf_width * pcell->hscl / (1.0 * pcell->hoff_d),
+ graf_height * pcell->vscl / (1.0 * pcell->voff_d));
+ int dbl_height_bck = overdraw_row && (irow > 2) &&
+ (pcell->v.ti.bckRow >= overdraw_row &&
+ pcell->v.ti.bckRow <= overdraw_max);
+ int dbl_height_fgd = overdraw_row && (irow > 2) &&
+ (pcell->v.ti.fgdRow >= overdraw_row) &&
+ (pcell->v.ti.fgdRow <= overdraw_max);
+ int aligned_row = 0, aligned_col = 0;
+ int is_first_piece = 0, simple_upper = 0;
+
+ /* Initialize stuff for handling a double-height tile. */
+ if (dbl_height_bck || dbl_height_fgd) {
+ if (self->terminal == angband_term[0]) {
+ aligned_col = ((icol0 - COL_MAP) / pcell->hoff_d) *
+ pcell->hoff_d + COL_MAP;
+ } else {
+ aligned_col = (icol0 / pcell->hoff_d) * pcell->hoff_d;
+ }
+ aligned_row = ((irow - ROW_MAP) / pcell->voff_d) *
+ pcell->voff_d + ROW_MAP;
+
+ /*
+ * If the lower half has been broken into multiple pieces, only
+ * do the work of rendering whatever is necessary for the upper
+ * half when drawing the first piece (the one closest to the
+ * upper left corner).
+ */
+ struct TerminalCellLocation curs = { 0, 0 };
+
+ [self.contents scanForTypeMaskInBlockAtColumn:aligned_col
+ row:aligned_row width:pcell->hoff_d height:pcell->voff_d
+ mask:TERM_CELL_TILE cursor:&curs];
+ if (curs.col + aligned_col == icol0 &&
+ curs.row + aligned_row == irow) {
+ is_first_piece = 1;
+
+ /*
+ * Hack: lookup the previous row to determine how much of the
+ * tile there is shown to apply it the upper half of the
+ * double-height tile. That will do the right thing if there
+ * is a menu displayed in that row but isn't right if there's
+ * an object/creature/feature there that doesn't have a
+ * mapping to the tile set and is rendered with a character.
+ */
+ curs.col = 0;
+ curs.row = 0;
+ [self.contents scanForTypeMaskInBlockAtColumn:aligned_col
+ row:(aligned_row - pcell->voff_d) width:pcell->hoff_d
+ height:pcell->voff_d mask:TERM_CELL_TILE cursor:&curs];
+ if (curs.col == 0 && curs.row == 0) {
+ const struct TerminalCell *pcell2 =
+ [self.contents
+ getCellAtColumn:(aligned_col + curs.col)
+ row:(aligned_row + curs.row - pcell->voff_d)];
+
+ if (pcell2->hscl == pcell2->hoff_d &&
+ pcell2->vscl == pcell2->voff_d) {
+ /*
+ * The tile in the previous row hasn't been clipped
+ * or partially overwritten. Use a streamlined
+ * rendering procedure.
+ */
+ simple_upper = 1;
+ }
+ }
+ }
+ }
+
+ /*
+ * Draw the background. For a double-height tile, this is only the
+ * the lower half.
+ */
+ draw_image_tile(
+ nsctx, ctx, pict_image, bckRect, destinationRect, NSCompositeCopy);
+ if (dbl_height_bck && is_first_piece) {
+ /* Combine upper half with previously drawn row. */
+ if (simple_upper) {
+ const struct TerminalCell *pcell2 =
+ [self.contents getCellAtColumn:aligned_col
+ row:(aligned_row - pcell->voff_d)];
+ NSRect drect2 =
+ [self viewRectForCellBlockAtX:aligned_col
+ y:(aligned_row - pcell->voff_d)
+ width:pcell2->hscl height:pcell2->vscl];
+ NSRect brect2 = NSMakeRect(
+ graf_width * pcell->v.ti.bckCol,
+ graf_height * (pcell->v.ti.bckRow - 1),
+ graf_width, graf_height);
+
+ draw_image_tile(nsctx, ctx, pict_image, brect2, drect2,
+ NSCompositeSourceOver);
+ } else {
+ struct TerminalCellLocation curs = { 0, 0 };
+
+ [self.contents scanForTypeMaskInBlockAtColumn:aligned_col
+ row:(aligned_row - pcell->voff_d) width:pcell->hoff_d
+ height:pcell->voff_d mask:TERM_CELL_TILE
+ cursor:&curs];
+ while (curs.col < pcell->hoff_d &&
+ curs.row < pcell->voff_d) {
+ const struct TerminalCell *pcell2 =
+ [self.contents getCellAtColumn:(aligned_col + curs.col)
+ row:(aligned_row + curs.row - pcell->voff_d)];
+ NSRect drect2 =
+ [self viewRectForCellBlockAtX:(aligned_col + curs.col)
+ y:(aligned_row + curs.row - pcell->voff_d)
+ width:pcell2->hscl height:pcell2->vscl];
+ /*
+ * Column and row in the tile set are from the
+ * double-height tile at *pcell, but the offsets within
+ * that and size are from what's visible for *pcell2.
+ */
+ NSRect brect2 = NSMakeRect(
+ graf_width * (pcell->v.ti.bckCol +
+ pcell2->hoff_n / (1.0 * pcell2->hoff_d)),
+ graf_height * (pcell->v.ti.bckRow - 1 +
+ pcell2->voff_n /
+ (1.0 * pcell2->voff_d)),
+ graf_width * pcell2->hscl / (1.0 * pcell2->hoff_d),
+ graf_height * pcell2->vscl / (1.0 * pcell2->voff_d));
+
+ draw_image_tile(nsctx, ctx, pict_image, brect2, drect2,
+ NSCompositeSourceOver);
+ curs.col += pcell2->hscl;
+ [self.contents
+ scanForTypeMaskInBlockAtColumn:aligned_col
+ row:(aligned_row - pcell->voff_d)
+ width:pcell->hoff_d height:pcell->voff_d
+ mask:TERM_CELL_TILE cursor:&curs];
+ }
+ }
+ }
+
+ /* Skip drawing the foreground if it is the same as the background. */
+ if (fgdRect.origin.x != bckRect.origin.x ||
+ fgdRect.origin.y != bckRect.origin.y) {
+ if (is_first_piece && dbl_height_fgd) {
+ if (simple_upper) {
+ if (pcell->hoff_n == 0 && pcell->voff_n == 0 &&
+ pcell->hscl == pcell->hoff_d) {
+ /*
+ * Render upper and lower parts as one since they
+ * are contiguous.
+ */
+ fgdRect.origin.y -= graf_height;
+ fgdRect.size.height += graf_height;
+ destinationRect.origin.y -=
+ destinationRect.size.height;
+ destinationRect.size.height +=
+ destinationRect.size.height;
+ } else {
+ /* Not contiguous. Render the upper half. */
+ NSRect drect2 =
+ [self viewRectForCellBlockAtX:aligned_col
+ y:(aligned_row - pcell->voff_d)
+ width:pcell->hoff_d height:pcell->voff_d];
+ NSRect frect2 = NSMakeRect(
+ graf_width * pcell->v.ti.fgdCol,
+ graf_height * (pcell->v.ti.fgdRow - 1),
+ graf_width, graf_height);
+
+ draw_image_tile(
+ nsctx, ctx, pict_image, frect2, drect2,
+ NSCompositeSourceOver);
+ }
+ } else {
+ /* Render the upper half pieces. */
+ struct TerminalCellLocation curs = { 0, 0 };
+
+ while (1) {
+ [self.contents
+ scanForTypeMaskInBlockAtColumn:aligned_col
+ row:(aligned_row - pcell->voff_d)
+ width:pcell->hoff_d height:pcell->voff_d
+ mask:TERM_CELL_TILE cursor:&curs];
+
+ if (curs.col >= pcell->hoff_d ||
+ curs.row >= pcell->voff_d) {
+ break;
+ }
+
+ const struct TerminalCell *pcell2 =
+ [self.contents
+ getCellAtColumn:(aligned_col + curs.col)
+ row:(aligned_row + curs.row - pcell->voff_d)];
+ NSRect drect2 =
+ [self viewRectForCellBlockAtX:(aligned_col + curs.col)
+ y:(aligned_row + curs.row - pcell->voff_d)
+ width:pcell2->hscl height:pcell2->vscl];
+ NSRect frect2 = NSMakeRect(
+ graf_width * (pcell->v.ti.fgdCol +
+ pcell2->hoff_n /
+ (1.0 * pcell2->hoff_d)),
+ graf_height * (pcell->v.ti.fgdRow - 1 +
+ pcell2->voff_n /
+ (1.0 * pcell2->voff_d)),
+ graf_width * pcell2->hscl / (1.0 * pcell2->hoff_d),
+ graf_height * pcell2->vscl /
+ (1.0 * pcell2->voff_d));
+
+ draw_image_tile(nsctx, ctx, pict_image, frect2, drect2,
+ NSCompositeSourceOver);
+ curs.col += pcell2->hscl;
+ }
+ }
+ }
+ /*
+ * Render the foreground (if a double height tile and the bottom
+ * part is contiguous with the upper part this also render the
+ * upper part.
+ */
+ draw_image_tile(
+ nsctx, ctx, pict_image, fgdRect, destinationRect,
+ NSCompositeSourceOver);
+ }
+ icol0 = [self.contents scanForTypeMaskInRow:irow mask:TERM_CELL_TILE
+ col0:(icol0+pcell->hscl) col1:icol1];
+ }
+
+ /* Restore the compositing mode. */
+ nsctx.compositingOperation = op;
+}
+
+/**
+ * This is what our views call to get us to draw to the window
+ */
+- (void)drawRect:(NSRect)rect inView:(NSView *)view
+{
+ /* Take this opportunity to throttle so we don't flush faster than desired.
+ */
+ [self throttle];
+
+ CGFloat bottomY =
+ self.borderSize.height + self.tileSize.height * self.rows;
+ CGFloat rightX =
+ self.borderSize.width + self.tileSize.width * self.cols;
+
+ const NSRect *invalidRects;
+ NSInteger invalidCount;
+ [view getRectsBeingDrawn:&invalidRects count:&invalidCount];
+
+ /*
+ * If the non-border areas need rendering, set some things up so they can
+ * be reused for each invalid rectangle.
+ */
+ NSGraphicsContext *nsctx = nil;
+ CGContextRef ctx = 0;
+ NSFont* screenFont = nil;
+ int graf_width = 0, graf_height = 0;
+ int overdraw_row = 0, overdraw_max = 0;
+ wchar_t blank = 0;
+ if (rect.origin.x < rightX &&
+ rect.origin.x + rect.size.width > self.borderSize.width &&
+ rect.origin.y < bottomY &&
+ rect.origin.y + rect.size.height > self.borderSize.height) {
+ nsctx = [NSGraphicsContext currentContext];
+ ctx = [nsctx graphicsPort];
+ screenFont = [self.angbandViewFont screenFont];
+ [screenFont set];
+ blank = [TerminalContents getBlankChar];
+ if (use_graphics) {
+ graf_width = current_graphics_mode->cell_width;
+ graf_height = current_graphics_mode->cell_height;
+ overdraw_row = current_graphics_mode->overdrawRow;
+ overdraw_max = current_graphics_mode->overdrawMax;
+ }
+ }
+
+ /*
+ * With double height tiles, need to have rendered prior rows (i.e.
+ * smaller y) before the current one. Since the invalid rectanges are
+ * processed in order, ensure that by sorting the invalid rectangles in
+ * increasing order of y origin (AppKit guarantees the invalid rectanges
+ * are non-overlapping).
+ */
+ NSRect* sortedRects = 0;
+ const NSRect* workingRects;
+ if (overdraw_row && invalidCount > 1) {
+ sortedRects = malloc(invalidCount * sizeof(NSRect));
+ if (sortedRects == 0) {
+ NSException *exc = [NSException exceptionWithName:@"OutOfMemory"
+ reason:@"sorted rects in drawRect"
+ userInfo:nil];
+ @throw exc;
+ }
+ (void) memcpy(
+ sortedRects, invalidRects, invalidCount * sizeof(NSRect));
+ qsort(sortedRects, invalidCount, sizeof(NSRect),
+ compare_nsrect_yorigin_greater);
+ workingRects = sortedRects;
+ } else {
+ workingRects = invalidRects;
+ }
+
+ /*
+ * Use -2 for unknown. Use -1 for Cocoa's blackColor. All others are the
+ * Angband color index.
+ */
+ int alast = -2;
+ int redrawCursor = 0;
+
+ for (NSInteger irect = 0; irect < invalidCount; ++irect) {
+ NSRect modRect, clearRect;
+ CGFloat edge;
+ int iRowFirst, iRowLast;
+ int iColFirst, iColLast;
+
+ /* Handle the top border. */
+ if (workingRects[irect].origin.y < self.borderSize.height) {
+ edge =
+ workingRects[irect].origin.y + workingRects[irect].size.height;
+ if (edge <= self.borderSize.height) {
+ if (alast != -1) {
+ [[NSColor blackColor] set];
+ alast = -1;
+ }
+ NSRectFill(workingRects[irect]);
+ continue;
+ }
+ clearRect = workingRects[irect];
+ clearRect.size.height =
+ self.borderSize.height - workingRects[irect].origin.y;
+ if (alast != -1) {
+ [[NSColor blackColor] set];
+ alast = -1;
+ }
+ NSRectFill(clearRect);
+ modRect.origin.x = workingRects[irect].origin.x;
+ modRect.origin.y = self.borderSize.height;
+ modRect.size.width = workingRects[irect].size.width;
+ modRect.size.height = edge - self.borderSize.height;
+ } else {
+ modRect = workingRects[irect];
+ }
+
+ /* Handle the left border. */
+ if (modRect.origin.x < self.borderSize.width) {
+ edge = modRect.origin.x + modRect.size.width;
+ if (edge <= self.borderSize.width) {
+ if (alast != -1) {
+ alast = -1;
+ [[NSColor blackColor] set];
+ }
+ NSRectFill(modRect);
+ continue;
+ }
+ clearRect = modRect;
+ clearRect.size.width = self.borderSize.width - clearRect.origin.x;
+ if (alast != -1) {
+ alast = -1;
+ [[NSColor blackColor] set];
+ }
+ NSRectFill(clearRect);
+ modRect.origin.x = self.borderSize.width;
+ modRect.size.width = edge - self.borderSize.width;
+ }
+
+ iRowFirst = floor((modRect.origin.y - self.borderSize.height) /
+ self.tileSize.height);
+ iColFirst = floor((modRect.origin.x - self.borderSize.width) /
+ self.tileSize.width);
+ edge = modRect.origin.y + modRect.size.height;
+ if (edge <= bottomY) {
+ iRowLast =
+ ceil((edge - self.borderSize.height) / self.tileSize.height);
+ } else {
+ iRowLast = self.rows;
+ }
+ edge = modRect.origin.x + modRect.size.width;
+ if (edge <= rightX) {
+ iColLast =
+ ceil((edge - self.borderSize.width) / self.tileSize.width);
+ } else {
+ iColLast = self.cols;
+ }
+
+ if (self.contents.cursorColumn != -1 &&
+ self.contents.cursorRow != -1 &&
+ self.contents.cursorColumn + self.contents.cursorWidth - 1 >=
+ iColFirst &&
+ self.contents.cursorColumn < iColLast &&
+ self.contents.cursorRow + self.contents.cursorHeight - 1 >=
+ iRowFirst &&
+ self.contents.cursorRow < iRowLast) {
+ redrawCursor = 1;
+ }
+
+ for (int irow = iRowFirst; irow < iRowLast; ++irow) {
+ int icol =
+ [self.contents scanForTypeMaskInRow:irow
+ mask:(TERM_CELL_CHAR | TERM_CELL_TILE)
+ col0:iColFirst col1:iColLast];
+
+ while (1) {
+ if (icol >= iColLast) {
+ break;
+ }
+
+ if ([self.contents getCellAtColumn:icol row:irow]->form ==
+ TERM_CELL_TILE) {
+ /*
+ * It is a tile. Identify how far the run of tiles goes.
+ */
+ int jcol = [self.contents scanForPredicateInRow:irow
+ predicate:isTileTop desired:1
+ col0:(icol + 1) col1:iColLast];
+
+ [self renderTileRunInRow:irow col0:icol col1:jcol
+ nsctx:nsctx ctx:ctx
+ grafWidth:graf_width grafHeight:graf_height
+ overdrawRow:overdraw_row overdrawMax:overdraw_max];
+ icol = jcol;
+ } else {
+ /*
+ * It is a character. Identify how far the run of
+ * characters goes.
+ */
+ int jcol = [self.contents scanForPredicateInRow:irow
+ predicate:isCharNoPartial desired:1
+ col0:(icol + 1) col1:iColLast];
+ int jcol2;
+
+ if (jcol < iColLast &&
+ isPartiallyOverwrittenBigChar(
+ [self.contents getCellAtColumn:jcol row:irow])) {
+ jcol2 = [self.contents scanForTypeMaskInRow:irow
+ mask:~TERM_CELL_CHAR_PADDING
+ col0:(jcol + 1) col1:iColLast];
+ } else {
+ jcol2 = jcol;
+ }
+
+ /*
+ * Set up clipping rectangle for text. Save the
+ * graphics context so the clipping rectangle can be
+ * forgotten. Use CGContextBeginPath to clear the current
+ * path so it does not affect clipping. Do not call
+ * CGContextSetTextDrawingMode() to include clipping since
+ * that does not appear to necessary on 10.14 and is
+ * actually detrimental: when displaying more than one
+ * character, only the first is visible.
+ */
+ CGContextSaveGState(ctx);
+ CGContextBeginPath(ctx);
+ NSRect r = [self viewRectForCellBlockAtX:icol y:irow
+ width:(jcol2 - icol) height:1];
+ CGContextClipToRect(ctx, r);
+
+ /*
+ * See if the region to be rendered needs to be expanded:
+ * adjacent text that could influence what's in the clipped
+ * region.
+ */
+ int isrch = icol;
+ int irng = icol - self.nColPost;
+ if (irng < 1) {
+ irng = 1;
+ }
+
+ while (1) {
+ if (isrch <= irng) {
+ break;
+ }
+
+ const struct TerminalCell *pcell2 =
+ [self.contents getCellAtColumn:(isrch - 1)
+ row:irow];
+ if (pcell2->form == TERM_CELL_CHAR) {
+ --isrch;
+ if (pcell2->v.ch.glyph != blank) {
+ icol = isrch;
+ }
+ } else if (pcell2->form == TERM_CELL_CHAR_PADDING) {
+ /*
+ * Only extend the rendering if this is padding
+ * for a character that hasn't been partially
+ * overwritten.
+ */
+ if (! isPartiallyOverwrittenBigChar(pcell2)) {
+ if (isrch - pcell2->v.pd.hoff >= 0) {
+ const struct TerminalCell* pcell3 =
+ [self.contents
+ getCellAtColumn:(isrch - pcell2->v.pd.hoff)
+ row:irow];
+
+ if (pcell3->v.ch.glyph != blank) {
+ icol = isrch - pcell2->v.pd.hoff;
+ isrch = icol - 1;
+ } else {
+ isrch = isrch - pcell2->v.pd.hoff - 1;
+ }
+ } else {
+ /* Should not happen, corrupt offset. */
+ --isrch;
+ }
+ } else {
+ break;
+ }
+ } else {
+ /*
+ * Tiles or tile padding block anything before
+ * them from rendering after them.
+ */
+ break;
+ }
+ }
+
+ isrch = jcol2;
+ irng = jcol2 + self.nColPre;
+ if (irng > self.cols) {
+ irng = self.cols;
+ }
+ while (1) {
+ if (isrch >= irng) {
+ break;
+ }
+
+ const struct TerminalCell *pcell2 =
+ [self.contents getCellAtColumn:isrch row:irow];
+ if (pcell2->form == TERM_CELL_CHAR) {
+ if (pcell2->v.ch.glyph != blank) {
+ jcol2 = isrch;
+ }
+ ++isrch;
+ } else if (pcell2->form == TERM_CELL_CHAR_PADDING) {
+ ++isrch;
+ } else {
+ break;
+ }
+ }
+
+ /* Render text. */
+ /* Clear where rendering will be done. */
+ if (alast != -1) {
+ [[NSColor blackColor] set];
+ alast = -1;
+ }
+ r = [self viewRectForCellBlockAtX:icol y:irow
+ width:(jcol - icol) height:1];
+ NSRectFill(r);
+
+ while (icol < jcol) {
+ const struct TerminalCell *pcell =
+ [self.contents getCellAtColumn:icol row:irow];
+
+ /*
+ * For blanks, clearing was all that was necessary.
+ * Don't redraw them.
+ */
+ if (pcell->v.ch.glyph != blank) {
+ int a = pcell->v.ch.attr % MAX_COLORS;
+
+ if (alast != a) {
+ alast = a;
+ set_color_for_index(a);
+ }
+ r = [self viewRectForCellBlockAtX:icol
+ y:irow width:pcell->hscl
+ height:1];
+ [self drawWChar:pcell->v.ch.glyph inRect:r
+ screenFont:screenFont context:ctx];
+ }
+ icol += pcell->hscl;
+ }
+
+ /*
+ * Forget the clipping rectangle. As a side effect, lose
+ * the color.
+ */
+ CGContextRestoreGState(ctx);
+ alast = -2;
+ }
+ icol =
+ [self.contents scanForTypeMaskInRow:irow
+ mask:(TERM_CELL_CHAR | TERM_CELL_TILE)
+ col0:icol col1:iColLast];
+ }
+ }
+
+ /* Handle the right border. */
+ edge = modRect.origin.x + modRect.size.width;
+ if (edge > rightX) {
+ if (modRect.origin.x >= rightX) {
+ if (alast != -1) {
+ alast = -1;
+ [[NSColor blackColor] set];
+ }
+ NSRectFill(modRect);
+ continue;
+ }
+ clearRect = modRect;
+ clearRect.origin.x = rightX;
+ clearRect.size.width = edge - rightX;
+ if (alast != -1) {
+ alast = -1;
+ [[NSColor blackColor] set];
+ }
+ NSRectFill(clearRect);
+ modRect.size.width = edge - modRect.origin.x;
+ }
+
+ /* Handle the bottom border. */
+ edge = modRect.origin.y + modRect.size.height;
+ if (edge > bottomY) {
+ if (modRect.origin.y < bottomY) {
+ modRect.origin.y = bottomY;
+ modRect.size.height = edge - bottomY;
+ }
+ if (alast != -1) {
+ alast = -1;
+ [[NSColor blackColor] set];
+ }
+ NSRectFill(modRect);
+ }
+ }
+
+ if (redrawCursor) {
+ NSRect r = [self viewRectForCellBlockAtX:self.contents.cursorColumn
+ y:self.contents.cursorRow
+ width:self.contents.cursorWidth
+ height:self.contents.cursorHeight];
+ [[NSColor yellowColor] set];
+ NSFrameRectWithWidth(r, 1);
+ }
+
+ free(sortedRects);
+}
+
+- (BOOL)isOrderedIn
+{
+ return [[self->angbandView window] isVisible];
+}
+
+- (BOOL)isMainWindow
+{
+ return [[self->angbandView window] isMainWindow];
+}
+
+- (BOOL)isKeyWindow
+{
+ return [[self->angbandView window] isKeyWindow];
+}
+
+- (void)setNeedsDisplay:(BOOL)val
+{
+ [self->angbandView setNeedsDisplay:val];
+}
+
+- (void)setNeedsDisplayInRect:(NSRect)rect
+{
+ [self->angbandView setNeedsDisplayInRect:rect];
+}
+
+- (void)displayIfNeeded
+{
+ [self->angbandView displayIfNeeded];
+}
+
+- (int)terminalIndex
+{
+ int termIndex = 0;
+
+ for( termIndex = 0; termIndex < ANGBAND_TERM_MAX; termIndex++ )
+ {
+ if( angband_term[termIndex] == self->terminal )
+ {
+ break;
+ }
+ }
+
+ return termIndex;
+}
+
+- (void)resizeTerminalWithContentRect: (NSRect)contentRect saveToDefaults: (BOOL)saveToDefaults
+{
+ CGFloat newRows = floor(
+ (contentRect.size.height - (self.borderSize.height * 2.0)) /
+ self.tileSize.height);
+ CGFloat newColumns = floor(
+ (contentRect.size.width - (self.borderSize.width * 2.0)) /
+ self.tileSize.width);
+
+ if (newRows < 1 || newColumns < 1) return;
+ [self resizeWithColumns:newColumns rows:newRows];
+
+ int termIndex = [self terminalIndex];
+ [self setDefaultTitle:termIndex];
+
+ if( saveToDefaults )
+ {
+ NSArray *terminals = [[NSUserDefaults standardUserDefaults] valueForKey: AngbandTerminalsDefaultsKey];
+
+ if( termIndex < (int)[terminals count] )
+ {
+ NSMutableDictionary *mutableTerm = [[NSMutableDictionary alloc] initWithDictionary: [terminals objectAtIndex: termIndex]];
+ [mutableTerm setValue: [NSNumber numberWithInteger: self.cols]
+ forKey: AngbandTerminalColumnsDefaultsKey];
+ [mutableTerm setValue: [NSNumber numberWithInteger: self.rows]
+ forKey: AngbandTerminalRowsDefaultsKey];
+
+ NSMutableArray *mutableTerminals = [[NSMutableArray alloc] initWithArray: terminals];
+ [mutableTerminals replaceObjectAtIndex: termIndex withObject: mutableTerm];
+
+ [[NSUserDefaults standardUserDefaults] setValue: mutableTerminals forKey: AngbandTerminalsDefaultsKey];
+ }
+ }
+
+ term *old = Term;
+ Term_activate( self->terminal );
+ Term_resize( self.cols, self.rows );
+ Term_redraw();
+ Term_activate( old );
+}
+
+- (void)constrainWindowSize:(int)termIdx
+{
+ NSSize minsize;
+
+ if (termIdx == 0) {
+ minsize.width = 80;
+ minsize.height = 24;
+ } else {
+ minsize.width = 1;
+ minsize.height = 1;
+ }
+ minsize.width =
+ minsize.width * self.tileSize.width + self.borderSize.width * 2.0;
+ minsize.height =
+ minsize.height * self.tileSize.height + self.borderSize.height * 2.0;
+ [[self makePrimaryWindow] setContentMinSize:minsize];
+ self.primaryWindow.contentResizeIncrements = self.tileSize;
+}
+
+- (void)saveWindowVisibleToDefaults: (BOOL)windowVisible
+{
+ int termIndex = [self terminalIndex];
+ BOOL safeVisibility = (termIndex == 0) ? YES : windowVisible; /* Ensure main term doesn't go away because of these defaults */
+ NSArray *terminals = [[NSUserDefaults standardUserDefaults] valueForKey: AngbandTerminalsDefaultsKey];
+
+ if( termIndex < (int)[terminals count] )
+ {
+ NSMutableDictionary *mutableTerm = [[NSMutableDictionary alloc] initWithDictionary: [terminals objectAtIndex: termIndex]];
+ [mutableTerm setValue: [NSNumber numberWithBool: safeVisibility] forKey: AngbandTerminalVisibleDefaultsKey];
+
+ NSMutableArray *mutableTerminals = [[NSMutableArray alloc] initWithArray: terminals];
+ [mutableTerminals replaceObjectAtIndex: termIndex withObject: mutableTerm];
+
+ [[NSUserDefaults standardUserDefaults] setValue: mutableTerminals forKey: AngbandTerminalsDefaultsKey];
+ }
+}
+
+- (BOOL)windowVisibleUsingDefaults
+{
+ int termIndex = [self terminalIndex];
+
+ if( termIndex == 0 )
+ {
+ return YES;
+ }
+
+ NSArray *terminals = [[NSUserDefaults standardUserDefaults] valueForKey: AngbandTerminalsDefaultsKey];
+ BOOL visible = NO;
+
+ if( termIndex < (int)[terminals count] )
+ {
+ NSDictionary *term = [terminals objectAtIndex: termIndex];
+ NSNumber *visibleValue = [term valueForKey: AngbandTerminalVisibleDefaultsKey];
+
+ if( visibleValue != nil )
+ {
+ visible = [visibleValue boolValue];
+ }
+ }
+
+ return visible;
+}
+
+#pragma mark -
+#pragma mark NSWindowDelegate Methods
+
+/*- (void)windowWillStartLiveResize: (NSNotification *)notification
+{
+}*/
+
+- (void)windowDidEndLiveResize: (NSNotification *)notification
+{
+ NSWindow *window = [notification object];
+ NSRect contentRect = [window contentRectForFrameRect: [window frame]];
+ [self resizeTerminalWithContentRect: contentRect saveToDefaults: !(self->inFullscreenTransition)];
+}
+
+/*- (NSSize)windowWillResize: (NSWindow *)sender toSize: (NSSize)frameSize
+{
+} */
+
+- (void)windowWillEnterFullScreen: (NSNotification *)notification
+{
+ self->inFullscreenTransition = YES;
+}
+
+- (void)windowDidEnterFullScreen: (NSNotification *)notification
+{
+ NSWindow *window = [notification object];
+ NSRect contentRect = [window contentRectForFrameRect: [window frame]];
+ self->inFullscreenTransition = NO;
+ [self resizeTerminalWithContentRect: contentRect saveToDefaults: NO];
+}
+
+- (void)windowWillExitFullScreen: (NSNotification *)notification
+{
+ self->inFullscreenTransition = YES;
+}
+
+- (void)windowDidExitFullScreen: (NSNotification *)notification
+{
+ NSWindow *window = [notification object];
+ NSRect contentRect = [window contentRectForFrameRect: [window frame]];
+ self->inFullscreenTransition = NO;
+ [self resizeTerminalWithContentRect: contentRect saveToDefaults: NO];
+}
+
+- (void)windowDidBecomeMain:(NSNotification *)notification
+{
+ NSWindow *window = [notification object];
+
+ if( window != self.primaryWindow )
+ {
+ return;
+ }
+
+ int termIndex = [self terminalIndex];
+ NSMenuItem *item = [[[NSApplication sharedApplication] windowsMenu] itemWithTag: AngbandWindowMenuItemTagBase + termIndex];
+ [item setState: NSOnState];
+
+ if( [[NSFontPanel sharedFontPanel] isVisible] )
+ {
+ [[NSFontPanel sharedFontPanel] setPanelFont:self.angbandViewFont
+ isMultiple: NO];
+ }
+}
+
+- (void)windowDidResignMain: (NSNotification *)notification
+{
+ NSWindow *window = [notification object];
+
+ if( window != self.primaryWindow )
+ {
+ return;
+ }
+
+ int termIndex = [self terminalIndex];
+ NSMenuItem *item = [[[NSApplication sharedApplication] windowsMenu] itemWithTag: AngbandWindowMenuItemTagBase + termIndex];
+ [item setState: NSOffState];
+}
+
+- (void)windowWillClose: (NSNotification *)notification
+{
+ /*
+ * If closing only because the application is terminating, don't update
+ * the visible state for when the application is relaunched.
+ */
+ if (! quit_when_ready) {
+ [self saveWindowVisibleToDefaults: NO];
+ }
+}
+
+@end
+
+
+@implementation AngbandView
+
+- (BOOL)isOpaque
+{
+ return YES;
+}
+
+- (BOOL)isFlipped
+{
+ return YES;
+}
+
+- (void)drawRect:(NSRect)rect
+{
+ if ([self inLiveResize]) {
+ /*
+ * Always anchor the cached area to the upper left corner of the view.
+ * Any parts on the right or bottom that can't be drawn from the cached
+ * area are simply cleared. Will fill them with appropriate content
+ * when resizing is done.
+ */
+ const NSRect *rects;
+ NSInteger count;
+
+ [self getRectsBeingDrawn:&rects count:&count];
+ if (count > 0) {
+ NSRect viewRect = [self visibleRect];
+
+ [[NSColor blackColor] set];
+ while (count-- > 0) {
+ CGFloat drawTop = rects[count].origin.y - viewRect.origin.y;
+ CGFloat drawBottom = drawTop + rects[count].size.height;
+ CGFloat drawLeft = rects[count].origin.x - viewRect.origin.x;
+ CGFloat drawRight = drawLeft + rects[count].size.width;
+ /*
+ * modRect and clrRect, like rects[count], are in the view
+ * coordinates with y flipped. cacheRect is in the bitmap
+ * coordinates and y is not flipped.
+ */
+ NSRect modRect, clrRect, cacheRect;
+
+ /*
+ * Clip by bottom edge of cached area. Clear what's below
+ * that.
+ */
+ if (drawTop >= self->cacheBounds.size.height) {
+ NSRectFill(rects[count]);
+ continue;
+ }
+ modRect.origin.x = rects[count].origin.x;
+ modRect.origin.y = rects[count].origin.y;
+ modRect.size.width = rects[count].size.width;
+ cacheRect.origin.y = drawTop;
+ if (drawBottom > self->cacheBounds.size.height) {
+ CGFloat excess =
+ drawBottom - self->cacheBounds.size.height;
+
+ modRect.size.height = rects[count].size.height - excess;
+ cacheRect.origin.y = 0;
+ clrRect.origin.x = modRect.origin.x;
+ clrRect.origin.y = modRect.origin.y + modRect.size.height;
+ clrRect.size.width = modRect.size.width;
+ clrRect.size.height = excess;
+ NSRectFill(clrRect);
+ } else {
+ modRect.size.height = rects[count].size.height;
+ cacheRect.origin.y = self->cacheBounds.size.height -
+ rects[count].size.height;
+ }
+ cacheRect.size.height = modRect.size.height;
+
+ /*
+ * Clip by right edge of cached area. Clear what's to the
+ * right of that and copy the remainder from the cache.
+ */
+ if (drawLeft >= self->cacheBounds.size.width) {
+ NSRectFill(modRect);
+ continue;
+ }
+ cacheRect.origin.x = drawLeft;
+ if (drawRight > self->cacheBounds.size.width) {
+ CGFloat excess = drawRight - self->cacheBounds.size.width;
+
+ modRect.size.width -= excess;
+ cacheRect.size.width =
+ self->cacheBounds.size.width - drawLeft;
+ clrRect.origin.x = modRect.origin.x + modRect.size.width;
+ clrRect.origin.y = modRect.origin.y;
+ clrRect.size.width = excess;
+ clrRect.size.height = modRect.size.height;
+ NSRectFill(clrRect);
+ } else {
+ cacheRect.size.width = drawRight - drawLeft;
+ }
+ [self->cacheForResize drawInRect:modRect fromRect:cacheRect
+ operation:NSCompositeCopy fraction:1.0
+ respectFlipped:YES hints:nil];
+ }
+ }
+ } else if (! self.angbandContext) {
+ /* Draw bright orange, 'cause this ain't right */
+ [[NSColor orangeColor] set];
+ NSRectFill([self bounds]);
+ } else {
+ /* Tell the Angband context to draw into us */
+ [self.angbandContext drawRect:rect inView:self];
+ }
+}
+
+/**
+ * Override NSView's method to set up a cache that's used in drawRect to
+ * handle drawing during a resize.
+ */
+- (void)viewWillStartLiveResize
+{
+ [super viewWillStartLiveResize];
+ self->cacheBounds = [self visibleRect];
+ self->cacheForResize =
+ [self bitmapImageRepForCachingDisplayInRect:self->cacheBounds];
+ if (self->cacheForResize != nil) {
+ [self cacheDisplayInRect:self->cacheBounds
+ toBitmapImageRep:self->cacheForResize];
+ } else {
+ self->cacheBounds.size.width = 0.;
+ self->cacheBounds.size.height = 0.;
+ }
+}
+
+/**
+ * Override NSView's method to release the cache set up in
+ * viewWillStartLiveResize.
+ */
+- (void)viewDidEndLiveResize
+{
+ [super viewDidEndLiveResize];
+ self->cacheForResize = nil;
+ [self setNeedsDisplay:YES];
+}
+
+@end
+
+/**
+ * Delay handling of double-clicked savefiles
+ */
+Boolean open_when_ready = FALSE;
+
+
+
+/**
+ * ------------------------------------------------------------------------
+ * Some generic functions
+ * ------------------------------------------------------------------------ */
+
+/**
+ * Sets an Angband color at a given index
+ */
+static void set_color_for_index(int idx)
+{
+ u16b rv, gv, bv;
- /* If this is the first term, and we support full screen (Mac OS X Lion or
- * later), then allow it to go full screen (sweet). Allow other terms to be
- * FullScreenAuxilliary, so they can at least show up. Unfortunately in
- * Lion they don't get brought to the full screen space; but they would
- * only make sense on multiple displays anyways so it's not a big loss. */
- if ([window respondsToSelector:@selector(toggleFullScreen:)])
- {
- NSWindowCollectionBehavior behavior = [window collectionBehavior];
- behavior |= (termIdx == 0 ? Angband_NSWindowCollectionBehaviorFullScreenPrimary : Angband_NSWindowCollectionBehaviorFullScreenAuxiliary);
- [window setCollectionBehavior:behavior];
- }
+ /* Extract the R,G,B data */
+ rv = angband_color_table[idx][1];
+ gv = angband_color_table[idx][2];
+ bv = angband_color_table[idx][3];
- /* No Resume support yet, though it would not be hard to add */
- if ([window respondsToSelector:@selector(setRestorable:)])
+ CGContextSetRGBFillColor([[NSGraphicsContext currentContext] graphicsPort], rv/255., gv/255., bv/255., 1.);
+}
+
+/**
+ * Remember the current character in UserDefaults so we can select it by
+ * default next time.
+ */
+static void record_current_savefile(void)
+{
+ NSString *savefileString = [[NSString stringWithCString:savefile encoding:NSMacOSRomanStringEncoding] lastPathComponent];
+ if (savefileString)
{
- [window setRestorable:NO];
+ NSUserDefaults *angbandDefs = [NSUserDefaults angbandDefaults];
+ [angbandDefs setObject:savefileString forKey:@"SaveFile"];
}
+}
+
+
+#ifdef JP
+/**
+ * Convert a two-byte EUC-JP encoded character (both *cp and (*cp + 1) are in
+ * the range, 0xA1-0xFE, or *cp is 0x8E) to a utf16 value in the native byte
+ * ordering.
+ */
+static wchar_t convert_two_byte_eucjp_to_utf16_native(const char *cp)
+{
+ NSString* str = [[NSString alloc] initWithBytes:cp length:2
+ encoding:NSJapaneseEUCStringEncoding];
+ wchar_t result = [str characterAtIndex:0];
+ str = nil;
+ return result;
+}
+#endif /* JP */
+
+
+/**
+ * ------------------------------------------------------------------------
+ * Support for the "z-term.c" package
+ * ------------------------------------------------------------------------ */
+
+
+/**
+ * Initialize a new Term
+ */
+static void Term_init_cocoa(term *t)
+{
+ @autoreleasepool {
+ AngbandContext *context = [[AngbandContext alloc] init];
+
+ /* Give the term ownership of the context */
+ t->data = (void *)CFBridgingRetain(context);
+
+ /* Handle graphics */
+ t->higher_pict = !! use_graphics;
+ t->always_pict = FALSE;
+
+ NSDisableScreenUpdates();
+
+ /*
+ * Figure out the frame autosave name based on the index of this term
+ */
+ NSString *autosaveName = nil;
+ int termIdx;
+ for (termIdx = 0; termIdx < ANGBAND_TERM_MAX; termIdx++)
+ {
+ if (angband_term[termIdx] == t)
+ {
+ autosaveName =
+ [NSString stringWithFormat:@"AngbandTerm-%d", termIdx];
+ break;
+ }
+ }
+
+ /* Set its font. */
+ NSString *fontName =
+ [[NSUserDefaults angbandDefaults]
+ stringForKey:[NSString stringWithFormat:@"FontName-%d", termIdx]];
+ if (! fontName) fontName = [[AngbandContext defaultFont] fontName];
+
+ /*
+ * Use a smaller default font for the other windows, but only if the
+ * font hasn't been explicitly set.
+ */
+ float fontSize =
+ (termIdx > 0) ? 10.0 : [[AngbandContext defaultFont] pointSize];
+ NSNumber *fontSizeNumber =
+ [[NSUserDefaults angbandDefaults]
+ valueForKey: [NSString stringWithFormat: @"FontSize-%d", termIdx]];
+
+ if( fontSizeNumber != nil )
+ {
+ fontSize = [fontSizeNumber floatValue];
+ }
+
+ [context setSelectionFont:[NSFont fontWithName:fontName size:fontSize]
+ adjustTerminal: NO];
+
+ NSArray *terminalDefaults =
+ [[NSUserDefaults standardUserDefaults]
+ valueForKey: AngbandTerminalsDefaultsKey];
+ NSInteger rows = 24;
+ NSInteger columns = 80;
+
+ if( termIdx < (int)[terminalDefaults count] )
+ {
+ NSDictionary *term = [terminalDefaults objectAtIndex: termIdx];
+ NSInteger defaultRows =
+ [[term valueForKey: AngbandTerminalRowsDefaultsKey]
+ integerValue];
+ NSInteger defaultColumns =
+ [[term valueForKey: AngbandTerminalColumnsDefaultsKey]
+ integerValue];
+
+ if (defaultRows > 0) rows = defaultRows;
+ if (defaultColumns > 0) columns = defaultColumns;
+ }
+
+ [context resizeWithColumns:columns rows:rows];
+
+ /* Get the window */
+ NSWindow *window = [context makePrimaryWindow];
+
+ /* Set its title and, for auxiliary terms, tentative size */
+ [context setDefaultTitle:termIdx];
+ [context constrainWindowSize:termIdx];
+
+ /*
+ * If this is the first term, and we support full screen (Mac OS X Lion
+ * or later), then allow it to go full screen (sweet). Allow other
+ * terms to be FullScreenAuxilliary, so they can at least show up.
+ * Unfortunately in Lion they don't get brought to the full screen
+ * space; but they would only make sense on multiple displays anyways
+ * so it's not a big loss.
+ */
+ if ([window respondsToSelector:@selector(toggleFullScreen:)])
+ {
+ NSWindowCollectionBehavior behavior = [window collectionBehavior];
+ behavior |=
+ (termIdx == 0 ?
+ NSWindowCollectionBehaviorFullScreenPrimary :
+ NSWindowCollectionBehaviorFullScreenAuxiliary);
+ [window setCollectionBehavior:behavior];
+ }
+
+ /* No Resume support yet, though it would not be hard to add */
+ if ([window respondsToSelector:@selector(setRestorable:)])
+ {
+ [window setRestorable:NO];
+ }
/* default window placement */ {
- static NSRect overallBoundingRect;
+ static NSRect overallBoundingRect;
- if( termIdx == 0 )
- {
- /* This is a bit of a trick to allow us to display multiple windows
- * in the "standard default" window position in OS X: the upper
- * center of the screen.
- * The term sizes set in load_prefs() are based on a 5-wide by
- * 3-high grid, with the main term being 4/5 wide by 2/3 high
- * (hence the scaling to find */
-
- /* What the containing rect would be). */
- NSRect originalMainTermFrame = [window frame];
- NSRect scaledFrame = originalMainTermFrame;
- scaledFrame.size.width *= 5.0 / 4.0;
- scaledFrame.size.height *= 3.0 / 2.0;
- scaledFrame.size.width += 1.0; /* spacing between window columns */
- scaledFrame.size.height += 1.0; /* spacing between window rows */
- [window setFrame: scaledFrame display: NO];
- [window center];
- overallBoundingRect = [window frame];
- [window setFrame: originalMainTermFrame display: NO];
- }
+ if( termIdx == 0 )
+ {
+ /*
+ * This is a bit of a trick to allow us to display multiple
+ * windows in the "standard default" window position in OS X:
+ * the upper center of the screen. The term sizes set in
+ * load_prefs() are based on a 5-wide by 3-high grid, with the
+ * main term being 4/5 wide by 2/3 high (hence the scaling to
+ * find what the containing rect would be).
+ */
+ NSRect originalMainTermFrame = [window frame];
+ NSRect scaledFrame = originalMainTermFrame;
+ scaledFrame.size.width *= 5.0 / 4.0;
+ scaledFrame.size.height *= 3.0 / 2.0;
+ scaledFrame.size.width += 1.0; /* spacing between window columns */
+ scaledFrame.size.height += 1.0; /* spacing between window rows */
+ [window setFrame: scaledFrame display: NO];
+ [window center];
+ overallBoundingRect = [window frame];
+ [window setFrame: originalMainTermFrame display: NO];
+ }
- static NSRect mainTermBaseRect;
- NSRect windowFrame = [window frame];
+ static NSRect mainTermBaseRect;
+ NSRect windowFrame = [window frame];
- if( termIdx == 0 )
- {
- /* The height and width adjustments were determined experimentally,
- * so that the rest of the windows line up nicely without
- * overlapping */
- windowFrame.size.width += 7.0;
- windowFrame.size.height += 9.0;
- windowFrame.origin.x = NSMinX( overallBoundingRect );
- windowFrame.origin.y = NSMaxY( overallBoundingRect ) - NSHeight( windowFrame );
- mainTermBaseRect = windowFrame;
- }
- else if( termIdx == 1 )
- {
- windowFrame.origin.x = NSMinX( mainTermBaseRect );
- windowFrame.origin.y = NSMinY( mainTermBaseRect ) - NSHeight( windowFrame ) - 1.0;
- }
- else if( termIdx == 2 )
- {
- windowFrame.origin.x = NSMaxX( mainTermBaseRect ) + 1.0;
- windowFrame.origin.y = NSMaxY( mainTermBaseRect ) - NSHeight( windowFrame );
- }
- else if( termIdx == 3 )
- {
- windowFrame.origin.x = NSMaxX( mainTermBaseRect ) + 1.0;
- windowFrame.origin.y = NSMinY( mainTermBaseRect ) - NSHeight( windowFrame ) - 1.0;
- }
- else if( termIdx == 4 )
- {
- windowFrame.origin.x = NSMaxX( mainTermBaseRect ) + 1.0;
- windowFrame.origin.y = NSMinY( mainTermBaseRect );
- }
- else if( termIdx == 5 )
- {
- windowFrame.origin.x = NSMinX( mainTermBaseRect ) + NSWidth( windowFrame ) + 1.0;
- windowFrame.origin.y = NSMinY( mainTermBaseRect ) - NSHeight( windowFrame ) - 1.0;
- }
+ if( termIdx == 0 )
+ {
+ /*
+ * The height and width adjustments were determined
+ * experimentally, so that the rest of the windows line up
+ * nicely without overlapping.
+ */
+ windowFrame.size.width += 7.0;
+ windowFrame.size.height += 9.0;
+ windowFrame.origin.x = NSMinX( overallBoundingRect );
+ windowFrame.origin.y =
+ NSMaxY( overallBoundingRect ) - NSHeight( windowFrame );
+ mainTermBaseRect = windowFrame;
+ }
+ else if( termIdx == 1 )
+ {
+ windowFrame.origin.x = NSMinX( mainTermBaseRect );
+ windowFrame.origin.y =
+ NSMinY( mainTermBaseRect ) - NSHeight( windowFrame ) - 1.0;
+ }
+ else if( termIdx == 2 )
+ {
+ windowFrame.origin.x = NSMaxX( mainTermBaseRect ) + 1.0;
+ windowFrame.origin.y =
+ NSMaxY( mainTermBaseRect ) - NSHeight( windowFrame );
+ }
+ else if( termIdx == 3 )
+ {
+ windowFrame.origin.x = NSMaxX( mainTermBaseRect ) + 1.0;
+ windowFrame.origin.y =
+ NSMinY( mainTermBaseRect ) - NSHeight( windowFrame ) - 1.0;
+ }
+ else if( termIdx == 4 )
+ {
+ windowFrame.origin.x = NSMaxX( mainTermBaseRect ) + 1.0;
+ windowFrame.origin.y = NSMinY( mainTermBaseRect );
+ }
+ else if( termIdx == 5 )
+ {
+ windowFrame.origin.x =
+ NSMinX( mainTermBaseRect ) + NSWidth( windowFrame ) + 1.0;
+ windowFrame.origin.y =
+ NSMinY( mainTermBaseRect ) - NSHeight( windowFrame ) - 1.0;
+ }
- [window setFrame: windowFrame display: NO];
+ [window setFrame: windowFrame display: NO];
}
/* Override the default frame above if the user has adjusted windows in
* the past */
if (autosaveName) [window setFrameAutosaveName:autosaveName];
- /* Tell it about its term. Do this after we've sized it so that the sizing
- * doesn't trigger redrawing and such. */
- [context setTerm:t];
-
- /* Only order front if it's the first term. Other terms will be ordered
+ /*
+ * Tell it about its term. Do this after we've sized it so that the
+ * sizing doesn't trigger redrawing and such.
+ */
+ [context setTerm:t];
+
+ /*
+ * Only order front if it's the first term. Other terms will be ordered
* front from AngbandUpdateWindowVisibility(). This is to work around a
* problem where Angband aggressively tells us to initialize terms that
- * don't do anything! */
- if (t == angband_term[0]) [context->primaryWindow makeKeyAndOrderFront: nil];
-
- NSEnableScreenUpdates();
-
- /* Set "mapped" flag */
- t->mapped_flag = true;
- [pool drain];
+ * don't do anything!
+ */
+ if (t == angband_term[0])
+ [context.primaryWindow makeKeyAndOrderFront: nil];
+
+ NSEnableScreenUpdates();
+
+ /* Set "mapped" flag */
+ t->mapped_flag = true;
+ }
}
*/
static void Term_nuke_cocoa(term *t)
{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
- AngbandContext *context = t->data;
- if (context)
- {
- /* Tell the context to get rid of its windows, etc. */
- [context dispose];
-
- /* Balance our CFRetain from when we created it */
- CFRelease(context);
-
- /* Done with it */
- t->data = NULL;
+ @autoreleasepool {
+ AngbandContext *context = (__bridge AngbandContext*) (t->data);
+ if (context)
+ {
+ /* Tell the context to get rid of its windows, etc. */
+ [context dispose];
+
+ /* Balance our CFBridgingRetain from when we created it */
+ CFRelease(t->data);
+
+ /* Done with it */
+ t->data = NULL;
+ }
}
-
- [pool drain];
}
/**
- * Returns the CGImageRef corresponding to an image with the given name in the
- * resource directory, transferring ownership to the caller
+ * Returns the CGImageRef corresponding to an image with the given path.
+ * Transfers ownership to the caller.
*/
static CGImageRef create_angband_image(NSString *path)
{
CGImageSourceRef source = CGImageSourceCreateWithURL((CFURLRef)url, (CFDictionaryRef)options);
if (source)
{
- /* We really want the largest image, but in practice there's
- * only going to be one */
+ /*
+ * We really want the largest image, but in practice there's
+ * only going to be one
+ */
decodedImage = CGImageSourceCreateImageAtIndex(source, 0, (CFDictionaryRef)options);
CFRelease(source);
}
- [options release];
- [url release];
}
}
- /* Draw the sucker to defeat ImageIO's weird desire to cache and decode on
- * demand. Our images aren't that big! */
+ /*
+ * Draw the sucker to defeat ImageIO's weird desire to cache and decode on
+ * demand. Our images aren't that big!
+ */
if (decodedImage)
{
size_t width = CGImageGetWidth(decodedImage), height = CGImageGetHeight(decodedImage);
/* No alpha */
contextBitmapInfo |= kCGImageAlphaNone;
break;
- default:
- /* Some alpha, use premultiplied last which is most efficient. */
- contextBitmapInfo |= kCGImageAlphaPremultipliedLast;
- break;
- }
-
- /* Draw the source image flipped, since the view is flipped */
- CGContextRef ctx = CGBitmapContextCreate(NULL, width, height, CGImageGetBitsPerComponent(decodedImage), CGImageGetBytesPerRow(decodedImage), CGImageGetColorSpace(decodedImage), contextBitmapInfo);
- CGContextSetBlendMode(ctx, kCGBlendModeCopy);
- CGContextTranslateCTM(ctx, 0.0, height);
- CGContextScaleCTM(ctx, 1.0, -1.0);
- CGContextDrawImage(ctx, CGRectMake(0, 0, width, height), decodedImage);
- result = CGBitmapContextCreateImage(ctx);
-
- /* Done with these things */
- CFRelease(ctx);
- CGImageRelease(decodedImage);
- }
- return result;
-}
-
-/**
- * React to changes
- */
-static errr Term_xtra_cocoa_react(void)
-{
- /* Don't actually switch graphics until the game is running */
- if (!initialized || !game_in_progress) return (-1);
-
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- AngbandContext *angbandContext = Term->data;
-
- /* Handle graphics */
- int expected_graf_mode = (current_graphics_mode) ?
- current_graphics_mode->grafID : GRAPHICS_NONE;
- if (graf_mode_req != expected_graf_mode)
- {
- graphics_mode *new_mode;
- if (graf_mode_req != GRAPHICS_NONE) {
- new_mode = get_graphics_mode(graf_mode_req);
- } else {
- new_mode = NULL;
- }
-
- /* Get rid of the old image. CGImageRelease is NULL-safe. */
- CGImageRelease(pict_image);
- pict_image = NULL;
-
- /* Try creating the image if we want one */
- if (new_mode != NULL)
- {
- NSString *img_path = [NSString stringWithFormat:@"%s/%s", new_mode->path, new_mode->file];
- pict_image = create_angband_image(img_path);
-
- /* If we failed to create the image, set the new desired mode to
- * NULL */
- if (! pict_image)
- new_mode = NULL;
- }
-
- /* Record what we did */
- use_graphics = new_mode ? new_mode->grafID : 0;
-#if 0
- /* This global is not in Hengband. */
- use_transparency = (new_mode != NULL);
-#endif
- ANGBAND_GRAF = (new_mode ? new_mode->graf : "ascii");
- current_graphics_mode = new_mode;
-
- /* Enable or disable higher picts. Note: this should be done for all
- * terms. */
- angbandContext->terminal->higher_pict = !! use_graphics;
-
- if (pict_image && current_graphics_mode)
- {
- /* Compute the row and column count via the image height and width.
- */
- pict_rows = (int)(CGImageGetHeight(pict_image) / current_graphics_mode->cell_height);
- pict_cols = (int)(CGImageGetWidth(pict_image) / current_graphics_mode->cell_width);
- }
- else
- {
- pict_rows = 0;
- pict_cols = 0;
- }
-
- /* Reset visuals */
- if (initialized && game_in_progress)
- {
- reset_visuals();
- }
- }
- [pool drain];
-
- /* Success */
- return (0);
-}
-
-
-/**
- * Draws one tile as a helper function for Term_xtra_cocoa_fresh().
- */
-static void draw_image_tile(
- NSGraphicsContext* nsContext,
- CGContextRef cgContext,
- CGImageRef image,
- NSRect srcRect,
- NSRect dstRect,
- NSCompositingOperation op)
-{
- /* Flip the source rect since the source image is flipped */
- CGAffineTransform flip = CGAffineTransformIdentity;
- flip = CGAffineTransformTranslate(flip, 0.0, CGImageGetHeight(image));
- flip = CGAffineTransformScale(flip, 1.0, -1.0);
- CGRect flippedSourceRect =
- CGRectApplyAffineTransform(NSRectToCGRect(srcRect), flip);
-
- /*
- * When we use high-quality resampling to draw a tile, pixels from outside
- * the tile may bleed in, causing graphics artifacts. Work around that.
- */
- CGImageRef subimage =
- CGImageCreateWithImageInRect(image, flippedSourceRect);
- [nsContext setCompositingOperation:op];
- CGContextDrawImage(cgContext, NSRectToCGRect(dstRect), subimage);
- CGImageRelease(subimage);
-}
-
-
-/**
- * This is a helper function for Term_xtra_cocoa_fresh(): look before a block
- * of text on a row to see if the bounds for rendering and clipping need to be
- * extended.
- */
-static void query_before_text(
- struct PendingRowChange* prc, int iy, int npre, int* pclip, int* prend)
-{
- int start = *prend;
- int i = start - 1;
-
- while (1) {
- if (i < 0 || i < start - npre) {
- break;
- }
-
- if (prc->cell_changes[i].change_type == CELL_CHANGE_PICT) {
- /*
- * The cell has been rendered with a tile. Do not want to modify
- * its contents so the clipping and rendering region can not be
- * extended.
- */
- break;
- } else if (prc->cell_changes[i].change_type == CELL_CHANGE_NONE) {
- /* It has not changed so inquire what it is. */
- TERM_COLOR a[2];
- char c[2];
-
- Term_what(i, iy, a + 1, c + 1);
- if (use_graphics && (a[1] & 0x80) && (c[1] & 0x80)) {
- /*
- * It is an unchanged location rendered with a tile. Do not
- * want to modify its contents so the clipping and rendering
- * region can not be extended.
- */
- break;
- }
- /*
- * It is unchanged text. A character from the changed region
- * may have extended into it so render it to clear that.
- */
-#ifdef JP
- /* Check to see if it is the second part of a kanji character. */
- if (i > 0) {
- Term_what(i - 1, iy, a, c);
- if (iskanji(c)) {
- prc->cell_changes[i - 1].c.w =
- convert_two_byte_eucjp_to_utf16_native(c);
- prc->cell_changes[i - 1].a = a[0];
- prc->cell_changes[i - 1].tcol = 1;
- prc->cell_changes[i].c.w = 0;
- prc->cell_changes[i].a = a[0];
- prc->cell_changes[i].tcol = 0;
- *pclip = i - 1;
- *prend = i - 1;
- --i;
- } else {
- prc->cell_changes[i].c.w = c[1];
- prc->cell_changes[i].a = a[1];
- prc->cell_changes[i].tcol = 0;
- *pclip = i;
- *prend = i;
- }
- } else {
- prc->cell_changes[i].c.w = c[1];
- prc->cell_changes[i].a = a[1];
- prc->cell_changes[i].tcol = 0;
- *pclip = i;
- *prend = i;
- }
-#else
- prc->cell_changes[i].c.w = c[1];
- prc->cell_changes[i].a = a[1];
- prc->cell_changes[i].tcol = 0;
- *pclip = i;
- *prend = i;
-#endif
- --i;
- } else {
- /*
- * The cell has been wiped or had changed text rendered. Do
- * not need to render. Can extend the clipping rectangle into it.
- */
- *pclip = i;
- --i;
- }
- }
-}
-
-
-/**
- * This is a helper function for Term_xtra_cocoa_fresh(): look after a block
- * of text on a row to see if the bounds for rendering and clipping need to be
- * extended.
- */
-static void query_after_text(
- struct PendingRowChange* prc,
- int iy,
- int ncol,
- int npost,
- int* pclip,
- int* prend)
-{
- int end = *prend;
- int i = end + 1;
-
- while (1) {
- /*
- * Be willing to consolidate this block with the one after it. This
- * logic should be sufficient to avoid redraws of the region between
- * changed blocks of text if angbandContext->ncol_pre is zero or one.
- * For larger values of ncol_pre, would need to do something more to
- * avoid extra redraws.
- */
- if (i >= ncol ||
- (i > end + npost &&
- prc->cell_changes[i].change_type != CELL_CHANGE_TEXT &&
- prc->cell_changes[i].change_type != CELL_CHANGE_WIPE)) {
- break;
- }
-
- if (prc->cell_changes[i].change_type == CELL_CHANGE_PICT) {
- /*
- * The cell has been rendered with a tile. Do not want to modify
- * its contents so the clipping and rendering region can not be
- * extended.
- */
- break;
- } else if (prc->cell_changes[i].change_type == CELL_CHANGE_NONE) {
- /* It has not changed so inquire what it is. */
- TERM_COLOR a[2];
- char c[2];
+ default:
+ /* Some alpha, use premultiplied last which is most efficient. */
+ contextBitmapInfo |= kCGImageAlphaPremultipliedLast;
+ break;
+ }
- Term_what(i, iy, a, c);
- if (use_graphics && (a[0] & 0x80) && (c[0] & 0x80)) {
- /*
- * It is an unchanged location rendered with a tile. Do not
- * want to modify its contents so the clipping and rendering
- * region can not be extended.
- */
- break;
- }
- /*
- * It is unchanged text. A character from the changed region
- * may have extended into it so render it to clear that.
- */
-#ifdef JP
- /* Check to see if it is the first part of a kanji character. */
- if (i < ncol - 1) {
- Term_what(i + 1, iy, a + 1, c + 1);
- if (iskanji(c)) {
- prc->cell_changes[i].c.w =
- convert_two_byte_eucjp_to_utf16_native(c);
- prc->cell_changes[i].a = a[0];
- prc->cell_changes[i].tcol = 1;
- prc->cell_changes[i + 1].c.w = 0;
- prc->cell_changes[i + 1].a = a[0];
- prc->cell_changes[i + 1].tcol = 0;
- *pclip = i + 1;
- *prend = i + 1;
- ++i;
- } else {
- prc->cell_changes[i].c.w = c[0];
- prc->cell_changes[i].a = a[0];
- prc->cell_changes[i].tcol = 0;
- *pclip = i;
- *prend = i;
- }
- } else {
- prc->cell_changes[i].c.w = c[0];
- prc->cell_changes[i].a = a[0];
- prc->cell_changes[i].tcol = 0;
- *pclip = i;
- *prend = i;
- }
-#else
- prc->cell_changes[i].c.w = c[0];
- prc->cell_changes[i].a = a[0];
- prc->cell_changes[i].tcol = 0;
- *pclip = i;
- *prend = i;
-#endif
- ++i;
- } else {
- /*
- * Have come to another region of changed text or another region
- * to wipe. Combine the regions to minimize redraws.
- */
- *pclip = i;
- *prend = i;
- end = i;
- ++i;
+ /* Draw the source image flipped, since the view is flipped */
+ CGContextRef ctx = CGBitmapContextCreate(NULL, width, height, CGImageGetBitsPerComponent(decodedImage), CGImageGetBytesPerRow(decodedImage), CGImageGetColorSpace(decodedImage), contextBitmapInfo);
+ if (ctx) {
+ CGContextSetBlendMode(ctx, kCGBlendModeCopy);
+ CGContextTranslateCTM(ctx, 0.0, height);
+ CGContextScaleCTM(ctx, 1.0, -1.0);
+ CGContextDrawImage(
+ ctx, CGRectMake(0, 0, width, height), decodedImage);
+ result = CGBitmapContextCreateImage(ctx);
+ CFRelease(ctx);
}
+
+ CGImageRelease(decodedImage);
}
+ return result;
}
-
/**
- * Draw the pending changes saved in angbandContext->changes.
+ * React to changes
*/
-static void Term_xtra_cocoa_fresh(AngbandContext* angbandContext)
+static errr Term_xtra_cocoa_react(void)
{
- int graf_width, graf_height, alphablend;
-
- if (angbandContext->changes->has_pict) {
- graf_width = current_graphics_mode->cell_width;
- graf_height = current_graphics_mode->cell_height;
- /*
- * Transparency effect. We really want to check
- * current_graphics_mode->alphablend, but as of this writing
- * that's never set, so we do something lame.
- */
- /* alphablend = current_graphics_mode->alphablend */
- alphablend = (graf_width > 8 || graf_height > 8);
- } else {
- graf_width = 0;
- graf_height = 0;
- alphablend = 0;
- }
-
- CGContextRef ctx = [angbandContext lockFocus];
-
- if (angbandContext->changes->has_text ||
- angbandContext->changes->has_wipe) {
- NSFont *selectionFont = [[angbandContext selectionFont] screenFont];
- [selectionFont set];
- }
-
- int iy;
- for (iy = angbandContext->changes->ymin;
- iy <= angbandContext->changes->ymax;
- ++iy) {
- struct PendingRowChange* prc = angbandContext->changes->rows[iy];
- int ix;
-
- /* Skip untouched rows. */
- if (prc == 0) {
- continue;
- }
-
- ix = prc->xmin;
- while (1) {
- int jx;
+ /* Don't actually switch graphics until the game is running */
+ if (!initialized || !game_in_progress) return (-1);
- if (ix > prc->xmax) {
- break;
+ @autoreleasepool {
+ /* Handle graphics */
+ int expected_graf_mode = (current_graphics_mode) ?
+ current_graphics_mode->grafID : GRAPHICS_NONE;
+ if (graf_mode_req != expected_graf_mode)
+ {
+ graphics_mode *new_mode;
+ if (graf_mode_req != GRAPHICS_NONE) {
+ new_mode = get_graphics_mode(graf_mode_req);
+ } else {
+ new_mode = NULL;
}
- switch (prc->cell_changes[ix].change_type) {
- case CELL_CHANGE_NONE:
- ++ix;
- break;
-
- case CELL_CHANGE_PICT:
- {
- /*
- * Because changes are made to the compositing mode, save
- * the incoming value.
- */
- NSGraphicsContext *nsContext =
- [NSGraphicsContext currentContext];
- NSCompositingOperation op = nsContext.compositingOperation;
-
- jx = ix;
- while (jx <= prc->xmax &&
- prc->cell_changes[jx].change_type
- == CELL_CHANGE_PICT) {
- NSRect destinationRect =
- [angbandContext rectInImageForTileAtX:jx Y:iy];
- NSRect sourceRect, terrainRect;
-
- sourceRect.origin.x = graf_width *
- prc->cell_changes[jx].c.c;
- sourceRect.origin.y = graf_height *
- prc->cell_changes[jx].a;
- sourceRect.size.width = graf_width;
- sourceRect.size.height = graf_height;
- terrainRect.origin.x = graf_width *
- prc->cell_changes[jx].tcol;
- terrainRect.origin.y = graf_height *
- prc->cell_changes[jx].trow;
- terrainRect.size.width = graf_width;
- terrainRect.size.height = graf_height;
- if (alphablend) {
- draw_image_tile(
- nsContext,
- ctx,
- pict_image,
- terrainRect,
- destinationRect,
- NSCompositeCopy);
- draw_image_tile(
- nsContext,
- ctx,
- pict_image,
- sourceRect,
- destinationRect,
- NSCompositeSourceOver);
- } else {
- draw_image_tile(
- nsContext,
- ctx,
- pict_image,
- sourceRect,
- destinationRect,
- NSCompositeCopy);
- }
- ++jx;
+ /* Get rid of the old image. CGImageRelease is NULL-safe. */
+ CGImageRelease(pict_image);
+ pict_image = NULL;
+
+ /* Try creating the image if we want one */
+ if (new_mode != NULL)
+ {
+ NSString *img_path =
+ [NSString stringWithFormat:@"%s/%s", new_mode->path, new_mode->file];
+ pict_image = create_angband_image(img_path);
+
+ /* If we failed to create the image, revert to ASCII. */
+ if (! pict_image) {
+ new_mode = NULL;
+ if (use_bigtile) {
+ arg_bigtile = FALSE;
}
-
- [nsContext setCompositingOperation:op];
-
- NSRect rect =
- [angbandContext rectInImageForTileAtX:ix Y:iy];
- rect.size.width =
- angbandContext->tileSize.width * (jx - ix);
- [angbandContext setNeedsDisplayInBaseRect:rect];
+ [[NSUserDefaults angbandDefaults]
+ setInteger:GRAPHICS_NONE
+ forKey:AngbandGraphicsDefaultsKey];
+
+ NSString *msg = NSLocalizedStringWithDefaultValue(
+ @"Error.TileSetLoadFailed",
+ AngbandMessageCatalog,
+ [NSBundle mainBundle],
+ @"Failed to Load Tile Set",
+ @"Alert text for failed tile set load");
+ NSString *info = NSLocalizedStringWithDefaultValue(
+ @"Error.TileSetRevertToASCII",
+ AngbandMessageCatalog,
+ [NSBundle mainBundle],
+ @"Could not load the tile set. Switched back to ASCII.",
+ @"Alert informative message for failed tile set load");
+ NSAlert *alert = [[NSAlert alloc] init];
+ alert.messageText = msg;
+ alert.informativeText = info;
+ [alert runModal];
}
- ix = jx;
- break;
+ }
- case CELL_CHANGE_WIPE:
- case CELL_CHANGE_TEXT:
+ if (graphics_are_enabled()) {
/*
- * For a wiped region, treat it as if it had text (the only
- * loss if it was not is some extra work rendering
- * neighboring unchanged text).
+ * The contents stored in the AngbandContext may have
+ * references to the old tile set. Out of an abundance
+ * of caution, clear those references in case there's an
+ * attempt to redraw the contents before the core has the
+ * chance to update it via the text_hook, pict_hook, and
+ * wipe_hook.
*/
- jx = ix + 1;
- while (jx < angbandContext->cols &&
- (prc->cell_changes[jx].change_type
- == CELL_CHANGE_TEXT
- || prc->cell_changes[jx].change_type
- == CELL_CHANGE_WIPE)) {
- ++jx;
- }
- {
- int isclip = ix;
- int ieclip = jx - 1;
- int isrend = ix;
- int ierend = jx - 1;
- int set_color = 1;
- TERM_COLOR alast = 0;
- NSRect r;
- int k;
-
- query_before_text(
- prc, iy, angbandContext->ncol_pre, &isclip, &isrend);
- query_after_text(
- prc,
- iy,
- angbandContext->cols,
- angbandContext->ncol_post,
- &ieclip,
- &ierend
- );
- ix = ierend + 1;
-
- /* Save the state since the clipping will be modified. */
- CGContextSaveGState(ctx);
-
- /* Clear the area that where rendering will be done. */
- r = [angbandContext rectInImageForTileAtX:isrend Y:iy];
- r.size.width = angbandContext->tileSize.width *
- (ierend - isrend + 1);
- [[NSColor blackColor] set];
- NSRectFill(r);
-
- /*
- * Clear the current path so it does not affect clipping.
- * Then set the clipping rectangle. Using
- * CGContextSetTextDrawingMode() to include clipping does
- * not appear to be necessary on 10.14 and is actually
- * detrimental: when displaying more than one character,
- * only the first is visible.
- */
- CGContextBeginPath(ctx);
- r = [angbandContext rectInImageForTileAtX:isclip Y:iy];
- r.size.width = angbandContext->tileSize.width *
- (ieclip - isclip + 1);
- CGContextClipToRect(ctx, r);
-
- /* Render. */
- k = isrend;
- while (k <= ierend) {
- NSRect rectToDraw;
+ for (int iterm = 0; iterm < ANGBAND_TERM_MAX; ++iterm) {
+ AngbandContext* aContext =
+ (__bridge AngbandContext*) (angband_term[iterm]->data);
- if (prc->cell_changes[k].change_type
- == CELL_CHANGE_WIPE) {
- /* Skip over since no rendering is necessary. */
- ++k;
- continue;
- }
+ [aContext.contents wipeTiles];
+ }
+ }
- if (set_color || alast != prc->cell_changes[k].a) {
- set_color = 0;
- alast = prc->cell_changes[k].a;
- set_color_for_index(alast % MAX_COLORS);
- }
+ /* Record what we did */
+ use_graphics = new_mode ? new_mode->grafID : 0;
+ ANGBAND_GRAF = (new_mode ? new_mode->graf : "ascii");
+ current_graphics_mode = new_mode;
- rectToDraw =
- [angbandContext rectInImageForTileAtX:k Y:iy];
- if (prc->cell_changes[k].tcol) {
- rectToDraw.size.width *= 2.0;
- [angbandContext drawWChar:prc->cell_changes[k].c.w
- inRect:rectToDraw context:ctx];
- k += 2;
- } else {
- [angbandContext drawWChar:prc->cell_changes[k].c.w
- inRect:rectToDraw context:ctx];
- ++k;
- }
- }
+ /* Enable or disable higher picts. */
+ for (int iterm = 0; iterm < ANGBAND_TERM_MAX; ++iterm) {
+ if (angband_term[iterm]) {
+ angband_term[iterm]->higher_pict = !! use_graphics;
+ }
+ }
- /*
- * Inform the context that the area in the clipping
- * rectangle needs to be redisplayed.
- */
- [angbandContext setNeedsDisplayInBaseRect:r];
+ if (pict_image && current_graphics_mode)
+ {
+ /*
+ * Compute the row and column count via the image height and
+ * width.
+ */
+ pict_rows = (int)(CGImageGetHeight(pict_image) /
+ current_graphics_mode->cell_height);
+ pict_cols = (int)(CGImageGetWidth(pict_image) /
+ current_graphics_mode->cell_width);
+ }
+ else
+ {
+ pict_rows = 0;
+ pict_cols = 0;
+ }
- CGContextRestoreGState(ctx);
- }
- break;
+ /* Reset visuals */
+ if (arg_bigtile == use_bigtile && character_generated)
+ {
+ reset_visuals();
}
}
- }
- if (angbandContext->changes->xcurs >= 0 &&
- angbandContext->changes->ycurs >= 0) {
- NSRect rect = [angbandContext
- rectInImageForTileAtX:angbandContext->changes->xcurs
- Y:angbandContext->changes->ycurs];
+ if (arg_bigtile != use_bigtile) {
+ if (character_generated)
+ {
+ /* Reset visuals */
+ reset_visuals();
+ }
- if (angbandContext->changes->bigcurs) {
- rect.size.width += angbandContext->tileSize.width;
+ Term_activate(angband_term[0]);
+ Term_resize(angband_term[0]->wid, angband_term[0]->hgt);
}
- [[NSColor yellowColor] set];
- NSFrameRectWithWidth(rect, 1);
- /* Invalidate that rect */
- [angbandContext setNeedsDisplayInBaseRect:rect];
}
- [angbandContext unlockFocus];
+ /* Success */
+ return (0);
}
*/
static errr Term_xtra_cocoa(int n, int v)
{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- AngbandContext* angbandContext = Term->data;
-
errr result = 0;
-
- /* Analyze */
- switch (n)
- {
- /* Make a noise */
+ @autoreleasepool {
+ AngbandContext* angbandContext =
+ (__bridge AngbandContext*) (Term->data);
+
+ /* Analyze */
+ switch (n) {
+ /* Make a noise */
case TERM_XTRA_NOISE:
- {
- NSBeep();
-
- /* Success */
- break;
- }
+ NSBeep();
+ break;
- /* Make a sound */
+ /* Make a sound */
case TERM_XTRA_SOUND:
play_sound(v);
break;
- /* Process random events */
+ /* Process random events */
case TERM_XTRA_BORED:
- {
- /* Show or hide cocoa windows based on the subwindow flags set by
- * the user */
- AngbandUpdateWindowVisibility();
+ /*
+ * Show or hide cocoa windows based on the subwindow flags set by
+ * the user.
+ */
+ AngbandUpdateWindowVisibility();
+ /* Process an event */
+ (void)check_events(CHECK_EVENTS_NO_WAIT);
+ break;
- /* Process an event */
- (void)check_events(CHECK_EVENTS_NO_WAIT);
-
- /* Success */
- break;
- }
-
- /* Process pending events */
+ /* Process pending events */
case TERM_XTRA_EVENT:
- {
- /* Process an event */
- (void)check_events(v);
-
- /* Success */
- break;
- }
-
- /* Flush all pending events (if any) */
- case TERM_XTRA_FLUSH:
- {
- /* Hack -- flush all events */
- while (check_events(CHECK_EVENTS_DRAIN)) /* loop */;
-
- /* Success */
- break;
- }
-
- /* Hack -- Change the "soft level" */
- case TERM_XTRA_LEVEL:
- {
- /* Here we could activate (if requested), but I don't think Angband
- * should be telling us our window order (the user should decide
- * that), so do nothing. */
- break;
- }
-
- /* Clear the screen */
- case TERM_XTRA_CLEAR:
- {
- [angbandContext lockFocus];
- [[NSColor blackColor] set];
- NSRect imageRect = {NSZeroPoint, [angbandContext imageSize]};
- NSRectFillUsingOperation(imageRect, NSCompositeCopy);
- [angbandContext unlockFocus];
- [angbandContext setNeedsDisplay:YES];
- /* Success */
- break;
- }
-
- /* React to changes */
- case TERM_XTRA_REACT:
- {
- /* React to changes */
- return (Term_xtra_cocoa_react());
- }
-
- /* Delay (milliseconds) */
- case TERM_XTRA_DELAY:
- {
- /* If needed */
- if (v > 0)
- {
-
- double seconds = v / 1000.;
- NSDate* date = [NSDate dateWithTimeIntervalSinceNow:seconds];
- do
- {
- NSEvent* event;
- do
- {
- event = [NSApp nextEventMatchingMask:-1 untilDate:date inMode:NSDefaultRunLoopMode dequeue:YES];
- if (event) send_event(event);
- } while (event);
- } while ([date timeIntervalSinceNow] >= 0);
-
- }
-
- /* Success */
- break;
- }
-
- case TERM_XTRA_FRESH:
- /* Draw the pending changes. */
- if (angbandContext->changes != 0) {
- Term_xtra_cocoa_fresh(angbandContext);
- clear_pending_changes(angbandContext->changes);
- }
- break;
-
- default:
- /* Oops */
- result = 1;
- break;
- }
-
- [pool drain];
-
- /* Oops */
- return result;
-}
-
-static errr Term_curs_cocoa(int x, int y)
-{
- AngbandContext *angbandContext = Term->data;
-
- if (angbandContext->changes == 0) {
- /* Bail out; there was an earlier memory allocation failure. */
- return 1;
- }
- angbandContext->changes->xcurs = x;
- angbandContext->changes->ycurs = y;
- angbandContext->changes->bigcurs = 0;
-
- /* Success */
- return 0;
-}
-
-/**
- * Draw a cursor that's two tiles wide. For Japanese, that's used when
- * the cursor points at a kanji character, irregardless of whether operating
- * in big tile mode.
- */
-static errr Term_bigcurs_cocoa(int x, int y)
-{
- AngbandContext *angbandContext = Term->data;
-
- if (angbandContext->changes == 0) {
- /* Bail out; there was an earlier memory allocation failure. */
- return 1;
- }
- angbandContext->changes->xcurs = x;
- angbandContext->changes->ycurs = y;
- angbandContext->changes->bigcurs = 1;
-
- /* Success */
- return 0;
-}
-
-/**
- * Low level graphics (Assumes valid input)
- *
- * Erase "n" characters starting at (x,y)
- */
-static errr Term_wipe_cocoa(int x, int y, int n)
-{
- AngbandContext *angbandContext = Term->data;
- struct PendingCellChange *pc;
-
- if (angbandContext->changes == 0) {
- /* Bail out; there was an earlier memory allocation failure. */
- return 1;
- }
- if (angbandContext->changes->rows[y] == 0) {
- angbandContext->changes->rows[y] =
- create_row_change(angbandContext->cols);
- if (angbandContext->changes->rows[y] == 0) {
- NSLog(@"failed to allocate changes for row %d", y);
- return 1;
- }
- if (angbandContext->changes->ymin > y) {
- angbandContext->changes->ymin = y;
- }
- if (angbandContext->changes->ymax < y) {
- angbandContext->changes->ymax = y;
- }
- }
+ /* Process an event */
+ (void)check_events(v);
+ break;
- angbandContext->changes->has_wipe = 1;
- if (angbandContext->changes->rows[y]->xmin > x) {
- angbandContext->changes->rows[y]->xmin = x;
- }
- if (angbandContext->changes->rows[y]->xmax < x + n - 1) {
- angbandContext->changes->rows[y]->xmax = x + n - 1;
- }
- for (pc = angbandContext->changes->rows[y]->cell_changes + x;
- pc != angbandContext->changes->rows[y]->cell_changes + x + n;
- ++pc) {
- pc->change_type = CELL_CHANGE_WIPE;
- }
-
- /* Success */
- return (0);
-}
+ /* Flush all pending events (if any) */
+ case TERM_XTRA_FLUSH:
+ /* Hack -- flush all events */
+ while (check_events(CHECK_EVENTS_DRAIN)) /* loop */;
-static errr Term_pict_cocoa(int x, int y, int n, TERM_COLOR *ap,
- const char *cp, const TERM_COLOR *tap,
- const char *tcp)
-{
-
- /* Paranoia: Bail if we don't have a current graphics mode */
- if (! current_graphics_mode) return -1;
-
- AngbandContext* angbandContext = Term->data;
- int any_change = 0;
- struct PendingCellChange *pc;
-
- if (angbandContext->changes == 0) {
- /* Bail out; there was an earlier memory allocation failure. */
- return 1;
- }
- if (angbandContext->changes->rows[y] == 0) {
- angbandContext->changes->rows[y] =
- create_row_change(angbandContext->cols);
- if (angbandContext->changes->rows[y] == 0) {
- NSLog(@"failed to allocate changes for row %d", y);
- return 1;
- }
- if (angbandContext->changes->ymin > y) {
- angbandContext->changes->ymin = y;
- }
- if (angbandContext->changes->ymax < y) {
- angbandContext->changes->ymax = y;
- }
- }
+ break;
- if (angbandContext->changes->rows[y]->xmin > x) {
- angbandContext->changes->rows[y]->xmin = x;
- }
- if (angbandContext->changes->rows[y]->xmax < x + n - 1) {
- angbandContext->changes->rows[y]->xmax = x + n - 1;
- }
- for (pc = angbandContext->changes->rows[y]->cell_changes + x;
- pc != angbandContext->changes->rows[y]->cell_changes + x + n;
- ++pc) {
- TERM_COLOR a = *ap++;
- char c = *cp++;
- TERM_COLOR ta = *tap++;
- char tc = *tcp++;
+ /* Hack -- Change the "soft level" */
+ case TERM_XTRA_LEVEL:
+ /*
+ * Here we could activate (if requested), but I don't think
+ * Angband should be telling us our window order (the user
+ * should decide that), so do nothing.
+ */
+ break;
- if (use_graphics && (a & 0x80) && (c & 0x80)) {
- pc->c.c = ((byte)c & 0x7F) % pict_cols;
- pc->a = ((byte)a & 0x7F) % pict_rows;
- pc->tcol = ((byte)tc & 0x7F) & pict_cols;
- pc->trow = ((byte)ta & 0x7F) & pict_rows;
- pc->change_type = CELL_CHANGE_PICT;
- any_change = 1;
- }
- }
- if (any_change) {
- angbandContext->changes->has_pict = 1;
- }
-
- /* Success */
- return (0);
-}
+ /* Clear the screen */
+ case TERM_XTRA_CLEAR:
+ [angbandContext.contents wipe];
+ [angbandContext setNeedsDisplay:YES];
+ break;
-/**
- * Low level graphics. Assumes valid input.
- *
- * Draw several ("n") chars, with an attr, at a given location.
- */
-static errr Term_text_cocoa(int x, int y, int n, byte_hack a, concptr cp)
-{
- AngbandContext* angbandContext = Term->data;
- struct PendingCellChange *pc;
+ /* React to changes */
+ case TERM_XTRA_REACT:
+ result = Term_xtra_cocoa_react();
+ break;
- if (angbandContext->changes == 0) {
- /* Bail out; there was an earlier memory allocation failure. */
- return 1;
- }
- if (angbandContext->changes->rows[y] == 0) {
- angbandContext->changes->rows[y] =
- create_row_change(angbandContext->cols);
- if (angbandContext->changes->rows[y] == 0) {
- NSLog(@"failed to allocate changes for row %d", y);
- return 1;
- }
- if (angbandContext->changes->ymin > y) {
- angbandContext->changes->ymin = y;
- }
- if (angbandContext->changes->ymax < y) {
- angbandContext->changes->ymax = y;
- }
- }
+ /* Delay (milliseconds) */
+ case TERM_XTRA_DELAY:
+ /* If needed */
+ if (v > 0) {
+ double seconds = v / 1000.;
+ NSDate* date = [NSDate dateWithTimeIntervalSinceNow:seconds];
+ do {
+ NSEvent* event;
+ do {
+ event = [NSApp nextEventMatchingMask:-1
+ untilDate:date
+ inMode:NSDefaultRunLoopMode
+ dequeue:YES];
+ if (event) send_event(event);
+ } while (event);
+ } while ([date timeIntervalSinceNow] >= 0);
+ }
+ break;
- angbandContext->changes->has_text = 1;
- if (angbandContext->changes->rows[y]->xmin > x) {
- angbandContext->changes->rows[y]->xmin = x;
- }
- if (angbandContext->changes->rows[y]->xmax < x + n - 1) {
- angbandContext->changes->rows[y]->xmax = x + n - 1;
- }
- pc = angbandContext->changes->rows[y]->cell_changes + x;
- while (pc != angbandContext->changes->rows[y]->cell_changes + x + n) {
-#ifdef JP
- if (iskanji(*cp)) {
- if (pc + 1 ==
- angbandContext->changes->rows[y]->cell_changes + x + n) {
- /*
- * The second byte of the character is past the end. Ignore
- * the character.
- */
- break;
- } else {
- pc->c.w = convert_two_byte_eucjp_to_utf16_native(cp);
- pc->a = a;
- pc->tcol = 1;
- pc->change_type = CELL_CHANGE_TEXT;
- ++pc;
+ /* Draw the pending changes. */
+ case TERM_XTRA_FRESH:
+ {
/*
- * Fill in a dummy value since the previous character will take
- * up two columns.
+ * Check the cursor visibility since the core will tell us
+ * explicitly to draw it, but tells us implicitly to forget it
+ * by simply telling us to redraw a location.
*/
- pc->c.w = 0;
- pc->a = a;
- pc->tcol = 0;
- pc->change_type = CELL_CHANGE_TEXT;
- ++pc;
- cp += 2;
+ int isVisible = 0;
+
+ Term_get_cursor(&isVisible);
+ if (! isVisible) {
+ [angbandContext.contents removeCursor];
+ }
+ [angbandContext computeInvalidRects];
+ [angbandContext.changes clear];
}
- } else {
- pc->c.w = *cp;
- pc->a = a;
- pc->tcol = 0;
- pc->change_type = CELL_CHANGE_TEXT;
- ++pc;
- ++cp;
+ break;
+
+ default:
+ /* Oops */
+ result = 1;
+ break;
}
-#else
- pc->c.w = *cp;
- pc->a = a;
- pc->tcol = 0;
- pc->change_type = CELL_CHANGE_TEXT;
- ++pc;
- ++cp;
-#endif
}
-
+
+ return result;
+}
+
+static errr Term_curs_cocoa(TERM_LEN x, TERM_LEN y)
+{
+ AngbandContext *angbandContext = (__bridge AngbandContext*) (Term->data);
+
+ [angbandContext.contents setCursorAtColumn:x row:y width:1 height:1];
+ /*
+ * Unfortunately, this (and the same logic in Term_bigcurs_cocoa) will
+ * also trigger what's under the cursor to be redrawn as well, even if
+ * it has not changed. In the current drawing implementation, that
+ * inefficiency seems unavoidable.
+ */
+ [angbandContext.changes markChangedAtColumn:x row:y];
+
/* Success */
- return (0);
+ return 0;
}
/**
- * Post a nonsense event so that our event loop wakes up
+ * Draw a cursor that's two tiles wide. For Japanese, that's used when
+ * the cursor points at a kanji character, irregardless of whether operating
+ * in big tile mode.
*/
-static void wakeup_event_loop(void)
+static errr Term_bigcurs_cocoa(TERM_LEN x, TERM_LEN y)
{
- /* Big hack - send a nonsense event to make us update */
- NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined location:NSZeroPoint modifierFlags:0 timestamp:0 windowNumber:0 context:NULL subtype:AngbandEventWakeup data1:0 data2:0];
- [NSApp postEvent:event atStart:NO];
-}
+ AngbandContext *angbandContext = (__bridge AngbandContext*) (Term->data);
+
+ [angbandContext.contents setCursorAtColumn:x row:y width:2 height:1];
+ [angbandContext.changes markChangedBlockAtColumn:x row:y width:2 height:1];
+ /* Success */
+ return 0;
+}
/**
- * Create and initialize window number "i"
+ * Low level graphics (Assumes valid input)
+ *
+ * Erase "n" characters starting at (x,y)
*/
-static term *term_data_link(int i)
+static errr Term_wipe_cocoa(TERM_LEN x, TERM_LEN y, int n)
{
- NSArray *terminalDefaults = [[NSUserDefaults standardUserDefaults] valueForKey: AngbandTerminalsDefaultsKey];
- NSInteger rows = 24;
- NSInteger columns = 80;
+ AngbandContext *angbandContext = (__bridge AngbandContext*) (Term->data);
- if( i < (int)[terminalDefaults count] )
- {
- NSDictionary *term = [terminalDefaults objectAtIndex: i];
- rows = [[term valueForKey: AngbandTerminalRowsDefaultsKey] integerValue];
- columns = [[term valueForKey: AngbandTerminalColumnsDefaultsKey] integerValue];
- }
+ [angbandContext.contents wipeBlockAtColumn:x row:y width:n height:1];
+ [angbandContext.changes markChangedRangeAtColumn:x row:y width:n];
- /* Allocate */
- term *newterm = ZNEW(term);
+ /* Success */
+ return 0;
+}
- /* Initialize the term */
- term_init(newterm, columns, rows, 256 /* keypresses, for some reason? */);
-
- /* Differentiate between BS/^h, Tab/^i, etc. */
- /* newterm->complex_input = TRUE; */
+static errr Term_pict_cocoa(TERM_LEN x, TERM_LEN y, int n,
+ TERM_COLOR *ap, concptr cp,
+ const TERM_COLOR *tap, concptr tcp)
+{
+ /* Paranoia: Bail if graphics aren't enabled */
+ if (! graphics_are_enabled()) return -1;
- /* Use a "software" cursor */
- newterm->soft_cursor = TRUE;
-
- /* Disable the per-row flush notifications since they are not used. */
- newterm->never_frosh = TRUE;
+ AngbandContext* angbandContext = (__bridge AngbandContext*) (Term->data);
+ int step = (use_bigtile) ? 2 : 1;
- /* Erase with "white space" */
- newterm->attr_blank = TERM_WHITE;
- newterm->char_blank = ' ';
-
- /* Prepare the init/nuke hooks */
- newterm->init_hook = Term_init_cocoa;
- newterm->nuke_hook = Term_nuke_cocoa;
-
- /* Prepare the function hooks */
- newterm->xtra_hook = Term_xtra_cocoa;
- newterm->wipe_hook = Term_wipe_cocoa;
- newterm->curs_hook = Term_curs_cocoa;
- newterm->bigcurs_hook = Term_bigcurs_cocoa;
- newterm->text_hook = Term_text_cocoa;
- newterm->pict_hook = Term_pict_cocoa;
- /* newterm->mbcs_hook = Term_mbcs_cocoa; */
-
- /* Global pointer */
- angband_term[i] = newterm;
-
- return newterm;
-}
+ int alphablend;
+ if (use_graphics) {
+ CGImageAlphaInfo ainfo = CGImageGetAlphaInfo(pict_image);
-/**
- * Load preferences from preferences file for current host+current user+
- * current application.
- */
-static void load_prefs()
-{
- NSUserDefaults *defs = [NSUserDefaults angbandDefaults];
-
- /* Make some default defaults */
- NSMutableArray *defaultTerms = [[NSMutableArray alloc] init];
+ alphablend = (ainfo & (kCGImageAlphaPremultipliedFirst |
+ kCGImageAlphaPremultipliedLast)) ? 1 : 0;
+ } else {
+ alphablend = 0;
+ }
- /* The following default rows/cols were determined experimentally by first
- * finding the ideal window/font size combinations. But because of awful
- * temporal coupling in Term_init_cocoa(), it's impossible to set up the
- * defaults there, so we do it this way. */
- for( NSUInteger i = 0; i < ANGBAND_TERM_MAX; i++ )
- {
- int columns, rows;
- BOOL visible = YES;
+ for (int i = x; i < x + n * step; i += step) {
+ TERM_COLOR a = *ap;
+ char c = *cp;
+ TERM_COLOR ta = *tap;
+ char tc = *tcp;
- switch( i )
- {
- case 0:
- columns = 129;
- rows = 32;
- break;
- case 1:
- columns = 84;
- rows = 20;
- break;
- case 2:
- columns = 42;
- rows = 24;
- break;
- case 3:
- columns = 42;
- rows = 20;
- break;
- case 4:
- columns = 42;
- rows = 16;
- break;
- case 5:
- columns = 84;
- rows = 20;
- break;
- default:
- columns = 80;
- rows = 24;
- visible = NO;
- break;
- }
+ ap += step;
+ cp += step;
+ tap += step;
+ tcp += step;
+ if (use_graphics && (a & 0x80) && (c & 0x80)) {
+ char fgdRow = ((byte)a & 0x7F) % pict_rows;
+ char fgdCol = ((byte)c & 0x7F) % pict_cols;
+ char bckRow, bckCol;
- NSDictionary *standardTerm = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithInt: rows], AngbandTerminalRowsDefaultsKey,
- [NSNumber numberWithInt: columns], AngbandTerminalColumnsDefaultsKey,
- [NSNumber numberWithBool: visible], AngbandTerminalVisibleDefaultsKey,
- nil];
- [defaultTerms addObject: standardTerm];
+ if (alphablend) {
+ bckRow = ((byte)ta & 0x7F) % pict_rows;
+ bckCol = ((byte)tc & 0x7F) % pict_cols;
+ } else {
+ /*
+ * Not blending so make the background the same as the
+ * the foreground.
+ */
+ bckRow = fgdRow;
+ bckCol = fgdCol;
+ }
+ [angbandContext.contents setTileAtColumn:i row:y
+ foregroundColumn:fgdCol
+ foregroundRow:fgdRow
+ backgroundColumn:bckCol
+ backgroundRow:bckRow
+ tileWidth:step
+ tileHeight:1];
+ [angbandContext.changes markChangedBlockAtColumn:i row:y
+ width:step height:1];
+ }
}
- NSDictionary *defaults = [[NSDictionary alloc] initWithObjectsAndKeys:
-#ifdef JP
- @"Osaka", @"FontName",
-#else
- @"Menlo", @"FontName",
-#endif
- [NSNumber numberWithFloat:13.f], @"FontSize",
- [NSNumber numberWithInt:60], AngbandFrameRateDefaultsKey,
- [NSNumber numberWithBool:YES], AngbandSoundDefaultsKey,
- [NSNumber numberWithInt:GRAPHICS_NONE], AngbandGraphicsDefaultsKey,
- defaultTerms, AngbandTerminalsDefaultsKey,
- nil];
- [defs registerDefaults:defaults];
- [defaults release];
- [defaultTerms release];
-
- /* Preferred graphics mode */
- graf_mode_req = [defs integerForKey:AngbandGraphicsDefaultsKey];
-
- /* Use sounds; set the Angband global */
- use_sound = ([defs boolForKey:AngbandSoundDefaultsKey] == YES) ? TRUE : FALSE;
-
- /* fps */
- frames_per_second = [defs integerForKey:AngbandFrameRateDefaultsKey];
-
- /* Font */
- default_font = [[NSFont fontWithName:[defs valueForKey:@"FontName-0"] size:[defs floatForKey:@"FontSize-0"]] retain];
- if (! default_font) default_font = [[NSFont fontWithName:@"Menlo" size:13.] retain];
+ /* Success */
+ return (0);
}
/**
- * Arbitary limit on number of possible samples per event
- */
-#define MAX_SAMPLES 16
-
-/**
- * Struct representing all data for a set of event samples
+ * Low level graphics. Assumes valid input.
+ *
+ * Draw several ("n") chars, with an attr, at a given location.
*/
-typedef struct
+static errr Term_text_cocoa(
+ TERM_LEN x, TERM_LEN y, int n, TERM_COLOR a, concptr cp)
{
- int num; /* Number of available samples for this event */
- NSSound *sound[MAX_SAMPLES];
-} sound_sample_list;
+ AngbandContext* angbandContext = (__bridge AngbandContext*) (Term->data);
-/**
- * Array of event sound structs
- */
-static sound_sample_list samples[MSG_MAX];
+ [angbandContext.contents setUniformAttributeTextRunAtColumn:x
+ row:y n:n glyphs:cp attribute:a];
+ [angbandContext.changes markChangedRangeAtColumn:x row:y width:n];
+ /* Success */
+ return 0;
+}
-/**
- * Load sound effects based on sound.cfg within the xtra/sound directory;
- * bridge to Cocoa to use NSSound for simple loading and playback, avoiding
- * I/O latency by cacheing all sounds at the start. Inherits full sound
- * format support from Quicktime base/plugins.
- * pelpel favoured a plist-based parser for the future but .cfg support
- * improves cross-platform compatibility.
+#if 0
+/* From the Linux mbstowcs(3) man page:
+ * If dest is NULL, n is ignored, and the conversion proceeds as above,
+ * except that the converted wide characters are not written out to mem‐
+ * ory, and that no length limit exists.
*/
-static void load_sounds(void)
+static size_t Term_mbcs_cocoa(wchar_t *dest, const char *src, int n)
{
- char sound_dir[1024];
- char path[1024];
- char buffer[2048];
- FILE *fff;
-
- /* Build the "sound" path */
- path_build(sound_dir, sizeof(sound_dir), ANGBAND_DIR_XTRA, "sound");
-
- /* Find and open the config file */
- path_build(path, sizeof(path), sound_dir, "sound.cfg");
- fff = my_fopen(path, "r");
-
- /* Handle errors */
- if (!fff)
- {
- NSLog(@"The sound configuration file could not be opened.");
- return;
- }
-
- /* Instantiate an autorelease pool for use by NSSound */
- NSAutoreleasePool *autorelease_pool;
- autorelease_pool = [[NSAutoreleasePool alloc] init];
-
- /* Use a dictionary to unique sounds, so we can share NSSounds across
- * multiple events */
- NSMutableDictionary *sound_dict = [NSMutableDictionary dictionary];
-
- /*
- * This loop may take a while depending on the count and size of samples
- * to load.
- */
-
- /* Parse the file */
- /* Lines are always of the form "name = sample [sample ...]" */
- while (my_fgets(fff, buffer, sizeof(buffer)) == 0)
- {
- char *msg_name;
- char *cfg_sample_list;
- char *search;
- char *cur_token;
- char *next_token;
- int event;
-
- /* Skip anything not beginning with an alphabetic character */
- if (!buffer[0] || !isalpha((unsigned char)buffer[0])) continue;
-
- /* Split the line into two: message name, and the rest */
- search = strchr(buffer, ' ');
- cfg_sample_list = strchr(search + 1, ' ');
- if (!search) continue;
- if (!cfg_sample_list) continue;
-
- /* Set the message name, and terminate at first space */
- msg_name = buffer;
- search[0] = '\0';
-
- /* Make sure this is a valid event name */
- for (event = MSG_MAX - 1; event >= 0; event--)
- {
- if (strcmp(msg_name, angband_sound_name[event]) == 0)
- break;
- }
- if (event < 0) continue;
-
- /* Advance the sample list pointer so it's at the beginning of text */
- cfg_sample_list++;
- if (!cfg_sample_list[0]) continue;
-
- /* Terminate the current token */
- cur_token = cfg_sample_list;
- search = strchr(cur_token, ' ');
- if (search)
- {
- search[0] = '\0';
- next_token = search + 1;
- }
- else
- {
- next_token = NULL;
- }
-
- /*
- * Now we find all the sample names and add them one by one
- */
- while (cur_token)
- {
- int num = samples[event].num;
-
- /* Don't allow too many samples */
- if (num >= MAX_SAMPLES) break;
-
- NSString *token_string = [NSString stringWithUTF8String:cur_token];
- NSSound *sound = [sound_dict objectForKey:token_string];
-
- if (! sound)
- {
- struct stat stb;
+ int i;
+ int count = 0;
- /* We have to load the sound. Build the path to the sample */
- path_build(path, sizeof(path), sound_dir, cur_token);
- if (stat(path, &stb) == 0)
- {
-
- /* Load the sound into memory */
- sound = [[[NSSound alloc] initWithContentsOfFile:[NSString stringWithUTF8String:path] byReference:YES] autorelease];
- if (sound) [sound_dict setObject:sound forKey:token_string];
- }
- }
-
- /* Store it if we loaded it */
- if (sound)
- {
- samples[event].sound[num] = [sound retain];
-
- /* Imcrement the sample count */
- samples[event].num++;
- }
-
-
- /* Figure out next token */
- cur_token = next_token;
- if (next_token)
- {
- /* Try to find a space */
- search = strchr(cur_token, ' ');
-
- /* If we can find one, terminate, and set new "next" */
- if (search)
- {
- search[0] = '\0';
- next_token = search + 1;
- }
- else
- {
- /* Otherwise prevent infinite looping */
- next_token = NULL;
- }
- }
- }
- }
-
- /* Release the autorelease pool */
- [autorelease_pool release];
-
- /* Close the file */
- my_fclose(fff);
+ /* Unicode code point to UTF-8
+ * 0x0000-0x007f: 0xxxxxxx
+ * 0x0080-0x07ff: 110xxxxx 10xxxxxx
+ * 0x0800-0xffff: 1110xxxx 10xxxxxx 10xxxxxx
+ * 0x10000-0x1fffff: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+ * Note that UTF-16 limits Unicode to 0x10ffff. This code is not
+ * endian-agnostic.
+ */
+ for (i = 0; i < n || dest == NULL; i++) {
+ if ((src[i] & 0x80) == 0) {
+ if (dest != NULL) dest[count] = src[i];
+ if (src[i] == 0) break;
+ } else if ((src[i] & 0xe0) == 0xc0) {
+ if (dest != NULL) dest[count] =
+ (((unsigned char)src[i] & 0x1f) << 6)|
+ ((unsigned char)src[i+1] & 0x3f);
+ i++;
+ } else if ((src[i] & 0xf0) == 0xe0) {
+ if (dest != NULL) dest[count] =
+ (((unsigned char)src[i] & 0x0f) << 12) |
+ (((unsigned char)src[i+1] & 0x3f) << 6) |
+ ((unsigned char)src[i+2] & 0x3f);
+ i += 2;
+ } else if ((src[i] & 0xf8) == 0xf0) {
+ if (dest != NULL) dest[count] =
+ (((unsigned char)src[i] & 0x0f) << 18) |
+ (((unsigned char)src[i+1] & 0x3f) << 12) |
+ (((unsigned char)src[i+2] & 0x3f) << 6) |
+ ((unsigned char)src[i+3] & 0x3f);
+ i += 3;
+ } else {
+ /* Found an invalid multibyte sequence */
+ return (size_t)-1;
+ }
+ count++;
+ }
+ return count;
}
+#endif
/**
- * Play sound effects asynchronously. Select a sound from any available
- * for the required event, and bridge to Cocoa to play it.
+ * Handle redrawing for a change to the tile set, tile scaling, or main window
+ * font. Returns YES if the redrawing was initiated. Otherwise returns NO.
*/
-static void play_sound(int event)
-{
- /* Paranoia */
- if (event < 0 || event >= MSG_MAX) return;
-
- /* Load sounds just-in-time (once) */
- static BOOL loaded = NO;
- if (!loaded) {
- loaded = YES;
- load_sounds();
+static BOOL redraw_for_tiles_or_term0_font(void)
+{
+ /*
+ * In Angband 4.2, do_cmd_redraw() will always clear, but only provides
+ * something to replace the erased content if a character has been
+ * generated. In Hengband, do_cmd_redraw() isn't safe to call unless a
+ * character has been generated. Therefore, only call it if a character
+ * has been generated.
+ */
+ if (character_generated) {
+ do_cmd_redraw();
+ wakeup_event_loop();
+ return YES;
}
-
- /* Check there are samples for this event */
- if (!samples[event].num) return;
-
- /* Instantiate an autorelease pool for use by NSSound */
- NSAutoreleasePool *autorelease_pool;
- autorelease_pool = [[NSAutoreleasePool alloc] init];
-
- /* Choose a random event */
- int s = randint0(samples[event].num);
-
- /* Stop the sound if it's currently playing */
- if ([samples[event].sound[s] isPlaying])
- [samples[event].sound[s] stop];
-
- /* Play the sound */
- [samples[event].sound[s] play];
-
- /* Release the autorelease pool */
- [autorelease_pool drain];
+ return NO;
}
-/*
- *
+/**
+ * Post a nonsense event so that our event loop wakes up
*/
-static void init_windows(void)
+static void wakeup_event_loop(void)
{
- /* Create the main window */
- term *primary = term_data_link(0);
-
- /* Prepare to create any additional windows */
- int i;
- for (i=1; i < ANGBAND_TERM_MAX; i++) {
- term_data_link(i);
- }
-
- /* Activate the primary term */
- Term_activate(primary);
+ /* Big hack - send a nonsense event to make us update */
+ NSEvent *event = [NSEvent otherEventWithType:NSApplicationDefined location:NSZeroPoint modifierFlags:0 timestamp:0 windowNumber:0 context:NULL subtype:AngbandEventWakeup data1:0 data2:0];
+ [NSApp postEvent:event atStart:NO];
}
+
/**
* Handle the "open_when_ready" flag
*/
{
/* Hack -- Forget messages and term */
msg_flag = FALSE;
- Term->mapped_flag = FALSE;
+ Term->mapped_flag = FALSE;
/* Save the game */
do_cmd_save_game(FALSE);
record_current_savefile();
-
-
+
/* Quit */
quit(NULL);
}
{
#if 0
AngbandContext *angbandContext = [[[event window] contentView] angbandContext];
- AngbandContext *mainAngbandContext = angband_term[0]->data;
+ AngbandContext *mainAngbandContext =
+ (__bridge AngbandContext*) (angband_term[0]->data);
- if (mainAngbandContext->primaryWindow && [[event window] windowNumber] == [mainAngbandContext->primaryWindow windowNumber])
+ if (mainAngbandContext.primaryWindow &&
+ [[event window] windowNumber] ==
+ [mainAngbandContext.primaryWindow windowNumber])
{
int cols, rows, x, y;
Term_get_size(&cols, &rows);
- NSSize tileSize = angbandContext->tileSize;
- NSSize border = angbandContext->borderSize;
+ NSSize tileSize = angbandContext.tileSize;
+ NSSize border = angbandContext.borderSize;
NSPoint windowPoint = [event locationInWindow];
/* Adjust for border; add border height because window origin is at
/* Coordinates run from (0,0) to (cols-1, rows-1). */
BOOL mouseInMapSection = (x > 13 && x <= cols - 1 && y > 0 && y <= rows - 2);
- /* If we are displaying a menu, allow clicks anywhere; if we are
- * displaying the main game interface, only allow clicks in the map
- * section */
- if (!displayingMapInterface || (displayingMapInterface && mouseInMapSection))
+ /* If we are displaying a menu, allow clicks anywhere within
+ * the terminal bounds; if we are displaying the main game
+ * interface, only allow clicks in the map section */
+ if ((!displayingMapInterface && x >= 0 && x < cols &&
+ y >= 0 && y < rows) ||
+ (displayingMapInterface && mouseInMapSection))
{
/* [event buttonNumber] will return 0 for left click,
* 1 for right click, but this is safer */
}
}
#endif
- /* Pass click through to permit focus change, resize, etc. */
- [NSApp sendEvent:event];
+
+ /* Pass click through to permit focus change, resize, etc. */
+ [NSApp sendEvent:event];
}
/* Extract some modifiers */
-#if 0
- /* Caught above so don't do anything with it here. */
- int mx = !! (modifiers & NSCommandKeyMask);
-#endif
int mc = !! (modifiers & NSControlKeyMask);
int ms = !! (modifiers & NSShiftKeyMask);
int mo = !! (modifiers & NSAlternateKeyMask);
/* Get the Angband char corresponding to this unichar */
unichar c = [[event characters] characterAtIndex:0];
char ch;
- switch (c) {
+ /*
+ * Have anything from the numeric keypad generate a macro
+ * trigger so that shift or control modifiers can be passed.
+ */
+ if (c <= 0x7F && !kp)
+ {
+ ch = (char) c;
+ }
+ else {
/*
- * Convert some special keys to what would be the normal
- * alternative in the original keyset or, for things lke
- * Delete, Return, and Escape, what one might use from ASCII.
* The rest of Hengband uses Angband 2.7's or so key handling:
* so for the rest do something like the encoding that
* main-win.c does: send a macro trigger with the Unicode
- * value encoded into printable ASCII characters. Since
- * macro triggers appear to assume at most two keys plus the
- * modifiers, can only handle values of c below 4096 with
- * 64 values per key.
+ * value encoded into printable ASCII characters.
*/
- case NSUpArrowFunctionKey: ch = '8'; kp = 0; break;
- case NSDownArrowFunctionKey: ch = '2'; kp = 0; break;
- case NSLeftArrowFunctionKey: ch = '4'; kp = 0; break;
- case NSRightArrowFunctionKey: ch = '6'; kp = 0; break;
- case NSHelpFunctionKey: ch = '?'; break;
- case NSDeleteFunctionKey: ch = '\b'; break;
-
- default:
- if (c <= 0x7F)
- ch = (char)c;
- else
- ch = '\0';
- break;
+ ch = '\0';
}
/* override special keys */
/* Enqueue it */
if (ch != '\0')
{
-
- /* Enqueue the keypress */
-#if 0
- byte mods = 0;
- if (mo) mods |= KC_MOD_ALT;
- if (mx) mods |= KC_MOD_META;
- if (mc && MODS_INCLUDE_CONTROL(ch)) mods |= KC_MOD_CONTROL;
- if (ms && MODS_INCLUDE_SHIFT(ch)) mods |= KC_MOD_SHIFT;
- if (kp) mods |= KC_MOD_KEYPAD;
- Term_keypress(ch, mods);
-#else
Term_keypress(ch);
-#endif
- } else if (c < 4096 || (c >= 0xF700 && c <= 0xF77F)) {
- unichar part;
- char cenc;
+ }
+ else
+ {
+ /*
+ * Could use the hexsym global but some characters overlap with
+ * those used to indicate modifiers.
+ */
+ const char encoded[16] = {
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b',
+ 'c', 'd', 'e', 'f'
+ };
/* Begin the macro trigger. */
Term_keypress(31);
/* Send the modifiers. */
if (mc) Term_keypress('C');
if (ms) Term_keypress('S');
- if (mo) Term_keypress('A');
+ if (mo) Term_keypress('O');
if (kp) Term_keypress('K');
- /*
- * Put part of the range Apple reserves for special keys
- * into 0 - 127 since that range has been handled normally.
- */
- if (c >= 0xF700) {
- c -= 0xF700;
- }
-
- /* Encode the value as two printable characters. */
- part = (c >> 6) & 63;
- if (part > 38) {
- cenc = 'a' + (part - 38);
- } else if (part > 12) {
- cenc = 'A' + (part - 12);
- } else {
- cenc = '0' + part;
- }
- Term_keypress(cenc);
- part = c & 63;
- if (part > 38) {
- cenc = 'a' + (part - 38);
- } else if (part > 12) {
- cenc = 'A' + (part - 12);
- } else {
- cenc = '0' + part;
- }
- Term_keypress(cenc);
+ do {
+ Term_keypress(encoded[c & 0xF]);
+ c >>= 4;
+ } while (c > 0);
/* End the macro trigger. */
Term_keypress(13);
* Check for Events, return TRUE if we process any
*/
static BOOL check_events(int wait)
-{
-
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-
- /* Handles the quit_when_ready flag */
- if (quit_when_ready) quit_calmly();
-
- NSDate* endDate;
- if (wait == CHECK_EVENTS_WAIT) endDate = [NSDate distantFuture];
- else endDate = [NSDate distantPast];
-
- NSEvent* event;
- for (;;) {
- if (quit_when_ready)
- {
- /* send escape events until we quit */
- Term_keypress(0x1B);
- [pool drain];
- return false;
- }
- else {
- event = [NSApp nextEventMatchingMask:-1 untilDate:endDate inMode:NSDefaultRunLoopMode dequeue:YES];
- if (! event)
- {
- [pool drain];
- return FALSE;
- }
- if (send_event(event)) break;
- }
+{
+ BOOL result = YES;
+
+ @autoreleasepool {
+ /* Handles the quit_when_ready flag */
+ if (quit_when_ready) quit_calmly();
+
+ NSDate* endDate;
+ if (wait == CHECK_EVENTS_WAIT) endDate = [NSDate distantFuture];
+ else endDate = [NSDate distantPast];
+
+ NSEvent* event;
+ for (;;) {
+ if (quit_when_ready)
+ {
+ /* send escape events until we quit */
+ Term_keypress(0x1B);
+ result = NO;
+ break;
+ }
+ else {
+ event = [NSApp nextEventMatchingMask:-1 untilDate:endDate
+ inMode:NSDefaultRunLoopMode dequeue:YES];
+ if (! event) {
+ result = NO;
+ break;
+ }
+ if (send_event(event)) break;
+ }
+ }
}
-
- [pool drain];
-
- /* Something happened */
- return YES;
-
+
+ return result;
+}
+
+/**
+ * Hook to tell the user something important
+ */
+static void hook_plog(const char * str)
+{
+ if (str)
+ {
+ NSString *msg = NSLocalizedStringWithDefaultValue(
+ @"Warning", AngbandMessageCatalog, [NSBundle mainBundle],
+ @"Warning", @"Alert text for generic warning");
+ NSString *info = [NSString stringWithCString:str
+#ifdef JP
+ encoding:NSJapaneseEUCStringEncoding
+#else
+ encoding:NSMacOSRomanStringEncoding
+#endif
+ ];
+ NSAlert *alert = [[NSAlert alloc] init];
+
+ alert.messageText = msg;
+ alert.informativeText = info;
+ [alert runModal];
+ }
+}
+
+
+/**
+ * Hook to tell the user something, and then quit
+ */
+static void hook_quit(const char * str)
+{
+ for (int i = ANGBAND_TERM_MAX - 1; i >= 0; --i) {
+ if (angband_term[i]) {
+ term_nuke(angband_term[i]);
+ }
+ }
+ [AngbandSoundCatalog clearSharedSounds];
+ [AngbandContext setDefaultFont:nil];
+ plog(str);
+ exit(0);
+}
+
+/**
+ * Return the path for Angband's lib directory and bail if it isn't found. The
+ * lib directory should be in the bundle's resources directory, since it's
+ * copied when built.
+ */
+static NSString* get_lib_directory(void)
+{
+ NSString *bundleLibPath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent: AngbandDirectoryNameLib];
+ BOOL isDirectory = NO;
+ BOOL libExists = [[NSFileManager defaultManager] fileExistsAtPath: bundleLibPath isDirectory: &isDirectory];
+
+ if( !libExists || !isDirectory )
+ {
+ NSLog( @"%@: can't find %@/ in bundle: isDirectory: %d libExists: %d", @VERSION_NAME, AngbandDirectoryNameLib, isDirectory, libExists );
+
+ NSString *msg = NSLocalizedStringWithDefaultValue(
+ @"Error.MissingResources",
+ AngbandMessageCatalog,
+ [NSBundle mainBundle],
+ @"Missing Resources",
+ @"Alert text for missing resources");
+ NSString *info = NSLocalizedStringWithDefaultValue(
+ @"Error.MissingAngbandLib",
+ AngbandMessageCatalog,
+ [NSBundle mainBundle],
+ @"Hengband was unable to find required resources and must quit. Please report a bug on the Angband forums.",
+ @"Alert informative message for missing Angband lib/ folder");
+ NSString *quit_label = NSLocalizedStringWithDefaultValue(
+ @"Label.Quit", AngbandMessageCatalog, [NSBundle mainBundle],
+ @"Quit", @"Quit");
+ NSAlert *alert = [[NSAlert alloc] init];
+ /*
+ * Note that NSCriticalAlertStyle was deprecated in 10.10. The
+ * replacement is NSAlertStyleCritical.
+ */
+ alert.alertStyle = NSCriticalAlertStyle;
+ alert.messageText = msg;
+ alert.informativeText = info;
+ [alert addButtonWithTitle:quit_label];
+ [alert runModal];
+ exit(0);
+ }
+
+ return bundleLibPath;
+}
+
+/**
+ * Return the path for the directory where Angband should look for its standard
+ * user file tree.
+ */
+static NSString* get_doc_directory(void)
+{
+ NSString *documents = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject];
+
+#if defined(SAFE_DIRECTORY)
+ NSString *versionedDirectory = [NSString stringWithFormat: @"%@-%s", AngbandDirectoryNameBase, VERSION_STRING];
+ return [documents stringByAppendingPathComponent: versionedDirectory];
+#else
+ return [documents stringByAppendingPathComponent: AngbandDirectoryNameBase];
+#endif
+}
+
+/**
+ * Adjust directory paths as needed to correct for any differences needed by
+ * Angband. init_file_paths() currently requires that all paths provided have
+ * a trailing slash and all other platforms honor this.
+ *
+ * \param originalPath The directory path to adjust.
+ * \return A path suitable for Angband or nil if an error occurred.
+ */
+static NSString* AngbandCorrectedDirectoryPath(NSString *originalPath)
+{
+ if ([originalPath length] == 0) {
+ return nil;
+ }
+
+ if (![originalPath hasSuffix: @"/"]) {
+ return [originalPath stringByAppendingString: @"/"];
+ }
+
+ return originalPath;
+}
+
+/**
+ * Give Angband the base paths that should be used for the various directories
+ * it needs. It will create any needed directories.
+ */
+static void prepare_paths_and_directories(void)
+{
+ char libpath[PATH_MAX + 1] = "\0";
+ NSString *libDirectoryPath =
+ AngbandCorrectedDirectoryPath(get_lib_directory());
+ [libDirectoryPath getFileSystemRepresentation: libpath maxLength: sizeof(libpath)];
+
+ char basepath[PATH_MAX + 1] = "\0";
+ NSString *angbandDocumentsPath =
+ AngbandCorrectedDirectoryPath(get_doc_directory());
+ [angbandDocumentsPath getFileSystemRepresentation: basepath maxLength: sizeof(basepath)];
+
+ init_file_paths(libpath, basepath);
+ create_needed_dirs();
+}
+
+/**
+ * Create and initialize Angband terminal number "i".
+ */
+static term *term_data_link(int i)
+{
+ NSArray *terminalDefaults = [[NSUserDefaults standardUserDefaults]
+ valueForKey: AngbandTerminalsDefaultsKey];
+ NSInteger rows = 24;
+ NSInteger columns = 80;
+
+ if (i < (int)[terminalDefaults count]) {
+ NSDictionary *term = [terminalDefaults objectAtIndex:i];
+ rows = [[term valueForKey: AngbandTerminalRowsDefaultsKey]
+ integerValue];
+ columns = [[term valueForKey: AngbandTerminalColumnsDefaultsKey]
+ integerValue];
+ }
+
+ /* Allocate */
+ term *newterm = ZNEW(term);
+
+ /* Initialize the term */
+ term_init(newterm, columns, rows, 256 /* keypresses, for some reason? */);
+
+ /* Use a "software" cursor */
+ newterm->soft_cursor = TRUE;
+
+ /* Disable the per-row flush notifications since they are not used. */
+ newterm->never_frosh = TRUE;
+
+ /*
+ * Differentiate between BS/^h, Tab/^i, ... so ^h and ^j work under the
+ * roguelike command set.
+ */
+ /* newterm->complex_input = TRUE; */
+
+ /* Erase with "white space" */
+ newterm->attr_blank = TERM_WHITE;
+ newterm->char_blank = ' ';
+
+ /* Prepare the init/nuke hooks */
+ newterm->init_hook = Term_init_cocoa;
+ newterm->nuke_hook = Term_nuke_cocoa;
+
+ /* Prepare the function hooks */
+ newterm->xtra_hook = Term_xtra_cocoa;
+ newterm->wipe_hook = Term_wipe_cocoa;
+ newterm->curs_hook = Term_curs_cocoa;
+ newterm->bigcurs_hook = Term_bigcurs_cocoa;
+ newterm->text_hook = Term_text_cocoa;
+ newterm->pict_hook = Term_pict_cocoa;
+ /* newterm->mbcs_hook = Term_mbcs_cocoa; */
+
+ /* Global pointer */
+ angband_term[i] = newterm;
+
+ return newterm;
}
/**
- * Hook to tell the user something important
+ * Load preferences from preferences file for current host+current user+
+ * current application.
*/
-static void hook_plog(const char * str)
+static void load_prefs(void)
{
- if (str)
- {
- NSString *msg = NSLocalizedStringWithDefaultValue(
- @"Warning", AngbandMessageCatalog, [NSBundle mainBundle],
- @"Warning", @"Alert text for generic warning");
- NSString *info = [NSString stringWithCString:str
+ NSUserDefaults *defs = [NSUserDefaults angbandDefaults];
+
+ /* Make some default defaults */
+ NSMutableArray *defaultTerms = [[NSMutableArray alloc] init];
+
+ /*
+ * The following default rows/cols were determined experimentally by first
+ * finding the ideal window/font size combinations. But because of awful
+ * temporal coupling in Term_init_cocoa(), it's impossible to set up the
+ * defaults there, so we do it this way.
+ */
+ for (NSUInteger i = 0; i < ANGBAND_TERM_MAX; i++) {
+ int columns, rows;
+ BOOL visible = YES;
+
+ switch (i) {
+ case 0:
+ columns = 129;
+ rows = 32;
+ break;
+ case 1:
+ columns = 84;
+ rows = 20;
+ break;
+ case 2:
+ columns = 42;
+ rows = 24;
+ break;
+ case 3:
+ columns = 42;
+ rows = 20;
+ break;
+ case 4:
+ columns = 42;
+ rows = 16;
+ break;
+ case 5:
+ columns = 84;
+ rows = 20;
+ break;
+ default:
+ columns = 80;
+ rows = 24;
+ visible = NO;
+ break;
+ }
+
+ NSDictionary *standardTerm =
+ [NSDictionary dictionaryWithObjectsAndKeys:
+ [NSNumber numberWithInt: rows], AngbandTerminalRowsDefaultsKey,
+ [NSNumber numberWithInt: columns], AngbandTerminalColumnsDefaultsKey,
+ [NSNumber numberWithBool: visible], AngbandTerminalVisibleDefaultsKey,
+ nil];
+ [defaultTerms addObject: standardTerm];
+ }
+
+ NSDictionary *defaults = [[NSDictionary alloc] initWithObjectsAndKeys:
#ifdef JP
- encoding:NSJapaneseEUCStringEncoding
+ @"Osaka", @"FontName",
#else
- encoding:NSMacOSRomanStringEncoding
+ @"Menlo", @"FontName",
#endif
- ];
- NSAlert *alert = [[NSAlert alloc] init];
+ [NSNumber numberWithFloat:13.f], @"FontSize",
+ [NSNumber numberWithInt:60], AngbandFrameRateDefaultsKey,
+ [NSNumber numberWithBool:YES], AngbandSoundDefaultsKey,
+ [NSNumber numberWithInt:GRAPHICS_NONE], AngbandGraphicsDefaultsKey,
+ [NSNumber numberWithBool:YES], AngbandBigTileDefaultsKey,
+ defaultTerms, AngbandTerminalsDefaultsKey,
+ nil];
+ [defs registerDefaults:defaults];
- alert.messageText = msg;
- alert.informativeText = info;
- NSModalResponse result = [alert runModal];
- [alert release];
+ /* Preferred graphics mode */
+ graf_mode_req = [defs integerForKey:AngbandGraphicsDefaultsKey];
+ if (graphics_will_be_enabled() &&
+ [defs boolForKey:AngbandBigTileDefaultsKey] == YES) {
+ use_bigtile = TRUE;
+ arg_bigtile = TRUE;
+ } else {
+ use_bigtile = FALSE;
+ arg_bigtile = FALSE;
+ }
+
+ /* Use sounds; set the Angband global */
+ if ([defs boolForKey:AngbandSoundDefaultsKey] == YES) {
+ use_sound = TRUE;
+ [AngbandSoundCatalog sharedSounds].enabled = YES;
+ } else {
+ use_sound = FALSE;
+ [AngbandSoundCatalog sharedSounds].enabled = NO;
}
+
+ /* fps */
+ frames_per_second = [defs integerForKey:AngbandFrameRateDefaultsKey];
+
+ /* Font */
+ [AngbandContext
+ setDefaultFont:[NSFont fontWithName:[defs valueForKey:@"FontName-0"]
+ size:[defs floatForKey:@"FontSize-0"]]];
+ if (! [AngbandContext defaultFont])
+ [AngbandContext
+ setDefaultFont:[NSFont fontWithName:@"Menlo" size:13.]];
}
+/**
+ * Play sound effects asynchronously. Select a sound from any available
+ * for the required event, and bridge to Cocoa to play it.
+ */
+static void play_sound(int event)
+{
+ [[AngbandSoundCatalog sharedSounds] playSound:event];
+}
/**
- * Hook to tell the user something, and then quit
+ * Allocate the primary Angband terminal and activate it. Allocate the other
+ * Angband terminals.
*/
-static void hook_quit(const char * str)
+static void init_windows(void)
{
- plog(str);
- exit(0);
+ /* Create the primary window */
+ term *primary = term_data_link(0);
+
+ /* Prepare to create any additional windows */
+ for (int i = 1; i < ANGBAND_TERM_MAX; i++) {
+ term_data_link(i);
+ }
+
+ /* Activate the primary term */
+ Term_activate(primary);
}
/**
* Main program
* ------------------------------------------------------------------------ */
-@interface AngbandAppDelegate : NSObject {
- IBOutlet NSMenu *terminalsMenu;
- NSMenu *_graphicsMenu;
- NSMenu *_commandMenu;
- NSDictionary *_commandMenuTagMap;
-}
-
-@property (nonatomic, retain) IBOutlet NSMenu *graphicsMenu;
-@property (nonatomic, retain) IBOutlet NSMenu *commandMenu;
-@property (nonatomic, retain) NSDictionary *commandMenuTagMap;
-
-- (IBAction)newGame:sender;
-- (IBAction)openGame:sender;
-
-- (IBAction)editFont:sender;
-- (IBAction)setGraphicsMode:(NSMenuItem *)sender;
-- (IBAction)toggleSound:(NSMenuItem *)sender;
-
-- (IBAction)setRefreshRate:(NSMenuItem *)menuItem;
-- (IBAction)selectWindow: (id)sender;
-
-@end
-
@implementation AngbandAppDelegate
@synthesize graphicsMenu=_graphicsMenu;
- (IBAction)editFont:sender
{
NSFontPanel *panel = [NSFontPanel sharedFontPanel];
- NSFont *termFont = default_font;
+ NSFont *termFont = [AngbandContext defaultFont];
int i;
for (i=0; i < ANGBAND_TERM_MAX; i++) {
- if ([(id)angband_term[i]->data isMainWindow]) {
- termFont = [(id)angband_term[i]->data selectionFont];
+ AngbandContext *context =
+ (__bridge AngbandContext*) (angband_term[i]->data);
+ if ([context isKeyWindow]) {
+ termFont = [context angbandViewFont];
break;
}
}
-
+
[panel setPanelFont:termFont isMultiple:NO];
[panel orderFront:self];
}
/**
- * Implent NSObject's changeFont() method to receive a notification about the
+ * Implement NSObject's changeFont() method to receive a notification about the
* changed font. Note that, as of 10.14, changeFont() is deprecated in
* NSObject - it will be removed at some point and the application delegate
* will have to be declared as implementing the NSFontChanging protocol.
{
int mainTerm;
for (mainTerm=0; mainTerm < ANGBAND_TERM_MAX; mainTerm++) {
- if ([(id)angband_term[mainTerm]->data isMainWindow]) {
+ AngbandContext *context =
+ (__bridge AngbandContext*) (angband_term[mainTerm]->data);
+ if ([context isKeyWindow]) {
break;
}
}
/* Bug #1709: Only change font for angband windows */
if (mainTerm == ANGBAND_TERM_MAX) return;
-
- NSFont *oldFont = default_font;
+
+ NSFont *oldFont = [AngbandContext defaultFont];
NSFont *newFont = [sender convertFont:oldFont];
if (! newFont) return; /*paranoia */
-
+
/* Store as the default font if we changed the first term */
if (mainTerm == 0) {
- [newFont retain];
- [default_font release];
- default_font = newFont;
+ [AngbandContext setDefaultFont:newFont];
}
-
+
/* Record it in the preferences */
NSUserDefaults *defs = [NSUserDefaults angbandDefaults];
[defs setValue:[newFont fontName]
forKey:[NSString stringWithFormat:@"FontName-%d", mainTerm]];
[defs setFloat:[newFont pointSize]
forKey:[NSString stringWithFormat:@"FontSize-%d", mainTerm]];
- [defs synchronize];
-
+
NSDisableScreenUpdates();
-
+
/* Update window */
- AngbandContext *angbandContext = angband_term[mainTerm]->data;
+ AngbandContext *angbandContext =
+ (__bridge AngbandContext*) (angband_term[mainTerm]->data);
[(id)angbandContext setSelectionFont:newFont adjustTerminal: YES];
-
+
NSEnableScreenUpdates();
+
+ if (mainTerm != 0 || ! redraw_for_tiles_or_term0_font()) {
+ [(id)angbandContext requestRedraw];
+ }
}
- (IBAction)openGame:sender
{
- NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
- BOOL selectedSomething = NO;
- int panelResult;
-
- /* Get where we think the save files are */
- NSURL *startingDirectoryURL = [NSURL fileURLWithPath:[NSString stringWithCString:ANGBAND_DIR_SAVE encoding:NSASCIIStringEncoding] isDirectory:YES];
-
- /* Set up an open panel */
- NSOpenPanel* panel = [NSOpenPanel openPanel];
- [panel setCanChooseFiles:YES];
- [panel setCanChooseDirectories:NO];
- [panel setResolvesAliases:YES];
- [panel setAllowsMultipleSelection:NO];
- [panel setTreatsFilePackagesAsDirectories:YES];
- [panel setDirectoryURL:startingDirectoryURL];
-
- /* Run it */
- panelResult = [panel runModal];
- if (panelResult == NSOKButton)
- {
- NSArray* fileURLs = [panel URLs];
- if ([fileURLs count] > 0 && [[fileURLs objectAtIndex:0] isFileURL])
- {
- NSURL* savefileURL = (NSURL *)[fileURLs objectAtIndex:0];
- /* The path property doesn't do the right thing except for
- * URLs with the file scheme. We had getFileSystemRepresentation
- * here before, but that wasn't introduced until OS X 10.9. */
- selectedSomething = [[savefileURL path] getCString:savefile
- maxLength:sizeof savefile encoding:NSMacOSRomanStringEncoding];
- }
- }
-
- if (selectedSomething)
- {
- /* Remember this so we can select it by default next time */
- record_current_savefile();
-
- /* Game is in progress */
- game_in_progress = TRUE;
- new_game = FALSE;
+ @autoreleasepool {
+ BOOL selectedSomething = NO;
+ int panelResult;
+
+ /* Get where we think the save files are */
+ NSURL *startingDirectoryURL =
+ [NSURL fileURLWithPath:[NSString stringWithCString:ANGBAND_DIR_SAVE encoding:NSASCIIStringEncoding]
+ isDirectory:YES];
+
+ /* Set up an open panel */
+ NSOpenPanel* panel = [NSOpenPanel openPanel];
+ [panel setCanChooseFiles:YES];
+ [panel setCanChooseDirectories:NO];
+ [panel setResolvesAliases:YES];
+ [panel setAllowsMultipleSelection:NO];
+ [panel setTreatsFilePackagesAsDirectories:YES];
+ [panel setDirectoryURL:startingDirectoryURL];
+
+ /* Run it */
+ panelResult = [panel runModal];
+ if (panelResult == NSOKButton)
+ {
+ NSArray* fileURLs = [panel URLs];
+ if ([fileURLs count] > 0 && [[fileURLs objectAtIndex:0] isFileURL])
+ {
+ NSURL* savefileURL = (NSURL *)[fileURLs objectAtIndex:0];
+ /*
+ * The path property doesn't do the right thing except for
+ * URLs with the file scheme. We had
+ * getFileSystemRepresentation here before, but that wasn't
+ * introduced until OS X 10.9.
+ */
+ selectedSomething = [[savefileURL path]
+ getCString:savefile
+ maxLength:sizeof savefile
+ encoding:NSMacOSRomanStringEncoding];
+ }
+ }
+
+ if (selectedSomething)
+ {
+ /* Remember this so we can select it by default next time */
+ record_current_savefile();
+
+ /* Game is in progress */
+ game_in_progress = TRUE;
+ }
}
-
- [pool drain];
}
- (IBAction)saveGame:sender
/* Save the game */
do_cmd_save_game(FALSE);
- /* Record the current save file so we can select it by default next time.
- * It's a little sketchy that this only happens when we save through the
- * menu; ideally game-triggered saves would trigger it too. */
+ /*
+ * Record the current save file so we can select it by default next time.
+ * It's a little sketchy that this only happens when we save through the
+ * menu; ideally game-triggered saves would trigger it too.
+ */
record_current_savefile();
}
/**
+ * Entry point for initializing Angband
+ */
+- (void)beginGame
+{
+ @autoreleasepool {
+ /* Hooks in some "z-util.c" hooks */
+ plog_aux = hook_plog;
+ quit_aux = hook_quit;
+
+ /* Initialize file paths */
+ prepare_paths_and_directories();
+
+ /* Note the "system" */
+ ANGBAND_SYS = "coc";
+
+ /* Load possible graphics modes */
+ init_graphics_modes();
+
+ /* Load preferences */
+ load_prefs();
+
+ /* Prepare the windows */
+ init_windows();
+
+ /* Set up game event handlers */
+ /* init_display(); */
+
+ /* Register the sound hook */
+ /* sound_hook = play_sound; */
+
+ /* Initialize some save file stuff */
+ player_euid = geteuid();
+ player_egid = getegid();
+
+ /* Initialise game */
+ init_angband();
+
+ /* We are now initialized */
+ initialized = TRUE;
+
+ /* Handle "open_when_ready" */
+ handle_open_when_ready();
+
+ /* Handle pending events (most notably update) and flush input */
+ Term_flush();
+
+ /*
+ * Prompt the user; assume the splash screen is 80 x 23 and position
+ * relative to that rather than center based on the full size of the
+ * window.
+ */
+ int message_row = 23;
+ Term_erase(0, message_row, 255);
+ put_str(
+#ifdef JP
+ "['ファイル' メニューから '新規' または '開く' を選択します]",
+ message_row, (80 - 59) / 2
+#else
+ "[Choose 'New' or 'Open' from the 'File' menu]",
+ message_row, (80 - 45) / 2
+#endif
+ );
+ Term_fresh();
+ }
+
+ while (!game_in_progress) {
+ @autoreleasepool {
+ NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantFuture] inMode:NSDefaultRunLoopMode dequeue:YES];
+ if (event) [NSApp sendEvent:event];
+ }
+ }
+
+ /*
+ * Play a game -- "new_game" is set by "new", "open" or the open document
+ * even handler as appropriate
+ */
+ Term_fresh();
+ play_game(new_game);
+
+ quit(NULL);
+}
+
+/**
* Implement NSObject's validateMenuItem() method to override enabling or
* disabling a menu item. Note that, as of 10.14, validateMenuItem() is
- * deprecated in NSObject - it will be removed at some point and the
+ * deprecated in NSObject - it will be removed at some point and the
* application delegate will have to be declared as implementing the
* NSMenuItemValidation protocol.
*/
{
return ! game_in_progress;
}
- else if (sel == @selector(setRefreshRate:) && [superitem(menuItem) tag] == 150)
+ else if (sel == @selector(setRefreshRate:) &&
+ [[menuItem parentItem] tag] == 150)
{
NSInteger fps = [[NSUserDefaults standardUserDefaults] integerForKey:AngbandFrameRateDefaultsKey];
[menuItem setState: ([menuItem tag] == fps)];
[menuItem setState: ((is_on) ? NSOnState : NSOffState)];
return YES;
}
- else if( sel == @selector(sendAngbandCommand:) )
+ else if (sel == @selector(toggleWideTiles:)) {
+ BOOL is_on = [[NSUserDefaults standardUserDefaults]
+ boolForKey:AngbandBigTileDefaultsKey];
+
+ [menuItem setState: ((is_on) ? NSOnState : NSOffState)];
+ return YES;
+ }
+ else if( sel == @selector(sendAngbandCommand:) ||
+ sel == @selector(saveGame:) )
{
- /* we only want to be able to send commands during an active game */
- return !!game_in_progress;
+ /*
+ * we only want to be able to send commands during an active game
+ * after the birth screens
+ */
+ return !!game_in_progress && character_generated;
}
else return YES;
}
[[NSUserDefaults angbandDefaults] setInteger:frames_per_second forKey:AngbandFrameRateDefaultsKey];
}
-- (IBAction)selectWindow: (id)sender
-{
- NSInteger subwindowNumber = [(NSMenuItem *)sender tag] - AngbandWindowMenuItemTagBase;
- AngbandContext *context = angband_term[subwindowNumber]->data;
- [context->primaryWindow makeKeyAndOrderFront: self];
- [context saveWindowVisibleToDefaults: YES];
-}
-
-- (void)prepareWindowsMenu
-{
- /* Get the window menu with default items and add a separator and item for
- * the main window */
- NSMenu *windowsMenu = [[NSApplication sharedApplication] windowsMenu];
- [windowsMenu addItem: [NSMenuItem separatorItem]];
-
- NSString *title1 = [NSString stringWithCString:angband_term_name[0]
-#ifdef JP
- encoding:NSJapaneseEUCStringEncoding
-#else
- encoding:NSMacOSRomanStringEncoding
-#endif
- ];
- NSMenuItem *angbandItem = [[NSMenuItem alloc] initWithTitle:title1 action: @selector(selectWindow:) keyEquivalent: @"0"];
- [angbandItem setTarget: self];
- [angbandItem setTag: AngbandWindowMenuItemTagBase];
- [windowsMenu addItem: angbandItem];
- [angbandItem release];
-
- /* Add items for the additional term windows */
- for( NSInteger i = 1; i < ANGBAND_TERM_MAX; i++ )
- {
- NSString *title = [NSString stringWithCString:angband_term_name[i]
-#ifdef JP
- encoding:NSJapaneseEUCStringEncoding
-#else
- encoding:NSMacOSRomanStringEncoding
-#endif
- ];
- NSString *keyEquivalent = [NSString stringWithFormat: @"%ld", (long)i];
- NSMenuItem *windowItem = [[NSMenuItem alloc] initWithTitle: title action: @selector(selectWindow:) keyEquivalent: keyEquivalent];
- [windowItem setTarget: self];
- [windowItem setTag: AngbandWindowMenuItemTagBase + i];
- [windowsMenu addItem: windowItem];
- [windowItem release];
- }
-}
-
-- (IBAction)setGraphicsMode:(NSMenuItem *)sender
+- (void)setGraphicsMode:(NSMenuItem *)sender
{
/* We stashed the graphics mode ID in the menu item's tag */
graf_mode_req = [sender tag];
/* Stash it in UserDefaults */
[[NSUserDefaults angbandDefaults] setInteger:graf_mode_req forKey:AngbandGraphicsDefaultsKey];
- [[NSUserDefaults angbandDefaults] synchronize];
-
- if (game_in_progress)
- {
- /* Hack -- Force redraw */
- do_cmd_redraw();
-
- /* Wake up the event loop so it notices the change */
- wakeup_event_loop();
+
+ if (! graphics_will_be_enabled()) {
+ if (use_bigtile) {
+ arg_bigtile = FALSE;
+ }
+ } else if ([[NSUserDefaults angbandDefaults] boolForKey:AngbandBigTileDefaultsKey] == YES &&
+ ! use_bigtile) {
+ arg_bigtile = TRUE;
+ }
+
+ if (arg_bigtile != use_bigtile) {
+ Term_activate(angband_term[0]);
+ Term_resize(angband_term[0]->wid, angband_term[0]->hgt);
}
+ redraw_for_tiles_or_term0_font();
+}
+
+- (void)selectWindow: (id)sender
+{
+ NSInteger subwindowNumber =
+ [(NSMenuItem *)sender tag] - AngbandWindowMenuItemTagBase;
+ AngbandContext *context =
+ (__bridge AngbandContext*) (angband_term[subwindowNumber]->data);
+ [context.primaryWindow makeKeyAndOrderFront: self];
+ [context saveWindowVisibleToDefaults: YES];
}
- (IBAction) toggleSound: (NSMenuItem *) sender
BOOL is_on = (sender.state == NSOnState);
/* Toggle the state and update the Angband global and preferences. */
- sender.state = (is_on) ? NSOffState : NSOnState;
- use_sound = (is_on) ? FALSE : TRUE;
+ if (is_on) {
+ sender.state = NSOffState;
+ use_sound = FALSE;
+ [AngbandSoundCatalog sharedSounds].enabled = NO;
+ } else {
+ sender.state = NSOnState;
+ use_sound = TRUE;
+ [AngbandSoundCatalog sharedSounds].enabled = YES;
+ }
[[NSUserDefaults angbandDefaults] setBool:(! is_on)
forKey:AngbandSoundDefaultsKey];
}
+- (IBAction)toggleWideTiles:(NSMenuItem *) sender
+{
+ BOOL is_on = (sender.state == NSOnState);
+
+ /* Toggle the state and update the Angband globals and preferences. */
+ sender.state = (is_on) ? NSOffState : NSOnState;
+ [[NSUserDefaults angbandDefaults] setBool:(! is_on)
+ forKey:AngbandBigTileDefaultsKey];
+ if (graphics_are_enabled()) {
+ arg_bigtile = (is_on) ? FALSE : TRUE;
+ if (arg_bigtile != use_bigtile) {
+ Term_activate(angband_term[0]);
+ Term_resize(angband_term[0]->wid, angband_term[0]->hgt);
+ redraw_for_tiles_or_term0_font();
+ }
+ }
+}
+
+- (void)prepareWindowsMenu
+{
+ @autoreleasepool {
+ /*
+ * Get the window menu with default items and add a separator and
+ * item for the main window.
+ */
+ NSMenu *windowsMenu = [[NSApplication sharedApplication] windowsMenu];
+ [windowsMenu addItem: [NSMenuItem separatorItem]];
+
+ NSString *title1 = [NSString stringWithCString:angband_term_name[0]
+#ifdef JP
+ encoding:NSJapaneseEUCStringEncoding
+#else
+ encoding:NSMacOSRomanStringEncoding
+#endif
+ ];
+ NSMenuItem *angbandItem = [[NSMenuItem alloc] initWithTitle:title1 action: @selector(selectWindow:) keyEquivalent: @"0"];
+ [angbandItem setTarget: self];
+ [angbandItem setTag: AngbandWindowMenuItemTagBase];
+ [windowsMenu addItem: angbandItem];
+
+ /* Add items for the additional term windows */
+ for( NSInteger i = 1; i < ANGBAND_TERM_MAX; i++ )
+ {
+ NSString *title = [NSString stringWithCString:angband_term_name[i]
+#ifdef JP
+ encoding:NSJapaneseEUCStringEncoding
+#else
+ encoding:NSMacOSRomanStringEncoding
+#endif
+ ];
+ NSString *keyEquivalent =
+ [NSString stringWithFormat: @"%ld", (long)i];
+ NSMenuItem *windowItem =
+ [[NSMenuItem alloc] initWithTitle: title
+ action: @selector(selectWindow:)
+ keyEquivalent: keyEquivalent];
+ [windowItem setTarget: self];
+ [windowItem setTag: AngbandWindowMenuItemTagBase + i];
+ [windowsMenu addItem: windowItem];
+ }
+ }
+}
+
/**
* Send a command to Angband via a menu item. This places the appropriate key
* down events into the queue so that it seems like the user pressed them
{
NSMenuItem *menuItem = (NSMenuItem *)sender;
NSString *command = [self.commandMenuTagMap objectForKey: [NSNumber numberWithInteger: [menuItem tag]]];
- NSInteger windowNumber = [((AngbandContext *)angband_term[0]->data)->primaryWindow windowNumber];
+ AngbandContext* context =
+ (__bridge AngbandContext*) (angband_term[0]->data);
+ NSInteger windowNumber = [context.primaryWindow windowNumber];
/* Send a \ to bypass keymaps */
NSEvent *escape = [NSEvent keyEventWithType: NSKeyDown
*/
- (void)prepareCommandMenu
{
- NSString *commandMenuPath = [[NSBundle mainBundle] pathForResource: @"CommandMenu" ofType: @"plist"];
- NSArray *commandMenuItems = [[NSArray alloc] initWithContentsOfFile: commandMenuPath];
- NSMutableDictionary *angbandCommands = [[NSMutableDictionary alloc] init];
- NSString *tblname = @"CommandMenu";
- NSInteger tagOffset = 0;
-
- for( NSDictionary *item in commandMenuItems )
- {
- BOOL useShiftModifier = [[item valueForKey: @"ShiftModifier"] boolValue];
- BOOL useOptionModifier = [[item valueForKey: @"OptionModifier"] boolValue];
- NSUInteger keyModifiers = NSCommandKeyMask;
- keyModifiers |= (useShiftModifier) ? NSShiftKeyMask : 0;
- keyModifiers |= (useOptionModifier) ? NSAlternateKeyMask : 0;
-
- NSString *lookup = [item valueForKey: @"Title"];
- NSString *title = NSLocalizedStringWithDefaultValue(
- lookup, tblname, [NSBundle mainBundle], lookup, @"");
- NSString *key = [item valueForKey: @"KeyEquivalent"];
- NSMenuItem *menuItem = [[NSMenuItem alloc] initWithTitle: title action: @selector(sendAngbandCommand:) keyEquivalent: key];
- [menuItem setTarget: self];
- [menuItem setKeyEquivalentModifierMask: keyModifiers];
- [menuItem setTag: AngbandCommandMenuItemTagBase + tagOffset];
- [self.commandMenu addItem: menuItem];
- [menuItem release];
+ @autoreleasepool {
+ NSString *commandMenuPath =
+ [[NSBundle mainBundle] pathForResource: @"CommandMenu"
+ ofType: @"plist"];
+ NSArray *commandMenuItems =
+ [[NSArray alloc] initWithContentsOfFile: commandMenuPath];
+ NSMutableDictionary *angbandCommands =
+ [[NSMutableDictionary alloc] init];
+ NSString *tblname = @"CommandMenu";
+ NSInteger tagOffset = 0;
+
+ for( NSDictionary *item in commandMenuItems )
+ {
+ BOOL useShiftModifier =
+ [[item valueForKey: @"ShiftModifier"] boolValue];
+ BOOL useOptionModifier =
+ [[item valueForKey: @"OptionModifier"] boolValue];
+ NSUInteger keyModifiers = NSCommandKeyMask;
+ keyModifiers |= (useShiftModifier) ? NSShiftKeyMask : 0;
+ keyModifiers |= (useOptionModifier) ? NSAlternateKeyMask : 0;
+
+ NSString *lookup = [item valueForKey: @"Title"];
+ NSString *title = NSLocalizedStringWithDefaultValue(
+ lookup, tblname, [NSBundle mainBundle], lookup, @"");
+ NSString *key = [item valueForKey: @"KeyEquivalent"];
+ NSMenuItem *menuItem =
+ [[NSMenuItem alloc] initWithTitle: title
+ action: @selector(sendAngbandCommand:)
+ keyEquivalent: key];
+ [menuItem setTarget: self];
+ [menuItem setKeyEquivalentModifierMask: keyModifiers];
+ [menuItem setTag: AngbandCommandMenuItemTagBase + tagOffset];
+ [self.commandMenu addItem: menuItem];
+
+ NSString *angbandCommand = [item valueForKey: @"AngbandCommand"];
+ [angbandCommands setObject: angbandCommand
+ forKey: [NSNumber numberWithInteger: [menuItem tag]]];
+ tagOffset++;
+ }
- NSString *angbandCommand = [item valueForKey: @"AngbandCommand"];
- [angbandCommands setObject: angbandCommand forKey: [NSNumber numberWithInteger: [menuItem tag]]];
- tagOffset++;
+ self.commandMenuTagMap = [[NSDictionary alloc]
+ initWithDictionary: angbandCommands];
}
-
- [commandMenuItems release];
-
- NSDictionary *safeCommands = [[NSDictionary alloc] initWithDictionary: angbandCommands];
- self.commandMenuTagMap = safeCommands;
- [safeCommands release];
- [angbandCommands release];
}
- (void)awakeFromNib
- (void)applicationDidFinishLaunching:sender
{
- [AngbandContext beginGame];
+ [self beginGame];
/* Once beginGame finished, the game is over - that's how Angband works,
* and we should quit */
{
if (p_ptr->playing == FALSE || game_is_finished == TRUE)
{
+ quit_when_ready = true;
return NSTerminateNow;
}
else if (! inkey_flag)
key = [[NSString alloc] initWithUTF8String:graf->menuname];
title = NSLocalizedStringWithDefaultValue(
key, tblname, [NSBundle mainBundle], key, @"");
-
+
/* Make the item */
NSMenuItem *item = [menu addItemWithTitle:title action:action keyEquivalent:@""];
- [key release];
[item setTag:graf->grafID];
}
}
/**
* Delegate method that gets called if we're asked to open a file.
*/
-- (BOOL)application:(NSApplication *)sender openFiles:(NSArray *)filenames
+- (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames
{
/* Can't open a file once we've started */
- if (game_in_progress) return NO;
-
+ if (game_in_progress) {
+ [[NSApplication sharedApplication]
+ replyToOpenOrPrint:NSApplicationDelegateReplyFailure];
+ return;
+ }
+
/* We can only open one file. Use the last one. */
NSString *file = [filenames lastObject];
- if (! file) return NO;
-
+ if (! file) {
+ [[NSApplication sharedApplication]
+ replyToOpenOrPrint:NSApplicationDelegateReplyFailure];
+ return;
+ }
+
/* Put it in savefile */
- if (! [file getFileSystemRepresentation:savefile maxLength:sizeof savefile])
- return NO;
-
+ if (! [file getFileSystemRepresentation:savefile maxLength:sizeof savefile]) {
+ [[NSApplication sharedApplication]
+ replyToOpenOrPrint:NSApplicationDelegateReplyFailure];
+ return;
+ }
+
game_in_progress = TRUE;
- new_game = FALSE;
/* Wake us up in case this arrives while we're sitting at the Welcome
* screen! */
wakeup_event_loop();
-
- return YES;
+
+ [[NSApplication sharedApplication]
+ replyToOpenOrPrint:NSApplicationDelegateReplySuccess];
}
@end
OSDN Git Service
