added ifdef for configuring font settings for OSX and Linux

diff --git a/XResources b/XResources
index 6785d38b4640c68ff2a630e3683ada62799a689e..29dda5696ebc5b3b0599c25543ca8374ac21e512 100644 (file)
--- a/XResources
+++ b/XResources
@@ -1,9 +1,15 @@
 ! UI Settings
+
+#ifdef __MACH__
+tide.ui.font:         Monaco:size=10:antialias=true:autohint=true
+tide.ui.line_spacing: 0
+#else
 tide.ui.font:         Liberation Mono:pixelsize=14:antialias=true:autohint=true
+tide.ui.line_spacing: 2
+#endif
 tide.ui.tags:         'Quit Save Undo Redo Cut Copy Paste | Find '
 tide.ui.width:        640
 tide.ui.height:       480
-tide.ui.line_spacing: 2
 tide.ui.line_numbers: true
 tide.ui.ruler_column: 80
 tide.ui.timeout:      50

diff --git a/lib/config.c b/lib/config.c
index 36dcf68ca6563f1d6eec24505dffbf90eb7a1b84..fb772016a3c2b1db1b512d34e9150652caf48c6d 100644 (file)
--- a/lib/config.c
+++ b/lib/config.c
@@ -14,15 +14,22 @@ struct {
         char* str;
     } value;
 } Options[] = {
-    [FontString] = { "tide.ui.font", STRING, {
-        .str = "Liberation Mono:pixelsize=14:antialias=true:autohint=true" } },
     [TagString] = { "tide.ui.tags", STRING, {
         .str = "Quit Save Undo Redo Cut Copy Paste | Find " } },
 
+#ifdef __MACH__
+    [FontString] = { "tide.ui.font", STRING, {
+        .str = "Monaco:size=10:antialias=true:autohint=true" } },
+    [LineSpacing]  = { "tide.ui.line_spacing", INTEGER, { .num = 0    } },
+#else
+    [FontString] = { "tide.ui.font", STRING, {
+        .str = "Liberation Mono:pixelsize=14:antialias=true:autohint=true" } },
+    [LineSpacing]  = { "tide.ui.line_spacing", INTEGER, { .num = 2    } },
+#endif
+
     /* user interface related options */
     [WinWidth]     = { "tide.ui.width",        INTEGER, { .num = 640  } },
     [WinHeight]    = { "tide.ui.height",       INTEGER, { .num = 480  } },
-    [LineSpacing]  = { "tide.ui.line_spacing", INTEGER, { .num = 0    } },
     [LineNumbers]  = { "tide.ui.line_numbers", BOOLEAN, { .opt = true } },
     [RulerColumn]  = { "tide.ui.ruler_column", INTEGER, { .num = 80   } },
     [EventTimeout] = { "tide.ui.timeout",      INTEGER, { .num = 50   } },