Revision: 5644
http://skim-app.svn.sourceforge.net/skim-app/?rev=5644&view=rev
Author: hofman
Date: 2009-09-03 21:05:38 +0000 (Thu, 03 Sep 2009)
Log Message:
-----------
Move use of Carbon GetCurrentKeyModifiers to NSEvent category. Avoid some more
Carbon imports.
Modified Paths:
--------------
trunk/Files_SKExtensions.m
trunk/NSEvent_SKExtensions.h
trunk/NSEvent_SKExtensions.m
trunk/NSString_SKExtensions.m
trunk/SKCFCallBacks.h
trunk/SKColorSwatch.m
trunk/SKMainWindowController.m
trunk/SKMainWindowController_Actions.m
trunk/SKPDFDocument.m
trunk/SKPDFSynchronizerServer.m
trunk/SKPDFView.m
trunk/SKTocOutlineView.h
trunk/SKTransitionController.h
Modified: trunk/Files_SKExtensions.m
===================================================================
--- trunk/Files_SKExtensions.m 2009-09-03 20:21:42 UTC (rev 5643)
+++ trunk/Files_SKExtensions.m 2009-09-03 21:05:38 UTC (rev 5644)
@@ -37,7 +37,7 @@
*/
#import "Files_SKExtensions.h"
-#import <Carbon/Carbon.h>
+#import <CoreFoundation/CoreFoundation.h>
NSString *SKDownloadDirectory() {
Modified: trunk/NSEvent_SKExtensions.h
===================================================================
--- trunk/NSEvent_SKExtensions.h 2009-09-03 20:21:42 UTC (rev 5643)
+++ trunk/NSEvent_SKExtensions.h 2009-09-03 21:05:38 UTC (rev 5644)
@@ -43,6 +43,7 @@
};
@interface NSEvent (SKExtensions)
++ (NSUInteger)currentModifierFlags;
- (NSUInteger)deviceIndependentModifierFlags;
- (NSUInteger)standardModifierFlags;
- (unichar)firstCharacter;
Modified: trunk/NSEvent_SKExtensions.m
===================================================================
--- trunk/NSEvent_SKExtensions.m 2009-09-03 20:21:42 UTC (rev 5643)
+++ trunk/NSEvent_SKExtensions.m 2009-09-03 21:05:38 UTC (rev 5644)
@@ -37,10 +37,26 @@
*/
#import "NSEvent_SKExtensions.h"
+#import <Carbon/Carbon.h>
@implementation NSEvent (SKExtensions)
++ (NSUInteger)currentModifierFlags {
+ NSUInteger flags = 0;
+ UInt32 currentKeyModifiers = GetCurrentKeyModifiers();
+ if (currentKeyModifiers & cmdKey)
+ flags |= NSCommandKeyMask;
+ if (currentKeyModifiers & shiftKey)
+ flags |= NSShiftKeyMask;
+ if (currentKeyModifiers & optionKey)
+ flags |= NSAlternateKeyMask;
+ if (currentKeyModifiers & controlKey)
+ flags |= NSControlKeyMask;
+
+ return flags;
+}
+
- (NSUInteger)deviceIndependentModifierFlags {
return [self modifierFlags] & NSDeviceIndependentModifierFlagsMask;
}
Modified: trunk/NSString_SKExtensions.m
===================================================================
--- trunk/NSString_SKExtensions.m 2009-09-03 20:21:42 UTC (rev 5643)
+++ trunk/NSString_SKExtensions.m 2009-09-03 21:05:38 UTC (rev 5644)
@@ -42,7 +42,7 @@
#import "NSURL_SKExtensions.h"
#import "NSImage_SKExtensions.h"
#import <SkimNotes/SkimNotes.h>
-#import <Carbon/Carbon.h>
+#import <CoreFoundation/CoreFoundation.h>
#define ELLIPSIS_CHARACTER 0x2026
Modified: trunk/SKCFCallBacks.h
===================================================================
--- trunk/SKCFCallBacks.h 2009-09-03 20:21:42 UTC (rev 5643)
+++ trunk/SKCFCallBacks.h 2009-09-03 21:05:38 UTC (rev 5644)
@@ -36,7 +36,7 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <Carbon/Carbon.h>
+#import <CoreFoundation/CoreFoundation.h>
extern const void *SKNSObjectRetain(CFAllocatorRef allocator, const void
*value);
Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m 2009-09-03 20:21:42 UTC (rev 5643)
+++ trunk/SKColorSwatch.m 2009-09-03 21:05:38 UTC (rev 5644)
@@ -39,8 +39,8 @@
#import "SKColorSwatch.h"
#import "SKRuntime.h"
#import "NSColor_SKExtensions.h"
-#import <Carbon/Carbon.h>
#import "SKAccessibilityFauxUIElement.h"
+#import "NSEvent_SKExtensions.h"
NSString *SKColorSwatchColorsChangedNotification =
@"SKColorSwatchColorsChangedNotification";
@@ -399,7 +399,7 @@
- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender {
NSPoint mouseLoc = [self convertPoint:[sender draggingLocation]
fromView:nil];
- BOOL isCopy = GetCurrentKeyModifiers() == optionKey;
+ BOOL isCopy = ([NSEvent currentModifierFlags] &&
NSDeviceIndependentModifierFlagsMask) == NSAlternateKeyMask;
NSInteger i = isCopy ? [self insertionIndexAtPoint:mouseLoc] : [self
colorIndexAtPoint:mouseLoc];
NSDragOperation dragOp = isCopy ? NSDragOperationCopy :
NSDragOperationGeneric;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2009-09-03 20:21:42 UTC (rev 5643)
+++ trunk/SKMainWindowController.m 2009-09-03 21:05:38 UTC (rev 5644)
@@ -40,7 +40,7 @@
#import "SKMainWindowController_Toolbar.h"
#import "SKMainWindowController_UI.h"
#import <Quartz/Quartz.h>
-#import <CoreServices/CoreServices.h>
+#import <Carbon/Carbon.h>
#import "SKStringConstants.h"
#import "SKSnapshotWindowController.h"
#import "SKNoteWindowController.h"
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2009-09-03 20:21:42 UTC (rev
5643)
+++ trunk/SKMainWindowController_Actions.m 2009-09-03 21:05:38 UTC (rev
5644)
@@ -62,6 +62,7 @@
#import "SKSplitView.h"
#import "SKPDFOutline.h"
#import "SKLineInspector.h"
+#import "NSEvent_SKExtensions.h"
@implementation SKMainWindowController (Actions)
@@ -88,8 +89,8 @@
- (IBAction)selectColor:(id)sender{
PDFAnnotation *annotation = [pdfView activeAnnotation];
if ([annotation isSkimNote]) {
- BOOL isFill = (GetCurrentKeyModifiers() & optionKey) != 0 &&
[annotation respondsToSelector:@selector(setInteriorColor:)];
- BOOL isText = (GetCurrentKeyModifiers() & optionKey) != 0 &&
[annotation respondsToSelector:@selector(setFontColor:)];
+ BOOL isFill = ([NSEvent currentModifierFlags] & NSAlternateKeyMask) !=
0 && [annotation respondsToSelector:@selector(setInteriorColor:)];
+ BOOL isText = ([NSEvent currentModifierFlags] & NSAlternateKeyMask) !=
0 && [annotation respondsToSelector:@selector(setFontColor:)];
NSColor *color = (isFill ? [(id)annotation interiorColor] : (isText ?
[(id)annotation fontColor] : [annotation color])) ?: [NSColor clearColor];
NSColor *newColor = [sender
respondsToSelector:@selector(representedObject)] ? [sender representedObject] :
[sender respondsToSelector:@selector(color)] ? [sender color] : nil;
if (newColor && [color isEqual:newColor] == NO) {
Modified: trunk/SKPDFDocument.m
===================================================================
--- trunk/SKPDFDocument.m 2009-09-03 20:21:42 UTC (rev 5643)
+++ trunk/SKPDFDocument.m 2009-09-03 21:05:38 UTC (rev 5644)
@@ -38,7 +38,7 @@
#import "SKPDFDocument.h"
#import <Quartz/Quartz.h>
-#import <Carbon/Carbon.h>
+#import <CoreFoundation/CoreFoundation.h>
#import <SkimNotes/SkimNotes.h>
#import "SKMainWindowController.h"
#import "PDFAnnotation_SKExtensions.h"
Modified: trunk/SKPDFSynchronizerServer.m
===================================================================
--- trunk/SKPDFSynchronizerServer.m 2009-09-03 20:21:42 UTC (rev 5643)
+++ trunk/SKPDFSynchronizerServer.m 2009-09-03 21:05:38 UTC (rev 5644)
@@ -42,7 +42,7 @@
#import "SKPDFSyncRecord.h"
#import "NSCharacterSet_SKExtensions.h"
#import "NSScanner_SKExtensions.h"
-#import <Carbon/Carbon.h>
+#import <CoreFoundation/CoreFoundation.h>
#import "Files_SKExtensions.h"
#import "NSString_SKExtensions.h"
#import "SKCFCallBacks.h"
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2009-09-03 20:21:42 UTC (rev 5643)
+++ trunk/SKPDFView.m 2009-09-03 21:05:38 UTC (rev 5644)
@@ -58,7 +58,7 @@
#import "PDFSelection_SKExtensions.h"
#import "NSBezierPath_BDSKExtensions.h"
#import "SKLineWell.h"
-#import <Carbon/Carbon.h>
+#import <CoreServices/CoreServices.h>
#import "NSGeometry_SKExtensions.h"
#import "SKTypeSelectHelper.h"
#import "SKRuntime.h"
@@ -1726,9 +1726,9 @@
if (highlightAnnotation) {
NSString *type = [highlightAnnotation type];
if ([pboardType isEqualToString:NSColorPboardType]) {
- if ((GetCurrentKeyModifiers() & optionKey) &&
[highlightAnnotation respondsToSelector:@selector(setInteriorColor:)])
+ if (([NSEvent currentModifierFlags] & NSAlternateKeyMask) &&
[highlightAnnotation respondsToSelector:@selector(setInteriorColor:)])
[(id)highlightAnnotation setInteriorColor:[NSColor
colorFromPasteboard:pboard]];
- else if ((GetCurrentKeyModifiers() & optionKey) &&
[highlightAnnotation respondsToSelector:@selector(setFontColor:)])
+ else if (([NSEvent currentModifierFlags] & NSAlternateKeyMask)
&& [highlightAnnotation respondsToSelector:@selector(setFontColor:)])
[(id)highlightAnnotation setFontColor:[NSColor
colorFromPasteboard:pboard]];
else
[highlightAnnotation setColor:[NSColor
colorFromPasteboard:pboard]];
@@ -4231,19 +4231,9 @@
}
- (void)doUpdateCursor {
- NSUInteger flags = 0;
- UInt32 currentKeyModifiers = GetCurrentKeyModifiers();
- if (currentKeyModifiers & cmdKey)
- flags |= NSCommandKeyMask;
- if (currentKeyModifiers & shiftKey)
- flags |= NSShiftKeyMask;
- if (currentKeyModifiers & optionKey)
- flags |= NSAlternateKeyMask;
- if (currentKeyModifiers & controlKey)
- flags |= NSControlKeyMask;
NSEvent *event = [NSEvent mouseEventWithType:NSMouseMoved
location:[[self window]
mouseLocationOutsideOfEventStream]
- modifierFlags:flags
+ modifierFlags:[NSEvent currentModifierFlags]
timestamp:0
windowNumber:[[self window] windowNumber]
context:nil
Modified: trunk/SKTocOutlineView.h
===================================================================
--- trunk/SKTocOutlineView.h 2009-09-03 20:21:42 UTC (rev 5643)
+++ trunk/SKTocOutlineView.h 2009-09-03 21:05:38 UTC (rev 5644)
@@ -37,7 +37,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <Carbon/Carbon.h>
+#import <CoreFoundation/CoreFoundation.h>
#import "SKOutlineView.h"
Modified: trunk/SKTransitionController.h
===================================================================
--- trunk/SKTransitionController.h 2009-09-03 20:21:42 UTC (rev 5643)
+++ trunk/SKTransitionController.h 2009-09-03 21:05:38 UTC (rev 5644)
@@ -37,7 +37,7 @@
*/
#import <Cocoa/Cocoa.h>
-#import <Carbon/Carbon.h>
+#import <CoreFoundation/CoreFoundation.h>
#import <Quartz/Quartz.h>
#pragma mark SKTransitionController
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit