From 04d4d4c290dfafa9e2b50c4158484231e13533a1 Mon Sep 17 00:00:00 2001 From: Nathan Henrie Date: Sat, 30 Mar 2024 17:50:18 -0600 Subject: [PATCH] remove private apis (#3002) * Remove the private APIs entirely This removes `CGSPrivate.h`, `CPSPrivate.h`, as well as `QSCGSTransition.{h,m}` which only seemed to serve as adapters for them. It additionally either removes entirely or comments out (to serve as a quick and dirty reference for reimplementation) code that depended on these files. This will break the pretty animations. See also: https://github.com/quicksilver/Quicksilver/issues/3001 * Revert "#FIXME: Force-disable superfluous effects on startup" This reverts commit a5640c6cd5470e872f7f796ffbce45097150ac4d. * Cleanup unused * Remove references to flare --- Quicksilver/Code-App/QSApp.m | 7 - Quicksilver/Code-App/QSController.m | 2 +- Quicksilver/Code-App/QSSimpleNotifier.m | 12 - Quicksilver/Code-External/CGSPrivate.h | 246 ----------------- Quicksilver/Code-External/CPSPrivate.h | 260 ------------------ .../Code-QuickStepEffects/QSCGSTransition.h | 22 -- .../Code-QuickStepEffects/QSCGSTransition.m | 58 ---- Quicksilver/Code-QuickStepEffects/QSEffects.h | 1 - Quicksilver/Code-QuickStepEffects/QSWindow.h | 12 - Quicksilver/Code-QuickStepEffects/QSWindow.m | 139 ---------- .../Code-QuickStepEffects/QSWindowAnimation.h | 6 +- .../Code-QuickStepEffects/QSWindowAnimation.m | 38 +-- .../NSApplication_BLTRExtensions.m | 6 - .../NSWindow_BLTRExtensions.m | 1 - .../Code-QuickStepFoundation/QSFoundation.h | 2 - .../Code-QuickStepFoundation/QSHotKeyEvent.m | 9 - .../Code-QuickStepInterface/QSHotKeyEditor.m | 13 - .../QSInterfaceController.m | 14 +- .../Bezel/QSBezelInterfaceController.m | 1 - .../QSHotKeyPlugIn/QSHotKeyTriggerManager.m | 1 - .../Quicksilver.xcodeproj/project.pbxproj | 15 - 21 files changed, 11 insertions(+), 854 deletions(-) delete mode 100644 Quicksilver/Code-External/CGSPrivate.h delete mode 100644 Quicksilver/Code-External/CPSPrivate.h delete mode 100644 Quicksilver/Code-QuickStepEffects/QSCGSTransition.h delete mode 100644 Quicksilver/Code-QuickStepEffects/QSCGSTransition.m diff --git a/Quicksilver/Code-App/QSApp.m b/Quicksilver/Code-App/QSApp.m index a0c5965f8..a5ffd8c5e 100644 --- a/Quicksilver/Code-App/QSApp.m +++ b/Quicksilver/Code-App/QSApp.m @@ -32,13 +32,6 @@ +(void)load { setenv("QSDebugCatalog", "1", YES); } #endif - // #TODO @n8henrie: Hopefully temporary workaround for Sonoma - // https://github.com/quicksilver/Quicksilver/issues/2962 - if (@available(macOS 14, *)) { - NSLog(@"Force-disabling superfluous effects at startup"); - [[NSUserDefaults standardUserDefaults] setBool:false forKey:kUseEffects]; - } - } + (void)initialize { diff --git a/Quicksilver/Code-App/QSController.m b/Quicksilver/Code-App/QSController.m index fc175b507..ad182b89d 100644 --- a/Quicksilver/Code-App/QSController.m +++ b/Quicksilver/Code-App/QSController.m @@ -474,7 +474,7 @@ - (void)animationDidEnd:(NSAnimation *)animation { - (void)hideSplash:sender { if (splashWindow) { - [splashWindow flare:self]; +// [splashWindow flare:self]; [splashWindow close]; splashWindow = nil; } diff --git a/Quicksilver/Code-App/QSSimpleNotifier.m b/Quicksilver/Code-App/QSSimpleNotifier.m index 62b7a4222..e871fb7ac 100644 --- a/Quicksilver/Code-App/QSSimpleNotifier.m +++ b/Quicksilver/Code-App/QSSimpleNotifier.m @@ -11,8 +11,6 @@ #import "QSBackgroundView.h" #import "QSWindow.h" #import "NSColor_QSModifications.h" -#import "QSCGSTransition.h" - #import "QSWindowAnimation.h" #import @@ -36,16 +34,11 @@ - (id)init { - (void)hideWindow:(NSWindow *)window early:(BOOL)early { if (early) { - //[window setShowEffect:[NSDictionary dictionaryWithObjectsAndKeys:@"QSExtraExtraEffect", @"transformFn", @"show", @"type", nil]]; [(QSWindow *)window performEffect:[NSDictionary dictionaryWithObjectsAndKeys:@"0.25", @"duration", @"QSPurgeEffect", @"transformFn", @"visible", @"type", nil]]; [(QSWindow *)window reallyOrderOut:self]; - - //[[QSWindowAnimation helper] flipHide:window]; } else { [(QSWindow *)window performEffect:[NSDictionary dictionaryWithObjectsAndKeys:@"0.25", @"duration", @"QSShrinkEffect", @"transformFn", @"hide", @"type", nil]]; - [(QSWindow *)window reallyOrderOut:self]; - } [window close]; } @@ -154,15 +147,10 @@ - (void)mainThreadDisplayNotificationWithAttributes:(NSDictionary *)attributes { } [self setThisTitle:titleString]; - // - //[window pulse:self]; curTimer = [NSTimer scheduledTimerWithTimeInterval:2.0 target:self selector:@selector(hideNotification:) userInfo:window repeats:NO]; [[NSRunLoop currentRunLoop] addTimer:curTimer forMode:NSModalPanelRunLoopMode]; - // [attributes objectForKey:QSNotifierTitle] , GROWL_NOTIFICATION_TITLE, - // [attributes objectForKey:QSNotifierText] , GROWL_NOTIFICATION_DESCRIPTION, - // [[attributes objectForKey:QSNotifierIcon] TIFFRepresentation] , GROWL_NOTIFICATION_ICON, } - (void)hideNotification:(NSTimer *)timer { NSWindow *window = [timer userInfo]; diff --git a/Quicksilver/Code-External/CGSPrivate.h b/Quicksilver/Code-External/CGSPrivate.h deleted file mode 100644 index ea69b8149..000000000 --- a/Quicksilver/Code-External/CGSPrivate.h +++ /dev/null @@ -1,246 +0,0 @@ -/* CGSPrivate.h -- Header file for undocumented CoreGraphics stuff. */ - -/* This file is a relicensed portion of DesktopManager and was originally released under - * the terms of the GNU General Public Licence. Original licence text follows the new terms. - * The contents of this file has been re-released by the original author under the following terms: - * - * Copyright (C) 2003, 2004, 2013 Richard J Wareham - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of this - * software and associated documentation files (the "Software"), to deal in the Software - * without restriction, including without limitation the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all copies or - * substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING - * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/* Original licence text follows. */ - -/* DesktopManager -- A virtual desktop provider for OS X - * - * Copyright (C) 2003, 2004 Richard J Wareham - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., 675 - * Mass Ave, Cambridge, MA 02139, USA. - */ - -#include - -/* These functions all return a status code. Typical CoreGraphics replies are: - kCGErrorSuccess = 0, - kCGErrorFirst = 1000, - kCGErrorFailure = kCGErrorFirst, - kCGErrorIllegalArgument = 1001, - kCGErrorInvalidConnection = 1002, -*/ - -// Internal CoreGraphics typedefs -typedef int CGSConnection; -typedef long CGSWindow; -typedef int CGSValue; - -//// CONSTANTS //// - -/* Window ordering mode. */ -typedef enum _CGSWindowOrderingMode { - kCGSOrderAbove = 1, // Window is ordered above target. - kCGSOrderBelow = -1, // Window is ordered below target. - kCGSOrderOut = 0 // Window is removed from the on-screen window list. -} CGSWindowOrderingMode; - -// Internal CoreGraphics functions. - -/* Retrieve the workspace number associated with the workspace currently - * being shown. - * - * cid -- Current connection. - * workspace -- Pointer to int value to be set to workspace number. - */ -extern OSStatus CGSGetWorkspace(const CGSConnection cid, int *workspace); - -/* Retrieve workspace number associated with the workspace a particular window - * resides on. - * - * cid -- Current connection. - * wid -- Window number of window to examine. - * workspace -- Pointer to int value to be set to workspace number. - */ -extern OSStatus CGSGetWindowWorkspace(const CGSConnection cid, const CGSWindow wid, int *workspace); - -/* Show workspace associated with a workspace number. - * - * cid -- Current connection. - * workspace -- Workspace number. - */ -extern OSStatus CGSSetWorkspace(const CGSConnection cid, int workspace); - -typedef enum { - CGSNone = 0, // No transition effect. - CGSFade, // Cross-fade. - CGSZoom, // Zoom/fade towards us. - CGSReveal, // Reveal new desktop under old. - CGSSlide, // Slide old out and new in. - CGSWarpFade, // Warp old and fade out revealing new. - CGSSwap, // Swap desktops over graphically. - CGSCube, // The well-known cube effect. - CGSWarpSwitch, // Warp old, switch and un-warp. - CGSFlip, -} CGSTransitionType; - -typedef enum { - CGSDown, // Old desktop moves down. - CGSLeft, // Old desktop moves left. - CGSRight, // Old desktop moves right. - CGSInRight, // CGSSwap: Old desktop moves into screen, - // new comes from right. - CGSBottomLeft = 5, // CGSSwap: Old desktop moves to bl, - // new comes from tr. - CGSBottomRight, // Old desktop to br, New from tl. - CGSDownTopRight, // CGSSwap: Old desktop moves down, new from tr. - CGSUp, // Old desktop moves up. - CGSTopLeft, // Old desktop moves tl. - - CGSTopRight, // CGSSwap: old to tr. new from bl. - CGSUpBottomRight, // CGSSwap: old desktop up, new from br. - CGSInBottom, // CGSSwap: old in, new from bottom. - CGSLeftBottomRight, // CGSSwap: old one moves left, new from br. - CGSRightBottomLeft, // CGSSwap: old one moves right, new from bl. - CGSInBottomRight, // CGSSwap: onl one in, new from br. - CGSInOut // CGSSwap: old in, new out. -} CGSTransitionOption; - -typedef enum { - CGSTagExposeFade = 0x0002, // Fade out when Expose activates. - CGSTagNoShadow = 0x0008, // No window shadow. - CGSTagTransparent = 0x0200, // Transparent to mouse clicks. - CGSTagSticky = 0x0800, // Appears on all workspaces. -} CGSWindowTag; - -extern OSStatus CGSSetWorkspaceWithTransition(const CGSConnection cid, - int workspaceNumber, CGSTransitionType transition, CGSTransitionOption subtype, - float time); - -/* Get the default connection for the current process. */ -extern CGSConnection _CGSDefaultConnection(void); - -typedef struct { - uint32_t unknown1; - CGSTransitionType type; - CGSTransitionOption option; - CGSWindow wid; /* Can be 0 for full-screen */ - float *backColour; /* Null for black otherwise pointer to 3 float array with RGB value */ -} CGSTransitionSpec; - -/* Transition handling. */ -extern OSStatus CGSNewTransition(const CGSConnection cid, const CGSTransitionSpec* spec, int *pTransitionHandle); -extern OSStatus CGSInvokeTransition(const CGSConnection cid, int transitionHandle, float duration); -extern OSStatus CGSReleaseTransition(const CGSConnection cid, int transitionHandle); - -// thirtyTwo must = 32 for some reason. tags is pointer to -//array ot ints (size 2?). First entry holds window tags. -// 0x0800 is sticky bit. -extern OSStatus CGSGetWindowTags(const CGSConnection cid, const CGSWindow wid, - CGSWindowTag *tags, int thirtyTwo); -extern OSStatus CGSSetWindowTags(const CGSConnection cid, const CGSWindow wid, - CGSWindowTag *tags, int thirtyTwo); -extern OSStatus CGSClearWindowTags(const CGSConnection cid, const CGSWindow wid, - CGSWindowTag *tags, int thirtyTwo); -extern OSStatus CGSGetWindowEventMask(const CGSConnection cid, const CGSWindow wid, uint32_t *mask); -extern OSStatus CGSSetWindowEventMask(const CGSConnection cid, const CGSWindow wid, uint32_t mask); - -// Get on-screen window counts and lists. -extern OSStatus CGSGetWindowCount(const CGSConnection cid, CGSConnection targetCID, int* outCount); -extern OSStatus CGSGetWindowList(const CGSConnection cid, CGSConnection targetCID, - int count, int* list, int* outCount); - -// Get on-screen window counts and lists. -extern OSStatus CGSGetOnScreenWindowCount(const CGSConnection cid, CGSConnection targetCID, int* outCount); -extern OSStatus CGSGetOnScreenWindowList(const CGSConnection cid, CGSConnection targetCID, - int count, int* list, int* outCount); - -// Per-workspace window counts and lists. -extern OSStatus CGSGetWorkspaceWindowCount(const CGSConnection cid, int workspaceNumber, int *outCount); -extern OSStatus CGSGetWorkspaceWindowList(const CGSConnection cid, int workspaceNumber, int count, - int* list, int* outCount); - -// Gets the level of a window -extern OSStatus CGSGetWindowLevel(const CGSConnection cid, CGSWindow wid, - int *level); - -// Window ordering -extern OSStatus CGSOrderWindow(const CGSConnection cid, const CGSWindow wid, - CGSWindowOrderingMode place, CGSWindow relativeToWindowID /* can be NULL */); - -// Gets the screen rect for a window. -extern OSStatus CGSGetScreenRectForWindow(const CGSConnection cid, CGSWindow wid, - CGRect *outRect); - -// Window appearance/position -extern OSStatus CGSSetWindowAlpha(const CGSConnection cid, const CGSWindow wid, float alpha); -extern OSStatus CGSSetWindowListAlpha(const CGSConnection cid, CGSWindow *wids, int count, float alpha); -extern OSStatus CGSGetWindowAlpha(const CGSConnection cid, const CGSWindow wid, float* alpha); -extern OSStatus CGSMoveWindow(const CGSConnection cid, const CGSWindow wid, CGPoint *point); -extern OSStatus CGSSetWindowTransform(const CGSConnection cid, const CGSWindow wid, CGAffineTransform transform); -extern OSStatus CGSGetWindowTransform(const CGSConnection cid, const CGSWindow wid, CGAffineTransform * outTransform); -extern OSStatus CGSSetWindowTransforms(const CGSConnection cid, CGSWindow *wids, CGAffineTransform *transform, int n); - -extern OSStatus CGSMoveWorkspaceWindows(const CGSConnection connection, int toWorkspace, int fromWorkspace); -extern OSStatus CGSMoveWorkspaceWindowList(const CGSConnection connection, CGSWindow *wids, int count, - int toWorkspace); - -// extern OSStatus CGSConnectionGetPID(const CGSConnection cid, pid_t *pid, CGSConnection b); - -extern OSStatus CGSGetWindowProperty(const CGSConnection cid, CGSWindow wid, CGSValue key, - CGSValue *outValue); - -//extern OSStatus CGSWindowAddRectToDirtyShape(const CGSConnection cid, const CGSWindow wid, CGRect *rect); -extern OSStatus CGSUncoverWindow(const CGSConnection cid, const CGSWindow wid); -extern OSStatus CGSFlushWindow(const CGSConnection cid, const CGSWindow wid, int unknown /* 0 works */ ); - -extern OSStatus CGSGetWindowOwner(const CGSConnection cid, const CGSWindow wid, CGSConnection *ownerCid); -extern OSStatus CGSConnectionGetPID(const CGSConnection cid, pid_t *pid, const CGSConnection ownerCid); - -// Values -extern CGSValue CGSCreateCStringNoCopy(const char *str); -extern char* CGSCStringValue(CGSValue string); -extern int CGSIntegerValue(CGSValue intVal); - -//#define CGSTransparentBackgroundMask (1 << 7) - -// Window wrapping -typedef struct CGPointWarp CGPointWarp; - -struct CGPointWarp { - float local; - float global; -}; - -extern CGError CGSSetWindowWarp(const CGSConnection cid, const CGSWindow wid, uint32_t w, uint32_t h, CGPointWarp *mesh); -extern OSStatus CGSSetWindowListBrightness(const CGSConnection cid, CGSWindow *wids, float *brightness, int count); - -// Global Hotkeys -typedef enum { - CGSGlobalHotKeyEnable = 0, - CGSGlobalHotKeyDisable = 1, -} CGSGlobalHotKeyOperatingMode; - -extern CGError CGSGetGlobalHotKeyOperatingMode(CGSConnection connection, CGSGlobalHotKeyOperatingMode *mode); -extern CGError CGSSetGlobalHotKeyOperatingMode(CGSConnection connection, CGSGlobalHotKeyOperatingMode mode); diff --git a/Quicksilver/Code-External/CPSPrivate.h b/Quicksilver/Code-External/CPSPrivate.h deleted file mode 100644 index a17161782..000000000 --- a/Quicksilver/Code-External/CPSPrivate.h +++ /dev/null @@ -1,260 +0,0 @@ -// CPS.h - -#ifdef __cplusplus -extern "C" { -#endif - -#if PRAGMA_STRUCT_ALIGN -#pragma options align=mac68k -#elif PRAGMA_STRUCT_PACKPUSH -#pragma pack(push, 2) -#elif PRAGMA_STRUCT_PACK -#pragma pack(2)h -#endif - -struct CPSProcessSerNum -{ - UInt32 lo; - UInt32 hi; -}; - -typedef struct CPSProcessSerNum CPSProcessSerNum; - -enum -{ - kCPSNoProcess = 0, - kCPSSystemProcess = 1, - kCPSCurrentProcess = 2 -}; - -enum -{ - bfCPSIntraProcessSwitch = 1, - bfCPSDeathBySignal = 2 -}; - -typedef UInt16 CPSEventFlags; - -enum -{ - kCPSBlueApp = 0, - kCPSBlueBox = 1, - kCPSCarbonApp = 2, - kCPSYellowApp = 3, - kCPSUnknownApp = 4 -}; - -typedef UInt32 CPSAppFlavour; - -enum -{ - kCPSBGOnlyAttr = 1024, - kCPSUIElementAttr = 65536, - kCPSHiddenAttr = 131072, - kCPSNoConnectAttr = 262144, - kCPSFullScreenAttr = 524288, - kCPSClassicReqAttr = 1048576, - kCPSNativeReqAttr = 2097152 -}; - -typedef UInt32 CPSProcAttributes; - -struct CPSProcessInfoRec -{ - CPSProcessSerNum Parent; - UInt64 LaunchDate; - CPSAppFlavour Flavour; - CPSProcAttributes Attributes; - UInt32 ExecFileType; - UInt32 ExecFileCreator; - UInt32 UnixPID; -}; - -typedef struct CPSProcessInfoRec CPSProcessInfoRec; - -enum -{ - kCPSNotifyChildDeath = 1, - kCPSNotifyNewFront = 2, - kCPSNotifyAppBirth = 4, - kCPSNotifyAppDeath = 8, - kCPSNotifyLaunch = 9, - kCPSNotifyServiceReq = 16, - kCPSNotifyAppHidden = 32, - kCPSNotifyAppRevealed = 64, - kCPSNotifyFGEnabled = 128, - kCPSNotifyLaunchStart = 256, - kCPSNotifyAppReady = 512, - kCPSNotifyLaunchFail = 1024, - kCPSNotifyAppDeathExt = 2048, - kCPSNotifyLostKeyFocus = 4096 -}; - -typedef UInt32 CPSNotificationCodes; - -enum -{ - bfCPSLaunchInhibitDaemon = 128, - bfCPSLaunchDontSwitch = 512, - bfCPSLaunchNoProcAttr = 2048, - bfCPSLaunchAsync = 65536, - bfCPSLaunchStartClassic = 131072, - bfCPSLaunchInClassic = 262144, - bfCPSLaunchInstance = 524288, - bfCPSLaunchAndHide = 1048576, - bfCPSLaunchAndHideOthers = 2097152 -}; - -typedef UInt32 CPSLaunchOptions; - -typedef UInt8 *CPSLaunchRefcon; - -typedef UInt8 *CPSLaunchData; - -enum -{ - bfCPSExtLaunchWithData = 2, - bfCPSExtLaunchByParent = 4, - bfCPSExtLaunchAsUidGid = 8 -}; - -typedef UInt32 CPSLaunchPBFields; - -struct CPSLaunchPB -{ - CPSLaunchPBFields Contents; - CPSLaunchData pData; - UInt32 DataLen; - UInt32 DataTag; - UInt32 RefCon; - CPSProcessSerNum Parent; - UInt32 ChildUID; - UInt32 ChildGID; -}; - -typedef struct CPSLaunchPB CPSLaunchPB; - -enum -{ - bfCPSKillHard = 1, - bfCPSKillAllClassicApps = 2 -}; - -typedef UInt32 CPSKillOptions; - -enum -{ - kCPSLaunchService = 0, - kCPSKillService = 1, - kCPSHideService = 2, - kCPSShowService = 3, - kCPSPrivService = 4, - kCPSExtDeathNoteService = 5 -}; - -typedef UInt32 CPSServiceReqType; - -struct CPSLaunchRequest -{ - CPSProcessSerNum TargetPSN; - CPSLaunchOptions Options; - CPSProcAttributes ProcAttributes; - UInt8 *pUTF8TargetPath; - UInt32 PathLen; -}; - -typedef struct CPSLaunchRequest CPSLaunchRequest; - -struct CPSKillRequest -{ - CPSProcessSerNum TargetPSN; - CPSKillOptions Options; -}; - -typedef struct CPSKillRequest CPSKillRequest; - -struct CPSHideRequest -{ - CPSProcessSerNum TargetPSN; -}; - -typedef struct CPSHideRequest CPSHideRequest; - -struct CPSShowRequest -{ - CPSProcessSerNum TargetPSN; -}; - -typedef struct CPSShowRequest CPSShowRequest; - -struct CPSExtDeathNotice -{ - CPSProcessSerNum DeadPSN; - UInt32 Flags; - UInt8 *pUTF8AppPath; - UInt32 PathLen; -}; - -typedef struct CPSExtDeathNotice CPSExtDeathNotice; - -union CPSRequestDetails -{ - CPSLaunchRequest LaunchReq; - CPSKillRequest KillReq; - CPSHideRequest HideReq; - CPSShowRequest ShowReq; - CPSExtDeathNotice DeathNotice; -}; - -typedef union CPSRequestDetails CPSRequestDetails; - -struct CPSServiceRequest -{ - CPSServiceReqType Type; - SInt32 ID; - CPSRequestDetails Details; -}; - -typedef struct CPSServiceRequest CPSServiceRequest; - -enum -{ - kCPSProcessInterruptKey = 0, - kCPSAppSwitchFwdKey = 1, - kCPSAppSwitchBackKey = 2, - kCPSSessionInterruptKey = 3, - kCPSScreenSaverKey = 4, - kCPSDiskEjectKey = 5, - kCPSSpecialKeyCount = 6 -}; - -typedef SInt32 CPSSpecialKeyID; - -extern Boolean CPSEqualProcess( CPSProcessSerNum *psn1, CPSProcessSerNum *psn2); -extern OSErr CPSGetCurrentProcess( CPSProcessSerNum *psn); -extern OSErr CPSGetFrontProcess( CPSProcessSerNum *psn); -extern OSErr CPSGetNextProcess( CPSProcessSerNum *psn); -extern OSErr CPSGetNextToFrontProcess( CPSProcessSerNum *psn); -extern OSErr CPSGetProcessInfo( CPSProcessSerNum *psn, CPSProcessInfoRec *info, char *path, NSInteger maxPathLen, NSInteger *len, char *name, NSInteger maxNameLen); -extern OSErr CPSPostHideMostReq( CPSProcessSerNum *psn); -extern OSErr CPSPostHideReq( CPSProcessSerNum *psn); -extern OSErr CPSPostKillRequest( CPSProcessSerNum *psn, CPSKillOptions options); -extern OSErr CPSPostShowAllReq( CPSProcessSerNum *psn); -extern OSErr CPSPostShowReq( CPSProcessSerNum *psn); -extern OSErr CPSSetFrontProcess( CPSProcessSerNum *psn); -extern OSErr CPSReleaseKeyFocus( CPSProcessSerNum *psn); -extern OSErr CPSStealKeyFocus( CPSProcessSerNum *psn); -extern OSErr CPSSetProcessName ( CPSProcessSerNum *psn, char *processname); -extern OSErr CPSEnableForegroundOperation( CPSProcessSerNum *psn, UInt32 _arg2, UInt32 _arg3, UInt32 _arg4, UInt32 _arg5); - -#if PRAGMA_STRUCT_ALIGN -#pragma options align=reset -#elif PRAGMA_STRUCT_PACKPUSH -#pragma pack(pop) -#elif PRAGMA_STRUCT_PACK -#pragma pack() -#endif - -#ifdef __cplusplus -} -#endif diff --git a/Quicksilver/Code-QuickStepEffects/QSCGSTransition.h b/Quicksilver/Code-QuickStepEffects/QSCGSTransition.h deleted file mode 100644 index 962b4cec0..000000000 --- a/Quicksilver/Code-QuickStepEffects/QSCGSTransition.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// QSCGSTransition.h -// Quicksilver -// -// Created by Nicholas Jitkoff on 10/9/05. -// Copyright 2005 __MyCompanyName__. All rights reserved. -// - -#import -#import - -@interface QSCGSTransition : NSObject { - int handle; - CGSTransitionSpec spec; -} -+ (id)transitionWithWindow:(NSWindow *)window type:(CGSTransitionType)type option:(CGSTransitionOption)option; -+ (id)transitionWithWindow:(NSWindow *)window type:(CGSTransitionType)type option:(CGSTransitionOption)option duration:(CGFloat)duration; -+ (id)transitionWithType:(CGSTransitionType)type option:(CGSTransitionOption)option duration:(CGFloat)duration; -- (id)initWithType:(CGSTransitionType) type option:(CGSTransitionOption)option; -- (void)attachToWindow:(NSWindow *)window; -- (void)runTransition:(CGFloat)duration; -@end diff --git a/Quicksilver/Code-QuickStepEffects/QSCGSTransition.m b/Quicksilver/Code-QuickStepEffects/QSCGSTransition.m deleted file mode 100644 index 5e88ba69f..000000000 --- a/Quicksilver/Code-QuickStepEffects/QSCGSTransition.m +++ /dev/null @@ -1,58 +0,0 @@ -// -// QSCGSTransition.m -// Quicksilver -// -// Created by Nicholas Jitkoff on 10/9/05. -// Copyright 2005 __MyCompanyName__. All rights reserved. -// - -#import "QSCGSTransition.h" -#import - -@implementation QSCGSTransition -+ (id)transitionWithType:(CGSTransitionType)type option:(CGSTransitionOption)option duration:(CGFloat)duration { - return [[self alloc] initWithType:(CGSTransitionType) type option:(CGSTransitionOption)option]; -} -+ (id)transitionWithWindow:(NSWindow *)window type:(CGSTransitionType)type option:(CGSTransitionOption)option duration:(CGFloat)duration { - id transition = [[self alloc] initWithType:(CGSTransitionType)type option:(CGSTransitionOption)option]; - [transition attachToWindow:window]; - return transition; -} -+ (id)transitionWithWindow:(NSWindow *)window type:(CGSTransitionType)type option:(CGSTransitionOption)option { - id transition = [[self alloc] initWithType:(CGSTransitionType) type option:(CGSTransitionOption)option]; - [transition attachToWindow:window]; - return transition; -} - -- (id)initWithType:(CGSTransitionType) type option:(CGSTransitionOption)option { - self = [super init]; - if (self != nil) { - spec.unknown1 = 0; - spec.type = type; - spec.option = option | (1<<7); - spec.wid = 0; - spec.backColour = NULL; - } - return self; -} -- (void)dealloc { - if (handle) - CGSReleaseTransition(_CGSDefaultConnection(), handle); -} -- (void)attachToWindow:(NSWindow *)window { - CGSConnection cgs = _CGSDefaultConnection(); - spec.wid = (int)[(NSWindow *)window windowNumber]; - CGSNewTransition(cgs, &spec, &handle); -} -- (void)finishTransition { - CGSReleaseTransition(_CGSDefaultConnection(), handle); - handle = 0; -} -- (void)runTransition:(CGFloat)duration { - if (!handle) return; - CGSInvokeTransition(_CGSDefaultConnection(), handle, duration); - usleep((useconds_t) (duration*1000000)); - [self finishTransition]; -} - -@end diff --git a/Quicksilver/Code-QuickStepEffects/QSEffects.h b/Quicksilver/Code-QuickStepEffects/QSEffects.h index 2cdf90be2..014ca9dd8 100644 --- a/Quicksilver/Code-QuickStepEffects/QSEffects.h +++ b/Quicksilver/Code-QuickStepEffects/QSEffects.h @@ -7,7 +7,6 @@ * */ -#import #import #import #import diff --git a/Quicksilver/Code-QuickStepEffects/QSWindow.h b/Quicksilver/Code-QuickStepEffects/QSWindow.h index 1e8d0351d..0ab2f5785 100644 --- a/Quicksilver/Code-QuickStepEffects/QSWindow.h +++ b/Quicksilver/Code-QuickStepEffects/QSWindow.h @@ -1,18 +1,10 @@ #import -#import @protocol QSWindowDelegate - (void)firstResponderChanged:(NSResponder *)aResponder; - (BOOL)shouldSendEvent:(NSEvent *)theEvent; @end -@interface NSWindow (Effects) -- (void)pulse:(id)sender; -- (void)flare:(id)sender; -- (void)shrink:(id)sender; -- (void)fold:(id)sender; -@end - #define kQSWindowHideEffect @"hideEffect" #define kQSWindowShowEffect @"showEffect" @@ -79,7 +71,3 @@ #endif @end - -@interface NSWindow (CGSTransitionRedraw) -- (void)displayWithTransition:(CGSTransitionType) type option:(CGSTransitionOption)option duration:(CGFloat)duration; -@end diff --git a/Quicksilver/Code-QuickStepEffects/QSWindow.m b/Quicksilver/Code-QuickStepEffects/QSWindow.m index c8b684526..283c46cb7 100644 --- a/Quicksilver/Code-QuickStepEffects/QSWindow.m +++ b/Quicksilver/Code-QuickStepEffects/QSWindow.m @@ -10,126 +10,6 @@ - (void)_unhideAllDrawers; @end -@implementation NSWindow (Effects) - -- (void)pulse:(id)sender { - CGSConnection conn = _CGSDefaultConnection(); - CGAffineTransform transform; - CGSGetWindowTransform(conn, [self windowNumber] , &transform); - NSSize size = [self frame] .size; - CGFloat f; - for (f = 1.0; f <= 1.01; f += 0.001) { - CGAffineTransform newTransform = CGAffineTransformConcat(transform, CGAffineTransformTranslate(CGAffineTransformMakeScale(1/f, 1/f), -size.width/2 + size.width/2*f, -size.height/2+size.height/2*f) ); - //CGSSetWindowAlpha(conn, [self windowNumber] , f); - CGSSetWindowTransform(conn, [self windowNumber] , newTransform); - - } - CGSSetWindowTransform(conn, [self windowNumber] , transform); -} - -#define FLAREDURATION 0.3f -- (void)flare:(id)sender { - CGSConnection conn = _CGSDefaultConnection(); - CGAffineTransform transform; - CGSGetWindowTransform(conn, [self windowNumber] , &transform); - NSSize size = [self frame] .size; - CGFloat f; - NSDate *date = [NSDate date]; - CGFloat elapsed; - while ((elapsed = - [date timeIntervalSinceNow]) selector:<#(SEL)aSelector#> userInfo:<#(id)userInfo#> repeats:<#(BOOL)yesOrNo#> - CGSReleaseTransition(cgs, handle); -} -@end diff --git a/Quicksilver/Code-QuickStepEffects/QSWindowAnimation.h b/Quicksilver/Code-QuickStepEffects/QSWindowAnimation.h index 34e911163..c8ae5b3e1 100644 --- a/Quicksilver/Code-QuickStepEffects/QSWindowAnimation.h +++ b/Quicksilver/Code-QuickStepEffects/QSWindowAnimation.h @@ -7,7 +7,7 @@ // #import -#import + #define kQSGSTransformF @"transformFn" #define kQSGSBrightF @"brightnessFn" @@ -24,13 +24,9 @@ @interface QSWindowAnimation : NSAnimation { @public NSWindow *_window; - CGSWindow wid; - CGSConnection cgs; void (*effectFt) (QSWindowAnimation *); - CGPointWarp *(*warpFt) (QSWindowAnimation *, CGFloat, uint32_t *, uint32_t *); - CGAffineTransform (*transformFt) (QSWindowAnimation *, CGFloat); struct CGAffineTransform _transformA; struct CGAffineTransform _transformB; diff --git a/Quicksilver/Code-QuickStepEffects/QSWindowAnimation.m b/Quicksilver/Code-QuickStepEffects/QSWindowAnimation.m index cfd0e4729..49a5f5af0 100644 --- a/Quicksilver/Code-QuickStepEffects/QSWindowAnimation.m +++ b/Quicksilver/Code-QuickStepEffects/QSWindowAnimation.m @@ -16,11 +16,8 @@ @implementation QSWindowAnimation - (id)init { if (self = [super init]) { - cgs = _CGSDefaultConnection(); [self setDuration:0.3333f]; - alphaFt = QSStandardAlphaBlending; transformFt = NULL; - warpFt = NULL; brightFt = NULL; effectFt = NULL; restoreTransform = YES; @@ -31,7 +28,6 @@ - (id)init { - (id)initWithWindow:(NSWindow *)window { if (self = [self init]) { [self setWindow:window]; - CGSGetWindowTransform(cgs, wid, &_transformA); } return self; } @@ -50,8 +46,6 @@ - (void)setAttributes:(NSDictionary *)attr { transformFt = CFBundleGetFunctionPointerForName (CFBundleGetBundleWithIdentifier(kQSEffectsID), (__bridge CFStringRef) value); if (value = [attr objectForKey:kQSGSBrightF]) brightFt = CFBundleGetFunctionPointerForName (CFBundleGetBundleWithIdentifier(kQSEffectsID), (__bridge CFStringRef) value); - if (value = [attr objectForKey:kQSGSWarpF]) - warpFt = CFBundleGetFunctionPointerForName (CFBundleGetBundleWithIdentifier(kQSEffectsID), (__bridge CFStringRef) value); if (value = [attr objectForKey:kQSGSAlphaF]) alphaFt = CFBundleGetFunctionPointerForName (CFBundleGetBundleWithIdentifier(kQSEffectsID), (__bridge CFStringRef) value); if (value = [attr objectForKey:kQSGSDuration]) @@ -95,35 +89,10 @@ - (void)setCurrentProgress:(NSAnimationProgress)progress { if (progress >= 0.99f ) newTransform = _transformA; - CGSSetWindowTransform(cgs, wid, newTransform); - -// if ([childWindows count]) { -// CGSSetWindowTransform(cgs, [[childWindows lastObject] windowNumber] , newTransform); -// } - } - if (warpFt) { - uint32_t w, h; - CGPointWarp *mesh = (*warpFt)(self, _percent, &w, &h); - CGSSetWindowWarp(cgs, wid, w, h, mesh); - free(mesh); } - if (alphaFt) { - CGFloat alpha = (*alphaFt) (self, progress); - - // NSLog(@"step a %f", alpha); - // alpha = progress; - CGSSetWindowAlpha(cgs, wid, alpha); - if ([childWindows count]) { - CGSSetWindowAlpha(cgs, (int)[[childWindows lastObject] windowNumber] , alpha); - } - if (progress == 1.0f) - [_window setAlphaValue:alpha]; - - } if (brightFt) { CGFloat brightness = (*brightFt) (self, _percent); - CGSSetWindowListBrightness(cgs, &wid, (float *)&brightness, 1); } if (progress == 1.0f) [self finishAnimation]; @@ -140,7 +109,6 @@ - (NSWindow *)window { return _window; } - (void)setWindow:(NSWindow *)aWindow { if(_window != aWindow){ _window = aWindow; - wid = (int)[aWindow windowNumber]; } } @@ -157,7 +125,7 @@ - (void)setTransformFt:(void *)aTransformFt {transformFt = aTransformFt;} - (void)startAnimation { // CGSConnection cgs = _CGSDefaultConnection(); - CGSGetWindowTransform(cgs, wid, &_transformA); +// CGSGetWindowTransform(cgs, wid, &_transformA); //CGSTransformLog(_transformA); [super startAnimation]; @@ -167,14 +135,14 @@ - (void)finishAnimation { if (restoreTransform) { // CGSTransformLog(_transformA); //[_window reallyOrderOut:nil]; - CGSSetWindowTransform(cgs, wid, _transformA); +// CGSSetWindowTransform(cgs, wid, _transformA); //CGSSetWindowAlpha(cgs, wid, 1.0); //sleep(1); // [_window setAlphaValue:0.9f]; // [_window setAlphaValue:1.0f]; } - CGSSetWindowListBrightness(cgs, &wid, (float *)&_brightA, 1); +// CGSSetWindowListBrightness(cgs, &wid, (float *)&_brightA, 1); } diff --git a/Quicksilver/Code-QuickStepFoundation/NSApplication_BLTRExtensions.m b/Quicksilver/Code-QuickStepFoundation/NSApplication_BLTRExtensions.m index 0f100ec4b..05f8d780c 100644 --- a/Quicksilver/Code-QuickStepFoundation/NSApplication_BLTRExtensions.m +++ b/Quicksilver/Code-QuickStepFoundation/NSApplication_BLTRExtensions.m @@ -58,16 +58,10 @@ - (NSDictionary *)parentProcessInformation { @implementation NSApplication (Focus) - (BOOL)stealKeyFocus { - CPSProcessSerNum psn; - if ((CPSGetCurrentProcess(&psn) == noErr) && (CPSStealKeyFocus(&psn) == noErr)) - return YES; return NO; } - (BOOL)releaseKeyFocus { - CPSProcessSerNum psn; - if ((CPSGetCurrentProcess(&psn) == noErr) && (CPSReleaseKeyFocus(&psn) == noErr)) - return YES; return NO; } diff --git a/Quicksilver/Code-QuickStepFoundation/NSWindow_BLTRExtensions.m b/Quicksilver/Code-QuickStepFoundation/NSWindow_BLTRExtensions.m index bf5abb2f0..9dbe54892 100644 --- a/Quicksilver/Code-QuickStepFoundation/NSWindow_BLTRExtensions.m +++ b/Quicksilver/Code-QuickStepFoundation/NSWindow_BLTRExtensions.m @@ -1,6 +1,5 @@ #import "NSWindow_BLTRExtensions.h" #import "NSGeometry_BLTRExtensions.h" -#import "CGSPrivate.h" @implementation NSWindow (Fade) - (id)windowPropertyForKey:(NSString *)key { return nil; } diff --git a/Quicksilver/Code-QuickStepFoundation/QSFoundation.h b/Quicksilver/Code-QuickStepFoundation/QSFoundation.h index a2f579838..5b30b5e7a 100644 --- a/Quicksilver/Code-QuickStepFoundation/QSFoundation.h +++ b/Quicksilver/Code-QuickStepFoundation/QSFoundation.h @@ -1,5 +1,3 @@ -#import "CGSPrivate.h" -#import "CPSPrivate.h" #import "NDAlias+AliasFile.h" #import "NDAlias.h" #import "NDScript.h" diff --git a/Quicksilver/Code-QuickStepFoundation/QSHotKeyEvent.m b/Quicksilver/Code-QuickStepFoundation/QSHotKeyEvent.m index 82fe9251c..34b1758e6 100644 --- a/Quicksilver/Code-QuickStepFoundation/QSHotKeyEvent.m +++ b/Quicksilver/Code-QuickStepFoundation/QSHotKeyEvent.m @@ -7,7 +7,6 @@ // #import "QSHotKeyEvent.h" -#import "CGSPrivate.h" /* * cocoaModifierFlagsToCarbonModifierFlags() @@ -37,14 +36,6 @@ @implementation QSHotKeyEvent + (void)initialize { hotKeyDictionary = [[NSMutableDictionary alloc] init]; } -+ (void)disableGlobalHotKeys { - CGSConnection conn = _CGSDefaultConnection(); - CGSSetGlobalHotKeyOperatingMode(conn, CGSGlobalHotKeyDisable); -} -+ (void)enableGlobalHotKeys { - CGSConnection conn = _CGSDefaultConnection(); - CGSSetGlobalHotKeyOperatingMode(conn, CGSGlobalHotKeyEnable); -} - (NSString *)identifier { NSArray *array = [hotKeyDictionary allKeysForObject:self]; diff --git a/Quicksilver/Code-QuickStepInterface/QSHotKeyEditor.m b/Quicksilver/Code-QuickStepInterface/QSHotKeyEditor.m index 79d76a692..4102e52da 100644 --- a/Quicksilver/Code-QuickStepInterface/QSHotKeyEditor.m +++ b/Quicksilver/Code-QuickStepInterface/QSHotKeyEditor.m @@ -40,16 +40,6 @@ + (id)sharedInstance { _sharedInstance = [[[self class] allocWithZone:nil] init]; return _sharedInstance; } -- (void)_disableHotKeyOperationMode { - CGSConnection conn = _CGSDefaultConnection(); - CGSSetGlobalHotKeyOperatingMode(conn, CGSGlobalHotKeyDisable); - [(QSApp *)NSApp setGlobalKeyEquivalentTarget:self]; -} -- (void)_restoreHotKeyOperationMode { - CGSConnection conn = _CGSDefaultConnection(); - CGSSetGlobalHotKeyOperatingMode(conn, CGSGlobalHotKeyEnable); - [(QSApp *)NSApp setGlobalKeyEquivalentTarget:nil]; -} - (void)_windowDidBecomeKeyNotification:(id)fp8 { [self _disableHotKeyOperationMode]; } - (void)_windowDidResignKeyNotification:(id)fp8 { [self _restoreHotKeyOperationMode]; } - (id)init { @@ -243,8 +233,6 @@ - (void)absorbEvents { [[self window] display]; NSEvent *theEvent; - CGSConnection conn = _CGSDefaultConnection(); - CGSSetGlobalHotKeyOperatingMode(conn, CGSGlobalHotKeyDisable); BOOL collectEvents = YES; while(collectEvents) { theEvent = [NSApp nextEventMatchingMask:NSEventMaskKeyDown | NSEventMaskFlagsChanged | NSEventMaskLeftMouseDown | NSEventMaskAppKitDefined | NSEventMaskSystemDefined untilDate:[NSDate dateWithTimeIntervalSinceNow:10.0] inMode:NSDefaultRunLoopMode dequeue:YES]; @@ -288,7 +276,6 @@ - (void)absorbEvents { } } [timer invalidate]; - CGSSetGlobalHotKeyOperatingMode(conn, CGSGlobalHotKeyEnable); [self updateStringForHotKey]; [self setBackgroundColor:[NSColor textBackgroundColor]]; [setButton setState:NSControlStateValueOff]; diff --git a/Quicksilver/Code-QuickStepInterface/QSInterfaceController.m b/Quicksilver/Code-QuickStepInterface/QSInterfaceController.m index 8ceafa72a..8dae48f11 100644 --- a/Quicksilver/Code-QuickStepInterface/QSInterfaceController.m +++ b/Quicksilver/Code-QuickStepInterface/QSInterfaceController.m @@ -41,8 +41,6 @@ #define KeySpace 0x31 #define KeyTabs 0x30 -#import "CGSPrivate.h" - @implementation QSInterfaceController + (void)initialize { @@ -166,10 +164,10 @@ - (void)showMainWindow:(id)sender { QSGCDMainAsync(^{ [[self window] makeKeyAndOrderFront:sender]; // Switch the keyboard/hotkey on the main thread. - if ([[NSUserDefaults standardUserDefaults] boolForKey:kSuppressHotKeysInCommand]) { - CGSConnection conn = _CGSDefaultConnection(); - CGSSetGlobalHotKeyOperatingMode(conn, CGSGlobalHotKeyDisable); - } + if ([[NSUserDefaults standardUserDefaults] boolForKey:kSuppressHotKeysInCommand]) { +// CGSConnection conn = _CGSDefaultConnection(); +// CGSSetGlobalHotKeyOperatingMode(conn, CGSGlobalHotKeyDisable); + } if ([[NSUserDefaults standardUserDefaults] boolForKey:@"QSSwitchKeyboardOnActivation"]) { self->savedKeyboard = TISCopyCurrentKeyboardInputSource(); @@ -196,8 +194,8 @@ - (void)showMainWindow:(id)sender { - (void)willHideMainWindow:(id)sender { if ([[NSUserDefaults standardUserDefaults] boolForKey:kSuppressHotKeysInCommand]) { - CGSConnection conn = _CGSDefaultConnection(); - CGSSetGlobalHotKeyOperatingMode(conn, CGSGlobalHotKeyEnable); +// CGSConnection conn = _CGSDefaultConnection(); +// CGSSetGlobalHotKeyOperatingMode(conn, CGSGlobalHotKeyEnable); } if ([[self window] isVisible] && ![[self window] attachedSheet]) { [[self window] makeFirstResponder:nil]; diff --git a/Quicksilver/PlugIns-Main/Bezel/QSBezelInterfaceController.m b/Quicksilver/PlugIns-Main/Bezel/QSBezelInterfaceController.m index c208793ed..bc1a9e2b9 100644 --- a/Quicksilver/PlugIns-Main/Bezel/QSBezelInterfaceController.m +++ b/Quicksilver/PlugIns-Main/Bezel/QSBezelInterfaceController.m @@ -80,7 +80,6 @@ - (NSSize) maxIconSize { - (void)showMainWindow:(id)sender { [[self window] setFrame:[self rectForState:[self expanded]] display:YES]; - if ([[self window] isVisible]) [[self window] pulse:self]; [super showMainWindow:sender]; // Does this need to be here? [[[self window] contentView] setNeedsDisplay:YES]; diff --git a/Quicksilver/PlugIns-Main/QSHotKeyPlugIn/QSHotKeyTriggerManager.m b/Quicksilver/PlugIns-Main/QSHotKeyPlugIn/QSHotKeyTriggerManager.m index 90e713cf2..665ea00fc 100644 --- a/Quicksilver/PlugIns-Main/QSHotKeyPlugIn/QSHotKeyTriggerManager.m +++ b/Quicksilver/PlugIns-Main/QSHotKeyPlugIn/QSHotKeyTriggerManager.m @@ -110,7 +110,6 @@ - (BOOL)hotKeyPressed:(QSHotKeyEvent *)hotKey { [trigger execute]; triggerExecuted = YES; } - [window flare:self]; [window reallyOrderOut:self]; [window close]; } diff --git a/Quicksilver/Quicksilver.xcodeproj/project.pbxproj b/Quicksilver/Quicksilver.xcodeproj/project.pbxproj index 94cd85654..4be2cc0c6 100644 --- a/Quicksilver/Quicksilver.xcodeproj/project.pbxproj +++ b/Quicksilver/Quicksilver.xcodeproj/project.pbxproj @@ -83,7 +83,6 @@ 4D62E31C1476919300362E9A /* QSTriggersPrefPane.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4D62E3161476919300362E9A /* QSTriggersPrefPane.strings */; }; 4D62E324147694D800362E9A /* QSAction.description.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4D62E326147694D800362E9A /* QSAction.description.plist */; }; 4D62E32A1476A6BF00362E9A /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4D62E3281476A6BF00362E9A /* Localizable.strings */; }; - 4D66BBDA1486FCF400351C42 /* CPSPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D66BBD91486FCDE00351C42 /* CPSPrivate.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D66BC05148701B800351C42 /* NDProgrammerUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D66BBFF148701B800351C42 /* NDProgrammerUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D66BC06148701B800351C42 /* NDProgrammerUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D66BC00148701B800351C42 /* NDProgrammerUtilities.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 4D66BC07148701B800351C42 /* NSAppleEventDescriptor+NDCoercion.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D66BC01148701B800351C42 /* NSAppleEventDescriptor+NDCoercion.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -154,7 +153,6 @@ 4DC493E40E8D15CB000EEF1C /* QSPopUpTextButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DC493DE0E8D15CB000EEF1C /* QSPopUpTextButtonCell.m */; }; 4DD2CF360E7B345500BA1128 /* QSBasicObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD2CF340E7B345500BA1128 /* QSBasicObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4DD2CF370E7B345500BA1128 /* QSBasicObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DD2CF350E7B345500BA1128 /* QSBasicObject.m */; }; - 4DD89EF90EBDD97B005A15AE /* CGSPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = E12444CB07297FF300043A01 /* CGSPrivate.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4DD89F0C0EBDDA7A005A15AE /* NTViewLocalizer.m in Sources */ = {isa = PBXBuildFile; fileRef = E1E3CB960653BE040026BAF2 /* NTViewLocalizer.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 4DD89F240EBDDBA9005A15AE /* QSDebug.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD89F1B0EBDDBA9005A15AE /* QSDebug.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4DD89F250EBDDBA9005A15AE /* QSDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DD89F1C0EBDDBA9005A15AE /* QSDefines.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -237,8 +235,6 @@ 7F840FF0096C3356006E6F0E /* QSAction.commandFormat.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7F840FD2096C3356006E6F0E /* QSAction.commandFormat.strings */; }; 7F841767096CB23B006E6F0E /* GettingSupport.html in Resources */ = {isa = PBXBuildFile; fileRef = 7F841766096CB23B006E6F0E /* GettingSupport.html */; }; 7F841BB6096CCCBF006E6F0E /* Rocket.png in Resources */ = {isa = PBXBuildFile; fileRef = 7F841BB5096CCCBF006E6F0E /* Rocket.png */; }; - 7F86016408FA092500622BEF /* QSCGSTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F15A6AC08F9CAB20058D25E /* QSCGSTransition.m */; }; - 7F86016508FA092600622BEF /* QSCGSTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = 7F15A6AB08F9CAB10058D25E /* QSCGSTransition.h */; settings = {ATTRIBUTES = (Public, ); }; }; 7F8C658308116FD10051113C /* QSAboutWindowController.h in Headers */ = {isa = PBXBuildFile; fileRef = 7F8C658108116FD10051113C /* QSAboutWindowController.h */; }; 7F8C658408116FD10051113C /* QSAboutWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F8C658208116FD10051113C /* QSAboutWindowController.m */; }; 7F8C65A50811728E0051113C /* Credits.html in Copy SharedSupport */ = {isa = PBXBuildFile; fileRef = 7F8C659E081171DB0051113C /* Credits.html */; }; @@ -1141,7 +1137,6 @@ 4D62E327147694E000362E9A /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = fr; path = fr.lproj/QSAction.description.plist; sourceTree = ""; }; 4D62E3291476A6BF00362E9A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; 4D62E32B1476A6C600362E9A /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; - 4D66BBD91486FCDE00351C42 /* CPSPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPSPrivate.h; sourceTree = ""; }; 4D66BBF01486FFF000351C42 /* NDSDKCompatibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NDSDKCompatibility.h; sourceTree = ""; }; 4D66BBF11486FFF000351C42 /* NSURL+NDCarbonUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+NDCarbonUtilities.h"; sourceTree = ""; }; 4D66BBF21486FFF000351C42 /* NSURL+NDCarbonUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURL+NDCarbonUtilities.m"; sourceTree = ""; }; @@ -1276,8 +1271,6 @@ 7F0BDE4207FC962E002CBDDF /* Get Quicksilver Selection.action */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Get Quicksilver Selection.action"; path = "Scripting/Automator/Get Quicksilver Selection.action"; sourceTree = SOURCE_ROOT; }; 7F0BDE5007FC962E002CBDDF /* Send to Quicksilver.action */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "Send to Quicksilver.action"; path = "Scripting/Automator/Send to Quicksilver.action"; sourceTree = SOURCE_ROOT; }; 7F15A5F908F996D70058D25E /* QSSimpleNotifier.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = QSSimpleNotifier.xib; sourceTree = ""; }; - 7F15A6AB08F9CAB10058D25E /* QSCGSTransition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSCGSTransition.h; sourceTree = ""; usesTabs = 1; }; - 7F15A6AC08F9CAB20058D25E /* QSCGSTransition.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QSCGSTransition.m; sourceTree = ""; usesTabs = 1; }; 7F24E8B507EDC67D00943D5A /* QSObject_AEConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSObject_AEConversion.h; sourceTree = ""; usesTabs = 1; }; 7F24E8B607EDC67D00943D5A /* QSObject_AEConversion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QSObject_AEConversion.m; sourceTree = ""; usesTabs = 1; }; 7F257BD4090DB26F00045D08 /* QSWindowAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QSWindowAnimation.h; sourceTree = ""; usesTabs = 1; }; @@ -2148,7 +2141,6 @@ E1087B40069BD5D300971A69 /* ContactEmail.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = ContactEmail.icns; sourceTree = ""; }; E1087B41069BD5D300971A69 /* ContactPhone.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = ContactPhone.icns; sourceTree = ""; }; E1186AD506A6D6F700F3EA8E /* QSKindDescriptions.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = QSKindDescriptions.plist; sourceTree = ""; }; - E12444CB07297FF300043A01 /* CGSPrivate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CGSPrivate.h; sourceTree = ""; }; E1264FAC072FE76C00206035 /* QSPreferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = QSPreferences.xib; sourceTree = ""; }; E129F348071DD65A001E1D5A /* License.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = License.rtf; sourceTree = ""; }; E131F4EF07B43BF400D0E4AC /* QSDockingWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = QSDockingWindow.h; sourceTree = ""; usesTabs = 1; }; @@ -3294,8 +3286,6 @@ CDC10E6D16221459005FA734 /* Sparkle */, D413172B15DEE5D90021479B /* LaunchAtLoginController */, CDE1E65F158A4CFD00355A9F /* VDKQueue */, - 4D66BBD91486FCDE00351C42 /* CPSPrivate.h */, - E12444CB07297FF300043A01 /* CGSPrivate.h */, 4DFE7D9E0E081A30000B9AA3 /* NSImageQuickLook */, E1E3CB8F0653BE030026BAF2 /* NSButton-NTExtensions.h */, E1E3CB900653BE030026BAF2 /* NSButton-NTExtensions.m */, @@ -3469,8 +3459,6 @@ E1E5FA4A07B204580044D6EF /* Code-QuickStepEffects */ = { isa = PBXGroup; children = ( - 7F15A6AB08F9CAB10058D25E /* QSCGSTransition.h */, - 7F15A6AC08F9CAB20058D25E /* QSCGSTransition.m */, E131FA4B07B44C0900D0E4AC /* QSEffects.h */, E1E5FA4D07B204580044D6EF /* QSEmbeddedEffects.h */, E1E5FA4E07B204580044D6EF /* QSEmbeddedEffects.m */, @@ -4003,7 +3991,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 4DD89EF90EBDD97B005A15AE /* CGSPrivate.h in Headers */, E1E5FAA407B204BF0044D6EF /* NDAlias+QSMods.h in Headers */, E1E5FAA807B204BF0044D6EF /* NSAppleEventDescriptor_QSMods.h in Headers */, E1E5FAAA07B204BF0044D6EF /* NSAppleScript_BLTRExtensions.h in Headers */, @@ -4052,7 +4039,6 @@ 7F943F6508033961007EDC31 /* QSUTI.h in Headers */, 4D6E8EC41EA93D61003CD3CE /* FMDatabaseAdditions.h in Headers */, D4E0060F1523951500FDF185 /* NSMetadataQuery+Synchronous.h in Headers */, - 4D66BBDA1486FCF400351C42 /* CPSPrivate.h in Headers */, D4BDCC2019E7F8F50080710C /* SUVersionComparisonProtocol.h in Headers */, 4D66BC5C1487027E00351C42 /* NDSDKCompatibility.h in Headers */, 4D66BC5D1487027E00351C42 /* NSURL+NDCarbonUtilities.h in Headers */, @@ -4098,7 +4084,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 7F86016508FA092600622BEF /* QSCGSTransition.h in Headers */, E131FA4C07B44C0900D0E4AC /* QSEffects.h in Headers */, E1E5FA5D07B204580044D6EF /* QSEmbeddedEffects.h in Headers */, E1E5FA5F07B204580044D6EF /* QSFadingView.h in Headers */,