Mercurial > mplayer.hg
annotate libvo/vo_x11.c @ 5636:2cb3ac39e207
libpng2-dev no longer exists in debian. libpng-dev should be there.
as requested by Samuele Giovanni Tonon
author | eyck |
---|---|
date | Mon, 15 Apr 2002 17:39:06 +0000 |
parents | 1972c3475d93 |
children | b8d8d72776f2 |
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> |
4734 | 15 * runtime fullscreen switching by alex |
1 | 16 * |
17 */ | |
18 | |
19 #include <stdio.h> | |
20 #include <stdlib.h> | |
21 #include <string.h> | |
22 #include <signal.h> | |
23 | |
24 #include "config.h" | |
25 #include "video_out.h" | |
26 #include "video_out_internal.h" | |
27 | |
28 LIBVO_EXTERN( x11 ) | |
29 | |
30 #include <X11/Xlib.h> | |
31 #include <X11/Xutil.h> | |
4036 | 32 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
33 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
34 #include <X11/extensions/xf86vmode.h> |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
35 #endif |
1 | 36 #include <errno.h> |
37 | |
31 | 38 #include "x11_common.h" |
39 | |
354 | 40 #include "fastmemcpy.h" |
616 | 41 #include "sub.h" |
350 | 42 |
2218 | 43 #include "../postproc/swscale.h" |
2556 | 44 #include "../postproc/rgb2rgb.h" |
2218 | 45 |
4734 | 46 #include "../mp_msg.h" |
47 | |
1 | 48 static vo_info_t vo_info = |
49 { | |
50 "X11 ( XImage/Shm )", | |
51 "x11", | |
52 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>", | |
53 "" | |
54 }; | |
55 | |
56 /* private prototypes */ | |
57 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
|
58 static void (*draw_alpha_fnc)(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride); |
1 | 59 |
60 /* local data */ | |
61 static unsigned char *ImageData; | |
62 | |
63 /* X11 related variables */ | |
64 static XImage *myximage; | |
65 static int depth,bpp,mode; | |
66 static XWindowAttributes attribs; | |
67 | |
2969 | 68 static int Flip_Flag; |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
69 static int zoomFlag; |
2969 | 70 |
3003 | 71 #ifdef HAVE_SHM |
1 | 72 #include <sys/ipc.h> |
73 #include <sys/shm.h> | |
74 #include <X11/extensions/XShm.h> | |
75 | |
76 static int Shmem_Flag; | |
77 static int Quiet_Flag; | |
78 static XShmSegmentInfo Shminfo[1]; | |
79 static int gXErrorFlag; | |
80 static int CompletionType=-1; | |
81 | |
4813 | 82 /* since it doesn't seem to be defined on some platforms */ |
83 int XShmGetEventBase( Display* ); | |
1 | 84 #endif |
85 | |
86 static uint32_t image_width; | |
87 static uint32_t image_height; | |
4641 | 88 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
|
89 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
|
90 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
|
91 static int srcH=-1; |
4641 | 92 static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing |
1 | 93 |
31 | 94 static void check_events(){ |
4808
4eaa205201b0
clear the window if resized but no scaling used. Enable runtime fullscreen selectin when no zooming available
alex
parents:
4805
diff
changeset
|
95 int ret = vo_x11_check_events(mDisplay); |
4eaa205201b0
clear the window if resized but no scaling used. Enable runtime fullscreen selectin when no zooming available
alex
parents:
4805
diff
changeset
|
96 |
4eaa205201b0
clear the window if resized but no scaling used. Enable runtime fullscreen selectin when no zooming available
alex
parents:
4805
diff
changeset
|
97 /* clear the old window */ |
4eaa205201b0
clear the window if resized but no scaling used. Enable runtime fullscreen selectin when no zooming available
alex
parents:
4805
diff
changeset
|
98 if (ret & VO_EVENT_RESIZE) |
4eaa205201b0
clear the window if resized but no scaling used. Enable runtime fullscreen selectin when no zooming available
alex
parents:
4805
diff
changeset
|
99 { |
4eaa205201b0
clear the window if resized but no scaling used. Enable runtime fullscreen selectin when no zooming available
alex
parents:
4805
diff
changeset
|
100 XSetBackground(mDisplay, vo_gc, 0); |
4eaa205201b0
clear the window if resized but no scaling used. Enable runtime fullscreen selectin when no zooming available
alex
parents:
4805
diff
changeset
|
101 XClearWindow(mDisplay, vo_window); |
4eaa205201b0
clear the window if resized but no scaling used. Enable runtime fullscreen selectin when no zooming available
alex
parents:
4805
diff
changeset
|
102 } |
1 | 103 } |
104 | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
105 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
|
106 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
|
107 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
108 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
109 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
|
110 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
|
111 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
112 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
113 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
|
114 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
|
115 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
116 |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
117 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
|
118 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
|
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_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
|
122 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
123 |
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
|
124 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
|
125 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
|
126 |
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
|
127 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
|
128 |
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
|
129 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
|
130 { |
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
|
131 #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
|
132 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
|
133 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
|
134 { |
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
|
135 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
|
136 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
|
137 } |
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 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
|
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 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
|
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 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
|
143 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
|
144 { |
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 ( 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
|
146 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
|
147 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
|
148 } |
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 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
|
150 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
|
151 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
|
152 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
|
153 { |
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 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
|
155 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
|
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 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
|
158 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
|
159 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
|
160 } |
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 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
|
162 } |
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 Shminfo[0].shmaddr=( char * ) shmat( Shminfo[0].shmid,0,0 ); |
3209 | 164 |
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
|
165 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
|
166 { |
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 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
|
168 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
|
169 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
|
170 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
|
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 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
|
173 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
|
174 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
|
175 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
|
176 |
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 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
|
178 |
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
|
179 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
|
180 { |
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 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
|
182 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
|
183 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
|
184 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
|
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 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
|
188 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
|
189 |
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 { |
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 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
|
192 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
|
193 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
|
194 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
|
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 } |
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 } |
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 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
|
199 { |
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 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 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
|
202 #endif |
4804 | 203 myximage=XGetImage( mDisplay,vo_window,0,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
|
204 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
|
205 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
|
206 #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
|
207 } |
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 #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
|
209 } |
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 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
|
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 #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
|
214 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
|
215 { |
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 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
|
217 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
|
218 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
|
219 } |
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 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
|
221 #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
|
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 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
|
224 } |
5414 | 225 myximage=NULL; |
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
|
226 } |
2218 | 227 |
4433 | 228 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 | 229 { |
1110 | 230 // int screen; |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
231 int fullscreen=0; |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
232 int vm=0; |
1110 | 233 // int interval, prefer_blank, allow_exp, nothing; |
1 | 234 unsigned int fg,bg; |
235 XSizeHints hint; | |
236 XEvent xev; | |
237 XGCValues xgcv; | |
238 Colormap theCmap; | |
239 XSetWindowAttributes xswa; | |
240 unsigned long xswamask; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
241 #ifdef HAVE_XF86VM |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
242 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
|
243 static uint32_t vm_width; |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
244 static uint32_t vm_height; |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
245 #endif |
1 | 246 |
4815
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4813
diff
changeset
|
247 |
178b524e5213
Bugfix in x11_common.c mainly. Don't screw up the display name,
albeu
parents:
4813
diff
changeset
|
248 |
4813 | 249 if (!title) |
250 title = strdup("MPlayer X11 (XImage/Shm) render"); | |
251 | |
4641 | 252 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
|
253 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
|
254 srcH= height; |
4641 | 255 |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
256 if( flags&0x03 ) fullscreen = 1; |
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
257 if( flags&0x02 ) vm = 1; |
767
372042df5c77
Added support for flipped BGR/RGB via -flip cmdline switch.
atmosfear
parents:
616
diff
changeset
|
258 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
|
259 zoomFlag = flags&0x04; |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
260 // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode |
2218 | 261 |
262 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight ); | |
1746 | 263 |
264 XGetWindowAttributes( mDisplay,DefaultRootWindow( mDisplay ),&attribs ); | |
265 depth=attribs.depth; | |
266 | |
267 if ( depth != 15 && depth != 16 && depth != 24 && depth != 32 ) depth=24; | |
268 XMatchVisualInfo( mDisplay,mScreen,depth,TrueColor,&vinfo ); | |
269 | |
4697 | 270 /* set image size (which is indeed neither the input nor output size), |
271 if zoom is on it will be changed during draw_slice anyway so we dont dupplicate the aspect code here | |
272 */ | |
273 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
|
274 image_height=height; |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
275 |
4641 | 276 aspect= ((1<<16)*d_width + d_height/2)/d_height; |
2218 | 277 |
1752 | 278 #ifdef HAVE_NEW_GUI |
4805 | 279 if ( vo_window == None ) |
1752 | 280 #endif |
1746 | 281 { |
282 hint.x=0; | |
283 hint.y=0; | |
4697 | 284 if(zoomFlag){ |
285 hint.width=d_width; | |
286 hint.height=d_height; | |
287 }else{ | |
288 hint.width=width; | |
289 hint.height=height; | |
290 } | |
1746 | 291 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
292 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
293 if ( vm ) |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
294 { |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
295 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
|
296 { 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
|
297 else |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
298 { 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
|
299 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
|
300 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
|
301 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
|
302 hint.width=modeline_width; |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
303 hint.height=modeline_height; |
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
304 } |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
305 else |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
306 #endif |
1746 | 307 if ( fullscreen ) |
308 { | |
309 hint.width=vo_screenwidth; | |
310 hint.height=vo_screenheight; | |
311 } | |
312 hint.flags=PPosition | PSize; | |
1 | 313 |
1746 | 314 bg=WhitePixel( mDisplay,mScreen ); |
315 fg=BlackPixel( mDisplay,mScreen ); | |
316 vo_dwidth=hint.width; | |
317 vo_dheight=hint.height; | |
1 | 318 |
1746 | 319 theCmap =XCreateColormap( mDisplay,RootWindow( mDisplay,mScreen ), |
320 vinfo.visual,AllocNone ); | |
1 | 321 |
1746 | 322 xswa.background_pixel=0; |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
323 xswa.border_pixel=0; |
1746 | 324 xswa.colormap=theCmap; |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
325 xswamask=CWBackPixel | CWBorderPixel | CWColormap; |
1 | 326 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
327 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
328 if ( vm ) |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
329 { |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
330 xswa.override_redirect=True; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
331 xswamask|=CWOverrideRedirect; |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
332 } |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
333 #endif |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
334 |
3830 | 335 if ( WinID>=0 ){ |
4804 | 336 vo_window = WinID ? ((Window)WinID) : RootWindow( mDisplay,mScreen ); |
337 XUnmapWindow( mDisplay,vo_window ); | |
338 XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa ); | |
3655 | 339 } |
340 else | |
4804 | 341 vo_window=XCreateWindow( mDisplay,RootWindow( mDisplay,mScreen ), |
1 | 342 hint.x,hint.y, |
343 hint.width,hint.height, | |
344 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
|
345 |
4804 | 346 vo_x11_classhint( mDisplay,vo_window,"x11" ); |
347 vo_hidecursor(mDisplay,vo_window); | |
348 if ( fullscreen ) vo_x11_decoration( mDisplay,vo_window,0 ); | |
349 XSelectInput( mDisplay,vo_window,StructureNotifyMask ); | |
4813 | 350 XSetStandardProperties( mDisplay,vo_window,title,title,None,NULL,0,&hint ); |
4804 | 351 XMapWindow( mDisplay,vo_window ); |
4017 | 352 #ifdef HAVE_XINERAMA |
4804 | 353 vo_x11_xinerama_move(mDisplay,vo_window); |
4017 | 354 #endif |
4804 | 355 do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != vo_window ); |
356 XSelectInput( mDisplay,vo_window,NoEventMask ); | |
1 | 357 |
1746 | 358 XFlush( mDisplay ); |
359 XSync( mDisplay,False ); | |
4804 | 360 vo_gc=XCreateGC( mDisplay,vo_window,0L,&xgcv ); |
1 | 361 |
4813 | 362 XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask); |
4805 | 363 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
364 #ifdef HAVE_XF86VM |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
365 if ( vm ) |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
366 { |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
367 /* Grab the mouse pointer in our window */ |
4804 | 368 XGrabPointer(mDisplay, vo_window, True, 0, |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
369 GrabModeAsync, GrabModeAsync, |
4804 | 370 vo_window, None, CurrentTime); |
371 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
372 } |
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
373 #endif |
1746 | 374 } |
1 | 375 |
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
|
376 getMyXImage(); |
1 | 377 |
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
|
378 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
|
379 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
|
380 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
|
381 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
|
382 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
|
383 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
|
384 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
|
385 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
|
386 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
|
387 }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
|
388 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
|
389 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
|
390 }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
|
391 default: draw_alpha_fnc=draw_alpha_null; |
1 | 392 } |
393 | |
5368
fdb92215a1fc
Fix resizing when zoom is used and image size changes between frames.
atmos4
parents:
5248
diff
changeset
|
394 /* always allocate swsContext as size could change between frames */ |
fdb92215a1fc
Fix resizing when zoom is used and image size changes between frames.
atmos4
parents:
5248
diff
changeset
|
395 swsContext= getSwsContextFromCmdLine(width, height, in_format, width, height, out_format ); |
1 | 396 |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
397 // printf( "X11 color mask: R:%lX G:%lX B:%lX\n",myximage->red_mask,myximage->green_mask,myximage->blue_mask ); |
1 | 398 |
399 // If we have blue in the lowest bit then obviously RGB | |
400 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_RGB : MODE_BGR; | |
401 #ifdef WORDS_BIGENDIAN | |
402 if ( myximage->byte_order != MSBFirst ) | |
403 #else | |
404 if ( myximage->byte_order != LSBFirst ) | |
405 #endif | |
406 { | |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
407 mode=( ( myximage->blue_mask & 0x01 ) != 0 ) ? MODE_BGR : MODE_RGB; |
4382 | 408 // 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
|
409 // return -1; |
1 | 410 } |
5248
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
411 |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
412 #ifdef WORDS_BIGENDIAN |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
413 if(mode==MODE_BGR && bpp!=32){ |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
414 printf("BGR%d not supported, please contact the developers\n", bpp); |
4641 | 415 return -1; |
416 } | |
5248
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
417 if(mode==MODE_RGB && bpp==32){ |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
418 printf("RGB32 not supported on big-endian systems, please contact the developers\n"); |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
419 return -1; |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
420 } |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
421 #else |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
422 if(mode==MODE_BGR){ |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
423 printf("BGR not supported, please contact the developers\n"); |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
424 return -1; |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
425 } |
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
426 #endif |
1 | 427 |
4316 | 428 saver_off(mDisplay); |
1 | 429 return 0; |
430 } | |
431 | |
432 static const vo_info_t* get_info( void ) | |
433 { return &vo_info; } | |
434 | |
435 static void Display_Image( XImage *myximage,uint8_t *ImageData ) | |
436 { | |
437 #ifdef DISP | |
3003 | 438 #ifdef HAVE_SHM |
1 | 439 if ( Shmem_Flag ) |
440 { | |
4804 | 441 XShmPutImage( mDisplay,vo_window,vo_gc,myximage, |
1 | 442 0,0, |
4641 | 443 ( vo_dwidth - swsContext->dstW ) / 2,( vo_dheight - myximage->height ) / 2, |
444 swsContext->dstW,myximage->height,True ); | |
1 | 445 } |
446 else | |
447 #endif | |
448 { | |
4804 | 449 XPutImage( mDisplay,vo_window,vo_gc,myximage, |
1 | 450 0,0, |
4641 | 451 ( vo_dwidth - swsContext->dstW ) / 2,( vo_dheight - myximage->height ) / 2, |
452 swsContext->dstW,myximage->height); | |
1 | 453 } |
454 #endif | |
455 } | |
456 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
457 static void draw_osd(void) |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
458 { 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
|
459 |
31 | 460 static void flip_page( void ){ |
461 Display_Image( myximage,ImageData ); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
462 XSync(mDisplay, False); |
31 | 463 } |
1 | 464 |
465 static uint32_t draw_slice( uint8_t *src[],int stride[],int w,int h,int x,int y ) | |
466 { | |
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
|
467 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
|
468 int dstStride[3]; |
4641 | 469 static int old_vo_dwidth=-1; |
470 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
|
471 |
4734 | 472 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
|
473 { |
4641 | 474 int newW= vo_dwidth; |
475 int newH= vo_dheight; | |
476 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
|
477 SwsContext *oldContext= swsContext; |
4340 | 478 |
4641 | 479 if(newAspect>aspect) newW= (newH*aspect + (1<<15))>>16; |
4662 | 480 else newH= ((newW<<16) + (aspect>>1)) /aspect; |
4641 | 481 |
482 old_vo_dwidth= vo_dwidth; | |
483 old_vo_dheight= vo_dheight; | |
484 | |
485 if(sws_flags==0) newW&= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed | |
486 | |
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
|
487 swsContext= getSwsContextFromCmdLine(srcW, srcH, in_format, |
4541 | 488 newW, newH, out_format); |
489 if(swsContext) | |
490 { | |
4627 | 491 image_width= (newW+7)&(~7); |
4541 | 492 image_height= newH; |
4627 | 493 |
4541 | 494 freeMyXImage(); |
495 getMyXImage(); | |
496 freeSwsContext(oldContext); | |
497 } | |
498 else | |
499 { | |
500 swsContext= oldContext; | |
501 } | |
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
|
502 } |
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
|
503 dstStride[1]= |
4641 | 504 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
|
505 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
|
506 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
|
507 |
4641 | 508 if(Flip_Flag) |
509 { | |
510 dstStride[0]= -image_width*((bpp+7)/8); | |
511 dst[0]=ImageData - dstStride[0]*(image_height-1); | |
512 swsContext->swScale(swsContext,src,stride,y,h,dst, dstStride); | |
513 } | |
514 else | |
515 { | |
516 dstStride[0]=image_width*((bpp+7)/8); | |
517 dst[0]=ImageData; | |
518 swsContext->swScale(swsContext,src,stride,y,h,dst, dstStride); | |
519 } | |
520 return 0; | |
1 | 521 } |
522 | |
775
1cc160d46319
flip implemented for converted modes, soem cleanup, fixed indent
arpi_esp
parents:
767
diff
changeset
|
523 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
|
524 int stride[3]= {0,0,0}; |
4641 | 525 |
4726 | 526 if (in_format==IMGFMT_YUY2) stride[0]=srcW*2; |
527 else if(in_format==IMGFMT_BGR15) stride[0]=srcW*2; | |
528 else if(in_format==IMGFMT_BGR16) stride[0]=srcW*2; | |
529 else if(in_format==IMGFMT_BGR24) stride[0]=srcW*3; | |
530 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
|
531 |
4726 | 532 return draw_slice(src, stride, srcW, srcH, 0, 0); |
1 | 533 } |
534 | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
535 static uint32_t get_image(mp_image_t *mpi) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
536 { |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
537 if (zoomFlag || |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
538 !IMGFMT_IS_BGR(mpi->imgfmt) || |
5416 | 539 (IMGFMT_BGR_DEPTH(mpi->imgfmt) != vo_depthonscreen) || |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
540 ((mpi->type != MP_IMGTYPE_STATIC) && (mpi->type != MP_IMGTYPE_TEMP)) || |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
541 (mpi->flags & MP_IMGFLAG_PLANAR) || |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
542 (mpi->flags & MP_IMGFLAG_YUV) || |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
543 (mpi->width != image_width) || |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
544 (mpi->height != image_height) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
545 ) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
546 return(VO_FALSE); |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
547 |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
548 if (Flip_Flag) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
549 { |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
550 mpi->stride[0] = -image_width*((bpp+7)/8); |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
551 mpi->planes[0] = ImageData - mpi->stride[0]*(image_height-1); |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
552 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
553 else |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
554 { |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
555 mpi->stride[0] = image_width*((bpp+7)/8); |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
556 mpi->planes[0] = ImageData; |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
557 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
558 mpi->flags |= MP_IMGFLAG_DIRECT; |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
559 |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
560 return(VO_TRUE); |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
561 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
562 |
1 | 563 static uint32_t query_format( uint32_t format ) |
564 { | |
5163
566c4db606aa
Add a (more or less dummy) reference to vo_format_name(), to pull the
jkeil
parents:
5130
diff
changeset
|
565 if(verbose > 2) |
566c4db606aa
Add a (more or less dummy) reference to vo_format_name(), to pull the
jkeil
parents:
5130
diff
changeset
|
566 printf("vo_x11: query_format was called: %x (%s)\n",format,vo_format_name(format)); |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
567 if (IMGFMT_IS_BGR(format)) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
568 { |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
569 if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen) |
5566 | 570 return 3|VFCAP_OSD|VFCAP_SWSCALE|VFCAP_FLIP; |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
571 else |
5566 | 572 return 1|VFCAP_OSD|VFCAP_SWSCALE|VFCAP_FLIP; |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
573 } |
325 | 574 |
1 | 575 switch( format ) |
324 | 576 { |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
577 // case IMGFMT_BGR15: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
578 // case IMGFMT_BGR16: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
579 // case IMGFMT_BGR24: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
580 // case IMGFMT_BGR32: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
581 // return 0x2; |
4905
eb1a28f1236a
yuy2 support disabled to workaround stupid colorspace selection
michael
parents:
4889
diff
changeset
|
582 // case IMGFMT_YUY2: |
4340 | 583 case IMGFMT_I420: |
584 case IMGFMT_IYUV: | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
585 case IMGFMT_YV12: |
5566 | 586 return 1|VFCAP_OSD|VFCAP_SWSCALE; |
324 | 587 } |
1 | 588 return 0; |
589 } | |
590 | |
591 | |
592 static void | |
593 uninit(void) | |
594 { | |
5414 | 595 if(!myximage) return; |
596 | |
4443
cf62fa252821
removed obsoleted Terminate_Display_Process, using freeMyXImage and vo_x11_uninit at exit
alex
parents:
4433
diff
changeset
|
597 freeMyXImage(); |
4316 | 598 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
|
599 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
600 #ifdef HAVE_XF86VM |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
601 vo_vm_close(mDisplay); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
602 #endif |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
603 |
4804 | 604 vo_x11_uninit(mDisplay, vo_window); |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
605 |
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
606 freeSwsContext(swsContext); |
1 | 607 } |
608 | |
4352 | 609 static uint32_t preinit(const char *arg) |
610 { | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
611 if(arg) |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
612 { |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
613 printf("vo_x11: Unknown subdevice: %s\n",arg); |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
614 return ENOSYS; |
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
615 } |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
616 |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
617 #ifdef HAVE_NEW_GUI |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
618 if ( vo_window == None ) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
619 #endif |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
620 if( !vo_init() ) return -1; // Can't open X11 |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
621 |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
622 return 0; |
4352 | 623 } |
1 | 624 |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
625 #if 0 |
4734 | 626 /* for runtime fullscreen switching */ |
627 static int vo_fs_oldx = -1; | |
628 static int vo_fs_oldy = -1; | |
629 static int vo_fs_oldwidth = -1; | |
630 static int vo_fs_oldheight = -1; | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
631 #endif |
4734 | 632 |
4596 | 633 static uint32_t control(uint32_t request, void *data, ...) |
4352 | 634 { |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
635 switch (request) { |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
636 case VOCTRL_QUERY_FORMAT: |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
637 return query_format(*((uint32_t*)data)); |
4734 | 638 case VOCTRL_GUISUPPORT: |
639 return VO_TRUE; | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
640 case VOCTRL_GET_IMAGE: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
641 return get_image(data); |
4734 | 642 case VOCTRL_FULLSCREEN: |
4993 | 643 vo_x11_fullscreen(); |
644 /* | |
4734 | 645 if ((vo_fs_oldwidth == -1) && (vo_fs_oldheight == -1)) |
646 { | |
647 int foo; | |
648 Window root; | |
649 | |
4813 | 650 #ifdef LOCAL_LOOKUP |
4804 | 651 XGetGeometry(mDisplay, vo_window, &root, &foo, &foo, |
4780
01dcf6584729
changes in fullscreen/window switching code to obtain returning to
atlka
parents:
4737
diff
changeset
|
652 &vo_fs_oldwidth, &vo_fs_oldheight, &foo, &foo); |
01dcf6584729
changes in fullscreen/window switching code to obtain returning to
atlka
parents:
4737
diff
changeset
|
653 |
4804 | 654 XTranslateCoordinates(mDisplay, vo_window, root, 0, 0, |
4780
01dcf6584729
changes in fullscreen/window switching code to obtain returning to
atlka
parents:
4737
diff
changeset
|
655 &vo_fs_oldx, &vo_fs_oldy,(Window *) &foo); |
4813 | 656 #else |
657 vo_fs_oldwidth = vo_dwidth; | |
658 vo_fs_oldheight = vo_dheight; | |
659 vo_fs_oldx = vo_dx; | |
660 vo_fs_oldy = vo_dy; | |
661 #endif | |
4734 | 662 |
663 mp_msg(MSGT_VO,MSGL_V,"X11 Fullscreen: saved old place: %dx%d-%dx%d\n", | |
664 vo_fs_oldx, vo_fs_oldy, vo_fs_oldwidth, vo_fs_oldheight); | |
665 | |
4993 | 666 // resize |
4734 | 667 vo_dwidth = vo_screenwidth; |
668 vo_dheight = vo_screenheight; | |
4889
c91a96b35522
Corrections to position saving/restore under vo=X11.
atlka
parents:
4827
diff
changeset
|
669 vo_x11_decoration( mDisplay,vo_window,0 ); |
4804 | 670 XMoveResizeWindow(mDisplay, vo_window, 0, 0, |
4734 | 671 vo_screenwidth, vo_screenheight); |
4780
01dcf6584729
changes in fullscreen/window switching code to obtain returning to
atlka
parents:
4737
diff
changeset
|
672 XSync(mDisplay, False); |
4734 | 673 } |
674 else | |
675 { | |
4889
c91a96b35522
Corrections to position saving/restore under vo=X11.
atlka
parents:
4827
diff
changeset
|
676 vo_x11_decoration( mDisplay,vo_window,1 ); |
4804 | 677 XMoveResizeWindow(mDisplay, vo_window, vo_fs_oldx, vo_fs_oldy, |
4734 | 678 vo_fs_oldwidth, vo_fs_oldheight); |
4889
c91a96b35522
Corrections to position saving/restore under vo=X11.
atlka
parents:
4827
diff
changeset
|
679 |
4734 | 680 |
4813 | 681 #ifdef LOCAL_LOOKUP |
4993 | 682 // restore |
4734 | 683 vo_dwidth = vo_fs_oldwidth; |
684 vo_dheight = vo_fs_oldheight; | |
4813 | 685 #endif |
4734 | 686 |
4993 | 687 // clean |
4734 | 688 vo_fs_oldwidth = -1; |
689 vo_fs_oldheight = -1; | |
4780
01dcf6584729
changes in fullscreen/window switching code to obtain returning to
atlka
parents:
4737
diff
changeset
|
690 XSync(mDisplay, False); |
4734 | 691 } |
4993 | 692 */ |
4790 | 693 return VO_TRUE; |
4592
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
694 } |
5fbfd8545c3b
query_ stuff replaced by new control() - patch by David Holm
arpi
parents:
4554
diff
changeset
|
695 return VO_NOTIMPL; |
4352 | 696 } |