automatically detect Dvorak

Chen Xiaoliang · Chen Xiaoliang · commit fd456410cf1e · 2013-11-03T15:22:21.000+08:00
diff --git a/VVDocumenter-Xcode.xcodeproj/project.pbxproj b/VVDocumenter-Xcode.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		893D8F8018262EF500E8A00C /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 893D8F7F18262EF500E8A00C /* Carbon.framework */; };
 		D114BEE0179644D00043FA65 /* NSString+PDRegex.m in Sources */ = {isa = PBXBuildFile; fileRef = D114BEDE179644D00043FA65 /* NSString+PDRegex.m */; };
 		D114BEE3179644FA0043FA65 /* NSTextView+VVTextGetter.m in Sources */ = {isa = PBXBuildFile; fileRef = D114BEE2179644FA0043FA65 /* NSTextView+VVTextGetter.m */; };
 		D11C542D17999D9000D3DE38 /* VVArgument.m in Sources */ = {isa = PBXBuildFile; fileRef = D11C542B17999D9000D3DE38 /* VVArgument.m */; };
@@ -42,6 +43,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		893D8F7F18262EF500E8A00C /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
 		D114BEDD179644D00043FA65 /* NSString+PDRegex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+PDRegex.h"; sourceTree = "<group>"; };
 		D114BEDE179644D00043FA65 /* NSString+PDRegex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+PDRegex.m"; sourceTree = "<group>"; };
 		D114BEE1179644FA0043FA65 /* NSTextView+VVTextGetter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTextView+VVTextGetter.h"; sourceTree = "<group>"; };
@@ -106,6 +108,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				893D8F8018262EF500E8A00C /* Carbon.framework in Frameworks */,
 				D14380F7179551B900C829CE /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -172,6 +175,7 @@
 		D14380F5179551B900C829CE /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				893D8F7F18262EF500E8A00C /* Carbon.framework */,
 				D14380F6179551B900C829CE /* Cocoa.framework */,
 				D1C462DB17999C2000EB7B23 /* SenTestingKit.framework */,
 				D14380F8179551B900C829CE /* Other Frameworks */,
diff --git a/VVDocumenter-Xcode/VVDocumenterManager.m b/VVDocumenter-Xcode/VVDocumenterManager.m
@@ -71,6 +71,17 @@ -(void) showSettingPanel:(NSNotification *)noti {
     [self.settingPanel showWindow:self.settingPanel];
 }
 
+-(BOOL) isDvorakActive
+{
+    TISInputSourceRef inputSource = TISCopyCurrentKeyboardLayoutInputSource();
+    NSString *layoutID = (__bridge NSString *)TISGetInputSourceProperty(inputSource, kTISPropertyInputSourceID);
+    if ([layoutID isEqualToString:@"com.apple.keylayout.Dvorak"]) {
+        return YES;
+    } else {
+        return NO;
+    }
+}
+
 - (void) textStorageDidChange:(NSNotification *)noti {
 
     if ([[noti object] isKindOfClass:[NSTextView class]]) {
@@ -150,7 +161,7 @@ - (void) textStorageDidChange:(NSNotification *)noti {
                 [kes sendKeyCode:kVK_Delete withModifierCommand:YES alt:NO shift:NO control:NO];
                 //if (shouldReplace) [textView setSelectedRange:resultToDocument.range];
                 //Cmd+V, paste (If it is Dvorak layout, use '.', which is corresponding the key 'V' in a QWERTY layout)
-                NSInteger kKeyVCode = [[VVDocumenterSetting defaultSetting] useDvorakLayout] ? kVK_ANSI_Period : kVK_ANSI_V;
+                NSInteger kKeyVCode = [self isDvorakActive] ? kVK_ANSI_Period : kVK_ANSI_V;
                 [kes sendKeyCode:kKeyVCode withModifierCommand:YES alt:NO shift:NO control:NO];
                 
                 //The key down is just a defined finish signal by me. When we receive this key, we know operation above is finished.
