diff options
| author | wm4 <wm4@mplayer2.org> | 2012-07-28 17:07:49 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-07-28 17:24:05 +0200 |
| commit | 51e198c2a1e43b74ad35ef358628dcd8791158d9 (patch) | |
| tree | 60f6c2255ed912a7a4866b71728104a2cb2442f1 /libvo/x11_common.c | |
| parent | 2793e7eb70a342b346788f83e1ed660c8e0d491e (diff) | |
| parent | 7dfaaa95104a8e6dc024fddaf1b49c71768f1be7 (diff) | |
| download | mpv-51e198c2a1e43b74ad35ef358628dcd8791158d9.tar.bz2 mpv-51e198c2a1e43b74ad35ef358628dcd8791158d9.tar.xz | |
Merge remote-tracking branch 'origin/master'
Conflicts:
.gitignore
bstr.c
cfg-mplayer.h
defaultopts.c
libvo/video_out.c
The conflict in bstr.c is due to uau adding a bstr_getline function in
commit 2ba8b91a97e7e8. This function already existed in this branch.
While uau's function is obviously derived from mine, it's incompatible.
His function preserves line breaks, while mine strips them. Add a
bstr_strip_linebreaks function, fix all other uses of bstr_getline, and
pick uau's implementation.
In .gitignore, change vo_gl3_shaders.h to use an absolute path
additional to resolving the merge conflict.
Diffstat (limited to 'libvo/x11_common.c')
| -rw-r--r-- | libvo/x11_common.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 2fae9f480a..074e97bfed 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -337,6 +337,9 @@ static void init_atoms(struct vo_x11_state *x11) XA_INIT(WM_PROTOCOLS); XA_INIT(WM_DELETE_WINDOW); XA_INIT(UTF8_STRING); + char buf[50]; + sprintf(buf, "_NET_WM_CM_S%d", x11->screen); + x11->XA_NET_WM_CM = XInternAtom(x11->display, buf, False); } void update_xinerama_info(struct vo *vo) { @@ -1942,6 +1945,12 @@ uint32_t vo_x11_get_equalizer(const char *name, int *value) return VO_TRUE; } +bool vo_x11_screen_is_composited(struct vo *vo) +{ + struct vo_x11_state *x11 = vo->x11; + return XGetSelectionOwner(x11->display, x11->XA_NET_WM_CM) != None; +} + #ifdef CONFIG_XV int vo_xv_set_eq(struct vo *vo, uint32_t xv_port, const char *name, int value) { |