Merge branch 'v4.7.x' into master

[xboard.git] / gtk / xboard.c

diff --git a/gtk/xboard.c b/gtk/xboard.c
index a1974ee..750e64f 100644 (file)
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -5,7 +5,7 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
  *
  * The following terms apply to Digital Equipment Corporation's copyright
  * interest in XBoard:
@@ -167,6 +167,23 @@ extern char *getenv();
 #include "gettext.h"
 #include "draw.h"
 
+#ifdef __APPLE__
+#  include <gtkmacintegration/gtkosxapplication.h>
+   // prevent pathname of positional file argument provided by OS X being be mistaken for option name
+   // (price is that we won't recognize Windows option format anymore).
+#  define SLASH '-'
+   // redefine some defaults
+#  undef ICS_LOGON
+#  undef SYSCONFDIR
+#  undef DATADIR
+#  define ICS_LOGON "Library/Preferences/XboardICS.conf"
+#  define SYSCONFDIR "../etc"
+#  define DATADIR dataDir
+   char *dataDir; // for expanding ~~
+#else
+#  define SLASH '/'
+#  define DATADIR "~~"
+#endif
 
 #ifdef __EMX__
 #ifndef HAVE_USLEEP
@@ -663,6 +680,7 @@ PrintArg (ArgType t)
     case ArgTwo:
     case ArgNone:
     case ArgCommSettings:
+    default:
       break;
   }
   return p;
@@ -712,6 +730,24 @@ SlaveResize (Option *opt)
   gtk_window_resize(GTK_WINDOW(shells[DummyDlg]), slaveW + opt->max, slaveH + opt->value);
 }
 
+#ifdef __APPLE__
+static char clickedFile[MSG_SIZ];
+static int suppress;
+
+static gboolean
+StartNewXBoard(GtkosxApplication *app, gchar *path, gpointer user_data)
+{ // handler of OSX OpenFile signal, which sends us the filename of clicked file or first argument
+  if(suppress) { // we just started XBoard without arguments
+    strncpy(clickedFile, path, MSG_SIZ); // remember file name, but otherwise ignore
+  } else {       // we are running something presumably useful
+    char buf[MSG_SIZ];
+    snprintf(buf, MSG_SIZ, "open -n -a \"xboard\" --args \"%s\"", path);
+    system(buf); // start new instance on this file
+  }
+  return TRUE;
+}
+#endif
+
 int
 main (int argc, char **argv)
 {
@@ -727,7 +763,7 @@ main (int argc, char **argv)
     debugFP = stderr;
 
     if(argc > 1 && (!strcmp(argv[1], "-v" ) || !strcmp(argv[1], "--version" ))) {
-       printf("%s version %s\n", PACKAGE_NAME, PACKAGE_VERSION);
+        printf("%s version %s\n\n  configure options: %s\n", PACKAGE_NAME, PACKAGE_VERSION, CONFIGURE_OPTIONS);
        exit(0);
     }
 
@@ -738,6 +774,29 @@ main (int argc, char **argv)
 
     /* set up GTK */
     gtk_init (&argc, &argv);
+#ifdef __APPLE__
+    {   // prepare to catch OX OpenFile signal, which will tell us the clicked file
+       GtkosxApplication *theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL);
+       dataDir = gtkosx_application_get_bundle_path();
+       g_signal_connect(theApp, "NSApplicationOpenFile", G_CALLBACK(StartNewXBoard), NULL);
+       // we must call application ready before we can get the signal,
+       // and supply a (dummy) menu bar before that, to avoid problems with dual apples in it
+       gtkosx_application_set_menu_bar(theApp, GTK_MENU_SHELL(gtk_menu_bar_new()));
+       gtkosx_application_ready(theApp);
+       suppress = (argc == 1 || argc > 1 && argv[1][00] != '-'); // OSX sends signal even if name was already argv[1]!
+       if(argc == 1) {                  // called without args: OSX open-file signal might follow
+           static char *fakeArgv[3] = {NULL, clickedFile, NULL};
+           usleep(10000);               // wait 10 msec (and hope this is long enough).
+           while(gtk_events_pending())
+               gtk_main_iteration();    // process all events that came in upto now
+           suppress = 0;                // future open-file signals should start new instance
+           if(clickedFile[0]) {         // we were sent an open-file signal with filename!
+             fakeArgv[0] = argv[0];
+             argc = 2; argv = fakeArgv; // fake that we were called as "xboard filename"
+           }
+       }
+    }
+#endif
 
     /* set up keyboard accelerators group */
     GtkAccelerators = gtk_accel_group_new();
@@ -1687,14 +1746,14 @@ void MoveTypeInProc(eventkey)
 {
     char buf[10];
 
-    // ingnore if ctrl or alt is pressed
-    if (eventkey->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) {
+    // ingnore if ctrl, alt, or meta is pressed
+    if (eventkey->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_META_MASK)) {
         return;
     }
 
     buf[0]=eventkey->keyval;
     buf[1]='\0';
-    if (*buf >= 32)
+    if (eventkey->keyval > 32 && eventkey->keyval < 256)
        BoxAutoPopUp (buf);
 }
 
@@ -1723,26 +1782,15 @@ TempForwardProc (Widget w, XEvent *event, String *prms, Cardinal *nprms)
     ForwardEvent();
        TempBackwardActive = False;
 }
-
-void
-ManInner (Widget w, XEvent *event, String *prms, Cardinal *nprms)
-{   // called as key binding
-    char buf[MSG_SIZ];
-    String name;
-    if (nprms && *nprms > 0)
-      name = prms[0];
-    else
-      name = "xboard";
-    snprintf(buf, sizeof(buf), "xterm -e man %s &", name);
-    system(buf);
-}
 #endif
 
 void
 ManProc ()
 {   // called from menu
-#ifdef TODO_GTK
-    ManInner(NULL, NULL, NULL, NULL);
+#ifdef __APPLE__
+    system("%s ./man.command", appData.sysOpen);
+#else
+    system("xterm -e man xboard &");
 #endif
 }
 
@@ -2063,7 +2111,7 @@ void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp
   char *cp;
 
   /* make a copy of the filter string, so that strtok can work with it*/
-  cp = strndup(filter,strlen(filter));
+  cp = strdup(filter);
 
   /* add filters for file extensions */
   gtkfilter     = gtk_file_filter_new();