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