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