Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
966a1503
Commit
966a1503
authored
Sep 25, 2005
by
Clément Stenac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow setting video output title under X
Patch by Oscar Perez
parent
98988dae
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
5 deletions
+15
-5
modules/video_output/x11/xcommon.c
modules/video_output/x11/xcommon.c
+15
-5
No files found.
modules/video_output/x11/xcommon.c
View file @
966a1503
...
@@ -262,7 +262,7 @@ int E_(Activate) ( vlc_object_t *p_this )
...
@@ -262,7 +262,7 @@ int E_(Activate) ( vlc_object_t *p_this )
/* Set main window's size */
/* Set main window's size */
p_vout
->
p_sys
->
original_window
.
i_width
=
p_vout
->
i_window_width
;
p_vout
->
p_sys
->
original_window
.
i_width
=
p_vout
->
i_window_width
;
p_vout
->
p_sys
->
original_window
.
i_height
=
p_vout
->
i_window_height
;
p_vout
->
p_sys
->
original_window
.
i_height
=
p_vout
->
i_window_height
;
var_Create
(
p_vout
,
"video-title"
,
VLC_VAR_STRING
|
VLC_VAR_DOINHERIT
);
/* Spawn base window - this window will include the video output window,
/* Spawn base window - this window will include the video output window,
* but also command buttons, subtitles and other indicators */
* but also command buttons, subtitles and other indicators */
if
(
CreateWindow
(
p_vout
,
&
p_vout
->
p_sys
->
original_window
)
)
if
(
CreateWindow
(
p_vout
,
&
p_vout
->
p_sys
->
original_window
)
)
...
@@ -914,6 +914,7 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
...
@@ -914,6 +914,7 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
vlc_bool_t
b_expose
=
VLC_FALSE
;
vlc_bool_t
b_expose
=
VLC_FALSE
;
vlc_bool_t
b_configure_notify
=
VLC_FALSE
;
vlc_bool_t
b_configure_notify
=
VLC_FALSE
;
vlc_bool_t
b_map_notify
=
VLC_FALSE
;
vlc_bool_t
b_map_notify
=
VLC_FALSE
;
vlc_value_t
val
;
/* Prepare window manager hints and properties */
/* Prepare window manager hints and properties */
p_win
->
wm_protocols
=
p_win
->
wm_protocols
=
...
@@ -1002,6 +1003,9 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
...
@@ -1002,6 +1003,9 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
PROP_MWM_HINTS_ELEMENTS
);
PROP_MWM_HINTS_ELEMENTS
);
}
}
else
else
{
var_Get
(
p_vout
,
"video-title"
,
&
val
);
if
(
!
val
.
psz_string
||
!*
val
.
psz_string
)
{
{
XStoreName
(
p_vout
->
p_sys
->
p_display
,
p_win
->
base_window
,
XStoreName
(
p_vout
->
p_sys
->
p_display
,
p_win
->
base_window
,
#ifdef MODULE_NAME_IS_x11
#ifdef MODULE_NAME_IS_x11
...
@@ -1013,6 +1017,12 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
...
@@ -1013,6 +1017,12 @@ static int CreateWindow( vout_thread_t *p_vout, x11_window_t *p_win )
#endif
#endif
);
);
}
}
else
{
XStoreName
(
p_vout
->
p_sys
->
p_display
,
p_win
->
base_window
,
val
.
psz_string
);
}
}
}
}
}
}
else
else
...
...
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