Mercurial > mplayer.hg

comparison libvo/vo_xvmc.c @ 18116:d75953576ae4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix and improve xinerama support
author reimar
date Sun, 16 Apr 2006 13:38:28 +0000
parents 3fe3b2b3a6ce
children 94965d83e2b6
comparison
equal deleted inserted replaced
18115:5e0bafa6f7e8 18116:d75953576ae4
602 image_height = height; 602 image_height = height;
603 image_width = width; 603 image_width = width;
604 604
605 vo_mouse_autohide = 1; 605 vo_mouse_autohide = 1;
606 606
607 update_xinerama_info();
607 vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2; 608 vo_dx=( vo_screenwidth - d_width ) / 2; vo_dy=( vo_screenheight - d_height ) / 2;
608 geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, vo_screenheight); 609 geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, vo_screenheight);
610 vo_dx += xinerama_x;
611 vo_dy += xinerama_y;
609 vo_dwidth=d_width; vo_dheight=d_height; 612 vo_dwidth=d_width; vo_dheight=d_height;
610 613
611 #ifdef HAVE_XF86VM 614 #ifdef HAVE_XF86VM
612 if( flags&VOFLAG_MODESWITCHING ) vm = 1; 615 if( flags&VOFLAG_MODESWITCHING ) vm = 1;
613 #endif 616 #endif
614
615 aspect_save_screenres(vo_screenwidth,vo_screenheight);
616 617
617 #ifdef HAVE_NEW_GUI 618 #ifdef HAVE_NEW_GUI
618 if(use_gui) 619 if(use_gui)
619 guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window 620 guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window
620 else 621 else
700 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint); 701 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint);
701 XSetWMNormalHints( mDisplay,vo_window,&hint ); 702 XSetWMNormalHints( mDisplay,vo_window,&hint );
702 XMapWindow(mDisplay, vo_window); 703 XMapWindow(mDisplay, vo_window);
703 if ( flags&VOFLAG_FULLSCREEN ) vo_x11_fullscreen(); 704 if ( flags&VOFLAG_FULLSCREEN ) vo_x11_fullscreen();
704 else { 705 else {
705 #ifdef HAVE_XINERAMA
706 vo_x11_xinerama_move(mDisplay,vo_window);
707 #endif
708 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); 706 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );
709 } 707 }
710 } else { 708 } else {
711 // vo_fs set means we were already at fullscreen 709 // vo_fs set means we were already at fullscreen
712 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); 710 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 );