1.4.0

Author: hrbrmstr

.gitignore

@@ -24,3 +24,4 @@ Icon
 Network Trash Folder
 Temporary Items
 .apdisk
+.Rproj.user

RSwitch.xcodeproj/project.pbxproj

@@ -18,6 +18,9 @@
 		01073F1F2311E67D007162C9 /* HandleUpdate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01073F1E2311E67D007162C9 /* HandleUpdate.swift */; };
 		01073F212311E6BD007162C9 /* HandleSwitch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01073F202311E6BD007162C9 /* HandleSwitch.swift */; };
 		0178970D230ED25100F8F5BC /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0178970C230ED25100F8F5BC /* AboutViewController.swift */; };
+		018A8C3B2312C7BC0006E87D /* libprocInfo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 018A8C3A2312C7BC0006E87D /* libprocInfo.a */; };
+		018A8C3F2312CB480006E87D /* procHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 018A8C3E2312CB480006E87D /* procHelper.m */; };
+		018A8C412312F4940006E87D /* HandleSwitchTo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 018A8C402312F4940006E87D /* HandleSwitchTo.swift */; };
 		01F3EF0C230E635300DF5DF9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F3EF0B230E635300DF5DF9 /* AppDelegate.swift */; };
 		01F3EF0E230E635300DF5DF9 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01F3EF0D230E635300DF5DF9 /* ViewController.swift */; };
 		01F3EF10230E635500DF5DF9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 01F3EF0F230E635500DF5DF9 /* Assets.xcassets */; };
@@ -37,6 +40,12 @@
 		01073F1E2311E67D007162C9 /* HandleUpdate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HandleUpdate.swift; sourceTree = "<group>"; };
 		01073F202311E6BD007162C9 /* HandleSwitch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HandleSwitch.swift; sourceTree = "<group>"; };
 		0178970C230ED25100F8F5BC /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
+		018A8C392312C7BC0006E87D /* procInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = procInfo.h; sourceTree = "<group>"; };
+		018A8C3A2312C7BC0006E87D /* libprocInfo.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libprocInfo.a; sourceTree = "<group>"; };
+		018A8C3C2312C8380006E87D /* RSwitch-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RSwitch-Bridging-Header.h"; sourceTree = "<group>"; };
+		018A8C3D2312CB480006E87D /* procHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = procHelper.h; sourceTree = "<group>"; };
+		018A8C3E2312CB480006E87D /* procHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = procHelper.m; sourceTree = "<group>"; };
+		018A8C402312F4940006E87D /* HandleSwitchTo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HandleSwitchTo.swift; sourceTree = "<group>"; };
 		01F3EF08230E635300DF5DF9 /* RSwitch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RSwitch.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		01F3EF0B230E635300DF5DF9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		01F3EF0D230E635300DF5DF9 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -54,6 +63,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				52B8A14237DA712A6A2ABDE0 /* Pods_RSwitch.framework in Frameworks */,
+				018A8C3B2312C7BC0006E87D /* libprocInfo.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -69,6 +79,7 @@
 				01073F1E2311E67D007162C9 /* HandleUpdate.swift */,
 				01073F1C2311E64E007162C9 /* DownloadRStudio.swift */,
 				01073F1A2311E613007162C9 /* DownloadTarball.swift */,
+				018A8C402312F4940006E87D /* HandleSwitchTo.swift */,
 				01073F182311E3B8007162C9 /* Bundle.swift */,
 				01073F162311E397007162C9 /* Menu.swift */,
 				01073F142311E370007162C9 /* Notify.swift */,
@@ -80,6 +91,19 @@
 			path = swift;
 			sourceTree = "<group>";
 		};
+		018A8C342312C6510006E87D /* c */ = {
+			isa = PBXGroup;
+			children = (
+				018A8C3C2312C8380006E87D /* RSwitch-Bridging-Header.h */,
+				018A8C3A2312C7BC0006E87D /* libprocInfo.a */,
+				018A8C392312C7BC0006E87D /* procInfo.h */,
+				018A8C3D2312CB480006E87D /* procHelper.h */,
+				018A8C3E2312CB480006E87D /* procHelper.m */,
+				01073F232311E859007162C9 /* swift */,
+			);
+			path = c;
+			sourceTree = "<group>";
+		};
 		01F3EEFF230E635300DF5DF9 = {
 			isa = PBXGroup;
 			children = (
@@ -101,7 +125,7 @@
 		01F3EF0A230E635300DF5DF9 /* RSwitch */ = {
 			isa = PBXGroup;
 			children = (
-				01073F232311E859007162C9 /* swift */,
+				018A8C342312C6510006E87D /* c */,
 				01F3EF0F230E635500DF5DF9 /* Assets.xcassets */,
 				01F3EF11230E635500DF5DF9 /* Main.storyboard */,
 				01F3EF14230E635500DF5DF9 /* Info.plist */,
@@ -160,6 +184,7 @@
 				TargetAttributes = {
 					01F3EF07230E635300DF5DF9 = {
 						CreatedOnToolsVersion = 11.0;
+						LastSwiftMigration = 1100;
 					};
 				};
 			};
@@ -241,8 +266,10 @@
 			buildActionMask = 2147483647;
 			files = (
 				01073F212311E6BD007162C9 /* HandleSwitch.swift in Sources */,
+				018A8C3F2312CB480006E87D /* procHelper.m in Sources */,
 				01073F1F2311E67D007162C9 /* HandleUpdate.swift in Sources */,
 				01073F1B2311E613007162C9 /* DownloadTarball.swift in Sources */,
+				018A8C412312F4940006E87D /* HandleSwitchTo.swift in Sources */,
 				0178970D230ED25100F8F5BC /* AboutViewController.swift in Sources */,
 				01073F192311E3B8007162C9 /* Bundle.swift in Sources */,
 				01073F152311E370007162C9 /* Notify.swift in Sources */,
@@ -391,6 +418,7 @@
 			baseConfigurationReference = 53FF56D90FA7100C1726A4F7 /* Pods-RSwitch.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
@@ -401,11 +429,17 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/RSwitch/c",
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = is.rud.bob.RSwitch;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "RSwitch/c/RSwitch-Bridging-Header.h";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
@@ -415,6 +449,7 @@
 			baseConfigurationReference = 574911021B3B7938E36AB013 /* Pods-RSwitch.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
@@ -425,11 +460,16 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/RSwitch/c",
+				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
 				MARKETING_VERSION = 1.4.0;
 				PRODUCT_BUNDLE_IDENTIFIER = is.rud.bob.RSwitch;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_OBJC_BRIDGING_HEADER = "RSwitch/c/RSwitch-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 			};
 			name = Release;

RSwitch/Base.lproj/Main.storyboard

@@ -721,22 +721,22 @@
             <objects>
                 <viewController storyboardIdentifier="about2" id="KlD-6a-3Gc" customClass="AboutViewController" sceneMemberID="viewController">
                     <view key="view" id="SgY-wa-ilj">
-                        <rect key="frame" x="0.0" y="0.0" width="480" height="240"/>
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <subviews>
                             <scrollView appearanceType="aqua" fixedFrame="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rEB-nx-gFw">
-                                <rect key="frame" x="7" y="9" width="463" height="223"/>
+                                <rect key="frame" x="9" y="11" width="463" height="247"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="iCP-uh-CRl">
-                                    <rect key="frame" x="0.0" y="0.0" width="463" height="223"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="463" height="247"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textView ambiguous="YES" editable="NO" drawsBackground="NO" importsGraphics="NO" verticallyResizable="YES" smartInsertDelete="YES" id="kWH-Et-k6l">
-                                            <rect key="frame" x="0.0" y="0.0" width="463" height="223"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="463" height="247"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="alternatingContentBackgroundColor" catalog="System" colorSpace="catalog"/>
-                                            <size key="minSize" width="463" height="223"/>
+                                            <size key="minSize" width="463" height="247"/>
                                             <size key="maxSize" width="463" height="10000000"/>
                                             <attributedString key="textStorage">
                                                 <fragment>
@@ -763,16 +763,25 @@ MIT Licensed
                                                     </attributes>
                                                 </fragment>
                                                 <fragment>
-                                                    <string key="content">
-
-dial app icon by IconMark from the Noun Project
+                                                    <string key="content" base64-UTF8="YES">
+Cgo
 </string>
                                                     <attributes>
                                                         <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                                         <font key="NSFont" metaFont="label" size="17"/>
                                                         <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
                                                     </attributes>
                                                 </fragment>
+                                                <fragment>
+                                                    <string key="content">dial app icon by IconMark from the Noun Project
+String+Version by DragonCherry
+ProcInfo by Patrick Wardle </string>
+                                                    <attributes>
+                                                        <color key="NSColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                                        <font key="NSFont" size="11" name="HelveticaNeue"/>
+                                                        <paragraphStyle key="NSParagraphStyle" alignment="center" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                                                    </attributes>
+                                                </fragment>
                                             </attributedString>
                                             <color key="insertionPointColor" name="textColor" catalog="System" colorSpace="catalog"/>
                                         </textView>
@@ -792,7 +801,7 @@ dial app icon by IconMark from the Noun Project
                 </viewController>
                 <customObject id="N40-nE-NTQ" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="689" y="357"/>
+            <point key="canvasLocation" x="689" y="373"/>
         </scene>
     </scenes>
 </document>

RSwitch/c/RSwitch-Bridging-Header.h

@@ -0,0 +1,7 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#import <Foundation/Foundation.h>
+#include "procInfo.h"
+#include "procHelper.h"

RSwitch/c/libprocInfo.a

@@ -0,0 +1,19 @@
+//
+//  procHelper.h
+//  RSwitch
+//
+//  Created by hrbrmstr on 8/25/19.
+//  Copyright © 2019 Bob Rudis. All rights reserved.
+//
+
+#ifndef procHelper_h
+#define procHelper_h
+
+#include <stdio.h>
+#include "procHelper.h"
+#include "procInfo.h"
+#import <Foundation/Foundation.h>
+
+NSMutableArray *getArgs(pid_t pid);
+
+#endif /* procHelper_h */

RSwitch/c/procHelper.h

@@ -0,0 +1,18 @@
+//
+//  procHelper.c
+//  RSwitch
+//
+//  Created by hrbrmstr on 8/25/19.
+//  Copyright © 2019 Bob Rudis. All rights reserved.
+//
+
+#include "procHelper.h"
+#include "procInfo.h"
+#import <Foundation/Foundation.h>
+
+NSMutableArray *getArgs(pid_t pid) {
+  
+  Process* process = [[Process alloc] init:pid];
+  return(process.arguments);
+  
+}