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