/*****************************************************************************
* misc.m: code not specific to vlc
*****************************************************************************
- * Copyright (C) 2003-2007 the VideoLAN team
+ * Copyright (C) 2003-2013 VLC authors and VideoLAN
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
+ * Felix Paul Kühne <fkuehne at videolan dot org>
*
* 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
-#include <Cocoa/Cocoa.h>
+#import "misc.h"
+#import "intf.h" /* VLCApplication */
+#import "MainWindow.h"
+#import "ControlsBar.h"
+#import "controls.h"
+#import "CoreInteraction.h"
+#import <CoreAudio/CoreAudio.h>
+#import <vlc_keys.h>
-#include "intf.h" /* VLCApplication */
-#include "misc.h"
-#include "playlist.h"
-#include "controls.h"
/*****************************************************************************
- * VLCWindow
+ * NSSound (VLCAdditions)
*
- * Missing extension to NSWindow
+ * added code to change the system volume, needed for the apple remote code
+ * this is simplified code, which won't let you set the exact volume
+ * (that's what the audio output is for after all), but just the system volume
+ * in steps of 1/16 (matching the default AR or volume key implementation).
*****************************************************************************/
-@implementation VLCWindow
-- (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask
- backing:(NSBackingStoreType)backingType defer:(BOOL)flag
+@implementation NSSound (VLCAdditions)
+
++ (float)systemVolumeForChannel:(int)channel
{
- self = [super initWithContentRect:contentRect styleMask:styleMask backing:backingType defer:flag];
- if( self )
- b_isset_canBecomeKeyWindow = NO;
- return self;
+ AudioDeviceID i_device;
+ float f_volume;
+ OSStatus err;
+ UInt32 i_size;
+
+ i_size = sizeof( i_device );
+ AudioObjectPropertyAddress deviceAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
+ err = AudioObjectGetPropertyData( kAudioObjectSystemObject, &deviceAddress, 0, NULL, &i_size, &i_device );
+ if (err != noErr) {
+ msg_Warn( VLCIntf, "couldn't get main audio output device" );
+ return .0;
+ }
+
+ AudioObjectPropertyAddress propertyAddress = { kAudioDevicePropertyVolumeScalar, kAudioDevicePropertyScopeOutput, channel };
+ i_size = sizeof( f_volume );
+ err = AudioObjectGetPropertyData(i_device, &propertyAddress, 0, NULL, &i_size, &f_volume);
+ if (err != noErr) {
+ msg_Warn( VLCIntf, "couldn't get volume value" );
+ return .0;
+ }
+
+ return f_volume;
}
-- (void)setCanBecomeKeyWindow: (BOOL)canBecomeKey
+
++ (bool)setSystemVolume:(float)f_volume forChannel:(int)i_channel
{
- b_isset_canBecomeKeyWindow = YES;
- b_canBecomeKeyWindow = canBecomeKey;
+ /* the following code will fail on S/PDIF devices. there is an easy work-around, but we'd like to match the OS behavior */
+
+ AudioDeviceID i_device;
+ OSStatus err;
+ UInt32 i_size;
+ Boolean b_writeable;
+
+ i_size = sizeof( i_device );
+ AudioObjectPropertyAddress deviceAddress = { kAudioHardwarePropertyDefaultOutputDevice, kAudioDevicePropertyScopeOutput, kAudioObjectPropertyElementMaster };
+ err = AudioObjectGetPropertyData( kAudioObjectSystemObject, &deviceAddress, 0, NULL, &i_size, &i_device );
+ if (err != noErr) {
+ msg_Warn( VLCIntf, "couldn't get main audio output device" );
+ return NO;
+ }
+
+ AudioObjectPropertyAddress propertyAddress = { kAudioDevicePropertyVolumeScalar, kAudioDevicePropertyScopeOutput, i_channel };
+ i_size = sizeof( f_volume );
+ err = AudioObjectIsPropertySettable( i_device, &propertyAddress, &b_writeable );
+ if (err != noErr || !b_writeable ) {
+ msg_Warn( VLCIntf, "we can't set the main audio devices' volume" );
+ return NO;
+ }
+ err = AudioObjectSetPropertyData(i_device, &propertyAddress, 0, NULL, i_size, &f_volume);
+
+ return YES;
+}
+
++ (void)increaseSystemVolume
+{
+ float f_volume = [NSSound systemVolumeForChannel:1]; // we trust that mono is always available and that all channels got the same volume
+ f_volume += .0625; // 1/16 to match the OS
+ bool b_returned = YES;
+
+ /* since core audio doesn't provide a reasonable way to see how many channels we got, let's see how long we can do this */
+ for (NSUInteger x = 1; b_returned ; x++)
+ b_returned = [NSSound setSystemVolume: f_volume forChannel:x];
}
-- (BOOL)canBecomeKeyWindow
++ (void)decreaseSystemVolume
{
- if(b_isset_canBecomeKeyWindow)
- return b_canBecomeKeyWindow;
+ float f_volume = [NSSound systemVolumeForChannel:1]; // we trust that mono is always available and that all channels got the same volume
+ f_volume -= .0625; // 1/16 to match the OS
+ bool b_returned = YES;
- return [super canBecomeKeyWindow];
+ /* since core audio doesn't provide a reasonable way to see how many channels we got, let's see how long we can do this */
+ for (NSUInteger x = 1; b_returned ; x++)
+ b_returned = [NSSound setSystemVolume: f_volume forChannel:x];
}
+
@end
/*****************************************************************************
- * VLCControllerWindow
+ * NSAnimation (VLCAdditions)
+ *
+ * Missing extension to NSAnimation
*****************************************************************************/
-@implementation VLCControllerWindow
+@implementation NSAnimation (VLCAdditions)
+/* fake class attributes */
+static NSMapTable *VLCAdditions_userInfo = NULL;
-- (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask
- backing:(NSBackingStoreType)backingType defer:(BOOL)flag
++ (void)load
{
- self = [super initWithContentRect:contentRect styleMask:styleMask //& ~NSTitledWindowMask
- backing:backingType defer:flag];
-
- [[VLCMain sharedInstance] updateTogglePlaylistState];
-
- return( self );
+ /* init our fake object attribute */
+ VLCAdditions_userInfo = NSCreateMapTable(NSNonRetainedObjectMapKeyCallBacks, NSObjectMapValueCallBacks, 16);
}
-- (BOOL)performKeyEquivalent:(NSEvent *)o_event
+- (void)dealloc
{
- /* We indeed want to prioritize Cocoa key equivalent against libvlc,
- so we perform the menu equivalent now. */
- if([[NSApp mainMenu] performKeyEquivalent:o_event])
- return TRUE;
+ NSMapRemove(VLCAdditions_userInfo, self);
+ [super dealloc];
+}
- return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event] ||
- [(VLCControls *)[[VLCMain sharedInstance] getControls] keyEvent:o_event];
+- (void)setUserInfo: (void *)userInfo
+{
+ NSMapInsert(VLCAdditions_userInfo, self, (void*)userInfo);
}
+- (void *)userInfo
+{
+ return NSMapGet(VLCAdditions_userInfo, self);
+}
@end
-
-
/*****************************************************************************
- * VLCControllerView
+ * NSScreen (VLCAdditions)
+ *
+ * Missing extension to NSScreen
*****************************************************************************/
-@implementation VLCControllerView
+@implementation NSScreen (VLCAdditions)
-- (void)dealloc
+static NSMutableArray *blackoutWindows = NULL;
+
++ (void)load
{
- [self unregisterDraggedTypes];
- [super dealloc];
+ /* init our fake object attribute */
+ blackoutWindows = [[NSMutableArray alloc] initWithCapacity:1];
}
-#if GC_ENABLED
-- (void)finalize
++ (NSScreen *)screenWithDisplayID: (CGDirectDisplayID)displayID
{
- /* dealloc doesn't get called on 10.5 if GC is enabled, so we need to provide the basic functionality here */
- [self unregisterDraggedTypes];
- [super finalize];
+ NSUInteger count = [[NSScreen screens] count];
+
+ for ( NSUInteger i = 0; i < count; i++ ) {
+ NSScreen *screen = [[NSScreen screens] objectAtIndex: i];
+ if ([screen displayID] == displayID)
+ return screen;
+ }
+ return nil;
}
-#endif
-- (void)awakeFromNib
+- (BOOL)hasMenuBar
{
- [self registerForDraggedTypes:[NSArray arrayWithObjects:NSTIFFPboardType,
- NSFilenamesPboardType, nil]];
+ return ([self displayID] == [[[NSScreen screens] objectAtIndex:0] displayID]);
}
-- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
+- (BOOL)hasDock
{
- if ((NSDragOperationGeneric & [sender draggingSourceOperationMask])
- == NSDragOperationGeneric)
- {
- return NSDragOperationGeneric;
- }
- else
- {
- return NSDragOperationNone;
- }
+ NSRect screen_frame = [self frame];
+ NSRect screen_visible_frame = [self visibleFrame];
+ CGFloat f_menu_bar_thickness = [self hasMenuBar] ? [[NSStatusBar systemStatusBar] thickness] : 0.0;
+
+ BOOL b_found_dock = NO;
+ if (screen_visible_frame.size.width < screen_frame.size.width)
+ b_found_dock = YES;
+ else if (screen_visible_frame.size.height + f_menu_bar_thickness < screen_frame.size.height)
+ b_found_dock = YES;
+
+ return b_found_dock;
}
-- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
+- (BOOL)isScreen: (NSScreen*)screen
{
- return YES;
+ return ([self displayID] == [screen displayID]);
}
-- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
+- (CGDirectDisplayID)displayID
{
- NSPasteboard *o_paste = [sender draggingPasteboard];
- NSArray *o_types = [NSArray arrayWithObjects: NSFilenamesPboardType, nil];
- NSString *o_desired_type = [o_paste availableTypeFromArray:o_types];
- NSData *o_carried_data = [o_paste dataForType:o_desired_type];
+ return (CGDirectDisplayID)[[[self deviceDescription] objectForKey: @"NSScreenNumber"] intValue];
+}
- if( o_carried_data )
- {
- if ([o_desired_type isEqualToString:NSFilenamesPboardType])
- {
- int i;
- NSArray *o_array = [NSArray array];
- NSArray *o_values = [[o_paste propertyListForType: NSFilenamesPboardType]
- sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
-
- for( i = 0; i < (int)[o_values count]; i++)
- {
- NSDictionary *o_dic;
- o_dic = [NSDictionary dictionaryWithObject:[o_values objectAtIndex:i] forKey:@"ITEM_URL"];
- o_array = [o_array arrayByAddingObject: o_dic];
- }
- [(VLCPlaylist *)[[VLCMain sharedInstance] getPlaylist] appendArray: o_array atPos: -1 enqueue:NO];
- return YES;
- }
+- (void)blackoutOtherScreens
+{
+ /* Free our previous blackout window (follow blackoutWindow alloc strategy) */
+ [blackoutWindows makeObjectsPerformSelector:@selector(close)];
+ [blackoutWindows removeAllObjects];
+
+ NSUInteger screenCount = [[NSScreen screens] count];
+ for (NSUInteger i = 0; i < screenCount; i++) {
+ NSScreen *screen = [[NSScreen screens] objectAtIndex: i];
+ VLCWindow *blackoutWindow;
+ NSRect screen_rect;
+
+ if ([self isScreen: screen])
+ continue;
+
+ screen_rect = [screen frame];
+ screen_rect.origin.x = screen_rect.origin.y = 0;
+
+ /* blackoutWindow alloc strategy
+ - The NSMutableArray blackoutWindows has the blackoutWindow references
+ - blackoutOtherDisplays is responsible for alloc/releasing its Windows
+ */
+ blackoutWindow = [[VLCWindow alloc] initWithContentRect: screen_rect styleMask: NSBorderlessWindowMask
+ backing: NSBackingStoreBuffered defer: NO screen: screen];
+ [blackoutWindow setBackgroundColor:[NSColor blackColor]];
+ [blackoutWindow setLevel: NSFloatingWindowLevel]; /* Disappear when Expose is triggered */
+
+ [blackoutWindow displayIfNeeded];
+ [blackoutWindow orderFront: self animate: YES];
+
+ [blackoutWindows addObject: blackoutWindow];
+ [blackoutWindow release];
+
+ [screen setFullscreenPresentationOptions];
}
- [self setNeedsDisplay:YES];
- return YES;
}
-- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
++ (void)unblackoutScreens
{
- [self setNeedsDisplay:YES];
+ NSUInteger blackoutWindowCount = [blackoutWindows count];
+
+ for (NSUInteger i = 0; i < blackoutWindowCount; i++) {
+ VLCWindow *blackoutWindow = [blackoutWindows objectAtIndex: i];
+ [[blackoutWindow screen] setNonFullscreenPresentationOptions];
+ [blackoutWindow closeAndAnimate: YES];
+ }
+}
+
+- (void)setFullscreenPresentationOptions
+{
+ NSApplicationPresentationOptions presentationOpts = [NSApp presentationOptions];
+ if ([self hasMenuBar])
+ presentationOpts |= NSApplicationPresentationAutoHideMenuBar;
+ if ([self hasMenuBar] || [self hasDock])
+ presentationOpts |= NSApplicationPresentationAutoHideDock;
+ [NSApp setPresentationOptions:presentationOpts];
+}
+
+- (void)setNonFullscreenPresentationOptions
+{
+ NSApplicationPresentationOptions presentationOpts = [NSApp presentationOptions];
+ if ([self hasMenuBar])
+ presentationOpts &= (~NSApplicationPresentationAutoHideMenuBar);
+ if ([self hasMenuBar] || [self hasDock])
+ presentationOpts &= (~NSApplicationPresentationAutoHideDock);
+ [NSApp setPresentationOptions:presentationOpts];
}
@end
[super dealloc];
}
-#if GC_ENABLED
-- (void)finalize
-{
- /* dealloc doesn't get called on 10.5 if GC is enabled, so we need to provide the basic functionality here */
- [self unregisterDraggedTypes];
- [super finalize];
-}
-#endif
-
- (void)awakeFromNib
{
- [self registerForDraggedTypes:[NSArray arrayWithObjects:NSTIFFPboardType,
- NSFilenamesPboardType, nil]];
+ [self registerForDraggedTypes:@[NSFilenamesPboardType]];
+ [self setImageScaling: NSScaleToFit];
+ [self setImageFrameStyle: NSImageFrameNone];
+ [self setImageAlignment: NSImageAlignCenter];
}
- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
{
- if ((NSDragOperationGeneric & [sender draggingSourceOperationMask])
- == NSDragOperationGeneric)
- {
+ if ((NSDragOperationGeneric & [sender draggingSourceOperationMask]) == NSDragOperationGeneric)
return NSDragOperationGeneric;
- }
- else
- {
- return NSDragOperationNone;
- }
+
+ return NSDragOperationNone;
}
- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
{
- NSPasteboard *o_paste = [sender draggingPasteboard];
- NSArray *o_types = [NSArray arrayWithObjects: NSFilenamesPboardType, nil];
- NSString *o_desired_type = [o_paste availableTypeFromArray:o_types];
- NSData *o_carried_data = [o_paste dataForType:o_desired_type];
- BOOL b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
+ BOOL b_returned;
+ b_returned = [[VLCCoreInteraction sharedInstance] performDragOperation: sender];
- if( o_carried_data )
- {
- if ([o_desired_type isEqualToString:NSFilenamesPboardType])
- {
- int i;
- NSArray *o_array = [NSArray array];
- NSArray *o_values = [[o_paste propertyListForType: NSFilenamesPboardType]
- sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
-
- for( i = 0; i < (int)[o_values count]; i++)
- {
- NSDictionary *o_dic;
- o_dic = [NSDictionary dictionaryWithObject:[o_values objectAtIndex:i] forKey:@"ITEM_URL"];
- o_array = [o_array arrayByAddingObject: o_dic];
- }
- if( b_autoplay )
- [[[VLCMain sharedInstance] getPlaylist] appendArray: o_array atPos: -1 enqueue:NO];
- else
- [[[VLCMain sharedInstance] getPlaylist] appendArray: o_array atPos: -1 enqueue:YES];
- return YES;
- }
- }
[self setNeedsDisplay:YES];
- return YES;
+ return b_returned;
}
- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
// Center knob in given rect
knobRect.origin.x += (int)((float)(knobRect.size.width - 7)/2.0);
knobRect.origin.y += (int)((float)(knobRect.size.height - 7)/2.0);
-
+
// Draw diamond
NSRectFillUsingOperation(NSMakeRect(knobRect.origin.x + 3, knobRect.origin.y + 6, 1, 1), NSCompositeSourceOver);
NSRectFillUsingOperation(NSMakeRect(knobRect.origin.x + 2, knobRect.origin.y + 5, 3, 1), NSCompositeSourceOver);
NSRectClip(NSZeroRect);
[super drawRect:rect];
[[NSGraphicsContext currentContext] restoreGraphicsState];
-
+
// Full size
rect = [self bounds];
int diff = (int)(([[self cell] knobThickness] - 7.0)/2.0) - 1;
rect.origin.y += diff;
rect.size.width -= 2*diff-2;
rect.size.height -= 2*diff;
-
+
// Draw dark
NSRect knobRect = [[self cell] knobRectFlipped:NO];
[[[NSColor blackColor] colorWithAlphaComponent:0.6] set];
_drawFrameInRect(rect);
_drawKnobInRect(knobRect);
-
+
// Draw shadow
[[[NSColor blackColor] colorWithAlphaComponent:0.1] set];
rect.origin.x++;
@end
+/*****************************************************************************
+ * ProgressView
+ *****************************************************************************/
+
+@implementation VLCProgressView : NSView
+
+- (void)scrollWheel:(NSEvent *)o_event
+{
+ intf_thread_t * p_intf = VLCIntf;
+ BOOL b_forward = NO;
+ CGFloat f_deltaY = [o_event deltaY];
+ CGFloat f_deltaX = [o_event deltaX];
+
+ if (!OSX_SNOW_LEOPARD && [o_event isDirectionInvertedFromDevice])
+ f_deltaX = -f_deltaX; // optimisation, actually double invertion of f_deltaY here
+ else
+ f_deltaY = -f_deltaY;
+
+ // positive for left / down, negative otherwise
+ CGFloat f_delta = f_deltaX + f_deltaY;
+ CGFloat f_abs;
+ int i_vlckey;
+
+ if (f_delta > 0.0f)
+ f_abs = f_delta;
+ else {
+ b_forward = YES;
+ f_abs = -f_delta;
+ }
+
+ for (NSUInteger i = 0; i < (int)(f_abs/4.+1.) && f_abs > 0.05 ; i++) {
+ if (b_forward)
+ [[VLCCoreInteraction sharedInstance] forwardExtraShort];
+ else
+ [[VLCCoreInteraction sharedInstance] backwardExtraShort];
+ }
+}
+
+- (BOOL)acceptsFirstResponder
+{
+ return YES;
+}
+
+@end
+
+/*****************************************************************************
+ * TimeLineSlider
+ *****************************************************************************/
+
+@implementation TimeLineSlider
+
+- (void)awakeFromNib
+{
+ if (config_GetInt( VLCIntf, "macosx-interfacestyle" )) {
+ o_knob_img = [NSImage imageNamed:@"progression-knob_dark"];
+ b_dark = YES;
+ } else {
+ o_knob_img = [NSImage imageNamed:@"progression-knob"];
+ b_dark = NO;
+ }
+ img_rect.size = [o_knob_img size];
+ img_rect.origin.x = img_rect.origin.y = 0;
+}
+
+- (void)dealloc
+{
+ [o_knob_img release];
+ [super dealloc];
+}
+
+- (CGFloat)knobPosition
+{
+ NSRect knobRect = [[self cell] knobRectFlipped:NO];
+ knobRect.origin.x += knobRect.size.width / 2;
+ return knobRect.origin.x;
+}
+
+- (void)drawKnobInRect:(NSRect)knobRect
+{
+ knobRect.origin.x += (knobRect.size.width - img_rect.size.width) / 2;
+ knobRect.size.width = img_rect.size.width;
+ knobRect.size.height = img_rect.size.height;
+ [o_knob_img drawInRect:knobRect fromRect:img_rect operation:NSCompositeSourceOver fraction:1];
+}
+
+- (void)drawRect:(NSRect)rect
+{
+ [[(VLCVideoWindowCommon *)[self window] controlsBar] drawFancyGradientEffectForTimeSlider];
+ msleep(10000); //wait for the gradient to draw completely
+
+ /* Draw default to make sure the slider behaves correctly */
+ [[NSGraphicsContext currentContext] saveGraphicsState];
+ NSRectClip(NSZeroRect);
+ [super drawRect:rect];
+ [[NSGraphicsContext currentContext] restoreGraphicsState];
+
+ NSRect knobRect = [[self cell] knobRectFlipped:NO];
+ knobRect.origin.y+=1;
+ [self drawKnobInRect: knobRect];
+}
+
+@end
+
+/*****************************************************************************
+ * VLCVolumeSliderCommon
+ *****************************************************************************/
+
+@implementation VLCVolumeSliderCommon : NSSlider
+
+- (void)scrollWheel:(NSEvent *)o_event
+{
+ intf_thread_t * p_intf = VLCIntf;
+ BOOL b_up = NO;
+ CGFloat f_deltaY = [o_event deltaY];
+ CGFloat f_deltaX = [o_event deltaX];
+
+ if (!OSX_SNOW_LEOPARD && [o_event isDirectionInvertedFromDevice])
+ f_deltaX = -f_deltaX; // optimisation, actually double invertion of f_deltaY here
+ else
+ f_deltaY = -f_deltaY;
+
+ // positive for left / down, negative otherwise
+ CGFloat f_delta = f_deltaX + f_deltaY;
+ CGFloat f_abs;
+ int i_vlckey;
+
+ if (f_delta > 0.0f)
+ f_abs = f_delta;
+ else {
+ b_up = YES;
+ f_abs = -f_delta;
+ }
+
+ for (NSUInteger i = 0; i < (int)(f_abs/4.+1.) && f_abs > 0.05 ; i++) {
+ if (b_up)
+ [[VLCCoreInteraction sharedInstance] volumeUp];
+ else
+ [[VLCCoreInteraction sharedInstance] volumeDown];
+ }
+}
+
+@end
/*****************************************************************************
* ITSlider
- (void)awakeFromNib
{
- if ([[self cell] class] != [ITSliderCell class]) {
- // replace cell
- NSSliderCell *oldCell = [self cell];
- NSSliderCell *newCell = [[[ITSliderCell alloc] init] autorelease];
- [newCell setTag:[oldCell tag]];
- [newCell setTarget:[oldCell target]];
- [newCell setAction:[oldCell action]];
- [newCell setControlSize:[oldCell controlSize]];
- [newCell setType:[oldCell type]];
- [newCell setState:[oldCell state]];
- [newCell setAllowsTickMarkValuesOnly:[oldCell allowsTickMarkValuesOnly]];
- [newCell setAltIncrementValue:[oldCell altIncrementValue]];
- [newCell setControlTint:[oldCell controlTint]];
- [newCell setKnobThickness:[oldCell knobThickness]];
- [newCell setMaxValue:[oldCell maxValue]];
- [newCell setMinValue:[oldCell minValue]];
- [newCell setDoubleValue:[oldCell doubleValue]];
- [newCell setNumberOfTickMarks:[oldCell numberOfTickMarks]];
- [newCell setEditable:[oldCell isEditable]];
- [newCell setEnabled:[oldCell isEnabled]];
- [newCell setEntryType:[oldCell entryType]];
- [newCell setHighlighted:[oldCell isHighlighted]];
- [newCell setTickMarkPosition:[oldCell tickMarkPosition]];
- [self setCell:newCell];
- }
+ BOOL b_dark = config_GetInt( VLCIntf, "macosx-interfacestyle" );
+ if (b_dark)
+ img = [NSImage imageNamed:@"volume-slider-knob_dark"];
+ else
+ img = [NSImage imageNamed:@"volume-slider-knob"];
+
+ image_rect.size = [img size];
+ image_rect.origin.x = 0;
+
+ if (b_dark)
+ image_rect.origin.y = -1;
+ else
+ image_rect.origin.y = 0;
+}
+
+- (void)drawKnobInRect:(NSRect)knobRect
+{
+ knobRect.origin.x += (knobRect.size.width - image_rect.size.width) / 2;
+ knobRect.size.width = image_rect.size.width;
+ knobRect.size.height = image_rect.size.height;
+ [img drawInRect:knobRect fromRect:image_rect operation:NSCompositeSourceOver fraction:1];
+}
+
+- (void)drawRect:(NSRect)rect
+{
+ /* Draw default to make sure the slider behaves correctly */
+ [[NSGraphicsContext currentContext] saveGraphicsState];
+ NSRectClip(NSZeroRect);
+ [super drawRect:rect];
+ [[NSGraphicsContext currentContext] restoreGraphicsState];
+
+ NSRect knobRect = [[self cell] knobRectFlipped:NO];
+ knobRect.origin.y+=2;
+ [self drawKnobInRect: knobRect];
}
@end
/*****************************************************************************
- * ITSliderCell
+ * VLCTimeField implementation
+ *****************************************************************************
+ * we need this to catch our click-event in the controller window
*****************************************************************************/
-@implementation ITSliderCell
-- (id)init
+@implementation VLCTimeField
++ (void)initialize{
+ NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+ NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys:
+ @"NO", @"DisplayTimeAsTimeRemaining",
+ @"YES", @"DisplayFullscreenTimeAsTimeRemaining",
+ nil];
+
+ [defaults registerDefaults:appDefaults];
+}
+
+- (id)initWithFrame:(NSRect)frameRect
{
- self = [super init];
- _knobOff = [[NSImage imageNamed:@"volumeslider_normal"] retain];
- _knobOn = [[NSImage imageNamed:@"volumeslider_blue"] retain];
- b_mouse_down = FALSE;
+ if (self = [super initWithFrame:frameRect]) {
+ textAlignment = NSCenterTextAlignment;
+ o_remaining_identifier = @"";
+ }
+
return self;
}
+- (void)setRemainingIdentifier:(NSString *)o_string
+{
+ o_remaining_identifier = o_string;
+ b_time_remaining = [[NSUserDefaults standardUserDefaults] boolForKey:o_remaining_identifier];
+}
+
+- (void)setAlignment:(NSTextAlignment)alignment
+{
+ textAlignment = alignment;
+ [self setStringValue:[self stringValue]];
+}
+
- (void)dealloc
{
- [_knobOff release];
- [_knobOn release];
+ [o_string_shadow release];
[super dealloc];
}
-- (void)drawKnob:(NSRect)knob_rect
+- (void)setStringValue:(NSString *)string
+{
+ if (!o_string_shadow) {
+ o_string_shadow = [[NSShadow alloc] init];
+ [o_string_shadow setShadowColor: [NSColor colorWithCalibratedWhite:1.0 alpha:0.5]];
+ [o_string_shadow setShadowOffset:NSMakeSize(0.0, -1.0)];
+ [o_string_shadow setShadowBlurRadius:0.0];
+ }
+
+ NSMutableAttributedString *o_attributed_string = [[NSMutableAttributedString alloc] initWithString:string attributes: nil];
+ NSUInteger i_stringLength = [string length];
+
+ [o_attributed_string addAttribute: NSShadowAttributeName value: o_string_shadow range: NSMakeRange(0, i_stringLength)];
+ [o_attributed_string setAlignment: textAlignment range: NSMakeRange(0, i_stringLength)];
+ [self setAttributedStringValue: o_attributed_string];
+ [o_attributed_string release];
+}
+
+- (void)mouseDown: (NSEvent *)ourEvent
{
- NSImage *knob;
+ if ( [ourEvent clickCount] > 1 )
+ [[[VLCMain sharedInstance] controls] goToSpecificTime: nil];
+ else
+ {
+ if (![o_remaining_identifier isEqualToString: @""]) {
+ if ([[NSUserDefaults standardUserDefaults] boolForKey:o_remaining_identifier]) {
+ [[NSUserDefaults standardUserDefaults] setObject:@"NO" forKey:o_remaining_identifier];
+ b_time_remaining = NO;
+ } else {
+ [[NSUserDefaults standardUserDefaults] setObject:@"YES" forKey:o_remaining_identifier];
+ b_time_remaining = YES;
+ }
+ } else {
+ b_time_remaining = !b_time_remaining;
+ [[NSUserDefaults standardUserDefaults] setObject:(b_time_remaining ? @"YES" : @"NO") forKey:o_remaining_identifier];
+ }
+ }
+}
- if( b_mouse_down )
- knob = _knobOn;
+- (BOOL)timeRemaining
+{
+ if (![o_remaining_identifier isEqualToString: @""])
+ return [[NSUserDefaults standardUserDefaults] boolForKey:o_remaining_identifier];
else
- knob = _knobOff;
+ return b_time_remaining;
+}
+
+@end
+
+/*****************************************************************************
+ * VLCMainWindowSplitView implementation
+ * comment 1 + 2 taken from NSSplitView.h (10.7 SDK)
+ *****************************************************************************/
+@implementation VLCMainWindowSplitView : NSSplitView
+/* Return the color of the dividers that the split view is drawing between subviews. The default implementation of this method returns [NSColor clearColor] for the thick divider style. It will also return [NSColor clearColor] for the thin divider style when the split view is in a textured window. All other thin dividers are drawn with a color that looks good between two white panes. You can override this method to change the color of dividers.
+ */
+- (NSColor *)dividerColor
+{
+ return [NSColor colorWithCalibratedRed:.60 green:.60 blue:.60 alpha:1.];
+}
+
+/* Return the thickness of the dividers that the split view is drawing between subviews. The default implementation returns a value that depends on the divider style. You can override this method to change the size of dividers.
+ */
+- (CGFloat)dividerThickness
+{
+ return 1.0;
+}
+@end
- [[self controlView] lockFocus];
- [knob compositeToPoint:NSMakePoint( knob_rect.origin.x + 1,
- knob_rect.origin.y + knob_rect.size.height -2 )
- operation:NSCompositeSourceOver];
- [[self controlView] unlockFocus];
+/*****************************************************************************
+ * VLCThreePartImageView interface
+ *****************************************************************************/
+@implementation VLCThreePartImageView
+
+- (void)dealloc
+{
+ [o_left_img release];
+ [o_middle_img release];
+ [o_right_img release];
+
+ [super dealloc];
}
-- (void)stopTracking:(NSPoint)lastPoint at:(NSPoint)stopPoint inView:
- (NSView *)controlView mouseIsUp:(BOOL)flag
+- (void)setImagesLeft:(NSImage *)left middle: (NSImage *)middle right:(NSImage *)right
{
- b_mouse_down = NO;
- [self drawKnob];
- [super stopTracking:lastPoint at:stopPoint inView:controlView mouseIsUp:flag];
+ if (o_left_img)
+ [o_left_img release];
+ if (o_middle_img)
+ [o_middle_img release];
+ if (o_right_img)
+ [o_right_img release];
+
+ o_left_img = [left retain];
+ o_middle_img = [middle retain];
+ o_right_img = [right retain];
}
-- (BOOL)startTrackingAt:(NSPoint)startPoint inView:(NSView *)controlView
+- (void)drawRect:(NSRect)rect
{
- b_mouse_down = YES;
- [self drawKnob];
- return [super startTrackingAt:startPoint inView:controlView];
+ NSRect bnds = [self bounds];
+ NSDrawThreePartImage( bnds, o_left_img, o_middle_img, o_right_img, NO, NSCompositeSourceOver, 1, NO );
}
@end
+@implementation VLCThreePartDropView
+
+- (BOOL)mouseDownCanMoveWindow
+{
+ return YES;
+}
+
+- (void)dealloc
+{
+ [self unregisterDraggedTypes];
+ [super dealloc];
+}
+
+- (void)awakeFromNib
+{
+ [self registerForDraggedTypes:@[NSFilenamesPboardType]];
+}
+
+- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
+{
+ if ((NSDragOperationGeneric & [sender draggingSourceOperationMask]) == NSDragOperationGeneric)
+ return NSDragOperationGeneric;
+
+ return NSDragOperationNone;
+}
+
+- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender
+{
+ return YES;
+}
+
+- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender
+{
+ BOOL b_returned;
+ b_returned = [[VLCCoreInteraction sharedInstance] performDragOperation: sender];
+
+ [self setNeedsDisplay:YES];
+ return YES;
+}
+
+- (void)concludeDragOperation:(id <NSDraggingInfo>)sender
+{
+ [self setNeedsDisplay:YES];
+}
+
+@end
projects / vlc / blobdiff