Mercurial > mplayer.hg
annotate libvo/vo_x11.c @ 4302:9f12fd5f47d0
Modified the cache option value setting/reading, so we can report
in any case the cache size value used.
author | bertrand |
---|---|
date | Tue, 22 Jan 2002 06:12:18 +0000 |
parents | 76ea6f97ebb7 |
children | 9f8a618e87c3 |
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> | |
4036 | 30 |
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 | |
31 | 74 //static int vo_dwidth,vo_dheight; |
1 | 75 |
2969 | 76 static int Flip_Flag; |
77 | |
3003 | 78 #ifdef HAVE_SHM |
1 | 79 |
80 #include <sys/ipc.h> | |
81 #include <sys/shm.h> | |
82 #include <X11/extensions/XShm.h> | |
83 | |
84 //static int HandleXError _ANSI_ARGS_( ( Display * dpy,XErrorEvent * event ) ); | |
85 static void InstallXErrorHandler ( void ); | |
86 static void DeInstallXErrorHandler ( void ); | |
87 | |
88 static int Shmem_Flag; | |
89 static int Quiet_Flag; | |
90 static XShmSegmentInfo Shminfo[1]; | |
91 static int gXErrorFlag; | |
92 static int CompletionType=-1; | |
93 | |
94 static void InstallXErrorHandler() | |
95 { | |
96 //XSetErrorHandler( HandleXError ); | |
97 XFlush( mDisplay ); | |
98 } | |
99 | |
100 static void DeInstallXErrorHandler() | |
101 { | |
102 XSetErrorHandler( NULL ); | |
103 XFlush( mDisplay ); | |
104 } | |
105 | |
106 #endif | |
107 | |
108 static uint32_t image_width; | |
109 static uint32_t image_height; | |
110 static uint32_t image_format; | |
111 | |
31 | 112 static void check_events(){ |
1110 | 113 vo_x11_check_events(mDisplay); |
1 | 114 } |
115 | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
116 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
|
117 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
|
118 } |
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 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
|
121 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
|
122 } |
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 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
|
125 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
|
126 } |
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 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
|
129 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
|
130 } |
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 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
|
133 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
134 |
3209 | 135 static unsigned int scale_srcW=0; |
136 static unsigned int scale_srcH=0; | |
137 | |
2218 | 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 } | |
3209 | 182 scale_srcW=width; |
183 scale_srcH=height; | |
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( !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
|
193 |
1746 | 194 hint.x=0; |
195 hint.y=0; | |
196 hint.width=image_width; | |
197 hint.height=image_height; | |
198 | |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
199 |
1746 | 200 #ifdef HAVE_XF86VM |
201 if (vm) { | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
202 unsigned int vm_event, vm_error; |
1746 | 203 unsigned int vm_ver, vm_rev; |
204 int i,j,have_vm=0,X,Y; | |
205 | |
206 int modecount; | |
207 | |
208 if (XF86VidModeQueryExtension(mDisplay, &vm_event, &vm_error)) { | |
209 XF86VidModeQueryVersion(mDisplay, &vm_ver, &vm_rev); | |
210 printf("XF86VidMode Extension v%i.%i\n", vm_ver, vm_rev); | |
211 have_vm=1; | |
212 } else | |
213 printf("XF86VidMode Extenstion not available.\n"); | |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
214 |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
215 if (have_vm) { |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
216 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
|
217 XF86VidModeGetAllModeLines(mDisplay,mScreen,&modecount,&vidmodes); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
218 j=0; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
219 modeline_width=vidmodes[0]->hdisplay; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
220 modeline_height=vidmodes[0]->vdisplay; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
221 if ((d_width==0) && (d_height==0)) |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
222 { X=image_width; Y=image_height; } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
223 else |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
224 { X=d_width; Y=d_height; } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
225 |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
226 for (i=1; i<modecount; i++) |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
227 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
|
228 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
|
229 { |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
230 modeline_width=vidmodes[i]->hdisplay; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
231 modeline_height=vidmodes[i]->vdisplay; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
232 j=i; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
233 } |
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 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
|
236 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
|
237 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
|
238 XF86VidModeSwitchToMode(mDisplay,mScreen,vidmodes[j]); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
239 X=(vo_screenwidth-modeline_width)/2; |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
240 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
|
241 XF86VidModeSetViewPort(mDisplay,mScreen,X,Y); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
242 } |
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 #endif |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
245 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
246 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
247 if ( vm ) |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
248 { |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
249 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
|
250 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
|
251 hint.width=modeline_width; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
252 hint.height=modeline_height; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
253 } |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
254 else |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
255 #endif |
1746 | 256 if ( fullscreen ) |
257 { | |
258 hint.width=vo_screenwidth; | |
259 hint.height=vo_screenheight; | |
260 } | |
261 hint.flags=PPosition | PSize; | |
1 | 262 |
1746 | 263 bg=WhitePixel( mDisplay,mScreen ); |
264 fg=BlackPixel( mDisplay,mScreen ); | |
265 vo_dwidth=hint.width; | |
266 vo_dheight=hint.height; | |
1 | 267 |
1746 | 268 theCmap =XCreateColormap( mDisplay,RootWindow( mDisplay,mScreen ), |
269 vinfo.visual,AllocNone ); | |
1 | 270 |
1746 | 271 xswa.background_pixel=0; |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
272 xswa.border_pixel=0; |
1746 | 273 xswa.colormap=theCmap; |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
274 xswamask=CWBackPixel | CWBorderPixel | CWColormap; |
1 | 275 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
276 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
277 if ( vm ) |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
278 { |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
279 xswa.override_redirect=True; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
280 xswamask|=CWOverrideRedirect; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
281 } |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
282 #endif |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
283 |
3830 | 284 if ( WinID>=0 ){ |
285 mywindow = WinID ? ((Window)WinID) : RootWindow( mDisplay,mScreen ); | |
3655 | 286 XUnmapWindow( mDisplay,mywindow ); |
287 XChangeWindowAttributes( mDisplay,mywindow,xswamask,&xswa ); | |
288 } | |
289 else | |
290 mywindow=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ), | |
1 | 291 hint.x,hint.y, |
292 hint.width,hint.height, | |
293 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
|
294 |
1746 | 295 vo_x11_classhint( mDisplay,mywindow,"x11" ); |
296 vo_hidecursor(mDisplay,mywindow); | |
297 if ( fullscreen ) vo_x11_decoration( mDisplay,mywindow,0 ); | |
298 XSelectInput( mDisplay,mywindow,StructureNotifyMask ); | |
299 XSetStandardProperties( mDisplay,mywindow,hello,hello,None,NULL,0,&hint ); | |
300 XMapWindow( mDisplay,mywindow ); | |
4017 | 301 #ifdef HAVE_XINERAMA |
302 vo_x11_xinerama_move(mDisplay,mywindow); | |
303 #endif | |
1746 | 304 do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != mywindow ); |
305 XSelectInput( mDisplay,mywindow,NoEventMask ); | |
1 | 306 |
1746 | 307 XFlush( mDisplay ); |
308 XSync( mDisplay,False ); | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
309 mygc=XCreateGC( mDisplay,mywindow,0L,&xgcv ); |
1 | 310 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
311 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
312 if ( vm ) |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
313 { |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
314 /* 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
|
315 XGrabPointer(mDisplay, mywindow, True, 0, |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
316 GrabModeAsync, GrabModeAsync, |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
317 mywindow, None, CurrentTime); |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
318 XSetInputFocus(mDisplay, mywindow, RevertToNone, CurrentTime); |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
319 } |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
320 #endif |
1746 | 321 } |
1 | 322 |
3003 | 323 #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
|
324 if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag=1; |
1 | 325 else |
326 { | |
327 Shmem_Flag=0; | |
614 | 328 if ( !Quiet_Flag ) printf( "Shared memory not supported\nReverting to normal Xlib\n" ); |
1 | 329 } |
330 if ( Shmem_Flag ) CompletionType=XShmGetEventBase( mDisplay ) + ShmCompletion; | |
331 | |
332 InstallXErrorHandler(); | |
333 | |
334 if ( Shmem_Flag ) | |
335 { | |
1746 | 336 myximage=XShmCreateImage( mDisplay,vinfo.visual,depth,ZPixmap,NULL,&Shminfo[0],image_width,image_height ); |
1 | 337 if ( myximage == NULL ) |
338 { | |
339 if ( myximage != NULL ) XDestroyImage( myximage ); | |
614 | 340 if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( Ximage error )\n" ); |
1 | 341 goto shmemerror; |
342 } | |
343 Shminfo[0].shmid=shmget( IPC_PRIVATE, | |
344 myximage->bytes_per_line * myximage->height , | |
345 IPC_CREAT | 0777 ); | |
346 if ( Shminfo[0].shmid < 0 ) | |
347 { | |
348 XDestroyImage( myximage ); | |
349 if ( !Quiet_Flag ) | |
350 { | |
351 printf( "%s\n",strerror( errno ) ); | |
352 perror( strerror( errno ) ); | |
614 | 353 printf( "Shared memory error,disabling ( seg id error )\n" ); |
1 | 354 } |
355 goto shmemerror; | |
356 } | |
357 Shminfo[0].shmaddr=( char * ) shmat( Shminfo[0].shmid,0,0 ); | |
358 | |
359 if ( Shminfo[0].shmaddr == ( ( char * ) -1 ) ) | |
360 { | |
361 XDestroyImage( myximage ); | |
362 if ( Shminfo[0].shmaddr != ( ( char * ) -1 ) ) shmdt( Shminfo[0].shmaddr ); | |
614 | 363 if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( address error )\n" ); |
1 | 364 goto shmemerror; |
365 } | |
366 myximage->data=Shminfo[0].shmaddr; | |
367 ImageData=( unsigned char * ) myximage->data; | |
368 Shminfo[0].readOnly=False; | |
369 XShmAttach( mDisplay,&Shminfo[0] ); | |
370 | |
371 XSync( mDisplay,False ); | |
372 | |
373 if ( gXErrorFlag ) | |
374 { | |
375 XDestroyImage( myximage ); | |
376 shmdt( Shminfo[0].shmaddr ); | |
614 | 377 if ( !Quiet_Flag ) printf( "Shared memory error,disabling.\n" ); |
1 | 378 gXErrorFlag=0; |
379 goto shmemerror; | |
380 } | |
381 else | |
382 shmctl( Shminfo[0].shmid,IPC_RMID,0 ); | |
383 | |
614 | 384 if ( !Quiet_Flag ) printf( "Sharing memory.\n" ); |
1 | 385 } |
386 else | |
387 { | |
388 shmemerror: | |
389 Shmem_Flag=0; | |
390 #endif | |
391 myximage=XGetImage( mDisplay,mywindow,0,0, | |
2218 | 392 image_width,image_height,AllPlanes,ZPixmap ); |
1 | 393 ImageData=myximage->data; |
3003 | 394 #ifdef HAVE_SHM |
1 | 395 } |
396 | |
397 DeInstallXErrorHandler(); | |
398 #endif | |
399 | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
400 switch ((bpp=myximage->bits_per_pixel)){ |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
401 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
|
402 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
|
403 case 15: |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
404 case 16: if (depth==15) |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
405 draw_alpha_fnc=draw_alpha_15; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
406 else |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
407 draw_alpha_fnc=draw_alpha_16; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
408 break; |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
409 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
|
410 } |
1 | 411 |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
412 // printf( "X11 color mask: R:%lX G:%lX B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask ); |
1 | 413 |
414 // If we have blue in the lowest bit then obviously RGB | |
415 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR; | |
416 #ifdef WORDS_BIGENDIAN | |
417 if ( myximage->byte_order != MSBFirst ) | |
418 #else | |
419 if ( myximage->byte_order != LSBFirst ) | |
420 #endif | |
421 { | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
422 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
|
423 // 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
|
424 // return -1; |
1 | 425 } |
426 | |
427 if( format==IMGFMT_YV12 ) yuv2rgb_init( ( depth == 24 ) ? bpp : depth,mode ); | |
1758 | 428 |
429 #ifdef HAVE_NEW_GUI | |
430 if ( vo_window == None ) | |
431 #endif | |
1852 | 432 { |
433 XSelectInput( mDisplay,mywindow,StructureNotifyMask | KeyPressMask ); | |
434 saver_off(mDisplay); | |
435 } | |
1 | 436 return 0; |
437 } | |
438 | |
439 static const vo_info_t* get_info( void ) | |
440 { return &vo_info; } | |
441 | |
442 static void Terminate_Display_Process( void ) | |
443 { | |
444 getchar(); /* wait for enter to remove window */ | |
3003 | 445 #ifdef HAVE_SHM |
1 | 446 if ( Shmem_Flag ) |
447 { | |
448 XShmDetach( mDisplay,&Shminfo[0] ); | |
449 XDestroyImage( myximage ); | |
450 shmdt( Shminfo[0].shmaddr ); | |
451 } | |
452 #endif | |
453 XDestroyWindow( mDisplay,mywindow ); | |
454 XCloseDisplay( mDisplay ); | |
455 } | |
456 | |
457 static void Display_Image( XImage *myximage,uint8_t *ImageData ) | |
458 { | |
459 #ifdef DISP | |
3003 | 460 #ifdef HAVE_SHM |
1 | 461 if ( Shmem_Flag ) |
462 { | |
463 XShmPutImage( mDisplay,mywindow,mygc,myximage, | |
464 0,0, | |
31 | 465 ( vo_dwidth - myximage->width ) / 2,( vo_dheight - myximage->height ) / 2, |
1 | 466 myximage->width,myximage->height,True ); |
467 } | |
468 else | |
469 #endif | |
470 { | |
471 XPutImage( mDisplay,mywindow,mygc,myximage, | |
472 0,0, | |
31 | 473 ( vo_dwidth - myximage->width ) / 2,( vo_dheight - myximage->height ) / 2, |
1 | 474 myximage->width,myximage->height ); |
475 } | |
476 #endif | |
477 } | |
478 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
479 static void draw_osd(void) |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
480 { 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
|
481 |
31 | 482 static void flip_page( void ){ |
483 Display_Image( myximage,ImageData ); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
484 XSync(mDisplay, False); |
31 | 485 } |
1 | 486 |
487 static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y ) | |
488 { | |
489 | |
3209 | 490 if(scale_srcW){ |
2519 | 491 uint8_t *dst[3] = {ImageData, NULL, NULL}; |
492 SwScale_YV12slice(src,stride,y,h, | |
3209 | 493 dst, image_width*((bpp+7)/8), ( depth == 24 ) ? bpp : depth, |
494 scale_srcW, scale_srcH, image_width, image_height); | |
2218 | 495 } else { |
496 uint8_t *dst=ImageData + ( image_width * y + x ) * ( bpp/8 ); | |
1 | 497 yuv2rgb( dst,src[0],src[1],src[2],w,h,image_width*( bpp/8 ),stride[0],stride[1] ); |
2218 | 498 } |
1 | 499 return 0; |
500 } | |
501 | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
502 static uint32_t draw_frame( uint8_t *src[] ){ |
1 | 503 int sbpp=( ( image_format&0xFF )+7 )/8; |
504 int dbpp=( bpp+7 )/8; | |
505 char *d=ImageData; | |
506 char *s=src[0]; | |
507 //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
|
508 |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
509 if( Flip_Flag ){ |
1 | 510 // flipped BGR |
511 int i; | |
512 //printf( "Rendering flipped BGR frame bpp=%d src=%d dst=%d\n",bpp,sbpp,dbpp ); | |
513 s+=sbpp*image_width*image_height; | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
514 for( i=0;i<image_height;i++ ) { |
1 | 515 s-=sbpp*image_width; |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
516 if( sbpp==dbpp ) { |
2556 | 517 if( depth==16 && image_format==( IMGFMT_BGR|15 ) ) |
518 rgb15to16(s,d,2*image_width ); | |
519 else | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
520 memcpy( d,s,sbpp*image_width ); |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
521 } else { |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
522 // sbpp!=dbpp |
1 | 523 char *s2=s; |
524 char *d2=d; | |
525 char *e=s2+sbpp*image_width; | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
526 while( s2<e ) { |
1 | 527 d2[0]=s2[0]; |
528 d2[1]=s2[1]; | |
529 d2[2]=s2[2]; | |
530 s2+=sbpp;d2+=dbpp; | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
531 } |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
532 } |
1 | 533 d+=dbpp*image_width; |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
534 } |
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 if( sbpp==dbpp ) { |
2556 | 537 if( depth==16 && image_format==( IMGFMT_BGR|15 ) ) |
538 rgb15to16( s,d,2*image_width*image_height ); | |
539 else | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
540 memcpy( d,s,sbpp*image_width*image_height ); |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
541 } else { |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
542 // sbpp!=dbpp |
4036 | 543 #if 0 |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
544 char *e=s+sbpp*image_width*image_height; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
545 //printf( "libvo: using C 24->32bpp conversion\n" ); |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
546 while( s<e ){ |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
547 d[0]=s[0]; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
548 d[1]=s[1]; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
549 d[2]=s[2]; |
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
550 s+=sbpp;d+=dbpp; |
1 | 551 } |
4036 | 552 #else |
553 rgb24to32(s, d, sbpp*image_width*image_height); | |
554 #endif | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
555 } |
1 | 556 } |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
557 return 0; |
1 | 558 } |
559 | |
560 static uint32_t query_format( uint32_t format ) | |
561 { | |
562 if( !vo_init() ) return 0; // Can't open X11 | |
325 | 563 |
564 if( ( format&IMGFMT_BGR_MASK )==IMGFMT_BGR ){ | |
565 int bpp=format&0xFF; | |
566 if( bpp==vo_depthonscreen ) return 1; | |
567 if( bpp==15 && vo_depthonscreen==16) return 1; // built-in conversion | |
568 if( bpp==24 && vo_depthonscreen==32) return 1; // built-in conversion | |
569 } | |
570 | |
1 | 571 switch( format ) |
324 | 572 { |
1 | 573 case IMGFMT_YV12: return 1; |
324 | 574 } |
1 | 575 return 0; |
576 } | |
577 | |
578 | |
579 static void | |
580 uninit(void) | |
581 { | |
1852 | 582 #ifdef HAVE_NEW_GUI |
583 if ( vo_window == None ) | |
584 #endif | |
1924 | 585 { |
586 saver_on(mDisplay); // screen saver back on | |
587 XDestroyWindow( mDisplay,mywindow ); | |
588 } | |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
589 #ifdef HAVE_XF86VM |
1852 | 590 #ifdef HAVE_NEW_GUI |
591 if ((vidmodes!=NULL)&&( vo_window == None ) ) | |
592 #else | |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
593 if (vidmodes!=NULL) |
1852 | 594 #endif |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
595 { |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
596 int screen; screen=DefaultScreen( mDisplay ); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
597 XF86VidModeSwitchToMode(mDisplay,screen,vidmodes[0]); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
598 XF86VidModeSwitchToMode(mDisplay,screen,vidmodes[0]); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
599 free(vidmodes); |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
600 } |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
601 #endif |
1 | 602 printf("vo: uninit!\n"); |
603 } | |
604 | |
605 | |
606 |