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