diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-25 02:14:16 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-25 02:50:58 +0300 |
| commit | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (patch) | |
| tree | 1ba215c9978eadcd6b99b2c696b22ea6a3779e33 /libvo/x11_common.c | |
| parent | 577587ec6ce8dad59c303a76cba03af03db879a3 (diff) | |
| parent | 901574e3bf6ff45a46a12dc7884a93970f9d58d1 (diff) | |
| download | mpv-3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d.tar.bz2 mpv-3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d.tar.xz | |
Merge svn changes up to r27347
Conflicts:
libvo/x11_common.c
libvo/x11_common.h
Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts
with the global variable "vo_border"; done in the merge commit because
uses of the macro needed changes anyway to resolve conflicts.
Diffstat (limited to 'libvo/x11_common.c')
| -rw-r--r-- | libvo/x11_common.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index d40efd8735..858acda3be 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -1289,6 +1289,7 @@ void vo_x11_create_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y, hint.flags = PPosition | PSize; XSetStandardProperties(mDisplay, x11->window, title, title, None, NULL, 0, &hint); vo_x11_sizehint(vo, x, y, width, height, 0); + if (!vo_border) vo_x11_decoration(vo, 0); // map window XMapWindow(mDisplay, x11->window); XClearWindow(mDisplay, x11->window); @@ -1546,7 +1547,7 @@ void vo_x11_fullscreen(struct vo *vo) if ( ! (x11->fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs { - vo_x11_decoration(vo, (vo_fs) ? 0 : 1); + vo_x11_decoration(vo, vo_border && !vo_fs); vo_x11_sizehint(vo, x, y, w, h, 0); vo_x11_setlayer(vo, x11->window, vo_fs); @@ -1572,6 +1573,12 @@ void vo_x11_ontop(struct vo *vo) vo_x11_setlayer(vo, vo->x11->window, opts->vo_ontop); } +void vo_x11_border(struct vo *vo) +{ + vo_border = !vo_border; + vo_x11_decoration(vo, vo_border && !vo_fs); +} + /* * XScreensaver stuff */ |