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