annotate libvo/osx_objc_common.m @ 35086:8848682f4035

Split out an objective-C common OS X layer, to be reused by -vo gl.
author reimar
date Thu, 13 Sep 2012 19:20:47 +0000
parents libvo/vo_corevideo.m@5a9728bbb51e
children 9fcfc9c5f038
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
28446
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
1 /*
29210
779281d8cd80 Rename macosx video output driver to corevideo.
diego
parents: 29177
diff changeset
2 * CoreVideo video output driver
28836
93652f17d567 cosmetics: Reformat file header.
diego
parents: 28446
diff changeset
3 * Copyright (c) 2005 Nicolas Plourde <nicolasplourde@gmail.com>
93652f17d567 cosmetics: Reformat file header.
diego
parents: 28446
diff changeset
4 *
28446
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
5 * This file is part of MPlayer.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
6 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
7 * MPlayer is free software; you can redistribute it and/or modify
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
8 * it under the terms of the GNU General Public License as published by
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
9 * the Free Software Foundation; either version 2 of the License, or
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
10 * (at your option) any later version.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
11 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
12 * MPlayer is distributed in the hope that it will be useful,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
15 * GNU General Public License for more details.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
16 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
17 * You should have received a copy of the GNU General Public License along
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
18 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
20 */
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28306
diff changeset
21
35086
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
22 #import "osx_objc_common.h"
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
23 #include <Carbon/Carbon.h>
27988
84bad10e6d8d Allow vo_macosx to be compiled in 64-bits mode:
gpoirier
parents: 27397
diff changeset
24 #include <CoreServices/CoreServices.h>
84bad10e6d8d Allow vo_macosx to be compiled in 64-bits mode:
gpoirier
parents: 27397
diff changeset
25 //special workaround for Apple bug #6267445
84bad10e6d8d Allow vo_macosx to be compiled in 64-bits mode:
gpoirier
parents: 27397
diff changeset
26 //(OSServices Power API disabled in OSServices.h for 64bit systems)
84bad10e6d8d Allow vo_macosx to be compiled in 64-bits mode:
gpoirier
parents: 27397
diff changeset
27 #ifndef __POWER__
84bad10e6d8d Allow vo_macosx to be compiled in 64-bits mode:
gpoirier
parents: 27397
diff changeset
28 #include <CoreServices/../Frameworks/OSServices.framework/Headers/Power.h>
84bad10e6d8d Allow vo_macosx to be compiled in 64-bits mode:
gpoirier
parents: 27397
diff changeset
29 #endif
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
30
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
31 //MPLAYER
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
32 #include "config.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
33 #include "video_out.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
34 #include "aspect.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
35 #include "mp_msg.h"
28075
ca9badc94740 #include appropriate headers instead of locally declaring function prototypes.
diego
parents: 28051
diff changeset
36 #include "mp_fifo.h"
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
37
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
38 #include "input/input.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
39 #include "input/mouse.h"
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
40
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
41 #include "osdep/keycodes.h"
29533
9c8f8e375823 Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
reimar
parents: 29272
diff changeset
42 #include "osx_common.h"
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
43
15731
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
44 static float winAlpha = 1;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
45
25179
6e8b40d412f0 Fix play window not get actived problem on Leopard.
ulion
parents: 25178
diff changeset
46 static BOOL isLeopardOrLater;
6e8b40d412f0 Fix play window not get actived problem on Leopard.
ulion
parents: 25178
diff changeset
47
35086
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
48 static NSAutoreleasePool *autoreleasepool;
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
49 static MPCommonOpenGLView *oglv;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
50
35086
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
51 int vo_osx_init(void)
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
52 {
35086
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
53 autoreleasepool = [[NSAutoreleasePool alloc] init];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
54 oglv = [[MPCommonOpenGLView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) pixelFormat:[MPCommonOpenGLView defaultPixelFormat]];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
55 [oglv autorelease];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
56 [oglv display];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
57 [oglv preinit];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
58 return 1;
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
59 }
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
60
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
61 void vo_osx_uninit(void)
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
62 {
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
63 NSAutoreleasePool *finalPool;
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
64 oglv = nil;
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
65 [autoreleasepool release];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
66 finalPool = [[NSAutoreleasePool alloc] init];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
67 [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
68 [finalPool release];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
69 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
70
35086
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
71 int vo_osx_config(uint32_t width, uint32_t height, uint32_t flags)
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
72 {
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
73 [oglv config:width:height:flags];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
74 return 1;
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
75 }
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
76
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
77 void vo_osx_ontop(void)
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
78 {
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
79 vo_ontop = !vo_ontop;
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
80 [oglv ontop];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
81 }
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
82
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
83 void vo_osx_fullscreen(void)
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
84 {
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
85 vo_fs = !vo_fs;
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
86 [oglv fullscreen:YES];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
87 }
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
88
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
89 int vo_osx_check_events(void)
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
90 {
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
91 [oglv check_events];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
92 return 0;
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
93 }
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
94
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
95 void vo_osx_update_xinerama_info(void)
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
96 {
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
97 [oglv update_screen_info];
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
98 }
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
99
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
100 @implementation MPCommonOpenGLView
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
101 - (void) update_screen_info
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
102 {
35074
3fb18ad99003 Deprecate corevideo device_id in favour of -xineramascreen.
reimar
parents: 35073
diff changeset
103 int screen_id = xinerama_screen;
35073
cae3fc699368 Merge declaration and initialization.
reimar
parents: 35072
diff changeset
104 NSArray *screen_array = [NSScreen screens];
35072
5d9e4777593b Avoid some more global variables.
reimar
parents: 35071
diff changeset
105 NSScreen *screen_handle;
5d9e4777593b Avoid some more global variables.
reimar
parents: 35071
diff changeset
106 NSRect screen_frame;
30000
a30debd7acd7 Add -xineramascreen support to corevideo vo. Still prefer corevideo's own device_id parameter if it's set.
adrian
parents: 29657
diff changeset
107
31740
ede53d2a08eb Simplify update_screen_info.
reimar
parents: 31739
diff changeset
108 if(screen_id >= (int)[screen_array count])
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
109 {
29210
779281d8cd80 Rename macosx video output driver to corevideo.
diego
parents: 29177
diff changeset
110 mp_msg(MSGT_VO, MSGL_INFO, "[vo_corevideo] Device ID %d does not exist, falling back to main device\n", screen_id);
28306
19cf626f188a fix device_id option after r28165
gpoirier
parents: 28204
diff changeset
111 screen_id = -1;
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
112 }
35086
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
113 if (screen_id < 0 && [self window])
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
114 screen_handle = [[self window] screen];
31741
601cd1e830fe Avoid some code duplication in update_screen_info.
reimar
parents: 31740
diff changeset
115 else
31742
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
116 screen_handle = [screen_array objectAtIndex:(screen_id < 0 ? 0 : screen_id)];
29564
4ae3d2d7946e Use MPlayer's standard aspect handling functions in corevideo
reimar
parents: 29533
diff changeset
117
31741
601cd1e830fe Avoid some code duplication in update_screen_info.
reimar
parents: 31740
diff changeset
118 screen_frame = [screen_handle frame];
25414
5c03a9bdf220 Record screen size and display size in vo_ variables.
ulion
parents: 25413
diff changeset
119 vo_screenwidth = screen_frame.size.width;
5c03a9bdf220 Record screen size and display size in vo_ variables.
ulion
parents: 25413
diff changeset
120 vo_screenheight = screen_frame.size.height;
35071
e31eb09c681d Use xinerama_x/xinerama_y.
reimar
parents: 35070
diff changeset
121 xinerama_x = screen_frame.origin.x;
e31eb09c681d Use xinerama_x/xinerama_y.
reimar
parents: 35070
diff changeset
122 xinerama_y = screen_frame.origin.y;
29564
4ae3d2d7946e Use MPlayer's standard aspect handling functions in corevideo
reimar
parents: 29533
diff changeset
123 aspect_save_screenres(vo_screenwidth, vo_screenheight);
4ae3d2d7946e Use MPlayer's standard aspect handling functions in corevideo
reimar
parents: 29533
diff changeset
124 }
4ae3d2d7946e Use MPlayer's standard aspect handling functions in corevideo
reimar
parents: 29533
diff changeset
125
24076
7ac48ed8c394 Functions that do not return a value must be void
reimar
parents: 24074
diff changeset
126 - (void) preinit
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
127 {
29575
0e182921966b Make glContext a local variable, it is not needed outside the function
reimar
parents: 29574
diff changeset
128 NSOpenGLContext *glContext;
29566
b128ce47771d Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents: 29564
diff changeset
129 GLint swapInterval = 1;
b128ce47771d Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents: 29564
diff changeset
130
35085
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
131 NSApplicationLoad();
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
132 NSApp = [NSApplication sharedApplication];
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
133 isLeopardOrLater = floor(NSAppKitVersionNumber) > 824;
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
134
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
135 osx_foreground_hack();
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
136
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
137 // Install an event handler so the Quit menu entry works
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
138 // The proper way using NSApp setDelegate: and
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
139 // applicationShouldTerminate: does not work,
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
140 // probably NSApplication never installs its handler.
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
141 [[NSAppleEventManager sharedAppleEventManager]
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
142 setEventHandler:self
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
143 andSelector:@selector(handleQuitEvent:withReplyEvent:)
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
144 forEventClass:kCoreEventClass
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
145 andEventID:kAEQuitApplication];
5a9728bbb51e Move some code around in preparation for following patch.
reimar
parents: 35084
diff changeset
146
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
147 //init menu
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
148 [self initMenu];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
149
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
150 //create window
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
151 window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 100, 100)
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
152 styleMask:NSTitledWindowMask|NSTexturedBackgroundWindowMask|NSClosableWindowMask|NSMiniaturizableWindowMask|NSResizableWindowMask
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
153 backing:NSBackingStoreBuffered defer:NO];
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
154
16144
6ea7c0735fce properly release window
nplourde
parents: 16081
diff changeset
155 [window autorelease];
35066
e91f5bd3214d Consistently use "self" instead of a global variable.
reimar
parents: 35065
diff changeset
156 [window setDelegate:self];
e91f5bd3214d Consistently use "self" instead of a global variable.
reimar
parents: 35065
diff changeset
157 [window setContentView:self];
e91f5bd3214d Consistently use "self" instead of a global variable.
reimar
parents: 35065
diff changeset
158 [window setInitialFirstResponder:self];
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
159 [window setAcceptsMouseMovedEvents:YES];
31742
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
160 [window setTitle:@"MPlayer - The Movie Player"];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
161
15855
1ca8b5873c3f keep window size when changing aspect
nplourde
parents: 15854
diff changeset
162 winSizeMult = 1;
29566
b128ce47771d Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents: 29564
diff changeset
163
b128ce47771d Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents: 29564
diff changeset
164 //create OpenGL Context
b128ce47771d Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents: 29564
diff changeset
165 glContext = [[NSOpenGLContext alloc] initWithFormat:[NSOpenGLView defaultPixelFormat] shareContext:nil];
b128ce47771d Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents: 29564
diff changeset
166
b128ce47771d Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents: 29564
diff changeset
167 [self setOpenGLContext:glContext];
b128ce47771d Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents: 29564
diff changeset
168 [glContext setValues:&swapInterval forParameter:NSOpenGLCPSwapInterval];
b128ce47771d Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents: 29564
diff changeset
169 [glContext setView:self];
b128ce47771d Reduce vo_corevideo memleaks by initializing static context etc. only once
reimar
parents: 29564
diff changeset
170 [glContext makeCurrentContext];
29575
0e182921966b Make glContext a local variable, it is not needed outside the function
reimar
parents: 29574
diff changeset
171 [glContext release];
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
172 }
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
173
29574
0aa36133f638 Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents: 29573
diff changeset
174 - (void) dealloc
0aa36133f638 Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents: 29573
diff changeset
175 {
0aa36133f638 Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents: 29573
diff changeset
176 [self setOpenGLContext:nil];
0aa36133f638 Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents: 29573
diff changeset
177 [super dealloc];
0aa36133f638 Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents: 29573
diff changeset
178 }
0aa36133f638 Add a dealloc function to corevideo to reduce the memleaks from
reimar
parents: 29573
diff changeset
179
35080
a10c7a7a9232 Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents: 35079
diff changeset
180 - (void) config:(uint32_t)width:(uint32_t)height:(uint32_t)flags
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
181 {
35080
a10c7a7a9232 Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents: 35079
diff changeset
182 config_movie_aspect((float)width/height);
a10c7a7a9232 Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents: 35079
diff changeset
183
35084
3be1bcf3f16b Use "self".
reimar
parents: 35083
diff changeset
184 vo_dwidth = width *= self->winSizeMult;
3be1bcf3f16b Use "self".
reimar
parents: 35083
diff changeset
185 vo_dheight = height *= self->winSizeMult;
35080
a10c7a7a9232 Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents: 35079
diff changeset
186
15728
caa1d0aeffd5 device_id flag force fullscreen device
nplourde
parents: 15727
diff changeset
187 //config window
30001
444f843a54ec Add support for -geometry to corevideo.
adrian
parents: 30000
diff changeset
188 [window setContentSize:NSMakeSize(vo_dwidth, vo_dheight)];
444f843a54ec Add support for -geometry to corevideo.
adrian
parents: 30000
diff changeset
189
35070
ff4758e8cfba Change geometry for corevideo vo to not take dock into account.
reimar
parents: 35069
diff changeset
190 // Do not use visibleFrame - taking the menu bar and dock into account
ff4758e8cfba Change geometry for corevideo vo to not take dock into account.
reimar
parents: 35069
diff changeset
191 // would be nicer in principle, but currently only results in the window
ff4758e8cfba Change geometry for corevideo vo to not take dock into account.
reimar
parents: 35069
diff changeset
192 // being placed strangely off-center since vo_dx/vo_dy calculation is
ff4758e8cfba Change geometry for corevideo vo to not take dock into account.
reimar
parents: 35069
diff changeset
193 // not aware of it.
30001
444f843a54ec Add support for -geometry to corevideo.
adrian
parents: 30000
diff changeset
194 // Also flip vo_dy since the screen origin is in the bottom left on OSX.
35086
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
195 [self update_screen_info];
30001
444f843a54ec Add support for -geometry to corevideo.
adrian
parents: 30000
diff changeset
196 [window setFrameTopLeftPoint:NSMakePoint(
35071
e31eb09c681d Use xinerama_x/xinerama_y.
reimar
parents: 35070
diff changeset
197 vo_dx,
e31eb09c681d Use xinerama_x/xinerama_y.
reimar
parents: 35070
diff changeset
198 2*xinerama_y + vo_screenheight - vo_dy)];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
199
35080
a10c7a7a9232 Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents: 35079
diff changeset
200 vo_fs = flags & VOFLAG_FULLSCREEN;
a10c7a7a9232 Move some code around to make splitting into vo-specific and generic code easier.
reimar
parents: 35079
diff changeset
201
35083
b3a7f40618b9 Fix handling of -ontop and -rootwin.
reimar
parents: 35082
diff changeset
202 [self rootwin];
15726
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
203
25ee208c6da9 do not realloc window while playing playlist
nplourde
parents: 15657
diff changeset
204 if(vo_fs)
35066
e91f5bd3214d Consistently use "self" instead of a global variable.
reimar
parents: 35065
diff changeset
205 [self fullscreen: NO];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
206
35083
b3a7f40618b9 Fix handling of -ontop and -rootwin.
reimar
parents: 35082
diff changeset
207 [self ontop];
35081
65f3a403ab3e Set up things like fullscreen status etc. before showing the window.
reimar
parents: 35080
diff changeset
208
35086
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
209 if (!(flags & VOFLAG_HIDDEN))
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
210 //show window
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
211 [window makeKeyAndOrderFront:self];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
212 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
213
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
214 /*
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
215 Init Menu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
216 */
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
217 - (void)initMenu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
218 {
35075
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
219 NSMenu *mainMenu = [[NSMenu alloc] init];
21395
dd05dd9e3e7b Fix declarations vs statements warning.
diego
parents: 18878
diff changeset
220 NSMenu *menu, *aspectMenu;
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
221 NSMenuItem *menuItem;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
222
35075
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
223 menu = [[NSMenu alloc] init];
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
224 menuItem = [[NSMenuItem alloc] init];
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
225 [menuItem setSubmenu:menu];
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
226 [mainMenu addItem:menuItem];
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
227 // Note: setAppleMenu seems to be unnecessary from 10.6 on,
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
228 // but is needed for all earlier versions or the menu is
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
229 // messed up.
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
230 // Round-about way with performSelector used to avoid compiler
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
231 // warnings.
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
232 [NSApp performSelector:@selector(setAppleMenu:) withObject:menu];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
233
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
234 //Create Movie Menu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
235 menu = [[NSMenu alloc] initWithTitle:@"Movie"];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
236 menuItem = [[NSMenuItem alloc] initWithTitle:@"Half Size" action:@selector(menuAction:) keyEquivalent:@"0"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
237 kHalfScreenCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
238 menuItem = [[NSMenuItem alloc] initWithTitle:@"Normal Size" action:@selector(menuAction:) keyEquivalent:@"1"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
239 kNormalScreenCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
240 menuItem = [[NSMenuItem alloc] initWithTitle:@"Double Size" action:@selector(menuAction:) keyEquivalent:@"2"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
241 kDoubleScreenCmd = menuItem;
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
242 menuItem = [[NSMenuItem alloc] initWithTitle:@"Full Size" action:@selector(menuAction:) keyEquivalent:@"f"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
243 kFullScreenCmd = menuItem;
31738
781904280cd7 Remove pointless casts.
reimar
parents: 31737
diff changeset
244 menuItem = [NSMenuItem separatorItem]; [menu addItem:menuItem];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
245
31742
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
246 aspectMenu = [[NSMenu alloc] initWithTitle:@"Aspect Ratio"];
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
247 menuItem = [[NSMenuItem alloc] initWithTitle:@"Keep" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
248 if(vo_keepaspect) [menuItem setState:NSOnState];
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
249 kKeepAspectCmd = menuItem;
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
250 menuItem = [[NSMenuItem alloc] initWithTitle:@"Pan-Scan" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
251 if(vo_panscan) [menuItem setState:NSOnState];
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
252 kPanScanCmd = menuItem;
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
253 menuItem = [NSMenuItem separatorItem]; [aspectMenu addItem:menuItem];
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
254 menuItem = [[NSMenuItem alloc] initWithTitle:@"Original" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
255 kAspectOrgCmd = menuItem;
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
256 menuItem = [[NSMenuItem alloc] initWithTitle:@"4:3" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
257 kAspectFullCmd = menuItem;
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
258 menuItem = [[NSMenuItem alloc] initWithTitle:@"16:9" action:@selector(menuAction:) keyEquivalent:@""]; [aspectMenu addItem:menuItem];
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
259 kAspectWideCmd = menuItem;
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
260 menuItem = [[NSMenuItem alloc] initWithTitle:@"Aspect Ratio" action:nil keyEquivalent:@""];
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
261 [menuItem setSubmenu:aspectMenu];
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
262 [menu addItem:menuItem];
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
263 [aspectMenu release];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
264
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
265 //Add to menubar
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
266 menuItem = [[NSMenuItem alloc] initWithTitle:@"Movie" action:nil keyEquivalent:@""];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
267 [menuItem setSubmenu:menu];
35075
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
268 [mainMenu addItem:menuItem];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
269
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
270 //Create Window Menu
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
271 menu = [[NSMenu alloc] initWithTitle:@"Window"];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
272
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
273 menuItem = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
274 menuItem = [[NSMenuItem alloc] initWithTitle:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""]; [menu addItem:menuItem];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
275
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
276 //Add to menubar
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
277 menuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
278 [menuItem setSubmenu:menu];
35075
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
279 [mainMenu addItem:menuItem];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
280 [NSApp setWindowsMenu:menu];
35075
c40203dd82b7 Fix menu on newer OSX versions (at least 10.6) without breaking 10.5.
reimar
parents: 35074
diff changeset
281 [NSApp setMainMenu:mainMenu];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
282
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
283 [menu release];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
284 [menuItem release];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
285 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
286
29604
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
287 - (void)set_winSizeMult:(float)mult
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
288 {
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
289 NSRect frame;
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
290 int d_width, d_height;
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
291 aspect(&d_width, &d_height, A_NOZOOM);
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
292
35082
6d8be70115a8 Remove local variables that (except for very brief moments before
reimar
parents: 35081
diff changeset
293 if (vo_fs) {
29604
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
294 vo_fs = !vo_fs;
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
295 [self fullscreen:NO];
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
296 }
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
297
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
298 winSizeMult = mult;
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
299 frame.size.width = d_width * mult;
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
300 frame.size.height = d_height * mult;
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
301 [window setContentSize: frame.size];
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
302 [self reshape];
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
303 }
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
304
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
305 /*
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
306 Menu Action
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
307 */
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
308 - (void)menuAction:(id)sender
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
309 {
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
310 if(sender == kHalfScreenCmd)
29604
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
311 [self set_winSizeMult: 0.5];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
312 if(sender == kNormalScreenCmd)
29604
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
313 [self set_winSizeMult: 1];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
314 if(sender == kDoubleScreenCmd)
29604
cd056d688db8 Factor out duplicated code to set play video scaled by a certain factor.
reimar
parents: 29603
diff changeset
315 [self set_winSizeMult: 2];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
316 if(sender == kFullScreenCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
317 {
31736
8d6697e4838e Remove useless ().
reimar
parents: 31735
diff changeset
318 vo_fs = !vo_fs;
21546
253a1e98bfe3 vo_macosx.m disable window animation when going to fullscreen
nplourde
parents: 21395
diff changeset
319 [self fullscreen:NO];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
320 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
321
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
322 if(sender == kKeepAspectCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
323 {
31736
8d6697e4838e Remove useless ().
reimar
parents: 31735
diff changeset
324 vo_keepaspect = !vo_keepaspect;
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
325 if(vo_keepaspect)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
326 [kKeepAspectCmd setState:NSOnState];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
327 else
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
328 [kKeepAspectCmd setState:NSOffState];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
329
15909
b1bc923b38fe resize video after keep aspect menu item toggle
nplourde
parents: 15902
diff changeset
330 [self reshape];
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
331 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
332
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
333 if(sender == kPanScanCmd)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
334 {
31736
8d6697e4838e Remove useless ().
reimar
parents: 31735
diff changeset
335 vo_panscan = !vo_panscan;
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
336 if(vo_panscan)
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
337 [kPanScanCmd setState:NSOnState];
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
338 else
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
339 [kPanScanCmd setState:NSOffState];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
340
35069
90a2e4fedfab Remove pointless one-line function.
reimar
parents: 35066
diff changeset
341 panscan_calc();
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
342 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
343
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
344 if(sender == kAspectOrgCmd)
29564
4ae3d2d7946e Use MPlayer's standard aspect handling functions in corevideo
reimar
parents: 29533
diff changeset
345 change_movie_aspect(-1);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
346
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
347 if(sender == kAspectFullCmd)
29564
4ae3d2d7946e Use MPlayer's standard aspect handling functions in corevideo
reimar
parents: 29533
diff changeset
348 change_movie_aspect(4.0f/3.0f);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
349
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
350 if(sender == kAspectWideCmd)
29564
4ae3d2d7946e Use MPlayer's standard aspect handling functions in corevideo
reimar
parents: 29533
diff changeset
351 change_movie_aspect(16.0f/9.0f);
15570
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
352 }
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
353
f197f4a60b20 create menu
nplourde
parents: 15339
diff changeset
354 /*
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
355 Toggle Fullscreen
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
356 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
357 - (void) fullscreen: (BOOL) animate
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
358 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
359 static NSRect old_frame;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
360 static NSRect old_view_frame;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
361
15573
5db3dd72c876 Fix pan-scan in fullscreen mode
nplourde
parents: 15571
diff changeset
362 panscan_calc();
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
363
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
364 //go fullscreen
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
365 if(vo_fs)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
366 {
35082
6d8be70115a8 Remove local variables that (except for very brief moments before
reimar
parents: 35081
diff changeset
367 if(!vo_rootwin)
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
368 {
15882
77aa290c726a fix fullscreen menubar item behaviour
nplourde
parents: 15855
diff changeset
369 SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
18057
0e7291ee4b6b Replace deprecated function
nplourde
parents: 17725
diff changeset
370 CGDisplayHideCursor(kCGDirectMainDisplay);
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
371 mouseHide = YES;
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
372 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
373
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
374 old_frame = [window frame]; //save main window size & position
35086
8848682f4035 Split out an objective-C common OS X layer, to be reused by -vo gl.
reimar
parents: 35085
diff changeset
375 [self update_screen_info];
25413
8368ae92c092 screen_frame is only used for fullscreen mode.
ulion
parents: 25180
diff changeset
376
35072
5d9e4777593b Avoid some more global variables.
reimar
parents: 35071
diff changeset
377 [window setFrame:NSMakeRect(xinerama_x, xinerama_y, vo_screenwidth, vo_screenheight) display:YES animate:animate]; //zoom-in window with nice useless sfx
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
378 old_view_frame = [self bounds];
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
379
35072
5d9e4777593b Avoid some more global variables.
reimar
parents: 35071
diff changeset
380 [self setFrame:NSMakeRect(0, 0, vo_screenwidth, vo_screenheight)];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
381 [self setNeedsDisplay:YES];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
382 [window setHasShadow:NO];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
383 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
384 else
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
385 {
15902
16534910f0fb fix various window resizing bug with menu option
nplourde
parents: 15882
diff changeset
386 SetSystemUIMode( kUIModeNormal, 0);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
387
18057
0e7291ee4b6b Replace deprecated function
nplourde
parents: 17725
diff changeset
388 CGDisplayShowCursor(kCGDirectMainDisplay);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
389 mouseHide = NO;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
390
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
391 //revert window to previous setting
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
392 [self setFrame:old_view_frame];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
393 [self setNeedsDisplay:YES];
16081
72c352edce8f restore window shadow when quitting fullscreen mode
nplourde
parents: 15909
diff changeset
394 [window setHasShadow:YES];
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
395 [window setFrame:old_frame display:YES animate:animate];//zoom-out window with nice useless sfx
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
396 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
397 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
398
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
399 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
400 Toggle ontop
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
401 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
402 - (void) ontop
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
403 {
15320
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
404 if(vo_ontop)
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
405 {
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
406 [window setLevel:NSScreenSaverWindowLevel];
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
407 }
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
408 else
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
409 {
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
410 [window setLevel:NSNormalWindowLevel];
f743828642fd add ontop
nplourde
parents: 15289
diff changeset
411 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
412 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
413
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
414 /*
15327
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
415 Toggle rootwin
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
416 */
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
417 - (void) rootwin
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
418 {
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
419 if(vo_rootwin)
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
420 {
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
421 [window setLevel:CGWindowLevelForKey(kCGDesktopWindowLevelKey)];
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
422 [window orderBack:self];
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
423 }
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
424 else
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
425 {
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
426 [window setLevel:NSNormalWindowLevel];
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
427 }
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
428 }
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
429
8e21844c8a4c enable rootwin
nplourde
parents: 15325
diff changeset
430 /*
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
431 Check event for new event
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
432 */
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
433 - (void) check_events
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
434 {
31760
dc95a7191375 Move variable into the only function where it is used.
reimar
parents: 31759
diff changeset
435 NSEvent *event;
31759
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
436 int curTime = TickCount()/60;
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
437
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
438 //automatically hide mouse cursor (and future on-screen control?)
35082
6d8be70115a8 Remove local variables that (except for very brief moments before
reimar
parents: 35081
diff changeset
439 if(vo_fs && !mouseHide && !vo_rootwin)
31759
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
440 {
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
441 if(curTime - lastMouseHide >= 5 || lastMouseHide == 0)
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
442 {
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
443 CGDisplayHideCursor(kCGDirectMainDisplay);
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
444 mouseHide = TRUE;
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
445 lastMouseHide = curTime;
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
446 }
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
447 }
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
448
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
449 //update activity every 30 seconds to prevent
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
450 //screensaver from starting up.
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
451 if(curTime - lastScreensaverUpdate >= 30 || lastScreensaverUpdate == 0)
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
452 {
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
453 UpdateSystemActivity(UsrActivity);
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
454 lastScreensaverUpdate = curTime;
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
455 }
a320b893f660 Move mouse hiding code to check_events, this allows mouse hiding
reimar
parents: 31758
diff changeset
456
31757
83423e6b288e Simplify check_events: avoid seemingly pointless untilDate argument.
reimar
parents: 31756
diff changeset
457 event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSEventTrackingRunLoopMode dequeue:YES];
25178
e9d23081b4ab Ignore empty event.
ulion
parents: 25157
diff changeset
458 if (event == nil)
e9d23081b4ab Ignore empty event.
ulion
parents: 25157
diff changeset
459 return;
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
460 [NSApp sendEvent:event];
25179
6e8b40d412f0 Fix play window not get actived problem on Leopard.
ulion
parents: 25178
diff changeset
461 // Without SDL's bootstrap code (include SDL.h in mplayer.c),
28837
e5171567fe6c cosmetics: spelling fixes
diego
parents: 28836
diff changeset
462 // on Leopard, we have trouble to get the play window automatically focused
e5171567fe6c cosmetics: spelling fixes
diego
parents: 28836
diff changeset
463 // when the app is actived. The Following code fix this problem.
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 26755
diff changeset
464 #ifndef CONFIG_SDL
25179
6e8b40d412f0 Fix play window not get actived problem on Leopard.
ulion
parents: 25178
diff changeset
465 if (isLeopardOrLater && [event type] == NSAppKitDefined
6e8b40d412f0 Fix play window not get actived problem on Leopard.
ulion
parents: 25178
diff changeset
466 && [event subtype] == NSApplicationActivatedEventType) {
6e8b40d412f0 Fix play window not get actived problem on Leopard.
ulion
parents: 25178
diff changeset
467 [window makeMainWindow];
35066
e91f5bd3214d Consistently use "self" instead of a global variable.
reimar
parents: 35065
diff changeset
468 [window makeKeyAndOrderFront:self];
25179
6e8b40d412f0 Fix play window not get actived problem on Leopard.
ulion
parents: 25178
diff changeset
469 }
6e8b40d412f0 Fix play window not get actived problem on Leopard.
ulion
parents: 25178
diff changeset
470 #endif
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
471 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
472
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
473 /*
15731
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
474 From NSView, respond to key equivalents.
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
475 */
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
476 - (BOOL)performKeyEquivalent:(NSEvent *)theEvent
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
477 {
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
478 switch([theEvent keyCode])
31742
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
479 {
15731
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
480 case 0x21: [window setAlphaValue: winAlpha-=0.05]; return YES;
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
481 case 0x1e: [window setAlphaValue: winAlpha+=0.05]; return YES;
31742
8c22970585a7 Cosmetics: indentation fixes.
reimar
parents: 31741
diff changeset
482 }
15731
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
483 return NO;
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
484 }
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
485
532a351962fb set window alpha
nplourde
parents: 15729
diff changeset
486 /*
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
487 Process key event
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
488 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
489 - (void) keyDown: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
490 {
29533
9c8f8e375823 Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
reimar
parents: 29272
diff changeset
491 int key = convert_key([theEvent keyCode], *[[theEvent characters] UTF8String]);
9c8f8e375823 Reuse the osx_common convert_key function to convert OSX keycodes to MPlayer
reimar
parents: 29272
diff changeset
492 if (key != -1)
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
493 mplayer_put_key(key);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
494 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
495
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
496 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
497 Process mouse button event
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
498 */
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
499 - (void) mouseMoved: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
500 {
35082
6d8be70115a8 Remove local variables that (except for very brief moments before
reimar
parents: 35081
diff changeset
501 if(vo_fs && !vo_rootwin)
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
502 {
18057
0e7291ee4b6b Replace deprecated function
nplourde
parents: 17725
diff changeset
503 CGDisplayShowCursor(kCGDirectMainDisplay);
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
504 mouseHide = NO;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
505 }
35082
6d8be70115a8 Remove local variables that (except for very brief moments before
reimar
parents: 35081
diff changeset
506 if (enable_mouse_movements && !vo_rootwin) {
25446
8dfc8a3b4152 Support send mouse movements commands to mplayer.
ulion
parents: 25424
diff changeset
507 NSPoint p =[self convertPoint:[theEvent locationInWindow] fromView:nil];
35079
d01a5c88bcc9 corevideo: Simplify mouse handling.
reimar
parents: 35075
diff changeset
508 if ([self mouse:p inRect:[self frame]]) {
d01a5c88bcc9 corevideo: Simplify mouse handling.
reimar
parents: 35075
diff changeset
509 vo_mouse_movement(p.x, [self frame].size.height - p.y);
25446
8dfc8a3b4152 Support send mouse movements commands to mplayer.
ulion
parents: 25424
diff changeset
510 }
8dfc8a3b4152 Support send mouse movements commands to mplayer.
ulion
parents: 25424
diff changeset
511 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
512 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
513
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
514 - (void) mouseDown: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
515 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
516 [self mouseEvent: theEvent];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
517 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
518
24077
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
519 - (void) mouseUp: (NSEvent *) theEvent
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
520 {
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
521 [self mouseEvent: theEvent];
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
522 }
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
523
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
524 - (void) rightMouseDown: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
525 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
526 [self mouseEvent: theEvent];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
527 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
528
24077
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
529 - (void) rightMouseUp: (NSEvent *) theEvent
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
530 {
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
531 [self mouseEvent: theEvent];
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
532 }
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
533
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
534 - (void) otherMouseDown: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
535 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
536 [self mouseEvent: theEvent];
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
537 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
538
24077
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
539 - (void) otherMouseUp: (NSEvent *) theEvent
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
540 {
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
541 [self mouseEvent: theEvent];
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
542 }
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
543
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
544 - (void) scrollWheel: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
545 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
546 if([theEvent deltaY] > 0)
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
547 mplayer_put_key(MOUSE_BTN3);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
548 else
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
549 mplayer_put_key(MOUSE_BTN4);
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
550 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
551
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
552 - (void) mouseEvent: (NSEvent *) theEvent
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
553 {
24077
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
554 if ( [theEvent buttonNumber] >= 0 && [theEvent buttonNumber] <= 9 )
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
555 {
25422
31bc1206890c Fix mouse button mapping:
ulion
parents: 25414
diff changeset
556 int buttonNumber = [theEvent buttonNumber];
31bc1206890c Fix mouse button mapping:
ulion
parents: 25414
diff changeset
557 // Fix to mplayer defined button order: left, middle, right
31bc1206890c Fix mouse button mapping:
ulion
parents: 25414
diff changeset
558 if (buttonNumber == 1)
31bc1206890c Fix mouse button mapping:
ulion
parents: 25414
diff changeset
559 buttonNumber = 2;
25423
875d77cb7bbc Fix wrong code in last commit.
ulion
parents: 25422
diff changeset
560 else if (buttonNumber == 2)
875d77cb7bbc Fix wrong code in last commit.
ulion
parents: 25422
diff changeset
561 buttonNumber = 1;
24077
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
562 switch([theEvent type])
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
563 {
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
564 case NSLeftMouseDown:
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
565 case NSRightMouseDown:
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
566 case NSOtherMouseDown:
25422
31bc1206890c Fix mouse button mapping:
ulion
parents: 25414
diff changeset
567 mplayer_put_key((MOUSE_BTN0 + buttonNumber) | MP_KEY_DOWN);
24077
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
568 break;
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
569 case NSLeftMouseUp:
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
570 case NSRightMouseUp:
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
571 case NSOtherMouseUp:
25422
31bc1206890c Fix mouse button mapping:
ulion
parents: 25414
diff changeset
572 mplayer_put_key(MOUSE_BTN0 + buttonNumber);
24077
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
573 break;
9ce03980ed0c added double click support in vo_macosx. Patch by Ulion <ulion2002@gmail.com>
nplourde
parents: 24076
diff changeset
574 }
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
575 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
576 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
577
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
578 /*
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
579 NSResponder
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29210
diff changeset
580 */
15289
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
581 - (BOOL) acceptsFirstResponder
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
582 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
583 return YES;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
584 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
585
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
586 - (BOOL) becomeFirstResponder
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
587 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
588 return YES;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
589 }
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
590
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
591 - (BOOL) resignFirstResponder
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
592 {
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
593 return YES;
e985d786c5f1 macosx core video module
nplourde
parents:
diff changeset
594 }
15325
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
595
31756
8e043273075d Change window-closing handling so it works properly if the
reimar
parents: 31745
diff changeset
596 - (BOOL)windowShouldClose:(id)sender
15325
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
597 {
31735
3bb00f5abe8e Send KEY_CLOSE_WIN instead of KEY_ESC when the user requested
reimar
parents: 31049
diff changeset
598 mplayer_put_key(KEY_CLOSE_WIN);
31756
8e043273075d Change window-closing handling so it works properly if the
reimar
parents: 31745
diff changeset
599 // We have to wait for MPlayer to handle this,
8e043273075d Change window-closing handling so it works properly if the
reimar
parents: 31745
diff changeset
600 // otherwise we are in trouble if the
8e043273075d Change window-closing handling so it works properly if the
reimar
parents: 31745
diff changeset
601 // KEY_CLOSE_WIN handler is disabled
8e043273075d Change window-closing handling so it works properly if the
reimar
parents: 31745
diff changeset
602 return NO;
15325
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
603 }
31758
0577595394f8 Make the Quit menu entry work.
reimar
parents: 31757
diff changeset
604
0577595394f8 Make the Quit menu entry work.
reimar
parents: 31757
diff changeset
605 - (void)handleQuitEvent:(NSAppleEventDescriptor*)e withReplyEvent:(NSAppleEventDescriptor*)r
0577595394f8 Make the Quit menu entry work.
reimar
parents: 31757
diff changeset
606 {
0577595394f8 Make the Quit menu entry work.
reimar
parents: 31757
diff changeset
607 mplayer_put_key(KEY_CLOSE_WIN);
0577595394f8 Make the Quit menu entry work.
reimar
parents: 31757
diff changeset
608 }
15325
5bd11a72dc58 close button exit mplayer with esc key
nplourde
parents: 15320
diff changeset
609 @end