Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
e53d8f51
Commit
e53d8f51
authored
Nov 03, 2006
by
Damien Fouilleul
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- voutgl.m: a bit of cleanup
parent
035319dd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
16 deletions
+15
-16
modules/gui/macosx/voutgl.m
modules/gui/macosx/voutgl.m
+15
-16
No files found.
modules/gui/macosx/voutgl.m
View file @
e53d8f51
...
@@ -578,26 +578,23 @@ static int aglManage( vout_thread_t * p_vout )
...
@@ -578,26 +578,23 @@ static int aglManage( vout_thread_t * p_vout )
}
}
else
else
{
{
/* Create a window */
WindowAttributes
windowAttrs
;
Rect
deviceRect
;
Rect
deviceRect
;
Rect
viewBounds
;
Rect
clipBounds
;
GDHandle
deviceHdl
=
GetMainDevice
();
GDHandle
deviceHdl
=
GetMainDevice
();
deviceRect
=
(
*
deviceHdl
)
->
gdRect
;
deviceRect
=
(
*
deviceHdl
)
->
gdRect
;
int
device_width
=
deviceRect
.
right
-
deviceRect
.
left
;
int
device_height
=
deviceRect
.
bottom
-
deviceRect
.
top
;
windowAttrs
=
kWindowStandardDocumentAttributes
|
kWindowStandardHandlerAttribute
|
kWindowLiveResizeAttribute
|
kWindowNoShadowAttribute
;
windowAttrs
&=
(
~
kWindowResizableAttribute
);
if
(
!
p_vout
->
p_sys
->
theWindow
)
if
(
!
p_vout
->
p_sys
->
theWindow
)
{
{
/* Create a window */
WindowAttributes
windowAttrs
;
windowAttrs
=
kWindowStandardDocumentAttributes
|
kWindowStandardHandlerAttribute
|
kWindowLiveResizeAttribute
|
kWindowNoShadowAttribute
;
windowAttrs
&=
(
~
kWindowResizableAttribute
);
CreateNewWindow
(
kDocumentWindowClass
,
windowAttrs
,
&
deviceRect
,
&
p_vout
->
p_sys
->
theWindow
);
CreateNewWindow
(
kDocumentWindowClass
,
windowAttrs
,
&
deviceRect
,
&
p_vout
->
p_sys
->
theWindow
);
if
(
!
p_vout
->
p_sys
->
winGroup
)
if
(
!
p_vout
->
p_sys
->
winGroup
)
{
{
...
@@ -622,6 +619,10 @@ static int aglManage( vout_thread_t * p_vout )
...
@@ -622,6 +619,10 @@ static int aglManage( vout_thread_t * p_vout )
};
};
InstallWindowEventHandler
(
p_vout
->
p_sys
->
theWindow
,
NewEventHandlerUPP
(
WindowEventHandler
),
GetEventTypeCount
(
win_events
),
win_events
,
p_vout
,
NULL
);
InstallWindowEventHandler
(
p_vout
->
p_sys
->
theWindow
,
NewEventHandlerUPP
(
WindowEventHandler
),
GetEventTypeCount
(
win_events
),
win_events
,
p_vout
,
NULL
);
}
}
else
{
SetWindowBounds
(
p_vout
->
p_sys
->
theWindow
,
kWindowContentRgn
,
&
deviceRect
);
}
glClear
(
GL_COLOR_BUFFER_BIT
);
glClear
(
GL_COLOR_BUFFER_BIT
);
p_vout
->
p_sys
->
agl_drawable
=
(
AGLDrawable
)
GetWindowPort
(
p_vout
->
p_sys
->
theWindow
);
p_vout
->
p_sys
->
agl_drawable
=
(
AGLDrawable
)
GetWindowPort
(
p_vout
->
p_sys
->
theWindow
);
aglSetDrawable
(
p_vout
->
p_sys
->
agl_ctx
,
p_vout
->
p_sys
->
agl_drawable
);
aglSetDrawable
(
p_vout
->
p_sys
->
agl_ctx
,
p_vout
->
p_sys
->
agl_drawable
);
...
@@ -631,7 +632,7 @@ static int aglManage( vout_thread_t * p_vout )
...
@@ -631,7 +632,7 @@ static int aglManage( vout_thread_t * p_vout )
ShowWindow
(
p_vout
->
p_sys
->
theWindow
);
ShowWindow
(
p_vout
->
p_sys
->
theWindow
);
SetSystemUIMode
(
kUIModeAllHidden
,
kUIOptionAutoShowMenuBar
);
SetSystemUIMode
(
kUIModeAllHidden
,
kUIOptionAutoShowMenuBar
);
CGDisplayHideCursor
(
kCGDirectMainDisplay
);
//
CGDisplayHideCursor(kCGDirectMainDisplay);
}
}
p_vout
->
b_fullscreen
=
!
p_vout
->
b_fullscreen
;
p_vout
->
b_fullscreen
=
!
p_vout
->
b_fullscreen
;
p_vout
->
i_changes
&=
~
VOUT_FULLSCREEN_CHANGE
;
p_vout
->
i_changes
&=
~
VOUT_FULLSCREEN_CHANGE
;
...
@@ -729,8 +730,6 @@ static void aglSetViewport( vout_thread_t *p_vout, Rect viewBounds, Rect clipBou
...
@@ -729,8 +730,6 @@ static void aglSetViewport( vout_thread_t *p_vout, Rect viewBounds, Rect clipBou
static
pascal
OSStatus
WindowEventHandler
(
EventHandlerCallRef
nextHandler
,
EventRef
event
,
void
*
userData
)
static
pascal
OSStatus
WindowEventHandler
(
EventHandlerCallRef
nextHandler
,
EventRef
event
,
void
*
userData
)
{
{
OSStatus
result
=
noErr
;
OSStatus
result
=
noErr
;
uint32_t
d_width
;
uint32_t
d_height
;
UInt32
class
=
GetEventClass
(
event
);
UInt32
class
=
GetEventClass
(
event
);
UInt32
kind
=
GetEventKind
(
event
);
UInt32
kind
=
GetEventKind
(
event
);
vout_thread_t
*
p_vout
=
(
vout_thread_t
*
)
userData
;
vout_thread_t
*
p_vout
=
(
vout_thread_t
*
)
userData
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment