Mercurial > mplayer.hg

comparison libvo/vo_gl2.c @ 18949:51aeef9ada52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improve windows gui support
author reimar
date Sat, 08 Jul 2006 15:00:37 +0000
parents da5ceabe9a43
children 2d3fdf94a50c
comparison
equal deleted inserted replaced
18948:c2aee29c80b6 18949:51aeef9ada52
729 if (vo_fs ^ (flags & VOFLAG_FULLSCREEN)) 729 if (vo_fs ^ (flags & VOFLAG_FULLSCREEN))
730 vo_x11_fullscreen(); 730 vo_x11_fullscreen();
731 731
732 return 0; 732 return 0;
733 } 733 }
734 #endif
734 735
735 #ifdef HAVE_NEW_GUI 736 #ifdef HAVE_NEW_GUI
736 static int config_glx_gui(uint32_t d_width, uint32_t d_height) { 737 static int config_glx_gui(uint32_t d_width, uint32_t d_height) {
737 vo_dwidth = d_width; 738 vo_dwidth = d_width;
738 vo_dheight = d_height; 739 vo_dheight = d_height;
739 guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window 740 guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window
740 return 0; 741 return 0;
741 } 742 }
742 #endif
743
744 #endif 743 #endif
745 744
746 static int initGl(uint32_t d_width, uint32_t d_height) 745 static int initGl(uint32_t d_width, uint32_t d_height)
747 { 746 {
748 fragprog = lookupTex = 0; 747 fragprog = lookupTex = 0;
819 geometry(&vo_dx, &vo_dy, &d_width, &d_height, 818 geometry(&vo_dx, &vo_dy, &d_width, &d_height,
820 vo_screenwidth, vo_screenheight); 819 vo_screenwidth, vo_screenheight);
821 vo_dx += xinerama_x; 820 vo_dx += xinerama_x;
822 vo_dy += xinerama_y; 821 vo_dy += xinerama_y;
823 822
824 #if defined(HAVE_NEW_GUI) && !defined(GL_WIN32) 823 #ifdef HAVE_NEW_GUI
825 if (use_gui) { 824 if (use_gui) {
826 if (config_glx_gui(d_width, d_height) == -1) 825 if (config_glx_gui(d_width, d_height) == -1)
827 return -1; 826 return -1;
828 } else 827 }
828 #ifndef GL_WIN32
829 else
830 #endif
829 #endif 831 #endif
830 #ifdef GL_WIN32 832 #ifdef GL_WIN32
831 if (config_w32(width, height, d_width, d_height, flags, title, format) == -1) 833 if (config_w32(width, height, d_width, d_height, flags, title, format) == -1)
832 #else 834 #else
833 if (config_glx(width, height, d_width, d_height, flags, title, format) == -1) 835 if (config_glx(width, height, d_width, d_height, flags, title, format) == -1)