Mercurial > mplayer.hg
annotate libvo/vo_x11.c @ 3096:15abd9121737
ao_plugin.c and plugin headers added
author | anders |
---|---|
date | Sat, 24 Nov 2001 05:24:06 +0000 |
parents | 16a593a1e6ed |
children | 0b172eb639f1 |
rev | line source |
---|---|
1 | 1 #define DISP |
2 | |
3 /* | |
4 * video_out_x11.c,X11 interface | |
5 * | |
6 * | |
7 * Copyright ( C ) 1996,MPEG Software Simulation Group. All Rights Reserved. | |
8 * | |
9 * Hacked into mpeg2dec by | |
10 * | |
11 * Aaron Holtzman <aholtzma@ess.engr.uvic.ca> | |
12 * | |
13 * 15 & 16 bpp support added by Franck Sicard <Franck.Sicard@solsoft.fr> | |
14 * | |
15 */ | |
16 | |
17 #include <stdio.h> | |
18 #include <stdlib.h> | |
19 #include <string.h> | |
20 #include <signal.h> | |
21 | |
22 #include "config.h" | |
23 #include "video_out.h" | |
24 #include "video_out_internal.h" | |
25 | |
26 LIBVO_EXTERN( x11 ) | |
27 | |
28 #include <X11/Xlib.h> | |
29 #include <X11/Xutil.h> | |
2969 | 30 //#include <X11/extensions/XShm.h> |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
31 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
32 #include <X11/extensions/xf86vmode.h> |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
33 #endif |
1 | 34 #include <errno.h> |
35 | |
31 | 36 #include "x11_common.h" |
37 | |
354 | 38 #include "fastmemcpy.h" |
616 | 39 #include "sub.h" |
350 | 40 |
2218 | 41 #include "../postproc/swscale.h" |
2556 | 42 #include "../postproc/rgb2rgb.h" |
2218 | 43 |
1 | 44 static vo_info_t vo_info = |
45 { | |
46 "X11 ( XImage/Shm )", | |
47 "x11", | |
48 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>", | |
49 "" | |
50 }; | |
51 | |
52 /* private prototypes */ | |
53 static void Display_Image ( XImage * myximage,unsigned char *ImageData ); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
54 static void (*draw_alpha_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride); |
1 | 55 |
56 /* since it doesn't seem to be defined on some platforms */ | |
57 int XShmGetEventBase( Display* ); | |
58 | |
59 /* local data */ | |
60 static unsigned char *ImageData; | |
61 | |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
62 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
63 XF86VidModeModeInfo **vidmodes=NULL; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
64 #endif |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
65 |
1 | 66 /* X11 related variables */ |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
67 //static Display *mDisplay; |
1 | 68 static Window mywindow; |
69 static GC mygc; | |
70 static XImage *myximage; | |
71 static int depth,bpp,mode; | |
72 static XWindowAttributes attribs; | |
73 static int X_already_started=0; | |
74 | |
31 | 75 //static int vo_dwidth,vo_dheight; |
1 | 76 |
2969 | 77 static int Flip_Flag; |
78 | |
3003 | 79 #ifdef HAVE_SHM |
1 | 80 |
81 #include <sys/ipc.h> | |
82 #include <sys/shm.h> | |
83 #include <X11/extensions/XShm.h> | |
84 | |
85 //static int HandleXError _ANSI_ARGS_( ( Display * dpy,XErrorEvent * event ) ); | |
86 static void InstallXErrorHandler ( void ); | |
87 static void DeInstallXErrorHandler ( void ); | |
88 | |
89 static int Shmem_Flag; | |
90 static int Quiet_Flag; | |
91 static XShmSegmentInfo Shminfo[1]; | |
92 static int gXErrorFlag; | |
93 static int CompletionType=-1; | |
94 | |
95 static void InstallXErrorHandler() | |
96 { | |
97 //XSetErrorHandler( HandleXError ); | |
98 XFlush( mDisplay ); | |
99 } | |
100 | |
101 static void DeInstallXErrorHandler() | |
102 { | |
103 XSetErrorHandler( NULL ); | |
104 XFlush( mDisplay ); | |
105 } | |
106 | |
107 #endif | |
108 | |
109 static uint32_t image_width; | |
110 static uint32_t image_height; | |
111 static uint32_t image_format; | |
112 | |
31 | 113 static void check_events(){ |
1110 | 114 vo_x11_check_events(mDisplay); |
1 | 115 } |
116 | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
117 static void draw_alpha_32(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
118 vo_draw_alpha_rgb32(w,h,src,srca,stride,ImageData+4*(y0*image_width+x0),4*image_width); |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
119 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
120 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
121 static void draw_alpha_24(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
122 vo_draw_alpha_rgb24(w,h,src,srca,stride,ImageData+3*(y0*image_width+x0),3*image_width); |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
123 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
124 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
125 static void draw_alpha_16(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
126 vo_draw_alpha_rgb16(w,h,src,srca,stride,ImageData+2*(y0*image_width+x0),2*image_width); |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
127 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
128 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
129 static void draw_alpha_15(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
130 vo_draw_alpha_rgb15(w,h,src,srca,stride,ImageData+2*(y0*image_width+x0),2*image_width); |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
131 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
132 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
133 static void draw_alpha_null(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
134 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
135 |
2218 | 136 static unsigned int scale_xinc=0; |
137 static unsigned int scale_yinc=0; | |
138 | |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
139 static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format ) |
1 | 140 { |
1110 | 141 // int screen; |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
142 int fullscreen=0; |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
143 int vm=0; |
1110 | 144 // int interval, prefer_blank, allow_exp, nothing; |
1 | 145 unsigned int fg,bg; |
146 char *hello=( title == NULL ) ? "X11 render" : title; | |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
147 // char *name=":0.0"; |
1 | 148 XSizeHints hint; |
149 XVisualInfo vinfo; | |
150 XEvent xev; | |
151 XGCValues xgcv; | |
152 Colormap theCmap; | |
153 XSetWindowAttributes xswa; | |
154 unsigned long xswamask; | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
155 unsigned int modeline_width, modeline_height; |
1 | 156 |
157 image_height=height; | |
158 image_width=width; | |
159 image_format=format; | |
160 | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
161 if( flags&0x03 ) fullscreen = 1; |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
162 if( flags&0x02 ) vm = 1; |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
163 if( flags&0x08 ) Flip_Flag = 1; |
2218 | 164 |
165 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight ); | |
1746 | 166 |
167 XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs ); | |
168 depth=attribs.depth; | |
169 | |
170 if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) depth=24; | |
171 XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo ); | |
172 | |
2234 | 173 if( flags&0x04 && format==IMGFMT_YV12 ) { |
2218 | 174 // software scale |
2234 | 175 if(fullscreen){ |
176 image_width=vo_screenwidth; | |
177 image_height=vo_screenheight; | |
178 } else { | |
2274 | 179 image_width=d_width&(~7); |
2234 | 180 image_height=d_height; |
181 } | |
2274 | 182 scale_xinc=(width << 16) / image_width - 2; // needed for proper rounding |
183 scale_yinc=(height << 16) / image_height +2; | |
2218 | 184 SwScale_Init(); |
185 } | |
186 | |
1752 | 187 #ifdef HAVE_NEW_GUI |
1746 | 188 if ( vo_window != None ) { mywindow=vo_window; mygc=vo_gc; } |
189 else | |
1752 | 190 #endif |
1746 | 191 { |
192 if ( X_already_started ) return -1; | |
193 if( !vo_init() ) return 0; // Can't open X11 | |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
194 |
1746 | 195 hint.x=0; |
196 hint.y=0; | |
197 hint.width=image_width; | |
198 hint.height=image_height; | |
199 | |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
200 |
1746 | 201 #ifdef HAVE_XF86VM |
202 if (vm) { | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
203 unsigned int vm_event, vm_error; |
1746 | 204 unsigned int vm_ver, vm_rev; |
205 int i,j,have_vm=0,X,Y; | |
206 | |
207 int modecount; | |
208 | |
209 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) { | |
210 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev); | |
211 printf("XF86VidMode Extension v%i.%i\n", vm_ver, vm_rev); | |
212 have_vm=1; | |
213 } else | |
214 printf("XF86VidMode Extenstion not available.\n"); | |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
215 |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
216 if (have_vm) { |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
217 if (vidmodes==NULL) |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
218 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
219 j=0; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
220 modeline_width=vidmodes[0]->hdisplay; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
221 modeline_height=vidmodes[0]->vdisplay; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
222 if ((d_width==0) && (d_height==0)) |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
223 { X=image_width; Y=image_height; } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
224 else |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
225 { X=d_width; Y=d_height; } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
226 |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
227 for (i=1; i<modecount; i++) |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
228 if ((vidmodes[i]->hdisplay >= X) && (vidmodes[i]->vdisplay >= Y)) |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
229 if ( (vidmodes[i]->hdisplay < modeline_width ) && (vidmodes[i]->vdisplay < modeline_height) ) |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
230 { |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
231 modeline_width=vidmodes[i]->hdisplay; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
232 modeline_height=vidmodes[i]->vdisplay; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
233 j=i; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
234 } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
235 |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
236 printf("XF86VM: Selected video mode %dx%d for image size %dx%d.\n",modeline_width, modeline_height, image_width, image_height); |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
237 XF86VidModeLockModeSwitch(mDisplay,mScreen,0); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
238 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]); |
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
239 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
240 X=(vo_screenwidth-modeline_width)/2; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
241 Y=(vo_screenheight-modeline_height)/2; |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
242 XF86VidModeSetViewPort(mDisplay,mScreen,X,Y); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
243 } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
244 } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
245 #endif |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
246 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
247 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
248 if ( vm ) |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
249 { |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
250 hint.x=(vo_screenwidth-modeline_width)/2; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
251 hint.y=(vo_screenheight-modeline_height)/2; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
252 hint.width=modeline_width; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
253 hint.height=modeline_height; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
254 } |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
255 else |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
256 #endif |
1746 | 257 if ( fullscreen ) |
258 { | |
259 hint.width=vo_screenwidth; | |
260 hint.height=vo_screenheight; | |
261 } | |
262 hint.flags=PPosition | PSize; | |
1 | 263 |
1746 | 264 bg=WhitePixel( mDisplay,mScreen ); |
265 fg=BlackPixel( mDisplay,mScreen ); | |
266 vo_dwidth=hint.width; | |
267 vo_dheight=hint.height; | |
1 | 268 |
1746 | 269 theCmap =XCreateColormap( mDisplay,RootWindow( mDisplay,mScreen ), |
270 vinfo.visual,AllocNone ); | |
1 | 271 |
1746 | 272 xswa.background_pixel=0; |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
273 xswa.border_pixel=0; |
1746 | 274 xswa.colormap=theCmap; |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
275 xswamask=CWBackPixel | CWBorderPixel | CWColormap; |
1 | 276 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
277 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
278 if ( vm ) |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
279 { |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
280 xswa.override_redirect=True; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
281 xswamask|=CWOverrideRedirect; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
282 } |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
283 #endif |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
284 |
1746 | 285 mywindow=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ), |
1 | 286 hint.x,hint.y, |
287 hint.width,hint.height, | |
288 xswa.border_pixel,depth,CopyFromParent,vinfo.visual,xswamask,&xswa ); | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
289 |
1746 | 290 vo_x11_classhint( mDisplay,mywindow,"x11" ); |
291 vo_hidecursor(mDisplay,mywindow); | |
292 if ( fullscreen ) vo_x11_decoration( mDisplay,mywindow,0 ); | |
293 XSelectInput( mDisplay,mywindow,StructureNotifyMask ); | |
294 XSetStandardProperties( mDisplay,mywindow,hello,hello,None,NULL,0,&hint ); | |
295 XMapWindow( mDisplay,mywindow ); | |
296 do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != mywindow ); | |
297 XSelectInput( mDisplay,mywindow,NoEventMask ); | |
1 | 298 |
1746 | 299 XFlush( mDisplay ); |
300 XSync( mDisplay,False ); | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
301 mygc=XCreateGC( mDisplay,mywindow,0L,&xgcv ); |
1 | 302 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
303 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
304 if ( vm ) |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
305 { |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
306 /* Grab the mouse pointer in our window */ |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
307 XGrabPointer(mDisplay, mywindow, True, 0, |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
308 GrabModeAsync, GrabModeAsync, |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
309 mywindow, None, CurrentTime); |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
310 XSetInputFocus(mDisplay, mywindow, RevertToNone, CurrentTime); |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
311 } |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
312 #endif |
1746 | 313 } |
1 | 314 |
3003 | 315 #ifdef HAVE_SHM |
922
db06ae8967eb
Centralized and cleaned up X11 connecting, fixed remote X11 playing, -display option for mplayer. SHOULD BE TESTED.
lgb
parents:
865
diff
changeset
|
316 if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag=1; |
1 | 317 else |
318 { | |
319 Shmem_Flag=0; | |
614 | 320 if ( !Quiet_Flag ) printf( "Shared memory not supported\nReverting to normal Xlib\n" ); |
1 | 321 } |
322 if ( Shmem_Flag ) CompletionType=XShmGetEventBase( mDisplay ) + ShmCompletion; | |
323 | |
324 InstallXErrorHandler(); | |
325 | |
326 if ( Shmem_Flag ) | |
327 { | |
1746 | 328 myximage=XShmCreateImage( mDisplay,vinfo.visual,depth,ZPixmap,NULL,&Shminfo[0],image_width,image_height ); |
1 | 329 if ( myximage == NULL ) |
330 { | |
331 if ( myximage != NULL ) XDestroyImage( myximage ); | |
614 | 332 if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( Ximage error )\n" ); |
1 | 333 goto shmemerror; |
334 } | |
335 Shminfo[0].shmid=shmget( IPC_PRIVATE, | |
336 myximage->bytes_per_line * myximage->height , | |
337 IPC_CREAT | 0777 ); | |
338 if ( Shminfo[0].shmid < 0 ) | |
339 { | |
340 XDestroyImage( myximage ); | |
341 if ( !Quiet_Flag ) | |
342 { | |
343 printf( "%s\n",strerror( errno ) ); | |
344 perror( strerror( errno ) ); | |
614 | 345 printf( "Shared memory error,disabling ( seg id error )\n" ); |
1 | 346 } |
347 goto shmemerror; | |
348 } | |
349 Shminfo[0].shmaddr=( char * ) shmat( Shminfo[0].shmid,0,0 ); | |
350 | |
351 if ( Shminfo[0].shmaddr == ( ( char * ) -1 ) ) | |
352 { | |
353 XDestroyImage( myximage ); | |
354 if ( Shminfo[0].shmaddr != ( ( char * ) -1 ) ) shmdt( Shminfo[0].shmaddr ); | |
614 | 355 if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( address error )\n" ); |
1 | 356 goto shmemerror; |
357 } | |
358 myximage->data=Shminfo[0].shmaddr; | |
359 ImageData=( unsigned char * ) myximage->data; | |
360 Shminfo[0].readOnly=False; | |
361 XShmAttach( mDisplay,&Shminfo[0] ); | |
362 | |
363 XSync( mDisplay,False ); | |
364 | |
365 if ( gXErrorFlag ) | |
366 { | |
367 XDestroyImage( myximage ); | |
368 shmdt( Shminfo[0].shmaddr ); | |
614 | 369 if ( !Quiet_Flag ) printf( "Shared memory error,disabling.\n" ); |
1 | 370 gXErrorFlag=0; |
371 goto shmemerror; | |
372 } | |
373 else | |
374 shmctl( Shminfo[0].shmid,IPC_RMID,0 ); | |
375 | |
614 | 376 if ( !Quiet_Flag ) printf( "Sharing memory.\n" ); |
1 | 377 } |
378 else | |
379 { | |
380 shmemerror: | |
381 Shmem_Flag=0; | |
382 #endif | |
383 myximage=XGetImage( mDisplay,mywindow,0,0, | |
2218 | 384 image_width,image_height,AllPlanes,ZPixmap ); |
1 | 385 ImageData=myximage->data; |
3003 | 386 #ifdef HAVE_SHM |
1 | 387 } |
388 | |
389 DeInstallXErrorHandler(); | |
390 #endif | |
391 | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
392 switch ((bpp=myximage->bits_per_pixel)){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
393 case 24: draw_alpha_fnc=draw_alpha_24; break; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
394 case 32: draw_alpha_fnc=draw_alpha_32; break; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
395 case 15: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
396 case 16: if (depth==15) |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
397 draw_alpha_fnc=draw_alpha_15; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
398 else |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
399 draw_alpha_fnc=draw_alpha_16; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
400 break; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
401 default: draw_alpha_fnc=draw_alpha_null; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
402 } |
1 | 403 |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
404 // printf( "X11 color mask: R:%lX G:%lX B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask ); |
1 | 405 |
406 // If we have blue in the lowest bit then obviously RGB | |
407 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR; | |
408 #ifdef WORDS_BIGENDIAN | |
409 if ( myximage->byte_order != MSBFirst ) | |
410 #else | |
411 if ( myximage->byte_order != LSBFirst ) | |
412 #endif | |
413 { | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
414 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_BGR : MODE_RGB; |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
415 // printf( "No support fon non-native XImage byte order!\n" ); |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
416 // return -1; |
1 | 417 } |
418 | |
419 if( format==IMGFMT_YV12 ) yuv2rgb_init( ( depth == 24 ) ? bpp : depth,mode ); | |
1758 | 420 |
421 #ifdef HAVE_NEW_GUI | |
422 if ( vo_window == None ) | |
423 #endif | |
1852 | 424 { |
425 XSelectInput( mDisplay,mywindow,StructureNotifyMask | KeyPressMask ); | |
426 saver_off(mDisplay); | |
427 } | |
1 | 428 X_already_started++; |
429 return 0; | |
430 } | |
431 | |
432 static const vo_info_t* get_info( void ) | |
433 { return &vo_info; } | |
434 | |
435 static void Terminate_Display_Process( void ) | |
436 { | |
437 getchar(); /* wait for enter to remove window */ | |
3003 | 438 #ifdef HAVE_SHM |
1 | 439 if ( Shmem_Flag ) |
440 { | |
441 XShmDetach( mDisplay,&Shminfo[0] ); | |
442 XDestroyImage( myximage ); | |
443 shmdt( Shminfo[0].shmaddr ); | |
444 } | |
445 #endif | |
446 XDestroyWindow( mDisplay,mywindow ); | |
447 XCloseDisplay( mDisplay ); | |
448 X_already_started=0; | |
449 } | |
450 | |
451 static void Display_Image( XImage *myximage,uint8_t *ImageData ) | |
452 { | |
453 #ifdef DISP | |
3003 | 454 #ifdef HAVE_SHM |
1 | 455 if ( Shmem_Flag ) |
456 { | |
457 XShmPutImage( mDisplay,mywindow,mygc,myximage, | |
458 0,0, | |
31 | 459 ( vo_dwidth - myximage->width ) / 2,( vo_dheight - myximage->height ) / 2, |
1 | 460 myximage->width,myximage->height,True ); |
461 } | |
462 else | |
463 #endif | |
464 { | |
465 XPutImage( mDisplay,mywindow,mygc,myximage, | |
466 0,0, | |
31 | 467 ( vo_dwidth - myximage->width ) / 2,( vo_dheight - myximage->height ) / 2, |
1 | 468 myximage->width,myximage->height ); |
469 } | |
470 #endif | |
471 } | |
472 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
473 static void draw_osd(void) |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
474 { vo_draw_text(image_width,image_height,draw_alpha_fnc); } |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
475 |
31 | 476 static void flip_page( void ){ |
477 Display_Image( myximage,ImageData ); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
478 XSync(mDisplay, False); |
31 | 479 } |
1 | 480 |
481 static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y ) | |
482 { | |
483 | |
2218 | 484 if(scale_xinc){ |
2519 | 485 uint8_t *dst[3] = {ImageData, NULL, NULL}; |
486 SwScale_YV12slice(src,stride,y,h, | |
487 dst, image_width*((bpp+7)/8), image_width, ( depth == 24 ) ? bpp : depth, | |
2218 | 488 scale_xinc, scale_yinc); |
489 } else { | |
490 uint8_t *dst=ImageData + ( image_width * y + x ) * ( bpp/8 ); | |
1 | 491 yuv2rgb( dst,src[0],src[1],src[2],w,h,image_width*( bpp/8 ),stride[0],stride[1] ); |
2218 | 492 } |
1 | 493 return 0; |
494 } | |
495 | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
496 static uint32_t draw_frame( uint8_t *src[] ){ |
1 | 497 int sbpp=( ( image_format&0xFF )+7 )/8; |
498 int dbpp=( bpp+7 )/8; | |
499 char *d=ImageData; | |
500 char *s=src[0]; | |
501 //printf( "sbpp=%d dbpp=%d depth=%d bpp=%d\n",sbpp,dbpp,depth,bpp ); | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
502 |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
503 if( Flip_Flag ){ |
1 | 504 // flipped BGR |
505 int i; | |
506 //printf( "Rendering flipped BGR frame bpp=%d src=%d dst=%d\n",bpp,sbpp,dbpp ); | |
507 s+=sbpp*image_width*image_height; | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
508 for( i=0;i<image_height;i++ ) { |
1 | 509 s-=sbpp*image_width; |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
510 if( sbpp==dbpp ) { |
2556 | 511 if( depth==16 && image_format==( IMGFMT_BGR|15 ) ) |
512 rgb15to16(s,d,2*image_width ); | |
513 else | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
514 memcpy( d,s,sbpp*image_width ); |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
515 } else { |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
516 // sbpp!=dbpp |
1 | 517 char *s2=s; |
518 char *d2=d; | |
519 char *e=s2+sbpp*image_width; | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
520 while( s2<e ) { |
1 | 521 d2[0]=s2[0]; |
522 d2[1]=s2[1]; | |
523 d2[2]=s2[2]; | |
524 s2+=sbpp;d2+=dbpp; | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
525 } |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
526 } |
1 | 527 d+=dbpp*image_width; |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
528 } |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
529 } else { |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
530 if( sbpp==dbpp ) { |
2556 | 531 if( depth==16 && image_format==( IMGFMT_BGR|15 ) ) |
532 rgb15to16( s,d,2*image_width*image_height ); | |
533 else | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
534 memcpy( d,s,sbpp*image_width*image_height ); |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
535 } else { |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
536 // sbpp!=dbpp |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
537 char *e=s+sbpp*image_width*image_height; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
538 //printf( "libvo: using C 24->32bpp conversion\n" ); |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
539 while( s<e ){ |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
540 d[0]=s[0]; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
541 d[1]=s[1]; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
542 d[2]=s[2]; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
543 s+=sbpp;d+=dbpp; |
1 | 544 } |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
545 } |
1 | 546 } |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
547 return 0; |
1 | 548 } |
549 | |
550 static uint32_t query_format( uint32_t format ) | |
551 { | |
552 if( !vo_init() ) return 0; // Can't open X11 | |
325 | 553 |
554 if( ( format&IMGFMT_BGR_MASK )==IMGFMT_BGR ){ | |
555 int bpp=format&0xFF; | |
556 if( bpp==vo_depthonscreen ) return 1; | |
557 if( bpp==15 && vo_depthonscreen==16) return 1; // built-in conversion | |
558 if( bpp==24 && vo_depthonscreen==32) return 1; // built-in conversion | |
559 } | |
560 | |
1 | 561 switch( format ) |
324 | 562 { |
1 | 563 case IMGFMT_YV12: return 1; |
324 | 564 } |
1 | 565 return 0; |
566 } | |
567 | |
568 | |
569 static void | |
570 uninit(void) | |
571 { | |
1852 | 572 #ifdef HAVE_NEW_GUI |
573 if ( vo_window == None ) | |
574 #endif | |
1924 | 575 { |
576 saver_on(mDisplay); // screen saver back on | |
577 XDestroyWindow( mDisplay,mywindow ); | |
578 } | |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
579 #ifdef HAVE_XF86VM |
1852 | 580 #ifdef HAVE_NEW_GUI |
581 if ((vidmodes!=NULL)&&( vo_window == None ) ) | |
582 #else | |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
583 if (vidmodes!=NULL) |
1852 | 584 #endif |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
585 { |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
586 int screen; screen=DefaultScreen( mDisplay ); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
587 XF86VidModeSwitchToMode(mDisplay,screen,vidmodes[0]); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
588 XF86VidModeSwitchToMode(mDisplay,screen,vidmodes[0]); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
589 free(vidmodes); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
590 } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
591 #endif |
1 | 592 printf("vo: uninit!\n"); |
593 } | |
594 | |
595 | |
596 |