annotate libvo/vo_gl.c @ 14081:866623c7ec87

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