Skip to content

Use windowController.selectTab so activate event is properly triggered. ... #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvtorres wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use windowController.selectTab so activate event is properly triggered. ... #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions SafariTabSwitching/SafariTabSwitching.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,26 @@ @implementation NSApplication(SafariTabSwitching)
- (void)SafariTabeSwitching_sendEvent:(NSEvent *)event
{
static NSArray *keyCode2TabIndex = nil;

if (event.type == NSKeyDown
&& (event.modifierFlags & NSDeviceIndependentModifierFlagsMask) == NSCommandKeyMask) // only command modifier pressed
{
if (!keyCode2TabIndex)
{
keyCode2TabIndex = [[NSArray alloc] initWithObjects:@"18", @"19", @"20", @"21", @"23", @"22", @"26", @"28", @"25", nil];
}

NSUInteger tabIndex = [keyCode2TabIndex indexOfObject:[[NSNumber numberWithInt:event.keyCode] stringValue]];

if (tabIndex != NSNotFound)
{
NSWindow *keyWindow = [[NSApplication sharedApplication] keyWindow];

if ([keyWindow respondsToSelector:@selector(orderedTabViewItems)] // check safari API compat
&& [keyWindow respondsToSelector:@selector(setCurrentTabViewItem:)])
NSWindowController *controller = keyWindow.windowController;

if ([controller respondsToSelector:@selector(orderedTabs)] // check safari API compat
&& [controller respondsToSelector:@selector(selectTab:)])
{
NSArray *tabs = [keyWindow performSelector:@selector(orderedTabViewItems)];
NSArray *tabs = [controller performSelector:@selector(orderedTabs)];
NSInteger newTabIndex = -1;

if (tabIndex == 8)
Expand All @@ -46,17 +47,17 @@ - (void)SafariTabeSwitching_sendEvent:(NSEvent *)event

if (newTabIndex >= 0)
{
[keyWindow performSelector:@selector(setCurrentTabViewItem:) withObject:[tabs objectAtIndex:newTabIndex]];
[controller performSelector:@selector(selectTab:) withObject:[tabs objectAtIndex:newTabIndex]];
}

return; // prevent event dispatching
}
}

}
else if (event.type == NSKeyDown
&& (event.modifierFlags & NSDeviceIndependentModifierFlagsMask) == (NSCommandKeyMask|NSShiftKeyMask) && event.keyCode == 0x11) { // keycode of 'T'

CGEventRef e = CGEventCreateKeyboardEvent(NULL, 0x6, YES); // keycode of 'Z'

CGEventSetFlags(e, kCGEventFlagMaskCommand);
Expand All @@ -69,7 +70,7 @@ - (void)SafariTabeSwitching_sendEvent:(NSEvent *)event

return;
}

[self SafariTabeSwitching_sendEvent:event];
}

Expand All @@ -87,7 +88,7 @@ + (void)load
{
NSLog(@"Safari Tab Switching %@ Loaded", self.pluginVersion);
[NSClassFromString(@"BrowserApplication") jr_swizzleMethod:@selector(sendEvent:) withMethod:@selector(SafariTabeSwitching_sendEvent:) error:NULL];

}

@end