Add better mac compatibility

Author: stevearc

Diff for: README.md

@@ -48,25 +48,25 @@ following:
 
 ```vim
 " my_file.ino [arduino:avr:uno]
-function! b:MyStatusLine()
+function! MyStatusLine()
   return '%f [' . g:arduino_board . ']'
 endfunction
-setl statusline=%!b:MyStatusLine()
+setl statusline=%!MyStatusLine()
 ```
 
 Or if you want something a bit fancier that includes serial port info:
 
 ```vim
 " my_file.ino [arduino:avr:uno] [arduino:usbtinyisp] (/dev/ttyACM0:9600)
-function! b:MyStatusLine()
+function! MyStatusLine()
   let port = arduino#GetPort()
   let line = '%f [' . g:arduino_board . '] [' . g:arduino_programmer . ']'
   if !empty(port)
     let line = line . ' (' . port . ':' . g:arduino_serial_baud . ')'
   endif
   return line
 endfunction
-setl statusline=%!b:MyStatusLine()
+setl statusline=%!MyStatusLine()
 ```
 
 

Diff for: autoload/arduino.vim

@@ -2,7 +2,12 @@ if (exists('g:loaded_arduino_autoload') && g:loaded_arduino_autoload)
 	finish
 endif
 let g:loaded_arduino_autoload = 1
+if has('win64') || has('win32') || has('win16')
+  echo "vim-arduino does not support windows :("
+  finish
+endif
 let s:HERE = resolve(expand('<sfile>:p:h:h'))
+let s:OS = substitute(system('uname'), '\n', '', '')
 " In neovim, run the shell commands using :terminal to preserve interactivity
 if has('nvim')
   let s:TERM = 'terminal! '
@@ -42,6 +47,10 @@ function! arduino#InitializeConfig()
   if !exists('g:arduino_serial_tmux')
     let g:arduino_serial_tmux = 'split-window -d'
   endif
+  if !exists('g:arduino_run_headless')
+    let xvfbPath = substitute(system('command -v Xvfb'), "\n*$", '', '')
+    let g:arduino_run_headless = empty(xvfbPath) ? 0 : 1
+  endif
 
   if !exists('g:arduino_serial_port_globs')
     let g:arduino_serial_port_globs = ['/dev/ttyACM*',
@@ -73,12 +82,23 @@ function! arduino#SaveCache()
 endfunction
 
 " Arduino command helpers {{{1
-function! arduino#GetArduinoCommand(cmd)
+function! arduino#GetArduinoExecutable()
   if exists('g:arduino_cmd')
-    let arduino = g:arduino_cmd
+    return g:arduino_cmd
+  elseif s:OS == 'Darwin'
+    return '/Applications/Arduino.app/Contents/MacOS/Arduino'
   else
-    let arduino = s:HERE . '/bin/arduino-headless'
+    return 'arduino'
+  endif
+endfunction
+
+function! arduino#GetArduinoCommand(cmd)
+  let arduino = arduino#GetArduinoExecutable()
+
+  if g:arduino_run_headless
+    let arduino = s:HERE . '/bin/run-headless ' . arduino
   endif
+
   let cmd = arduino . ' ' . a:cmd . " --board " . g:arduino_board
   let port = arduino#GetPort()
   if !empty(port)
@@ -400,8 +420,12 @@ function! arduino#GetArduinoDir()
   if exists('g:arduino_dir')
     return g:arduino_dir
   endif
-  let arduino_cmd = arduino#FindExecutable('arduino')
+  let executable = arduino#GetArduinoExecutable()
+  let arduino_cmd = arduino#FindExecutable(executable)
   let arduino_dir = fnamemodify(arduino_cmd, ':h')
+  if s:OS == 'Darwin'
+    let arduino_dir = fnamemodify(arduino_dir, ':h') . '/Java'
+  endif
   if !s:FileExists(arduino_dir . '/hardware/arduino/')
     throw "Could not find arduino directory. Please set g:arduino_dir"
   endif

Diff for: bin/arduino-headless

@@ -0,0 +1,30 @@
+#!/bin/bash -e
+# Wrapper script that will automatically use Xvfb to run a command
+declare -r XVFB="Xvfb :1 -nolisten tcp -screen :1 1280x800x24"
+
+cleanup() {
+  if [[ -n "$xvfb_proc" ]] && kill -0 $xvfb_proc; then
+    kill -9 $xvfb_proc
+  fi
+}
+
+main() {
+  # If we're using --verbose or --verbose-build, show the output of xvfb
+  local silent=1
+  for arg in $@; do
+    if [[ "$arg" == "--verbose" ]] || [[ "$arg" == "--verbose-build" ]]; then
+      silent=
+      break
+    fi
+  done
+  if [ $silent ]; then
+    $XVFB > /dev/null 2> /dev/null &
+  else
+    $XVFB &
+  fi
+  xvfb_proc="$!"
+  trap cleanup SIGINT SIGTERM EXIT
+  DISPLAY=:1 "$@"
+}
+
+main "$@"

Diff for: bin/run-headless

@@ -23,8 +23,12 @@ OPTIONS                                                       *arduino-options*
 
 Overview:~
 
-  |arduino_board|................The fully-qualified name of the board.
+  |arduino_cmd|..................Path to the arduino executable
+  |arduino_dir|..................Path to the arduino install directory
+  |arduino_run_headless|.........Try to run inside Xvfb
   |arduino_args|.................Additional args to pass to 'arduino' command.
+  |arduino_board|................The fully-qualified name of the board.
+  |arduino_programmer|...........The programmer type.
   |arduino_serial_cmd|...........Command to run to attach to serial port.
   |arduino_serial_baud|..........The baud rate for the serial connection.
   |arduino_auto_baud|............Auto-detect the baud rate.
@@ -36,15 +40,19 @@ Overview:~
 Detailed descriptions and default values:~
 
                                                              *'g:arduino_cmd'*
-The path to the 'arduino' command. By default it will use the
-'arduino-headless' script in the 'bin' directory, which looks for 'arduino' in
-your PATH and runs it inside Xvfb if it can. >
+The path to the 'arduino' command. By default it will look in your PATH, or in
+Applications on Mac. >
   let g:arduino_cmd = '/usr/share/local/arduino/arduino'
 <
                                                              *'g:arduino_dir'*
 The path to your 'arduino' directory. Usually vim-arduino will be able to
-detect it, but if it cannot you can set the value manually.
+detect it, but if it cannot you can set the value manually. >
   let g:arduino_dir = '/usr/share/local/arduino'
+<
+                                                    *'g:arduino_run_headless'*
+Run the arduino command inside a Xvfb. Requires Xvfb to be installed and in the
+PATH. >
+  let g:arduino_run_headless = 1
 <
                                                              *'g:arduino_args'*
 Additional arguments that will be passed to the 'arduino' command during build

Diff for: doc/arduino.txt

@@ -4,6 +4,7 @@
 'g:arduino_cmd'	arduino.txt	/*'g:arduino_cmd'*
 'g:arduino_dir'	arduino.txt	/*'g:arduino_dir'*
 'g:arduino_programmer'	arduino.txt	/*'g:arduino_programmer'*
+'g:arduino_run_headless'	arduino.txt	/*'g:arduino_run_headless'*
 'g:arduino_serial_baud'	arduino.txt	/*'g:arduino_serial_baud'*
 'g:arduino_serial_cmd'	arduino.txt	/*'g:arduino_serial_cmd'*
 'g:arduino_serial_port'	arduino.txt	/*'g:arduino_serial_port'*