Mercurial > mplayer.hg
comparison libvo/vo_gl2.c @ 18116:d75953576ae4
Fix and improve xinerama support
author | reimar |
---|---|
date | Sun, 16 Apr 2006 13:38:28 +0000 |
parents | f57317460375 |
children | 212999db0203 |
comparison
equal
deleted
inserted
replaced
18115:5e0bafa6f7e8 | 18116:d75953576ae4 |
---|---|
704 | 704 |
705 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint); | 705 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint); |
706 | 706 |
707 /* Map window. */ | 707 /* Map window. */ |
708 XMapWindow(mDisplay, vo_window); | 708 XMapWindow(mDisplay, vo_window); |
709 #ifdef HAVE_XINERAMA | |
710 vo_x11_xinerama_move(mDisplay,vo_window); | |
711 #endif | |
712 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); | 709 vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); |
713 XClearWindow(mDisplay,vo_window); | 710 XClearWindow(mDisplay,vo_window); |
714 | 711 |
715 /* Wait for map. */ | 712 /* Wait for map. */ |
716 do | 713 do |
808 int_pause = 0; | 805 int_pause = 0; |
809 | 806 |
810 panscan_init(); | 807 panscan_init(); |
811 aspect_save_orig(width,height); | 808 aspect_save_orig(width,height); |
812 aspect_save_prescale(d_width,d_height); | 809 aspect_save_prescale(d_width,d_height); |
813 aspect_save_screenres(vo_screenwidth,vo_screenheight); | 810 update_xinerama_info(); |
814 | 811 |
815 aspect(&d_width,&d_height,A_NOZOOM); | 812 aspect(&d_width,&d_height,A_NOZOOM); |
816 vo_dx = (int)(vo_screenwidth - d_width) / 2; | 813 vo_dx = (int)(vo_screenwidth - d_width) / 2; |
817 vo_dy = (int)(vo_screenheight - d_height) / 2; | 814 vo_dy = (int)(vo_screenheight - d_height) / 2; |
818 geometry(&vo_dx, &vo_dy, &d_width, &d_height, | 815 geometry(&vo_dx, &vo_dy, &d_width, &d_height, |
819 vo_screenwidth, vo_screenheight); | 816 vo_screenwidth, vo_screenheight); |
817 vo_dx += xinerama_x; | |
818 vo_dy += xinerama_y; | |
820 | 819 |
821 #if defined(HAVE_NEW_GUI) && !defined(GL_WIN32) | 820 #if defined(HAVE_NEW_GUI) && !defined(GL_WIN32) |
822 if (use_gui) { | 821 if (use_gui) { |
823 if (config_glx_gui(d_width, d_height) == -1) | 822 if (config_glx_gui(d_width, d_height) == -1) |
824 return -1; | 823 return -1; |