erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Updates to TestInput and addition of instructions for InDesign testing

Browse source
This commit is contained in:
Tom Bogle 2018-05-17 17:27:32 -04:00
parent 953ba5d9c9
commit ee40a1eddc
7 changed files with 171 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mac/TestInput/TestInput.xcodeproj/project.pbxproj
View file

@ -8,6 +8,7 @@
/* Begin PBXBuildFile section */
E22804F320ACC3BE00085FCB /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = E22804F220ACC3BE00085FCB /* MainMenu.xib */; };
E22804F820ADBFC400085FCB /* TestInputMethodAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E22804F720ADBFC400085FCB /* TestInputMethodAppDelegate.m */; };
E237EE721F6982E000DFBADF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E237EE711F6982E000DFBADF /* main.m */; };
E237EE771F6982E000DFBADF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E237EE761F6982E000DFBADF /* Assets.xcassets */; };
E237EE831F69849A00DFBADF /* TestInputController.m in Sources */ = {isa = PBXBuildFile; fileRef = E237EE821F69849A00DFBADF /* TestInputController.m */; };
@ -16,6 +17,8 @@
/* Begin PBXFileReference section */
E22804F220ACC3BE00085FCB /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
E22804F620ADBFC400085FCB /* TestInputMethodAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestInputMethodAppDelegate.h; sourceTree = "<group>"; };
E22804F720ADBFC400085FCB /* TestInputMethodAppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestInputMethodAppDelegate.m; sourceTree = "<group>"; };
E237EE6A1F6982E000DFBADF /* TestInput.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestInput.app; sourceTree = BUILT_PRODUCTS_DIR; };
E237EE711F6982E000DFBADF /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
E237EE761F6982E000DFBADF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@ -55,6 +58,8 @@
E237EE6C1F6982E000DFBADF /* TestInput */ = {
isa = PBXGroup;
children = (
E22804F620ADBFC400085FCB /* TestInputMethodAppDelegate.h */,
E22804F720ADBFC400085FCB /* TestInputMethodAppDelegate.m */,
E237EE841F6A2AC600DFBADF /* test.tiff */,
E237EE711F6982E000DFBADF /* main.m */,
E237EE761F6982E000DFBADF /* Assets.xcassets */,
@ -141,6 +146,7 @@
files = (
E237EE831F69849A00DFBADF /* TestInputController.m in Sources */,
E237EE721F6982E000DFBADF /* main.m in Sources */,
E22804F820ADBFC400085FCB /* TestInputMethodAppDelegate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

13
mac/TestInput/TestInput/MainMenu.xib
View file

@ -5,12 +5,21 @@
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication"/>
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
<connections>
<outlet property="delegate" destination="IUD-Tp-QJo" id="wQc-tj-K9I"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customObject id="IUD-Tp-QJo" customClass="TestInputMethodAppDelegate">
<connections>
<outlet property="_menu" destination="Jl6-bW-tTD" id="vDr-Bx-FO2"/>
</connections>
</customObject>
<menu id="Jl6-bW-tTD">
<items>
<menuItem title="Static Top-level Manu" tag="1" id="Gdy-IA-8vc">
<menuItem title="Static Top-level Menu" tag="1" id="Gdy-IA-8vc">
<modifierMask key="keyEquivalentModifierMask"/>
</menuItem>
<menuItem title="Static Drop-down Menu" tag="2" id="HHH-Xo-CtE">

5
mac/TestInput/TestInput/TestInputController.h
View file

@ -52,8 +52,6 @@
@interface TestInputController : IMKInputController {
IBOutlet NSMenu* _menu;
//_composedBuffer contains text that the input method has converted
NSMutableString* _composedBuffer;
//_original buffer contains the text has it was received from user input.
@ -61,6 +59,9 @@
//used to remember where text is being inserted in the _composedBuffer
NSInteger _originalIndex;
NSUInteger _numberOfDeletesExpected;
}
- (void)menuAction:(id)sender;
@end

114
mac/TestInput/TestInput/TestInputController.m
View file

@ -10,6 +10,7 @@
*/
#import "TestInputController.h"
#import "TestInputMethodAppDelegate.h"
#include <Carbon/Carbon.h> /* For kVK_ constants, and TIS functions. */
@implementation TestInputController
@ -78,14 +79,11 @@
// return NO;
// }
id inputClient;
inputClient = [self client];
id inputClient = [self client];
if (![inputClient supportsUnicode])
return NO;
// [self setComposedBuffer:@""];
NSUInteger location = [self logContext:inputClient];
if ([[event characters] isEqual: @"1"])
@ -164,6 +162,15 @@
return YES;
}
if ([[event characters] isEqual: @"~"])
{
NSLog(@"Attempting to insert characters 'tilde' using insertText with undefined (default) replacement range.");
[inputClient insertText:@"tilde" replacementRange:NSMakeRange(NSNotFound, NSNotFound)];
return YES;
}
if ([[event characters] isEqual: @"$"])
{
NSLog(@"Attempting to delete the previous character by replacing it and the prior character with just the prior one. location = %lu", location);
@ -176,8 +183,29 @@
// This works in TextEdit, but not in TextWrangler. In Chrome, it just tacks the prior character on
// at the current insertion point.
NSString *preChar = [[inputClient attributedSubstringFromRange:NSMakeRange(location - 2, 1)] string];
NSLog(@"Previous character retrieved = %@", preChar);
NSString *preChar = @"=";
if ([inputClient respondsToSelector:@selector(attributedSubstringFromRange:)]) {
preChar = [[inputClient attributedSubstringFromRange:NSMakeRange(location - 2, 1)] string];
if (!preChar || [preChar isEqualToString:@""]) {
NSLog(@"attributedSubstringFromRange did not return a previous character. Trying attributedSubstringForProposedRange...");
if ([inputClient respondsToSelector:@selector(attributedSubstringForProposedRange:actualRange:)]) {
NSRange returnedRange;
preChar = [[inputClient attributedSubstringForProposedRange:NSMakeRange(location - 2, 1) actualRange:&returnedRange] string];
if (!preChar || [preChar isEqualToString:@""]) {
NSLog(@"Previous character could NOT be retrieved using attributedSubstringFromRange or attributedSubstringForProposedRange. Using '&' instead");
preChar = @"&";
}
}
else {
NSLog(@"Client does not respond to attributedSubstringForProposedRange:actualRange:. Using '#' instead");
preChar = @"#";
}
}
else
NSLog(@"Previous character retrieved = %@", preChar);
}
else
NSLog(@"Client does not respond to attributedSubstringFromRange:. Using '=' instead");
[inputClient insertText:preChar replacementRange:NSMakeRange(location - 2, 2)];
return YES;
@ -493,38 +521,6 @@ CGKeyCode keyCodeForChar(const char c)
[buffer setString:string];
}
/*!
@method
@abstract Called when a user action was taken that ends an input session. Typically triggered by the user selecting a new input method or keyboard layout.
@discussion When this method is called your controller should send the current input buffer to the client via a call to insertText:replacementRange:. Additionally, this is the time to clean up if that is necessary.
*/
//-(void)commitComposition:(id)sender
//{
// NSString* text = [self composedBuffer];
//
// if ( text != nil && [text length] == 0 ) {
// [sender insertText: text replacementRange:NSMakeRange(NSNotFound, NSNotFound)];
// [self setComposedBuffer:@""];
// }
//}
//// Return the composed buffer. If it is NIL create it.
//-(NSMutableString*)composedBuffer;
//{
// if ( _composedBuffer == nil ) {
// _composedBuffer = [[NSMutableString alloc] init];
// }
// return _composedBuffer;
//}
//
//// Change the composed buffer.
//-(void)setComposedBuffer:(NSString*)string
//{
// NSMutableString* buffer = [self composedBuffer];
// [buffer setString:string];
//}
// Get the original buffer.
-(NSMutableString*)originalBuffer
{
@ -595,47 +591,23 @@ CGKeyCode keyCodeForChar(const char c)
return selRange.location;
}
NSMenu* _menu = nil;
- (void)activateServer:(id)sender {
NSLog(@"*** activateServer ***");
NSLog(@"sender: %@", sender);
[sender overrideKeyboardWithKeyboardNamed:@"com.apple.keylayout.US"];
if (!_menu) {
_menu = [[NSApplication sharedApplication] mainMenu];
if (!_menu)
NSLog(@"No main menu!");
NSMenuItem *staticMenuItem1 = [_menu itemWithTag:1];
if (staticMenuItem1)
[staticMenuItem1 setAction:@selector(menuAction:)];
NSMenuItem* staticDropdownMenuItem = [_menu itemWithTag:2];
if (staticDropdownMenuItem) {
NSMenu* dropDownMenu = [staticDropdownMenuItem submenu];
if (dropDownMenu) {
NSMenuItem* staticSubMenu = [dropDownMenu itemWithTag:10];
if ( staticSubMenu ) {
NSLog(@"Setting action for static submenu item");
[staticSubMenu setAction:@selector(menuAction:)];
}
}
}
NSMenuItem* dynamicDropdownMenuItem = [_menu itemWithTag:3];
if (dynamicDropdownMenuItem) {
NSMenu* dropDownMenu = [staticDropdownMenuItem submenu];
if (dropDownMenu) {
NSMenuItem *dynamicSubMenuItem = [[NSMenuItem alloc] initWithTitle:@"Submenu One" action:@selector(menuAction:) keyEquivalent:@""];
[dynamicSubMenuItem setTag:100];
NSLog(@"Adding dynamic submenu item");
[dropDownMenu addItem:dynamicSubMenuItem];
}
}
}
[self performSelector:@selector(logContext:) withObject:sender afterDelay:0.25];
}
- (TestInputMethodAppDelegate *)AppDelegate {
return (TestInputMethodAppDelegate *)[NSApp delegate];
}
-(NSMenu*)menu
{
return [self.AppDelegate menu];
}
- (void)menuAction:(id)sender {
NSMenuItem *mItem = [sender objectForKey:kIMKCommandMenuItemName];
NSInteger itag = mItem.tag;

22
mac/TestInput/TestInput/TestInputMethodAppDelegate.h Normal file
View file

@ -0,0 +1,22 @@
//
// TestInputMethodAppDelegate.h
//
// Copyright (c) 2018 SIL International. All rights reserved.
//
#ifndef TestInputMethodAppDelegate_h
#define TestInputMethodAppDelegate_h
#import <Foundation/Foundation.h>
#import <Cocoa/Cocoa.h>
#import "TestInputController.h"
@interface TestInputMethodAppDelegate : NSObject {
IBOutlet NSMenu *_menu;
}
- (NSMenu *)menu;
@end
#endif /* TestInputMethodAppDelegate_h */

53
mac/TestInput/TestInput/TestInputMethodAppDelegate.m Normal file
View file

@ -0,0 +1,53 @@
//
// TestInputMethodAppDelegate.m
// Copyright (c) 2018 SIL International. All rights reserved.
//
#import "TestInputMethodAppDelegate.h"
@implementation TestInputMethodAppDelegate
+ (TestInputMethodAppDelegate *)AppDelegate {
return (TestInputMethodAppDelegate *)[NSApp delegate];
}
- (NSMenu *)menu {
return _menu;
}
- (void)awakeFromNib {
if (!_menu)
NSLog(@"No main menu!");
NSMenuItem *staticMenuItem1 = [_menu itemWithTag:1];
if (staticMenuItem1) {
NSLog(@"Setting action for menu 1");
[staticMenuItem1 setAction:@selector(menuAction:)];
}
NSMenuItem* staticDropdownMenuItem = [_menu itemWithTag:2];
if (staticDropdownMenuItem) {
NSLog(@"Looking for dropdown menu on menu 2");
NSMenu* dropDownMenu = [staticDropdownMenuItem submenu];
if (dropDownMenu) {
NSLog(@"Looking for menu 10");
NSMenuItem* staticSubMenu = [dropDownMenu itemWithTag:10];
if ( staticSubMenu ) {
NSLog(@"Setting action for static submenu item");
[staticSubMenu setAction:@selector(menuAction:)];
}
}
}
NSMenuItem* dynamicDropdownMenuItem = [_menu itemWithTag:3];
if (dynamicDropdownMenuItem) {
NSLog(@"Looking for dropdown menu on menu 3");
NSMenu* dropDownMenu = [dynamicDropdownMenuItem submenu];
if (dropDownMenu) {
NSMenuItem *dynamicSubMenuItem = [[NSMenuItem alloc] initWithTitle:@"Submenu One" action:@selector(menuAction:) keyEquivalent:@""];
[dynamicSubMenuItem setTag:100];
NSLog(@"Adding dynamic submenu item 100");
[dropDownMenu addItem:dynamicSubMenuItem];
}
}
}
@end

45
mac/TestInput/TestInput/main.m
View file

@ -57,17 +57,38 @@ const NSString* kConnectionName = @"TestInput_2_Connection";
//let this be a global so our application controller delegate can access it easily
IMKServer* server;
int main(int argc, char *argv[])
{
NSString* identifier;
//find the bundle identifier and then initialize the input method server
identifier = [[NSBundle mainBundle] bundleIdentifier];
server = [[IMKServer alloc] initWithName:(NSString*)kConnectionName bundleIdentifier:[[NSBundle mainBundle] bundleIdentifier]];
[NSBundle loadNibNamed:@"MainMenu" owner:[NSApplication sharedApplication]];
//finally run everything
[[NSApplication sharedApplication] run];
int main(int argc, const char * argv[]) {
NSString *identifier;
@autoreleasepool {
identifier = [[NSBundle mainBundle] bundleIdentifier];
server = [[IMKServer alloc] initWithName:(NSString *)kConnectionName bundleIdentifier:identifier];
[NSBundle loadNibNamed:@"MainMenu" owner:[NSApplication sharedApplication]];
[[NSApplication sharedApplication] run];
}
return 0;
}
//int main(int argc, char *argv[])
//{
// NSString* identifier;
//
// //find the bundle identifier and then initialize the input method server
// identifier = [[NSBundle mainBundle] bundleIdentifier];
// server = [[IMKServer alloc] initWithName:(NSString*)kConnectionName bundleIdentifier:[[NSBundle mainBundle] bundleIdentifier]];
// NSLog(@"About to load MainMenu...");
// @try {
// [NSBundle loadNibNamed:@"MainMenu" owner:[NSApplication sharedApplication]];
// if ([[NSApplication sharedApplication] mainMenu])
// NSLog(@"Finished loading MainMenu!");
// else
// NSLog(@"MainMenu not set!!!");
// }
// @catch (NSException *e) {
// NSLog(@"Error loading MainMenu: %@", e.description);
// }
//
// //finally run everything
// [[NSApplication sharedApplication] run];
//
// return 0;
//}