annotate libvo/vo_gl.c @ 14423:160dc87f9e8a

consistent two pass, pass two etc spelling
author diego
date Fri, 07 Jan 2005 22:40:16 +0000
parents da530c6064a0
children 3512ff2cddb2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
1 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
2 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
3 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
4 #include <math.h>
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
5 #include <errno.h>
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
6
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
7 #include "mp_msg.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
8 #include "config.h"
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
9 #include "subopt-helper.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
10 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
11 #include "video_out_internal.h"
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
12 #include "font_load.h"
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
13 #include "sub.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
14
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
15 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
16 #include <X11/Xutil.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
17 //#include <X11/keysym.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18 #include <GL/glx.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
19 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
21 #include <GL/gl.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
23 #include "gl_common.h"
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
24 #include "x11_common.h"
2057
378aed6b232d Use aspect()
atmos4
parents: 2041
diff changeset
25 #include "aspect.h"
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
26 #ifdef HAVE_NEW_GUI
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
27 #include "Gui/interface.h"
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
28 #endif
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
29
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7931
diff changeset
30 static vo_info_t info =
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32 "X11 (OpenGL)",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
33 "gl",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
34 "Arpad Gereoffy <arpi@esp-team.scene.hu>",
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
35 ""
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
36 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
37
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7931
diff changeset
38 LIBVO_EXTERN(gl)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7931
diff changeset
39
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
40 static XVisualInfo *gl_vinfo = NULL;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
41 static GLXContext gl_context = 0;
2041
ba8a225d1a18 now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents: 2040
diff changeset
42 static int wsGLXAttrib[] = { GLX_RGBA,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
43 GLX_RED_SIZE,1,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
44 GLX_GREEN_SIZE,1,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
45 GLX_BLUE_SIZE,1,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
46 GLX_DOUBLEBUFFER,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
47 None };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
48
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
49 static int use_osd;
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
50 static int scaled_osd;
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
51 //! How many parts the OSD may consist of at most
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
52 #define MAX_OSD_PARTS 20
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
53 //! Textures for OSD
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
54 static GLuint osdtex[MAX_OSD_PARTS];
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
55 #ifndef FAST_OSD
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
56 //! Alpha textures for OSD
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
57 static GLuint osdatex[MAX_OSD_PARTS];
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
58 #endif
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
59 //! Display lists that draw the OSD parts
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
60 static GLuint osdDispList[MAX_OSD_PARTS];
14269
718ec28220d6 Doxygen comments improved
reimar
parents: 14078
diff changeset
61 //! How many parts the OSD currently consists of
13599
094b023bd291 Variables for OSD support should be static
reimar
parents: 13585
diff changeset
62 static int osdtexCnt = 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
64 static int use_aspect;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
65 static uint32_t image_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 static uint32_t image_height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67 static uint32_t image_bytes;
12159
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
68 static int many_fmts;
12445
d97398ed403e changes to get manyfmts nearer to working and fixed memory leak
reimar
parents: 12212
diff changeset
69 static GLenum gl_texfmt;
12159
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
70 static GLenum gl_format;
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
71 static GLenum gl_type;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
73 static int int_pause;
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
74
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75 static uint32_t texture_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
76 static uint32_t texture_height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
77
13237
f85c105bfeaa improved suboption parsing, fixes also compiler warnings
reimar
parents: 13206
diff changeset
78 static unsigned int slice_height = 1;
8654
2c4cebb8637d - optional slice height for -vo gl (example: -vo gl:32)
arpi
parents: 8148
diff changeset
79
612
77e0094f0cce some warnings killed
szabii
parents: 384
diff changeset
80 static void resize(int x,int y){
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
81 mp_msg(MSGT_VO, MSGL_V, "[gl] Resize: %dx%d\n",x,y);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
82 glViewport( 0, 0, x, y );
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
84 glMatrixMode(GL_PROJECTION);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85 glLoadIdentity();
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
86 if (vo_fs && use_aspect) {
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
87 int new_w, new_h;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
88 GLdouble scale_x, scale_y;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
89 aspect(&new_w, &new_h, A_ZOOM);
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
90 panscan_calc();
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
91 new_w += vo_panscan_x;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
92 new_h += vo_panscan_y;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
93 scale_x = (GLdouble) new_w / (GLdouble) x;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
94 scale_y = (GLdouble) new_h / (GLdouble) y;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
95 glScaled(scale_x, scale_y, 1);
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
96 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
97 glOrtho(0, image_width, image_height, 0, -1,1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
98
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
99 glMatrixMode(GL_MODELVIEW);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
100 glLoadIdentity();
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
101
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
102 if (!scaled_osd) {
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
103 #ifdef HAVE_FREETYPE
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
104 // adjust font size to display size
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
105 force_load_font = 1;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
106 #endif
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
107 vo_osd_changed(OSDTYPE_OSD);
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
108 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
109 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
110
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
111 /**
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
112 * \brief Initialize a (new or reused) OpenGL context.
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
113 */
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
114 static int initGl(uint32_t d_width, uint32_t d_height) {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
115 unsigned char *ImageData = NULL;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
116 texture_width = 32;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
117 while (texture_width < image_width ||
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
118 texture_width < image_height)
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
119 texture_width *= 2;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
120 texture_height = texture_width;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
121
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
122 glDisable(GL_BLEND);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
123 glDisable(GL_DEPTH_TEST);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
124 glDepthMask(GL_FALSE);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
125 glDisable(GL_CULL_FACE);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
126 glEnable(GL_TEXTURE_2D);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
127
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
128 mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n",
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
129 texture_width, texture_height);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
130
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
131 glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER, GL_LINEAR);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
132 glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER, GL_LINEAR);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
133
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
134 glAdjustAlignment(texture_width * image_bytes);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
135 ImageData = malloc(texture_width * texture_height * image_bytes);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
136 memset(ImageData, 0, texture_width * texture_height * image_bytes);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
137 glTexImage2D(GL_TEXTURE_2D, 0, gl_texfmt, texture_width, texture_height, 0,
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
138 gl_format, gl_type, ImageData);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
139 free (ImageData);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
140
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
141 // set alignment as default is 4 which will break some files
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
142 glAdjustAlignment(image_width * image_bytes);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
143
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
144 resize(d_width, d_height);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
145
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
146 glClearColor( 0.0f,0.0f,0.0f,0.0f );
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
147 glClear( GL_COLOR_BUFFER_BIT );
13920
4d4c6ac44d55 missing return for InitGl function
reimar
parents: 13871
diff changeset
148 return 1;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
149 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
150
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
151 /* connect to server, create and map window,
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
152 * allocate colors and (shared) memory
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
153 */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
154 static uint32_t
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 7111
diff changeset
155 config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
156 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
157 image_height = height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
158 image_width = width;
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13993
diff changeset
159 glFindFormat(format, &image_bytes, &gl_texfmt, &gl_format, &gl_type);
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13993
diff changeset
160 image_bytes = (image_bytes + 7) / 8;
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
161
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
162 sub_bg_alpha = 255; // We need alpha = 255 for invisible part of the OSD
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
163 int_pause = 0;
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
164
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
165 panscan_init();
2249
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2057
diff changeset
166 aspect_save_orig(width,height);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2057
diff changeset
167 aspect_save_prescale(d_width,d_height);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2057
diff changeset
168 aspect_save_screenres(vo_screenwidth,vo_screenheight);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2057
diff changeset
169
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2057
diff changeset
170 aspect(&d_width,&d_height,A_NOZOOM);
2040
bf7764f429c9 -fs fix
atmos4
parents: 1501
diff changeset
171 #ifdef X11_FULLSCREEN
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
172 // if( flags&0x01 ){ // (-fs)
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
173 // aspect(&d_width,&d_height,A_ZOOM);
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
174 // }
2040
bf7764f429c9 -fs fix
atmos4
parents: 1501
diff changeset
175 #endif
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
176 #ifdef HAVE_NEW_GUI
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
177 if (use_gui) {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
178 // GUI creates and manages window for us
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
179 vo_dwidth = d_width;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
180 vo_dheight= d_height;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
181 guiGetEvent(guiSetShVideo, 0);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
182 setGlWindow(&gl_vinfo, &gl_context, vo_window);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
183 initGl(vo_dwidth, vo_dheight);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
184 return 0;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
185 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
186 #endif
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
187 if ( vo_window == None ) {
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
188 unsigned int fg, bg;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
189 XSizeHints hint;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
190 XVisualInfo *vinfo;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
191 XEvent xev;
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
192
13871
8298dc8ca78b more fullscreen fixes and gl2 uses setGlWindow.
reimar
parents: 13843
diff changeset
193 vo_fs = VO_FALSE;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
194
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
195 hint.x = 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
196 hint.y = 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
197 hint.width = d_width;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
198 hint.height = d_height;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
199 hint.flags = PPosition | PSize;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
200
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
201 /* Get some colors */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
202
2041
ba8a225d1a18 now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents: 2040
diff changeset
203 bg = WhitePixel(mDisplay, mScreen);
ba8a225d1a18 now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents: 2040
diff changeset
204 fg = BlackPixel(mDisplay, mScreen);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
205
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
206 /* Make the window */
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
207
2041
ba8a225d1a18 now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents: 2040
diff changeset
208 vinfo=glXChooseVisual( mDisplay,mScreen,wsGLXAttrib );
1290
af0b764f34c5 no segfault if no glx present
alex
parents: 1137
diff changeset
209 if (vinfo == NULL)
af0b764f34c5 no segfault if no glx present
alex
parents: 1137
diff changeset
210 {
11988
ccb15c72f331 printf -> mp_msg
attila
parents: 11542
diff changeset
211 mp_msg(MSGT_VO, MSGL_ERR, "[gl] no GLX support present\n");
1290
af0b764f34c5 no segfault if no glx present
alex
parents: 1137
diff changeset
212 return -1;
af0b764f34c5 no segfault if no glx present
alex
parents: 1137
diff changeset
213 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
214
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
215
1137
4c7b219e126c patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents: 1109
diff changeset
216
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
217 vo_window = vo_x11_create_smooth_window(mDisplay, mRootWin, vinfo->visual, hint.x, hint.y, hint.width, hint.height,
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
218 vinfo->depth, XCreateColormap(mDisplay, mRootWin, vinfo->visual, AllocNone));
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
219
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
220 vo_x11_classhint( mDisplay,vo_window,"gl" );
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
221 vo_hidecursor(mDisplay,vo_window);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
222
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
223 // if ( flags&0x01 ) vo_x11_decoration( mDisplay,vo_window,0 );
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
224 XSelectInput(mDisplay, vo_window, StructureNotifyMask);
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
225 /* Tell other applications about this window */
10138
5e286cc6ad21 Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents: 8654
diff changeset
226 XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint);
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
227 /* Map window. */
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
228 XMapWindow(mDisplay, vo_window);
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 2732
diff changeset
229 #ifdef HAVE_XINERAMA
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
230 vo_x11_xinerama_move(mDisplay,vo_window);
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 2732
diff changeset
231 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
232
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
233 /* Wait for map. */
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
234 do
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
235 {
2041
ba8a225d1a18 now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents: 2040
diff changeset
236 XNextEvent(mDisplay, &xev);
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
237 }
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
238 while (xev.type != MapNotify || xev.xmap.event != vo_window);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
239
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
240 XSelectInput(mDisplay, vo_window, NoEventMask);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
241
2041
ba8a225d1a18 now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents: 2040
diff changeset
242 XSync(mDisplay, False);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243
6953
ce67cc1f0beb ignore BadAccess error at XSelectInput() (grabbing mouse etc) with warning
arpi
parents: 6212
diff changeset
244 vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PointerMotionMask
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
245 | ButtonPressMask | ButtonReleaseMask | ExposureMask
4658
93d562ad1c22 Added new input mouse support in x11 vo
albeu
parents: 4596
diff changeset
246 );
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
247 }
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
248 if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
13575
d3ef52aafb54 fixed UNPACK_ALIGNMENT setting.
reimar
parents: 13237
diff changeset
249
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
250 vo_x11_nofs_sizepos(0, 0, d_width, d_height);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
251 if (vo_fs ^ (flags & VOFLAG_FULLSCREEN))
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
252 vo_x11_fullscreen();
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
253 setGlWindow(&gl_vinfo, &gl_context, vo_window);
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
254 initGl(vo_dwidth, vo_dheight);
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
255
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
256 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
257 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
258
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
259 static void check_events(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
260 {
2041
ba8a225d1a18 now using x11_common stuff for X11 opening and w/h/bpp query
arpi
parents: 2040
diff changeset
261 int e=vo_x11_check_events(mDisplay);
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
262 if(e&VO_EVENT_RESIZE) resize(vo_dwidth,vo_dheight);
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
263 if(e&VO_EVENT_EXPOSE && int_pause) flip_page();
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
264 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
265
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
266 /**
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
267 * Creates the textures and the display list needed for displaying
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
268 * an OSD part.
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
269 * Callback function for vo_draw_text().
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
270 */
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
271 static void create_osd_texture(int x0, int y0, int w, int h,
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
272 unsigned char *src, unsigned char *srca,
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
273 int stride)
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
274 {
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
275 // initialize to 8 to avoid special-casing on alignment
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
276 int sx = 8, sy = 8;
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
277 GLfloat xcov, ycov;
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
278 GLint scale_type = (scaled_osd) ? GL_LINEAR : GL_NEAREST;
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
279 char *clearTexture;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
280 while (sx < w) sx *= 2;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
281 while (sy < h) sy *= 2;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
282 xcov = (GLfloat) w / (GLfloat) sx;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
283 ycov = (GLfloat) h / (GLfloat) sy;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
284
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
285 if (osdtexCnt >= MAX_OSD_PARTS) {
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
286 mp_msg(MSGT_VO, MSGL_ERR, "Too many OSD parts, contact the developers!\n");
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
287 return;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
288 }
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
289 clearTexture = malloc(sx * sy);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
290 memset(clearTexture, 0, sx * sy);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
291
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
292 // create Textures for OSD part
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
293 glAdjustAlignment(stride);
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
294 glPixelStorei(GL_UNPACK_ROW_LENGTH, stride);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
295 glGenTextures(1, &osdtex[osdtexCnt]);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
296 glBindTexture(GL_TEXTURE_2D, osdtex[osdtexCnt]);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
297 glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, sx, sy, 0,
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
298 GL_LUMINANCE, GL_UNSIGNED_BYTE, clearTexture);
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
299 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, scale_type);
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
300 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, scale_type);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
301 glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_LUMINANCE,
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
302 GL_UNSIGNED_BYTE, src);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
303
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
304 #ifndef FAST_OSD
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
305 glGenTextures(1, &osdatex[osdtexCnt]);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
306 glBindTexture(GL_TEXTURE_2D, osdatex[osdtexCnt]);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
307 glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, sx, sy, 0,
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
308 GL_LUMINANCE, GL_UNSIGNED_BYTE, clearTexture);
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
309 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, scale_type);
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
310 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, scale_type);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
311 glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, w, h, GL_ALPHA,
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
312 GL_UNSIGNED_BYTE, srca);
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
313 #endif
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
314 glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
13653
799f81d3cb19 added gl_common for code used by both vo_gl.c and vo_gl2.c.
reimar
parents: 13601
diff changeset
315 glAdjustAlignment(image_width * image_bytes);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
316
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
317 glBindTexture(GL_TEXTURE_2D, 0);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
318 free(clearTexture);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
319
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
320 // Create a list for rendering this OSD part
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
321 osdDispList[osdtexCnt] = glGenLists(1);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
322 glNewList(osdDispList[osdtexCnt], GL_COMPILE);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
323 #ifndef FAST_OSD
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
324 // render alpha
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
325 glBlendFunc(GL_ZERO, GL_SRC_ALPHA);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
326 glBindTexture(GL_TEXTURE_2D, osdatex[osdtexCnt]);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
327 glBegin(GL_QUADS);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
328 glTexCoord2f (0, 0);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
329 glVertex2f (x0, y0);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
330 glTexCoord2f (0, ycov);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
331 glVertex2f (x0, y0 + h);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
332 glTexCoord2f (xcov, ycov);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
333 glVertex2f (x0 + w, y0 + h);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
334 glTexCoord2f (xcov, 0);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
335 glVertex2f (x0 + w, y0);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
336 glEnd();
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
337 #endif
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
338 // render OSD
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
339 glBlendFunc (GL_ONE, GL_ONE);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
340 glBindTexture(GL_TEXTURE_2D, osdtex[osdtexCnt]);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
341 glBegin(GL_QUADS);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
342 glTexCoord2f (0, 0);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
343 glVertex2f (x0, y0);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
344 glTexCoord2f (0, ycov);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
345 glVertex2f (x0, y0 + h);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
346 glTexCoord2f (xcov, ycov);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
347 glVertex2f (x0 + w, y0 + h);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
348 glTexCoord2f (xcov, 0);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
349 glVertex2f (x0 + w, y0);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
350 glEnd();
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
351 glEndList();
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
352
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
353 osdtexCnt++;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
354 }
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
355
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1302
diff changeset
356 static void draw_osd(void)
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1302
diff changeset
357 {
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
358 int i;
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
359 int osd_h, osd_w;
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
360 if (!use_osd) return;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
361 if (vo_osd_changed(0)) {
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
362 for (i = 0; i < osdtexCnt; i++) {
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
363 glDeleteTextures(1, &osdtex[i]);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
364 #ifndef FAST_OSD
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
365 glDeleteTextures(1, &osdatex[i]);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
366 #endif
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
367 glDeleteLists(osdDispList[i], 1);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
368 }
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
369 osdtexCnt = 0;
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
370
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
371 osd_w = (scaled_osd) ? image_width : vo_dwidth;
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
372 osd_h = (scaled_osd) ? image_height : vo_dheight;
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
373 vo_draw_text(osd_w, osd_h, create_osd_texture);
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
374 }
1501
d40f2b686846 changes according to -utf8 option, draw_osd() function added
atlka
parents: 1302
diff changeset
375 }
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
376
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
377 static void
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
378 flip_page(void)
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
379 {
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
380
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
381 // glEnable(GL_TEXTURE_2D);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
382 // glBindTexture(GL_TEXTURE_2D, texture_id);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
383
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
384 glColor3f(1,1,1);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
385 glBegin(GL_QUADS);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
386 glTexCoord2f(0,0);glVertex2i(0,0);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
387 glTexCoord2f(0,1);glVertex2i(0,texture_height);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
388 glTexCoord2f(1,1);glVertex2i(texture_width,texture_height);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
389 glTexCoord2f(1,0);glVertex2i(texture_width,0);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
390 glEnd();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
391
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
392 if (osdtexCnt > 0) {
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
393 // set special rendering parameters
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
394 if (!scaled_osd) {
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
395 glMatrixMode(GL_PROJECTION);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
396 glPushMatrix();
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
397 glLoadIdentity();
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
398 glOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1);
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
399 }
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
400 glEnable(GL_BLEND);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
401 // draw OSD
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
402 glCallLists(osdtexCnt, GL_UNSIGNED_INT, osdDispList);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
403 // set rendering parameters back to defaults
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
404 glDisable (GL_BLEND);
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
405 if (!scaled_osd)
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
406 glPopMatrix();
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
407 glBindTexture(GL_TEXTURE_2D, 0);
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
408 }
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
409
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
410 // glFlush();
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
411 glFinish();
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
412 glXSwapBuffers( mDisplay,vo_window );
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
413
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
414 if (vo_fs && use_aspect)
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
415 glClear(GL_COLOR_BUFFER_BIT);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
416 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
417
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
418 //static inline uint32_t draw_slice_x11(uint8_t *src[], uint32_t slice_num)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
419 static uint32_t draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
420 {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
421 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
422 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
423
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
424
10138
5e286cc6ad21 Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents: 8654
diff changeset
425 static uint32_t
5e286cc6ad21 Removed YUV (YV12) and BGR support, leaving the native RGB support. Also cleaned some other parts.
alex
parents: 8654
diff changeset
426 draw_frame(uint8_t *src[])
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
427 {
13237
f85c105bfeaa improved suboption parsing, fixes also compiler warnings
reimar
parents: 13206
diff changeset
428 unsigned int i;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
429 uint8_t *ImageData=src[0];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
430
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
431 if (slice_height == 0)
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
432 glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, image_width, image_height,
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
433 gl_format, gl_type, ImageData);
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
434 else
8654
2c4cebb8637d - optional slice height for -vo gl (example: -vo gl:32)
arpi
parents: 8148
diff changeset
435 for(i=0;i<image_height;i+=slice_height){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
436 glTexSubImage2D( GL_TEXTURE_2D, // target
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
437 0, // level
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
438 0, // x offset
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
439 // image_height-1-i, // y offset
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
440 i, // y offset
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
441 image_width, // width
8654
2c4cebb8637d - optional slice height for -vo gl (example: -vo gl:32)
arpi
parents: 8148
diff changeset
442 (i+slice_height<=image_height)?slice_height:image_height-i, // height
12159
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
443 gl_format,
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
444 gl_type,
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
445 ImageData+i*image_bytes*image_width ); // *pixels
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
446 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
447
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
448 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
449 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
450
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
451 static uint32_t
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
452 query_format(uint32_t format)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
453 {
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
454 int caps = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
455 if (use_osd)
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
456 caps |= VFCAP_OSD;
13206
6e8d1ac141fc Using updated colorspace specifications from colorspaces.txt.
reimar
parents: 13188
diff changeset
457 if ((format == IMGFMT_RGB24) || (format == IMGFMT_RGBA))
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
458 return caps;
14078
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13993
diff changeset
459 if (many_fmts &&
c4033dcb986f More similar code from gl and gl2 moved to gl_common
reimar
parents: 13993
diff changeset
460 glFindFormat(format, NULL, NULL, NULL, NULL))
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
461 return caps;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
462 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
463 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
464
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
465
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
466 static void
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
467 uninit(void)
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
468 {
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
469 if ( !vo_config_count ) return;
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
470 releaseGlContext(&gl_vinfo, &gl_context);
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
471 vo_x11_uninit();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
472 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
473
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
474 static int int_non_neg(int *sh)
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
475 {
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
476 if ( *sh < 0 )
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
477 return 0;
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
478 return 1;
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
479 }
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
480
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
481 static opt_t subopts[] = {
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
482 {"manyfmts", OPT_ARG_BOOL, &many_fmts, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
483 {"osd", OPT_ARG_BOOL, &use_osd, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
484 {"scaled-osd", OPT_ARG_BOOL, &scaled_osd, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
485 {"aspect", OPT_ARG_BOOL, &use_aspect, NULL},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
486 {"slice-height", OPT_ARG_INT, &slice_height, (opt_test_f)int_non_neg},
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
487 {NULL}
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
488 };
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
489
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
490 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
491 {
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
492 // set defaults
12159
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
493 many_fmts = 0;
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
494 use_osd = 1;
13660
b34c5aa5f798 OSD variant for vo_gl.c that behaves more like the one of other vos.
reimar
parents: 13653
diff changeset
495 scaled_osd = 0;
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
496 use_aspect = 1;
12159
9d96071652c4 vo_gl supporting more color formats for testing
reimar
parents: 11988
diff changeset
497 slice_height = 4;
14286
da530c6064a0 Use subopt helper to parse arguments
reimar
parents: 14269
diff changeset
498 if (subopt_parse(arg, subopts) != 0) {
13237
f85c105bfeaa improved suboption parsing, fixes also compiler warnings
reimar
parents: 13206
diff changeset
499 mp_msg(MSGT_VO, MSGL_FATAL,
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
500 "\n-vo gl command line help:\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
501 "Example: mplayer -vo gl:slice-height=4\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
502 "\nOptions:\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
503 " manyfmts\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
504 " Enable extended color formats for OpenGL 1.2 and later\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
505 " slice-height=<0-...>\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
506 " Slice size for texture transfer, 0 for whole image\n"
13585
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
507 " noosd\n"
db4d2cf3f2dc OpenGL OSD rendering for vo_gl
reimar
parents: 13576
diff changeset
508 " Do not use OpenGL OSD code\n"
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
509 " noaspect\n"
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
510 " Do not do aspect scaling\n"
12212
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
511 "\n" );
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
512 return -1;
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
513 }
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
514 if (many_fmts)
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
515 mp_msg (MSGT_VO, MSGL_WARN, "[gl] using extended formats.\n"
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
516 "Make sure you have OpenGL >= 1.2 and used corresponding "
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
517 "headers for compiling!\n");
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
518 mp_msg (MSGT_VO, MSGL_INFO, "[gl] Using %d as slice height "
2e8b305586a0 fixed suboption parsing, added help for suboptions
reimar
parents: 12159
diff changeset
519 "(0 means image height).\n", slice_height);
7931
48c71b6c7389 vo_init() moved to/fixed in preinit()
arpi
parents: 7777
diff changeset
520 if( !vo_init() ) return -1; // Can't open X11
7777
ed7b05575aab -fixed-vo support
pontscho
parents: 7124
diff changeset
521
4737
32e1f5042f65 I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents: 4658
diff changeset
522 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
523 }
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
524
4596
c35d7ce151b3 10000hl to Holm... control MUST BE static...
arpi
parents: 4592
diff changeset
525 static uint32_t control(uint32_t request, void *data, ...)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
526 {
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
527 switch (request) {
10757
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
528 case VOCTRL_PAUSE: return (int_pause=1);
3aea64e0d6d9 Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents: 10138
diff changeset
529 case VOCTRL_RESUME: return (int_pause=0);
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
530 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
531 return query_format(*((uint32_t*)data));
13843
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
532 case VOCTRL_GUISUPPORT:
3f28d2a56758 fullscreen fixes and GUI support for vo_gl
reimar
parents: 13660
diff changeset
533 return VO_TRUE;
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
534 case VOCTRL_ONTOP:
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
535 vo_x11_ontop();
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 10919
diff changeset
536 return VO_TRUE;
6095
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
537 case VOCTRL_FULLSCREEN:
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
538 vo_x11_fullscreen();
891cff8aba60 some cleanup, gl/gl2 updated to use vo_window
arpi
parents: 5651
diff changeset
539 return VO_TRUE;
13601
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
540 case VOCTRL_GET_PANSCAN:
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
541 if (!use_aspect) return VO_NOTIMPL;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
542 return VO_TRUE;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
543 case VOCTRL_SET_PANSCAN:
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
544 if (!use_aspect) return VO_NOTIMPL;
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
545 resize (vo_dwidth, vo_dheight);
da85ac96600e aspect scaling and panscan support for vo_gl.c
reimar
parents: 13599
diff changeset
546 return VO_TRUE;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
547 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4448
diff changeset
548 return VO_NOTIMPL;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4017
diff changeset
549 }