add var vo_rootwin and -rootwin switch for mac osx

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12913 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nplourde 2004-07-29 14:59:48 +00:00
parent 1a16bb4a04
commit 41508ab12e
4 changed files with 10 additions and 7 deletions

View File

@ -84,10 +84,11 @@ extern int fs_layer;
extern int stop_xscreensaver;
extern char **vo_fstype_list;
extern int vo_nomouse_input;
extern int WinID;
#endif
#if defined(HAVE_X11) || defined(MACOSX)
extern int WinID;
#ifdef MACOSX
extern int vo_rootwin;
#endif
#ifdef HAVE_AA
@ -301,10 +302,11 @@ m_option_t mplayer_opts[]={
{"stop_xscreensaver", "Use -stop-xscreensaver instead, options with _ have been obsoleted.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
{"fstype", &vo_fstype_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
{"nomouseinput", &vo_nomouse_input, CONF_TYPE_FLAG,0,0,-1,NULL},
{"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL},
#endif
#if defined(HAVE_X11) || defined(MACOSX)
{"rootwin", &WinID, CONF_TYPE_FLAG, 0, -1, 0, NULL},
#ifdef MACOSX
{"rootwin", &vo_rootwin, CONF_TYPE_FLAG, 0, 0, 1, NULL},
#endif
#ifdef HAVE_XINERAMA

View File

@ -44,6 +44,7 @@ int vo_ontop = 0;
int vo_adapter_num=0;
int vo_refresh_rate=0;
int vo_keepaspect=1;
int vo_rootwin=0;
int vo_pts=0; // for hw decoding
float vo_fps=0; // for mp1e rte

View File

@ -199,6 +199,7 @@ extern float vo_panscan;
extern int vo_adapter_num;
extern int vo_refresh_rate;
extern int vo_keepaspect;
extern int vo_rootwin;
extern int vo_gamma_brightness;
extern int vo_gamma_saturation;

View File

@ -70,12 +70,11 @@ static MatrixRecord matrix;
static int EnterMoviesDone = 0;
static int get_image_done = 0;
extern int vo_rootwin;
extern int vo_ontop;
extern int vo_fs; // user want fullscreen
static int vo_quartz_fs; // we are in fullscreen
int WinID = -1;
static int winLevel = 1;
int levelList[] =
{
@ -572,7 +571,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
if(vo_ontop)
window_ontop();
if(WinID == 0)
if(vo_rootwin)
{
vo_fs = TRUE;
winLevel = 0;