RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

video/out: introduce VOCTRL_UPDATE_WINDOW_TITLE 

Instead of implicitly changing the window title on config(), do it as
part of the new VOCTRL.

At first I wanted to make all VOs use the VOCTRL argument directly, but
on a second thought it appears vo_get_window_title() is much more useful
for some (namely, if the window is created lazily on first config()).

Not all VOs are changed. Wayland and OSX have to follow.
This commit is contained in:
wm4 2013-06-15 19:04:20 +02:00
parent 70f97efa72
commit 168a595bfe
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/mplayer.c
View File

@ -2365,6 +2365,7 @@ static void vo_update_window_title(struct MPContext *mpctx)
char *title = mp_property_expand_string(mpctx, mpctx->opts.wintitle);
talloc_free(mpctx->video_out->window_title);
mpctx->video_out->window_title = talloc_steal(mpctx, title);
vo_control(mpctx->video_out, VOCTRL_UPDATE_WINDOW_TITLE, title);
}
static void update_fps(struct MPContext *mpctx)

1
video/out/vo.h
View File

@ -60,6 +60,7 @@ enum mp_voctrl {
VOCTRL_ONTOP,
VOCTRL_BORDER,
VOCTRL_UPDATE_WINDOW_TITLE, // char*
VOCTRL_SET_CURSOR_VISIBILITY, // bool

6
video/out/vo_sdl.c
View File

@ -939,6 +939,8 @@ static int get_eq(struct vo *vo, const char *name, int *value)
static int control(struct vo *vo, uint32_t request, void *data)
{
struct priv *vc = vo->priv;
switch (request) {
case VOCTRL_CHECK_EVENTS:
check_events(vo);
@ -976,6 +978,10 @@ static int control(struct vo *vo, uint32_t request, void *data)
case VOCTRL_SET_CURSOR_VISIBILITY:
SDL_ShowCursor(*(bool *)data);
return true;
case VOCTRL_UPDATE_WINDOW_TITLE:
if (vc->window)
SDL_SetWindowTitle(vc->window, vo_get_window_title(vo));
return true;
}
return VO_NOTIMPL;
}

10
video/out/w32_common.c
View File

@ -407,10 +407,6 @@ static int reinit_window_state(struct vo *vo)
if (vo->opts->WinID >= 0)
return 1;
wchar_t *title = mp_from_utf8(NULL, vo_get_window_title(vo));
SetWindowTextW(w32->window, title);
talloc_free(title);
bool toggle_fs = w32->current_fs != vo->opts->fs;
w32->current_fs = vo->opts->fs;
@ -705,6 +701,12 @@ int vo_w32_control(struct vo *vo, int *events, int request, void *arg)
case VOCTRL_RESTORE_SCREENSAVER:
w32->disable_screensaver = false;
return VO_TRUE;
case VOCTRL_UPDATE_WINDOW_TITLE: {
wchar_t *title = mp_from_utf8(NULL, (char *)arg);
SetWindowTextW(w32->window, title);
talloc_free(title);
return VO_TRUE;
}
}
return VO_NOTIMPL;
}

9
video/out/x11_common.c
View File

@ -915,6 +915,9 @@ static void vo_x11_update_window_title(struct vo *vo)
{
struct vo_x11_state *x11 = vo->x11;
if (!x11->window)
return;
const char *title = vo_get_window_title(vo);
vo_x11_set_property_string(vo, XA_WM_NAME, title);
vo_x11_set_property_string(vo, XA_WM_ICON_NAME, title);
@ -970,6 +973,8 @@ static void vo_x11_create_window(struct vo *vo, XVisualInfo *vis, int x, int y,
XNClientWindow, x11->window,
XNFocusWindow, x11->window,
NULL);
vo_x11_update_window_title(vo);
}
static void vo_x11_map_window(struct vo *vo, int x, int y, int w, int h)
@ -1022,7 +1027,6 @@ void vo_x11_config_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y,
if (flags & VOFLAG_HIDDEN)
return;
vo_x11_update_window_title(vo);
if (opts->ontop)
vo_x11_setlayer(vo, x11->window, opts->ontop);
@ -1396,6 +1400,9 @@ int vo_x11_control(struct vo *vo, int *events, int request, void *arg)
case VOCTRL_RESTORE_SCREENSAVER:
saver_on(x11);
return VO_TRUE;
case VOCTRL_UPDATE_WINDOW_TITLE:
vo_x11_update_window_title(vo);
return VO_TRUE;
}
return VO_NOTIMPL;
}