diff options
-rw-r--r-- | DOCS/faq.html | 2 | ||||
-rw-r--r-- | DOCS/mplayer.1 | 14 | ||||
-rw-r--r-- | help/help_mp-en.h | 1 | ||||
-rw-r--r-- | libvo/x11_common.c | 16 |
4 files changed, 22 insertions, 11 deletions
diff --git a/DOCS/faq.html b/DOCS/faq.html index bf8cfc18ae..4ebf33b727 100644 --- a/DOCS/faq.html +++ b/DOCS/faq.html @@ -367,7 +367,7 @@ <DT>Q: Icewm's taskbar keeps covering the movie in fullscreen mode!</DT> <DD>A: This shouldn't happen anymore, if it still does use the - <CODE>-icelayer</CODE> option and report it to the + <CODE>-fstype layer</CODE> option and report it to the <A HREF="http://mplayerhq.hu/pipermail/mplayer-users/">mplayer-users</A> mailing list.</DD> <DD> </DD> diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1 index c67f82de4a..31a86e923f 100644 --- a/DOCS/mplayer.1 +++ b/DOCS/mplayer.1 @@ -1426,6 +1426,20 @@ See also \-zoom. .B \-fsmode-dontuse <0-31> (OBSOLETE) (use \-fs option) Try this option if you still experience fullscreen problems. .TP +.B \-fstype <type1,type2,...> +Specify a priority list of fullscreen layer setting modes to be +used. + +The default order is "layer,stays_on_top,above,fullscreen". It will be used +as a fallback in case of specifying incorrect or unsupported modes. +.br +If you experience problems with fullscreen window being covered by other +windows try using different order. + +.I NOTE: +.br +See \-fstype help for a full list of available modes. +.TP .B \-geometry x[%][:y[%]] or [WxH][+x+y] Adjust where the output is on the screen initially. The x and y specifications are in pixels measured from the top-right of the diff --git a/help/help_mp-en.h b/help/help_mp-en.h index 646e6a9d39..c5f9c5e5c1 100644 --- a/help/help_mp-en.h +++ b/help/help_mp-en.h @@ -128,7 +128,6 @@ static char help_text[]= #define MSGTR_AvailableAudioFm "\nAvailable (compiled-in) audio codec families/drivers:\n" #define MSGTR_AvailableVideoFm "\nAvailable (compiled-in) video codec families/drivers:\n" #define MSGTR_AvailableFsType "Available fullscreen layer change modes:\n" -#define MSGTR_DefaultFsType "\nThe deafult order is \"layer=%d,stays_on_top,above,fullscreen\".\nIt will be used in case of specifying incorrect or unsupported types.\n" #define MSGTR_UsingRTCTiming "Using Linux hardware RTC timing (%ldHz).\n" #define MSGTR_CannotReadVideoProperties "Video: Cannot read properties.\n" #define MSGTR_NoStreamFound "No stream found.\n" diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 5590c4f2cc..4fff4f4711 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -153,15 +153,13 @@ void fstype_help(void) { mp_msg(MSGT_VO, MSGL_INFO, MSGTR_AvailableFsType); - mp_msg(MSGT_VO, MSGL_INFO, " %-21s %s\n", "none", "don't set fullscreen window layer"); - mp_msg(MSGT_VO, MSGL_INFO, " %-21s %s\n", "layer", "use _WIN_LAYER hint with default layer"); - mp_msg(MSGT_VO, MSGL_INFO, " %-21s %s\n", "layer=<0..15>", "use _WIN_LAYER hint with a given layer number"); - mp_msg(MSGT_VO, MSGL_INFO, " %-21s %s\n", "above", "use _NETWM_STATE_ABOVE hint if available"); - mp_msg(MSGT_VO, MSGL_INFO, " %-21s %s\n", "below", "use _NETWM_STATE_BELOW hint if vailable"); - mp_msg(MSGT_VO, MSGL_INFO, " %-21s %s\n", "fullscreen", "use _NETWM_STATE_FULLSCREEN hint if availale"); - mp_msg(MSGT_VO, MSGL_INFO, " %-21s %s\n", "stays_on_top", "use _NETWM_STATE_STAYS_ON_TOP hint if available"); - - mp_msg(MSGT_VO, MSGL_INFO, MSGTR_DefaultFsType, WIN_LAYER_ABOVE_DOCK); + mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "none", "don't set fullscreen window layer"); + mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "layer", "use _WIN_LAYER hint with default layer"); + mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "layer=<0..15>", "use _WIN_LAYER hint with a given layer number"); + mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "above", "use _NETWM_STATE_ABOVE hint if available"); + mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "below", "use _NETWM_STATE_BELOW hint if vailable"); + mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "fullscreen", "use _NETWM_STATE_FULLSCREEN hint if availale"); + mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "stays_on_top", "use _NETWM_STATE_STAYS_ON_TOP hint if available"); } int net_wm_support_state_test( Atom atom ) |