Mercurial > mplayer.hg
annotate libvo/vo_x11.c @ 4726:9ff121145b20
101 (NULL->srcW, NULL->srcH)
author | michael |
---|---|
date | Sat, 16 Feb 2002 13:12:51 +0000 |
parents | c70b0c4b85f5 |
children | cc375edb5eda |
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> | |
4641 | 14 * use swScaler instead of lots of tricky converters by Michael Niedermayer <michaelni@gmx.at> |
1 | 15 * |
16 */ | |
17 | |
18 #include <stdio.h> | |
19 #include <stdlib.h> | |
20 #include <string.h> | |
21 #include <signal.h> | |
22 | |
23 #include "config.h" | |
24 #include "video_out.h" | |
25 #include "video_out_internal.h" | |
26 | |
27 LIBVO_EXTERN( x11 ) | |
28 | |
29 #include <X11/Xlib.h> | |
30 #include <X11/Xutil.h> | |
4036 | 31 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
32 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
33 #include <X11/extensions/xf86vmode.h> |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
34 #endif |
1 | 35 #include <errno.h> |
36 | |
31 | 37 #include "x11_common.h" |
38 | |
354 | 39 #include "fastmemcpy.h" |
616 | 40 #include "sub.h" |
350 | 41 |
2218 | 42 #include "../postproc/swscale.h" |
2556 | 43 #include "../postproc/rgb2rgb.h" |
2218 | 44 |
1 | 45 static vo_info_t vo_info = |
46 { | |
47 "X11 ( XImage/Shm )", | |
48 "x11", | |
49 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>", | |
50 "" | |
51 }; | |
52 | |
53 /* private prototypes */ | |
54 static void Display_Image ( XImage * myximage,unsigned char *ImageData ); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
55 static void (*draw_alpha_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride); |
1 | 56 |
57 /* since it doesn't seem to be defined on some platforms */ | |
58 int XShmGetEventBase( Display* ); | |
59 | |
60 /* local data */ | |
61 static unsigned char *ImageData; | |
62 | |
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 | |
31 | 71 //static int vo_dwidth,vo_dheight; |
1 | 72 |
2969 | 73 static int Flip_Flag; |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
74 static int zoomFlag; |
2969 | 75 |
3003 | 76 #ifdef HAVE_SHM |
1 | 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 | |
92 static void InstallXErrorHandler() | |
93 { | |
94 //XSetErrorHandler( HandleXError ); | |
95 XFlush( mDisplay ); | |
96 } | |
97 | |
98 static void DeInstallXErrorHandler() | |
99 { | |
100 XSetErrorHandler( NULL ); | |
101 XFlush( mDisplay ); | |
102 } | |
103 | |
104 #endif | |
105 | |
106 static uint32_t image_width; | |
107 static uint32_t image_height; | |
4641 | 108 static uint32_t in_format; |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
109 static uint32_t out_format=0; |
4718
c70b0c4b85f5
avoid allocating a dummy scaler as debug/info messages will only be printed for the first allocated scaler unless -v -v is used
michael
parents:
4697
diff
changeset
|
110 static int srcW=-1; |
c70b0c4b85f5
avoid allocating a dummy scaler as debug/info messages will only be printed for the first allocated scaler unless -v -v is used
michael
parents:
4697
diff
changeset
|
111 static int srcH=-1; |
4641 | 112 static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing |
1 | 113 |
31 | 114 static void check_events(){ |
1110 | 115 vo_x11_check_events(mDisplay); |
1 | 116 } |
117 | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
118 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
|
119 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
|
120 } |
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 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
|
123 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
|
124 } |
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 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
|
127 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
|
128 } |
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 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
|
131 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
|
132 } |
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 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
|
135 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
136 |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
137 static SwsContext *swsContext=NULL; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
138 extern int sws_flags; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
139 |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
140 static XVisualInfo vinfo; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
141 |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
142 static void getMyXImage() |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
143 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
144 #ifdef HAVE_SHM |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
145 if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag=1; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
146 else |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
147 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
148 Shmem_Flag=0; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
149 if ( !Quiet_Flag ) printf( "Shared memory not supported\nReverting to normal Xlib\n" ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
150 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
151 if ( Shmem_Flag ) CompletionType=XShmGetEventBase( mDisplay ) + ShmCompletion; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
152 |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
153 InstallXErrorHandler(); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
154 |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
155 if ( Shmem_Flag ) |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
156 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
157 myximage=XShmCreateImage( mDisplay,vinfo.visual,depth,ZPixmap,NULL,&Shminfo[0],image_width,image_height ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
158 if ( myximage == NULL ) |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
159 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
160 if ( myximage != NULL ) XDestroyImage( myximage ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
161 if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( Ximage error )\n" ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
162 goto shmemerror; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
163 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
164 Shminfo[0].shmid=shmget( IPC_PRIVATE, |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
165 myximage->bytes_per_line * myximage->height , |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
166 IPC_CREAT | 0777 ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
167 if ( Shminfo[0].shmid < 0 ) |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
168 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
169 XDestroyImage( myximage ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
170 if ( !Quiet_Flag ) |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
171 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
172 printf( "%s\n",strerror( errno ) ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
173 perror( strerror( errno ) ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
174 printf( "Shared memory error,disabling ( seg id error )\n" ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
175 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
176 goto shmemerror; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
177 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
178 Shminfo[0].shmaddr=( char * ) shmat( Shminfo[0].shmid,0,0 ); |
3209 | 179 |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
180 if ( Shminfo[0].shmaddr == ( ( char * ) -1 ) ) |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
181 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
182 XDestroyImage( myximage ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
183 if ( Shminfo[0].shmaddr != ( ( char * ) -1 ) ) shmdt( Shminfo[0].shmaddr ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
184 if ( !Quiet_Flag ) printf( "Shared memory error,disabling ( address error )\n" ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
185 goto shmemerror; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
186 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
187 myximage->data=Shminfo[0].shmaddr; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
188 ImageData=( unsigned char * ) myximage->data; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
189 Shminfo[0].readOnly=False; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
190 XShmAttach( mDisplay,&Shminfo[0] ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
191 |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
192 XSync( mDisplay,False ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
193 |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
194 if ( gXErrorFlag ) |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
195 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
196 XDestroyImage( myximage ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
197 shmdt( Shminfo[0].shmaddr ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
198 if ( !Quiet_Flag ) printf( "Shared memory error,disabling.\n" ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
199 gXErrorFlag=0; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
200 goto shmemerror; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
201 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
202 else |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
203 shmctl( Shminfo[0].shmid,IPC_RMID,0 ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
204 |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
205 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
206 static int firstTime=1; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
207 if ( !Quiet_Flag && firstTime){ |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
208 printf( "Sharing memory.\n" ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
209 firstTime=0; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
210 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
211 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
212 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
213 else |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
214 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
215 shmemerror: |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
216 Shmem_Flag=0; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
217 #endif |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
218 myximage=XGetImage( mDisplay,mywindow,0,0, |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
219 image_width,image_height,AllPlanes,ZPixmap ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
220 ImageData=myximage->data; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
221 #ifdef HAVE_SHM |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
222 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
223 |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
224 DeInstallXErrorHandler(); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
225 #endif |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
226 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
227 |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
228 static void freeMyXImage() |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
229 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
230 #ifdef HAVE_SHM |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
231 if ( Shmem_Flag ) |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
232 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
233 XShmDetach( mDisplay,&Shminfo[0] ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
234 XDestroyImage( myximage ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
235 shmdt( Shminfo[0].shmaddr ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
236 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
237 else |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
238 #endif |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
239 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
240 XDestroyImage( myximage ); |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
241 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
242 } |
2218 | 243 |
4433 | 244 static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d_height,uint32_t flags,char *title,uint32_t format,const vo_tune_info_t *info) |
1 | 245 { |
1110 | 246 // int screen; |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
247 int fullscreen=0; |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
248 int vm=0; |
1110 | 249 // int interval, prefer_blank, allow_exp, nothing; |
1 | 250 unsigned int fg,bg; |
251 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
|
252 // char *name=":0.0"; |
1 | 253 XSizeHints hint; |
254 XEvent xev; | |
255 XGCValues xgcv; | |
256 Colormap theCmap; | |
257 XSetWindowAttributes xswa; | |
258 unsigned long xswamask; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
259 #ifdef HAVE_XF86VM |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
260 unsigned int modeline_width, modeline_height; |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
261 static uint32_t vm_width; |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
262 static uint32_t vm_height; |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
263 #endif |
1 | 264 |
4641 | 265 in_format=format; |
4718
c70b0c4b85f5
avoid allocating a dummy scaler as debug/info messages will only be printed for the first allocated scaler unless -v -v is used
michael
parents:
4697
diff
changeset
|
266 srcW= width; |
c70b0c4b85f5
avoid allocating a dummy scaler as debug/info messages will only be printed for the first allocated scaler unless -v -v is used
michael
parents:
4697
diff
changeset
|
267 srcH= height; |
4641 | 268 |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
269 if( flags&0x03 ) fullscreen = 1; |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
270 if( flags&0x02 ) vm = 1; |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
271 if( flags&0x08 ) Flip_Flag = 1; |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
272 zoomFlag = flags&0x04; |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
273 // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode |
2218 | 274 |
275 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight ); | |
1746 | 276 |
277 XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs ); | |
278 depth=attribs.depth; | |
279 | |
280 if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) depth=24; | |
281 XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo ); | |
282 | |
4697 | 283 /* set image size (which is indeed neither the input nor output size), |
284 if zoom is on it will be changed during draw_slice anyway so we dont dupplicate the aspect code here | |
285 */ | |
286 image_width=(width + 7) & (~7); | |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
287 image_height=height; |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
288 |
4641 | 289 aspect= ((1<<16)*d_width + d_height/2)/d_height; |
2218 | 290 |
1752 | 291 #ifdef HAVE_NEW_GUI |
1746 | 292 if ( vo_window != None ) { mywindow=vo_window; mygc=vo_gc; } |
293 else | |
1752 | 294 #endif |
1746 | 295 { |
296 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
|
297 |
1746 | 298 hint.x=0; |
299 hint.y=0; | |
4697 | 300 if(zoomFlag){ |
301 hint.width=d_width; | |
302 hint.height=d_height; | |
303 }else{ | |
304 hint.width=width; | |
305 hint.height=height; | |
306 } | |
1746 | 307 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
308 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
309 if ( vm ) |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
310 { |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
311 if ((d_width==0) && (d_height==0)) |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
312 { vm_width=image_width; vm_height=image_height; } |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
313 else |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
314 { vm_width=d_width; vm_height=d_height; } |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
315 vo_vm_switch(vm_width, vm_height,&modeline_width, &modeline_height); |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
316 hint.x=(vo_screenwidth-modeline_width)/2; |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
317 hint.y=(vo_screenheight-modeline_height)/2; |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
318 hint.width=modeline_width; |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
319 hint.height=modeline_height; |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
320 } |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
321 else |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
322 #endif |
1746 | 323 if ( fullscreen ) |
324 { | |
325 hint.width=vo_screenwidth; | |
326 hint.height=vo_screenheight; | |
327 } | |
328 hint.flags=PPosition | PSize; | |
1 | 329 |
1746 | 330 bg=WhitePixel( mDisplay,mScreen ); |
331 fg=BlackPixel( mDisplay,mScreen ); | |
332 vo_dwidth=hint.width; | |
333 vo_dheight=hint.height; | |
1 | 334 |
1746 | 335 theCmap =XCreateColormap( mDisplay,RootWindow( mDisplay,mScreen ), |
336 vinfo.visual,AllocNone ); | |
1 | 337 |
1746 | 338 xswa.background_pixel=0; |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
339 xswa.border_pixel=0; |
1746 | 340 xswa.colormap=theCmap; |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
341 xswamask=CWBackPixel | CWBorderPixel | CWColormap; |
1 | 342 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
343 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
344 if ( vm ) |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
345 { |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
346 xswa.override_redirect=True; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
347 xswamask|=CWOverrideRedirect; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
348 } |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
349 #endif |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
350 |
3830 | 351 if ( WinID>=0 ){ |
352 mywindow = WinID ? ((Window)WinID) : RootWindow( mDisplay,mScreen ); | |
3655 | 353 XUnmapWindow( mDisplay,mywindow ); |
354 XChangeWindowAttributes( mDisplay,mywindow,xswamask,&xswa ); | |
355 } | |
356 else | |
357 mywindow=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ), | |
1 | 358 hint.x,hint.y, |
359 hint.width,hint.height, | |
360 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
|
361 |
1746 | 362 vo_x11_classhint( mDisplay,mywindow,"x11" ); |
363 vo_hidecursor(mDisplay,mywindow); | |
364 if ( fullscreen ) vo_x11_decoration( mDisplay,mywindow,0 ); | |
365 XSelectInput( mDisplay,mywindow,StructureNotifyMask ); | |
366 XSetStandardProperties( mDisplay,mywindow,hello,hello,None,NULL,0,&hint ); | |
367 XMapWindow( mDisplay,mywindow ); | |
4017 | 368 #ifdef HAVE_XINERAMA |
369 vo_x11_xinerama_move(mDisplay,mywindow); | |
370 #endif | |
1746 | 371 do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != mywindow ); |
372 XSelectInput( mDisplay,mywindow,NoEventMask ); | |
1 | 373 |
1746 | 374 XFlush( mDisplay ); |
375 XSync( mDisplay,False ); | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
376 mygc=XCreateGC( mDisplay,mywindow,0L,&xgcv ); |
1 | 377 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
378 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
379 if ( vm ) |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
380 { |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
381 /* 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
|
382 XGrabPointer(mDisplay, mywindow, True, 0, |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
383 GrabModeAsync, GrabModeAsync, |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
384 mywindow, None, CurrentTime); |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
385 XSetInputFocus(mDisplay, mywindow, RevertToNone, CurrentTime); |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
386 } |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
387 #endif |
1746 | 388 } |
1 | 389 |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
390 getMyXImage(); |
1 | 391 |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
392 switch ((bpp=myximage->bits_per_pixel)){ |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
393 case 24: draw_alpha_fnc=draw_alpha_24; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
394 out_format= IMGFMT_BGR24; break; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
395 case 32: draw_alpha_fnc=draw_alpha_32; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
396 out_format= IMGFMT_BGR32; break; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
397 case 15: |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
398 case 16: if (depth==15){ |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
399 draw_alpha_fnc=draw_alpha_15; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
400 out_format= IMGFMT_BGR15; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
401 }else{ |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
402 draw_alpha_fnc=draw_alpha_16; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
403 out_format= IMGFMT_BGR16; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
404 }break; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
405 default: draw_alpha_fnc=draw_alpha_null; |
1 | 406 } |
407 | |
4718
c70b0c4b85f5
avoid allocating a dummy scaler as debug/info messages will only be printed for the first allocated scaler unless -v -v is used
michael
parents:
4697
diff
changeset
|
408 /* we avoid unnecessary allocating the swsContext here as it is allocated during draw_slice if zoom is on */ |
c70b0c4b85f5
avoid allocating a dummy scaler as debug/info messages will only be printed for the first allocated scaler unless -v -v is used
michael
parents:
4697
diff
changeset
|
409 if(!zoomFlag) |
c70b0c4b85f5
avoid allocating a dummy scaler as debug/info messages will only be printed for the first allocated scaler unless -v -v is used
michael
parents:
4697
diff
changeset
|
410 swsContext= getSwsContextFromCmdLine(width, height, in_format, width, height, out_format ); |
1 | 411 |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
412 // printf( "X11 color mask: R:%lX G:%lX B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask ); |
1 | 413 |
414 // If we have blue in the lowest bit then obviously RGB | |
415 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR; | |
416 #ifdef WORDS_BIGENDIAN | |
417 if ( myximage->byte_order != MSBFirst ) | |
418 #else | |
419 if ( myximage->byte_order != LSBFirst ) | |
420 #endif | |
421 { | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
422 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_BGR : MODE_RGB; |
4382 | 423 // printf( "No support for non-native XImage byte order!\n" ); |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
424 // return -1; |
1 | 425 } |
4641 | 426 |
427 if(mode==MODE_BGR) | |
428 { | |
429 printf("hmm, arpi said that isnt used, contact the developers, thats weird\n" ); | |
430 return -1; | |
431 } | |
1 | 432 |
1758 | 433 #ifdef HAVE_NEW_GUI |
434 if ( vo_window == None ) | |
435 #endif | |
1852 | 436 { |
4658 | 437 XSelectInput( mDisplay,mywindow,StructureNotifyMask | KeyPressMask |
438 #ifdef HAVE_NEW_INPUT | |
439 | ButtonPressMask | ButtonReleaseMask | |
440 #endif | |
441 ); | |
1852 | 442 } |
4316 | 443 saver_off(mDisplay); |
1 | 444 return 0; |
445 } | |
446 | |
447 static const vo_info_t* get_info( void ) | |
448 { return &vo_info; } | |
449 | |
450 static void Display_Image( XImage *myximage,uint8_t *ImageData ) | |
451 { | |
452 #ifdef DISP | |
3003 | 453 #ifdef HAVE_SHM |
1 | 454 if ( Shmem_Flag ) |
455 { | |
456 XShmPutImage( mDisplay,mywindow,mygc,myximage, | |
457 0,0, | |
4641 | 458 ( vo_dwidth - swsContext->dstW ) / 2,( vo_dheight - myximage->height ) / 2, |
459 swsContext->dstW,myximage->height,True ); | |
1 | 460 } |
461 else | |
462 #endif | |
463 { | |
464 XPutImage( mDisplay,mywindow,mygc,myximage, | |
465 0,0, | |
4641 | 466 ( vo_dwidth - swsContext->dstW ) / 2,( vo_dheight - myximage->height ) / 2, |
467 swsContext->dstW,myximage->height); | |
1 | 468 } |
469 #endif | |
470 } | |
471 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
472 static void draw_osd(void) |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
473 { 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
|
474 |
31 | 475 static void flip_page( void ){ |
476 Display_Image( myximage,ImageData ); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
477 XSync(mDisplay, False); |
31 | 478 } |
1 | 479 |
480 static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y ) | |
481 { | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
482 uint8_t *dst[3]; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
483 int dstStride[3]; |
4641 | 484 static int old_vo_dwidth=-1; |
485 static int old_vo_dheight=-1; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
486 |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
487 if((old_vo_dwidth != vo_dwidth || old_vo_dheight != vo_dheight) && y==0 && zoomFlag) |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
488 { |
4641 | 489 int newW= vo_dwidth; |
490 int newH= vo_dheight; | |
491 int newAspect= (newW*(1<<16) + (newH>>1))/newH; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
492 SwsContext *oldContext= swsContext; |
4340 | 493 |
4641 | 494 if(newAspect>aspect) newW= (newH*aspect + (1<<15))>>16; |
4662 | 495 else newH= ((newW<<16) + (aspect>>1)) /aspect; |
4641 | 496 |
497 old_vo_dwidth= vo_dwidth; | |
498 old_vo_dheight= vo_dheight; | |
499 | |
500 if(sws_flags==0) newW&= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed | |
501 | |
4718
c70b0c4b85f5
avoid allocating a dummy scaler as debug/info messages will only be printed for the first allocated scaler unless -v -v is used
michael
parents:
4697
diff
changeset
|
502 swsContext= getSwsContextFromCmdLine(srcW, srcH, in_format, |
4541 | 503 newW, newH, out_format); |
504 if(swsContext) | |
505 { | |
4627 | 506 image_width= (newW+7)&(~7); |
4541 | 507 image_height= newH; |
4627 | 508 |
4541 | 509 freeMyXImage(); |
510 getMyXImage(); | |
511 freeSwsContext(oldContext); | |
512 } | |
513 else | |
514 { | |
515 swsContext= oldContext; | |
516 } | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
517 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
518 dstStride[1]= |
4641 | 519 dstStride[2]=0; |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
520 dst[1]= |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
521 dst[2]=NULL; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
522 |
4641 | 523 if(Flip_Flag) |
524 { | |
525 dstStride[0]= -image_width*((bpp+7)/8); | |
526 dst[0]=ImageData - dstStride[0]*(image_height-1); | |
527 swsContext->swScale(swsContext,src,stride,y,h,dst, dstStride); | |
528 } | |
529 else | |
530 { | |
531 dstStride[0]=image_width*((bpp+7)/8); | |
532 dst[0]=ImageData; | |
533 swsContext->swScale(swsContext,src,stride,y,h,dst, dstStride); | |
534 } | |
535 return 0; | |
1 | 536 } |
537 | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
538 static uint32_t draw_frame( uint8_t *src[] ){ |
4512
f52e38e03bb7
YUY2 BGR32 BGR24 support for vo_x11 if swScaler is used
michael
parents:
4443
diff
changeset
|
539 int stride[3]= {0,0,0}; |
4641 | 540 |
4726 | 541 if (in_format==IMGFMT_YUY2) stride[0]=srcW*2; |
542 else if(in_format==IMGFMT_BGR15) stride[0]=srcW*2; | |
543 else if(in_format==IMGFMT_BGR16) stride[0]=srcW*2; | |
544 else if(in_format==IMGFMT_BGR24) stride[0]=srcW*3; | |
545 else if(in_format==IMGFMT_BGR32) stride[0]=srcW*4; | |
4512
f52e38e03bb7
YUY2 BGR32 BGR24 support for vo_x11 if swScaler is used
michael
parents:
4443
diff
changeset
|
546 |
4726 | 547 return draw_slice(src, stride, srcW, srcH, 0, 0); |
1 | 548 } |
549 | |
550 static uint32_t query_format( uint32_t format ) | |
551 { | |
552 if( !vo_init() ) return 0; // Can't open X11 | |
325 | 553 |
1 | 554 switch( format ) |
324 | 555 { |
4627 | 556 case IMGFMT_BGR15: |
557 case IMGFMT_BGR16: | |
4512
f52e38e03bb7
YUY2 BGR32 BGR24 support for vo_x11 if swScaler is used
michael
parents:
4443
diff
changeset
|
558 case IMGFMT_BGR24: |
f52e38e03bb7
YUY2 BGR32 BGR24 support for vo_x11 if swScaler is used
michael
parents:
4443
diff
changeset
|
559 case IMGFMT_BGR32: |
f52e38e03bb7
YUY2 BGR32 BGR24 support for vo_x11 if swScaler is used
michael
parents:
4443
diff
changeset
|
560 case IMGFMT_YUY2: |
4340 | 561 case IMGFMT_I420: |
562 case IMGFMT_IYUV: | |
1 | 563 case IMGFMT_YV12: return 1; |
324 | 564 } |
1 | 565 return 0; |
566 } | |
567 | |
568 | |
569 static void | |
570 uninit(void) | |
571 { | |
4443
cf62fa252821
removed obsoleted Terminate_Display_Process, using freeMyXImage and vo_x11_uninit at exit
alex
parents:
4433
diff
changeset
|
572 freeMyXImage(); |
4316 | 573 saver_on(mDisplay); // screen saver back on |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
574 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
575 #ifdef HAVE_XF86VM |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
576 vo_vm_close(mDisplay); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
577 #endif |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
578 |
4443
cf62fa252821
removed obsoleted Terminate_Display_Process, using freeMyXImage and vo_x11_uninit at exit
alex
parents:
4433
diff
changeset
|
579 vo_x11_uninit(mDisplay, mywindow); |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
580 |
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
581 freeSwsContext(swsContext); |
1 | 582 } |
583 | |
4352 | 584 static uint32_t preinit(const char *arg) |
585 { | |
586 return 0; | |
587 } | |
1 | 588 |
4596 | 589 static uint32_t control(uint32_t request, void *data, ...) |
4352 | 590 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
591 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
592 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
593 return query_format(*((uint32_t*)data)); |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
594 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
595 return VO_NOTIMPL; |
4352 | 596 } |