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
3a31af06
Commit
3a31af06
authored
Aug 03, 2010
by
David Menestrina
Committed by
Rémi Denis-Courmont
Aug 03, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make xcb reject resize requests when embedded. Fixes trac #3848.
Signed-off-by:
Rémi Denis-Courmont
<
remi@remlab.net
>
parent
91f39030
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
modules/video_output/xcb/window.c
modules/video_output/xcb/window.c
+7
-0
No files found.
modules/video_output/xcb/window.c
View file @
3a31af06
...
...
@@ -99,6 +99,8 @@ struct vout_window_sys_t
#ifdef MATCHBOX_HACK
xcb_atom_t
mb_current_app_window
;
#endif
bool
embedded
;
};
/** Set an X window property from a nul-terminated string */
...
...
@@ -214,6 +216,7 @@ static int Open (vlc_object_t *obj)
vout_window_sys_t
*
p_sys
=
malloc
(
sizeof
(
*
p_sys
));
if
(
p_sys
==
NULL
)
return
VLC_ENOMEM
;
p_sys
->
embedded
=
false
;
/* Connect to X */
char
*
display
=
var_CreateGetNonEmptyString
(
wnd
,
"x11-display"
);
...
...
@@ -486,6 +489,9 @@ static int Control (vout_window_t *wnd, int cmd, va_list ap)
{
case
VOUT_WINDOW_SET_SIZE
:
{
if
(
p_sys
->
embedded
)
return
VLC_EGENERIC
;
unsigned
width
=
va_arg
(
ap
,
unsigned
);
unsigned
height
=
va_arg
(
ap
,
unsigned
);
const
uint32_t
values
[]
=
{
width
,
height
,
};
...
...
@@ -613,6 +619,7 @@ static int EmOpen (vlc_object_t *obj)
return
VLC_EGENERIC
;
vout_window_sys_t
*
p_sys
=
malloc
(
sizeof
(
*
p_sys
));
p_sys
->
embedded
=
true
;
xcb_connection_t
*
conn
=
xcb_connect
(
NULL
,
NULL
);
if
(
p_sys
==
NULL
||
xcb_connection_has_error
(
conn
))
goto
error
;
...
...
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