Mercurial > mplayer.hg
comparison libvo/vo_xv.c @ 5999:792d58595767
fix -fs and 'f'
author | pontscho |
---|---|
date | Mon, 06 May 2002 16:56:41 +0000 |
parents | cb393303865d |
children | bb1f3552f118 |
comparison
equal
deleted
inserted
replaced
5998:79977d64bb99 | 5999:792d58595767 |
---|---|
336 image_format=format; | 336 image_format=format; |
337 | 337 |
338 vo_mouse_autohide=1; | 338 vo_mouse_autohide=1; |
339 | 339 |
340 vo_dwidth=d_width; vo_dheight=d_height; | 340 vo_dwidth=d_width; vo_dheight=d_height; |
341 vo_fs=flags&1; | 341 // vo_fs=flags&1; |
342 if ( vo_fs ) | 342 // if ( vo_fs ) |
343 { vo_old_width=d_width; vo_old_height=d_height; } | 343 // { vo_old_width=d_width; vo_old_height=d_height; } |
344 | 344 |
345 #ifdef HAVE_XF86VM | 345 #ifdef HAVE_XF86VM |
346 if( flags&0x02 ) vm = 1; | 346 if( flags&0x02 ) vm = 1; |
347 #endif | 347 #endif |
348 flip_flag=flags&8; | 348 flip_flag=flags&8; |
386 } | 386 } |
387 else | 387 else |
388 #endif | 388 #endif |
389 if ( vo_fs ) | 389 if ( vo_fs ) |
390 { | 390 { |
391 hint.width=vo_screenwidth; | 391 // hint.width=vo_screenwidth; |
392 hint.height=vo_screenheight; | 392 // hint.height=vo_screenheight; |
393 #ifdef X11_FULLSCREEN | 393 #ifdef X11_FULLSCREEN |
394 /* this code replaces X11_FULLSCREEN hack in mplayer.c | 394 /* this code replaces X11_FULLSCREEN hack in mplayer.c |
395 * aspect() is available through aspect.h for all vos. | 395 * aspect() is available through aspect.h for all vos. |
396 * besides zooming should only be done with -zoom, | 396 * besides zooming should only be done with -zoom, |
397 * but I leave the old -fs behaviour so users don't get | 397 * but I leave the old -fs behaviour so users don't get |
435 #endif | 435 #endif |
436 )) | 436 )) |
437 ); | 437 ); |
438 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint); | 438 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint); |
439 XSetWMNormalHints( mDisplay,vo_window,&hint ); | 439 XSetWMNormalHints( mDisplay,vo_window,&hint ); |
440 if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 ); | 440 // if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 ); |
441 XMapWindow(mDisplay, vo_window); | 441 XMapWindow(mDisplay, vo_window); |
442 if ( flags&1 ) vo_x11_fullscreen(); | |
442 #ifdef HAVE_XINERAMA | 443 #ifdef HAVE_XINERAMA |
443 vo_x11_xinerama_move(mDisplay,vo_window); | 444 vo_x11_xinerama_move(mDisplay,vo_window); |
444 #endif | 445 #endif |
445 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); | 446 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); |
446 XFlush(mDisplay); | 447 XFlush(mDisplay); |