From a23f3c57caa37886956b704cb232ef211792c1aa Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <programble@gmail.com>
Date: Sun, 4 Feb 2018 11:42:54 -0500
Subject: Add Quit menu item to gfcocoa

---
 bin/gfcocoa.m | 40 ++++++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

(limited to 'bin/gfcocoa.m')

diff --git a/bin/gfcocoa.m b/bin/gfcocoa.m
index 720f1c72..b1118bf3 100644
--- a/bin/gfcocoa.m
+++ b/bin/gfcocoa.m
@@ -61,19 +61,21 @@ static uint32_t buf[WIDTH * HEIGHT];
 
 - (void) keyDown: (NSEvent *) event {
     char in;
-    [
+    BOOL converted = [
         [event characters]
         getBytes: &in
         maxLength: 1
         usedLength: NULL
         encoding: NSASCIIStringEncoding
-        options: NSStringEncodingConversionAllowLossy
+        options: 0
         range: NSMakeRange(0, 1)
         remainingRange: NULL
     ];
-    input(in);
-    draw(buf, WIDTH, HEIGHT);
-    [self setNeedsDisplay: YES];
+    if (converted) {
+        input(in);
+        draw(buf, WIDTH, HEIGHT);
+        [self setNeedsDisplay: YES];
+    }
 }
 @end
 
@@ -90,25 +92,43 @@ int main(int argc, char *argv[]) {
     int error = init(argc, argv);
     if (error) return error;
 
-    draw(buf, WIDTH, HEIGHT);
-
     [NSApplication sharedApplication];
     [NSApp setActivationPolicy: NSApplicationActivationPolicyRegular];
     [NSApp setDelegate: [Delegate new]];
 
+    NSString *name = [[NSProcessInfo processInfo] processName];
+    NSMenu *menu = [NSMenu new];
+    NSMenuItem *quit = [
+        [NSMenuItem alloc]
+        initWithTitle: [@"Quit " stringByAppendingString: name]
+        action: @selector(terminate:)
+        keyEquivalent: @"q"
+    ];
+    [menu addItem: quit];
+    NSMenuItem *menuItem = [NSMenuItem new];
+    [menuItem setSubmenu: menu];
+    [NSApp setMainMenu: [NSMenu new]];
+    [[NSApp mainMenu] addItem: menuItem];
+
+    NSUInteger style = NSTitledWindowMask
+        | NSClosableWindowMask
+        | NSMiniaturizableWindowMask
+        | NSResizableWindowMask;
     NSWindow *window = [
         [NSWindow alloc]
         initWithContentRect: NSMakeRect(0, 0, WIDTH, HEIGHT)
-        styleMask: NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask
+        styleMask: style
         backing: NSBackingStoreBuffered
         defer: YES
     ];
+    [window setTitle: name];
+    [window center];
 
     BufferView *view = [[BufferView alloc] initWithFrame: [window frame]];
     [window setContentView: view];
 
-    [window setTitle: [NSString stringWithUTF8String: argv[0]]];
-    [window center];
+    draw(buf, WIDTH, HEIGHT);
+
     [window makeKeyAndOrderFront: nil];
     [NSApp activateIgnoringOtherApps: YES];
     [NSApp run];
-- 
cgit 1.4.1

freecell.6?id=6f35229b87e64472805ba83e70bac5d8f90cb3e0&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span class='age-hours' title='2024-06-09 18:48:15 -0400'>15 hours</span></td><td class='logsubject'><a href='/src/commit/www/photo.causal.agency/generate.sh?id=2df9d0291f9451fd603f102778abf64a4d62f977&amp;follow=1'>Put lens and (future) film at the tops of photo pages</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2024-05-22 12:16:41 -0400'>2024-05-22</span></td><td class='logsubject'><a href='/src/commit/bin/xx.c?id=625662a5c1cbb71cf37653df1f31cd60c48b18ae&amp;follow=1'>Remove use of sysexits.h</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2024-05-22 11:55:53 -0400'>2024-05-22</span></td><td class='logsubject'><a href='/src/commit/www/photo.causal.agency/2024-05-06/IMG_2015.txt?id=00e1552bfe74992ccd5653a738a984e47bb2699c&amp;follow=1'>Add photo descriptions from 05-03 and 05-06</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2024-05-21 17:07:53 -0400'>2024-05-21</span></td><td class='logsubject'><a href='/src/commit/bin/when.y?id=cc8dba0836353aa5ea1096d526daae9129da3b5e&amp;follow=1'>Fix = precedence in when</a></td><td>June McEnroe