movewin 1.6 → 1.11

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YmU4MmIyMzIxZGZiYjY4ODQ2NTQ4NDIxYWQ4ZjJlNTIwMjJhNmQyZA==
-  data.tar.gz: !binary |-
-    NWIxMjcyMDY0MzMxMzkzOTg0ZTI0MzI4ZmMxYmI5NjA0YTg0Mzk1Yg==
+SHA256:
+  metadata.gz: 3843c385c582fdeeb83f418b7681e91506fcd9a8e0b645b321e12a3c6e02d120
+  data.tar.gz: 60fe63177a8b4081f64bccdbf36bd824f562a13390b082734337c95c6eba2ae1
 SHA512:
-  metadata.gz: !binary |-
-    NmNkNmNhMWRiYmM2YTBhYTNhZTYwMGE2ZTZlYWU1YTJkMmRhNjY1MTljMDhh
-    MjUxODk1ODhkZTljODNhOGUyNzZmNzIxNDJiZmE4ZDI5ODRmYmQ0MDQ3ZDdl
-    YTI5MjE5ZDNmZDM0M2Y3ZTE3YmRiOGQzYWQwMTEyZDQ0NDZkNmY=
-  data.tar.gz: !binary |-
-    YWJmNjUyNWM0ODc0MTMwMGRlNWYzNzY4NGNkMmNlNjI1ZDQ0MzY0YmQ1YTMy
-    ZDBjZWE4MWNkNWM1MWIwOWU2ZjAzYjhkNjZmYjg4ODg3NDMwN2FkMjc3OWE1
-    ZWExN2JlNmY5MzhiZDYwZGMwNGYzODVlZjYwMWUxMTc1MGQzNDI=
+  metadata.gz: acb032ac21110ad0b3d142966a3e43e1c7f2be28780eb90e2f655d2b10a3f2850169757bc9ce01aef87c43cc4ae435f82cc6129883c8471a2c8f23000f4efe86
+  data.tar.gz: 3701ad4547eec20f8a4604250a82a23c778cfc596e0fdc561af70e1485103505ae1565e17de707307c0b4c513c76ec923e0a3dc42806b1e8d4e93c157ee2acbd

data/ext/movewin/dispatch/empty.rb

@@ -0,0 +1,4 @@
+# This empty Ruby file exists to make sure the ext/movewin/dispatch
+# directory is copied into the "movewin-#{VERSION}.gem" file, so that
+# building this RubyGem will work under Yosemite (OS X 10.10), as per:
+# https://github.com/andrewgho/movewin-ruby/issues/1

data/ext/movewin/extconf.rb

@@ -7,12 +7,7 @@ def main(argv = [])
   $CFLAGS = '-Wall'
   $LDFLAGS = '-Wall -framework Carbon'
 
-  # No have_framework() in mkmf that ships with Ruby versions earlier than 1.9
-  if ruby_older_than?('1.9')
-    have_header('Carbon/Carbon.h')
-  else
-    have_framework('Carbon')
-  end
+  have_header('Carbon/Carbon.h')
 
   # On Yosemite or newer, fix bug in Carbon header that breaks under gcc
   if yosemite_or_newer? && using_gcc?
@@ -22,66 +17,131 @@ def main(argv = [])
   create_makefile('movewin/movewin_ext')
 end
 
-# Return true if current Ruby version is older than given version
-def ruby_older_than?(version)
-  Gem::Version.new(RUBY_VERSION) < Gem::Version.new(version)
-end
-
 # Return true if this is OS X 10.10 (Yosemite) or newer
 def yosemite_or_newer?
   Gem::Version.new(`sw_vers -productVersion`) >= Gem::Version.new('10.10')
 end
 
-# Return true if our compiler is GCC (not clang), as for RVM installed Ruby
+# Return true if our compiler is GCC (not Clang), as for RVM installed Ruby
 def using_gcc?
-  true  # TODO: make this really work
+  # Match gcc, /usr/local/bin/gcc-4.2, etc. (Clang is "xcrun cc")
+  File.basename(RbConfig::MAKEFILE_CONFIG["CC"]).match(/\Agcc\b/)
 end
 
 # Building with GCC on Yosemite (OS X 10.10) results in an error
 # (https://github.com/andrewgho/movewin-ruby/issues/1).
 # Patch header file to work around this issue.
 def fix_dispatch_object_header!
-  srcfile = find_header_file('dispatch/object.h')
-  tmpfile = "#{File.dirname(__FILE__)}/dispatch/object.h.tmp.#{$$}"
-  begin
-    patched = false
-    File.open(tmpfile, 'w') do |tmpfh|
-      File.open(srcfile, 'r').each do |srcline|
-        patched ||= srcline.sub!(
-          /\Atypedef void \(\^dispatch_block_t\)\(void\);/,
-          'typedef void* dispatch_block_t;'
-        )
-        tmpfh.print(srcline)
+  $stdout.print 'Creating patched copy of dispatch/object.h... '
+  $stdout.flush
+  status = 'failed'
+  if (srcfile = find_header_file('dispatch/object.h'))
+    tmpfile = "#{File.dirname(__FILE__)}/dispatch/object.h.tmp.#{$$}"
+    begin
+      patched = false
+      File.open(tmpfile, 'w') do |tmpfh|
+        File.open(srcfile, 'r').each do |srcline|
+          patched ||= srcline.sub!(
+            /\Atypedef void \(\^dispatch_block_t\)\(void\);/,
+            'typedef void* dispatch_block_t;'
+          )
+          tmpfh.print(srcline)
+        end
       end
-    end
-    if patched
-      destfile = "#{File.dirname(__FILE__)}/dispatch/object.h"
-      File.rename(tmpfile, destfile)
-      if $CFLAGS.nil? || $CFLAGS.empty?
-        $CFLAGS = "-I#{File.dirname(__FILE__)}"
+      if patched
+        destfile = "#{File.dirname(__FILE__)}/dispatch/object.h"
+        File.rename(tmpfile, destfile)
+        if $CFLAGS.nil? || $CFLAGS.empty?
+          $CFLAGS = "-I#{File.dirname(__FILE__)}"
+        else
+          $CFLAGS += " -I#{File.dirname(__FILE__)}"
+        end
+        # TODO: Ruby 2.2 mkmf doesn't seem to actually use CLEANINGS any more
+        set_constant! :CLEANINGS,
+          "DISTCLEANFILES += dispatch/object.h\n" + CLEANINGS
+        status = "patched #{destfile}"
       else
-        $CFLAGS += " -I#{File.dirname(__FILE__)}"
+        status = 'skipped'
       end
-      set_constant!(:CLEANINGS, "CLEANFILES += dispatch/object.h\n" + CLEANINGS)
+    ensure
+      File.unlink(tmpfile) if File.exists?(tmpfile)
     end
-  ensure
-    File.unlink(tmpfile) if File.exists?(tmpfile)
+  else
+    status = 'header not found'
   end
+  $stdout.puts status
+  $stdout.flush
 end
 
-# Given an #include <foo/bar.h>, return actual filename /path/to/foo/bar.h
+# Given an #include <dispatch/object.h>, return actual filename
+# /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/dispatch/object.h
 def find_header_file(header)
-  # TODO: really crawl through cpp include path to find this
-  "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/#{header}"
+  filename = nil
+  header_include_paths.each do |path|
+    maybe_filename = "#{path}/#{header}"
+    if File.exists?(maybe_filename)
+      filename = maybe_filename
+      break
+    end
+  end
+  filename
+end
+
+# Return GCC header include path
+# (http://stackoverflow.com/a/19839946, http://stackoverflow.com/a/19852298)
+# gcc -Wp,-v -xc /dev/null -fsyntax-only 2>&1
+def header_include_paths
+  cmd = RbConfig::MAKEFILE_CONFIG["CC"]
+  args = %w{-Wp,-v -xc /dev/null -fsyntax-only}
+  paths = []
+  reading_paths = false
+  run_command(cmd, *args) do |line|
+    line.chomp!
+    if reading_paths
+      if line == 'End of search list.'
+        reading_paths = false
+      elsif line.match(/\A /)
+        line.strip!
+        line.sub!(/\s+\(framework directory\)\Z/, '')
+        paths << line
+      end
+    elsif line == '#include <...> search starts here:'
+      reading_paths = true
+    end
+  end
+  paths
+end
+
+# Safely run a command with no shell escapes, pass output lines to callback
+def run_command(cmd, *args)
+  raise ArgumentError.new('missing required cmd to run') if cmd.nil?
+  rd, wr = IO.pipe
+  if fork
+    wr.close
+    if block_given?
+      rd.each { |line| yield(line) }
+    else
+      rd.read
+    end
+    rd.close
+    Process.wait
+  else
+    rd.close
+    $stdout.reopen(wr)
+    $stderr.reopen(wr)
+    exec cmd, *args
+    raise "exec #{cmd} failed"
+  end
+  $? == 0 # return a bool indicating a successful exit
 end
 
 # Redefine constant without warning (http://stackoverflow.com/q/3375360)
-class Object
-  def set_constant!(const, value)
-    mod = self.is_a?(Module) ? self : self.class
-    mod.send(:remove_const, const) if mod.const_defined?(const)
-    mod.const_set(const, value)
+def set_constant!(const, value)
+  unless Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0')
+    # Ruby 2.0.0 and newer no longer warn when const_set() redefines constant
+    Object::send(:remove_const, const) if Object::const_defined?(const)
   end
+  Object::send(:const_set, const, value)
 end
 
 # Run main loop and exit

data/ext/movewin/movewin_ext.c

@@ -2,7 +2,7 @@
  * movewin_ext.c - Ruby extension to list and move OS X windows
  * Andrew Ho (andrew@zeuscat.com)
  *
- * Copyright (c) 2014, Andrew Ho.
+ * Copyright (c) 2014-2020, Andrew Ho.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,10 @@ static VALUE MW_WindowClass;
 void Init_movewin_ext();
 
 /* Ruby method implementations */
-VALUE MW_is_authorized(VALUE module);   /* MoveWin.authorized? */
+VALUE MW_is_recording_authorized(VALUE module);
+                                        /* MoveWin.recording_authorized? */
+VALUE MW_is_accessibility_authorized(VALUE module);
+                                        /* MoveWin.accessibility_authorized? */
 VALUE MW_display_size(VALUE module);    /* MoveWin.display_size */
 VALUE MW_windows(VALUE module);         /* MoveWin.windows */
 VALUE MW_Window_id(VALUE self);         /* MoveWin::Window.id */
@@ -86,7 +89,10 @@ void Init_movewin_ext() {
 
     /* Define module MoveWin and its methods */
     MW_Module = rb_define_module("MoveWin");
-    rb_define_singleton_method(MW_Module, "authorized?",  MW_is_authorized, 0);
+    rb_define_singleton_method(MW_Module, "recording_authorized?",
+                               MW_is_recording_authorized, 0);
+    rb_define_singleton_method(MW_Module, "accessibility_authorized?",
+                               MW_is_accessibility_authorized, 0);
     rb_define_singleton_method(MW_Module, "display_size", MW_display_size,  0);
     rb_define_singleton_method(MW_Module, "windows",      MW_windows,       0);
 
@@ -104,9 +110,14 @@ void Init_movewin_ext() {
     rb_define_method(MW_WindowClass, "to_s",      MW_Window_to_string,     0);
 }
 
+/* Return true if we are authorized to do screen recording */
+VALUE MW_is_recording_authorized(VALUE module) {
+    return isAuthorizedForScreenRecording() ? Qtrue : Qfalse;
+}
+
 /* Return true if we are authorized to use OS X accessibility APIs */
-VALUE MW_is_authorized(VALUE module) {
-    return isAuthorized() ? Qtrue : Qfalse;
+VALUE MW_is_accessibility_authorized(VALUE module) {
+    return isAuthorizedForAccessibility() ? Qtrue : Qfalse;
 }
 
 /* Return dimensions of current main display as an array of two integers */

data/ext/movewin/winutils.c

@@ -2,7 +2,7 @@
  * winutils.c - utility functions for listing and moving windows
  * Andrew Ho (andrew@zeuscat.com)
  *
- * Copyright (c) 2014, Andrew Ho.
+ * Copyright (c) 2014-2020, Andrew Ho.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -186,8 +186,30 @@ CGSize CGWindowGetSize(CFDictionaryRef window) {
     return CGSizeMake(width, height);
 }
 
+/* Return true if and only if we are authorized to do screen recording */
+bool isAuthorizedForScreenRecording() {
+    if (MAC_OS_X_VERSION_MIN_REQUIRED < 101500) {
+        /* OS X prior to Catalina does not require separate permissions */
+        return 1;
+    } else {
+        CGDisplayStreamFrameAvailableHandler handler =
+            ^(CGDisplayStreamFrameStatus status,
+              uint64_t display_time,
+              IOSurfaceRef frame_surface,
+              CGDisplayStreamUpdateRef updateRef) { return; };
+        CGDisplayStreamRef stream =
+            CGDisplayStreamCreate(CGMainDisplayID(), 1, 1, 'BGRA', NULL, handler);
+        if (stream == NULL) {
+            return 0;
+        } else {
+            CFRelease(stream);
+            return 1;
+        }
+    }
+}
+
 /* Return true if and only if we are authorized to call accessibility APIs */
-bool isAuthorized() {
+bool isAuthorizedForAccessibility() {
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
     return AXAPIEnabled() || AXIsProcessTrusted();
 #else

data/ext/movewin/winutils.h

@@ -2,7 +2,7 @@
  * winutils.h - utility functions for listing and moving windows
  * Andrew Ho (andrew@zeuscat.com)
  *
- * Copyright (c) 2014, Andrew Ho.
+ * Copyright (c) 2014-2020, Andrew Ho.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,8 +63,11 @@ char *windowTitle(char *appName, char *windowName);
 CGPoint CGWindowGetPosition(CFDictionaryRef window);
 CGSize CGWindowGetSize(CFDictionaryRef window);
 
+/* Return true if and only if we are authorized to do screen recording */
+bool isAuthorizedForScreenRecording();
+
 /* Return true if and only if we are authorized to call accessibility APIs */
-bool isAuthorized();
+bool isAuthorizedForAccessibility();
 
 /* Given window dictionary from CGWindowList, return accessibility object */
 AXUIElementRef AXWindowFromCGWindow(CFDictionaryRef window);

data/lib/movewin.rb

@@ -2,7 +2,7 @@
 # movewin.rb - Ruby native code that augments movewin_ext Ruby extension
 # Andrew Ho (andrew@zeuscat.com)
 #
-# Copyright (c) 2014, Andrew Ho.
+# Copyright (c) 2014-2020, Andrew Ho.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,7 @@
 require 'movewin/movewin_ext'
 
 module MoveWin
-  VERSION = '1.6'
+  VERSION = '1.11'
 
   # Individual accessors for display size components
   def self.display_width;  MoveWin.display_size[0]; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: movewin
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.11'
 platform: ruby
 authors:
 - Andrew Ho
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-01 00:00:00.000000000 Z
+date: 2020-07-03 00:00:00.000000000 Z
 dependencies: []
 description: List and move OS X windows from Ruby via the OS X accessibility APIs.
 email: andrew@zeuscat.com
@@ -17,6 +17,7 @@ extensions:
 - ext/movewin/extconf.rb
 extra_rdoc_files: []
 files:
+- ext/movewin/dispatch/empty.rb
 - ext/movewin/extconf.rb
 - ext/movewin/movewin_ext.c
 - ext/movewin/winutils.c
@@ -32,17 +33,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: List and move OS X windows from Ruby