emcc frontend: stop indiscriminately squashing mouseups.

[sgt-puzzles.git] / osx.m

diff --git a/osx.m b/osx.m
index 53d14bafd8edd07a63c051fe50c70cf3e5235a7b..c46e8bcc9023ded501e158720d975c8cd250287e 100644 (file)
--- a/osx.m
+++ b/osx.m
@@ -100,6 +100,12 @@ NSMenu *typemenu;
  */
 extern const struct drawing_api osx_drawing;
 
+/*
+ * The NSApplication shared instance, which I'll want to refer to from
+ * a few places here and there.
+ */
+NSApplication *app;
+
 /* ----------------------------------------------------------------------
  * Miscellaneous support routines that aren't part of any object or
  * clearly defined subsystem.
@@ -1088,15 +1094,16 @@ struct frontend {
                p = i->sval;
                c = *p++;
                while (*p) {
-                   char cc, *q;
+                   char *q, *copy;
 
                    q = p;
                    while (*p && *p != c) p++;
 
-                   cc = *p;
-                   *p = '\0';
-                   [pb addItemWithTitle:[NSString stringWithUTF8String:q]];
-                   *p = cc;
+                    copy = snewn((p-q) + 1, char);
+                    memcpy(copy, q, p-q);
+                    copy[p-q] = '\0';
+                   [pb addItemWithTitle:[NSString stringWithUTF8String:copy]];
+                    sfree(copy);
 
                    if (*p) p++;
                }
@@ -1190,7 +1197,7 @@ struct frontend {
     for (k = 0; k < cfg_ncontrols; k++)
        [[sheet contentView] addSubview:cfg_controls[k]];
 
-    [NSApp beginSheet:sheet modalForWindow:self
+    [app beginSheet:sheet modalForWindow:self
      modalDelegate:nil didEndSelector:NULL contextInfo:nil];
 }
 
@@ -1212,7 +1219,7 @@ struct frontend {
 - (void)sheetEndWithStatus:(BOOL)update
 {
     assert(sheet != NULL);
-    [NSApp endSheet:sheet];
+    [app endSheet:sheet];
     [sheet orderOut:self];
     sheet = NULL;
     if (update) {
@@ -1342,6 +1349,8 @@ static void osx_draw_line(void *handle, int x1, int y1, int x2, int y2, int colo
     [path moveToPoint:p1];
     [path lineToPoint:p2];
     [path stroke];
+    NSRectFill(NSMakeRect(x1, fe->h-y1-1, 1, 1));
+    NSRectFill(NSMakeRect(x2, fe->h-y2-1, 1, 1));
 }
 static void osx_draw_rect(void *handle, int x, int y, int w, int h, int colour)
 {
@@ -1547,7 +1556,7 @@ void activate_timer(frontend *fe)
  * AppController: the object which receives the messages from all
  * menu selections that aren't standard OS X functions.
  */
-@interface AppController : NSObject
+@interface AppController : NSObject <NSApplicationDelegate>
 {
 }
 - (void)newGameWindow:(id)sender;
@@ -1605,27 +1614,27 @@ int main(int argc, char **argv)
     pool = [[NSAutoreleasePool alloc] init];
 
     icon = [NSImage imageNamed:@"NSApplicationIcon"];
-    [NSApplication sharedApplication];
-    [NSApp setApplicationIconImage:icon];
+    app = [NSApplication sharedApplication];
+    [app setApplicationIconImage:icon];
 
     controller = [[[AppController alloc] init] autorelease];
-    [NSApp setDelegate:controller];
+    [app setDelegate:controller];
 
-    [NSApp setMainMenu: newmenu("Main Menu")];
+    [app setMainMenu: newmenu("Main Menu")];
 
-    menu = newsubmenu([NSApp mainMenu], "Apple Menu");
+    menu = newsubmenu([app mainMenu], "Apple Menu");
     newitem(menu, "About Puzzles", "", NULL, @selector(about:));
     [menu addItem:[NSMenuItem separatorItem]];
-    [NSApp setServicesMenu:newsubmenu(menu, "Services")];
+    [app setServicesMenu:newsubmenu(menu, "Services")];
     [menu addItem:[NSMenuItem separatorItem]];
-    newitem(menu, "Hide Puzzles", "h", NSApp, @selector(hide:));
-    newitem(menu, "Hide Others", "o-h", NSApp, @selector(hideOtherApplications:));
-    newitem(menu, "Show All", "", NSApp, @selector(unhideAllApplications:));
+    newitem(menu, "Hide Puzzles", "h", app, @selector(hide:));
+    newitem(menu, "Hide Others", "o-h", app, @selector(hideOtherApplications:));
+    newitem(menu, "Show All", "", app, @selector(unhideAllApplications:));
     [menu addItem:[NSMenuItem separatorItem]];
-    newitem(menu, "Quit", "q", NSApp, @selector(terminate:));
-    [NSApp setAppleMenu: menu];
+    newitem(menu, "Quit", "q", app, @selector(terminate:));
+    [app setAppleMenu: menu];
 
-    menu = newsubmenu([NSApp mainMenu], "File");
+    menu = newsubmenu([app mainMenu], "File");
     newitem(menu, "Open", "o", NULL, @selector(loadSavedGame:));
     newitem(menu, "Save As", "s", NULL, @selector(saveGame:));
     newitem(menu, "New Game", "n", NULL, @selector(newGame:));
@@ -1649,7 +1658,7 @@ int main(int argc, char **argv)
     [menu addItem:[NSMenuItem separatorItem]];
     newitem(menu, "Close", "w", NULL, @selector(performClose:));
 
-    menu = newsubmenu([NSApp mainMenu], "Edit");
+    menu = newsubmenu([app mainMenu], "Edit");
     newitem(menu, "Undo", "z", NULL, @selector(undoMove:));
     newitem(menu, "Redo", "S-z", NULL, @selector(redoMove:));
     [menu addItem:[NSMenuItem separatorItem]];
@@ -1659,18 +1668,18 @@ int main(int argc, char **argv)
     [menu addItem:[NSMenuItem separatorItem]];
     newitem(menu, "Solve", "S-s", NULL, @selector(solveGame:));
 
-    menu = newsubmenu([NSApp mainMenu], "Type");
+    menu = newsubmenu([app mainMenu], "Type");
     typemenu = menu;
     newitem(menu, "Custom", "", NULL, @selector(customGameType:));
 
-    menu = newsubmenu([NSApp mainMenu], "Window");
-    [NSApp setWindowsMenu: menu];
+    menu = newsubmenu([app mainMenu], "Window");
+    [app setWindowsMenu: menu];
     newitem(menu, "Minimise Window", "m", NULL, @selector(performMiniaturize:));
 
-    menu = newsubmenu([NSApp mainMenu], "Help");
-    newitem(menu, "Puzzles Help", "?", NSApp, @selector(showHelp:));
+    menu = newsubmenu([app mainMenu], "Help");
+    newitem(menu, "Puzzles Help", "?", app, @selector(showHelp:));
 
-    [NSApp run];
+    [app run];
     [pool release];
 
     return 0;