Bunch 'o Patches.

Joshua Pettus <[email protected]> Sun, 8 Mar 2015 10:23:43 -0400

Newsgroups	gmane.comp.gnu.xboard.devel
Message-ID	<[email protected]>

Hi Harm,

I tried to send this to you directly, but, for whatever reason, it looks like the message gets lost in the void. It’s part of the reason why there are so many patches. ;)

I have been a little busy and made a bunch of fixes for the OSX build portion I’d like in for 4.8.1

The first is the Man and Info page changes to launch through Apple script. If you recall I mentioned that I moved infoProc to gtk/xboard.c so I could use the dataDir stuff there.

Next, to simplify the build process a little bit, and avoid a possible error, I decided to change the way pango is included in the bundle. Before I used a special variant that had the pango modules built into the pango libs. As I was setting up macports again on the 10.6 VirtualMachine, I forgot that. Now that I know more about how it works, it isn’t really necessary to use a special variant here.

Next is some changes to the output OSX master conf file. Mostly puts it back more in line with the original. I shouldn’t have used an ip address for FICS. Also it implements the uxiadapter for UCI2WB

Then with the update to gtk-mac-integration library, he changed the name to gtkmacintegration-gtk2 to differentiate from gtk-3 I guess… A pain but here is a fix for compiling.

Also with the gtk-mac-integration library update fixes osx localization for the App menu. So we don’t need to include separate string folders in our source code. So I removed them and have the build script pull from the system installed directory. If you could also remove the osxapp/osx-localization folder itself. That would be very helpful. I couldn’t figure out how to do it with diff.

Finally I decided to use the Mac theme in the GIMP bundle which also uses GPL v3. It’s better then the one before in that there is no pixbuffs going on, and is a lot less complicated. Still looks better then default, so thats good. As a result, I had to reimplement the gtk-murrine engine, but that’s no biggie. Be sure to put this patch on last. I must have created it when I had some of the other patches applied. Else it will fail... :(

Thanks a lot! and Best Wishes,
Josh

Man+InfoFix.patch (application/octet-stream, 4 KB)

diff -uprN ./xboard-a/Makefile.am ./xboard-b/Makefile.am
--- ./xboard-a/Makefile.am	2014-10-28 17:37:22.000000000 -0400
+++ ./xboard-b/Makefile.am	2014-11-04 14:10:08.000000000 -0500
@@ -255,8 +255,6 @@ osxapp: all-recursive install install-re
 	$(INSTALL) ./osxapp/XBoard.gtklauncher $(bindir)/XBoard
 	$(INSTALL) ./xboard $(bindir)/xboard-bin
 	cp -R ./osxapp/icons/. $(datarootdir)
-	$(INSTALL) ./osxapp/man.command    $(datarootdir)/bin/man.command
-	$(INSTALL) ./osxapp/info.command   $(datarootdir)/bin/info.command
 	sed -e 's?-soundProgram "aplay -q"?-soundProgram "afplay"?'\
             -e 's?-firstChessProgram fairymax?-firstChessProgram "./fairymax"?'\
 	    -e 's?-firstChessProgramNames {fairymax?-firstChessProgramNames {"fairymax" -fcp "./fairymax" -fd "~~/../../bin/fairymax"?'\
@@ -280,7 +278,7 @@ osxapp: all-recursive install install-re
 	echo '-autoLogo true' >>$(sysconfdir)/xboard.conf
 	echo '-logoDir "~~/logos"' >>$(sysconfdir)/xboard.conf
 	echo '-logoSize 100' >>$(sysconfdir)/xboard.conf
-	echo '-openCommand "cd %s/../../bin; open"' >>$(sysconfdir)/xboard.conf
+	echo '-openCommand "open"' >>$(sysconfdir)/xboard.conf
 	echo '-firstDirectory "~~/../../bin/fairymax"' >>$(sysconfdir)/xboard.conf
 	echo '-secondDirectory "~~/../../bin/fairymax"' >>$(sysconfdir)/xboard.conf
 	echo '-secondChessProgram "./fairymax"' >>$(sysconfdir)/xboard.conf
diff -uprN ./xboard-a/gtk/xboard.c ./xboard-b/gtk/xboard.c
--- ./xboard-a/gtk/xboard.c	2014-10-28 17:37:22.000000000 -0400
+++ ./xboard-b/gtk/xboard.c	2014-11-04 14:04:16.000000000 -0500
@@ -1965,7 +1966,7 @@ ManProc ()
 {   // called from menu
 #ifdef OSXAPP
     char buf[MSG_SIZ];
-    snprintf(buf, MSG_SIZ, "%s ./man.command", appData.sysOpen);
+    snprintf(buf, MSG_SIZ, "osascript -e 'tell application \"Terminal\"' -e 'activate' -e 'do script \"man %s/../man/man6/xboard.6\"' -e 'end tell'", dataDir);
     system(buf);
 #else
     system("xterm -e man xboard &");
@@ -1973,6 +1974,20 @@ ManProc ()
 }
 
 void
+InfoProc ()
+{
+    char buf[MSG_SIZ];
+#ifdef OSXAPP
+    snprintf(buf, MSG_SIZ, "osascript -e 'tell application \"Terminal\"' -e 'activate' -e 'do script \"info -d %s/../info -f xboard.info\"' -e 'end tell'", dataDir);
+#else
+        snprintf(buf, sizeof(buf), "xterm -e info --directory %s --directory . -f %s &",
+                 INFODIR, INFOFILE);
+#endif
+    system(buf);
+}
+
+
+void
 SetWindowTitle (char *text, char *title, char *icon)
 {
 #ifdef TODO_GTK
diff -uprN ./xboard-a/menus.c ./xboard-b/menus.c
--- ./xboard-a/menus.c	2014-10-28 17:37:22.000000000 -0400
+++ ./xboard-b/menus.c	2014-11-04 14:14:33.000000000 -0500
@@ -310,19 +310,6 @@ SaveSettingsProc ()
 }
 
 void
-InfoProc ()
-{
-    char buf[MSG_SIZ];
-#ifdef OSXAPP
-    snprintf(buf, MSG_SIZ, "%s ./info.command", appData.sysOpen);
-#else
-    snprintf(buf, sizeof(buf), "xterm -e info --directory %s --directory . -f %s &",
-	    INFODIR, INFOFILE);
-#endif
-    system(buf);
-}
-
-void
 BugReportProc ()
 {
     char buf[MSG_SIZ];
diff -uprN ./xboard-a/osxapp/info.command ./xboard-b/osxapp/info.command
--- ./xboard-a/osxapp/info.command	2014-10-28 17:37:22.000000000 -0400
+++ ./xboard-b/osxapp/info.command	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-cd "${0%/*}"
-info -d ../share/info -f xboard.info
diff -uprN ./xboard-a/osxapp/man.command ./xboard-b/osxapp/man.command
--- ./xboard-a/osxapp/man.command	2014-10-28 17:37:22.000000000 -0400
+++ ./xboard-b/osxapp/man.command	1969-12-31 19:00:00.000000000 -0500
@@ -1,2 +0,0 @@
-cd "${0%/*}"
-man ../share/man/man6/xboard.6
diff -uprN ./xboard-a/xaw/xboard.c ./xboard-b/xaw/xboard.c
--- ./xboard-a/xaw/xboard.c	2014-10-28 17:37:22.000000000 -0400
+++ ./xboard-b/xaw/xboard.c	2014-11-04 14:14:16.000000000 -0500
@@ -2123,6 +2123,15 @@ ManProc ()
 }
 
 void
+InfoProc ()
+{
+    char buf[MSG_SIZ];
+    snprintf(buf, sizeof(buf), "xterm -e info --directory %s --directory . -f %s &",
+             INFODIR, INFOFILE);
+    system(buf);
+}
+
+void
 SetWindowTitle (char *text, char *title, char *icon)
 {
     Arg args[16];

PangoFix.patch (application/octet-stream, 3.3 KB)

diff -uprN ./xboard-a/Makefile.am ./xboard-b/Makefile.am
--- ./xboard-a/Makefile.am	2014-12-02 10:23:46.000000000 -0500
+++ ./xboard-b/Makefile.am	2014-12-03 23:40:38.000000000 -0500
@@ -295,9 +295,11 @@ osxapp: all-recursive install install-re
 	$(INSTALL) ./osxapp/launcher_rc $(datarootdir)/
 	$(INSTALL) /opt/local/etc/gtk-2.0/im-multipress.conf $(sysconfdir)/gtk-2.0
 	$(INSTALL) ./osxapp/gtkrc $(sysconfdir)/gtk-2.0/gtkrc
-	$(INSTALL) ./osxapp/pango.modules $(sysconfdir)/pango/pangorc
+	sed -e '/ModuleFiles = \/opt\/local\/etc\/pango\/pango.modules/d' </opt/local/etc/pango/pangorc >$(sysconfdir)/pango/pangorc
+	sed -e 's?/opt/local/lib/pango/1.8.0/modules/??' </opt/local/etc/pango/pango.modules >$(sysconfdir)/pango/pango.modules
 	cp -R /opt/local/lib/gtk-2.0 $(datarootdir)/lib
 	cp -R /opt/local/lib/gdk-pixbuf-2.0 $(datarootdir)/lib
+	cp -R /opt/local/lib/pango $(datarootdir)/lib
 	cp -R /opt/local/share/themes/Mac $(datadir)/themes
 	cp -R ./osxapp/default/. $(gamedatadir)/themes/default
 	$(INSTALL) ./png/marble_d.png $(gamedatadir)/themes/textures
@@ -310,7 +312,12 @@ osxapp: all-recursive install install-re
 	dylibbundler -of -b -x $(datarootdir)/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
 	dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/immodules/im-quartz.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
 	dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/engines/libpixmap.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
+	dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-arabic-lang.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
+	dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-basic-coretext.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
+	dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-basic-fc.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
+	dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-indic-lang.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
 	find ./XBoard.app -name '*.a' -print0 | xargs -0 rm
+	find ./XBoard.app -name '*.la' -print0 | xargs -0 rm
 	rm -r $(datarootdir)/lib/gtk-2.0/include
 	rm -r $(datarootdir)/share/applications
 	rm $(datarootdir)/share/info/dir
diff -uprN ./xboard-a/osxapp/XBoard.gtklauncher ./xboard-b/osxapp/XBoard.gtklauncher
--- ./xboard-a/osxapp/XBoard.gtklauncher	2014-11-13 12:39:54.000000000 -0500
+++ ./xboard-b/osxapp/XBoard.gtklauncher	2014-12-03 23:00:28.000000000 -0500
@@ -38,7 +38,9 @@ export GTK_PATH="$bundle_lib/gtk-2.0/2.1
  export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules"
 
 # Pango path no longer required
- export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+export PANGO_RC_FILE="$bundle_etc/pango/pangorc"
+export PANGO_SYSCONFDIR="$bundle_etc"
+export PANGO_LIBDIR="$bundle_lib"
 
 # Fix the gegl path issue
 export GEGL_PATH="$bundle_lib/gegl-0.2"
diff -uprN ./xboard-a/osxapp/pango.modules ./xboard-b/osxapp/pango.modules
--- ./xboard-a/osxapp/pango.modules	2014-11-13 12:39:54.000000000 -0500
+++ ./xboard-b/osxapp/pango.modules	1969-12-31 19:00:00.000000000 -0500
@@ -1,5 +0,0 @@
-# Pango Modules file
-# Automatically generated file, do not edit
-#
-#
-[pango]

conf.patch (application/octet-stream, 2.7 KB)

diff -uprN ./xboard-a/Makefile.am ./xboard-b/Makefile.am
--- ./xboard-a/Makefile.am	2014-11-13 12:39:54.000000000 -0500
+++ ./xboard-b/Makefile.am	2014-12-06 15:36:08.000000000 -0500
@@ -263,11 +263,8 @@ osxapp: all-recursive install install-re
 	    -e 's?"Fruit 2.1" -fcp fruit -fUCI?"fruit" -fcp "./fruit" -fd "~~/../../bin/fruit" -fUCI?'\
 	    -e '/"Crafty" -fcp crafty/d'\
 	    -e '/"GNU Chess" -fcp gnuchess/d'\
-	    -e 's?-polyglotDir ""?-polyglotDir "~~/../../bin"?'\
-	    -e 's?polyglot ?./polyglot ?'\
-	    -e 's?-icsNames {"fics" -icshost freechess.org -icshelper timeseal?-icsNames {"fics" -icshost 69.36.243.188 -icshelper ~~/../../bin/timeseal?'\
-	    -e 's?"icc" -icshost chessclub.com -icshelper timestamp?"icc" -icshost 207.99.83.228 -icshelper ~~/../../bin/timestamp?'\
-	    -e 's?"kc" -icshost alanimus.com -icshelper timeseal?"vics" -icshost winboard.nl -icshelper ~~/../../bin/timeseal?'\
+	    -e 's?"icc" -icshost chessclub.com -icshelper timestamp?"icc" -icshost 207.99.83.228 -icshelper timestamp?'\
+	    -e 's?"kc" -icshost alanimus.com -icshelper timeseal?"vics" -icshost winboard.nl -icshelper timeseal?'\
 	    -e '/; Save user settings./d'\
 	    -e '/; Must be last in file to make user options prevail over system-wide settings!/d'\
 	    -e '/-saveSettingsOnExit true/d'\
@@ -284,13 +281,14 @@ osxapp: all-recursive install install-re
 	echo '-firstDirectory "~~/../../bin/fairymax"' >>$(sysconfdir)/xboard.conf
 	echo '-secondDirectory "~~/../../bin/fairymax"' >>$(sysconfdir)/xboard.conf
 	echo '-secondChessProgram "./fairymax"' >>$(sysconfdir)/xboard.conf
+	echo '-uxiAdapter "uci2wb -%variant %fcp %fd"' >>$(sysconfdir)/xboard.conf
 	echo ';' >>$(sysconfdir)/xboard.conf
 	echo '; Save user settings.' >>$(sysconfdir)/xboard.conf
 	echo '; Must be last in file to make user options prevail over system-wide settings!' >>$(sysconfdir)/xboard.conf
 	echo ';' >>$(sysconfdir)/xboard.conf
 	echo '-saveSettingsOnExit true' >>$(sysconfdir)/xboard.conf
-	echo '-saveSettingsFile "~/Library/Preferences/XBoardOSX.conf"' >>$(sysconfdir)/xboard.conf
-	echo '-settingsFile "~/Library/Preferences/XBoardOSX.conf"' >>$(sysconfdir)/xboard.conf
+	echo '-saveSettingsFile "~/Library/Preferences/XBoardApp.conf"' >>$(sysconfdir)/xboard.conf
+	echo '-settingsFile "~/Library/Preferences/XBoardApp.conf"' >>$(sysconfdir)/xboard.conf
 
 	sed 's?/opt/local/lib?/tmp/skl/XBoard.app/Contents/Resources/lib?' </opt/local/etc/gtk-2.0/gdk-pixbuf.loaders >$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
 	sed -e 's?/opt/local/lib?/tmp/skl/XBoard.app/Contents/Resources/lib?' -e 's?/opt/local/share/locale?/tmp/skl/XBoard.app/Contents/Resources/share/locale?' </opt/local/etc/gtk-2.0/gtk.immodules >$(sysconfdir)/gtk-2.0/gtk.immodules

gtk2i_name_update.patch (application/octet-stream, 1.5 KB)

diff -uprN ./xboard-a/configure.ac ./xboard-b/configure.ac
--- ./xboard-a/configure.ac	2014-11-13 12:39:54.000000000 -0500
+++ ./xboard-b/configure.ac	2015-01-06 00:12:06.000000000 -0500
@@ -476,7 +476,7 @@ dnl| add some libs for OS X
     fi
     FRONTEND_LIBS="$FRONTEND_LIBS -headerpad_max_install_names "
     if test x"$enable_OSXAPP" = x"yes" ; then
-        FRONTEND_LIBS="$FRONTEND_LIBS -lgtkmacintegration"
+        FRONTEND_LIBS="$FRONTEND_LIBS -lgtkmacintegration-gtk2"
     fi
     FRONTEND_CFLAGS="$FRONTEND_CFLAGS -I/opt/local/include -L/opt/local/lib"
   ;;
diff -uprN ./xboard-a/gtk/xboard.c ./xboard-b/gtk/xboard.c
--- ./xboard-a/gtk/xboard.c	2014-11-13 12:39:54.000000000 -0500
+++ ./xboard-b/gtk/xboard.c	2015-01-06 00:10:27.000000000 -0500
@@ -168,7 +168,7 @@ extern char *getenv();
 #include "draw.h"
 
 #ifdef OSXAPP
-#  include <gtkmacintegration/gtkosxapplication.h>
+#  include <gtkmacintegration-gtk2/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 '-'
diff -uprN ./xboard-a/gtk/xoptions.c ./xboard-b/gtk/xoptions.c
--- ./xboard-a/gtk/xoptions.c	2014-11-13 12:39:54.000000000 -0500
+++ ./xboard-b/gtk/xoptions.c	2015-01-06 00:10:56.000000000 -0500
@@ -52,7 +52,7 @@ extern char *getenv();
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #ifdef OSXAPP
-#  include <gtkmacintegration/gtkosxapplication.h>
+#  include <gtkmacintegration-gtk2/gtkosxapplication.h>
 #endif
 
 #include "common.h"

gtk2i_locale_update.patch (application/octet-stream, 20.8 KB) - not displayed

gtk_mac_theme.patch (application/octet-stream, 24.1 KB)

diff -uprN ./xboard-a/Makefile.am ./xboard-b/Makefile.am
--- ./xboard-a/Makefile.am	2014-12-05 08:44:44.000000000 -0500
+++ ./xboard-b/Makefile.am	2014-12-05 08:35:59.000000000 -0500
@@ -249,6 +249,7 @@ osxapp: all-recursive install install-re
 	$(MKDIR_P) $(sysconfdir)/gtk-2.0
 	$(MKDIR_P) $(sysconfdir)/pango
 	$(MKDIR_P) $(datadir)/themes
+	$(MKDIR_P) $(datadir)/gtk-engines
 	$(MKDIR_P) $(gamedatadir)/themes
 	$(INSTALL) ./osxapp/Info.plist $(prefix)
 	$(INSTALL) ./osxapp/PkgInfo $(prefix)
@@ -301,7 +302,9 @@ osxapp: all-recursive install install-re
 	cp -R /opt/local/lib/gdk-pixbuf-2.0 $(datarootdir)/lib
 	cp -R /opt/local/lib/pango $(datarootdir)/lib
 	cp -R /opt/local/share/themes/Mac $(datadir)/themes
+	cp -R ./osxapp/Mac/gtk-2.0 $(datadir)/themes/Mac
 	cp -R ./osxapp/default/. $(gamedatadir)/themes/default
+	cp /opt/local/share/gtk-engines/murrine.xml $(datadir)/gtk-engines/murrine.xml
 	$(INSTALL) ./png/marble_d.png $(gamedatadir)/themes/textures
 	$(INSTALL) ./png/marble_l.png $(gamedatadir)/themes/textures
 	$(INSTALL) ./png/xqwood.png $(gamedatadir)/themes/textures
@@ -312,6 +315,7 @@ osxapp: all-recursive install install-re
 	dylibbundler -of -b -x $(datarootdir)/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
 	dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/immodules/im-quartz.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
 	dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/engines/libpixmap.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
+	dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/engines/libmurrine.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
 	dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-arabic-lang.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
 	dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-basic-coretext.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
 	dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-basic-fc.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
diff -uprN ./xboard-a/osxapp/Mac/gtk-2.0/gtkrc ./xboard-b/osxapp/Mac/gtk-2.0/gtkrc
--- ./xboard-a/osxapp/Mac/gtk-2.0/gtkrc	1969-12-31 19:00:00.000000000 -0500
+++ ./xboard-b/osxapp/Mac/gtk-2.0/gtkrc	2014-09-28 12:30:10.000000000 -0400
@@ -0,0 +1,672 @@
+# GIMP GTK+ 2 Mac integration theme
+# Author: scl
+#
+# Based upon:
+#     Zukitwo by lassekongo83
+#     Gnome-Cupertino by Rafa Cobreros
+#
+# Requirements:
+#     Murrine Theme Engine
+#     For a documentation of the Murrine properties see
+#     https://wiki.ubuntu.com/Artwork/Documentation/Murrine
+#
+# For explanations of the theme properties see:
+#   - the GTK+ 2 Settings Reference Manual
+#       https://developer.gnome.org/gtk2/2.24/GtkSettings.html
+#   - the API documentation of the GTK widgets and
+#   - the Murrine Engine documentation:
+#       https://wiki.ubuntu.com/Artwork/Documentation/Murrine
+#
+# This theme is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# See the file COPYING for the full license text.
+#
+
+# Global settings #
+
+## Color definitions ##
+# Background, base:
+gtk_color_scheme = "bg_color:#e8e8e8\nselected_bg_color:#6699cc\nbase_color:#f7f7f7"
+
+# Foreground, text:
+gtk_color_scheme = "fg_color:#2c2c2c\nselected_fg_color:#f5f5f5\ntext_color:#2c2c2c"
+
+# Tooltips:
+gtk_color_scheme = "tooltip_bg_color:#f5f5b5\ntooltip_fg_color:#000000"
+
+ # Hyperlinks:
+gtk_color_scheme = "link_color:#08c"
+
+# Dark colors:
+gtk_color_scheme = "bg_color_dark:#3f3f3f\ntext_color_dark:#ffffff"
+
+# Filechooser sidebar background:
+gtk-color-scheme = "sidebar_background:#e1e5eb"
+
+
+## Miscellanous definitions ##
+gtk-auto-mnemonics = 1  # disables ugly lines under menu items
+gtk-button-images  = 0  # enables icons in buttons
+gtk-icon-sizes     = "gtk-button=16,16"  # reduce button icon size
+gtk-toolbar-style  = 0  # disables text in toolbar
+
+# Styles #
+## Basic styles ##
+style "default"
+{
+  ### Color Definitions ###
+  base[ACTIVE]      = shade (0.92, @selected_bg_color)
+  base[INSENSITIVE] = @bg_color
+  base[NORMAL]      = @base_color
+  base[PRELIGHT]    = shade (0.95, @bg_color)
+  base[SELECTED]    = shade (0.93, @selected_bg_color)
+  bg[ACTIVE]        = shade (1.04, @bg_color)
+  bg[INSENSITIVE]   = @bg_color
+  bg[NORMAL]        = @bg_color
+  bg[PRELIGHT]      = shade (1.02, @bg_color)
+  bg[SELECTED]      = @selected_bg_color
+  fg[ACTIVE]        = @fg_color
+  fg[INSENSITIVE]   = darker (@bg_color)
+  fg[NORMAL]        = @fg_color
+  fg[PRELIGHT]      = @fg_color
+  fg[SELECTED]      = @selected_fg_color
+  text[ACTIVE]      = @selected_fg_color
+  text[INSENSITIVE] = darker (@bg_color)
+  text[NORMAL]      = @text_color
+  text[PRELIGHT]    = @text_color
+  text[SELECTED]    = @selected_fg_color
+
+  xthickness = 1
+  ythickness = 1
+
+  GnomeHRef::link_color                      = @link_color
+  GtkHTML::link-color                        = @link_color
+  GtkIMHtmlr::hyperlink-color                = @link_color
+  GtkIMHtml::hyperlink-color                 = @link_color
+  GtkWidget::link-color                      = @link_color
+  GtkWidget::visited-link-color              = @text_color
+  GtkButton::child-displacement-x            = 1
+  GtkButton::child-displacement-y            = 1
+  GtkButton::default-border                  = {0, 0, 0, 0}
+  GtkCheckButton::indicator-size             = 15
+  GtkWidget::new-tooltip-style               = 1
+  GtkWidget::focus-line-width                = 1
+
+  # 0 = prevent the Firefox tabs from jumping a few pixels when creating a new
+  # tab. Set the value locally if needed.
+  GtkWidget::focus-padding                   = 0
+
+  GtkImage::x-ayatana-indicator-dynamic      = 1
+  GtkScrollbar::activate-slider              = 0
+  GtkScrollbar::has-backward-stepper         = 0
+  GtkScrollbar::has-forward-stepper          = 1
+  GtkScrollbar::min-slider-length            = 30
+  GtkScrollbar::slider-width                 = 9
+  GtkScrollbar::stepper-size                 = 1
+  GtkScrollbar::trough-border                = 3
+  GtkScrollbar::trough-side-details          = 0
+  GtkScrolledWindow::scrollbar-spacing       = 0
+  GtkScrolledWindow::scrollbars-within-bevel = 1
+  GtkPaned::handle-size                      = 6
+  GtkRange::slider-width                     = 11
+  GtkRange::stepper-size                     = 0
+  GtkRange::stepper_spacing                  = 0
+  GtkRange::trough-border                    = 0
+  GtkRange::trough-under-steppers            = 0
+  GtkScale::slider-length                    = 14
+  GtkScale::slider-width                     = 14
+  GtkMenuBar::internal-padding               = 0
+  GtkExpander::expander-size                 = 16
+  GtkToolbar::internal-padding               = 0
+  GtkTreeView::expander-size                 = 6
+  GtkTreeView::indent-expanders              = 1
+  GtkTreeView::vertical-separator            = 1
+  GtkNotebook::tab-curvature                 = 1  # 1 = default
+  GtkNotebook::tab-overlap                   = 2  # 2 = default
+  GtkMenu::horizontal-padding                = 0
+  GtkMenu::vertical-padding                  = 0
+  WnckTasklist::fade-overlay-rect            = 0
+
+  # 1 = hint to Gecko (and possibly other appliations) that the entry should be
+  # drawn transparently on the canvas. Without this, Gecko will fill in the
+  # background of the entry.
+  GtkEntry::honors-transparent-bg-hint       = 1
+
+  GtkEntry::state-hint                       = 0
+  GtkEntry::progress-border                  = {2, 2, 2, 2}
+  GtkProgressBar::min-horizontal-bar-height  = 16
+  GtkProgressBar::min-vertical-bar-width     = 16
+  GtkMenuBar::window-dragging                = 1
+  GtkToolbar::window-dragging                = 1
+
+  # remove little ugly gripper at the bottom right
+  GtkWindow::resize-grip-height              = 0
+  GtkWindow::resize-grip-width               = 0
+
+  # Murrine engine properties
+  engine "murrine"
+  {
+    animation            = FALSE
+    arrowstyle           = 1  # 1 = filled arrows
+    border_shades        = {1.0, 0.7}  # gradient to draw on border
+    colorize_scrollbar   = TRUE
+    comboboxstyle        = 0  # 0 = normal combobox
+    contrast             = 0.4  # 0.4 for less contrast on borders
+    default_button_color = "#4c8ed4"
+    expanderstyle        = 0
+    focus_color          = @selected_bg_color
+    focusstyle           = 3
+    glazestyle           = 1  # 1 = curved highlight
+    glow_shade           = 1.1
+    glowstyle            = 1  # 1 = bottom
+    gradient_shades      = {1.31, 1.0, 1.0, 1.2}  # gradients on the widgets
+    highlight_shade      = 1.0  # highlight amount for buttons or widgets
+    lightborder_shade    = 1.1  # lightborder amount for buttons or widgets
+    lightborderstyle     = 0  # 0 = lightborder on top side
+    listviewheaderstyle  = 1  # 1 = glassy
+    listviewstyle        = 1  # 1 = dotted
+    menubaritemstyle     = 0  # 0 = menuitem look
+    menubarstyle         = 2  # 2 = gradient
+    menuitemstyle        = 0  # 0 = flat
+    menustyle            = 0  # 0 = no vertical menu stripe
+
+    # shade level for scrollbar's slider, comboboxstyle(1), and prelight state
+    # with gradient_colors:
+    prelight_shade       = 0.95
+
+    progressbarstyle     = 0  # 0 = nothing
+    reliefstyle          = 2  # 2 = shadow
+    rgba                 = FALSE  # FALSE = disabled
+    roundness            = 3  # 0 = squared, greater values increase roundness
+    scrollbarstyle       = 0  # 0 = nothing
+    separatorstyle       = 1  # 1 = smooth separators
+    shadow_shades        = {0.5, 0.0}  # gradient for shadows
+    sliderstyle          = 0  # 0 = nothing added
+    stepperstyle         = 1  # 1 = integrated stepper handles
+    textstyle            = 0  # 0 = normal text,1=inset and very resource heavy!
+    toolbarstyle         = 2  # 2 = gradient
+
+    # draw gradient on trough of GtkScrollbar and GtkProgressbar:
+    trough_shades        = {0.95, 1.05}
+  }
+}
+
+style "thin" = "default"
+{
+  xthickness = 0
+  ythickness = 0
+}
+
+style "wide" = "default"
+{
+  xthickness = 2
+  ythickness = 2
+}
+
+style "wider" = "default"
+{
+  xthickness = 3
+  ythickness = 3
+}
+
+style "widest" = "default"
+{
+  xthickness = 4
+  ythickness = 4
+}
+
+## Widget styles ##
+style "button" = "wider"
+{
+  bg[ACTIVE]      = shade (0.85, @bg_color)
+  bg[INSENSITIVE] = shade (0.95, @bg_color)
+  bg[NORMAL]      = shade (1.06, @bg_color)
+  bg[PRELIGHT]    = shade (1.2, @bg_color)
+  bg[SELECTED]    = shade (1.0, @selected_bg_color)
+
+  engine "murrine"
+  {
+    contrast          = 0.8
+    lightborder_shade = 1.9
+    roundness         = 3
+  }
+}
+
+style "comboboxentry"
+{
+  engine "murrine"
+  {
+    contrast = 0.4
+  }
+}
+
+style "entry"
+{
+  # text input box
+  base[ACTIVE]      = "#b5d5ff"  # background of active text
+  base[INSENSITIVE] = shade(0.85, @base_color)  # background text-box disabled
+  base[NORMAL]      = @base_color  # background text-box
+  base[SELECTED]    = "#b5d5ff"  # background of selected text
+  bg[INSENSITIVE]   = shade(0.85, @base_color)  # background spinbutton disabled
+                                                # (probably a bug)
+  bg[NORMAL]        = @bg_color  # base color of edges
+  text[ACTIVE]      = @text_color
+  text[SELECTED]    = @text_color
+
+  xthickness = 3
+  ythickness = 3
+
+  engine "murrine"
+  {
+    border_shades = {1.2, 0.90}
+    contrast      = 0.7
+    focus_color   = shade(0.75, mix(0.95, "#83aadc", @bg_color))
+    roundness     = 2
+  }
+}
+
+style "filechooser-sidepane-treeview" = "treeview"
+{
+  base[NORMAL] = @sidebar_background  # background
+  bg[NORMAL]   = shade (0.91, @base_color)
+  bg[PRELIGHT] = @fg_color
+
+  GtkTreeView::allow-rules    = 0  # disable alternating row colors
+  GtkTreeView::even_row_color = @sidebar_background
+
+  engine "murrine"
+  {
+    contrast = 0.80
+  }
+}
+
+style "frame-title"
+{
+  fg[NORMAL] = lighter (@fg_color)
+}
+
+style "menu"
+{
+  bg[NORMAL] = @base_color
+
+  xthickness = 0
+  ythickness = 0
+
+  engine "murrine"
+  {
+    border_shades = {1.2, 1.0}
+    roundness     = 0  # roundness of menu items
+    textstyle     = 0
+  }
+}
+
+style "menu-item" = "wider"
+{
+  bg[SELECTED] = shade (0.95, @selected_bg_color)
+  bg[PRELIGHT] = shade (0.95, @selected_bg_color)
+  fg[PRELIGHT] = @selected_fg_color
+
+  xthickness = 2
+  ythickness = 3
+
+  engine "murrine"
+  {
+    border_shades = {1.2, 1.0}
+    roundness     = 0
+    textstyle     = 0
+  }
+}
+
+# This style is there to modify the separator menu items. The goals are:
+# 1. Get a specific height.
+# 2. The line should go to the edges (i.e. no border at the left/right)
+style "menu-separator-item"
+{
+  bg[NORMAL] = @base_color  # Remove for visible separators
+
+  xthickness = 1
+  ythickness = 0
+
+  GtkSeparatorMenuItem::horizontal-padding = 0
+  GtkWidget::separator-height              = 7
+  GtkWidget::separator-width               = 1
+  GtkWidget::wide-separators               = 1
+
+  engine "murrine"
+  {
+    contrast       = 0.0  # set the contrast to 0.6 for visible separators.
+    separatorstyle = 0
+  }
+}
+
+style "menubar" = "default"
+{
+  bg[NORMAL]   = @bg_color
+  fg[NORMAL]   = @fg_color
+  fg[PRELIGHT] = @fg_color
+  fg[SELECTED] = @fg_color
+}
+
+style "menubar-menuitem" = "wider"
+{
+  bg[PRELIGHT] = @selected_bg_color
+  bg[SELECTED] = @bg_color
+
+  engine "murrine"
+  {
+    border_shades   = {1.0, 0.8}
+    contrast        = 0.0
+    gradient_shades = {1.0, 1.0, 0.85, 0.85}
+    roundness       = 0
+  }
+}
+
+style "notebook"
+{
+  bg[ACTIVE] = shade (1.04, @bg_color)  # unselected tab
+  bg[NORMAL] = shade (0.96, @bg_color)  # selected tab entire
+
+  xthickness = 2
+  ythickness = 2
+
+  engine "murrine"
+  {
+    contrast        = 0.75
+    focus_color     = shade (0.96, @bg_color)
+    focusstyle      = 2
+    gradient_shades = {1.18, 0.96, 0.92, 0.92}
+    roundness       = 3
+  }
+}
+
+# performance fix if murrine textstyle is on by default in the theme.
+style "performance-fix"
+{
+  engine "murrine"
+  {
+    textstyle = 0
+  }
+}
+
+style "progressbar"
+{
+  bg[SELECTED] = @selected_bg_color
+
+  xthickness = 0
+  ythickness = 0
+
+  engine "murrine"
+  {
+    gradient_shades = {1.17, 1.00, 1.01, 1.12}
+    roundness       = 2
+  }
+}
+
+style "radiocheck" = "wider"
+{
+  bg[ACTIVE]      = shade (0.85, @bg_color)
+  bg[INSENSITIVE] = shade (0.95, @bg_color)
+  bg[NORMAL]      = shade (1.06, @bg_color)
+  bg[PRELIGHT]    = shade (1.06, @bg_color)
+  bg[SELECTED]    = @selected_bg_color
+
+  engine "murrine"
+  {
+    contrast          = 0.8
+    lightborder_shade = 1.9
+  }
+}
+
+style "radiocheck-menu"
+{
+  fg[PRELIGHT]   = @selected_fg_color
+  text[PRELIGHT] = @selected_fg_color
+}
+
+style "scale" = "wider"
+{
+  bg[ACTIVE]      = shade (0.85, @bg_color)
+  bg[INSENSITIVE] = shade (0.95, @bg_color)
+  bg[NORMAL]      = shade (1.06, @bg_color)
+  bg[PRELIGHT]    = shade (1.2, @bg_color)
+  bg[SELECTED]    = @selected_bg_color
+
+  engine "murrine"
+  {
+    border_shades = {1.0, 1.0}
+    contrast      = 0.8
+    roundness     = 7
+    trough_shades = {1.06, 1.16}
+  }
+}
+
+style "scrollbar"
+{
+  bg[ACTIVE]   = shade (0.96, @base_color)
+  bg[SELECTED] = shade (0.74, @base_color)
+
+  # steppers' color
+  fg[ACTIVE]      = @base_color
+  fg[INSENSITIVE] = @base_color
+  fg[NORMAL]      = @base_color
+  fg[PRELIGHT]    = @base_color
+  fg[SELECTED]    = @base_color
+
+  engine "murrine"
+  {
+    border_shades     = {0.935, 1.00}
+    contrast          = 0.00
+    glow_shade        = 1.0
+    gradient_colors   = FALSE
+    gradient_shades   = {1.0, 1.0, 1.0, 1.0}
+    highlight_shade   = 1.0
+    lightborder_shade = 1.0
+    lightborderstyle  = 0
+    prelight_shade    = 0.75
+    roundness         = 8
+    trough_shades     = {0.935, 1.00}
+    }
+}
+
+style "spinbutton"
+{
+  bg[NORMAL] = @base_color
+
+  engine "murrine"
+  {
+    border_shades     = {1.0, 0.7}
+    contrast          = 0.70
+    gradient_shades   = {1.01, 1.00, 1.00, 0.93}
+    lightborder_shade = 1.00
+    lightborderstyle  = 1
+  }
+}
+
+style "statusbar"
+{
+  font_name  = "10"
+  xthickness = 2
+}
+
+style "toolbar" = "thin"
+{
+  bg[NORMAL] = @bg_color
+}
+
+style "tooltips" = "wider"
+{
+  bg[NORMAL] = @tooltip_bg_color
+  fg[NORMAL] = @tooltip_fg_color
+
+  engine "murrine"
+  {
+    textstyle = 0
+  }
+}
+
+style "treeview"
+{
+  bg[SELECTED]   = @selected_bg_color    # background mini-checkbox checked
+  fg[NORMAL]     = @fg_color  # header text color
+  text[ACTIVE]   = @selected_fg_color  # text+indicator selected unfocused
+  text[NORMAL]   = shade (1.05, @fg_color)  # text+indicator checked normal
+  text[SELECTED] = @selected_fg_color  # text+indicator selected focused
+
+  # enable alternating row colors for the file chooser's middle pane:
+  GtkTreeView::allow-rules    = 1
+  GtkTreeView::odd_row_color  = mix (0.05, @selected_bg_color, @base_color)
+  GtkTreeView::even_row_color = @base_color
+
+  engine "murrine"
+  {
+    gradient_shades = {1.00, 1.05, 1.05, 1.10}
+    roundness       = 2
+    separatorstyle  = 0
+  }
+}
+
+style "treeview-header"
+{
+  bg[ACTIVE]      = "#80b8ea"
+  bg[INSENSITIVE] = "#ffffff"
+  bg[NORMAL]      = shade (0.95, "#ffffff")
+  bg[PRELIGHT]    = shade (1.05, "#80b8ea")
+  bg[SELECTED]    = shade (0.95, "#80b8ea")
+
+  ythickness = 1
+
+  GtkWidget::focus-padding = 0
+
+  engine "murrine"
+  {
+    border_shades    = {1.2, 1.05}
+    contrast         = 1.22
+    gradient_shades  = {1.20, 1.02, 0.99, 1.15}
+    lightborderstyle = 1
+    textstyle = 1
+  }
+}
+
+# workaround style for widgets that use the text color instead of the fg color:
+style "workaround-for-text-is-fg-color"
+{
+  text[ACTIVE]      = @fg_color
+  text[INSENSITIVE] = darker (@bg_color)
+  text[NORMAL]      = @fg_color
+  text[PRELIGHT]    = @fg_color
+  text[SELECTED]    = @selected_fg_color
+}
+
+# workaround style for menus that use the text color instead of the fg color:
+style "workaround-for-menuitem-text-is-fg-color"
+{
+  text[ACTIVE]      = @fg_color
+  text[INSENSITIVE] = darker (@bg_color)
+  text[NORMAL]      = @fg_color
+  text[PRELIGHT]    = @selected_fg_color
+  text[SELECTED]    = @selected_fg_color
+}
+
+# workaround style for widgets that use the fg color instead of the text color:
+style "workaround-for-fg-is-text-color"
+{
+  fg[ACTIVE]      = @selected_fg_color
+  fg[INSENSITIVE] = darker (@bg_color)
+  fg[NORMAL]      = @text_color
+  fg[PRELIGHT]    = @text_color
+  fg[SELECTED]    = @selected_fg_color
+}
+
+# Assign styles to the widgets #
+
+# Apply default style to every widget:
+class "GtkWidget"     style "default"
+
+# Increase the x/ythickness (= space) in some widgets.
+class "GtkFrame"      style "wide"
+class "GtkEntry"      style "entry"
+class "GtkSeparator"  style "wide"
+class "GtkCalendar"   style "wide"
+
+class "GtkInfoBar"    style "default"
+class "GtkIconView"   style "default"
+class "GtkSpinButton" style "spinbutton"
+widget_class "*<GtkSpinButton>.*.<GtkEntry>" style "entry"
+class "GtkScale"      style "scale"
+class "GtkVScale"     style "scale"
+class "GtkHScale"     style "scale"
+class "GtkScrollbar"  style "scrollbar"
+class "GtkVScrollbar" style "scrollbar"
+class "GtkHScrollbar" style "scrollbar"
+
+# General matching following, later matching styles override earlier matches.
+widget_class "*<GtkNotebook>"               style "notebook"
+widget_class "*<GtkButton>"                 style "button"
+widget_class "*<GtkStatusbar>*"             style "statusbar"
+widget_class "*<GtkComboBoxEntry>*"         style "comboboxentry"
+widget_class "*<GtkCombo>*"                 style "comboboxentry"
+widget_class "*<GtkMenuBar>*"               style "menubar"
+widget_class "*<GtkMenu>*"                  style "menu"
+widget_class "*<GtkMenuItem>*"              style "menu-item"
+widget_class "*<GtkSeparatorMenuItem>*"     style "menu-separator-item"
+widget_class "*<GtkMenuBar>*<GtkMenuItem>*" style "menubar-menuitem"
+widget_class "*<GtkMenuBar>*<GtkSeparatorMenuItem>*" style "menu-separator-item"
+widget_class "*.<GtkFrame>.<GtkLabel>"      style "frame-title"
+widget_class "*.<GtkTreeView>*"             style "treeview"
+widget_class
+  "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*"
+  style "filechooser-sidepane-treeview"
+widget_class "*<GtkProgress>"               style "progressbar"
+widget_class "*<GtkProgressBar>"            style "progressbar"
+widget_class "*<GtkRadioButton>*"           style "radiocheck"
+widget_class "*<GtkCheckButton>*"           style "radiocheck"
+class "GtkCheckMenuItem"                    style:highest "radiocheck-menu"
+class "GtkRadioMenuItem"                    style:highest "radiocheck-menu"
+
+# Treeview header
+widget_class "*.<GtkTreeView>.<GtkButton>"  style "treeview-header"
+widget_class "*.<GtkCTree>.<GtkButton>"     style "treeview-header"
+widget_class "*.<GtkList>.<GtkButton>"      style "treeview-header"
+widget_class "*.<GtkCList>.<GtkButton>"     style "treeview-header"
+
+# FIXME: This will not work if one embeds eg. a button into the tooltip.
+widget "gtk-tooltip*" style "tooltips"
+
+# Special cases and workarounds: #
+
+# workaround for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that this workaround assumes that the combobox is _NOT_ in
+# appears-as-list mode.
+widget_class "*.<GtkComboBox>.<GtkCellView>"
+  style "workaround-for-text-is-fg-color"
+
+# This is the part of the workaround that fixes the menus
+widget "*.gtk-combobox-popup-menu.*"
+  style "workaround-for-menuitem-text-is-fg-color"
+
+# workaround the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on
+# the base color.
+widget_class "*<GtkListItem>*" style "workaround-for-fg-is-text-color"
+
+# GtkCList also uses the fg color to draw text on top of the base colors.
+widget_class "*<GtkCList>" style "workaround-for-fg-is-text-color"
+
+# Draw arrows dark on dark toolbars.
+widget_class "*GtkToolbar*GtkArrow*"        style "default"
+
+# Various performance fixes if murrine textstyle is on by default in the theme.
+widget_class "*GimpDisplayShell*"           style "performance-fix"
+widget_class "*GimpToolbox*"                style "performance-fix"
+widget_class "*GimpMenuDock*"               style "performance-fix"
\ No newline at end of file
Binary files ./xboard-a/osxapp/default/.DS_Store and ./xboard-b/osxapp/default/.DS_Store differ
diff -uprN ./xboard-a/osxapp/gtkrc ./xboard-b/osxapp/gtkrc
--- ./xboard-a/osxapp/gtkrc	2014-11-13 12:39:54.000000000 -0500
+++ ./xboard-b/osxapp/gtkrc	2014-12-05 08:08:54.000000000 -0500
@@ -1,4 +1,11 @@
-# Include Mac path to fix plugins not applying key-bindings
-include "../../share/themes/Mac/gtk-2.0-key/gtkrc"
+# Set default theme to Mac
+gtk-theme-name = "Mac"
+
+#Include Mac path to fix plugins not applying theme
+include "../../share/themes/Mac/gtk-2.0/gtkrc"
+
 # Set default key-bindings to Mac
 gtk-key-theme-name = "Mac"
+
+# Include Mac path to fix plugins not applying key-bindings
+include "../../share/themes/Mac/gtk-2.0-key/gtkrc"