Windows

.gitignore

@@ -1,6 +1,7 @@
 src/deps/*/*
 src/*.o
 src/howl
+src/howl.exe
 *.bc
 *.bak
 site/build/

README.md

@@ -30,6 +30,8 @@ how to install Howl from source.
 based system).
 - `C compiler`: Howl has a very small C core itself, and it embeds
 dependencies written in C.
+- If you're using Windows, you *need* to build Howl inside of
+[MSYS2](https://msys2.github.io/)'s MinGW32 shell.
 
 ### Build && install
 

bundles/git/spec/git_spec.moon

@@ -2,6 +2,11 @@ import bundle, config, VC from howl
 import File from howl.io
 import Spy from howl.spec
 
+echo = if jit.os == 'Windows'
+  "#{howl.sys.env.WD}echo.exe"
+else
+  '/bin/echo'
+
 describe 'Git bundle', ->
   setup -> bundle.load_by_name 'git'
   teardown -> bundle.unload 'git'
@@ -27,8 +32,7 @@ describe 'Git bundle', ->
           assert.equal instance.root, dir
 
     it 'returns nil if no git root was found', ->
-      File.with_tmpfile (file) ->
-        assert.is_nil git_vc.find file
+      assert.is_nil git_vc.find howl.io.File echo
 
   describe 'A Git instance', ->
     root = nil
@@ -52,7 +56,7 @@ describe 'Git bundle', ->
         assert.same list1, list2
 
       it 'returns a list of git files, including untracked', (done) ->
-        howl_async ->
+        proc_async ->
           assert_same_files git\files!, {}
           file = root / 'new.lua'
           file\touch!
@@ -67,7 +71,7 @@ describe 'Git bundle', ->
           file2 = root / 'another.lua'
           file2\touch!
           assert_same_files git\files!, { file2, file }
-          done!
+          proc_done done
 
     describe 'diff([file])', ->
       local file
@@ -79,37 +83,37 @@ describe 'Git bundle', ->
         os.execute "cd #{root} && git commit -q -m 'rev1' #{file}"
 
       it 'returns nil if <file> has not changed', (done) ->
-        howl_async ->
+        proc_async ->
           assert.is_nil git\diff file
-          done!
+          proc_done done
 
       it 'returns a string containing the diff if <file> has changed', (done) ->
-        howl_async ->
+        proc_async ->
           file.contents ..= 'line 2\n'
           diff = git\diff file
           assert.includes diff, file.basename
           assert.includes diff, '+line 2'
-          done!
+          proc_done done
 
       it 'returns a diff for the entire directory if file is not specified', (done) ->
-        howl_async ->
+        proc_async ->
           file.contents ..= 'line 2\n'
           diff = git\diff!
           assert.includes diff, file.basename
           assert.includes diff, '+line 2'
-          done!
+          proc_done done
 
     describe 'run(...)', ->
       it 'runs git in the root dir with the given arguments and returns the output', (done) ->
-        howl_async ->
+        proc_async ->
           assert.includes git\run('config', '--local', '-l'), "Howl Spec"
-          done!
+          proc_done done
 
       it 'uses the executable in variable `git_path` if specified', (done) ->
-        howl_async ->
-          config.git_path = '/bin/echo'
+        proc_async ->
+          config.git_path = echo
           status, out = pcall git.run, git, 'using echo'
           config.git_path = nil
           assert status, out
           assert.includes out, "using echo"
-          done!
+          proc_done done

bundles/howl-themes/solarized_light/solarized_light.moon

@@ -263,7 +263,7 @@ return {
       font:
         bold: true
         size: 'large'
-        family: 'Purisa,Latin Modern Sans'
+        family: 'Purisa,Comic Sans,Latin Modern Sans,Lucida Sans Unicode'
 
     definition: color: yellow
     function: color: blue

bundles/howl-themes/steinom/steinom.moon

@@ -247,7 +247,7 @@ return {
       font:
         bold: true
         size: 'large'
-        family: 'Purisa,Latin Modern Sans'
+        family: 'Purisa,Comic Sans,Latin Modern Sans,Lucida Sans Unicode'
 
     definition: color: yellow
 

bundles/howl-themes/tomorrow_night_blue/tm_night_blue.moon

@@ -246,7 +246,7 @@ return {
       font:
         bold: true
         size: 'large'
-        family: 'Purisa,Latin Modern Sans'
+        family: 'Purisa,Comic Sans,Latin Modern Sans,Lucida Sans Unicode'
 
     definition: color: yellow
 

lib/aullar/view.moon

@@ -282,9 +282,14 @@ View = {
 
     if opts.vertical
       page_size = @lines_showing - 1
+      upper = @buffer.nr_lines
+      if page_size == 0
+        -- GtkRange docs mention that page_size is normally >0 for GtkScrollbar
+        upper = 2
+        page_size = 1
       adjustment = @vertical_scrollbar.adjustment
       if adjustment
-        adjustment\configure @first_visible_line, 1, @buffer.nr_lines, 1, page_size, page_size
+        adjustment\configure @first_visible_line, 1, upper, 1, page_size, page_size
 
     if opts.horizontal
       max_width = 0

lib/howl/cdefs/init.moon

@@ -51,6 +51,9 @@ int sig_PWR;
 int sig_SYS;
 ]]
 
+if ffi.os == 'Windows'
+  require 'howl.cdefs.windows'
+
 return {
   const_char_p: ffi.typeof 'const char *'
   char_p: ffi.typeof 'char *'

lib/howl/cdefs/windows.moon

@@ -0,0 +1,21 @@
+-- Copyright 2016 The Howl Developers
+-- License: MIT (see LICENSE.md at the top-level directory of the distribution)
+
+ffi = require 'ffi'
+
+ffi.cdef [[
+  typedef void* HANDLE;
+  typedef void* PVOID;
+  typedef int DWORD;
+  typedef int BOOL;
+  typedef char* LPTSTR;
+  typedef const char* LPCTSTR;
+
+  DWORD GetProcessId(HANDLE process);
+  HANDLE _get_osfhandle(int fd);
+  BOOL TerminateProcess(HANDLE process, unsigned int exitcode);
+  int AddFontResourceExA(LPCTSTR lpszFilename, DWORD fl, PVOID pdv);
+  BOOL SetFileAttributesA(LPCTSTR file, DWORD attrs);
+
+  int fr_private;
+]]

lib/howl/commands/app_commands.moon

@@ -379,7 +379,7 @@ command.register
 -----------------------------------------------------------------------
 
 launch_cmd = (working_directory, cmd) ->
-  shell = howl.sys.env.SHELL or '/bin/sh'
+  shell = howl.sys.env.SHELL
   p = Process {
     :cmd,
     :shell,

lib/howl/init.lua

@@ -19,6 +19,8 @@ Where options can be any of:
 ]=]
 
 local path_separator = jit.os == 'Windows' and '\\' or '/'
+local path_prefix = jit.os == 'Windows' and '\\\\.\\' or ''
+app_root = path_prefix .. app_root
 
 local function parse_args(argv)
   local options = {
@@ -162,12 +164,27 @@ local function main(args)
   set_package_path('lib', 'lib/ext', 'lib/ext/moonscript')
   require 'howl.moonscript_support'
   table.insert(package.loaders, 2, bytecode_loader())
-  require 'howl.cdefs.fontconfig'
-  ffi.C.FcConfigAppFontAddDir(nil, table.concat({app_root, 'fonts'}, path_separator))
   require 'ljglibs.cdefs.glib'
 
   howl = auto_module('howl')
   require('howl.globals')
+
+  local font_dir = table.concat({app_root, 'fonts'}, path_separator)
+  if ffi.os == 'Windows' then
+    require 'howl.cdefs.windows'
+    local fonts = howl.io.File(font_dir).children
+    for _, font in ipairs(fonts) do
+      local loaded = ffi.C.AddFontResourceExA(font.path, ffi.C.fr_private, nil)
+      if loaded == 0 then
+        io.stderr:write('failed to load font ', font.path, '\n')
+        io.stderr:flush()
+      end
+    end
+  else
+    require 'howl.cdefs.fontconfig'
+    ffi.C.FcConfigAppFontAddDir(nil, font_dir)
+  end
+
   _G.log = require('howl.log')
   local args = parse_args(argv)
 

lib/howl/interactions/file_selection.moon

@@ -45,13 +45,15 @@ class FileSelector
     parent or= File.home_dir
 
     path = @command_line\pop_spillover!
+    -- Make / work on Windows.
+    path = path\gsub '/', File.separator
 
     if path.is_empty
-      path = tostring(parent) .. '/'
+      path = tostring(parent) .. File.separator
     else
-      trailing = path\ends_with('/') and '/' or ''
+      trailing = path\ends_with(File.separator) and File.separator or ''
       path = tostring parent / path
-      if not path\ends_with '/'
+      if not path\ends_with File.separator
         path ..= trailing
 
     directory, unmatched = get_dir_and_leftover path
@@ -93,7 +95,12 @@ class FileSelector
   on_update: (text) =>
     return if @submitting
 
-    path = @directory.path .. '/' .. text
+    -- This allows one to use / as a directory separator, even on Windows.
+    text = text\gsub '/', File.separator
+    path = if File.is_absolute text
+      text
+    else
+      @directory.path .. File.separator .. text
     directory, text = get_dir_and_leftover path
 
     if directory != @directory

lib/howl/io/file.moon

@@ -6,6 +6,7 @@ GFileInfo = require 'ljglibs.gio.file_info'
 glib = require 'ljglibs.glib'
 import PropertyObject from howl.util.moon
 append = table.insert
+ffi = require 'ffi'
 
 file_types = {
   [tonumber GFileInfo.TYPE_DIRECTORY]: 'directory',
@@ -16,15 +17,23 @@ file_types = {
   [tonumber GFileInfo.TYPE_UNKNOWN]: 'unknown',
 }
 
+platform_tmpname = ->
+  -- os.tmpname is broken on Windows and returns a filename prefixed with \.
+  -- This causes a lot of "Access denied"-related errors.
+  filename = assert os.tmpname!
+  -- Remove the prefix \.
+  filename = filename\sub 2 if ffi.os == 'Windows'
+  filename
+
 class File extends PropertyObject
 
   tmpfile: ->
-    file = File assert os.tmpname!
-    file.touch if not file.exists
+    file = File platform_tmpname!
+    file\touch! if not file.exists
     file
 
   tmpdir: ->
-    with File os.tmpname!
+    with File platform_tmpname!
       \delete! if .exists
       \mkdir!
 
@@ -35,7 +44,7 @@ class File extends PropertyObject
     error err if not status
 
   is_absolute: (path) ->
-    (path\match('^/') or path\match('^%a:\\\\')) != nil
+    (path\match('^/') or path\match('^%a:\\')) != nil
 
   expand_path: (path) ->
     res = path\gsub "~#{File.separator}", File.home_dir.path .. File.separator
@@ -79,7 +88,7 @@ class File extends PropertyObject
   @property size: get: => @_info!.size
   @property exists: get: => @gfile.exists
   @property readable: get: => @exists and @_info('access')\get_attribute_boolean 'access::can-read'
-  @property etag: get: => @exists and @_info('etag').etag
+  @property etag: get: => @exists and @_info('etag').etag or nil
   @property modified_at: get: => @exists and @_info('time')\get_attribute_uint64 'time::modified'
   @property short_path: get: => @path\gsub "^#{File.home_dir.path}", '~'
 

lib/howl/io/input_stream.moon

@@ -3,13 +3,18 @@
 
 dispatch = howl.dispatch
 glib = require 'ljglibs.glib'
-{:UnixInputStream} = require 'ljglibs.gio'
+{:Win32InputStream, :UnixInputStream} = require 'ljglibs.gio'
 {:PropertyObject} = howl.util.moon
 append = table.insert
+ffi = require 'ffi'
 
 class InputStream extends PropertyObject
   new: (@stream, @priority = glib.PRIORITY_LOW) =>
-    @stream = UnixInputStream(@stream) if type(@stream) == 'number'
+    if type(@stream) == 'number'
+      if ffi.os == 'Windows'
+        @stream = Win32InputStream ffi.C._get_osfhandle @stream
+      else
+        @stream = UnixInputStream @stream
     super!
 
   @property is_closed: get: => @stream.is_closed

lib/howl/io/output_stream.moon

@@ -2,12 +2,16 @@
 -- License: MIT (see LICENSE.md at the top-level directory of the distribution)
 
 dispatch = howl.dispatch
-{:UnixOutputStream} = require 'ljglibs.gio'
+{:Win32OutputStream, :UnixOutputStream} = require 'ljglibs.gio'
 {:PropertyObject} = howl.util.moon
+ffi = require 'ffi'
 
 class OutputStream extends PropertyObject
   new: (fd) =>
-    @stream = UnixOutputStream fd
+    if ffi.os == 'Windows'
+      @stream = Win32OutputStream ffi.C._get_osfhandle fd
+    else
+      @stream = UnixOutputStream fd
     super!
 
   @property is_closed: get: => @stream.is_closed