diff options
| author | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-10-30 22:18:29 +0000 |
|---|---|---|
| committer | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-10-30 22:18:29 +0000 |
| commit | 0746f99a0afa22aac84823b96c1757659616786e (patch) | |
| tree | 8d02a6fe417b68cbcfc1472e8e04235c0958db86 | |
| parent | 9e259c79bd078bea84346e8a22979f81d8b971b8 (diff) | |
| download | mpv-0746f99a0afa22aac84823b96c1757659616786e.tar.bz2 mpv-0746f99a0afa22aac84823b96c1757659616786e.tar.xz | |
Slightly change behavior of "none" if fstype specification.
In a list of enabled fstypes, "none" now clears the list rather than
disabling all fstypes and interrupting the parser. To enable only one
(or more) fstypes, list the types to enable after "none".
For example:
"-fstype none" is the same as before: all disabled
"-fstype none,fullscreen" enables only the fullscreen type
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29805 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 2 | ||||
| -rw-r--r-- | libvo/x11_common.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index e8fcecc5fa..0e8582f53b 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3101,7 +3101,7 @@ Use the _WIN_LAYER hint with the given layer number. .IPs netwm Force NETWM style. .IPs "none\ " -Do not set fullscreen window layer. +Clear the list of modes; you can add modes to enable afterward. .IPs stays_on_top Use _NETWM_STATE_STAYS_ON_TOP hint if available. .REss diff --git a/libvo/x11_common.c b/libvo/x11_common.c index cdb695290e..036d77e55f 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -1316,7 +1316,7 @@ static int vo_x11_get_fs_type(int supported) else type |= vo_wm_NETWM; } else if (!strcmp(arg, "none")) - return 0; + type = 0; // clear; keep parsing } } |